From 4b8b13ec557a9db802095161ff8da64fbe7cd558 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 3 Oct 2019 12:08:41 +0100 Subject: [PATCH 001/369] Resolve next candidate op string in api --- UKSFWebsite.Api.Services/RecruitmentService.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/UKSFWebsite.Api.Services/RecruitmentService.cs b/UKSFWebsite.Api.Services/RecruitmentService.cs index dba83b9d..786bc455 100644 --- a/UKSFWebsite.Api.Services/RecruitmentService.cs +++ b/UKSFWebsite.Api.Services/RecruitmentService.cs @@ -184,13 +184,17 @@ private JObject GetWaitingApplication(Account account) { return (tsOnline, tsNickname, discordService.IsAccountOnline(account)); } - private static DateTime GetNextCandidateOp() { - DateTime nextDate = DateTime.Today.AddDays(1); + private static string GetNextCandidateOp() { + DateTime nextDate = DateTime.Now; while (nextDate.DayOfWeek == DayOfWeek.Monday || nextDate.DayOfWeek == DayOfWeek.Wednesday || nextDate.DayOfWeek == DayOfWeek.Saturday) { nextDate = nextDate.AddDays(1); } - return nextDate; + if (nextDate.Hour > 18) { + nextDate = nextDate.AddDays(1); + } + + return nextDate.Day == DateTime.Today.Day ? "Today" : nextDate.Day == DateTime.Today.AddDays(1).Day ? "Tomorrow" : nextDate.ToString("dddd"); } private double GetAverageProcessingTime() { From 7d135cd65074fa013af4ce3226c0d6659b7ff6a8 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 12 Oct 2019 00:45:56 +0100 Subject: [PATCH 002/369] Change fake discord service to only override updating functions. --- .../Debug/FakeDiscordService.cs | 15 ++++++--------- UKSFWebsite.Api.Services/DiscordService.cs | 6 +++--- UKSFWebsite.Api/Controllers/DiscordController.cs | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs b/UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs index d40ca801..53bf499c 100644 --- a/UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs +++ b/UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs @@ -1,21 +1,18 @@ using System.Collections.Generic; using System.Threading.Tasks; using Discord.WebSocket; +using Microsoft.Extensions.Configuration; using UKSFWebsite.Api.Models.Accounts; using UKSFWebsite.Api.Services.Abstraction; namespace UKSFWebsite.Api.Services.Debug { - public class FakeDiscordService : IDiscordService { - public Task ConnectDiscord() => Task.CompletedTask; + public class FakeDiscordService : DiscordService { + public FakeDiscordService(IConfiguration configuration, IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService) : base(configuration, ranksService, unitsService, accountService, displayNameService) { } - public bool IsAccountOnline(Account account) => false; + public override Task SendMessage(ulong channelId, string message) => Task.CompletedTask; - public Task SendMessage(ulong channelId, string message) => Task.CompletedTask; + public override Task UpdateAllUsers() => Task.CompletedTask; - public Task> GetRoles() => Task.FromResult>(new List()); - - public Task UpdateAllUsers() => Task.CompletedTask; - - public Task UpdateAccount(Account account, ulong discordId = 0) => Task.CompletedTask; + public override Task UpdateAccount(Account account, ulong discordId = 0) => Task.CompletedTask; } } diff --git a/UKSFWebsite.Api.Services/DiscordService.cs b/UKSFWebsite.Api.Services/DiscordService.cs index ac917189..7a5f3dde 100644 --- a/UKSFWebsite.Api.Services/DiscordService.cs +++ b/UKSFWebsite.Api.Services/DiscordService.cs @@ -51,7 +51,7 @@ public async Task ConnectDiscord() { await client.StartAsync(); } - public async Task SendMessage(ulong channelId, string message) { + public virtual async Task SendMessage(ulong channelId, string message) { await AssertOnline(); SocketTextChannel channel = guild.GetTextChannel(channelId); @@ -63,7 +63,7 @@ public async Task> GetRoles() { return roles; } - public async Task UpdateAllUsers() { + public virtual async Task UpdateAllUsers() { await AssertOnline(); await Task.Run( () => { @@ -74,7 +74,7 @@ await Task.Run( ); } - public async Task UpdateAccount(Account account, ulong discordId = 0) { + public virtual async Task UpdateAccount(Account account, ulong discordId = 0) { await AssertOnline(); if (discordId == 0 && account != null && !string.IsNullOrEmpty(account.discordId)) { discordId = ulong.Parse(account.discordId); diff --git a/UKSFWebsite.Api/Controllers/DiscordController.cs b/UKSFWebsite.Api/Controllers/DiscordController.cs index 5fc87a6f..66d18079 100644 --- a/UKSFWebsite.Api/Controllers/DiscordController.cs +++ b/UKSFWebsite.Api/Controllers/DiscordController.cs @@ -17,7 +17,7 @@ public class DiscordController : Controller { [HttpGet("roles"), Authorize, Roles(RoleDefinitions.ADMIN)] public async Task GetRoles() { IReadOnlyCollection roles = await discordService.GetRoles(); - return Ok(roles.OrderBy(x => x.Name).Select(x => $"{x.Id},{x.Name}").Aggregate((x, y) => $"{x}\n{y}")); + return Ok(roles.OrderBy(x => x.Name).Select(x => $"{x.Name}: {x.Id}").Aggregate((x, y) => $"{x}\n{y}")); } [HttpGet("updateuserroles"), Authorize, Roles(RoleDefinitions.ADMIN)] From 0ea6916c20f962bfe766afe335013d5e78cd2af0 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 15 Oct 2019 15:25:56 +0100 Subject: [PATCH 003/369] Ensure account has discord ID before checking if online --- UKSFWebsite.Api.Services/DiscordService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSFWebsite.Api.Services/DiscordService.cs b/UKSFWebsite.Api.Services/DiscordService.cs index 7a5f3dde..35812638 100644 --- a/UKSFWebsite.Api.Services/DiscordService.cs +++ b/UKSFWebsite.Api.Services/DiscordService.cs @@ -93,7 +93,7 @@ public virtual async Task UpdateAccount(Account account, ulong discordId = 0) { await UpdateAccountNickname(user, account); } - public bool IsAccountOnline(Account account) => guild.GetUser(ulong.Parse(account.discordId))?.Status == UserStatus.Online; + public bool IsAccountOnline(Account account) => account.discordId != null && guild.GetUser(ulong.Parse(account.discordId))?.Status == UserStatus.Online; public void Dispose() { client.StopAsync().Wait(TimeSpan.FromSeconds(5)); From 378ed3f9018929f1ea2f249a7aff148bbfc05534 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 18 Oct 2019 15:08:04 +0100 Subject: [PATCH 004/369] Add patching report when patching is ignored. Inline some variables, adjust some sequences --- .../Missions/MissionService.cs | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/UKSFWebsite.Api.Services/Missions/MissionService.cs b/UKSFWebsite.Api.Services/Missions/MissionService.cs index 48cf11b3..594d68b1 100644 --- a/UKSFWebsite.Api.Services/Missions/MissionService.cs +++ b/UKSFWebsite.Api.Services/Missions/MissionService.cs @@ -12,8 +12,6 @@ public class MissionService { private const string UNBIN = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\DeRapDos.exe"; private readonly MissionPatchDataService missionPatchDataService; - private bool ignored; - private bool imageIgnored; private Mission mission; private List reports; @@ -25,19 +23,23 @@ public List ProcessMission(Mission tempMission) { reports = new List(); if (!AssertRequiredFiles()) return reports; - ignored = ReadIgnored("missionPatchingIgnore"); if (CheckBinned()) { UnBin(); } - Read(); - if (ignored) { + if (CheckIgnoreKey("missionPatchingIgnore")) { PatchDescription(); + reports.Add( + new MissionPatchingReport( + "Mission Patching Ignored", + "Mission patching for this mission was ignored.\nThis means no changes to the mission.sqm were made. This is not an error, however errors may occur in the mission as a result of this.\nEnsure ALL the steps below have been done to the mission.sqm before reporting any errors:\n\n\n1: Remove raw newline characters. Any newline characters (\\n) in code will result in compile errors and that code will NOT run.\nFor example, a line: init = \"myTestVariable = 10; \\n myOtherTestVariable = 20;\" should be replaced with: init = \"myTestVariable = 10; myOtherTestVariable = 20;\"\n\n2: Replace embedded quotes. Any embedded quotes (\"\") in code will result in compile errors and that code will NOT run. They should be replaced with a single quote character (').\nFor example, a line: init = \"myTestVariable = \"\"hello\"\";\" should be replaced with: init = \"myTestVariable = 'hello';\"" + ) + ); return reports; } - imageIgnored = ReadIgnored("missionImageIgnore"); missionPatchDataService.UpdatePatchData(); + Read(); Patch(); Write(); PatchDescription(); @@ -62,8 +64,7 @@ private bool AssertRequiredFiles() { return true; } - private bool ReadIgnored(string key) { - if (!File.Exists(mission.descriptionPath)) return true; + private bool CheckIgnoreKey(string key) { mission.descriptionLines = File.ReadAllLines(mission.descriptionPath).ToList(); return mission.descriptionLines.Any(x => x.ContainsCaseInsensitive(key)); } @@ -109,13 +110,19 @@ private void ReadAllData() { private void Patch() { mission.missionEntity.Patch(); - if (!imageIgnored) { + if (!CheckIgnoreKey("missionImageIgnore")) { string imagePath = Path.Combine(mission.path, "uksf.paa"); string modpackImagePath = Path.Combine(VariablesWrapper.VariablesService().GetSingle("PATH_MODPACK").AsString(), "@uksf", "UKSFTemplate.VR", "uksf.paa"); if (File.Exists(modpackImagePath)) { if (File.Exists(imagePath) && new FileInfo(imagePath).Length != new FileInfo(modpackImagePath).Length) { - reports.Add(new MissionPatchingReport("Loading image was different", "The mission loading image `uksf.paa` was different from the default and has been replaced\n\nIf you wish this to be a custom image, see this page for details on how to achieve this")); + reports.Add( + new MissionPatchingReport( + "Loading image was different", + "The mission loading image `uksf.paa` was different from the default and has been replaced\n\nIf you wish this to be a custom image, see this page for details on how to achieve this" + ) + ); } + File.Copy(modpackImagePath, imagePath, true); } } From 040c4aa943471b6f092cb573e786b185c60979f4 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 18 Oct 2019 15:19:26 +0100 Subject: [PATCH 005/369] Revert order of mission read. Fix description key reading to use equals sign --- UKSFWebsite.Api.Services/Missions/MissionService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UKSFWebsite.Api.Services/Missions/MissionService.cs b/UKSFWebsite.Api.Services/Missions/MissionService.cs index 594d68b1..d00ca392 100644 --- a/UKSFWebsite.Api.Services/Missions/MissionService.cs +++ b/UKSFWebsite.Api.Services/Missions/MissionService.cs @@ -26,20 +26,20 @@ public List ProcessMission(Mission tempMission) { if (CheckBinned()) { UnBin(); } + Read(); if (CheckIgnoreKey("missionPatchingIgnore")) { - PatchDescription(); reports.Add( new MissionPatchingReport( "Mission Patching Ignored", "Mission patching for this mission was ignored.\nThis means no changes to the mission.sqm were made. This is not an error, however errors may occur in the mission as a result of this.\nEnsure ALL the steps below have been done to the mission.sqm before reporting any errors:\n\n\n1: Remove raw newline characters. Any newline characters (\\n) in code will result in compile errors and that code will NOT run.\nFor example, a line: init = \"myTestVariable = 10; \\n myOtherTestVariable = 20;\" should be replaced with: init = \"myTestVariable = 10; myOtherTestVariable = 20;\"\n\n2: Replace embedded quotes. Any embedded quotes (\"\") in code will result in compile errors and that code will NOT run. They should be replaced with a single quote character (').\nFor example, a line: init = \"myTestVariable = \"\"hello\"\";\" should be replaced with: init = \"myTestVariable = 'hello';\"" ) ); + PatchDescription(); return reports; } missionPatchDataService.UpdatePatchData(); - Read(); Patch(); Write(); PatchDescription(); @@ -177,7 +177,7 @@ private void CheckDescriptionRequireds() { } private void CheckDescriptionItem(string key, string defaultValue, bool required = true) { - int index = mission.descriptionLines.FindIndex(x => x.Contains(key)); + int index = mission.descriptionLines.FindIndex(x => x.Contains($"{key} = ") || x.Contains($"{key}=") || x.Contains($"{key}= ") || x.Contains($"{key} =")); if (index != -1) { string itemValue = mission.descriptionLines[index].Split("=")[1].Trim(); itemValue = itemValue.Remove(itemValue.Length - 1); From 6107ef7687c48b8d4f4d9c58637d4e7d5df25b0a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 29 Oct 2019 17:48:43 +0000 Subject: [PATCH 006/369] Temporarily disable signature checking --- UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs b/UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs index 8478e258..d8a6f7c7 100644 --- a/UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs +++ b/UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs @@ -18,7 +18,7 @@ public static class GameServerHelpers { "motdInterval = 999999;", "maxPlayers = {3};", "kickDuplicate = 1;", - "verifySignatures = 2;", + "verifySignatures = 0;", "allowedFilePatching = 1;", "disableVoN = 1;", "persistent = 1;", From da59dbab145515850abdb8b9fabc84ff9004c934 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 30 Oct 2019 10:31:47 +0000 Subject: [PATCH 007/369] Added unsafe cvl to server config --- UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs b/UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs index d8a6f7c7..cf049dbc 100644 --- a/UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs +++ b/UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs @@ -20,6 +20,7 @@ public static class GameServerHelpers { "kickDuplicate = 1;", "verifySignatures = 0;", "allowedFilePatching = 1;", + "unsafeCVL = 1;", "disableVoN = 1;", "persistent = 1;", "timeStampFormat = \"short\";", From 360dfa2306ad387246ea59bc42a05b4bfd554515 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 6 Nov 2019 22:26:22 +0000 Subject: [PATCH 008/369] Revert review state if request errors --- .../Abstraction/ICommandRequestService.cs | 2 +- .../Data/CommandRequestService.cs | 6 +---- .../CommandRequestsController.cs | 25 ++++++++++++++++--- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/UKSFWebsite.Api.Services/Abstraction/ICommandRequestService.cs b/UKSFWebsite.Api.Services/Abstraction/ICommandRequestService.cs index be5cd4de..8bc18960 100644 --- a/UKSFWebsite.Api.Services/Abstraction/ICommandRequestService.cs +++ b/UKSFWebsite.Api.Services/Abstraction/ICommandRequestService.cs @@ -6,7 +6,7 @@ public interface ICommandRequestService : IDataService { Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE); Task ArchiveRequest(string id); Task SetRequestReviewState(CommandRequest request, string reviewerId, ReviewState newState); - Task SetRequestAllReviewStates(CommandRequest request, ReviewState newState, string overriderId); + Task SetRequestAllReviewStates(CommandRequest request, ReviewState newState); ReviewState GetReviewState(string id, string reviewer); bool IsRequestApproved(string id); bool IsRequestRejected(string id); diff --git a/UKSFWebsite.Api.Services/Data/CommandRequestService.cs b/UKSFWebsite.Api.Services/Data/CommandRequestService.cs index dc0ab79c..ddf5d34f 100644 --- a/UKSFWebsite.Api.Services/Data/CommandRequestService.cs +++ b/UKSFWebsite.Api.Services/Data/CommandRequestService.cs @@ -83,16 +83,12 @@ public async Task SetRequestReviewState(CommandRequest request, string reviewerI Refresh(); } - public async Task SetRequestAllReviewStates(CommandRequest request, ReviewState newState, string overriderId) { + public async Task SetRequestAllReviewStates(CommandRequest request, ReviewState newState) { List keys = new List(request.reviews.Keys); foreach (string key in keys) { request.reviews[key] = newState; } - foreach (string id in request.reviews.Select(x => x.Key).Where(x => x != overriderId)) { - notificationsService.Add(new Notification {owner = id, icon = NotificationIcons.REQUEST, message = $"Your review on {AvsAn.Query(request.type).Article} {request.type.ToLower()} request for {request.displayRecipient} was overriden by {overriderId}"}); - } - await Update(request.id, Builders.Update.Set("reviews", request.reviews)); Refresh(); } diff --git a/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs b/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs index 5344947a..8a53334f 100644 --- a/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs +++ b/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs @@ -3,12 +3,15 @@ using System.Globalization; using System.Linq; using System.Threading.Tasks; +using AvsAnLib; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; +using UKSFWebsite.Api.Models; using UKSFWebsite.Api.Models.Accounts; using UKSFWebsite.Api.Models.CommandRequests; using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Services.Data; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Controllers.CommandRequests { @@ -19,19 +22,22 @@ public class CommandRequestsController : Controller { private readonly IDisplayNameService displayNameService; private readonly ISessionService sessionService; private readonly IUnitsService unitsService; + private readonly INotificationsService notificationsService; public CommandRequestsController( ICommandRequestService commandRequestService, ICommandRequestCompletionService commandRequestCompletionService, ISessionService sessionService, IUnitsService unitsService, - IDisplayNameService displayNameService + IDisplayNameService displayNameService, + INotificationsService notificationsService ) { this.commandRequestService = commandRequestService; this.commandRequestCompletionService = commandRequestCompletionService; this.sessionService = sessionService; this.unitsService = unitsService; this.displayNameService = displayNameService; + this.notificationsService = notificationsService; } [HttpGet, Authorize] @@ -91,7 +97,11 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje } if (overriden) { LogWrapper.AuditLog(sessionAccount.id, $"Review state of {request.type.ToLower()} request for {request.displayRecipient} overriden to {state}"); - await commandRequestService.SetRequestAllReviewStates(request, state, sessionAccount.id); + await commandRequestService.SetRequestAllReviewStates(request, state); + + foreach (string reviewerId in request.reviews.Select(x => x.Key).Where(x => x != sessionAccount.id)) { + notificationsService.Add(new Notification {owner = reviewerId, icon = NotificationIcons.REQUEST, message = $"Your review on {AvsAn.Query(request.type).Article} {request.type.ToLower()} request for {request.displayRecipient} was overriden by {sessionAccount.id}"}); + } } else { ReviewState currentState = commandRequestService.GetReviewState(request.id, sessionAccount.id); if (currentState == ReviewState.ERROR) { @@ -102,7 +112,16 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje await commandRequestService.SetRequestReviewState(request, sessionAccount.id, state); } - await commandRequestCompletionService.Resolve(request.id); + try { + await commandRequestCompletionService.Resolve(request.id); + } catch (Exception) { + if (overriden) { + await commandRequestService.SetRequestAllReviewStates(request, ReviewState.PENDING); + } else { + await commandRequestService.SetRequestReviewState(request, sessionAccount.id, ReviewState.PENDING); + } + throw; + } return Ok(); } From d6c6ec76820d4ab4a5efed9df64342707a4b17d9 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 7 Nov 2019 12:55:02 +0000 Subject: [PATCH 009/369] Correctly set unit index when moved to a new parent --- UKSFWebsite.Api/Controllers/UnitsController.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/UKSFWebsite.Api/Controllers/UnitsController.cs b/UKSFWebsite.Api/Controllers/UnitsController.cs index dae427f1..f0716f5c 100644 --- a/UKSFWebsite.Api/Controllers/UnitsController.cs +++ b/UKSFWebsite.Api/Controllers/UnitsController.cs @@ -161,6 +161,7 @@ public async Task DeleteUnit(string id) { public async Task UpdateParent([FromBody] JObject data) { Unit unit = JsonConvert.DeserializeObject(data["unit"].ToString()); Unit parentUnit = JsonConvert.DeserializeObject(data["parentUnit"].ToString()); + int index = JsonConvert.DeserializeObject(data["index"].ToString()); if (unit.parent == parentUnit.id) return Ok(); await unitsService.Update(unit.id, "parent", parentUnit.id); @@ -170,7 +171,7 @@ public async Task UpdateParent([FromBody] JObject data) { List parentChildren = unitsService.Get(x => x.parent == parentUnit.id).ToList(); parentChildren.Remove(parentChildren.FirstOrDefault(x => x.id == unit.id)); - parentChildren.Add(unit); + parentChildren.Insert(index, unit); foreach (Unit child in parentChildren) { await unitsService.Update(child.id, "order", parentChildren.IndexOf(child)); } From b95845b69415ef6c2c2e95672d2dd01dc8499c6c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 8 Nov 2019 19:42:38 +0000 Subject: [PATCH 010/369] Moved notifications to controllers except for command request completion service --- .../Abstraction/IAssignmentService.cs | 5 +- UKSFWebsite.Api.Services/AssignmentService.cs | 21 ++----- .../CommandRequestCompletionService.cs | 28 ++++++--- .../Data/NotificationsService.cs | 1 + .../Debug/FakeDiscordService.cs | 2 - .../RecruitmentService.cs | 7 --- UKSFWebsite.Api.Services/ServerService.cs | 2 + .../Controllers/ApplicationsController.cs | 3 +- .../CommandRequestsController.cs | 61 +++++++++---------- .../Controllers/DischargesController.cs | 3 +- .../Controllers/RanksController.cs | 7 ++- .../Controllers/RecruitmentController.cs | 23 ++++--- .../Controllers/RolesController.cs | 7 ++- .../Controllers/UnitsController.cs | 11 +++- .../Controllers/DiscordController.cs | 4 +- 15 files changed, 99 insertions(+), 86 deletions(-) diff --git a/UKSFWebsite.Api.Services/Abstraction/IAssignmentService.cs b/UKSFWebsite.Api.Services/Abstraction/IAssignmentService.cs index 8f35fff8..3c9d09a7 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IAssignmentService.cs +++ b/UKSFWebsite.Api.Services/Abstraction/IAssignmentService.cs @@ -1,12 +1,13 @@ using System.Threading.Tasks; +using UKSFWebsite.Api.Models; namespace UKSFWebsite.Api.Services.Abstraction { public interface IAssignmentService { Task AssignUnitRole(string id, string unitId, string role); Task UnassignAllUnits(string id); Task UnassignAllUnitRoles(string id); - Task UpdateUnitRankAndRole(string id, string unitString = "", string role = "", string rankString = "", string notes = "", string message = "", string reason = ""); - Task UnassignUnitRole(string id, string unitId); + Task UpdateUnitRankAndRole(string id, string unitString = "", string role = "", string rankString = "", string notes = "", string message = "", string reason = ""); + Task UnassignUnitRole(string id, string unitId); Task UnassignUnit(string id, string unitId); } } diff --git a/UKSFWebsite.Api.Services/AssignmentService.cs b/UKSFWebsite.Api.Services/AssignmentService.cs index a8b8f4d7..5eef03f2 100644 --- a/UKSFWebsite.Api.Services/AssignmentService.cs +++ b/UKSFWebsite.Api.Services/AssignmentService.cs @@ -16,7 +16,6 @@ public class AssignmentService : IAssignmentService { public const string REMOVE_FLAG = "REMOVE"; private readonly IAccountService accountService; private readonly IDisplayNameService displayNameService; - private readonly INotificationsService notificationsService; private readonly IRanksService ranksService; private readonly IServerService serverService; private readonly IServiceRecordService serviceRecordService; @@ -26,7 +25,6 @@ public class AssignmentService : IAssignmentService { private readonly IHubContext accountHub; public AssignmentService( - INotificationsService notificationsService, IServiceRecordService serviceRecordService, IAccountService accountService, IRanksService ranksService, @@ -37,7 +35,6 @@ public AssignmentService( IDiscordService discordService, IHubContext accountHub ) { - this.notificationsService = notificationsService; this.serviceRecordService = serviceRecordService; this.accountService = accountService; this.ranksService = ranksService; @@ -49,7 +46,7 @@ IHubContext accountHub this.accountHub = accountHub; } - public async Task UpdateUnitRankAndRole(string id, string unitString = "", string role = "", string rankString = "", string notes = "", string message = "", string reason = "") { + public async Task UpdateUnitRankAndRole(string id, string unitString = "", string role = "", string rankString = "", string notes = "", string message = "", string reason = "") { StringBuilder notificationBuilder = new StringBuilder(); (bool unitUpdate, bool unitPositive) = await UpdateUnit(id, unitString, notificationBuilder); @@ -62,7 +59,7 @@ public async Task UpdateUnitRankAndRole(string id, string unitString = "", strin positive = unitPositive || rolePositive; } - if (!unitUpdate && !roleUpdate && !rankUpdate) return; + if (!unitUpdate && !roleUpdate && !rankUpdate) return null; if (string.IsNullOrEmpty(message)) { message = notificationBuilder.ToString(); if (!string.IsNullOrEmpty(reason)) { @@ -76,15 +73,11 @@ public async Task UpdateUnitRankAndRole(string id, string unitString = "", strin serviceRecordService.AddServiceRecord(id, message, notes); await UpdateGroupsAndRoles(id); - if (message != REMOVE_FLAG) { - notificationsService.Add(new Notification {owner = id, message = message, icon = positive ? NotificationIcons.PROMOTION : NotificationIcons.DEMOTION}); - } + return message != REMOVE_FLAG ? new Notification {owner = id, message = message, icon = positive ? NotificationIcons.PROMOTION : NotificationIcons.DEMOTION} : null; } public async Task AssignUnitRole(string id, string unitId, string role) { await unitsService.SetMemberRole(id, unitId, role); - Unit unit = unitsService.GetSingle(unitId); - notificationsService.Add(new Notification {owner = id, message = $"You have been assigned as {AvsAn.Query(role).Article} {role} in {unitsService.GetChainString(unit)}", icon = NotificationIcons.PROMOTION}); await UpdateGroupsAndRoles(id); } @@ -101,25 +94,23 @@ public async Task UnassignAllUnitRoles(string id) { await unitsService.SetMemberRole(id, unit); } - notificationsService.Add(new Notification {owner = id, message = "You have been unassigned from all roles in all units", icon = NotificationIcons.DEMOTION}); await UpdateGroupsAndRoles(id); } - public async Task UnassignUnitRole(string id, string unitId) { + public async Task UnassignUnitRole(string id, string unitId) { Unit unit = unitsService.GetSingle(unitId); string role = unit.roles.FirstOrDefault(x => x.Value == id).Key; if (unitsService.RolesHasMember(unit, id)) { await unitsService.SetMemberRole(id, unitId); - notificationsService.Add(new Notification {owner = unitId, message = $"You have been unassigned as {AvsAn.Query(role).Article} {role} in {unitsService.GetChainString(unit)}", icon = NotificationIcons.DEMOTION}); await UpdateGroupsAndRoles(id); } + + return role; } public async Task UnassignUnit(string id, string unitId) { Unit unit = unitsService.GetSingle(unitId); await unitsService.RemoveMember(id, unit); - - notificationsService.Add(new Notification {owner = unitId, message = $"You have been removed from {unitsService.GetChainString(unit)}", icon = NotificationIcons.DEMOTION}); await UpdateGroupsAndRoles(unitId); } diff --git a/UKSFWebsite.Api.Services/CommandRequestCompletionService.cs b/UKSFWebsite.Api.Services/CommandRequestCompletionService.cs index ade506d1..0c18a2a7 100644 --- a/UKSFWebsite.Api.Services/CommandRequestCompletionService.cs +++ b/UKSFWebsite.Api.Services/CommandRequestCompletionService.cs @@ -1,11 +1,13 @@ using System; using System.Threading.Tasks; +using AvsAnLib; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; using UKSFWebsite.Api.Models; using UKSFWebsite.Api.Models.Accounts; using UKSFWebsite.Api.Models.CommandRequests; using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Services.Data; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Hubs.Abstraction; using UKSFWebsite.Api.Services.Utility; @@ -20,6 +22,7 @@ public class CommandRequestCompletionService : ICommandRequestCompletionService private readonly ILoaService loaService; private readonly ISessionService sessionService; private readonly IUnitsService unitsService; + private readonly INotificationsService notificationsService; public CommandRequestCompletionService( ISessionService sessionService, @@ -29,7 +32,8 @@ public CommandRequestCompletionService( IAssignmentService assignmentService, ILoaService loaService, IUnitsService unitsService, - IHubContext commandRequestsHub + IHubContext commandRequestsHub, + INotificationsService notificationsService ) { this.sessionService = sessionService; this.accountService = accountService; @@ -40,6 +44,7 @@ IHubContext commandRequestsHub this.unitsService = unitsService; this.dischargeService = dischargeService; this.commandRequestsHub = commandRequestsHub; + this.notificationsService = notificationsService; } public async Task Resolve(string id) { @@ -81,7 +86,8 @@ public async Task Resolve(string id) { private async Task Rank(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { - await assignmentService.UpdateUnitRankAndRole(request.recipient, rankString: request.value, reason: request.reason); + Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, rankString: request.value, reason: request.reason); + notificationsService.Add(notification); await commandRequestService.ArchiveRequest(request.id); LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { @@ -119,7 +125,8 @@ private async Task Discharge(CommandRequest request) { } await accountService.Update(account.id, "membershipState", MembershipState.DISCHARGED); - await assignmentService.UpdateUnitRankAndRole(account.id, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, request.reason, "", AssignmentService.REMOVE_FLAG); + Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, request.reason, "", AssignmentService.REMOVE_FLAG); + notificationsService.Add(notification); await assignmentService.UnassignAllUnits(account.id); await commandRequestService.ArchiveRequest(request.id); LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); @@ -131,7 +138,8 @@ private async Task Discharge(CommandRequest request) { private async Task IndividualRole(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { - await assignmentService.UpdateUnitRankAndRole(request.recipient, role: request.value == "None" ? AssignmentService.REMOVE_FLAG : request.value, reason: request.reason); + Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, role: request.value == "None" ? AssignmentService.REMOVE_FLAG : request.value, reason: request.reason); + notificationsService.Add(notification); await commandRequestService.ArchiveRequest(request.id); LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { @@ -145,11 +153,14 @@ private async Task UnitRole(CommandRequest request) { if (request.secondaryValue == "None") { if (string.IsNullOrEmpty(request.value)) { await assignmentService.UnassignAllUnitRoles(request.recipient); + notificationsService.Add(new Notification {owner = request.recipient, message = "You have been unassigned from all roles in all units", icon = NotificationIcons.DEMOTION}); } else { - await assignmentService.UnassignUnitRole(request.recipient, request.value); + string role = await assignmentService.UnassignUnitRole(request.recipient, request.value); + notificationsService.Add(new Notification {owner = request.recipient, message = $"You have been unassigned as {AvsAn.Query(role).Article} {role} in {unitsService.GetChainString(unitsService.GetSingle(request.value))}", icon = NotificationIcons.DEMOTION}); } } else { await assignmentService.AssignUnitRole(request.recipient, request.value, request.secondaryValue); + notificationsService.Add(new Notification {owner = request.recipient, message = $"You have been assigned as {AvsAn.Query(request.secondaryValue).Article} {request.secondaryValue} in {unitsService.GetChainString(unitsService.GetSingle(request.value))}", icon = NotificationIcons.PROMOTION}); } await commandRequestService.ArchiveRequest(request.id); @@ -164,6 +175,7 @@ private async Task UnitRemoval(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { Unit unit = unitsService.GetSingle(request.value); await assignmentService.UnassignUnit(request.recipient, unit.id); + notificationsService.Add(new Notification {owner = request.recipient, message = $"You have been removed from {unitsService.GetChainString(unit)}", icon = NotificationIcons.DEMOTION}); await commandRequestService.ArchiveRequest(request.id); LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { @@ -175,7 +187,8 @@ private async Task UnitRemoval(CommandRequest request) { private async Task Transfer(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { Unit unit = unitsService.GetSingle(request.value); - await assignmentService.UpdateUnitRankAndRole(request.recipient, unit.name, reason: request.reason); + Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, unit.name, reason: request.reason); + notificationsService.Add(notification); await commandRequestService.ArchiveRequest(request.id); LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { @@ -189,7 +202,8 @@ private async Task Reinstate(CommandRequest request) { DischargeCollection dischargeCollection = dischargeService.GetSingle(x => x.accountId == request.recipient); await dischargeService.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); await accountService.Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); - await assignmentService.UpdateUnitRankAndRole(dischargeCollection.accountId, "Basic Training Unit", "Trainee", "Recruit", "", "", "your membership was reinstated"); + Notification notification = await assignmentService.UpdateUnitRankAndRole(dischargeCollection.accountId, "Basic Training Unit", "Trainee", "Recruit", "", "", "your membership was reinstated"); + notificationsService.Add(notification); LogWrapper.AuditLog(sessionService.GetContextId(), $"{sessionService.GetContextId()} reinstated {dischargeCollection.name}'s membership"); await commandRequestService.ArchiveRequest(request.id); diff --git a/UKSFWebsite.Api.Services/Data/NotificationsService.cs b/UKSFWebsite.Api.Services/Data/NotificationsService.cs index 9927b390..6e02c38a 100644 --- a/UKSFWebsite.Api.Services/Data/NotificationsService.cs +++ b/UKSFWebsite.Api.Services/Data/NotificationsService.cs @@ -53,6 +53,7 @@ public IEnumerable GetNotificationsForContext() { } public new void Add(Notification notification) { + if (notification == null) return; Task unused = AddNotificationAsync(notification); } diff --git a/UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs b/UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs index 53bf499c..ff0141c0 100644 --- a/UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs +++ b/UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; using System.Threading.Tasks; -using Discord.WebSocket; using Microsoft.Extensions.Configuration; using UKSFWebsite.Api.Models.Accounts; using UKSFWebsite.Api.Services.Abstraction; diff --git a/UKSFWebsite.Api.Services/RecruitmentService.cs b/UKSFWebsite.Api.Services/RecruitmentService.cs index 786bc455..999cb039 100644 --- a/UKSFWebsite.Api.Services/RecruitmentService.cs +++ b/UKSFWebsite.Api.Services/RecruitmentService.cs @@ -16,7 +16,6 @@ public class RecruitmentService : IRecruitmentService { private readonly IDiscordService discordService; private readonly IDisplayNameService displayNameService; private readonly ITeamspeakMetricsService metricsService; - private readonly INotificationsService notificationsService; private readonly IRanksService ranksService; private readonly ISessionService sessionService; private readonly ITeamspeakService teamspeakService; @@ -29,7 +28,6 @@ public RecruitmentService( IDisplayNameService displayNameService, IDiscordService discordService, IRanksService ranksService, - INotificationsService notificationsService, ITeamspeakService teamspeakService, IUnitsService unitsService ) { @@ -38,7 +36,6 @@ IUnitsService unitsService this.metricsService = metricsService; this.displayNameService = displayNameService; this.ranksService = ranksService; - this.notificationsService = notificationsService; this.teamspeakService = teamspeakService; this.unitsService = unitsService; this.discordService = discordService; @@ -109,10 +106,6 @@ public JObject GetApplication(Account account) { public async Task SetRecruiter(string id, string newRecruiter) { await accountService.Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiter)); - Account account = accountService.GetSingle(id); - if (account.application.state == ApplicationState.WAITING) { - notificationsService.Add(new Notification {owner = newRecruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application has been transferred to you", link = $"/recruitment/{account.id}"}); - } } public object GetStats(string account, bool monthly) { diff --git a/UKSFWebsite.Api.Services/ServerService.cs b/UKSFWebsite.Api.Services/ServerService.cs index f906447c..371f2c65 100644 --- a/UKSFWebsite.Api.Services/ServerService.cs +++ b/UKSFWebsite.Api.Services/ServerService.cs @@ -8,6 +8,8 @@ using UKSFWebsite.Api.Models.Accounts; using UKSFWebsite.Api.Services.Abstraction; using UKSFWebsite.Api.Services.Data; +// ReSharper disable HeuristicUnreachableCode +#pragma warning disable 162 namespace UKSFWebsite.Api.Services { public class ServerService : IServerService { diff --git a/UKSFWebsite.Api/Controllers/ApplicationsController.cs b/UKSFWebsite.Api/Controllers/ApplicationsController.cs index 97edd7ee..d9a42822 100644 --- a/UKSFWebsite.Api/Controllers/ApplicationsController.cs +++ b/UKSFWebsite.Api/Controllers/ApplicationsController.cs @@ -53,7 +53,8 @@ public async Task Post([FromBody] JObject body) { }; await accountService.Update(account.id, Builders.Update.Set(x => x.application, application)); account = accountService.GetSingle(account.id); - await assignmentService.UpdateUnitRankAndRole(account.id, "", "Applicant", "Candidate", reason: "you were entered into the recruitment process"); + Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, "", "Applicant", "Candidate", reason: "you were entered into the recruitment process"); + notificationsService.Add(notification); notificationsService.Add(new Notification {owner = application.recruiter, icon = NotificationIcons.APPLICATION, message = $"You have been assigned {account.firstname} {account.lastname}'s application", link = $"/recruitment/{account.id}"}); foreach ((_, string sr1Id) in recruitmentService.GetSr1Leads()) { if (account.application.recruiter == sr1Id) continue; diff --git a/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs b/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs index 8a53334f..aedcf46b 100644 --- a/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs +++ b/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs @@ -20,18 +20,11 @@ public class CommandRequestsController : Controller { private readonly ICommandRequestCompletionService commandRequestCompletionService; private readonly ICommandRequestService commandRequestService; private readonly IDisplayNameService displayNameService; + private readonly INotificationsService notificationsService; private readonly ISessionService sessionService; private readonly IUnitsService unitsService; - private readonly INotificationsService notificationsService; - public CommandRequestsController( - ICommandRequestService commandRequestService, - ICommandRequestCompletionService commandRequestCompletionService, - ISessionService sessionService, - IUnitsService unitsService, - IDisplayNameService displayNameService, - INotificationsService notificationsService - ) { + public CommandRequestsController(ICommandRequestService commandRequestService, ICommandRequestCompletionService commandRequestCompletionService, ISessionService sessionService, IUnitsService unitsService, IDisplayNameService displayNameService, INotificationsService notificationsService) { this.commandRequestService = commandRequestService; this.commandRequestCompletionService = commandRequestCompletionService; this.sessionService = sessionService; @@ -58,30 +51,29 @@ public IActionResult Get() { } } - return Ok( - new { - myRequests = myRequests.Select( - x => { - if (string.IsNullOrEmpty(x.reason)) x.reason = "None given"; - x.type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.type.ToLower()); - return new { - data = x, - canOverride = superAdmin || canOverride && x.reviews.Count > 1 && x.dateCreated.AddDays(1) < now && x.reviews.Any(y => y.Value == ReviewState.PENDING && y.Key != contextId), - reviews = x.reviews.Select(y => new {id = y.Key, name = displayNameService.GetDisplayName(y.Key), state = y.Value}) - }; - } - ), - otherRequests = otherRequests.Select( - x => { - if (string.IsNullOrEmpty(x.reason)) x.reason = "None given"; - x.type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.type.ToLower()); - return new { - data = x, - canOverride = superAdmin || canOverride && x.dateCreated.AddDays(1) < now, - reviews = x.reviews.Select(y => new {name = displayNameService.GetDisplayName(y.Key), state = y.Value}) - }; - } - ) + return Ok(new {myRequests = GetMyRequests(myRequests, contextId, canOverride, superAdmin, now), otherRequests = GetOtherRequests(otherRequests, canOverride, superAdmin, now)}); + } + + private object GetMyRequests(IEnumerable myRequests, string contextId, bool canOverride, bool superAdmin, DateTime now) { + return myRequests.Select( + x => { + if (string.IsNullOrEmpty(x.reason)) x.reason = "None given"; + x.type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.type.ToLower()); + return new { + data = x, + canOverride = superAdmin || canOverride && x.reviews.Count > 1 && x.dateCreated.AddDays(1) < now && x.reviews.Any(y => y.Value == ReviewState.PENDING && y.Key != contextId), + reviews = x.reviews.Select(y => new {id = y.Key, name = displayNameService.GetDisplayName(y.Key), state = y.Value}) + }; + } + ); + } + + private object GetOtherRequests(IEnumerable otherRequests, bool canOverride, bool superAdmin, DateTime now) { + return otherRequests.Select( + x => { + if (string.IsNullOrEmpty(x.reason)) x.reason = "None given"; + x.type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.type.ToLower()); + return new {data = x, canOverride = superAdmin || canOverride && x.dateCreated.AddDays(1) < now, reviews = x.reviews.Select(y => new {name = displayNameService.GetDisplayName(y.Key), state = y.Value})}; } ); } @@ -95,6 +87,7 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje if (request == null) { throw new NullReferenceException($"Failed to get request with id {id}, does not exist"); } + if (overriden) { LogWrapper.AuditLog(sessionAccount.id, $"Review state of {request.type.ToLower()} request for {request.displayRecipient} overriden to {state}"); await commandRequestService.SetRequestAllReviewStates(request, state); @@ -107,6 +100,7 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje if (currentState == ReviewState.ERROR) { throw new ArgumentOutOfRangeException($"Getting review state for {sessionAccount} from {request.id} failed. Reviews: \n{request.reviews.Select(x => $"{x.Key}: {x.Value}").Aggregate((x, y) => $"{x}\n{y}")}"); } + if (currentState == state) return Ok(); LogWrapper.AuditLog(sessionAccount.id, $"Review state of {displayNameService.GetDisplayName(sessionAccount)} for {request.type.ToLower()} request for {request.displayRecipient} updated to {state}"); await commandRequestService.SetRequestReviewState(request, sessionAccount.id, state); @@ -120,6 +114,7 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje } else { await commandRequestService.SetRequestReviewState(request, sessionAccount.id, ReviewState.PENDING); } + throw; } diff --git a/UKSFWebsite.Api/Controllers/DischargesController.cs b/UKSFWebsite.Api/Controllers/DischargesController.cs index 93006b5f..28288562 100644 --- a/UKSFWebsite.Api/Controllers/DischargesController.cs +++ b/UKSFWebsite.Api/Controllers/DischargesController.cs @@ -45,7 +45,8 @@ public async Task Reinstate(string id) { DischargeCollection dischargeCollection = dischargeService.GetSingle(id); await dischargeService.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); await accountService.Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); - await assignmentService.UpdateUnitRankAndRole(dischargeCollection.accountId, "Basic Training Unit", "Trainee", "Recruit", "", "", "your membership was reinstated"); + Notification notification = await assignmentService.UpdateUnitRankAndRole(dischargeCollection.accountId, "Basic Training Unit", "Trainee", "Recruit", "", "", "your membership was reinstated"); + notificationsService.Add(notification); LogWrapper.AuditLog(sessionService.GetContextId(), $"{sessionService.GetContextId()} reinstated {dischargeCollection.name}'s membership"); foreach (string member in unitsService.GetSingle(x => x.shortname == "SR10").members.Where(x => x != sessionService.GetContextId())) { diff --git a/UKSFWebsite.Api/Controllers/RanksController.cs b/UKSFWebsite.Api/Controllers/RanksController.cs index 8e54cac2..159ec926 100644 --- a/UKSFWebsite.Api/Controllers/RanksController.cs +++ b/UKSFWebsite.Api/Controllers/RanksController.cs @@ -16,12 +16,14 @@ public class RanksController : Controller { private readonly IAssignmentService assignmentService; private readonly IRanksService ranksService; private readonly ISessionService sessionService; + private readonly INotificationsService notificationsService; - public RanksController(IRanksService ranksService, IAccountService accountService, IAssignmentService assignmentService, ISessionService sessionService) { + public RanksController(IRanksService ranksService, IAccountService accountService, IAssignmentService assignmentService, ISessionService sessionService, INotificationsService notificationsService) { this.ranksService = ranksService; this.accountService = accountService; this.assignmentService = assignmentService; this.sessionService = sessionService; + this.notificationsService = notificationsService; } [HttpGet, Authorize] @@ -69,7 +71,8 @@ public async Task DeleteRank(string id) { LogWrapper.AuditLog(sessionService.GetContextId(), $"Rank deleted '{rank.name}'"); await ranksService.Delete(id); foreach (Account account in accountService.Get(x => x.rank == rank.name)) { - await assignmentService.UpdateUnitRankAndRole(account.id, rankString: AssignmentService.REMOVE_FLAG, reason: $"the '{rank.name}' rank was deleted"); + Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, rankString: AssignmentService.REMOVE_FLAG, reason: $"the '{rank.name}' rank was deleted"); + notificationsService.Add(notification); } return Ok(ranksService.Get()); diff --git a/UKSFWebsite.Api/Controllers/RecruitmentController.cs b/UKSFWebsite.Api/Controllers/RecruitmentController.cs index efc98a1c..8834af19 100644 --- a/UKSFWebsite.Api/Controllers/RecruitmentController.cs +++ b/UKSFWebsite.Api/Controllers/RecruitmentController.cs @@ -76,11 +76,12 @@ public async Task UpdateState([FromBody] dynamic body, string id) if (updatedState == ApplicationState.ACCEPTED) { await accountService.Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now)); await accountService.Update(id, "membershipState", MembershipState.MEMBER); - await assignmentService.UpdateUnitRankAndRole(id, "Basic Training Unit", "Trainee", "Recruit", reason: "your application was accepted"); + Notification notification = await assignmentService.UpdateUnitRankAndRole(id, "Basic Training Unit", "Trainee", "Recruit", reason: "your application was accepted"); + notificationsService.Add(notification); } else if (updatedState == ApplicationState.REJECTED) { await accountService.Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now)); await accountService.Update(id, "membershipState", MembershipState.CONFIRMED); - await assignmentService.UpdateUnitRankAndRole( + Notification notification = await assignmentService.UpdateUnitRankAndRole( id, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, @@ -88,11 +89,13 @@ await assignmentService.UpdateUnitRankAndRole( "", $"Unfortunately you have not been accepted into our unit, however we thank you for your interest and hope you find a suitable alternative. You may view any notes about your application here: [url]https://uk-sf.co.uk/recruitment/{id}[/url]" ); + notificationsService.Add(notification); } else if (updatedState == ApplicationState.WAITING) { await accountService.Update(id, Builders.Update.Set(x => x.application.dateCreated, DateTime.Now)); await accountService.Update(id, Builders.Update.Unset(x => x.application.dateAccepted)); await accountService.Update(id, "membershipState", MembershipState.CONFIRMED); - await assignmentService.UpdateUnitRankAndRole(id, AssignmentService.REMOVE_FLAG, "Applicant", "Candidate", reason: "your application was reactivated"); + Notification notification = await assignmentService.UpdateUnitRankAndRole(id, AssignmentService.REMOVE_FLAG, "Applicant", "Candidate", reason: "your application was reactivated"); + notificationsService.Add(notification); if (recruitmentService.GetSr1Members().All(x => x.id != account.application.recruiter)) { string newRecruiterId = recruitmentService.GetRecruiter(); LogWrapper.AuditLog(sessionId, $"Application recruiter for {id} is no longer SR1, reassigning from {account.application.recruiter} to {newRecruiterId}"); @@ -119,7 +122,12 @@ await assignmentService.UpdateUnitRankAndRole( [HttpPost("recruiter/{id}"), Authorize, Roles(RoleDefinitions.SR1_LEAD)] public async Task PostReassignment([FromBody] JObject newRecruiter, string id) { if (!sessionService.ContextHasRole(RoleDefinitions.ADMIN) && !recruitmentService.IsAccountSr1Lead()) throw new Exception($"attempted to assign recruiter to {newRecruiter}. Context is not recruitment lead."); - await recruitmentService.SetRecruiter(id, newRecruiter["newRecruiter"].ToString()); + string recruiter = newRecruiter["newRecruiter"].ToString(); + await recruitmentService.SetRecruiter(id, recruiter); + Account account = accountService.GetSingle(id); + if (account.application.state == ApplicationState.WAITING) { + notificationsService.Add(new Notification {owner = recruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application has been transferred to you", link = $"/recruitment/{account.id}"}); + } LogWrapper.AuditLog(sessionService.GetContextId(), $"Application recruiter changed for {id} to {newRecruiter["newRecruiter"]}"); return Ok(); } @@ -139,10 +147,7 @@ public async Task> Ratings([FromBody] KeyValuePair Ok(recruitmentService.GetActiveRecruiters()); } } diff --git a/UKSFWebsite.Api/Controllers/RolesController.cs b/UKSFWebsite.Api/Controllers/RolesController.cs index bd4c3c20..3fb37b45 100644 --- a/UKSFWebsite.Api/Controllers/RolesController.cs +++ b/UKSFWebsite.Api/Controllers/RolesController.cs @@ -17,13 +17,15 @@ public class RolesController : Controller { private readonly IRolesService rolesService; private readonly ISessionService sessionService; private readonly IUnitsService unitsService; + private readonly INotificationsService notificationsService; - public RolesController(IRolesService rolesService, IAccountService accountService, IAssignmentService assignmentService, ISessionService sessionService, IUnitsService unitsService) { + public RolesController(IRolesService rolesService, IAccountService accountService, IAssignmentService assignmentService, ISessionService sessionService, IUnitsService unitsService, INotificationsService notificationsService) { this.rolesService = rolesService; this.accountService = accountService; this.assignmentService = assignmentService; this.sessionService = sessionService; this.unitsService = unitsService; + this.notificationsService = notificationsService; } [HttpGet, Authorize] @@ -75,7 +77,8 @@ public async Task DeleteRole(string id) { LogWrapper.AuditLog(sessionService.GetContextId(), $"Role deleted '{role.name}'"); await rolesService.Delete(id); foreach (Account account in accountService.Get(x => x.roleAssignment == role.name)) { - await assignmentService.UpdateUnitRankAndRole(account.id, role: AssignmentService.REMOVE_FLAG, reason: $"the '{role.name}' role was deleted"); + Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, role: AssignmentService.REMOVE_FLAG, reason: $"the '{role.name}' role was deleted"); + notificationsService.Add(notification); } await unitsService.DeleteRole(role.name); diff --git a/UKSFWebsite.Api/Controllers/UnitsController.cs b/UKSFWebsite.Api/Controllers/UnitsController.cs index dae427f1..b13053aa 100644 --- a/UKSFWebsite.Api/Controllers/UnitsController.cs +++ b/UKSFWebsite.Api/Controllers/UnitsController.cs @@ -25,6 +25,7 @@ public class UnitsController : Controller { private readonly ISessionService sessionService; private readonly ITeamspeakService teamspeakService; private readonly IUnitsService unitsService; + private readonly INotificationsService notificationsService; public UnitsController( ISessionService sessionService, @@ -36,7 +37,8 @@ public UnitsController( ITeamspeakService teamspeakService, IAssignmentService assignmentService, IServerService serverService, - IDiscordService discordService + IDiscordService discordService, + INotificationsService notificationsService ) { this.sessionService = sessionService; this.accountService = accountService; @@ -48,6 +50,7 @@ IDiscordService discordService this.assignmentService = assignmentService; this.serverService = serverService; this.discordService = discordService; + this.notificationsService = notificationsService; } [HttpGet, Authorize] @@ -149,7 +152,8 @@ public async Task DeleteUnit(string id) { Unit unit = unitsService.GetSingle(id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Unit deleted '{unit.name}'"); foreach (Account account in accountService.Get(x => x.unitAssignment == unit.name)) { - await assignmentService.UpdateUnitRankAndRole(account.id, "Reserves", reason: $"{unit.name} was deleted"); + Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, "Reserves", reason: $"{unit.name} was deleted"); + notificationsService.Add(notification); } await unitsService.Delete(id); @@ -178,7 +182,8 @@ public async Task UpdateParent([FromBody] JObject data) { unit = unitsService.GetSingle(unit.id); foreach (Unit child in unitsService.GetAllChildren(unit, true)) { foreach (Account account in child.members.Select(x => accountService.GetSingle(x))) { - await assignmentService.UpdateUnitRankAndRole(account.id, unit.name, reason: $"the hierarchy chain for {unit.name} was updated"); + Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, unit.name, reason: $"the hierarchy chain for {unit.name} was updated"); + notificationsService.Add(notification); } } diff --git a/UKSFWebsite.Steam/Controllers/DiscordController.cs b/UKSFWebsite.Steam/Controllers/DiscordController.cs index 64a9857a..5dd4b483 100644 --- a/UKSFWebsite.Steam/Controllers/DiscordController.cs +++ b/UKSFWebsite.Steam/Controllers/DiscordController.cs @@ -45,7 +45,7 @@ public DiscordController(IConfirmationCodeService confirmationCodeService, IConf [HttpGet("success/application")] public async Task SuccessFromApplication([FromQuery] string code) => Redirect($"{urlReturn}/application?{await GetUrlParameters(code, $"{url}/discord/success/application")}"); - private async Task GetUrlParameters(string code, string url) { + private async Task GetUrlParameters(string code, string redirectUrl) { using (HttpClient client = new HttpClient()) { HttpResponseMessage response = await client.PostAsync( "https://discordapp.com/api/oauth2/token", @@ -55,7 +55,7 @@ private async Task GetUrlParameters(string code, string url) { {"client_secret", clientSecret}, {"grant_type", "authorization_code"}, {"code", code}, - {"redirect_uri", url}, + {"redirect_uri", redirectUrl}, {"scope", "identify guilds.join"} } ) From 04f8e7963aa720d11808efc8598b2448a396d191 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 9 Nov 2019 02:06:23 +0000 Subject: [PATCH 011/369] Upgrade to dotnet core 3.0. Rename steam to integrations --- UKSFWebsite.Api.Data/Class1.cs | 5 ++ .../UKSFWebsite.Api.Data.csproj | 8 +++ UKSFWebsite.Api.Models/ScheduledJob.cs | 2 +- .../UKSFWebsite.Api.Models.csproj | 3 +- .../Abstraction/IConfirmationCodeService.cs | 2 +- .../Abstraction/ISchedulerService.cs | 2 +- .../Data/ConfirmationCodeService.cs | 4 +- .../Data/SchedulerService.cs | 13 ++-- .../UKSFWebsite.Api.Services.csproj | 21 ++++-- .../Utility/MigrationUtility.cs | 5 +- .../Accounts/CommunicationsController.cs | 6 +- UKSFWebsite.Api/Program.cs | 60 ++++++++-------- .../Properties/launchSettings.json | 27 ++++++++ UKSFWebsite.Api/Startup.cs | 66 ++++++++---------- UKSFWebsite.Api/UKSFWebsite.Api.csproj | 27 ++++---- UKSFWebsite.Backend.sln | 16 ++++- .../Controllers/DiscordController.cs | 63 +++++++++-------- .../Controllers/SteamController.cs | 17 +++-- .../Global.cs | 2 +- UKSFWebsite.Integrations/Program.cs | 69 +++++++++++++++++++ .../Properties/launchSettings.json | 27 ++++++++ .../Startup.cs | 18 ++--- .../UKSFWebsite.Integrations.csproj | 11 +-- .../appsettings.json | 0 UKSFWebsite.Steam/Program.cs | 65 ----------------- 25 files changed, 314 insertions(+), 225 deletions(-) create mode 100644 UKSFWebsite.Api.Data/Class1.cs create mode 100644 UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj create mode 100644 UKSFWebsite.Api/Properties/launchSettings.json rename {UKSFWebsite.Steam => UKSFWebsite.Integrations}/Controllers/DiscordController.cs (54%) rename {UKSFWebsite.Steam => UKSFWebsite.Integrations}/Controllers/SteamController.cs (80%) rename {UKSFWebsite.Steam => UKSFWebsite.Integrations}/Global.cs (75%) create mode 100644 UKSFWebsite.Integrations/Program.cs create mode 100644 UKSFWebsite.Integrations/Properties/launchSettings.json rename {UKSFWebsite.Steam => UKSFWebsite.Integrations}/Startup.cs (80%) rename UKSFWebsite.Steam/UKSFWebsite.Steam.csproj => UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj (71%) rename {UKSFWebsite.Steam => UKSFWebsite.Integrations}/appsettings.json (100%) delete mode 100644 UKSFWebsite.Steam/Program.cs diff --git a/UKSFWebsite.Api.Data/Class1.cs b/UKSFWebsite.Api.Data/Class1.cs new file mode 100644 index 00000000..a90b0009 --- /dev/null +++ b/UKSFWebsite.Api.Data/Class1.cs @@ -0,0 +1,5 @@ +using System; + +namespace UKSFWebsite.Api.Data { + public class Class1 { } +} diff --git a/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj b/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj new file mode 100644 index 00000000..a2f7ec36 --- /dev/null +++ b/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj @@ -0,0 +1,8 @@ + + + + netcoreapp3.0 + enable + + + diff --git a/UKSFWebsite.Api.Models/ScheduledJob.cs b/UKSFWebsite.Api.Models/ScheduledJob.cs index e7828449..a69e01f9 100644 --- a/UKSFWebsite.Api.Models/ScheduledJob.cs +++ b/UKSFWebsite.Api.Models/ScheduledJob.cs @@ -7,7 +7,7 @@ public enum ScheduledJobType { NORMAL, TEAMSPEAK_SNAPSHOT, LOG_PRUNE, - STEAM, + INTEGRATION, DISCORD_VOTE_ANNOUNCEMENT } diff --git a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj b/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj index a9768ae9..60a83ddc 100644 --- a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj +++ b/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj @@ -1,8 +1,9 @@  - netcoreapp2.1 + netcoreapp3.0 UKSFWebsite.Api.Models UKSFWebsite.Api.Models + enable full diff --git a/UKSFWebsite.Api.Services/Abstraction/IConfirmationCodeService.cs b/UKSFWebsite.Api.Services/Abstraction/IConfirmationCodeService.cs index 36926910..231cea97 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IConfirmationCodeService.cs +++ b/UKSFWebsite.Api.Services/Abstraction/IConfirmationCodeService.cs @@ -3,7 +3,7 @@ namespace UKSFWebsite.Api.Services.Abstraction { public interface IConfirmationCodeService : IDataService { - Task CreateConfirmationCode(string value, bool steam = false); + Task CreateConfirmationCode(string value, bool integration = false); Task GetConfirmationCode(string id); } } diff --git a/UKSFWebsite.Api.Services/Abstraction/ISchedulerService.cs b/UKSFWebsite.Api.Services/Abstraction/ISchedulerService.cs index 825cc5e1..6c0cefd4 100644 --- a/UKSFWebsite.Api.Services/Abstraction/ISchedulerService.cs +++ b/UKSFWebsite.Api.Services/Abstraction/ISchedulerService.cs @@ -4,7 +4,7 @@ namespace UKSFWebsite.Api.Services.Abstraction { public interface ISchedulerService : IDataService { - void Load(bool steam = false); + void Load(bool integration = false); Task Create(DateTime next, TimeSpan interval, ScheduledJobType type, string action, params object[] actionParameters); Task Cancel(Func predicate); } diff --git a/UKSFWebsite.Api.Services/Data/ConfirmationCodeService.cs b/UKSFWebsite.Api.Services/Data/ConfirmationCodeService.cs index 2e58d234..f9fcfaf7 100644 --- a/UKSFWebsite.Api.Services/Data/ConfirmationCodeService.cs +++ b/UKSFWebsite.Api.Services/Data/ConfirmationCodeService.cs @@ -12,10 +12,10 @@ public class ConfirmationCodeService : DataService, IConfirmat public ConfirmationCodeService(IMongoDatabase database, ISchedulerService schedulerService) : base(database, "confirmationCodes") => this.schedulerService = schedulerService; - public async Task CreateConfirmationCode(string value, bool steam = false) { + public async Task CreateConfirmationCode(string value, bool integration = false) { ConfirmationCode code = new ConfirmationCode {value = value}; await Add(code); - await schedulerService.Create(DateTime.Now.AddMinutes(30), TimeSpan.Zero, steam ? ScheduledJobType.STEAM : ScheduledJobType.NORMAL, nameof(SchedulerActionHelper.DeleteExpiredConfirmationCode), code.id); + await schedulerService.Create(DateTime.Now.AddMinutes(30), TimeSpan.Zero, integration ? ScheduledJobType.INTEGRATION : ScheduledJobType.NORMAL, nameof(SchedulerActionHelper.DeleteExpiredConfirmationCode), code.id); return code.id; } diff --git a/UKSFWebsite.Api.Services/Data/SchedulerService.cs b/UKSFWebsite.Api.Services/Data/SchedulerService.cs index 8745b633..8446d4ca 100644 --- a/UKSFWebsite.Api.Services/Data/SchedulerService.cs +++ b/UKSFWebsite.Api.Services/Data/SchedulerService.cs @@ -4,6 +4,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using MongoDB.Driver; using Newtonsoft.Json; using UKSFWebsite.Api.Models; @@ -12,17 +13,17 @@ namespace UKSFWebsite.Api.Services.Data { public class SchedulerService : DataService, ISchedulerService { - private readonly IHostingEnvironment currentEnvironment; + private readonly IHostEnvironment currentEnvironment; private static readonly ConcurrentDictionary ACTIVE_TASKS = new ConcurrentDictionary(); - public SchedulerService(IMongoDatabase database, IHostingEnvironment currentEnvironment) : base(database, "scheduledJobs") => this.currentEnvironment = currentEnvironment; + public SchedulerService(IMongoDatabase database, IHostEnvironment currentEnvironment) : base(database, "scheduledJobs") => this.currentEnvironment = currentEnvironment; - public async void Load(bool steam = false) { - if (steam) { - Get(x => x.type == ScheduledJobType.STEAM).ForEach(Schedule); + public async void Load(bool integration = false) { + if (integration) { + Get(x => x.type == ScheduledJobType.INTEGRATION).ForEach(Schedule); } else { if (!currentEnvironment.IsDevelopment()) await AddUnique(); - Get(x => x.type != ScheduledJobType.STEAM).ForEach(Schedule); + Get(x => x.type != ScheduledJobType.INTEGRATION).ForEach(Schedule); } } diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index 213481c7..0baa3f7b 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -1,8 +1,9 @@  - netcoreapp2.1 + netcoreapp3.0 UKSFWebsite.Api.Services UKSFWebsite.Api.Services + enable full @@ -10,16 +11,22 @@ - - - - - - + + + + + + + + + + C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\3.0.0\ref\netcoreapp3.0\Microsoft.AspNetCore.Mvc.Core.dll + + \ No newline at end of file diff --git a/UKSFWebsite.Api.Services/Utility/MigrationUtility.cs b/UKSFWebsite.Api.Services/Utility/MigrationUtility.cs index 52286c58..ec0e5b14 100644 --- a/UKSFWebsite.Api.Services/Utility/MigrationUtility.cs +++ b/UKSFWebsite.Api.Services/Utility/MigrationUtility.cs @@ -7,6 +7,7 @@ using System.Linq; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Driver; @@ -21,9 +22,9 @@ namespace UKSFWebsite.Api.Services.Utility { public class MigrationUtility { private const string KEY = "MIGRATED"; private readonly IMongoDatabase database; - private readonly IHostingEnvironment currentEnvironment; + private readonly IHostEnvironment currentEnvironment; - public MigrationUtility(IMongoDatabase database, IHostingEnvironment currentEnvironment) { + public MigrationUtility(IMongoDatabase database, IHostEnvironment currentEnvironment) { this.database = database; this.currentEnvironment = currentEnvironment; } diff --git a/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs b/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs index 37337497..e04486d8 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs @@ -57,10 +57,10 @@ public async Task ReceiveCode([FromBody] JObject body) { return BadRequest(new {error = $"Code mode '{mode}' not recognized"}); } - private async Task SendTeamspeakCode(string teamspeakdbId) { - string code = await confirmationCodeService.CreateConfirmationCode(teamspeakdbId); + private async Task SendTeamspeakCode(string teamspeakDbId) { + string code = await confirmationCodeService.CreateConfirmationCode(teamspeakDbId); notificationsService.SendTeamspeakNotification( - new HashSet {teamspeakdbId}, + new HashSet {teamspeakDbId}, $"This Teamspeak ID was selected for connection to the website. Copy this code to your clipboard and return to the UKSF website application page to enter the code:\n{code}\nIf this request was not made by you, please contact an admin" ); return Ok(); diff --git a/UKSFWebsite.Api/Program.cs b/UKSFWebsite.Api/Program.cs index 18b1a077..caf15c20 100644 --- a/UKSFWebsite.Api/Program.cs +++ b/UKSFWebsite.Api/Program.cs @@ -1,6 +1,4 @@ -// ReSharper disable RedundantUsingDirective - -using System; +using System; using System.Diagnostics; using System.IO; using System.Linq; @@ -8,9 +6,10 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.WindowsServices; +using Microsoft.Extensions.Hosting; namespace UKSFWebsite.Api { - public class Program { + public static class Program { public static void Main(string[] args) { AppDomain.CurrentDomain.GetAssemblies() .ToList() @@ -20,46 +19,51 @@ public static void Main(string[] args) { .ToList() .ForEach(x => AppDomain.CurrentDomain.GetAssemblies().ToList().Add(AppDomain.CurrentDomain.Load(x))); -#if DEBUG - BuildWebHost(args).Run(); -#else - InitLogging(); - BuildWebHost(args).RunAsService(); -#endif + string? environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); + bool isDevelopment = environment == Environments.Development; + + if (isDevelopment) { + BuildDebugWebHost(args).Run(); + } else { + InitLogging(); + BuildProductionWebHost(args).RunAsService(); + } } -#if DEBUG - private static IWebHost BuildWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel().UseContentRoot(Directory.GetCurrentDirectory()).UseUrls("http://*:5000").UseIISIntegration().Build(); -#else - private static IWebHost BuildWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel( + private static IWebHost BuildDebugWebHost(string[] args) => WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel().UseContentRoot(Directory.GetCurrentDirectory()).UseUrls("http://*:5000").UseIISIntegration().Build(); + + private static IWebHost BuildProductionWebHost(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseStartup() + .UseKestrel( options => { options.Listen(IPAddress.Loopback, 5000); options.Listen(IPAddress.Loopback, 5001, listenOptions => { listenOptions.UseHttps("C:\\ProgramData\\win-acme\\httpsacme-v01.api.letsencrypt.org\\uk-sf.co.uk-all.pfx"); }); - }).UseContentRoot(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName)) - .UseIISIntegration().Build(); + } + ) + .UseContentRoot(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule?.FileName)) + .UseIISIntegration() + .Build(); private static void InitLogging() { - string appdata = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSFWebsiteApi"); - Directory.CreateDirectory(appdata); - string[] logFiles = new DirectoryInfo(appdata).EnumerateFiles("*.log").OrderByDescending(file => file.LastWriteTime).Select(file => file.Name).ToArray(); + string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSFWebsiteApi"); + Directory.CreateDirectory(appData); + string[] logFiles = new DirectoryInfo(appData).EnumerateFiles("*.log").OrderByDescending(file => file.LastWriteTime).Select(file => file.Name).ToArray(); if (logFiles.Length > 9) { - File.Delete(Path.Combine(appdata, logFiles.Last())); + File.Delete(Path.Combine(appData, logFiles.Last())); } - string logFile = Path.Combine(appdata, $"LOG__{DateTime.Now:yyyy-MM-dd__HH-mm}.log"); + string logFile = Path.Combine(appData, $"LOG__{DateTime.Now:yyyy-MM-dd__HH-mm}.log"); try { File.Create(logFile).Close(); } catch (Exception e) { Console.WriteLine($"Log file not created: {logFile}. {e.Message}"); } - FileStream filestream = new FileStream(logFile, FileMode.Create); - StreamWriter streamwriter = new StreamWriter(filestream) {AutoFlush = true}; - Console.SetOut(streamwriter); - Console.SetError(streamwriter); + FileStream fileStream = new FileStream(logFile, FileMode.Create); + StreamWriter streamWriter = new StreamWriter(fileStream) {AutoFlush = true}; + Console.SetOut(streamWriter); + Console.SetError(streamWriter); } -#endif } } diff --git a/UKSFWebsite.Api/Properties/launchSettings.json b/UKSFWebsite.Api/Properties/launchSettings.json new file mode 100644 index 00000000..f5160fb4 --- /dev/null +++ b/UKSFWebsite.Api/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:61505/", + "sslPort": 0 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "UKSFWebsite.Api": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:61508/" + } + } +} \ No newline at end of file diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 701dd69c..50baa170 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -5,15 +5,13 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc.Cors.Internal; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; using Microsoft.IdentityModel.Tokens; -using Swashbuckle.AspNetCore.Swagger; using UKSFWebsite.Api.Services; using UKSFWebsite.Api.Services.Abstraction; using UKSFWebsite.Api.Services.Data; @@ -29,9 +27,9 @@ namespace UKSFWebsite.Api { public class Startup { private readonly IConfiguration configuration; - private readonly IHostingEnvironment currentEnvironment; + private readonly IHostEnvironment currentEnvironment; - public Startup(IHostingEnvironment currentEnvironment, IConfiguration configuration) { + public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration) { this.configuration = configuration; this.currentEnvironment = currentEnvironment; IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); @@ -44,9 +42,11 @@ public Startup(IHostingEnvironment currentEnvironment, IConfiguration configurat public void ConfigureServices(IServiceCollection services) { services.RegisterServices(configuration, currentEnvironment); services.BuildServiceProvider(); - services.AddSwaggerGen(c => { c.SwaggerDoc("v1", new Info {Title = "UKSF API", Version = "v1"}); }); services.AddCors( - options => options.AddPolicy("CorsPolicy", builder => { builder.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader().AllowCredentials().WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://steam.uk-sf.co.uk"); }) + options => options.AddPolicy( + "CorsPolicy", + builder => { builder.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader().AllowCredentials().WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://integrations.uk-sf.co.uk"); } + ) ); services.AddSignalR(); services.AddAuthentication( @@ -87,38 +87,31 @@ public void ConfigureServices(IServiceCollection services) { ); ExceptionHandler.Instance = new ExceptionHandler(); - services.AddMvc( - options => { - options.Filters.Add(ExceptionHandler.Instance); - options.Filters.Add(new CorsAuthorizationFilterFactory("CorsPolicy")); - } - ); + services.AddMvc(options => { options.Filters.Add(ExceptionHandler.Instance); }); } // ReSharper disable once UnusedMember.Global - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) { + public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFactory loggerFactory) { + app.UseHsts(); + app.UseHttpsRedirection(); + app.UseStaticFiles(); + app.UseRouting(); app.UseCors("CorsPolicy"); app.UseCorsMiddleware(); app.UseAuthentication(); - app.UseSwagger(); - app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", "V1 Docs"); }); - app.UseStaticFiles(); - app.UseSignalR( - route => { - route.MapHub($"/hub/{AccountHub.END_POINT}"); - route.MapHub($"/hub/{AdminHub.END_POINT}"); - route.MapHub($"/hub/{CommandRequestsHub.END_POINT}"); - route.MapHub($"/hub/{CommentThreadHub.END_POINT}"); - route.MapHub($"/hub/{NotificationHub.END_POINT}"); - route.MapHub($"/hub/{TeamspeakClientsHub.END_POINT}"); - route.MapHub($"/hub/{UtilityHub.END_POINT}"); - route.MapHub($"/hub/{ServersHub.END_POINT}"); - route.MapHub($"/hub/{LauncherHub.END_POINT}"); + app.UseEndpoints( + endpoints => { + endpoints.MapHub($"/hub/{AccountHub.END_POINT}"); + endpoints.MapHub($"/hub/{AdminHub.END_POINT}"); + endpoints.MapHub($"/hub/{CommandRequestsHub.END_POINT}"); + endpoints.MapHub($"/hub/{CommentThreadHub.END_POINT}"); + endpoints.MapHub($"/hub/{NotificationHub.END_POINT}"); + endpoints.MapHub($"/hub/{TeamspeakClientsHub.END_POINT}"); + endpoints.MapHub($"/hub/{UtilityHub.END_POINT}"); + endpoints.MapHub($"/hub/{ServersHub.END_POINT}"); + endpoints.MapHub($"/hub/{LauncherHub.END_POINT}"); } ); - app.UseMvc(); - app.UseHsts(); - app.UseHttpsRedirection(); Global.ServiceProvider = app.ApplicationServices; ServiceWrapper.ServiceProvider = Global.ServiceProvider; @@ -149,16 +142,15 @@ private static void WarmDataServices() { .Where(x => !x.IsAbstract && !x.IsInterface && x.BaseType != null && x.BaseType.IsGenericType && x.BaseType.GetGenericTypeDefinition() == typeof(CachedDataService<>)) .Select(x => x.GetInterfaces().FirstOrDefault(y => !y.IsGenericType)) .ToList(); - foreach (Type type in servicesTypes) { - dynamic service = Global.ServiceProvider.GetService(type); - cacheService.AddService(service); - service.Get(); + foreach (object service in servicesTypes.Select(type => Global.ServiceProvider.GetService(type))) { + cacheService.AddService((dynamic) service); + ((dynamic) service).Get(); } } } public static class ServiceExtensions { - public static void RegisterServices(this IServiceCollection services, IConfiguration configuration, IHostingEnvironment currentEnvironment) { + public static void RegisterServices(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { // Instance Objects services.AddTransient(); services.AddTransient(); @@ -240,6 +232,6 @@ public Task Invoke(HttpContext httpContext) { } public static class CorsMiddlewareExtensions { - public static IApplicationBuilder UseCorsMiddleware(this IApplicationBuilder builder) => builder.UseMiddleware(); + public static void UseCorsMiddleware(this IApplicationBuilder builder) => builder.UseMiddleware(); } } diff --git a/UKSFWebsite.Api/UKSFWebsite.Api.csproj b/UKSFWebsite.Api/UKSFWebsite.Api.csproj index ffec9742..79f199af 100644 --- a/UKSFWebsite.Api/UKSFWebsite.Api.csproj +++ b/UKSFWebsite.Api/UKSFWebsite.Api.csproj @@ -1,10 +1,12 @@  - netcoreapp2.1 - any + netcoreapp3.0 + win7-x64 UKSFWebsite.Api Exe win7-x64 + default + enable 1701;1702;1705;1591 @@ -18,17 +20,18 @@ - - - - - - - - - + + + + + + + + + + + - diff --git a/UKSFWebsite.Backend.sln b/UKSFWebsite.Backend.sln index 62705560..01ec8fc1 100644 --- a/UKSFWebsite.Backend.sln +++ b/UKSFWebsite.Backend.sln @@ -14,7 +14,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UKSFWebsite.Api.Models", "U EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UKSFWebsite.Api.Services", "UKSFWebsite.Api.Services\UKSFWebsite.Api.Services.csproj", "{F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Steam", "UKSFWebsite.Steam\UKSFWebsite.Steam.csproj", "{69AADF01-164E-4AD7-9E67-2974B79D3856}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Integrations", "UKSFWebsite.Integrations\UKSFWebsite.Integrations.csproj", "{69AADF01-164E-4AD7-9E67-2974B79D3856}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Data", "UKSFWebsite.Api.Data\UKSFWebsite.Api.Data.csproj", "{AE15E44A-DB7B-432F-84BA-7A01E6C54010}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -74,6 +76,18 @@ Global {69AADF01-164E-4AD7-9E67-2974B79D3856}.Release|x64.Build.0 = Release|Any CPU {69AADF01-164E-4AD7-9E67-2974B79D3856}.Release|x86.ActiveCfg = Release|Any CPU {69AADF01-164E-4AD7-9E67-2974B79D3856}.Release|x86.Build.0 = Release|Any CPU + {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|x64.ActiveCfg = Debug|Any CPU + {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|x64.Build.0 = Debug|Any CPU + {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|x86.ActiveCfg = Debug|Any CPU + {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|x86.Build.0 = Debug|Any CPU + {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|Any CPU.Build.0 = Release|Any CPU + {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x64.ActiveCfg = Release|Any CPU + {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x64.Build.0 = Release|Any CPU + {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x86.ActiveCfg = Release|Any CPU + {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UKSFWebsite.Steam/Controllers/DiscordController.cs b/UKSFWebsite.Integrations/Controllers/DiscordController.cs similarity index 54% rename from UKSFWebsite.Steam/Controllers/DiscordController.cs rename to UKSFWebsite.Integrations/Controllers/DiscordController.cs index 5dd4b483..61373944 100644 --- a/UKSFWebsite.Steam/Controllers/DiscordController.cs +++ b/UKSFWebsite.Integrations/Controllers/DiscordController.cs @@ -4,32 +4,32 @@ using System.Text; using System.Threading.Tasks; using System.Web; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Services.Abstraction; using UKSFWebsite.Api.Services.Data; using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Steam.Controllers { +namespace UKSFWebsite.Integrations.Controllers { [Route("[controller]")] public class DiscordController : Controller { - private readonly string url; - private readonly string urlReturn; + private readonly string botToken; private readonly string clientId; private readonly string clientSecret; - private readonly string botToken; private readonly IConfirmationCodeService confirmationCodeService; + private readonly string url; + private readonly string urlReturn; - public DiscordController(IConfirmationCodeService confirmationCodeService, IConfiguration configuration, IHostingEnvironment currentEnvironment) { + public DiscordController(IConfirmationCodeService confirmationCodeService, IConfiguration configuration, IHostEnvironment currentEnvironment) { this.confirmationCodeService = confirmationCodeService; clientId = configuration.GetSection("Discord")["clientId"]; clientSecret = configuration.GetSection("Discord")["clientSecret"]; botToken = configuration.GetSection("Discord")["botToken"]; - url = currentEnvironment.IsDevelopment() ? "http://localhost:5100" : "https://steam.uk-sf.co.uk"; + url = currentEnvironment.IsDevelopment() ? "http://localhost:5100" : "https://integrations.uk-sf.co.uk"; urlReturn = currentEnvironment.IsDevelopment() ? "http://localhost:4200" : "https://uk-sf.co.uk"; } @@ -46,31 +46,30 @@ public DiscordController(IConfirmationCodeService confirmationCodeService, IConf public async Task SuccessFromApplication([FromQuery] string code) => Redirect($"{urlReturn}/application?{await GetUrlParameters(code, $"{url}/discord/success/application")}"); private async Task GetUrlParameters(string code, string redirectUrl) { - using (HttpClient client = new HttpClient()) { - HttpResponseMessage response = await client.PostAsync( - "https://discordapp.com/api/oauth2/token", - new FormUrlEncodedContent( - new Dictionary { - {"client_id", clientId}, - {"client_secret", clientSecret}, - {"grant_type", "authorization_code"}, - {"code", code}, - {"redirect_uri", redirectUrl}, - {"scope", "identify guilds.join"} - } - ) - ); - string result = await response.Content.ReadAsStringAsync(); - string token = JObject.Parse(result)["access_token"].ToString(); - client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token); - response = await client.GetAsync("https://discordapp.com/api/users/@me"); - string user = await response.Content.ReadAsStringAsync(); - string id = JObject.Parse(user)["id"].ToString(); - client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bot", botToken); - await client.PutAsync($"https://discordapp.com/api/guilds/{VariablesWrapper.VariablesService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json")); - string confirmationCode = await confirmationCodeService.CreateConfirmationCode(id, true); - return $"validation={confirmationCode}&discordid={id}"; - } + using HttpClient client = new HttpClient(); + HttpResponseMessage response = await client.PostAsync( + "https://discordapp.com/api/oauth2/token", + new FormUrlEncodedContent( + new Dictionary { + {"client_id", clientId}, + {"client_secret", clientSecret}, + {"grant_type", "authorization_code"}, + {"code", code}, + {"redirect_uri", redirectUrl}, + {"scope", "identify guilds.join"} + } + ) + ); + string result = await response.Content.ReadAsStringAsync(); + string token = JObject.Parse(result)["access_token"].ToString(); + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token); + response = await client.GetAsync("https://discordapp.com/api/users/@me"); + string user = await response.Content.ReadAsStringAsync(); + string id = JObject.Parse(user)["id"].ToString(); + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bot", botToken); + await client.PutAsync($"https://discordapp.com/api/guilds/{VariablesWrapper.VariablesService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json")); + string confirmationCode = await confirmationCodeService.CreateConfirmationCode(id, true); + return $"validation={confirmationCode}&discordid={id}"; } } } diff --git a/UKSFWebsite.Steam/Controllers/SteamController.cs b/UKSFWebsite.Integrations/Controllers/SteamController.cs similarity index 80% rename from UKSFWebsite.Steam/Controllers/SteamController.cs rename to UKSFWebsite.Integrations/Controllers/SteamController.cs index 12392434..a871b62c 100644 --- a/UKSFWebsite.Steam/Controllers/SteamController.cs +++ b/UKSFWebsite.Integrations/Controllers/SteamController.cs @@ -1,30 +1,29 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Hosting; using UKSFWebsite.Api.Services.Abstraction; -namespace UKSFWebsite.Steam.Controllers { +namespace UKSFWebsite.Integrations.Controllers { [Route("[controller]")] public class SteamController : Controller { + private readonly IConfirmationCodeService confirmationCodeService; private readonly string url; private readonly string urlReturn; - private readonly IConfirmationCodeService confirmationCodeService; - - public SteamController(IConfirmationCodeService confirmationCodeService, IHostingEnvironment currentEnvironment) { + public SteamController(IConfirmationCodeService confirmationCodeService, IHostEnvironment currentEnvironment) { this.confirmationCodeService = confirmationCodeService; - url = currentEnvironment.IsDevelopment() ? "http://localhost:5100" : "https://steam.uk-sf.co.uk"; + url = currentEnvironment.IsDevelopment() ? "http://localhost:5100" : "https://integrations.uk-sf.co.uk"; urlReturn = currentEnvironment.IsDevelopment() ? "http://localhost:4200" : "https://uk-sf.co.uk"; } [HttpGet] - public IActionResult Get() => Challenge(new AuthenticationProperties {RedirectUri = $"{url}/steam/success"}, "Steam"); + public IActionResult Get() => Challenge(new AuthenticationProperties {RedirectUri = $"{url}/integrations/success"}, "Steam"); [HttpGet("application")] - public IActionResult GetFromApplication() => Challenge(new AuthenticationProperties {RedirectUri = $"{url}/steam/success/application"}, "Steam"); + public IActionResult GetFromApplication() => Challenge(new AuthenticationProperties {RedirectUri = $"{url}/integrations/success/application"}, "Steam"); [HttpGet("success")] public async Task Success() => Redirect($"{urlReturn}/profile?{await GetUrlParameters()}"); @@ -34,7 +33,7 @@ public SteamController(IConfirmationCodeService confirmationCodeService, IHostin private async Task GetUrlParameters() { string[] idParts = HttpContext.User.Claims.First(claim => claim.Type == "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier").Value.Split('/'); - string id = idParts[idParts.Length - 1]; + string id = idParts[^1]; string code = await confirmationCodeService.CreateConfirmationCode(id, true); return $"validation={code}&steamid={id}"; } diff --git a/UKSFWebsite.Steam/Global.cs b/UKSFWebsite.Integrations/Global.cs similarity index 75% rename from UKSFWebsite.Steam/Global.cs rename to UKSFWebsite.Integrations/Global.cs index bcfd7d20..901c7499 100644 --- a/UKSFWebsite.Steam/Global.cs +++ b/UKSFWebsite.Integrations/Global.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Steam { +namespace UKSFWebsite.Integrations { public static class Global { public static IServiceProvider ServiceProvider; } diff --git a/UKSFWebsite.Integrations/Program.cs b/UKSFWebsite.Integrations/Program.cs new file mode 100644 index 00000000..31d83f38 --- /dev/null +++ b/UKSFWebsite.Integrations/Program.cs @@ -0,0 +1,69 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Net; +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting.WindowsServices; +using Microsoft.Extensions.Hosting; + +namespace UKSFWebsite.Integrations { + internal static class Program { + private static void Main(string[] args) { + AppDomain.CurrentDomain.GetAssemblies() + .ToList() + .SelectMany(x => x.GetReferencedAssemblies()) + .Distinct() + .Where(y => AppDomain.CurrentDomain.GetAssemblies().ToList().Any(a => a.FullName == y.FullName) == false) + .ToList() + .ForEach(x => AppDomain.CurrentDomain.GetAssemblies().ToList().Add(AppDomain.CurrentDomain.Load(x))); + + string? environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); + bool isDevelopment = environment == Environments.Development; + + if (isDevelopment) { + BuildDebugWebHost(args).Run(); + } else { + InitLogging(); + BuildProductionWebHost(args).RunAsService(); + } + } + + private static IWebHost BuildDebugWebHost(string[] args) => WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel().UseContentRoot(Directory.GetCurrentDirectory()).UseUrls("http://*:5100").UseIISIntegration().Build(); + + private static IWebHost BuildProductionWebHost(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseStartup() + .UseKestrel( + options => { + options.Listen(IPAddress.Loopback, 5100); + options.Listen(IPAddress.Loopback, 5101, listenOptions => { listenOptions.UseHttps("C:\\ProgramData\\win-acme\\httpsacme-v01.api.letsencrypt.org\\uk-sf.co.uk-all.pfx"); }); + } + ) + .UseContentRoot(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule?.FileName)) + .UseIISIntegration() + .Build(); + + private static void InitLogging() { + string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSFWebsiteIntegrations"); + Directory.CreateDirectory(appData); + string[] logFiles = new DirectoryInfo(appData).EnumerateFiles("*.log").OrderByDescending(file => file.LastWriteTime).Select(file => file.Name).ToArray(); + if (logFiles.Length > 9) { + File.Delete(Path.Combine(appData, logFiles.Last())); + } + + string logFile = Path.Combine(appData, $"LOG__{DateTime.Now:yyyy-MM-dd__HH-mm}.log"); + try { + File.Create(logFile).Close(); + } catch (Exception e) { + Console.WriteLine($"Log file not created: {logFile}. {e.Message}"); + } + + FileStream fileStream = new FileStream(logFile, FileMode.Create); + StreamWriter streamWriter = new StreamWriter(fileStream) {AutoFlush = true}; + Console.SetOut(streamWriter); + Console.SetError(streamWriter); + } + } +} diff --git a/UKSFWebsite.Integrations/Properties/launchSettings.json b/UKSFWebsite.Integrations/Properties/launchSettings.json new file mode 100644 index 00000000..4852ae47 --- /dev/null +++ b/UKSFWebsite.Integrations/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:61506/", + "sslPort": 0 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "UKSFWebsite.Integrations": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:61507/" + } + } +} \ No newline at end of file diff --git a/UKSFWebsite.Steam/Startup.cs b/UKSFWebsite.Integrations/Startup.cs similarity index 80% rename from UKSFWebsite.Steam/Startup.cs rename to UKSFWebsite.Integrations/Startup.cs index 0eeb9ca0..ebe4c7ff 100644 --- a/UKSFWebsite.Steam/Startup.cs +++ b/UKSFWebsite.Integrations/Startup.cs @@ -1,20 +1,19 @@ using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Swashbuckle.AspNetCore.Swagger; using UKSFWebsite.Api.Services.Abstraction; using UKSFWebsite.Api.Services.Data; using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Steam { +namespace UKSFWebsite.Integrations { public class Startup { private readonly IConfiguration configuration; - public Startup(IHostingEnvironment currentEnvironment, IConfiguration configuration) { + public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration) { this.configuration = configuration; IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); builder.Build(); @@ -24,21 +23,18 @@ public void ConfigureServices(IServiceCollection services) { services.RegisterServices(configuration); services.BuildServiceProvider(); - services.AddSwaggerGen(c => { c.SwaggerDoc("v1", new Info {Title = "Server", Version = "v1"}); }); services.AddCors(); services.AddAuthentication(options => { options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme; }).AddCookie().AddSteam(); services.AddMvc(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) { - app.UseCors(options => options.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod().AllowCredentials()); - app.UseAuthentication(); - app.UseSwagger(); - app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", "V1 Docs"); }); - app.UseMvc(); + public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFactory loggerFactory) { app.UseHsts(); app.UseHttpsRedirection(); + app.UseRouting(); + app.UseCors(options => options.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod().AllowCredentials()); + app.UseAuthentication(); Global.ServiceProvider = app.ApplicationServices; ServiceWrapper.ServiceProvider = Global.ServiceProvider; diff --git a/UKSFWebsite.Steam/UKSFWebsite.Steam.csproj b/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj similarity index 71% rename from UKSFWebsite.Steam/UKSFWebsite.Steam.csproj rename to UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj index ceea685f..c43e8b1d 100644 --- a/UKSFWebsite.Steam/UKSFWebsite.Steam.csproj +++ b/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj @@ -1,18 +1,19 @@  - netcoreapp2.1 + netcoreapp3.0 Exe win7-x64 + UKSFWebsite.Integrations + UKSFWebsite.Integrations + enable bin\Debug\ - + - - - + diff --git a/UKSFWebsite.Steam/appsettings.json b/UKSFWebsite.Integrations/appsettings.json similarity index 100% rename from UKSFWebsite.Steam/appsettings.json rename to UKSFWebsite.Integrations/appsettings.json diff --git a/UKSFWebsite.Steam/Program.cs b/UKSFWebsite.Steam/Program.cs deleted file mode 100644 index de8b92e2..00000000 --- a/UKSFWebsite.Steam/Program.cs +++ /dev/null @@ -1,65 +0,0 @@ -// ReSharper disable RedundantUsingDirective - -using System; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Net; -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Hosting.WindowsServices; - -namespace UKSFWebsite.Steam { - internal class Program { - private static void Main(string[] args) { - AppDomain.CurrentDomain.GetAssemblies() - .ToList() - .SelectMany(x => x.GetReferencedAssemblies()) - .Distinct() - .Where(y => AppDomain.CurrentDomain.GetAssemblies().ToList().Any(a => a.FullName == y.FullName) == false) - .ToList() - .ForEach(x => AppDomain.CurrentDomain.GetAssemblies().ToList().Add(AppDomain.CurrentDomain.Load(x))); - -#if DEBUG - BuildWebHost(args).Run(); -#else - InitLogging(); - BuildWebHost(args).RunAsService(); -#endif - } - -#if DEBUG - private static IWebHost BuildWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel().UseContentRoot(Directory.GetCurrentDirectory()).UseUrls("http://*:5100").UseIISIntegration().Build(); -#else - private static IWebHost BuildWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel( - options => { - options.Listen(IPAddress.Loopback, 5100); - options.Listen(IPAddress.Loopback, 5101, listenOptions => { listenOptions.UseHttps("C:\\ProgramData\\win-acme\\httpsacme-v01.api.letsencrypt.org\\uk-sf.co.uk-all.pfx"); }); - }).UseContentRoot(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName)) - .UseIISIntegration().Build(); - - private static void InitLogging() { - string appdata = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSFWebsiteSteam"); - Directory.CreateDirectory(appdata); - string[] logFiles = new DirectoryInfo(appdata).EnumerateFiles("*.log").OrderByDescending(file => file.LastWriteTime).Select(file => file.Name).ToArray(); - if (logFiles.Length > 9) { - File.Delete(Path.Combine(appdata, logFiles.Last())); - } - - string logFile = Path.Combine(appdata, $"LOG__{DateTime.Now:yyyy-MM-dd__HH-mm}.log"); - try { - File.Create(logFile).Close(); - } catch (Exception e) { - Console.WriteLine($"Log file not created: {logFile}. {e.Message}"); - } - - FileStream filestream = new FileStream(logFile, FileMode.Create); - StreamWriter streamwriter = new StreamWriter(filestream) {AutoFlush = true}; - Console.SetOut(streamwriter); - Console.SetError(streamwriter); - } -#endif - } -} From a5be612c971d5e3734f11b371fd52c8cd241a654 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 9 Nov 2019 12:06:56 +0000 Subject: [PATCH 012/369] Implement code suggestions --- .../CommandRequests/CommandRequest.cs | 2 +- .../Logging/BasicLogMessage.cs | 2 +- .../Requests/ApplicationStateUpdateRequest.cs | 5 - .../ChainOfCommandService.cs | 32 +++--- .../Data/GameServersService.cs | 43 ++++---- UKSFWebsite.Api.Services/DiscordService.cs | 8 +- UKSFWebsite.Api.Services/EmailService.cs | 19 ++-- .../Launcher/LauncherFileService.cs | 8 +- .../Missions/MissionDataResolver.cs | 98 ++++++++++--------- .../Missions/MissionEntityItemHelper.cs | 7 +- .../Missions/MissionUtilities.cs | 2 +- .../Procedures/ProcedureDefinitons.cs | 2 +- .../Teamspeak/TeamspeakGroupService.cs | 6 +- .../Utility/GameServerHelpers.cs | 8 +- .../Utility/MigrationUtility.cs | 2 +- UKSFWebsite.Api.Services/Utility/Utilities.cs | 2 +- .../Accounts/CommunicationsController.cs | 18 ++-- .../Accounts/ConfirmationCodeReceiver.cs | 8 +- .../Accounts/PasswordResetController.cs | 8 +- .../Controllers/ApplicationsController.cs | 7 +- .../Controllers/CommentThreadController.cs | 24 ++--- .../Controllers/DischargesController.cs | 2 +- UKSFWebsite.Api/Controllers/DocsController.cs | 5 +- .../Controllers/IssueController.cs | 19 ++-- UKSFWebsite.Api/Controllers/LoaController.cs | 17 +++- .../Controllers/RecruitmentController.cs | 66 +++++++------ .../Controllers/UnitsController.cs | 19 ++-- 27 files changed, 208 insertions(+), 231 deletions(-) delete mode 100644 UKSFWebsite.Api.Models/Requests/ApplicationStateUpdateRequest.cs diff --git a/UKSFWebsite.Api.Models/CommandRequests/CommandRequest.cs b/UKSFWebsite.Api.Models/CommandRequests/CommandRequest.cs index 32fc22b3..4b87ecdc 100644 --- a/UKSFWebsite.Api.Models/CommandRequests/CommandRequest.cs +++ b/UKSFWebsite.Api.Models/CommandRequests/CommandRequest.cs @@ -11,7 +11,7 @@ public enum ReviewState { ERROR } - public class CommandRequestType { + public static class CommandRequestType { public const string AUXILIARY_TRANSFER = "Axuiliary Transfer"; public const string DEMOTION = "Demotion"; public const string DISCHARGE = "Discharge"; diff --git a/UKSFWebsite.Api.Models/Logging/BasicLogMessage.cs b/UKSFWebsite.Api.Models/Logging/BasicLogMessage.cs index b258b51c..22fa69f8 100644 --- a/UKSFWebsite.Api.Models/Logging/BasicLogMessage.cs +++ b/UKSFWebsite.Api.Models/Logging/BasicLogMessage.cs @@ -30,7 +30,7 @@ public BasicLogMessage(Exception logException) : this() { level = LogLevel.ERROR; } - public BasicLogMessage(DateTime time) { + private BasicLogMessage(DateTime time) { timestamp = time; id = ObjectId.GenerateNewId(time).ToString(); } diff --git a/UKSFWebsite.Api.Models/Requests/ApplicationStateUpdateRequest.cs b/UKSFWebsite.Api.Models/Requests/ApplicationStateUpdateRequest.cs deleted file mode 100644 index c4ef4ec4..00000000 --- a/UKSFWebsite.Api.Models/Requests/ApplicationStateUpdateRequest.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace UKSFWebsite.Api.Models.Requests { - public class ApplicationStateUpdateRequest { - public string updatedState; - } -} diff --git a/UKSFWebsite.Api.Services/ChainOfCommandService.cs b/UKSFWebsite.Api.Services/ChainOfCommandService.cs index 7265c1ed..c2f8d103 100644 --- a/UKSFWebsite.Api.Services/ChainOfCommandService.cs +++ b/UKSFWebsite.Api.Services/ChainOfCommandService.cs @@ -38,10 +38,8 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U // If no chain, get root unit child commanders if (chain.Count == 0) { - foreach (Unit unit in unitsService.Get(x => x.parent == unitsService.GetRoot().id)) { - if (UnitHasCommander(unit) && GetCommander(unit) != recipient) { - chain.Add(GetCommander(unit)); - } + foreach (Unit unit in unitsService.Get(x => x.parent == unitsService.GetRoot().id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) { + chain.Add(GetCommander(unit)); } } @@ -61,17 +59,17 @@ public bool InContextChainOfCommand(string id) { } private IEnumerable ResolveMode(ChainOfCommandMode mode, Unit start, Unit target) { - switch (mode) { - case ChainOfCommandMode.FULL: return Full(start); - case ChainOfCommandMode.NEXT_COMMANDER: return GetNextCommander(start); - case ChainOfCommandMode.NEXT_COMMANDER_EXCLUDE_SELF: return GetNextCommanderExcludeSelf(start); - case ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE: return CommanderAndOneAbove(start); - case ChainOfCommandMode.COMMANDER_AND_SR10: return GetCommanderAndSr10(start); - case ChainOfCommandMode.COMMANDER_AND_TARGET_COMMANDER: return GetCommanderAndTargetCommander(start, target); - case ChainOfCommandMode.SR10: return GetSr10(); - case ChainOfCommandMode.TARGET_COMMANDER: return GetNextCommander(target); - default: throw new InvalidOperationException("Chain of command mode not recognized"); - } + return mode switch { + ChainOfCommandMode.FULL => Full(start), + ChainOfCommandMode.NEXT_COMMANDER => GetNextCommander(start), + ChainOfCommandMode.NEXT_COMMANDER_EXCLUDE_SELF => GetNextCommanderExcludeSelf(start), + ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE => CommanderAndOneAbove(start), + ChainOfCommandMode.COMMANDER_AND_SR10 => GetCommanderAndSr10(start), + ChainOfCommandMode.COMMANDER_AND_TARGET_COMMANDER => GetCommanderAndTargetCommander(start, target), + ChainOfCommandMode.SR10 => GetSr10(), + ChainOfCommandMode.TARGET_COMMANDER => GetNextCommander(target), + _ => throw new InvalidOperationException("Chain of command mode not recognized") + }; } private IEnumerable Full(Unit unit) { @@ -87,9 +85,9 @@ private IEnumerable Full(Unit unit) { return chain; } - private HashSet GetNextCommander(Unit unit) => new HashSet {GetNextUnitCommander(unit)}; + private IEnumerable GetNextCommander(Unit unit) => new HashSet {GetNextUnitCommander(unit)}; - private HashSet GetNextCommanderExcludeSelf(Unit unit) => new HashSet {GetNextUnitCommanderExcludeSelf(unit)}; + private IEnumerable GetNextCommanderExcludeSelf(Unit unit) => new HashSet {GetNextUnitCommanderExcludeSelf(unit)}; private IEnumerable CommanderAndOneAbove(Unit unit) { HashSet chain = new HashSet(); diff --git a/UKSFWebsite.Api.Services/Data/GameServersService.cs b/UKSFWebsite.Api.Services/Data/GameServersService.cs index d0307b25..81f2d728 100644 --- a/UKSFWebsite.Api.Services/Data/GameServersService.cs +++ b/UKSFWebsite.Api.Services/Data/GameServersService.cs @@ -49,23 +49,22 @@ public async Task GetGameServerStatus(GameServer gameServer) { } } - using (HttpClient client = new HttpClient()) { - client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - try { - HttpResponseMessage response = await client.GetAsync($"http://localhost:{gameServer.apiPort}/server"); - if (!response.IsSuccessStatusCode) { - gameServer.status.running = false; - } - - string content = await response.Content.ReadAsStringAsync(); - gameServer.status = JsonConvert.DeserializeObject(content); - gameServer.status.parsedUptime = TimeSpan.FromSeconds(gameServer.status.uptime).StripMilliseconds().ToString(); - gameServer.status.maxPlayers = gameServer.GetMaxPlayerCountFromConfig(); - gameServer.status.running = true; - gameServer.status.started = false; - } catch (Exception) { + using HttpClient client = new HttpClient(); + client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + try { + HttpResponseMessage response = await client.GetAsync($"http://localhost:{gameServer.apiPort}/server"); + if (!response.IsSuccessStatusCode) { gameServer.status.running = false; } + + string content = await response.Content.ReadAsStringAsync(); + gameServer.status = JsonConvert.DeserializeObject(content); + gameServer.status.parsedUptime = TimeSpan.FromSeconds(gameServer.status.uptime).StripMilliseconds().ToString(); + gameServer.status.maxPlayers = gameServer.GetMaxPlayerCountFromConfig(); + gameServer.status.running = true; + gameServer.status.started = false; + } catch (Exception) { + gameServer.status.running = false; } } @@ -120,10 +119,9 @@ public async Task LaunchGameServer(GameServer gameServer) { public async Task StopGameServer(GameServer gameServer) { try { - using (HttpClient client = new HttpClient()) { - client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - await client.GetAsync($"http://localhost:{gameServer.apiPort}/server/stop"); - } + using HttpClient client = new HttpClient(); + client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + await client.GetAsync($"http://localhost:{gameServer.apiPort}/server/stop"); } catch (Exception) { // ignored } @@ -131,10 +129,9 @@ public async Task StopGameServer(GameServer gameServer) { if (gameServer.numberHeadlessClients > 0) { for (int index = 0; index < gameServer.numberHeadlessClients; index++) { try { - using (HttpClient client = new HttpClient()) { - client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - await client.GetAsync($"http://localhost:{gameServer.apiPort + index + 1}/server/stop"); - } + using HttpClient client = new HttpClient(); + client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + await client.GetAsync($"http://localhost:{gameServer.apiPort + index + 1}/server/stop"); } catch (Exception) { // ignored } diff --git a/UKSFWebsite.Api.Services/DiscordService.cs b/UKSFWebsite.Api.Services/DiscordService.cs index 35812638..97b9d381 100644 --- a/UKSFWebsite.Api.Services/DiscordService.cs +++ b/UKSFWebsite.Api.Services/DiscordService.cs @@ -115,11 +115,9 @@ private async Task UpdateAccountRoles(SocketGuildUser user, Account account) { } } - foreach (string role in allowedRoles) { - if (userRoles.All(x => x.Id.ToString() != role)) { - if (ulong.TryParse(role, out ulong roleId)) { - await user.AddRoleAsync(roles.First(x => x.Id == roleId)); - } + foreach (string role in allowedRoles.Where(role => userRoles.All(x => x.Id.ToString() != role))) { + if (ulong.TryParse(role, out ulong roleId)) { + await user.AddRoleAsync(roles.First(x => x.Id == roleId)); } } } diff --git a/UKSFWebsite.Api.Services/EmailService.cs b/UKSFWebsite.Api.Services/EmailService.cs index 492ebef1..74f20f78 100644 --- a/UKSFWebsite.Api.Services/EmailService.cs +++ b/UKSFWebsite.Api.Services/EmailService.cs @@ -15,19 +15,14 @@ public EmailService(IConfiguration configuration) { public void SendEmail(string targetEmail, string subject, string htmlEmail) { if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password)) return; - using (MailMessage mail = new MailMessage()) { - mail.From = new MailAddress(username, "UKSF"); - mail.To.Add(targetEmail); - mail.Subject = subject; - mail.Body = htmlEmail; - mail.IsBodyHtml = true; + using MailMessage mail = new MailMessage {From = new MailAddress(username, "UKSF")}; + mail.To.Add(targetEmail); + mail.Subject = subject; + mail.Body = htmlEmail; + mail.IsBodyHtml = true; - using (SmtpClient smtp = new SmtpClient("smtp.gmail.com", 587)) { - smtp.Credentials = new NetworkCredential(username, password); - smtp.EnableSsl = true; - smtp.Send(mail); - } - } + using SmtpClient smtp = new SmtpClient("smtp.gmail.com", 587) {Credentials = new NetworkCredential(username, password), EnableSsl = true}; + smtp.Send(mail); } } } diff --git a/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs b/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs index f8fe811e..95d93020 100644 --- a/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs +++ b/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs @@ -34,10 +34,8 @@ public async Task UpdateAllVersions() { } } - foreach (LauncherFile storedVersion in storedVersions) { - if (fileNames.All(x => x != storedVersion.fileName)) { - await Delete(storedVersion.id); - } + foreach (LauncherFile storedVersion in storedVersions.Where(storedVersion => fileNames.All(x => x != storedVersion.fileName))) { + await Delete(storedVersion.id); } } @@ -79,7 +77,7 @@ public async Task GetUpdatedFiles(IEnumerable files) { string updateZipPath = Path.Combine(VariablesWrapper.VariablesService().GetSingle("LAUNCHER_LOCATION").AsString(), $"{updateFolderName}.zip"); ZipFile.CreateFromDirectory(updateFolder, updateZipPath); MemoryStream stream = new MemoryStream(); - using (FileStream fileStream = new FileStream(updateZipPath, FileMode.Open, FileAccess.Read, FileShare.None)) { + await using (FileStream fileStream = new FileStream(updateZipPath, FileMode.Open, FileAccess.Read, FileShare.None)) { await fileStream.CopyToAsync(stream); } File.Delete(updateZipPath); diff --git a/UKSFWebsite.Api.Services/Missions/MissionDataResolver.cs b/UKSFWebsite.Api.Services/Missions/MissionDataResolver.cs index 57a5dca4..e8fed9dc 100644 --- a/UKSFWebsite.Api.Services/Missions/MissionDataResolver.cs +++ b/UKSFWebsite.Api.Services/Missions/MissionDataResolver.cs @@ -17,33 +17,33 @@ public class MissionDataResolver { public static string ResolveObjectClass(MissionPlayer player) { if (player.account?.id == "5b4b568c20e1fd00013752d1") return "UKSF_B_Medic"; // Smith, SAS Medic - switch (player.unit.sourceUnit.id) { - case "5a435eea905d47336442c75a": // "Joint Special Forces Aviation Wing" - case "5a848590eab14d12cc7fa618": // "RAF Cranwell" - case "5c98d7b396dba31f24cdb19c": // "51 Squadron" - return "UKSF_B_Pilot"; - case "5a441619730e9d162834500b": // "7 Squadron" - return "UKSF_B_Pilot_7"; - case "5a441602730e9d162834500a": // "656 Squadron" - return "UKSF_B_Pilot_656"; - case "5a4415d8730e9d1628345007": // "617 Squadron" - return "UKSF_B_Pilot_617"; - case "5a68b28e196530164c9b4fed": // "Sniper Platoon" - return "UKSF_B_Sniper"; - case "5a68c047196530164c9b4fee": // "The Pathfinder Platoon" - return "UKSF_B_Pathfinder"; - case "5bbbb8875eb3a4170c488b24": // "Air Troop" - return "UKSF_B_SAS"; - case "5ba8983ee12a331f94cb02d4": // "SAS" - return "UKSF_B_Officer"; - case "5b9123ca7a6c1f0e9875601c": // "3 Medical Regiment" - return "UKSF_B_Medic"; - case "5a42835b55d6109bf0b081bd": // "UKSF" - return ResolvePlayerUnitRole(player) == 3 ? "UKSF_B_Officer" : "UKSF_B_Rifleman"; - - default: - return ResolvePlayerUnitRole(player) != -1 ? "UKSF_B_SectionLeader" : "UKSF_B_Rifleman"; - } + return player.unit.sourceUnit.id switch { + "5a435eea905d47336442c75a" => // "Joint Special Forces Aviation Wing" + "UKSF_B_Pilot", + "5a848590eab14d12cc7fa618" => // "RAF Cranwell" + "UKSF_B_Pilot", + "5c98d7b396dba31f24cdb19c" => // "51 Squadron" + "UKSF_B_Pilot", + "5a441619730e9d162834500b" => // "7 Squadron" + "UKSF_B_Pilot_7", + "5a441602730e9d162834500a" => // "656 Squadron" + "UKSF_B_Pilot_656", + "5a4415d8730e9d1628345007" => // "617 Squadron" + "UKSF_B_Pilot_617", + "5a68b28e196530164c9b4fed" => // "Sniper Platoon" + "UKSF_B_Sniper", + "5a68c047196530164c9b4fee" => // "The Pathfinder Platoon" + "UKSF_B_Pathfinder", + "5bbbb8875eb3a4170c488b24" => // "Air Troop" + "UKSF_B_SAS", + "5ba8983ee12a331f94cb02d4" => // "SAS" + "UKSF_B_Officer", + "5b9123ca7a6c1f0e9875601c" => // "3 Medical Regiment" + "UKSF_B_Medic", + "5a42835b55d6109bf0b081bd" => // "UKSF" + (ResolvePlayerUnitRole(player) == 3 ? "UKSF_B_Officer" : "UKSF_B_Rifleman"), + _ => (ResolvePlayerUnitRole(player) != -1 ? "UKSF_B_SectionLeader" : "UKSF_B_Rifleman") + }; } private static int ResolvePlayerUnitRole(MissionPlayer player) { @@ -57,16 +57,21 @@ private static int ResolvePlayerUnitRole(MissionPlayer player) { public static bool IsEngineer(MissionPlayer player) => ENGINEER_IDS.Contains(player.account?.id); public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) { - switch (unit.sourceUnit.id) { - case "5a435eea905d47336442c75a": // "Joint Special Forces Aviation Wing" - case "5a441619730e9d162834500b": // "7 Squadron" - case "5a441602730e9d162834500a": // "656 Squadron" - case "5a4415d8730e9d1628345007": // "617 Squadron" - case "5a848590eab14d12cc7fa618": // "RAF Cranwell" - case "5c98d7b396dba31f24cdb19c": // "51 Squadron" - return "JSFAW"; - default: return defaultCallsign; - } + return unit.sourceUnit.id switch { + "5a435eea905d47336442c75a" => // "Joint Special Forces Aviation Wing" + "JSFAW", + "5a441619730e9d162834500b" => // "7 Squadron" + "JSFAW", + "5a441602730e9d162834500a" => // "656 Squadron" + "JSFAW", + "5a4415d8730e9d1628345007" => // "617 Squadron" + "JSFAW", + "5a848590eab14d12cc7fa618" => // "RAF Cranwell" + "JSFAW", + "5c98d7b396dba31f24cdb19c" => // "51 Squadron" + "JSFAW", + _ => defaultCallsign + }; } public static void ResolveSpecialUnits(ref List orderedUnits) { @@ -154,14 +159,17 @@ public static List ResolveUnitSlots(MissionUnit unit) { } public static bool IsUnitPermanent(MissionUnit unit) { - switch (unit.sourceUnit.id) { - case "5bbbb9645eb3a4170c488b36": // "Guardian 1-1" - case "5bbbbdab5eb3a4170c488f2e": // "Guardian 1-2" - case "5bbbbe365eb3a4170c488f30": // "Guardian 1-3" - case "5ad748e0de5d414f4c4055e0": // "Guardian 1-R" - return true; - default: return false; - } + return unit.sourceUnit.id switch { + "5bbbb9645eb3a4170c488b36" => // "Guardian 1-1" + true, + "5bbbbdab5eb3a4170c488f2e" => // "Guardian 1-2" + true, + "5bbbbe365eb3a4170c488f30" => // "Guardian 1-3" + true, + "5ad748e0de5d414f4c4055e0" => // "Guardian 1-R" + true, + _ => false + }; } } } diff --git a/UKSFWebsite.Api.Services/Missions/MissionEntityItemHelper.cs b/UKSFWebsite.Api.Services/Missions/MissionEntityItemHelper.cs index 844f7c5a..9da76dd5 100644 --- a/UKSFWebsite.Api.Services/Missions/MissionEntityItemHelper.cs +++ b/UKSFWebsite.Api.Services/Missions/MissionEntityItemHelper.cs @@ -97,7 +97,6 @@ public static void Patch(this MissionEntityItem missionEntityItem, int index) { } public static IEnumerable Serialize(this MissionEntityItem missionEntityItem) { - List serialized = new List(); if (missionEntityItem.rawMissionEntities.Count > 0) { int start = MissionUtilities.GetIndexByKey(missionEntityItem.rawMissionEntityItem, "Entities"); int count = missionEntityItem.rawMissionEntities.Count; @@ -105,11 +104,7 @@ public static IEnumerable Serialize(this MissionEntityItem missionEntity missionEntityItem.rawMissionEntityItem.InsertRange(start, missionEntityItem.missionEntity.Serialize()); } - foreach (string s in missionEntityItem.rawMissionEntityItem) { - serialized.Add(s); - } - - return serialized; + return missionEntityItem.rawMissionEntityItem.ToList(); } private static void AddEngineerTrait(this ICollection entity) { diff --git a/UKSFWebsite.Api.Services/Missions/MissionUtilities.cs b/UKSFWebsite.Api.Services/Missions/MissionUtilities.cs index f37f6764..3427917f 100644 --- a/UKSFWebsite.Api.Services/Missions/MissionUtilities.cs +++ b/UKSFWebsite.Api.Services/Missions/MissionUtilities.cs @@ -2,7 +2,7 @@ using System.Linq; namespace UKSFWebsite.Api.Services.Missions { - public class MissionUtilities { + public static class MissionUtilities { public static List ReadDataFromIndex(List source, ref int index) { List data = new List {source[index]}; index += 1; diff --git a/UKSFWebsite.Api.Services/Teamspeak/Procedures/ProcedureDefinitons.cs b/UKSFWebsite.Api.Services/Teamspeak/Procedures/ProcedureDefinitons.cs index ee26b61f..871f246d 100644 --- a/UKSFWebsite.Api.Services/Teamspeak/Procedures/ProcedureDefinitons.cs +++ b/UKSFWebsite.Api.Services/Teamspeak/Procedures/ProcedureDefinitons.cs @@ -1,5 +1,5 @@ namespace UKSFWebsite.Api.Services.Teamspeak.Procedures { - public class ProcedureDefinitons { + public static class ProcedureDefinitons { public const string PROC_ASSIGN_SERVER_GROUP = "ProcAssignServerGroup"; public const string PROC_PING = "ProcPing"; public const string PROC_SEND_MESSAGE_TO_CLIENT = "ProcSendMessageToClient"; diff --git a/UKSFWebsite.Api.Services/Teamspeak/TeamspeakGroupService.cs b/UKSFWebsite.Api.Services/Teamspeak/TeamspeakGroupService.cs index dc002a3d..af0b5b8c 100644 --- a/UKSFWebsite.Api.Services/Teamspeak/TeamspeakGroupService.cs +++ b/UKSFWebsite.Api.Services/Teamspeak/TeamspeakGroupService.cs @@ -40,10 +40,8 @@ public void UpdateAccountGroups(Account account, ICollection serverGroup } } - foreach (string serverGroup in allowedGroups) { - if (!serverGroups.Contains(serverGroup)) { - AddServerGroup(clientDbId, serverGroup); - } + foreach (string serverGroup in allowedGroups.Where(serverGroup => !serverGroups.Contains(serverGroup))) { + AddServerGroup(clientDbId, serverGroup); } } diff --git a/UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs b/UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs index cf049dbc..6f0f0fc2 100644 --- a/UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs +++ b/UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs @@ -57,13 +57,13 @@ public static class GameServerHelpers { public static string GetGameServerConfigPath(this GameServer gameServer) => Path.Combine(VariablesWrapper.VariablesService().GetSingle("SERVERS_PATH").AsString(), "configs", $"{gameServer.profileName}.cfg"); - public static string GetGameServerProfilesPath() => VariablesWrapper.VariablesService().GetSingle("SERVER_PROFILES").AsString(); + private static string GetGameServerProfilesPath() => VariablesWrapper.VariablesService().GetSingle("SERVER_PROFILES").AsString(); - public static string GetGameServerPerfConfigPath() => VariablesWrapper.VariablesService().GetSingle("SERVER_PERF_CONFIG").AsString(); + private static string GetGameServerPerfConfigPath() => VariablesWrapper.VariablesService().GetSingle("SERVER_PERF_CONFIG").AsString(); - public static string GetHeadlessClientName(int index) => VariablesWrapper.VariablesService().GetSingle("HEADLESS_CLIENT_NAMES").AsArray()[index]; + private static string GetHeadlessClientName(int index) => VariablesWrapper.VariablesService().GetSingle("HEADLESS_CLIENT_NAMES").AsArray()[index]; - public static string FormatGameServerMods(this GameServer gameServer) => $"{string.Join(";", gameServer.mods.Select(x => x.pathRelativeToServerExecutable ?? x.path))};"; + private static string FormatGameServerMods(this GameServer gameServer) => $"{string.Join(";", gameServer.mods.Select(x => x.pathRelativeToServerExecutable ?? x.path))};"; public static IEnumerable GetGameServerModsPaths() => VariablesWrapper.VariablesService().GetSingle("MODS_PATHS").AsArray(x => x.RemoveQuotes()); diff --git a/UKSFWebsite.Api.Services/Utility/MigrationUtility.cs b/UKSFWebsite.Api.Services/Utility/MigrationUtility.cs index ec0e5b14..0348f1bf 100644 --- a/UKSFWebsite.Api.Services/Utility/MigrationUtility.cs +++ b/UKSFWebsite.Api.Services/Utility/MigrationUtility.cs @@ -50,7 +50,7 @@ public void Migrate() { } // TODO: CHECK BEFORE RELEASE - private void ExecuteMigration() { + private static void ExecuteMigration() { IUnitsService unitsService = ServiceWrapper.ServiceProvider.GetService(); IRolesService rolesService = ServiceWrapper.ServiceProvider.GetService(); List roles = rolesService.Get(x => x.roleType == RoleType.UNIT); diff --git a/UKSFWebsite.Api.Services/Utility/Utilities.cs b/UKSFWebsite.Api.Services/Utility/Utilities.cs index bc157309..c8f393bf 100644 --- a/UKSFWebsite.Api.Services/Utility/Utilities.cs +++ b/UKSFWebsite.Api.Services/Utility/Utilities.cs @@ -6,7 +6,7 @@ namespace UKSFWebsite.Api.Services.Utility { public static class Utilities { - public static dynamic ToDynamic(this T obj) { + private static dynamic ToDynamic(this T obj) { IDictionary expando = new ExpandoObject(); foreach (PropertyInfo propertyInfo in typeof(T).GetProperties()) { diff --git a/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs b/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs index e04486d8..51bc4142 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs @@ -37,11 +37,10 @@ INotificationsService notificationsService [HttpPost("send"), Authorize] public async Task SendCode([FromBody] JObject body) { string mode = body["mode"].ToString(); - switch (mode) { - case "teamspeak": return await SendTeamspeakCode(body["data"].ToString()); - } - - return BadRequest(new {error = $"Code mode '{mode}' not recognized"}); + return mode switch { + "teamspeak" => await SendTeamspeakCode(body["data"].ToString()), + _ => BadRequest(new {error = $"Code mode '{mode}' not recognized"}) + }; } [HttpPost("receive"), Authorize] @@ -50,11 +49,10 @@ public async Task ReceiveCode([FromBody] JObject body) { string id = body["id"].ToString(); string code = body["code"].ToString(); string[] data = body["data"].ToString().Split(','); - switch (mode) { - case "teamspeak": return await ReceiveTeamspeakCode(id, code, data[0]); - } - - return BadRequest(new {error = $"Code mode '{mode}' not recognized"}); + return mode switch { + "teamspeak" => await ReceiveTeamspeakCode(id, code, data[0]), + _ => BadRequest(new {error = $"Code mode '{mode}' not recognized"}) + }; } private async Task SendTeamspeakCode(string teamspeakDbId) { diff --git a/UKSFWebsite.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs b/UKSFWebsite.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs index 0cd9dc56..ced961c6 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs @@ -11,7 +11,7 @@ public abstract class ConfirmationCodeReceiver : Controller { protected readonly IConfirmationCodeService ConfirmationCodeService; internal readonly ILoginService LoginService; protected readonly IAccountService AccountService; - protected string Logintoken; + protected string LoginToken; protected ConfirmationCodeReceiver(IConfirmationCodeService confirmationCodeService, ILoginService loginService, IAccountService accountService) { LoginService = loginService; @@ -25,13 +25,13 @@ protected async Task AttemptLoginValidatedAction(JObject loginFor try { string validateCode = loginForm["code"].ToString(); if (codeType == "passwordreset") { - Logintoken = LoginService.LoginWithoutPassword(loginForm["email"].ToString()); + LoginToken = LoginService.LoginWithoutPassword(loginForm["email"].ToString()); Account account = AccountService.GetSingle(x => string.Equals(x.email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); - if (await ConfirmationCodeService.GetConfirmationCode(validateCode) == account.id && Logintoken != null) { + if (await ConfirmationCodeService.GetConfirmationCode(validateCode) == account.id && LoginToken != null) { return await ApplyValidatedPayload(loginForm["password"].ToString(), account); } } else { - Logintoken = LoginService.Login(loginForm["email"].ToString(), loginForm["password"].ToString()); + LoginToken = LoginService.Login(loginForm["email"].ToString(), loginForm["password"].ToString()); Account account = AccountService.GetSingle(x => string.Equals(x.email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); string codeValue = await ConfirmationCodeService.GetConfirmationCode(validateCode); if (!string.IsNullOrWhiteSpace(codeValue)) { diff --git a/UKSFWebsite.Api/Controllers/Accounts/PasswordResetController.cs b/UKSFWebsite.Api/Controllers/Accounts/PasswordResetController.cs index 2bd34943..e7aa0f00 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/PasswordResetController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/PasswordResetController.cs @@ -31,13 +31,11 @@ public async Task ResetPassword([FromBody] JObject body) { } string code = await ConfirmationCodeService.CreateConfirmationCode(account.id); - string url = - $"https://uk-sf.co.uk/login?validatecode={code}&validatetype={WebUtility.UrlEncode("password reset")}&validateurl={WebUtility.UrlEncode("passwordreset")}"; - string html = $"

UKSF Password Reset


Please reset your password by clicking here." + - "

If this request was not made by you seek assistance from UKSF staff.

"; + string url = $"https://uk-sf.co.uk/login?validatecode={code}&validatetype={WebUtility.UrlEncode("password reset")}&validateurl={WebUtility.UrlEncode("passwordreset")}"; + string html = $"

UKSF Password Reset


Please reset your password by clicking here." + "

If this request was not made by you seek assistance from UKSF staff.

"; emailService.SendEmail(account.email, "UKSF Password Reset", html); LogWrapper.AuditLog(account.id, $"Password reset request made for {account.id}"); - return Ok(Logintoken); + return Ok(LoginToken); } } } diff --git a/UKSFWebsite.Api/Controllers/ApplicationsController.cs b/UKSFWebsite.Api/Controllers/ApplicationsController.cs index d9a42822..9db8e523 100644 --- a/UKSFWebsite.Api/Controllers/ApplicationsController.cs +++ b/UKSFWebsite.Api/Controllers/ApplicationsController.cs @@ -56,12 +56,9 @@ public async Task Post([FromBody] JObject body) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, "", "Applicant", "Candidate", reason: "you were entered into the recruitment process"); notificationsService.Add(notification); notificationsService.Add(new Notification {owner = application.recruiter, icon = NotificationIcons.APPLICATION, message = $"You have been assigned {account.firstname} {account.lastname}'s application", link = $"/recruitment/{account.id}"}); - foreach ((_, string sr1Id) in recruitmentService.GetSr1Leads()) { - if (account.application.recruiter == sr1Id) continue; + foreach (string sr1Id in recruitmentService.GetSr1Leads().Cast().Where(sr1Id => account.application.recruiter != sr1Id)) { notificationsService.Add( - new Notification { - owner = sr1Id, icon = NotificationIcons.APPLICATION, message = $"{displayNameService.GetDisplayName(account.application.recruiter)} has been assigned {account.firstname} {account.lastname}'s application", link = $"/recruitment/{account.id}" - } + new Notification {owner = sr1Id, icon = NotificationIcons.APPLICATION, message = $"{displayNameService.GetDisplayName(account.application.recruiter)} has been assigned {account.firstname} {account.lastname}'s application", link = $"/recruitment/{account.id}"} ); } diff --git a/UKSFWebsite.Api/Controllers/CommentThreadController.cs b/UKSFWebsite.Api/Controllers/CommentThreadController.cs index c5a62673..b0b3ab42 100644 --- a/UKSFWebsite.Api/Controllers/CommentThreadController.cs +++ b/UKSFWebsite.Api/Controllers/CommentThreadController.cs @@ -58,23 +58,13 @@ public IActionResult GetCanPostComment(string id) { bool canPost; Account account = sessionService.GetContextAccount(); bool admin = sessionService.ContextHasRole(RoleDefinitions.ADMIN); - switch (commentThread.mode) { - case ThreadMode.SR1: - canPost = commentThread.authors.Any(x => x == sessionService.GetContextId()) || admin || recruitmentService.IsRecruiter(sessionService.GetContextAccount()); - break; - case ThreadMode.RANKSUPERIOR: - canPost = commentThread.authors.Any(x => admin || ranksService.IsSuperior(account.rank, accountService.GetSingle(x).rank)); - break; - case ThreadMode.RANKEQUAL: - canPost = commentThread.authors.Any(x => admin || ranksService.IsEqual(account.rank, accountService.GetSingle(x).rank)); - break; - case ThreadMode.RANKSUPERIOROREQUAL: - canPost = commentThread.authors.Any(x => admin || ranksService.IsSuperiorOrEqual(account.rank, accountService.GetSingle(x).rank)); - break; - default: - canPost = true; - break; - } + canPost = commentThread.mode switch { + ThreadMode.SR1 => (commentThread.authors.Any(x => x == sessionService.GetContextId()) || admin || recruitmentService.IsRecruiter(sessionService.GetContextAccount())), + ThreadMode.RANKSUPERIOR => commentThread.authors.Any(x => admin || ranksService.IsSuperior(account.rank, accountService.GetSingle(x).rank)), + ThreadMode.RANKEQUAL => commentThread.authors.Any(x => admin || ranksService.IsEqual(account.rank, accountService.GetSingle(x).rank)), + ThreadMode.RANKSUPERIOROREQUAL => commentThread.authors.Any(x => admin || ranksService.IsSuperiorOrEqual(account.rank, accountService.GetSingle(x).rank)), + _ => true + }; return Ok(new {canPost}); } diff --git a/UKSFWebsite.Api/Controllers/DischargesController.cs b/UKSFWebsite.Api/Controllers/DischargesController.cs index 28288562..ed1c40ed 100644 --- a/UKSFWebsite.Api/Controllers/DischargesController.cs +++ b/UKSFWebsite.Api/Controllers/DischargesController.cs @@ -34,7 +34,7 @@ public DischargesController(IAccountService accountService, IAssignmentService a [HttpGet] public IActionResult Get() { IEnumerable discharges = dischargeService.Get(); - foreach (dynamic discharge in discharges) { + foreach (DischargeCollection discharge in discharges) { discharge.requestExists = commandRequestService.DoesEquivalentRequestExist(new CommandRequest {recipient = discharge.accountId, type = CommandRequestType.REINSTATE_MEMBER, displayValue = "Member", displayFrom = "Discharged"}); } return Ok(discharges); diff --git a/UKSFWebsite.Api/Controllers/DocsController.cs b/UKSFWebsite.Api/Controllers/DocsController.cs index 5c164256..6c917918 100644 --- a/UKSFWebsite.Api/Controllers/DocsController.cs +++ b/UKSFWebsite.Api/Controllers/DocsController.cs @@ -40,9 +40,8 @@ public IActionResult Get(string id) { string filePath = $"Docs/{id}.md"; if (!System.IO.File.Exists(filePath)) return Ok(new {doc = $"'{filePath}' does not exist"}); try { - using (StreamReader streamReader = new StreamReader(System.IO.File.Open(filePath, FileMode.Open, FileAccess.Read, FileShare.Read))) { - return Ok(new {doc = Markdown.ToHtml(streamReader.ReadToEnd())}); - } + using StreamReader streamReader = new StreamReader(System.IO.File.Open(filePath, FileMode.Open, FileAccess.Read, FileShare.Read)); + return Ok(new {doc = Markdown.ToHtml(streamReader.ReadToEnd())}); } catch (Exception) { return Ok(new {doc = $"Could not read file '{filePath}'"}); } diff --git a/UKSFWebsite.Api/Controllers/IssueController.cs b/UKSFWebsite.Api/Controllers/IssueController.cs index 7c0762b6..64ac292d 100644 --- a/UKSFWebsite.Api/Controllers/IssueController.cs +++ b/UKSFWebsite.Api/Controllers/IssueController.cs @@ -35,16 +35,15 @@ public async Task CreateIssue([FromQuery] int type, [FromBody] JO string issueUrl; try { - using (HttpClient client = new HttpClient()) { - StringContent content = new StringContent(JsonConvert.SerializeObject(new {title, body}), Encoding.UTF8, "application/vnd.github.v3.full+json"); - string url = type == 0 ? "https://api.github.com/repos/uksf/website-issues/issues" : "https://api.github.com/repos/uksf/modpack/issues"; - client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("token", githubToken); - client.DefaultRequestHeaders.UserAgent.ParseAdd(user); - HttpResponseMessage response = await client.PostAsync(url, content); - string result = await response.Content.ReadAsStringAsync(); - issueUrl = JObject.Parse(result)["html_url"].ToString(); - emailService.SendEmail("contact.tim.here@gmail.com", "New Issue Created", $"New {(type == 0 ? "website" : "modpack")} issue reported by {user}\n\n{issueUrl}"); - } + using HttpClient client = new HttpClient(); + StringContent content = new StringContent(JsonConvert.SerializeObject(new {title, body}), Encoding.UTF8, "application/vnd.github.v3.full+json"); + string url = type == 0 ? "https://api.github.com/repos/uksf/website-issues/issues" : "https://api.github.com/repos/uksf/modpack/issues"; + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("token", githubToken); + client.DefaultRequestHeaders.UserAgent.ParseAdd(user); + HttpResponseMessage response = await client.PostAsync(url, content); + string result = await response.Content.ReadAsStringAsync(); + issueUrl = JObject.Parse(result)["html_url"].ToString(); + emailService.SendEmail("contact.tim.here@gmail.com", "New Issue Created", $"New {(type == 0 ? "website" : "modpack")} issue reported by {user}\n\n{issueUrl}"); } catch (Exception) { return BadRequest(); } diff --git a/UKSFWebsite.Api/Controllers/LoaController.cs b/UKSFWebsite.Api/Controllers/LoaController.cs index 46cab5c6..ce59dfa5 100644 --- a/UKSFWebsite.Api/Controllers/LoaController.cs +++ b/UKSFWebsite.Api/Controllers/LoaController.cs @@ -16,14 +16,23 @@ namespace UKSFWebsite.Api.Controllers { public class LoaController : Controller { private readonly IAccountService accountService; private readonly IChainOfCommandService chainOfCommandService; + private readonly ICommandRequestService commandRequestService; private readonly IDisplayNameService displayNameService; private readonly ILoaService loaService; + private readonly INotificationsService notificationsService; private readonly ISessionService sessionService; private readonly IUnitsService unitsService; - private readonly ICommandRequestService commandRequestService; - private readonly INotificationsService notificationsService; - public LoaController(ILoaService loaService, ISessionService sessionService, IDisplayNameService displayNameService, IAccountService accountService, IUnitsService unitsService, IChainOfCommandService chainOfCommandService, ICommandRequestService commandRequestService, INotificationsService notificationsService) { + public LoaController( + ILoaService loaService, + ISessionService sessionService, + IDisplayNameService displayNameService, + IAccountService accountService, + IUnitsService unitsService, + IChainOfCommandService chainOfCommandService, + ICommandRequestService commandRequestService, + INotificationsService notificationsService + ) { this.loaService = loaService; this.sessionService = sessionService; this.displayNameService = displayNameService; @@ -87,8 +96,10 @@ public async Task DeleteLoa(string id) { foreach (string reviewerId in request.reviews.Keys.Where(x => x != request.requester)) { notificationsService.Add(new Notification {owner = reviewerId, icon = NotificationIcons.REQUEST, message = $"Your review for {request.displayRequester}'s LOA is no longer required as they deleted their LOA", link = "/command/requests"}); } + LogWrapper.AuditLog(sessionService.GetContextId(), $"Loa request deleted for '{displayNameService.GetDisplayName(accountService.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); } + LogWrapper.AuditLog(sessionService.GetContextId(), $"Loa deleted for '{displayNameService.GetDisplayName(accountService.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); await loaService.Delete(loa.id); diff --git a/UKSFWebsite.Api/Controllers/RecruitmentController.cs b/UKSFWebsite.Api/Controllers/RecruitmentController.cs index 8834af19..850c3a4b 100644 --- a/UKSFWebsite.Api/Controllers/RecruitmentController.cs +++ b/UKSFWebsite.Api/Controllers/RecruitmentController.cs @@ -73,34 +73,43 @@ public async Task UpdateState([FromBody] dynamic body, string id) await accountService.Update(id, Builders.Update.Set(x => x.application.state, updatedState)); LogWrapper.AuditLog(sessionId, $"Application state changed for {id} from {account.application.state} to {updatedState}"); - if (updatedState == ApplicationState.ACCEPTED) { - await accountService.Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now)); - await accountService.Update(id, "membershipState", MembershipState.MEMBER); - Notification notification = await assignmentService.UpdateUnitRankAndRole(id, "Basic Training Unit", "Trainee", "Recruit", reason: "your application was accepted"); - notificationsService.Add(notification); - } else if (updatedState == ApplicationState.REJECTED) { - await accountService.Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now)); - await accountService.Update(id, "membershipState", MembershipState.CONFIRMED); - Notification notification = await assignmentService.UpdateUnitRankAndRole( - id, - AssignmentService.REMOVE_FLAG, - AssignmentService.REMOVE_FLAG, - AssignmentService.REMOVE_FLAG, - "", - $"Unfortunately you have not been accepted into our unit, however we thank you for your interest and hope you find a suitable alternative. You may view any notes about your application here: [url]https://uk-sf.co.uk/recruitment/{id}[/url]" - ); - notificationsService.Add(notification); - } else if (updatedState == ApplicationState.WAITING) { - await accountService.Update(id, Builders.Update.Set(x => x.application.dateCreated, DateTime.Now)); - await accountService.Update(id, Builders.Update.Unset(x => x.application.dateAccepted)); - await accountService.Update(id, "membershipState", MembershipState.CONFIRMED); - Notification notification = await assignmentService.UpdateUnitRankAndRole(id, AssignmentService.REMOVE_FLAG, "Applicant", "Candidate", reason: "your application was reactivated"); - notificationsService.Add(notification); - if (recruitmentService.GetSr1Members().All(x => x.id != account.application.recruiter)) { - string newRecruiterId = recruitmentService.GetRecruiter(); - LogWrapper.AuditLog(sessionId, $"Application recruiter for {id} is no longer SR1, reassigning from {account.application.recruiter} to {newRecruiterId}"); - await accountService.Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiterId)); + switch (updatedState) { + case ApplicationState.ACCEPTED: { + await accountService.Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now)); + await accountService.Update(id, "membershipState", MembershipState.MEMBER); + Notification notification = await assignmentService.UpdateUnitRankAndRole(id, "Basic Training Unit", "Trainee", "Recruit", reason: "your application was accepted"); + notificationsService.Add(notification); + break; + } + case ApplicationState.REJECTED: { + await accountService.Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now)); + await accountService.Update(id, "membershipState", MembershipState.CONFIRMED); + Notification notification = await assignmentService.UpdateUnitRankAndRole( + id, + AssignmentService.REMOVE_FLAG, + AssignmentService.REMOVE_FLAG, + AssignmentService.REMOVE_FLAG, + "", + $"Unfortunately you have not been accepted into our unit, however we thank you for your interest and hope you find a suitable alternative. You may view any notes about your application here: [url]https://uk-sf.co.uk/recruitment/{id}[/url]" + ); + notificationsService.Add(notification); + break; + } + case ApplicationState.WAITING: { + await accountService.Update(id, Builders.Update.Set(x => x.application.dateCreated, DateTime.Now)); + await accountService.Update(id, Builders.Update.Unset(x => x.application.dateAccepted)); + await accountService.Update(id, "membershipState", MembershipState.CONFIRMED); + Notification notification = await assignmentService.UpdateUnitRankAndRole(id, AssignmentService.REMOVE_FLAG, "Applicant", "Candidate", reason: "your application was reactivated"); + notificationsService.Add(notification); + if (recruitmentService.GetSr1Members().All(x => x.id != account.application.recruiter)) { + string newRecruiterId = recruitmentService.GetRecruiter(); + LogWrapper.AuditLog(sessionId, $"Application recruiter for {id} is no longer SR1, reassigning from {account.application.recruiter} to {newRecruiterId}"); + await accountService.Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiterId)); + } + + break; } + default: throw new ArgumentOutOfRangeException(); } account = accountService.GetSingle(id); @@ -111,8 +120,7 @@ public async Task UpdateState([FromBody] dynamic body, string id) ); } - foreach ((_, string value) in recruitmentService.GetSr1Leads()) { - if (sessionId == value || account.application.recruiter == value) continue; + foreach (string value in recruitmentService.GetSr1Leads().Cast().Where(value => sessionId != value && account.application.recruiter != value)) { notificationsService.Add(new Notification {owner = value, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application {message} by {displayNameService.GetDisplayName(sessionService.GetContextAccount())}", link = $"/recruitment/{id}"}); } diff --git a/UKSFWebsite.Api/Controllers/UnitsController.cs b/UKSFWebsite.Api/Controllers/UnitsController.cs index 5f686336..f8d3c171 100644 --- a/UKSFWebsite.Api/Controllers/UnitsController.cs +++ b/UKSFWebsite.Api/Controllers/UnitsController.cs @@ -19,13 +19,13 @@ public class UnitsController : Controller { private readonly IAssignmentService assignmentService; private readonly IDiscordService discordService; private readonly IDisplayNameService displayNameService; + private readonly INotificationsService notificationsService; private readonly IRanksService ranksService; private readonly IRolesService rolesService; private readonly IServerService serverService; private readonly ISessionService sessionService; private readonly ITeamspeakService teamspeakService; private readonly IUnitsService unitsService; - private readonly INotificationsService notificationsService; public UnitsController( ISessionService sessionService, @@ -58,11 +58,11 @@ INotificationsService notificationsService [HttpGet("{id}"), Authorize] public IActionResult GetAccountUnits(string id, [FromQuery] string filter = "") { - switch (filter) { - case "auxiliary": return Ok(unitsService.GetSortedUnits(x => x.branch == UnitBranch.AUXILIARY && x.members.Contains(id))); - case "available": return Ok(unitsService.GetSortedUnits(x => !x.members.Contains(id))); - default: return Ok(unitsService.GetSortedUnits(x => x.members.Contains(id))); - } + return filter switch { + "auxiliary" => Ok(unitsService.GetSortedUnits(x => x.branch == UnitBranch.AUXILIARY && x.members.Contains(id))), + "available" => Ok(unitsService.GetSortedUnits(x => !x.members.Contains(id))), + _ => Ok(unitsService.GetSortedUnits(x => x.members.Contains(id))) + }; } [HttpGet("tree"), Authorize] @@ -314,12 +314,7 @@ private IEnumerable SortMembers(IEnumerable members, Unit unit) } ) .ToList(); - accounts.Sort( - (a, b) => a.roleIndex < b.roleIndex ? 1 : - a.roleIndex > b.roleIndex ? -1 : - a.rankIndex < b.rankIndex ? -1 : - a.rankIndex > b.rankIndex ? 1 : string.CompareOrdinal(a.account.lastname, b.account.lastname) - ); + accounts.Sort((a, b) => a.roleIndex < b.roleIndex ? 1 : a.roleIndex > b.roleIndex ? -1 : a.rankIndex < b.rankIndex ? -1 : a.rankIndex > b.rankIndex ? 1 : string.CompareOrdinal(a.account.lastname, b.account.lastname)); return accounts.Select(x => x.account.id); } } From 9a895197caa65d41ed9656b7e9869b3a678264cc Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 00:18:23 +0000 Subject: [PATCH 013/369] Large refactor. Split data services into data-handling only services with a service for each for non-direct data functions --- .../CachedDataService.cs | 2 +- UKSFWebsite.Api.Data/Class1.cs | 5 - .../CommandRequestArchiveDataService.cs | 9 ++ .../Command/CommandRequestDataService.cs | 9 ++ .../DataService.cs | 4 +- .../Game/GameServersDataService.cs | 17 +++ .../Launcher/LauncherFileDataService.cs | 9 ++ .../Message/CommentThreadDataService.cs | 15 +++ .../Message/NotificationsDataService.cs | 20 +++ .../Operations/OperationOrderDataService.cs | 22 +++ .../Operations/OperationReportDataService.cs | 22 +++ .../Personnel/AccountDataService.cs | 9 ++ .../Personnel/DischargeDataService.cs | 15 +++ .../Personnel/LoaDataService.cs | 9 ++ .../Personnel/RanksDataService.cs | 24 ++++ .../Personnel/RolesDataService.cs | 19 +++ .../UKSFWebsite.Api.Data.csproj | 10 ++ .../Units/UnitsDataService.cs | 17 +++ .../Utility/ConfirmationCodeDataService.cs | 9 ++ .../Utility/SchedulerDataService.cs | 9 ++ .../Utility/VariablesDataService.cs | 26 +--- .../Command}/IChainOfCommandService.cs | 5 +- .../ICommandRequestCompletionService.cs | 2 +- .../Command}/ICommandRequestService.cs | 8 +- .../Data/Cached/IAccountDataService.cs | 5 + .../Data/Cached/ICommandRequestDataService.cs | 5 + .../Data/Cached/ICommentThreadDataService.cs | 8 ++ .../Data/Cached/IDischargeDataService.cs | 5 + .../Data/Cached/IGameServersDataService.cs | 5 + .../Data/Cached/ILauncherFileDataService.cs | 5 + .../Data/Cached/ILoaDataService.cs | 5 + .../Data/Cached/INotificationsDataService.cs | 10 ++ .../Data/Cached/IOperationOrderDataService.cs | 8 ++ .../Cached/IOperationReportDataService.cs | 8 ++ .../Data/Cached/IRanksDataService.cs | 10 ++ .../Data/Cached/IRolesDataService.cs | 9 ++ .../Data/Cached/IUnitsDataService.cs | 5 + .../Data/Cached/IVariablesDataService.cs | 8 ++ .../Data/ICommandRequestArchiveDataService.cs | 5 + .../Data/IConfirmationCodeDataService.cs | 5 + .../Data}/IDataService.cs | 4 +- .../Data/ISchedulerDataService.cs | 5 + .../Game}/IGameServersService.cs | 8 +- .../Game}/IMissionPatchingService.cs | 2 +- .../Integrations}/IDiscordService.cs | 6 +- .../Integrations}/IPipeManager.cs | 2 +- .../Integrations}/ITeamspeakGroupService.cs | 4 +- .../Integrations}/ITeamspeakMetricsService.cs | 2 +- .../Integrations}/ITeamspeakService.cs | 4 +- .../Launcher}/ILauncherFileService.cs | 6 +- .../Launcher/ILauncherService.cs | 3 + .../Message/ICommentThreadService.cs | 14 ++ .../Message}/IEmailService.cs | 4 +- .../Message/ILoggingService.cs | 6 +- .../Message}/INotificationsService.cs | 12 +- .../Operations/IOperationOrderService.cs | 10 ++ .../Operations/IOperationReportService.cs | 10 ++ .../Personnel/IAccountService.cs | 12 ++ .../Personnel}/IAssignmentService.cs | 4 +- .../Personnel}/IAttendanceService.cs | 4 +- .../Personnel/IDischargeService.cs | 7 + .../Personnel}/IDisplayNameService.cs | 4 +- .../Personnel}/ILoaService.cs | 10 +- .../Personnel/IRanksService.cs | 12 ++ .../Personnel}/IRecruitmentService.cs | 4 +- .../Personnel/IRolesService.cs | 10 ++ .../Personnel}/IServiceRecordService.cs | 2 +- .../UKSFWebsite.Api.Interfaces.csproj | 24 ++++ .../Units}/IUnitsService.cs | 10 +- .../Utility}/IConfirmationCodeService.cs | 7 +- .../Utility}/ILoginService.cs | 2 +- .../Utility}/ISchedulerService.cs | 10 +- .../Utility}/IServerService.cs | 2 +- .../Utility}/ISessionService.cs | 4 +- .../Command/ChainOfCommandMode.cs | 12 ++ .../CommandRequest.cs | 2 +- .../CommandRequestLoa.cs | 4 +- .../{ => Game}/GameServer.cs | 2 +- .../{ => Game}/GameServerMod.cs | 2 +- .../{ => Game}/MissionFile.cs | 2 +- .../TeamspeakClientSnapshot.cs | 2 +- .../TeamspeakServerSnapshot.cs | 2 +- .../Launcher/LauncherFile.cs | 2 +- .../{ => Message}/Comment.cs | 2 +- .../{ => Message}/CommentThread.cs | 2 +- .../{ => Message}/Logging/AuditLogMessage.cs | 2 +- .../{ => Message}/Logging/BasicLogMessage.cs | 2 +- .../Logging/LauncherLogMessage.cs | 4 +- .../{ => Message}/Logging/WebLogMessage.cs | 4 +- .../{ => Message}/Notification.cs | 2 +- .../Message/NotificationIcons.cs | 9 ++ .../Mission/MissionPatchData.cs | 1 + .../Mission/MissionPatchingReport.cs | 2 +- .../Mission/MissionPatchingResult.cs | 2 +- .../Mission/MissionPlayer.cs | 2 +- UKSFWebsite.Api.Models/Mission/MissionUnit.cs | 3 +- .../CreateOperationOrderRequest.cs | 2 +- .../CreateOperationReport.cs | 2 +- .../{ => Operations}/Operation.cs | 3 +- .../{ => Operations}/Opord.cs | 2 +- .../{ => Operations}/Oprep.cs | 3 +- .../{Accounts => Personnel}/Account.cs | 4 +- .../AccountAttendanceStatus.cs | 2 +- .../AccountSettings.cs | 2 +- .../{Accounts => Personnel}/Application.cs | 2 +- .../{ => Personnel}/AttendanceReport.cs | 2 +- .../{ => Personnel}/Discharge.cs | 8 +- UKSFWebsite.Api.Models/{ => Personnel}/Loa.cs | 2 +- .../MembershipState.cs | 2 +- .../{ => Personnel}/Rank.cs | 4 +- .../{ => Personnel}/Role.cs | 2 +- .../{ => Personnel}/ServiceRecord.cs | 2 +- UKSFWebsite.Api.Models/{ => Units}/Unit.cs | 4 +- .../{ => Utility}/ConfirmationCode.cs | 2 +- .../{ => Utility}/ScheduledJob.cs | 2 +- .../{ => Utility}/UtilityObject.cs | 2 +- .../{ => Utility}/VariableItem.cs | 2 +- .../Abstraction/IAccountService.cs | 5 - .../Abstraction/ICommentThreadService.cs | 13 -- .../Abstraction/IDischargeService.cs | 5 - .../Abstraction/ILauncherService.cs | 5 - .../Abstraction/ILoggingService.cs | 10 -- .../Abstraction/IOperationOrderService.cs | 10 -- .../Abstraction/IOperationReportService.cs | 10 -- .../Abstraction/IRanksService.cs | 15 --- .../Abstraction/IRolesService.cs | 11 -- .../Abstraction/IVariablesService.cs | 8 -- .../{ => Command}/ChainOfCommandService.cs | 33 ++--- .../CommandRequestCompletionService.cs | 64 +++++---- .../CommandRequestService.cs | 73 +++++----- .../Data/AccountService.cs | 25 ---- UKSFWebsite.Api.Services/Data/CacheService.cs | 15 --- .../Data/CommentThreadService.cs | 33 ----- .../Data/DischargeService.cs | 15 --- .../Data/OperationOrderService.cs | 33 ----- .../Data/OperationReportService.cs | 37 ------ UKSFWebsite.Api.Services/Data/RanksService.cs | 69 ---------- UKSFWebsite.Api.Services/Data/RolesService.cs | 29 ---- .../Debug/FakeDataService.cs | 2 +- .../Debug/FakeDiscordService.cs | 6 +- .../Debug/FakeNotificationsDataService.cs | 12 ++ .../Debug/FakeNotificationsService.cs | 13 +- .../Debug/FakePipeManager.cs | 2 +- .../{Utility => Game}/GameServerHelpers.cs | 20 +-- .../{Data => Game}/GameServersService.cs | 30 ++--- .../Missions/MissionDataResolver.cs | 4 +- .../Missions/MissionEntityHelper.cs | 2 +- .../Missions/MissionEntityItemHelper.cs | 4 +- .../Missions/MissionPatchDataService.cs | 17 +-- .../Missions/MissionPatchingService.cs | 61 +++++---- .../{ => Game}/Missions/MissionService.cs | 6 +- .../{ => Game}/Missions/MissionUtilities.cs | 2 +- .../{ => Game}/ServerService.cs | 17 ++- .../Hubs/Abstraction/IAdminClient.cs | 2 +- .../{ => Integrations}/DiscordService.cs | 40 +++--- .../PipeManager.cs | 6 +- .../PipeQueueManager.cs | 2 +- .../Procedures/CheckClientServerGroup.cs | 10 +- .../Procedures/ITeamspeakProcedure.cs | 2 +- .../Procedures/Pong.cs | 2 +- .../Procedures/ProcedureDefinitons.cs | 2 +- .../Procedures/SendClientsUpdate.cs | 5 +- .../TeamspeakGroupService.cs | 36 +++-- .../TeamspeakMetricsService.cs | 4 +- .../TeamspeakService.cs | 10 +- .../Launcher/LauncherFileService.cs | 37 +++--- .../Launcher/LauncherService.cs | 2 +- UKSFWebsite.Api.Services/Logging/Logging.cs | 35 ----- .../Message/CommentThreadService.cs | 33 +++++ .../{ => Message}/EmailService.cs | 6 +- .../{Utility => Message}/LogWrapper.cs | 13 +- .../{Logging => Message}/LoggingService.cs | 34 ++++- .../{Data => Message}/NotificationsService.cs | 46 +++---- .../Operations/OperationOrderService.cs | 25 ++++ .../Operations/OperationReportService.cs | 32 +++++ .../Personnel/AccountService.cs | 32 +++++ .../{ => Personnel}/AssignmentService.cs | 51 +++---- .../{ => Personnel}/AttendanceService.cs | 19 ++- .../Personnel/DischargeService.cs | 12 ++ .../{ => Personnel}/DisplayNameService.cs | 11 +- .../{Data => Personnel}/LoaService.cs | 27 ++-- .../{ => Personnel}/LoginService.cs | 17 +-- .../Personnel/RanksService.cs | 49 +++++++ .../{ => Personnel}/RecruitmentService.cs | 32 ++--- .../{Utility => Personnel}/RoleDefinitions.cs | 6 +- .../Personnel/RolesService.cs | 23 ++++ .../{ => Personnel}/ServiceRecordService.cs | 9 +- .../UKSFWebsite.Api.Services.csproj | 1 + .../{Data => Units}/UnitsService.cs | 76 +++++------ .../Utility/ChangeHelper.cs | 72 +++++----- .../ConfirmationCodeService.cs | 27 ++-- .../Utility/DataCacheService.cs | 15 +++ .../Utility/MigrationUtility.cs | 22 +-- .../Utility/SchedulerActionHelper.cs | 12 +- .../{Data => Utility}/SchedulerService.cs | 46 ++++--- .../{ => Utility}/SessionService.cs | 9 +- .../Utility/StringUtilities.cs | 7 +- UKSFWebsite.Api.Services/Utility/Utilities.cs | 2 +- .../Utility/VariablesService.cs | 19 +++ .../Utility/VariablesWrapper.cs | 4 +- .../Accounts/AccountsController.cs | 48 ++++--- .../Accounts/CommunicationsController.cs | 23 ++-- .../Accounts/ConfirmationCodeReceiver.cs | 13 +- .../Accounts/DiscordCodeController.cs | 14 +- .../Accounts/OperationOrderController.cs | 13 +- .../Accounts/OperationReportController.cs | 13 +- .../Accounts/OperationsController.cs | 16 +-- .../Accounts/PasswordResetController.cs | 12 +- .../Accounts/SteamCodeController.cs | 11 +- .../Controllers/ApplicationsController.cs | 44 +++--- .../CommandRequestsController.cs | 22 +-- .../CommandRequestsCreationController.cs | 42 +++--- .../Controllers/CommentThreadController.cs | 49 ++++--- UKSFWebsite.Api/Controllers/DataController.cs | 10 +- .../Controllers/DischargesController.cs | 29 ++-- .../Controllers/DiscordController.cs | 4 +- .../Controllers/GameServersController.cs | 93 +++++++------ .../Controllers/IssueController.cs | 8 +- .../Controllers/LauncherController.cs | 22 +-- UKSFWebsite.Api/Controllers/LoaController.cs | 37 +++--- .../Controllers/LoggingController.cs | 4 +- .../Controllers/LoginController.cs | 4 +- .../Controllers/News/NewsController.cs | 13 +- .../Controllers/NotificationsController.cs | 2 +- .../Controllers/RanksController.cs | 55 ++++---- .../Controllers/RecruitmentController.cs | 46 ++++--- .../Controllers/RolesController.cs | 64 +++++---- .../Controllers/TeamspeakController.cs | 8 +- .../Controllers/UnitsController.cs | 125 +++++++++--------- .../Controllers/VariablesController.cs | 40 +++--- .../Controllers/VersionController.cs | 14 +- UKSFWebsite.Api/ExceptionHandler.cs | 7 +- UKSFWebsite.Api/Global.cs | 2 +- UKSFWebsite.Api/ModsController.cs | 3 +- UKSFWebsite.Api/Startup.cs | 112 +++++++++++----- UKSFWebsite.Api/UKSFWebsite.Api.csproj | 2 +- UKSFWebsite.Backend.sln | 14 ++ .../Controllers/DiscordController.cs | 5 +- .../Controllers/SteamController.cs | 2 +- UKSFWebsite.Integrations/Startup.cs | 10 +- .../UKSFWebsite.Integrations.csproj | 2 +- 241 files changed, 2026 insertions(+), 1486 deletions(-) rename {UKSFWebsite.Api.Services/Data => UKSFWebsite.Api.Data}/CachedDataService.cs (97%) delete mode 100644 UKSFWebsite.Api.Data/Class1.cs create mode 100644 UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs create mode 100644 UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs rename {UKSFWebsite.Api.Services/Data => UKSFWebsite.Api.Data}/DataService.cs (96%) create mode 100644 UKSFWebsite.Api.Data/Game/GameServersDataService.cs create mode 100644 UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs create mode 100644 UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs create mode 100644 UKSFWebsite.Api.Data/Message/NotificationsDataService.cs create mode 100644 UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs create mode 100644 UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs create mode 100644 UKSFWebsite.Api.Data/Personnel/AccountDataService.cs create mode 100644 UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs create mode 100644 UKSFWebsite.Api.Data/Personnel/LoaDataService.cs create mode 100644 UKSFWebsite.Api.Data/Personnel/RanksDataService.cs create mode 100644 UKSFWebsite.Api.Data/Personnel/RolesDataService.cs create mode 100644 UKSFWebsite.Api.Data/Units/UnitsDataService.cs create mode 100644 UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs create mode 100644 UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs rename UKSFWebsite.Api.Services/Data/VariablesService.cs => UKSFWebsite.Api.Data/Utility/VariablesDataService.cs (53%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Command}/IChainOfCommandService.cs (67%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Command}/ICommandRequestCompletionService.cs (72%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Command}/ICommandRequestService.cs (73%) create mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/IAccountDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/IDischargeDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/IGameServersDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/ILoaDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/INotificationsDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/IOperationReportDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/IRanksDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/IRolesDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/IUnitsDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/IConfirmationCodeDataService.cs rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Data}/IDataService.cs (90%) create mode 100644 UKSFWebsite.Api.Interfaces/Data/ISchedulerDataService.cs rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Game}/IGameServersService.cs (78%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Game}/IMissionPatchingService.cs (79%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Integrations}/IDiscordService.cs (81%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Integrations}/IPipeManager.cs (64%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Integrations}/ITeamspeakGroupService.cs (68%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Integrations}/ITeamspeakMetricsService.cs (76%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Integrations}/ITeamspeakService.cs (87%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Launcher}/ILauncherFileService.cs (64%) create mode 100644 UKSFWebsite.Api.Interfaces/Launcher/ILauncherService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Message}/IEmailService.cs (69%) rename UKSFWebsite.Api.Services/Abstraction/ILogging.cs => UKSFWebsite.Api.Interfaces/Message/ILoggingService.cs (51%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Message}/INotificationsService.cs (57%) create mode 100644 UKSFWebsite.Api.Interfaces/Operations/IOperationOrderService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Operations/IOperationReportService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Personnel}/IAssignmentService.cs (86%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Personnel}/IAttendanceService.cs (67%) create mode 100644 UKSFWebsite.Api.Interfaces/Personnel/IDischargeService.cs rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Personnel}/IDisplayNameService.cs (68%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Personnel}/ILoaService.cs (56%) create mode 100644 UKSFWebsite.Api.Interfaces/Personnel/IRanksService.cs rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Personnel}/IRecruitmentService.cs (87%) create mode 100644 UKSFWebsite.Api.Interfaces/Personnel/IRolesService.cs rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Personnel}/IServiceRecordService.cs (70%) create mode 100644 UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Units}/IUnitsService.cs (85%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Utility}/IConfirmationCodeService.cs (50%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Utility}/ILoginService.cs (79%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Utility}/ISchedulerService.cs (57%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Utility}/IServerService.cs (59%) rename {UKSFWebsite.Api.Services/Abstraction => UKSFWebsite.Api.Interfaces/Utility}/ISessionService.cs (67%) create mode 100644 UKSFWebsite.Api.Models/Command/ChainOfCommandMode.cs rename UKSFWebsite.Api.Models/{CommandRequests => Command}/CommandRequest.cs (96%) rename UKSFWebsite.Api.Models/{CommandRequests => Command}/CommandRequestLoa.cs (79%) rename UKSFWebsite.Api.Models/{ => Game}/GameServer.cs (97%) rename UKSFWebsite.Api.Models/{ => Game}/GameServerMod.cs (85%) rename UKSFWebsite.Api.Models/{ => Game}/MissionFile.cs (90%) rename UKSFWebsite.Api.Models/{ => Integrations}/TeamspeakClientSnapshot.cs (78%) rename UKSFWebsite.Api.Models/{ => Integrations}/TeamspeakServerSnapshot.cs (80%) rename UKSFWebsite.Api.Models/{ => Message}/Comment.cs (88%) rename UKSFWebsite.Api.Models/{ => Message}/CommentThread.cs (91%) rename UKSFWebsite.Api.Models/{ => Message}/Logging/AuditLogMessage.cs (61%) rename UKSFWebsite.Api.Models/{ => Message}/Logging/BasicLogMessage.cs (95%) rename UKSFWebsite.Api.Models/{ => Message}/Logging/LauncherLogMessage.cs (82%) rename UKSFWebsite.Api.Models/{ => Message}/Logging/WebLogMessage.cs (90%) rename UKSFWebsite.Api.Models/{ => Message}/Notification.cs (91%) create mode 100644 UKSFWebsite.Api.Models/Message/NotificationIcons.cs rename UKSFWebsite.Api.Models/{Requests => Operations}/CreateOperationOrderRequest.cs (80%) rename UKSFWebsite.Api.Models/{Requests => Operations}/CreateOperationReport.cs (80%) rename UKSFWebsite.Api.Models/{ => Operations}/Operation.cs (79%) rename UKSFWebsite.Api.Models/{ => Operations}/Opord.cs (85%) rename UKSFWebsite.Api.Models/{ => Operations}/Oprep.cs (79%) rename UKSFWebsite.Api.Models/{Accounts => Personnel}/Account.cs (96%) rename UKSFWebsite.Api.Models/{ => Personnel}/AccountAttendanceStatus.cs (92%) rename UKSFWebsite.Api.Models/{Accounts => Personnel}/AccountSettings.cs (87%) rename UKSFWebsite.Api.Models/{Accounts => Personnel}/Application.cs (94%) rename UKSFWebsite.Api.Models/{ => Personnel}/AttendanceReport.cs (65%) rename UKSFWebsite.Api.Models/{ => Personnel}/Discharge.cs (94%) rename UKSFWebsite.Api.Models/{ => Personnel}/Loa.cs (92%) rename UKSFWebsite.Api.Models/{Accounts => Personnel}/MembershipState.cs (75%) rename UKSFWebsite.Api.Models/{ => Personnel}/Rank.cs (88%) rename UKSFWebsite.Api.Models/{ => Personnel}/Role.cs (88%) rename UKSFWebsite.Api.Models/{ => Personnel}/ServiceRecord.cs (78%) rename UKSFWebsite.Api.Models/{ => Units}/Unit.cs (96%) rename UKSFWebsite.Api.Models/{ => Utility}/ConfirmationCode.cs (86%) rename UKSFWebsite.Api.Models/{ => Utility}/ScheduledJob.cs (93%) rename UKSFWebsite.Api.Models/{ => Utility}/UtilityObject.cs (87%) rename UKSFWebsite.Api.Models/{ => Utility}/VariableItem.cs (84%) delete mode 100644 UKSFWebsite.Api.Services/Abstraction/IAccountService.cs delete mode 100644 UKSFWebsite.Api.Services/Abstraction/ICommentThreadService.cs delete mode 100644 UKSFWebsite.Api.Services/Abstraction/IDischargeService.cs delete mode 100644 UKSFWebsite.Api.Services/Abstraction/ILauncherService.cs delete mode 100644 UKSFWebsite.Api.Services/Abstraction/ILoggingService.cs delete mode 100644 UKSFWebsite.Api.Services/Abstraction/IOperationOrderService.cs delete mode 100644 UKSFWebsite.Api.Services/Abstraction/IOperationReportService.cs delete mode 100644 UKSFWebsite.Api.Services/Abstraction/IRanksService.cs delete mode 100644 UKSFWebsite.Api.Services/Abstraction/IRolesService.cs delete mode 100644 UKSFWebsite.Api.Services/Abstraction/IVariablesService.cs rename UKSFWebsite.Api.Services/{ => Command}/ChainOfCommandService.cs (87%) rename UKSFWebsite.Api.Services/{ => Command}/CommandRequestCompletionService.cs (83%) rename UKSFWebsite.Api.Services/{Data => Command}/CommandRequestService.cs (63%) delete mode 100644 UKSFWebsite.Api.Services/Data/AccountService.cs delete mode 100644 UKSFWebsite.Api.Services/Data/CacheService.cs delete mode 100644 UKSFWebsite.Api.Services/Data/CommentThreadService.cs delete mode 100644 UKSFWebsite.Api.Services/Data/DischargeService.cs delete mode 100644 UKSFWebsite.Api.Services/Data/OperationOrderService.cs delete mode 100644 UKSFWebsite.Api.Services/Data/OperationReportService.cs delete mode 100644 UKSFWebsite.Api.Services/Data/RanksService.cs delete mode 100644 UKSFWebsite.Api.Services/Data/RolesService.cs create mode 100644 UKSFWebsite.Api.Services/Debug/FakeNotificationsDataService.cs rename UKSFWebsite.Api.Services/{Utility => Game}/GameServerHelpers.cs (85%) rename UKSFWebsite.Api.Services/{Data => Game}/GameServersService.cs (91%) rename UKSFWebsite.Api.Services/{ => Game}/Missions/MissionDataResolver.cs (99%) rename UKSFWebsite.Api.Services/{ => Game}/Missions/MissionEntityHelper.cs (98%) rename UKSFWebsite.Api.Services/{ => Game}/Missions/MissionEntityItemHelper.cs (99%) rename UKSFWebsite.Api.Services/{ => Game}/Missions/MissionPatchDataService.cs (80%) rename UKSFWebsite.Api.Services/{ => Game}/Missions/MissionPatchingService.cs (62%) rename UKSFWebsite.Api.Services/{ => Game}/Missions/MissionService.cs (98%) rename UKSFWebsite.Api.Services/{ => Game}/Missions/MissionUtilities.cs (97%) rename UKSFWebsite.Api.Services/{ => Game}/ServerService.cs (87%) rename UKSFWebsite.Api.Services/{ => Integrations}/DiscordService.cs (85%) rename UKSFWebsite.Api.Services/{Teamspeak => Integrations}/PipeManager.cs (97%) rename UKSFWebsite.Api.Services/{Teamspeak => Integrations}/PipeQueueManager.cs (91%) rename UKSFWebsite.Api.Services/{Teamspeak => Integrations}/Procedures/CheckClientServerGroup.cs (88%) rename UKSFWebsite.Api.Services/{Teamspeak => Integrations}/Procedures/ITeamspeakProcedure.cs (57%) rename UKSFWebsite.Api.Services/{Teamspeak => Integrations}/Procedures/Pong.cs (73%) rename UKSFWebsite.Api.Services/{Teamspeak => Integrations}/Procedures/ProcedureDefinitons.cs (89%) rename UKSFWebsite.Api.Services/{Teamspeak => Integrations}/Procedures/SendClientsUpdate.cs (85%) rename UKSFWebsite.Api.Services/{Teamspeak => Integrations}/TeamspeakGroupService.cs (69%) rename UKSFWebsite.Api.Services/{Teamspeak => Integrations}/TeamspeakMetricsService.cs (68%) rename UKSFWebsite.Api.Services/{Teamspeak => Integrations}/TeamspeakService.cs (95%) delete mode 100644 UKSFWebsite.Api.Services/Logging/Logging.cs create mode 100644 UKSFWebsite.Api.Services/Message/CommentThreadService.cs rename UKSFWebsite.Api.Services/{ => Message}/EmailService.cs (92%) rename UKSFWebsite.Api.Services/{Utility => Message}/LogWrapper.cs (55%) rename UKSFWebsite.Api.Services/{Logging => Message}/LoggingService.cs (55%) rename UKSFWebsite.Api.Services/{Data => Message}/NotificationsService.cs (66%) create mode 100644 UKSFWebsite.Api.Services/Operations/OperationOrderService.cs create mode 100644 UKSFWebsite.Api.Services/Operations/OperationReportService.cs create mode 100644 UKSFWebsite.Api.Services/Personnel/AccountService.cs rename UKSFWebsite.Api.Services/{ => Personnel}/AssignmentService.cs (83%) rename UKSFWebsite.Api.Services/{ => Personnel}/AttendanceService.cs (80%) create mode 100644 UKSFWebsite.Api.Services/Personnel/DischargeService.cs rename UKSFWebsite.Api.Services/{ => Personnel}/DisplayNameService.cs (78%) rename UKSFWebsite.Api.Services/{Data => Personnel}/LoaService.cs (55%) rename UKSFWebsite.Api.Services/{ => Personnel}/LoginService.cs (88%) create mode 100644 UKSFWebsite.Api.Services/Personnel/RanksService.cs rename UKSFWebsite.Api.Services/{ => Personnel}/RecruitmentService.cs (87%) rename UKSFWebsite.Api.Services/{Utility => Personnel}/RoleDefinitions.cs (94%) create mode 100644 UKSFWebsite.Api.Services/Personnel/RolesService.cs rename UKSFWebsite.Api.Services/{ => Personnel}/ServiceRecordService.cs (53%) rename UKSFWebsite.Api.Services/{Data => Units}/UnitsService.cs (61%) rename UKSFWebsite.Api.Services/{Data => Utility}/ConfirmationCodeService.cs (57%) create mode 100644 UKSFWebsite.Api.Services/Utility/DataCacheService.cs rename UKSFWebsite.Api.Services/{Data => Utility}/SchedulerService.cs (76%) rename UKSFWebsite.Api.Services/{ => Utility}/SessionService.cs (77%) create mode 100644 UKSFWebsite.Api.Services/Utility/VariablesService.cs diff --git a/UKSFWebsite.Api.Services/Data/CachedDataService.cs b/UKSFWebsite.Api.Data/CachedDataService.cs similarity index 97% rename from UKSFWebsite.Api.Services/Data/CachedDataService.cs rename to UKSFWebsite.Api.Data/CachedDataService.cs index d2cbf616..ad5be30a 100644 --- a/UKSFWebsite.Api.Services/Data/CachedDataService.cs +++ b/UKSFWebsite.Api.Data/CachedDataService.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using MongoDB.Driver; -namespace UKSFWebsite.Api.Services.Data { +namespace UKSFWebsite.Api.Data { public abstract class CachedDataService : DataService { protected List Collection; diff --git a/UKSFWebsite.Api.Data/Class1.cs b/UKSFWebsite.Api.Data/Class1.cs deleted file mode 100644 index a90b0009..00000000 --- a/UKSFWebsite.Api.Data/Class1.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; - -namespace UKSFWebsite.Api.Data { - public class Class1 { } -} diff --git a/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs b/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs new file mode 100644 index 00000000..d2b899a1 --- /dev/null +++ b/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs @@ -0,0 +1,9 @@ +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Models.Command; + +namespace UKSFWebsite.Api.Data.Command { + public class CommandRequestArchiveDataService : DataService, ICommandRequestArchiveDataService { + public CommandRequestArchiveDataService(IMongoDatabase database) : base(database, "commandRequestsArchive") { } + } +} diff --git a/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs b/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs new file mode 100644 index 00000000..ae34e0b3 --- /dev/null +++ b/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs @@ -0,0 +1,9 @@ +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Command; + +namespace UKSFWebsite.Api.Data.Command { + public class CommandRequestDataService : CachedDataService, ICommandRequestDataService { + public CommandRequestDataService(IMongoDatabase database) : base(database, "commandRequests") { } + } +} diff --git a/UKSFWebsite.Api.Services/Data/DataService.cs b/UKSFWebsite.Api.Data/DataService.cs similarity index 96% rename from UKSFWebsite.Api.Services/Data/DataService.cs rename to UKSFWebsite.Api.Data/DataService.cs index 248865be..215ccf82 100644 --- a/UKSFWebsite.Api.Services/Data/DataService.cs +++ b/UKSFWebsite.Api.Data/DataService.cs @@ -3,9 +3,9 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Data; -namespace UKSFWebsite.Api.Services.Data { +namespace UKSFWebsite.Api.Data { public abstract class DataService : IDataService { protected readonly IMongoDatabase Database; protected readonly string DatabaseCollection; diff --git a/UKSFWebsite.Api.Data/Game/GameServersDataService.cs b/UKSFWebsite.Api.Data/Game/GameServersDataService.cs new file mode 100644 index 00000000..c1be2a58 --- /dev/null +++ b/UKSFWebsite.Api.Data/Game/GameServersDataService.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; +using System.Linq; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Game; + +namespace UKSFWebsite.Api.Data.Game { + public class GameServersDataService : CachedDataService, IGameServersDataService { + public GameServersDataService(IMongoDatabase database) : base(database, "gameServers") { } + + public override List Get() { + base.Get(); + Collection = Collection.OrderBy(x => x.order).ToList(); + return Collection; + } + } +} diff --git a/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs b/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs new file mode 100644 index 00000000..1c22f228 --- /dev/null +++ b/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs @@ -0,0 +1,9 @@ +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Launcher; + +namespace UKSFWebsite.Api.Data.Launcher { + public class LauncherFileDataService : CachedDataService, ILauncherFileDataService { + public LauncherFileDataService(IMongoDatabase database) : base(database, "launcherFiles") { } + } +} diff --git a/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs b/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs new file mode 100644 index 00000000..8c2e801c --- /dev/null +++ b/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs @@ -0,0 +1,15 @@ +using System.Threading.Tasks; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Message; + +namespace UKSFWebsite.Api.Data.Message { + public class CommentThreadDataService : CachedDataService, ICommentThreadDataService { + public CommentThreadDataService(IMongoDatabase database) : base(database, "commentThreads") { } + + public new async Task Add(CommentThread commentThread) { + await base.Add(commentThread); + return commentThread.id; + } + } +} diff --git a/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs b/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs new file mode 100644 index 00000000..4705d9ce --- /dev/null +++ b/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs @@ -0,0 +1,20 @@ +using System.Threading.Tasks; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Message; + +namespace UKSFWebsite.Api.Data.Message { + public class NotificationsDataService : CachedDataService, INotificationsDataService { + public NotificationsDataService(IMongoDatabase database) : base(database, "notifications") { } + + public async Task UpdateMany(FilterDefinition filter, UpdateDefinition update) { + await Database.GetCollection(DatabaseCollection).UpdateManyAsync(filter, update); + Refresh(); + } + + public async Task DeleteMany(FilterDefinition filter) { + await Database.GetCollection(DatabaseCollection).DeleteManyAsync(filter); + Refresh(); + } + } +} diff --git a/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs b/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs new file mode 100644 index 00000000..7e388dcd --- /dev/null +++ b/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs @@ -0,0 +1,22 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Operations; + +namespace UKSFWebsite.Api.Data.Operations { + public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { + public OperationOrderDataService(IMongoDatabase database) : base(database, "opord") { } + + public override List Get() { + List reversed = base.Get(); + reversed.Reverse(); + return reversed; + } + + public async Task Replace(Opord opord) { + await Database.GetCollection(DatabaseCollection).ReplaceOneAsync(x => x.id == opord.id, opord); + Refresh(); + } + } +} diff --git a/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs b/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs new file mode 100644 index 00000000..0dc34548 --- /dev/null +++ b/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs @@ -0,0 +1,22 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Operations; + +namespace UKSFWebsite.Api.Data.Operations { + public class OperationReportDataService : CachedDataService, IOperationReportDataService { + public OperationReportDataService(IMongoDatabase database) : base(database, "oprep") { } + + public override List Get() { + List reversed = base.Get(); + reversed.Reverse(); + return reversed; + } + + public async Task Replace(Oprep request) { + await Database.GetCollection(DatabaseCollection).ReplaceOneAsync(x => x.id == request.id, request); + Refresh(); + } + } +} diff --git a/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs b/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs new file mode 100644 index 00000000..37c1431f --- /dev/null +++ b/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs @@ -0,0 +1,9 @@ +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Data.Personnel { + public class AccountDataService : CachedDataService, IAccountDataService { + public AccountDataService(IMongoDatabase database) : base(database, "accounts") { } + } +} diff --git a/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs b/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs new file mode 100644 index 00000000..a633072e --- /dev/null +++ b/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; +using System.Linq; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Data.Personnel { + public class DischargeDataService : CachedDataService, IDischargeDataService { + public DischargeDataService(IMongoDatabase database) : base(database, "discharges") { } + + public override List Get() { + return base.Get().OrderByDescending(x => x.discharges.Last().timestamp).ToList(); + } + } +} diff --git a/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs b/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs new file mode 100644 index 00000000..21da3200 --- /dev/null +++ b/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs @@ -0,0 +1,9 @@ +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Data.Personnel { + public class LoaDataService : CachedDataService, ILoaDataService { + public LoaDataService(IMongoDatabase database) : base(database, "loas") { } + } +} diff --git a/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs b/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs new file mode 100644 index 00000000..24f0bb1a --- /dev/null +++ b/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs @@ -0,0 +1,24 @@ +using System.Collections.Generic; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Data.Personnel { + public class RanksDataService : CachedDataService, IRanksDataService { + public RanksDataService(IMongoDatabase database) : base(database, "ranks") { } + + public override List Get() { + base.Get(); + Collection.Sort(Sort); + return Collection; + } + + public override Rank GetSingle(string name) => GetSingle(x => x.name == name); + + public int Sort(Rank rankA, Rank rankB) { + int rankOrderA = rankA?.order ?? 0; + int rankOrderB = rankB?.order ?? 0; + return rankOrderA < rankOrderB ? -1 : rankOrderA > rankOrderB ? 1 : 0; + } + } +} diff --git a/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs b/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs new file mode 100644 index 00000000..71bd11ad --- /dev/null +++ b/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs @@ -0,0 +1,19 @@ +using System.Collections.Generic; +using System.Linq; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Data.Personnel { + public class RolesDataService : CachedDataService, IRolesDataService { + public RolesDataService(IMongoDatabase database) : base(database, "roles") { } + + public override List Get() { + base.Get(); + Collection = Collection.OrderBy(x => x.name).ToList(); + return Collection; + } + + public override Role GetSingle(string name) => GetSingle(x => x.name == name); + } +} diff --git a/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj b/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj index a2f7ec36..6943c8a7 100644 --- a/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj +++ b/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj @@ -5,4 +5,14 @@ enable + + + + + + + C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\3.0.0\ref\netcoreapp3.0\Microsoft.AspNetCore.Mvc.Core.dll + + + diff --git a/UKSFWebsite.Api.Data/Units/UnitsDataService.cs b/UKSFWebsite.Api.Data/Units/UnitsDataService.cs new file mode 100644 index 00000000..1f97ac14 --- /dev/null +++ b/UKSFWebsite.Api.Data/Units/UnitsDataService.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; +using System.Linq; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Units; + +namespace UKSFWebsite.Api.Data.Units { + public class UnitsDataService : CachedDataService, IUnitsDataService { + public UnitsDataService(IMongoDatabase database) : base(database, "units") { } + + public override List Get() { + base.Get(); + Collection = Collection.OrderBy(x => x.order).ToList(); + return Collection; + } + } +} diff --git a/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs b/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs new file mode 100644 index 00000000..ed2efad5 --- /dev/null +++ b/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs @@ -0,0 +1,9 @@ +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Models.Utility; + +namespace UKSFWebsite.Api.Data.Utility { + public class ConfirmationCodeDataService : DataService, IConfirmationCodeDataService { + public ConfirmationCodeDataService(IMongoDatabase database) : base(database, "confirmationCodes") { } + } +} diff --git a/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs b/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs new file mode 100644 index 00000000..ac879e78 --- /dev/null +++ b/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs @@ -0,0 +1,9 @@ +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Models.Utility; + +namespace UKSFWebsite.Api.Data.Utility { + public class SchedulerDataService : DataService, ISchedulerDataService { + public SchedulerDataService(IMongoDatabase database) : base(database, "scheduledJobs") { } + } +} diff --git a/UKSFWebsite.Api.Services/Data/VariablesService.cs b/UKSFWebsite.Api.Data/Utility/VariablesDataService.cs similarity index 53% rename from UKSFWebsite.Api.Services/Data/VariablesService.cs rename to UKSFWebsite.Api.Data/Utility/VariablesDataService.cs index c5077ea2..0ce70fce 100644 --- a/UKSFWebsite.Api.Services/Data/VariablesService.cs +++ b/UKSFWebsite.Api.Data/Utility/VariablesDataService.cs @@ -1,16 +1,14 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text.RegularExpressions; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Utility; using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Data { - public class VariablesService : CachedDataService, IVariablesService { - public VariablesService(IMongoDatabase database) : base(database, "variables") { } +namespace UKSFWebsite.Api.Data.Utility { + public class VariablesDataService : CachedDataService, IVariablesDataService { + public VariablesDataService(IMongoDatabase database) : base(database, "variables") { } public override List Get() { base.Get(); @@ -38,16 +36,4 @@ public override async Task Delete(string key) { Refresh(); } } - - public static class VariablesServiceConverter { - public static string AsString(this VariableItem variable) => variable.item.ToString(); - public static bool AsBool(this VariableItem variable) => bool.Parse(variable.item.ToString()); - public static ulong AsUlong(this VariableItem variable) => ulong.Parse(variable.item.ToString()); - public static string[] AsArray(this VariableItem variable, Func predicate = null) { - string itemString = variable.item.ToString(); - itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); - string[] items = itemString.Split(","); - return predicate != null ? items.Select(predicate).ToArray() : items; - } - } } diff --git a/UKSFWebsite.Api.Services/Abstraction/IChainOfCommandService.cs b/UKSFWebsite.Api.Interfaces/Command/IChainOfCommandService.cs similarity index 67% rename from UKSFWebsite.Api.Services/Abstraction/IChainOfCommandService.cs rename to UKSFWebsite.Api.Interfaces/Command/IChainOfCommandService.cs index 5570cf3c..3c9ef5e3 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IChainOfCommandService.cs +++ b/UKSFWebsite.Api.Interfaces/Command/IChainOfCommandService.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; -using UKSFWebsite.Api.Models; +using UKSFWebsite.Api.Models.Command; +using UKSFWebsite.Api.Models.Units; -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Command { public interface IChainOfCommandService { HashSet ResolveChain(ChainOfCommandMode mode, string recipient, Unit start, Unit target); bool InContextChainOfCommand(string id); diff --git a/UKSFWebsite.Api.Services/Abstraction/ICommandRequestCompletionService.cs b/UKSFWebsite.Api.Interfaces/Command/ICommandRequestCompletionService.cs similarity index 72% rename from UKSFWebsite.Api.Services/Abstraction/ICommandRequestCompletionService.cs rename to UKSFWebsite.Api.Interfaces/Command/ICommandRequestCompletionService.cs index 2e13d417..47d2ee17 100644 --- a/UKSFWebsite.Api.Services/Abstraction/ICommandRequestCompletionService.cs +++ b/UKSFWebsite.Api.Interfaces/Command/ICommandRequestCompletionService.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Command { public interface ICommandRequestCompletionService { Task Resolve(string id); } diff --git a/UKSFWebsite.Api.Services/Abstraction/ICommandRequestService.cs b/UKSFWebsite.Api.Interfaces/Command/ICommandRequestService.cs similarity index 73% rename from UKSFWebsite.Api.Services/Abstraction/ICommandRequestService.cs rename to UKSFWebsite.Api.Interfaces/Command/ICommandRequestService.cs index 8bc18960..7e2499f1 100644 --- a/UKSFWebsite.Api.Services/Abstraction/ICommandRequestService.cs +++ b/UKSFWebsite.Api.Interfaces/Command/ICommandRequestService.cs @@ -1,8 +1,10 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Models.CommandRequests; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Command; -namespace UKSFWebsite.Api.Services.Abstraction { - public interface ICommandRequestService : IDataService { +namespace UKSFWebsite.Api.Interfaces.Command { + public interface ICommandRequestService { + ICommandRequestDataService Data(); Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE); Task ArchiveRequest(string id); Task SetRequestReviewState(CommandRequest request, string reviewerId, ReviewState newState); diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IAccountDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IAccountDataService.cs new file mode 100644 index 00000000..ad15a5a6 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IAccountDataService.cs @@ -0,0 +1,5 @@ +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Interfaces.Data.Cached { + public interface IAccountDataService : IDataService { } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs new file mode 100644 index 00000000..4837e676 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs @@ -0,0 +1,5 @@ +using UKSFWebsite.Api.Models.Command; + +namespace UKSFWebsite.Api.Interfaces.Data.Cached { + public interface ICommandRequestDataService : IDataService { } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs new file mode 100644 index 00000000..56e3d4cf --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs @@ -0,0 +1,8 @@ +using System.Threading.Tasks; +using UKSFWebsite.Api.Models.Message; + +namespace UKSFWebsite.Api.Interfaces.Data.Cached { + public interface ICommentThreadDataService : IDataService { + new Task Add(CommentThread commentThread); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IDischargeDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IDischargeDataService.cs new file mode 100644 index 00000000..6bbdaf38 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IDischargeDataService.cs @@ -0,0 +1,5 @@ +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Interfaces.Data.Cached { + public interface IDischargeDataService : IDataService { } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IGameServersDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IGameServersDataService.cs new file mode 100644 index 00000000..a2988ab3 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IGameServersDataService.cs @@ -0,0 +1,5 @@ +using UKSFWebsite.Api.Models.Game; + +namespace UKSFWebsite.Api.Interfaces.Data.Cached { + public interface IGameServersDataService : IDataService { } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs new file mode 100644 index 00000000..9ea5759e --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs @@ -0,0 +1,5 @@ +using UKSFWebsite.Api.Models.Launcher; + +namespace UKSFWebsite.Api.Interfaces.Data.Cached { + public interface ILauncherFileDataService : IDataService { } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/ILoaDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/ILoaDataService.cs new file mode 100644 index 00000000..47d0933b --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/ILoaDataService.cs @@ -0,0 +1,5 @@ +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Interfaces.Data.Cached { + public interface ILoaDataService : IDataService { } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/INotificationsDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/INotificationsDataService.cs new file mode 100644 index 00000000..bc8ec092 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/INotificationsDataService.cs @@ -0,0 +1,10 @@ +using System.Threading.Tasks; +using MongoDB.Driver; +using UKSFWebsite.Api.Models.Message; + +namespace UKSFWebsite.Api.Interfaces.Data.Cached { + public interface INotificationsDataService : IDataService { + Task UpdateMany(FilterDefinition filter, UpdateDefinition update); + Task DeleteMany(FilterDefinition filter); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs new file mode 100644 index 00000000..8904558e --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs @@ -0,0 +1,8 @@ +using System.Threading.Tasks; +using UKSFWebsite.Api.Models.Operations; + +namespace UKSFWebsite.Api.Interfaces.Data.Cached { + public interface IOperationOrderDataService : IDataService { + Task Replace(Opord opord); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationReportDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationReportDataService.cs new file mode 100644 index 00000000..ca16051c --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationReportDataService.cs @@ -0,0 +1,8 @@ +using System.Threading.Tasks; +using UKSFWebsite.Api.Models.Operations; + +namespace UKSFWebsite.Api.Interfaces.Data.Cached { + public interface IOperationReportDataService : IDataService { + Task Replace(Oprep oprep); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IRanksDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IRanksDataService.cs new file mode 100644 index 00000000..e57434cb --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IRanksDataService.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Interfaces.Data.Cached { + public interface IRanksDataService : IDataService { + new List Get(); + new Rank GetSingle(string name); + int Sort(Rank rankA, Rank rankB); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IRolesDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IRolesDataService.cs new file mode 100644 index 00000000..79f084c0 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IRolesDataService.cs @@ -0,0 +1,9 @@ +using System.Collections.Generic; +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Interfaces.Data.Cached { + public interface IRolesDataService : IDataService { + new List Get(); + new Role GetSingle(string name); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IUnitsDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IUnitsDataService.cs new file mode 100644 index 00000000..b5a7bf10 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IUnitsDataService.cs @@ -0,0 +1,5 @@ +using UKSFWebsite.Api.Models.Units; + +namespace UKSFWebsite.Api.Interfaces.Data.Cached { + public interface IUnitsDataService : IDataService { } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs new file mode 100644 index 00000000..8bd6c0ff --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs @@ -0,0 +1,8 @@ +using System.Threading.Tasks; +using UKSFWebsite.Api.Models.Utility; + +namespace UKSFWebsite.Api.Interfaces.Data.Cached { + public interface IVariablesDataService : IDataService { + Task Update(string key, object value); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs b/UKSFWebsite.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs new file mode 100644 index 00000000..a4a9f32a --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs @@ -0,0 +1,5 @@ +using UKSFWebsite.Api.Models.Command; + +namespace UKSFWebsite.Api.Interfaces.Data { + public interface ICommandRequestArchiveDataService : IDataService { } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/IConfirmationCodeDataService.cs b/UKSFWebsite.Api.Interfaces/Data/IConfirmationCodeDataService.cs new file mode 100644 index 00000000..1098735f --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/IConfirmationCodeDataService.cs @@ -0,0 +1,5 @@ +using UKSFWebsite.Api.Models.Utility; + +namespace UKSFWebsite.Api.Interfaces.Data { + public interface IConfirmationCodeDataService : IDataService { } +} diff --git a/UKSFWebsite.Api.Services/Abstraction/IDataService.cs b/UKSFWebsite.Api.Interfaces/Data/IDataService.cs similarity index 90% rename from UKSFWebsite.Api.Services/Abstraction/IDataService.cs rename to UKSFWebsite.Api.Interfaces/Data/IDataService.cs index db2a92e5..3f150ada 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/IDataService.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using MongoDB.Driver; -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Data { public interface IDataService { List Get(); List Get(Func predicate); @@ -14,4 +14,4 @@ public interface IDataService { Task Update(string id, UpdateDefinition update); Task Delete(string id); } -} \ No newline at end of file +} diff --git a/UKSFWebsite.Api.Interfaces/Data/ISchedulerDataService.cs b/UKSFWebsite.Api.Interfaces/Data/ISchedulerDataService.cs new file mode 100644 index 00000000..a40d4c7c --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/ISchedulerDataService.cs @@ -0,0 +1,5 @@ +using UKSFWebsite.Api.Models.Utility; + +namespace UKSFWebsite.Api.Interfaces.Data { + public interface ISchedulerDataService : IDataService { } +} diff --git a/UKSFWebsite.Api.Services/Abstraction/IGameServersService.cs b/UKSFWebsite.Api.Interfaces/Game/IGameServersService.cs similarity index 78% rename from UKSFWebsite.Api.Services/Abstraction/IGameServersService.cs rename to UKSFWebsite.Api.Interfaces/Game/IGameServersService.cs index ebec2956..e19b1d94 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IGameServersService.cs +++ b/UKSFWebsite.Api.Interfaces/Game/IGameServersService.cs @@ -1,11 +1,13 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using UKSFWebsite.Api.Models; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Game; using UKSFWebsite.Api.Models.Mission; -namespace UKSFWebsite.Api.Services.Abstraction { - public interface IGameServersService : IDataService { +namespace UKSFWebsite.Api.Interfaces.Game { + public interface IGameServersService { + IGameServersDataService Data(); int GetGameInstanceCount(); Task UploadMissionFile(IFormFile file); List GetMissionFiles(); diff --git a/UKSFWebsite.Api.Services/Abstraction/IMissionPatchingService.cs b/UKSFWebsite.Api.Interfaces/Game/IMissionPatchingService.cs similarity index 79% rename from UKSFWebsite.Api.Services/Abstraction/IMissionPatchingService.cs rename to UKSFWebsite.Api.Interfaces/Game/IMissionPatchingService.cs index 03e00062..592abcdd 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IMissionPatchingService.cs +++ b/UKSFWebsite.Api.Interfaces/Game/IMissionPatchingService.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using UKSFWebsite.Api.Models.Mission; -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Game { public interface IMissionPatchingService { Task PatchMission(string path); } diff --git a/UKSFWebsite.Api.Services/Abstraction/IDiscordService.cs b/UKSFWebsite.Api.Interfaces/Integrations/IDiscordService.cs similarity index 81% rename from UKSFWebsite.Api.Services/Abstraction/IDiscordService.cs rename to UKSFWebsite.Api.Interfaces/Integrations/IDiscordService.cs index d3740a08..be9d8758 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IDiscordService.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/IDiscordService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Threading.Tasks; using Discord.WebSocket; -using UKSFWebsite.Api.Models.Accounts; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Integrations { public interface IDiscordService { Task ConnectDiscord(); bool IsAccountOnline(Account account); @@ -12,4 +12,4 @@ public interface IDiscordService { Task UpdateAllUsers(); Task UpdateAccount(Account account, ulong discordId = 0); } -} \ No newline at end of file +} diff --git a/UKSFWebsite.Api.Services/Abstraction/IPipeManager.cs b/UKSFWebsite.Api.Interfaces/Integrations/IPipeManager.cs similarity index 64% rename from UKSFWebsite.Api.Services/Abstraction/IPipeManager.cs rename to UKSFWebsite.Api.Interfaces/Integrations/IPipeManager.cs index 08a46742..cd1efdfb 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IPipeManager.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/IPipeManager.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Integrations { public interface IPipeManager : IDisposable { void Start(); } diff --git a/UKSFWebsite.Api.Services/Abstraction/ITeamspeakGroupService.cs b/UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakGroupService.cs similarity index 68% rename from UKSFWebsite.Api.Services/Abstraction/ITeamspeakGroupService.cs rename to UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakGroupService.cs index a98ec2ea..6d97a410 100644 --- a/UKSFWebsite.Api.Services/Abstraction/ITeamspeakGroupService.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakGroupService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using UKSFWebsite.Api.Models.Accounts; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Integrations { public interface ITeamspeakGroupService { void UpdateAccountGroups(Account account, ICollection serverGroups, string clientDbId); } diff --git a/UKSFWebsite.Api.Services/Abstraction/ITeamspeakMetricsService.cs b/UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakMetricsService.cs similarity index 76% rename from UKSFWebsite.Api.Services/Abstraction/ITeamspeakMetricsService.cs rename to UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakMetricsService.cs index 9352fa17..42a3af77 100644 --- a/UKSFWebsite.Api.Services/Abstraction/ITeamspeakMetricsService.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakMetricsService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Integrations { public interface ITeamspeakMetricsService { float GetWeeklyParticipationTrend(HashSet teamspeakIdentities); } diff --git a/UKSFWebsite.Api.Services/Abstraction/ITeamspeakService.cs b/UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakService.cs similarity index 87% rename from UKSFWebsite.Api.Services/Abstraction/ITeamspeakService.cs rename to UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakService.cs index 7e828540..28fbf450 100644 --- a/UKSFWebsite.Api.Services/Abstraction/ITeamspeakService.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakService.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Accounts; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Integrations { public interface ITeamspeakService { string GetOnlineTeamspeakClients(); (bool online, string nickname) GetOnlineUserDetails(Account account); diff --git a/UKSFWebsite.Api.Services/Abstraction/ILauncherFileService.cs b/UKSFWebsite.Api.Interfaces/Launcher/ILauncherFileService.cs similarity index 64% rename from UKSFWebsite.Api.Services/Abstraction/ILauncherFileService.cs rename to UKSFWebsite.Api.Interfaces/Launcher/ILauncherFileService.cs index fbe6ada3..a86e2fb9 100644 --- a/UKSFWebsite.Api.Services/Abstraction/ILauncherFileService.cs +++ b/UKSFWebsite.Api.Interfaces/Launcher/ILauncherFileService.cs @@ -2,10 +2,12 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Models.Launcher; -namespace UKSFWebsite.Api.Services.Abstraction { - public interface ILauncherFileService : IDataService { +namespace UKSFWebsite.Api.Interfaces.Launcher { + public interface ILauncherFileService { + ILauncherFileDataService Data(); Task UpdateAllVersions(); FileStreamResult GetLauncherFile(params string[] file); Task GetUpdatedFiles(IEnumerable files); diff --git a/UKSFWebsite.Api.Interfaces/Launcher/ILauncherService.cs b/UKSFWebsite.Api.Interfaces/Launcher/ILauncherService.cs new file mode 100644 index 00000000..cb07397e --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Launcher/ILauncherService.cs @@ -0,0 +1,3 @@ +namespace UKSFWebsite.Api.Interfaces.Launcher { + public interface ILauncherService { } +} diff --git a/UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs b/UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs new file mode 100644 index 00000000..93b63570 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs @@ -0,0 +1,14 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Message; + +namespace UKSFWebsite.Api.Interfaces.Message { + public interface ICommentThreadService { + ICommentThreadDataService Data(); + IEnumerable GetCommentThreadComments(string id); + Task InsertComment(string id, Comment comment); + Task RemoveComment(string id, Comment comment); + IEnumerable GetCommentThreadParticipants(string id); + } +} diff --git a/UKSFWebsite.Api.Services/Abstraction/IEmailService.cs b/UKSFWebsite.Api.Interfaces/Message/IEmailService.cs similarity index 69% rename from UKSFWebsite.Api.Services/Abstraction/IEmailService.cs rename to UKSFWebsite.Api.Interfaces/Message/IEmailService.cs index 99c13dbf..3eadc121 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IEmailService.cs +++ b/UKSFWebsite.Api.Interfaces/Message/IEmailService.cs @@ -1,5 +1,5 @@ -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Message { public interface IEmailService { void SendEmail(string targetEmail, string subject, string htmlEmail); } -} \ No newline at end of file +} diff --git a/UKSFWebsite.Api.Services/Abstraction/ILogging.cs b/UKSFWebsite.Api.Interfaces/Message/ILoggingService.cs similarity index 51% rename from UKSFWebsite.Api.Services/Abstraction/ILogging.cs rename to UKSFWebsite.Api.Interfaces/Message/ILoggingService.cs index 27168f93..f4185fb3 100644 --- a/UKSFWebsite.Api.Services/Abstraction/ILogging.cs +++ b/UKSFWebsite.Api.Interfaces/Message/ILoggingService.cs @@ -1,8 +1,8 @@ using System; -using UKSFWebsite.Api.Models.Logging; +using UKSFWebsite.Api.Models.Message.Logging; -namespace UKSFWebsite.Api.Services.Abstraction { - public interface ILogging { +namespace UKSFWebsite.Api.Interfaces.Message { + public interface ILoggingService { void Log(string message); void Log(BasicLogMessage log); void Log(Exception exception); diff --git a/UKSFWebsite.Api.Services/Abstraction/INotificationsService.cs b/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs similarity index 57% rename from UKSFWebsite.Api.Services/Abstraction/INotificationsService.cs rename to UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs index a5b4dd92..09de9e8c 100644 --- a/UKSFWebsite.Api.Services/Abstraction/INotificationsService.cs +++ b/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs @@ -1,14 +1,16 @@ using System.Collections.Generic; using System.Threading.Tasks; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Abstraction { - public interface INotificationsService : IDataService { +namespace UKSFWebsite.Api.Interfaces.Message { + public interface INotificationsService { + INotificationsDataService Data(); + void Add(Notification notification); void SendTeamspeakNotification(Account account, string rawMessage); void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage); IEnumerable GetNotificationsForContext(); - new void Add(Notification notification); Task MarkNotificationsAsRead(IEnumerable ids); Task Delete(IEnumerable ids); } diff --git a/UKSFWebsite.Api.Interfaces/Operations/IOperationOrderService.cs b/UKSFWebsite.Api.Interfaces/Operations/IOperationOrderService.cs new file mode 100644 index 00000000..73f0c207 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Operations/IOperationOrderService.cs @@ -0,0 +1,10 @@ +using System.Threading.Tasks; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Operations; + +namespace UKSFWebsite.Api.Interfaces.Operations { + public interface IOperationOrderService { + IOperationOrderDataService Data(); + Task Add(CreateOperationOrderRequest request); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Operations/IOperationReportService.cs b/UKSFWebsite.Api.Interfaces/Operations/IOperationReportService.cs new file mode 100644 index 00000000..3d0df0b8 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Operations/IOperationReportService.cs @@ -0,0 +1,10 @@ +using System.Threading.Tasks; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Operations; + +namespace UKSFWebsite.Api.Interfaces.Operations { + public interface IOperationReportService { + IOperationReportDataService Data(); + Task Create(CreateOperationReportRequest request); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs new file mode 100644 index 00000000..c0d1c58b --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs @@ -0,0 +1,12 @@ +using System.Threading.Tasks; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Interfaces.Personnel { + public interface IAccountService { + IAccountDataService Data(); + Task Update(string id, string fieldName, object value); + Task Update(string id, UpdateDefinition update); + } +} diff --git a/UKSFWebsite.Api.Services/Abstraction/IAssignmentService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IAssignmentService.cs similarity index 86% rename from UKSFWebsite.Api.Services/Abstraction/IAssignmentService.cs rename to UKSFWebsite.Api.Interfaces/Personnel/IAssignmentService.cs index 3c9d09a7..543a36a7 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IAssignmentService.cs +++ b/UKSFWebsite.Api.Interfaces/Personnel/IAssignmentService.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Models; +using UKSFWebsite.Api.Models.Message; -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Personnel { public interface IAssignmentService { Task AssignUnitRole(string id, string unitId, string role); Task UnassignAllUnits(string id); diff --git a/UKSFWebsite.Api.Services/Abstraction/IAttendanceService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IAttendanceService.cs similarity index 67% rename from UKSFWebsite.Api.Services/Abstraction/IAttendanceService.cs rename to UKSFWebsite.Api.Interfaces/Personnel/IAttendanceService.cs index acdfab67..5a6e860f 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IAttendanceService.cs +++ b/UKSFWebsite.Api.Interfaces/Personnel/IAttendanceService.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; -using UKSFWebsite.Api.Models; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Personnel { public interface IAttendanceService { Task GenerateAttendanceReport(DateTime start, DateTime end); } diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IDischargeService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IDischargeService.cs new file mode 100644 index 00000000..390431c4 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Personnel/IDischargeService.cs @@ -0,0 +1,7 @@ +using UKSFWebsite.Api.Interfaces.Data.Cached; + +namespace UKSFWebsite.Api.Interfaces.Personnel { + public interface IDischargeService { + IDischargeDataService Data(); + } +} diff --git a/UKSFWebsite.Api.Services/Abstraction/IDisplayNameService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IDisplayNameService.cs similarity index 68% rename from UKSFWebsite.Api.Services/Abstraction/IDisplayNameService.cs rename to UKSFWebsite.Api.Interfaces/Personnel/IDisplayNameService.cs index bde1bcb1..8dc5e66b 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IDisplayNameService.cs +++ b/UKSFWebsite.Api.Interfaces/Personnel/IDisplayNameService.cs @@ -1,6 +1,6 @@ -using UKSFWebsite.Api.Models.Accounts; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Personnel { public interface IDisplayNameService { string GetDisplayName(Account account); string GetDisplayName(string id); diff --git a/UKSFWebsite.Api.Services/Abstraction/ILoaService.cs b/UKSFWebsite.Api.Interfaces/Personnel/ILoaService.cs similarity index 56% rename from UKSFWebsite.Api.Services/Abstraction/ILoaService.cs rename to UKSFWebsite.Api.Interfaces/Personnel/ILoaService.cs index d730bc2a..a510a67a 100644 --- a/UKSFWebsite.Api.Services/Abstraction/ILoaService.cs +++ b/UKSFWebsite.Api.Interfaces/Personnel/ILoaService.cs @@ -1,11 +1,13 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.CommandRequests; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Command; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Abstraction { - public interface ILoaService : IDataService { +namespace UKSFWebsite.Api.Interfaces.Personnel { + public interface ILoaService { + ILoaDataService Data(); IEnumerable Get(List ids); Task Add(CommandRequestLoa requestBase); Task SetLoaState(string id, LoaReviewState state); diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IRanksService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IRanksService.cs new file mode 100644 index 00000000..0ea737ec --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Personnel/IRanksService.cs @@ -0,0 +1,12 @@ +using UKSFWebsite.Api.Interfaces.Data.Cached; + +namespace UKSFWebsite.Api.Interfaces.Personnel { + public interface IRanksService { + IRanksDataService Data(); + int GetRankIndex(string rankName); + int Sort(string nameA, string nameB); + bool IsEqual(string nameA, string nameB); + bool IsSuperior(string nameA, string nameB); + bool IsSuperiorOrEqual(string nameA, string nameB); + } +} diff --git a/UKSFWebsite.Api.Services/Abstraction/IRecruitmentService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IRecruitmentService.cs similarity index 87% rename from UKSFWebsite.Api.Services/Abstraction/IRecruitmentService.cs rename to UKSFWebsite.Api.Interfaces/Personnel/IRecruitmentService.cs index ec7efaf5..c7773507 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IRecruitmentService.cs +++ b/UKSFWebsite.Api.Interfaces/Personnel/IRecruitmentService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Threading.Tasks; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Models.Accounts; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Personnel { public interface IRecruitmentService { object GetAllApplications(); JObject GetApplication(Account account); diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IRolesService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IRolesService.cs new file mode 100644 index 00000000..ac753fd6 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Personnel/IRolesService.cs @@ -0,0 +1,10 @@ +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Interfaces.Personnel { + public interface IRolesService { + IRolesDataService Data(); + int Sort(string nameA, string nameB); + Role GetUnitRoleByOrder(int order); + } +} diff --git a/UKSFWebsite.Api.Services/Abstraction/IServiceRecordService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IServiceRecordService.cs similarity index 70% rename from UKSFWebsite.Api.Services/Abstraction/IServiceRecordService.cs rename to UKSFWebsite.Api.Interfaces/Personnel/IServiceRecordService.cs index 67477c1d..c3689455 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IServiceRecordService.cs +++ b/UKSFWebsite.Api.Interfaces/Personnel/IServiceRecordService.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Personnel { public interface IServiceRecordService { void AddServiceRecord(string id, string occurence, string notes); } diff --git a/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj b/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj new file mode 100644 index 00000000..50899d88 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj @@ -0,0 +1,24 @@ + + + + netcoreapp3.0 + + + + + + + + + + + + + C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\3.0.0\ref\netcoreapp3.0\Microsoft.AspNetCore.Http.Features.dll + + + C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\3.0.0\ref\netcoreapp3.0\Microsoft.AspNetCore.Mvc.Core.dll + + + + diff --git a/UKSFWebsite.Api.Services/Abstraction/IUnitsService.cs b/UKSFWebsite.Api.Interfaces/Units/IUnitsService.cs similarity index 85% rename from UKSFWebsite.Api.Services/Abstraction/IUnitsService.cs rename to UKSFWebsite.Api.Interfaces/Units/IUnitsService.cs index 0e91447a..6bfb63d7 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IUnitsService.cs +++ b/UKSFWebsite.Api.Interfaces/Units/IUnitsService.cs @@ -1,11 +1,13 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; -namespace UKSFWebsite.Api.Services.Abstraction { - public interface IUnitsService : IDataService { +namespace UKSFWebsite.Api.Interfaces.Units { + public interface IUnitsService { + IUnitsDataService Data(); IEnumerable GetSortedUnits(Func predicate = null); Task AddMember(string id, string unitId); Task RemoveMember(string id, string unitName); diff --git a/UKSFWebsite.Api.Services/Abstraction/IConfirmationCodeService.cs b/UKSFWebsite.Api.Interfaces/Utility/IConfirmationCodeService.cs similarity index 50% rename from UKSFWebsite.Api.Services/Abstraction/IConfirmationCodeService.cs rename to UKSFWebsite.Api.Interfaces/Utility/IConfirmationCodeService.cs index 231cea97..4f9ff555 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IConfirmationCodeService.cs +++ b/UKSFWebsite.Api.Interfaces/Utility/IConfirmationCodeService.cs @@ -1,8 +1,9 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Models; +using UKSFWebsite.Api.Interfaces.Data; -namespace UKSFWebsite.Api.Services.Abstraction { - public interface IConfirmationCodeService : IDataService { +namespace UKSFWebsite.Api.Interfaces.Utility { + public interface IConfirmationCodeService { + IConfirmationCodeDataService Data(); Task CreateConfirmationCode(string value, bool integration = false); Task GetConfirmationCode(string id); } diff --git a/UKSFWebsite.Api.Services/Abstraction/ILoginService.cs b/UKSFWebsite.Api.Interfaces/Utility/ILoginService.cs similarity index 79% rename from UKSFWebsite.Api.Services/Abstraction/ILoginService.cs rename to UKSFWebsite.Api.Interfaces/Utility/ILoginService.cs index 0ffcd79b..4534088c 100644 --- a/UKSFWebsite.Api.Services/Abstraction/ILoginService.cs +++ b/UKSFWebsite.Api.Interfaces/Utility/ILoginService.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Utility { public interface ILoginService { string Login(string email, string password); string LoginWithoutPassword(string email); diff --git a/UKSFWebsite.Api.Services/Abstraction/ISchedulerService.cs b/UKSFWebsite.Api.Interfaces/Utility/ISchedulerService.cs similarity index 57% rename from UKSFWebsite.Api.Services/Abstraction/ISchedulerService.cs rename to UKSFWebsite.Api.Interfaces/Utility/ISchedulerService.cs index 6c0cefd4..f6de2372 100644 --- a/UKSFWebsite.Api.Services/Abstraction/ISchedulerService.cs +++ b/UKSFWebsite.Api.Interfaces/Utility/ISchedulerService.cs @@ -1,11 +1,13 @@ using System; using System.Threading.Tasks; -using UKSFWebsite.Api.Models; +using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Models.Utility; -namespace UKSFWebsite.Api.Services.Abstraction { - public interface ISchedulerService : IDataService { +namespace UKSFWebsite.Api.Interfaces.Utility { + public interface ISchedulerService { + ISchedulerDataService Data(); void Load(bool integration = false); Task Create(DateTime next, TimeSpan interval, ScheduledJobType type, string action, params object[] actionParameters); Task Cancel(Func predicate); } -} \ No newline at end of file +} diff --git a/UKSFWebsite.Api.Services/Abstraction/IServerService.cs b/UKSFWebsite.Api.Interfaces/Utility/IServerService.cs similarity index 59% rename from UKSFWebsite.Api.Services/Abstraction/IServerService.cs rename to UKSFWebsite.Api.Interfaces/Utility/IServerService.cs index 63671f66..6b7e6292 100644 --- a/UKSFWebsite.Api.Services/Abstraction/IServerService.cs +++ b/UKSFWebsite.Api.Interfaces/Utility/IServerService.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Utility { public interface IServerService { void UpdateSquadXml(); } diff --git a/UKSFWebsite.Api.Services/Abstraction/ISessionService.cs b/UKSFWebsite.Api.Interfaces/Utility/ISessionService.cs similarity index 67% rename from UKSFWebsite.Api.Services/Abstraction/ISessionService.cs rename to UKSFWebsite.Api.Interfaces/Utility/ISessionService.cs index 6004cfc8..97ecc22e 100644 --- a/UKSFWebsite.Api.Services/Abstraction/ISessionService.cs +++ b/UKSFWebsite.Api.Interfaces/Utility/ISessionService.cs @@ -1,6 +1,6 @@ -using UKSFWebsite.Api.Models.Accounts; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Utility { public interface ISessionService { Account GetContextAccount(); string GetContextEmail(); diff --git a/UKSFWebsite.Api.Models/Command/ChainOfCommandMode.cs b/UKSFWebsite.Api.Models/Command/ChainOfCommandMode.cs new file mode 100644 index 00000000..55f283d3 --- /dev/null +++ b/UKSFWebsite.Api.Models/Command/ChainOfCommandMode.cs @@ -0,0 +1,12 @@ +namespace UKSFWebsite.Api.Models.Command { + public enum ChainOfCommandMode { + FULL, + NEXT_COMMANDER, + NEXT_COMMANDER_EXCLUDE_SELF, + COMMANDER_AND_ONE_ABOVE, + COMMANDER_AND_SR10, + COMMANDER_AND_TARGET_COMMANDER, + SR10, + TARGET_COMMANDER + } +} diff --git a/UKSFWebsite.Api.Models/CommandRequests/CommandRequest.cs b/UKSFWebsite.Api.Models/Command/CommandRequest.cs similarity index 96% rename from UKSFWebsite.Api.Models/CommandRequests/CommandRequest.cs rename to UKSFWebsite.Api.Models/Command/CommandRequest.cs index 4b87ecdc..394f7fe8 100644 --- a/UKSFWebsite.Api.Models/CommandRequests/CommandRequest.cs +++ b/UKSFWebsite.Api.Models/Command/CommandRequest.cs @@ -3,7 +3,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.CommandRequests { +namespace UKSFWebsite.Api.Models.Command { public enum ReviewState { APPROVED, REJECTED, diff --git a/UKSFWebsite.Api.Models/CommandRequests/CommandRequestLoa.cs b/UKSFWebsite.Api.Models/Command/CommandRequestLoa.cs similarity index 79% rename from UKSFWebsite.Api.Models/CommandRequests/CommandRequestLoa.cs rename to UKSFWebsite.Api.Models/Command/CommandRequestLoa.cs index c714a942..dae94036 100644 --- a/UKSFWebsite.Api.Models/CommandRequests/CommandRequestLoa.cs +++ b/UKSFWebsite.Api.Models/Command/CommandRequestLoa.cs @@ -1,10 +1,10 @@ using System; -namespace UKSFWebsite.Api.Models.CommandRequests { +namespace UKSFWebsite.Api.Models.Command { public class CommandRequestLoa : CommandRequest { public string emergency; - public DateTime start; public DateTime end; public string late; + public DateTime start; } } diff --git a/UKSFWebsite.Api.Models/GameServer.cs b/UKSFWebsite.Api.Models/Game/GameServer.cs similarity index 97% rename from UKSFWebsite.Api.Models/GameServer.cs rename to UKSFWebsite.Api.Models/Game/GameServer.cs index 51ca062b..5d6a0cf3 100644 --- a/UKSFWebsite.Api.Models/GameServer.cs +++ b/UKSFWebsite.Api.Models/Game/GameServer.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Game { public enum GameServerOption { NONE, SINGLETON, diff --git a/UKSFWebsite.Api.Models/GameServerMod.cs b/UKSFWebsite.Api.Models/Game/GameServerMod.cs similarity index 85% rename from UKSFWebsite.Api.Models/GameServerMod.cs rename to UKSFWebsite.Api.Models/Game/GameServerMod.cs index 5df1cda8..0762cc9c 100644 --- a/UKSFWebsite.Api.Models/GameServerMod.cs +++ b/UKSFWebsite.Api.Models/Game/GameServerMod.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Game { public class GameServerMod { public bool isDuplicate; public string name; diff --git a/UKSFWebsite.Api.Models/MissionFile.cs b/UKSFWebsite.Api.Models/Game/MissionFile.cs similarity index 90% rename from UKSFWebsite.Api.Models/MissionFile.cs rename to UKSFWebsite.Api.Models/Game/MissionFile.cs index cfaa3373..40226b4d 100644 --- a/UKSFWebsite.Api.Models/MissionFile.cs +++ b/UKSFWebsite.Api.Models/Game/MissionFile.cs @@ -1,6 +1,6 @@ using System.IO; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Game { public class MissionFile { public string map; public string name; diff --git a/UKSFWebsite.Api.Models/TeamspeakClientSnapshot.cs b/UKSFWebsite.Api.Models/Integrations/TeamspeakClientSnapshot.cs similarity index 78% rename from UKSFWebsite.Api.Models/TeamspeakClientSnapshot.cs rename to UKSFWebsite.Api.Models/Integrations/TeamspeakClientSnapshot.cs index 97d68fd0..6d7e6d0b 100644 --- a/UKSFWebsite.Api.Models/TeamspeakClientSnapshot.cs +++ b/UKSFWebsite.Api.Models/Integrations/TeamspeakClientSnapshot.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Integrations { public class TeamspeakClientSnapshot { public string channelId; public string channelName; diff --git a/UKSFWebsite.Api.Models/TeamspeakServerSnapshot.cs b/UKSFWebsite.Api.Models/Integrations/TeamspeakServerSnapshot.cs similarity index 80% rename from UKSFWebsite.Api.Models/TeamspeakServerSnapshot.cs rename to UKSFWebsite.Api.Models/Integrations/TeamspeakServerSnapshot.cs index 7ef36fd5..db6ca7bc 100644 --- a/UKSFWebsite.Api.Models/TeamspeakServerSnapshot.cs +++ b/UKSFWebsite.Api.Models/Integrations/TeamspeakServerSnapshot.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Integrations { public class TeamspeakServerSnapshot { public DateTime timestamp; public HashSet users; diff --git a/UKSFWebsite.Api.Models/Launcher/LauncherFile.cs b/UKSFWebsite.Api.Models/Launcher/LauncherFile.cs index 109374c3..46367a64 100644 --- a/UKSFWebsite.Api.Models/Launcher/LauncherFile.cs +++ b/UKSFWebsite.Api.Models/Launcher/LauncherFile.cs @@ -3,8 +3,8 @@ namespace UKSFWebsite.Api.Models.Launcher { public class LauncherFile { - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public string fileName; + [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public string version; } } diff --git a/UKSFWebsite.Api.Models/Comment.cs b/UKSFWebsite.Api.Models/Message/Comment.cs similarity index 88% rename from UKSFWebsite.Api.Models/Comment.cs rename to UKSFWebsite.Api.Models/Message/Comment.cs index 6af16ff9..dd44b4b2 100644 --- a/UKSFWebsite.Api.Models/Comment.cs +++ b/UKSFWebsite.Api.Models/Message/Comment.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Message { public class Comment { [BsonRepresentation(BsonType.ObjectId)] public string author; public string content; diff --git a/UKSFWebsite.Api.Models/CommentThread.cs b/UKSFWebsite.Api.Models/Message/CommentThread.cs similarity index 91% rename from UKSFWebsite.Api.Models/CommentThread.cs rename to UKSFWebsite.Api.Models/Message/CommentThread.cs index 4cc54bc9..4b64de88 100644 --- a/UKSFWebsite.Api.Models/CommentThread.cs +++ b/UKSFWebsite.Api.Models/Message/CommentThread.cs @@ -1,7 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Message { public enum ThreadMode { ALL, SR1, diff --git a/UKSFWebsite.Api.Models/Logging/AuditLogMessage.cs b/UKSFWebsite.Api.Models/Message/Logging/AuditLogMessage.cs similarity index 61% rename from UKSFWebsite.Api.Models/Logging/AuditLogMessage.cs rename to UKSFWebsite.Api.Models/Message/Logging/AuditLogMessage.cs index 8098a008..33607fc3 100644 --- a/UKSFWebsite.Api.Models/Logging/AuditLogMessage.cs +++ b/UKSFWebsite.Api.Models/Message/Logging/AuditLogMessage.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models.Logging { +namespace UKSFWebsite.Api.Models.Message.Logging { public class AuditLogMessage : BasicLogMessage { public string who; } diff --git a/UKSFWebsite.Api.Models/Logging/BasicLogMessage.cs b/UKSFWebsite.Api.Models/Message/Logging/BasicLogMessage.cs similarity index 95% rename from UKSFWebsite.Api.Models/Logging/BasicLogMessage.cs rename to UKSFWebsite.Api.Models/Message/Logging/BasicLogMessage.cs index 22fa69f8..7563c547 100644 --- a/UKSFWebsite.Api.Models/Logging/BasicLogMessage.cs +++ b/UKSFWebsite.Api.Models/Message/Logging/BasicLogMessage.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Logging { +namespace UKSFWebsite.Api.Models.Message.Logging { public enum LogLevel { DEBUG, INFO, diff --git a/UKSFWebsite.Api.Models/Logging/LauncherLogMessage.cs b/UKSFWebsite.Api.Models/Message/Logging/LauncherLogMessage.cs similarity index 82% rename from UKSFWebsite.Api.Models/Logging/LauncherLogMessage.cs rename to UKSFWebsite.Api.Models/Message/Logging/LauncherLogMessage.cs index 0e4ab219..cd0fb711 100644 --- a/UKSFWebsite.Api.Models/Logging/LauncherLogMessage.cs +++ b/UKSFWebsite.Api.Models/Message/Logging/LauncherLogMessage.cs @@ -1,7 +1,7 @@ -namespace UKSFWebsite.Api.Models.Logging { +namespace UKSFWebsite.Api.Models.Message.Logging { public class LauncherLogMessage : BasicLogMessage { - public string userId; public string name; + public string userId; public string version; public LauncherLogMessage(string version, string message) : base(message) => this.version = version; diff --git a/UKSFWebsite.Api.Models/Logging/WebLogMessage.cs b/UKSFWebsite.Api.Models/Message/Logging/WebLogMessage.cs similarity index 90% rename from UKSFWebsite.Api.Models/Logging/WebLogMessage.cs rename to UKSFWebsite.Api.Models/Message/Logging/WebLogMessage.cs index 604ec45c..978bc532 100644 --- a/UKSFWebsite.Api.Models/Logging/WebLogMessage.cs +++ b/UKSFWebsite.Api.Models/Message/Logging/WebLogMessage.cs @@ -1,12 +1,12 @@ using System; -namespace UKSFWebsite.Api.Models.Logging { +namespace UKSFWebsite.Api.Models.Message.Logging { public class WebLogMessage : BasicLogMessage { public string exception; public string httpMethod; + public string name; public string url; public string userId; - public string name; public WebLogMessage() { } diff --git a/UKSFWebsite.Api.Models/Notification.cs b/UKSFWebsite.Api.Models/Message/Notification.cs similarity index 91% rename from UKSFWebsite.Api.Models/Notification.cs rename to UKSFWebsite.Api.Models/Message/Notification.cs index 5a7d3836..71034b18 100644 --- a/UKSFWebsite.Api.Models/Notification.cs +++ b/UKSFWebsite.Api.Models/Message/Notification.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Message { public class Notification { public string icon; [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; diff --git a/UKSFWebsite.Api.Models/Message/NotificationIcons.cs b/UKSFWebsite.Api.Models/Message/NotificationIcons.cs new file mode 100644 index 00000000..28a537f1 --- /dev/null +++ b/UKSFWebsite.Api.Models/Message/NotificationIcons.cs @@ -0,0 +1,9 @@ +namespace UKSFWebsite.Api.Models.Message { + public static class NotificationIcons { + public const string APPLICATION = "group_add"; + public const string COMMENT = "comment"; + public const string DEMOTION = "mood_bad"; + public const string PROMOTION = "stars"; + public const string REQUEST = "add_circle"; + } +} diff --git a/UKSFWebsite.Api.Models/Mission/MissionPatchData.cs b/UKSFWebsite.Api.Models/Mission/MissionPatchData.cs index f5eea424..d463f155 100644 --- a/UKSFWebsite.Api.Models/Mission/MissionPatchData.cs +++ b/UKSFWebsite.Api.Models/Mission/MissionPatchData.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Models.Mission { public class MissionPatchData { diff --git a/UKSFWebsite.Api.Models/Mission/MissionPatchingReport.cs b/UKSFWebsite.Api.Models/Mission/MissionPatchingReport.cs index ad1cc6e0..a2772886 100644 --- a/UKSFWebsite.Api.Models/Mission/MissionPatchingReport.cs +++ b/UKSFWebsite.Api.Models/Mission/MissionPatchingReport.cs @@ -2,9 +2,9 @@ namespace UKSFWebsite.Api.Models.Mission { public class MissionPatchingReport { - public string title; public string detail; public bool error; + public string title; public MissionPatchingReport(Exception exception) { title = exception.GetBaseException().Message; diff --git a/UKSFWebsite.Api.Models/Mission/MissionPatchingResult.cs b/UKSFWebsite.Api.Models/Mission/MissionPatchingResult.cs index e7f34ff1..f761c23d 100644 --- a/UKSFWebsite.Api.Models/Mission/MissionPatchingResult.cs +++ b/UKSFWebsite.Api.Models/Mission/MissionPatchingResult.cs @@ -3,7 +3,7 @@ namespace UKSFWebsite.Api.Models.Mission { public class MissionPatchingResult { public int playerCount; - public bool success; public List reports = new List(); + public bool success; } } diff --git a/UKSFWebsite.Api.Models/Mission/MissionPlayer.cs b/UKSFWebsite.Api.Models/Mission/MissionPlayer.cs index f130f6fa..27613daa 100644 --- a/UKSFWebsite.Api.Models/Mission/MissionPlayer.cs +++ b/UKSFWebsite.Api.Models/Mission/MissionPlayer.cs @@ -1,4 +1,4 @@ -using UKSFWebsite.Api.Models.Accounts; +using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Models.Mission { public class MissionPlayer { diff --git a/UKSFWebsite.Api.Models/Mission/MissionUnit.cs b/UKSFWebsite.Api.Models/Mission/MissionUnit.cs index 43364168..9010d435 100644 --- a/UKSFWebsite.Api.Models/Mission/MissionUnit.cs +++ b/UKSFWebsite.Api.Models/Mission/MissionUnit.cs @@ -1,11 +1,12 @@ using System.Collections.Generic; +using UKSFWebsite.Api.Models.Units; namespace UKSFWebsite.Api.Models.Mission { public class MissionUnit { public string callsign; + public int depth; public List members = new List(); public Dictionary roles = new Dictionary(); public Unit sourceUnit; - public int depth; } } diff --git a/UKSFWebsite.Api.Models/Requests/CreateOperationOrderRequest.cs b/UKSFWebsite.Api.Models/Operations/CreateOperationOrderRequest.cs similarity index 80% rename from UKSFWebsite.Api.Models/Requests/CreateOperationOrderRequest.cs rename to UKSFWebsite.Api.Models/Operations/CreateOperationOrderRequest.cs index a6b18a6f..974159d2 100644 --- a/UKSFWebsite.Api.Models/Requests/CreateOperationOrderRequest.cs +++ b/UKSFWebsite.Api.Models/Operations/CreateOperationOrderRequest.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Models.Requests { +namespace UKSFWebsite.Api.Models.Operations { public class CreateOperationOrderRequest { public string name, map, type; public DateTime start, end; diff --git a/UKSFWebsite.Api.Models/Requests/CreateOperationReport.cs b/UKSFWebsite.Api.Models/Operations/CreateOperationReport.cs similarity index 80% rename from UKSFWebsite.Api.Models/Requests/CreateOperationReport.cs rename to UKSFWebsite.Api.Models/Operations/CreateOperationReport.cs index f5eaeaf7..db0c17de 100644 --- a/UKSFWebsite.Api.Models/Requests/CreateOperationReport.cs +++ b/UKSFWebsite.Api.Models/Operations/CreateOperationReport.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Models.Requests { +namespace UKSFWebsite.Api.Models.Operations { public class CreateOperationReportRequest { public string name, map, type, result; public DateTime start, end; diff --git a/UKSFWebsite.Api.Models/Operation.cs b/UKSFWebsite.Api.Models/Operations/Operation.cs similarity index 79% rename from UKSFWebsite.Api.Models/Operation.cs rename to UKSFWebsite.Api.Models/Operations/Operation.cs index 8206cfb9..bf160198 100644 --- a/UKSFWebsite.Api.Models/Operation.cs +++ b/UKSFWebsite.Api.Models/Operations/Operation.cs @@ -1,8 +1,9 @@ using System; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Operations { public class Operation { public AttendanceReport attendanceReport; [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; diff --git a/UKSFWebsite.Api.Models/Opord.cs b/UKSFWebsite.Api.Models/Operations/Opord.cs similarity index 85% rename from UKSFWebsite.Api.Models/Opord.cs rename to UKSFWebsite.Api.Models/Operations/Opord.cs index e6fb6cd5..e782eb1c 100644 --- a/UKSFWebsite.Api.Models/Opord.cs +++ b/UKSFWebsite.Api.Models/Operations/Opord.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Operations { public class Opord { [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public string name, map, type, description; diff --git a/UKSFWebsite.Api.Models/Oprep.cs b/UKSFWebsite.Api.Models/Operations/Oprep.cs similarity index 79% rename from UKSFWebsite.Api.Models/Oprep.cs rename to UKSFWebsite.Api.Models/Operations/Oprep.cs index d5656d7f..985b0124 100644 --- a/UKSFWebsite.Api.Models/Oprep.cs +++ b/UKSFWebsite.Api.Models/Operations/Oprep.cs @@ -1,8 +1,9 @@ using System; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Operations { public class Oprep { public AttendanceReport attendanceReport; [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; diff --git a/UKSFWebsite.Api.Models/Accounts/Account.cs b/UKSFWebsite.Api.Models/Personnel/Account.cs similarity index 96% rename from UKSFWebsite.Api.Models/Accounts/Account.cs rename to UKSFWebsite.Api.Models/Personnel/Account.cs index 22e47e0b..744ce185 100644 --- a/UKSFWebsite.Api.Models/Accounts/Account.cs +++ b/UKSFWebsite.Api.Models/Personnel/Account.cs @@ -3,12 +3,13 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Accounts { +namespace UKSFWebsite.Api.Models.Personnel { public class Account { public Application application; public string armaExperience; public bool aviation; public string background; + public string discordId; public DateTime dob; public string email; public string firstname; @@ -26,7 +27,6 @@ public class Account { public ServiceRecordEntry[] serviceRecord = new ServiceRecordEntry[0]; public AccountSettings settings = new AccountSettings(); public string steamname; - public string discordId; public HashSet teamspeakIdentities; public string unitAssignment; public string unitsExperience; diff --git a/UKSFWebsite.Api.Models/AccountAttendanceStatus.cs b/UKSFWebsite.Api.Models/Personnel/AccountAttendanceStatus.cs similarity index 92% rename from UKSFWebsite.Api.Models/AccountAttendanceStatus.cs rename to UKSFWebsite.Api.Models/Personnel/AccountAttendanceStatus.cs index 46d56b45..85203545 100644 --- a/UKSFWebsite.Api.Models/AccountAttendanceStatus.cs +++ b/UKSFWebsite.Api.Models/Personnel/AccountAttendanceStatus.cs @@ -1,7 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Personnel { public class AccountAttendanceStatus { [BsonRepresentation(BsonType.ObjectId)] public string accountId; public float attendancePercent; diff --git a/UKSFWebsite.Api.Models/Accounts/AccountSettings.cs b/UKSFWebsite.Api.Models/Personnel/AccountSettings.cs similarity index 87% rename from UKSFWebsite.Api.Models/Accounts/AccountSettings.cs rename to UKSFWebsite.Api.Models/Personnel/AccountSettings.cs index 53179c68..598b90b7 100644 --- a/UKSFWebsite.Api.Models/Accounts/AccountSettings.cs +++ b/UKSFWebsite.Api.Models/Personnel/AccountSettings.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models.Accounts { +namespace UKSFWebsite.Api.Models.Personnel { public class AccountSettings { public bool errorEmails = false; public bool notificationsEmail = true; diff --git a/UKSFWebsite.Api.Models/Accounts/Application.cs b/UKSFWebsite.Api.Models/Personnel/Application.cs similarity index 94% rename from UKSFWebsite.Api.Models/Accounts/Application.cs rename to UKSFWebsite.Api.Models/Personnel/Application.cs index 5eefa030..82a1059f 100644 --- a/UKSFWebsite.Api.Models/Accounts/Application.cs +++ b/UKSFWebsite.Api.Models/Personnel/Application.cs @@ -3,7 +3,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Accounts { +namespace UKSFWebsite.Api.Models.Personnel { public enum ApplicationState { ACCEPTED, REJECTED, diff --git a/UKSFWebsite.Api.Models/AttendanceReport.cs b/UKSFWebsite.Api.Models/Personnel/AttendanceReport.cs similarity index 65% rename from UKSFWebsite.Api.Models/AttendanceReport.cs rename to UKSFWebsite.Api.Models/Personnel/AttendanceReport.cs index 1192bce3..d25385bf 100644 --- a/UKSFWebsite.Api.Models/AttendanceReport.cs +++ b/UKSFWebsite.Api.Models/Personnel/AttendanceReport.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Personnel { public class AttendanceReport { public AccountAttendanceStatus[] users; } diff --git a/UKSFWebsite.Api.Models/Discharge.cs b/UKSFWebsite.Api.Models/Personnel/Discharge.cs similarity index 94% rename from UKSFWebsite.Api.Models/Discharge.cs rename to UKSFWebsite.Api.Models/Personnel/Discharge.cs index c7bf0d3d..0a454d18 100644 --- a/UKSFWebsite.Api.Models/Discharge.cs +++ b/UKSFWebsite.Api.Models/Personnel/Discharge.cs @@ -3,16 +3,16 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Personnel { public class DischargeCollection { [BsonRepresentation(BsonType.ObjectId)] public string accountId; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public List discharges = new List(); - public bool reinstated; + [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public string name; + public bool reinstated; [BsonIgnore] public bool requestExists; } - + public class Discharge { public string dischargedBy; [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; diff --git a/UKSFWebsite.Api.Models/Loa.cs b/UKSFWebsite.Api.Models/Personnel/Loa.cs similarity index 92% rename from UKSFWebsite.Api.Models/Loa.cs rename to UKSFWebsite.Api.Models/Personnel/Loa.cs index aae73c15..6c32e4c5 100644 --- a/UKSFWebsite.Api.Models/Loa.cs +++ b/UKSFWebsite.Api.Models/Personnel/Loa.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Personnel { public enum LoaReviewState { PENDING, APPROVED, diff --git a/UKSFWebsite.Api.Models/Accounts/MembershipState.cs b/UKSFWebsite.Api.Models/Personnel/MembershipState.cs similarity index 75% rename from UKSFWebsite.Api.Models/Accounts/MembershipState.cs rename to UKSFWebsite.Api.Models/Personnel/MembershipState.cs index 4f7fe899..48f1fe29 100644 --- a/UKSFWebsite.Api.Models/Accounts/MembershipState.cs +++ b/UKSFWebsite.Api.Models/Personnel/MembershipState.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models.Accounts { +namespace UKSFWebsite.Api.Models.Personnel { public enum MembershipState { UNCONFIRMED, CONFIRMED, diff --git a/UKSFWebsite.Api.Models/Rank.cs b/UKSFWebsite.Api.Models/Personnel/Rank.cs similarity index 88% rename from UKSFWebsite.Api.Models/Rank.cs rename to UKSFWebsite.Api.Models/Personnel/Rank.cs index 7964c373..0d2581a9 100644 --- a/UKSFWebsite.Api.Models/Rank.cs +++ b/UKSFWebsite.Api.Models/Personnel/Rank.cs @@ -1,13 +1,13 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Personnel { public class Rank { public string abbreviation; + public string discordRoleId; [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public string name; public int order = 0; public string teamspeakGroup; - public string discordRoleId; } } diff --git a/UKSFWebsite.Api.Models/Role.cs b/UKSFWebsite.Api.Models/Personnel/Role.cs similarity index 88% rename from UKSFWebsite.Api.Models/Role.cs rename to UKSFWebsite.Api.Models/Personnel/Role.cs index 48705c9b..f3bb0381 100644 --- a/UKSFWebsite.Api.Models/Role.cs +++ b/UKSFWebsite.Api.Models/Personnel/Role.cs @@ -1,7 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Personnel { public enum RoleType { INDIVIDUAL, UNIT diff --git a/UKSFWebsite.Api.Models/ServiceRecord.cs b/UKSFWebsite.Api.Models/Personnel/ServiceRecord.cs similarity index 78% rename from UKSFWebsite.Api.Models/ServiceRecord.cs rename to UKSFWebsite.Api.Models/Personnel/ServiceRecord.cs index 12867b4e..b6769634 100644 --- a/UKSFWebsite.Api.Models/ServiceRecord.cs +++ b/UKSFWebsite.Api.Models/Personnel/ServiceRecord.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Personnel { public class ServiceRecordEntry { public string notes; public string occurence; diff --git a/UKSFWebsite.Api.Models/Unit.cs b/UKSFWebsite.Api.Models/Units/Unit.cs similarity index 96% rename from UKSFWebsite.Api.Models/Unit.cs rename to UKSFWebsite.Api.Models/Units/Unit.cs index 465ac1d1..c2d266e0 100644 --- a/UKSFWebsite.Api.Models/Unit.cs +++ b/UKSFWebsite.Api.Models/Units/Unit.cs @@ -2,10 +2,11 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Units { public class Unit { public UnitBranch branch = UnitBranch.COMBAT; public string callsign; + public string discordRoleId; public string icon; [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; [BsonRepresentation(BsonType.ObjectId)] public List members = new List(); @@ -15,7 +16,6 @@ public class Unit { [BsonRepresentation(BsonType.ObjectId)] public Dictionary roles = new Dictionary(); public string shortname; public string teamspeakGroup; - public string discordRoleId; public UnitType type; } diff --git a/UKSFWebsite.Api.Models/ConfirmationCode.cs b/UKSFWebsite.Api.Models/Utility/ConfirmationCode.cs similarity index 86% rename from UKSFWebsite.Api.Models/ConfirmationCode.cs rename to UKSFWebsite.Api.Models/Utility/ConfirmationCode.cs index d7746c2f..f271ff74 100644 --- a/UKSFWebsite.Api.Models/ConfirmationCode.cs +++ b/UKSFWebsite.Api.Models/Utility/ConfirmationCode.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Utility { public class ConfirmationCode { [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public DateTime timestamp = DateTime.UtcNow; diff --git a/UKSFWebsite.Api.Models/ScheduledJob.cs b/UKSFWebsite.Api.Models/Utility/ScheduledJob.cs similarity index 93% rename from UKSFWebsite.Api.Models/ScheduledJob.cs rename to UKSFWebsite.Api.Models/Utility/ScheduledJob.cs index a69e01f9..9aa9bd02 100644 --- a/UKSFWebsite.Api.Models/ScheduledJob.cs +++ b/UKSFWebsite.Api.Models/Utility/ScheduledJob.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Utility { public enum ScheduledJobType { NORMAL, TEAMSPEAK_SNAPSHOT, diff --git a/UKSFWebsite.Api.Models/UtilityObject.cs b/UKSFWebsite.Api.Models/Utility/UtilityObject.cs similarity index 87% rename from UKSFWebsite.Api.Models/UtilityObject.cs rename to UKSFWebsite.Api.Models/Utility/UtilityObject.cs index 61aadaf0..2b9ba349 100644 --- a/UKSFWebsite.Api.Models/UtilityObject.cs +++ b/UKSFWebsite.Api.Models/Utility/UtilityObject.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Utility { public class UtilityObject { [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public Dictionary values = new Dictionary(); diff --git a/UKSFWebsite.Api.Models/VariableItem.cs b/UKSFWebsite.Api.Models/Utility/VariableItem.cs similarity index 84% rename from UKSFWebsite.Api.Models/VariableItem.cs rename to UKSFWebsite.Api.Models/Utility/VariableItem.cs index b79ef6f1..6c7e1b7f 100644 --- a/UKSFWebsite.Api.Models/VariableItem.cs +++ b/UKSFWebsite.Api.Models/Utility/VariableItem.cs @@ -1,7 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models { +namespace UKSFWebsite.Api.Models.Utility { public class VariableItem { [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public object item; diff --git a/UKSFWebsite.Api.Services/Abstraction/IAccountService.cs b/UKSFWebsite.Api.Services/Abstraction/IAccountService.cs deleted file mode 100644 index ca42a688..00000000 --- a/UKSFWebsite.Api.Services/Abstraction/IAccountService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSFWebsite.Api.Models.Accounts; - -namespace UKSFWebsite.Api.Services.Abstraction { - public interface IAccountService : IDataService { } -} diff --git a/UKSFWebsite.Api.Services/Abstraction/ICommentThreadService.cs b/UKSFWebsite.Api.Services/Abstraction/ICommentThreadService.cs deleted file mode 100644 index 664aa160..00000000 --- a/UKSFWebsite.Api.Services/Abstraction/ICommentThreadService.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using UKSFWebsite.Api.Models; - -namespace UKSFWebsite.Api.Services.Abstraction { - public interface ICommentThreadService : IDataService { - new Task Add(CommentThread commentThread); - Comment[] GetCommentThreadComments(string id); - Task InsertComment(string id, Comment comment); - Task RemoveComment(string id, Comment comment); - IEnumerable GetCommentThreadParticipants(string id); - } -} diff --git a/UKSFWebsite.Api.Services/Abstraction/IDischargeService.cs b/UKSFWebsite.Api.Services/Abstraction/IDischargeService.cs deleted file mode 100644 index 6fdfd88c..00000000 --- a/UKSFWebsite.Api.Services/Abstraction/IDischargeService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSFWebsite.Api.Models; - -namespace UKSFWebsite.Api.Services.Abstraction { - public interface IDischargeService : IDataService { } -} diff --git a/UKSFWebsite.Api.Services/Abstraction/ILauncherService.cs b/UKSFWebsite.Api.Services/Abstraction/ILauncherService.cs deleted file mode 100644 index 92732044..00000000 --- a/UKSFWebsite.Api.Services/Abstraction/ILauncherService.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace UKSFWebsite.Api.Services.Abstraction { - public interface ILauncherService { - - } -} diff --git a/UKSFWebsite.Api.Services/Abstraction/ILoggingService.cs b/UKSFWebsite.Api.Services/Abstraction/ILoggingService.cs deleted file mode 100644 index 3e2d2e71..00000000 --- a/UKSFWebsite.Api.Services/Abstraction/ILoggingService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Logging; - -namespace UKSFWebsite.Api.Services.Abstraction { - public interface ILoggingService { - Task LogAsync(Exception exception); - Task LogAsync(BasicLogMessage log); - } -} diff --git a/UKSFWebsite.Api.Services/Abstraction/IOperationOrderService.cs b/UKSFWebsite.Api.Services/Abstraction/IOperationOrderService.cs deleted file mode 100644 index 19fdbc2b..00000000 --- a/UKSFWebsite.Api.Services/Abstraction/IOperationOrderService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Threading.Tasks; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Requests; - -namespace UKSFWebsite.Api.Services.Abstraction { - public interface IOperationOrderService : IDataService { - Task Add(CreateOperationOrderRequest request); - Task Replace(Opord request); - } -} diff --git a/UKSFWebsite.Api.Services/Abstraction/IOperationReportService.cs b/UKSFWebsite.Api.Services/Abstraction/IOperationReportService.cs deleted file mode 100644 index a76ccf53..00000000 --- a/UKSFWebsite.Api.Services/Abstraction/IOperationReportService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Threading.Tasks; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Requests; - -namespace UKSFWebsite.Api.Services.Abstraction { - public interface IOperationReportService : IDataService { - Task Create(CreateOperationReportRequest request); - Task Replace(Oprep request); - } -} diff --git a/UKSFWebsite.Api.Services/Abstraction/IRanksService.cs b/UKSFWebsite.Api.Services/Abstraction/IRanksService.cs deleted file mode 100644 index 7e186166..00000000 --- a/UKSFWebsite.Api.Services/Abstraction/IRanksService.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections.Generic; -using UKSFWebsite.Api.Models; - -namespace UKSFWebsite.Api.Services.Abstraction { - public interface IRanksService : IDataService { - new List Get(); - new Rank GetSingle(string name); - int GetRankIndex(string rankName); - bool IsEqual(string nameA, string nameB); - bool IsSuperior(string nameA, string nameB); - bool IsSuperiorOrEqual(string nameA, string nameB); - int Sort(string nameA, string nameB); - int Sort(Rank rankA, Rank rankB); - } -} diff --git a/UKSFWebsite.Api.Services/Abstraction/IRolesService.cs b/UKSFWebsite.Api.Services/Abstraction/IRolesService.cs deleted file mode 100644 index 8734e895..00000000 --- a/UKSFWebsite.Api.Services/Abstraction/IRolesService.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections.Generic; -using UKSFWebsite.Api.Models; - -namespace UKSFWebsite.Api.Services.Abstraction { - public interface IRolesService : IDataService { - new List Get(); - new Role GetSingle(string name); - int Sort(string nameA, string nameB); - Role GetUnitRoleByOrder(int order); - } -} diff --git a/UKSFWebsite.Api.Services/Abstraction/IVariablesService.cs b/UKSFWebsite.Api.Services/Abstraction/IVariablesService.cs deleted file mode 100644 index 96ac589b..00000000 --- a/UKSFWebsite.Api.Services/Abstraction/IVariablesService.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Threading.Tasks; -using UKSFWebsite.Api.Models; - -namespace UKSFWebsite.Api.Services.Abstraction { - public interface IVariablesService : IDataService { - Task Update(string key, object value); - } -} \ No newline at end of file diff --git a/UKSFWebsite.Api.Services/ChainOfCommandService.cs b/UKSFWebsite.Api.Services/Command/ChainOfCommandService.cs similarity index 87% rename from UKSFWebsite.Api.Services/ChainOfCommandService.cs rename to UKSFWebsite.Api.Services/Command/ChainOfCommandService.cs index c2f8d103..68a614c8 100644 --- a/UKSFWebsite.Api.Services/ChainOfCommandService.cs +++ b/UKSFWebsite.Api.Services/Command/ChainOfCommandService.cs @@ -1,22 +1,15 @@ using System; using System.Collections.Generic; using System.Linq; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; - -namespace UKSFWebsite.Api.Services { - public enum ChainOfCommandMode { - FULL, - NEXT_COMMANDER, - NEXT_COMMANDER_EXCLUDE_SELF, - COMMANDER_AND_ONE_ABOVE, - COMMANDER_AND_SR10, - COMMANDER_AND_TARGET_COMMANDER, - SR10, - TARGET_COMMANDER - } - +using UKSFWebsite.Api.Interfaces.Command; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Command; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; + +namespace UKSFWebsite.Api.Services.Command { public class ChainOfCommandService : IChainOfCommandService { private readonly string commanderRoleName; private readonly ISessionService sessionService; @@ -30,7 +23,7 @@ public ChainOfCommandService(IUnitsService unitsService, IRolesService rolesServ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, Unit start, Unit target) { HashSet chain = ResolveMode(mode, start, target).Where(x => !string.IsNullOrEmpty(x) && x != recipient).ToHashSet(); - + // If no chain, and mode is not next commander, get next commander if (chain.Count == 0 && mode != ChainOfCommandMode.NEXT_COMMANDER && mode != ChainOfCommandMode.NEXT_COMMANDER_EXCLUDE_SELF) { chain = GetNextCommander(start).Where(x => !string.IsNullOrEmpty(x) && x != recipient).ToHashSet(); @@ -38,7 +31,7 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U // If no chain, get root unit child commanders if (chain.Count == 0) { - foreach (Unit unit in unitsService.Get(x => x.parent == unitsService.GetRoot().id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) { + foreach (Unit unit in unitsService.Data().Get(x => x.parent == unitsService.GetRoot().id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) { chain.Add(GetCommander(unit)); } } @@ -54,7 +47,7 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U public bool InContextChainOfCommand(string id) { Account contextAccount = sessionService.GetContextAccount(); if (id == contextAccount.id) return true; - Unit unit = unitsService.GetSingle(x => x.name == contextAccount.unitAssignment); + Unit unit = unitsService.Data().GetSingle(x => x.name == contextAccount.unitAssignment); return unitsService.RolesHasMember(unit, contextAccount.id) && (unit.members.Contains(id) || unitsService.GetAllChildren(unit, true).Any(unitChild => unitChild.members.Contains(id))); } @@ -115,7 +108,7 @@ private IEnumerable GetCommanderAndSr10(Unit unit) { return chain; } - private IEnumerable GetSr10() => unitsService.GetSingle(x => x.shortname == "SR10").members.ToHashSet(); + private IEnumerable GetSr10() => unitsService.Data().GetSingle(x => x.shortname == "SR10").members.ToHashSet(); private IEnumerable GetCommanderAndTargetCommander(Unit unit, Unit targetUnit) => new HashSet {GetNextUnitCommander(unit), GetNextUnitCommander(targetUnit)}; diff --git a/UKSFWebsite.Api.Services/CommandRequestCompletionService.cs b/UKSFWebsite.Api.Services/Command/CommandRequestCompletionService.cs similarity index 83% rename from UKSFWebsite.Api.Services/CommandRequestCompletionService.cs rename to UKSFWebsite.Api.Services/Command/CommandRequestCompletionService.cs index 0c18a2a7..fd007ce2 100644 --- a/UKSFWebsite.Api.Services/CommandRequestCompletionService.cs +++ b/UKSFWebsite.Api.Services/Command/CommandRequestCompletionService.cs @@ -3,16 +3,21 @@ using AvsAnLib; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Models.CommandRequests; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Interfaces.Command; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Command; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Hubs.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Personnel; -namespace UKSFWebsite.Api.Services { +namespace UKSFWebsite.Api.Services.Command { public class CommandRequestCompletionService : ICommandRequestCompletionService { private readonly IAccountService accountService; private readonly IAssignmentService assignmentService; @@ -20,9 +25,9 @@ public class CommandRequestCompletionService : ICommandRequestCompletionService private readonly IHubContext commandRequestsHub; private readonly IDischargeService dischargeService; private readonly ILoaService loaService; + private readonly INotificationsService notificationsService; private readonly ISessionService sessionService; private readonly IUnitsService unitsService; - private readonly INotificationsService notificationsService; public CommandRequestCompletionService( ISessionService sessionService, @@ -49,7 +54,7 @@ INotificationsService notificationsService public async Task Resolve(string id) { if (commandRequestService.IsRequestApproved(id) || commandRequestService.IsRequestRejected(id)) { - CommandRequest request = commandRequestService.GetSingle(id); + CommandRequest request = commandRequestService.Data().GetSingle(id); switch (request.type) { case CommandRequestType.PROMOTION: case CommandRequestType.DEMOTION: @@ -110,21 +115,28 @@ private async Task Loa(CommandRequest request) { private async Task Discharge(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { - Account account = accountService.GetSingle(request.recipient); - Discharge discharge = new Discharge {rank = account.rank, unit = account.unitAssignment, role = account.roleAssignment, dischargedBy = request.displayRequester, reason = request.reason}; - DischargeCollection dischargeCollection = dischargeService.GetSingle(x => x.accountId == account.id); + Account account = accountService.Data().GetSingle(request.recipient); + Discharge discharge = new Discharge { + rank = account.rank, + unit = account.unitAssignment, + role = account.roleAssignment, + dischargedBy = request.displayRequester, + reason = request.reason + }; + DischargeCollection dischargeCollection = dischargeService.Data().GetSingle(x => x.accountId == account.id); if (dischargeCollection == null) { dischargeCollection = new DischargeCollection {accountId = account.id, name = $"{account.lastname}.{account.firstname[0]}"}; dischargeCollection.discharges.Add(discharge); - await dischargeService.Add(dischargeCollection); + await dischargeService.Data().Add(dischargeCollection); } else { dischargeCollection.discharges.Add(discharge); - await dischargeService.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, false)); - await dischargeService.Update(dischargeCollection.id, Builders.Update.Set(x => x.name, $"{account.lastname}.{account.firstname[0]}")); - await dischargeService.Update(dischargeCollection.id, Builders.Update.Set(x => x.discharges, dischargeCollection.discharges)); + await dischargeService.Data().Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, false)); + await dischargeService.Data().Update(dischargeCollection.id, Builders.Update.Set(x => x.name, $"{account.lastname}.{account.firstname[0]}")); + await dischargeService.Data().Update(dischargeCollection.id, Builders.Update.Set(x => x.discharges, dischargeCollection.discharges)); } - await accountService.Update(account.id, "membershipState", MembershipState.DISCHARGED); - + + await accountService.Data().Update(account.id, "membershipState", MembershipState.DISCHARGED); + Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, request.reason, "", AssignmentService.REMOVE_FLAG); notificationsService.Add(notification); await assignmentService.UnassignAllUnits(account.id); @@ -156,11 +168,13 @@ private async Task UnitRole(CommandRequest request) { notificationsService.Add(new Notification {owner = request.recipient, message = "You have been unassigned from all roles in all units", icon = NotificationIcons.DEMOTION}); } else { string role = await assignmentService.UnassignUnitRole(request.recipient, request.value); - notificationsService.Add(new Notification {owner = request.recipient, message = $"You have been unassigned as {AvsAn.Query(role).Article} {role} in {unitsService.GetChainString(unitsService.GetSingle(request.value))}", icon = NotificationIcons.DEMOTION}); + notificationsService.Add(new Notification {owner = request.recipient, message = $"You have been unassigned as {AvsAn.Query(role).Article} {role} in {unitsService.GetChainString(unitsService.Data().GetSingle(request.value))}", icon = NotificationIcons.DEMOTION}); } } else { await assignmentService.AssignUnitRole(request.recipient, request.value, request.secondaryValue); - notificationsService.Add(new Notification {owner = request.recipient, message = $"You have been assigned as {AvsAn.Query(request.secondaryValue).Article} {request.secondaryValue} in {unitsService.GetChainString(unitsService.GetSingle(request.value))}", icon = NotificationIcons.PROMOTION}); + notificationsService.Add( + new Notification {owner = request.recipient, message = $"You have been assigned as {AvsAn.Query(request.secondaryValue).Article} {request.secondaryValue} in {unitsService.GetChainString(unitsService.Data().GetSingle(request.value))}", icon = NotificationIcons.PROMOTION} + ); } await commandRequestService.ArchiveRequest(request.id); @@ -173,7 +187,7 @@ private async Task UnitRole(CommandRequest request) { private async Task UnitRemoval(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { - Unit unit = unitsService.GetSingle(request.value); + Unit unit = unitsService.Data().GetSingle(request.value); await assignmentService.UnassignUnit(request.recipient, unit.id); notificationsService.Add(new Notification {owner = request.recipient, message = $"You have been removed from {unitsService.GetChainString(unit)}", icon = NotificationIcons.DEMOTION}); await commandRequestService.ArchiveRequest(request.id); @@ -186,7 +200,7 @@ private async Task UnitRemoval(CommandRequest request) { private async Task Transfer(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { - Unit unit = unitsService.GetSingle(request.value); + Unit unit = unitsService.Data().GetSingle(request.value); Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, unit.name, reason: request.reason); notificationsService.Add(notification); await commandRequestService.ArchiveRequest(request.id); @@ -199,9 +213,9 @@ private async Task Transfer(CommandRequest request) { private async Task Reinstate(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { - DischargeCollection dischargeCollection = dischargeService.GetSingle(x => x.accountId == request.recipient); - await dischargeService.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); - await accountService.Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); + DischargeCollection dischargeCollection = dischargeService.Data().GetSingle(x => x.accountId == request.recipient); + await dischargeService.Data().Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); + await accountService.Data().Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); Notification notification = await assignmentService.UpdateUnitRankAndRole(dischargeCollection.accountId, "Basic Training Unit", "Trainee", "Recruit", "", "", "your membership was reinstated"); notificationsService.Add(notification); diff --git a/UKSFWebsite.Api.Services/Data/CommandRequestService.cs b/UKSFWebsite.Api.Services/Command/CommandRequestService.cs similarity index 63% rename from UKSFWebsite.Api.Services/Data/CommandRequestService.cs rename to UKSFWebsite.Api.Services/Command/CommandRequestService.cs index ddf5d34f..ffe70408 100644 --- a/UKSFWebsite.Api.Services/Data/CommandRequestService.cs +++ b/UKSFWebsite.Api.Services/Command/CommandRequestService.cs @@ -5,28 +5,37 @@ using AvsAnLib; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Models.CommandRequests; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Command; +using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Command; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Hubs.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Personnel; -namespace UKSFWebsite.Api.Services.Data { - public class CommandRequestService : CachedDataService, ICommandRequestService { - private const string DATABASE_ARCHIVE_COLLECTION = "commandRequestsArchive"; +namespace UKSFWebsite.Api.Services.Command { + public class CommandRequestService : ICommandRequestService { private readonly IAccountService accountService; private readonly IChainOfCommandService chainOfCommandService; private readonly IHubContext commandRequestsHub; + private readonly ICommandRequestDataService data; + private readonly ICommandRequestArchiveDataService dataArchive; private readonly IDisplayNameService displayNameService; private readonly INotificationsService notificationsService; + private readonly IRanksService ranksService; private readonly ISessionService sessionService; private readonly IUnitsService unitsService; - private readonly IRanksService ranksService; public CommandRequestService( - IMongoDatabase database, + ICommandRequestDataService data, + ICommandRequestArchiveDataService dataArchive, INotificationsService notificationsService, ISessionService sessionService, IDisplayNameService displayNameService, @@ -35,7 +44,9 @@ public CommandRequestService( IUnitsService unitsService, IRanksService ranksService, IHubContext commandRequestsHub - ) : base(database, "commandRequests") { + ) { + this.data = data; + this.dataArchive = dataArchive; this.notificationsService = notificationsService; this.sessionService = sessionService; this.displayNameService = displayNameService; @@ -46,20 +57,22 @@ IHubContext commandRequestsHub this.commandRequestsHub = commandRequestsHub; } + public ICommandRequestDataService Data() => data; + public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE) { Account requesterAccount = sessionService.GetContextAccount(); - Account recipientAccount = accountService.GetSingle(request.recipient); + Account recipientAccount = accountService.Data().GetSingle(request.recipient); request.displayRequester = displayNameService.GetDisplayName(requesterAccount); request.displayRecipient = displayNameService.GetDisplayName(recipientAccount); - HashSet ids = chainOfCommandService.ResolveChain(mode, recipientAccount.id, unitsService.GetSingle(x => x.name == recipientAccount.unitAssignment), unitsService.GetSingle(request.value)); + HashSet ids = chainOfCommandService.ResolveChain(mode, recipientAccount.id, unitsService.Data().GetSingle(x => x.name == recipientAccount.unitAssignment), unitsService.Data().GetSingle(request.value)); if (ids.Count == 0) throw new Exception($"Failed to get any commanders for review for {request.type.ToLower()} request for {request.displayRecipient}.\nContact an admin"); - - List accounts = ids.Select(x => accountService.GetSingle(x)).OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); + + List accounts = ids.Select(x => accountService.Data().GetSingle(x)).OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); foreach (Account account in accounts) { request.reviews.Add(account.id, ReviewState.PENDING); } - await base.Add(request); + await data.Add(request); LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request created for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); bool selfRequest = request.displayRequester == request.displayRecipient; string notificationMessage = $"{request.displayRequester} requires your review on {(selfRequest ? "their" : AvsAn.Query(request.type).Article)} {request.type.ToLower()} request{(selfRequest ? "" : $" for {request.displayRecipient}")}"; @@ -67,20 +80,17 @@ public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfC notificationsService.Add(new Notification {owner = account.id, icon = NotificationIcons.REQUEST, message = notificationMessage, link = "/command/requests"}); } - Refresh(); await commandRequestsHub.Clients.All.ReceiveRequestUpdate(); } public async Task ArchiveRequest(string id) { - CommandRequest request = GetSingle(id); - await Database.GetCollection(DATABASE_ARCHIVE_COLLECTION).InsertOneAsync(request); - await Delete(id); - Refresh(); + CommandRequest request = data.GetSingle(id); + await dataArchive.Add(request); + await data.Delete(id); } public async Task SetRequestReviewState(CommandRequest request, string reviewerId, ReviewState newState) { - await Update(request.id, Builders.Update.Set($"reviews.{reviewerId}", newState)); - Refresh(); + await data.Update(request.id, Builders.Update.Set($"reviews.{reviewerId}", newState)); } public async Task SetRequestAllReviewStates(CommandRequest request, ReviewState newState) { @@ -89,25 +99,20 @@ public async Task SetRequestAllReviewStates(CommandRequest request, ReviewState request.reviews[key] = newState; } - await Update(request.id, Builders.Update.Set("reviews", request.reviews)); - Refresh(); + await data.Update(request.id, Builders.Update.Set("reviews", request.reviews)); } public ReviewState GetReviewState(string id, string reviewer) { - CommandRequest request = GetSingle(id); - return request == null - ? ReviewState.ERROR - : !request.reviews.ContainsKey(reviewer) - ? ReviewState.ERROR - : request.reviews[reviewer]; + CommandRequest request = data.GetSingle(id); + return request == null ? ReviewState.ERROR : !request.reviews.ContainsKey(reviewer) ? ReviewState.ERROR : request.reviews[reviewer]; } - public bool IsRequestApproved(string id) => GetSingle(id).reviews.All(x => x.Value == ReviewState.APPROVED); + public bool IsRequestApproved(string id) => data.GetSingle(id).reviews.All(x => x.Value == ReviewState.APPROVED); - public bool IsRequestRejected(string id) => GetSingle(id).reviews.Any(x => x.Value == ReviewState.REJECTED); + public bool IsRequestRejected(string id) => data.GetSingle(id).reviews.Any(x => x.Value == ReviewState.REJECTED); public bool DoesEquivalentRequestExist(CommandRequest request) { - return Get().Any(x => x.recipient == request.recipient && x.type == request.type && x.displayValue == request.displayValue && x.displayFrom == request.displayFrom); + return data.Get().Any(x => x.recipient == request.recipient && x.type == request.type && x.displayValue == request.displayValue && x.displayFrom == request.displayFrom); } } } diff --git a/UKSFWebsite.Api.Services/Data/AccountService.cs b/UKSFWebsite.Api.Services/Data/AccountService.cs deleted file mode 100644 index 28467a09..00000000 --- a/UKSFWebsite.Api.Services/Data/AccountService.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.SignalR; -using MongoDB.Driver; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Hubs.Abstraction; - -namespace UKSFWebsite.Api.Services.Data { - public class AccountService : CachedDataService, IAccountService { - private readonly IHubContext accountHub; - - public AccountService(IMongoDatabase database, IHubContext accountHub) : base(database, "accounts") => this.accountHub = accountHub; - - public override async Task Update(string id, string fieldName, object value) { - await base.Update(id, fieldName, value); - await accountHub.Clients.Group(id).ReceiveAccountUpdate(); - } - - public override async Task Update(string id, UpdateDefinition update) { - await base.Update(id, update); - await accountHub.Clients.Group(id).ReceiveAccountUpdate(); - } - } -} diff --git a/UKSFWebsite.Api.Services/Data/CacheService.cs b/UKSFWebsite.Api.Services/Data/CacheService.cs deleted file mode 100644 index 8a768a2e..00000000 --- a/UKSFWebsite.Api.Services/Data/CacheService.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections.Generic; - -namespace UKSFWebsite.Api.Services.Data { - public class CacheService { - private readonly List services = new List(); - - public void AddService(dynamic service) => services.Add(service); - - public void InvalidateCaches() { - foreach (dynamic service in services) { - service.Refresh(); - } - } - } -} diff --git a/UKSFWebsite.Api.Services/Data/CommentThreadService.cs b/UKSFWebsite.Api.Services/Data/CommentThreadService.cs deleted file mode 100644 index f34fda18..00000000 --- a/UKSFWebsite.Api.Services/Data/CommentThreadService.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Services.Abstraction; - -namespace UKSFWebsite.Api.Services.Data { - public class CommentThreadService : CachedDataService, ICommentThreadService { - public CommentThreadService(IMongoDatabase database) : base(database, "commentThreads") { } - - public Comment[] GetCommentThreadComments(string id) => GetSingle(id).comments.Reverse().ToArray(); - - public new async Task Add(CommentThread commentThread) { - await base.Add(commentThread); - return commentThread.id; - } - - public async Task InsertComment(string id, Comment comment) { - await Update(id, Builders.Update.Push("comments", comment)); - } - - public async Task RemoveComment(string id, Comment comment) { - await Update(id, Builders.Update.Pull("comments", comment)); - } - - public IEnumerable GetCommentThreadParticipants(string id) { - HashSet participants = GetCommentThreadComments(id).Select(x => x.author).ToHashSet(); - participants.UnionWith(GetSingle(id).authors); - return participants; - } - } -} diff --git a/UKSFWebsite.Api.Services/Data/DischargeService.cs b/UKSFWebsite.Api.Services/Data/DischargeService.cs deleted file mode 100644 index fcaabeb1..00000000 --- a/UKSFWebsite.Api.Services/Data/DischargeService.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Services.Abstraction; - -namespace UKSFWebsite.Api.Services.Data { - public class DischargeService : CachedDataService, IDischargeService { - public DischargeService(IMongoDatabase database) : base(database, "discharges") { } - - public override List Get() { - return base.Get().OrderByDescending(x => x.discharges.Last().timestamp).ToList(); - } - } -} diff --git a/UKSFWebsite.Api.Services/Data/OperationOrderService.cs b/UKSFWebsite.Api.Services/Data/OperationOrderService.cs deleted file mode 100644 index fa42c614..00000000 --- a/UKSFWebsite.Api.Services/Data/OperationOrderService.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Requests; -using UKSFWebsite.Api.Services.Abstraction; - -namespace UKSFWebsite.Api.Services.Data { - public class OperationOrderService : CachedDataService, IOperationOrderService { - public OperationOrderService(IMongoDatabase database) : base(database, "opord") { } - - public async Task Add(CreateOperationOrderRequest request) { - Opord operation = new Opord { - name = request.name, - map = request.map, - start = request.start.AddHours((double) request.starttime / 100), - end = request.end.AddHours((double) request.endtime / 100), - type = request.type - }; - await base.Add(operation); - } - - public override List Get() { - List reversed = base.Get(); - reversed.Reverse(); - return reversed; - } - - public async Task Replace(Opord request) { - await Database.GetCollection(DatabaseCollection).ReplaceOneAsync(x => x.id == request.id, request); - } - } -} diff --git a/UKSFWebsite.Api.Services/Data/OperationReportService.cs b/UKSFWebsite.Api.Services/Data/OperationReportService.cs deleted file mode 100644 index ab6045b1..00000000 --- a/UKSFWebsite.Api.Services/Data/OperationReportService.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Requests; -using UKSFWebsite.Api.Services.Abstraction; - -namespace UKSFWebsite.Api.Services.Data { - public class OperationReportService : CachedDataService, IOperationReportService { - private readonly IAttendanceService attendanceService; - - public OperationReportService(IMongoDatabase database, IAttendanceService attendanceService) : base(database, "oprep") => this.attendanceService = attendanceService; - - public async Task Create(CreateOperationReportRequest request) { - Oprep operation = new Oprep { - name = request.name, - map = request.map, - start = request.start.AddHours((double) request.starttime / 100), - end = request.end.AddHours((double) request.endtime / 100), - type = request.type, - result = request.result - }; - operation.attendanceReport = await attendanceService.GenerateAttendanceReport(operation.start, operation.end); - await base.Add(operation); - } - - public override List Get() { - List reversed = base.Get(); - reversed.Reverse(); - return reversed; - } - - public async Task Replace(Oprep request) { - await Database.GetCollection(DatabaseCollection).ReplaceOneAsync(x => x.id == request.id, request); - } - } -} diff --git a/UKSFWebsite.Api.Services/Data/RanksService.cs b/UKSFWebsite.Api.Services/Data/RanksService.cs deleted file mode 100644 index 10ed8bf1..00000000 --- a/UKSFWebsite.Api.Services/Data/RanksService.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System.Collections.Generic; -using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Services.Abstraction; - -namespace UKSFWebsite.Api.Services.Data { - public class RanksService : CachedDataService, IRanksService { - - public RanksService(IMongoDatabase database) : base(database, "ranks") { } - - public override List Get() { - base.Get(); - Collection.Sort(Sort); - return Collection; - } - - public override Rank GetSingle(string name) => GetSingle(x => x.name == name); - - public int GetRankIndex(string rankName) { - if (Collection == null) Get(); - return Collection.FindIndex(x => x.name == rankName); - } - - public int Sort(string nameA, string nameB) { - Rank rankA = GetSingle(nameA); - Rank rankB = GetSingle(nameB); - int rankOrderA = rankA?.order ?? 0; - int rankOrderB = rankB?.order ?? 0; - return rankOrderA < rankOrderB ? -1 : rankOrderA > rankOrderB ? 1 : 0; - } - - public int Sort(Rank rankA, Rank rankB) { - int rankOrderA = rankA?.order ?? 0; - int rankOrderB = rankB?.order ?? 0; - return rankOrderA < rankOrderB ? -1 : rankOrderA > rankOrderB ? 1 : 0; - } - - public bool IsSuperior(string nameA, string nameB) { - Rank rankA = GetSingle(nameA); - Rank rankB = GetSingle(nameB); - int rankOrderA = rankA?.order ?? 0; - int rankOrderB = rankB?.order ?? 0; - return rankOrderA < rankOrderB; - } - - public bool IsEqual(string nameA, string nameB) { - Rank rankA = GetSingle(nameA); - Rank rankB = GetSingle(nameB); - int rankOrderA = rankA?.order ?? 0; - int rankOrderB = rankB?.order ?? 0; - return rankOrderA == rankOrderB; - } - - public bool IsSuperiorOrEqual(string nameA, string nameB) { - Rank rankA = GetSingle(nameA); - Rank rankB = GetSingle(nameB); - int rankOrderA = rankA?.order ?? 0; - int rankOrderB = rankB?.order ?? 0; - return rankOrderA <= rankOrderB; - } - } - - public class RankComparer : IComparer { - private readonly IRanksService ranksService; - public RankComparer(IRanksService ranksService) => this.ranksService = ranksService; - - public int Compare(string rankA, string rankB) => ranksService.Sort(rankA, rankB); - } -} diff --git a/UKSFWebsite.Api.Services/Data/RolesService.cs b/UKSFWebsite.Api.Services/Data/RolesService.cs deleted file mode 100644 index 576defcb..00000000 --- a/UKSFWebsite.Api.Services/Data/RolesService.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Services.Abstraction; - -namespace UKSFWebsite.Api.Services.Data { - public class RolesService : CachedDataService, IRolesService { - public RolesService(IMongoDatabase database) : base(database, "roles") {} - - public override List Get() { - base.Get(); - Collection = Collection.OrderBy(x => x.name).ToList(); - return Collection; - } - - public override Role GetSingle(string name) => GetSingle(x => x.name == name); - - public int Sort(string nameA, string nameB) { - Role roleA = GetSingle(nameA); - Role roleB = GetSingle(nameB); - int roleOrderA = roleA?.order ?? 0; - int roleOrderB = roleB?.order ?? 0; - return roleOrderA < roleOrderB ? -1 : roleOrderA > roleOrderB ? 1 : 0; - } - - public Role GetUnitRoleByOrder(int order) => GetSingle(x => x.roleType == RoleType.UNIT && x.order == order); - } -} diff --git a/UKSFWebsite.Api.Services/Debug/FakeDataService.cs b/UKSFWebsite.Api.Services/Debug/FakeDataService.cs index 9790003d..0e9e6564 100644 --- a/UKSFWebsite.Api.Services/Debug/FakeDataService.cs +++ b/UKSFWebsite.Api.Services/Debug/FakeDataService.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Data; namespace UKSFWebsite.Api.Services.Debug { public abstract class FakeDataService : IDataService { diff --git a/UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs b/UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs index ff0141c0..caf5c2f9 100644 --- a/UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs +++ b/UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs @@ -1,7 +1,9 @@ using System.Threading.Tasks; using Microsoft.Extensions.Configuration; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Services.Integrations; namespace UKSFWebsite.Api.Services.Debug { public class FakeDiscordService : DiscordService { diff --git a/UKSFWebsite.Api.Services/Debug/FakeNotificationsDataService.cs b/UKSFWebsite.Api.Services/Debug/FakeNotificationsDataService.cs new file mode 100644 index 00000000..1efc5943 --- /dev/null +++ b/UKSFWebsite.Api.Services/Debug/FakeNotificationsDataService.cs @@ -0,0 +1,12 @@ +using System.Threading.Tasks; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Message; + +namespace UKSFWebsite.Api.Services.Debug { + public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { + public Task UpdateMany(FilterDefinition filter, UpdateDefinition update) => Task.CompletedTask; + + public Task DeleteMany(FilterDefinition filter) => Task.CompletedTask; + } +} diff --git a/UKSFWebsite.Api.Services/Debug/FakeNotificationsService.cs b/UKSFWebsite.Api.Services/Debug/FakeNotificationsService.cs index 89d05102..751c1f92 100644 --- a/UKSFWebsite.Api.Services/Debug/FakeNotificationsService.cs +++ b/UKSFWebsite.Api.Services/Debug/FakeNotificationsService.cs @@ -1,18 +1,21 @@ using System.Collections.Generic; using System.Threading.Tasks; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Services.Debug { - public class FakeNotificationsService : FakeCachedDataService, INotificationsService { + public class FakeNotificationsService : INotificationsService { public void SendTeamspeakNotification(Account account, string rawMessage) { } public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { } public IEnumerable GetNotificationsForContext() => new List(); - public new void Add(Notification notification) { } + public INotificationsDataService Data() => null; + + public void Add(Notification notification) { } public Task MarkNotificationsAsRead(IEnumerable ids) => Task.CompletedTask; diff --git a/UKSFWebsite.Api.Services/Debug/FakePipeManager.cs b/UKSFWebsite.Api.Services/Debug/FakePipeManager.cs index f8911665..baf7c276 100644 --- a/UKSFWebsite.Api.Services/Debug/FakePipeManager.cs +++ b/UKSFWebsite.Api.Services/Debug/FakePipeManager.cs @@ -1,4 +1,4 @@ -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Integrations; namespace UKSFWebsite.Api.Services.Debug { public class FakePipeManager : IPipeManager { diff --git a/UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs b/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs similarity index 85% rename from UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs rename to UKSFWebsite.Api.Services/Game/GameServerHelpers.cs index 6f0f0fc2..24b4d986 100644 --- a/UKSFWebsite.Api.Services/Utility/GameServerHelpers.cs +++ b/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs @@ -3,10 +3,10 @@ using System.Diagnostics; using System.IO; using System.Linq; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Models.Game; +using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSFWebsite.Api.Services.Game { public static class GameServerHelpers { private static readonly string[] BASE_CONFIG = { "hostname = \"{0}\";", @@ -51,21 +51,21 @@ public static class GameServerHelpers { "}};" }; - public static string GetGameServerExecutablePath() => VariablesWrapper.VariablesService().GetSingle("SERVER_EXECUTABLE").AsString(); + public static string GetGameServerExecutablePath() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_EXECUTABLE").AsString(); - public static string GetGameServerMissionsPath() => VariablesWrapper.VariablesService().GetSingle("MISSIONS_PATH").AsString(); + public static string GetGameServerMissionsPath() => VariablesWrapper.VariablesDataService().GetSingle("MISSIONS_PATH").AsString(); - public static string GetGameServerConfigPath(this GameServer gameServer) => Path.Combine(VariablesWrapper.VariablesService().GetSingle("SERVERS_PATH").AsString(), "configs", $"{gameServer.profileName}.cfg"); + public static string GetGameServerConfigPath(this GameServer gameServer) => Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("SERVERS_PATH").AsString(), "configs", $"{gameServer.profileName}.cfg"); - private static string GetGameServerProfilesPath() => VariablesWrapper.VariablesService().GetSingle("SERVER_PROFILES").AsString(); + private static string GetGameServerProfilesPath() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PROFILES").AsString(); - private static string GetGameServerPerfConfigPath() => VariablesWrapper.VariablesService().GetSingle("SERVER_PERF_CONFIG").AsString(); + private static string GetGameServerPerfConfigPath() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PERF_CONFIG").AsString(); - private static string GetHeadlessClientName(int index) => VariablesWrapper.VariablesService().GetSingle("HEADLESS_CLIENT_NAMES").AsArray()[index]; + private static string GetHeadlessClientName(int index) => VariablesWrapper.VariablesDataService().GetSingle("HEADLESS_CLIENT_NAMES").AsArray()[index]; private static string FormatGameServerMods(this GameServer gameServer) => $"{string.Join(";", gameServer.mods.Select(x => x.pathRelativeToServerExecutable ?? x.path))};"; - public static IEnumerable GetGameServerModsPaths() => VariablesWrapper.VariablesService().GetSingle("MODS_PATHS").AsArray(x => x.RemoveQuotes()); + public static IEnumerable GetGameServerModsPaths() => VariablesWrapper.VariablesDataService().GetSingle("MODS_PATHS").AsArray(x => x.RemoveQuotes()); public static string FormatGameServerConfig(this GameServer gameServer, int playerCount, string missionSelection) => string.Format(string.Join("\n", BASE_CONFIG), gameServer.hostName, gameServer.password, gameServer.adminPassword, playerCount, missionSelection.Replace(".pbo", "")); diff --git a/UKSFWebsite.Api.Services/Data/GameServersService.cs b/UKSFWebsite.Api.Services/Game/GameServersService.cs similarity index 91% rename from UKSFWebsite.Api.Services/Data/GameServersService.cs rename to UKSFWebsite.Api.Services/Game/GameServersService.cs index 81f2d728..87c86b2e 100644 --- a/UKSFWebsite.Api.Services/Data/GameServersService.cs +++ b/UKSFWebsite.Api.Services/Game/GameServersService.cs @@ -8,32 +8,30 @@ using System.Net.Http.Headers; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using MongoDB.Driver; using Newtonsoft.Json; -using UKSFWebsite.Api.Models; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Game; +using UKSFWebsite.Api.Models.Game; using UKSFWebsite.Api.Models.Mission; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Data { - public class GameServersService : CachedDataService, IGameServersService { +namespace UKSFWebsite.Api.Services.Game { + public class GameServersService : IGameServersService { + private readonly IGameServersDataService data; private readonly IMissionPatchingService missionPatchingService; - public GameServersService(IMongoDatabase database, IMissionPatchingService missionPatchingService) : base(database, "gameServers") => this.missionPatchingService = missionPatchingService; - - public override List Get() { - base.Get(); - Collection = Collection.OrderBy(x => x.order).ToList(); - return Collection; + public GameServersService(IGameServersDataService data, IMissionPatchingService missionPatchingService) { + this.data = data; + this.missionPatchingService = missionPatchingService; } + public IGameServersDataService Data() => data; + public int GetGameInstanceCount() => GameServerHelpers.GetArmaProcesses().Count(); public async Task UploadMissionFile(IFormFile file) { string fileName = ContentDispositionHeaderValue.Parse(file.ContentDisposition).FileName.Trim('"'); - using (FileStream stream = new FileStream(Path.Combine(GameServerHelpers.GetGameServerMissionsPath(), fileName), FileMode.Create)) { - await file.CopyToAsync(stream); - } + await using FileStream stream = new FileStream(Path.Combine(GameServerHelpers.GetGameServerMissionsPath(), fileName), FileMode.Create); + await file.CopyToAsync(stream); } public List GetMissionFiles() { @@ -168,7 +166,7 @@ public int KillAllArmaProcesses() { process.Kill(); } - Get() + data.Get() .ForEach( x => { x.processId = null; diff --git a/UKSFWebsite.Api.Services/Missions/MissionDataResolver.cs b/UKSFWebsite.Api.Services/Game/Missions/MissionDataResolver.cs similarity index 99% rename from UKSFWebsite.Api.Services/Missions/MissionDataResolver.cs rename to UKSFWebsite.Api.Services/Game/Missions/MissionDataResolver.cs index e8fed9dc..3b071c66 100644 --- a/UKSFWebsite.Api.Services/Missions/MissionDataResolver.cs +++ b/UKSFWebsite.Api.Services/Game/Missions/MissionDataResolver.cs @@ -2,7 +2,7 @@ using System.Linq; using UKSFWebsite.Api.Models.Mission; -namespace UKSFWebsite.Api.Services.Missions { +namespace UKSFWebsite.Api.Services.Game.Missions { public class MissionDataResolver { private static readonly string[] ENGINEER_IDS = { "5a1e894463d0f71710089106", // Bridg @@ -14,7 +14,7 @@ public class MissionDataResolver { "59e38f1b594c603b78aa9dc1", // Lars "5a1a14b5aacf7b00346dcc37" // Gilbert }; - + public static string ResolveObjectClass(MissionPlayer player) { if (player.account?.id == "5b4b568c20e1fd00013752d1") return "UKSF_B_Medic"; // Smith, SAS Medic return player.unit.sourceUnit.id switch { diff --git a/UKSFWebsite.Api.Services/Missions/MissionEntityHelper.cs b/UKSFWebsite.Api.Services/Game/Missions/MissionEntityHelper.cs similarity index 98% rename from UKSFWebsite.Api.Services/Missions/MissionEntityHelper.cs rename to UKSFWebsite.Api.Services/Game/Missions/MissionEntityHelper.cs index 7571396c..6968b31f 100644 --- a/UKSFWebsite.Api.Services/Missions/MissionEntityHelper.cs +++ b/UKSFWebsite.Api.Services/Game/Missions/MissionEntityHelper.cs @@ -3,7 +3,7 @@ using System.Linq; using UKSFWebsite.Api.Models.Mission; -namespace UKSFWebsite.Api.Services.Missions { +namespace UKSFWebsite.Api.Services.Game.Missions { public static class MissionEntityHelper { public static MissionEntity CreateFromItems(List rawEntities) { MissionEntity missionEntity = new MissionEntity {itemsCount = Convert.ToInt32(MissionUtilities.ReadSingleDataByKey(rawEntities, "items"))}; diff --git a/UKSFWebsite.Api.Services/Missions/MissionEntityItemHelper.cs b/UKSFWebsite.Api.Services/Game/Missions/MissionEntityItemHelper.cs similarity index 99% rename from UKSFWebsite.Api.Services/Missions/MissionEntityItemHelper.cs rename to UKSFWebsite.Api.Services/Game/Missions/MissionEntityItemHelper.cs index 9da76dd5..b8fd367e 100644 --- a/UKSFWebsite.Api.Services/Missions/MissionEntityItemHelper.cs +++ b/UKSFWebsite.Api.Services/Game/Missions/MissionEntityItemHelper.cs @@ -2,7 +2,7 @@ using System.Linq; using UKSFWebsite.Api.Models.Mission; -namespace UKSFWebsite.Api.Services.Missions { +namespace UKSFWebsite.Api.Services.Game.Missions { public static class MissionEntityItemHelper { public static MissionEntityItem CreateFromList(List rawItem) { MissionEntityItem missionEntityItem = new MissionEntityItem {rawMissionEntityItem = rawItem}; @@ -106,7 +106,7 @@ public static IEnumerable Serialize(this MissionEntityItem missionEntity return missionEntityItem.rawMissionEntityItem.ToList(); } - + private static void AddEngineerTrait(this ICollection entity) { entity.Add("class CustomAttributes"); entity.Add("{"); diff --git a/UKSFWebsite.Api.Services/Missions/MissionPatchDataService.cs b/UKSFWebsite.Api.Services/Game/Missions/MissionPatchDataService.cs similarity index 80% rename from UKSFWebsite.Api.Services/Missions/MissionPatchDataService.cs rename to UKSFWebsite.Api.Services/Game/Missions/MissionPatchDataService.cs index 0a65301f..f933a0f9 100644 --- a/UKSFWebsite.Api.Services/Missions/MissionPatchDataService.cs +++ b/UKSFWebsite.Api.Services/Game/Missions/MissionPatchDataService.cs @@ -1,12 +1,13 @@ using System.Collections.Generic; using System.Linq; using MongoDB.Bson; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; using UKSFWebsite.Api.Models.Mission; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; -namespace UKSFWebsite.Api.Services.Missions { +namespace UKSFWebsite.Api.Services.Game.Missions { public class MissionPatchDataService { private readonly IAccountService accountService; private readonly IDisplayNameService displayNameService; @@ -21,14 +22,14 @@ public MissionPatchDataService(IRanksService ranksService, IUnitsService unitsSe } public void UpdatePatchData() { - MissionPatchData.instance = new MissionPatchData {units = new List(), ranks = ranksService.Get(), players = new List(), orderedUnits = new List()}; + MissionPatchData.instance = new MissionPatchData {units = new List(), ranks = ranksService.Data().Get(), players = new List(), orderedUnits = new List()}; - foreach (Unit unit in unitsService.Get(x => x.branch == UnitBranch.COMBAT).ToList()) { + foreach (Unit unit in unitsService.Data().Get(x => x.branch == UnitBranch.COMBAT).ToList()) { MissionPatchData.instance.units.Add(new MissionUnit {sourceUnit = unit, depth = unitsService.GetUnitDepth(unit)}); } - foreach (Account account in accountService.Get().Where(x => !string.IsNullOrEmpty(x.rank) && ranksService.IsSuperiorOrEqual(x.rank, "Recruit"))) { - MissionPatchData.instance.players.Add(new MissionPlayer {account = account, rank = ranksService.GetSingle(account.rank), name = displayNameService.GetDisplayName(account)}); + foreach (Account account in accountService.Data().Get().Where(x => !string.IsNullOrEmpty(x.rank) && ranksService.IsSuperiorOrEqual(x.rank, "Recruit"))) { + MissionPatchData.instance.players.Add(new MissionPlayer {account = account, rank = ranksService.Data().GetSingle(account.rank), name = displayNameService.GetDisplayName(account)}); } foreach (MissionUnit missionUnit in MissionPatchData.instance.units) { diff --git a/UKSFWebsite.Api.Services/Missions/MissionPatchingService.cs b/UKSFWebsite.Api.Services/Game/Missions/MissionPatchingService.cs similarity index 62% rename from UKSFWebsite.Api.Services/Missions/MissionPatchingService.cs rename to UKSFWebsite.Api.Services/Game/Missions/MissionPatchingService.cs index feda60c3..6fcc517e 100644 --- a/UKSFWebsite.Api.Services/Missions/MissionPatchingService.cs +++ b/UKSFWebsite.Api.Services/Game/Missions/MissionPatchingService.cs @@ -5,12 +5,12 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; +using UKSFWebsite.Api.Interfaces.Game; using UKSFWebsite.Api.Models.Mission; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Missions { +namespace UKSFWebsite.Api.Services.Game.Missions { public class MissionPatchingService : IMissionPatchingService { private const string EXTRACT_PBO = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\ExtractPboDos.exe"; private const string MAKE_PBO = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\MakePbo.exe"; @@ -26,32 +26,33 @@ public class MissionPatchingService : IMissionPatchingService { public Task PatchMission(string path) { return Task.Run( async () => { - filePath = path; - parentFolderPath = Path.GetDirectoryName(filePath); - MissionPatchingResult result = new MissionPatchingResult(); - try { - CreateBackup(); - UnpackPbo(); - Mission mission = new Mission(folderPath); - result.reports = missionService.ProcessMission(mission); - - await PackPbo(); - result.playerCount = mission.playerCount; - result.success = result.reports.All(x => !x.error); - } catch (Exception exception) { - LogWrapper.Log(exception); - result.reports = new List {new MissionPatchingReport(exception)}; - result.success = false; - } finally { - Cleanup(); + filePath = path; + parentFolderPath = Path.GetDirectoryName(filePath); + MissionPatchingResult result = new MissionPatchingResult(); + try { + CreateBackup(); + UnpackPbo(); + Mission mission = new Mission(folderPath); + result.reports = missionService.ProcessMission(mission); + + await PackPbo(); + result.playerCount = mission.playerCount; + result.success = result.reports.All(x => !x.error); + } catch (Exception exception) { + LogWrapper.Log(exception); + result.reports = new List {new MissionPatchingReport(exception)}; + result.success = false; + } finally { + Cleanup(); + } + + return result; } - - return result; - }); + ); } private void CreateBackup() { - string backupPath = Path.Combine(VariablesWrapper.VariablesService().GetSingle("MISSION_BACKUPS_FOLDER").AsString(), Path.GetFileName(filePath) ?? throw new FileNotFoundException()); + string backupPath = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("MISSION_BACKUPS_FOLDER").AsString(), Path.GetFileName(filePath) ?? throw new FileNotFoundException()); Directory.CreateDirectory(Path.GetDirectoryName(backupPath) ?? throw new DirectoryNotFoundException()); File.Copy(filePath, backupPath, true); @@ -81,7 +82,15 @@ private async Task PackPbo() { } Process process = new Process { - StartInfo = {FileName = MAKE_PBO, WorkingDirectory = VariablesWrapper.VariablesService().GetSingle("MAKEPBO_WORKING_DIR").AsString(), Arguments = $"-Z -BD -P -X=thumbs.db,*.txt,*.h,*.dep,*.cpp,*.bak,*.png,*.log,*.pew \"{folderPath}\"", UseShellExecute = false, CreateNoWindow = true, RedirectStandardOutput = true, RedirectStandardError = true} + StartInfo = { + FileName = MAKE_PBO, + WorkingDirectory = VariablesWrapper.VariablesDataService().GetSingle("MAKEPBO_WORKING_DIR").AsString(), + Arguments = $"-Z -BD -P -X=thumbs.db,*.txt,*.h,*.dep,*.cpp,*.bak,*.png,*.log,*.pew \"{folderPath}\"", + UseShellExecute = false, + CreateNoWindow = true, + RedirectStandardOutput = true, + RedirectStandardError = true + } }; process.Start(); string output = await process.StandardOutput.ReadToEndAsync(); diff --git a/UKSFWebsite.Api.Services/Missions/MissionService.cs b/UKSFWebsite.Api.Services/Game/Missions/MissionService.cs similarity index 98% rename from UKSFWebsite.Api.Services/Missions/MissionService.cs rename to UKSFWebsite.Api.Services/Game/Missions/MissionService.cs index d00ca392..c5b69b82 100644 --- a/UKSFWebsite.Api.Services/Missions/MissionService.cs +++ b/UKSFWebsite.Api.Services/Game/Missions/MissionService.cs @@ -4,10 +4,9 @@ using System.IO; using System.Linq; using UKSFWebsite.Api.Models.Mission; -using UKSFWebsite.Api.Services.Data; using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Missions { +namespace UKSFWebsite.Api.Services.Game.Missions { public class MissionService { private const string UNBIN = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\DeRapDos.exe"; @@ -26,6 +25,7 @@ public List ProcessMission(Mission tempMission) { if (CheckBinned()) { UnBin(); } + Read(); if (CheckIgnoreKey("missionPatchingIgnore")) { @@ -112,7 +112,7 @@ private void Patch() { mission.missionEntity.Patch(); if (!CheckIgnoreKey("missionImageIgnore")) { string imagePath = Path.Combine(mission.path, "uksf.paa"); - string modpackImagePath = Path.Combine(VariablesWrapper.VariablesService().GetSingle("PATH_MODPACK").AsString(), "@uksf", "UKSFTemplate.VR", "uksf.paa"); + string modpackImagePath = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("PATH_MODPACK").AsString(), "@uksf", "UKSFTemplate.VR", "uksf.paa"); if (File.Exists(modpackImagePath)) { if (File.Exists(imagePath) && new FileInfo(imagePath).Length != new FileInfo(modpackImagePath).Length) { reports.Add( diff --git a/UKSFWebsite.Api.Services/Missions/MissionUtilities.cs b/UKSFWebsite.Api.Services/Game/Missions/MissionUtilities.cs similarity index 97% rename from UKSFWebsite.Api.Services/Missions/MissionUtilities.cs rename to UKSFWebsite.Api.Services/Game/Missions/MissionUtilities.cs index 3427917f..6949949a 100644 --- a/UKSFWebsite.Api.Services/Missions/MissionUtilities.cs +++ b/UKSFWebsite.Api.Services/Game/Missions/MissionUtilities.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace UKSFWebsite.Api.Services.Missions { +namespace UKSFWebsite.Api.Services.Game.Missions { public static class MissionUtilities { public static List ReadDataFromIndex(List source, ref int index) { List data = new List {source[index]}; diff --git a/UKSFWebsite.Api.Services/ServerService.cs b/UKSFWebsite.Api.Services/Game/ServerService.cs similarity index 87% rename from UKSFWebsite.Api.Services/ServerService.cs rename to UKSFWebsite.Api.Services/Game/ServerService.cs index 371f2c65..ed1fa828 100644 --- a/UKSFWebsite.Api.Services/ServerService.cs +++ b/UKSFWebsite.Api.Services/Game/ServerService.cs @@ -4,14 +4,17 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; +using UKSFWebsite.Api.Services.Personnel; + // ReSharper disable HeuristicUnreachableCode #pragma warning disable 162 -namespace UKSFWebsite.Api.Services { +namespace UKSFWebsite.Api.Services.Game { public class ServerService : IServerService { private const string FILE_BACKUP = "backup.xml"; private const string FILE_SQUAD = "squad.xml"; @@ -33,7 +36,7 @@ public void UpdateSquadXml() { return; Task.Run( () => { - List accounts = accountService.Get(x => x.membershipState == MembershipState.MEMBER && x.rank != null); + List accounts = accountService.Data().Get(x => x.membershipState == MembershipState.MEMBER && x.rank != null); accounts = accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); StringBuilder stringBuilder = new StringBuilder(); @@ -43,7 +46,7 @@ public void UpdateSquadXml() { foreach (Account account in accounts.Where(x => ranksService.IsSuperiorOrEqual(x.rank, "Private"))) { StringBuilder accountStringBuilder = new StringBuilder(); - Unit unit = unitsService.GetSingle(x => x.name == account.unitAssignment); + Unit unit = unitsService.Data().GetSingle(x => x.name == account.unitAssignment); string unitRole = unit.roles.FirstOrDefault(x => x.Value == account.id).Key; accountStringBuilder.AppendLine($"\t"); accountStringBuilder.AppendLine($"\t\t{unit.callsign}"); diff --git a/UKSFWebsite.Api.Services/Hubs/Abstraction/IAdminClient.cs b/UKSFWebsite.Api.Services/Hubs/Abstraction/IAdminClient.cs index d6069eb7..d05d4048 100644 --- a/UKSFWebsite.Api.Services/Hubs/Abstraction/IAdminClient.cs +++ b/UKSFWebsite.Api.Services/Hubs/Abstraction/IAdminClient.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Logging; +using UKSFWebsite.Api.Models.Message.Logging; namespace UKSFWebsite.Api.Services.Hubs.Abstraction { public interface IAdminClient { diff --git a/UKSFWebsite.Api.Services/DiscordService.cs b/UKSFWebsite.Api.Services/Integrations/DiscordService.cs similarity index 85% rename from UKSFWebsite.Api.Services/DiscordService.cs rename to UKSFWebsite.Api.Services/Integrations/DiscordService.cs index 97b9d381..f40980f1 100644 --- a/UKSFWebsite.Api.Services/DiscordService.cs +++ b/UKSFWebsite.Api.Services/Integrations/DiscordService.cs @@ -5,13 +5,15 @@ using Discord; using Discord.WebSocket; using Microsoft.Extensions.Configuration; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; +using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Api.Services { +namespace UKSFWebsite.Api.Services.Integrations { public class DiscordService : IDiscordService, IDisposable { private static readonly string[] REPLIES = {"Why thank you {0}", "Thank you {0}, you're too kind", "Thank you so much {0}", "Aw shucks {0} you're embarrassing me"}; private static readonly string[] TRIGGERS = {"thank you", "thank", "best", "mvp", "love you", "appreciate you", "good"}; @@ -32,7 +34,7 @@ public DiscordService(IConfiguration configuration, IRanksService ranksService, this.unitsService = unitsService; this.accountService = accountService; this.displayNameService = displayNameService; - specialUser = VariablesWrapper.VariablesService().GetSingle("DID_U_MASTER").AsUlong(); + specialUser = VariablesWrapper.VariablesDataService().GetSingle("DID_U_MASTER").AsUlong(); } public async Task ConnectDiscord() { @@ -81,11 +83,11 @@ public virtual async Task UpdateAccount(Account account, ulong discordId = 0) { } if (discordId != 0 && account == null) { - account = accountService.GetSingle(x => !string.IsNullOrEmpty(x.discordId) && x.discordId == discordId.ToString()); + account = accountService.Data().GetSingle(x => !string.IsNullOrEmpty(x.discordId) && x.discordId == discordId.ToString()); } if (discordId == 0) return; - if (VariablesWrapper.VariablesService().GetSingle("DID_U_BLACKLIST").AsArray().Contains(discordId.ToString())) return; + if (VariablesWrapper.VariablesDataService().GetSingle("DID_U_BLACKLIST").AsArray().Contains(discordId.ToString())) return; SocketGuildUser user = guild.GetUser(discordId); if (user == null) return; @@ -108,7 +110,7 @@ private async Task UpdateAccountRoles(SocketGuildUser user, Account account) { UpdateAccountUnits(account, allowedRoles); } - string[] rolesBlacklist = VariablesWrapper.VariablesService().GetSingle("DID_R_BLACKLIST").AsArray(); + string[] rolesBlacklist = VariablesWrapper.VariablesDataService().GetSingle("DID_R_BLACKLIST").AsArray(); foreach (SocketRole role in userRoles) { if (!allowedRoles.Contains(role.Id.ToString()) && !rolesBlacklist.Contains(role.Id.ToString())) { await user.RemoveRoleAsync(role); @@ -135,19 +137,14 @@ private async Task UpdateAccountNickname(IGuildUser user, Account account) { private void UpdateAccountRanks(Account account, ISet allowedRoles) { string rank = account.rank; - ranksService.Get() - .ForEach( - x => { - if (rank == x.name) { - allowedRoles.Add(x.discordRoleId); - } - } - ); + foreach (Rank x in ranksService.Data().Get().Where(x => rank == x.name)) { + allowedRoles.Add(x.discordRoleId); + } } private void UpdateAccountUnits(Account account, ISet allowedRoles) { - Unit accountUnit = unitsService.GetSingle(x => x.name == account.unitAssignment); - List accountUnits = unitsService.Get(x => x.members.Contains(account.id)).Where(x => !string.IsNullOrEmpty(x.discordRoleId)).ToList(); + Unit accountUnit = unitsService.Data().GetSingle(x => x.name == account.unitAssignment); + List accountUnits = unitsService.Data().Get(x => x.members.Contains(account.id)).Where(x => !string.IsNullOrEmpty(x.discordRoleId)).ToList(); List accountUnitParents = unitsService.GetParents(accountUnit).Where(x => !string.IsNullOrEmpty(x.discordRoleId)).ToList(); accountUnits.ForEach(x => allowedRoles.Add(x.discordRoleId)); accountUnitParents.ForEach(x => allowedRoles.Add(x.discordRoleId)); @@ -179,15 +176,14 @@ private async Task ClientOnMessageReceived(SocketMessage incomingMessage) { if (TRIGGERS.Any(x => incomingMessage.Content.Contains(x, StringComparison.InvariantCultureIgnoreCase))) { string message = REPLIES[new Random().Next(0, REPLIES.Length)]; string[] parts = guild.GetUser(incomingMessage.Author.Id).Nickname.Split('.'); - string nickname = incomingMessage.Author.Id == specialUser ? "Master" : - parts.Length > 1 ? parts[1] : parts[0]; + string nickname = incomingMessage.Author.Id == specialUser ? "Master" : parts.Length > 1 ? parts[1] : parts[0]; await SendMessage(incomingMessage.Channel.Id, string.Format(message, nickname)); } } } private Task OnClientOnReady() { - guild = client.GetGuild(VariablesWrapper.VariablesService().GetSingle("DID_SERVER").AsUlong()); + guild = client.GetGuild(VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()); roles = guild.Roles; connected = true; return null; diff --git a/UKSFWebsite.Api.Services/Teamspeak/PipeManager.cs b/UKSFWebsite.Api.Services/Integrations/PipeManager.cs similarity index 97% rename from UKSFWebsite.Api.Services/Teamspeak/PipeManager.cs rename to UKSFWebsite.Api.Services/Integrations/PipeManager.cs index 3b6548d2..9beb1e72 100644 --- a/UKSFWebsite.Api.Services/Teamspeak/PipeManager.cs +++ b/UKSFWebsite.Api.Services/Integrations/PipeManager.cs @@ -3,10 +3,10 @@ using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Teamspeak.Procedures; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Services.Integrations.Procedures; -namespace UKSFWebsite.Api.Services.Teamspeak { +namespace UKSFWebsite.Api.Services.Integrations { public class PipeManager : IPipeManager { private const string PIPE_COMMAND_CLOSE = "1"; private const string PIPE_COMMAND_OPEN = "0"; diff --git a/UKSFWebsite.Api.Services/Teamspeak/PipeQueueManager.cs b/UKSFWebsite.Api.Services/Integrations/PipeQueueManager.cs similarity index 91% rename from UKSFWebsite.Api.Services/Teamspeak/PipeQueueManager.cs rename to UKSFWebsite.Api.Services/Integrations/PipeQueueManager.cs index 5d2da604..d1c78955 100644 --- a/UKSFWebsite.Api.Services/Teamspeak/PipeQueueManager.cs +++ b/UKSFWebsite.Api.Services/Integrations/PipeQueueManager.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; -namespace UKSFWebsite.Api.Services.Teamspeak { +namespace UKSFWebsite.Api.Services.Integrations { public static class PipeQueueManager { private static readonly ConcurrentQueue PIPE_QUEUE = new ConcurrentQueue(); diff --git a/UKSFWebsite.Api.Services/Teamspeak/Procedures/CheckClientServerGroup.cs b/UKSFWebsite.Api.Services/Integrations/Procedures/CheckClientServerGroup.cs similarity index 88% rename from UKSFWebsite.Api.Services/Teamspeak/Procedures/CheckClientServerGroup.cs rename to UKSFWebsite.Api.Services/Integrations/Procedures/CheckClientServerGroup.cs index d602a44a..e6600651 100644 --- a/UKSFWebsite.Api.Services/Teamspeak/Procedures/CheckClientServerGroup.cs +++ b/UKSFWebsite.Api.Services/Integrations/Procedures/CheckClientServerGroup.cs @@ -3,11 +3,11 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; - -namespace UKSFWebsite.Api.Services.Teamspeak.Procedures { +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Models.Personnel; +namespace UKSFWebsite.Api.Services.Integrations.Procedures { public class CheckClientServerGroup : ITeamspeakProcedure { private static readonly Dictionary SERVER_GROUP_UPDATES = new Dictionary(); @@ -48,7 +48,7 @@ public void Run(string[] args) { private void ProcessAccountData(string clientDbId, ICollection serverGroups) { Console.WriteLine($"Processing server groups for {clientDbId}"); - Account account = accountService.GetSingle(x => x.teamspeakIdentities != null && x.teamspeakIdentities.Any(y => y == clientDbId)); + Account account = accountService.Data().GetSingle(x => x.teamspeakIdentities != null && x.teamspeakIdentities.Any(y => y == clientDbId)); teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); lock (SERVER_GROUP_UPDATES) { diff --git a/UKSFWebsite.Api.Services/Teamspeak/Procedures/ITeamspeakProcedure.cs b/UKSFWebsite.Api.Services/Integrations/Procedures/ITeamspeakProcedure.cs similarity index 57% rename from UKSFWebsite.Api.Services/Teamspeak/Procedures/ITeamspeakProcedure.cs rename to UKSFWebsite.Api.Services/Integrations/Procedures/ITeamspeakProcedure.cs index e98f3678..680be10c 100644 --- a/UKSFWebsite.Api.Services/Teamspeak/Procedures/ITeamspeakProcedure.cs +++ b/UKSFWebsite.Api.Services/Integrations/Procedures/ITeamspeakProcedure.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Services.Teamspeak.Procedures { +namespace UKSFWebsite.Api.Services.Integrations.Procedures { public interface ITeamspeakProcedure { void Run(string[] args); } diff --git a/UKSFWebsite.Api.Services/Teamspeak/Procedures/Pong.cs b/UKSFWebsite.Api.Services/Integrations/Procedures/Pong.cs similarity index 73% rename from UKSFWebsite.Api.Services/Teamspeak/Procedures/Pong.cs rename to UKSFWebsite.Api.Services/Integrations/Procedures/Pong.cs index 6e797f9d..cef0d869 100644 --- a/UKSFWebsite.Api.Services/Teamspeak/Procedures/Pong.cs +++ b/UKSFWebsite.Api.Services/Integrations/Procedures/Pong.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Services.Teamspeak.Procedures { +namespace UKSFWebsite.Api.Services.Integrations.Procedures { public class Pong : ITeamspeakProcedure { public void Run(string[] args) { PipeManager.PongTime = DateTime.Now; diff --git a/UKSFWebsite.Api.Services/Teamspeak/Procedures/ProcedureDefinitons.cs b/UKSFWebsite.Api.Services/Integrations/Procedures/ProcedureDefinitons.cs similarity index 89% rename from UKSFWebsite.Api.Services/Teamspeak/Procedures/ProcedureDefinitons.cs rename to UKSFWebsite.Api.Services/Integrations/Procedures/ProcedureDefinitons.cs index 871f246d..65ea34ea 100644 --- a/UKSFWebsite.Api.Services/Teamspeak/Procedures/ProcedureDefinitons.cs +++ b/UKSFWebsite.Api.Services/Integrations/Procedures/ProcedureDefinitons.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Services.Teamspeak.Procedures { +namespace UKSFWebsite.Api.Services.Integrations.Procedures { public static class ProcedureDefinitons { public const string PROC_ASSIGN_SERVER_GROUP = "ProcAssignServerGroup"; public const string PROC_PING = "ProcPing"; diff --git a/UKSFWebsite.Api.Services/Teamspeak/Procedures/SendClientsUpdate.cs b/UKSFWebsite.Api.Services/Integrations/Procedures/SendClientsUpdate.cs similarity index 85% rename from UKSFWebsite.Api.Services/Teamspeak/Procedures/SendClientsUpdate.cs rename to UKSFWebsite.Api.Services/Integrations/Procedures/SendClientsUpdate.cs index f0a6024f..79a15a0e 100644 --- a/UKSFWebsite.Api.Services/Teamspeak/Procedures/SendClientsUpdate.cs +++ b/UKSFWebsite.Api.Services/Integrations/Procedures/SendClientsUpdate.cs @@ -1,9 +1,8 @@ using System; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Integrations; -namespace UKSFWebsite.Api.Services.Teamspeak.Procedures { +namespace UKSFWebsite.Api.Services.Integrations.Procedures { public class SendClientsUpdate : ITeamspeakProcedure { - private readonly ITeamspeakService teamspeakService; public SendClientsUpdate(ITeamspeakService teamspeakService) => this.teamspeakService = teamspeakService; diff --git a/UKSFWebsite.Api.Services/Teamspeak/TeamspeakGroupService.cs b/UKSFWebsite.Api.Services/Integrations/TeamspeakGroupService.cs similarity index 69% rename from UKSFWebsite.Api.Services/Teamspeak/TeamspeakGroupService.cs rename to UKSFWebsite.Api.Services/Integrations/TeamspeakGroupService.cs index af0b5b8c..8fd7e261 100644 --- a/UKSFWebsite.Api.Services/Teamspeak/TeamspeakGroupService.cs +++ b/UKSFWebsite.Api.Services/Integrations/TeamspeakGroupService.cs @@ -1,13 +1,14 @@ using System.Collections.Generic; using System.Linq; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; -using UKSFWebsite.Api.Services.Teamspeak.Procedures; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; +using UKSFWebsite.Api.Services.Integrations.Procedures; using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Teamspeak { +namespace UKSFWebsite.Api.Services.Integrations { public class TeamspeakGroupService : ITeamspeakGroupService { private readonly IRanksService ranksService; private readonly IUnitsService unitsService; @@ -21,11 +22,11 @@ public void UpdateAccountGroups(Account account, ICollection serverGroup HashSet allowedGroups = new HashSet(); if (account == null || account.membershipState == MembershipState.UNCONFIRMED) { - allowedGroups.Add(VariablesWrapper.VariablesService().GetSingle("TSGID_UNVERIFIED").AsString()); + allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TSGID_UNVERIFIED").AsString()); } if (account?.membershipState == MembershipState.DISCHARGED) { - allowedGroups.Add(VariablesWrapper.VariablesService().GetSingle("TSGID_DISCHARGED").AsString()); + allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TSGID_DISCHARGED").AsString()); } if (account != null) { @@ -33,7 +34,7 @@ public void UpdateAccountGroups(Account account, ICollection serverGroup UpdateUnits(account, allowedGroups); } - string[] groupsBlacklist = VariablesWrapper.VariablesService().GetSingle("TSGID_BLACKLIST").AsArray(); + string[] groupsBlacklist = VariablesWrapper.VariablesDataService().GetSingle("TSGID_BLACKLIST").AsArray(); foreach (string serverGroup in serverGroups) { if (!allowedGroups.Contains(serverGroup) && !groupsBlacklist.Contains(serverGroup)) { RemoveServerGroup(clientDbId, serverGroup); @@ -47,26 +48,21 @@ public void UpdateAccountGroups(Account account, ICollection serverGroup private void UpdateRank(Account account, ISet allowedGroups) { string rank = account.rank; - ranksService.Get() - .ForEach( - x => { - if (rank == x.name) { - allowedGroups.Add(x.teamspeakGroup); - } - } - ); + foreach (Rank x in ranksService.Data().Get().Where(x => rank == x.name)) { + allowedGroups.Add(x.teamspeakGroup); + } } private void UpdateUnits(Account account, ISet allowedGroups) { - Unit accountUnit = unitsService.GetSingle(x => x.name == account.unitAssignment); - List accountUnits = unitsService.Get(x => x.members.Contains(account.id)).Where(x => !string.IsNullOrEmpty(x.teamspeakGroup)).ToList(); + Unit accountUnit = unitsService.Data().GetSingle(x => x.name == account.unitAssignment); + List accountUnits = unitsService.Data().Get(x => x.members.Contains(account.id)).Where(x => !string.IsNullOrEmpty(x.teamspeakGroup)).ToList(); List accountUnitParents = unitsService.GetParents(accountUnit).Where(x => !string.IsNullOrEmpty(x.teamspeakGroup)).ToList(); Unit elcom = unitsService.GetAuxilliaryRoot(); if (elcom.members.Contains(account.id)) { accountUnits.Remove(accountUnits.Find(x => x.branch == UnitBranch.COMBAT)); accountUnitParents = accountUnitParents.TakeLast(2).ToList(); - allowedGroups.Add(VariablesWrapper.VariablesService().GetSingle("TSGID_ELCOM").AsString()); + allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TSGID_ELCOM").AsString()); } accountUnits.ForEach(x => allowedGroups.Add(x.teamspeakGroup)); diff --git a/UKSFWebsite.Api.Services/Teamspeak/TeamspeakMetricsService.cs b/UKSFWebsite.Api.Services/Integrations/TeamspeakMetricsService.cs similarity index 68% rename from UKSFWebsite.Api.Services/Teamspeak/TeamspeakMetricsService.cs rename to UKSFWebsite.Api.Services/Integrations/TeamspeakMetricsService.cs index 8b7a7ea8..c6d0397b 100644 --- a/UKSFWebsite.Api.Services/Teamspeak/TeamspeakMetricsService.cs +++ b/UKSFWebsite.Api.Services/Integrations/TeamspeakMetricsService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Integrations; -namespace UKSFWebsite.Api.Services.Teamspeak { +namespace UKSFWebsite.Api.Services.Integrations { public class TeamspeakMetricsService : ITeamspeakMetricsService { public float GetWeeklyParticipationTrend(HashSet teamspeakIdentities) => 3; } diff --git a/UKSFWebsite.Api.Services/Teamspeak/TeamspeakService.cs b/UKSFWebsite.Api.Services/Integrations/TeamspeakService.cs similarity index 95% rename from UKSFWebsite.Api.Services/Teamspeak/TeamspeakService.cs rename to UKSFWebsite.Api.Services/Integrations/TeamspeakService.cs index b5a708c7..a22fab0b 100644 --- a/UKSFWebsite.Api.Services/Teamspeak/TeamspeakService.cs +++ b/UKSFWebsite.Api.Services/Integrations/TeamspeakService.cs @@ -8,14 +8,14 @@ using MongoDB.Driver; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Models.Integrations; +using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Hubs.Abstraction; -using UKSFWebsite.Api.Services.Teamspeak.Procedures; +using UKSFWebsite.Api.Services.Integrations.Procedures; -namespace UKSFWebsite.Api.Services.Teamspeak { +namespace UKSFWebsite.Api.Services.Integrations { public class TeamspeakService : ITeamspeakService { private readonly SemaphoreSlim clientStringSemaphore = new SemaphoreSlim(1); private readonly IMongoDatabase database; diff --git a/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs b/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs index 95d93020..7a75f2ad 100644 --- a/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs +++ b/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs @@ -6,19 +6,24 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using MimeMapping; using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Launcher; using UKSFWebsite.Api.Models.Launcher; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Services.Launcher { - public class LauncherFileService : CachedDataService, ILauncherFileService { - public LauncherFileService(IMongoDatabase database) : base(database, "launcherFiles") { } + public class LauncherFileService : ILauncherFileService { + private readonly ILauncherFileDataService data; + + public LauncherFileService(ILauncherFileDataService data) => this.data = data; + + public ILauncherFileDataService Data() => data; public async Task UpdateAllVersions() { - List storedVersions = Get(); - string launcherDirectory = Path.Combine(VariablesWrapper.VariablesService().GetSingle("LAUNCHER_LOCATION").AsString(), "Launcher"); + List storedVersions = data.Get(); + string launcherDirectory = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("LAUNCHER_LOCATION").AsString(), "Launcher"); List fileNames = new List(); foreach (string filePath in Directory.EnumerateFiles(launcherDirectory)) { string fileName = Path.GetFileName(filePath); @@ -26,29 +31,30 @@ public async Task UpdateAllVersions() { fileNames.Add(fileName); LauncherFile storedFile = storedVersions.FirstOrDefault(x => x.fileName == fileName); if (storedFile == null) { - await Add(new LauncherFile {fileName = fileName, version = version}); + await data.Add(new LauncherFile {fileName = fileName, version = version}); continue; } + if (storedFile.version != version) { - await Update(storedFile.id, Builders.Update.Set(x => x.version, version)); + await data.Update(storedFile.id, Builders.Update.Set(x => x.version, version)); } } foreach (LauncherFile storedVersion in storedVersions.Where(storedVersion => fileNames.All(x => x != storedVersion.fileName))) { - await Delete(storedVersion.id); + await data.Delete(storedVersion.id); } } public FileStreamResult GetLauncherFile(params string[] file) { - string[] paths = file.Prepend(VariablesWrapper.VariablesService().GetSingle("LAUNCHER_LOCATION").AsString()).ToArray(); + string[] paths = file.Prepend(VariablesWrapper.VariablesDataService().GetSingle("LAUNCHER_LOCATION").AsString()).ToArray(); string path = Path.Combine(paths); - FileStreamResult fileStreamResult = new FileStreamResult(new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read), MimeMapping.MimeUtility.GetMimeMapping(path)); + FileStreamResult fileStreamResult = new FileStreamResult(new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read), MimeUtility.GetMimeMapping(path)); return fileStreamResult; } public async Task GetUpdatedFiles(IEnumerable files) { - string launcherDirectory = Path.Combine(VariablesWrapper.VariablesService().GetSingle("LAUNCHER_LOCATION").AsString(), "Launcher"); - List storedVersions = Get(); + string launcherDirectory = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("LAUNCHER_LOCATION").AsString(), "Launcher"); + List storedVersions = data.Get(); List updatedFiles = new List(); List deletedFiles = new List(); foreach (LauncherFile launcherFile in files) { @@ -64,7 +70,7 @@ public async Task GetUpdatedFiles(IEnumerable files) { } string updateFolderName = Guid.NewGuid().ToString("N"); - string updateFolder = Path.Combine(VariablesWrapper.VariablesService().GetSingle("LAUNCHER_LOCATION").AsString(), updateFolderName); + string updateFolder = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("LAUNCHER_LOCATION").AsString(), updateFolderName); Directory.CreateDirectory(updateFolder); string deletedFilesPath = Path.Combine(updateFolder, "deleted"); @@ -74,12 +80,13 @@ public async Task GetUpdatedFiles(IEnumerable files) { File.Copy(Path.Combine(launcherDirectory, file), Path.Combine(updateFolder, file), true); } - string updateZipPath = Path.Combine(VariablesWrapper.VariablesService().GetSingle("LAUNCHER_LOCATION").AsString(), $"{updateFolderName}.zip"); + string updateZipPath = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("LAUNCHER_LOCATION").AsString(), $"{updateFolderName}.zip"); ZipFile.CreateFromDirectory(updateFolder, updateZipPath); MemoryStream stream = new MemoryStream(); await using (FileStream fileStream = new FileStream(updateZipPath, FileMode.Open, FileAccess.Read, FileShare.None)) { await fileStream.CopyToAsync(stream); } + File.Delete(updateZipPath); Directory.Delete(updateFolder, true); diff --git a/UKSFWebsite.Api.Services/Launcher/LauncherService.cs b/UKSFWebsite.Api.Services/Launcher/LauncherService.cs index 046889f3..c9f3b2bb 100644 --- a/UKSFWebsite.Api.Services/Launcher/LauncherService.cs +++ b/UKSFWebsite.Api.Services/Launcher/LauncherService.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Launcher; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Hubs.Abstraction; diff --git a/UKSFWebsite.Api.Services/Logging/Logging.cs b/UKSFWebsite.Api.Services/Logging/Logging.cs deleted file mode 100644 index f0cfa2ad..00000000 --- a/UKSFWebsite.Api.Services/Logging/Logging.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Logging; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; - -namespace UKSFWebsite.Api.Services.Logging { - public class Logging : ILogging { - private readonly IDisplayNameService displayNameService; - private readonly ILoggingService loggingService; - - public Logging(ILoggingService loggingService, IDisplayNameService displayNameService) { - this.loggingService = loggingService; - this.displayNameService = displayNameService; - } - - public void Log(string message) { - Task unused = loggingService.LogAsync(new BasicLogMessage(message)); - } - - public void Log(BasicLogMessage log) { - if (log is AuditLogMessage auditLog) { - auditLog.who = displayNameService.GetDisplayName(auditLog.who); - log = auditLog; - } - - log.message = log.message.ConvertObjectIds(); - Task unused = loggingService.LogAsync(log); - } - - public void Log(Exception exception) { - Task unused = loggingService.LogAsync(exception); - } - } -} diff --git a/UKSFWebsite.Api.Services/Message/CommentThreadService.cs b/UKSFWebsite.Api.Services/Message/CommentThreadService.cs new file mode 100644 index 00000000..04d0e5e5 --- /dev/null +++ b/UKSFWebsite.Api.Services/Message/CommentThreadService.cs @@ -0,0 +1,33 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Models.Message; + +namespace UKSFWebsite.Api.Services.Message { + public class CommentThreadService : ICommentThreadService { + private readonly ICommentThreadDataService data; + + public CommentThreadService(ICommentThreadDataService data) => this.data = data; + + public ICommentThreadDataService Data() => data; + + public IEnumerable GetCommentThreadComments(string id) => data.GetSingle(id).comments.Reverse(); + + public async Task InsertComment(string id, Comment comment) { + await data.Update(id, Builders.Update.Push("comments", comment)); + } + + public async Task RemoveComment(string id, Comment comment) { + await data.Update(id, Builders.Update.Pull("comments", comment)); + } + + public IEnumerable GetCommentThreadParticipants(string id) { + HashSet participants = GetCommentThreadComments(id).Select(x => x.author).ToHashSet(); + participants.UnionWith(data.GetSingle(id).authors); + return participants; + } + } +} diff --git a/UKSFWebsite.Api.Services/EmailService.cs b/UKSFWebsite.Api.Services/Message/EmailService.cs similarity index 92% rename from UKSFWebsite.Api.Services/EmailService.cs rename to UKSFWebsite.Api.Services/Message/EmailService.cs index 74f20f78..92a6ba9a 100644 --- a/UKSFWebsite.Api.Services/EmailService.cs +++ b/UKSFWebsite.Api.Services/Message/EmailService.cs @@ -1,12 +1,12 @@ using System.Net; using System.Net.Mail; using Microsoft.Extensions.Configuration; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Message; -namespace UKSFWebsite.Api.Services { +namespace UKSFWebsite.Api.Services.Message { public class EmailService : IEmailService { - private readonly string username; private readonly string password; + private readonly string username; public EmailService(IConfiguration configuration) { username = configuration.GetSection("EmailSettings")["username"]; diff --git a/UKSFWebsite.Api.Services/Utility/LogWrapper.cs b/UKSFWebsite.Api.Services/Message/LogWrapper.cs similarity index 55% rename from UKSFWebsite.Api.Services/Utility/LogWrapper.cs rename to UKSFWebsite.Api.Services/Message/LogWrapper.cs index 85516bbb..5ff8166b 100644 --- a/UKSFWebsite.Api.Services/Utility/LogWrapper.cs +++ b/UKSFWebsite.Api.Services/Message/LogWrapper.cs @@ -1,15 +1,16 @@ using System; using Microsoft.Extensions.DependencyInjection; -using UKSFWebsite.Api.Models.Logging; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Models.Message.Logging; +using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSFWebsite.Api.Services.Message { public static class LogWrapper { - public static void Log(string message) => ServiceWrapper.ServiceProvider.GetService().Log(message); + public static void Log(string message) => ServiceWrapper.ServiceProvider.GetService().Log(message); - public static void Log(BasicLogMessage log) => ServiceWrapper.ServiceProvider.GetService().Log(log); + public static void Log(BasicLogMessage log) => ServiceWrapper.ServiceProvider.GetService().Log(log); - public static void Log(Exception exception) => ServiceWrapper.ServiceProvider.GetService().Log(exception); + public static void Log(Exception exception) => ServiceWrapper.ServiceProvider.GetService().Log(exception); public static void AuditLog(string userId, string message) => Log(new AuditLogMessage {who = userId, level = LogLevel.INFO, message = message}); } diff --git a/UKSFWebsite.Api.Services/Logging/LoggingService.cs b/UKSFWebsite.Api.Services/Message/LoggingService.cs similarity index 55% rename from UKSFWebsite.Api.Services/Logging/LoggingService.cs rename to UKSFWebsite.Api.Services/Message/LoggingService.cs index 6af9047c..68177419 100644 --- a/UKSFWebsite.Api.Services/Logging/LoggingService.cs +++ b/UKSFWebsite.Api.Services/Message/LoggingService.cs @@ -2,24 +2,46 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; -using UKSFWebsite.Api.Models.Logging; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Models.Message.Logging; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Hubs.Abstraction; +using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Logging { +namespace UKSFWebsite.Api.Services.Message { public class LoggingService : ILoggingService { private readonly IHubContext adminHub; private readonly IMongoDatabase database; + private readonly IDisplayNameService displayNameService; - public LoggingService(IMongoDatabase database, IHubContext adminHub) { + public LoggingService(IMongoDatabase database, IDisplayNameService displayNameService, IHubContext adminHub) { this.database = database; + this.displayNameService = displayNameService; this.adminHub = adminHub; } - public async Task LogAsync(BasicLogMessage log) => await LogToStorage(log); + public void Log(string message) { + Task unused = LogAsync(new BasicLogMessage(message)); + } + + public void Log(BasicLogMessage log) { + if (log is AuditLogMessage auditLog) { + auditLog.who = displayNameService.GetDisplayName(auditLog.who); + log = auditLog; + } + + log.message = log.message.ConvertObjectIds(); + Task unused = LogAsync(log); + } + + public void Log(Exception exception) { + Task unused = LogAsync(exception); + } + + private async Task LogAsync(BasicLogMessage log) => await LogToStorage(log); - public async Task LogAsync(Exception exception) => await LogToStorage(new BasicLogMessage(exception)); + private async Task LogAsync(Exception exception) => await LogToStorage(new BasicLogMessage(exception)); private async Task LogToStorage(BasicLogMessage log) { switch (log) { diff --git a/UKSFWebsite.Api.Services/Data/NotificationsService.cs b/UKSFWebsite.Api.Services/Message/NotificationsService.cs similarity index 66% rename from UKSFWebsite.Api.Services/Data/NotificationsService.cs rename to UKSFWebsite.Api.Services/Message/NotificationsService.cs index 6e02c38a..b8889c19 100644 --- a/UKSFWebsite.Api.Services/Data/NotificationsService.cs +++ b/UKSFWebsite.Api.Services/Message/NotificationsService.cs @@ -3,33 +3,28 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Hubs.Abstraction; using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Data { - public static class NotificationIcons { - public const string APPLICATION = "group_add"; - public const string COMMENT = "comment"; - public const string DEMOTION = "mood_bad"; - public const string PROMOTION = "stars"; - public const string REQUEST = "add_circle"; - } - - public class NotificationsService : CachedDataService, INotificationsService { +namespace UKSFWebsite.Api.Services.Message { + public class NotificationsService : INotificationsService { private readonly IAccountService accountService; + private readonly INotificationsDataService data; private readonly IEmailService emailService; private readonly IHubContext notificationsHub; private readonly ISessionService sessionService; private readonly ITeamspeakService teamspeakService; - public NotificationsService(ITeamspeakService teamspeakService, IAccountService accountService, ISessionService sessionService, IMongoDatabase database, IEmailService emailService, IHubContext notificationsHub) : base( - database, - "notifications" - ) { + public NotificationsService(INotificationsDataService data, ITeamspeakService teamspeakService, IAccountService accountService, ISessionService sessionService, IEmailService emailService, IHubContext notificationsHub) { + this.data = data; this.teamspeakService = teamspeakService; this.accountService = accountService; this.sessionService = sessionService; @@ -37,6 +32,8 @@ public NotificationsService(ITeamspeakService teamspeakService, IAccountService this.notificationsHub = notificationsHub; } + public INotificationsDataService Data() => data; + public void SendTeamspeakNotification(Account account, string rawMessage) { rawMessage = rawMessage.Replace("", "[/url]"); teamspeakService.SendTeamspeakMessageToClient(account, rawMessage); @@ -49,10 +46,10 @@ public void SendTeamspeakNotification(IEnumerable clientDbIds, string ra public IEnumerable GetNotificationsForContext() { string contextId = sessionService.GetContextId(); - return Get(x => x.owner == contextId); + return data.Get(x => x.owner == contextId); } - public new void Add(Notification notification) { + public void Add(Notification notification) { if (notification == null) return; Task unused = AddNotificationAsync(notification); } @@ -60,24 +57,21 @@ public IEnumerable GetNotificationsForContext() { public async Task MarkNotificationsAsRead(IEnumerable ids) { ids = ids.ToList(); string contextId = sessionService.GetContextId(); - FilterDefinition filter = Builders.Filter.Eq(x => x.owner, contextId) & Builders.Filter.In(x => x.id, ids); - await Database.GetCollection(DatabaseCollection).UpdateManyAsync(filter, Builders.Update.Set(x => x.read, true)); - Refresh(); + await data.UpdateMany(Builders.Filter.Eq(x => x.owner, contextId) & Builders.Filter.In(x => x.id, ids), Builders.Update.Set(x => x.read, true)); await notificationsHub.Clients.Group(contextId).ReceiveRead(ids); } public async Task Delete(IEnumerable ids) { ids = ids.ToList(); string contextId = sessionService.GetContextId(); - await Database.GetCollection(DatabaseCollection).DeleteManyAsync(Builders.Filter.Eq(x => x.owner, contextId) & Builders.Filter.In(x => x.id, ids)); - Refresh(); + await data.DeleteMany(Builders.Filter.Eq(x => x.owner, contextId) & Builders.Filter.In(x => x.id, ids)); await notificationsHub.Clients.Group(contextId).ReceiveClear(ids); } private async Task AddNotificationAsync(Notification notification) { notification.message = notification.message.ConvertObjectIds(); - await base.Add(notification); - Account account = accountService.GetSingle(notification.owner); + await data.Add(notification); + Account account = accountService.Data().GetSingle(notification.owner); if (account.settings.notificationsEmail) { SendEmailNotification(account.email, $"{notification.message}{(notification.link != null ? $"
https://uk-sf.co.uk{notification.link}" : "")}"); } diff --git a/UKSFWebsite.Api.Services/Operations/OperationOrderService.cs b/UKSFWebsite.Api.Services/Operations/OperationOrderService.cs new file mode 100644 index 00000000..618c6606 --- /dev/null +++ b/UKSFWebsite.Api.Services/Operations/OperationOrderService.cs @@ -0,0 +1,25 @@ +using System.Threading.Tasks; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Operations; +using UKSFWebsite.Api.Models.Operations; + +namespace UKSFWebsite.Api.Services.Operations { + public class OperationOrderService : IOperationOrderService { + private readonly IOperationOrderDataService data; + + public OperationOrderService(IOperationOrderDataService data) => this.data = data; + + public IOperationOrderDataService Data() => data; + + public async Task Add(CreateOperationOrderRequest request) { + Opord operation = new Opord { + name = request.name, + map = request.map, + start = request.start.AddHours((double) request.starttime / 100), + end = request.end.AddHours((double) request.endtime / 100), + type = request.type + }; + await data.Add(operation); + } + } +} diff --git a/UKSFWebsite.Api.Services/Operations/OperationReportService.cs b/UKSFWebsite.Api.Services/Operations/OperationReportService.cs new file mode 100644 index 00000000..953c5a97 --- /dev/null +++ b/UKSFWebsite.Api.Services/Operations/OperationReportService.cs @@ -0,0 +1,32 @@ +using System.Threading.Tasks; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Operations; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Models.Operations; + +namespace UKSFWebsite.Api.Services.Operations { + public class OperationReportService : IOperationReportService { + private readonly IAttendanceService attendanceService; + private readonly IOperationReportDataService data; + + public OperationReportService(IOperationReportDataService data, IAttendanceService attendanceService) { + this.data = data; + this.attendanceService = attendanceService; + } + + public IOperationReportDataService Data() => data; + + public async Task Create(CreateOperationReportRequest request) { + Oprep operation = new Oprep { + name = request.name, + map = request.map, + start = request.start.AddHours((double) request.starttime / 100), + end = request.end.AddHours((double) request.endtime / 100), + type = request.type, + result = request.result + }; + operation.attendanceReport = await attendanceService.GenerateAttendanceReport(operation.start, operation.end); + await data.Add(operation); + } + } +} diff --git a/UKSFWebsite.Api.Services/Personnel/AccountService.cs b/UKSFWebsite.Api.Services/Personnel/AccountService.cs new file mode 100644 index 00000000..09bf5a39 --- /dev/null +++ b/UKSFWebsite.Api.Services/Personnel/AccountService.cs @@ -0,0 +1,32 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.SignalR; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Services.Hubs; +using UKSFWebsite.Api.Services.Hubs.Abstraction; + +namespace UKSFWebsite.Api.Services.Personnel { + public class AccountService : IAccountService { + private readonly IHubContext accountHub; + private readonly IAccountDataService data; + + public AccountService(IAccountDataService data, IHubContext accountHub) { + this.data = data; + this.accountHub = accountHub; + } + + public IAccountDataService Data() => data; + + public async Task Update(string id, string fieldName, object value) { + await data.Update(id, fieldName, value); + await accountHub.Clients.Group(id).ReceiveAccountUpdate(); // TODO: Implement event bus for signals, move to base data services + } + + public async Task Update(string id, UpdateDefinition update) { + await data.Update(id, update); + await accountHub.Clients.Group(id).ReceiveAccountUpdate(); + } + } +} diff --git a/UKSFWebsite.Api.Services/AssignmentService.cs b/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs similarity index 83% rename from UKSFWebsite.Api.Services/AssignmentService.cs rename to UKSFWebsite.Api.Services/Personnel/AssignmentService.cs index 5eef03f2..33748afe 100644 --- a/UKSFWebsite.Api.Services/AssignmentService.cs +++ b/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs @@ -4,25 +4,28 @@ using System.Threading.Tasks; using AvsAnLib; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Hubs.Abstraction; -namespace UKSFWebsite.Api.Services { +namespace UKSFWebsite.Api.Services.Personnel { public class AssignmentService : IAssignmentService { public const string REMOVE_FLAG = "REMOVE"; + private readonly IHubContext accountHub; private readonly IAccountService accountService; + private readonly IDiscordService discordService; private readonly IDisplayNameService displayNameService; private readonly IRanksService ranksService; private readonly IServerService serverService; private readonly IServiceRecordService serviceRecordService; private readonly ITeamspeakService teamspeakService; private readonly IUnitsService unitsService; - private readonly IDiscordService discordService; - private readonly IHubContext accountHub; public AssignmentService( IServiceRecordService serviceRecordService, @@ -82,7 +85,7 @@ public async Task AssignUnitRole(string id, string unitId, string role) { } public async Task UnassignAllUnits(string id) { - foreach (Unit unit in unitsService.Get()) { + foreach (Unit unit in unitsService.Data().Get()) { await unitsService.RemoveMember(id, unit); } @@ -90,7 +93,7 @@ public async Task UnassignAllUnits(string id) { } public async Task UnassignAllUnitRoles(string id) { - foreach (Unit unit in unitsService.Get()) { + foreach (Unit unit in unitsService.Data().Get()) { await unitsService.SetMemberRole(id, unit); } @@ -98,7 +101,7 @@ public async Task UnassignAllUnitRoles(string id) { } public async Task UnassignUnitRole(string id, string unitId) { - Unit unit = unitsService.GetSingle(unitId); + Unit unit = unitsService.Data().GetSingle(unitId); string role = unit.roles.FirstOrDefault(x => x.Value == id).Key; if (unitsService.RolesHasMember(unit, id)) { await unitsService.SetMemberRole(id, unitId); @@ -109,13 +112,13 @@ public async Task UnassignUnitRole(string id, string unitId) { } public async Task UnassignUnit(string id, string unitId) { - Unit unit = unitsService.GetSingle(unitId); + Unit unit = unitsService.Data().GetSingle(unitId); await unitsService.RemoveMember(id, unit); await UpdateGroupsAndRoles(unitId); } private async Task UpdateGroupsAndRoles(string id) { - Account account = accountService.GetSingle(id); + Account account = accountService.Data().GetSingle(id); teamspeakService.UpdateAccountTeamspeakGroups(account); await discordService.UpdateAccount(account); serverService.UpdateSquadXml(); @@ -125,22 +128,22 @@ private async Task UpdateGroupsAndRoles(string id) { private async Task> UpdateUnit(string id, string unitString, StringBuilder notificationMessage) { bool unitUpdate = false; bool positive = true; - Unit unit = unitsService.GetSingle(x => x.name == unitString); + Unit unit = unitsService.Data().GetSingle(x => x.name == unitString); if (unit != null) { if (unit.branch == UnitBranch.COMBAT) { - await unitsService.RemoveMember(id, accountService.GetSingle(id).unitAssignment); - await accountService.Update(id, "unitAssignment", unit.name); + await unitsService.RemoveMember(id, accountService.Data().GetSingle(id).unitAssignment); + await accountService.Data().Update(id, "unitAssignment", unit.name); } await unitsService.AddMember(id, unit.id); notificationMessage.Append($"You have been transfered to {unitsService.GetChainString(unit)}"); unitUpdate = true; } else if (unitString == REMOVE_FLAG) { - string currentUnit = accountService.GetSingle(id).unitAssignment; + string currentUnit = accountService.Data().GetSingle(id).unitAssignment; if (string.IsNullOrEmpty(currentUnit)) return new Tuple(false, false); - unit = unitsService.GetSingle(x => x.name == currentUnit); + unit = unitsService.Data().GetSingle(x => x.name == currentUnit); await unitsService.RemoveMember(id, currentUnit); - await accountService.Update(id, "unitAssignment", null); + await accountService.Data().Update(id, "unitAssignment", null); notificationMessage.Append($"You have been removed from {unitsService.GetChainString(unit)}"); unitUpdate = true; positive = false; @@ -153,12 +156,12 @@ private async Task> UpdateRole(string id, string role, bool un bool roleUpdate = false; bool positive = true; if (!string.IsNullOrEmpty(role) && role != REMOVE_FLAG) { - await accountService.Update(id, "roleAssignment", role); + await accountService.Data().Update(id, "roleAssignment", role); notificationMessage.Append($"{(unitUpdate ? $" as {AvsAn.Query(role).Article} {role}" : $"You have been assigned as {AvsAn.Query(role).Article} {role}")}"); roleUpdate = true; } else if (role == REMOVE_FLAG) { - string currentRole = accountService.GetSingle(id).roleAssignment; - await accountService.Update(id, "roleAssignment", null); + string currentRole = accountService.Data().GetSingle(id).roleAssignment; + await accountService.Data().Update(id, "roleAssignment", null); notificationMessage.Append( string.IsNullOrEmpty(currentRole) ? $"{(unitUpdate ? " and unassigned from your role" : "You have been unassigned from your role")}" @@ -175,15 +178,15 @@ private async Task> UpdateRole(string id, string role, bool un private async Task> UpdateRank(string id, string rank, bool unitUpdate, bool roleUpdate, StringBuilder notificationMessage) { bool rankUpdate = false; bool positive = true; - string currentRank = accountService.GetSingle(id).rank; + string currentRank = accountService.Data().GetSingle(id).rank; if (!string.IsNullOrEmpty(rank) && rank != REMOVE_FLAG) { if (currentRank == rank) return new Tuple(false, true); - await accountService.Update(id, "rank", rank); + await accountService.Data().Update(id, "rank", rank); bool promotion = string.IsNullOrEmpty(currentRank) || ranksService.IsSuperior(rank, currentRank); notificationMessage.Append($"{(unitUpdate || roleUpdate ? $" and {(promotion ? "promoted" : "demoted")} to {rank}" : $"You have been {(promotion ? "promoted" : "demoted")} to {rank}")}"); rankUpdate = true; } else if (rank == REMOVE_FLAG) { - await accountService.Update(id, "rank", null); + await accountService.Data().Update(id, "rank", null); notificationMessage.Append($"{(unitUpdate || roleUpdate ? $" and demoted from {currentRank}" : $"You have been demoted from {currentRank}")}"); rankUpdate = true; positive = false; diff --git a/UKSFWebsite.Api.Services/AttendanceService.cs b/UKSFWebsite.Api.Services/Personnel/AttendanceService.cs similarity index 80% rename from UKSFWebsite.Api.Services/AttendanceService.cs rename to UKSFWebsite.Api.Services/Personnel/AttendanceService.cs index b8601356..f6e46a6d 100644 --- a/UKSFWebsite.Api.Services/AttendanceService.cs +++ b/UKSFWebsite.Api.Services/Personnel/AttendanceService.cs @@ -3,11 +3,12 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Models.Integrations; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services { +namespace UKSFWebsite.Api.Services.Personnel { public class AttendanceService : IAttendanceService { private readonly IAccountService accountService; private readonly IMongoDatabase database; @@ -33,9 +34,8 @@ public async Task GenerateAttendanceReport(DateTime start, Dat accountId = x.id, displayName = displayNameService.GetDisplayName(x), attendancePercent = GetAttendancePercent(x.teamspeakIdentities), - attendanceState = - loaService.IsLoaCovered(x.id, start) ? AttendanceState.LOA : GetAttendanceState(GetAttendancePercent(x.teamspeakIdentities)), - groupId = unitsService.GetSingle(y => y.name == x.unitAssignment).id, + attendanceState = loaService.IsLoaCovered(x.id, start) ? AttendanceState.LOA : GetAttendanceState(GetAttendancePercent(x.teamspeakIdentities)), + groupId = unitsService.Data().GetSingle(y => y.name == x.unitAssignment).id, groupName = x.unitAssignment } ) @@ -44,7 +44,7 @@ public async Task GenerateAttendanceReport(DateTime start, Dat } private void GetAccounts() { - accounts = accountService.Get(x => x.membershipState == MembershipState.MEMBER); + accounts = accountService.Data().Get(x => x.membershipState == MembershipState.MEMBER); } private async Task GetRecords(DateTime start, DateTime end) { @@ -56,7 +56,6 @@ private float GetAttendancePercent(ICollection userTsId) { return presentRecords.Count() / (float) records.Count; } - private static AttendanceState GetAttendanceState(float attendancePercent) => - attendancePercent > 0.6 ? AttendanceState.FULL : attendancePercent > 0.3 ? AttendanceState.PARTIAL : AttendanceState.MIA; + private static AttendanceState GetAttendanceState(float attendancePercent) => attendancePercent > 0.6 ? AttendanceState.FULL : attendancePercent > 0.3 ? AttendanceState.PARTIAL : AttendanceState.MIA; } } diff --git a/UKSFWebsite.Api.Services/Personnel/DischargeService.cs b/UKSFWebsite.Api.Services/Personnel/DischargeService.cs new file mode 100644 index 00000000..1685bdab --- /dev/null +++ b/UKSFWebsite.Api.Services/Personnel/DischargeService.cs @@ -0,0 +1,12 @@ +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Personnel; + +namespace UKSFWebsite.Api.Services.Personnel { + public class DischargeService : IDischargeService { + private readonly IDischargeDataService data; + + public DischargeService(IDischargeDataService data) => this.data = data; + + public IDischargeDataService Data() => data; + } +} diff --git a/UKSFWebsite.Api.Services/DisplayNameService.cs b/UKSFWebsite.Api.Services/Personnel/DisplayNameService.cs similarity index 78% rename from UKSFWebsite.Api.Services/DisplayNameService.cs rename to UKSFWebsite.Api.Services/Personnel/DisplayNameService.cs index 14511d78..b258ad3b 100644 --- a/UKSFWebsite.Api.Services/DisplayNameService.cs +++ b/UKSFWebsite.Api.Services/Personnel/DisplayNameService.cs @@ -1,8 +1,7 @@ -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services { +namespace UKSFWebsite.Api.Services.Personnel { public class DisplayNameService : IDisplayNameService { private readonly IAccountService accountService; private readonly IRanksService ranksService; @@ -13,7 +12,7 @@ public DisplayNameService(IRanksService ranksService, IAccountService accountSer } public string GetDisplayName(Account account) { - Rank rank = account.rank != null ? ranksService.GetSingle(account.rank) : null; + Rank rank = account.rank != null ? ranksService.Data().GetSingle(account.rank) : null; if (account.membershipState == MembershipState.MEMBER) { return rank == null ? account.lastname + "." + account.firstname[0] : rank.abbreviation + "." + account.lastname + "." + account.firstname[0]; } @@ -22,7 +21,7 @@ public string GetDisplayName(Account account) { } public string GetDisplayName(string id) { - Account account = accountService.GetSingle(id); + Account account = accountService.Data().GetSingle(id); return account != null ? GetDisplayName(account) : id; } diff --git a/UKSFWebsite.Api.Services/Data/LoaService.cs b/UKSFWebsite.Api.Services/Personnel/LoaService.cs similarity index 55% rename from UKSFWebsite.Api.Services/Data/LoaService.cs rename to UKSFWebsite.Api.Services/Personnel/LoaService.cs index 0b97bc49..d25d5152 100644 --- a/UKSFWebsite.Api.Services/Data/LoaService.cs +++ b/UKSFWebsite.Api.Services/Personnel/LoaService.cs @@ -2,16 +2,21 @@ using System.Collections.Generic; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.CommandRequests; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Models.Command; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Data { - public class LoaService : CachedDataService, ILoaService { - public LoaService(IMongoDatabase database) : base(database, "loas") { } +namespace UKSFWebsite.Api.Services.Personnel { + public class LoaService : ILoaService { + private readonly ILoaDataService data; + + public LoaService(ILoaDataService data) => this.data = data; + + public ILoaDataService Data() => data; public IEnumerable Get(List ids) { - return Get(x => ids.Contains(x.recipient) && x.end > DateTime.Now.AddDays(-30)); + return data.Get(x => ids.Contains(x.recipient) && x.end > DateTime.Now.AddDays(-30)); } public async Task Add(CommandRequestLoa requestBase) { @@ -24,18 +29,16 @@ public async Task Add(CommandRequestLoa requestBase) { emergency = !string.IsNullOrEmpty(requestBase.emergency) && bool.Parse(requestBase.emergency), late = !string.IsNullOrEmpty(requestBase.late) && bool.Parse(requestBase.late) }; - await base.Add(loa); - Refresh(); + await data.Add(loa); return loa.id; } public async Task SetLoaState(string id, LoaReviewState state) { - await Update(id, Builders.Update.Set(x => x.state, state)); - Refresh(); + await data.Update(id, Builders.Update.Set(x => x.state, state)); } public bool IsLoaCovered(string id, DateTime eventStart) { - return Get(loa => loa.recipient == id && loa.start < eventStart && loa.end > eventStart).Count > 0; + return data.Get(loa => loa.recipient == id && loa.start < eventStart && loa.end > eventStart).Count > 0; } } } diff --git a/UKSFWebsite.Api.Services/LoginService.cs b/UKSFWebsite.Api.Services/Personnel/LoginService.cs similarity index 88% rename from UKSFWebsite.Api.Services/LoginService.cs rename to UKSFWebsite.Api.Services/Personnel/LoginService.cs index 8d9b2805..7b03df82 100644 --- a/UKSFWebsite.Api.Services/LoginService.cs +++ b/UKSFWebsite.Api.Services/Personnel/LoginService.cs @@ -5,11 +5,12 @@ using System.Security.Claims; using Microsoft.IdentityModel.Tokens; using Newtonsoft.Json; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services { +namespace UKSFWebsite.Api.Services.Personnel { public class LoginService : ILoginService { private readonly IAccountService accountService; @@ -42,10 +43,10 @@ public string LoginWithoutPassword(string email) { return GenerateToken(account); } - public string RegenerateToken(string accountId) => GenerateToken(accountService.GetSingle(accountId)); + public string RegenerateToken(string accountId) => GenerateToken(accountService.Data().GetSingle(accountId)); private Account FindAccount(string email, string password) { - Account account = accountService.GetSingle(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)); + Account account = accountService.Data().GetSingle(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)); if (account != null) { if (!isPasswordReset) { if (!BCrypt.Net.BCrypt.Verify(password, account.password)) { @@ -90,11 +91,11 @@ private void ResolveRoles(ICollection claims, Account account) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SR1)); } - if (unitsService.GetSingle(x => x.shortname == "SR10").members.Contains(account.id) || admin) { + if (unitsService.Data().GetSingle(x => x.shortname == "SR10").members.Contains(account.id) || admin) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SR10)); } - if (unitsService.GetSingle(x => x.shortname == "SR5").members.Contains(account.id) || admin) { + if (unitsService.Data().GetSingle(x => x.shortname == "SR5").members.Contains(account.id) || admin) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SR5)); } diff --git a/UKSFWebsite.Api.Services/Personnel/RanksService.cs b/UKSFWebsite.Api.Services/Personnel/RanksService.cs new file mode 100644 index 00000000..0e841b0b --- /dev/null +++ b/UKSFWebsite.Api.Services/Personnel/RanksService.cs @@ -0,0 +1,49 @@ +using System.Collections.Generic; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Services.Personnel { + public class RanksService : IRanksService { + private readonly IRanksDataService data; + + public RanksService(IRanksDataService data) => this.data = data; + + public IRanksDataService Data() => data; + + public int GetRankIndex(string rankName) { + return data.Get().FindIndex(x => x.name == rankName); + } + + public int Sort(string nameA, string nameB) { + Rank rankA = data.GetSingle(nameA); + Rank rankB = data.GetSingle(nameB); + return data.Sort(rankA, rankB); + } + + public bool IsSuperior(string nameA, string nameB) { + Rank rankA = data.GetSingle(nameA); + Rank rankB = data.GetSingle(nameB); + int rankOrderA = rankA?.order ?? 0; + int rankOrderB = rankB?.order ?? 0; + return rankOrderA < rankOrderB; + } + + public bool IsEqual(string nameA, string nameB) { + Rank rankA = data.GetSingle(nameA); + Rank rankB = data.GetSingle(nameB); + int rankOrderA = rankA?.order ?? 0; + int rankOrderB = rankB?.order ?? 0; + return rankOrderA == rankOrderB; + } + + public bool IsSuperiorOrEqual(string nameA, string nameB) => IsSuperior(nameA, nameB) || IsEqual(nameA, nameB); + } + + public class RankComparer : IComparer { + private readonly IRanksService ranksService; + public RankComparer(IRanksService ranksService) => this.ranksService = ranksService; + + public int Compare(string rankA, string rankB) => ranksService.Sort(rankA, rankB); + } +} diff --git a/UKSFWebsite.Api.Services/RecruitmentService.cs b/UKSFWebsite.Api.Services/Personnel/RecruitmentService.cs similarity index 87% rename from UKSFWebsite.Api.Services/RecruitmentService.cs rename to UKSFWebsite.Api.Services/Personnel/RecruitmentService.cs index 999cb039..3cc67712 100644 --- a/UKSFWebsite.Api.Services/RecruitmentService.cs +++ b/UKSFWebsite.Api.Services/Personnel/RecruitmentService.cs @@ -4,13 +4,15 @@ using System.Threading.Tasks; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Api.Services { +namespace UKSFWebsite.Api.Services.Personnel { public class RecruitmentService : IRecruitmentService { private readonly IAccountService accountService; private readonly IDiscordService discordService; @@ -46,8 +48,8 @@ IUnitsService unitsService public Dictionary GetSr1Leads() => GetSr1Group().roles; public IEnumerable GetSr1Members(bool skipSort = false) { - IEnumerable members = unitsService.GetSingle(x => x.name == "SR1 Recruitment").members; - List accounts = members.Select(x => accountService.GetSingle(x)).ToList(); + IEnumerable members = unitsService.Data().GetSingle(x => x.name == "SR1 Recruitment").members; + List accounts = members.Select(x => accountService.Data().GetSingle(x)).ToList(); if (skipSort) return accounts; return accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname); } @@ -58,7 +60,7 @@ public object GetAllApplications() { JArray complete = new JArray(); JArray recruiters = new JArray(); string me = sessionService.GetContextId(); - IEnumerable accounts = accountService.Get(x => x.application != null); + IEnumerable accounts = accountService.Data().Get(x => x.application != null); foreach (Account account in accounts) { if (account.application.state == ApplicationState.WAITING) { if (account.application.recruiter == me) { @@ -79,7 +81,7 @@ public object GetAllApplications() { } public JObject GetApplication(Account account) { - Account recruiterAccount = accountService.GetSingle(account.application.recruiter); + Account recruiterAccount = accountService.Data().GetSingle(account.application.recruiter); (bool tsOnline, string tsNickname, bool discordOnline) = GetOnlineUserDetails(account); (int years, int months) = account.dob.ToAge(); return JObject.FromObject( @@ -105,11 +107,11 @@ public JObject GetApplication(Account account) { public bool IsAccountSr1Lead(Account account = null) => account != null ? GetSr1Group().roles.ContainsValue(account.id) : GetSr1Group().roles.ContainsValue(sessionService.GetContextId()); public async Task SetRecruiter(string id, string newRecruiter) { - await accountService.Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiter)); + await accountService.Data().Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiter)); } public object GetStats(string account, bool monthly) { - List accounts = accountService.Get(x => x.application != null); + List accounts = accountService.Data().Get(x => x.application != null); if (account != string.Empty) { accounts = accounts.Where(x => x.application.recruiter == account).ToList(); } @@ -138,15 +140,15 @@ public object GetStats(string account, bool monthly) { public string GetRecruiter() { List recruiters = GetSr1Members().Where(x => x.settings.sr1Enabled).ToList(); - List waiting = accountService.Get(x => x.application != null && x.application.state == ApplicationState.WAITING); - List complete = accountService.Get(x => x.application != null && x.application.state != ApplicationState.WAITING); + List waiting = accountService.Data().Get(x => x.application != null && x.application.state == ApplicationState.WAITING); + List complete = accountService.Data().Get(x => x.application != null && x.application.state != ApplicationState.WAITING); var unsorted = recruiters.Select(x => new {x.id, complete = complete.Count(y => y.application.recruiter == x.id), waiting = waiting.Count(y => y.application.recruiter == x.id)}); var sorted = unsorted.OrderBy(x => x.waiting).ThenBy(x => x.complete); return sorted.First().id; } private Unit GetSr1Group() { - return unitsService.Get(x => x.name == "SR1 Recruitment").FirstOrDefault(); + return unitsService.Data().Get(x => x.name == "SR1 Recruitment").FirstOrDefault(); } private JObject GetCompletedApplication(Account account) => @@ -191,7 +193,7 @@ private static string GetNextCandidateOp() { } private double GetAverageProcessingTime() { - List waitingApplications = accountService.Get(x => x.application != null && x.application.state != ApplicationState.WAITING).ToList(); + List waitingApplications = accountService.Data().Get(x => x.application != null && x.application.state != ApplicationState.WAITING).ToList(); double days = waitingApplications.Sum(x => (x.application.dateAccepted - x.application.dateCreated).TotalDays); double time = Math.Round(days / waitingApplications.Count, 1); return time; diff --git a/UKSFWebsite.Api.Services/Utility/RoleDefinitions.cs b/UKSFWebsite.Api.Services/Personnel/RoleDefinitions.cs similarity index 94% rename from UKSFWebsite.Api.Services/Utility/RoleDefinitions.cs rename to UKSFWebsite.Api.Services/Personnel/RoleDefinitions.cs index 4998b8a9..6dcbdc98 100644 --- a/UKSFWebsite.Api.Services/Utility/RoleDefinitions.cs +++ b/UKSFWebsite.Api.Services/Personnel/RoleDefinitions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Authorization; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSFWebsite.Api.Services.Personnel { public static class RoleDefinitions { public const string ADMIN = "ADMIN"; public const string COMMAND = "COMMAND"; @@ -9,9 +9,9 @@ public static class RoleDefinitions { public const string MEMBER = "MEMBER"; public const string NCO = "NCO"; public const string SR1 = "SR1"; - public const string SR5 = "SR5"; - public const string SR10 = "SR10"; public const string SR1_LEAD = "SR1_LEAD"; + public const string SR10 = "SR10"; + public const string SR5 = "SR5"; public const string UNCONFIRMED = "UNCONFIRMED"; } diff --git a/UKSFWebsite.Api.Services/Personnel/RolesService.cs b/UKSFWebsite.Api.Services/Personnel/RolesService.cs new file mode 100644 index 00000000..e057b3c6 --- /dev/null +++ b/UKSFWebsite.Api.Services/Personnel/RolesService.cs @@ -0,0 +1,23 @@ +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Services.Personnel { + public class RolesService : IRolesService { + private readonly IRolesDataService data; + + public RolesService(IRolesDataService data) => this.data = data; + + public IRolesDataService Data() => data; + + public int Sort(string nameA, string nameB) { + Role roleA = data.GetSingle(nameA); + Role roleB = data.GetSingle(nameB); + int roleOrderA = roleA?.order ?? 0; + int roleOrderB = roleB?.order ?? 0; + return roleOrderA < roleOrderB ? -1 : roleOrderA > roleOrderB ? 1 : 0; + } + + public Role GetUnitRoleByOrder(int order) => data.GetSingle(x => x.roleType == RoleType.UNIT && x.order == order); + } +} diff --git a/UKSFWebsite.Api.Services/ServiceRecordService.cs b/UKSFWebsite.Api.Services/Personnel/ServiceRecordService.cs similarity index 53% rename from UKSFWebsite.Api.Services/ServiceRecordService.cs rename to UKSFWebsite.Api.Services/Personnel/ServiceRecordService.cs index eca18b6e..491ee160 100644 --- a/UKSFWebsite.Api.Services/ServiceRecordService.cs +++ b/UKSFWebsite.Api.Services/Personnel/ServiceRecordService.cs @@ -1,17 +1,16 @@ using System; using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services { +namespace UKSFWebsite.Api.Services.Personnel { public class ServiceRecordService : IServiceRecordService { private readonly IAccountService accountService; public ServiceRecordService(IAccountService accountService) => this.accountService = accountService; public void AddServiceRecord(string id, string occurence, string notes) { - accountService.Update(id, Builders.Update.Push("serviceRecord", new ServiceRecordEntry {timestamp = DateTime.Now, occurence = occurence, notes = notes})); + accountService.Data().Update(id, Builders.Update.Push("serviceRecord", new ServiceRecordEntry {timestamp = DateTime.Now, occurence = occurence, notes = notes})); } } } diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index 0baa3f7b..5bfd9794 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -22,6 +22,7 @@ + diff --git a/UKSFWebsite.Api.Services/Data/UnitsService.cs b/UKSFWebsite.Api.Services/Units/UnitsService.cs similarity index 61% rename from UKSFWebsite.Api.Services/Data/UnitsService.cs rename to UKSFWebsite.Api.Services/Units/UnitsService.cs index d176254a..2a92161d 100644 --- a/UKSFWebsite.Api.Services/Data/UnitsService.cs +++ b/UKSFWebsite.Api.Services/Units/UnitsService.cs @@ -5,32 +5,32 @@ using Microsoft.AspNetCore.SignalR; using MongoDB.Bson; using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Hubs.Abstraction; -namespace UKSFWebsite.Api.Services.Data { - public class UnitsService : CachedDataService, IUnitsService { +namespace UKSFWebsite.Api.Services.Units { + public class UnitsService : IUnitsService { private readonly IHubContext accountHub; + private readonly IUnitsDataService data; private readonly IRolesService rolesService; - public UnitsService(IMongoDatabase database, IRolesService rolesService, IHubContext accountHub) : base(database, "units") { + public UnitsService(IUnitsDataService data, IRolesService rolesService, IHubContext accountHub) { + this.data = data; this.rolesService = rolesService; this.accountHub = accountHub; } - public override List Get() { - base.Get(); - Collection = Collection.OrderBy(x => x.order).ToList(); - return Collection; - } + public IUnitsDataService Data() => data; public IEnumerable GetSortedUnits(Func predicate = null) { List sortedUnits = new List(); - Unit combatRoot = GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); - Unit auxiliaryRoot = GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); + Unit combatRoot = data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); + Unit auxiliaryRoot = data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); sortedUnits.Add(combatRoot); sortedUnits.AddRange(GetAllChildren(combatRoot)); sortedUnits.Add(auxiliaryRoot); @@ -40,13 +40,13 @@ public IEnumerable GetSortedUnits(Func predicate = null) { } public async Task AddMember(string id, string unitId) { - if (GetSingle(x => x.id == unitId && x.members.Contains(id)) != null) return; - await Update(unitId, Builders.Update.Push(x => x.members, id)); + if (data.GetSingle(x => x.id == unitId && x.members.Contains(id)) != null) return; + await data.Update(unitId, Builders.Update.Push(x => x.members, id)); await accountHub.Clients.Group(id).ReceiveAccountUpdate(); } public async Task RemoveMember(string id, string unitName) { - Unit unit = GetSingle(x => x.name == unitName); + Unit unit = data.GetSingle(x => x.name == unitName); if (unit == null) return; await RemoveMember(id, unit); @@ -54,7 +54,7 @@ public async Task RemoveMember(string id, string unitName) { public async Task RemoveMember(string id, Unit unit) { if (unit.members.Contains(id)) { - await Update(unit.id, Builders.Update.Pull(x => x.members, id)); + await data.Update(unit.id, Builders.Update.Pull(x => x.members, id)); } await RemoveMemberRoles(id, unit); @@ -62,7 +62,7 @@ public async Task RemoveMember(string id, Unit unit) { } public async Task SetMemberRole(string id, string unitId, string role = "") { - Unit unit = GetSingle(x => x.id == unitId); + Unit unit = data.GetSingle(x => x.id == unitId); if (unit == null) return; await SetMemberRole(id, unit, role); @@ -71,65 +71,65 @@ public async Task SetMemberRole(string id, string unitId, string role = "") { public async Task SetMemberRole(string id, Unit unit, string role = "") { await RemoveMemberRoles(id, unit); if (!string.IsNullOrEmpty(role)) { - await Update(unit.id, Builders.Update.Set($"roles.{role}", id)); + await data.Update(unit.id, Builders.Update.Set($"roles.{role}", id)); } await accountHub.Clients.Group(id).ReceiveAccountUpdate(); } public async Task RenameRole(string oldName, string newName) { - foreach (Unit unit in Get(x => x.roles.ContainsKey(oldName))) { + foreach (Unit unit in data.Get(x => x.roles.ContainsKey(oldName))) { string id = unit.roles[oldName]; - await Update(unit.id, Builders.Update.Unset($"roles.{oldName}")); - await Update(unit.id, Builders.Update.Set($"roles.{newName}", id)); + await data.Update(unit.id, Builders.Update.Unset($"roles.{oldName}")); + await data.Update(unit.id, Builders.Update.Set($"roles.{newName}", id)); } } public async Task DeleteRole(string role) { - foreach (Unit unit in Get(x => x.roles.ContainsKey(role))) { + foreach (Unit unit in data.Get(x => x.roles.ContainsKey(role))) { string id = unit.roles[role]; - await Update(unit.id, Builders.Update.Unset($"roles.{role}")); + await data.Update(unit.id, Builders.Update.Unset($"roles.{role}")); await accountHub.Clients.Group(id).ReceiveAccountUpdate(); } } public bool HasRole(string unitId, string role) { - Unit unit = GetSingle(x => x.id == unitId); + Unit unit = data.GetSingle(x => x.id == unitId); return HasRole(unit, role); } public bool HasRole(Unit unit, string role) => unit.roles.ContainsKey(role); public bool RolesHasMember(string unitId, string id) { - Unit unit = GetSingle(x => x.id == unitId); + Unit unit = data.GetSingle(x => x.id == unitId); return RolesHasMember(unit, id); } public bool RolesHasMember(Unit unit, string id) => unit.roles.ContainsValue(id); public bool MemberHasRole(string id, string unitId, string role) { - Unit unit = GetSingle(x => x.id == unitId); + Unit unit = data.GetSingle(x => x.id == unitId); return MemberHasRole(id, unit, role); } public bool MemberHasRole(string id, Unit unit, string role) => unit.roles.GetValueOrDefault(role, string.Empty) == id; - public bool MemberHasAnyRole(string id) => Get().Any(x => RolesHasMember(x, id)); + public bool MemberHasAnyRole(string id) => data.Get().Any(x => RolesHasMember(x, id)); public int GetMemberRoleOrder(Account account, Unit unit) { if (RolesHasMember(unit.id, account.id)) { - return int.MaxValue - rolesService.GetSingle(x => x.name == unit.roles.FirstOrDefault(y => y.Value == account.id).Key).order; + return int.MaxValue - rolesService.Data().GetSingle(x => x.name == unit.roles.FirstOrDefault(y => y.Value == account.id).Key).order; } return -1; } - public Unit GetRoot() => GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); + public Unit GetRoot() => data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); - public Unit GetAuxilliaryRoot() => GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); + public Unit GetAuxilliaryRoot() => data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); public Unit GetParent(Unit unit) { - return unit.parent != string.Empty ? GetSingle(x => x.id == unit.parent) : null; + return unit.parent != string.Empty ? data.GetSingle(x => x.id == unit.parent) : null; } public IEnumerable GetParents(Unit unit) { @@ -138,17 +138,17 @@ public IEnumerable GetParents(Unit unit) { do { parentUnits.Add(unit); Unit child = unit; - unit = !string.IsNullOrEmpty(unit.parent) ? GetSingle(x => x.id == child.parent) : null; + unit = !string.IsNullOrEmpty(unit.parent) ? data.GetSingle(x => x.id == child.parent) : null; } while (unit != null); return parentUnits; } - public IEnumerable GetChildren(Unit parent) => Get(x => x.parent == parent.id).ToList(); + public IEnumerable GetChildren(Unit parent) => data.Get(x => x.parent == parent.id).ToList(); public IEnumerable GetAllChildren(Unit parent, bool includeParent = false) { List children = includeParent ? new List {parent} : new List(); - foreach (Unit unit in Get(x => x.parent == parent.id)) { + foreach (Unit unit in data.Get(x => x.parent == parent.id)) { children.Add(unit); children.AddRange(GetAllChildren(unit)); } @@ -162,10 +162,10 @@ public int GetUnitDepth(Unit unit) { } int depth = 0; - Unit parent = GetSingle(unit.parent); + Unit parent = data.GetSingle(unit.parent); while (parent != null) { depth++; - parent = GetSingle(parent.parent); + parent = data.GetSingle(parent.parent); } return depth; @@ -186,7 +186,7 @@ private async Task RemoveMemberRoles(string id, Unit unit) { } if (roles.Count != originalCount) { - await Update(unit.id, Builders.Update.Set(x => x.roles, roles)); + await data.Update(unit.id, Builders.Update.Set(x => x.roles, roles)); } } } diff --git a/UKSFWebsite.Api.Services/Utility/ChangeHelper.cs b/UKSFWebsite.Api.Services/Utility/ChangeHelper.cs index bb4fe5f8..cf900693 100644 --- a/UKSFWebsite.Api.Services/Utility/ChangeHelper.cs +++ b/UKSFWebsite.Api.Services/Utility/ChangeHelper.cs @@ -10,26 +10,25 @@ public static class ChangeHelper { public static string Changes(this T original, T updated) { List fields = typeof(T).GetFields(BindingFlags.Public | BindingFlags.Instance).Where(x => !x.IsDefined(typeof(BsonIgnoreAttribute))).ToList(); IEnumerable changes = FindChanges(JToken.FromObject(original), JToken.FromObject(updated), fields); - return changes - .Aggregate( - string.Empty, - (a, b) => { - if (b.Original == null && b.Updated != null) { - return $"{a}\n\t{b.Name} added: '{b.Updated}'"; - } - - if (b.Original != null && b.Updated == null) { - return $"{a}\n\t{b.Name} removed: '{b.Original}'"; - } + return changes.Aggregate( + string.Empty, + (a, b) => { + if (b.Original == null && b.Updated != null) { + return $"{a}\n\t{b.Name} added: '{b.Updated}'"; + } + + if (b.Original != null && b.Updated == null) { + return $"{a}\n\t{b.Name} removed: '{b.Original}'"; + } // if (b.Original is IEnumerable && b.Updated is IEnumerable) { // string listChanges = ((IEnumerable) b.Original).Select(x => x.ToString()).Changes(((IEnumerable) b.Updated).Select(x => x.ToString())); // return string.IsNullOrEmpty(listChanges) ? string.Empty : $"{a}\n\t{b.Name} changed:\n{listChanges}"; // } - return !Equals(b.Original, b.Updated) ? $"{a}\n\t'{b.Name}' changed: '{b.Original}' to '{b.Updated}'" : ""; - } - ); + return !Equals(b.Original, b.Updated) ? $"{a}\n\t'{b.Name}' changed: '{b.Original}' to '{b.Updated}'" : ""; + } + ); } public static string Changes(this IEnumerable original, IEnumerable updated) { @@ -60,29 +59,30 @@ private static IEnumerable FindChanges(this JToken original, JToken upda // ReSharper disable once ConvertIfStatementToSwitchStatement if (original.Type == JTokenType.Object) { - JObject originalObject = original as JObject; - JObject updatedObject = updated as JObject; + JObject originalObject = original as JObject; + JObject updatedObject = updated as JObject; - if (originalObject == null) { - originalObject = new JObject(); - } - if (updatedObject == null) { - updatedObject = new JObject(); - } - - List added = updatedObject.Properties().Select(c => c.Name).Except(originalObject.Properties().Select(c => c.Name)).ToList(); - List removed = originalObject.Properties().Select(c => c.Name).Except(updatedObject.Properties().Select(c => c.Name)).ToList(); - List unchanged = originalObject.Properties().Where(c => JToken.DeepEquals(c.Value, updated[c.Name])).Select(c => c.Name).ToList(); - List changed = originalObject.Properties().Select(c => c.Name).Except(added).Except(unchanged).ToList(); - - changes.AddRange(added.Where(x => allowedFields.Any(y => y.Name == x)).Select(key => updatedObject.Properties().First(x => x.Name == key)).Select(addedObject => new Change {Name = addedObject.Name, Original = null, Updated = addedObject.Value.Value()})); - changes.AddRange(removed.Where(x => allowedFields.Any(y => y.Name == x)).Select(key => originalObject.Properties().First(x => x.Name == key)).Select(removedObject => new Change {Name = removedObject.Name, Original = removedObject.Value.Value(), Updated = null})); - - foreach (string key in changed.Where(x => allowedFields.Any(y => y.Name == x))) { - JToken originalChangedObject = originalObject[key]; - JToken updatedChangedObject = updatedObject[key]; - changes.AddRange(FindChanges(originalChangedObject, updatedChangedObject, allowedFields)); - } + if (originalObject == null) { + originalObject = new JObject(); + } + + if (updatedObject == null) { + updatedObject = new JObject(); + } + + List added = updatedObject.Properties().Select(c => c.Name).Except(originalObject.Properties().Select(c => c.Name)).ToList(); + List removed = originalObject.Properties().Select(c => c.Name).Except(updatedObject.Properties().Select(c => c.Name)).ToList(); + List unchanged = originalObject.Properties().Where(c => JToken.DeepEquals(c.Value, updated[c.Name])).Select(c => c.Name).ToList(); + List changed = originalObject.Properties().Select(c => c.Name).Except(added).Except(unchanged).ToList(); + + changes.AddRange(added.Where(x => allowedFields.Any(y => y.Name == x)).Select(key => updatedObject.Properties().First(x => x.Name == key)).Select(addedObject => new Change {Name = addedObject.Name, Original = null, Updated = addedObject.Value.Value()})); + changes.AddRange(removed.Where(x => allowedFields.Any(y => y.Name == x)).Select(key => originalObject.Properties().First(x => x.Name == key)).Select(removedObject => new Change {Name = removedObject.Name, Original = removedObject.Value.Value(), Updated = null})); + + foreach (string key in changed.Where(x => allowedFields.Any(y => y.Name == x))) { + JToken originalChangedObject = originalObject[key]; + JToken updatedChangedObject = updatedObject[key]; + changes.AddRange(FindChanges(originalChangedObject, updatedChangedObject, allowedFields)); + } } else { changes.Add(new Change {Name = ((JProperty) updated.Parent).Name, Original = original.Value(), Updated = updated.Value()}); } diff --git a/UKSFWebsite.Api.Services/Data/ConfirmationCodeService.cs b/UKSFWebsite.Api.Services/Utility/ConfirmationCodeService.cs similarity index 57% rename from UKSFWebsite.Api.Services/Data/ConfirmationCodeService.cs rename to UKSFWebsite.Api.Services/Utility/ConfirmationCodeService.cs index f9fcfaf7..7945beca 100644 --- a/UKSFWebsite.Api.Services/Data/ConfirmationCodeService.cs +++ b/UKSFWebsite.Api.Services/Utility/ConfirmationCodeService.cs @@ -1,28 +1,33 @@ -using System; +using System; using System.Threading.Tasks; -using MongoDB.Driver; using Newtonsoft.Json; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Utility; -namespace UKSFWebsite.Api.Services.Data { - public class ConfirmationCodeService : DataService, IConfirmationCodeService { +namespace UKSFWebsite.Api.Services.Utility { + public class ConfirmationCodeService : IConfirmationCodeService { + private readonly IConfirmationCodeDataService data; private readonly ISchedulerService schedulerService; - public ConfirmationCodeService(IMongoDatabase database, ISchedulerService schedulerService) : base(database, "confirmationCodes") => this.schedulerService = schedulerService; + public ConfirmationCodeService(IConfirmationCodeDataService data, ISchedulerService schedulerService) { + this.data = data; + this.schedulerService = schedulerService; + } + + public IConfirmationCodeDataService Data() => data; public async Task CreateConfirmationCode(string value, bool integration = false) { ConfirmationCode code = new ConfirmationCode {value = value}; - await Add(code); + await data.Add(code); await schedulerService.Create(DateTime.Now.AddMinutes(30), TimeSpan.Zero, integration ? ScheduledJobType.INTEGRATION : ScheduledJobType.NORMAL, nameof(SchedulerActionHelper.DeleteExpiredConfirmationCode), code.id); return code.id; } public async Task GetConfirmationCode(string id) { - ConfirmationCode confirmationCode = GetSingle(x => x.id == id); + ConfirmationCode confirmationCode = data.GetSingle(x => x.id == id); if (confirmationCode == null) return string.Empty; - await Delete(confirmationCode.id); + await data.Delete(confirmationCode.id); string actionParameters = JsonConvert.SerializeObject(new object[] {confirmationCode.id}); if (actionParameters != null) { await schedulerService.Cancel(x => x.actionParameters == actionParameters); diff --git a/UKSFWebsite.Api.Services/Utility/DataCacheService.cs b/UKSFWebsite.Api.Services/Utility/DataCacheService.cs new file mode 100644 index 00000000..4b3cea6d --- /dev/null +++ b/UKSFWebsite.Api.Services/Utility/DataCacheService.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; + +namespace UKSFWebsite.Api.Services.Utility { + public class DataCacheService { + private readonly List dataServices = new List(); + + public void AddDataService(dynamic dataService) => dataServices.Add(dataService); + + public void InvalidateDataCaches() { + foreach (dynamic dataService in dataServices) { + dataService.Refresh(); + } + } + } +} diff --git a/UKSFWebsite.Api.Services/Utility/MigrationUtility.cs b/UKSFWebsite.Api.Services/Utility/MigrationUtility.cs index 0348f1bf..fb491c71 100644 --- a/UKSFWebsite.Api.Services/Utility/MigrationUtility.cs +++ b/UKSFWebsite.Api.Services/Utility/MigrationUtility.cs @@ -11,18 +11,18 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Models.CommandRequests; -using UKSFWebsite.Api.Models.Logging; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; +using UKSFWebsite.Api.Services.Message; namespace UKSFWebsite.Api.Services.Utility { public class MigrationUtility { private const string KEY = "MIGRATED"; - private readonly IMongoDatabase database; private readonly IHostEnvironment currentEnvironment; + private readonly IMongoDatabase database; public MigrationUtility(IMongoDatabase database, IHostEnvironment currentEnvironment) { this.database = database; @@ -32,7 +32,7 @@ public MigrationUtility(IMongoDatabase database, IHostEnvironment currentEnviron public void Migrate() { bool migrated = true; if (!currentEnvironment.IsDevelopment()) { - string migratedString = VariablesWrapper.VariablesService().GetSingle(KEY).AsString(); + string migratedString = VariablesWrapper.VariablesDataService().GetSingle(KEY).AsString(); migrated = bool.Parse(migratedString); } @@ -44,7 +44,7 @@ public void Migrate() { } catch (Exception e) { LogWrapper.Log(e); } finally { - VariablesWrapper.VariablesService().Update(KEY, "true"); + VariablesWrapper.VariablesDataService().Update(KEY, "true"); } } } @@ -53,9 +53,9 @@ public void Migrate() { private static void ExecuteMigration() { IUnitsService unitsService = ServiceWrapper.ServiceProvider.GetService(); IRolesService rolesService = ServiceWrapper.ServiceProvider.GetService(); - List roles = rolesService.Get(x => x.roleType == RoleType.UNIT); + List roles = rolesService.Data().Get(x => x.roleType == RoleType.UNIT); - foreach (Unit unit in unitsService.Get()) { + foreach (Unit unit in unitsService.Data().Get()) { Dictionary unitRoles = unit.roles; int originalCount = unit.roles.Count; foreach ((string key, string _) in unitRoles.ToList()) { @@ -65,7 +65,7 @@ private static void ExecuteMigration() { } if (roles.Count != originalCount) { - unitsService.Update(unit.id, Builders.Update.Set(x => x.roles, unitRoles)).Wait(); + unitsService.Data().Update(unit.id, Builders.Update.Set(x => x.roles, unitRoles)).Wait(); } } } diff --git a/UKSFWebsite.Api.Services/Utility/SchedulerActionHelper.cs b/UKSFWebsite.Api.Services/Utility/SchedulerActionHelper.cs index 369ff58c..e855c0c2 100644 --- a/UKSFWebsite.Api.Services/Utility/SchedulerActionHelper.cs +++ b/UKSFWebsite.Api.Services/Utility/SchedulerActionHelper.cs @@ -1,17 +1,17 @@ using System; using Microsoft.Extensions.DependencyInjection; using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Logging; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Message.Logging; namespace UKSFWebsite.Api.Services.Utility { public static class SchedulerActionHelper { private const ulong ID_CHANNEL_GENERAL = 311547576942067713; public static void DeleteExpiredConfirmationCode(string id) { - ServiceWrapper.ServiceProvider.GetService().Delete(id); + ServiceWrapper.ServiceProvider.GetService().Data().Delete(id); } public static void PruneLogs() { @@ -28,7 +28,7 @@ public static void TeamspeakSnapshot() { } public static void DiscordVoteAnnouncement() { - bool run = bool.Parse(VariablesWrapper.VariablesService().GetSingle("RUN_DISCORD_CLANLIST").AsString()); + bool run = bool.Parse(VariablesWrapper.VariablesDataService().GetSingle("RUN_DISCORD_CLANLIST").AsString()); if (!run) return; ServiceWrapper.ServiceProvider.GetService().SendMessage(ID_CHANNEL_GENERAL, "@everyone - As part of our recruitment drive, we're aiming to gain exposure through a high ranking on Clanlist. To help with this, please go to https://clanlist.io/vote/UKSFMilsim and vote"); } diff --git a/UKSFWebsite.Api.Services/Data/SchedulerService.cs b/UKSFWebsite.Api.Services/Utility/SchedulerService.cs similarity index 76% rename from UKSFWebsite.Api.Services/Data/SchedulerService.cs rename to UKSFWebsite.Api.Services/Utility/SchedulerService.cs index 8446d4ca..6ecda117 100644 --- a/UKSFWebsite.Api.Services/Data/SchedulerService.cs +++ b/UKSFWebsite.Api.Services/Utility/SchedulerService.cs @@ -3,27 +3,32 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; -using MongoDB.Driver; using Newtonsoft.Json; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Utility; +using UKSFWebsite.Api.Services.Message; -namespace UKSFWebsite.Api.Services.Data { - public class SchedulerService : DataService, ISchedulerService { - private readonly IHostEnvironment currentEnvironment; +namespace UKSFWebsite.Api.Services.Utility { + public class SchedulerService : ISchedulerService { private static readonly ConcurrentDictionary ACTIVE_TASKS = new ConcurrentDictionary(); + private readonly IHostEnvironment currentEnvironment; + private readonly ISchedulerDataService data; + + public SchedulerService(ISchedulerDataService data, IHostEnvironment currentEnvironment) { + this.data = data; + this.currentEnvironment = currentEnvironment; + } - public SchedulerService(IMongoDatabase database, IHostEnvironment currentEnvironment) : base(database, "scheduledJobs") => this.currentEnvironment = currentEnvironment; + public ISchedulerDataService Data() => data; public async void Load(bool integration = false) { if (integration) { - Get(x => x.type == ScheduledJobType.INTEGRATION).ForEach(Schedule); + data.Get(x => x.type == ScheduledJobType.INTEGRATION).ForEach(Schedule); } else { if (!currentEnvironment.IsDevelopment()) await AddUnique(); - Get(x => x.type != ScheduledJobType.INTEGRATION).ForEach(Schedule); + data.Get(x => x.type != ScheduledJobType.INTEGRATION).ForEach(Schedule); } } @@ -38,19 +43,19 @@ public async Task Create(DateTime next, TimeSpan interval, ScheduledJobType type job.repeat = true; } - await Add(job); + await data.Add(job); Schedule(job); } public async Task Cancel(Func predicate) { - ScheduledJob job = GetSingle(predicate); + ScheduledJob job = data.GetSingle(predicate); if (job == null) return; if (ACTIVE_TASKS.TryGetValue(job.id, out CancellationTokenSource token)) { token.Cancel(); ACTIVE_TASKS.TryRemove(job.id, out CancellationTokenSource _); } - await Delete(job.id); + await data.Delete(job.id); } private void Schedule(ScheduledJob job) { @@ -82,7 +87,7 @@ private void Schedule(ScheduledJob job) { await SetNext(job); Schedule(job); } else { - await Delete(job.id); + await data.Delete(job.id); ACTIVE_TASKS.TryRemove(job.id, out CancellationTokenSource _); } }, @@ -91,28 +96,27 @@ private void Schedule(ScheduledJob job) { ACTIVE_TASKS[job.id] = token; } - // ReSharper disable once UnusedMember.Local private async Task AddUnique() { - if (GetSingle(x => x.type == ScheduledJobType.LOG_PRUNE) == null) { + if (data.GetSingle(x => x.type == ScheduledJobType.LOG_PRUNE) == null) { await Create(DateTime.Today.AddDays(1), TimeSpan.FromDays(1), ScheduledJobType.LOG_PRUNE, nameof(SchedulerActionHelper.PruneLogs)); } - if (GetSingle(x => x.type == ScheduledJobType.TEAMSPEAK_SNAPSHOT) == null) { + if (data.GetSingle(x => x.type == ScheduledJobType.TEAMSPEAK_SNAPSHOT) == null) { await Create(DateTime.Today.AddDays(1), TimeSpan.FromMinutes(5), ScheduledJobType.TEAMSPEAK_SNAPSHOT, nameof(SchedulerActionHelper.TeamspeakSnapshot)); } - if (GetSingle(x => x.type == ScheduledJobType.DISCORD_VOTE_ANNOUNCEMENT) == null) { + if (data.GetSingle(x => x.type == ScheduledJobType.DISCORD_VOTE_ANNOUNCEMENT) == null) { await Create(DateTime.Today.AddHours(19), TimeSpan.FromDays(1), ScheduledJobType.DISCORD_VOTE_ANNOUNCEMENT, nameof(SchedulerActionHelper.DiscordVoteAnnouncement)); } } private async Task SetNext(ScheduledJob job) { - await Update(job.id, "next", job.next); + await data.Update(job.id, "next", job.next); } private bool IsCancelled(ScheduledJob job, CancellationTokenSource token) { if (token.IsCancellationRequested) return true; - return GetSingle(job.id) == null; + return data.GetSingle(job.id) == null; } private static void ExecuteAction(ScheduledJob job) { diff --git a/UKSFWebsite.Api.Services/SessionService.cs b/UKSFWebsite.Api.Services/Utility/SessionService.cs similarity index 77% rename from UKSFWebsite.Api.Services/SessionService.cs rename to UKSFWebsite.Api.Services/Utility/SessionService.cs index bb81aaf4..7519fbd6 100644 --- a/UKSFWebsite.Api.Services/SessionService.cs +++ b/UKSFWebsite.Api.Services/Utility/SessionService.cs @@ -1,10 +1,11 @@ using System.Linq; using System.Security.Claims; using Microsoft.AspNetCore.Http; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services { +namespace UKSFWebsite.Api.Services.Utility { public class SessionService : ISessionService { private readonly IAccountService accountService; private readonly IHttpContextAccessor httpContext; @@ -14,7 +15,7 @@ public SessionService(IHttpContextAccessor httpContext, IAccountService accountS this.accountService = accountService; } - public Account GetContextAccount() => accountService.GetSingle(GetContextId()); + public Account GetContextAccount() => accountService.Data().GetSingle(GetContextId()); public string GetContextId() { return httpContext.HttpContext.User.Claims.Single(x => x.Type == ClaimTypes.Sid).Value; diff --git a/UKSFWebsite.Api.Services/Utility/StringUtilities.cs b/UKSFWebsite.Api.Services/Utility/StringUtilities.cs index 62da6fb6..69b555ef 100644 --- a/UKSFWebsite.Api.Services/Utility/StringUtilities.cs +++ b/UKSFWebsite.Api.Services/Utility/StringUtilities.cs @@ -4,8 +4,9 @@ using System.Text.RegularExpressions; using Microsoft.Extensions.DependencyInjection; using MongoDB.Bson; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Models.Units; namespace UKSFWebsite.Api.Services.Utility { public static class StringUtilities { @@ -32,7 +33,7 @@ public static string ConvertObjectIds(this string message) { if (ObjectId.TryParse(part, out ObjectId _)) { string displayName = displayNameService.GetDisplayName(part); if (displayName == part) { - Unit unit = unitsService.GetSingle(x => x.id == part); + Unit unit = unitsService.Data().GetSingle(x => x.id == part); if (unit != null) { displayName = unit.name; } diff --git a/UKSFWebsite.Api.Services/Utility/Utilities.cs b/UKSFWebsite.Api.Services/Utility/Utilities.cs index c8f393bf..18fe55da 100644 --- a/UKSFWebsite.Api.Services/Utility/Utilities.cs +++ b/UKSFWebsite.Api.Services/Utility/Utilities.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Dynamic; using System.Reflection; -using UKSFWebsite.Api.Models.Accounts; +using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Services.Utility { public static class Utilities { diff --git a/UKSFWebsite.Api.Services/Utility/VariablesService.cs b/UKSFWebsite.Api.Services/Utility/VariablesService.cs new file mode 100644 index 00000000..3d4cd4df --- /dev/null +++ b/UKSFWebsite.Api.Services/Utility/VariablesService.cs @@ -0,0 +1,19 @@ +using System; +using System.Linq; +using System.Text.RegularExpressions; +using UKSFWebsite.Api.Models.Utility; + +namespace UKSFWebsite.Api.Services.Utility { + public static class VariablesService { + public static string AsString(this VariableItem variable) => variable.item.ToString(); + public static bool AsBool(this VariableItem variable) => bool.Parse(variable.item.ToString()); + public static ulong AsUlong(this VariableItem variable) => ulong.Parse(variable.item.ToString()); + + public static string[] AsArray(this VariableItem variable, Func predicate = null) { + string itemString = variable.item.ToString(); + itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); + string[] items = itemString.Split(","); + return predicate != null ? items.Select(predicate).ToArray() : items; + } + } +} diff --git a/UKSFWebsite.Api.Services/Utility/VariablesWrapper.cs b/UKSFWebsite.Api.Services/Utility/VariablesWrapper.cs index 9c761fce..97173636 100644 --- a/UKSFWebsite.Api.Services/Utility/VariablesWrapper.cs +++ b/UKSFWebsite.Api.Services/Utility/VariablesWrapper.cs @@ -1,8 +1,8 @@ using Microsoft.Extensions.DependencyInjection; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Data.Cached; namespace UKSFWebsite.Api.Services.Utility { public static class VariablesWrapper { - public static IVariablesService VariablesService() => ServiceWrapper.ServiceProvider.GetService(); + public static IVariablesDataService VariablesDataService() => ServiceWrapper.ServiceProvider.GetService(); } } diff --git a/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs b/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs index 55a703cb..79aba9f0 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs @@ -7,10 +7,14 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Integrations; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Controllers.Accounts { @@ -18,13 +22,13 @@ namespace UKSFWebsite.Api.Controllers.Accounts { public class AccountsController : Controller { private readonly IAccountService accountService; private readonly IConfirmationCodeService confirmationCodeService; + private readonly IDiscordService discordService; private readonly IDisplayNameService displayNameService; private readonly IEmailService emailService; private readonly IRanksService ranksService; private readonly IRecruitmentService recruitmentService; private readonly ISessionService sessionService; private readonly ITeamspeakService teamspeakService; - private readonly IDiscordService discordService; public AccountsController( IConfirmationCodeService confirmationCodeService, @@ -56,14 +60,14 @@ public IActionResult Get() { [HttpGet("{id}"), Authorize] public IActionResult GetById(string id) { - Account account = accountService.GetSingle(id); + Account account = accountService.Data().GetSingle(id); return Ok(FormatAccount(account)); } [HttpPut] public async Task Put([FromBody] JObject body) { string email = body["email"].ToString(); - if (accountService.Get(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)).Any()) { + if (accountService.Data().Get(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)).Any()) { return BadRequest(new {error = "an account with this email or username exists"}); } @@ -76,9 +80,9 @@ public async Task Put([FromBody] JObject body) { nation = body["nation"].ToString(), membershipState = MembershipState.UNCONFIRMED }; - await accountService.Add(account); + await accountService.Data().Add(account); await SendConfirmationCode(account); - LogWrapper.AuditLog(accountService.GetSingle(x => x.email == account.email).id, $"New account created: '{account.firstname} {account.lastname}, {account.email}'"); + LogWrapper.AuditLog(accountService.Data().GetSingle(x => x.email == account.email).id, $"New account created: '{account.firstname} {account.lastname}, {account.email}'"); return Ok(new {account.email}); } @@ -86,18 +90,18 @@ public async Task Put([FromBody] JObject body) { public async Task ApplyConfirmationCode([FromBody] JObject body) { string code = body["code"].ToString(); string email = body["email"].ToString(); - Account account = accountService.GetSingle(x => x.email == email); + Account account = accountService.Data().GetSingle(x => x.email == email); if (account == null) { return BadRequest(new {error = $"An account with the email '{email}' doesn't exist. This should be impossible so please contact an admin for help"}); } string value = await confirmationCodeService.GetConfirmationCode(code); if (value == email) { - await accountService.Update(account.id, "membershipState", MembershipState.CONFIRMED); + await accountService.Data().Update(account.id, "membershipState", MembershipState.CONFIRMED); LogWrapper.AuditLog(account.id, $"Email address confirmed for {account.id}"); return Ok(); } - + await SendConfirmationCode(account); return BadRequest(new {error = $"The confirmation code has expired. A new code has been sent to '{account.email}'"}); } @@ -106,7 +110,7 @@ public async Task ApplyConfirmationCode([FromBody] JObject body) public IActionResult GetAccountsUnder([FromQuery] bool reverse = false) { List accounts = new List(); - List memberAccounts = accountService.Get(x => x.membershipState == MembershipState.MEMBER).ToList(); + List memberAccounts = accountService.Data().Get(x => x.membershipState == MembershipState.MEMBER).ToList(); if (reverse) { memberAccounts.Sort((x, y) => ranksService.Sort(y.rank, x.rank)); } else { @@ -121,7 +125,7 @@ public IActionResult GetAccountsUnder([FromQuery] bool reverse = false) { [HttpGet("roster"), Authorize] public IActionResult GetRosterAccounts() { List accountObjects = new List(); - List accounts = accountService.Get(x => x.membershipState == MembershipState.MEMBER); + List accounts = accountService.Data().Get(x => x.membershipState == MembershipState.MEMBER); accounts = accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); accountObjects.AddRange( accounts.Select( @@ -144,7 +148,7 @@ public IActionResult GetOnlineAccounts() { if (string.IsNullOrEmpty(clientsString)) return Ok(); JObject clientsObject = JObject.Parse(clientsString); HashSet onlineClients = JsonConvert.DeserializeObject>(clientsObject["clients"].ToString()); - List allAccounts = accountService.Get(); + List allAccounts = accountService.Data().Get(); var clients = onlineClients.Where(x => x != null).Select(x => new {account = allAccounts.FirstOrDefault(y => y.teamspeakIdentities != null && y.teamspeakIdentities.Any(z => z == x.clientDbId)), client = x}).ToList(); var clientAccounts = clients.Where(x => x.account != null && x.account.membershipState == MembershipState.MEMBER).OrderBy(x => x.account.rank, new RankComparer(ranksService)).ThenBy(x => x.account.lastname).ThenBy(x => x.account.firstname); @@ -168,31 +172,31 @@ public IActionResult GetOnlineAccounts() { [HttpGet("exists")] public IActionResult CheckUsernameOrEmailExists([FromQuery] string check) { - return Ok(accountService.Get().Any(x => string.Equals(x.email, check, StringComparison.InvariantCultureIgnoreCase)) ? new {exists = true} : new {exists = false}); + return Ok(accountService.Data().Get().Any(x => string.Equals(x.email, check, StringComparison.InvariantCultureIgnoreCase)) ? new {exists = true} : new {exists = false}); } [HttpPut("name"), Authorize] public async Task ChangeName([FromBody] JObject changeNameRequest) { Account account = sessionService.GetContextAccount(); - await accountService.Update(account.id, "firstname", changeNameRequest["firstname"].ToString()); - await accountService.Update(account.id, "lastname", changeNameRequest["lastname"].ToString()); + await accountService.Data().Update(account.id, "firstname", changeNameRequest["firstname"].ToString()); + await accountService.Data().Update(account.id, "lastname", changeNameRequest["lastname"].ToString()); LogWrapper.AuditLog(sessionService.GetContextId(), $"{account.lastname}, {account.firstname} changed their name to {changeNameRequest["lastname"]}, {changeNameRequest["firstname"]}"); - await discordService.UpdateAccount(accountService.GetSingle(account.id)); + await discordService.UpdateAccount(accountService.Data().GetSingle(account.id)); return Ok(); } [HttpPut("password"), Authorize] public async Task ChangePassword([FromBody] JObject changePasswordRequest) { string contextId = sessionService.GetContextId(); - await accountService.Update(contextId, "password", BCrypt.Net.BCrypt.HashPassword(changePasswordRequest["password"].ToString())); + await accountService.Data().Update(contextId, "password", BCrypt.Net.BCrypt.HashPassword(changePasswordRequest["password"].ToString())); LogWrapper.AuditLog(contextId, $"Password changed for {contextId}"); return Ok(); } [HttpPost("updatesetting/{id}"), Authorize] public async Task UpdateSetting(string id, [FromBody] JObject body) { - Account account = string.IsNullOrEmpty(id) ? sessionService.GetContextAccount() : accountService.GetSingle(id); - await accountService.Update(account.id, $"settings.{body["name"]}", body["value"]); + Account account = string.IsNullOrEmpty(id) ? sessionService.GetContextAccount() : accountService.Data().GetSingle(id); + await accountService.Data().Update(account.id, $"settings.{body["name"]}", body["value"]); LogWrapper.AuditLog(sessionService.GetContextId(), $"Setting {body["name"]} updated for {account.id} from {account.settings.GetAttribute(body["name"].ToString())} to {body["value"]}"); return Ok(); } diff --git a/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs b/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs index 51bc4142..7805fcbb 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs @@ -4,9 +4,12 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Services.Message; namespace UKSFWebsite.Api.Controllers.Accounts { [Route("[controller]")] @@ -17,13 +20,7 @@ public class CommunicationsController : Controller { private readonly ISessionService sessionService; private readonly ITeamspeakService teamspeakService; - public CommunicationsController( - IConfirmationCodeService confirmationCodeService, - IAccountService accountService, - ISessionService sessionService, - ITeamspeakService teamspeakService, - INotificationsService notificationsService - ) { + public CommunicationsController(IConfirmationCodeService confirmationCodeService, IAccountService accountService, ISessionService sessionService, ITeamspeakService teamspeakService, INotificationsService notificationsService) { this.confirmationCodeService = confirmationCodeService; this.accountService = accountService; this.sessionService = sessionService; @@ -65,7 +62,7 @@ private async Task SendTeamspeakCode(string teamspeakDbId) { } private async Task ReceiveTeamspeakCode(string id, string code, string checkId) { - Account account = accountService.GetSingle(id); + Account account = accountService.Data().GetSingle(id); string teamspeakId = await confirmationCodeService.GetConfirmationCode(code); if (string.IsNullOrWhiteSpace(teamspeakId) || teamspeakId != checkId) { return BadRequest(new {error = "The confirmation code has expired or is invalid. Please try again"}); @@ -73,8 +70,8 @@ private async Task ReceiveTeamspeakCode(string id, string code, s if (account.teamspeakIdentities == null) account.teamspeakIdentities = new HashSet(); account.teamspeakIdentities.Add(teamspeakId); - await accountService.Update(account.id, Builders.Update.Set("teamspeakIdentities", account.teamspeakIdentities)); - account = accountService.GetSingle(account.id); + await accountService.Data().Update(account.id, Builders.Update.Set("teamspeakIdentities", account.teamspeakIdentities)); + account = accountService.Data().GetSingle(account.id); teamspeakService.UpdateAccountTeamspeakGroups(account); notificationsService.SendTeamspeakNotification(new HashSet {teamspeakId}, $"This teamspeak identity has been linked to the account with email '{account.email}'\nIf this was not done by you, please contact an admin"); LogWrapper.AuditLog(account.id, $"Teamspeak ID {teamspeakId} added for {account.id}"); diff --git a/UKSFWebsite.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs b/UKSFWebsite.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs index ced961c6..840a7346 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs @@ -2,15 +2,16 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers.Accounts { public abstract class ConfirmationCodeReceiver : Controller { + protected readonly IAccountService AccountService; protected readonly IConfirmationCodeService ConfirmationCodeService; internal readonly ILoginService LoginService; - protected readonly IAccountService AccountService; protected string LoginToken; protected ConfirmationCodeReceiver(IConfirmationCodeService confirmationCodeService, ILoginService loginService, IAccountService accountService) { @@ -26,13 +27,13 @@ protected async Task AttemptLoginValidatedAction(JObject loginFor string validateCode = loginForm["code"].ToString(); if (codeType == "passwordreset") { LoginToken = LoginService.LoginWithoutPassword(loginForm["email"].ToString()); - Account account = AccountService.GetSingle(x => string.Equals(x.email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); + Account account = AccountService.Data().GetSingle(x => string.Equals(x.email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); if (await ConfirmationCodeService.GetConfirmationCode(validateCode) == account.id && LoginToken != null) { return await ApplyValidatedPayload(loginForm["password"].ToString(), account); } } else { LoginToken = LoginService.Login(loginForm["email"].ToString(), loginForm["password"].ToString()); - Account account = AccountService.GetSingle(x => string.Equals(x.email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); + Account account = AccountService.Data().GetSingle(x => string.Equals(x.email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); string codeValue = await ConfirmationCodeService.GetConfirmationCode(validateCode); if (!string.IsNullOrWhiteSpace(codeValue)) { return await ApplyValidatedPayload(codeValue, account); diff --git a/UKSFWebsite.Api/Controllers/Accounts/DiscordCodeController.cs b/UKSFWebsite.Api/Controllers/Accounts/DiscordCodeController.cs index e3bc6fcd..b89b6b36 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/DiscordCodeController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/DiscordCodeController.cs @@ -3,17 +3,19 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Services.Message; namespace UKSFWebsite.Api.Controllers.Accounts { [Route("[controller]")] public class DiscordCodeController : Controller { private readonly IAccountService accountService; private readonly IConfirmationCodeService confirmationCodeService; - private readonly ISessionService sessionService; private readonly IDiscordService discordService; + private readonly ISessionService sessionService; public DiscordCodeController(ISessionService sessionService, IConfirmationCodeService confirmationCodeService, IAccountService accountService, IDiscordService discordService) { this.sessionService = sessionService; @@ -30,8 +32,8 @@ public async Task DiscordConnect(string discordId, [FromBody] JOb } string id = sessionService.GetContextId(); - await accountService.Update(id, Builders.Update.Set(x => x.discordId, discordId)); - Account account = accountService.GetSingle(id); + await accountService.Data().Update(id, Builders.Update.Set(x => x.discordId, discordId)); + Account account = accountService.Data().GetSingle(id); await discordService.UpdateAccount(account); LogWrapper.AuditLog(account.id, $"DiscordID updated for {account.id} to {discordId}"); return Ok(); diff --git a/UKSFWebsite.Api/Controllers/Accounts/OperationOrderController.cs b/UKSFWebsite.Api/Controllers/Accounts/OperationOrderController.cs index 8dc11657..220bf918 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/OperationOrderController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/OperationOrderController.cs @@ -1,10 +1,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Requests; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Operations; +using UKSFWebsite.Api.Models.Operations; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers.Accounts { [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] @@ -14,10 +13,10 @@ public class OperationOrderController : Controller { public OperationOrderController(IOperationOrderService operationOrderService) => this.operationOrderService = operationOrderService; [HttpGet, Authorize] - public IActionResult Get() => Ok(operationOrderService.Get()); + public IActionResult Get() => Ok(operationOrderService.Data().Get()); [HttpGet("{id}"), Authorize] - public IActionResult Get(string id) => Ok(new {result = operationOrderService.GetSingle(id)}); + public IActionResult Get(string id) => Ok(new {result = operationOrderService.Data().GetSingle(id)}); [HttpPost, Authorize] public async Task Post([FromBody] CreateOperationOrderRequest request) { @@ -27,7 +26,7 @@ public async Task Post([FromBody] CreateOperationOrderRequest req [HttpPut, Authorize] public async Task Put([FromBody] Opord request) { - await operationOrderService.Replace(request); + await operationOrderService.Data().Replace(request); return Ok(); } } diff --git a/UKSFWebsite.Api/Controllers/Accounts/OperationReportController.cs b/UKSFWebsite.Api/Controllers/Accounts/OperationReportController.cs index 47137fbf..52d4c340 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/OperationReportController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/OperationReportController.cs @@ -2,10 +2,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Requests; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Operations; +using UKSFWebsite.Api.Models.Operations; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers.Accounts { [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] @@ -16,7 +15,7 @@ public class OperationReportController : Controller { [HttpGet("{id}"), Authorize] public IActionResult Get(string id) { - Oprep oprep = operationReportService.GetSingle(id); + Oprep oprep = operationReportService.Data().GetSingle(id); return Ok(new {operationEntity = oprep, groupedAttendance = oprep.attendanceReport.users.GroupBy(x => x.groupName)}); } @@ -28,11 +27,11 @@ public async Task Post([FromBody] CreateOperationReportRequest re [HttpPut, Authorize] public async Task Put([FromBody] Oprep request) { - await operationReportService.Replace(request); + await operationReportService.Data().Replace(request); return Ok(); } [HttpGet, Authorize] - public IActionResult Get() => Ok(operationReportService.Get()); + public IActionResult Get() => Ok(operationReportService.Data().Get()); } } diff --git a/UKSFWebsite.Api/Controllers/Accounts/OperationsController.cs b/UKSFWebsite.Api/Controllers/Accounts/OperationsController.cs index db8185f0..e79e91da 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/OperationsController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/OperationsController.cs @@ -4,8 +4,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Models.Integrations; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers.Accounts { [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] @@ -28,8 +28,7 @@ private static int[] GetData(IReadOnlyCollection server DateTime startdate = DateTime.Today.AddMinutes(30 * i); DateTime enddate = DateTime.Today.AddMinutes(30 * (i + 1)); try { - TeamspeakServerSnapshot serverSnapshot = - serverSnapshots.FirstOrDefault(x => x.timestamp.TimeOfDay > startdate.TimeOfDay && x.timestamp.TimeOfDay < enddate.TimeOfDay && x.timestamp.Date == day); + TeamspeakServerSnapshot serverSnapshot = serverSnapshots.FirstOrDefault(x => x.timestamp.TimeOfDay > startdate.TimeOfDay && x.timestamp.TimeOfDay < enddate.TimeOfDay && x.timestamp.Date == day); if (serverSnapshot != null) { dataset.Add(acre ? serverSnapshot.users.Where(x => x.channelName == "ACRE").ToArray().Length : serverSnapshot.users.Count); } else { @@ -60,14 +59,7 @@ private static List GetDataSets(IReadOnlyCollection this.emailService = emailService; protected override async Task ApplyValidatedPayload(string codePayload, Account account) { - await AccountService.Update(account.id, "password", BCrypt.Net.BCrypt.HashPassword(codePayload)); + await AccountService.Data().Update(account.id, "password", BCrypt.Net.BCrypt.HashPassword(codePayload)); LogWrapper.AuditLog(account.id, $"Password changed for {account.id}"); return Ok(LoginService.RegenerateToken(account.id)); } @@ -25,7 +27,7 @@ protected override async Task ApplyValidatedPayload(string codePa [HttpPut] public async Task ResetPassword([FromBody] JObject body) { - Account account = AccountService.GetSingle(x => string.Equals(x.email, body["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); + Account account = AccountService.Data().GetSingle(x => string.Equals(x.email, body["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); if (account == null) { return BadRequest(); } diff --git a/UKSFWebsite.Api/Controllers/Accounts/SteamCodeController.cs b/UKSFWebsite.Api/Controllers/Accounts/SteamCodeController.cs index 947603c0..99ca1937 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/SteamCodeController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/SteamCodeController.cs @@ -2,9 +2,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Services.Message; namespace UKSFWebsite.Api.Controllers.Accounts { [Route("[controller]")] @@ -27,8 +28,8 @@ public async Task SteamConnect(string steamId, [FromBody] JObject } string id = sessionService.GetContextId(); - await accountService.Update(id, "steamname", steamId); - Account account = accountService.GetSingle(id); + await accountService.Data().Update(id, "steamname", steamId); + Account account = accountService.Data().GetSingle(id); LogWrapper.AuditLog(account.id, $"SteamID updated for {account.id} to {steamId}"); return Ok(); } diff --git a/UKSFWebsite.Api/Controllers/ApplicationsController.cs b/UKSFWebsite.Api/Controllers/ApplicationsController.cs index 9db8e523..f7604fe0 100644 --- a/UKSFWebsite.Api/Controllers/ApplicationsController.cs +++ b/UKSFWebsite.Api/Controllers/ApplicationsController.cs @@ -5,10 +5,13 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Controllers { @@ -48,11 +51,11 @@ public async Task Post([FromBody] JObject body) { dateCreated = DateTime.Now, state = ApplicationState.WAITING, recruiter = recruitmentService.GetRecruiter(), - recruiterCommentThread = await commentThreadService.Add(new CommentThread {authors = recruitmentService.GetSr1Leads().Values.ToArray(), mode = ThreadMode.SR1}), - applicationCommentThread = await commentThreadService.Add(new CommentThread {authors = new[] {account.id}, mode = ThreadMode.SR1}) + recruiterCommentThread = await commentThreadService.Data().Add(new CommentThread {authors = recruitmentService.GetSr1Leads().Values.ToArray(), mode = ThreadMode.SR1}), + applicationCommentThread = await commentThreadService.Data().Add(new CommentThread {authors = new[] {account.id}, mode = ThreadMode.SR1}) }; - await accountService.Update(account.id, Builders.Update.Set(x => x.application, application)); - account = accountService.GetSingle(account.id); + await accountService.Data().Update(account.id, Builders.Update.Set(x => x.application, application)); + account = accountService.Data().GetSingle(account.id); Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, "", "Applicant", "Candidate", reason: "you were entered into the recruitment process"); notificationsService.Add(notification); notificationsService.Add(new Notification {owner = application.recruiter, icon = NotificationIcons.APPLICATION, message = $"You have been assigned {account.firstname} {account.lastname}'s application", link = $"/recruitment/{account.id}"}); @@ -71,23 +74,24 @@ public async Task PostUpdate([FromBody] JObject body) { Account account = sessionService.GetContextAccount(); await Update(body, account); notificationsService.Add(new Notification {owner = account.application.recruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname} updated their application", link = $"/recruitment/{account.id}"}); - string difference = account.Changes(accountService.GetSingle(account.id)); + string difference = account.Changes(accountService.Data().GetSingle(account.id)); LogWrapper.AuditLog(account.id, $"Application updated for {account.id}: {difference}"); return Ok(); } private async Task Update(JObject body, Account account) { - await accountService.Update( - account.id, - Builders.Update.Set(x => x.armaExperience, body["armaExperience"].ToString()) - .Set(x => x.unitsExperience, body["unitsExperience"].ToString()) - .Set(x => x.background, body["background"].ToString()) - .Set(x => x.militaryExperience, string.Equals(body["militaryExperience"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) - .Set(x => x.officer, string.Equals(body["officer"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) - .Set(x => x.nco, string.Equals(body["nco"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) - .Set(x => x.aviation, string.Equals(body["aviation"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) - .Set(x => x.reference, body["reference"].ToString()) - ); + await accountService.Data() + .Update( + account.id, + Builders.Update.Set(x => x.armaExperience, body["armaExperience"].ToString()) + .Set(x => x.unitsExperience, body["unitsExperience"].ToString()) + .Set(x => x.background, body["background"].ToString()) + .Set(x => x.militaryExperience, string.Equals(body["militaryExperience"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) + .Set(x => x.officer, string.Equals(body["officer"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) + .Set(x => x.nco, string.Equals(body["nco"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) + .Set(x => x.aviation, string.Equals(body["aviation"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) + .Set(x => x.reference, body["reference"].ToString()) + ); } } } diff --git a/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs b/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs index aedcf46b..7903c273 100644 --- a/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs +++ b/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs @@ -7,12 +7,16 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Models.CommandRequests; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Command; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Command; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers.CommandRequests { [Route("[controller]"), Roles(RoleDefinitions.COMMAND)] @@ -35,11 +39,11 @@ public CommandRequestsController(ICommandRequestService commandRequestService, I [HttpGet, Authorize] public IActionResult Get() { - List allRequests = commandRequestService.Get(); + List allRequests = commandRequestService.Data().Get(); List myRequests = new List(); List otherRequests = new List(); string contextId = sessionService.GetContextId(); - bool canOverride = unitsService.GetSingle(x => x.shortname == "SR10").members.Any(x => x == contextId); + bool canOverride = unitsService.Data().GetSingle(x => x.shortname == "SR10").members.Any(x => x == contextId); bool superAdmin = contextId == Global.SUPER_ADMIN; DateTime now = DateTime.Now; foreach (CommandRequest commandRequest in allRequests) { @@ -83,7 +87,7 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje bool overriden = bool.Parse(body["overriden"].ToString()); ReviewState state = Enum.Parse(body["reviewState"].ToString()); Account sessionAccount = sessionService.GetContextAccount(); - CommandRequest request = commandRequestService.GetSingle(id); + CommandRequest request = commandRequestService.Data().GetSingle(id); if (request == null) { throw new NullReferenceException($"Failed to get request with id {id}, does not exist"); } diff --git a/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs b/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs index 2f8ec876..e1bcd273 100644 --- a/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs +++ b/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs @@ -4,11 +4,13 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.CommandRequests; -using UKSFWebsite.Api.Services; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Command; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Command; +using UKSFWebsite.Api.Models.Units; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers.CommandRequests { [Route("commandrequests/create")] @@ -18,19 +20,11 @@ public class CommandRequestsCreationController : Controller { private readonly IDisplayNameService displayNameService; private readonly ILoaService loaService; private readonly IRanksService ranksService; - private readonly IUnitsService unitsService; private readonly string sessionId; + private readonly IUnitsService unitsService; - public CommandRequestsCreationController( - ISessionService sessionService, - IAccountService accountService, - ICommandRequestService commandRequestService, - IRanksService ranksService, - ILoaService loaService, - IUnitsService unitsService, - IDisplayNameService displayNameService - ) { + public CommandRequestsCreationController(ISessionService sessionService, IAccountService accountService, ICommandRequestService commandRequestService, IRanksService ranksService, ILoaService loaService, IUnitsService unitsService, IDisplayNameService displayNameService) { this.accountService = accountService; this.commandRequestService = commandRequestService; this.ranksService = ranksService; @@ -44,14 +38,10 @@ IDisplayNameService displayNameService public async Task CreateRequestRank([FromBody] CommandRequest request) { request.requester = sessionId; request.displayValue = request.value; - request.displayFrom = accountService.GetSingle(request.recipient).rank; + request.displayFrom = accountService.Data().GetSingle(request.recipient).rank; if (request.displayValue == request.displayFrom) return BadRequest("Ranks are equal"); bool direction = ranksService.IsSuperior(request.displayValue, request.displayFrom); - request.type = string.IsNullOrEmpty(request.displayFrom) - ? CommandRequestType.PROMOTION - : direction - ? CommandRequestType.PROMOTION - : CommandRequestType.DEMOTION; + request.type = string.IsNullOrEmpty(request.displayFrom) ? CommandRequestType.PROMOTION : direction ? CommandRequestType.PROMOTION : CommandRequestType.DEMOTION; if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); await commandRequestService.Add(request); return Ok(); @@ -98,7 +88,7 @@ public async Task CreateRequestDischarge([FromBody] CommandReques public async Task CreateRequestIndividualRole([FromBody] CommandRequest request) { request.requester = sessionId; request.displayValue = request.value; - request.displayFrom = accountService.GetSingle(request.recipient).roleAssignment; + request.displayFrom = accountService.Data().GetSingle(request.recipient).roleAssignment; request.type = CommandRequestType.INDIVIDUAL_ROLE; if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); await commandRequestService.Add(request, ChainOfCommandMode.NEXT_COMMANDER); @@ -107,7 +97,7 @@ public async Task CreateRequestIndividualRole([FromBody] CommandR [HttpPut("unitrole"), Authorize, Roles(RoleDefinitions.COMMAND)] public async Task CreateRequestUnitRole([FromBody] CommandRequest request) { - Unit unit = unitsService.GetSingle(request.value); + Unit unit = unitsService.Data().GetSingle(request.value); bool recipientHasUnitRole = unitsService.RolesHasMember(unit, request.recipient); if (!recipientHasUnitRole && request.secondaryValue == "None") { return BadRequest($"{displayNameService.GetDisplayName(request.recipient)} has no unit role in {unit.name}. If you are trying to remove them from the unit, use a Unit Removal request"); @@ -130,7 +120,7 @@ public async Task CreateRequestUnitRole([FromBody] CommandRequest [HttpPut("unitremoval"), Authorize, Roles(RoleDefinitions.COMMAND)] public async Task CreateRequestUnitRemoval([FromBody] CommandRequest request) { - Unit removeUnit = unitsService.GetSingle(request.value); + Unit removeUnit = unitsService.Data().GetSingle(request.value); if (removeUnit.branch == UnitBranch.COMBAT) { return BadRequest("To remove from a combat unit, use a Transfer request"); } @@ -146,7 +136,7 @@ public async Task CreateRequestUnitRemoval([FromBody] CommandRequ [HttpPut("transfer"), Authorize, Roles(RoleDefinitions.COMMAND)] public async Task CreateRequestTransfer([FromBody] CommandRequest request) { - Unit toUnit = unitsService.GetSingle(request.value); + Unit toUnit = unitsService.Data().GetSingle(request.value); request.requester = sessionId; request.displayValue = toUnit.name; if (toUnit.branch == UnitBranch.AUXILIARY) { @@ -155,7 +145,7 @@ public async Task CreateRequestTransfer([FromBody] CommandRequest if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); await commandRequestService.Add(request, ChainOfCommandMode.TARGET_COMMANDER); } else { - request.displayFrom = accountService.GetSingle(request.recipient).unitAssignment; + request.displayFrom = accountService.Data().GetSingle(request.recipient).unitAssignment; request.type = CommandRequestType.TRANSFER; if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); await commandRequestService.Add(request, ChainOfCommandMode.COMMANDER_AND_TARGET_COMMANDER); diff --git a/UKSFWebsite.Api/Controllers/CommentThreadController.cs b/UKSFWebsite.Api/Controllers/CommentThreadController.cs index b0b3ab42..f53758bb 100644 --- a/UKSFWebsite.Api/Controllers/CommentThreadController.cs +++ b/UKSFWebsite.Api/Controllers/CommentThreadController.cs @@ -6,13 +6,14 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; using MongoDB.Bson; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Hubs.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers { [Route("commentthread"), Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER, RoleDefinitions.DISCHARGED)] @@ -48,21 +49,33 @@ IHubContext commentThreadHub [HttpGet("{id}"), Authorize] public IActionResult Get(string id) { - Comment[] comments = commentThreadService.GetCommentThreadComments(id); - return Ok(new {comments = comments.Select(comment => new {Id = comment.id.ToString(), Author = comment.author.ToString(), DisplayName = displayNameService.GetDisplayName(accountService.GetSingle(comment.author)), Content = comment.content, Timestamp = comment.timestamp})}); + IEnumerable comments = commentThreadService.GetCommentThreadComments(id); + return Ok( + new { + comments = comments.Select( + comment => new { + Id = comment.id.ToString(), + Author = comment.author.ToString(), + DisplayName = displayNameService.GetDisplayName(accountService.Data().GetSingle(comment.author)), + Content = comment.content, + Timestamp = comment.timestamp + } + ) + } + ); } [HttpGet("canpost/{id}"), Authorize] public IActionResult GetCanPostComment(string id) { - CommentThread commentThread = commentThreadService.GetSingle(id); + CommentThread commentThread = commentThreadService.Data().GetSingle(id); bool canPost; Account account = sessionService.GetContextAccount(); bool admin = sessionService.ContextHasRole(RoleDefinitions.ADMIN); canPost = commentThread.mode switch { ThreadMode.SR1 => (commentThread.authors.Any(x => x == sessionService.GetContextId()) || admin || recruitmentService.IsRecruiter(sessionService.GetContextAccount())), - ThreadMode.RANKSUPERIOR => commentThread.authors.Any(x => admin || ranksService.IsSuperior(account.rank, accountService.GetSingle(x).rank)), - ThreadMode.RANKEQUAL => commentThread.authors.Any(x => admin || ranksService.IsEqual(account.rank, accountService.GetSingle(x).rank)), - ThreadMode.RANKSUPERIOROREQUAL => commentThread.authors.Any(x => admin || ranksService.IsSuperiorOrEqual(account.rank, accountService.GetSingle(x).rank)), + ThreadMode.RANKSUPERIOR => commentThread.authors.Any(x => admin || ranksService.IsSuperior(account.rank, accountService.Data().GetSingle(x).rank)), + ThreadMode.RANKEQUAL => commentThread.authors.Any(x => admin || ranksService.IsEqual(account.rank, accountService.Data().GetSingle(x).rank)), + ThreadMode.RANKSUPERIOROREQUAL => commentThread.authors.Any(x => admin || ranksService.IsSuperiorOrEqual(account.rank, accountService.Data().GetSingle(x).rank)), _ => true }; @@ -74,7 +87,7 @@ public async Task AddComment(string id, [FromBody] Comment commen comment.id = ObjectId.GenerateNewId().ToString(); comment.timestamp = DateTime.Now; comment.author = sessionService.GetContextId(); - CommentThread thread = commentThreadService.GetSingle(id); + CommentThread thread = commentThreadService.Data().GetSingle(id); await commentThreadService.InsertComment(id, comment); IEnumerable participants = commentThreadService.GetCommentThreadParticipants(thread.id); foreach (string objectId in participants.Where(x => x != comment.author)) { @@ -88,7 +101,13 @@ public async Task AddComment(string id, [FromBody] Comment commen ); } - var returnComment = new {Id = comment.id, Author = comment.author, Content = comment.content, DisplayName = displayNameService.GetDisplayName(comment.author), Timestamp = comment.timestamp}; + var returnComment = new { + Id = comment.id, + Author = comment.author, + Content = comment.content, + DisplayName = displayNameService.GetDisplayName(comment.author), + Timestamp = comment.timestamp + }; await commentThreadHub.Clients.Group($"{id}").ReceiveComment(returnComment); return Ok(); @@ -96,9 +115,9 @@ public async Task AddComment(string id, [FromBody] Comment commen [HttpPost("{id}/{commentId}"), Authorize] public async Task DeleteComment(string id, string commentId) { - Comment[] comments = commentThreadService.GetCommentThreadComments(id); + List comments = commentThreadService.GetCommentThreadComments(id).ToList(); Comment comment = comments.FirstOrDefault(x => x.id == commentId); - int commentIndex = Array.IndexOf(comments, comment); + int commentIndex = comments.IndexOf(comment); await commentThreadService.RemoveComment(id, comment); await commentThreadHub.Clients.Group($"{id}").DeleteComment(commentIndex); return Ok(); diff --git a/UKSFWebsite.Api/Controllers/DataController.cs b/UKSFWebsite.Api/Controllers/DataController.cs index 7d816e0b..b3481323 100644 --- a/UKSFWebsite.Api/Controllers/DataController.cs +++ b/UKSFWebsite.Api/Controllers/DataController.cs @@ -1,18 +1,18 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.ADMIN)] public class DataController : Controller { - private readonly CacheService cacheService; + private readonly DataCacheService dataCacheService; + + public DataController(DataCacheService dataCacheService) => this.dataCacheService = dataCacheService; - public DataController(CacheService cacheService) => this.cacheService = cacheService; - [HttpGet("invalidate"), Authorize] public IActionResult Invalidate() { - cacheService.InvalidateCaches(); + dataCacheService.InvalidateDataCaches(); return Ok(); } } diff --git a/UKSFWebsite.Api/Controllers/DischargesController.cs b/UKSFWebsite.Api/Controllers/DischargesController.cs index ed1c40ed..3530c9f7 100644 --- a/UKSFWebsite.Api/Controllers/DischargesController.cs +++ b/UKSFWebsite.Api/Controllers/DischargesController.cs @@ -3,12 +3,16 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Models.CommandRequests; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Command; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Command; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.SR10, RoleDefinitions.NCO, RoleDefinitions.SR1)] @@ -33,27 +37,28 @@ public DischargesController(IAccountService accountService, IAssignmentService a [HttpGet] public IActionResult Get() { - IEnumerable discharges = dischargeService.Get(); + IEnumerable discharges = dischargeService.Data().Get(); foreach (DischargeCollection discharge in discharges) { discharge.requestExists = commandRequestService.DoesEquivalentRequestExist(new CommandRequest {recipient = discharge.accountId, type = CommandRequestType.REINSTATE_MEMBER, displayValue = "Member", displayFrom = "Discharged"}); } + return Ok(discharges); } [HttpGet("reinstate/{id}")] public async Task Reinstate(string id) { - DischargeCollection dischargeCollection = dischargeService.GetSingle(id); - await dischargeService.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); - await accountService.Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); + DischargeCollection dischargeCollection = dischargeService.Data().GetSingle(id); + await dischargeService.Data().Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); + await accountService.Data().Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); Notification notification = await assignmentService.UpdateUnitRankAndRole(dischargeCollection.accountId, "Basic Training Unit", "Trainee", "Recruit", "", "", "your membership was reinstated"); notificationsService.Add(notification); LogWrapper.AuditLog(sessionService.GetContextId(), $"{sessionService.GetContextId()} reinstated {dischargeCollection.name}'s membership"); - foreach (string member in unitsService.GetSingle(x => x.shortname == "SR10").members.Where(x => x != sessionService.GetContextId())) { + foreach (string member in unitsService.Data().GetSingle(x => x.shortname == "SR10").members.Where(x => x != sessionService.GetContextId())) { notificationsService.Add(new Notification {owner = member, icon = NotificationIcons.PROMOTION, message = $"{dischargeCollection.name}'s membership was reinstated by {sessionService.GetContextId()}"}); } - return Ok(dischargeService.Get()); + return Ok(dischargeService.Data().Get()); } } } diff --git a/UKSFWebsite.Api/Controllers/DiscordController.cs b/UKSFWebsite.Api/Controllers/DiscordController.cs index 66d18079..b18d468b 100644 --- a/UKSFWebsite.Api/Controllers/DiscordController.cs +++ b/UKSFWebsite.Api/Controllers/DiscordController.cs @@ -4,8 +4,8 @@ using Discord.WebSocket; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers { [Route("[controller]")] diff --git a/UKSFWebsite.Api/Controllers/GameServersController.cs b/UKSFWebsite.Api/Controllers/GameServersController.cs index 96bdf381..0736f2f0 100644 --- a/UKSFWebsite.Api/Controllers/GameServersController.cs +++ b/UKSFWebsite.Api/Controllers/GameServersController.cs @@ -8,20 +8,23 @@ using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Models; +using UKSFWebsite.Api.Interfaces.Game; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Game; using UKSFWebsite.Api.Models.Mission; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Services.Game; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Hubs.Abstraction; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.NCO, RoleDefinitions.SR5, RoleDefinitions.COMMAND)] public class GameServersController : Controller { private readonly IGameServersService gameServersService; - private readonly ISessionService sessionService; private readonly IHubContext serversHub; + private readonly ISessionService sessionService; public GameServersController(ISessionService sessionService, IGameServersService gameServersService, IHubContext serversHub) { this.sessionService = sessionService; @@ -30,67 +33,73 @@ public GameServersController(ISessionService sessionService, IGameServersService } [HttpGet, Authorize] - public IActionResult GetGameServers() => Ok(new {servers = gameServersService.Get(), missions = gameServersService.GetMissionFiles(), instanceCount = gameServersService.GetGameInstanceCount()}); + public IActionResult GetGameServers() => Ok(new {servers = gameServersService.Data().Get(), missions = gameServersService.GetMissionFiles(), instanceCount = gameServersService.GetGameInstanceCount()}); [HttpGet("status/{id}"), Authorize] public async Task GetGameServerStatus(string id) { - GameServer gameServer = gameServersService.GetSingle(id); + GameServer gameServer = gameServersService.Data().GetSingle(id); await gameServersService.GetGameServerStatus(gameServer); return Ok(new {gameServer, instanceCount = gameServersService.GetGameInstanceCount()}); } [HttpPost("{check}"), Authorize] public IActionResult CheckGameServers(string check, [FromBody] GameServer gameServer = null) { - return Ok(gameServer != null ? gameServersService.GetSingle(x => x.id != gameServer.id && (x.name == check || x.apiPort.ToString() == check)) : gameServersService.GetSingle(x => x.name == check || x.apiPort.ToString() == check)); + if (gameServer != null) { + GameServer safeGameServer = gameServer; + return Ok(gameServersService.Data().GetSingle(x => x.id != safeGameServer.id && (x.name == check || x.apiPort.ToString() == check))); + } + + return Ok(gameServersService.Data().GetSingle(x => x.name == check || x.apiPort.ToString() == check)); } [HttpPut, Authorize] public async Task AddServer([FromBody] GameServer gameServer) { - await gameServersService.Add(gameServer); + await gameServersService.Data().Add(gameServer); LogWrapper.AuditLog(sessionService.GetContextId(), $"Server added '{gameServer}'"); return Ok(); } [HttpPatch, Authorize] public async Task EditGameServer([FromBody] GameServer gameServer) { - GameServer oldGameServer = gameServersService.GetSingle(x => x.id == gameServer.id); + GameServer oldGameServer = gameServersService.Data().GetSingle(x => x.id == gameServer.id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server '{gameServer.name}' updated:{oldGameServer.Changes(gameServer)}"); - await gameServersService.Update( - gameServer.id, - Builders.Update.Set("name", gameServer.name) - .Set("port", gameServer.port) - .Set("apiPort", gameServer.apiPort) - .Set("numberHeadlessClients", gameServer.numberHeadlessClients) - .Set("profileName", gameServer.profileName) - .Set("hostName", gameServer.hostName) - .Set("password", gameServer.password) - .Set("adminPassword", gameServer.adminPassword) - .Set("serverOption", gameServer.serverOption) - .Set("serverMods", gameServer.serverMods) - ); - - return Ok(gameServersService.Get()); + await gameServersService.Data() + .Update( + gameServer.id, + Builders.Update.Set("name", gameServer.name) + .Set("port", gameServer.port) + .Set("apiPort", gameServer.apiPort) + .Set("numberHeadlessClients", gameServer.numberHeadlessClients) + .Set("profileName", gameServer.profileName) + .Set("hostName", gameServer.hostName) + .Set("password", gameServer.password) + .Set("adminPassword", gameServer.adminPassword) + .Set("serverOption", gameServer.serverOption) + .Set("serverMods", gameServer.serverMods) + ); + + return Ok(gameServersService.Data().Get()); } [HttpDelete("{id}"), Authorize] public async Task DeleteGameServer(string id) { - GameServer gameServer = gameServersService.GetSingle(x => x.id == id); + GameServer gameServer = gameServersService.Data().GetSingle(x => x.id == id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server deleted '{gameServer.name}'"); - await gameServersService.Delete(id); + await gameServersService.Data().Delete(id); - return Ok(gameServersService.Get()); + return Ok(gameServersService.Data().Get()); } [HttpPost("order"), Authorize] public async Task UpdateOrder([FromBody] List newServerOrder) { for (int index = 0; index < newServerOrder.Count; index++) { GameServer gameServer = newServerOrder[index]; - if (gameServersService.GetSingle(gameServer.id).order != index) { - await gameServersService.Update(gameServer.id, "order", index); + if (gameServersService.Data().GetSingle(gameServer.id).order != index) { + await gameServersService.Data().Update(gameServer.id, "order", index); } } - return Ok(gameServersService.Get()); + return Ok(gameServersService.Data().Get()); } [HttpPost("mission"), Authorize, RequestSizeLimit(10485760), RequestFormLimits(MultipartBodyLengthLimit = 10485760)] @@ -113,22 +122,22 @@ public async Task UploadMissionFile() { [HttpPost("launch/{id}"), Authorize] public async Task LaunchServer(string id, [FromBody] JObject data) { - Task.WaitAll(gameServersService.Get().Select(x => gameServersService.GetGameServerStatus(x)).ToArray()); - GameServer gameServer = gameServersService.GetSingle(id); + Task.WaitAll(gameServersService.Data().Get().Select(x => gameServersService.GetGameServerStatus(x)).ToArray()); + GameServer gameServer = gameServersService.Data().GetSingle(id); if (gameServer.status.running) return BadRequest("Server is already running. This shouldn't happen so please contact an admin"); if (GameServerHelpers.IsMainOpTime()) { if (gameServer.serverOption == GameServerOption.SINGLETON) { - if (gameServersService.Get(x => x.serverOption != GameServerOption.SINGLETON).Any(x => x.status.started || x.status.running)) { + if (gameServersService.Data().Get(x => x.serverOption != GameServerOption.SINGLETON).Any(x => x.status.started || x.status.running)) { return BadRequest("Server must be launched on its own. Stop the other running servers first"); } } - if (gameServersService.Get(x => x.serverOption == GameServerOption.SINGLETON).Any(x => x.status.started || x.status.running)) { + if (gameServersService.Data().Get(x => x.serverOption == GameServerOption.SINGLETON).Any(x => x.status.started || x.status.running)) { return BadRequest("Server cannot be launched whilst main server is running at this time"); } } - if (gameServersService.Get(x => x.port == gameServer.port).Any(x => x.status.started || x.status.running)) { + if (gameServersService.Data().Get(x => x.port == gameServer.port).Any(x => x.status.started || x.status.running)) { return BadRequest("Server cannot be launched while another server with the same port is running"); } @@ -152,7 +161,7 @@ public async Task LaunchServer(string id, [FromBody] JObject data [HttpGet("stop/{id}"), Authorize] public async Task StopServer(string id) { - GameServer gameServer = gameServersService.GetSingle(id); + GameServer gameServer = gameServersService.Data().GetSingle(id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server stopped '{gameServer.name}'"); await gameServersService.GetGameServerStatus(gameServer); if (!gameServer.status.started && !gameServer.status.running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); @@ -163,7 +172,7 @@ public async Task StopServer(string id) { [HttpGet("kill/{id}"), Authorize] public async Task KillServer(string id) { - GameServer gameServer = gameServersService.GetSingle(id); + GameServer gameServer = gameServersService.Data().GetSingle(id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server killed '{gameServer.name}'"); await gameServersService.GetGameServerStatus(gameServer); if (!gameServer.status.started && !gameServer.status.running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); @@ -189,20 +198,20 @@ public IActionResult KillAllArmaProcesses() { [HttpPost("mods/{id}"), Authorize] public async Task SetGameServerMods(string id, [FromBody] List mods) { - GameServer gameServer = gameServersService.GetSingle(id); + GameServer gameServer = gameServersService.Data().GetSingle(id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server '{gameServer.name}' mods updated:{gameServer.mods.Select(x => x.name).Changes(mods.Select(x => x.name))}"); - await gameServersService.Update(id, Builders.Update.Unset(x => x.mods)); - await gameServersService.Update(id, Builders.Update.PushEach(x => x.mods, mods)); + await gameServersService.Data().Update(id, Builders.Update.Unset(x => x.mods)); + await gameServersService.Data().Update(id, Builders.Update.PushEach(x => x.mods, mods)); return Ok(gameServersService.GetAvailableMods()); } [HttpGet("disabled"), Authorize] - public IActionResult GetDisabledState() => Ok(new {state = VariablesWrapper.VariablesService().GetSingle("SERVERS_DISABLED").AsBool()}); + public IActionResult GetDisabledState() => Ok(new {state = VariablesWrapper.VariablesDataService().GetSingle("SERVERS_DISABLED").AsBool()}); [HttpPost("disabled"), Authorize] public async Task SetDisabledState([FromBody] JObject body) { bool state = bool.Parse(body["state"].ToString()); - await VariablesWrapper.VariablesService().Update("SERVERS_DISABLED", state); + await VariablesWrapper.VariablesDataService().Update("SERVERS_DISABLED", state); await serversHub.Clients.All.ReceiveDisabledState(state); return Ok(); } diff --git a/UKSFWebsite.Api/Controllers/IssueController.cs b/UKSFWebsite.Api/Controllers/IssueController.cs index 64ac292d..823b82ce 100644 --- a/UKSFWebsite.Api/Controllers/IssueController.cs +++ b/UKSFWebsite.Api/Controllers/IssueController.cs @@ -8,16 +8,18 @@ using Microsoft.Extensions.Configuration; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] public class IssueController : Controller { private readonly IDisplayNameService displayNameService; - private readonly ISessionService sessionService; private readonly IEmailService emailService; private readonly string githubToken; + private readonly ISessionService sessionService; public IssueController(ISessionService sessionService, IDisplayNameService displayNameService, IEmailService emailService, IConfiguration configuration) { this.sessionService = sessionService; diff --git a/UKSFWebsite.Api/Controllers/LauncherController.cs b/UKSFWebsite.Api/Controllers/LauncherController.cs index cdaeec53..f4d73a39 100644 --- a/UKSFWebsite.Api/Controllers/LauncherController.cs +++ b/UKSFWebsite.Api/Controllers/LauncherController.cs @@ -6,26 +6,30 @@ using Microsoft.AspNetCore.SignalR; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Launcher; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Models.Launcher; -using UKSFWebsite.Api.Models.Logging; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Models.Message.Logging; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Hubs.Abstraction; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Controllers { [Route("[controller]"), Authorize, Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER)] public class LauncherController : Controller { private readonly IDisplayNameService displayNameService; + private readonly ILauncherFileService launcherFileService; private readonly IHubContext launcherHub; private readonly ILauncherService launcherService; - private readonly ILauncherFileService launcherFileService; private readonly ISessionService sessionService; - private readonly IVariablesService variablesService; + private readonly IVariablesDataService variablesDataService; - public LauncherController(IVariablesService variablesService, IHubContext launcherHub, ILauncherService launcherService, ILauncherFileService launcherFileService, ISessionService sessionService, IDisplayNameService displayNameService) { - this.variablesService = variablesService; + public LauncherController(IVariablesDataService variablesDataService, IHubContext launcherHub, ILauncherService launcherService, ILauncherFileService launcherFileService, ISessionService sessionService, IDisplayNameService displayNameService) { + this.variablesDataService = variablesDataService; this.launcherHub = launcherHub; this.launcherService = launcherService; this.launcherFileService = launcherFileService; @@ -37,12 +41,12 @@ public LauncherController(IVariablesService variablesService, IHubContext Ok(); [HttpGet("version")] - public IActionResult GetVersion() => Ok(variablesService.GetSingle("LAUNCHER_VERSION").AsString()); + public IActionResult GetVersion() => Ok(variablesDataService.GetSingle("LAUNCHER_VERSION").AsString()); [HttpPost("version"), Roles(RoleDefinitions.ADMIN)] public async Task UpdateVersion([FromBody] JObject body) { string version = body["version"].ToString(); - await variablesService.Update("LAUNCHER_VERSION", version); + await variablesDataService.Update("LAUNCHER_VERSION", version); await launcherFileService.UpdateAllVersions(); await launcherHub.Clients.All.ReceiveLauncherVersion(version); return Ok(); diff --git a/UKSFWebsite.Api/Controllers/LoaController.cs b/UKSFWebsite.Api/Controllers/LoaController.cs index ce59dfa5..c2aa0a98 100644 --- a/UKSFWebsite.Api/Controllers/LoaController.cs +++ b/UKSFWebsite.Api/Controllers/LoaController.cs @@ -4,12 +4,17 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Models.CommandRequests; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Command; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Command; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] @@ -48,13 +53,13 @@ public IActionResult Get([FromQuery] string scope = "you") { List objectIds; switch (scope) { case "all": - objectIds = accountService.Get(x => x.membershipState == MembershipState.MEMBER).Select(x => x.id).ToList(); + objectIds = accountService.Data().Get(x => x.membershipState == MembershipState.MEMBER).Select(x => x.id).ToList(); break; case "unit": Account account = sessionService.GetContextAccount(); - IEnumerable groups = unitsService.GetAllChildren(unitsService.GetSingle(x => x.name == account.unitAssignment), true); + IEnumerable groups = unitsService.GetAllChildren(unitsService.Data().GetSingle(x => x.name == account.unitAssignment), true); List members = groups.SelectMany(x => x.members.ToList()).ToList(); - objectIds = accountService.Get(x => x.membershipState == MembershipState.MEMBER && members.Contains(x.id)).Select(x => x.id).ToList(); + objectIds = accountService.Data().Get(x => x.membershipState == MembershipState.MEMBER && members.Contains(x.id)).Select(x => x.id).ToList(); break; case "you": objectIds = new List {sessionService.GetContextId()}; @@ -72,7 +77,7 @@ public IActionResult Get([FromQuery] string scope = "you") { x.emergency, x.late, x.reason, - name = displayNameService.GetDisplayName(accountService.GetSingle(x.recipient)), + name = displayNameService.GetDisplayName(accountService.Data().GetSingle(x.recipient)), inChainOfCommand = chainOfCommandService.InContextChainOfCommand(x.recipient), longTerm = (x.end - x.start).Days > 21 } @@ -89,19 +94,19 @@ public IActionResult Get([FromQuery] string scope = "you") { [HttpDelete("{id}"), Authorize] public async Task DeleteLoa(string id) { - Loa loa = loaService.GetSingle(id); - CommandRequest request = commandRequestService.GetSingle(x => x.value == id); + Loa loa = loaService.Data().GetSingle(id); + CommandRequest request = commandRequestService.Data().GetSingle(x => x.value == id); if (request != null) { - await commandRequestService.Delete(request.id); + await commandRequestService.Data().Delete(request.id); foreach (string reviewerId in request.reviews.Keys.Where(x => x != request.requester)) { notificationsService.Add(new Notification {owner = reviewerId, icon = NotificationIcons.REQUEST, message = $"Your review for {request.displayRequester}'s LOA is no longer required as they deleted their LOA", link = "/command/requests"}); } - LogWrapper.AuditLog(sessionService.GetContextId(), $"Loa request deleted for '{displayNameService.GetDisplayName(accountService.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); + LogWrapper.AuditLog(sessionService.GetContextId(), $"Loa request deleted for '{displayNameService.GetDisplayName(accountService.Data().GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); } - LogWrapper.AuditLog(sessionService.GetContextId(), $"Loa deleted for '{displayNameService.GetDisplayName(accountService.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); - await loaService.Delete(loa.id); + LogWrapper.AuditLog(sessionService.GetContextId(), $"Loa deleted for '{displayNameService.GetDisplayName(accountService.Data().GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); + await loaService.Data().Delete(loa.id); return Ok(); } diff --git a/UKSFWebsite.Api/Controllers/LoggingController.cs b/UKSFWebsite.Api/Controllers/LoggingController.cs index 7dda8612..c9c7e539 100644 --- a/UKSFWebsite.Api/Controllers/LoggingController.cs +++ b/UKSFWebsite.Api/Controllers/LoggingController.cs @@ -2,8 +2,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; -using UKSFWebsite.Api.Models.Logging; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Models.Message.Logging; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.ADMIN)] diff --git a/UKSFWebsite.Api/Controllers/LoginController.cs b/UKSFWebsite.Api/Controllers/LoginController.cs index 00a5cba1..655828a4 100644 --- a/UKSFWebsite.Api/Controllers/LoginController.cs +++ b/UKSFWebsite.Api/Controllers/LoginController.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Services; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers { [Route("[controller]")] diff --git a/UKSFWebsite.Api/Controllers/News/NewsController.cs b/UKSFWebsite.Api/Controllers/News/NewsController.cs index 702854eb..de145afe 100644 --- a/UKSFWebsite.Api/Controllers/News/NewsController.cs +++ b/UKSFWebsite.Api/Controllers/News/NewsController.cs @@ -18,17 +18,8 @@ public async Task Get() { foreach (JToken jToken in json) { JObject message = (JObject) jToken; if (message.GetValue("content").ToString().StartsWith("@everyone")) { - string user = await (await client.GetAsync($"https://discordapp.com/api/v6/guilds/311543678126653451/members/{(message.GetValue("author") as JObject)?.GetValue("id")}")) - .Content.ReadAsStringAsync(); - output.Add( - JObject.FromObject( - new { - message = CleanNewsMessage(message.GetValue("content").ToString().Replace("@everyone", "")), - author = JObject.Parse(user).GetValue("nick"), - timestamp = message.GetValue("timestamp") - } - ) - ); + string user = await (await client.GetAsync($"https://discordapp.com/api/v6/guilds/311543678126653451/members/{(message.GetValue("author") as JObject)?.GetValue("id")}")).Content.ReadAsStringAsync(); + output.Add(JObject.FromObject(new {message = CleanNewsMessage(message.GetValue("content").ToString().Replace("@everyone", "")), author = JObject.Parse(user).GetValue("nick"), timestamp = message.GetValue("timestamp")})); } } } diff --git a/UKSFWebsite.Api/Controllers/NotificationsController.cs b/UKSFWebsite.Api/Controllers/NotificationsController.cs index c1d25eae..28b728f7 100644 --- a/UKSFWebsite.Api/Controllers/NotificationsController.cs +++ b/UKSFWebsite.Api/Controllers/NotificationsController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Message; namespace UKSFWebsite.Api.Controllers { [Route("[controller]")] diff --git a/UKSFWebsite.Api/Controllers/RanksController.cs b/UKSFWebsite.Api/Controllers/RanksController.cs index 159ec926..ad40987f 100644 --- a/UKSFWebsite.Api/Controllers/RanksController.cs +++ b/UKSFWebsite.Api/Controllers/RanksController.cs @@ -3,20 +3,22 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers { [Route("[controller]")] public class RanksController : Controller { private readonly IAccountService accountService; private readonly IAssignmentService assignmentService; + private readonly INotificationsService notificationsService; private readonly IRanksService ranksService; private readonly ISessionService sessionService; - private readonly INotificationsService notificationsService; public RanksController(IRanksService ranksService, IAccountService accountService, IAssignmentService assignmentService, ISessionService sessionService, INotificationsService notificationsService) { this.ranksService = ranksService; @@ -27,67 +29,72 @@ public RanksController(IRanksService ranksService, IAccountService accountServic } [HttpGet, Authorize] - public IActionResult GetRanks() => Ok(ranksService.Get()); + public IActionResult GetRanks() => Ok(ranksService.Data().Get()); [HttpGet("{id}"), Authorize] public IActionResult GetRanks(string id) { - Account account = accountService.GetSingle(id); - return Ok(ranksService.Get(x => x.name != account.rank)); + Account account = accountService.Data().GetSingle(id); + return Ok(ranksService.Data().Get(x => x.name != account.rank)); } [HttpPost("{check}"), Authorize] public IActionResult CheckRank(string check, [FromBody] Rank rank = null) { if (string.IsNullOrEmpty(check)) return Ok(); - return Ok(rank != null ? ranksService.GetSingle(x => x.id != rank.id && (x.name == check || x.teamspeakGroup == check)) : ranksService.GetSingle(x => x.name == check || x.teamspeakGroup == check)); + if (rank != null) { + Rank safeRank = rank; + return Ok(ranksService.Data().GetSingle(x => x.id != safeRank.id && (x.name == check || x.teamspeakGroup == check))); + } + + return Ok(ranksService.Data().GetSingle(x => x.name == check || x.teamspeakGroup == check)); } [HttpPost, Authorize] public IActionResult CheckRank([FromBody] Rank rank) { - return rank != null ? (IActionResult) Ok(ranksService.GetSingle(x => x.id != rank.id && (x.name == rank.name || x.teamspeakGroup == rank.teamspeakGroup))) : Ok(); + return rank != null ? (IActionResult) Ok(ranksService.Data().GetSingle(x => x.id != rank.id && (x.name == rank.name || x.teamspeakGroup == rank.teamspeakGroup))) : Ok(); } [HttpPut, Authorize] public async Task AddRank([FromBody] Rank rank) { - await ranksService.Add(rank); + await ranksService.Data().Add(rank); LogWrapper.AuditLog(sessionService.GetContextId(), $"Rank added '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}'"); return Ok(); } [HttpPatch, Authorize] public async Task EditRank([FromBody] Rank rank) { - Rank oldRank = ranksService.GetSingle(x => x.id == rank.id); + Rank oldRank = ranksService.Data().GetSingle(x => x.id == rank.id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Rank updated from '{oldRank.name}, {oldRank.abbreviation}, {oldRank.teamspeakGroup}, {oldRank.discordRoleId}' to '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}, {rank.discordRoleId}'"); - await ranksService.Update(rank.id, Builders.Update.Set("name", rank.name).Set("abbreviation", rank.abbreviation).Set("teamspeakGroup", rank.teamspeakGroup).Set("discordRoleId", rank.discordRoleId)); - foreach (Account account in accountService.Get(x => x.rank == oldRank.name)) { - await accountService.Update(account.id, "rank", rank.name); + await ranksService.Data().Update(rank.id, Builders.Update.Set("name", rank.name).Set("abbreviation", rank.abbreviation).Set("teamspeakGroup", rank.teamspeakGroup).Set("discordRoleId", rank.discordRoleId)); + foreach (Account account in accountService.Data().Get(x => x.rank == oldRank.name)) { + await accountService.Data().Update(account.id, "rank", rank.name); } - return Ok(ranksService.Get()); + return Ok(ranksService.Data().Get()); } [HttpDelete("{id}"), Authorize] public async Task DeleteRank(string id) { - Rank rank = ranksService.GetSingle(x => x.id == id); + Rank rank = ranksService.Data().GetSingle(x => x.id == id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Rank deleted '{rank.name}'"); - await ranksService.Delete(id); - foreach (Account account in accountService.Get(x => x.rank == rank.name)) { + await ranksService.Data().Delete(id); + foreach (Account account in accountService.Data().Get(x => x.rank == rank.name)) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, rankString: AssignmentService.REMOVE_FLAG, reason: $"the '{rank.name}' rank was deleted"); notificationsService.Add(notification); } - return Ok(ranksService.Get()); + return Ok(ranksService.Data().Get()); } [HttpPost("order"), Authorize] public async Task UpdateOrder([FromBody] List newRankOrder) { for (int index = 0; index < newRankOrder.Count; index++) { Rank rank = newRankOrder[index]; - if (ranksService.GetSingle(rank.name).order != index) { - await ranksService.Update(rank.id, "order", index); + if (ranksService.Data().GetSingle(rank.name).order != index) { + await ranksService.Data().Update(rank.id, "order", index); } } - return Ok(ranksService.Get()); + return Ok(ranksService.Data().Get()); } } } diff --git a/UKSFWebsite.Api/Controllers/RecruitmentController.cs b/UKSFWebsite.Api/Controllers/RecruitmentController.cs index 850c3a4b..9378dd1d 100644 --- a/UKSFWebsite.Api/Controllers/RecruitmentController.cs +++ b/UKSFWebsite.Api/Controllers/RecruitmentController.cs @@ -6,12 +6,13 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers { [Route("[controller]")] @@ -37,7 +38,7 @@ public RecruitmentController(IAccountService accountService, IRecruitmentService [HttpGet("{id}"), Authorize] public IActionResult GetSingle(string id) { - Account account = accountService.GetSingle(id); + Account account = accountService.Data().GetSingle(id); return Ok(recruitmentService.GetApplication(account)); } @@ -49,7 +50,7 @@ public IActionResult GetRecruitmentStats() { string account = sessionService.GetContextId(); List activity = new List(); foreach (Account recruiterAccount in recruitmentService.GetSr1Members()) { - List recruiterApplications = accountService.Get(x => x.application != null && x.application.recruiter == recruiterAccount.id); + List recruiterApplications = accountService.Data().Get(x => x.application != null && x.application.recruiter == recruiterAccount.id); activity.Add( new { account = new {recruiterAccount.id, recruiterAccount.settings}, @@ -67,23 +68,23 @@ public IActionResult GetRecruitmentStats() { [HttpPost("{id}"), Authorize, Roles(RoleDefinitions.SR1)] public async Task UpdateState([FromBody] dynamic body, string id) { ApplicationState updatedState = body.updatedState; - Account account = accountService.GetSingle(id); + Account account = accountService.Data().GetSingle(id); if (updatedState == account.application.state) return Ok(); string sessionId = sessionService.GetContextId(); - await accountService.Update(id, Builders.Update.Set(x => x.application.state, updatedState)); + await accountService.Data().Update(id, Builders.Update.Set(x => x.application.state, updatedState)); LogWrapper.AuditLog(sessionId, $"Application state changed for {id} from {account.application.state} to {updatedState}"); switch (updatedState) { case ApplicationState.ACCEPTED: { - await accountService.Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now)); - await accountService.Update(id, "membershipState", MembershipState.MEMBER); + await accountService.Data().Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now)); + await accountService.Data().Update(id, "membershipState", MembershipState.MEMBER); Notification notification = await assignmentService.UpdateUnitRankAndRole(id, "Basic Training Unit", "Trainee", "Recruit", reason: "your application was accepted"); notificationsService.Add(notification); break; } case ApplicationState.REJECTED: { - await accountService.Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now)); - await accountService.Update(id, "membershipState", MembershipState.CONFIRMED); + await accountService.Data().Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now)); + await accountService.Data().Update(id, "membershipState", MembershipState.CONFIRMED); Notification notification = await assignmentService.UpdateUnitRankAndRole( id, AssignmentService.REMOVE_FLAG, @@ -96,15 +97,15 @@ public async Task UpdateState([FromBody] dynamic body, string id) break; } case ApplicationState.WAITING: { - await accountService.Update(id, Builders.Update.Set(x => x.application.dateCreated, DateTime.Now)); - await accountService.Update(id, Builders.Update.Unset(x => x.application.dateAccepted)); - await accountService.Update(id, "membershipState", MembershipState.CONFIRMED); + await accountService.Data().Update(id, Builders.Update.Set(x => x.application.dateCreated, DateTime.Now)); + await accountService.Data().Update(id, Builders.Update.Unset(x => x.application.dateAccepted)); + await accountService.Data().Update(id, "membershipState", MembershipState.CONFIRMED); Notification notification = await assignmentService.UpdateUnitRankAndRole(id, AssignmentService.REMOVE_FLAG, "Applicant", "Candidate", reason: "your application was reactivated"); notificationsService.Add(notification); if (recruitmentService.GetSr1Members().All(x => x.id != account.application.recruiter)) { string newRecruiterId = recruitmentService.GetRecruiter(); LogWrapper.AuditLog(sessionId, $"Application recruiter for {id} is no longer SR1, reassigning from {account.application.recruiter} to {newRecruiterId}"); - await accountService.Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiterId)); + await accountService.Data().Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiterId)); } break; @@ -112,7 +113,7 @@ public async Task UpdateState([FromBody] dynamic body, string id) default: throw new ArgumentOutOfRangeException(); } - account = accountService.GetSingle(id); + account = accountService.Data().GetSingle(id); string message = updatedState == ApplicationState.WAITING ? "was reactivated" : $"was {updatedState}"; if (sessionId != account.application.recruiter) { notificationsService.Add( @@ -132,17 +133,18 @@ public async Task PostReassignment([FromBody] JObject newRecruite if (!sessionService.ContextHasRole(RoleDefinitions.ADMIN) && !recruitmentService.IsAccountSr1Lead()) throw new Exception($"attempted to assign recruiter to {newRecruiter}. Context is not recruitment lead."); string recruiter = newRecruiter["newRecruiter"].ToString(); await recruitmentService.SetRecruiter(id, recruiter); - Account account = accountService.GetSingle(id); + Account account = accountService.Data().GetSingle(id); if (account.application.state == ApplicationState.WAITING) { notificationsService.Add(new Notification {owner = recruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application has been transferred to you", link = $"/recruitment/{account.id}"}); } + LogWrapper.AuditLog(sessionService.GetContextId(), $"Application recruiter changed for {id} to {newRecruiter["newRecruiter"]}"); return Ok(); } [HttpPost("ratings/{id}"), Authorize, Roles(RoleDefinitions.SR1)] public async Task> Ratings([FromBody] KeyValuePair value, string id) { - Dictionary ratings = accountService.GetSingle(id).application.ratings; + Dictionary ratings = accountService.Data().GetSingle(id).application.ratings; (string key, uint rating) = value; if (ratings.ContainsKey(key)) { @@ -151,7 +153,7 @@ public async Task> Ratings([FromBody] KeyValuePair.Update.Set(x => x.application.ratings, ratings)); + await accountService.Data().Update(id, Builders.Update.Set(x => x.application.ratings, ratings)); return ratings; } diff --git a/UKSFWebsite.Api/Controllers/RolesController.cs b/UKSFWebsite.Api/Controllers/RolesController.cs index 3fb37b45..bf869a7c 100644 --- a/UKSFWebsite.Api/Controllers/RolesController.cs +++ b/UKSFWebsite.Api/Controllers/RolesController.cs @@ -3,21 +3,25 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers { [Route("[controller]")] public class RolesController : Controller { private readonly IAccountService accountService; private readonly IAssignmentService assignmentService; + private readonly INotificationsService notificationsService; private readonly IRolesService rolesService; private readonly ISessionService sessionService; private readonly IUnitsService unitsService; - private readonly INotificationsService notificationsService; public RolesController(IRolesService rolesService, IAccountService accountService, IAssignmentService assignmentService, ISessionService sessionService, IUnitsService unitsService, INotificationsService notificationsService) { this.rolesService = rolesService; @@ -31,70 +35,76 @@ public RolesController(IRolesService rolesService, IAccountService accountServic [HttpGet, Authorize] public IActionResult GetRoles([FromQuery] string id = "", [FromQuery] string unitId = "") { if (!string.IsNullOrEmpty(id) && !string.IsNullOrEmpty(unitId)) { - Unit unit = unitsService.GetSingle(unitId); - IOrderedEnumerable unitRoles = rolesService.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order); + Unit unit = unitsService.Data().GetSingle(unitId); + IOrderedEnumerable unitRoles = rolesService.Data().Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order); IEnumerable> existingPairs = unit.roles.Where(x => x.Value == id); IEnumerable filteredRoles = unitRoles.Where(x => existingPairs.All(y => y.Key != x.name)); return Ok(filteredRoles); } if (!string.IsNullOrEmpty(id)) { - Account account = accountService.GetSingle(id); - return Ok(rolesService.Get(x => x.roleType == RoleType.INDIVIDUAL && x.name != account.roleAssignment).OrderBy(x => x.order)); + Account account = accountService.Data().GetSingle(id); + return Ok(rolesService.Data().Get(x => x.roleType == RoleType.INDIVIDUAL && x.name != account.roleAssignment).OrderBy(x => x.order)); } - return Ok(new {individualRoles = rolesService.Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); + + return Ok(new {individualRoles = rolesService.Data().Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data().Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); } [HttpPost("{roleType}/{check}"), Authorize] public IActionResult CheckRole(RoleType roleType, string check, [FromBody] Role role = null) { if (string.IsNullOrEmpty(check)) return Ok(); - return Ok(role != null ? rolesService.GetSingle(x => x.id != role.id && x.roleType == roleType && x.name == check) : rolesService.GetSingle(x => x.roleType == roleType && x.name == check)); + if (role != null) { + Role safeRole = role; + return Ok(rolesService.Data().GetSingle(x => x.id != safeRole.id && x.roleType == roleType && x.name == check)); + } + + return Ok(rolesService.Data().GetSingle(x => x.roleType == roleType && x.name == check)); } [HttpPut, Authorize] public async Task AddRole([FromBody] Role role) { - await rolesService.Add(role); + await rolesService.Data().Add(role); LogWrapper.AuditLog(sessionService.GetContextId(), $"Role added '{role.name}'"); - return Ok(new {individualRoles = rolesService.Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); + return Ok(new {individualRoles = rolesService.Data().Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data().Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); } [HttpPatch, Authorize] public async Task EditRole([FromBody] Role role) { - Role oldRole = rolesService.GetSingle(x => x.id == role.id); + Role oldRole = rolesService.Data().GetSingle(x => x.id == role.id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Role updated from '{oldRole.name}' to '{role.name}'"); - await rolesService.Update(role.id, "name", role.name); - foreach (Account account in accountService.Get(x => x.roleAssignment == oldRole.name)) { - await accountService.Update(account.id, "roleAssignment", role.name); + await rolesService.Data().Update(role.id, "name", role.name); + foreach (Account account in accountService.Data().Get(x => x.roleAssignment == oldRole.name)) { + await accountService.Data().Update(account.id, "roleAssignment", role.name); } - + await unitsService.RenameRole(oldRole.name, role.name); - return Ok(new {individualRoles = rolesService.Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); + return Ok(new {individualRoles = rolesService.Data().Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data().Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); } [HttpDelete("{id}"), Authorize] public async Task DeleteRole(string id) { - Role role = rolesService.GetSingle(x => x.id == id); + Role role = rolesService.Data().GetSingle(x => x.id == id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Role deleted '{role.name}'"); - await rolesService.Delete(id); - foreach (Account account in accountService.Get(x => x.roleAssignment == role.name)) { + await rolesService.Data().Delete(id); + foreach (Account account in accountService.Data().Get(x => x.roleAssignment == role.name)) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, role: AssignmentService.REMOVE_FLAG, reason: $"the '{role.name}' role was deleted"); notificationsService.Add(notification); } await unitsService.DeleteRole(role.name); - return Ok(new {individualRoles = rolesService.Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); + return Ok(new {individualRoles = rolesService.Data().Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data().Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); } [HttpPost("order"), Authorize] public async Task UpdateOrder([FromBody] List newRoleOrder) { for (int index = 0; index < newRoleOrder.Count; index++) { Role role = newRoleOrder[index]; - if (rolesService.GetSingle(role.name).order != index) { - await rolesService.Update(role.id, "order", index); + if (rolesService.Data().GetSingle(role.name).order != index) { + await rolesService.Data().Update(role.id, "order", index); } } - return Ok(rolesService.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)); + return Ok(rolesService.Data().Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)); } } } diff --git a/UKSFWebsite.Api/Controllers/TeamspeakController.cs b/UKSFWebsite.Api/Controllers/TeamspeakController.cs index 89b8b0e6..5d4649aa 100644 --- a/UKSFWebsite.Api/Controllers/TeamspeakController.cs +++ b/UKSFWebsite.Api/Controllers/TeamspeakController.cs @@ -2,8 +2,8 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers { [Route("[controller]")] @@ -15,9 +15,9 @@ public class TeamspeakController : Controller { [HttpGet("online"), Authorize, Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER, RoleDefinitions.DISCHARGED)] public IActionResult GetOnlineClients() { object clients = teamspeakService.GetFormattedClients(); - return clients == null ? Ok(new {}) : Ok(new {clients}); + return clients == null ? Ok(new { }) : Ok(new {clients}); } - + [HttpGet("shutdown"), Authorize, Roles(RoleDefinitions.ADMIN)] public async Task Shutdown() { teamspeakService.Shutdown(); diff --git a/UKSFWebsite.Api/Controllers/UnitsController.cs b/UKSFWebsite.Api/Controllers/UnitsController.cs index f8d3c171..a470d022 100644 --- a/UKSFWebsite.Api/Controllers/UnitsController.cs +++ b/UKSFWebsite.Api/Controllers/UnitsController.cs @@ -7,10 +7,15 @@ using MongoDB.Driver; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Models.Accounts; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; +using UKSFWebsite.Api.Services.Message; namespace UKSFWebsite.Api.Controllers { [Route("[controller]")] @@ -67,14 +72,14 @@ public IActionResult GetAccountUnits(string id, [FromQuery] string filter = "") [HttpGet("tree"), Authorize] public IActionResult GetTree() { - Unit combatRoot = unitsService.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); - Unit auxiliaryRoot = unitsService.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); + Unit combatRoot = unitsService.Data().GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); + Unit auxiliaryRoot = unitsService.Data().GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); return Ok(new {combatUnits = new[] {new {combatRoot.id, combatRoot.name, children = GetTreeChildren(combatRoot), unit = combatRoot}}, auxiliaryUnits = new[] {new {auxiliaryRoot.id, auxiliaryRoot.name, children = GetTreeChildren(auxiliaryRoot), unit = auxiliaryRoot}}}); } private List GetTreeChildren(Unit parent) { List children = new List(); - foreach (Unit unit in unitsService.Get(x => x.parent == parent.id).OrderBy(x => x.order)) { + foreach (Unit unit in unitsService.Data().Get(x => x.parent == parent.id).OrderBy(x => x.order)) { children.Add(new {unit.id, unit.name, children = GetTreeChildren(unit), unit}); } @@ -84,21 +89,22 @@ private List GetTreeChildren(Unit parent) { [HttpPost("{check}"), Authorize] public IActionResult CheckUnit(string check, [FromBody] Unit unit = null) { if (string.IsNullOrEmpty(check)) return Ok(); - return Ok( - unit != null - ? unitsService.GetSingle(x => x.id != unit.id && (x.name == check || x.shortname == check || x.teamspeakGroup == check || x.discordRoleId == check || x.callsign == check)) - : unitsService.GetSingle(x => x.name == check || x.shortname == check || x.teamspeakGroup == check || x.discordRoleId == check || x.callsign == check) - ); + if (unit != null) { + Unit safeUnit = unit; + return Ok(unitsService.Data().GetSingle(x => x.id != safeUnit.id && (x.name == check || x.shortname == check || x.teamspeakGroup == check || x.discordRoleId == check || x.callsign == check))); + } + + return Ok(unitsService.Data().GetSingle(x => x.name == check || x.shortname == check || x.teamspeakGroup == check || x.discordRoleId == check || x.callsign == check)); } [HttpPost, Authorize] public IActionResult CheckUnit([FromBody] Unit unit) { - return unit != null ? (IActionResult) Ok(unitsService.GetSingle(x => x.id != unit.id && (x.name == unit.name || x.shortname == unit.shortname || x.teamspeakGroup == unit.teamspeakGroup || x.discordRoleId == unit.discordRoleId || x.callsign == unit.callsign))) : Ok(); + return unit != null ? (IActionResult) Ok(unitsService.Data().GetSingle(x => x.id != unit.id && (x.name == unit.name || x.shortname == unit.shortname || x.teamspeakGroup == unit.teamspeakGroup || x.discordRoleId == unit.discordRoleId || x.callsign == unit.callsign))) : Ok(); } [HttpPut, Authorize] public async Task AddUnit([FromBody] Unit unit) { - await unitsService.Add(unit); + await unitsService.Data().Add(unit); LogWrapper.AuditLog(sessionService.GetContextId(), $"New unit added '{unit.name}, {unit.shortname}, {unit.type}, {unit.branch}, {unit.teamspeakGroup}, {unit.discordRoleId}, {unit.callsign}'"); return Ok(); } @@ -106,39 +112,40 @@ public async Task AddUnit([FromBody] Unit unit) { [HttpPatch, Authorize] public async Task EditUnit([FromBody] Unit unit) { Unit localUnit = unit; - Unit oldUnit = unitsService.GetSingle(x => x.id == localUnit.id); + Unit oldUnit = unitsService.Data().GetSingle(x => x.id == localUnit.id); LogWrapper.AuditLog( sessionService.GetContextId(), $"Unit updated from '{oldUnit.name}, {oldUnit.shortname}, {oldUnit.type}, {oldUnit.parent}, {oldUnit.branch}, {oldUnit.teamspeakGroup}, {oldUnit.discordRoleId}, {oldUnit.callsign}, {oldUnit.icon}' to '{unit.name}, {unit.shortname}, {unit.type}, {unit.parent}, {unit.branch}, {unit.teamspeakGroup}, {unit.discordRoleId}, {unit.callsign}, {unit.icon}'" ); - await unitsService.Update( - unit.id, - Builders.Update.Set("name", unit.name) - .Set("shortname", unit.shortname) - .Set("type", unit.type) - .Set("parent", unit.parent) - .Set("branch", unit.branch) - .Set("teamspeakGroup", unit.teamspeakGroup) - .Set("discordRoleId", unit.discordRoleId) - .Set("callsign", unit.callsign) - .Set("icon", unit.icon) - ); - unit = unitsService.GetSingle(unit.id); + await unitsService.Data() + .Update( + unit.id, + Builders.Update.Set("name", unit.name) + .Set("shortname", unit.shortname) + .Set("type", unit.type) + .Set("parent", unit.parent) + .Set("branch", unit.branch) + .Set("teamspeakGroup", unit.teamspeakGroup) + .Set("discordRoleId", unit.discordRoleId) + .Set("callsign", unit.callsign) + .Set("icon", unit.icon) + ); + unit = unitsService.Data().GetSingle(unit.id); if (unit.name != oldUnit.name) { - foreach (Account account in accountService.Get(x => x.unitAssignment == oldUnit.name)) { - await accountService.Update(account.id, "unitAssignment", unit.name); - teamspeakService.UpdateAccountTeamspeakGroups(accountService.GetSingle(account.id)); + foreach (Account account in accountService.Data().Get(x => x.unitAssignment == oldUnit.name)) { + await accountService.Data().Update(account.id, "unitAssignment", unit.name); + teamspeakService.UpdateAccountTeamspeakGroups(accountService.Data().GetSingle(account.id)); } } if (unit.teamspeakGroup != oldUnit.teamspeakGroup) { - foreach (Account account in unit.members.Select(x => accountService.GetSingle(x))) { + foreach (Account account in unit.members.Select(x => accountService.Data().GetSingle(x))) { teamspeakService.UpdateAccountTeamspeakGroups(account); } } if (unit.discordRoleId != oldUnit.discordRoleId) { - foreach (Account account in unit.members.Select(x => accountService.GetSingle(x))) { + foreach (Account account in unit.members.Select(x => accountService.Data().GetSingle(x))) { await discordService.UpdateAccount(account); } } @@ -149,14 +156,14 @@ await unitsService.Update( [HttpDelete("{id}"), Authorize] public async Task DeleteUnit(string id) { - Unit unit = unitsService.GetSingle(id); + Unit unit = unitsService.Data().GetSingle(id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Unit deleted '{unit.name}'"); - foreach (Account account in accountService.Get(x => x.unitAssignment == unit.name)) { + foreach (Account account in accountService.Data().Get(x => x.unitAssignment == unit.name)) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, "Reserves", reason: $"{unit.name} was deleted"); notificationsService.Add(notification); } - await unitsService.Delete(id); + await unitsService.Data().Delete(id); serverService.UpdateSquadXml(); return Ok(); } @@ -167,22 +174,22 @@ public async Task UpdateParent([FromBody] JObject data) { Unit parentUnit = JsonConvert.DeserializeObject(data["parentUnit"].ToString()); int index = JsonConvert.DeserializeObject(data["index"].ToString()); if (unit.parent == parentUnit.id) return Ok(); - await unitsService.Update(unit.id, "parent", parentUnit.id); + await unitsService.Data().Update(unit.id, "parent", parentUnit.id); if (unit.branch != parentUnit.branch) { - await unitsService.Update(unit.id, "branch", parentUnit.branch); + await unitsService.Data().Update(unit.id, "branch", parentUnit.branch); } - List parentChildren = unitsService.Get(x => x.parent == parentUnit.id).ToList(); + List parentChildren = unitsService.Data().Get(x => x.parent == parentUnit.id).ToList(); parentChildren.Remove(parentChildren.FirstOrDefault(x => x.id == unit.id)); parentChildren.Insert(index, unit); foreach (Unit child in parentChildren) { - await unitsService.Update(child.id, "order", parentChildren.IndexOf(child)); + await unitsService.Data().Update(child.id, "order", parentChildren.IndexOf(child)); } - unit = unitsService.GetSingle(unit.id); + unit = unitsService.Data().GetSingle(unit.id); foreach (Unit child in unitsService.GetAllChildren(unit, true)) { - foreach (Account account in child.members.Select(x => accountService.GetSingle(x))) { + foreach (Account account in child.members.Select(x => accountService.Data().GetSingle(x))) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, unit.name, reason: $"the hierarchy chain for {unit.name} was updated"); notificationsService.Add(notification); } @@ -195,12 +202,12 @@ public async Task UpdateParent([FromBody] JObject data) { public IActionResult UpdateSortOrder([FromBody] JObject data) { Unit unit = JsonConvert.DeserializeObject(data["unit"].ToString()); int index = JsonConvert.DeserializeObject(data["index"].ToString()); - Unit parentUnit = unitsService.GetSingle(x => x.id == unit.parent); - List parentChildren = unitsService.Get(x => x.parent == parentUnit.id).ToList(); + Unit parentUnit = unitsService.Data().GetSingle(x => x.id == unit.parent); + List parentChildren = unitsService.Data().Get(x => x.parent == parentUnit.id).ToList(); parentChildren.Remove(parentChildren.FirstOrDefault(x => x.id == unit.id)); parentChildren.Insert(index, unit); foreach (Unit child in parentChildren) { - unitsService.Update(child.id, "order", parentChildren.IndexOf(child)); + unitsService.Data().Update(child.id, "order", parentChildren.IndexOf(child)); } return Ok(); @@ -210,10 +217,10 @@ public IActionResult UpdateSortOrder([FromBody] JObject data) { public IActionResult Get([FromQuery] string typeFilter) { switch (typeFilter) { case "regiments": - string combatRootId = unitsService.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT).id; - return Ok(unitsService.Get(x => x.parent == combatRootId || x.id == combatRootId).ToList().Select(x => new {x.name, x.shortname, id = x.id.ToString(), x.icon})); + string combatRootId = unitsService.Data().GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT).id; + return Ok(unitsService.Data().Get(x => x.parent == combatRootId || x.id == combatRootId).ToList().Select(x => new {x.name, x.shortname, id = x.id.ToString(), x.icon})); case "orgchart": - Unit combatRoot = unitsService.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); + Unit combatRoot = unitsService.Data().GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); return Ok( new[] { new { @@ -228,7 +235,7 @@ public IActionResult Get([FromQuery] string typeFilter) { } ); case "orgchartaux": - Unit auziliaryRoot = unitsService.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); + Unit auziliaryRoot = unitsService.Data().GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); return Ok( new[] { new { @@ -242,13 +249,13 @@ public IActionResult Get([FromQuery] string typeFilter) { } } ); - default: return Ok(unitsService.Get().Select(x => new {viewValue = x.name, value = x.id.ToString()})); + default: return Ok(unitsService.Data().Get().Select(x => new {viewValue = x.name, value = x.id.ToString()})); } } [HttpGet("info/{id}"), Authorize] public IActionResult GetInfo(string id) { - Unit unit = unitsService.GetSingle(id); + Unit unit = unitsService.Data().GetSingle(id); IEnumerable parents = unitsService.GetParents(unit).ToList(); Unit regiment = parents.Skip(1).FirstOrDefault(x => x.type == UnitType.REGIMENT); return Ok( @@ -257,9 +264,9 @@ public IActionResult GetInfo(string id) { unit.parent, type = unit.type.ToString(), displayName = unit.name, -// oic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(0).name) ? "" : displayNameService.GetDisplayName(accountService.GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(0).name])), -// xic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(1).name) ? "" : displayNameService.GetDisplayName(accountService.GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(1).name])), -// ncoic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(2).name) ? "" : displayNameService.GetDisplayName(accountService.GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(2).name])), +// oic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(0).name) ? "" : displayNameService.GetDisplayName(accountService.Data().GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(0).name])), +// xic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(1).name) ? "" : displayNameService.GetDisplayName(accountService.Data().GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(1).name])), +// ncoic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(2).name) ? "" : displayNameService.GetDisplayName(accountService.Data().GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(2).name])), code = unitsService.GetChainString(unit), parentDisplay = parents.Skip(1).FirstOrDefault()?.name, regimentDisplay = regiment?.name, @@ -270,20 +277,20 @@ public IActionResult GetInfo(string id) { // coverageLOA = "80%", // casualtyRate = "10010 instances (70% rate)", // fatalityRate = "200 instances (20% rate)", - memberCollection = unit.members.Select(x => accountService.GetSingle(x)).Select(x => new {name = displayNameService.GetDisplayName(x), role = x.roleAssignment}) + memberCollection = unit.members.Select(x => accountService.Data().GetSingle(x)).Select(x => new {name = displayNameService.GetDisplayName(x), role = x.roleAssignment}) } ); } [HttpGet("members/{id}"), Authorize] public IActionResult GetMembers(string id) { - Unit unit = unitsService.GetSingle(id); - return Ok(unit.members.Select(x => accountService.GetSingle(x)).Select(x => new {name = displayNameService.GetDisplayName(x), role = x.roleAssignment})); + Unit unit = unitsService.Data().GetSingle(id); + return Ok(unit.members.Select(x => accountService.Data().GetSingle(x)).Select(x => new {name = displayNameService.GetDisplayName(x), role = x.roleAssignment})); } private object[] GetChartChildren(string parent) { List units = new List(); - foreach (Unit unit in unitsService.Get(x => x.parent == parent)) { + foreach (Unit unit in unitsService.Data().Get(x => x.parent == parent)) { units.Add( new { unit.id, @@ -309,7 +316,7 @@ private string GetRole(Unit unit, string accountId) => private IEnumerable SortMembers(IEnumerable members, Unit unit) { var accounts = members.Select( x => { - Account account = accountService.GetSingle(x); + Account account = accountService.Data().GetSingle(x); return new {account, rankIndex = ranksService.GetRankIndex(account.rank), roleIndex = unitsService.GetMemberRoleOrder(account, unit)}; } ) diff --git a/UKSFWebsite.Api/Controllers/VariablesController.cs b/UKSFWebsite.Api/Controllers/VariablesController.cs index 1ec9394c..73c1b695 100644 --- a/UKSFWebsite.Api/Controllers/VariablesController.cs +++ b/UKSFWebsite.Api/Controllers/VariablesController.cs @@ -1,60 +1,68 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Models; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Utility; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.ADMIN)] public class VariablesController : Controller { private readonly ISessionService sessionService; - private readonly IVariablesService variablesService; + private readonly IVariablesDataService variablesDataService; - public VariablesController(IVariablesService variablesService, ISessionService sessionService) { - this.variablesService = variablesService; + public VariablesController(IVariablesDataService variablesDataService, ISessionService sessionService) { + this.variablesDataService = variablesDataService; this.sessionService = sessionService; } [HttpGet, Authorize] - public IActionResult GetAll() => Ok(variablesService.Get()); + public IActionResult GetAll() => Ok(variablesDataService.Get()); [HttpGet("{key}"), Authorize] - public IActionResult GetVariableItems(string key) => Ok(variablesService.GetSingle(key)); + public IActionResult GetVariableItems(string key) => Ok(variablesDataService.GetSingle(key)); [HttpPost("{key}"), Authorize] public IActionResult CheckVariableItem(string key, [FromBody] VariableItem variableItem = null) { if (string.IsNullOrEmpty(key)) return Ok(); - return Ok(variableItem != null ? variablesService.GetSingle(x => x.id != variableItem.id && x.key == key.Keyify()) : variablesService.GetSingle(x => x.key == key.Keyify())); + if (variableItem != null) { + VariableItem safeVariableItem = variableItem; + return Ok(variablesDataService.GetSingle(x => x.id != safeVariableItem.id && x.key == key.Keyify())); + } + + return Ok(variablesDataService.GetSingle(x => x.key == key.Keyify())); } [HttpPost, Authorize] public IActionResult CheckVariableItem([FromBody] VariableItem variableItem) { - return variableItem != null ? (IActionResult) Ok(variablesService.GetSingle(x => x.id != variableItem.id && x.key == variableItem.key.Keyify())) : Ok(); + return variableItem != null ? (IActionResult) Ok(variablesDataService.GetSingle(x => x.id != variableItem.id && x.key == variableItem.key.Keyify())) : Ok(); } [HttpPut, Authorize] public async Task AddVariableItem([FromBody] VariableItem variableItem) { variableItem.key = variableItem.key.Keyify(); - await variablesService.Add(variableItem); + await variablesDataService.Add(variableItem); LogWrapper.AuditLog(sessionService.GetContextId(), $"VariableItem added '{variableItem.key}, {variableItem.item}'"); return Ok(); } [HttpPatch, Authorize] public async Task EditVariableItem([FromBody] VariableItem variableItem) { - VariableItem oldVariableItem = variablesService.GetSingle(variableItem.key); + VariableItem oldVariableItem = variablesDataService.GetSingle(variableItem.key); LogWrapper.AuditLog(sessionService.GetContextId(), $"VariableItem '{oldVariableItem.key}' updated from '{oldVariableItem.item}' to '{variableItem.item}'"); - await variablesService.Update(variableItem.key, variableItem.item); - return Ok(variablesService.Get()); + await variablesDataService.Update(variableItem.key, variableItem.item); + return Ok(variablesDataService.Get()); } [HttpDelete("{key}"), Authorize] public async Task DeleteVariableItem(string key) { - VariableItem variableItem = variablesService.GetSingle(key); + VariableItem variableItem = variablesDataService.GetSingle(key); LogWrapper.AuditLog(sessionService.GetContextId(), $"VariableItem deleted '{variableItem.key}, {variableItem.item}'"); - await variablesService.Delete(key); - return Ok(variablesService.Get()); + await variablesDataService.Delete(key); + return Ok(variablesDataService.Get()); } } } diff --git a/UKSFWebsite.Api/Controllers/VersionController.cs b/UKSFWebsite.Api/Controllers/VersionController.cs index 3f8a66b1..71048635 100644 --- a/UKSFWebsite.Api/Controllers/VersionController.cs +++ b/UKSFWebsite.Api/Controllers/VersionController.cs @@ -3,29 +3,29 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Hubs.Abstraction; +using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Controllers { [Route("[controller]")] public class VersionController : Controller { - private readonly IVariablesService variablesService; private readonly IHubContext utilityHub; + private readonly IVariablesDataService variablesDataService; - public VersionController(IVariablesService variablesService, IHubContext utilityHub) { - this.variablesService = variablesService; + public VersionController(IVariablesDataService variablesDataService, IHubContext utilityHub) { + this.variablesDataService = variablesDataService; this.utilityHub = utilityHub; } [HttpGet] - public IActionResult GetFrontendVersion() => Ok(variablesService.GetSingle("FRONTEND_VERSION").AsString()); + public IActionResult GetFrontendVersion() => Ok(variablesDataService.GetSingle("FRONTEND_VERSION").AsString()); [HttpPost("update"), Authorize] public async Task UpdateFrontendVersion([FromBody] JObject body) { string version = body["version"].ToString(); - await variablesService.Update("FRONTEND_VERSION", version); + await variablesDataService.Update("FRONTEND_VERSION", version); await utilityHub.Clients.All.ReceiveFrontendUpdate(version); return Ok(); } diff --git a/UKSFWebsite.Api/ExceptionHandler.cs b/UKSFWebsite.Api/ExceptionHandler.cs index b3cac5e9..492548ad 100644 --- a/UKSFWebsite.Api/ExceptionHandler.cs +++ b/UKSFWebsite.Api/ExceptionHandler.cs @@ -5,9 +5,10 @@ using Microsoft.AspNetCore.Http.Extensions; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using UKSFWebsite.Api.Models.Logging; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Message.Logging; +using UKSFWebsite.Api.Services.Message; namespace UKSFWebsite.Api { public class ExceptionHandler : IExceptionFilter { diff --git a/UKSFWebsite.Api/Global.cs b/UKSFWebsite.Api/Global.cs index 3ad73e9e..f2d0c988 100644 --- a/UKSFWebsite.Api/Global.cs +++ b/UKSFWebsite.Api/Global.cs @@ -2,9 +2,9 @@ namespace UKSFWebsite.Api { public static class Global { + public const string SUPER_ADMIN = "59e38f10594c603b78aa9dbd"; public const string TOKEN_AUDIENCE = "uksf-audience"; public const string TOKEN_ISSUER = "uksf-issuer"; - public const string SUPER_ADMIN = "59e38f10594c603b78aa9dbd"; public static IServiceProvider ServiceProvider; } diff --git a/UKSFWebsite.Api/ModsController.cs b/UKSFWebsite.Api/ModsController.cs index b7cce31c..487edac2 100644 --- a/UKSFWebsite.Api/ModsController.cs +++ b/UKSFWebsite.Api/ModsController.cs @@ -1,11 +1,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api { [Route("[controller]"), Authorize, Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER)] public class ModsController : Controller { - // TODO: Return size of modpack folder [HttpGet("size")] public IActionResult Index() => Ok("37580963840"); diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 50baa170..51cac185 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -12,16 +12,38 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; using Microsoft.IdentityModel.Tokens; -using UKSFWebsite.Api.Services; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Data; +using UKSFWebsite.Api.Data.Command; +using UKSFWebsite.Api.Data.Game; +using UKSFWebsite.Api.Data.Launcher; +using UKSFWebsite.Api.Data.Message; +using UKSFWebsite.Api.Data.Operations; +using UKSFWebsite.Api.Data.Personnel; +using UKSFWebsite.Api.Data.Units; +using UKSFWebsite.Api.Data.Utility; +using UKSFWebsite.Api.Interfaces.Command; +using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Game; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Launcher; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Operations; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Services.Command; using UKSFWebsite.Api.Services.Debug; +using UKSFWebsite.Api.Services.Game; +using UKSFWebsite.Api.Services.Game.Missions; using UKSFWebsite.Api.Services.Hubs; +using UKSFWebsite.Api.Services.Integrations; +using UKSFWebsite.Api.Services.Integrations.Procedures; using UKSFWebsite.Api.Services.Launcher; -using UKSFWebsite.Api.Services.Logging; -using UKSFWebsite.Api.Services.Missions; -using UKSFWebsite.Api.Services.Teamspeak; -using UKSFWebsite.Api.Services.Teamspeak.Procedures; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Operations; +using UKSFWebsite.Api.Services.Personnel; +using UKSFWebsite.Api.Services.Units; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api { @@ -136,14 +158,14 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact } private static void WarmDataServices() { - CacheService cacheService = Global.ServiceProvider.GetService(); + DataCacheService dataCacheService = Global.ServiceProvider.GetService(); List servicesTypes = AppDomain.CurrentDomain.GetAssemblies() .SelectMany(x => x.GetTypes()) .Where(x => !x.IsAbstract && !x.IsInterface && x.BaseType != null && x.BaseType.IsGenericType && x.BaseType.GetGenericTypeDefinition() == typeof(CachedDataService<>)) .Select(x => x.GetInterfaces().FirstOrDefault(y => !y.IsGenericType)) .ToList(); foreach (object service in servicesTypes.Select(type => Global.ServiceProvider.GetService(type))) { - cacheService.AddService((dynamic) service); + dataCacheService.AddDataService((dynamic) service); ((dynamic) service).Get(); } } @@ -151,12 +173,13 @@ private static void WarmDataServices() { public static class ServiceExtensions { public static void RegisterServices(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { + RegisterDataServics(services); + // Instance Objects services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -164,40 +187,40 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); - // Request Singletons - // services.AddScoped<>(); + // Instance Objects with data backing + services.AddTransient(); + services.AddTransient(); + + // Instance Objects with cached data backing + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); // Global Singletons services.AddSingleton(configuration); services.AddSingleton(currentEnvironment); services.AddSingleton(_ => MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); - services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); // TeamSpeak procedures services.AddSingleton(); @@ -206,14 +229,38 @@ public static void RegisterServices(this IServiceCollection services, IConfigura if (currentEnvironment.IsDevelopment()) { services.AddSingleton(); - services.AddSingleton(); + services.AddSingleton(); + services.AddTransient(); services.AddSingleton(); } else { services.AddSingleton(); - services.AddSingleton(); + services.AddSingleton(); + services.AddTransient(); services.AddSingleton(); } } + + private static void RegisterDataServics(this IServiceCollection services) { + // Non-Cached + services.AddTransient(); + services.AddTransient(); + + // Cached + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + } } public class CorsMiddleware { @@ -235,3 +282,6 @@ public static class CorsMiddlewareExtensions { public static void UseCorsMiddleware(this IApplicationBuilder builder) => builder.UseMiddleware(); } } + +// Request Singletons +// services.AddScoped<>(); diff --git a/UKSFWebsite.Api/UKSFWebsite.Api.csproj b/UKSFWebsite.Api/UKSFWebsite.Api.csproj index 79f199af..d2991b2b 100644 --- a/UKSFWebsite.Api/UKSFWebsite.Api.csproj +++ b/UKSFWebsite.Api/UKSFWebsite.Api.csproj @@ -29,7 +29,6 @@ - @@ -37,6 +36,7 @@ + diff --git a/UKSFWebsite.Backend.sln b/UKSFWebsite.Backend.sln index 01ec8fc1..a5b62fcb 100644 --- a/UKSFWebsite.Backend.sln +++ b/UKSFWebsite.Backend.sln @@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Integrations", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Data", "UKSFWebsite.Api.Data\UKSFWebsite.Api.Data.csproj", "{AE15E44A-DB7B-432F-84BA-7A01E6C54010}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Interfaces", "UKSFWebsite.Api.Interfaces\UKSFWebsite.Api.Interfaces.csproj", "{462304E4-442D-46F2-B0AD-73BBCEB01C8A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -88,6 +90,18 @@ Global {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x64.Build.0 = Release|Any CPU {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x86.ActiveCfg = Release|Any CPU {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x86.Build.0 = Release|Any CPU + {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|x64.ActiveCfg = Debug|Any CPU + {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|x64.Build.0 = Debug|Any CPU + {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|x86.ActiveCfg = Debug|Any CPU + {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|x86.Build.0 = Debug|Any CPU + {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|Any CPU.Build.0 = Release|Any CPU + {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x64.ActiveCfg = Release|Any CPU + {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x64.Build.0 = Release|Any CPU + {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x86.ActiveCfg = Release|Any CPU + {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UKSFWebsite.Integrations/Controllers/DiscordController.cs b/UKSFWebsite.Integrations/Controllers/DiscordController.cs index 61373944..fd2521d5 100644 --- a/UKSFWebsite.Integrations/Controllers/DiscordController.cs +++ b/UKSFWebsite.Integrations/Controllers/DiscordController.cs @@ -8,8 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Integrations.Controllers { @@ -67,7 +66,7 @@ private async Task GetUrlParameters(string code, string redirectUrl) { string user = await response.Content.ReadAsStringAsync(); string id = JObject.Parse(user)["id"].ToString(); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bot", botToken); - await client.PutAsync($"https://discordapp.com/api/guilds/{VariablesWrapper.VariablesService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json")); + await client.PutAsync($"https://discordapp.com/api/guilds/{VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json")); string confirmationCode = await confirmationCodeService.CreateConfirmationCode(id, true); return $"validation={confirmationCode}&discordid={id}"; } diff --git a/UKSFWebsite.Integrations/Controllers/SteamController.cs b/UKSFWebsite.Integrations/Controllers/SteamController.cs index a871b62c..a84f7b19 100644 --- a/UKSFWebsite.Integrations/Controllers/SteamController.cs +++ b/UKSFWebsite.Integrations/Controllers/SteamController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Hosting; -using UKSFWebsite.Api.Services.Abstraction; +using UKSFWebsite.Api.Interfaces.Utility; namespace UKSFWebsite.Integrations.Controllers { [Route("[controller]")] diff --git a/UKSFWebsite.Integrations/Startup.cs b/UKSFWebsite.Integrations/Startup.cs index ebe4c7ff..9e32ff92 100644 --- a/UKSFWebsite.Integrations/Startup.cs +++ b/UKSFWebsite.Integrations/Startup.cs @@ -5,8 +5,10 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using UKSFWebsite.Api.Services.Abstraction; -using UKSFWebsite.Api.Services.Data; +using UKSFWebsite.Api.Data.Utility; +using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Integrations { @@ -54,7 +56,9 @@ public static IServiceCollection RegisterServices(this IServiceCollection servic services.AddSingleton(configuration); services.AddSingleton(_ => MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); services.AddSingleton(); - services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); return services; } diff --git a/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj b/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj index c43e8b1d..4a69fb7c 100644 --- a/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj +++ b/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj @@ -3,7 +3,6 @@ netcoreapp3.0 Exe win7-x64 - UKSFWebsite.Integrations UKSFWebsite.Integrations enable @@ -16,6 +15,7 @@ + \ No newline at end of file From 838113c42556a7de9f2bfaabe8f6464d50829331 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 01:29:51 +0000 Subject: [PATCH 014/369] Further tweaks. Moved public Data method to own interface to simplify other interfaces --- UKSFWebsite.Api.Data/CachedDataService.cs | 13 +++++++++++-- UKSFWebsite.Api.Data/DataService.cs | 7 +++++++ UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj | 2 +- .../Command/ICommandRequestService.cs | 3 +-- .../Game/IGameServersService.cs | 3 +-- UKSFWebsite.Api.Interfaces/IDataBackedService.cs | 5 +++++ .../Launcher/ILauncherFileService.cs | 3 +-- .../Message/ICommentThreadService.cs | 3 +-- .../Message/INotificationsService.cs | 3 +-- .../Operations/IOperationOrderService.cs | 3 +-- .../Operations/IOperationReportService.cs | 3 +-- .../Personnel/IAccountService.cs | 3 +-- .../Personnel/IDischargeService.cs | 4 +--- UKSFWebsite.Api.Interfaces/Personnel/ILoaService.cs | 3 +-- .../Personnel/IRanksService.cs | 3 +-- .../Personnel/IRolesService.cs | 3 +-- UKSFWebsite.Api.Interfaces/Units/IUnitsService.cs | 3 +-- .../Utility/IConfirmationCodeService.cs | 3 +-- .../Utility/ISchedulerService.cs | 3 +-- .../UKSFWebsite.Api.Models.csproj | 2 +- .../UKSFWebsite.Api.Services.csproj | 2 +- .../Controllers/Accounts/AccountsController.cs | 4 ++-- UKSFWebsite.Api/Program.cs | 2 +- UKSFWebsite.Api/Startup.cs | 11 ++++++----- UKSFWebsite.Api/UKSFWebsite.Api.csproj | 3 ++- UKSFWebsite.Integrations/Program.cs | 2 +- UKSFWebsite.Integrations/Startup.cs | 3 +-- .../UKSFWebsite.Integrations.csproj | 3 ++- 28 files changed, 56 insertions(+), 49 deletions(-) create mode 100644 UKSFWebsite.Api.Interfaces/IDataBackedService.cs diff --git a/UKSFWebsite.Api.Data/CachedDataService.cs b/UKSFWebsite.Api.Data/CachedDataService.cs index ad5be30a..fb2abd53 100644 --- a/UKSFWebsite.Api.Data/CachedDataService.cs +++ b/UKSFWebsite.Api.Data/CachedDataService.cs @@ -6,11 +6,11 @@ namespace UKSFWebsite.Api.Data { public abstract class CachedDataService : DataService { - protected List Collection; + protected List Collection = new List(); protected CachedDataService(IMongoDatabase database, string collectionName) : base(database, collectionName) { } - // ReSharper disable once MemberCanBeProtected.Global // Used as dynamic call in startup + // ReSharper disable once MemberCanBeProtected.Global - Used in dynamic call, do not change to protected! public void Refresh() { Collection = null; Get(); @@ -48,16 +48,25 @@ public override async Task Add(T data) { public override async Task Update(string id, string fieldName, object value) { await base.Update(id, fieldName, value); Refresh(); + CachedDataEvent(); } public override async Task Update(string id, UpdateDefinition update) { await base.Update(id, update); Refresh(); + CachedDataEvent(); } public override async Task Delete(string id) { await base.Delete(id); Refresh(); + CachedDataEvent(); } + + private void CachedDataEvent() { + base.DataEvent(); + } + + protected override void DataEvent() { } } } diff --git a/UKSFWebsite.Api.Data/DataService.cs b/UKSFWebsite.Api.Data/DataService.cs index 215ccf82..ece2b40b 100644 --- a/UKSFWebsite.Api.Data/DataService.cs +++ b/UKSFWebsite.Api.Data/DataService.cs @@ -35,14 +35,21 @@ public virtual async Task Add(T data) { public virtual async Task Update(string id, string fieldName, object value) { UpdateDefinition update = value == null ? Builders.Update.Unset(fieldName) : Builders.Update.Set(fieldName, value); await Database.GetCollection(DatabaseCollection).UpdateOneAsync(Builders.Filter.Eq("id", id), update); + DataEvent(); } public virtual async Task Update(string id, UpdateDefinition update) { await Database.GetCollection(DatabaseCollection).UpdateOneAsync(Builders.Filter.Eq("id", id), update); + DataEvent(); } public virtual async Task Delete(string id) { await Database.GetCollection(DatabaseCollection).DeleteOneAsync(Builders.Filter.Eq("id", id)); + DataEvent(); + } + + protected virtual void DataEvent() { + } internal static string GetIdValue(T data) => data.GetType().GetField("id").GetValue(data) as string; diff --git a/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj b/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj index 6943c8a7..26c3be7d 100644 --- a/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj +++ b/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj @@ -2,7 +2,7 @@ netcoreapp3.0 - enable + disable diff --git a/UKSFWebsite.Api.Interfaces/Command/ICommandRequestService.cs b/UKSFWebsite.Api.Interfaces/Command/ICommandRequestService.cs index 7e2499f1..b351089d 100644 --- a/UKSFWebsite.Api.Interfaces/Command/ICommandRequestService.cs +++ b/UKSFWebsite.Api.Interfaces/Command/ICommandRequestService.cs @@ -3,8 +3,7 @@ using UKSFWebsite.Api.Models.Command; namespace UKSFWebsite.Api.Interfaces.Command { - public interface ICommandRequestService { - ICommandRequestDataService Data(); + public interface ICommandRequestService : IDataBackedService { Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE); Task ArchiveRequest(string id); Task SetRequestReviewState(CommandRequest request, string reviewerId, ReviewState newState); diff --git a/UKSFWebsite.Api.Interfaces/Game/IGameServersService.cs b/UKSFWebsite.Api.Interfaces/Game/IGameServersService.cs index e19b1d94..e6e2726d 100644 --- a/UKSFWebsite.Api.Interfaces/Game/IGameServersService.cs +++ b/UKSFWebsite.Api.Interfaces/Game/IGameServersService.cs @@ -6,8 +6,7 @@ using UKSFWebsite.Api.Models.Mission; namespace UKSFWebsite.Api.Interfaces.Game { - public interface IGameServersService { - IGameServersDataService Data(); + public interface IGameServersService : IDataBackedService { int GetGameInstanceCount(); Task UploadMissionFile(IFormFile file); List GetMissionFiles(); diff --git a/UKSFWebsite.Api.Interfaces/IDataBackedService.cs b/UKSFWebsite.Api.Interfaces/IDataBackedService.cs new file mode 100644 index 00000000..20614fac --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/IDataBackedService.cs @@ -0,0 +1,5 @@ +namespace UKSFWebsite.Api.Interfaces { + public interface IDataBackedService { + T Data(); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Launcher/ILauncherFileService.cs b/UKSFWebsite.Api.Interfaces/Launcher/ILauncherFileService.cs index a86e2fb9..2815de0d 100644 --- a/UKSFWebsite.Api.Interfaces/Launcher/ILauncherFileService.cs +++ b/UKSFWebsite.Api.Interfaces/Launcher/ILauncherFileService.cs @@ -6,8 +6,7 @@ using UKSFWebsite.Api.Models.Launcher; namespace UKSFWebsite.Api.Interfaces.Launcher { - public interface ILauncherFileService { - ILauncherFileDataService Data(); + public interface ILauncherFileService : IDataBackedService { Task UpdateAllVersions(); FileStreamResult GetLauncherFile(params string[] file); Task GetUpdatedFiles(IEnumerable files); diff --git a/UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs b/UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs index 93b63570..446d203e 100644 --- a/UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs +++ b/UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs @@ -4,8 +4,7 @@ using UKSFWebsite.Api.Models.Message; namespace UKSFWebsite.Api.Interfaces.Message { - public interface ICommentThreadService { - ICommentThreadDataService Data(); + public interface ICommentThreadService : IDataBackedService { IEnumerable GetCommentThreadComments(string id); Task InsertComment(string id, Comment comment); Task RemoveComment(string id, Comment comment); diff --git a/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs b/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs index 09de9e8c..ac95a591 100644 --- a/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs +++ b/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs @@ -5,8 +5,7 @@ using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Interfaces.Message { - public interface INotificationsService { - INotificationsDataService Data(); + public interface INotificationsService : IDataBackedService { void Add(Notification notification); void SendTeamspeakNotification(Account account, string rawMessage); void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage); diff --git a/UKSFWebsite.Api.Interfaces/Operations/IOperationOrderService.cs b/UKSFWebsite.Api.Interfaces/Operations/IOperationOrderService.cs index 73f0c207..998202cb 100644 --- a/UKSFWebsite.Api.Interfaces/Operations/IOperationOrderService.cs +++ b/UKSFWebsite.Api.Interfaces/Operations/IOperationOrderService.cs @@ -3,8 +3,7 @@ using UKSFWebsite.Api.Models.Operations; namespace UKSFWebsite.Api.Interfaces.Operations { - public interface IOperationOrderService { - IOperationOrderDataService Data(); + public interface IOperationOrderService : IDataBackedService { Task Add(CreateOperationOrderRequest request); } } diff --git a/UKSFWebsite.Api.Interfaces/Operations/IOperationReportService.cs b/UKSFWebsite.Api.Interfaces/Operations/IOperationReportService.cs index 3d0df0b8..efd88b29 100644 --- a/UKSFWebsite.Api.Interfaces/Operations/IOperationReportService.cs +++ b/UKSFWebsite.Api.Interfaces/Operations/IOperationReportService.cs @@ -3,8 +3,7 @@ using UKSFWebsite.Api.Models.Operations; namespace UKSFWebsite.Api.Interfaces.Operations { - public interface IOperationReportService { - IOperationReportDataService Data(); + public interface IOperationReportService : IDataBackedService { Task Create(CreateOperationReportRequest request); } } diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs index c0d1c58b..8a3e4612 100644 --- a/UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs +++ b/UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs @@ -4,8 +4,7 @@ using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Interfaces.Personnel { - public interface IAccountService { - IAccountDataService Data(); + public interface IAccountService : IDataBackedService { Task Update(string id, string fieldName, object value); Task Update(string id, UpdateDefinition update); } diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IDischargeService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IDischargeService.cs index 390431c4..7350bf78 100644 --- a/UKSFWebsite.Api.Interfaces/Personnel/IDischargeService.cs +++ b/UKSFWebsite.Api.Interfaces/Personnel/IDischargeService.cs @@ -1,7 +1,5 @@ using UKSFWebsite.Api.Interfaces.Data.Cached; namespace UKSFWebsite.Api.Interfaces.Personnel { - public interface IDischargeService { - IDischargeDataService Data(); - } + public interface IDischargeService : IDataBackedService { } } diff --git a/UKSFWebsite.Api.Interfaces/Personnel/ILoaService.cs b/UKSFWebsite.Api.Interfaces/Personnel/ILoaService.cs index a510a67a..5395c6e4 100644 --- a/UKSFWebsite.Api.Interfaces/Personnel/ILoaService.cs +++ b/UKSFWebsite.Api.Interfaces/Personnel/ILoaService.cs @@ -6,8 +6,7 @@ using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Interfaces.Personnel { - public interface ILoaService { - ILoaDataService Data(); + public interface ILoaService : IDataBackedService { IEnumerable Get(List ids); Task Add(CommandRequestLoa requestBase); Task SetLoaState(string id, LoaReviewState state); diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IRanksService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IRanksService.cs index 0ea737ec..aa78602e 100644 --- a/UKSFWebsite.Api.Interfaces/Personnel/IRanksService.cs +++ b/UKSFWebsite.Api.Interfaces/Personnel/IRanksService.cs @@ -1,8 +1,7 @@ using UKSFWebsite.Api.Interfaces.Data.Cached; namespace UKSFWebsite.Api.Interfaces.Personnel { - public interface IRanksService { - IRanksDataService Data(); + public interface IRanksService : IDataBackedService { int GetRankIndex(string rankName); int Sort(string nameA, string nameB); bool IsEqual(string nameA, string nameB); diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IRolesService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IRolesService.cs index ac753fd6..52fddf81 100644 --- a/UKSFWebsite.Api.Interfaces/Personnel/IRolesService.cs +++ b/UKSFWebsite.Api.Interfaces/Personnel/IRolesService.cs @@ -2,8 +2,7 @@ using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Interfaces.Personnel { - public interface IRolesService { - IRolesDataService Data(); + public interface IRolesService : IDataBackedService { int Sort(string nameA, string nameB); Role GetUnitRoleByOrder(int order); } diff --git a/UKSFWebsite.Api.Interfaces/Units/IUnitsService.cs b/UKSFWebsite.Api.Interfaces/Units/IUnitsService.cs index 6bfb63d7..c5ff5607 100644 --- a/UKSFWebsite.Api.Interfaces/Units/IUnitsService.cs +++ b/UKSFWebsite.Api.Interfaces/Units/IUnitsService.cs @@ -6,8 +6,7 @@ using UKSFWebsite.Api.Models.Units; namespace UKSFWebsite.Api.Interfaces.Units { - public interface IUnitsService { - IUnitsDataService Data(); + public interface IUnitsService : IDataBackedService { IEnumerable GetSortedUnits(Func predicate = null); Task AddMember(string id, string unitId); Task RemoveMember(string id, string unitName); diff --git a/UKSFWebsite.Api.Interfaces/Utility/IConfirmationCodeService.cs b/UKSFWebsite.Api.Interfaces/Utility/IConfirmationCodeService.cs index 4f9ff555..7b204f06 100644 --- a/UKSFWebsite.Api.Interfaces/Utility/IConfirmationCodeService.cs +++ b/UKSFWebsite.Api.Interfaces/Utility/IConfirmationCodeService.cs @@ -2,8 +2,7 @@ using UKSFWebsite.Api.Interfaces.Data; namespace UKSFWebsite.Api.Interfaces.Utility { - public interface IConfirmationCodeService { - IConfirmationCodeDataService Data(); + public interface IConfirmationCodeService : IDataBackedService { Task CreateConfirmationCode(string value, bool integration = false); Task GetConfirmationCode(string id); } diff --git a/UKSFWebsite.Api.Interfaces/Utility/ISchedulerService.cs b/UKSFWebsite.Api.Interfaces/Utility/ISchedulerService.cs index f6de2372..5972f0d8 100644 --- a/UKSFWebsite.Api.Interfaces/Utility/ISchedulerService.cs +++ b/UKSFWebsite.Api.Interfaces/Utility/ISchedulerService.cs @@ -4,8 +4,7 @@ using UKSFWebsite.Api.Models.Utility; namespace UKSFWebsite.Api.Interfaces.Utility { - public interface ISchedulerService { - ISchedulerDataService Data(); + public interface ISchedulerService : IDataBackedService { void Load(bool integration = false); Task Create(DateTime next, TimeSpan interval, ScheduledJobType type, string action, params object[] actionParameters); Task Cancel(Func predicate); diff --git a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj b/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj index 60a83ddc..38cca46c 100644 --- a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj +++ b/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj @@ -3,7 +3,7 @@ netcoreapp3.0 UKSFWebsite.Api.Models UKSFWebsite.Api.Models - enable + disable full diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index 5bfd9794..61377347 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -3,7 +3,7 @@ netcoreapp3.0 UKSFWebsite.Api.Services UKSFWebsite.Api.Services - enable + disable full diff --git a/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs b/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs index 79aba9f0..464395b6 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using MongoDB.Driver; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Integrations; @@ -178,8 +179,7 @@ public IActionResult CheckUsernameOrEmailExists([FromQuery] string check) { [HttpPut("name"), Authorize] public async Task ChangeName([FromBody] JObject changeNameRequest) { Account account = sessionService.GetContextAccount(); - await accountService.Data().Update(account.id, "firstname", changeNameRequest["firstname"].ToString()); - await accountService.Data().Update(account.id, "lastname", changeNameRequest["lastname"].ToString()); + await accountService.Data().Update(account.id, Builders.Update.Set(x => x.firstname, changeNameRequest["firstname"].ToString()).Set(x => x.lastname, changeNameRequest["lastname"].ToString())); LogWrapper.AuditLog(sessionService.GetContextId(), $"{account.lastname}, {account.firstname} changed their name to {changeNameRequest["lastname"]}, {changeNameRequest["firstname"]}"); await discordService.UpdateAccount(accountService.Data().GetSingle(account.id)); return Ok(); diff --git a/UKSFWebsite.Api/Program.cs b/UKSFWebsite.Api/Program.cs index caf15c20..3b5a7369 100644 --- a/UKSFWebsite.Api/Program.cs +++ b/UKSFWebsite.Api/Program.cs @@ -19,7 +19,7 @@ public static void Main(string[] args) { .ToList() .ForEach(x => AppDomain.CurrentDomain.GetAssemblies().ToList().Add(AppDomain.CurrentDomain.Load(x))); - string? environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); + string environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); bool isDevelopment = environment == Environments.Development; if (isDevelopment) { diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 51cac185..77269bcb 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -63,14 +63,13 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration public void ConfigureServices(IServiceCollection services) { services.RegisterServices(configuration, currentEnvironment); - services.BuildServiceProvider(); services.AddCors( options => options.AddPolicy( "CorsPolicy", builder => { builder.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader().AllowCredentials().WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://integrations.uk-sf.co.uk"); } ) ); - services.AddSignalR(); + services.AddSignalR().AddNewtonsoftJsonProtocol(); services.AddAuthentication( options => { options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; @@ -109,10 +108,10 @@ public void ConfigureServices(IServiceCollection services) { ); ExceptionHandler.Instance = new ExceptionHandler(); - services.AddMvc(options => { options.Filters.Add(ExceptionHandler.Instance); }); + services.AddControllers(); + services.AddMvc(options => { options.Filters.Add(ExceptionHandler.Instance); }).AddNewtonsoftJson(); } - // ReSharper disable once UnusedMember.Global public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFactory loggerFactory) { app.UseHsts(); app.UseHttpsRedirection(); @@ -121,8 +120,10 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact app.UseCors("CorsPolicy"); app.UseCorsMiddleware(); app.UseAuthentication(); + app.UseAuthorization(); app.UseEndpoints( endpoints => { + endpoints.MapControllers(); endpoints.MapHub($"/hub/{AccountHub.END_POINT}"); endpoints.MapHub($"/hub/{AdminHub.END_POINT}"); endpoints.MapHub($"/hub/{CommandRequestsHub.END_POINT}"); @@ -166,8 +167,8 @@ private static void WarmDataServices() { .ToList(); foreach (object service in servicesTypes.Select(type => Global.ServiceProvider.GetService(type))) { dataCacheService.AddDataService((dynamic) service); - ((dynamic) service).Get(); } + dataCacheService.InvalidateDataCaches(); } } diff --git a/UKSFWebsite.Api/UKSFWebsite.Api.csproj b/UKSFWebsite.Api/UKSFWebsite.Api.csproj index d2991b2b..4000e765 100644 --- a/UKSFWebsite.Api/UKSFWebsite.Api.csproj +++ b/UKSFWebsite.Api/UKSFWebsite.Api.csproj @@ -6,7 +6,7 @@ Exe win7-x64 default - enable + disable 1701;1702;1705;1591 @@ -26,6 +26,7 @@ + diff --git a/UKSFWebsite.Integrations/Program.cs b/UKSFWebsite.Integrations/Program.cs index 31d83f38..137c9eda 100644 --- a/UKSFWebsite.Integrations/Program.cs +++ b/UKSFWebsite.Integrations/Program.cs @@ -19,7 +19,7 @@ private static void Main(string[] args) { .ToList() .ForEach(x => AppDomain.CurrentDomain.GetAssemblies().ToList().Add(AppDomain.CurrentDomain.Load(x))); - string? environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); + string environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); bool isDevelopment = environment == Environments.Development; if (isDevelopment) { diff --git a/UKSFWebsite.Integrations/Startup.cs b/UKSFWebsite.Integrations/Startup.cs index 9e32ff92..ea25c9ac 100644 --- a/UKSFWebsite.Integrations/Startup.cs +++ b/UKSFWebsite.Integrations/Startup.cs @@ -23,12 +23,11 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration public void ConfigureServices(IServiceCollection services) { services.RegisterServices(configuration); - services.BuildServiceProvider(); services.AddCors(); services.AddAuthentication(options => { options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme; }).AddCookie().AddSteam(); - services.AddMvc(); + services.AddMvc().AddNewtonsoftJson(); } public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFactory loggerFactory) { diff --git a/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj b/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj index 4a69fb7c..9f131455 100644 --- a/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj +++ b/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj @@ -4,7 +4,7 @@ Exe win7-x64 UKSFWebsite.Integrations - enable + disable bin\Debug\ @@ -13,6 +13,7 @@ + From fa402c5490a835dbea34c052c729e6acad1bcfc2 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 18:14:31 +0000 Subject: [PATCH 015/369] Added data events. Move some signalr hubs to use data events --- UKSFWebsite.Api.Data/CachedDataService.cs | 18 ++-- .../CommandRequestArchiveDataService.cs | 3 +- .../Command/CommandRequestDataService.cs | 3 +- UKSFWebsite.Api.Data/DataService.cs | 18 ++-- .../Game/GameServersDataService.cs | 3 +- .../Launcher/LauncherFileDataService.cs | 3 +- .../Message/CommentThreadDataService.cs | 16 +++- .../Message/NotificationsDataService.cs | 3 +- .../Operations/OperationOrderDataService.cs | 3 +- .../Operations/OperationReportDataService.cs | 3 +- .../Personnel/AccountDataService.cs | 3 +- .../Personnel/DischargeDataService.cs | 3 +- .../Personnel/LoaDataService.cs | 3 +- .../Personnel/RanksDataService.cs | 3 +- .../Personnel/RolesDataService.cs | 3 +- .../UKSFWebsite.Api.Data.csproj | 1 + .../Units/UnitsDataService.cs | 3 +- .../Utility/ConfirmationCodeDataService.cs | 3 +- .../Utility/SchedulerDataService.cs | 3 +- .../Utility/VariablesDataService.cs | 3 +- .../Data/DataEventBacker.cs | 17 ++++ UKSFWebsite.Api.Events/Data/DataEventBus.cs | 17 ++++ .../Data/DataEventFactory.cs | 7 ++ .../EventHandlerInitialiser.cs | 24 ++++++ .../Handlers/AccountEventHandler.cs | 33 ++++++++ .../Handlers/CommandRequestEventHandler.cs | 40 +++++++++ .../Handlers/CommentThreadEventHandler.cs | 50 +++++++++++ .../Handlers/NotificationsEventHandler.cs | 34 ++++++++ .../UKSFWebsite.Api.Events.csproj | 17 ++++ .../Data/Cached/ICommentThreadDataService.cs | 2 + .../Data/IDataService.cs | 3 +- .../Events/IAccountEventHandler.cs | 3 + .../Events/ICommandRequestEventHandler.cs | 3 + .../Events/ICommentThreadEventHandler.cs | 3 + .../Events/IDataEventBacker.cs | 8 ++ .../Events/IEventBus.cs | 8 ++ .../Events/IEventHandler.cs | 5 ++ .../Events/INotificationsEventHandler.cs | 3 + .../Hubs}/IAccountClient.cs | 2 +- .../Hubs}/IAdminClient.cs | 2 +- .../Hubs}/ICommandRequestsClient.cs | 2 +- .../Hubs}/ICommentThreadClient.cs | 4 +- .../Hubs}/ILauncherClient.cs | 2 +- .../Hubs}/INotificationsClient.cs | 2 +- .../Hubs}/IServersClient.cs | 2 +- .../Hubs}/ITeamspeakClientsClient.cs | 2 +- .../Hubs}/IUtilityClient.cs | 2 +- .../Message/ICommentThreadService.cs | 1 + .../Personnel/IAccountService.cs | 10 +-- .../Events/DataEventModel.cs | 13 +++ .../CommandRequestCompletionService.cs | 2 +- .../Command/CommandRequestService.cs | 10 +-- .../Debug/FakeDataService.cs | 4 + .../Debug/FakeNotificationsDataService.cs | 12 --- UKSFWebsite.Api.Services/Hubs/AccountHub.cs | 2 +- UKSFWebsite.Api.Services/Hubs/AdminHub.cs | 2 +- .../Hubs/CommandRequestsHub.cs | 2 +- .../Hubs/CommentThreadHub.cs | 2 +- UKSFWebsite.Api.Services/Hubs/LauncherHub.cs | 2 +- .../Hubs/NotificationsHub.cs | 2 +- UKSFWebsite.Api.Services/Hubs/ServersHub.cs | 2 +- .../Hubs/TeamspeakClientsHub.cs | 2 +- UKSFWebsite.Api.Services/Hubs/UtilityHub.cs | 2 +- .../Integrations/TeamspeakService.cs | 2 +- .../Launcher/LauncherService.cs | 2 +- .../Message/CommentThreadService.cs | 22 ++++- .../Message/LogWrapper.cs | 1 - .../Message/LoggingService.cs | 2 +- .../Message/NotificationsService.cs | 7 +- .../Personnel/AccountService.cs | 24 +----- .../Personnel/AssignmentService.cs | 2 +- .../{Utility => }/ServiceWrapper.cs | 2 +- .../UKSFWebsite.Api.Services.csproj | 1 + .../Units/UnitsService.cs | 2 +- UKSFWebsite.Api.Services/Utility/Events.cs | 3 - .../Controllers/ApplicationsController.cs | 2 +- .../Controllers/CommentThreadController.cs | 36 ++------ .../Controllers/GameServersController.cs | 2 +- .../Controllers/LauncherController.cs | 2 +- .../Controllers/VersionController.cs | 2 +- UKSFWebsite.Api/Startup.cs | 84 +++++++++++++------ UKSFWebsite.Api/UKSFWebsite.Api.csproj | 1 + UKSFWebsite.Backend.sln | 14 ++++ UKSFWebsite.Integrations/Startup.cs | 1 + 84 files changed, 499 insertions(+), 183 deletions(-) create mode 100644 UKSFWebsite.Api.Events/Data/DataEventBacker.cs create mode 100644 UKSFWebsite.Api.Events/Data/DataEventBus.cs create mode 100644 UKSFWebsite.Api.Events/Data/DataEventFactory.cs create mode 100644 UKSFWebsite.Api.Events/EventHandlerInitialiser.cs create mode 100644 UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs create mode 100644 UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs create mode 100644 UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs create mode 100644 UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs create mode 100644 UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj create mode 100644 UKSFWebsite.Api.Interfaces/Events/IAccountEventHandler.cs create mode 100644 UKSFWebsite.Api.Interfaces/Events/ICommandRequestEventHandler.cs create mode 100644 UKSFWebsite.Api.Interfaces/Events/ICommentThreadEventHandler.cs create mode 100644 UKSFWebsite.Api.Interfaces/Events/IDataEventBacker.cs create mode 100644 UKSFWebsite.Api.Interfaces/Events/IEventBus.cs create mode 100644 UKSFWebsite.Api.Interfaces/Events/IEventHandler.cs create mode 100644 UKSFWebsite.Api.Interfaces/Events/INotificationsEventHandler.cs rename {UKSFWebsite.Api.Services/Hubs/Abstraction => UKSFWebsite.Api.Interfaces/Hubs}/IAccountClient.cs (67%) rename {UKSFWebsite.Api.Services/Hubs/Abstraction => UKSFWebsite.Api.Interfaces/Hubs}/IAdminClient.cs (85%) rename {UKSFWebsite.Api.Services/Hubs/Abstraction => UKSFWebsite.Api.Interfaces/Hubs}/ICommandRequestsClient.cs (69%) rename {UKSFWebsite.Api.Services/Hubs/Abstraction => UKSFWebsite.Api.Interfaces/Hubs}/ICommentThreadClient.cs (57%) rename {UKSFWebsite.Api.Services/Hubs/Abstraction => UKSFWebsite.Api.Interfaces/Hubs}/ILauncherClient.cs (70%) rename {UKSFWebsite.Api.Services/Hubs/Abstraction => UKSFWebsite.Api.Interfaces/Hubs}/INotificationsClient.cs (83%) rename {UKSFWebsite.Api.Services/Hubs/Abstraction => UKSFWebsite.Api.Interfaces/Hubs}/IServersClient.cs (69%) rename {UKSFWebsite.Api.Services/Hubs/Abstraction => UKSFWebsite.Api.Interfaces/Hubs}/ITeamspeakClientsClient.cs (70%) rename {UKSFWebsite.Api.Services/Hubs/Abstraction => UKSFWebsite.Api.Interfaces/Hubs}/IUtilityClient.cs (70%) create mode 100644 UKSFWebsite.Api.Models/Events/DataEventModel.cs delete mode 100644 UKSFWebsite.Api.Services/Debug/FakeNotificationsDataService.cs rename UKSFWebsite.Api.Services/{Utility => }/ServiceWrapper.cs (72%) delete mode 100644 UKSFWebsite.Api.Services/Utility/Events.cs diff --git a/UKSFWebsite.Api.Data/CachedDataService.cs b/UKSFWebsite.Api.Data/CachedDataService.cs index fb2abd53..28d73346 100644 --- a/UKSFWebsite.Api.Data/CachedDataService.cs +++ b/UKSFWebsite.Api.Data/CachedDataService.cs @@ -3,12 +3,15 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; +using UKSFWebsite.Api.Events.Data; +using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Models.Events; namespace UKSFWebsite.Api.Data { public abstract class CachedDataService : DataService { protected List Collection = new List(); - protected CachedDataService(IMongoDatabase database, string collectionName) : base(database, collectionName) { } + protected CachedDataService(IMongoDatabase database, IEventBus dataEventBus, string collectionName) : base(database, dataEventBus, collectionName) { } // ReSharper disable once MemberCanBeProtected.Global - Used in dynamic call, do not change to protected! public void Refresh() { @@ -43,30 +46,31 @@ public override T GetSingle(Func predicate) { public override async Task Add(T data) { await base.Add(data); Refresh(); + CachedDataEvent(DataEventFactory.Create(DataEventType.ADD, GetIdValue(data), data)); } public override async Task Update(string id, string fieldName, object value) { await base.Update(id, fieldName, value); Refresh(); - CachedDataEvent(); + CachedDataEvent(DataEventFactory.Create(DataEventType.UPDATE, id)); } public override async Task Update(string id, UpdateDefinition update) { await base.Update(id, update); Refresh(); - CachedDataEvent(); + CachedDataEvent(DataEventFactory.Create(DataEventType.UPDATE, id)); } public override async Task Delete(string id) { await base.Delete(id); Refresh(); - CachedDataEvent(); + CachedDataEvent(DataEventFactory.Create(DataEventType.DELETE, id)); } - private void CachedDataEvent() { - base.DataEvent(); + protected virtual void CachedDataEvent(DataEventModel dataEvent) { + base.DataEvent(dataEvent); } - protected override void DataEvent() { } + protected override void DataEvent(DataEventModel dataEvent) { } } } diff --git a/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs b/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs index d2b899a1..fa6f0dc7 100644 --- a/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs +++ b/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs @@ -1,9 +1,10 @@ using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Command; namespace UKSFWebsite.Api.Data.Command { public class CommandRequestArchiveDataService : DataService, ICommandRequestArchiveDataService { - public CommandRequestArchiveDataService(IMongoDatabase database) : base(database, "commandRequestsArchive") { } + public CommandRequestArchiveDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "commandRequestsArchive") { } } } diff --git a/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs b/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs index ae34e0b3..2220f87e 100644 --- a/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs +++ b/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs @@ -1,9 +1,10 @@ using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Command; namespace UKSFWebsite.Api.Data.Command { public class CommandRequestDataService : CachedDataService, ICommandRequestDataService { - public CommandRequestDataService(IMongoDatabase database) : base(database, "commandRequests") { } + public CommandRequestDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "commandRequests") { } } } diff --git a/UKSFWebsite.Api.Data/DataService.cs b/UKSFWebsite.Api.Data/DataService.cs index ece2b40b..3c718533 100644 --- a/UKSFWebsite.Api.Data/DataService.cs +++ b/UKSFWebsite.Api.Data/DataService.cs @@ -3,14 +3,17 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; +using UKSFWebsite.Api.Events.Data; using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Models.Events; namespace UKSFWebsite.Api.Data { - public abstract class DataService : IDataService { + public abstract class DataService : DataEventBacker, IDataService { protected readonly IMongoDatabase Database; protected readonly string DatabaseCollection; - protected DataService(IMongoDatabase database, string collectionName) { + protected DataService(IMongoDatabase database, IEventBus dataEventBus, string collectionName) : base(dataEventBus) { Database = database; DatabaseCollection = collectionName; if (Database.GetCollection(DatabaseCollection) == null) { @@ -30,26 +33,23 @@ public virtual T GetSingle(string id) { public virtual async Task Add(T data) { await Database.GetCollection(DatabaseCollection).InsertOneAsync(data); + DataEvent(DataEventFactory.Create(DataEventType.ADD, GetIdValue(data), data)); } public virtual async Task Update(string id, string fieldName, object value) { UpdateDefinition update = value == null ? Builders.Update.Unset(fieldName) : Builders.Update.Set(fieldName, value); await Database.GetCollection(DatabaseCollection).UpdateOneAsync(Builders.Filter.Eq("id", id), update); - DataEvent(); + DataEvent(DataEventFactory.Create(DataEventType.UPDATE, id)); } public virtual async Task Update(string id, UpdateDefinition update) { await Database.GetCollection(DatabaseCollection).UpdateOneAsync(Builders.Filter.Eq("id", id), update); - DataEvent(); + DataEvent(DataEventFactory.Create(DataEventType.UPDATE, id)); } public virtual async Task Delete(string id) { await Database.GetCollection(DatabaseCollection).DeleteOneAsync(Builders.Filter.Eq("id", id)); - DataEvent(); - } - - protected virtual void DataEvent() { - + DataEvent(DataEventFactory.Create(DataEventType.DELETE, id)); } internal static string GetIdValue(T data) => data.GetType().GetField("id").GetValue(data) as string; diff --git a/UKSFWebsite.Api.Data/Game/GameServersDataService.cs b/UKSFWebsite.Api.Data/Game/GameServersDataService.cs index c1be2a58..c2f1ec35 100644 --- a/UKSFWebsite.Api.Data/Game/GameServersDataService.cs +++ b/UKSFWebsite.Api.Data/Game/GameServersDataService.cs @@ -2,11 +2,12 @@ using System.Linq; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Game; namespace UKSFWebsite.Api.Data.Game { public class GameServersDataService : CachedDataService, IGameServersDataService { - public GameServersDataService(IMongoDatabase database) : base(database, "gameServers") { } + public GameServersDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "gameServers") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs b/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs index 1c22f228..13c39f27 100644 --- a/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs +++ b/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs @@ -1,9 +1,10 @@ using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Launcher; namespace UKSFWebsite.Api.Data.Launcher { public class LauncherFileDataService : CachedDataService, ILauncherFileDataService { - public LauncherFileDataService(IMongoDatabase database) : base(database, "launcherFiles") { } + public LauncherFileDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "launcherFiles") { } } } diff --git a/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs b/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs index 8c2e801c..ef4d8d58 100644 --- a/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs +++ b/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs @@ -1,15 +1,29 @@ using System.Threading.Tasks; using MongoDB.Driver; +using UKSFWebsite.Api.Events.Data; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Models.Events; using UKSFWebsite.Api.Models.Message; namespace UKSFWebsite.Api.Data.Message { public class CommentThreadDataService : CachedDataService, ICommentThreadDataService { - public CommentThreadDataService(IMongoDatabase database) : base(database, "commentThreads") { } + public CommentThreadDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "commentThreads") { } public new async Task Add(CommentThread commentThread) { await base.Add(commentThread); return commentThread.id; } + + public async Task Update(string id, Comment comment, DataEventType updateType) { + await base.Update(id, updateType == DataEventType.ADD ? Builders.Update.Push("comments", comment) : Builders.Update.Pull("comments", comment)); + CommentThreadDataEvent(DataEventFactory.Create(updateType, id, comment)); + } + + private void CommentThreadDataEvent(DataEventModel dataEvent) { + base.CachedDataEvent(dataEvent); + } + + protected override void CachedDataEvent(DataEventModel dataEvent) { } } } diff --git a/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs b/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs index 4705d9ce..8a49a30e 100644 --- a/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs +++ b/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs @@ -1,11 +1,12 @@ using System.Threading.Tasks; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Message; namespace UKSFWebsite.Api.Data.Message { public class NotificationsDataService : CachedDataService, INotificationsDataService { - public NotificationsDataService(IMongoDatabase database) : base(database, "notifications") { } + public NotificationsDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "notifications") { } public async Task UpdateMany(FilterDefinition filter, UpdateDefinition update) { await Database.GetCollection(DatabaseCollection).UpdateManyAsync(filter, update); diff --git a/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs b/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs index 7e388dcd..935dbff7 100644 --- a/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs +++ b/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs @@ -2,11 +2,12 @@ using System.Threading.Tasks; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Operations; namespace UKSFWebsite.Api.Data.Operations { public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { - public OperationOrderDataService(IMongoDatabase database) : base(database, "opord") { } + public OperationOrderDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "opord") { } public override List Get() { List reversed = base.Get(); diff --git a/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs b/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs index 0dc34548..25bb4e68 100644 --- a/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs +++ b/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs @@ -2,11 +2,12 @@ using System.Threading.Tasks; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Operations; namespace UKSFWebsite.Api.Data.Operations { public class OperationReportDataService : CachedDataService, IOperationReportDataService { - public OperationReportDataService(IMongoDatabase database) : base(database, "oprep") { } + public OperationReportDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "oprep") { } public override List Get() { List reversed = base.Get(); diff --git a/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs b/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs index 37c1431f..1a56c110 100644 --- a/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs @@ -1,9 +1,10 @@ using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Data.Personnel { public class AccountDataService : CachedDataService, IAccountDataService { - public AccountDataService(IMongoDatabase database) : base(database, "accounts") { } + public AccountDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "accounts") { } } } diff --git a/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs b/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs index a633072e..c054543e 100644 --- a/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs @@ -2,11 +2,12 @@ using System.Linq; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Data.Personnel { public class DischargeDataService : CachedDataService, IDischargeDataService { - public DischargeDataService(IMongoDatabase database) : base(database, "discharges") { } + public DischargeDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "discharges") { } public override List Get() { return base.Get().OrderByDescending(x => x.discharges.Last().timestamp).ToList(); diff --git a/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs b/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs index 21da3200..0b72ec9f 100644 --- a/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs @@ -1,9 +1,10 @@ using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Data.Personnel { public class LoaDataService : CachedDataService, ILoaDataService { - public LoaDataService(IMongoDatabase database) : base(database, "loas") { } + public LoaDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "loas") { } } } diff --git a/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs b/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs index 24f0bb1a..803f5278 100644 --- a/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs @@ -1,11 +1,12 @@ using System.Collections.Generic; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Data.Personnel { public class RanksDataService : CachedDataService, IRanksDataService { - public RanksDataService(IMongoDatabase database) : base(database, "ranks") { } + public RanksDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "ranks") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs b/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs index 71bd11ad..e56b5a63 100644 --- a/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs @@ -2,11 +2,12 @@ using System.Linq; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Data.Personnel { public class RolesDataService : CachedDataService, IRolesDataService { - public RolesDataService(IMongoDatabase database) : base(database, "roles") { } + public RolesDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "roles") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj b/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj index 26c3be7d..deab75c1 100644 --- a/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj +++ b/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj @@ -6,6 +6,7 @@ + diff --git a/UKSFWebsite.Api.Data/Units/UnitsDataService.cs b/UKSFWebsite.Api.Data/Units/UnitsDataService.cs index 1f97ac14..95095732 100644 --- a/UKSFWebsite.Api.Data/Units/UnitsDataService.cs +++ b/UKSFWebsite.Api.Data/Units/UnitsDataService.cs @@ -2,11 +2,12 @@ using System.Linq; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Units; namespace UKSFWebsite.Api.Data.Units { public class UnitsDataService : CachedDataService, IUnitsDataService { - public UnitsDataService(IMongoDatabase database) : base(database, "units") { } + public UnitsDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "units") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs b/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs index ed2efad5..8dbc2baf 100644 --- a/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs +++ b/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs @@ -1,9 +1,10 @@ using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Utility; namespace UKSFWebsite.Api.Data.Utility { public class ConfirmationCodeDataService : DataService, IConfirmationCodeDataService { - public ConfirmationCodeDataService(IMongoDatabase database) : base(database, "confirmationCodes") { } + public ConfirmationCodeDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "confirmationCodes") { } } } diff --git a/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs b/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs index ac879e78..b94c8dc0 100644 --- a/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs +++ b/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs @@ -1,9 +1,10 @@ using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Utility; namespace UKSFWebsite.Api.Data.Utility { public class SchedulerDataService : DataService, ISchedulerDataService { - public SchedulerDataService(IMongoDatabase database) : base(database, "scheduledJobs") { } + public SchedulerDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "scheduledJobs") { } } } diff --git a/UKSFWebsite.Api.Data/Utility/VariablesDataService.cs b/UKSFWebsite.Api.Data/Utility/VariablesDataService.cs index 0ce70fce..60b31127 100644 --- a/UKSFWebsite.Api.Data/Utility/VariablesDataService.cs +++ b/UKSFWebsite.Api.Data/Utility/VariablesDataService.cs @@ -3,12 +3,13 @@ using System.Threading.Tasks; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Utility; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Data.Utility { public class VariablesDataService : CachedDataService, IVariablesDataService { - public VariablesDataService(IMongoDatabase database) : base(database, "variables") { } + public VariablesDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "variables") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Events/Data/DataEventBacker.cs b/UKSFWebsite.Api.Events/Data/DataEventBacker.cs new file mode 100644 index 00000000..b086e250 --- /dev/null +++ b/UKSFWebsite.Api.Events/Data/DataEventBacker.cs @@ -0,0 +1,17 @@ +using System; +using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Models.Events; + +namespace UKSFWebsite.Api.Events.Data { + public abstract class DataEventBacker : IDataEventBacker { + private readonly IEventBus dataEventBus; + + protected DataEventBacker(IEventBus dataEventBus) => this.dataEventBus = dataEventBus; + + public IObservable EventBus() => dataEventBus.AsObservable(); + + protected virtual void DataEvent(DataEventModel dataEvent) { + dataEventBus.Send(dataEvent); + } + } +} diff --git a/UKSFWebsite.Api.Events/Data/DataEventBus.cs b/UKSFWebsite.Api.Events/Data/DataEventBus.cs new file mode 100644 index 00000000..eac43819 --- /dev/null +++ b/UKSFWebsite.Api.Events/Data/DataEventBus.cs @@ -0,0 +1,17 @@ +using System; +using System.Reactive.Linq; +using System.Reactive.Subjects; +using System.Threading.Tasks; +using UKSFWebsite.Api.Interfaces.Events; + +namespace UKSFWebsite.Api.Events.Data { + public class DataEventBus : IEventBus { + private readonly Subject subject = new Subject(); + + public void Send(T message) { + Task.Run(() => subject.OnNext(message)); + } + + public IObservable AsObservable() => subject.OfType(); + } +} diff --git a/UKSFWebsite.Api.Events/Data/DataEventFactory.cs b/UKSFWebsite.Api.Events/Data/DataEventFactory.cs new file mode 100644 index 00000000..c2ccc841 --- /dev/null +++ b/UKSFWebsite.Api.Events/Data/DataEventFactory.cs @@ -0,0 +1,7 @@ +using UKSFWebsite.Api.Models.Events; + +namespace UKSFWebsite.Api.Events.Data { + public static class DataEventFactory { + public static DataEventModel Create(DataEventType type, string id, object data = null) => new DataEventModel {type = type, id = id, data = data}; + } +} diff --git a/UKSFWebsite.Api.Events/EventHandlerInitialiser.cs b/UKSFWebsite.Api.Events/EventHandlerInitialiser.cs new file mode 100644 index 00000000..43492f78 --- /dev/null +++ b/UKSFWebsite.Api.Events/EventHandlerInitialiser.cs @@ -0,0 +1,24 @@ +using UKSFWebsite.Api.Interfaces.Events; + +namespace UKSFWebsite.Api.Events { + public class EventHandlerInitialiser { + private readonly IAccountEventHandler accountEventHandler; + private readonly ICommandRequestEventHandler commandRequestEventHandler; + private readonly ICommentThreadEventHandler commentThreadEventHandler; + private readonly INotificationsEventHandler notificationsEventHandler; + + public EventHandlerInitialiser(IAccountEventHandler accountEventHandler, ICommandRequestEventHandler commandRequestEventHandler, ICommentThreadEventHandler commentThreadEventHandler, INotificationsEventHandler notificationsEventHandler) { + this.accountEventHandler = accountEventHandler; + this.commandRequestEventHandler = commandRequestEventHandler; + this.commentThreadEventHandler = commentThreadEventHandler; + this.notificationsEventHandler = notificationsEventHandler; + } + + public void InitEventHandlers() { + accountEventHandler.Init(); + commandRequestEventHandler.Init(); + commentThreadEventHandler.Init(); + notificationsEventHandler.Init(); + } + } +} diff --git a/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs new file mode 100644 index 00000000..7dd88363 --- /dev/null +++ b/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs @@ -0,0 +1,33 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.SignalR; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Interfaces.Hubs; +using UKSFWebsite.Api.Models.Events; +using UKSFWebsite.Api.Services.Hubs; + +namespace UKSFWebsite.Api.Events.Handlers { + public class AccountEventHandler : IAccountEventHandler { + private readonly IHubContext hub; + private readonly IAccountDataService data; + + public AccountEventHandler(IAccountDataService data, IHubContext hub) { + this.data = data; + this.hub = hub; + } + + public void Init() { + data.EventBus() + .Subscribe( + async x => { + if (x.type == DataEventType.UPDATE) await UpdatedEvent(x.id); + } + ); + } + + private async Task UpdatedEvent(string id) { + await hub.Clients.Group(id).ReceiveAccountUpdate(); + } + } +} diff --git a/UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs new file mode 100644 index 00000000..7bf6e70b --- /dev/null +++ b/UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs @@ -0,0 +1,40 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.SignalR; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Interfaces.Hubs; +using UKSFWebsite.Api.Models.Events; +using UKSFWebsite.Api.Services.Hubs; + +namespace UKSFWebsite.Api.Events.Handlers { + public class CommandRequestEventHandler : ICommandRequestEventHandler { + private readonly ICommandRequestDataService data; + private readonly IHubContext hub; + + public CommandRequestEventHandler(ICommandRequestDataService data, IHubContext hub) { + this.data = data; + this.hub = hub; + } + + public void Init() { + data.EventBus() + .Subscribe( + async x => { + switch (x.type) { + case DataEventType.ADD: + case DataEventType.UPDATE: + await UpdatedEvent(); + break; + case DataEventType.DELETE: break; + default: throw new ArgumentOutOfRangeException(); + } + } + ); + } + + private async Task UpdatedEvent() { + await hub.Clients.All.ReceiveRequestUpdate(); + } + } +} diff --git a/UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs new file mode 100644 index 00000000..7af2d31d --- /dev/null +++ b/UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs @@ -0,0 +1,50 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.SignalR; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Interfaces.Hubs; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Models.Events; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Services.Hubs; + +namespace UKSFWebsite.Api.Events.Handlers { + public class CommentThreadEventHandler : ICommentThreadEventHandler { + private readonly IHubContext hub; + private readonly ICommentThreadService commentThreadService; + private readonly ICommentThreadDataService data; + + public CommentThreadEventHandler(ICommentThreadDataService data, IHubContext hub, ICommentThreadService commentThreadService) { + this.data = data; + this.hub = hub; + this.commentThreadService = commentThreadService; + } + + public void Init() { + data.EventBus() + .Subscribe( + async x => { + switch (x.type) { + case DataEventType.ADD: + await AddedEvent(x.id, x.data as Comment); + break; + case DataEventType.DELETE: + await DeletedEvent(x.id, x.data as Comment); + break; + case DataEventType.UPDATE: break; + default: throw new ArgumentOutOfRangeException(); + } + } + ); + } + + private async Task AddedEvent(string id, Comment comment) { + await hub.Clients.Group(id).ReceiveComment(commentThreadService.FormatComment(comment)); + } + + private async Task DeletedEvent(string id, Comment comment) { + await hub.Clients.Group(id).DeleteComment(comment.id); + } + } +} diff --git a/UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs new file mode 100644 index 00000000..985d5d43 --- /dev/null +++ b/UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs @@ -0,0 +1,34 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.SignalR; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Interfaces.Hubs; +using UKSFWebsite.Api.Models.Events; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Services.Hubs; + +namespace UKSFWebsite.Api.Events.Handlers { + public class NotificationsEventHandler : INotificationsEventHandler { + private readonly INotificationsDataService data; + private readonly IHubContext hub; + + public NotificationsEventHandler(INotificationsDataService data, IHubContext hub) { + this.data = data; + this.hub = hub; + } + + public void Init() { + data.EventBus() + .Subscribe( + async x => { + if (x.type == DataEventType.ADD) await AddedEvent(x.data as Notification); + } + ); + } + + private async Task AddedEvent(Notification notification) { + await hub.Clients.Group(notification.owner).ReceiveNotification(notification); + } + } +} diff --git a/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj b/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj new file mode 100644 index 00000000..5bbac31f --- /dev/null +++ b/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp3.0 + + + + + + + + + + + + + diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs index 56e3d4cf..2ea78c19 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs @@ -1,8 +1,10 @@ using System.Threading.Tasks; +using UKSFWebsite.Api.Models.Events; using UKSFWebsite.Api.Models.Message; namespace UKSFWebsite.Api.Interfaces.Data.Cached { public interface ICommentThreadDataService : IDataService { new Task Add(CommentThread commentThread); + Task Update(string id, Comment comment, DataEventType updateType); } } diff --git a/UKSFWebsite.Api.Interfaces/Data/IDataService.cs b/UKSFWebsite.Api.Interfaces/Data/IDataService.cs index 3f150ada..865bea69 100644 --- a/UKSFWebsite.Api.Interfaces/Data/IDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/IDataService.cs @@ -2,9 +2,10 @@ using System.Collections.Generic; using System.Threading.Tasks; using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Events; namespace UKSFWebsite.Api.Interfaces.Data { - public interface IDataService { + public interface IDataService : IDataEventBacker { List Get(); List Get(Func predicate); T GetSingle(string id); diff --git a/UKSFWebsite.Api.Interfaces/Events/IAccountEventHandler.cs b/UKSFWebsite.Api.Interfaces/Events/IAccountEventHandler.cs new file mode 100644 index 00000000..d8a70c44 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Events/IAccountEventHandler.cs @@ -0,0 +1,3 @@ +namespace UKSFWebsite.Api.Interfaces.Events { + public interface IAccountEventHandler : IEventHandler { } +} diff --git a/UKSFWebsite.Api.Interfaces/Events/ICommandRequestEventHandler.cs b/UKSFWebsite.Api.Interfaces/Events/ICommandRequestEventHandler.cs new file mode 100644 index 00000000..25ef6f16 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Events/ICommandRequestEventHandler.cs @@ -0,0 +1,3 @@ +namespace UKSFWebsite.Api.Interfaces.Events { + public interface ICommandRequestEventHandler : IEventHandler { } +} diff --git a/UKSFWebsite.Api.Interfaces/Events/ICommentThreadEventHandler.cs b/UKSFWebsite.Api.Interfaces/Events/ICommentThreadEventHandler.cs new file mode 100644 index 00000000..fe03c4e3 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Events/ICommentThreadEventHandler.cs @@ -0,0 +1,3 @@ +namespace UKSFWebsite.Api.Interfaces.Events { + public interface ICommentThreadEventHandler : IEventHandler { } +} diff --git a/UKSFWebsite.Api.Interfaces/Events/IDataEventBacker.cs b/UKSFWebsite.Api.Interfaces/Events/IDataEventBacker.cs new file mode 100644 index 00000000..394448dc --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Events/IDataEventBacker.cs @@ -0,0 +1,8 @@ +using System; +using UKSFWebsite.Api.Models.Events; + +namespace UKSFWebsite.Api.Interfaces.Events { + public interface IDataEventBacker { + IObservable EventBus(); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Events/IEventBus.cs b/UKSFWebsite.Api.Interfaces/Events/IEventBus.cs new file mode 100644 index 00000000..c07668ed --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Events/IEventBus.cs @@ -0,0 +1,8 @@ +using System; + +namespace UKSFWebsite.Api.Interfaces.Events { + public interface IEventBus { + void Send(T message); + IObservable AsObservable(); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Events/IEventHandler.cs b/UKSFWebsite.Api.Interfaces/Events/IEventHandler.cs new file mode 100644 index 00000000..ee1a23ce --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Events/IEventHandler.cs @@ -0,0 +1,5 @@ +namespace UKSFWebsite.Api.Interfaces.Events { + public interface IEventHandler { + void Init(); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Events/INotificationsEventHandler.cs b/UKSFWebsite.Api.Interfaces/Events/INotificationsEventHandler.cs new file mode 100644 index 00000000..0e69053e --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Events/INotificationsEventHandler.cs @@ -0,0 +1,3 @@ +namespace UKSFWebsite.Api.Interfaces.Events { + public interface INotificationsEventHandler : IEventHandler { } +} diff --git a/UKSFWebsite.Api.Services/Hubs/Abstraction/IAccountClient.cs b/UKSFWebsite.Api.Interfaces/Hubs/IAccountClient.cs similarity index 67% rename from UKSFWebsite.Api.Services/Hubs/Abstraction/IAccountClient.cs rename to UKSFWebsite.Api.Interfaces/Hubs/IAccountClient.cs index 3d9b1fb8..e859ea4f 100644 --- a/UKSFWebsite.Api.Services/Hubs/Abstraction/IAccountClient.cs +++ b/UKSFWebsite.Api.Interfaces/Hubs/IAccountClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Services.Hubs.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Hubs { public interface IAccountClient { Task ReceiveAccountUpdate(); } diff --git a/UKSFWebsite.Api.Services/Hubs/Abstraction/IAdminClient.cs b/UKSFWebsite.Api.Interfaces/Hubs/IAdminClient.cs similarity index 85% rename from UKSFWebsite.Api.Services/Hubs/Abstraction/IAdminClient.cs rename to UKSFWebsite.Api.Interfaces/Hubs/IAdminClient.cs index d05d4048..6da26f29 100644 --- a/UKSFWebsite.Api.Services/Hubs/Abstraction/IAdminClient.cs +++ b/UKSFWebsite.Api.Interfaces/Hubs/IAdminClient.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using UKSFWebsite.Api.Models.Message.Logging; -namespace UKSFWebsite.Api.Services.Hubs.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Hubs { public interface IAdminClient { Task ReceiveAuditLog(AuditLogMessage log); Task ReceiveErrorLog(WebLogMessage log); diff --git a/UKSFWebsite.Api.Services/Hubs/Abstraction/ICommandRequestsClient.cs b/UKSFWebsite.Api.Interfaces/Hubs/ICommandRequestsClient.cs similarity index 69% rename from UKSFWebsite.Api.Services/Hubs/Abstraction/ICommandRequestsClient.cs rename to UKSFWebsite.Api.Interfaces/Hubs/ICommandRequestsClient.cs index 0a4ca0af..35de85a2 100644 --- a/UKSFWebsite.Api.Services/Hubs/Abstraction/ICommandRequestsClient.cs +++ b/UKSFWebsite.Api.Interfaces/Hubs/ICommandRequestsClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Services.Hubs.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Hubs { public interface ICommandRequestsClient { Task ReceiveRequestUpdate(); } diff --git a/UKSFWebsite.Api.Services/Hubs/Abstraction/ICommentThreadClient.cs b/UKSFWebsite.Api.Interfaces/Hubs/ICommentThreadClient.cs similarity index 57% rename from UKSFWebsite.Api.Services/Hubs/Abstraction/ICommentThreadClient.cs rename to UKSFWebsite.Api.Interfaces/Hubs/ICommentThreadClient.cs index 50378df3..fdcba1f4 100644 --- a/UKSFWebsite.Api.Services/Hubs/Abstraction/ICommentThreadClient.cs +++ b/UKSFWebsite.Api.Interfaces/Hubs/ICommentThreadClient.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Services.Hubs.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Hubs { public interface ICommentThreadClient { Task ReceiveComment(object comment); - Task DeleteComment(int index); + Task DeleteComment(string id); } } diff --git a/UKSFWebsite.Api.Services/Hubs/Abstraction/ILauncherClient.cs b/UKSFWebsite.Api.Interfaces/Hubs/ILauncherClient.cs similarity index 70% rename from UKSFWebsite.Api.Services/Hubs/Abstraction/ILauncherClient.cs rename to UKSFWebsite.Api.Interfaces/Hubs/ILauncherClient.cs index b6da2320..4a4acf26 100644 --- a/UKSFWebsite.Api.Services/Hubs/Abstraction/ILauncherClient.cs +++ b/UKSFWebsite.Api.Interfaces/Hubs/ILauncherClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Services.Hubs.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Hubs { public interface ILauncherClient { Task ReceiveLauncherVersion(string version); } diff --git a/UKSFWebsite.Api.Services/Hubs/Abstraction/INotificationsClient.cs b/UKSFWebsite.Api.Interfaces/Hubs/INotificationsClient.cs similarity index 83% rename from UKSFWebsite.Api.Services/Hubs/Abstraction/INotificationsClient.cs rename to UKSFWebsite.Api.Interfaces/Hubs/INotificationsClient.cs index 3badcb2d..71b50e60 100644 --- a/UKSFWebsite.Api.Services/Hubs/Abstraction/INotificationsClient.cs +++ b/UKSFWebsite.Api.Interfaces/Hubs/INotificationsClient.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace UKSFWebsite.Api.Services.Hubs.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Hubs { public interface INotificationsClient { Task ReceiveNotification(object notification); Task ReceiveRead(IEnumerable ids); diff --git a/UKSFWebsite.Api.Services/Hubs/Abstraction/IServersClient.cs b/UKSFWebsite.Api.Interfaces/Hubs/IServersClient.cs similarity index 69% rename from UKSFWebsite.Api.Services/Hubs/Abstraction/IServersClient.cs rename to UKSFWebsite.Api.Interfaces/Hubs/IServersClient.cs index 055a3997..b4177eb5 100644 --- a/UKSFWebsite.Api.Services/Hubs/Abstraction/IServersClient.cs +++ b/UKSFWebsite.Api.Interfaces/Hubs/IServersClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Services.Hubs.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Hubs { public interface IServersClient { Task ReceiveDisabledState(bool state); } diff --git a/UKSFWebsite.Api.Services/Hubs/Abstraction/ITeamspeakClientsClient.cs b/UKSFWebsite.Api.Interfaces/Hubs/ITeamspeakClientsClient.cs similarity index 70% rename from UKSFWebsite.Api.Services/Hubs/Abstraction/ITeamspeakClientsClient.cs rename to UKSFWebsite.Api.Interfaces/Hubs/ITeamspeakClientsClient.cs index 70f046f3..de5423a2 100644 --- a/UKSFWebsite.Api.Services/Hubs/Abstraction/ITeamspeakClientsClient.cs +++ b/UKSFWebsite.Api.Interfaces/Hubs/ITeamspeakClientsClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Services.Hubs.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Hubs { public interface ITeamspeakClientsClient { Task ReceiveClients(object clients); } diff --git a/UKSFWebsite.Api.Services/Hubs/Abstraction/IUtilityClient.cs b/UKSFWebsite.Api.Interfaces/Hubs/IUtilityClient.cs similarity index 70% rename from UKSFWebsite.Api.Services/Hubs/Abstraction/IUtilityClient.cs rename to UKSFWebsite.Api.Interfaces/Hubs/IUtilityClient.cs index ac4c038f..f63c949b 100644 --- a/UKSFWebsite.Api.Services/Hubs/Abstraction/IUtilityClient.cs +++ b/UKSFWebsite.Api.Interfaces/Hubs/IUtilityClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Services.Hubs.Abstraction { +namespace UKSFWebsite.Api.Interfaces.Hubs { public interface IUtilityClient { Task ReceiveFrontendUpdate(string version); } diff --git a/UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs b/UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs index 446d203e..60d00c9f 100644 --- a/UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs +++ b/UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs @@ -9,5 +9,6 @@ public interface ICommentThreadService : IDataBackedService GetCommentThreadParticipants(string id); + object FormatComment(Comment comment); } } diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs index 8a3e4612..f415a977 100644 --- a/UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs +++ b/UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs @@ -1,11 +1,5 @@ -using System.Threading.Tasks; -using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Interfaces.Data.Cached; namespace UKSFWebsite.Api.Interfaces.Personnel { - public interface IAccountService : IDataBackedService { - Task Update(string id, string fieldName, object value); - Task Update(string id, UpdateDefinition update); - } + public interface IAccountService : IDataBackedService { } } diff --git a/UKSFWebsite.Api.Models/Events/DataEventModel.cs b/UKSFWebsite.Api.Models/Events/DataEventModel.cs new file mode 100644 index 00000000..b16cfb69 --- /dev/null +++ b/UKSFWebsite.Api.Models/Events/DataEventModel.cs @@ -0,0 +1,13 @@ +namespace UKSFWebsite.Api.Models.Events { + public enum DataEventType { + ADD, + UPDATE, + DELETE + } + + public class DataEventModel { + public DataEventType type; + public string id; + public object data; + } +} diff --git a/UKSFWebsite.Api.Services/Command/CommandRequestCompletionService.cs b/UKSFWebsite.Api.Services/Command/CommandRequestCompletionService.cs index fd007ce2..408e5cea 100644 --- a/UKSFWebsite.Api.Services/Command/CommandRequestCompletionService.cs +++ b/UKSFWebsite.Api.Services/Command/CommandRequestCompletionService.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Command; +using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Units; @@ -13,7 +14,6 @@ using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Models.Units; using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Hubs.Abstraction; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Personnel; diff --git a/UKSFWebsite.Api.Services/Command/CommandRequestService.cs b/UKSFWebsite.Api.Services/Command/CommandRequestService.cs index ffe70408..37ec8412 100644 --- a/UKSFWebsite.Api.Services/Command/CommandRequestService.cs +++ b/UKSFWebsite.Api.Services/Command/CommandRequestService.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Threading.Tasks; using AvsAnLib; -using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Command; using UKSFWebsite.Api.Interfaces.Data; @@ -15,8 +14,6 @@ using UKSFWebsite.Api.Models.Command; using UKSFWebsite.Api.Models.Message; using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Hubs.Abstraction; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Personnel; @@ -24,7 +21,6 @@ namespace UKSFWebsite.Api.Services.Command { public class CommandRequestService : ICommandRequestService { private readonly IAccountService accountService; private readonly IChainOfCommandService chainOfCommandService; - private readonly IHubContext commandRequestsHub; private readonly ICommandRequestDataService data; private readonly ICommandRequestArchiveDataService dataArchive; private readonly IDisplayNameService displayNameService; @@ -42,8 +38,7 @@ public CommandRequestService( IAccountService accountService, IChainOfCommandService chainOfCommandService, IUnitsService unitsService, - IRanksService ranksService, - IHubContext commandRequestsHub + IRanksService ranksService ) { this.data = data; this.dataArchive = dataArchive; @@ -54,7 +49,6 @@ IHubContext commandRequestsHub this.chainOfCommandService = chainOfCommandService; this.unitsService = unitsService; this.ranksService = ranksService; - this.commandRequestsHub = commandRequestsHub; } public ICommandRequestDataService Data() => data; @@ -79,8 +73,6 @@ public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfC foreach (Account account in accounts.Where(x => x.id != requesterAccount.id)) { notificationsService.Add(new Notification {owner = account.id, icon = NotificationIcons.REQUEST, message = notificationMessage, link = "/command/requests"}); } - - await commandRequestsHub.Clients.All.ReceiveRequestUpdate(); } public async Task ArchiveRequest(string id) { diff --git a/UKSFWebsite.Api.Services/Debug/FakeDataService.cs b/UKSFWebsite.Api.Services/Debug/FakeDataService.cs index 0e9e6564..cdc8f071 100644 --- a/UKSFWebsite.Api.Services/Debug/FakeDataService.cs +++ b/UKSFWebsite.Api.Services/Debug/FakeDataService.cs @@ -1,8 +1,10 @@ using System; using System.Collections.Generic; +using System.Reactive.Subjects; using System.Threading.Tasks; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Models.Events; namespace UKSFWebsite.Api.Services.Debug { public abstract class FakeDataService : IDataService { @@ -21,5 +23,7 @@ public abstract class FakeDataService : IDataService { public Task Update(string id, UpdateDefinition update) => Task.CompletedTask; public Task Delete(string id) => Task.CompletedTask; + + public IObservable EventBus() => new Subject(); } } diff --git a/UKSFWebsite.Api.Services/Debug/FakeNotificationsDataService.cs b/UKSFWebsite.Api.Services/Debug/FakeNotificationsDataService.cs deleted file mode 100644 index 1efc5943..00000000 --- a/UKSFWebsite.Api.Services/Debug/FakeNotificationsDataService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Threading.Tasks; -using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Models.Message; - -namespace UKSFWebsite.Api.Services.Debug { - public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { - public Task UpdateMany(FilterDefinition filter, UpdateDefinition update) => Task.CompletedTask; - - public Task DeleteMany(FilterDefinition filter) => Task.CompletedTask; - } -} diff --git a/UKSFWebsite.Api.Services/Hubs/AccountHub.cs b/UKSFWebsite.Api.Services/Hubs/AccountHub.cs index 319b17e5..242cd3b7 100644 --- a/UKSFWebsite.Api.Services/Hubs/AccountHub.cs +++ b/UKSFWebsite.Api.Services/Hubs/AccountHub.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; -using UKSFWebsite.Api.Services.Hubs.Abstraction; +using UKSFWebsite.Api.Interfaces.Hubs; namespace UKSFWebsite.Api.Services.Hubs { [Authorize] diff --git a/UKSFWebsite.Api.Services/Hubs/AdminHub.cs b/UKSFWebsite.Api.Services/Hubs/AdminHub.cs index a124d956..b91ef4f2 100644 --- a/UKSFWebsite.Api.Services/Hubs/AdminHub.cs +++ b/UKSFWebsite.Api.Services/Hubs/AdminHub.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Services.Hubs.Abstraction; +using UKSFWebsite.Api.Interfaces.Hubs; namespace UKSFWebsite.Api.Services.Hubs { [Authorize] diff --git a/UKSFWebsite.Api.Services/Hubs/CommandRequestsHub.cs b/UKSFWebsite.Api.Services/Hubs/CommandRequestsHub.cs index b5d488c0..5d1e8dfb 100644 --- a/UKSFWebsite.Api.Services/Hubs/CommandRequestsHub.cs +++ b/UKSFWebsite.Api.Services/Hubs/CommandRequestsHub.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Services.Hubs.Abstraction; +using UKSFWebsite.Api.Interfaces.Hubs; namespace UKSFWebsite.Api.Services.Hubs { [Authorize] diff --git a/UKSFWebsite.Api.Services/Hubs/CommentThreadHub.cs b/UKSFWebsite.Api.Services/Hubs/CommentThreadHub.cs index 8ba09715..a98374bb 100644 --- a/UKSFWebsite.Api.Services/Hubs/CommentThreadHub.cs +++ b/UKSFWebsite.Api.Services/Hubs/CommentThreadHub.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; -using UKSFWebsite.Api.Services.Hubs.Abstraction; +using UKSFWebsite.Api.Interfaces.Hubs; namespace UKSFWebsite.Api.Services.Hubs { [Authorize] diff --git a/UKSFWebsite.Api.Services/Hubs/LauncherHub.cs b/UKSFWebsite.Api.Services/Hubs/LauncherHub.cs index 8e5d46c9..6c2db2dd 100644 --- a/UKSFWebsite.Api.Services/Hubs/LauncherHub.cs +++ b/UKSFWebsite.Api.Services/Hubs/LauncherHub.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Services.Hubs.Abstraction; +using UKSFWebsite.Api.Interfaces.Hubs; namespace UKSFWebsite.Api.Services.Hubs { [Authorize] diff --git a/UKSFWebsite.Api.Services/Hubs/NotificationsHub.cs b/UKSFWebsite.Api.Services/Hubs/NotificationsHub.cs index a8c11c85..8ed041eb 100644 --- a/UKSFWebsite.Api.Services/Hubs/NotificationsHub.cs +++ b/UKSFWebsite.Api.Services/Hubs/NotificationsHub.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; -using UKSFWebsite.Api.Services.Hubs.Abstraction; +using UKSFWebsite.Api.Interfaces.Hubs; namespace UKSFWebsite.Api.Services.Hubs { [Authorize] diff --git a/UKSFWebsite.Api.Services/Hubs/ServersHub.cs b/UKSFWebsite.Api.Services/Hubs/ServersHub.cs index 0918de14..36de5491 100644 --- a/UKSFWebsite.Api.Services/Hubs/ServersHub.cs +++ b/UKSFWebsite.Api.Services/Hubs/ServersHub.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Services.Hubs.Abstraction; +using UKSFWebsite.Api.Interfaces.Hubs; namespace UKSFWebsite.Api.Services.Hubs { public class ServersHub : Hub { diff --git a/UKSFWebsite.Api.Services/Hubs/TeamspeakClientsHub.cs b/UKSFWebsite.Api.Services/Hubs/TeamspeakClientsHub.cs index f0f88ba8..578b9a68 100644 --- a/UKSFWebsite.Api.Services/Hubs/TeamspeakClientsHub.cs +++ b/UKSFWebsite.Api.Services/Hubs/TeamspeakClientsHub.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Services.Hubs.Abstraction; +using UKSFWebsite.Api.Interfaces.Hubs; namespace UKSFWebsite.Api.Services.Hubs { [Authorize] diff --git a/UKSFWebsite.Api.Services/Hubs/UtilityHub.cs b/UKSFWebsite.Api.Services/Hubs/UtilityHub.cs index b3ad4f7b..827af913 100644 --- a/UKSFWebsite.Api.Services/Hubs/UtilityHub.cs +++ b/UKSFWebsite.Api.Services/Hubs/UtilityHub.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Services.Hubs.Abstraction; +using UKSFWebsite.Api.Interfaces.Hubs; namespace UKSFWebsite.Api.Services.Hubs { public class UtilityHub : Hub { diff --git a/UKSFWebsite.Api.Services/Integrations/TeamspeakService.cs b/UKSFWebsite.Api.Services/Integrations/TeamspeakService.cs index a22fab0b..5c8d97ae 100644 --- a/UKSFWebsite.Api.Services/Integrations/TeamspeakService.cs +++ b/UKSFWebsite.Api.Services/Integrations/TeamspeakService.cs @@ -8,11 +8,11 @@ using MongoDB.Driver; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Integrations; using UKSFWebsite.Api.Models.Integrations; using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Hubs.Abstraction; using UKSFWebsite.Api.Services.Integrations.Procedures; namespace UKSFWebsite.Api.Services.Integrations { diff --git a/UKSFWebsite.Api.Services/Launcher/LauncherService.cs b/UKSFWebsite.Api.Services/Launcher/LauncherService.cs index c9f3b2bb..d68007aa 100644 --- a/UKSFWebsite.Api.Services/Launcher/LauncherService.cs +++ b/UKSFWebsite.Api.Services/Launcher/LauncherService.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.SignalR; +using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Launcher; using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Hubs.Abstraction; namespace UKSFWebsite.Api.Services.Launcher { public class LauncherService : ILauncherService { diff --git a/UKSFWebsite.Api.Services/Message/CommentThreadService.cs b/UKSFWebsite.Api.Services/Message/CommentThreadService.cs index 04d0e5e5..8763d903 100644 --- a/UKSFWebsite.Api.Services/Message/CommentThreadService.cs +++ b/UKSFWebsite.Api.Services/Message/CommentThreadService.cs @@ -1,27 +1,32 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Models.Events; using UKSFWebsite.Api.Models.Message; namespace UKSFWebsite.Api.Services.Message { public class CommentThreadService : ICommentThreadService { private readonly ICommentThreadDataService data; + private readonly IDisplayNameService displayNameService; - public CommentThreadService(ICommentThreadDataService data) => this.data = data; + public CommentThreadService(ICommentThreadDataService data, IDisplayNameService displayNameService) { + this.data = data; + this.displayNameService = displayNameService; + } public ICommentThreadDataService Data() => data; public IEnumerable GetCommentThreadComments(string id) => data.GetSingle(id).comments.Reverse(); public async Task InsertComment(string id, Comment comment) { - await data.Update(id, Builders.Update.Push("comments", comment)); + await data.Update(id, comment, DataEventType.ADD); } public async Task RemoveComment(string id, Comment comment) { - await data.Update(id, Builders.Update.Pull("comments", comment)); + await data.Update(id, comment, DataEventType.DELETE); } public IEnumerable GetCommentThreadParticipants(string id) { @@ -29,5 +34,14 @@ public IEnumerable GetCommentThreadParticipants(string id) { participants.UnionWith(data.GetSingle(id).authors); return participants; } + + public object FormatComment(Comment comment) => + new { + Id = comment.id, + Author = comment.author, + Content = comment.content, + DisplayName = displayNameService.GetDisplayName(comment.author), + Timestamp = comment.timestamp + }; } } diff --git a/UKSFWebsite.Api.Services/Message/LogWrapper.cs b/UKSFWebsite.Api.Services/Message/LogWrapper.cs index 5ff8166b..52af7203 100644 --- a/UKSFWebsite.Api.Services/Message/LogWrapper.cs +++ b/UKSFWebsite.Api.Services/Message/LogWrapper.cs @@ -2,7 +2,6 @@ using Microsoft.Extensions.DependencyInjection; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Models.Message.Logging; -using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Services.Message { public static class LogWrapper { diff --git a/UKSFWebsite.Api.Services/Message/LoggingService.cs b/UKSFWebsite.Api.Services/Message/LoggingService.cs index 68177419..26c8e2cc 100644 --- a/UKSFWebsite.Api.Services/Message/LoggingService.cs +++ b/UKSFWebsite.Api.Services/Message/LoggingService.cs @@ -2,11 +2,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Models.Message.Logging; using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Hubs.Abstraction; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Services.Message { diff --git a/UKSFWebsite.Api.Services/Message/NotificationsService.cs b/UKSFWebsite.Api.Services/Message/NotificationsService.cs index b8889c19..5a27dcd1 100644 --- a/UKSFWebsite.Api.Services/Message/NotificationsService.cs +++ b/UKSFWebsite.Api.Services/Message/NotificationsService.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Integrations; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Interfaces.Personnel; @@ -11,7 +12,6 @@ using UKSFWebsite.Api.Models.Message; using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Hubs.Abstraction; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Services.Message { @@ -35,11 +35,13 @@ public NotificationsService(INotificationsDataService data, ITeamspeakService te public INotificationsDataService Data() => data; public void SendTeamspeakNotification(Account account, string rawMessage) { + return; rawMessage = rawMessage.Replace("", "[/url]"); teamspeakService.SendTeamspeakMessageToClient(account, rawMessage); } public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { + return; rawMessage = rawMessage.Replace("", "[/url]"); teamspeakService.SendTeamspeakMessageToClient(clientDbIds, rawMessage); } @@ -79,11 +81,10 @@ private async Task AddNotificationAsync(Notification notification) { if (account.settings.notificationsTeamspeak) { SendTeamspeakNotification(account, $"{notification.message}{(notification.link != null ? $"\n[url]https://uk-sf.co.uk{notification.link}[/url]" : "")}"); } - - await notificationsHub.Clients.Group(account.id).ReceiveNotification(notification); } private void SendEmailNotification(string email, string message) { + return; message += "

You can opt-out of these emails by unchecking 'Email notifications' in your Profile"; emailService.SendEmail(email, "UKSF Notification", message); } diff --git a/UKSFWebsite.Api.Services/Personnel/AccountService.cs b/UKSFWebsite.Api.Services/Personnel/AccountService.cs index 09bf5a39..0a089e34 100644 --- a/UKSFWebsite.Api.Services/Personnel/AccountService.cs +++ b/UKSFWebsite.Api.Services/Personnel/AccountService.cs @@ -1,32 +1,12 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.SignalR; -using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Hubs.Abstraction; namespace UKSFWebsite.Api.Services.Personnel { public class AccountService : IAccountService { - private readonly IHubContext accountHub; private readonly IAccountDataService data; - public AccountService(IAccountDataService data, IHubContext accountHub) { - this.data = data; - this.accountHub = accountHub; - } + public AccountService(IAccountDataService data) => this.data = data; public IAccountDataService Data() => data; - - public async Task Update(string id, string fieldName, object value) { - await data.Update(id, fieldName, value); - await accountHub.Clients.Group(id).ReceiveAccountUpdate(); // TODO: Implement event bus for signals, move to base data services - } - - public async Task Update(string id, UpdateDefinition update) { - await data.Update(id, update); - await accountHub.Clients.Group(id).ReceiveAccountUpdate(); - } } } diff --git a/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs b/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs index 33748afe..338190f1 100644 --- a/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs +++ b/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using AvsAnLib; using Microsoft.AspNetCore.SignalR; +using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Integrations; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Units; @@ -12,7 +13,6 @@ using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Models.Units; using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Hubs.Abstraction; namespace UKSFWebsite.Api.Services.Personnel { public class AssignmentService : IAssignmentService { diff --git a/UKSFWebsite.Api.Services/Utility/ServiceWrapper.cs b/UKSFWebsite.Api.Services/ServiceWrapper.cs similarity index 72% rename from UKSFWebsite.Api.Services/Utility/ServiceWrapper.cs rename to UKSFWebsite.Api.Services/ServiceWrapper.cs index c0f5f940..fcd71eb1 100644 --- a/UKSFWebsite.Api.Services/Utility/ServiceWrapper.cs +++ b/UKSFWebsite.Api.Services/ServiceWrapper.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSFWebsite.Api.Services { public static class ServiceWrapper { public static IServiceProvider ServiceProvider; } diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index 61377347..e21ec66c 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -17,6 +17,7 @@ + diff --git a/UKSFWebsite.Api.Services/Units/UnitsService.cs b/UKSFWebsite.Api.Services/Units/UnitsService.cs index 2a92161d..90a51eec 100644 --- a/UKSFWebsite.Api.Services/Units/UnitsService.cs +++ b/UKSFWebsite.Api.Services/Units/UnitsService.cs @@ -6,12 +6,12 @@ using MongoDB.Bson; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Units; using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Models.Units; using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Hubs.Abstraction; namespace UKSFWebsite.Api.Services.Units { public class UnitsService : IUnitsService { diff --git a/UKSFWebsite.Api.Services/Utility/Events.cs b/UKSFWebsite.Api.Services/Utility/Events.cs deleted file mode 100644 index f1fafc2a..00000000 --- a/UKSFWebsite.Api.Services/Utility/Events.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace UKSFWebsite.Api.Services.Utility { - public delegate void EventHandler(); -} diff --git a/UKSFWebsite.Api/Controllers/ApplicationsController.cs b/UKSFWebsite.Api/Controllers/ApplicationsController.cs index f7604fe0..74cf2f28 100644 --- a/UKSFWebsite.Api/Controllers/ApplicationsController.cs +++ b/UKSFWebsite.Api/Controllers/ApplicationsController.cs @@ -59,7 +59,7 @@ public async Task Post([FromBody] JObject body) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, "", "Applicant", "Candidate", reason: "you were entered into the recruitment process"); notificationsService.Add(notification); notificationsService.Add(new Notification {owner = application.recruiter, icon = NotificationIcons.APPLICATION, message = $"You have been assigned {account.firstname} {account.lastname}'s application", link = $"/recruitment/{account.id}"}); - foreach (string sr1Id in recruitmentService.GetSr1Leads().Cast().Where(sr1Id => account.application.recruiter != sr1Id)) { + foreach (string sr1Id in recruitmentService.GetSr1Leads().Values.Where(sr1Id => account.application.recruiter != sr1Id)) { notificationsService.Add( new Notification {owner = sr1Id, icon = NotificationIcons.APPLICATION, message = $"{displayNameService.GetDisplayName(account.application.recruiter)} has been assigned {account.firstname} {account.lastname}'s application", link = $"/recruitment/{account.id}"} ); diff --git a/UKSFWebsite.Api/Controllers/CommentThreadController.cs b/UKSFWebsite.Api/Controllers/CommentThreadController.cs index f53758bb..d0b9be49 100644 --- a/UKSFWebsite.Api/Controllers/CommentThreadController.cs +++ b/UKSFWebsite.Api/Controllers/CommentThreadController.cs @@ -4,22 +4,18 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.SignalR; using MongoDB.Bson; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Models.Message; using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Hubs.Abstraction; using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers { [Route("commentthread"), Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER, RoleDefinitions.DISCHARGED)] public class CommentThreadController : Controller { private readonly IAccountService accountService; - private readonly IHubContext commentThreadHub; private readonly ICommentThreadService commentThreadService; private readonly IDisplayNameService displayNameService; private readonly INotificationsService notificationsService; @@ -27,16 +23,7 @@ public class CommentThreadController : Controller { private readonly IRecruitmentService recruitmentService; private readonly ISessionService sessionService; - public CommentThreadController( - ICommentThreadService commentThreadService, - ISessionService sessionService, - IRanksService ranksService, - IAccountService accountService, - IDisplayNameService displayNameService, - IRecruitmentService recruitmentService, - INotificationsService notificationsService, - IHubContext commentThreadHub - ) { + public CommentThreadController(ICommentThreadService commentThreadService, ISessionService sessionService, IRanksService ranksService, IAccountService accountService, IDisplayNameService displayNameService, IRecruitmentService recruitmentService, INotificationsService notificationsService) { this.commentThreadService = commentThreadService; this.sessionService = sessionService; this.ranksService = ranksService; @@ -44,7 +31,6 @@ IHubContext commentThreadHub this.displayNameService = displayNameService; this.recruitmentService = recruitmentService; this.notificationsService = notificationsService; - this.commentThreadHub = commentThreadHub; } [HttpGet("{id}"), Authorize] @@ -68,10 +54,9 @@ public IActionResult Get(string id) { [HttpGet("canpost/{id}"), Authorize] public IActionResult GetCanPostComment(string id) { CommentThread commentThread = commentThreadService.Data().GetSingle(id); - bool canPost; Account account = sessionService.GetContextAccount(); bool admin = sessionService.ContextHasRole(RoleDefinitions.ADMIN); - canPost = commentThread.mode switch { + bool canPost = commentThread.mode switch { ThreadMode.SR1 => (commentThread.authors.Any(x => x == sessionService.GetContextId()) || admin || recruitmentService.IsRecruiter(sessionService.GetContextAccount())), ThreadMode.RANKSUPERIOR => commentThread.authors.Any(x => admin || ranksService.IsSuperior(account.rank, accountService.Data().GetSingle(x).rank)), ThreadMode.RANKEQUAL => commentThread.authors.Any(x => admin || ranksService.IsEqual(account.rank, accountService.Data().GetSingle(x).rank)), @@ -87,29 +72,20 @@ public async Task AddComment(string id, [FromBody] Comment commen comment.id = ObjectId.GenerateNewId().ToString(); comment.timestamp = DateTime.Now; comment.author = sessionService.GetContextId(); - CommentThread thread = commentThreadService.Data().GetSingle(id); await commentThreadService.InsertComment(id, comment); + CommentThread thread = commentThreadService.Data().GetSingle(id); IEnumerable participants = commentThreadService.GetCommentThreadParticipants(thread.id); foreach (string objectId in participants.Where(x => x != comment.author)) { - notificationsService.Add( + notificationsService.Add( // TODO: Set correct link when comment thread is between /application and /recruitment/id new Notification { owner = objectId, icon = NotificationIcons.COMMENT, - message = $"{displayNameService.GetDisplayName(comment.author)} replied to a comment:\n{comment.content}", + message = $"{displayNameService.GetDisplayName(comment.author)} replied to a comment:\n\"{comment.content}\"", link = HttpContext.Request.Headers["Referer"].ToString().Replace("http://localhost:4200", "").Replace("https://www.uk-sf.co.uk", "").Replace("https://uk-sf.co.uk", "") } ); } - var returnComment = new { - Id = comment.id, - Author = comment.author, - Content = comment.content, - DisplayName = displayNameService.GetDisplayName(comment.author), - Timestamp = comment.timestamp - }; - await commentThreadHub.Clients.Group($"{id}").ReceiveComment(returnComment); - return Ok(); } @@ -117,9 +93,7 @@ public async Task AddComment(string id, [FromBody] Comment commen public async Task DeleteComment(string id, string commentId) { List comments = commentThreadService.GetCommentThreadComments(id).ToList(); Comment comment = comments.FirstOrDefault(x => x.id == commentId); - int commentIndex = comments.IndexOf(comment); await commentThreadService.RemoveComment(id, comment); - await commentThreadHub.Clients.Group($"{id}").DeleteComment(commentIndex); return Ok(); } } diff --git a/UKSFWebsite.Api/Controllers/GameServersController.cs b/UKSFWebsite.Api/Controllers/GameServersController.cs index 0736f2f0..ba6244ad 100644 --- a/UKSFWebsite.Api/Controllers/GameServersController.cs +++ b/UKSFWebsite.Api/Controllers/GameServersController.cs @@ -9,12 +9,12 @@ using MongoDB.Driver; using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Game; +using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Models.Game; using UKSFWebsite.Api.Models.Mission; using UKSFWebsite.Api.Services.Game; using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Hubs.Abstraction; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Utility; diff --git a/UKSFWebsite.Api/Controllers/LauncherController.cs b/UKSFWebsite.Api/Controllers/LauncherController.cs index f4d73a39..7e851865 100644 --- a/UKSFWebsite.Api/Controllers/LauncherController.cs +++ b/UKSFWebsite.Api/Controllers/LauncherController.cs @@ -7,13 +7,13 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Launcher; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Models.Launcher; using UKSFWebsite.Api.Models.Message.Logging; using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Hubs.Abstraction; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Utility; diff --git a/UKSFWebsite.Api/Controllers/VersionController.cs b/UKSFWebsite.Api/Controllers/VersionController.cs index 71048635..c6028e39 100644 --- a/UKSFWebsite.Api/Controllers/VersionController.cs +++ b/UKSFWebsite.Api/Controllers/VersionController.cs @@ -4,8 +4,8 @@ using Microsoft.AspNetCore.SignalR; using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Hubs.Abstraction; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Controllers { diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 77269bcb..69ac9e79 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -14,6 +14,7 @@ using Microsoft.IdentityModel.Tokens; using UKSFWebsite.Api.Data; using UKSFWebsite.Api.Data.Command; +using UKSFWebsite.Api.Data.Debug; using UKSFWebsite.Api.Data.Game; using UKSFWebsite.Api.Data.Launcher; using UKSFWebsite.Api.Data.Message; @@ -21,9 +22,13 @@ using UKSFWebsite.Api.Data.Personnel; using UKSFWebsite.Api.Data.Units; using UKSFWebsite.Api.Data.Utility; +using UKSFWebsite.Api.Events; +using UKSFWebsite.Api.Events.Data; +using UKSFWebsite.Api.Events.Handlers; using UKSFWebsite.Api.Interfaces.Command; using UKSFWebsite.Api.Interfaces.Data; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Interfaces.Game; using UKSFWebsite.Api.Interfaces.Integrations; using UKSFWebsite.Api.Interfaces.Launcher; @@ -137,7 +142,7 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact ); Global.ServiceProvider = app.ApplicationServices; - ServiceWrapper.ServiceProvider = Global.ServiceProvider; + Services.ServiceWrapper.ServiceProvider = Global.ServiceProvider; // Initialise exception handler ExceptionHandler.Instance.Initialise(Global.ServiceProvider.GetService(), Global.ServiceProvider.GetService()); @@ -147,6 +152,9 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact // Warm caches WarmDataServices(); + + // Add event handlers + Global.ServiceProvider.GetService().InitEventHandlers(); // Connect discord bot Global.ServiceProvider.GetService().ConnectDiscord(); @@ -163,7 +171,7 @@ private static void WarmDataServices() { List servicesTypes = AppDomain.CurrentDomain.GetAssemblies() .SelectMany(x => x.GetTypes()) .Where(x => !x.IsAbstract && !x.IsInterface && x.BaseType != null && x.BaseType.IsGenericType && x.BaseType.GetGenericTypeDefinition() == typeof(CachedDataService<>)) - .Select(x => x.GetInterfaces().FirstOrDefault(y => !y.IsGenericType)) + .Select(x => x.GetInterfaces().Reverse().FirstOrDefault(y => !y.IsGenericType)) .ToList(); foreach (object service in servicesTypes.Select(type => Global.ServiceProvider.GetService(type))) { dataCacheService.AddDataService((dynamic) service); @@ -174,7 +182,9 @@ private static void WarmDataServices() { public static class ServiceExtensions { public static void RegisterServices(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { - RegisterDataServics(services); + RegisterEventServices(services); + RegisterDataServices(services, currentEnvironment); + RegisterDataBackedServices(services, currentEnvironment); // Instance Objects services.AddTransient(); @@ -193,24 +203,6 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddTransient(); services.AddTransient(); - // Instance Objects with data backing - services.AddTransient(); - services.AddTransient(); - - // Instance Objects with cached data backing - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - // Global Singletons services.AddSingleton(configuration); services.AddSingleton(currentEnvironment); @@ -230,18 +222,26 @@ public static void RegisterServices(this IServiceCollection services, IConfigura if (currentEnvironment.IsDevelopment()) { services.AddSingleton(); - services.AddSingleton(); - services.AddTransient(); services.AddSingleton(); } else { services.AddSingleton(); - services.AddSingleton(); - services.AddTransient(); services.AddSingleton(); } } - private static void RegisterDataServics(this IServiceCollection services) { + private static void RegisterEventServices(this IServiceCollection services) { + // Event Buses + services.AddTransient(); + + // Event Handlers + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + } + + private static void RegisterDataServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { // Non-Cached services.AddTransient(); services.AddTransient(); @@ -261,6 +261,38 @@ private static void RegisterDataServics(this IServiceCollection services) { services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + + if (!currentEnvironment.IsDevelopment()) { + services.AddSingleton(); + } else { + services.AddSingleton(); + } + } + + private static void RegisterDataBackedServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { + // Non-Cached + services.AddTransient(); + services.AddTransient(); + + // Cached + services.AddSingleton(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + + if (!currentEnvironment.IsDevelopment()) { + services.AddTransient(); + } else { + services.AddTransient(); + } } } diff --git a/UKSFWebsite.Api/UKSFWebsite.Api.csproj b/UKSFWebsite.Api/UKSFWebsite.Api.csproj index 4000e765..bbff6a0b 100644 --- a/UKSFWebsite.Api/UKSFWebsite.Api.csproj +++ b/UKSFWebsite.Api/UKSFWebsite.Api.csproj @@ -38,6 +38,7 @@ + diff --git a/UKSFWebsite.Backend.sln b/UKSFWebsite.Backend.sln index a5b62fcb..bafb30db 100644 --- a/UKSFWebsite.Backend.sln +++ b/UKSFWebsite.Backend.sln @@ -20,6 +20,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Data", "UKS EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Interfaces", "UKSFWebsite.Api.Interfaces\UKSFWebsite.Api.Interfaces.csproj", "{462304E4-442D-46F2-B0AD-73BBCEB01C8A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Events", "UKSFWebsite.Api.Events\UKSFWebsite.Api.Events.csproj", "{F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -102,6 +104,18 @@ Global {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x64.Build.0 = Release|Any CPU {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x86.ActiveCfg = Release|Any CPU {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x86.Build.0 = Release|Any CPU + {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|x64.ActiveCfg = Debug|Any CPU + {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|x64.Build.0 = Debug|Any CPU + {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|x86.ActiveCfg = Debug|Any CPU + {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|x86.Build.0 = Debug|Any CPU + {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|Any CPU.Build.0 = Release|Any CPU + {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x64.ActiveCfg = Release|Any CPU + {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x64.Build.0 = Release|Any CPU + {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x86.ActiveCfg = Release|Any CPU + {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UKSFWebsite.Integrations/Startup.cs b/UKSFWebsite.Integrations/Startup.cs index ea25c9ac..d2211d33 100644 --- a/UKSFWebsite.Integrations/Startup.cs +++ b/UKSFWebsite.Integrations/Startup.cs @@ -9,6 +9,7 @@ using UKSFWebsite.Api.Interfaces.Data; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Services; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Integrations { From 71b232586b4f177af31410df890f295cd25937d6 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 18:31:50 +0000 Subject: [PATCH 016/369] Add missing project reference --- UKSFWebsite.Api/UKSFWebsite.Api.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/UKSFWebsite.Api/UKSFWebsite.Api.csproj b/UKSFWebsite.Api/UKSFWebsite.Api.csproj index bbff6a0b..32b392e9 100644 --- a/UKSFWebsite.Api/UKSFWebsite.Api.csproj +++ b/UKSFWebsite.Api/UKSFWebsite.Api.csproj @@ -39,6 +39,7 @@ + From 49151fbd8f6f60c2ba38a7de09346ed73f94dcb5 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 18:32:26 +0000 Subject: [PATCH 017/369] Revert test condition for fake services --- UKSFWebsite.Api/Startup.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 69ac9e79..4de61d63 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -262,7 +262,7 @@ private static void RegisterDataServices(this IServiceCollection services, IHost services.AddSingleton(); services.AddSingleton(); - if (!currentEnvironment.IsDevelopment()) { + if (currentEnvironment.IsDevelopment()) { services.AddSingleton(); } else { services.AddSingleton(); @@ -288,7 +288,7 @@ private static void RegisterDataBackedServices(this IServiceCollection services, services.AddTransient(); services.AddTransient(); - if (!currentEnvironment.IsDevelopment()) { + if (currentEnvironment.IsDevelopment()) { services.AddTransient(); } else { services.AddTransient(); From 747d585a889351bbbaa3bd6445a0b8b90736c0d8 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 18:36:44 +0000 Subject: [PATCH 018/369] Remove test returns in notification server. Add missing fake service files --- .../Fake/FakeNotificationsDataService.cs | 13 +++++++++++++ UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj | 4 ++++ .../UKSFWebsite.Api.Events.csproj | 4 ++++ .../UKSFWebsite.Api.Interfaces.csproj | 4 ++++ .../{Debug => Fake}/FakeCachedDataService.cs | 2 +- .../{Debug => Fake}/FakeDataService.cs | 2 +- .../{Debug => Fake}/FakeDiscordService.cs | 2 +- .../{Debug => Fake}/FakeNotificationsService.cs | 2 +- .../{Debug => Fake}/FakePipeManager.cs | 2 +- .../Message/NotificationsService.cs | 3 --- UKSFWebsite.Api/Startup.cs | 4 ++-- 11 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 UKSFWebsite.Api.Data/Fake/FakeNotificationsDataService.cs rename UKSFWebsite.Api.Services/{Debug => Fake}/FakeCachedDataService.cs (71%) rename UKSFWebsite.Api.Services/{Debug => Fake}/FakeDataService.cs (95%) rename UKSFWebsite.Api.Services/{Debug => Fake}/FakeDiscordService.cs (95%) rename UKSFWebsite.Api.Services/{Debug => Fake}/FakeNotificationsService.cs (95%) rename UKSFWebsite.Api.Services/{Debug => Fake}/FakePipeManager.cs (80%) diff --git a/UKSFWebsite.Api.Data/Fake/FakeNotificationsDataService.cs b/UKSFWebsite.Api.Data/Fake/FakeNotificationsDataService.cs new file mode 100644 index 00000000..e5382141 --- /dev/null +++ b/UKSFWebsite.Api.Data/Fake/FakeNotificationsDataService.cs @@ -0,0 +1,13 @@ +using System.Threading.Tasks; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Models.Message; +using UKSFWebsite.Api.Services.Fake; + +namespace UKSFWebsite.Api.Data.Fake { + public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { + public Task UpdateMany(FilterDefinition filter, UpdateDefinition update) => Task.CompletedTask; + + public Task DeleteMany(FilterDefinition filter) => Task.CompletedTask; + } +} diff --git a/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj b/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj index deab75c1..ef8be96e 100644 --- a/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj +++ b/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj @@ -4,6 +4,10 @@ netcoreapp3.0 disable + + full + true + diff --git a/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj b/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj index 5bbac31f..a18005d3 100644 --- a/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj +++ b/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj @@ -3,6 +3,10 @@ netcoreapp3.0 + + full + true + diff --git a/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj b/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj index 50899d88..62233cc1 100644 --- a/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj +++ b/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj @@ -3,6 +3,10 @@ netcoreapp3.0 + + full + true + diff --git a/UKSFWebsite.Api.Services/Debug/FakeCachedDataService.cs b/UKSFWebsite.Api.Services/Fake/FakeCachedDataService.cs similarity index 71% rename from UKSFWebsite.Api.Services/Debug/FakeCachedDataService.cs rename to UKSFWebsite.Api.Services/Fake/FakeCachedDataService.cs index 4dc79c2e..2489086c 100644 --- a/UKSFWebsite.Api.Services/Debug/FakeCachedDataService.cs +++ b/UKSFWebsite.Api.Services/Fake/FakeCachedDataService.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Services.Debug { +namespace UKSFWebsite.Api.Services.Fake { public class FakeCachedDataService : FakeDataService { public void Refresh() { } } diff --git a/UKSFWebsite.Api.Services/Debug/FakeDataService.cs b/UKSFWebsite.Api.Services/Fake/FakeDataService.cs similarity index 95% rename from UKSFWebsite.Api.Services/Debug/FakeDataService.cs rename to UKSFWebsite.Api.Services/Fake/FakeDataService.cs index cdc8f071..326f8f9f 100644 --- a/UKSFWebsite.Api.Services/Debug/FakeDataService.cs +++ b/UKSFWebsite.Api.Services/Fake/FakeDataService.cs @@ -6,7 +6,7 @@ using UKSFWebsite.Api.Interfaces.Data; using UKSFWebsite.Api.Models.Events; -namespace UKSFWebsite.Api.Services.Debug { +namespace UKSFWebsite.Api.Services.Fake { public abstract class FakeDataService : IDataService { public List Get() => new List(); diff --git a/UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs b/UKSFWebsite.Api.Services/Fake/FakeDiscordService.cs similarity index 95% rename from UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs rename to UKSFWebsite.Api.Services/Fake/FakeDiscordService.cs index caf5c2f9..f57e63ee 100644 --- a/UKSFWebsite.Api.Services/Debug/FakeDiscordService.cs +++ b/UKSFWebsite.Api.Services/Fake/FakeDiscordService.cs @@ -5,7 +5,7 @@ using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Services.Integrations; -namespace UKSFWebsite.Api.Services.Debug { +namespace UKSFWebsite.Api.Services.Fake { public class FakeDiscordService : DiscordService { public FakeDiscordService(IConfiguration configuration, IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService) : base(configuration, ranksService, unitsService, accountService, displayNameService) { } diff --git a/UKSFWebsite.Api.Services/Debug/FakeNotificationsService.cs b/UKSFWebsite.Api.Services/Fake/FakeNotificationsService.cs similarity index 95% rename from UKSFWebsite.Api.Services/Debug/FakeNotificationsService.cs rename to UKSFWebsite.Api.Services/Fake/FakeNotificationsService.cs index 751c1f92..2613317b 100644 --- a/UKSFWebsite.Api.Services/Debug/FakeNotificationsService.cs +++ b/UKSFWebsite.Api.Services/Fake/FakeNotificationsService.cs @@ -5,7 +5,7 @@ using UKSFWebsite.Api.Models.Message; using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Debug { +namespace UKSFWebsite.Api.Services.Fake { public class FakeNotificationsService : INotificationsService { public void SendTeamspeakNotification(Account account, string rawMessage) { } diff --git a/UKSFWebsite.Api.Services/Debug/FakePipeManager.cs b/UKSFWebsite.Api.Services/Fake/FakePipeManager.cs similarity index 80% rename from UKSFWebsite.Api.Services/Debug/FakePipeManager.cs rename to UKSFWebsite.Api.Services/Fake/FakePipeManager.cs index baf7c276..4c06486c 100644 --- a/UKSFWebsite.Api.Services/Debug/FakePipeManager.cs +++ b/UKSFWebsite.Api.Services/Fake/FakePipeManager.cs @@ -1,6 +1,6 @@ using UKSFWebsite.Api.Interfaces.Integrations; -namespace UKSFWebsite.Api.Services.Debug { +namespace UKSFWebsite.Api.Services.Fake { public class FakePipeManager : IPipeManager { public void Dispose() { } diff --git a/UKSFWebsite.Api.Services/Message/NotificationsService.cs b/UKSFWebsite.Api.Services/Message/NotificationsService.cs index 5a27dcd1..56a08c2c 100644 --- a/UKSFWebsite.Api.Services/Message/NotificationsService.cs +++ b/UKSFWebsite.Api.Services/Message/NotificationsService.cs @@ -35,13 +35,11 @@ public NotificationsService(INotificationsDataService data, ITeamspeakService te public INotificationsDataService Data() => data; public void SendTeamspeakNotification(Account account, string rawMessage) { - return; rawMessage = rawMessage.Replace("", "[/url]"); teamspeakService.SendTeamspeakMessageToClient(account, rawMessage); } public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { - return; rawMessage = rawMessage.Replace("", "[/url]"); teamspeakService.SendTeamspeakMessageToClient(clientDbIds, rawMessage); } @@ -84,7 +82,6 @@ private async Task AddNotificationAsync(Notification notification) { } private void SendEmailNotification(string email, string message) { - return; message += "

You can opt-out of these emails by unchecking 'Email notifications' in your Profile"; emailService.SendEmail(email, "UKSF Notification", message); } diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 4de61d63..d9eada8a 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -14,7 +14,7 @@ using Microsoft.IdentityModel.Tokens; using UKSFWebsite.Api.Data; using UKSFWebsite.Api.Data.Command; -using UKSFWebsite.Api.Data.Debug; +using UKSFWebsite.Api.Data.Fake; using UKSFWebsite.Api.Data.Game; using UKSFWebsite.Api.Data.Launcher; using UKSFWebsite.Api.Data.Message; @@ -38,7 +38,7 @@ using UKSFWebsite.Api.Interfaces.Units; using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Services.Command; -using UKSFWebsite.Api.Services.Debug; +using UKSFWebsite.Api.Services.Fake; using UKSFWebsite.Api.Services.Game; using UKSFWebsite.Api.Services.Game.Missions; using UKSFWebsite.Api.Services.Hubs; From 18a27b78512f7357e467483ec291895af178929d Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 18:42:21 +0000 Subject: [PATCH 019/369] Don't initialise data collection --- UKSFWebsite.Api.Data/CachedDataService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSFWebsite.Api.Data/CachedDataService.cs b/UKSFWebsite.Api.Data/CachedDataService.cs index 28d73346..54b547f3 100644 --- a/UKSFWebsite.Api.Data/CachedDataService.cs +++ b/UKSFWebsite.Api.Data/CachedDataService.cs @@ -9,7 +9,7 @@ namespace UKSFWebsite.Api.Data { public abstract class CachedDataService : DataService { - protected List Collection = new List(); + protected List Collection; protected CachedDataService(IMongoDatabase database, IEventBus dataEventBus, string collectionName) : base(database, dataEventBus, collectionName) { } From 914cfa59e9222fa0eb78b1ec11607693d2388bbc Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 19:54:49 +0000 Subject: [PATCH 020/369] Fix cors for integrations --- UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj | 2 +- .../UKSFWebsite.Api.Services.csproj | 2 +- .../Controllers/SteamController.cs | 4 ++-- UKSFWebsite.Integrations/Startup.cs | 11 +++++++++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj b/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj index 38cca46c..5b383b8b 100644 --- a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj +++ b/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj @@ -10,6 +10,6 @@ true - + \ No newline at end of file diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index e21ec66c..17107730 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -14,7 +14,7 @@ - + diff --git a/UKSFWebsite.Integrations/Controllers/SteamController.cs b/UKSFWebsite.Integrations/Controllers/SteamController.cs index a84f7b19..596a2ffa 100644 --- a/UKSFWebsite.Integrations/Controllers/SteamController.cs +++ b/UKSFWebsite.Integrations/Controllers/SteamController.cs @@ -20,10 +20,10 @@ public SteamController(IConfirmationCodeService confirmationCodeService, IHostEn } [HttpGet] - public IActionResult Get() => Challenge(new AuthenticationProperties {RedirectUri = $"{url}/integrations/success"}, "Steam"); + public IActionResult Get() => Challenge(new AuthenticationProperties {RedirectUri = $"{url}/steam/success"}, "Steam"); [HttpGet("application")] - public IActionResult GetFromApplication() => Challenge(new AuthenticationProperties {RedirectUri = $"{url}/integrations/success/application"}, "Steam"); + public IActionResult GetFromApplication() => Challenge(new AuthenticationProperties {RedirectUri = $"{url}/steam/success/application"}, "Steam"); [HttpGet("success")] public async Task Success() => Redirect($"{urlReturn}/profile?{await GetUrlParameters()}"); diff --git a/UKSFWebsite.Integrations/Startup.cs b/UKSFWebsite.Integrations/Startup.cs index d2211d33..109f6d6b 100644 --- a/UKSFWebsite.Integrations/Startup.cs +++ b/UKSFWebsite.Integrations/Startup.cs @@ -6,8 +6,10 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using UKSFWebsite.Api.Data.Utility; +using UKSFWebsite.Api.Events.Data; using UKSFWebsite.Api.Interfaces.Data; using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Services; using UKSFWebsite.Api.Services.Utility; @@ -25,9 +27,10 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration public void ConfigureServices(IServiceCollection services) { services.RegisterServices(configuration); - services.AddCors(); + services.AddCors(options => options.AddPolicy("CorsPolicy", builder => { builder.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader().AllowCredentials().WithOrigins("http://localhost:4200", "http://localhost:5100", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk"); })); services.AddAuthentication(options => { options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme; }).AddCookie().AddSteam(); + services.AddControllers(); services.AddMvc().AddNewtonsoftJson(); } @@ -35,8 +38,11 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact app.UseHsts(); app.UseHttpsRedirection(); app.UseRouting(); - app.UseCors(options => options.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod().AllowCredentials()); + app.UseCors("CorsPolicy"); app.UseAuthentication(); + app.UseAuthentication(); + app.UseAuthorization(); + app.UseEndpoints(endpoints => { endpoints.MapControllers(); }); Global.ServiceProvider = app.ApplicationServices; ServiceWrapper.ServiceProvider = Global.ServiceProvider; @@ -51,6 +57,7 @@ public static IServiceCollection RegisterServices(this IServiceCollection servic // Instance Objects services.AddTransient(); services.AddTransient(); + services.AddTransient(); // Global Singletons services.AddSingleton(configuration); From 237cc8b3a38564e01534d3e23b338be8c396be60 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 20:02:31 +0000 Subject: [PATCH 021/369] Use new cors for all controllers method --- UKSFWebsite.Api/Startup.cs | 10 ++++++---- UKSFWebsite.Integrations/Startup.cs | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index d9eada8a..0807b4e0 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -37,6 +37,7 @@ using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Units; using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Services; using UKSFWebsite.Api.Services.Command; using UKSFWebsite.Api.Services.Fake; using UKSFWebsite.Api.Services.Game; @@ -128,7 +129,7 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact app.UseAuthorization(); app.UseEndpoints( endpoints => { - endpoints.MapControllers(); + endpoints.MapControllers().RequireCors("CorsPolicy"); endpoints.MapHub($"/hub/{AccountHub.END_POINT}"); endpoints.MapHub($"/hub/{AdminHub.END_POINT}"); endpoints.MapHub($"/hub/{CommandRequestsHub.END_POINT}"); @@ -142,7 +143,7 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact ); Global.ServiceProvider = app.ApplicationServices; - Services.ServiceWrapper.ServiceProvider = Global.ServiceProvider; + ServiceWrapper.ServiceProvider = Global.ServiceProvider; // Initialise exception handler ExceptionHandler.Instance.Initialise(Global.ServiceProvider.GetService(), Global.ServiceProvider.GetService()); @@ -152,7 +153,7 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact // Warm caches WarmDataServices(); - + // Add event handlers Global.ServiceProvider.GetService().InitEventHandlers(); @@ -176,6 +177,7 @@ private static void WarmDataServices() { foreach (object service in servicesTypes.Select(type => Global.ServiceProvider.GetService(type))) { dataCacheService.AddDataService((dynamic) service); } + dataCacheService.InvalidateDataCaches(); } } @@ -232,7 +234,7 @@ public static void RegisterServices(this IServiceCollection services, IConfigura private static void RegisterEventServices(this IServiceCollection services) { // Event Buses services.AddTransient(); - + // Event Handlers services.AddSingleton(); services.AddSingleton(); diff --git a/UKSFWebsite.Integrations/Startup.cs b/UKSFWebsite.Integrations/Startup.cs index 109f6d6b..09a0ffe1 100644 --- a/UKSFWebsite.Integrations/Startup.cs +++ b/UKSFWebsite.Integrations/Startup.cs @@ -42,7 +42,7 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact app.UseAuthentication(); app.UseAuthentication(); app.UseAuthorization(); - app.UseEndpoints(endpoints => { endpoints.MapControllers(); }); + app.UseEndpoints(endpoints => { endpoints.MapControllers().RequireCors("CorsPolicy"); }); Global.ServiceProvider = app.ApplicationServices; ServiceWrapper.ServiceProvider = Global.ServiceProvider; From 598ed76a753695b2c510ee8b761ab25ce4ccc0db Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 20:17:03 +0000 Subject: [PATCH 022/369] Trying to fix cors --- UKSFWebsite.Api/Startup.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 0807b4e0..76387f82 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -72,7 +72,7 @@ public void ConfigureServices(IServiceCollection services) { services.AddCors( options => options.AddPolicy( "CorsPolicy", - builder => { builder.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader().AllowCredentials().WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://integrations.uk-sf.co.uk"); } + builder => { builder.WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://integrations.uk-sf.co.uk").AllowAnyMethod().AllowAnyHeader().AllowCredentials(); } ) ); services.AddSignalR().AddNewtonsoftJsonProtocol(); From 8c838824e47ee84a30f5e4f399b85c79408c7240 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 20:37:34 +0000 Subject: [PATCH 023/369] Cors --- UKSFWebsite.Api/Startup.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 76387f82..9356d8fe 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -72,7 +72,7 @@ public void ConfigureServices(IServiceCollection services) { services.AddCors( options => options.AddPolicy( "CorsPolicy", - builder => { builder.WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://integrations.uk-sf.co.uk").AllowAnyMethod().AllowAnyHeader().AllowCredentials(); } + builder => { builder.AllowAnyMethod().AllowAnyHeader().WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://integrations.uk-sf.co.uk").AllowCredentials(); } ) ); services.AddSignalR().AddNewtonsoftJsonProtocol(); From ca616fd185266969dc1f99536ab2267574c650da Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 20:56:57 +0000 Subject: [PATCH 024/369] Remove old packages --- UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj | 7 ++----- UKSFWebsite.Api/Startup.cs | 4 ++-- UKSFWebsite.Api/UKSFWebsite.Api.csproj | 4 ---- UKSFWebsite.Integrations/Startup.cs | 7 +++---- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index 17107730..f190972b 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -13,7 +13,9 @@ + + @@ -26,9 +28,4 @@ - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\3.0.0\ref\netcoreapp3.0\Microsoft.AspNetCore.Mvc.Core.dll - - \ No newline at end of file diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 9356d8fe..c327bd89 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -119,14 +119,14 @@ public void ConfigureServices(IServiceCollection services) { } public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFactory loggerFactory) { - app.UseHsts(); - app.UseHttpsRedirection(); app.UseStaticFiles(); app.UseRouting(); app.UseCors("CorsPolicy"); app.UseCorsMiddleware(); app.UseAuthentication(); app.UseAuthorization(); + app.UseHsts(); + app.UseHttpsRedirection(); app.UseEndpoints( endpoints => { endpoints.MapControllers().RequireCors("CorsPolicy"); diff --git a/UKSFWebsite.Api/UKSFWebsite.Api.csproj b/UKSFWebsite.Api/UKSFWebsite.Api.csproj index 32b392e9..9e02c126 100644 --- a/UKSFWebsite.Api/UKSFWebsite.Api.csproj +++ b/UKSFWebsite.Api/UKSFWebsite.Api.csproj @@ -24,11 +24,7 @@ - - - - diff --git a/UKSFWebsite.Integrations/Startup.cs b/UKSFWebsite.Integrations/Startup.cs index 09a0ffe1..080c1609 100644 --- a/UKSFWebsite.Integrations/Startup.cs +++ b/UKSFWebsite.Integrations/Startup.cs @@ -27,7 +27,7 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration public void ConfigureServices(IServiceCollection services) { services.RegisterServices(configuration); - services.AddCors(options => options.AddPolicy("CorsPolicy", builder => { builder.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader().AllowCredentials().WithOrigins("http://localhost:4200", "http://localhost:5100", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk"); })); + services.AddCors(options => options.AddPolicy("CorsPolicy", builder => { builder.AllowAnyMethod().AllowAnyHeader().WithOrigins("http://localhost:4200", "http://localhost:5100", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk").AllowCredentials(); })); services.AddAuthentication(options => { options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme; }).AddCookie().AddSteam(); services.AddControllers(); @@ -35,12 +35,11 @@ public void ConfigureServices(IServiceCollection services) { } public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFactory loggerFactory) { - app.UseHsts(); - app.UseHttpsRedirection(); app.UseRouting(); app.UseCors("CorsPolicy"); app.UseAuthentication(); - app.UseAuthentication(); + app.UseHsts(); + app.UseHttpsRedirection(); app.UseAuthorization(); app.UseEndpoints(endpoints => { endpoints.MapControllers().RequireCors("CorsPolicy"); }); From 2ff05c85422753c10a22e9274e111a1ba300d5e3 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 21:04:23 +0000 Subject: [PATCH 025/369] Package fixes --- UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj | 6 ------ .../UKSFWebsite.Api.Interfaces.csproj | 10 +--------- .../UKSFWebsite.Api.Services.csproj | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj b/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj index ef8be96e..de3ab1ae 100644 --- a/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj +++ b/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj @@ -14,10 +14,4 @@ - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\3.0.0\ref\netcoreapp3.0\Microsoft.AspNetCore.Mvc.Core.dll - - - diff --git a/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj b/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj index 62233cc1..3d1352ef 100644 --- a/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj +++ b/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj @@ -10,19 +10,11 @@ + - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\3.0.0\ref\netcoreapp3.0\Microsoft.AspNetCore.Http.Features.dll - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\3.0.0\ref\netcoreapp3.0\Microsoft.AspNetCore.Mvc.Core.dll - - - diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index f190972b..a0496ade 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -15,7 +15,7 @@ - + From 790ceb2512339ef29268001748952004dc24d642 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 21:34:14 +0000 Subject: [PATCH 026/369] Trying things --- UKSFWebsite.Api/Startup.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index c327bd89..9faaaf7c 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -69,12 +70,7 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration public void ConfigureServices(IServiceCollection services) { services.RegisterServices(configuration, currentEnvironment); - services.AddCors( - options => options.AddPolicy( - "CorsPolicy", - builder => { builder.AllowAnyMethod().AllowAnyHeader().WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://integrations.uk-sf.co.uk").AllowCredentials(); } - ) - ); + services.AddCors(options => options.AddPolicy("CorsPolicy", builder => { builder.AllowAnyMethod().AllowAnyHeader().WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://integrations.uk-sf.co.uk").AllowCredentials(); })); services.AddSignalR().AddNewtonsoftJsonProtocol(); services.AddAuthentication( options => { @@ -127,6 +123,7 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact app.UseAuthorization(); app.UseHsts(); app.UseHttpsRedirection(); + app.UseForwardedHeaders(new ForwardedHeadersOptions {ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto}); app.UseEndpoints( endpoints => { endpoints.MapControllers().RequireCors("CorsPolicy"); From f383878767460b348f15dae1b865a791fdfd6be5 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 21:39:07 +0000 Subject: [PATCH 027/369] Check env --- UKSFWebsite.Api/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/UKSFWebsite.Api/Program.cs b/UKSFWebsite.Api/Program.cs index 3b5a7369..6c41aa36 100644 --- a/UKSFWebsite.Api/Program.cs +++ b/UKSFWebsite.Api/Program.cs @@ -21,6 +21,7 @@ public static void Main(string[] args) { string environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); bool isDevelopment = environment == Environments.Development; + Console.Out.WriteLine(environment); if (isDevelopment) { BuildDebugWebHost(args).Run(); From 0875353cdb3c21a9555c0d0ea45f9b00e220ee1e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 21:42:03 +0000 Subject: [PATCH 028/369] Remove forwarding --- UKSFWebsite.Api/Startup.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 9faaaf7c..a8819da4 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -123,7 +123,6 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact app.UseAuthorization(); app.UseHsts(); app.UseHttpsRedirection(); - app.UseForwardedHeaders(new ForwardedHeadersOptions {ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto}); app.UseEndpoints( endpoints => { endpoints.MapControllers().RequireCors("CorsPolicy"); From 858264ab6a8edc2ca16854dc856a3291f4d2501c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 22:17:34 +0000 Subject: [PATCH 029/369] Try forwarding again --- UKSFWebsite.Api/Program.cs | 1 - UKSFWebsite.Api/Startup.cs | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UKSFWebsite.Api/Program.cs b/UKSFWebsite.Api/Program.cs index 6c41aa36..3b5a7369 100644 --- a/UKSFWebsite.Api/Program.cs +++ b/UKSFWebsite.Api/Program.cs @@ -21,7 +21,6 @@ public static void Main(string[] args) { string environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); bool isDevelopment = environment == Environments.Development; - Console.Out.WriteLine(environment); if (isDevelopment) { BuildDebugWebHost(args).Run(); diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index a8819da4..b645da24 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -123,6 +123,7 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact app.UseAuthorization(); app.UseHsts(); app.UseHttpsRedirection(); + app.UseForwardedHeaders(new ForwardedHeadersOptions {ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto}); app.UseEndpoints( endpoints => { endpoints.MapControllers().RequireCors("CorsPolicy"); @@ -310,7 +311,7 @@ public Task Invoke(HttpContext httpContext) { } public static class CorsMiddlewareExtensions { - public static void UseCorsMiddleware(this IApplicationBuilder builder) => builder.UseMiddleware(); + public static IApplicationBuilder UseCorsMiddleware(this IApplicationBuilder builder) => builder.UseMiddleware(); } } From fdb691c786f015e283e88c9cb7505ffb8baf5a30 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 22:20:33 +0000 Subject: [PATCH 030/369] Try removing redirection --- UKSFWebsite.Api/Startup.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index b645da24..a011c746 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -122,7 +122,6 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact app.UseAuthentication(); app.UseAuthorization(); app.UseHsts(); - app.UseHttpsRedirection(); app.UseForwardedHeaders(new ForwardedHeadersOptions {ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto}); app.UseEndpoints( endpoints => { From b4c62c931d2d791b6abbcc697b8e6ca0b9cdad95 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 11 Nov 2019 22:23:12 +0000 Subject: [PATCH 031/369] Update integrations to match --- UKSFWebsite.Integrations/Startup.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/UKSFWebsite.Integrations/Startup.cs b/UKSFWebsite.Integrations/Startup.cs index 080c1609..f4030862 100644 --- a/UKSFWebsite.Integrations/Startup.cs +++ b/UKSFWebsite.Integrations/Startup.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -38,9 +39,9 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact app.UseRouting(); app.UseCors("CorsPolicy"); app.UseAuthentication(); - app.UseHsts(); - app.UseHttpsRedirection(); app.UseAuthorization(); + app.UseHsts(); + app.UseForwardedHeaders(new ForwardedHeadersOptions {ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto}); app.UseEndpoints(endpoints => { endpoints.MapControllers().RequireCors("CorsPolicy"); }); Global.ServiceProvider = app.ApplicationServices; From acd5fdb919e425cc7e378ce1b9b736d4f72b9264 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 12 Nov 2019 14:16:10 +0000 Subject: [PATCH 032/369] Merged account updates in recruitment controller. Moved account updates from unit service to use unit data event --- .../Handlers/AccountEventHandler.cs | 26 ++++++++++++------- .../Units/UnitsService.cs | 12 ++------- .../Controllers/RecruitmentController.cs | 14 ++++------ 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs index 7dd88363..77ba9105 100644 --- a/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs +++ b/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs @@ -9,21 +9,29 @@ namespace UKSFWebsite.Api.Events.Handlers { public class AccountEventHandler : IAccountEventHandler { + private readonly IAccountDataService accountData; private readonly IHubContext hub; - private readonly IAccountDataService data; + private readonly IUnitsDataService unitsData; - public AccountEventHandler(IAccountDataService data, IHubContext hub) { - this.data = data; + public AccountEventHandler(IAccountDataService accountData, IUnitsDataService unitsData, IHubContext hub) { + this.accountData = accountData; + this.unitsData = unitsData; this.hub = hub; } public void Init() { - data.EventBus() - .Subscribe( - async x => { - if (x.type == DataEventType.UPDATE) await UpdatedEvent(x.id); - } - ); + accountData.EventBus() + .Subscribe( + async x => { + if (x.type == DataEventType.UPDATE) await UpdatedEvent(x.id); + } + ); + unitsData.EventBus() + .Subscribe( + async x => { + if (x.type == DataEventType.UPDATE) await UpdatedEvent(x.id); + } + ); } private async Task UpdatedEvent(string id) { diff --git a/UKSFWebsite.Api.Services/Units/UnitsService.cs b/UKSFWebsite.Api.Services/Units/UnitsService.cs index 90a51eec..46f1a975 100644 --- a/UKSFWebsite.Api.Services/Units/UnitsService.cs +++ b/UKSFWebsite.Api.Services/Units/UnitsService.cs @@ -15,14 +15,12 @@ namespace UKSFWebsite.Api.Services.Units { public class UnitsService : IUnitsService { - private readonly IHubContext accountHub; private readonly IUnitsDataService data; private readonly IRolesService rolesService; - public UnitsService(IUnitsDataService data, IRolesService rolesService, IHubContext accountHub) { + public UnitsService(IUnitsDataService data, IRolesService rolesService) { this.data = data; this.rolesService = rolesService; - this.accountHub = accountHub; } public IUnitsDataService Data() => data; @@ -42,7 +40,6 @@ public IEnumerable GetSortedUnits(Func predicate = null) { public async Task AddMember(string id, string unitId) { if (data.GetSingle(x => x.id == unitId && x.members.Contains(id)) != null) return; await data.Update(unitId, Builders.Update.Push(x => x.members, id)); - await accountHub.Clients.Group(id).ReceiveAccountUpdate(); } public async Task RemoveMember(string id, string unitName) { @@ -58,7 +55,6 @@ public async Task RemoveMember(string id, Unit unit) { } await RemoveMemberRoles(id, unit); - await accountHub.Clients.Group(id).ReceiveAccountUpdate(); } public async Task SetMemberRole(string id, string unitId, string role = "") { @@ -73,8 +69,6 @@ public async Task SetMemberRole(string id, Unit unit, string role = "") { if (!string.IsNullOrEmpty(role)) { await data.Update(unit.id, Builders.Update.Set($"roles.{role}", id)); } - - await accountHub.Clients.Group(id).ReceiveAccountUpdate(); } public async Task RenameRole(string oldName, string newName) { @@ -86,10 +80,8 @@ public async Task RenameRole(string oldName, string newName) { } public async Task DeleteRole(string role) { - foreach (Unit unit in data.Get(x => x.roles.ContainsKey(role))) { - string id = unit.roles[role]; + foreach (Unit unit in from unit in data.Get(x => x.roles.ContainsKey(role)) let id = unit.roles[role] select unit) { await data.Update(unit.id, Builders.Update.Unset($"roles.{role}")); - await accountHub.Clients.Group(id).ReceiveAccountUpdate(); } } diff --git a/UKSFWebsite.Api/Controllers/RecruitmentController.cs b/UKSFWebsite.Api/Controllers/RecruitmentController.cs index 9378dd1d..5b7bbb05 100644 --- a/UKSFWebsite.Api/Controllers/RecruitmentController.cs +++ b/UKSFWebsite.Api/Controllers/RecruitmentController.cs @@ -76,30 +76,26 @@ public async Task UpdateState([FromBody] dynamic body, string id) switch (updatedState) { case ApplicationState.ACCEPTED: { - await accountService.Data().Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now)); - await accountService.Data().Update(id, "membershipState", MembershipState.MEMBER); + await accountService.Data().Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now).Set(x => x.membershipState, MembershipState.MEMBER)); Notification notification = await assignmentService.UpdateUnitRankAndRole(id, "Basic Training Unit", "Trainee", "Recruit", reason: "your application was accepted"); notificationsService.Add(notification); break; } case ApplicationState.REJECTED: { - await accountService.Data().Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now)); - await accountService.Data().Update(id, "membershipState", MembershipState.CONFIRMED); + await accountService.Data().Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now).Set(x => x.membershipState, MembershipState.CONFIRMED)); Notification notification = await assignmentService.UpdateUnitRankAndRole( id, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, "", - $"Unfortunately you have not been accepted into our unit, however we thank you for your interest and hope you find a suitable alternative. You may view any notes about your application here: [url]https://uk-sf.co.uk/recruitment/{id}[/url]" + $"Unfortunately you have not been accepted into our unit, however we thank you for your interest and hope you find a suitable alternative. You can view any comments on your application here: [url]https://uk-sf.co.uk/recruitment/{id}[/url]" ); notificationsService.Add(notification); break; } case ApplicationState.WAITING: { - await accountService.Data().Update(id, Builders.Update.Set(x => x.application.dateCreated, DateTime.Now)); - await accountService.Data().Update(id, Builders.Update.Unset(x => x.application.dateAccepted)); - await accountService.Data().Update(id, "membershipState", MembershipState.CONFIRMED); + await accountService.Data().Update(id, Builders.Update.Set(x => x.application.dateCreated, DateTime.Now).Unset(x => x.application.dateAccepted).Set(x => x.membershipState, MembershipState.CONFIRMED)); Notification notification = await assignmentService.UpdateUnitRankAndRole(id, AssignmentService.REMOVE_FLAG, "Applicant", "Candidate", reason: "your application was reactivated"); notificationsService.Add(notification); if (recruitmentService.GetSr1Members().All(x => x.id != account.application.recruiter)) { @@ -121,7 +117,7 @@ public async Task UpdateState([FromBody] dynamic body, string id) ); } - foreach (string value in recruitmentService.GetSr1Leads().Cast().Where(value => sessionId != value && account.application.recruiter != value)) { + foreach (string value in recruitmentService.GetSr1Leads().Values.Where(value => sessionId != value && account.application.recruiter != value)) { notificationsService.Add(new Notification {owner = value, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application {message} by {displayNameService.GetDisplayName(sessionService.GetContextAccount())}", link = $"/recruitment/{id}"}); } From 90998360b64a6fcd4a36377ae8a97bd54ddd0eb3 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 12 Nov 2019 14:47:37 +0000 Subject: [PATCH 033/369] Update system management package --- UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj | 3 +-- UKSFWebsite.Api.Services/Units/UnitsService.cs | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index a0496ade..0043337e 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -21,8 +21,7 @@ - - + diff --git a/UKSFWebsite.Api.Services/Units/UnitsService.cs b/UKSFWebsite.Api.Services/Units/UnitsService.cs index 46f1a975..5fbc810a 100644 --- a/UKSFWebsite.Api.Services/Units/UnitsService.cs +++ b/UKSFWebsite.Api.Services/Units/UnitsService.cs @@ -2,16 +2,13 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNetCore.SignalR; using MongoDB.Bson; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Units; using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Services.Hubs; namespace UKSFWebsite.Api.Services.Units { public class UnitsService : IUnitsService { From 14b150b6575e2315ec4334e23e3b53749fb4699b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 13 Nov 2019 15:24:41 +0000 Subject: [PATCH 034/369] Add commanders to teamspeak online list --- .../Controllers/Accounts/AccountsController.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs b/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs index 464395b6..7b865d31 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs @@ -11,9 +11,11 @@ using UKSFWebsite.Api.Interfaces.Integrations; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Interfaces.Units; using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Models.Integrations; using UKSFWebsite.Api.Models.Personnel; +using UKSFWebsite.Api.Models.Units; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Utility; @@ -30,6 +32,7 @@ public class AccountsController : Controller { private readonly IRecruitmentService recruitmentService; private readonly ISessionService sessionService; private readonly ITeamspeakService teamspeakService; + private readonly IUnitsService unitsService; public AccountsController( IConfirmationCodeService confirmationCodeService, @@ -40,7 +43,8 @@ public AccountsController( IRecruitmentService recruitmentService, ITeamspeakService teamspeakService, IEmailService emailService, - IDiscordService discordService + IDiscordService discordService, + IUnitsService unitsService ) { this.confirmationCodeService = confirmationCodeService; this.ranksService = ranksService; @@ -51,6 +55,7 @@ IDiscordService discordService this.teamspeakService = teamspeakService; this.emailService = emailService; this.discordService = discordService; + this.unitsService = unitsService; } [HttpGet, Authorize] @@ -152,12 +157,16 @@ public IActionResult GetOnlineAccounts() { List allAccounts = accountService.Data().Get(); var clients = onlineClients.Where(x => x != null).Select(x => new {account = allAccounts.FirstOrDefault(y => y.teamspeakIdentities != null && y.teamspeakIdentities.Any(z => z == x.clientDbId)), client = x}).ToList(); var clientAccounts = clients.Where(x => x.account != null && x.account.membershipState == MembershipState.MEMBER).OrderBy(x => x.account.rank, new RankComparer(ranksService)).ThenBy(x => x.account.lastname).ThenBy(x => x.account.firstname); - + List commandAccounts = unitsService.GetAuxilliaryRoot().members; + + List commanders = new List(); List recruiters = new List(); List members = new List(); List guests = new List(); foreach (var onlineClient in clientAccounts) { - if (recruitmentService.IsRecruiter(onlineClient.account)) { + if (commandAccounts.Contains(onlineClient.account.id)) { + commanders.Add(new {displayName = displayNameService.GetDisplayName(onlineClient.account)}); + } else if (recruitmentService.IsRecruiter(onlineClient.account)) { recruiters.Add(new {displayName = displayNameService.GetDisplayName(onlineClient.account)}); } else { members.Add(new {displayName = displayNameService.GetDisplayName(onlineClient.account)}); @@ -168,7 +177,7 @@ public IActionResult GetOnlineAccounts() { guests.Add(new {displayName = client.client.clientName}); } - return Ok(new {recruiters, members, guests}); + return Ok(new {commanders, recruiters, members, guests}); } [HttpGet("exists")] From 64b4319b86c6595a94205ee6e75a7aad1a33c865 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 14 Nov 2019 00:29:44 +0000 Subject: [PATCH 035/369] Added socket server implementation for teamspeak connection. WIP --- .../VariablesDataService.cs | 6 +- UKSFWebsite.Api.Data/CachedDataService.cs | 10 +- .../CommandRequestArchiveDataService.cs | 2 +- .../Command/CommandRequestDataService.cs | 2 +- UKSFWebsite.Api.Data/DataService.cs | 10 +- .../Game/GameServersDataService.cs | 2 +- .../Launcher/LauncherFileDataService.cs | 2 +- .../Message/CommentThreadDataService.cs | 4 +- .../Message/NotificationsDataService.cs | 2 +- .../Operations/OperationOrderDataService.cs | 3 +- .../Operations/OperationReportDataService.cs | 2 +- .../Personnel/AccountDataService.cs | 2 +- .../Personnel/DischargeDataService.cs | 2 +- .../Personnel/LoaDataService.cs | 2 +- .../Personnel/RanksDataService.cs | 2 +- .../Personnel/RolesDataService.cs | 2 +- .../Units/UnitsDataService.cs | 2 +- .../Utility/ConfirmationCodeDataService.cs | 2 +- .../Utility/SchedulerDataService.cs | 2 +- .../Data/DataEventBacker.cs | 6 +- UKSFWebsite.Api.Events/Data/DataEventBus.cs | 15 +- .../Data/DataEventFactory.cs | 7 - .../Data/EventModelFactory.cs | 8 + UKSFWebsite.Api.Events/EventBus.cs | 17 + .../EventHandlerInitialiser.cs | 7 +- .../Handlers/AccountEventHandler.cs | 1 + .../Handlers/CommandRequestEventHandler.cs | 1 + .../Handlers/CommentThreadEventHandler.cs | 1 + .../Handlers/NotificationsEventHandler.cs | 1 + .../Handlers/TeamspeakEventHandler.cs | 94 +++ .../SocketServer/SocketEventBus.cs | 10 + .../Data/Cached/IVariablesDataService.cs | 1 + .../{ => Handlers}/IAccountEventHandler.cs | 2 +- .../ICommandRequestEventHandler.cs | 2 +- .../ICommentThreadEventHandler.cs | 2 +- .../Events/{ => Handlers}/IEventHandler.cs | 2 +- .../INotificationsEventHandler.cs | 2 +- .../Events/Handlers/ITeamspeakEventHandler.cs | 3 + .../Events/IDataEventBus.cs | 5 + .../Events/IEventBus.cs | 6 +- .../Events/ISocketEventBus.cs | 8 + .../Integrations/ISocket.cs | 12 + .../{ => Teamspeak}/ITeamspeakGroupService.cs | 2 +- .../Teamspeak/ITeamspeakManager.cs | 6 + .../ITeamspeakMetricsService.cs | 2 +- .../{ => Teamspeak}/ITeamspeakService.cs | 2 +- .../UKSFWebsite.Api.Interfaces.csproj | 4 + .../{Utility => Admin}/VariableItem.cs | 2 +- .../Events/SocketEventModel.cs | 6 + .../Events/Types/TeamspeakSocketEventType.cs | 6 + UKSFWebsite.Api.Models/Game/GameServer.cs | 4 +- .../Integrations/SocketCommands.cs | 5 + .../TeamspeakServerGroupUpdate.cs | 9 + .../TeamspeakSocketProcedureType.cs | 9 + .../{Utility => Admin}/MigrationUtility.cs | 8 +- .../{Utility => Admin}/VariablesService.cs | 14 +- .../{Utility => Admin}/VariablesWrapper.cs | 2 +- .../Game/GameServerHelpers.cs | 1 + .../Game/GameServersService.cs | 30 +- .../Game/Missions/MissionPatchingService.cs | 1 + .../Game/Missions/MissionService.cs | 1 + .../Integrations/DiscordService.cs | 1 + .../Integrations/PipeManager.cs | 18 +- .../Procedures/CheckClientServerGroup.cs | 64 -- .../Procedures/ITeamspeakProcedure.cs | 5 - .../Integrations/Procedures/Pong.cs | 9 - .../Procedures/ProcedureDefinitons.cs | 10 - .../Procedures/SendClientsUpdate.cs | 18 - .../{ => Teamspeak}/TeamspeakGroupService.cs | 27 +- .../Teamspeak/TeamspeakManager.cs | 62 ++ .../TeamspeakMetricsService.cs | 3 +- .../{ => Teamspeak}/TeamspeakService.cs | 26 +- .../Launcher/LauncherFileService.cs | 1 + .../Message/NotificationsService.cs | 1 + .../Personnel/AssignmentService.cs | 1 + .../Personnel/RecruitmentService.cs | 1 + .../UKSFWebsite.Api.Services.csproj | 1 + .../Utility/ProcessHelper.cs | 31 + .../Utility/SchedulerActionHelper.cs | 2 + UKSFWebsite.Api.SocketServer/Socket.cs | 133 +++ .../UKSFWebsite.Api.SocketServer.csproj | 13 + .../Accounts/AccountsController.cs | 1 + .../Accounts/CommunicationsController.cs | 1 + .../Controllers/GameServersController.cs | 1 + .../Controllers/LauncherController.cs | 1 + .../Controllers/TeamspeakController.cs | 1 + .../Controllers/UnitsController.cs | 1 + .../Controllers/VariablesController.cs | 1 + .../Controllers/VersionController.cs | 1 + UKSFWebsite.Api/Startup.cs | 38 +- UKSFWebsite.Api/UKSFWebsite.Api.csproj | 1 + UKSFWebsite.Api/appsettings.json | 3 +- UKSFWebsite.Backend.sln | 28 + .../Controllers/DiscordController.cs | 1 + UKSFWebsite.Integrations/Startup.cs | 4 +- ValveSockets/ValveSockets.cs | 758 ++++++++++++++++++ ValveSockets/ValveSockets.csproj | 9 + 97 files changed, 1394 insertions(+), 271 deletions(-) rename UKSFWebsite.Api.Data/{Utility => Admin}/VariablesDataService.cs (87%) delete mode 100644 UKSFWebsite.Api.Events/Data/DataEventFactory.cs create mode 100644 UKSFWebsite.Api.Events/Data/EventModelFactory.cs create mode 100644 UKSFWebsite.Api.Events/EventBus.cs create mode 100644 UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs create mode 100644 UKSFWebsite.Api.Events/SocketServer/SocketEventBus.cs rename UKSFWebsite.Api.Interfaces/Events/{ => Handlers}/IAccountEventHandler.cs (53%) rename UKSFWebsite.Api.Interfaces/Events/{ => Handlers}/ICommandRequestEventHandler.cs (56%) rename UKSFWebsite.Api.Interfaces/Events/{ => Handlers}/ICommentThreadEventHandler.cs (56%) rename UKSFWebsite.Api.Interfaces/Events/{ => Handlers}/IEventHandler.cs (54%) rename UKSFWebsite.Api.Interfaces/Events/{ => Handlers}/INotificationsEventHandler.cs (56%) create mode 100644 UKSFWebsite.Api.Interfaces/Events/Handlers/ITeamspeakEventHandler.cs create mode 100644 UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs create mode 100644 UKSFWebsite.Api.Interfaces/Events/ISocketEventBus.cs create mode 100644 UKSFWebsite.Api.Interfaces/Integrations/ISocket.cs rename UKSFWebsite.Api.Interfaces/Integrations/{ => Teamspeak}/ITeamspeakGroupService.cs (79%) create mode 100644 UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManager.cs rename UKSFWebsite.Api.Interfaces/Integrations/{ => Teamspeak}/ITeamspeakMetricsService.cs (73%) rename UKSFWebsite.Api.Interfaces/Integrations/{ => Teamspeak}/ITeamspeakService.cs (91%) rename UKSFWebsite.Api.Models/{Utility => Admin}/VariableItem.cs (84%) create mode 100644 UKSFWebsite.Api.Models/Events/SocketEventModel.cs create mode 100644 UKSFWebsite.Api.Models/Events/Types/TeamspeakSocketEventType.cs create mode 100644 UKSFWebsite.Api.Models/Integrations/SocketCommands.cs create mode 100644 UKSFWebsite.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs create mode 100644 UKSFWebsite.Api.Models/Integrations/TeamspeakSocketProcedureType.cs rename UKSFWebsite.Api.Services/{Utility => Admin}/MigrationUtility.cs (92%) rename UKSFWebsite.Api.Services/{Utility => Admin}/VariablesService.cs (62%) rename UKSFWebsite.Api.Services/{Utility => Admin}/VariablesWrapper.cs (86%) delete mode 100644 UKSFWebsite.Api.Services/Integrations/Procedures/CheckClientServerGroup.cs delete mode 100644 UKSFWebsite.Api.Services/Integrations/Procedures/ITeamspeakProcedure.cs delete mode 100644 UKSFWebsite.Api.Services/Integrations/Procedures/Pong.cs delete mode 100644 UKSFWebsite.Api.Services/Integrations/Procedures/ProcedureDefinitons.cs delete mode 100644 UKSFWebsite.Api.Services/Integrations/Procedures/SendClientsUpdate.cs rename UKSFWebsite.Api.Services/Integrations/{ => Teamspeak}/TeamspeakGroupService.cs (75%) create mode 100644 UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManager.cs rename UKSFWebsite.Api.Services/Integrations/{ => Teamspeak}/TeamspeakMetricsService.cs (68%) rename UKSFWebsite.Api.Services/Integrations/{ => Teamspeak}/TeamspeakService.cs (82%) create mode 100644 UKSFWebsite.Api.Services/Utility/ProcessHelper.cs create mode 100644 UKSFWebsite.Api.SocketServer/Socket.cs create mode 100644 UKSFWebsite.Api.SocketServer/UKSFWebsite.Api.SocketServer.csproj create mode 100644 ValveSockets/ValveSockets.cs create mode 100644 ValveSockets/ValveSockets.csproj diff --git a/UKSFWebsite.Api.Data/Utility/VariablesDataService.cs b/UKSFWebsite.Api.Data/Admin/VariablesDataService.cs similarity index 87% rename from UKSFWebsite.Api.Data/Utility/VariablesDataService.cs rename to UKSFWebsite.Api.Data/Admin/VariablesDataService.cs index 60b31127..14fdac0f 100644 --- a/UKSFWebsite.Api.Data/Utility/VariablesDataService.cs +++ b/UKSFWebsite.Api.Data/Admin/VariablesDataService.cs @@ -4,12 +4,12 @@ using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Utility; +using UKSFWebsite.Api.Models.Admin; using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Api.Data.Utility { +namespace UKSFWebsite.Api.Data.Admin { public class VariablesDataService : CachedDataService, IVariablesDataService { - public VariablesDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "variables") { } + public VariablesDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "variables") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Data/CachedDataService.cs b/UKSFWebsite.Api.Data/CachedDataService.cs index 54b547f3..c91fba04 100644 --- a/UKSFWebsite.Api.Data/CachedDataService.cs +++ b/UKSFWebsite.Api.Data/CachedDataService.cs @@ -11,7 +11,7 @@ namespace UKSFWebsite.Api.Data { public abstract class CachedDataService : DataService { protected List Collection; - protected CachedDataService(IMongoDatabase database, IEventBus dataEventBus, string collectionName) : base(database, dataEventBus, collectionName) { } + protected CachedDataService(IMongoDatabase database, IDataEventBus dataEventBus, string collectionName) : base(database, dataEventBus, collectionName) { } // ReSharper disable once MemberCanBeProtected.Global - Used in dynamic call, do not change to protected! public void Refresh() { @@ -46,25 +46,25 @@ public override T GetSingle(Func predicate) { public override async Task Add(T data) { await base.Add(data); Refresh(); - CachedDataEvent(DataEventFactory.Create(DataEventType.ADD, GetIdValue(data), data)); + CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(data), data)); } public override async Task Update(string id, string fieldName, object value) { await base.Update(id, fieldName, value); Refresh(); - CachedDataEvent(DataEventFactory.Create(DataEventType.UPDATE, id)); + CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public override async Task Update(string id, UpdateDefinition update) { await base.Update(id, update); Refresh(); - CachedDataEvent(DataEventFactory.Create(DataEventType.UPDATE, id)); + CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public override async Task Delete(string id) { await base.Delete(id); Refresh(); - CachedDataEvent(DataEventFactory.Create(DataEventType.DELETE, id)); + CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } protected virtual void CachedDataEvent(DataEventModel dataEvent) { diff --git a/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs b/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs index fa6f0dc7..bbd2a33e 100644 --- a/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs +++ b/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs @@ -5,6 +5,6 @@ namespace UKSFWebsite.Api.Data.Command { public class CommandRequestArchiveDataService : DataService, ICommandRequestArchiveDataService { - public CommandRequestArchiveDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "commandRequestsArchive") { } + public CommandRequestArchiveDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commandRequestsArchive") { } } } diff --git a/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs b/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs index 2220f87e..2878259b 100644 --- a/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs +++ b/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs @@ -5,6 +5,6 @@ namespace UKSFWebsite.Api.Data.Command { public class CommandRequestDataService : CachedDataService, ICommandRequestDataService { - public CommandRequestDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "commandRequests") { } + public CommandRequestDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commandRequests") { } } } diff --git a/UKSFWebsite.Api.Data/DataService.cs b/UKSFWebsite.Api.Data/DataService.cs index 3c718533..87ca55a6 100644 --- a/UKSFWebsite.Api.Data/DataService.cs +++ b/UKSFWebsite.Api.Data/DataService.cs @@ -13,7 +13,7 @@ public abstract class DataService : DataEventBacker, IDataService { protected readonly IMongoDatabase Database; protected readonly string DatabaseCollection; - protected DataService(IMongoDatabase database, IEventBus dataEventBus, string collectionName) : base(dataEventBus) { + protected DataService(IMongoDatabase database, IDataEventBus dataEventBus, string collectionName) : base(dataEventBus) { Database = database; DatabaseCollection = collectionName; if (Database.GetCollection(DatabaseCollection) == null) { @@ -33,23 +33,23 @@ public virtual T GetSingle(string id) { public virtual async Task Add(T data) { await Database.GetCollection(DatabaseCollection).InsertOneAsync(data); - DataEvent(DataEventFactory.Create(DataEventType.ADD, GetIdValue(data), data)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(data), data)); } public virtual async Task Update(string id, string fieldName, object value) { UpdateDefinition update = value == null ? Builders.Update.Unset(fieldName) : Builders.Update.Set(fieldName, value); await Database.GetCollection(DatabaseCollection).UpdateOneAsync(Builders.Filter.Eq("id", id), update); - DataEvent(DataEventFactory.Create(DataEventType.UPDATE, id)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public virtual async Task Update(string id, UpdateDefinition update) { await Database.GetCollection(DatabaseCollection).UpdateOneAsync(Builders.Filter.Eq("id", id), update); - DataEvent(DataEventFactory.Create(DataEventType.UPDATE, id)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public virtual async Task Delete(string id) { await Database.GetCollection(DatabaseCollection).DeleteOneAsync(Builders.Filter.Eq("id", id)); - DataEvent(DataEventFactory.Create(DataEventType.DELETE, id)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } internal static string GetIdValue(T data) => data.GetType().GetField("id").GetValue(data) as string; diff --git a/UKSFWebsite.Api.Data/Game/GameServersDataService.cs b/UKSFWebsite.Api.Data/Game/GameServersDataService.cs index c2f1ec35..ac43ffc6 100644 --- a/UKSFWebsite.Api.Data/Game/GameServersDataService.cs +++ b/UKSFWebsite.Api.Data/Game/GameServersDataService.cs @@ -7,7 +7,7 @@ namespace UKSFWebsite.Api.Data.Game { public class GameServersDataService : CachedDataService, IGameServersDataService { - public GameServersDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "gameServers") { } + public GameServersDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "gameServers") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs b/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs index 13c39f27..6e4314d1 100644 --- a/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs +++ b/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs @@ -5,6 +5,6 @@ namespace UKSFWebsite.Api.Data.Launcher { public class LauncherFileDataService : CachedDataService, ILauncherFileDataService { - public LauncherFileDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "launcherFiles") { } + public LauncherFileDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "launcherFiles") { } } } diff --git a/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs b/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs index ef4d8d58..e6adc948 100644 --- a/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs +++ b/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs @@ -8,7 +8,7 @@ namespace UKSFWebsite.Api.Data.Message { public class CommentThreadDataService : CachedDataService, ICommentThreadDataService { - public CommentThreadDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "commentThreads") { } + public CommentThreadDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commentThreads") { } public new async Task Add(CommentThread commentThread) { await base.Add(commentThread); @@ -17,7 +17,7 @@ public CommentThreadDataService(IMongoDatabase database, IEventBus dataEventBus) public async Task Update(string id, Comment comment, DataEventType updateType) { await base.Update(id, updateType == DataEventType.ADD ? Builders.Update.Push("comments", comment) : Builders.Update.Pull("comments", comment)); - CommentThreadDataEvent(DataEventFactory.Create(updateType, id, comment)); + CommentThreadDataEvent(EventModelFactory.CreateDataEvent(updateType, id, comment)); } private void CommentThreadDataEvent(DataEventModel dataEvent) { diff --git a/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs b/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs index 8a49a30e..5d8e8114 100644 --- a/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs +++ b/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs @@ -6,7 +6,7 @@ namespace UKSFWebsite.Api.Data.Message { public class NotificationsDataService : CachedDataService, INotificationsDataService { - public NotificationsDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "notifications") { } + public NotificationsDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "notifications") { } public async Task UpdateMany(FilterDefinition filter, UpdateDefinition update) { await Database.GetCollection(DatabaseCollection).UpdateManyAsync(filter, update); diff --git a/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs b/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs index 935dbff7..8fb2ca31 100644 --- a/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs +++ b/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs @@ -3,11 +3,12 @@ using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Models.Events; using UKSFWebsite.Api.Models.Operations; namespace UKSFWebsite.Api.Data.Operations { public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { - public OperationOrderDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "opord") { } + public OperationOrderDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "opord") { } public override List Get() { List reversed = base.Get(); diff --git a/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs b/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs index 25bb4e68..ce83e290 100644 --- a/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs +++ b/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs @@ -7,7 +7,7 @@ namespace UKSFWebsite.Api.Data.Operations { public class OperationReportDataService : CachedDataService, IOperationReportDataService { - public OperationReportDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "oprep") { } + public OperationReportDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "oprep") { } public override List Get() { List reversed = base.Get(); diff --git a/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs b/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs index 1a56c110..3a366138 100644 --- a/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs @@ -5,6 +5,6 @@ namespace UKSFWebsite.Api.Data.Personnel { public class AccountDataService : CachedDataService, IAccountDataService { - public AccountDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "accounts") { } + public AccountDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "accounts") { } } } diff --git a/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs b/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs index c054543e..a3ca106b 100644 --- a/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs @@ -7,7 +7,7 @@ namespace UKSFWebsite.Api.Data.Personnel { public class DischargeDataService : CachedDataService, IDischargeDataService { - public DischargeDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "discharges") { } + public DischargeDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "discharges") { } public override List Get() { return base.Get().OrderByDescending(x => x.discharges.Last().timestamp).ToList(); diff --git a/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs b/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs index 0b72ec9f..a3bdbef4 100644 --- a/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs @@ -5,6 +5,6 @@ namespace UKSFWebsite.Api.Data.Personnel { public class LoaDataService : CachedDataService, ILoaDataService { - public LoaDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "loas") { } + public LoaDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "loas") { } } } diff --git a/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs b/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs index 803f5278..f056adf5 100644 --- a/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs @@ -6,7 +6,7 @@ namespace UKSFWebsite.Api.Data.Personnel { public class RanksDataService : CachedDataService, IRanksDataService { - public RanksDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "ranks") { } + public RanksDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "ranks") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs b/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs index e56b5a63..33d1d410 100644 --- a/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs @@ -7,7 +7,7 @@ namespace UKSFWebsite.Api.Data.Personnel { public class RolesDataService : CachedDataService, IRolesDataService { - public RolesDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "roles") { } + public RolesDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "roles") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Data/Units/UnitsDataService.cs b/UKSFWebsite.Api.Data/Units/UnitsDataService.cs index 95095732..d1d3af91 100644 --- a/UKSFWebsite.Api.Data/Units/UnitsDataService.cs +++ b/UKSFWebsite.Api.Data/Units/UnitsDataService.cs @@ -7,7 +7,7 @@ namespace UKSFWebsite.Api.Data.Units { public class UnitsDataService : CachedDataService, IUnitsDataService { - public UnitsDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "units") { } + public UnitsDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "units") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs b/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs index 8dbc2baf..3be9c12b 100644 --- a/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs +++ b/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs @@ -5,6 +5,6 @@ namespace UKSFWebsite.Api.Data.Utility { public class ConfirmationCodeDataService : DataService, IConfirmationCodeDataService { - public ConfirmationCodeDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "confirmationCodes") { } + public ConfirmationCodeDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "confirmationCodes") { } } } diff --git a/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs b/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs index b94c8dc0..45b88569 100644 --- a/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs +++ b/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs @@ -5,6 +5,6 @@ namespace UKSFWebsite.Api.Data.Utility { public class SchedulerDataService : DataService, ISchedulerDataService { - public SchedulerDataService(IMongoDatabase database, IEventBus dataEventBus) : base(database, dataEventBus, "scheduledJobs") { } + public SchedulerDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "scheduledJobs") { } } } diff --git a/UKSFWebsite.Api.Events/Data/DataEventBacker.cs b/UKSFWebsite.Api.Events/Data/DataEventBacker.cs index b086e250..4dd0ef24 100644 --- a/UKSFWebsite.Api.Events/Data/DataEventBacker.cs +++ b/UKSFWebsite.Api.Events/Data/DataEventBacker.cs @@ -4,11 +4,11 @@ namespace UKSFWebsite.Api.Events.Data { public abstract class DataEventBacker : IDataEventBacker { - private readonly IEventBus dataEventBus; + private readonly IDataEventBus dataEventBus; - protected DataEventBacker(IEventBus dataEventBus) => this.dataEventBus = dataEventBus; + protected DataEventBacker(IDataEventBus dataEventBus) => this.dataEventBus = dataEventBus; - public IObservable EventBus() => dataEventBus.AsObservable(); + public IObservable EventBus() => dataEventBus.AsObservable(); protected virtual void DataEvent(DataEventModel dataEvent) { dataEventBus.Send(dataEvent); diff --git a/UKSFWebsite.Api.Events/Data/DataEventBus.cs b/UKSFWebsite.Api.Events/Data/DataEventBus.cs index eac43819..f74fd2a5 100644 --- a/UKSFWebsite.Api.Events/Data/DataEventBus.cs +++ b/UKSFWebsite.Api.Events/Data/DataEventBus.cs @@ -1,17 +1,6 @@ -using System; -using System.Reactive.Linq; -using System.Reactive.Subjects; -using System.Threading.Tasks; using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Models.Events; namespace UKSFWebsite.Api.Events.Data { - public class DataEventBus : IEventBus { - private readonly Subject subject = new Subject(); - - public void Send(T message) { - Task.Run(() => subject.OnNext(message)); - } - - public IObservable AsObservable() => subject.OfType(); - } + public class DataEventBus : EventBus, IDataEventBus { } } diff --git a/UKSFWebsite.Api.Events/Data/DataEventFactory.cs b/UKSFWebsite.Api.Events/Data/DataEventFactory.cs deleted file mode 100644 index c2ccc841..00000000 --- a/UKSFWebsite.Api.Events/Data/DataEventFactory.cs +++ /dev/null @@ -1,7 +0,0 @@ -using UKSFWebsite.Api.Models.Events; - -namespace UKSFWebsite.Api.Events.Data { - public static class DataEventFactory { - public static DataEventModel Create(DataEventType type, string id, object data = null) => new DataEventModel {type = type, id = id, data = data}; - } -} diff --git a/UKSFWebsite.Api.Events/Data/EventModelFactory.cs b/UKSFWebsite.Api.Events/Data/EventModelFactory.cs new file mode 100644 index 00000000..7eae1464 --- /dev/null +++ b/UKSFWebsite.Api.Events/Data/EventModelFactory.cs @@ -0,0 +1,8 @@ +using UKSFWebsite.Api.Models.Events; + +namespace UKSFWebsite.Api.Events.Data { + public static class EventModelFactory { + public static DataEventModel CreateDataEvent(DataEventType type, string id, object data = null) => new DataEventModel {type = type, id = id, data = data}; + public static SocketEventModel CreateSocketEvent(string clientName, string message) => new SocketEventModel {clientName = clientName, message = message}; + } +} diff --git a/UKSFWebsite.Api.Events/EventBus.cs b/UKSFWebsite.Api.Events/EventBus.cs new file mode 100644 index 00000000..001a5782 --- /dev/null +++ b/UKSFWebsite.Api.Events/EventBus.cs @@ -0,0 +1,17 @@ +using System; +using System.Reactive.Linq; +using System.Reactive.Subjects; +using System.Threading.Tasks; +using UKSFWebsite.Api.Interfaces.Events; + +namespace UKSFWebsite.Api.Events { + public class EventBus : IEventBus { + protected readonly Subject Subject = new Subject(); + + public void Send(T message) { + Task.Run(() => Subject.OnNext(message)); + } + + public virtual IObservable AsObservable() => Subject.OfType(); + } +} diff --git a/UKSFWebsite.Api.Events/EventHandlerInitialiser.cs b/UKSFWebsite.Api.Events/EventHandlerInitialiser.cs index 43492f78..d503db21 100644 --- a/UKSFWebsite.Api.Events/EventHandlerInitialiser.cs +++ b/UKSFWebsite.Api.Events/EventHandlerInitialiser.cs @@ -1,4 +1,4 @@ -using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Interfaces.Events.Handlers; namespace UKSFWebsite.Api.Events { public class EventHandlerInitialiser { @@ -6,12 +6,14 @@ public class EventHandlerInitialiser { private readonly ICommandRequestEventHandler commandRequestEventHandler; private readonly ICommentThreadEventHandler commentThreadEventHandler; private readonly INotificationsEventHandler notificationsEventHandler; + private readonly ITeamspeakEventHandler teamspeakEventHandler; - public EventHandlerInitialiser(IAccountEventHandler accountEventHandler, ICommandRequestEventHandler commandRequestEventHandler, ICommentThreadEventHandler commentThreadEventHandler, INotificationsEventHandler notificationsEventHandler) { + public EventHandlerInitialiser(IAccountEventHandler accountEventHandler, ICommandRequestEventHandler commandRequestEventHandler, ICommentThreadEventHandler commentThreadEventHandler, INotificationsEventHandler notificationsEventHandler, ITeamspeakEventHandler teamspeakEventHandler) { this.accountEventHandler = accountEventHandler; this.commandRequestEventHandler = commandRequestEventHandler; this.commentThreadEventHandler = commentThreadEventHandler; this.notificationsEventHandler = notificationsEventHandler; + this.teamspeakEventHandler = teamspeakEventHandler; } public void InitEventHandlers() { @@ -19,6 +21,7 @@ public void InitEventHandlers() { commandRequestEventHandler.Init(); commentThreadEventHandler.Init(); notificationsEventHandler.Init(); + teamspeakEventHandler.Init(); } } } diff --git a/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs index 77ba9105..71fdb1a0 100644 --- a/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs +++ b/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Interfaces.Events.Handlers; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Models.Events; using UKSFWebsite.Api.Services.Hubs; diff --git a/UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs index 7bf6e70b..db978de9 100644 --- a/UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs +++ b/UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Interfaces.Events.Handlers; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Models.Events; using UKSFWebsite.Api.Services.Hubs; diff --git a/UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs index 7af2d31d..053778d2 100644 --- a/UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs +++ b/UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Interfaces.Events.Handlers; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Models.Events; diff --git a/UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs index 985d5d43..3a1514d7 100644 --- a/UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs +++ b/UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Interfaces.Events.Handlers; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Models.Events; using UKSFWebsite.Api.Models.Message; diff --git a/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs new file mode 100644 index 00000000..fc388f65 --- /dev/null +++ b/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Interfaces.Events.Handlers; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; +using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Models.Events.Types; +using UKSFWebsite.Api.Models.Integrations; +using UKSFWebsite.Api.Models.Personnel; + +namespace UKSFWebsite.Api.Events.Handlers { + public class TeamspeakEventHandler : ITeamspeakEventHandler { + private readonly ISocketEventBus eventBus; + private readonly ITeamspeakService teamspeakService; + private readonly IAccountService accountService; + private readonly ITeamspeakGroupService teamspeakGroupService; + private readonly Dictionary serverGroupUpdates = new Dictionary(); + + public TeamspeakEventHandler(ISocketEventBus eventBus, ITeamspeakService teamspeakService, IAccountService accountService, ITeamspeakGroupService teamspeakGroupService) { + this.eventBus = eventBus; + this.teamspeakService = teamspeakService; + this.accountService = accountService; + this.teamspeakGroupService = teamspeakGroupService; + } + + public void Init() { + eventBus.AsObservable("0") + .Subscribe( + async x => { await HandleEvent(x.message); } + ); + } + + private async Task HandleEvent(string messageString) { + if (!Enum.TryParse(messageString.Substring(0, 1), out TeamspeakSocketEventType eventType)) return; + string message = messageString.Substring(1); + switch (eventType) { + case TeamspeakSocketEventType.CLIENTS: + await UpdateClients(message); + break; + case TeamspeakSocketEventType.CLIENT_SERVER_GROUPS: + UpdateClientServerGroups(message); + break; + default: throw new ArgumentOutOfRangeException(); + } + } + + private void UpdateClientServerGroups(string message) { + string[] args = message.Split('|'); + string clientDbid = args[0]; + string serverGroupId = args[1]; + Console.WriteLine($"Server group for {clientDbid}: {serverGroupId}"); + + lock (serverGroupUpdates) { + if (!serverGroupUpdates.ContainsKey(clientDbid)) { + serverGroupUpdates.Add(clientDbid, new TeamspeakServerGroupUpdate()); + } + + TeamspeakServerGroupUpdate update = serverGroupUpdates[clientDbid]; + update.serverGroups.Add(serverGroupId); + update.cancellationTokenSource?.Cancel(); + update.cancellationTokenSource = new CancellationTokenSource(); + Task.Run( + async () => { + await Task.Delay(TimeSpan.FromMilliseconds(200), update.cancellationTokenSource.Token); + if (!update.cancellationTokenSource.IsCancellationRequested) { + update.cancellationTokenSource.Cancel(); + ProcessAccountData(clientDbid, update.serverGroups); + } + }, + update.cancellationTokenSource.Token + ); + } + } + + private async Task UpdateClients(string clients) { + if (string.IsNullOrEmpty(clients)) return; + Console.WriteLine("Updating online clients"); + await teamspeakService.UpdateClients(clients); + } + + private void ProcessAccountData(string clientDbId, ICollection serverGroups) { + Console.WriteLine($"Processing server groups for {clientDbId}"); + Account account = accountService.Data().GetSingle(x => x.teamspeakIdentities != null && x.teamspeakIdentities.Any(y => y == clientDbId)); + teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); + + lock (serverGroupUpdates) { + serverGroupUpdates.Remove(clientDbId); + } + } + } +} diff --git a/UKSFWebsite.Api.Events/SocketServer/SocketEventBus.cs b/UKSFWebsite.Api.Events/SocketServer/SocketEventBus.cs new file mode 100644 index 00000000..0ba98f3b --- /dev/null +++ b/UKSFWebsite.Api.Events/SocketServer/SocketEventBus.cs @@ -0,0 +1,10 @@ +using System; +using System.Reactive.Linq; +using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Models.Events; + +namespace UKSFWebsite.Api.Events.SocketServer { + public class SocketEventBus : EventBus, ISocketEventBus { + public IObservable AsObservable(string clientName) => Subject.OfType().Where(x => x.clientName == clientName); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs index 8bd6c0ff..06f0f0d9 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs @@ -1,4 +1,5 @@ using System.Threading.Tasks; +using UKSFWebsite.Api.Models.Admin; using UKSFWebsite.Api.Models.Utility; namespace UKSFWebsite.Api.Interfaces.Data.Cached { diff --git a/UKSFWebsite.Api.Interfaces/Events/IAccountEventHandler.cs b/UKSFWebsite.Api.Interfaces/Events/Handlers/IAccountEventHandler.cs similarity index 53% rename from UKSFWebsite.Api.Interfaces/Events/IAccountEventHandler.cs rename to UKSFWebsite.Api.Interfaces/Events/Handlers/IAccountEventHandler.cs index d8a70c44..f6112067 100644 --- a/UKSFWebsite.Api.Interfaces/Events/IAccountEventHandler.cs +++ b/UKSFWebsite.Api.Interfaces/Events/Handlers/IAccountEventHandler.cs @@ -1,3 +1,3 @@ -namespace UKSFWebsite.Api.Interfaces.Events { +namespace UKSFWebsite.Api.Interfaces.Events.Handlers { public interface IAccountEventHandler : IEventHandler { } } diff --git a/UKSFWebsite.Api.Interfaces/Events/ICommandRequestEventHandler.cs b/UKSFWebsite.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs similarity index 56% rename from UKSFWebsite.Api.Interfaces/Events/ICommandRequestEventHandler.cs rename to UKSFWebsite.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs index 25ef6f16..e586e36f 100644 --- a/UKSFWebsite.Api.Interfaces/Events/ICommandRequestEventHandler.cs +++ b/UKSFWebsite.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs @@ -1,3 +1,3 @@ -namespace UKSFWebsite.Api.Interfaces.Events { +namespace UKSFWebsite.Api.Interfaces.Events.Handlers { public interface ICommandRequestEventHandler : IEventHandler { } } diff --git a/UKSFWebsite.Api.Interfaces/Events/ICommentThreadEventHandler.cs b/UKSFWebsite.Api.Interfaces/Events/Handlers/ICommentThreadEventHandler.cs similarity index 56% rename from UKSFWebsite.Api.Interfaces/Events/ICommentThreadEventHandler.cs rename to UKSFWebsite.Api.Interfaces/Events/Handlers/ICommentThreadEventHandler.cs index fe03c4e3..6b4684cf 100644 --- a/UKSFWebsite.Api.Interfaces/Events/ICommentThreadEventHandler.cs +++ b/UKSFWebsite.Api.Interfaces/Events/Handlers/ICommentThreadEventHandler.cs @@ -1,3 +1,3 @@ -namespace UKSFWebsite.Api.Interfaces.Events { +namespace UKSFWebsite.Api.Interfaces.Events.Handlers { public interface ICommentThreadEventHandler : IEventHandler { } } diff --git a/UKSFWebsite.Api.Interfaces/Events/IEventHandler.cs b/UKSFWebsite.Api.Interfaces/Events/Handlers/IEventHandler.cs similarity index 54% rename from UKSFWebsite.Api.Interfaces/Events/IEventHandler.cs rename to UKSFWebsite.Api.Interfaces/Events/Handlers/IEventHandler.cs index ee1a23ce..c1e2d5e5 100644 --- a/UKSFWebsite.Api.Interfaces/Events/IEventHandler.cs +++ b/UKSFWebsite.Api.Interfaces/Events/Handlers/IEventHandler.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Interfaces.Events { +namespace UKSFWebsite.Api.Interfaces.Events.Handlers { public interface IEventHandler { void Init(); } diff --git a/UKSFWebsite.Api.Interfaces/Events/INotificationsEventHandler.cs b/UKSFWebsite.Api.Interfaces/Events/Handlers/INotificationsEventHandler.cs similarity index 56% rename from UKSFWebsite.Api.Interfaces/Events/INotificationsEventHandler.cs rename to UKSFWebsite.Api.Interfaces/Events/Handlers/INotificationsEventHandler.cs index 0e69053e..0ea0eeef 100644 --- a/UKSFWebsite.Api.Interfaces/Events/INotificationsEventHandler.cs +++ b/UKSFWebsite.Api.Interfaces/Events/Handlers/INotificationsEventHandler.cs @@ -1,3 +1,3 @@ -namespace UKSFWebsite.Api.Interfaces.Events { +namespace UKSFWebsite.Api.Interfaces.Events.Handlers { public interface INotificationsEventHandler : IEventHandler { } } diff --git a/UKSFWebsite.Api.Interfaces/Events/Handlers/ITeamspeakEventHandler.cs b/UKSFWebsite.Api.Interfaces/Events/Handlers/ITeamspeakEventHandler.cs new file mode 100644 index 00000000..5987d30f --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Events/Handlers/ITeamspeakEventHandler.cs @@ -0,0 +1,3 @@ +namespace UKSFWebsite.Api.Interfaces.Events.Handlers { + public interface ITeamspeakEventHandler : IEventHandler { } +} diff --git a/UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs b/UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs new file mode 100644 index 00000000..d50a1985 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs @@ -0,0 +1,5 @@ +using UKSFWebsite.Api.Models.Events; + +namespace UKSFWebsite.Api.Interfaces.Events { + public interface IDataEventBus : IEventBus { } +} diff --git a/UKSFWebsite.Api.Interfaces/Events/IEventBus.cs b/UKSFWebsite.Api.Interfaces/Events/IEventBus.cs index c07668ed..738824ac 100644 --- a/UKSFWebsite.Api.Interfaces/Events/IEventBus.cs +++ b/UKSFWebsite.Api.Interfaces/Events/IEventBus.cs @@ -1,8 +1,8 @@ using System; namespace UKSFWebsite.Api.Interfaces.Events { - public interface IEventBus { - void Send(T message); - IObservable AsObservable(); + public interface IEventBus { + void Send(T message); + IObservable AsObservable(); } } diff --git a/UKSFWebsite.Api.Interfaces/Events/ISocketEventBus.cs b/UKSFWebsite.Api.Interfaces/Events/ISocketEventBus.cs new file mode 100644 index 00000000..31b3fd6f --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Events/ISocketEventBus.cs @@ -0,0 +1,8 @@ +using System; +using UKSFWebsite.Api.Models.Events; + +namespace UKSFWebsite.Api.Interfaces.Events { + public interface ISocketEventBus : IEventBus { + IObservable AsObservable(string clientName); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Integrations/ISocket.cs b/UKSFWebsite.Api.Interfaces/Integrations/ISocket.cs new file mode 100644 index 00000000..98e2ce1a --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Integrations/ISocket.cs @@ -0,0 +1,12 @@ +using System; + +namespace UKSFWebsite.Api.Interfaces.Integrations { + public interface ISocket { + void Start(string port); + void Stop(); + void SendMessageToAllClients(string message); + void SendMessageToClient(string clientName, string message); + void SendMessageToClient(string clientName, byte[] data); + bool IsClientOnline(string clientName); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakGroupService.cs b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs similarity index 79% rename from UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakGroupService.cs rename to UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs index 6d97a410..5d0af634 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakGroupService.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Integrations { +namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { public interface ITeamspeakGroupService { void UpdateAccountGroups(Account account, ICollection serverGroups, string clientDbId); } diff --git a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManager.cs b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManager.cs new file mode 100644 index 00000000..e9fcff6c --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManager.cs @@ -0,0 +1,6 @@ +namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { + public interface ITeamspeakManager { + void Start(); + void SendProcedure(string procedure); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakMetricsService.cs b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs similarity index 73% rename from UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakMetricsService.cs rename to UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs index 42a3af77..be1e4ee9 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakMetricsService.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSFWebsite.Api.Interfaces.Integrations { +namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { public interface ITeamspeakMetricsService { float GetWeeklyParticipationTrend(HashSet teamspeakIdentities); } diff --git a/UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakService.cs b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs similarity index 91% rename from UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakService.cs rename to UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs index 28fbf450..12baed53 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/ITeamspeakService.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using UKSFWebsite.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Integrations { +namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { public interface ITeamspeakService { string GetOnlineTeamspeakClients(); (bool online, string nickname) GetOnlineUserDetails(Account account); diff --git a/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj b/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj index 3d1352ef..1811f052 100644 --- a/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj +++ b/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj @@ -17,4 +17,8 @@ + + + + diff --git a/UKSFWebsite.Api.Models/Utility/VariableItem.cs b/UKSFWebsite.Api.Models/Admin/VariableItem.cs similarity index 84% rename from UKSFWebsite.Api.Models/Utility/VariableItem.cs rename to UKSFWebsite.Api.Models/Admin/VariableItem.cs index 6c7e1b7f..c5fb02de 100644 --- a/UKSFWebsite.Api.Models/Utility/VariableItem.cs +++ b/UKSFWebsite.Api.Models/Admin/VariableItem.cs @@ -1,7 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Utility { +namespace UKSFWebsite.Api.Models.Admin { public class VariableItem { [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public object item; diff --git a/UKSFWebsite.Api.Models/Events/SocketEventModel.cs b/UKSFWebsite.Api.Models/Events/SocketEventModel.cs new file mode 100644 index 00000000..454862d6 --- /dev/null +++ b/UKSFWebsite.Api.Models/Events/SocketEventModel.cs @@ -0,0 +1,6 @@ +namespace UKSFWebsite.Api.Models.Events { + public class SocketEventModel { + public string clientName; + public string message; + } +} diff --git a/UKSFWebsite.Api.Models/Events/Types/TeamspeakSocketEventType.cs b/UKSFWebsite.Api.Models/Events/Types/TeamspeakSocketEventType.cs new file mode 100644 index 00000000..e7a71fb0 --- /dev/null +++ b/UKSFWebsite.Api.Models/Events/Types/TeamspeakSocketEventType.cs @@ -0,0 +1,6 @@ +namespace UKSFWebsite.Api.Models.Events.Types { + public enum TeamspeakSocketEventType { + CLIENTS, + CLIENT_SERVER_GROUPS + } +} diff --git a/UKSFWebsite.Api.Models/Game/GameServer.cs b/UKSFWebsite.Api.Models/Game/GameServer.cs index 5d6a0cf3..e769ba91 100644 --- a/UKSFWebsite.Api.Models/Game/GameServer.cs +++ b/UKSFWebsite.Api.Models/Game/GameServer.cs @@ -10,7 +10,7 @@ public enum GameServerOption { } public class GameServer { - [BsonIgnore] public readonly List headlessClientProcessIds = new List(); + [BsonIgnore] public readonly List headlessClientProcessIds = new List(); public string adminPassword; public int apiPort; [BsonIgnore] public bool canLaunch; @@ -22,7 +22,7 @@ public class GameServer { public int order = 0; public string password; public int port; - [BsonIgnore] public uint? processId; + [BsonIgnore] public int? processId; public string profileName; public string serverMods; public GameServerOption serverOption; diff --git a/UKSFWebsite.Api.Models/Integrations/SocketCommands.cs b/UKSFWebsite.Api.Models/Integrations/SocketCommands.cs new file mode 100644 index 00000000..720dba6d --- /dev/null +++ b/UKSFWebsite.Api.Models/Integrations/SocketCommands.cs @@ -0,0 +1,5 @@ +namespace UKSFWebsite.Api.Models.Integrations { + public enum SocketCommands { + NAME + } +} diff --git a/UKSFWebsite.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs b/UKSFWebsite.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs new file mode 100644 index 00000000..bf6d6ab4 --- /dev/null +++ b/UKSFWebsite.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs @@ -0,0 +1,9 @@ +using System.Collections.Generic; +using System.Threading; + +namespace UKSFWebsite.Api.Models.Integrations { + public class TeamspeakServerGroupUpdate { + public readonly List serverGroups = new List(); + public CancellationTokenSource cancellationTokenSource; + } +} diff --git a/UKSFWebsite.Api.Models/Integrations/TeamspeakSocketProcedureType.cs b/UKSFWebsite.Api.Models/Integrations/TeamspeakSocketProcedureType.cs new file mode 100644 index 00000000..44a5ae00 --- /dev/null +++ b/UKSFWebsite.Api.Models/Integrations/TeamspeakSocketProcedureType.cs @@ -0,0 +1,9 @@ +namespace UKSFWebsite.Api.Models.Integrations { + public enum TeamspeakSocketProcedureType { + ASSIGN, + UNASSIGN, + GROUPS, + MESSAGE, + SHUTDOWN + } +} diff --git a/UKSFWebsite.Api.Services/Utility/MigrationUtility.cs b/UKSFWebsite.Api.Services/Admin/MigrationUtility.cs similarity index 92% rename from UKSFWebsite.Api.Services/Utility/MigrationUtility.cs rename to UKSFWebsite.Api.Services/Admin/MigrationUtility.cs index fb491c71..d4f6c9a1 100644 --- a/UKSFWebsite.Api.Services/Utility/MigrationUtility.cs +++ b/UKSFWebsite.Api.Services/Admin/MigrationUtility.cs @@ -2,23 +2,17 @@ using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Diagnostics; using System.Linq; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Models; using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Models.Units; using UKSFWebsite.Api.Services.Message; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSFWebsite.Api.Services.Admin { public class MigrationUtility { private const string KEY = "MIGRATED"; private readonly IHostEnvironment currentEnvironment; diff --git a/UKSFWebsite.Api.Services/Utility/VariablesService.cs b/UKSFWebsite.Api.Services/Admin/VariablesService.cs similarity index 62% rename from UKSFWebsite.Api.Services/Utility/VariablesService.cs rename to UKSFWebsite.Api.Services/Admin/VariablesService.cs index 3d4cd4df..9d595bca 100644 --- a/UKSFWebsite.Api.Services/Utility/VariablesService.cs +++ b/UKSFWebsite.Api.Services/Admin/VariablesService.cs @@ -1,15 +1,19 @@ using System; using System.Linq; using System.Text.RegularExpressions; -using UKSFWebsite.Api.Models.Utility; +using UKSFWebsite.Api.Models.Admin; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSFWebsite.Api.Services.Admin { public static class VariablesService { - public static string AsString(this VariableItem variable) => variable.item.ToString(); - public static bool AsBool(this VariableItem variable) => bool.Parse(variable.item.ToString()); - public static ulong AsUlong(this VariableItem variable) => ulong.Parse(variable.item.ToString()); + public static string AsString(this VariableItem variable) => variable?.item.ToString(); + public static bool AsBool(this VariableItem variable) => bool.Parse(variable?.item.ToString() ?? throw new Exception("Variable does not exist")); + public static ulong AsUlong(this VariableItem variable) => ulong.Parse(variable?.item.ToString() ?? throw new Exception("Variable does not exist")); public static string[] AsArray(this VariableItem variable, Func predicate = null) { + if (variable == null) { + throw new Exception("Variable does not exist"); + } + string itemString = variable.item.ToString(); itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); string[] items = itemString.Split(","); diff --git a/UKSFWebsite.Api.Services/Utility/VariablesWrapper.cs b/UKSFWebsite.Api.Services/Admin/VariablesWrapper.cs similarity index 86% rename from UKSFWebsite.Api.Services/Utility/VariablesWrapper.cs rename to UKSFWebsite.Api.Services/Admin/VariablesWrapper.cs index 97173636..04f23bd0 100644 --- a/UKSFWebsite.Api.Services/Utility/VariablesWrapper.cs +++ b/UKSFWebsite.Api.Services/Admin/VariablesWrapper.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using UKSFWebsite.Api.Interfaces.Data.Cached; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSFWebsite.Api.Services.Admin { public static class VariablesWrapper { public static IVariablesDataService VariablesDataService() => ServiceWrapper.ServiceProvider.GetService(); } diff --git a/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs b/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs index 24b4d986..3110e07d 100644 --- a/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs +++ b/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using UKSFWebsite.Api.Models.Game; +using UKSFWebsite.Api.Services.Admin; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Services.Game { diff --git a/UKSFWebsite.Api.Services/Game/GameServersService.cs b/UKSFWebsite.Api.Services/Game/GameServersService.cs index 87c86b2e..36d4753b 100644 --- a/UKSFWebsite.Api.Services/Game/GameServersService.cs +++ b/UKSFWebsite.Api.Services/Game/GameServersService.cs @@ -3,7 +3,6 @@ using System.Diagnostics; using System.IO; using System.Linq; -using System.Management; using System.Net.Http; using System.Net.Http.Headers; using System.Threading.Tasks; @@ -13,6 +12,7 @@ using UKSFWebsite.Api.Interfaces.Game; using UKSFWebsite.Api.Models.Game; using UKSFWebsite.Api.Models.Mission; +using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Services.Game { public class GameServersService : IGameServersService { @@ -76,19 +76,7 @@ public async Task PatchMissionFile(string missionName) { public async Task LaunchGameServer(GameServer gameServer) { string launchArguments = gameServer.FormatGameServerLaunchArguments(); - using (ManagementClass managementClass = new ManagementClass("Win32_Process")) { - ManagementClass processInfo = new ManagementClass("Win32_ProcessStartup"); - processInfo.Properties["CreateFlags"].Value = 0x00000008; - - ManagementBaseObject inParameters = managementClass.GetMethodParameters("Create"); - inParameters["CommandLine"] = $"\"{GameServerHelpers.GetGameServerExecutablePath()}\" {launchArguments}"; - inParameters["ProcessStartupInformation"] = processInfo; - - ManagementBaseObject result = managementClass.InvokeMethod("Create", inParameters, null); - if (result != null && (uint) result.Properties["ReturnValue"].Value == 0) { - gameServer.processId = (uint) result.Properties["ProcessId"].Value; - } - } + gameServer.processId = ProcessHelper.LaunchManagedProcess(GameServerHelpers.GetGameServerExecutablePath(), launchArguments); await Task.Delay(TimeSpan.FromSeconds(1)); @@ -96,19 +84,7 @@ public async Task LaunchGameServer(GameServer gameServer) { if (gameServer.numberHeadlessClients > 0) { for (int index = 0; index < gameServer.numberHeadlessClients; index++) { launchArguments = gameServer.FormatHeadlessClientLaunchArguments(index); - using (ManagementClass managementClass = new ManagementClass("Win32_Process")) { - ManagementClass processInfo = new ManagementClass("Win32_ProcessStartup"); - processInfo.Properties["CreateFlags"].Value = 0x00000008; - - ManagementBaseObject inParameters = managementClass.GetMethodParameters("Create"); - inParameters["CommandLine"] = $"\"{GameServerHelpers.GetGameServerExecutablePath()}\" {launchArguments}"; - inParameters["ProcessStartupInformation"] = processInfo; - - ManagementBaseObject result = managementClass.InvokeMethod("Create", inParameters, null); - if (result != null && (uint) result.Properties["ReturnValue"].Value == 0) { - gameServer.headlessClientProcessIds.Add((uint) result.Properties["ProcessId"].Value); - } - } + gameServer.headlessClientProcessIds.Add(ProcessHelper.LaunchManagedProcess(GameServerHelpers.GetGameServerExecutablePath(), launchArguments)); await Task.Delay(TimeSpan.FromSeconds(1)); } diff --git a/UKSFWebsite.Api.Services/Game/Missions/MissionPatchingService.cs b/UKSFWebsite.Api.Services/Game/Missions/MissionPatchingService.cs index 6fcc517e..333ca674 100644 --- a/UKSFWebsite.Api.Services/Game/Missions/MissionPatchingService.cs +++ b/UKSFWebsite.Api.Services/Game/Missions/MissionPatchingService.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using UKSFWebsite.Api.Interfaces.Game; using UKSFWebsite.Api.Models.Mission; +using UKSFWebsite.Api.Services.Admin; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Utility; diff --git a/UKSFWebsite.Api.Services/Game/Missions/MissionService.cs b/UKSFWebsite.Api.Services/Game/Missions/MissionService.cs index c5b69b82..e5deb446 100644 --- a/UKSFWebsite.Api.Services/Game/Missions/MissionService.cs +++ b/UKSFWebsite.Api.Services/Game/Missions/MissionService.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using UKSFWebsite.Api.Models.Mission; +using UKSFWebsite.Api.Services.Admin; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Services.Game.Missions { diff --git a/UKSFWebsite.Api.Services/Integrations/DiscordService.cs b/UKSFWebsite.Api.Services/Integrations/DiscordService.cs index f40980f1..1d20eea4 100644 --- a/UKSFWebsite.Api.Services/Integrations/DiscordService.cs +++ b/UKSFWebsite.Api.Services/Integrations/DiscordService.cs @@ -10,6 +10,7 @@ using UKSFWebsite.Api.Interfaces.Units; using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Models.Units; +using UKSFWebsite.Api.Services.Admin; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Utility; diff --git a/UKSFWebsite.Api.Services/Integrations/PipeManager.cs b/UKSFWebsite.Api.Services/Integrations/PipeManager.cs index 9beb1e72..1b7371c8 100644 --- a/UKSFWebsite.Api.Services/Integrations/PipeManager.cs +++ b/UKSFWebsite.Api.Services/Integrations/PipeManager.cs @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; using UKSFWebsite.Api.Interfaces.Integrations; -using UKSFWebsite.Api.Services.Integrations.Procedures; namespace UKSFWebsite.Api.Services.Integrations { public class PipeManager : IPipeManager { @@ -16,13 +13,10 @@ public class PipeManager : IPipeManager { private static DateTime connectionCheckTime = DateTime.Now; private static DateTime pingCheckTime = DateTime.Now; public static DateTime PongTime = DateTime.Now; - private readonly List procedures; private int pipeCode; private bool runAll, runServer, serverStarted; - public PipeManager(Pong pong, CheckClientServerGroup checkClientServerGroup, SendClientsUpdate sendClientsUpdate) => procedures = new List {pong, checkClientServerGroup, sendClientsUpdate}; - public void Dispose() { runAll = false; runServer = false; @@ -91,7 +85,7 @@ private void ConnectionCheck() { } private static bool PingCheck() { - ExecutePipeFunction($"{PIPE_COMMAND_WRITE}{ProcedureDefinitons.PROC_PING}:"); +// ExecutePipeFunction($"{PIPE_COMMAND_WRITE}{ProcedureDefinitons.PROC_PING}:"); if ((DateTime.Now - PongTime).Seconds > 10) { Console.WriteLine("Resetting pipe"); string result = ExecutePipeFunction(PIPE_COMMAND_RESET); @@ -127,11 +121,11 @@ private void HandleMessage(string message) { if (string.IsNullOrEmpty(procedureName)) return; if (parts.Length > 1) { - ITeamspeakProcedure procedure = procedures.FirstOrDefault(x => x.GetType().Name == procedureName); - if (procedure != null) { - string[] args = parts[1].Split('|'); - Task.Run(() => procedure.Run(args)); - } +// ITeamspeakProcedure procedure = procedures.FirstOrDefault(x => x.GetType().Name == procedureName); +// if (procedure != null) { +// string[] args = parts[1].Split('|'); +// Task.Run(() => procedure.Run(args)); +// } } } diff --git a/UKSFWebsite.Api.Services/Integrations/Procedures/CheckClientServerGroup.cs b/UKSFWebsite.Api.Services/Integrations/Procedures/CheckClientServerGroup.cs deleted file mode 100644 index e6600651..00000000 --- a/UKSFWebsite.Api.Services/Integrations/Procedures/CheckClientServerGroup.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Integrations; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Models.Personnel; - -namespace UKSFWebsite.Api.Services.Integrations.Procedures { - public class CheckClientServerGroup : ITeamspeakProcedure { - private static readonly Dictionary SERVER_GROUP_UPDATES = new Dictionary(); - - private readonly IAccountService accountService; - private readonly ITeamspeakGroupService teamspeakGroupService; - - public CheckClientServerGroup(IAccountService accountService, ITeamspeakGroupService teamspeakGroupService) { - this.accountService = accountService; - this.teamspeakGroupService = teamspeakGroupService; - } - - public void Run(string[] args) { - string clientDbid = args[0]; - string serverGroupId = args[1]; - Console.WriteLine($"Server group for {clientDbid}: {serverGroupId}"); - - lock (SERVER_GROUP_UPDATES) { - if (!SERVER_GROUP_UPDATES.ContainsKey(clientDbid)) { - SERVER_GROUP_UPDATES.Add(clientDbid, new ServerGroupUpdate()); - } - - ServerGroupUpdate update = SERVER_GROUP_UPDATES[clientDbid]; - update.ServerGroups.Add(serverGroupId); - update.CancellationTokenSource?.Cancel(); - update.CancellationTokenSource = new CancellationTokenSource(); - Task.Run( - async () => { - await Task.Delay(TimeSpan.FromMilliseconds(200), update.CancellationTokenSource.Token); - if (!update.CancellationTokenSource.IsCancellationRequested) { - update.CancellationTokenSource.Cancel(); - ProcessAccountData(clientDbid, update.ServerGroups); - } - }, - update.CancellationTokenSource.Token - ); - } - } - - private void ProcessAccountData(string clientDbId, ICollection serverGroups) { - Console.WriteLine($"Processing server groups for {clientDbId}"); - Account account = accountService.Data().GetSingle(x => x.teamspeakIdentities != null && x.teamspeakIdentities.Any(y => y == clientDbId)); - teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); - - lock (SERVER_GROUP_UPDATES) { - SERVER_GROUP_UPDATES.Remove(clientDbId); - } - } - } - - internal class ServerGroupUpdate { - public readonly List ServerGroups = new List(); - public CancellationTokenSource CancellationTokenSource; - } -} diff --git a/UKSFWebsite.Api.Services/Integrations/Procedures/ITeamspeakProcedure.cs b/UKSFWebsite.Api.Services/Integrations/Procedures/ITeamspeakProcedure.cs deleted file mode 100644 index 680be10c..00000000 --- a/UKSFWebsite.Api.Services/Integrations/Procedures/ITeamspeakProcedure.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace UKSFWebsite.Api.Services.Integrations.Procedures { - public interface ITeamspeakProcedure { - void Run(string[] args); - } -} diff --git a/UKSFWebsite.Api.Services/Integrations/Procedures/Pong.cs b/UKSFWebsite.Api.Services/Integrations/Procedures/Pong.cs deleted file mode 100644 index cef0d869..00000000 --- a/UKSFWebsite.Api.Services/Integrations/Procedures/Pong.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; - -namespace UKSFWebsite.Api.Services.Integrations.Procedures { - public class Pong : ITeamspeakProcedure { - public void Run(string[] args) { - PipeManager.PongTime = DateTime.Now; - } - } -} diff --git a/UKSFWebsite.Api.Services/Integrations/Procedures/ProcedureDefinitons.cs b/UKSFWebsite.Api.Services/Integrations/Procedures/ProcedureDefinitons.cs deleted file mode 100644 index 65ea34ea..00000000 --- a/UKSFWebsite.Api.Services/Integrations/Procedures/ProcedureDefinitons.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace UKSFWebsite.Api.Services.Integrations.Procedures { - public static class ProcedureDefinitons { - public const string PROC_ASSIGN_SERVER_GROUP = "ProcAssignServerGroup"; - public const string PROC_PING = "ProcPing"; - public const string PROC_SEND_MESSAGE_TO_CLIENT = "ProcSendMessageToClient"; - public const string PROC_SHUTDOWN = "ProcShutdown"; - public const string PROC_UNASSIGN_SERVER_GROUP = "ProcUnassignServerGroup"; - public const string PROC_UPDATE_SERVER_GROUPS = "ProcUpdateServerGroups"; - } -} diff --git a/UKSFWebsite.Api.Services/Integrations/Procedures/SendClientsUpdate.cs b/UKSFWebsite.Api.Services/Integrations/Procedures/SendClientsUpdate.cs deleted file mode 100644 index 79a15a0e..00000000 --- a/UKSFWebsite.Api.Services/Integrations/Procedures/SendClientsUpdate.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using UKSFWebsite.Api.Interfaces.Integrations; - -namespace UKSFWebsite.Api.Services.Integrations.Procedures { - public class SendClientsUpdate : ITeamspeakProcedure { - private readonly ITeamspeakService teamspeakService; - - public SendClientsUpdate(ITeamspeakService teamspeakService) => this.teamspeakService = teamspeakService; - - public void Run(string[] args) { - string clientsJson = args[0]; - Console.WriteLine($"Got data for online clients: {clientsJson}"); - if (string.IsNullOrEmpty(clientsJson)) return; - Console.WriteLine("Updating online clients"); - teamspeakService.UpdateClients(clientsJson).Wait(); - } - } -} diff --git a/UKSFWebsite.Api.Services/Integrations/TeamspeakGroupService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs similarity index 75% rename from UKSFWebsite.Api.Services/Integrations/TeamspeakGroupService.cs rename to UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs index 8fd7e261..0b3a11b5 100644 --- a/UKSFWebsite.Api.Services/Integrations/TeamspeakGroupService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs @@ -1,32 +1,35 @@ using System.Collections.Generic; using System.Linq; -using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Units; +using UKSFWebsite.Api.Models.Integrations; using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Services.Integrations.Procedures; +using UKSFWebsite.Api.Services.Admin; using UKSFWebsite.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Integrations { +namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { public class TeamspeakGroupService : ITeamspeakGroupService { private readonly IRanksService ranksService; private readonly IUnitsService unitsService; + private readonly ITeamspeakManager teamspeakManager; - public TeamspeakGroupService(IRanksService ranksService, IUnitsService unitsService) { + public TeamspeakGroupService(IRanksService ranksService, IUnitsService unitsService, ITeamspeakManager teamspeakManager) { this.ranksService = ranksService; this.unitsService = unitsService; + this.teamspeakManager = teamspeakManager; } public void UpdateAccountGroups(Account account, ICollection serverGroups, string clientDbId) { HashSet allowedGroups = new HashSet(); if (account == null || account.membershipState == MembershipState.UNCONFIRMED) { - allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TSGID_UNVERIFIED").AsString()); + allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_UNVERIFIED").AsString()); } if (account?.membershipState == MembershipState.DISCHARGED) { - allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TSGID_DISCHARGED").AsString()); + allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_DISCHARGED").AsString()); } if (account != null) { @@ -34,7 +37,7 @@ public void UpdateAccountGroups(Account account, ICollection serverGroup UpdateUnits(account, allowedGroups); } - string[] groupsBlacklist = VariablesWrapper.VariablesDataService().GetSingle("TSGID_BLACKLIST").AsArray(); + string[] groupsBlacklist = VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_BLACKLIST").AsArray(); foreach (string serverGroup in serverGroups) { if (!allowedGroups.Contains(serverGroup) && !groupsBlacklist.Contains(serverGroup)) { RemoveServerGroup(clientDbId, serverGroup); @@ -62,19 +65,19 @@ private void UpdateUnits(Account account, ISet allowedGroups) { if (elcom.members.Contains(account.id)) { accountUnits.Remove(accountUnits.Find(x => x.branch == UnitBranch.COMBAT)); accountUnitParents = accountUnitParents.TakeLast(2).ToList(); - allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TSGID_ELCOM").AsString()); + allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_ELCOM").AsString()); } accountUnits.ForEach(x => allowedGroups.Add(x.teamspeakGroup)); accountUnitParents.ForEach(x => allowedGroups.Add(x.teamspeakGroup)); } - private static void AddServerGroup(string clientDbId, string serverGroup) { - PipeQueueManager.QueueMessage($"{ProcedureDefinitons.PROC_ASSIGN_SERVER_GROUP}:{clientDbId}|{serverGroup}"); + private void AddServerGroup(string clientDbId, string serverGroup) { + teamspeakManager.SendProcedure($"{TeamspeakSocketProcedureType.ASSIGN}:{clientDbId}|{serverGroup}"); } - private static void RemoveServerGroup(string clientDbId, string serverGroup) { - PipeQueueManager.QueueMessage($"{ProcedureDefinitons.PROC_UNASSIGN_SERVER_GROUP}:{clientDbId}|{serverGroup}"); + private void RemoveServerGroup(string clientDbId, string serverGroup) { + teamspeakManager.SendProcedure($"{TeamspeakSocketProcedureType.UNASSIGN}:{clientDbId}|{serverGroup}"); } } } diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManager.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManager.cs new file mode 100644 index 00000000..72e8503d --- /dev/null +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManager.cs @@ -0,0 +1,62 @@ +using System; +using System.Diagnostics; +using System.Linq; +using System.Threading.Tasks; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; +using UKSFWebsite.Api.Services.Admin; +using UKSFWebsite.Api.Services.Utility; + +namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { + public class TeamspeakManager : ITeamspeakManager, IDisposable { + private readonly ISocket socket; + private readonly string teamspeakConnectionName; + private bool runTeamspeak; + private int teamspeakProcessId; + + public TeamspeakManager(ISocket socket) { + this.socket = socket; + teamspeakConnectionName = VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_SOCKET_NAME").AsString(); + } + + public void Start() { + runTeamspeak = true; + Task.Run(AssertOnline); + } + + public void SendProcedure(string procedure) { + socket.SendMessageToClient(teamspeakConnectionName, procedure); + } + + private async void AssertOnline() { + while (runTeamspeak) { + if (!VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_RUN").AsBool()) continue; + if (!socket.IsClientOnline(teamspeakConnectionName)) { + if (teamspeakProcessId == default) { + LaunchTeamspeak(); + } else { + while (Process.GetProcesses().Any(x => x.Id == teamspeakProcessId)) { + ShutTeamspeak(); + await Task.Delay(TimeSpan.FromSeconds(2)); + } + teamspeakProcessId = default; + } + } + await Task.Delay(TimeSpan.FromSeconds(10)); + } + } + + private void LaunchTeamspeak() { + teamspeakProcessId = ProcessHelper.LaunchProcess(VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_PATH").AsString(), ""); + } + + private void ShutTeamspeak() { + ProcessHelper.LaunchProcess("taskkill", $"/f /pid {teamspeakProcessId}"); + } + + public void Dispose() { + runTeamspeak = false; + socket.Stop(); + } + } +} diff --git a/UKSFWebsite.Api.Services/Integrations/TeamspeakMetricsService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs similarity index 68% rename from UKSFWebsite.Api.Services/Integrations/TeamspeakMetricsService.cs rename to UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs index c6d0397b..1027aa74 100644 --- a/UKSFWebsite.Api.Services/Integrations/TeamspeakMetricsService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -namespace UKSFWebsite.Api.Services.Integrations { +namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { public class TeamspeakMetricsService : ITeamspeakMetricsService { public float GetWeeklyParticipationTrend(HashSet teamspeakIdentities) => 3; } diff --git a/UKSFWebsite.Api.Services/Integrations/TeamspeakService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs similarity index 82% rename from UKSFWebsite.Api.Services/Integrations/TeamspeakService.cs rename to UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs index 5c8d97ae..0099b16c 100644 --- a/UKSFWebsite.Api.Services/Integrations/TeamspeakService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs @@ -9,22 +9,23 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Models.Integrations; using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Integrations.Procedures; -namespace UKSFWebsite.Api.Services.Integrations { +namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { public class TeamspeakService : ITeamspeakService { private readonly SemaphoreSlim clientStringSemaphore = new SemaphoreSlim(1); private readonly IMongoDatabase database; private readonly IHubContext teamspeakClientsHub; + private readonly ITeamspeakManager teamspeakManager; private string clientsString = ""; - public TeamspeakService(IMongoDatabase database, IHubContext teamspeakClientsHub) { + public TeamspeakService(IMongoDatabase database, IHubContext teamspeakClientsHub, ITeamspeakManager teamspeakManager) { this.database = database; this.teamspeakClientsHub = teamspeakClientsHub; + this.teamspeakManager = teamspeakManager; } public string GetOnlineTeamspeakClients() => clientsString; @@ -40,7 +41,7 @@ public async Task UpdateClients(string newClientsString) { public void UpdateAccountTeamspeakGroups(Account account) { if (account?.teamspeakIdentities == null) return; foreach (string clientDbId in account.teamspeakIdentities) { - PipeQueueManager.QueueMessage($"{ProcedureDefinitons.PROC_UPDATE_SERVER_GROUPS}:{clientDbId}"); + teamspeakManager.SendProcedure($"{TeamspeakSocketProcedureType.GROUPS}:{clientDbId}"); } } @@ -53,26 +54,25 @@ public void SendTeamspeakMessageToClient(Account account, string message) { public void SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message) { message = FormatTeamspeakMessage(message); foreach (string clientDbId in clientDbIds) { - PipeQueueManager.QueueMessage($"{ProcedureDefinitons.PROC_SEND_MESSAGE_TO_CLIENT}:{clientDbId}|{message}"); + teamspeakManager.SendProcedure($"{TeamspeakSocketProcedureType.MESSAGE}:{clientDbId}|{message}"); } } public async Task StoreTeamspeakServerSnapshot() { string clientsJson = GetOnlineTeamspeakClients(); if (string.IsNullOrEmpty(clientsJson)) { - Console.WriteLine("No clients online"); + Console.WriteLine("No client data for snapshot"); return; } JObject clientsObject = JObject.Parse(clientsJson); HashSet onlineClients = JsonConvert.DeserializeObject>(clientsObject["clients"].ToString()); TeamspeakServerSnapshot teamspeakServerSnapshot = new TeamspeakServerSnapshot {timestamp = DateTime.UtcNow, users = onlineClients}; - Console.WriteLine("Uploading snapshot"); await database.GetCollection("teamspeakSnapshots").InsertOneAsync(teamspeakServerSnapshot); } public void Shutdown() { - PipeQueueManager.QueueMessage($"{ProcedureDefinitons.PROC_SHUTDOWN}:"); + teamspeakManager.SendProcedure($"{TeamspeakSocketProcedureType.SHUTDOWN}:"); } public object GetFormattedClients() { @@ -97,12 +97,6 @@ public object GetFormattedClients() { return (false, ""); } - private static string FormatTeamspeakMessage(string message) { - StringBuilder messageBuilder = new StringBuilder(); - messageBuilder.AppendLine("\n========== UKSF Server Message =========="); - messageBuilder.AppendLine(message); - messageBuilder.AppendLine("=================================="); - return messageBuilder.ToString(); - } + private static string FormatTeamspeakMessage(string message) => $"\n========== UKSF Server Message ==========\n{message}\n=================================="; } } diff --git a/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs b/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs index 7a75f2ad..d097a6ff 100644 --- a/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs +++ b/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs @@ -11,6 +11,7 @@ using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Launcher; using UKSFWebsite.Api.Models.Launcher; +using UKSFWebsite.Api.Services.Admin; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Services.Launcher { diff --git a/UKSFWebsite.Api.Services/Message/NotificationsService.cs b/UKSFWebsite.Api.Services/Message/NotificationsService.cs index 56a08c2c..8eceec5b 100644 --- a/UKSFWebsite.Api.Services/Message/NotificationsService.cs +++ b/UKSFWebsite.Api.Services/Message/NotificationsService.cs @@ -6,6 +6,7 @@ using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Utility; diff --git a/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs b/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs index 338190f1..63714997 100644 --- a/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs +++ b/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Units; using UKSFWebsite.Api.Interfaces.Utility; diff --git a/UKSFWebsite.Api.Services/Personnel/RecruitmentService.cs b/UKSFWebsite.Api.Services/Personnel/RecruitmentService.cs index 3cc67712..d5bf4b09 100644 --- a/UKSFWebsite.Api.Services/Personnel/RecruitmentService.cs +++ b/UKSFWebsite.Api.Services/Personnel/RecruitmentService.cs @@ -5,6 +5,7 @@ using MongoDB.Driver; using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Units; using UKSFWebsite.Api.Interfaces.Utility; diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index 0043337e..c35a2994 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -26,5 +26,6 @@ + \ No newline at end of file diff --git a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs new file mode 100644 index 00000000..0f461a7a --- /dev/null +++ b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs @@ -0,0 +1,31 @@ +using System.Diagnostics; +using System.Management; + +namespace UKSFWebsite.Api.Services.Utility { + public static class ProcessHelper { + public static int LaunchManagedProcess(string executable, string arguments = null) { + int processId = default; + using ManagementClass managementClass = new ManagementClass("Win32_Process"); + ManagementClass processInfo = new ManagementClass("Win32_ProcessStartup"); + processInfo.Properties["CreateFlags"].Value = 0x00000008; + + ManagementBaseObject inParameters = managementClass.GetMethodParameters("Create"); + inParameters["CommandLine"] = $"\"{executable}\" {arguments}"; + inParameters["ProcessStartupInformation"] = processInfo; + + ManagementBaseObject result = managementClass.InvokeMethod("Create", inParameters, null); + if (result != null && (uint) result.Properties["ReturnValue"].Value == 0) { + processId = (int) result.Properties["ProcessId"].Value; + } + + return processId; + } + + public static int LaunchProcess(string executable, string arguments = null) { + using Process process = new Process {StartInfo = {UseShellExecute = true, FileName = executable, Arguments = arguments, Verb = "runas"}}; + process.Start(); + + return process.Id; + } + } +} diff --git a/UKSFWebsite.Api.Services/Utility/SchedulerActionHelper.cs b/UKSFWebsite.Api.Services/Utility/SchedulerActionHelper.cs index e855c0c2..a88772c5 100644 --- a/UKSFWebsite.Api.Services/Utility/SchedulerActionHelper.cs +++ b/UKSFWebsite.Api.Services/Utility/SchedulerActionHelper.cs @@ -2,9 +2,11 @@ using Microsoft.Extensions.DependencyInjection; using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Models.Message; using UKSFWebsite.Api.Models.Message.Logging; +using UKSFWebsite.Api.Services.Admin; namespace UKSFWebsite.Api.Services.Utility { public static class SchedulerActionHelper { diff --git a/UKSFWebsite.Api.SocketServer/Socket.cs b/UKSFWebsite.Api.SocketServer/Socket.cs new file mode 100644 index 00000000..cc320d1d --- /dev/null +++ b/UKSFWebsite.Api.SocketServer/Socket.cs @@ -0,0 +1,133 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using UKSFWebsite.Api.Events.Data; +using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Models.Events; +using UKSFWebsite.Api.Models.Integrations; +using Valve.Sockets; + +namespace UKSFWebsite.Api.SocketServer { + public class Socket : ISocket { + private readonly Dictionary clients = new Dictionary(); + private readonly IEventBus eventBus; + private NetworkingSockets server; + private uint socket; + + public Socket(ISocketEventBus eventBus) { + this.eventBus = eventBus; + Library.Initialize(); + } + + public void Start(string portString) { + if (server != null) return; + ushort port = ushort.Parse(portString); + Address address = new Address(); + address.SetAddress("::0", port); + server = new NetworkingSockets(); + socket = server.CreateListenSocket(ref address); + + server.DispatchCallback(StatusCallback); + server.ReceiveMessagesOnListenSocket(socket, ReceiveMessage, 20); + + Console.WriteLine($"Socket server running on port {port}"); + } + + public void Stop() { + Console.WriteLine("Socket server shutting down"); + server.CloseListenSocket(socket); + server = null; + Library.Deinitialize(); + } + + public void SendMessageToAllClients(string message) { + Task.Run(() => SendMessageToAllClientsAsync(message)); + } + + public void SendMessageToClient(string clientName, string message) { + Task.Run(() => SendMessageToClientAsync(clientName, message)); + } + + public void SendMessageToClient(string clientName, byte[] data) { + Task.Run(() => SendMessageToClientAsync(clientName, data)); + } + + public bool IsClientOnline(string clientName) { + uint client = GetClientByName(clientName); + return client != default; + } + + private void SendMessageToAllClientsAsync(string message) { + foreach (string client in clients.Values) { + SendMessageToClient(client, message); + } + } + + private void SendMessageToClientAsync(string clientName, string message) { + byte[] data = Encoding.UTF8.GetBytes(message); + uint client = GetClientByName(clientName); + server.SendMessageToConnection(client, data); + } + + private void SendMessageToClientAsync(string clientName, byte[] data) { + uint client = GetClientByName(clientName); + server.SendMessageToConnection(client, data); + } + + private uint GetClientByName(string clientName) { + return clients.FirstOrDefault(x => x.Value == clientName).Key; + } + + private string GetClientName(uint client) { + return clients.FirstOrDefault(x => x.Key == client).Value; + } + + private void StatusCallback(StatusInfo info, IntPtr context) { + switch (info.connectionInfo.state) { + case ConnectionState.NONE: break; + + case ConnectionState.CONNECTING: + server.AcceptConnection(info.connection); + break; + + case ConnectionState.CONNECTED: + clients.Add(info.connection, GetClientName(info.connection)); + Console.WriteLine($"Client connected - ID: {info.connection}, Name: {clients[info.connection]}"); + break; + + case ConnectionState.CLOSED_BY_PEER: + clients.Remove(info.connection); + server.CloseConnection(info.connection); + Console.WriteLine($"Client disconnected - ID: {info.connection}, Name: {clients[info.connection]}"); + break; + case ConnectionState.FINDING_ROUTE: break; + case ConnectionState.PROBLEM_DETECTED_LOCALLY: break; + default: throw new ArgumentOutOfRangeException(); + } + } + + private void ReceiveMessage(in NetworkingMessage message) { + Console.WriteLine($"Message received from - ID: {message.connection}, Channel ID: {message.channel}, Data length: {message.length}"); + byte[] buffer = new byte[message.length]; + message.CopyTo(buffer); + string messageString = Encoding.UTF8.GetString(buffer); + if (ResolveMessage(message.connection, messageString)) return; + eventBus.Send(EventModelFactory.CreateSocketEvent(GetClientName(message.connection), messageString)); + } + + private bool ResolveMessage(uint client, string messageString) { + if (!Enum.TryParse(messageString.Substring(0, 1), out SocketCommands command)) return false; + switch (command) { + case SocketCommands.NAME: + if (!clients.ContainsKey(client)) return true; + string newName = messageString.Substring(1); + clients[client] = newName; + return true; + default: return false; + } + } + } +} diff --git a/UKSFWebsite.Api.SocketServer/UKSFWebsite.Api.SocketServer.csproj b/UKSFWebsite.Api.SocketServer/UKSFWebsite.Api.SocketServer.csproj new file mode 100644 index 00000000..8af848f0 --- /dev/null +++ b/UKSFWebsite.Api.SocketServer/UKSFWebsite.Api.SocketServer.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp3.0 + + + + + + + + + diff --git a/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs b/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs index 7b865d31..52f818f6 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs @@ -9,6 +9,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Units; diff --git a/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs b/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs index 7805fcbb..04a41847 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs @@ -5,6 +5,7 @@ using MongoDB.Driver; using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Utility; diff --git a/UKSFWebsite.Api/Controllers/GameServersController.cs b/UKSFWebsite.Api/Controllers/GameServersController.cs index ba6244ad..2df5d4d5 100644 --- a/UKSFWebsite.Api/Controllers/GameServersController.cs +++ b/UKSFWebsite.Api/Controllers/GameServersController.cs @@ -13,6 +13,7 @@ using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Models.Game; using UKSFWebsite.Api.Models.Mission; +using UKSFWebsite.Api.Services.Admin; using UKSFWebsite.Api.Services.Game; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Message; diff --git a/UKSFWebsite.Api/Controllers/LauncherController.cs b/UKSFWebsite.Api/Controllers/LauncherController.cs index 7e851865..367558cc 100644 --- a/UKSFWebsite.Api/Controllers/LauncherController.cs +++ b/UKSFWebsite.Api/Controllers/LauncherController.cs @@ -13,6 +13,7 @@ using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Models.Launcher; using UKSFWebsite.Api.Models.Message.Logging; +using UKSFWebsite.Api.Services.Admin; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Personnel; diff --git a/UKSFWebsite.Api/Controllers/TeamspeakController.cs b/UKSFWebsite.Api/Controllers/TeamspeakController.cs index 5d4649aa..19931bce 100644 --- a/UKSFWebsite.Api/Controllers/TeamspeakController.cs +++ b/UKSFWebsite.Api/Controllers/TeamspeakController.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers { diff --git a/UKSFWebsite.Api/Controllers/UnitsController.cs b/UKSFWebsite.Api/Controllers/UnitsController.cs index a470d022..36cf75d6 100644 --- a/UKSFWebsite.Api/Controllers/UnitsController.cs +++ b/UKSFWebsite.Api/Controllers/UnitsController.cs @@ -8,6 +8,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Units; diff --git a/UKSFWebsite.Api/Controllers/VariablesController.cs b/UKSFWebsite.Api/Controllers/VariablesController.cs index 73c1b695..87dfde06 100644 --- a/UKSFWebsite.Api/Controllers/VariablesController.cs +++ b/UKSFWebsite.Api/Controllers/VariablesController.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Admin; using UKSFWebsite.Api.Models.Utility; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Personnel; diff --git a/UKSFWebsite.Api/Controllers/VersionController.cs b/UKSFWebsite.Api/Controllers/VersionController.cs index c6028e39..9dcbdfb0 100644 --- a/UKSFWebsite.Api/Controllers/VersionController.cs +++ b/UKSFWebsite.Api/Controllers/VersionController.cs @@ -5,6 +5,7 @@ using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Hubs; +using UKSFWebsite.Api.Services.Admin; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Utility; diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index a011c746..35862317 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -10,10 +10,10 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; using Microsoft.IdentityModel.Tokens; using UKSFWebsite.Api.Data; +using UKSFWebsite.Api.Data.Admin; using UKSFWebsite.Api.Data.Command; using UKSFWebsite.Api.Data.Fake; using UKSFWebsite.Api.Data.Game; @@ -26,12 +26,15 @@ using UKSFWebsite.Api.Events; using UKSFWebsite.Api.Events.Data; using UKSFWebsite.Api.Events.Handlers; +using UKSFWebsite.Api.Events.SocketServer; using UKSFWebsite.Api.Interfaces.Command; using UKSFWebsite.Api.Interfaces.Data; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Interfaces.Events.Handlers; using UKSFWebsite.Api.Interfaces.Game; using UKSFWebsite.Api.Interfaces.Integrations; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Interfaces.Launcher; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Interfaces.Operations; @@ -39,19 +42,21 @@ using UKSFWebsite.Api.Interfaces.Units; using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Services; +using UKSFWebsite.Api.Services.Admin; using UKSFWebsite.Api.Services.Command; using UKSFWebsite.Api.Services.Fake; using UKSFWebsite.Api.Services.Game; using UKSFWebsite.Api.Services.Game.Missions; using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Integrations; -using UKSFWebsite.Api.Services.Integrations.Procedures; +using UKSFWebsite.Api.Services.Integrations.Teamspeak; using UKSFWebsite.Api.Services.Launcher; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Operations; using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Units; using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.SocketServer; namespace UKSFWebsite.Api { public class Startup { @@ -114,7 +119,8 @@ public void ConfigureServices(IServiceCollection services) { services.AddMvc(options => { options.Filters.Add(ExceptionHandler.Instance); }).AddNewtonsoftJson(); } - public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFactory loggerFactory) { + // ReSharper disable once UnusedMember.Global + public void Configure(IApplicationBuilder app) { app.UseStaticFiles(); app.UseRouting(); app.UseCors("CorsPolicy"); @@ -147,18 +153,21 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact // Execute any DB migration Global.ServiceProvider.GetService().Migrate(); - // Warm caches + // Warm cached data services WarmDataServices(); // Add event handlers Global.ServiceProvider.GetService().InitEventHandlers(); + + // Start socket server + Global.ServiceProvider.GetService().Start(configuration["socketPort"]); + + // Start teamspeak manager + Global.ServiceProvider.GetService().Start(); // Connect discord bot Global.ServiceProvider.GetService().ConnectDiscord(); - // Start pipe connection - Global.ServiceProvider.GetService().Start(); - // Start scheduler Global.ServiceProvider.GetService().Load(); } @@ -212,24 +221,23 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - - // TeamSpeak procedures - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); + services.AddSingleton(); if (currentEnvironment.IsDevelopment()) { services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); } else { services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); } } private static void RegisterEventServices(this IServiceCollection services) { // Event Buses - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); // Event Handlers services.AddSingleton(); @@ -237,6 +245,7 @@ private static void RegisterEventServices(this IServiceCollection services) { services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); } private static void RegisterDataServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { @@ -294,11 +303,13 @@ private static void RegisterDataBackedServices(this IServiceCollection services, } } + // ReSharper disable once ClassNeverInstantiated.Global public class CorsMiddleware { private readonly RequestDelegate next; public CorsMiddleware(RequestDelegate next) => this.next = next; + // ReSharper disable once UnusedMember.Global public Task Invoke(HttpContext httpContext) { if (httpContext.Request.Path.Value.Contains("hub")) { httpContext.Response.Headers["Access-Control-Allow-Origin"] = httpContext.Request.Headers["Origin"]; @@ -310,6 +321,7 @@ public Task Invoke(HttpContext httpContext) { } public static class CorsMiddlewareExtensions { + // ReSharper disable once UnusedMethodReturnValue.Global public static IApplicationBuilder UseCorsMiddleware(this IApplicationBuilder builder) => builder.UseMiddleware(); } } diff --git a/UKSFWebsite.Api/UKSFWebsite.Api.csproj b/UKSFWebsite.Api/UKSFWebsite.Api.csproj index 9e02c126..35af057a 100644 --- a/UKSFWebsite.Api/UKSFWebsite.Api.csproj +++ b/UKSFWebsite.Api/UKSFWebsite.Api.csproj @@ -38,6 +38,7 @@ + diff --git a/UKSFWebsite.Api/appsettings.json b/UKSFWebsite.Api/appsettings.json index 3b346721..26e3f690 100644 --- a/UKSFWebsite.Api/appsettings.json +++ b/UKSFWebsite.Api/appsettings.json @@ -10,5 +10,6 @@ "EmailSettings": { "username": "", "password": "" - } + }, + "socketPort": "" } diff --git a/UKSFWebsite.Backend.sln b/UKSFWebsite.Backend.sln index bafb30db..93ecf897 100644 --- a/UKSFWebsite.Backend.sln +++ b/UKSFWebsite.Backend.sln @@ -22,6 +22,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Interfaces" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Events", "UKSFWebsite.Api.Events\UKSFWebsite.Api.Events.csproj", "{F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ValveSockets", "ValveSockets\ValveSockets.csproj", "{CA5236BD-918C-4F0C-8F3C-2673E917B477}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.SocketServer", "UKSFWebsite.Api.SocketServer\UKSFWebsite.Api.SocketServer.csproj", "{E1B8AC5C-B229-4B5A-9A06-21ABC3226594}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -116,6 +120,30 @@ Global {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x64.Build.0 = Release|Any CPU {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x86.ActiveCfg = Release|Any CPU {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x86.Build.0 = Release|Any CPU + {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Debug|x64.ActiveCfg = Debug|Any CPU + {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Debug|x64.Build.0 = Debug|Any CPU + {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Debug|x86.ActiveCfg = Debug|Any CPU + {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Debug|x86.Build.0 = Debug|Any CPU + {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Release|Any CPU.Build.0 = Release|Any CPU + {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Release|x64.ActiveCfg = Release|Any CPU + {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Release|x64.Build.0 = Release|Any CPU + {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Release|x86.ActiveCfg = Release|Any CPU + {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Release|x86.Build.0 = Release|Any CPU + {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Debug|x64.ActiveCfg = Debug|Any CPU + {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Debug|x64.Build.0 = Debug|Any CPU + {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Debug|x86.ActiveCfg = Debug|Any CPU + {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Debug|x86.Build.0 = Debug|Any CPU + {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Release|Any CPU.Build.0 = Release|Any CPU + {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Release|x64.ActiveCfg = Release|Any CPU + {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Release|x64.Build.0 = Release|Any CPU + {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Release|x86.ActiveCfg = Release|Any CPU + {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UKSFWebsite.Integrations/Controllers/DiscordController.cs b/UKSFWebsite.Integrations/Controllers/DiscordController.cs index fd2521d5..e4eff87a 100644 --- a/UKSFWebsite.Integrations/Controllers/DiscordController.cs +++ b/UKSFWebsite.Integrations/Controllers/DiscordController.cs @@ -9,6 +9,7 @@ using Microsoft.Extensions.Hosting; using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Services.Admin; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Integrations.Controllers { diff --git a/UKSFWebsite.Integrations/Startup.cs b/UKSFWebsite.Integrations/Startup.cs index f4030862..dce54072 100644 --- a/UKSFWebsite.Integrations/Startup.cs +++ b/UKSFWebsite.Integrations/Startup.cs @@ -6,12 +6,14 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using UKSFWebsite.Api.Data.Admin; using UKSFWebsite.Api.Data.Utility; using UKSFWebsite.Api.Events.Data; using UKSFWebsite.Api.Interfaces.Data; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Interfaces.Utility; +using UKSFWebsite.Api.Models.Events; using UKSFWebsite.Api.Services; using UKSFWebsite.Api.Services.Utility; @@ -57,7 +59,7 @@ public static IServiceCollection RegisterServices(this IServiceCollection servic // Instance Objects services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient, DataEventBus>(); // Global Singletons services.AddSingleton(configuration); diff --git a/ValveSockets/ValveSockets.cs b/ValveSockets/ValveSockets.cs new file mode 100644 index 00000000..2059c80a --- /dev/null +++ b/ValveSockets/ValveSockets.cs @@ -0,0 +1,758 @@ +// ReSharper disable All +/* + * Managed C# wrapper for GameNetworkingSockets library by Valve Software + * Copyright (c) 2018 Stanislav Denisov + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#define VALVESOCKETS_SPAN + +using System; +using System.Net; +using System.Net.Sockets; +using System.Runtime.InteropServices; +using System.Security; +using System.Text; + +namespace Valve.Sockets { + using ListenSocket = UInt32; + using Connection = UInt32; + using Microseconds = Int64; + + [Flags] + public enum SendType { + UNRELIABLE = 0, + NO_NAGLE = 1, + NO_DELAY = 1 << 2, + RELIABLE = 1 << 3 + } + + public enum IdentityType { + INVALID = 0, + IP_ADDRESS = 1, + GENERIC_STRING = 2, + GENERIC_BYTES = 3, + STEAM_ID = 16 + } + + public enum ConnectionState { + NONE = 0, + CONNECTING = 1, + FINDING_ROUTE = 2, + CONNECTED = 3, + CLOSED_BY_PEER = 4, + PROBLEM_DETECTED_LOCALLY = 5 + } + + public enum ConfigurationScope { + GLOBAL = 1, + SOCKETS_INTERFACE = 2, + LISTEN_SOCKET = 3, + CONNECTION = 4 + } + + public enum ConfigurationDataType { + INT32 = 1, + INT64 = 2, + FLOAT = 3, + STRING = 4, + FUNCTION_PTR = 5 + } + + public enum ConfigurationValue { + INVALID = 0, + FAKE_PACKET_LOSS_SEND = 2, + FAKE_PACKET_LOSS_RECV = 3, + FAKE_PACKET_LAG_SEND = 4, + FAKE_PACKET_LAG_RECV = 5, + FAKE_PACKET_REORDER_SEND = 6, + FAKE_PACKET_REORDER_RECV = 7, + FAKE_PACKET_REORDER_TIME = 8, + FAKE_PACKET_DUP_SEND = 26, + FAKE_PACKET_DUP_RECV = 27, + FAKE_PACKET_DUP_TIME_MAX = 28, + TIMEOUT_INITIAL = 24, + TIMEOUT_CONNECTED = 25, + SEND_BUFFER_SIZE = 9, + SEND_RATE_MIN = 10, + SEND_RATE_MAX = 11, + NAGLE_TIME = 12, + IP_ALLOW_WITHOUT_AUTH = 23, + SDR_CLIENT_CONSECUTITIVE_PING_TIMEOUTS_FAIL_INITIAL = 19, + SDR_CLIENT_CONSECUTITIVE_PING_TIMEOUTS_FAIL = 20, + SDR_CLIENT_MIN_PINGS_BEFORE_PING_ACCURATE = 21, + SDR_CLIENT_SINGLE_SOCKET = 22, + SDR_CLIENT_FORCE_RELAY_CLUSTER = 29, + SDR_CLIENT_DEBUG_TICKET_ADDRESS = 30, + SDR_CLIENT_FORCE_PROXY_ADDR = 31, + LOG_LEVEL_ACK_RTT = 13, + LOG_LEVEL_PACKET_DECODE = 14, + LOG_LEVEL_MESSAGE = 15, + LOG_LEVEL_PACKET_GAPS = 16, + LOG_LEVEL_P2_P_RENDEZVOUS = 17, + LOG_LEVEL_SDR_RELAY_PINGS = 18 + } + + public enum ConfigurationValueResult { + BAD_VALUE = -1, + BAD_SCOPE_OBJECT = -2, + BUFFER_TOO_SMALL = -3, + OK = 1, + OK_INHERITED = 2 + } + + public enum DebugType { + NONE = 0, + BUG = 1, + ERROR = 2, + IMPORTANT = 3, + WARNING = 4, + MESSAGE = 5, + VERBOSE = 6, + DEBUG = 7, + EVERYTHING = 8 + } + + public enum Result { + OK = 1, + FAIL = 2, + NO_CONNECTION = 3, + INVALID_PASSWORD = 5, + LOGGED_IN_ELSEWHERE = 6, + INVALID_PROTOCOL_VER = 7, + INVALID_PARAM = 8, + FILE_NOT_FOUND = 9, + BUSY = 10, + INVALID_STATE = 11, + INVALID_NAME = 12, + INVALID_EMAIL = 13, + DUPLICATE_NAME = 14, + ACCESS_DENIED = 15, + TIMEOUT = 16, + BANNED = 17, + ACCOUNT_NOT_FOUND = 18, + INVALID_STEAM_ID = 19, + SERVICE_UNAVAILABLE = 20, + NOT_LOGGED_ON = 21, + PENDING = 22, + ENCRYPTION_FAILURE = 23, + INSUFFICIENT_PRIVILEGE = 24, + LIMIT_EXCEEDED = 25, + REVOKED = 26, + EXPIRED = 27, + ALREADY_REDEEMED = 28, + DUPLICATE_REQUEST = 29, + ALREADY_OWNED = 30, + IP_NOT_FOUND = 31, + PERSIST_FAILED = 32, + LOCKING_FAILED = 33, + LOGON_SESSION_REPLACED = 34, + CONNECT_FAILED = 35, + HANDSHAKE_FAILED = 36, + IO_FAILURE = 37, + REMOTE_DISCONNECT = 38, + SHOPPING_CART_NOT_FOUND = 39, + BLOCKED = 40, + IGNORED = 41, + NO_MATCH = 42, + ACCOUNT_DISABLED = 43, + SERVICE_READ_ONLY = 44, + ACCOUNT_NOT_FEATURED = 45, + ADMINISTRATOR_OK = 46, + CONTENT_VERSION = 47, + TRY_ANOTHER_CM = 48, + PASSWORD_REQUIRED_TO_KICK_SESSION = 49, + ALREADY_LOGGED_IN_ELSEWHERE = 50, + SUSPENDED = 51, + CANCELLED = 52, + DATA_CORRUPTION = 53, + DISK_FULL = 54, + REMOTE_CALL_FAILED = 55, + PASSWORD_UNSET = 56, + EXTERNAL_ACCOUNT_UNLINKED = 57, + PSN_TICKET_INVALID = 58, + EXTERNAL_ACCOUNT_ALREADY_LINKED = 59, + REMOTE_FILE_CONFLICT = 60, + ILLEGAL_PASSWORD = 61, + SAME_AS_PREVIOUS_VALUE = 62, + ACCOUNT_LOGON_DENIED = 63, + CANNOT_USE_OLD_PASSWORD = 64, + INVALID_LOGIN_AUTH_CODE = 65, + ACCOUNT_LOGON_DENIED_NO_MAIL = 66, + HARDWARE_NOT_CAPABLE_OF_IPT = 67, + IPT_INIT_ERROR = 68, + PARENTAL_CONTROL_RESTRICTED = 69, + FACEBOOK_QUERY_ERROR = 70, + EXPIRED_LOGIN_AUTH_CODE = 71, + IP_LOGIN_RESTRICTION_FAILED = 72, + ACCOUNT_LOCKED_DOWN = 73, + ACCOUNT_LOGON_DENIED_VERIFIED_EMAIL_REQUIRED = 74, + NO_MATCHING_URL = 75, + BAD_RESPONSE = 76, + REQUIRE_PASSWORD_RE_ENTRY = 77, + VALUE_OUT_OF_RANGE = 78, + UNEXPECTED_ERROR = 79, + DISABLED = 80, + INVALID_CEG_SUBMISSION = 81, + RESTRICTED_DEVICE = 82, + REGION_LOCKED = 83, + RATE_LIMIT_EXCEEDED = 84, + ACCOUNT_LOGIN_DENIED_NEED_TWO_FACTOR = 85, + ITEM_DELETED = 86, + ACCOUNT_LOGIN_DENIED_THROTTLE = 87, + TWO_FACTOR_CODE_MISMATCH = 88, + TWO_FACTOR_ACTIVATION_CODE_MISMATCH = 89, + ACCOUNT_ASSOCIATED_TO_MULTIPLE_PARTNERS = 90, + NOT_MODIFIED = 91, + NO_MOBILE_DEVICE = 92, + TIME_NOT_SYNCED = 93, + SMS_CODE_FAILED = 94, + ACCOUNT_LIMIT_EXCEEDED = 95, + ACCOUNT_ACTIVITY_LIMIT_EXCEEDED = 96, + PHONE_ACTIVITY_LIMIT_EXCEEDED = 97, + REFUND_TO_WALLET = 98, + EMAIL_SEND_FAILURE = 99, + NOT_SETTLED = 100, + NEED_CAPTCHA = 101, + GSLT_DENIED = 102, + GS_OWNER_DENIED = 103, + INVALID_ITEM_TYPE = 104, + IP_BANNED = 105, + GSLT_EXPIRED = 106, + INSUFFICIENT_FUNDS = 107, + TOO_MANY_PENDING = 108, + NO_SITE_LICENSES_FOUND = 109, + WG_NETWORK_SEND_EXCEEDED = 110 + } + + [StructLayout(LayoutKind.Sequential)] + public struct Address { + [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)] public byte[] ip; + + public ushort port; + + public bool IsLocalHost => Native.SteamAPI_SteamNetworkingIPAddr_IsLocalHost(ref this); + + public string GetIp() => ip.ParseIp(); + + public void SetLocalHost(ushort port) { + Native.SteamAPI_SteamNetworkingIPAddr_SetIPv6LocalHost(ref this, port); + } + + public void SetAddress(string ip, ushort port) { + if (!ip.Contains(":")) { + Native.SteamAPI_SteamNetworkingIPAddr_SetIPv4(ref this, ip.ParseIPv4(), port); + } else { + Native.SteamAPI_SteamNetworkingIPAddr_SetIPv6(ref this, ip.ParseIPv6(), port); + } + } + } + + [StructLayout(LayoutKind.Sequential)] + public struct StatusInfo { + private const int CALLBACK = Library.SOCKETS_CALLBACKS + 1; + public uint connection; + public ConnectionInfo connectionInfo; + private readonly int socketState; + } + + [StructLayout(LayoutKind.Sequential)] + public struct ConnectionInfo { + public NetworkingIdentity identity; + public long userData; + public uint listenSocket; + public Address address; + private readonly ushort pad; + private readonly uint popRemote; + private readonly uint popRelay; + public ConnectionState state; + public int endReason; + + [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] public string endDebug; + + [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] public string connectionDescription; + } + + [StructLayout(LayoutKind.Sequential)] + public struct ConnectionStatus { + public ConnectionState state; + public int ping; + public float connectionQualityLocal; + public float connectionQualityRemote; + public float outPacketsPerSecond; + public float outBytesPerSecond; + public float inPacketsPerSecond; + public float inBytesPerSecond; + public int sendRateBytesPerSecond; + public int pendingUnreliable; + public int pendingReliable; + public int sentUnackedReliable; + public long queueTime; + } + + [StructLayout(LayoutKind.Explicit, Size = 136)] + public struct NetworkingIdentity { + [FieldOffset(0)] public IdentityType type; + + public bool IsInvalid => Native.SteamAPI_SteamNetworkingIdentity_IsInvalid(ref this); + + public ulong GetSteamId() => Native.SteamAPI_SteamNetworkingIdentity_GetSteamID64(ref this); + + public void SetSteamId(ulong steamId) { + Native.SteamAPI_SteamNetworkingIdentity_SetSteamID64(ref this, steamId); + } + + public bool EqualsTo(ref NetworkingIdentity identity) => Native.SteamAPI_SteamNetworkingIdentity_EqualTo(ref this, ref identity); + } + + [StructLayout(LayoutKind.Sequential)] + public struct NetworkingMessage { + public IntPtr data; + public int length; + public uint connection; + public NetworkingIdentity identity; + public long userData; + public long timeReceived; + public long messageNumber; + internal IntPtr release; + public int channel; + private readonly int pad; + + public readonly void CopyTo(byte[] destination) { + if (destination == null) { + throw new ArgumentNullException("destination"); + } + + Marshal.Copy(data, destination, 0, length); + } + +#if !VALVESOCKETS_SPAN + public void Destroy() { + if (release == IntPtr.Zero) { + throw new InvalidOperationException("Message not created"); + } + + Native.SteamAPI_SteamNetworkingMessage_t_Release(release); + } +#endif + } + + public delegate void StatusCallback(StatusInfo info, IntPtr context); + + public delegate void DebugCallback(DebugType type, string message); + +#if VALVESOCKETS_SPAN + public delegate void MessageCallback(in NetworkingMessage message); +#endif + + internal static class ArrayPool { + [ThreadStatic] private static IntPtr[] pointerBuffer; + + public static IntPtr[] GetPointerBuffer() { + if (pointerBuffer == null) { + pointerBuffer = new IntPtr[Library.MAX_MESSAGES_PER_BATCH]; + } + + return pointerBuffer; + } + } + + public class NetworkingSockets { + private readonly IntPtr _nativeSockets; + private readonly int _nativeMessageSize = Marshal.SizeOf(typeof(NetworkingMessage)); + + public NetworkingSockets() { + _nativeSockets = Native.SteamNetworkingSockets(); + + if (_nativeSockets == IntPtr.Zero) { + throw new InvalidOperationException("Networking sockets not created"); + } + } + + public uint CreateListenSocket(ref Address address) => Native.SteamAPI_ISteamNetworkingSockets_CreateListenSocketIP(_nativeSockets, ref address); + + public uint Connect(ref Address address) => Native.SteamAPI_ISteamNetworkingSockets_ConnectByIPAddress(_nativeSockets, ref address); + + public Result AcceptConnection(uint connection) => Native.SteamAPI_ISteamNetworkingSockets_AcceptConnection(_nativeSockets, connection); + + public bool CloseConnection(uint connection) => CloseConnection(connection, 0, string.Empty, false); + + public bool CloseConnection(uint connection, int reason, string debug, bool enableLinger) { + if (reason > Library.MAX_CLOSE_REASON_VALUE) { + throw new ArgumentOutOfRangeException("reason"); + } + + if (debug.Length > Library.MAX_CLOSE_MESSAGE_LENGTH) { + throw new ArgumentOutOfRangeException("debug"); + } + + return Native.SteamAPI_ISteamNetworkingSockets_CloseConnection(_nativeSockets, connection, reason, debug, enableLinger); + } + + public bool CloseListenSocket(uint socket) => Native.SteamAPI_ISteamNetworkingSockets_CloseListenSocket(_nativeSockets, socket); + + public bool SetConnectionUserData(uint peer, long userData) => Native.SteamAPI_ISteamNetworkingSockets_SetConnectionUserData(_nativeSockets, peer, userData); + + public long GetConnectionUserData(uint peer) => Native.SteamAPI_ISteamNetworkingSockets_GetConnectionUserData(_nativeSockets, peer); + + public void SetConnectionName(uint peer, string name) { + Native.SteamAPI_ISteamNetworkingSockets_SetConnectionName(_nativeSockets, peer, name); + } + + public bool GetConnectionName(uint peer, StringBuilder name, int maxLength) => Native.SteamAPI_ISteamNetworkingSockets_GetConnectionName(_nativeSockets, peer, name, maxLength); + + public Result SendMessageToConnection(uint connection, IntPtr data, uint length) => SendMessageToConnection(connection, data, length, SendType.UNRELIABLE); + + public Result SendMessageToConnection(uint connection, IntPtr data, uint length, SendType flags) => SendMessageToConnection(connection, data, length, flags); + + public Result SendMessageToConnection(uint connection, IntPtr data, int length, SendType flags) => Native.SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(_nativeSockets, connection, data, (uint) length, flags); + + public Result SendMessageToConnection(uint connection, byte[] data) => SendMessageToConnection(connection, data, data.Length, SendType.UNRELIABLE); + + public Result SendMessageToConnection(uint connection, byte[] data, SendType flags) => SendMessageToConnection(connection, data, data.Length, flags); + + public Result SendMessageToConnection(uint connection, byte[] data, int length, SendType flags) => Native.SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(_nativeSockets, connection, data, (uint) length, flags); + + public Result FlushMessagesOnConnection(uint connection) => Native.SteamAPI_ISteamNetworkingSockets_FlushMessagesOnConnection(_nativeSockets, connection); + +#if VALVESOCKETS_SPAN +#if VALVESOCKETS_INLINING + [MethodImpl(256)] +#endif + public void ReceiveMessagesOnConnection(Connection connection, MessageCallback callback, int maxMessages) { + if (maxMessages > Library.MAX_MESSAGES_PER_BATCH) throw new ArgumentOutOfRangeException("maxMessages"); + + IntPtr[] nativeMessages = ArrayPool.GetPointerBuffer(); + int messagesCount = Native.SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnConnection(_nativeSockets, connection, nativeMessages, maxMessages); + + for (int i = 0; i < messagesCount; i++) { + Span message; + + unsafe { + message = new Span((void*) nativeMessages[i], 1); + } + + callback(in message[0]); + + Native.SteamAPI_SteamNetworkingMessage_t_Release(nativeMessages[i]); + } + } + +#if VALVESOCKETS_INLINING + [MethodImpl(256)] +#endif + public void ReceiveMessagesOnListenSocket(ListenSocket socket, MessageCallback callback, int maxMessages) { + if (maxMessages > Library.MAX_MESSAGES_PER_BATCH) throw new ArgumentOutOfRangeException("maxMessages"); + + IntPtr[] nativeMessages = ArrayPool.GetPointerBuffer(); + int messagesCount = Native.SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnListenSocket(_nativeSockets, socket, nativeMessages, maxMessages); + + for (int i = 0; i < messagesCount; i++) { + Span message; + + unsafe { + message = new Span((void*) nativeMessages[i], 1); + } + + callback(in message[0]); + + Native.SteamAPI_SteamNetworkingMessage_t_Release(nativeMessages[i]); + } + } +#else +#if VALVESOCKETS_INLINING + [MethodImpl(256)] +#endif + public int ReceiveMessagesOnConnection(uint connection, NetworkingMessage[] messages, int maxMessages) { + if (maxMessages > Library.MAX_MESSAGES_PER_BATCH) { + throw new ArgumentOutOfRangeException("maxMessages"); + } + + IntPtr[] nativeMessages = ArrayPool.GetPointerBuffer(); + int messagesCount = Native.SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnConnection(_nativeSockets, connection, nativeMessages, maxMessages); + + for (int i = 0; i < messagesCount; i++) { + messages[i] = (NetworkingMessage) Marshal.PtrToStructure(nativeMessages[i], typeof(NetworkingMessage)); + messages[i].release = nativeMessages[i]; + } + + return messagesCount; + } + +#if VALVESOCKETS_INLINING + [MethodImpl(256)] +#endif + public int ReceiveMessagesOnListenSocket(uint socket, NetworkingMessage[] messages, int maxMessages) { + if (maxMessages > Library.MAX_MESSAGES_PER_BATCH) { + throw new ArgumentOutOfRangeException("maxMessages"); + } + + IntPtr[] nativeMessages = ArrayPool.GetPointerBuffer(); + int messagesCount = Native.SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnListenSocket(_nativeSockets, socket, nativeMessages, maxMessages); + + for (int i = 0; i < messagesCount; i++) { + messages[i] = (NetworkingMessage) Marshal.PtrToStructure(nativeMessages[i], typeof(NetworkingMessage)); + messages[i].release = nativeMessages[i]; + } + + return messagesCount; + } +#endif + + public bool GetConnectionInfo(uint connection, ref ConnectionInfo info) => Native.SteamAPI_ISteamNetworkingSockets_GetConnectionInfo(_nativeSockets, connection, ref info); + + public bool GetQuickConnectionStatus(uint connection, ConnectionStatus status) => Native.SteamAPI_ISteamNetworkingSockets_GetQuickConnectionStatus(_nativeSockets, connection, status); + + public int GetDetailedConnectionStatus(uint connection, StringBuilder status, int statusLength) => Native.SteamAPI_ISteamNetworkingSockets_GetDetailedConnectionStatus(_nativeSockets, connection, status, statusLength); + + public bool GetListenSocketAddress(uint socket, ref Address address) => Native.SteamAPI_ISteamNetworkingSockets_GetListenSocketAddress(_nativeSockets, socket, ref address); + + public bool CreateSocketPair(uint connectionOne, uint connectionTwo, bool useNetworkLoopback, NetworkingIdentity identityOne, NetworkingIdentity identityTwo) => + Native.SteamAPI_ISteamNetworkingSockets_CreateSocketPair(_nativeSockets, connectionOne, connectionTwo, useNetworkLoopback, identityOne, identityTwo); + + public void DispatchCallback(StatusCallback callback) { + DispatchCallback(callback, IntPtr.Zero); + } + + public void DispatchCallback(StatusCallback callback, IntPtr context) { + Native.SteamAPI_ISteamNetworkingSockets_RunConnectionStatusChangedCallbacks(_nativeSockets, callback, context); + } + } + + public class NetworkingUtils { + private readonly IntPtr _nativeUtils; + + public NetworkingUtils() { + _nativeUtils = Native.SteamNetworkingUtils(); + + if (_nativeUtils == IntPtr.Zero) { + throw new InvalidOperationException("Networking utils not created"); + } + } + + public ConfigurationValue FirstConfigurationValue => Native.SteamAPI_ISteamNetworkingUtils_GetFirstConfigValue(_nativeUtils); + + public long Time => Native.SteamAPI_ISteamNetworkingUtils_GetLocalTimestamp(_nativeUtils); + + public void SetDebugCallback(DebugType detailLevel, DebugCallback callback) { + Native.SteamAPI_ISteamNetworkingUtils_SetDebugOutputFunction(_nativeUtils, detailLevel, callback); + } + + public bool SetConfiguratioValue(ConfigurationValue configurationValue, ConfigurationScope configurationScope, IntPtr scopeObject, ConfigurationDataType dataType, IntPtr value) => + Native.SteamAPI_ISteamNetworkingUtils_SetConfigValue(_nativeUtils, configurationValue, configurationScope, scopeObject, dataType, value); + + public ConfigurationValueResult GetConfigurationValue(ConfigurationValue configurationValue, ConfigurationScope configurationScope, IntPtr scopeObject, out ConfigurationDataType dataType, out IntPtr result, out IntPtr resultLength) => + Native.SteamAPI_ISteamNetworkingUtils_GetConfigValue(_nativeUtils, configurationValue, configurationScope, scopeObject, out dataType, out result, out resultLength); + } + + public static class Extensions { + public static uint ParseIPv4(this string ip) { + IPAddress address = default; + + if (IPAddress.TryParse(ip, out address)) { + if (address.AddressFamily != AddressFamily.InterNetwork) { + throw new Exception("Incorrect format of an IPv4 address"); + } + } + + byte[] bytes = address.GetAddressBytes(); + + Array.Reverse(bytes); + + return BitConverter.ToUInt32(bytes, 0); + } + + public static byte[] ParseIPv6(this string ip) { + IPAddress address = default; + + if (IPAddress.TryParse(ip, out address)) { + if (address.AddressFamily != AddressFamily.InterNetworkV6) { + throw new Exception("Incorrect format of an IPv6 address"); + } + } + + return address.GetAddressBytes(); + } + + public static string ParseIp(this byte[] ip) { + IPAddress address = new IPAddress(ip); + string converted = address.ToString(); + + if (converted.Length > 7 && converted.Remove(7) == "::ffff:") { + Address ipv4 = default; + + ipv4.ip = ip; + + byte[] bytes = BitConverter.GetBytes(Native.SteamAPI_SteamNetworkingIPAddr_GetIPv4(ref ipv4)); + + Array.Reverse(bytes); + + address = new IPAddress(bytes); + } + + return address.ToString(); + } + } + + public static class Library { + public const int MAX_CLOSE_MESSAGE_LENGTH = 128; + public const int MAX_CLOSE_REASON_VALUE = 999; + public const int MAX_ERROR_MESSAGE_LENGTH = 1024; + public const int MAX_MESSAGE_SIZE = 512 * 1024; + public const int MAX_MESSAGES_PER_BATCH = 256; + public const int SOCKETS_CALLBACKS = 1220; + + public static bool Initialize() => Initialize(null); + + public static bool Initialize(StringBuilder errorMessage) { + if (errorMessage != null && errorMessage.Capacity != MAX_ERROR_MESSAGE_LENGTH) { + throw new ArgumentOutOfRangeException("Capacity of the error message must be equal to " + MAX_ERROR_MESSAGE_LENGTH); + } + + return Native.GameNetworkingSockets_Init(IntPtr.Zero, errorMessage); + } + + public static void Deinitialize() { + Native.GameNetworkingSockets_Kill(); + } + } + + [SuppressUnmanagedCodeSecurity] + internal static class Native { + private const string NATIVE_LIBRARY = "GameNetworkingSockets"; + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern bool GameNetworkingSockets_Init(IntPtr identity, StringBuilder errorMessage); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern void GameNetworkingSockets_Kill(); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern IntPtr SteamNetworkingSockets(); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern IntPtr SteamNetworkingUtils(); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern uint SteamAPI_ISteamNetworkingSockets_CreateListenSocketIP(IntPtr sockets, ref Address address); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern uint SteamAPI_ISteamNetworkingSockets_ConnectByIPAddress(IntPtr sockets, ref Address address); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern Result SteamAPI_ISteamNetworkingSockets_AcceptConnection(IntPtr sockets, uint connection); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern bool SteamAPI_ISteamNetworkingSockets_CloseConnection(IntPtr sockets, uint peer, int reason, string debug, bool enableLinger); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern bool SteamAPI_ISteamNetworkingSockets_CloseListenSocket(IntPtr sockets, uint socket); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern bool SteamAPI_ISteamNetworkingSockets_SetConnectionUserData(IntPtr sockets, uint peer, long userData); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern long SteamAPI_ISteamNetworkingSockets_GetConnectionUserData(IntPtr sockets, uint peer); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern void SteamAPI_ISteamNetworkingSockets_SetConnectionName(IntPtr sockets, uint peer, string name); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern bool SteamAPI_ISteamNetworkingSockets_GetConnectionName(IntPtr sockets, uint peer, StringBuilder name, int maxLength); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern Result SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(IntPtr sockets, uint connection, IntPtr data, uint length, SendType flags); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern Result SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(IntPtr sockets, uint connection, byte[] data, uint length, SendType flags); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern Result SteamAPI_ISteamNetworkingSockets_FlushMessagesOnConnection(IntPtr sockets, uint connection); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern int SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnConnection(IntPtr sockets, uint connection, IntPtr[] messages, int maxMessages); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern int SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnListenSocket(IntPtr sockets, uint socket, IntPtr[] messages, int maxMessages); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern bool SteamAPI_ISteamNetworkingSockets_GetConnectionInfo(IntPtr sockets, uint connection, ref ConnectionInfo info); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern bool SteamAPI_ISteamNetworkingSockets_GetQuickConnectionStatus(IntPtr sockets, uint connection, ConnectionStatus status); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern int SteamAPI_ISteamNetworkingSockets_GetDetailedConnectionStatus(IntPtr sockets, uint connection, StringBuilder status, int statusLength); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern bool SteamAPI_ISteamNetworkingSockets_GetListenSocketAddress(IntPtr sockets, uint socket, ref Address address); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern void SteamAPI_ISteamNetworkingSockets_RunConnectionStatusChangedCallbacks(IntPtr sockets, StatusCallback callback, IntPtr context); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern bool SteamAPI_ISteamNetworkingSockets_CreateSocketPair(IntPtr sockets, uint connectionOne, uint connectionTwo, bool useNetworkLoopback, NetworkingIdentity identityOne, NetworkingIdentity identityTwo); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern void SteamAPI_SteamNetworkingIPAddr_SetIPv6(ref Address address, byte[] ip, ushort port); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern void SteamAPI_SteamNetworkingIPAddr_SetIPv4(ref Address address, uint ip, ushort port); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern uint SteamAPI_SteamNetworkingIPAddr_GetIPv4(ref Address address); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern void SteamAPI_SteamNetworkingIPAddr_SetIPv6LocalHost(ref Address address, ushort port); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern bool SteamAPI_SteamNetworkingIPAddr_IsLocalHost(ref Address address); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern bool SteamAPI_SteamNetworkingIdentity_IsInvalid(ref NetworkingIdentity identity); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern void SteamAPI_SteamNetworkingIdentity_SetSteamID64(ref NetworkingIdentity identity, ulong steamId); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern ulong SteamAPI_SteamNetworkingIdentity_GetSteamID64(ref NetworkingIdentity identity); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern bool SteamAPI_SteamNetworkingIdentity_EqualTo(ref NetworkingIdentity identityOne, ref NetworkingIdentity identityTwo); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern long SteamAPI_ISteamNetworkingUtils_GetLocalTimestamp(IntPtr utils); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern void SteamAPI_ISteamNetworkingUtils_SetDebugOutputFunction(IntPtr utils, DebugType detailLevel, DebugCallback callback); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern bool SteamAPI_ISteamNetworkingUtils_SetConfigValue(IntPtr utils, ConfigurationValue configurationValue, ConfigurationScope configurationScope, IntPtr scopeObject, ConfigurationDataType dataType, IntPtr value); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern ConfigurationValueResult SteamAPI_ISteamNetworkingUtils_GetConfigValue(IntPtr utils, ConfigurationValue configurationValue, ConfigurationScope configurationScope, IntPtr scopeObject, out ConfigurationDataType dataType, out IntPtr result, out IntPtr resultLength); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern ConfigurationValue SteamAPI_ISteamNetworkingUtils_GetFirstConfigValue(IntPtr utils); + + [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] + internal static extern void SteamAPI_SteamNetworkingMessage_t_Release(IntPtr nativeMessage); + } +} diff --git a/ValveSockets/ValveSockets.csproj b/ValveSockets/ValveSockets.csproj new file mode 100644 index 00000000..ed5217ca --- /dev/null +++ b/ValveSockets/ValveSockets.csproj @@ -0,0 +1,9 @@ + + + + netcoreapp3.0 + Valve.Sockets + true + + + From ed63ac9c009a29b77304ce60903230a56b454454 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 19 Nov 2019 18:27:55 +0000 Subject: [PATCH 036/369] Full implementation of signalr for teamspeak --- .../Admin/VariablesDataService.cs | 4 +- UKSFWebsite.Api.Data/CachedDataService.cs | 18 +- .../CommandRequestArchiveDataService.cs | 4 +- .../Command/CommandRequestDataService.cs | 4 +- UKSFWebsite.Api.Data/DataService.cs | 13 +- .../Fake/FakeNotificationsDataService.cs | 2 +- .../Game/GameServersDataService.cs | 4 +- .../Launcher/LauncherFileDataService.cs | 4 +- .../Message/CommentThreadDataService.cs | 11 +- .../Message/NotificationsDataService.cs | 4 +- .../Operations/OperationOrderDataService.cs | 5 +- .../Operations/OperationReportDataService.cs | 4 +- .../Personnel/AccountDataService.cs | 7 +- .../Personnel/DischargeDataService.cs | 4 +- .../Personnel/LoaDataService.cs | 4 +- .../Personnel/RanksDataService.cs | 4 +- .../Personnel/RolesDataService.cs | 4 +- .../Units/UnitsDataService.cs | 4 +- .../Utility/ConfirmationCodeDataService.cs | 4 +- .../Utility/SchedulerDataService.cs | 4 +- .../Data/DataEventBacker.cs | 10 +- UKSFWebsite.Api.Events/Data/DataEventBus.cs | 6 +- .../Data/EventModelFactory.cs | 8 - .../Handlers/AccountEventHandler.cs | 3 +- .../Handlers/CommandRequestEventHandler.cs | 3 +- .../Handlers/CommentThreadEventHandler.cs | 3 +- .../Handlers/NotificationsEventHandler.cs | 3 +- .../Handlers/TeamspeakEventHandler.cs | 58 +- .../SignalrServer/SignalrEventBus.cs | 10 + .../SocketServer/SocketEventBus.cs | 10 - .../UKSFWebsite.Api.Events.csproj | 1 - .../Data/Cached/IAccountDataService.cs | 2 +- .../Data/Cached/ICommandRequestDataService.cs | 2 +- .../Data/Cached/ICommentThreadDataService.cs | 2 +- .../Data/Cached/IDischargeDataService.cs | 2 +- .../Data/Cached/IGameServersDataService.cs | 2 +- .../Data/Cached/ILauncherFileDataService.cs | 2 +- .../Data/Cached/ILoaDataService.cs | 2 +- .../Data/Cached/INotificationsDataService.cs | 2 +- .../Data/Cached/IOperationOrderDataService.cs | 2 +- .../Cached/IOperationReportDataService.cs | 2 +- .../Data/Cached/IRanksDataService.cs | 2 +- .../Data/Cached/IRolesDataService.cs | 2 +- .../Data/Cached/IUnitsDataService.cs | 2 +- .../Data/Cached/IVariablesDataService.cs | 3 +- .../Data/ICommandRequestArchiveDataService.cs | 2 +- .../Data/IConfirmationCodeDataService.cs | 2 +- .../Data/IDataService.cs | 2 +- .../Data/ISchedulerDataService.cs | 2 +- .../Events/IDataEventBacker.cs | 4 +- .../Events/IDataEventBus.cs | 3 +- .../Events/ISignalrEventBus.cs | 5 + .../Events/ISocketEventBus.cs | 8 - .../Hubs/ITeamspeakClient.cs | 8 + .../Integrations/ISocket.cs | 2 - .../Teamspeak/ITeamspeakGroupService.cs | 2 +- .../Teamspeak/ITeamspeakManager.cs | 4 +- .../Teamspeak/ITeamspeakMetricsService.cs | 2 +- .../Teamspeak/ITeamspeakService.cs | 7 +- .../Message/INotificationsService.cs | 2 +- .../UKSFWebsite.Api.Interfaces.csproj | 1 + .../Events/DataEventModel.cs | 3 +- .../Events/EventModelFactory.cs | 8 + .../Events/SignalrEventModel.cs | 8 + .../Events/SocketEventModel.cs | 6 - ...cketEventType.cs => TeamspeakEventType.cs} | 3 +- .../Integrations/SocketCommands.cs | 5 - ...akClientSnapshot.cs => TeamspeakClient.cs} | 6 +- ...edureType.cs => TeamspeakProcedureType.cs} | 3 +- .../TeamspeakServerGroupUpdate.cs | 2 +- .../Integrations/TeamspeakServerSnapshot.cs | 2 +- UKSFWebsite.Api.Models/Personnel/Account.cs | 2 +- .../Admin/VariablesService.cs | 16 +- .../CommandRequestCompletionService.cs | 2 +- .../Fake/FakeCachedDataService.cs | 2 +- .../Fake/FakeDataService.cs | 4 +- .../Fake/FakeNotificationsService.cs | 2 +- .../Fake/FakeTeamspeakManager.cs | 10 + .../Integrations/DiscordService.cs | 1 - .../Teamspeak/TeamspeakGroupService.cs | 34 +- .../Teamspeak/TeamspeakManager.cs | 67 +- .../Teamspeak/TeamspeakMetricsService.cs | 3 +- .../Teamspeak/TeamspeakService.cs | 52 +- .../Launcher/LauncherFileService.cs | 1 - .../Launcher/LauncherService.cs | 2 +- .../Message/LoggingService.cs | 2 +- .../Message/NotificationsService.cs | 5 +- .../Personnel/AssignmentService.cs | 2 +- .../Personnel/AttendanceService.cs | 4 +- .../Personnel/RecruitmentService.cs | 2 +- .../UKSFWebsite.Api.Services.csproj | 2 +- .../Utility/StringUtilities.cs | 1 + .../Hubs/Command}/CommandRequestsHub.cs | 2 +- .../Hubs/Game}/ServersHub.cs | 2 +- .../Hubs/Integrations}/LauncherHub.cs | 2 +- .../Hubs/Integrations}/TeamspeakClientsHub.cs | 2 +- .../Hubs/Integrations/TeamspeakHub.cs | 35 + .../Hubs/Message}/CommentThreadHub.cs | 2 +- .../Hubs/Message}/NotificationsHub.cs | 2 +- .../Hubs/Personnel}/AccountHub.cs | 2 +- .../Hubs/Utility}/AdminHub.cs | 2 +- .../Hubs/Utility}/UtilityHub.cs | 2 +- .../UKSFWebsite.Api.Signalr.csproj | 24 + UKSFWebsite.Api.SocketServer/Socket.cs | 133 --- .../UKSFWebsite.Api.SocketServer.csproj | 13 - .../Accounts/AccountsController.cs | 9 +- .../Accounts/CommunicationsController.cs | 10 +- .../Controllers/GameServersController.cs | 2 +- .../Controllers/LauncherController.cs | 3 +- .../Controllers/TeamspeakController.cs | 1 - UKSFWebsite.Api/Controllers/TestController.cs | 20 + .../Controllers/VariablesController.cs | 1 - .../Controllers/VersionController.cs | 3 +- UKSFWebsite.Api/Program.cs | 10 +- UKSFWebsite.Api/Startup.cs | 71 +- UKSFWebsite.Backend.sln | 40 +- .../Controllers/DiscordController.cs | 1 - UKSFWebsite.Integrations/Startup.cs | 6 +- ValveSockets/ValveSockets.cs | 758 ------------------ ValveSockets/ValveSockets.csproj | 9 - 120 files changed, 486 insertions(+), 1255 deletions(-) delete mode 100644 UKSFWebsite.Api.Events/Data/EventModelFactory.cs create mode 100644 UKSFWebsite.Api.Events/SignalrServer/SignalrEventBus.cs delete mode 100644 UKSFWebsite.Api.Events/SocketServer/SocketEventBus.cs create mode 100644 UKSFWebsite.Api.Interfaces/Events/ISignalrEventBus.cs delete mode 100644 UKSFWebsite.Api.Interfaces/Events/ISocketEventBus.cs create mode 100644 UKSFWebsite.Api.Interfaces/Hubs/ITeamspeakClient.cs create mode 100644 UKSFWebsite.Api.Models/Events/EventModelFactory.cs create mode 100644 UKSFWebsite.Api.Models/Events/SignalrEventModel.cs delete mode 100644 UKSFWebsite.Api.Models/Events/SocketEventModel.cs rename UKSFWebsite.Api.Models/Events/Types/{TeamspeakSocketEventType.cs => TeamspeakEventType.cs} (66%) delete mode 100644 UKSFWebsite.Api.Models/Integrations/SocketCommands.cs rename UKSFWebsite.Api.Models/Integrations/{TeamspeakClientSnapshot.cs => TeamspeakClient.cs} (53%) rename UKSFWebsite.Api.Models/Integrations/{TeamspeakSocketProcedureType.cs => TeamspeakProcedureType.cs} (71%) create mode 100644 UKSFWebsite.Api.Services/Fake/FakeTeamspeakManager.cs rename {UKSFWebsite.Api.Services/Hubs => UKSFWebsite.Api.Signalr/Hubs/Command}/CommandRequestsHub.cs (84%) rename {UKSFWebsite.Api.Services/Hubs => UKSFWebsite.Api.Signalr/Hubs/Game}/ServersHub.cs (80%) rename {UKSFWebsite.Api.Services/Hubs => UKSFWebsite.Api.Signalr/Hubs/Integrations}/LauncherHub.cs (82%) rename {UKSFWebsite.Api.Services/Hubs => UKSFWebsite.Api.Signalr/Hubs/Integrations}/TeamspeakClientsHub.cs (83%) create mode 100644 UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs rename {UKSFWebsite.Api.Services/Hubs => UKSFWebsite.Api.Signalr/Hubs/Message}/CommentThreadHub.cs (94%) rename {UKSFWebsite.Api.Services/Hubs => UKSFWebsite.Api.Signalr/Hubs/Message}/NotificationsHub.cs (94%) rename {UKSFWebsite.Api.Services/Hubs => UKSFWebsite.Api.Signalr/Hubs/Personnel}/AccountHub.cs (94%) rename {UKSFWebsite.Api.Services/Hubs => UKSFWebsite.Api.Signalr/Hubs/Utility}/AdminHub.cs (82%) rename {UKSFWebsite.Api.Services/Hubs => UKSFWebsite.Api.Signalr/Hubs/Utility}/UtilityHub.cs (79%) create mode 100644 UKSFWebsite.Api.Signalr/UKSFWebsite.Api.Signalr.csproj delete mode 100644 UKSFWebsite.Api.SocketServer/Socket.cs delete mode 100644 UKSFWebsite.Api.SocketServer/UKSFWebsite.Api.SocketServer.csproj create mode 100644 UKSFWebsite.Api/Controllers/TestController.cs delete mode 100644 ValveSockets/ValveSockets.cs delete mode 100644 ValveSockets/ValveSockets.csproj diff --git a/UKSFWebsite.Api.Data/Admin/VariablesDataService.cs b/UKSFWebsite.Api.Data/Admin/VariablesDataService.cs index 14fdac0f..3fd4851e 100644 --- a/UKSFWebsite.Api.Data/Admin/VariablesDataService.cs +++ b/UKSFWebsite.Api.Data/Admin/VariablesDataService.cs @@ -8,8 +8,8 @@ using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Data.Admin { - public class VariablesDataService : CachedDataService, IVariablesDataService { - public VariablesDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "variables") { } + public class VariablesDataService : CachedDataService, IVariablesDataService { + public VariablesDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "variables") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Data/CachedDataService.cs b/UKSFWebsite.Api.Data/CachedDataService.cs index c91fba04..8ee92237 100644 --- a/UKSFWebsite.Api.Data/CachedDataService.cs +++ b/UKSFWebsite.Api.Data/CachedDataService.cs @@ -3,15 +3,17 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; +using UKSFWebsite.Api.Events; using UKSFWebsite.Api.Events.Data; +using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Events; namespace UKSFWebsite.Api.Data { - public abstract class CachedDataService : DataService { + public abstract class CachedDataService : DataService { protected List Collection; - protected CachedDataService(IMongoDatabase database, IDataEventBus dataEventBus, string collectionName) : base(database, dataEventBus, collectionName) { } + protected CachedDataService(IMongoDatabase database, IDataEventBus dataEventBus, string collectionName) : base(database, dataEventBus, collectionName) { } // ReSharper disable once MemberCanBeProtected.Global - Used in dynamic call, do not change to protected! public void Refresh() { @@ -46,31 +48,31 @@ public override T GetSingle(Func predicate) { public override async Task Add(T data) { await base.Add(data); Refresh(); - CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(data), data)); + CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(data), data)); } public override async Task Update(string id, string fieldName, object value) { await base.Update(id, fieldName, value); Refresh(); - CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public override async Task Update(string id, UpdateDefinition update) { await base.Update(id, update); Refresh(); - CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public override async Task Delete(string id) { await base.Delete(id); Refresh(); - CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); + CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } - protected virtual void CachedDataEvent(DataEventModel dataEvent) { + protected virtual void CachedDataEvent(DataEventModel dataEvent) { base.DataEvent(dataEvent); } - protected override void DataEvent(DataEventModel dataEvent) { } + protected override void DataEvent(DataEventModel dataEvent) { } } } diff --git a/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs b/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs index bbd2a33e..d8e54708 100644 --- a/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs +++ b/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs @@ -4,7 +4,7 @@ using UKSFWebsite.Api.Models.Command; namespace UKSFWebsite.Api.Data.Command { - public class CommandRequestArchiveDataService : DataService, ICommandRequestArchiveDataService { - public CommandRequestArchiveDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commandRequestsArchive") { } + public class CommandRequestArchiveDataService : DataService, ICommandRequestArchiveDataService { + public CommandRequestArchiveDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commandRequestsArchive") { } } } diff --git a/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs b/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs index 2878259b..42cda11a 100644 --- a/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs +++ b/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs @@ -4,7 +4,7 @@ using UKSFWebsite.Api.Models.Command; namespace UKSFWebsite.Api.Data.Command { - public class CommandRequestDataService : CachedDataService, ICommandRequestDataService { - public CommandRequestDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commandRequests") { } + public class CommandRequestDataService : CachedDataService, ICommandRequestDataService { + public CommandRequestDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commandRequests") { } } } diff --git a/UKSFWebsite.Api.Data/DataService.cs b/UKSFWebsite.Api.Data/DataService.cs index 87ca55a6..3f7af094 100644 --- a/UKSFWebsite.Api.Data/DataService.cs +++ b/UKSFWebsite.Api.Data/DataService.cs @@ -3,17 +3,18 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; +using UKSFWebsite.Api.Events; using UKSFWebsite.Api.Events.Data; using UKSFWebsite.Api.Interfaces.Data; using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Events; namespace UKSFWebsite.Api.Data { - public abstract class DataService : DataEventBacker, IDataService { + public abstract class DataService : DataEventBacker, IDataService { protected readonly IMongoDatabase Database; protected readonly string DatabaseCollection; - protected DataService(IMongoDatabase database, IDataEventBus dataEventBus, string collectionName) : base(dataEventBus) { + protected DataService(IMongoDatabase database, IDataEventBus dataEventBus, string collectionName) : base(dataEventBus) { Database = database; DatabaseCollection = collectionName; if (Database.GetCollection(DatabaseCollection) == null) { @@ -33,23 +34,23 @@ public virtual T GetSingle(string id) { public virtual async Task Add(T data) { await Database.GetCollection(DatabaseCollection).InsertOneAsync(data); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(data), data)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(data), data)); } public virtual async Task Update(string id, string fieldName, object value) { UpdateDefinition update = value == null ? Builders.Update.Unset(fieldName) : Builders.Update.Set(fieldName, value); await Database.GetCollection(DatabaseCollection).UpdateOneAsync(Builders.Filter.Eq("id", id), update); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public virtual async Task Update(string id, UpdateDefinition update) { await Database.GetCollection(DatabaseCollection).UpdateOneAsync(Builders.Filter.Eq("id", id), update); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public virtual async Task Delete(string id) { await Database.GetCollection(DatabaseCollection).DeleteOneAsync(Builders.Filter.Eq("id", id)); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } internal static string GetIdValue(T data) => data.GetType().GetField("id").GetValue(data) as string; diff --git a/UKSFWebsite.Api.Data/Fake/FakeNotificationsDataService.cs b/UKSFWebsite.Api.Data/Fake/FakeNotificationsDataService.cs index e5382141..932fc5bc 100644 --- a/UKSFWebsite.Api.Data/Fake/FakeNotificationsDataService.cs +++ b/UKSFWebsite.Api.Data/Fake/FakeNotificationsDataService.cs @@ -5,7 +5,7 @@ using UKSFWebsite.Api.Services.Fake; namespace UKSFWebsite.Api.Data.Fake { - public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { + public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { public Task UpdateMany(FilterDefinition filter, UpdateDefinition update) => Task.CompletedTask; public Task DeleteMany(FilterDefinition filter) => Task.CompletedTask; diff --git a/UKSFWebsite.Api.Data/Game/GameServersDataService.cs b/UKSFWebsite.Api.Data/Game/GameServersDataService.cs index ac43ffc6..493482ad 100644 --- a/UKSFWebsite.Api.Data/Game/GameServersDataService.cs +++ b/UKSFWebsite.Api.Data/Game/GameServersDataService.cs @@ -6,8 +6,8 @@ using UKSFWebsite.Api.Models.Game; namespace UKSFWebsite.Api.Data.Game { - public class GameServersDataService : CachedDataService, IGameServersDataService { - public GameServersDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "gameServers") { } + public class GameServersDataService : CachedDataService, IGameServersDataService { + public GameServersDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "gameServers") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs b/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs index 6e4314d1..391b2036 100644 --- a/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs +++ b/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs @@ -4,7 +4,7 @@ using UKSFWebsite.Api.Models.Launcher; namespace UKSFWebsite.Api.Data.Launcher { - public class LauncherFileDataService : CachedDataService, ILauncherFileDataService { - public LauncherFileDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "launcherFiles") { } + public class LauncherFileDataService : CachedDataService, ILauncherFileDataService { + public LauncherFileDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "launcherFiles") { } } } diff --git a/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs b/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs index e6adc948..c12fa098 100644 --- a/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs +++ b/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using MongoDB.Driver; +using UKSFWebsite.Api.Events; using UKSFWebsite.Api.Events.Data; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; @@ -7,8 +8,8 @@ using UKSFWebsite.Api.Models.Message; namespace UKSFWebsite.Api.Data.Message { - public class CommentThreadDataService : CachedDataService, ICommentThreadDataService { - public CommentThreadDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commentThreads") { } + public class CommentThreadDataService : CachedDataService, ICommentThreadDataService { + public CommentThreadDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commentThreads") { } public new async Task Add(CommentThread commentThread) { await base.Add(commentThread); @@ -17,13 +18,13 @@ public CommentThreadDataService(IMongoDatabase database, IDataEventBus dataEvent public async Task Update(string id, Comment comment, DataEventType updateType) { await base.Update(id, updateType == DataEventType.ADD ? Builders.Update.Push("comments", comment) : Builders.Update.Pull("comments", comment)); - CommentThreadDataEvent(EventModelFactory.CreateDataEvent(updateType, id, comment)); + CommentThreadDataEvent(EventModelFactory.CreateDataEvent(updateType, id, comment)); } - private void CommentThreadDataEvent(DataEventModel dataEvent) { + private void CommentThreadDataEvent(DataEventModel dataEvent) { base.CachedDataEvent(dataEvent); } - protected override void CachedDataEvent(DataEventModel dataEvent) { } + protected override void CachedDataEvent(DataEventModel dataEvent) { } } } diff --git a/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs b/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs index 5d8e8114..d16fa0ba 100644 --- a/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs +++ b/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs @@ -5,8 +5,8 @@ using UKSFWebsite.Api.Models.Message; namespace UKSFWebsite.Api.Data.Message { - public class NotificationsDataService : CachedDataService, INotificationsDataService { - public NotificationsDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "notifications") { } + public class NotificationsDataService : CachedDataService, INotificationsDataService { + public NotificationsDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "notifications") { } public async Task UpdateMany(FilterDefinition filter, UpdateDefinition update) { await Database.GetCollection(DatabaseCollection).UpdateManyAsync(filter, update); diff --git a/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs b/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs index 8fb2ca31..18abad9c 100644 --- a/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs +++ b/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs @@ -3,12 +3,11 @@ using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Events; using UKSFWebsite.Api.Models.Operations; namespace UKSFWebsite.Api.Data.Operations { - public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { - public OperationOrderDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "opord") { } + public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { + public OperationOrderDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "opord") { } public override List Get() { List reversed = base.Get(); diff --git a/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs b/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs index ce83e290..1743cac1 100644 --- a/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs +++ b/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs @@ -6,8 +6,8 @@ using UKSFWebsite.Api.Models.Operations; namespace UKSFWebsite.Api.Data.Operations { - public class OperationReportDataService : CachedDataService, IOperationReportDataService { - public OperationReportDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "oprep") { } + public class OperationReportDataService : CachedDataService, IOperationReportDataService { + public OperationReportDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "oprep") { } public override List Get() { List reversed = base.Get(); diff --git a/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs b/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs index 3a366138..3a96f083 100644 --- a/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs @@ -1,10 +1,11 @@ -using MongoDB.Driver; +using System.Threading.Tasks; +using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Data.Personnel { - public class AccountDataService : CachedDataService, IAccountDataService { - public AccountDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "accounts") { } + public class AccountDataService : CachedDataService, IAccountDataService { + public AccountDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "accounts") { } } } diff --git a/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs b/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs index a3ca106b..f4a0fe08 100644 --- a/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs @@ -6,8 +6,8 @@ using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Data.Personnel { - public class DischargeDataService : CachedDataService, IDischargeDataService { - public DischargeDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "discharges") { } + public class DischargeDataService : CachedDataService, IDischargeDataService { + public DischargeDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "discharges") { } public override List Get() { return base.Get().OrderByDescending(x => x.discharges.Last().timestamp).ToList(); diff --git a/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs b/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs index a3bdbef4..3e432946 100644 --- a/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs @@ -4,7 +4,7 @@ using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Data.Personnel { - public class LoaDataService : CachedDataService, ILoaDataService { - public LoaDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "loas") { } + public class LoaDataService : CachedDataService, ILoaDataService { + public LoaDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "loas") { } } } diff --git a/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs b/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs index f056adf5..7e700176 100644 --- a/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs @@ -5,8 +5,8 @@ using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Data.Personnel { - public class RanksDataService : CachedDataService, IRanksDataService { - public RanksDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "ranks") { } + public class RanksDataService : CachedDataService, IRanksDataService { + public RanksDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "ranks") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs b/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs index 33d1d410..04f3bb6c 100644 --- a/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs @@ -6,8 +6,8 @@ using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Data.Personnel { - public class RolesDataService : CachedDataService, IRolesDataService { - public RolesDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "roles") { } + public class RolesDataService : CachedDataService, IRolesDataService { + public RolesDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "roles") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Data/Units/UnitsDataService.cs b/UKSFWebsite.Api.Data/Units/UnitsDataService.cs index d1d3af91..ff793a93 100644 --- a/UKSFWebsite.Api.Data/Units/UnitsDataService.cs +++ b/UKSFWebsite.Api.Data/Units/UnitsDataService.cs @@ -6,8 +6,8 @@ using UKSFWebsite.Api.Models.Units; namespace UKSFWebsite.Api.Data.Units { - public class UnitsDataService : CachedDataService, IUnitsDataService { - public UnitsDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "units") { } + public class UnitsDataService : CachedDataService, IUnitsDataService { + public UnitsDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "units") { } public override List Get() { base.Get(); diff --git a/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs b/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs index 3be9c12b..c2b630dc 100644 --- a/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs +++ b/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs @@ -4,7 +4,7 @@ using UKSFWebsite.Api.Models.Utility; namespace UKSFWebsite.Api.Data.Utility { - public class ConfirmationCodeDataService : DataService, IConfirmationCodeDataService { - public ConfirmationCodeDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "confirmationCodes") { } + public class ConfirmationCodeDataService : DataService, IConfirmationCodeDataService { + public ConfirmationCodeDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "confirmationCodes") { } } } diff --git a/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs b/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs index 45b88569..a262a8e3 100644 --- a/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs +++ b/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs @@ -4,7 +4,7 @@ using UKSFWebsite.Api.Models.Utility; namespace UKSFWebsite.Api.Data.Utility { - public class SchedulerDataService : DataService, ISchedulerDataService { - public SchedulerDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "scheduledJobs") { } + public class SchedulerDataService : DataService, ISchedulerDataService { + public SchedulerDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "scheduledJobs") { } } } diff --git a/UKSFWebsite.Api.Events/Data/DataEventBacker.cs b/UKSFWebsite.Api.Events/Data/DataEventBacker.cs index 4dd0ef24..b479ebc6 100644 --- a/UKSFWebsite.Api.Events/Data/DataEventBacker.cs +++ b/UKSFWebsite.Api.Events/Data/DataEventBacker.cs @@ -3,14 +3,14 @@ using UKSFWebsite.Api.Models.Events; namespace UKSFWebsite.Api.Events.Data { - public abstract class DataEventBacker : IDataEventBacker { - private readonly IDataEventBus dataEventBus; + public abstract class DataEventBacker : IDataEventBacker { + private readonly IDataEventBus dataEventBus; - protected DataEventBacker(IDataEventBus dataEventBus) => this.dataEventBus = dataEventBus; + protected DataEventBacker(IDataEventBus dataEventBus) => this.dataEventBus = dataEventBus; - public IObservable EventBus() => dataEventBus.AsObservable(); + public IObservable> EventBus() => dataEventBus.AsObservable(); - protected virtual void DataEvent(DataEventModel dataEvent) { + protected virtual void DataEvent(DataEventModel dataEvent) { dataEventBus.Send(dataEvent); } } diff --git a/UKSFWebsite.Api.Events/Data/DataEventBus.cs b/UKSFWebsite.Api.Events/Data/DataEventBus.cs index f74fd2a5..e2a90ad7 100644 --- a/UKSFWebsite.Api.Events/Data/DataEventBus.cs +++ b/UKSFWebsite.Api.Events/Data/DataEventBus.cs @@ -1,6 +1,10 @@ +using System; +using System.Reactive.Linq; using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Events; namespace UKSFWebsite.Api.Events.Data { - public class DataEventBus : EventBus, IDataEventBus { } + public class DataEventBus : EventBus>, IDataEventBus { + public override IObservable> AsObservable() => Subject.OfType>(); + } } diff --git a/UKSFWebsite.Api.Events/Data/EventModelFactory.cs b/UKSFWebsite.Api.Events/Data/EventModelFactory.cs deleted file mode 100644 index 7eae1464..00000000 --- a/UKSFWebsite.Api.Events/Data/EventModelFactory.cs +++ /dev/null @@ -1,8 +0,0 @@ -using UKSFWebsite.Api.Models.Events; - -namespace UKSFWebsite.Api.Events.Data { - public static class EventModelFactory { - public static DataEventModel CreateDataEvent(DataEventType type, string id, object data = null) => new DataEventModel {type = type, id = id, data = data}; - public static SocketEventModel CreateSocketEvent(string clientName, string message) => new SocketEventModel {clientName = clientName, message = message}; - } -} diff --git a/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs index 71fdb1a0..68f24a85 100644 --- a/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs +++ b/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs @@ -2,11 +2,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Interfaces.Events.Handlers; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Models.Events; -using UKSFWebsite.Api.Services.Hubs; +using UKSFWebsite.Api.Signalr.Hubs.Personnel; namespace UKSFWebsite.Api.Events.Handlers { public class AccountEventHandler : IAccountEventHandler { diff --git a/UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs index db978de9..5384338a 100644 --- a/UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs +++ b/UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs @@ -2,11 +2,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Interfaces.Events.Handlers; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Models.Events; -using UKSFWebsite.Api.Services.Hubs; +using UKSFWebsite.Api.Signalr.Hubs.Command; namespace UKSFWebsite.Api.Events.Handlers { public class CommandRequestEventHandler : ICommandRequestEventHandler { diff --git a/UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs index 053778d2..580ca085 100644 --- a/UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs +++ b/UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs @@ -2,13 +2,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Interfaces.Events.Handlers; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Models.Events; using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Services.Hubs; +using UKSFWebsite.Api.Signalr.Hubs.Message; namespace UKSFWebsite.Api.Events.Handlers { public class CommentThreadEventHandler : ICommentThreadEventHandler { diff --git a/UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs index 3a1514d7..eecc1f8c 100644 --- a/UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs +++ b/UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs @@ -2,12 +2,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Interfaces.Events.Handlers; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Models.Events; using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Services.Hubs; +using UKSFWebsite.Api.Signalr.Hubs.Message; namespace UKSFWebsite.Api.Events.Handlers { public class NotificationsEventHandler : INotificationsEventHandler { diff --git a/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs index fc388f65..0211f2fa 100644 --- a/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs +++ b/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs @@ -3,23 +3,26 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Interfaces.Events.Handlers; using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Interfaces.Personnel; +using UKSFWebsite.Api.Models.Events; using UKSFWebsite.Api.Models.Events.Types; using UKSFWebsite.Api.Models.Integrations; using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Events.Handlers { public class TeamspeakEventHandler : ITeamspeakEventHandler { - private readonly ISocketEventBus eventBus; + private readonly ISignalrEventBus eventBus; private readonly ITeamspeakService teamspeakService; private readonly IAccountService accountService; private readonly ITeamspeakGroupService teamspeakGroupService; - private readonly Dictionary serverGroupUpdates = new Dictionary(); + private readonly Dictionary serverGroupUpdates = new Dictionary(); - public TeamspeakEventHandler(ISocketEventBus eventBus, ITeamspeakService teamspeakService, IAccountService accountService, ITeamspeakGroupService teamspeakGroupService) { + public TeamspeakEventHandler(ISignalrEventBus eventBus, ITeamspeakService teamspeakService, IAccountService accountService, ITeamspeakGroupService teamspeakGroupService) { this.eventBus = eventBus; this.teamspeakService = teamspeakService; this.accountService = accountService; @@ -27,30 +30,39 @@ public TeamspeakEventHandler(ISocketEventBus eventBus, ITeamspeakService teamspe } public void Init() { - eventBus.AsObservable("0") + eventBus.AsObservable() .Subscribe( - async x => { await HandleEvent(x.message); } + async x => { await HandleEvent(x); } ); } - private async Task HandleEvent(string messageString) { - if (!Enum.TryParse(messageString.Substring(0, 1), out TeamspeakSocketEventType eventType)) return; - string message = messageString.Substring(1); - switch (eventType) { - case TeamspeakSocketEventType.CLIENTS: - await UpdateClients(message); + private async Task HandleEvent(SignalrEventModel eventModel) { + string args = eventModel.args.ToString(); + switch (eventModel.procedure) { + case TeamspeakEventType.CLIENTS: + await UpdateClients(args); break; - case TeamspeakSocketEventType.CLIENT_SERVER_GROUPS: - UpdateClientServerGroups(message); + case TeamspeakEventType.CLIENT_SERVER_GROUPS: + UpdateClientServerGroups(args); break; + case TeamspeakEventType.EMPTY: break; default: throw new ArgumentOutOfRangeException(); } } - private void UpdateClientServerGroups(string message) { - string[] args = message.Split('|'); - string clientDbid = args[0]; - string serverGroupId = args[1]; + private async Task UpdateClients(string args) { + Console.Out.WriteLine(args); + JArray clientsArray = JArray.Parse(args); + if (clientsArray.Count == 0) return; + HashSet clients = clientsArray.ToObject>(); + Console.WriteLine("Updating online clients"); + await teamspeakService.UpdateClients(clients); + } + + private void UpdateClientServerGroups(string args) { + JObject updateObject = JObject.Parse(args); + double clientDbid = double.Parse(updateObject["clientDbid"].ToString()); + double serverGroupId = double.Parse(updateObject["serverGroupId"].ToString()); Console.WriteLine($"Server group for {clientDbid}: {serverGroupId}"); lock (serverGroupUpdates) { @@ -64,7 +76,7 @@ private void UpdateClientServerGroups(string message) { update.cancellationTokenSource = new CancellationTokenSource(); Task.Run( async () => { - await Task.Delay(TimeSpan.FromMilliseconds(200), update.cancellationTokenSource.Token); + await Task.Delay(TimeSpan.FromMilliseconds(500), update.cancellationTokenSource.Token); if (!update.cancellationTokenSource.IsCancellationRequested) { update.cancellationTokenSource.Cancel(); ProcessAccountData(clientDbid, update.serverGroups); @@ -75,15 +87,9 @@ private void UpdateClientServerGroups(string message) { } } - private async Task UpdateClients(string clients) { - if (string.IsNullOrEmpty(clients)) return; - Console.WriteLine("Updating online clients"); - await teamspeakService.UpdateClients(clients); - } - - private void ProcessAccountData(string clientDbId, ICollection serverGroups) { + private void ProcessAccountData(double clientDbId, ICollection serverGroups) { Console.WriteLine($"Processing server groups for {clientDbId}"); - Account account = accountService.Data().GetSingle(x => x.teamspeakIdentities != null && x.teamspeakIdentities.Any(y => y == clientDbId)); + Account account = accountService.Data().GetSingle(x => x.teamspeakIdentities != null && x.teamspeakIdentities.Any(y => y.Equals(clientDbId))); teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); lock (serverGroupUpdates) { diff --git a/UKSFWebsite.Api.Events/SignalrServer/SignalrEventBus.cs b/UKSFWebsite.Api.Events/SignalrServer/SignalrEventBus.cs new file mode 100644 index 00000000..990e21b9 --- /dev/null +++ b/UKSFWebsite.Api.Events/SignalrServer/SignalrEventBus.cs @@ -0,0 +1,10 @@ +using System; +using System.Reactive.Linq; +using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Models.Events; + +namespace UKSFWebsite.Api.Events.SignalrServer { + public class SignalrEventBus : EventBus, ISignalrEventBus { +// public IObservable AsObservable(string clientName) => Subject.OfType(); + } +} diff --git a/UKSFWebsite.Api.Events/SocketServer/SocketEventBus.cs b/UKSFWebsite.Api.Events/SocketServer/SocketEventBus.cs deleted file mode 100644 index 0ba98f3b..00000000 --- a/UKSFWebsite.Api.Events/SocketServer/SocketEventBus.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Reactive.Linq; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Events; - -namespace UKSFWebsite.Api.Events.SocketServer { - public class SocketEventBus : EventBus, ISocketEventBus { - public IObservable AsObservable(string clientName) => Subject.OfType().Where(x => x.clientName == clientName); - } -} diff --git a/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj b/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj index a18005d3..23afdb92 100644 --- a/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj +++ b/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj @@ -9,7 +9,6 @@ - diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IAccountDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IAccountDataService.cs index ad15a5a6..cd59131d 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IAccountDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IAccountDataService.cs @@ -1,5 +1,5 @@ using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface IAccountDataService : IDataService { } + public interface IAccountDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs index 4837e676..60aa3ecd 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs @@ -1,5 +1,5 @@ using UKSFWebsite.Api.Models.Command; namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface ICommandRequestDataService : IDataService { } + public interface ICommandRequestDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs index 2ea78c19..0677ad85 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs @@ -3,7 +3,7 @@ using UKSFWebsite.Api.Models.Message; namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface ICommentThreadDataService : IDataService { + public interface ICommentThreadDataService : IDataService { new Task Add(CommentThread commentThread); Task Update(string id, Comment comment, DataEventType updateType); } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IDischargeDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IDischargeDataService.cs index 6bbdaf38..ae9c2abb 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IDischargeDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IDischargeDataService.cs @@ -1,5 +1,5 @@ using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface IDischargeDataService : IDataService { } + public interface IDischargeDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IGameServersDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IGameServersDataService.cs index a2988ab3..a22c6a93 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IGameServersDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IGameServersDataService.cs @@ -1,5 +1,5 @@ using UKSFWebsite.Api.Models.Game; namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface IGameServersDataService : IDataService { } + public interface IGameServersDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs index 9ea5759e..fc74e7c4 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs @@ -1,5 +1,5 @@ using UKSFWebsite.Api.Models.Launcher; namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface ILauncherFileDataService : IDataService { } + public interface ILauncherFileDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/ILoaDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/ILoaDataService.cs index 47d0933b..21f5f848 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/ILoaDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/ILoaDataService.cs @@ -1,5 +1,5 @@ using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface ILoaDataService : IDataService { } + public interface ILoaDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/INotificationsDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/INotificationsDataService.cs index bc8ec092..7df8f973 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/INotificationsDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/INotificationsDataService.cs @@ -3,7 +3,7 @@ using UKSFWebsite.Api.Models.Message; namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface INotificationsDataService : IDataService { + public interface INotificationsDataService : IDataService { Task UpdateMany(FilterDefinition filter, UpdateDefinition update); Task DeleteMany(FilterDefinition filter); } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs index 8904558e..126dcd25 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs @@ -2,7 +2,7 @@ using UKSFWebsite.Api.Models.Operations; namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface IOperationOrderDataService : IDataService { + public interface IOperationOrderDataService : IDataService { Task Replace(Opord opord); } } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationReportDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationReportDataService.cs index ca16051c..9eba9019 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationReportDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationReportDataService.cs @@ -2,7 +2,7 @@ using UKSFWebsite.Api.Models.Operations; namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface IOperationReportDataService : IDataService { + public interface IOperationReportDataService : IDataService { Task Replace(Oprep oprep); } } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IRanksDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IRanksDataService.cs index e57434cb..45da54a1 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IRanksDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IRanksDataService.cs @@ -2,7 +2,7 @@ using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface IRanksDataService : IDataService { + public interface IRanksDataService : IDataService { new List Get(); new Rank GetSingle(string name); int Sort(Rank rankA, Rank rankB); diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IRolesDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IRolesDataService.cs index 79f084c0..3e8a93c4 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IRolesDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IRolesDataService.cs @@ -2,7 +2,7 @@ using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface IRolesDataService : IDataService { + public interface IRolesDataService : IDataService { new List Get(); new Role GetSingle(string name); } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IUnitsDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IUnitsDataService.cs index b5a7bf10..94eae8f2 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IUnitsDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IUnitsDataService.cs @@ -1,5 +1,5 @@ using UKSFWebsite.Api.Models.Units; namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface IUnitsDataService : IDataService { } + public interface IUnitsDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs index 06f0f0d9..586655ce 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs @@ -1,9 +1,8 @@ using System.Threading.Tasks; using UKSFWebsite.Api.Models.Admin; -using UKSFWebsite.Api.Models.Utility; namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface IVariablesDataService : IDataService { + public interface IVariablesDataService : IDataService { Task Update(string key, object value); } } diff --git a/UKSFWebsite.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs b/UKSFWebsite.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs index a4a9f32a..3313b4d3 100644 --- a/UKSFWebsite.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs @@ -1,5 +1,5 @@ using UKSFWebsite.Api.Models.Command; namespace UKSFWebsite.Api.Interfaces.Data { - public interface ICommandRequestArchiveDataService : IDataService { } + public interface ICommandRequestArchiveDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/IConfirmationCodeDataService.cs b/UKSFWebsite.Api.Interfaces/Data/IConfirmationCodeDataService.cs index 1098735f..0ba14e8c 100644 --- a/UKSFWebsite.Api.Interfaces/Data/IConfirmationCodeDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/IConfirmationCodeDataService.cs @@ -1,5 +1,5 @@ using UKSFWebsite.Api.Models.Utility; namespace UKSFWebsite.Api.Interfaces.Data { - public interface IConfirmationCodeDataService : IDataService { } + public interface IConfirmationCodeDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/IDataService.cs b/UKSFWebsite.Api.Interfaces/Data/IDataService.cs index 865bea69..2aa4c508 100644 --- a/UKSFWebsite.Api.Interfaces/Data/IDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/IDataService.cs @@ -5,7 +5,7 @@ using UKSFWebsite.Api.Interfaces.Events; namespace UKSFWebsite.Api.Interfaces.Data { - public interface IDataService : IDataEventBacker { + public interface IDataService : IDataEventBacker { List Get(); List Get(Func predicate); T GetSingle(string id); diff --git a/UKSFWebsite.Api.Interfaces/Data/ISchedulerDataService.cs b/UKSFWebsite.Api.Interfaces/Data/ISchedulerDataService.cs index a40d4c7c..c4efac43 100644 --- a/UKSFWebsite.Api.Interfaces/Data/ISchedulerDataService.cs +++ b/UKSFWebsite.Api.Interfaces/Data/ISchedulerDataService.cs @@ -1,5 +1,5 @@ using UKSFWebsite.Api.Models.Utility; namespace UKSFWebsite.Api.Interfaces.Data { - public interface ISchedulerDataService : IDataService { } + public interface ISchedulerDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Events/IDataEventBacker.cs b/UKSFWebsite.Api.Interfaces/Events/IDataEventBacker.cs index 394448dc..06e83a28 100644 --- a/UKSFWebsite.Api.Interfaces/Events/IDataEventBacker.cs +++ b/UKSFWebsite.Api.Interfaces/Events/IDataEventBacker.cs @@ -2,7 +2,7 @@ using UKSFWebsite.Api.Models.Events; namespace UKSFWebsite.Api.Interfaces.Events { - public interface IDataEventBacker { - IObservable EventBus(); + public interface IDataEventBacker { + IObservable> EventBus(); } } diff --git a/UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs b/UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs index d50a1985..3b6afbbf 100644 --- a/UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs +++ b/UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs @@ -1,5 +1,6 @@ +using System; using UKSFWebsite.Api.Models.Events; namespace UKSFWebsite.Api.Interfaces.Events { - public interface IDataEventBus : IEventBus { } + public interface IDataEventBus : IEventBus> { } } diff --git a/UKSFWebsite.Api.Interfaces/Events/ISignalrEventBus.cs b/UKSFWebsite.Api.Interfaces/Events/ISignalrEventBus.cs new file mode 100644 index 00000000..1511da8c --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Events/ISignalrEventBus.cs @@ -0,0 +1,5 @@ +using UKSFWebsite.Api.Models.Events; + +namespace UKSFWebsite.Api.Interfaces.Events { + public interface ISignalrEventBus : IEventBus { } +} diff --git a/UKSFWebsite.Api.Interfaces/Events/ISocketEventBus.cs b/UKSFWebsite.Api.Interfaces/Events/ISocketEventBus.cs deleted file mode 100644 index 31b3fd6f..00000000 --- a/UKSFWebsite.Api.Interfaces/Events/ISocketEventBus.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using UKSFWebsite.Api.Models.Events; - -namespace UKSFWebsite.Api.Interfaces.Events { - public interface ISocketEventBus : IEventBus { - IObservable AsObservable(string clientName); - } -} diff --git a/UKSFWebsite.Api.Interfaces/Hubs/ITeamspeakClient.cs b/UKSFWebsite.Api.Interfaces/Hubs/ITeamspeakClient.cs new file mode 100644 index 00000000..f1b87534 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Hubs/ITeamspeakClient.cs @@ -0,0 +1,8 @@ +using System.Threading.Tasks; +using UKSFWebsite.Api.Models.Integrations; + +namespace UKSFWebsite.Api.Interfaces.Hubs { + public interface ITeamspeakClient { + Task Receive(TeamspeakProcedureType procedure, object args); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Integrations/ISocket.cs b/UKSFWebsite.Api.Interfaces/Integrations/ISocket.cs index 98e2ce1a..aadaecd9 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/ISocket.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/ISocket.cs @@ -1,5 +1,3 @@ -using System; - namespace UKSFWebsite.Api.Interfaces.Integrations { public interface ISocket { void Start(string port); diff --git a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs index 5d0af634..f2fd21e5 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs @@ -3,6 +3,6 @@ namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { public interface ITeamspeakGroupService { - void UpdateAccountGroups(Account account, ICollection serverGroups, string clientDbId); + void UpdateAccountGroups(Account account, ICollection serverGroups, double clientDbId); } } diff --git a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManager.cs b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManager.cs index e9fcff6c..25058025 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManager.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManager.cs @@ -1,6 +1,8 @@ +using UKSFWebsite.Api.Models.Integrations; + namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { public interface ITeamspeakManager { void Start(); - void SendProcedure(string procedure); + void SendProcedure(TeamspeakProcedureType procedure, object args); } } diff --git a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs index be1e4ee9..6dd1222e 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs @@ -2,6 +2,6 @@ namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { public interface ITeamspeakMetricsService { - float GetWeeklyParticipationTrend(HashSet teamspeakIdentities); + float GetWeeklyParticipationTrend(HashSet teamspeakIdentities); } } diff --git a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs index 12baed53..5c6426d3 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs @@ -1,16 +1,17 @@ using System.Collections.Generic; using System.Threading.Tasks; +using UKSFWebsite.Api.Models.Integrations; using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { public interface ITeamspeakService { - string GetOnlineTeamspeakClients(); + HashSet GetOnlineTeamspeakClients(); (bool online, string nickname) GetOnlineUserDetails(Account account); object GetFormattedClients(); - Task UpdateClients(string newClientsString); + Task UpdateClients(HashSet newClients); void UpdateAccountTeamspeakGroups(Account account); void SendTeamspeakMessageToClient(Account account, string message); - void SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message); + void SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message); void Shutdown(); Task StoreTeamspeakServerSnapshot(); } diff --git a/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs b/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs index ac95a591..413b8dee 100644 --- a/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs +++ b/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs @@ -8,7 +8,7 @@ namespace UKSFWebsite.Api.Interfaces.Message { public interface INotificationsService : IDataBackedService { void Add(Notification notification); void SendTeamspeakNotification(Account account, string rawMessage); - void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage); + void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage); IEnumerable GetNotificationsForContext(); Task MarkNotificationsAsRead(IEnumerable ids); Task Delete(IEnumerable ids); diff --git a/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj b/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj index 1811f052..a886f294 100644 --- a/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj +++ b/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj @@ -11,6 +11,7 @@ + diff --git a/UKSFWebsite.Api.Models/Events/DataEventModel.cs b/UKSFWebsite.Api.Models/Events/DataEventModel.cs index b16cfb69..884e2e25 100644 --- a/UKSFWebsite.Api.Models/Events/DataEventModel.cs +++ b/UKSFWebsite.Api.Models/Events/DataEventModel.cs @@ -5,7 +5,8 @@ public enum DataEventType { DELETE } - public class DataEventModel { + // ReSharper disable once UnusedTypeParameter + public class DataEventModel { public DataEventType type; public string id; public object data; diff --git a/UKSFWebsite.Api.Models/Events/EventModelFactory.cs b/UKSFWebsite.Api.Models/Events/EventModelFactory.cs new file mode 100644 index 00000000..4d414d7f --- /dev/null +++ b/UKSFWebsite.Api.Models/Events/EventModelFactory.cs @@ -0,0 +1,8 @@ +using UKSFWebsite.Api.Models.Events.Types; + +namespace UKSFWebsite.Api.Models.Events { + public static class EventModelFactory { + public static DataEventModel CreateDataEvent(DataEventType type, string id, object data = null) => new DataEventModel {type = type, id = id, data = data}; + public static SignalrEventModel CreateSignalrEvent(TeamspeakEventType procedure, object args) => new SignalrEventModel {procedure = procedure, args = args}; + } +} diff --git a/UKSFWebsite.Api.Models/Events/SignalrEventModel.cs b/UKSFWebsite.Api.Models/Events/SignalrEventModel.cs new file mode 100644 index 00000000..173c5739 --- /dev/null +++ b/UKSFWebsite.Api.Models/Events/SignalrEventModel.cs @@ -0,0 +1,8 @@ +using UKSFWebsite.Api.Models.Events.Types; + +namespace UKSFWebsite.Api.Models.Events { + public class SignalrEventModel { + public TeamspeakEventType procedure; + public object args; + } +} diff --git a/UKSFWebsite.Api.Models/Events/SocketEventModel.cs b/UKSFWebsite.Api.Models/Events/SocketEventModel.cs deleted file mode 100644 index 454862d6..00000000 --- a/UKSFWebsite.Api.Models/Events/SocketEventModel.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace UKSFWebsite.Api.Models.Events { - public class SocketEventModel { - public string clientName; - public string message; - } -} diff --git a/UKSFWebsite.Api.Models/Events/Types/TeamspeakSocketEventType.cs b/UKSFWebsite.Api.Models/Events/Types/TeamspeakEventType.cs similarity index 66% rename from UKSFWebsite.Api.Models/Events/Types/TeamspeakSocketEventType.cs rename to UKSFWebsite.Api.Models/Events/Types/TeamspeakEventType.cs index e7a71fb0..b1ad2f7c 100644 --- a/UKSFWebsite.Api.Models/Events/Types/TeamspeakSocketEventType.cs +++ b/UKSFWebsite.Api.Models/Events/Types/TeamspeakEventType.cs @@ -1,5 +1,6 @@ namespace UKSFWebsite.Api.Models.Events.Types { - public enum TeamspeakSocketEventType { + public enum TeamspeakEventType { + EMPTY, CLIENTS, CLIENT_SERVER_GROUPS } diff --git a/UKSFWebsite.Api.Models/Integrations/SocketCommands.cs b/UKSFWebsite.Api.Models/Integrations/SocketCommands.cs deleted file mode 100644 index 720dba6d..00000000 --- a/UKSFWebsite.Api.Models/Integrations/SocketCommands.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace UKSFWebsite.Api.Models.Integrations { - public enum SocketCommands { - NAME - } -} diff --git a/UKSFWebsite.Api.Models/Integrations/TeamspeakClientSnapshot.cs b/UKSFWebsite.Api.Models/Integrations/TeamspeakClient.cs similarity index 53% rename from UKSFWebsite.Api.Models/Integrations/TeamspeakClientSnapshot.cs rename to UKSFWebsite.Api.Models/Integrations/TeamspeakClient.cs index 6d7e6d0b..c6840e63 100644 --- a/UKSFWebsite.Api.Models/Integrations/TeamspeakClientSnapshot.cs +++ b/UKSFWebsite.Api.Models/Integrations/TeamspeakClient.cs @@ -1,8 +1,8 @@ namespace UKSFWebsite.Api.Models.Integrations { - public class TeamspeakClientSnapshot { - public string channelId; + public class TeamspeakClient { + public double channelId; public string channelName; - public string clientDbId; + public double clientDbId; public string clientName; } } diff --git a/UKSFWebsite.Api.Models/Integrations/TeamspeakSocketProcedureType.cs b/UKSFWebsite.Api.Models/Integrations/TeamspeakProcedureType.cs similarity index 71% rename from UKSFWebsite.Api.Models/Integrations/TeamspeakSocketProcedureType.cs rename to UKSFWebsite.Api.Models/Integrations/TeamspeakProcedureType.cs index 44a5ae00..d0e0342b 100644 --- a/UKSFWebsite.Api.Models/Integrations/TeamspeakSocketProcedureType.cs +++ b/UKSFWebsite.Api.Models/Integrations/TeamspeakProcedureType.cs @@ -1,5 +1,6 @@ namespace UKSFWebsite.Api.Models.Integrations { - public enum TeamspeakSocketProcedureType { + public enum TeamspeakProcedureType { + EMPTY, ASSIGN, UNASSIGN, GROUPS, diff --git a/UKSFWebsite.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs b/UKSFWebsite.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs index bf6d6ab4..d85f6e53 100644 --- a/UKSFWebsite.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs +++ b/UKSFWebsite.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs @@ -3,7 +3,7 @@ namespace UKSFWebsite.Api.Models.Integrations { public class TeamspeakServerGroupUpdate { - public readonly List serverGroups = new List(); + public readonly List serverGroups = new List(); public CancellationTokenSource cancellationTokenSource; } } diff --git a/UKSFWebsite.Api.Models/Integrations/TeamspeakServerSnapshot.cs b/UKSFWebsite.Api.Models/Integrations/TeamspeakServerSnapshot.cs index db6ca7bc..18bbe806 100644 --- a/UKSFWebsite.Api.Models/Integrations/TeamspeakServerSnapshot.cs +++ b/UKSFWebsite.Api.Models/Integrations/TeamspeakServerSnapshot.cs @@ -4,6 +4,6 @@ namespace UKSFWebsite.Api.Models.Integrations { public class TeamspeakServerSnapshot { public DateTime timestamp; - public HashSet users; + public HashSet users; } } diff --git a/UKSFWebsite.Api.Models/Personnel/Account.cs b/UKSFWebsite.Api.Models/Personnel/Account.cs index 744ce185..485ae100 100644 --- a/UKSFWebsite.Api.Models/Personnel/Account.cs +++ b/UKSFWebsite.Api.Models/Personnel/Account.cs @@ -27,7 +27,7 @@ public class Account { public ServiceRecordEntry[] serviceRecord = new ServiceRecordEntry[0]; public AccountSettings settings = new AccountSettings(); public string steamname; - public HashSet teamspeakIdentities; + public HashSet teamspeakIdentities; public string unitAssignment; public string unitsExperience; } diff --git a/UKSFWebsite.Api.Services/Admin/VariablesService.cs b/UKSFWebsite.Api.Services/Admin/VariablesService.cs index 9d595bca..c01073ff 100644 --- a/UKSFWebsite.Api.Services/Admin/VariablesService.cs +++ b/UKSFWebsite.Api.Services/Admin/VariablesService.cs @@ -1,11 +1,14 @@ using System; +using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using UKSFWebsite.Api.Models.Admin; +using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Services.Admin { public static class VariablesService { public static string AsString(this VariableItem variable) => variable?.item.ToString(); + public static double AsDouble(this VariableItem variable) => double.Parse(variable?.item.ToString() ?? throw new Exception("Variable does not exist")); public static bool AsBool(this VariableItem variable) => bool.Parse(variable?.item.ToString() ?? throw new Exception("Variable does not exist")); public static ulong AsUlong(this VariableItem variable) => ulong.Parse(variable?.item.ToString() ?? throw new Exception("Variable does not exist")); @@ -14,10 +17,21 @@ public static string[] AsArray(this VariableItem variable, Func throw new Exception("Variable does not exist"); } - string itemString = variable.item.ToString(); + string itemString = variable.AsString(); itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); string[] items = itemString.Split(","); return predicate != null ? items.Select(predicate).ToArray() : items; } + + public static IEnumerable AsDoublesArray(this VariableItem variable, Func predicate = null) { + if (variable == null) { + throw new Exception("Variable does not exist"); + } + + string itemString = variable.AsString(); + itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); + IEnumerable items = itemString.Split(",").Select(x => x.ToDouble()); + return predicate != null ? items.Select(predicate).ToArray() : items; + } } } diff --git a/UKSFWebsite.Api.Services/Command/CommandRequestCompletionService.cs b/UKSFWebsite.Api.Services/Command/CommandRequestCompletionService.cs index 408e5cea..f3428cc0 100644 --- a/UKSFWebsite.Api.Services/Command/CommandRequestCompletionService.cs +++ b/UKSFWebsite.Api.Services/Command/CommandRequestCompletionService.cs @@ -13,9 +13,9 @@ using UKSFWebsite.Api.Models.Message; using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Personnel; +using UKSFWebsite.Api.Signalr.Hubs.Command; namespace UKSFWebsite.Api.Services.Command { public class CommandRequestCompletionService : ICommandRequestCompletionService { diff --git a/UKSFWebsite.Api.Services/Fake/FakeCachedDataService.cs b/UKSFWebsite.Api.Services/Fake/FakeCachedDataService.cs index 2489086c..e64cf7d4 100644 --- a/UKSFWebsite.Api.Services/Fake/FakeCachedDataService.cs +++ b/UKSFWebsite.Api.Services/Fake/FakeCachedDataService.cs @@ -1,5 +1,5 @@ namespace UKSFWebsite.Api.Services.Fake { - public class FakeCachedDataService : FakeDataService { + public class FakeCachedDataService : FakeDataService { public void Refresh() { } } } diff --git a/UKSFWebsite.Api.Services/Fake/FakeDataService.cs b/UKSFWebsite.Api.Services/Fake/FakeDataService.cs index 326f8f9f..385ad4d1 100644 --- a/UKSFWebsite.Api.Services/Fake/FakeDataService.cs +++ b/UKSFWebsite.Api.Services/Fake/FakeDataService.cs @@ -7,7 +7,7 @@ using UKSFWebsite.Api.Models.Events; namespace UKSFWebsite.Api.Services.Fake { - public abstract class FakeDataService : IDataService { + public abstract class FakeDataService : IDataService { public List Get() => new List(); public List Get(Func predicate) => new List(); @@ -24,6 +24,6 @@ public abstract class FakeDataService : IDataService { public Task Delete(string id) => Task.CompletedTask; - public IObservable EventBus() => new Subject(); + public IObservable> EventBus() => new Subject>(); } } diff --git a/UKSFWebsite.Api.Services/Fake/FakeNotificationsService.cs b/UKSFWebsite.Api.Services/Fake/FakeNotificationsService.cs index 2613317b..59b6a9b9 100644 --- a/UKSFWebsite.Api.Services/Fake/FakeNotificationsService.cs +++ b/UKSFWebsite.Api.Services/Fake/FakeNotificationsService.cs @@ -9,7 +9,7 @@ namespace UKSFWebsite.Api.Services.Fake { public class FakeNotificationsService : INotificationsService { public void SendTeamspeakNotification(Account account, string rawMessage) { } - public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { } + public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { } public IEnumerable GetNotificationsForContext() => new List(); diff --git a/UKSFWebsite.Api.Services/Fake/FakeTeamspeakManager.cs b/UKSFWebsite.Api.Services/Fake/FakeTeamspeakManager.cs new file mode 100644 index 00000000..192c93c7 --- /dev/null +++ b/UKSFWebsite.Api.Services/Fake/FakeTeamspeakManager.cs @@ -0,0 +1,10 @@ +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; +using UKSFWebsite.Api.Models.Integrations; + +namespace UKSFWebsite.Api.Services.Fake { + public class FakeTeamspeakManager : ITeamspeakManager { + public void Start() { } + + public void SendProcedure(TeamspeakProcedureType procedure, object args) { } + } +} diff --git a/UKSFWebsite.Api.Services/Integrations/DiscordService.cs b/UKSFWebsite.Api.Services/Integrations/DiscordService.cs index 1d20eea4..4190f708 100644 --- a/UKSFWebsite.Api.Services/Integrations/DiscordService.cs +++ b/UKSFWebsite.Api.Services/Integrations/DiscordService.cs @@ -12,7 +12,6 @@ using UKSFWebsite.Api.Models.Units; using UKSFWebsite.Api.Services.Admin; using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Services.Integrations { public class DiscordService : IDiscordService, IDisposable { diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs index 0b3a11b5..02d1a900 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs @@ -21,15 +21,15 @@ public TeamspeakGroupService(IRanksService ranksService, IUnitsService unitsServ this.teamspeakManager = teamspeakManager; } - public void UpdateAccountGroups(Account account, ICollection serverGroups, string clientDbId) { - HashSet allowedGroups = new HashSet(); + public void UpdateAccountGroups(Account account, ICollection serverGroups, double clientDbId) { + HashSet allowedGroups = new HashSet(); if (account == null || account.membershipState == MembershipState.UNCONFIRMED) { - allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_UNVERIFIED").AsString()); + allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_UNVERIFIED").AsDouble()); } if (account?.membershipState == MembershipState.DISCHARGED) { - allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_DISCHARGED").AsString()); + allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_DISCHARGED").AsDouble()); } if (account != null) { @@ -37,26 +37,26 @@ public void UpdateAccountGroups(Account account, ICollection serverGroup UpdateUnits(account, allowedGroups); } - string[] groupsBlacklist = VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_BLACKLIST").AsArray(); - foreach (string serverGroup in serverGroups) { + List groupsBlacklist = VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_BLACKLIST").AsDoublesArray().ToList(); + foreach (double serverGroup in serverGroups) { if (!allowedGroups.Contains(serverGroup) && !groupsBlacklist.Contains(serverGroup)) { RemoveServerGroup(clientDbId, serverGroup); } } - foreach (string serverGroup in allowedGroups.Where(serverGroup => !serverGroups.Contains(serverGroup))) { + foreach (double serverGroup in allowedGroups.Where(serverGroup => !serverGroups.Contains(serverGroup))) { AddServerGroup(clientDbId, serverGroup); } } - private void UpdateRank(Account account, ISet allowedGroups) { + private void UpdateRank(Account account, ISet allowedGroups) { string rank = account.rank; foreach (Rank x in ranksService.Data().Get().Where(x => rank == x.name)) { - allowedGroups.Add(x.teamspeakGroup); + allowedGroups.Add(x.teamspeakGroup.ToDouble()); } } - private void UpdateUnits(Account account, ISet allowedGroups) { + private void UpdateUnits(Account account, ISet allowedGroups) { Unit accountUnit = unitsService.Data().GetSingle(x => x.name == account.unitAssignment); List accountUnits = unitsService.Data().Get(x => x.members.Contains(account.id)).Where(x => !string.IsNullOrEmpty(x.teamspeakGroup)).ToList(); List accountUnitParents = unitsService.GetParents(accountUnit).Where(x => !string.IsNullOrEmpty(x.teamspeakGroup)).ToList(); @@ -65,19 +65,19 @@ private void UpdateUnits(Account account, ISet allowedGroups) { if (elcom.members.Contains(account.id)) { accountUnits.Remove(accountUnits.Find(x => x.branch == UnitBranch.COMBAT)); accountUnitParents = accountUnitParents.TakeLast(2).ToList(); - allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_ELCOM").AsString()); + allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_ELCOM").AsDouble()); } - accountUnits.ForEach(x => allowedGroups.Add(x.teamspeakGroup)); - accountUnitParents.ForEach(x => allowedGroups.Add(x.teamspeakGroup)); + accountUnits.ForEach(x => allowedGroups.Add(x.teamspeakGroup.ToDouble())); + accountUnitParents.ForEach(x => allowedGroups.Add(x.teamspeakGroup.ToDouble())); } - private void AddServerGroup(string clientDbId, string serverGroup) { - teamspeakManager.SendProcedure($"{TeamspeakSocketProcedureType.ASSIGN}:{clientDbId}|{serverGroup}"); + private void AddServerGroup(double clientDbId, double serverGroup) { + teamspeakManager.SendProcedure(TeamspeakProcedureType.ASSIGN, new {clientDbId, serverGroup}); } - private void RemoveServerGroup(string clientDbId, string serverGroup) { - teamspeakManager.SendProcedure($"{TeamspeakSocketProcedureType.UNASSIGN}:{clientDbId}|{serverGroup}"); + private void RemoveServerGroup(double clientDbId, double serverGroup) { + teamspeakManager.SendProcedure(TeamspeakProcedureType.UNASSIGN, new {clientDbId, serverGroup}); } } } diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManager.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManager.cs index 72e8503d..7a2af69a 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManager.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManager.cs @@ -1,48 +1,70 @@ using System; using System.Diagnostics; using System.Linq; +using System.Threading; using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Integrations; +using Microsoft.AspNetCore.SignalR; +using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; +using UKSFWebsite.Api.Models.Integrations; using UKSFWebsite.Api.Services.Admin; using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Signalr.Hubs.Integrations; namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { public class TeamspeakManager : ITeamspeakManager, IDisposable { - private readonly ISocket socket; - private readonly string teamspeakConnectionName; + private readonly IHubContext hub; private bool runTeamspeak; private int teamspeakProcessId; + private CancellationTokenSource token; - public TeamspeakManager(ISocket socket) { - this.socket = socket; - teamspeakConnectionName = VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_SOCKET_NAME").AsString(); + public TeamspeakManager(IHubContext hub) => this.hub = hub; + + public void Dispose() { + runTeamspeak = false; + token.Cancel(); + if (TeamspeakHubState.Connected) { + SendProcedure(TeamspeakProcedureType.SHUTDOWN, null); + Task.Delay(TimeSpan.FromSeconds(5)).Wait(); + } + + while (Process.GetProcesses().Any(x => x.Id == teamspeakProcessId)) { + ShutTeamspeak(); + Task.Delay(TimeSpan.FromSeconds(1)).Wait(); + } } public void Start() { runTeamspeak = true; - Task.Run(AssertOnline); + Task.Run(KeepOnline); } - public void SendProcedure(string procedure) { - socket.SendMessageToClient(teamspeakConnectionName, procedure); + public void SendProcedure(TeamspeakProcedureType procedure, object args) { + hub.Clients.All.Receive(procedure, args); } - private async void AssertOnline() { + private async void KeepOnline() { + token = new CancellationTokenSource(); while (runTeamspeak) { - if (!VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_RUN").AsBool()) continue; - if (!socket.IsClientOnline(teamspeakConnectionName)) { - if (teamspeakProcessId == default) { - LaunchTeamspeak(); - } else { - while (Process.GetProcesses().Any(x => x.Id == teamspeakProcessId)) { - ShutTeamspeak(); - await Task.Delay(TimeSpan.FromSeconds(2)); + if (VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_RUN").AsBool()) { + if (!TeamspeakHubState.Connected) { + if (teamspeakProcessId == default) { + LaunchTeamspeak(); + } else { + while (Process.GetProcesses().Any(x => x.Id == teamspeakProcessId)) { + ShutTeamspeak(); + await Task.Delay(TimeSpan.FromSeconds(2), token.Token); + } + + teamspeakProcessId = default; + continue; } - teamspeakProcessId = default; + } else { + // TODO: Get teamspeakProcessId } } - await Task.Delay(TimeSpan.FromSeconds(10)); + + await Task.Delay(TimeSpan.FromSeconds(10), token.Token); } } @@ -53,10 +75,5 @@ private void LaunchTeamspeak() { private void ShutTeamspeak() { ProcessHelper.LaunchProcess("taskkill", $"/f /pid {teamspeakProcessId}"); } - - public void Dispose() { - runTeamspeak = false; - socket.Stop(); - } } } diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs index 1027aa74..96fabd77 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using UKSFWebsite.Api.Interfaces.Integrations; using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { public class TeamspeakMetricsService : ITeamspeakMetricsService { - public float GetWeeklyParticipationTrend(HashSet teamspeakIdentities) => 3; + public float GetWeeklyParticipationTrend(HashSet teamspeakIdentities) => 3; } } diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs index 0099b16c..e0588d34 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs @@ -1,26 +1,23 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Models.Integrations; using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Hubs; +using UKSFWebsite.Api.Signalr.Hubs.Integrations; namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { public class TeamspeakService : ITeamspeakService { - private readonly SemaphoreSlim clientStringSemaphore = new SemaphoreSlim(1); + private readonly SemaphoreSlim clientsSemaphore = new SemaphoreSlim(1); private readonly IMongoDatabase database; private readonly IHubContext teamspeakClientsHub; private readonly ITeamspeakManager teamspeakManager; - private string clientsString = ""; + private HashSet clients = new HashSet(); public TeamspeakService(IMongoDatabase database, IHubContext teamspeakClientsHub, ITeamspeakManager teamspeakManager) { this.database = database; @@ -28,20 +25,19 @@ public TeamspeakService(IMongoDatabase database, IHubContext clientsString; + public HashSet GetOnlineTeamspeakClients() => clients; - public async Task UpdateClients(string newClientsString) { - await clientStringSemaphore.WaitAsync(); - clientsString = newClientsString; - Console.WriteLine(clientsString); - clientStringSemaphore.Release(); + public async Task UpdateClients(HashSet newClients) { + await clientsSemaphore.WaitAsync(); + clients = newClients; + clientsSemaphore.Release(); await teamspeakClientsHub.Clients.All.ReceiveClients(GetFormattedClients()); } public void UpdateAccountTeamspeakGroups(Account account) { if (account?.teamspeakIdentities == null) return; - foreach (string clientDbId in account.teamspeakIdentities) { - teamspeakManager.SendProcedure($"{TeamspeakSocketProcedureType.GROUPS}:{clientDbId}"); + foreach (double clientDbId in account.teamspeakIdentities) { + teamspeakManager.SendProcedure(TeamspeakProcedureType.GROUPS, new {clientDbId}); } } @@ -51,45 +47,37 @@ public void SendTeamspeakMessageToClient(Account account, string message) { SendTeamspeakMessageToClient(account.teamspeakIdentities, message); } - public void SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message) { + public void SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message) { message = FormatTeamspeakMessage(message); - foreach (string clientDbId in clientDbIds) { - teamspeakManager.SendProcedure($"{TeamspeakSocketProcedureType.MESSAGE}:{clientDbId}|{message}"); + foreach (double clientDbId in clientDbIds) { + teamspeakManager.SendProcedure(TeamspeakProcedureType.MESSAGE, new {clientDbId, message}); } } public async Task StoreTeamspeakServerSnapshot() { - string clientsJson = GetOnlineTeamspeakClients(); - if (string.IsNullOrEmpty(clientsJson)) { + if (clients.Count == 0) { Console.WriteLine("No client data for snapshot"); return; } - JObject clientsObject = JObject.Parse(clientsJson); - HashSet onlineClients = JsonConvert.DeserializeObject>(clientsObject["clients"].ToString()); - TeamspeakServerSnapshot teamspeakServerSnapshot = new TeamspeakServerSnapshot {timestamp = DateTime.UtcNow, users = onlineClients}; + TeamspeakServerSnapshot teamspeakServerSnapshot = new TeamspeakServerSnapshot {timestamp = DateTime.UtcNow, users = clients}; await database.GetCollection("teamspeakSnapshots").InsertOneAsync(teamspeakServerSnapshot); } public void Shutdown() { - teamspeakManager.SendProcedure($"{TeamspeakSocketProcedureType.SHUTDOWN}:"); + teamspeakManager.SendProcedure(TeamspeakProcedureType.SHUTDOWN, new {}); } public object GetFormattedClients() { - if (string.IsNullOrEmpty(clientsString)) return null; - JObject clientsObject = JObject.Parse(clientsString); - HashSet onlineClients = JsonConvert.DeserializeObject>(clientsObject["clients"].ToString()); - return onlineClients.Where(x => x != null).Select(x => new {name = $"{x.clientName}", x.clientDbId}).ToList(); + return clients.Count == 0 ? null : clients.Where(x => x != null).Select(x => new {name = $"{x.clientName}", x.clientDbId}).ToList(); } public (bool online, string nickname) GetOnlineUserDetails(Account account) { if (account.teamspeakIdentities == null) return (false, ""); - if (string.IsNullOrEmpty(clientsString)) return (false, ""); + if (clients.Count == 0) return (false, ""); - JObject clientsObject = JObject.Parse(clientsString); - HashSet onlineClients = JsonConvert.DeserializeObject>(clientsObject["clients"].ToString()); - foreach (TeamspeakClientSnapshot client in onlineClients.Where(x => x != null)) { - if (account.teamspeakIdentities.Any(y => y == client.clientDbId)) { + foreach (TeamspeakClient client in clients.Where(x => x != null)) { + if (account.teamspeakIdentities.Any(y => y.Equals(client.clientDbId))) { return (true, client.clientName); } } diff --git a/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs b/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs index d097a6ff..01874d29 100644 --- a/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs +++ b/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs @@ -12,7 +12,6 @@ using UKSFWebsite.Api.Interfaces.Launcher; using UKSFWebsite.Api.Models.Launcher; using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Services.Launcher { public class LauncherFileService : ILauncherFileService { diff --git a/UKSFWebsite.Api.Services/Launcher/LauncherService.cs b/UKSFWebsite.Api.Services/Launcher/LauncherService.cs index d68007aa..dbf7cef9 100644 --- a/UKSFWebsite.Api.Services/Launcher/LauncherService.cs +++ b/UKSFWebsite.Api.Services/Launcher/LauncherService.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Launcher; -using UKSFWebsite.Api.Services.Hubs; +using UKSFWebsite.Api.Signalr.Hubs.Integrations; namespace UKSFWebsite.Api.Services.Launcher { public class LauncherService : ILauncherService { diff --git a/UKSFWebsite.Api.Services/Message/LoggingService.cs b/UKSFWebsite.Api.Services/Message/LoggingService.cs index 26c8e2cc..f012f6c5 100644 --- a/UKSFWebsite.Api.Services/Message/LoggingService.cs +++ b/UKSFWebsite.Api.Services/Message/LoggingService.cs @@ -6,8 +6,8 @@ using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Models.Message.Logging; -using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Signalr.Hubs.Utility; namespace UKSFWebsite.Api.Services.Message { public class LoggingService : ILoggingService { diff --git a/UKSFWebsite.Api.Services/Message/NotificationsService.cs b/UKSFWebsite.Api.Services/Message/NotificationsService.cs index 8eceec5b..2684e5b0 100644 --- a/UKSFWebsite.Api.Services/Message/NotificationsService.cs +++ b/UKSFWebsite.Api.Services/Message/NotificationsService.cs @@ -5,15 +5,14 @@ using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Interfaces.Integrations; using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Models.Message; using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Signalr.Hubs.Message; namespace UKSFWebsite.Api.Services.Message { public class NotificationsService : INotificationsService { @@ -40,7 +39,7 @@ public void SendTeamspeakNotification(Account account, string rawMessage) { teamspeakService.SendTeamspeakMessageToClient(account, rawMessage); } - public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { + public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { rawMessage = rawMessage.Replace("", "[/url]"); teamspeakService.SendTeamspeakMessageToClient(clientDbIds, rawMessage); } diff --git a/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs b/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs index 63714997..01b4a2c4 100644 --- a/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs +++ b/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs @@ -13,7 +13,7 @@ using UKSFWebsite.Api.Models.Message; using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Services.Hubs; +using UKSFWebsite.Api.Signalr.Hubs.Personnel; namespace UKSFWebsite.Api.Services.Personnel { public class AssignmentService : IAssignmentService { diff --git a/UKSFWebsite.Api.Services/Personnel/AttendanceService.cs b/UKSFWebsite.Api.Services/Personnel/AttendanceService.cs index f6e46a6d..4af4c09f 100644 --- a/UKSFWebsite.Api.Services/Personnel/AttendanceService.cs +++ b/UKSFWebsite.Api.Services/Personnel/AttendanceService.cs @@ -51,8 +51,8 @@ private async Task GetRecords(DateTime start, DateTime end) { records = (await database.GetCollection("teamspeakSnapshots").FindAsync(x => x.timestamp > start && x.timestamp < end)).ToList(); } - private float GetAttendancePercent(ICollection userTsId) { - IEnumerable presentRecords = records.Where(record => record.users.Any(x => userTsId.Contains(x.clientDbId.ToString()) && x.channelName == "ACRE")); + private float GetAttendancePercent(ICollection userTsId) { + IEnumerable presentRecords = records.Where(record => record.users.Any(x => userTsId.Contains(x.clientDbId) && x.channelName == "ACRE")); return presentRecords.Count() / (float) records.Count; } diff --git a/UKSFWebsite.Api.Services/Personnel/RecruitmentService.cs b/UKSFWebsite.Api.Services/Personnel/RecruitmentService.cs index d5bf4b09..19c1759d 100644 --- a/UKSFWebsite.Api.Services/Personnel/RecruitmentService.cs +++ b/UKSFWebsite.Api.Services/Personnel/RecruitmentService.cs @@ -88,7 +88,7 @@ public JObject GetApplication(Account account) { return JObject.FromObject( new { account, - displayName = displayNameService.GetDisplayNameWithoutRank(account), + displayName = displayNameService.GetDisplayName(account), age = new {years, months}, communications = new {tsOnline, tsNickname = tsOnline ? tsNickname : "", discordOnline}, daysProcessing = Math.Ceiling((DateTime.Now - account.application.dateCreated).TotalDays), diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index c35a2994..7c97c419 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -14,7 +14,6 @@ - @@ -26,6 +25,7 @@ + \ No newline at end of file diff --git a/UKSFWebsite.Api.Services/Utility/StringUtilities.cs b/UKSFWebsite.Api.Services/Utility/StringUtilities.cs index 69b555ef..33ac996c 100644 --- a/UKSFWebsite.Api.Services/Utility/StringUtilities.cs +++ b/UKSFWebsite.Api.Services/Utility/StringUtilities.cs @@ -10,6 +10,7 @@ namespace UKSFWebsite.Api.Services.Utility { public static class StringUtilities { + public static double ToDouble(this string text) => double.Parse(text); public static string ToTitleCase(string text) => CultureInfo.CurrentCulture.TextInfo.ToTitleCase(text); public static string Keyify(this string key) => key.ToUpper().Replace(" ", "_"); public static string RemoveSpaces(this string item) => item.Replace(" ", string.Empty); diff --git a/UKSFWebsite.Api.Services/Hubs/CommandRequestsHub.cs b/UKSFWebsite.Api.Signalr/Hubs/Command/CommandRequestsHub.cs similarity index 84% rename from UKSFWebsite.Api.Services/Hubs/CommandRequestsHub.cs rename to UKSFWebsite.Api.Signalr/Hubs/Command/CommandRequestsHub.cs index 5d1e8dfb..7f6aea31 100644 --- a/UKSFWebsite.Api.Services/Hubs/CommandRequestsHub.cs +++ b/UKSFWebsite.Api.Signalr/Hubs/Command/CommandRequestsHub.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Services.Hubs { +namespace UKSFWebsite.Api.Signalr.Hubs.Command { [Authorize] public class CommandRequestsHub : Hub { public const string END_POINT = "commandRequests"; diff --git a/UKSFWebsite.Api.Services/Hubs/ServersHub.cs b/UKSFWebsite.Api.Signalr/Hubs/Game/ServersHub.cs similarity index 80% rename from UKSFWebsite.Api.Services/Hubs/ServersHub.cs rename to UKSFWebsite.Api.Signalr/Hubs/Game/ServersHub.cs index 36de5491..876c6c05 100644 --- a/UKSFWebsite.Api.Services/Hubs/ServersHub.cs +++ b/UKSFWebsite.Api.Signalr/Hubs/Game/ServersHub.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Services.Hubs { +namespace UKSFWebsite.Api.Signalr.Hubs.Game { public class ServersHub : Hub { public const string END_POINT = "servers"; } diff --git a/UKSFWebsite.Api.Services/Hubs/LauncherHub.cs b/UKSFWebsite.Api.Signalr/Hubs/Integrations/LauncherHub.cs similarity index 82% rename from UKSFWebsite.Api.Services/Hubs/LauncherHub.cs rename to UKSFWebsite.Api.Signalr/Hubs/Integrations/LauncherHub.cs index 6c2db2dd..1c087f90 100644 --- a/UKSFWebsite.Api.Services/Hubs/LauncherHub.cs +++ b/UKSFWebsite.Api.Signalr/Hubs/Integrations/LauncherHub.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Services.Hubs { +namespace UKSFWebsite.Api.Signalr.Hubs.Integrations { [Authorize] public class LauncherHub : Hub { public const string END_POINT = "launcher"; diff --git a/UKSFWebsite.Api.Services/Hubs/TeamspeakClientsHub.cs b/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs similarity index 83% rename from UKSFWebsite.Api.Services/Hubs/TeamspeakClientsHub.cs rename to UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs index 578b9a68..2b7b1d15 100644 --- a/UKSFWebsite.Api.Services/Hubs/TeamspeakClientsHub.cs +++ b/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Services.Hubs { +namespace UKSFWebsite.Api.Signalr.Hubs.Integrations { [Authorize] public class TeamspeakClientsHub : Hub { public const string END_POINT = "teamspeakClients"; diff --git a/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs b/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs new file mode 100644 index 00000000..5c4359e2 --- /dev/null +++ b/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs @@ -0,0 +1,35 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.SignalR; +using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Interfaces.Hubs; +using UKSFWebsite.Api.Models.Events; +using UKSFWebsite.Api.Models.Events.Types; +// ReSharper disable UnusedMember.Global + +namespace UKSFWebsite.Api.Signalr.Hubs.Integrations { + public static class TeamspeakHubState { + public static bool Connected; + } + + public class TeamspeakHub : Hub { + private readonly ISignalrEventBus eventBus; + public const string END_POINT = "teamspeak"; + + public TeamspeakHub(ISignalrEventBus eventBus) => this.eventBus = eventBus; + + public void Invoke(int procedure, object args) { + eventBus.Send(EventModelFactory.CreateSignalrEvent((TeamspeakEventType)procedure, args)); + } + + public override Task OnConnectedAsync() { + TeamspeakHubState.Connected = true; + return base.OnConnectedAsync(); + } + + public override Task OnDisconnectedAsync(Exception exception) { + TeamspeakHubState.Connected = false; + return base.OnDisconnectedAsync(exception); + } + } +} diff --git a/UKSFWebsite.Api.Services/Hubs/CommentThreadHub.cs b/UKSFWebsite.Api.Signalr/Hubs/Message/CommentThreadHub.cs similarity index 94% rename from UKSFWebsite.Api.Services/Hubs/CommentThreadHub.cs rename to UKSFWebsite.Api.Signalr/Hubs/Message/CommentThreadHub.cs index a98374bb..681ec4b1 100644 --- a/UKSFWebsite.Api.Services/Hubs/CommentThreadHub.cs +++ b/UKSFWebsite.Api.Signalr/Hubs/Message/CommentThreadHub.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.Primitives; using UKSFWebsite.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Services.Hubs { +namespace UKSFWebsite.Api.Signalr.Hubs.Message { [Authorize] public class CommentThreadHub : Hub { public const string END_POINT = "commentThread"; diff --git a/UKSFWebsite.Api.Services/Hubs/NotificationsHub.cs b/UKSFWebsite.Api.Signalr/Hubs/Message/NotificationsHub.cs similarity index 94% rename from UKSFWebsite.Api.Services/Hubs/NotificationsHub.cs rename to UKSFWebsite.Api.Signalr/Hubs/Message/NotificationsHub.cs index 8ed041eb..507ab999 100644 --- a/UKSFWebsite.Api.Services/Hubs/NotificationsHub.cs +++ b/UKSFWebsite.Api.Signalr/Hubs/Message/NotificationsHub.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.Primitives; using UKSFWebsite.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Services.Hubs { +namespace UKSFWebsite.Api.Signalr.Hubs.Message { [Authorize] public class NotificationHub : Hub { public const string END_POINT = "notifications"; diff --git a/UKSFWebsite.Api.Services/Hubs/AccountHub.cs b/UKSFWebsite.Api.Signalr/Hubs/Personnel/AccountHub.cs similarity index 94% rename from UKSFWebsite.Api.Services/Hubs/AccountHub.cs rename to UKSFWebsite.Api.Signalr/Hubs/Personnel/AccountHub.cs index 242cd3b7..19076199 100644 --- a/UKSFWebsite.Api.Services/Hubs/AccountHub.cs +++ b/UKSFWebsite.Api.Signalr/Hubs/Personnel/AccountHub.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.Primitives; using UKSFWebsite.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Services.Hubs { +namespace UKSFWebsite.Api.Signalr.Hubs.Personnel { [Authorize] public class AccountHub : Hub { public const string END_POINT = "account"; diff --git a/UKSFWebsite.Api.Services/Hubs/AdminHub.cs b/UKSFWebsite.Api.Signalr/Hubs/Utility/AdminHub.cs similarity index 82% rename from UKSFWebsite.Api.Services/Hubs/AdminHub.cs rename to UKSFWebsite.Api.Signalr/Hubs/Utility/AdminHub.cs index b91ef4f2..5573852f 100644 --- a/UKSFWebsite.Api.Services/Hubs/AdminHub.cs +++ b/UKSFWebsite.Api.Signalr/Hubs/Utility/AdminHub.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Services.Hubs { +namespace UKSFWebsite.Api.Signalr.Hubs.Utility { [Authorize] public class AdminHub : Hub { public const string END_POINT = "admin"; diff --git a/UKSFWebsite.Api.Services/Hubs/UtilityHub.cs b/UKSFWebsite.Api.Signalr/Hubs/Utility/UtilityHub.cs similarity index 79% rename from UKSFWebsite.Api.Services/Hubs/UtilityHub.cs rename to UKSFWebsite.Api.Signalr/Hubs/Utility/UtilityHub.cs index 827af913..e1ace4d0 100644 --- a/UKSFWebsite.Api.Services/Hubs/UtilityHub.cs +++ b/UKSFWebsite.Api.Signalr/Hubs/Utility/UtilityHub.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.SignalR; using UKSFWebsite.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Services.Hubs { +namespace UKSFWebsite.Api.Signalr.Hubs.Utility { public class UtilityHub : Hub { public const string END_POINT = "utility"; } diff --git a/UKSFWebsite.Api.Signalr/UKSFWebsite.Api.Signalr.csproj b/UKSFWebsite.Api.Signalr/UKSFWebsite.Api.Signalr.csproj new file mode 100644 index 00000000..53ad0172 --- /dev/null +++ b/UKSFWebsite.Api.Signalr/UKSFWebsite.Api.Signalr.csproj @@ -0,0 +1,24 @@ + + + + netcoreapp3.0 + + + + + C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\3.0.0\ref\netcoreapp3.0\Microsoft.AspNetCore.Authorization.dll + + + ..\UKSFWebsite.Api\bin\Debug\netcoreapp3.0\win7-x64\Microsoft.AspNetCore.SignalR.Core.dll + + + + + + + + + + + + diff --git a/UKSFWebsite.Api.SocketServer/Socket.cs b/UKSFWebsite.Api.SocketServer/Socket.cs deleted file mode 100644 index cc320d1d..00000000 --- a/UKSFWebsite.Api.SocketServer/Socket.cs +++ /dev/null @@ -1,133 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using UKSFWebsite.Api.Events.Data; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Interfaces.Integrations; -using UKSFWebsite.Api.Models.Events; -using UKSFWebsite.Api.Models.Integrations; -using Valve.Sockets; - -namespace UKSFWebsite.Api.SocketServer { - public class Socket : ISocket { - private readonly Dictionary clients = new Dictionary(); - private readonly IEventBus eventBus; - private NetworkingSockets server; - private uint socket; - - public Socket(ISocketEventBus eventBus) { - this.eventBus = eventBus; - Library.Initialize(); - } - - public void Start(string portString) { - if (server != null) return; - ushort port = ushort.Parse(portString); - Address address = new Address(); - address.SetAddress("::0", port); - server = new NetworkingSockets(); - socket = server.CreateListenSocket(ref address); - - server.DispatchCallback(StatusCallback); - server.ReceiveMessagesOnListenSocket(socket, ReceiveMessage, 20); - - Console.WriteLine($"Socket server running on port {port}"); - } - - public void Stop() { - Console.WriteLine("Socket server shutting down"); - server.CloseListenSocket(socket); - server = null; - Library.Deinitialize(); - } - - public void SendMessageToAllClients(string message) { - Task.Run(() => SendMessageToAllClientsAsync(message)); - } - - public void SendMessageToClient(string clientName, string message) { - Task.Run(() => SendMessageToClientAsync(clientName, message)); - } - - public void SendMessageToClient(string clientName, byte[] data) { - Task.Run(() => SendMessageToClientAsync(clientName, data)); - } - - public bool IsClientOnline(string clientName) { - uint client = GetClientByName(clientName); - return client != default; - } - - private void SendMessageToAllClientsAsync(string message) { - foreach (string client in clients.Values) { - SendMessageToClient(client, message); - } - } - - private void SendMessageToClientAsync(string clientName, string message) { - byte[] data = Encoding.UTF8.GetBytes(message); - uint client = GetClientByName(clientName); - server.SendMessageToConnection(client, data); - } - - private void SendMessageToClientAsync(string clientName, byte[] data) { - uint client = GetClientByName(clientName); - server.SendMessageToConnection(client, data); - } - - private uint GetClientByName(string clientName) { - return clients.FirstOrDefault(x => x.Value == clientName).Key; - } - - private string GetClientName(uint client) { - return clients.FirstOrDefault(x => x.Key == client).Value; - } - - private void StatusCallback(StatusInfo info, IntPtr context) { - switch (info.connectionInfo.state) { - case ConnectionState.NONE: break; - - case ConnectionState.CONNECTING: - server.AcceptConnection(info.connection); - break; - - case ConnectionState.CONNECTED: - clients.Add(info.connection, GetClientName(info.connection)); - Console.WriteLine($"Client connected - ID: {info.connection}, Name: {clients[info.connection]}"); - break; - - case ConnectionState.CLOSED_BY_PEER: - clients.Remove(info.connection); - server.CloseConnection(info.connection); - Console.WriteLine($"Client disconnected - ID: {info.connection}, Name: {clients[info.connection]}"); - break; - case ConnectionState.FINDING_ROUTE: break; - case ConnectionState.PROBLEM_DETECTED_LOCALLY: break; - default: throw new ArgumentOutOfRangeException(); - } - } - - private void ReceiveMessage(in NetworkingMessage message) { - Console.WriteLine($"Message received from - ID: {message.connection}, Channel ID: {message.channel}, Data length: {message.length}"); - byte[] buffer = new byte[message.length]; - message.CopyTo(buffer); - string messageString = Encoding.UTF8.GetString(buffer); - if (ResolveMessage(message.connection, messageString)) return; - eventBus.Send(EventModelFactory.CreateSocketEvent(GetClientName(message.connection), messageString)); - } - - private bool ResolveMessage(uint client, string messageString) { - if (!Enum.TryParse(messageString.Substring(0, 1), out SocketCommands command)) return false; - switch (command) { - case SocketCommands.NAME: - if (!clients.ContainsKey(client)) return true; - string newName = messageString.Substring(1); - clients[client] = newName; - return true; - default: return false; - } - } - } -} diff --git a/UKSFWebsite.Api.SocketServer/UKSFWebsite.Api.SocketServer.csproj b/UKSFWebsite.Api.SocketServer/UKSFWebsite.Api.SocketServer.csproj deleted file mode 100644 index 8af848f0..00000000 --- a/UKSFWebsite.Api.SocketServer/UKSFWebsite.Api.SocketServer.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - diff --git a/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs b/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs index 52f818f6..0897a399 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs @@ -6,7 +6,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; -using Newtonsoft.Json; using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Integrations; using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; @@ -16,7 +15,6 @@ using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Models.Integrations; using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Utility; @@ -151,12 +149,9 @@ public IActionResult GetRosterAccounts() { [HttpGet("online")] public IActionResult GetOnlineAccounts() { - string clientsString = teamspeakService.GetOnlineTeamspeakClients(); - if (string.IsNullOrEmpty(clientsString)) return Ok(); - JObject clientsObject = JObject.Parse(clientsString); - HashSet onlineClients = JsonConvert.DeserializeObject>(clientsObject["clients"].ToString()); + HashSet teamnspeakClients = teamspeakService.GetOnlineTeamspeakClients(); List allAccounts = accountService.Data().Get(); - var clients = onlineClients.Where(x => x != null).Select(x => new {account = allAccounts.FirstOrDefault(y => y.teamspeakIdentities != null && y.teamspeakIdentities.Any(z => z == x.clientDbId)), client = x}).ToList(); + var clients = teamnspeakClients.Where(x => x != null).Select(x => new {account = allAccounts.FirstOrDefault(y => y.teamspeakIdentities != null && y.teamspeakIdentities.Any(z => z.Equals(x.clientDbId))), client = x}).ToList(); var clientAccounts = clients.Where(x => x.account != null && x.account.membershipState == MembershipState.MEMBER).OrderBy(x => x.account.rank, new RankComparer(ranksService)).ThenBy(x => x.account.lastname).ThenBy(x => x.account.firstname); List commandAccounts = unitsService.GetAuxilliaryRoot().members; diff --git a/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs b/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs index 04a41847..817ac941 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs @@ -4,13 +4,13 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Integrations; using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Models.Personnel; using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Api.Controllers.Accounts { [Route("[controller]")] @@ -56,7 +56,7 @@ public async Task ReceiveCode([FromBody] JObject body) { private async Task SendTeamspeakCode(string teamspeakDbId) { string code = await confirmationCodeService.CreateConfirmationCode(teamspeakDbId); notificationsService.SendTeamspeakNotification( - new HashSet {teamspeakDbId}, + new HashSet {teamspeakDbId.ToDouble()}, $"This Teamspeak ID was selected for connection to the website. Copy this code to your clipboard and return to the UKSF website application page to enter the code:\n{code}\nIf this request was not made by you, please contact an admin" ); return Ok(); @@ -69,12 +69,12 @@ private async Task ReceiveTeamspeakCode(string id, string code, s return BadRequest(new {error = "The confirmation code has expired or is invalid. Please try again"}); } - if (account.teamspeakIdentities == null) account.teamspeakIdentities = new HashSet(); - account.teamspeakIdentities.Add(teamspeakId); + if (account.teamspeakIdentities == null) account.teamspeakIdentities = new HashSet(); + account.teamspeakIdentities.Add(double.Parse(teamspeakId)); await accountService.Data().Update(account.id, Builders.Update.Set("teamspeakIdentities", account.teamspeakIdentities)); account = accountService.Data().GetSingle(account.id); teamspeakService.UpdateAccountTeamspeakGroups(account); - notificationsService.SendTeamspeakNotification(new HashSet {teamspeakId}, $"This teamspeak identity has been linked to the account with email '{account.email}'\nIf this was not done by you, please contact an admin"); + notificationsService.SendTeamspeakNotification(new HashSet {teamspeakId.ToDouble()}, $"This teamspeak identity has been linked to the account with email '{account.email}'\nIf this was not done by you, please contact an admin"); LogWrapper.AuditLog(account.id, $"Teamspeak ID {teamspeakId} added for {account.id}"); return Ok(); } diff --git a/UKSFWebsite.Api/Controllers/GameServersController.cs b/UKSFWebsite.Api/Controllers/GameServersController.cs index 2df5d4d5..45cdff0d 100644 --- a/UKSFWebsite.Api/Controllers/GameServersController.cs +++ b/UKSFWebsite.Api/Controllers/GameServersController.cs @@ -15,10 +15,10 @@ using UKSFWebsite.Api.Models.Mission; using UKSFWebsite.Api.Services.Admin; using UKSFWebsite.Api.Services.Game; -using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Signalr.Hubs.Game; namespace UKSFWebsite.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.NCO, RoleDefinitions.SR5, RoleDefinitions.COMMAND)] diff --git a/UKSFWebsite.Api/Controllers/LauncherController.cs b/UKSFWebsite.Api/Controllers/LauncherController.cs index 367558cc..43405378 100644 --- a/UKSFWebsite.Api/Controllers/LauncherController.cs +++ b/UKSFWebsite.Api/Controllers/LauncherController.cs @@ -14,10 +14,9 @@ using UKSFWebsite.Api.Models.Launcher; using UKSFWebsite.Api.Models.Message.Logging; using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Personnel; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Signalr.Hubs.Integrations; namespace UKSFWebsite.Api.Controllers { [Route("[controller]"), Authorize, Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER)] diff --git a/UKSFWebsite.Api/Controllers/TeamspeakController.cs b/UKSFWebsite.Api/Controllers/TeamspeakController.cs index 19931bce..d71abb22 100644 --- a/UKSFWebsite.Api/Controllers/TeamspeakController.cs +++ b/UKSFWebsite.Api/Controllers/TeamspeakController.cs @@ -2,7 +2,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Interfaces.Integrations; using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Services.Personnel; diff --git a/UKSFWebsite.Api/Controllers/TestController.cs b/UKSFWebsite.Api/Controllers/TestController.cs new file mode 100644 index 00000000..7785225b --- /dev/null +++ b/UKSFWebsite.Api/Controllers/TestController.cs @@ -0,0 +1,20 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.SignalR; +using UKSFWebsite.Api.Interfaces.Hubs; +using UKSFWebsite.Api.Signalr.Hubs.Integrations; + +namespace UKSFWebsite.Api.Controllers { + [Route("[controller]")] + public class TestController : Controller { + private readonly IHubContext hub; + + public TestController(IHubContext hub) => this.hub = hub; + + [HttpGet] + public async Task Get() { +// await hub.Clients.All.Receive("TEST"); + return Ok(); + } + } +} diff --git a/UKSFWebsite.Api/Controllers/VariablesController.cs b/UKSFWebsite.Api/Controllers/VariablesController.cs index 87dfde06..89ffb00b 100644 --- a/UKSFWebsite.Api/Controllers/VariablesController.cs +++ b/UKSFWebsite.Api/Controllers/VariablesController.cs @@ -4,7 +4,6 @@ using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Models.Admin; -using UKSFWebsite.Api.Models.Utility; using UKSFWebsite.Api.Services.Message; using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Utility; diff --git a/UKSFWebsite.Api/Controllers/VersionController.cs b/UKSFWebsite.Api/Controllers/VersionController.cs index 9dcbdfb0..15210c54 100644 --- a/UKSFWebsite.Api/Controllers/VersionController.cs +++ b/UKSFWebsite.Api/Controllers/VersionController.cs @@ -6,8 +6,7 @@ using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Hubs; -using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Signalr.Hubs.Utility; namespace UKSFWebsite.Api.Controllers { [Route("[controller]")] diff --git a/UKSFWebsite.Api/Program.cs b/UKSFWebsite.Api/Program.cs index 3b5a7369..63ea4578 100644 --- a/UKSFWebsite.Api/Program.cs +++ b/UKSFWebsite.Api/Program.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.WindowsServices; using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; namespace UKSFWebsite.Api { public static class Program { @@ -30,7 +31,14 @@ public static void Main(string[] args) { } } - private static IWebHost BuildDebugWebHost(string[] args) => WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel().UseContentRoot(Directory.GetCurrentDirectory()).UseUrls("http://*:5000").UseIISIntegration().Build(); + private static IWebHost BuildDebugWebHost(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseStartup() + .UseKestrel() + .UseContentRoot(Directory.GetCurrentDirectory()) + .UseUrls("http://*:5000") + .UseIISIntegration() + .Build(); private static IWebHost BuildProductionWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 35862317..2415f06e 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Net; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication.JwtBearer; @@ -26,7 +27,7 @@ using UKSFWebsite.Api.Events; using UKSFWebsite.Api.Events.Data; using UKSFWebsite.Api.Events.Handlers; -using UKSFWebsite.Api.Events.SocketServer; +using UKSFWebsite.Api.Events.SignalrServer; using UKSFWebsite.Api.Interfaces.Command; using UKSFWebsite.Api.Interfaces.Data; using UKSFWebsite.Api.Interfaces.Data.Cached; @@ -47,7 +48,6 @@ using UKSFWebsite.Api.Services.Fake; using UKSFWebsite.Api.Services.Game; using UKSFWebsite.Api.Services.Game.Missions; -using UKSFWebsite.Api.Services.Hubs; using UKSFWebsite.Api.Services.Integrations; using UKSFWebsite.Api.Services.Integrations.Teamspeak; using UKSFWebsite.Api.Services.Launcher; @@ -56,7 +56,12 @@ using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Units; using UKSFWebsite.Api.Services.Utility; -using UKSFWebsite.Api.SocketServer; +using UKSFWebsite.Api.Signalr.Hubs.Command; +using UKSFWebsite.Api.Signalr.Hubs.Game; +using UKSFWebsite.Api.Signalr.Hubs.Integrations; +using UKSFWebsite.Api.Signalr.Hubs.Message; +using UKSFWebsite.Api.Signalr.Hubs.Personnel; +using UKSFWebsite.Api.Signalr.Hubs.Utility; namespace UKSFWebsite.Api { public class Startup { @@ -103,7 +108,6 @@ public void ConfigureServices(IServiceCollection services) { options.Events = new JwtBearerEvents { OnMessageReceived = context => { StringValues accessToken = context.Request.Query["access_token"]; - if (!string.IsNullOrEmpty(accessToken) && context.Request.Path.StartsWithSegments("/hub")) { context.Token = accessToken; } @@ -137,6 +141,7 @@ public void Configure(IApplicationBuilder app) { endpoints.MapHub($"/hub/{CommandRequestsHub.END_POINT}"); endpoints.MapHub($"/hub/{CommentThreadHub.END_POINT}"); endpoints.MapHub($"/hub/{NotificationHub.END_POINT}"); + endpoints.MapHub($"/hub/{TeamspeakHub.END_POINT}").RequireHost("localhost"); endpoints.MapHub($"/hub/{TeamspeakClientsHub.END_POINT}"); endpoints.MapHub($"/hub/{UtilityHub.END_POINT}"); endpoints.MapHub($"/hub/{ServersHub.END_POINT}"); @@ -158,10 +163,7 @@ public void Configure(IApplicationBuilder app) { // Add event handlers Global.ServiceProvider.GetService().InitEventHandlers(); - - // Start socket server - Global.ServiceProvider.GetService().Start(configuration["socketPort"]); - + // Start teamspeak manager Global.ServiceProvider.GetService().Start(); @@ -176,7 +178,7 @@ private static void WarmDataServices() { DataCacheService dataCacheService = Global.ServiceProvider.GetService(); List servicesTypes = AppDomain.CurrentDomain.GetAssemblies() .SelectMany(x => x.GetTypes()) - .Where(x => !x.IsAbstract && !x.IsInterface && x.BaseType != null && x.BaseType.IsGenericType && x.BaseType.GetGenericTypeDefinition() == typeof(CachedDataService<>)) + .Where(x => !x.IsAbstract && !x.IsInterface && x.BaseType != null && x.BaseType.IsGenericType && x.BaseType.GetGenericTypeDefinition() == typeof(CachedDataService<,>)) .Select(x => x.GetInterfaces().Reverse().FirstOrDefault(y => !y.IsGenericType)) .ToList(); foreach (object service in servicesTypes.Select(type => Global.ServiceProvider.GetService(type))) { @@ -221,23 +223,36 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); if (currentEnvironment.IsDevelopment()) { + services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); } else { + services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); } } private static void RegisterEventServices(this IServiceCollection services) { // Event Buses - services.AddTransient(); - services.AddTransient(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton(); // Event Handlers services.AddSingleton(); @@ -269,7 +284,7 @@ private static void RegisterDataServices(this IServiceCollection services, IHost services.AddSingleton(); services.AddSingleton(); - if (currentEnvironment.IsDevelopment()) { + if (!currentEnvironment.IsDevelopment()) { services.AddSingleton(); } else { services.AddSingleton(); @@ -295,7 +310,7 @@ private static void RegisterDataBackedServices(this IServiceCollection services, services.AddTransient(); services.AddTransient(); - if (currentEnvironment.IsDevelopment()) { + if (!currentEnvironment.IsDevelopment()) { services.AddTransient(); } else { services.AddTransient(); @@ -324,6 +339,26 @@ public static class CorsMiddlewareExtensions { // ReSharper disable once UnusedMethodReturnValue.Global public static IApplicationBuilder UseCorsMiddleware(this IApplicationBuilder builder) => builder.UseMiddleware(); } + + public static class HttpRequestExtensions { + public static bool IsLocal(this HttpRequest req) { + ConnectionInfo connection = req.HttpContext.Connection; + if (connection.RemoteIpAddress != null) { + if (connection.LocalIpAddress != null) { + return connection.RemoteIpAddress.Equals(connection.LocalIpAddress); + } + + return IPAddress.IsLoopback(connection.RemoteIpAddress); + } + + // for in memory TestServer or when dealing with default connection info + if (connection.RemoteIpAddress == null && connection.LocalIpAddress == null) { + return true; + } + + return false; + } + } } // Request Singletons diff --git a/UKSFWebsite.Backend.sln b/UKSFWebsite.Backend.sln index 93ecf897..87bfe351 100644 --- a/UKSFWebsite.Backend.sln +++ b/UKSFWebsite.Backend.sln @@ -22,9 +22,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Interfaces" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Events", "UKSFWebsite.Api.Events\UKSFWebsite.Api.Events.csproj", "{F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ValveSockets", "ValveSockets\ValveSockets.csproj", "{CA5236BD-918C-4F0C-8F3C-2673E917B477}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.SocketServer", "UKSFWebsite.Api.SocketServer\UKSFWebsite.Api.SocketServer.csproj", "{E1B8AC5C-B229-4B5A-9A06-21ABC3226594}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Signalr", "UKSFWebsite.Api.Signalr\UKSFWebsite.Api.Signalr.csproj", "{6F9B12CA-26BE-45D2-B520-A032490A53F0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -120,30 +118,18 @@ Global {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x64.Build.0 = Release|Any CPU {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x86.ActiveCfg = Release|Any CPU {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x86.Build.0 = Release|Any CPU - {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Debug|x64.ActiveCfg = Debug|Any CPU - {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Debug|x64.Build.0 = Debug|Any CPU - {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Debug|x86.ActiveCfg = Debug|Any CPU - {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Debug|x86.Build.0 = Debug|Any CPU - {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Release|Any CPU.Build.0 = Release|Any CPU - {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Release|x64.ActiveCfg = Release|Any CPU - {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Release|x64.Build.0 = Release|Any CPU - {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Release|x86.ActiveCfg = Release|Any CPU - {CA5236BD-918C-4F0C-8F3C-2673E917B477}.Release|x86.Build.0 = Release|Any CPU - {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Debug|x64.ActiveCfg = Debug|Any CPU - {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Debug|x64.Build.0 = Debug|Any CPU - {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Debug|x86.ActiveCfg = Debug|Any CPU - {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Debug|x86.Build.0 = Debug|Any CPU - {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Release|Any CPU.Build.0 = Release|Any CPU - {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Release|x64.ActiveCfg = Release|Any CPU - {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Release|x64.Build.0 = Release|Any CPU - {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Release|x86.ActiveCfg = Release|Any CPU - {E1B8AC5C-B229-4B5A-9A06-21ABC3226594}.Release|x86.Build.0 = Release|Any CPU + {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|x64.ActiveCfg = Debug|Any CPU + {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|x64.Build.0 = Debug|Any CPU + {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|x86.ActiveCfg = Debug|Any CPU + {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|x86.Build.0 = Debug|Any CPU + {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|Any CPU.Build.0 = Release|Any CPU + {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x64.ActiveCfg = Release|Any CPU + {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x64.Build.0 = Release|Any CPU + {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x86.ActiveCfg = Release|Any CPU + {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UKSFWebsite.Integrations/Controllers/DiscordController.cs b/UKSFWebsite.Integrations/Controllers/DiscordController.cs index e4eff87a..3fe7362b 100644 --- a/UKSFWebsite.Integrations/Controllers/DiscordController.cs +++ b/UKSFWebsite.Integrations/Controllers/DiscordController.cs @@ -10,7 +10,6 @@ using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Integrations.Controllers { [Route("[controller]")] diff --git a/UKSFWebsite.Integrations/Startup.cs b/UKSFWebsite.Integrations/Startup.cs index dce54072..ba1c4baf 100644 --- a/UKSFWebsite.Integrations/Startup.cs +++ b/UKSFWebsite.Integrations/Startup.cs @@ -59,7 +59,6 @@ public static IServiceCollection RegisterServices(this IServiceCollection servic // Instance Objects services.AddTransient(); services.AddTransient(); - services.AddTransient, DataEventBus>(); // Global Singletons services.AddSingleton(configuration); @@ -68,6 +67,11 @@ public static IServiceCollection RegisterServices(this IServiceCollection servic services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + + // Event Buses + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); return services; } diff --git a/ValveSockets/ValveSockets.cs b/ValveSockets/ValveSockets.cs deleted file mode 100644 index 2059c80a..00000000 --- a/ValveSockets/ValveSockets.cs +++ /dev/null @@ -1,758 +0,0 @@ -// ReSharper disable All -/* - * Managed C# wrapper for GameNetworkingSockets library by Valve Software - * Copyright (c) 2018 Stanislav Denisov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#define VALVESOCKETS_SPAN - -using System; -using System.Net; -using System.Net.Sockets; -using System.Runtime.InteropServices; -using System.Security; -using System.Text; - -namespace Valve.Sockets { - using ListenSocket = UInt32; - using Connection = UInt32; - using Microseconds = Int64; - - [Flags] - public enum SendType { - UNRELIABLE = 0, - NO_NAGLE = 1, - NO_DELAY = 1 << 2, - RELIABLE = 1 << 3 - } - - public enum IdentityType { - INVALID = 0, - IP_ADDRESS = 1, - GENERIC_STRING = 2, - GENERIC_BYTES = 3, - STEAM_ID = 16 - } - - public enum ConnectionState { - NONE = 0, - CONNECTING = 1, - FINDING_ROUTE = 2, - CONNECTED = 3, - CLOSED_BY_PEER = 4, - PROBLEM_DETECTED_LOCALLY = 5 - } - - public enum ConfigurationScope { - GLOBAL = 1, - SOCKETS_INTERFACE = 2, - LISTEN_SOCKET = 3, - CONNECTION = 4 - } - - public enum ConfigurationDataType { - INT32 = 1, - INT64 = 2, - FLOAT = 3, - STRING = 4, - FUNCTION_PTR = 5 - } - - public enum ConfigurationValue { - INVALID = 0, - FAKE_PACKET_LOSS_SEND = 2, - FAKE_PACKET_LOSS_RECV = 3, - FAKE_PACKET_LAG_SEND = 4, - FAKE_PACKET_LAG_RECV = 5, - FAKE_PACKET_REORDER_SEND = 6, - FAKE_PACKET_REORDER_RECV = 7, - FAKE_PACKET_REORDER_TIME = 8, - FAKE_PACKET_DUP_SEND = 26, - FAKE_PACKET_DUP_RECV = 27, - FAKE_PACKET_DUP_TIME_MAX = 28, - TIMEOUT_INITIAL = 24, - TIMEOUT_CONNECTED = 25, - SEND_BUFFER_SIZE = 9, - SEND_RATE_MIN = 10, - SEND_RATE_MAX = 11, - NAGLE_TIME = 12, - IP_ALLOW_WITHOUT_AUTH = 23, - SDR_CLIENT_CONSECUTITIVE_PING_TIMEOUTS_FAIL_INITIAL = 19, - SDR_CLIENT_CONSECUTITIVE_PING_TIMEOUTS_FAIL = 20, - SDR_CLIENT_MIN_PINGS_BEFORE_PING_ACCURATE = 21, - SDR_CLIENT_SINGLE_SOCKET = 22, - SDR_CLIENT_FORCE_RELAY_CLUSTER = 29, - SDR_CLIENT_DEBUG_TICKET_ADDRESS = 30, - SDR_CLIENT_FORCE_PROXY_ADDR = 31, - LOG_LEVEL_ACK_RTT = 13, - LOG_LEVEL_PACKET_DECODE = 14, - LOG_LEVEL_MESSAGE = 15, - LOG_LEVEL_PACKET_GAPS = 16, - LOG_LEVEL_P2_P_RENDEZVOUS = 17, - LOG_LEVEL_SDR_RELAY_PINGS = 18 - } - - public enum ConfigurationValueResult { - BAD_VALUE = -1, - BAD_SCOPE_OBJECT = -2, - BUFFER_TOO_SMALL = -3, - OK = 1, - OK_INHERITED = 2 - } - - public enum DebugType { - NONE = 0, - BUG = 1, - ERROR = 2, - IMPORTANT = 3, - WARNING = 4, - MESSAGE = 5, - VERBOSE = 6, - DEBUG = 7, - EVERYTHING = 8 - } - - public enum Result { - OK = 1, - FAIL = 2, - NO_CONNECTION = 3, - INVALID_PASSWORD = 5, - LOGGED_IN_ELSEWHERE = 6, - INVALID_PROTOCOL_VER = 7, - INVALID_PARAM = 8, - FILE_NOT_FOUND = 9, - BUSY = 10, - INVALID_STATE = 11, - INVALID_NAME = 12, - INVALID_EMAIL = 13, - DUPLICATE_NAME = 14, - ACCESS_DENIED = 15, - TIMEOUT = 16, - BANNED = 17, - ACCOUNT_NOT_FOUND = 18, - INVALID_STEAM_ID = 19, - SERVICE_UNAVAILABLE = 20, - NOT_LOGGED_ON = 21, - PENDING = 22, - ENCRYPTION_FAILURE = 23, - INSUFFICIENT_PRIVILEGE = 24, - LIMIT_EXCEEDED = 25, - REVOKED = 26, - EXPIRED = 27, - ALREADY_REDEEMED = 28, - DUPLICATE_REQUEST = 29, - ALREADY_OWNED = 30, - IP_NOT_FOUND = 31, - PERSIST_FAILED = 32, - LOCKING_FAILED = 33, - LOGON_SESSION_REPLACED = 34, - CONNECT_FAILED = 35, - HANDSHAKE_FAILED = 36, - IO_FAILURE = 37, - REMOTE_DISCONNECT = 38, - SHOPPING_CART_NOT_FOUND = 39, - BLOCKED = 40, - IGNORED = 41, - NO_MATCH = 42, - ACCOUNT_DISABLED = 43, - SERVICE_READ_ONLY = 44, - ACCOUNT_NOT_FEATURED = 45, - ADMINISTRATOR_OK = 46, - CONTENT_VERSION = 47, - TRY_ANOTHER_CM = 48, - PASSWORD_REQUIRED_TO_KICK_SESSION = 49, - ALREADY_LOGGED_IN_ELSEWHERE = 50, - SUSPENDED = 51, - CANCELLED = 52, - DATA_CORRUPTION = 53, - DISK_FULL = 54, - REMOTE_CALL_FAILED = 55, - PASSWORD_UNSET = 56, - EXTERNAL_ACCOUNT_UNLINKED = 57, - PSN_TICKET_INVALID = 58, - EXTERNAL_ACCOUNT_ALREADY_LINKED = 59, - REMOTE_FILE_CONFLICT = 60, - ILLEGAL_PASSWORD = 61, - SAME_AS_PREVIOUS_VALUE = 62, - ACCOUNT_LOGON_DENIED = 63, - CANNOT_USE_OLD_PASSWORD = 64, - INVALID_LOGIN_AUTH_CODE = 65, - ACCOUNT_LOGON_DENIED_NO_MAIL = 66, - HARDWARE_NOT_CAPABLE_OF_IPT = 67, - IPT_INIT_ERROR = 68, - PARENTAL_CONTROL_RESTRICTED = 69, - FACEBOOK_QUERY_ERROR = 70, - EXPIRED_LOGIN_AUTH_CODE = 71, - IP_LOGIN_RESTRICTION_FAILED = 72, - ACCOUNT_LOCKED_DOWN = 73, - ACCOUNT_LOGON_DENIED_VERIFIED_EMAIL_REQUIRED = 74, - NO_MATCHING_URL = 75, - BAD_RESPONSE = 76, - REQUIRE_PASSWORD_RE_ENTRY = 77, - VALUE_OUT_OF_RANGE = 78, - UNEXPECTED_ERROR = 79, - DISABLED = 80, - INVALID_CEG_SUBMISSION = 81, - RESTRICTED_DEVICE = 82, - REGION_LOCKED = 83, - RATE_LIMIT_EXCEEDED = 84, - ACCOUNT_LOGIN_DENIED_NEED_TWO_FACTOR = 85, - ITEM_DELETED = 86, - ACCOUNT_LOGIN_DENIED_THROTTLE = 87, - TWO_FACTOR_CODE_MISMATCH = 88, - TWO_FACTOR_ACTIVATION_CODE_MISMATCH = 89, - ACCOUNT_ASSOCIATED_TO_MULTIPLE_PARTNERS = 90, - NOT_MODIFIED = 91, - NO_MOBILE_DEVICE = 92, - TIME_NOT_SYNCED = 93, - SMS_CODE_FAILED = 94, - ACCOUNT_LIMIT_EXCEEDED = 95, - ACCOUNT_ACTIVITY_LIMIT_EXCEEDED = 96, - PHONE_ACTIVITY_LIMIT_EXCEEDED = 97, - REFUND_TO_WALLET = 98, - EMAIL_SEND_FAILURE = 99, - NOT_SETTLED = 100, - NEED_CAPTCHA = 101, - GSLT_DENIED = 102, - GS_OWNER_DENIED = 103, - INVALID_ITEM_TYPE = 104, - IP_BANNED = 105, - GSLT_EXPIRED = 106, - INSUFFICIENT_FUNDS = 107, - TOO_MANY_PENDING = 108, - NO_SITE_LICENSES_FOUND = 109, - WG_NETWORK_SEND_EXCEEDED = 110 - } - - [StructLayout(LayoutKind.Sequential)] - public struct Address { - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)] public byte[] ip; - - public ushort port; - - public bool IsLocalHost => Native.SteamAPI_SteamNetworkingIPAddr_IsLocalHost(ref this); - - public string GetIp() => ip.ParseIp(); - - public void SetLocalHost(ushort port) { - Native.SteamAPI_SteamNetworkingIPAddr_SetIPv6LocalHost(ref this, port); - } - - public void SetAddress(string ip, ushort port) { - if (!ip.Contains(":")) { - Native.SteamAPI_SteamNetworkingIPAddr_SetIPv4(ref this, ip.ParseIPv4(), port); - } else { - Native.SteamAPI_SteamNetworkingIPAddr_SetIPv6(ref this, ip.ParseIPv6(), port); - } - } - } - - [StructLayout(LayoutKind.Sequential)] - public struct StatusInfo { - private const int CALLBACK = Library.SOCKETS_CALLBACKS + 1; - public uint connection; - public ConnectionInfo connectionInfo; - private readonly int socketState; - } - - [StructLayout(LayoutKind.Sequential)] - public struct ConnectionInfo { - public NetworkingIdentity identity; - public long userData; - public uint listenSocket; - public Address address; - private readonly ushort pad; - private readonly uint popRemote; - private readonly uint popRelay; - public ConnectionState state; - public int endReason; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] public string endDebug; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] public string connectionDescription; - } - - [StructLayout(LayoutKind.Sequential)] - public struct ConnectionStatus { - public ConnectionState state; - public int ping; - public float connectionQualityLocal; - public float connectionQualityRemote; - public float outPacketsPerSecond; - public float outBytesPerSecond; - public float inPacketsPerSecond; - public float inBytesPerSecond; - public int sendRateBytesPerSecond; - public int pendingUnreliable; - public int pendingReliable; - public int sentUnackedReliable; - public long queueTime; - } - - [StructLayout(LayoutKind.Explicit, Size = 136)] - public struct NetworkingIdentity { - [FieldOffset(0)] public IdentityType type; - - public bool IsInvalid => Native.SteamAPI_SteamNetworkingIdentity_IsInvalid(ref this); - - public ulong GetSteamId() => Native.SteamAPI_SteamNetworkingIdentity_GetSteamID64(ref this); - - public void SetSteamId(ulong steamId) { - Native.SteamAPI_SteamNetworkingIdentity_SetSteamID64(ref this, steamId); - } - - public bool EqualsTo(ref NetworkingIdentity identity) => Native.SteamAPI_SteamNetworkingIdentity_EqualTo(ref this, ref identity); - } - - [StructLayout(LayoutKind.Sequential)] - public struct NetworkingMessage { - public IntPtr data; - public int length; - public uint connection; - public NetworkingIdentity identity; - public long userData; - public long timeReceived; - public long messageNumber; - internal IntPtr release; - public int channel; - private readonly int pad; - - public readonly void CopyTo(byte[] destination) { - if (destination == null) { - throw new ArgumentNullException("destination"); - } - - Marshal.Copy(data, destination, 0, length); - } - -#if !VALVESOCKETS_SPAN - public void Destroy() { - if (release == IntPtr.Zero) { - throw new InvalidOperationException("Message not created"); - } - - Native.SteamAPI_SteamNetworkingMessage_t_Release(release); - } -#endif - } - - public delegate void StatusCallback(StatusInfo info, IntPtr context); - - public delegate void DebugCallback(DebugType type, string message); - -#if VALVESOCKETS_SPAN - public delegate void MessageCallback(in NetworkingMessage message); -#endif - - internal static class ArrayPool { - [ThreadStatic] private static IntPtr[] pointerBuffer; - - public static IntPtr[] GetPointerBuffer() { - if (pointerBuffer == null) { - pointerBuffer = new IntPtr[Library.MAX_MESSAGES_PER_BATCH]; - } - - return pointerBuffer; - } - } - - public class NetworkingSockets { - private readonly IntPtr _nativeSockets; - private readonly int _nativeMessageSize = Marshal.SizeOf(typeof(NetworkingMessage)); - - public NetworkingSockets() { - _nativeSockets = Native.SteamNetworkingSockets(); - - if (_nativeSockets == IntPtr.Zero) { - throw new InvalidOperationException("Networking sockets not created"); - } - } - - public uint CreateListenSocket(ref Address address) => Native.SteamAPI_ISteamNetworkingSockets_CreateListenSocketIP(_nativeSockets, ref address); - - public uint Connect(ref Address address) => Native.SteamAPI_ISteamNetworkingSockets_ConnectByIPAddress(_nativeSockets, ref address); - - public Result AcceptConnection(uint connection) => Native.SteamAPI_ISteamNetworkingSockets_AcceptConnection(_nativeSockets, connection); - - public bool CloseConnection(uint connection) => CloseConnection(connection, 0, string.Empty, false); - - public bool CloseConnection(uint connection, int reason, string debug, bool enableLinger) { - if (reason > Library.MAX_CLOSE_REASON_VALUE) { - throw new ArgumentOutOfRangeException("reason"); - } - - if (debug.Length > Library.MAX_CLOSE_MESSAGE_LENGTH) { - throw new ArgumentOutOfRangeException("debug"); - } - - return Native.SteamAPI_ISteamNetworkingSockets_CloseConnection(_nativeSockets, connection, reason, debug, enableLinger); - } - - public bool CloseListenSocket(uint socket) => Native.SteamAPI_ISteamNetworkingSockets_CloseListenSocket(_nativeSockets, socket); - - public bool SetConnectionUserData(uint peer, long userData) => Native.SteamAPI_ISteamNetworkingSockets_SetConnectionUserData(_nativeSockets, peer, userData); - - public long GetConnectionUserData(uint peer) => Native.SteamAPI_ISteamNetworkingSockets_GetConnectionUserData(_nativeSockets, peer); - - public void SetConnectionName(uint peer, string name) { - Native.SteamAPI_ISteamNetworkingSockets_SetConnectionName(_nativeSockets, peer, name); - } - - public bool GetConnectionName(uint peer, StringBuilder name, int maxLength) => Native.SteamAPI_ISteamNetworkingSockets_GetConnectionName(_nativeSockets, peer, name, maxLength); - - public Result SendMessageToConnection(uint connection, IntPtr data, uint length) => SendMessageToConnection(connection, data, length, SendType.UNRELIABLE); - - public Result SendMessageToConnection(uint connection, IntPtr data, uint length, SendType flags) => SendMessageToConnection(connection, data, length, flags); - - public Result SendMessageToConnection(uint connection, IntPtr data, int length, SendType flags) => Native.SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(_nativeSockets, connection, data, (uint) length, flags); - - public Result SendMessageToConnection(uint connection, byte[] data) => SendMessageToConnection(connection, data, data.Length, SendType.UNRELIABLE); - - public Result SendMessageToConnection(uint connection, byte[] data, SendType flags) => SendMessageToConnection(connection, data, data.Length, flags); - - public Result SendMessageToConnection(uint connection, byte[] data, int length, SendType flags) => Native.SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(_nativeSockets, connection, data, (uint) length, flags); - - public Result FlushMessagesOnConnection(uint connection) => Native.SteamAPI_ISteamNetworkingSockets_FlushMessagesOnConnection(_nativeSockets, connection); - -#if VALVESOCKETS_SPAN -#if VALVESOCKETS_INLINING - [MethodImpl(256)] -#endif - public void ReceiveMessagesOnConnection(Connection connection, MessageCallback callback, int maxMessages) { - if (maxMessages > Library.MAX_MESSAGES_PER_BATCH) throw new ArgumentOutOfRangeException("maxMessages"); - - IntPtr[] nativeMessages = ArrayPool.GetPointerBuffer(); - int messagesCount = Native.SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnConnection(_nativeSockets, connection, nativeMessages, maxMessages); - - for (int i = 0; i < messagesCount; i++) { - Span message; - - unsafe { - message = new Span((void*) nativeMessages[i], 1); - } - - callback(in message[0]); - - Native.SteamAPI_SteamNetworkingMessage_t_Release(nativeMessages[i]); - } - } - -#if VALVESOCKETS_INLINING - [MethodImpl(256)] -#endif - public void ReceiveMessagesOnListenSocket(ListenSocket socket, MessageCallback callback, int maxMessages) { - if (maxMessages > Library.MAX_MESSAGES_PER_BATCH) throw new ArgumentOutOfRangeException("maxMessages"); - - IntPtr[] nativeMessages = ArrayPool.GetPointerBuffer(); - int messagesCount = Native.SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnListenSocket(_nativeSockets, socket, nativeMessages, maxMessages); - - for (int i = 0; i < messagesCount; i++) { - Span message; - - unsafe { - message = new Span((void*) nativeMessages[i], 1); - } - - callback(in message[0]); - - Native.SteamAPI_SteamNetworkingMessage_t_Release(nativeMessages[i]); - } - } -#else -#if VALVESOCKETS_INLINING - [MethodImpl(256)] -#endif - public int ReceiveMessagesOnConnection(uint connection, NetworkingMessage[] messages, int maxMessages) { - if (maxMessages > Library.MAX_MESSAGES_PER_BATCH) { - throw new ArgumentOutOfRangeException("maxMessages"); - } - - IntPtr[] nativeMessages = ArrayPool.GetPointerBuffer(); - int messagesCount = Native.SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnConnection(_nativeSockets, connection, nativeMessages, maxMessages); - - for (int i = 0; i < messagesCount; i++) { - messages[i] = (NetworkingMessage) Marshal.PtrToStructure(nativeMessages[i], typeof(NetworkingMessage)); - messages[i].release = nativeMessages[i]; - } - - return messagesCount; - } - -#if VALVESOCKETS_INLINING - [MethodImpl(256)] -#endif - public int ReceiveMessagesOnListenSocket(uint socket, NetworkingMessage[] messages, int maxMessages) { - if (maxMessages > Library.MAX_MESSAGES_PER_BATCH) { - throw new ArgumentOutOfRangeException("maxMessages"); - } - - IntPtr[] nativeMessages = ArrayPool.GetPointerBuffer(); - int messagesCount = Native.SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnListenSocket(_nativeSockets, socket, nativeMessages, maxMessages); - - for (int i = 0; i < messagesCount; i++) { - messages[i] = (NetworkingMessage) Marshal.PtrToStructure(nativeMessages[i], typeof(NetworkingMessage)); - messages[i].release = nativeMessages[i]; - } - - return messagesCount; - } -#endif - - public bool GetConnectionInfo(uint connection, ref ConnectionInfo info) => Native.SteamAPI_ISteamNetworkingSockets_GetConnectionInfo(_nativeSockets, connection, ref info); - - public bool GetQuickConnectionStatus(uint connection, ConnectionStatus status) => Native.SteamAPI_ISteamNetworkingSockets_GetQuickConnectionStatus(_nativeSockets, connection, status); - - public int GetDetailedConnectionStatus(uint connection, StringBuilder status, int statusLength) => Native.SteamAPI_ISteamNetworkingSockets_GetDetailedConnectionStatus(_nativeSockets, connection, status, statusLength); - - public bool GetListenSocketAddress(uint socket, ref Address address) => Native.SteamAPI_ISteamNetworkingSockets_GetListenSocketAddress(_nativeSockets, socket, ref address); - - public bool CreateSocketPair(uint connectionOne, uint connectionTwo, bool useNetworkLoopback, NetworkingIdentity identityOne, NetworkingIdentity identityTwo) => - Native.SteamAPI_ISteamNetworkingSockets_CreateSocketPair(_nativeSockets, connectionOne, connectionTwo, useNetworkLoopback, identityOne, identityTwo); - - public void DispatchCallback(StatusCallback callback) { - DispatchCallback(callback, IntPtr.Zero); - } - - public void DispatchCallback(StatusCallback callback, IntPtr context) { - Native.SteamAPI_ISteamNetworkingSockets_RunConnectionStatusChangedCallbacks(_nativeSockets, callback, context); - } - } - - public class NetworkingUtils { - private readonly IntPtr _nativeUtils; - - public NetworkingUtils() { - _nativeUtils = Native.SteamNetworkingUtils(); - - if (_nativeUtils == IntPtr.Zero) { - throw new InvalidOperationException("Networking utils not created"); - } - } - - public ConfigurationValue FirstConfigurationValue => Native.SteamAPI_ISteamNetworkingUtils_GetFirstConfigValue(_nativeUtils); - - public long Time => Native.SteamAPI_ISteamNetworkingUtils_GetLocalTimestamp(_nativeUtils); - - public void SetDebugCallback(DebugType detailLevel, DebugCallback callback) { - Native.SteamAPI_ISteamNetworkingUtils_SetDebugOutputFunction(_nativeUtils, detailLevel, callback); - } - - public bool SetConfiguratioValue(ConfigurationValue configurationValue, ConfigurationScope configurationScope, IntPtr scopeObject, ConfigurationDataType dataType, IntPtr value) => - Native.SteamAPI_ISteamNetworkingUtils_SetConfigValue(_nativeUtils, configurationValue, configurationScope, scopeObject, dataType, value); - - public ConfigurationValueResult GetConfigurationValue(ConfigurationValue configurationValue, ConfigurationScope configurationScope, IntPtr scopeObject, out ConfigurationDataType dataType, out IntPtr result, out IntPtr resultLength) => - Native.SteamAPI_ISteamNetworkingUtils_GetConfigValue(_nativeUtils, configurationValue, configurationScope, scopeObject, out dataType, out result, out resultLength); - } - - public static class Extensions { - public static uint ParseIPv4(this string ip) { - IPAddress address = default; - - if (IPAddress.TryParse(ip, out address)) { - if (address.AddressFamily != AddressFamily.InterNetwork) { - throw new Exception("Incorrect format of an IPv4 address"); - } - } - - byte[] bytes = address.GetAddressBytes(); - - Array.Reverse(bytes); - - return BitConverter.ToUInt32(bytes, 0); - } - - public static byte[] ParseIPv6(this string ip) { - IPAddress address = default; - - if (IPAddress.TryParse(ip, out address)) { - if (address.AddressFamily != AddressFamily.InterNetworkV6) { - throw new Exception("Incorrect format of an IPv6 address"); - } - } - - return address.GetAddressBytes(); - } - - public static string ParseIp(this byte[] ip) { - IPAddress address = new IPAddress(ip); - string converted = address.ToString(); - - if (converted.Length > 7 && converted.Remove(7) == "::ffff:") { - Address ipv4 = default; - - ipv4.ip = ip; - - byte[] bytes = BitConverter.GetBytes(Native.SteamAPI_SteamNetworkingIPAddr_GetIPv4(ref ipv4)); - - Array.Reverse(bytes); - - address = new IPAddress(bytes); - } - - return address.ToString(); - } - } - - public static class Library { - public const int MAX_CLOSE_MESSAGE_LENGTH = 128; - public const int MAX_CLOSE_REASON_VALUE = 999; - public const int MAX_ERROR_MESSAGE_LENGTH = 1024; - public const int MAX_MESSAGE_SIZE = 512 * 1024; - public const int MAX_MESSAGES_PER_BATCH = 256; - public const int SOCKETS_CALLBACKS = 1220; - - public static bool Initialize() => Initialize(null); - - public static bool Initialize(StringBuilder errorMessage) { - if (errorMessage != null && errorMessage.Capacity != MAX_ERROR_MESSAGE_LENGTH) { - throw new ArgumentOutOfRangeException("Capacity of the error message must be equal to " + MAX_ERROR_MESSAGE_LENGTH); - } - - return Native.GameNetworkingSockets_Init(IntPtr.Zero, errorMessage); - } - - public static void Deinitialize() { - Native.GameNetworkingSockets_Kill(); - } - } - - [SuppressUnmanagedCodeSecurity] - internal static class Native { - private const string NATIVE_LIBRARY = "GameNetworkingSockets"; - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern bool GameNetworkingSockets_Init(IntPtr identity, StringBuilder errorMessage); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern void GameNetworkingSockets_Kill(); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern IntPtr SteamNetworkingSockets(); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern IntPtr SteamNetworkingUtils(); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern uint SteamAPI_ISteamNetworkingSockets_CreateListenSocketIP(IntPtr sockets, ref Address address); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern uint SteamAPI_ISteamNetworkingSockets_ConnectByIPAddress(IntPtr sockets, ref Address address); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern Result SteamAPI_ISteamNetworkingSockets_AcceptConnection(IntPtr sockets, uint connection); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern bool SteamAPI_ISteamNetworkingSockets_CloseConnection(IntPtr sockets, uint peer, int reason, string debug, bool enableLinger); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern bool SteamAPI_ISteamNetworkingSockets_CloseListenSocket(IntPtr sockets, uint socket); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern bool SteamAPI_ISteamNetworkingSockets_SetConnectionUserData(IntPtr sockets, uint peer, long userData); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern long SteamAPI_ISteamNetworkingSockets_GetConnectionUserData(IntPtr sockets, uint peer); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern void SteamAPI_ISteamNetworkingSockets_SetConnectionName(IntPtr sockets, uint peer, string name); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern bool SteamAPI_ISteamNetworkingSockets_GetConnectionName(IntPtr sockets, uint peer, StringBuilder name, int maxLength); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern Result SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(IntPtr sockets, uint connection, IntPtr data, uint length, SendType flags); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern Result SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(IntPtr sockets, uint connection, byte[] data, uint length, SendType flags); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern Result SteamAPI_ISteamNetworkingSockets_FlushMessagesOnConnection(IntPtr sockets, uint connection); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern int SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnConnection(IntPtr sockets, uint connection, IntPtr[] messages, int maxMessages); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern int SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnListenSocket(IntPtr sockets, uint socket, IntPtr[] messages, int maxMessages); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern bool SteamAPI_ISteamNetworkingSockets_GetConnectionInfo(IntPtr sockets, uint connection, ref ConnectionInfo info); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern bool SteamAPI_ISteamNetworkingSockets_GetQuickConnectionStatus(IntPtr sockets, uint connection, ConnectionStatus status); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern int SteamAPI_ISteamNetworkingSockets_GetDetailedConnectionStatus(IntPtr sockets, uint connection, StringBuilder status, int statusLength); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern bool SteamAPI_ISteamNetworkingSockets_GetListenSocketAddress(IntPtr sockets, uint socket, ref Address address); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern void SteamAPI_ISteamNetworkingSockets_RunConnectionStatusChangedCallbacks(IntPtr sockets, StatusCallback callback, IntPtr context); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern bool SteamAPI_ISteamNetworkingSockets_CreateSocketPair(IntPtr sockets, uint connectionOne, uint connectionTwo, bool useNetworkLoopback, NetworkingIdentity identityOne, NetworkingIdentity identityTwo); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern void SteamAPI_SteamNetworkingIPAddr_SetIPv6(ref Address address, byte[] ip, ushort port); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern void SteamAPI_SteamNetworkingIPAddr_SetIPv4(ref Address address, uint ip, ushort port); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern uint SteamAPI_SteamNetworkingIPAddr_GetIPv4(ref Address address); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern void SteamAPI_SteamNetworkingIPAddr_SetIPv6LocalHost(ref Address address, ushort port); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern bool SteamAPI_SteamNetworkingIPAddr_IsLocalHost(ref Address address); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern bool SteamAPI_SteamNetworkingIdentity_IsInvalid(ref NetworkingIdentity identity); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern void SteamAPI_SteamNetworkingIdentity_SetSteamID64(ref NetworkingIdentity identity, ulong steamId); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern ulong SteamAPI_SteamNetworkingIdentity_GetSteamID64(ref NetworkingIdentity identity); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern bool SteamAPI_SteamNetworkingIdentity_EqualTo(ref NetworkingIdentity identityOne, ref NetworkingIdentity identityTwo); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern long SteamAPI_ISteamNetworkingUtils_GetLocalTimestamp(IntPtr utils); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern void SteamAPI_ISteamNetworkingUtils_SetDebugOutputFunction(IntPtr utils, DebugType detailLevel, DebugCallback callback); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern bool SteamAPI_ISteamNetworkingUtils_SetConfigValue(IntPtr utils, ConfigurationValue configurationValue, ConfigurationScope configurationScope, IntPtr scopeObject, ConfigurationDataType dataType, IntPtr value); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern ConfigurationValueResult SteamAPI_ISteamNetworkingUtils_GetConfigValue(IntPtr utils, ConfigurationValue configurationValue, ConfigurationScope configurationScope, IntPtr scopeObject, out ConfigurationDataType dataType, out IntPtr result, out IntPtr resultLength); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern ConfigurationValue SteamAPI_ISteamNetworkingUtils_GetFirstConfigValue(IntPtr utils); - - [DllImport(NATIVE_LIBRARY, CallingConvention = CallingConvention.Cdecl)] - internal static extern void SteamAPI_SteamNetworkingMessage_t_Release(IntPtr nativeMessage); - } -} diff --git a/ValveSockets/ValveSockets.csproj b/ValveSockets/ValveSockets.csproj deleted file mode 100644 index ed5217ca..00000000 --- a/ValveSockets/ValveSockets.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - netcoreapp3.0 - Valve.Sockets - true - - - From 5b705b1778cde527c88ef8fa4460cf476302ee9e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 19 Nov 2019 19:08:50 +0000 Subject: [PATCH 037/369] Remove old project reference --- UKSFWebsite.Api/UKSFWebsite.Api.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/UKSFWebsite.Api/UKSFWebsite.Api.csproj b/UKSFWebsite.Api/UKSFWebsite.Api.csproj index 35af057a..9e02c126 100644 --- a/UKSFWebsite.Api/UKSFWebsite.Api.csproj +++ b/UKSFWebsite.Api/UKSFWebsite.Api.csproj @@ -38,7 +38,6 @@ - From 8e6c93dd4cc615c4c3f41663587086787be044f3 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 19 Nov 2019 19:10:44 +0000 Subject: [PATCH 038/369] Remove old package references --- UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj | 3 +-- UKSFWebsite.Api.Signalr/UKSFWebsite.Api.Signalr.csproj | 9 --------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index 7c97c419..d835211c 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -26,6 +26,5 @@ - - \ No newline at end of file + diff --git a/UKSFWebsite.Api.Signalr/UKSFWebsite.Api.Signalr.csproj b/UKSFWebsite.Api.Signalr/UKSFWebsite.Api.Signalr.csproj index 53ad0172..4e757fca 100644 --- a/UKSFWebsite.Api.Signalr/UKSFWebsite.Api.Signalr.csproj +++ b/UKSFWebsite.Api.Signalr/UKSFWebsite.Api.Signalr.csproj @@ -4,15 +4,6 @@ netcoreapp3.0 - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\3.0.0\ref\netcoreapp3.0\Microsoft.AspNetCore.Authorization.dll - - - ..\UKSFWebsite.Api\bin\Debug\netcoreapp3.0\win7-x64\Microsoft.AspNetCore.SignalR.Core.dll - - - From 13df86e1eb17f5dbd6bb3ff6543e5356190cbb5d Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 19 Nov 2019 19:11:35 +0000 Subject: [PATCH 039/369] Remove unused configuration --- UKSFWebsite.Api/appsettings.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/UKSFWebsite.Api/appsettings.json b/UKSFWebsite.Api/appsettings.json index 26e3f690..3b346721 100644 --- a/UKSFWebsite.Api/appsettings.json +++ b/UKSFWebsite.Api/appsettings.json @@ -10,6 +10,5 @@ "EmailSettings": { "username": "", "password": "" - }, - "socketPort": "" + } } From d14141ad0c5e4b4185a7d615f85817cfe13bfcae Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 19 Nov 2019 19:20:17 +0000 Subject: [PATCH 040/369] Debug --- UKSFWebsite.Api/Program.cs | 1 + UKSFWebsite.Api/Startup.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/UKSFWebsite.Api/Program.cs b/UKSFWebsite.Api/Program.cs index 63ea4578..c9b98e90 100644 --- a/UKSFWebsite.Api/Program.cs +++ b/UKSFWebsite.Api/Program.cs @@ -21,6 +21,7 @@ public static void Main(string[] args) { .ForEach(x => AppDomain.CurrentDomain.GetAssemblies().ToList().Add(AppDomain.CurrentDomain.Load(x))); string environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); + Console.Out.WriteLine(environment); bool isDevelopment = environment == Environments.Development; if (isDevelopment) { diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 2415f06e..4447e135 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -73,6 +73,7 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration this.currentEnvironment = currentEnvironment; IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); builder.Build(); + Console.Out.WriteLine(configuration.ToString()); LoginService.SecurityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetSection("Secrets")["tokenKey"])); LoginService.TokenIssuer = Global.TOKEN_ISSUER; LoginService.TokenAudience = Global.TOKEN_AUDIENCE; From a8e220dbc7ccb1e2afaecd3babf971ffc60882a7 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 19 Nov 2019 20:31:45 +0000 Subject: [PATCH 041/369] Print configuration --- UKSFWebsite.Api/Startup.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 4447e135..bc3dbd99 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -13,6 +13,7 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Primitives; using Microsoft.IdentityModel.Tokens; +using MongoDB.Bson; using UKSFWebsite.Api.Data; using UKSFWebsite.Api.Data.Admin; using UKSFWebsite.Api.Data.Command; @@ -73,7 +74,7 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration this.currentEnvironment = currentEnvironment; IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); builder.Build(); - Console.Out.WriteLine(configuration.ToString()); + Console.Out.WriteLine(configuration.GetChildren().Select(x => $"{x.Key}, {x.Value}").Aggregate((x,y) => $"{x}, {y}")); LoginService.SecurityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetSection("Secrets")["tokenKey"])); LoginService.TokenIssuer = Global.TOKEN_ISSUER; LoginService.TokenAudience = Global.TOKEN_AUDIENCE; @@ -285,7 +286,7 @@ private static void RegisterDataServices(this IServiceCollection services, IHost services.AddSingleton(); services.AddSingleton(); - if (!currentEnvironment.IsDevelopment()) { + if (currentEnvironment.IsDevelopment()) { services.AddSingleton(); } else { services.AddSingleton(); @@ -311,7 +312,7 @@ private static void RegisterDataBackedServices(this IServiceCollection services, services.AddTransient(); services.AddTransient(); - if (!currentEnvironment.IsDevelopment()) { + if (currentEnvironment.IsDevelopment()) { services.AddTransient(); } else { services.AddTransient(); From 6f58a3c9652087a82c5c4b251211ce67b95bf5bb Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 19 Nov 2019 20:34:21 +0000 Subject: [PATCH 042/369] Try removing config get to see logs --- UKSFWebsite.Api/Startup.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index bc3dbd99..97cc8408 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -75,9 +75,9 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); builder.Build(); Console.Out.WriteLine(configuration.GetChildren().Select(x => $"{x.Key}, {x.Value}").Aggregate((x,y) => $"{x}, {y}")); - LoginService.SecurityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetSection("Secrets")["tokenKey"])); - LoginService.TokenIssuer = Global.TOKEN_ISSUER; - LoginService.TokenAudience = Global.TOKEN_AUDIENCE; +// LoginService.SecurityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetSection("Secrets")["tokenKey"])); +// LoginService.TokenIssuer = Global.TOKEN_ISSUER; +// LoginService.TokenAudience = Global.TOKEN_AUDIENCE; } public void ConfigureServices(IServiceCollection services) { From 417490146a712fa041f5d1a3069ec2a90b18dce5 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 19 Nov 2019 20:36:08 +0000 Subject: [PATCH 043/369] Disable logging redirection --- UKSFWebsite.Api/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSFWebsite.Api/Program.cs b/UKSFWebsite.Api/Program.cs index c9b98e90..909c0467 100644 --- a/UKSFWebsite.Api/Program.cs +++ b/UKSFWebsite.Api/Program.cs @@ -27,7 +27,7 @@ public static void Main(string[] args) { if (isDevelopment) { BuildDebugWebHost(args).Run(); } else { - InitLogging(); + //InitLogging(); BuildProductionWebHost(args).RunAsService(); } } From 96df81ccbf6c67ef02b923bb48685be91a184c6e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 19 Nov 2019 20:56:03 +0000 Subject: [PATCH 044/369] Remove some debug stuff --- UKSFWebsite.Api/Program.cs | 2 +- UKSFWebsite.Api/Startup.cs | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/UKSFWebsite.Api/Program.cs b/UKSFWebsite.Api/Program.cs index 909c0467..c9b98e90 100644 --- a/UKSFWebsite.Api/Program.cs +++ b/UKSFWebsite.Api/Program.cs @@ -27,7 +27,7 @@ public static void Main(string[] args) { if (isDevelopment) { BuildDebugWebHost(args).Run(); } else { - //InitLogging(); + InitLogging(); BuildProductionWebHost(args).RunAsService(); } } diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 97cc8408..52946d70 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -13,7 +13,6 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Primitives; using Microsoft.IdentityModel.Tokens; -using MongoDB.Bson; using UKSFWebsite.Api.Data; using UKSFWebsite.Api.Data.Admin; using UKSFWebsite.Api.Data.Command; @@ -75,9 +74,9 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); builder.Build(); Console.Out.WriteLine(configuration.GetChildren().Select(x => $"{x.Key}, {x.Value}").Aggregate((x,y) => $"{x}, {y}")); -// LoginService.SecurityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetSection("Secrets")["tokenKey"])); -// LoginService.TokenIssuer = Global.TOKEN_ISSUER; -// LoginService.TokenAudience = Global.TOKEN_AUDIENCE; + LoginService.SecurityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetSection("Secrets")["tokenKey"])); + LoginService.TokenIssuer = Global.TOKEN_ISSUER; + LoginService.TokenAudience = Global.TOKEN_AUDIENCE; } public void ConfigureServices(IServiceCollection services) { From 7bc78d32018e41cbc45f6d1d9d95b9f044eb6bf1 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 19 Nov 2019 23:31:50 +0000 Subject: [PATCH 045/369] Try running normally --- UKSFWebsite.Api/Program.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/UKSFWebsite.Api/Program.cs b/UKSFWebsite.Api/Program.cs index c9b98e90..5e8f0cb7 100644 --- a/UKSFWebsite.Api/Program.cs +++ b/UKSFWebsite.Api/Program.cs @@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.WindowsServices; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; namespace UKSFWebsite.Api { public static class Program { @@ -27,8 +26,8 @@ public static void Main(string[] args) { if (isDevelopment) { BuildDebugWebHost(args).Run(); } else { - InitLogging(); - BuildProductionWebHost(args).RunAsService(); + //InitLogging(); + BuildProductionWebHost(args).Run(); } } From 407a0094f239aaa24f162159fb71719c5f037147 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 19 Nov 2019 23:33:29 +0000 Subject: [PATCH 046/369] Run as service --- UKSFWebsite.Api/Program.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UKSFWebsite.Api/Program.cs b/UKSFWebsite.Api/Program.cs index 5e8f0cb7..5e9bffd3 100644 --- a/UKSFWebsite.Api/Program.cs +++ b/UKSFWebsite.Api/Program.cs @@ -26,8 +26,8 @@ public static void Main(string[] args) { if (isDevelopment) { BuildDebugWebHost(args).Run(); } else { - //InitLogging(); - BuildProductionWebHost(args).Run(); + InitLogging(); + BuildProductionWebHost(args).RunAsService(); } } From a543b2f025dd30cbd5e181edd5e907f0c04cf74d Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 19 Nov 2019 23:35:45 +0000 Subject: [PATCH 047/369] Disable teamspeak manager --- UKSFWebsite.Api/Startup.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 52946d70..420f56ab 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -166,7 +166,7 @@ public void Configure(IApplicationBuilder app) { Global.ServiceProvider.GetService().InitEventHandlers(); // Start teamspeak manager - Global.ServiceProvider.GetService().Start(); +// Global.ServiceProvider.GetService().Start(); // Connect discord bot Global.ServiceProvider.GetService().ConnectDiscord(); From 84b11ffe95e599bbb5eb4421f1098176211508b8 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 20 Nov 2019 23:20:04 +0000 Subject: [PATCH 048/369] Fixed teamspeak not being opened from within service --- UKSFWebsite.Api.Events/EventBus.cs | 3 +- .../Handlers/TeamspeakEventHandler.cs | 1 - .../UKSFWebsite.Api.Events.csproj | 8 +- .../Teamspeak/ITeamspeakManager.cs | 8 -- .../Teamspeak/ITeamspeakManagerService.cs | 10 +++ .../Fake/FakeTeamspeakManager.cs | 10 --- .../Fake/FakeTeamspeakManagerService.cs | 13 +++ .../Teamspeak/TeamspeakGroupService.cs | 10 +-- .../Teamspeak/TeamspeakManager.cs | 79 ------------------- .../Teamspeak/TeamspeakManagerService.cs | 71 +++++++++++++++++ .../Teamspeak/TeamspeakService.cs | 12 +-- .../UKSFWebsite.Api.Services.csproj | 1 + .../Utility/ProcessHelper.cs | 17 ++-- .../Utility/TaskUtilities.cs | 15 ++++ .../Hubs/Integrations/TeamspeakHub.cs | 14 ++-- UKSFWebsite.Api/Controllers/TestController.cs | 23 ++++-- UKSFWebsite.Api/Program.cs | 1 - UKSFWebsite.Api/Startup.cs | 15 ++-- 18 files changed, 173 insertions(+), 138 deletions(-) delete mode 100644 UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManager.cs create mode 100644 UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs delete mode 100644 UKSFWebsite.Api.Services/Fake/FakeTeamspeakManager.cs create mode 100644 UKSFWebsite.Api.Services/Fake/FakeTeamspeakManagerService.cs delete mode 100644 UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManager.cs create mode 100644 UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs create mode 100644 UKSFWebsite.Api.Services/Utility/TaskUtilities.cs diff --git a/UKSFWebsite.Api.Events/EventBus.cs b/UKSFWebsite.Api.Events/EventBus.cs index 001a5782..0919b8c0 100644 --- a/UKSFWebsite.Api.Events/EventBus.cs +++ b/UKSFWebsite.Api.Events/EventBus.cs @@ -1,7 +1,6 @@ using System; using System.Reactive.Linq; using System.Reactive.Subjects; -using System.Threading.Tasks; using UKSFWebsite.Api.Interfaces.Events; namespace UKSFWebsite.Api.Events { @@ -9,7 +8,7 @@ public class EventBus : IEventBus { protected readonly Subject Subject = new Subject(); public void Send(T message) { - Task.Run(() => Subject.OnNext(message)); + Subject.OnNext(message); } public virtual IObservable AsObservable() => Subject.OfType(); diff --git a/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs index 0211f2fa..7e34be94 100644 --- a/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs +++ b/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Newtonsoft.Json; using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Interfaces.Events.Handlers; diff --git a/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj b/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj index 23afdb92..b5c94345 100644 --- a/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj +++ b/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj @@ -14,7 +14,13 @@ - + + + + + + ..\UKSFWebsite.Api\bin\Release\netcoreapp3.0\win7-x64\UKSFWebsite.Api.Services.dll + diff --git a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManager.cs b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManager.cs deleted file mode 100644 index 25058025..00000000 --- a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManager.cs +++ /dev/null @@ -1,8 +0,0 @@ -using UKSFWebsite.Api.Models.Integrations; - -namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { - public interface ITeamspeakManager { - void Start(); - void SendProcedure(TeamspeakProcedureType procedure, object args); - } -} diff --git a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs new file mode 100644 index 00000000..af4dac56 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs @@ -0,0 +1,10 @@ +using System.Threading.Tasks; +using UKSFWebsite.Api.Models.Integrations; + +namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { + public interface ITeamspeakManagerService { + void Start(); + void Stop(); + Task SendProcedure(TeamspeakProcedureType procedure, object args); + } +} diff --git a/UKSFWebsite.Api.Services/Fake/FakeTeamspeakManager.cs b/UKSFWebsite.Api.Services/Fake/FakeTeamspeakManager.cs deleted file mode 100644 index 192c93c7..00000000 --- a/UKSFWebsite.Api.Services/Fake/FakeTeamspeakManager.cs +++ /dev/null @@ -1,10 +0,0 @@ -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Models.Integrations; - -namespace UKSFWebsite.Api.Services.Fake { - public class FakeTeamspeakManager : ITeamspeakManager { - public void Start() { } - - public void SendProcedure(TeamspeakProcedureType procedure, object args) { } - } -} diff --git a/UKSFWebsite.Api.Services/Fake/FakeTeamspeakManagerService.cs b/UKSFWebsite.Api.Services/Fake/FakeTeamspeakManagerService.cs new file mode 100644 index 00000000..de245db3 --- /dev/null +++ b/UKSFWebsite.Api.Services/Fake/FakeTeamspeakManagerService.cs @@ -0,0 +1,13 @@ +using System.Threading.Tasks; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; +using UKSFWebsite.Api.Models.Integrations; + +namespace UKSFWebsite.Api.Services.Fake { + public class FakeTeamspeakManagerService : ITeamspeakManagerService { + public void Start() { } + + public void Stop() { } + + public Task SendProcedure(TeamspeakProcedureType procedure, object args) => Task.CompletedTask; + } +} diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs index 02d1a900..c1520c3b 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs @@ -13,12 +13,12 @@ namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { public class TeamspeakGroupService : ITeamspeakGroupService { private readonly IRanksService ranksService; private readonly IUnitsService unitsService; - private readonly ITeamspeakManager teamspeakManager; + private readonly ITeamspeakManagerService teamspeakManagerService; - public TeamspeakGroupService(IRanksService ranksService, IUnitsService unitsService, ITeamspeakManager teamspeakManager) { + public TeamspeakGroupService(IRanksService ranksService, IUnitsService unitsService, ITeamspeakManagerService teamspeakManagerService) { this.ranksService = ranksService; this.unitsService = unitsService; - this.teamspeakManager = teamspeakManager; + this.teamspeakManagerService = teamspeakManagerService; } public void UpdateAccountGroups(Account account, ICollection serverGroups, double clientDbId) { @@ -73,11 +73,11 @@ private void UpdateUnits(Account account, ISet allowedGroups) { } private void AddServerGroup(double clientDbId, double serverGroup) { - teamspeakManager.SendProcedure(TeamspeakProcedureType.ASSIGN, new {clientDbId, serverGroup}); + teamspeakManagerService.SendProcedure(TeamspeakProcedureType.ASSIGN, new {clientDbId, serverGroup}); } private void RemoveServerGroup(double clientDbId, double serverGroup) { - teamspeakManager.SendProcedure(TeamspeakProcedureType.UNASSIGN, new {clientDbId, serverGroup}); + teamspeakManagerService.SendProcedure(TeamspeakProcedureType.UNASSIGN, new {clientDbId, serverGroup}); } } } diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManager.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManager.cs deleted file mode 100644 index 7a2af69a..00000000 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManager.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System; -using System.Diagnostics; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Models.Integrations; -using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Utility; -using UKSFWebsite.Api.Signalr.Hubs.Integrations; - -namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { - public class TeamspeakManager : ITeamspeakManager, IDisposable { - private readonly IHubContext hub; - private bool runTeamspeak; - private int teamspeakProcessId; - private CancellationTokenSource token; - - public TeamspeakManager(IHubContext hub) => this.hub = hub; - - public void Dispose() { - runTeamspeak = false; - token.Cancel(); - if (TeamspeakHubState.Connected) { - SendProcedure(TeamspeakProcedureType.SHUTDOWN, null); - Task.Delay(TimeSpan.FromSeconds(5)).Wait(); - } - - while (Process.GetProcesses().Any(x => x.Id == teamspeakProcessId)) { - ShutTeamspeak(); - Task.Delay(TimeSpan.FromSeconds(1)).Wait(); - } - } - - public void Start() { - runTeamspeak = true; - Task.Run(KeepOnline); - } - - public void SendProcedure(TeamspeakProcedureType procedure, object args) { - hub.Clients.All.Receive(procedure, args); - } - - private async void KeepOnline() { - token = new CancellationTokenSource(); - while (runTeamspeak) { - if (VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_RUN").AsBool()) { - if (!TeamspeakHubState.Connected) { - if (teamspeakProcessId == default) { - LaunchTeamspeak(); - } else { - while (Process.GetProcesses().Any(x => x.Id == teamspeakProcessId)) { - ShutTeamspeak(); - await Task.Delay(TimeSpan.FromSeconds(2), token.Token); - } - - teamspeakProcessId = default; - continue; - } - } else { - // TODO: Get teamspeakProcessId - } - } - - await Task.Delay(TimeSpan.FromSeconds(10), token.Token); - } - } - - private void LaunchTeamspeak() { - teamspeakProcessId = ProcessHelper.LaunchProcess(VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_PATH").AsString(), ""); - } - - private void ShutTeamspeak() { - ProcessHelper.LaunchProcess("taskkill", $"/f /pid {teamspeakProcessId}"); - } - } -} diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs new file mode 100644 index 00000000..9648f898 --- /dev/null +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs @@ -0,0 +1,71 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.SignalR; +using UKSFWebsite.Api.Interfaces.Hubs; +using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; +using UKSFWebsite.Api.Models.Integrations; +using UKSFWebsite.Api.Services.Admin; +using UKSFWebsite.Api.Services.Utility; +using UKSFWebsite.Api.Signalr.Hubs.Integrations; + +namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { + public class TeamspeakManagerService : ITeamspeakManagerService { + private readonly IHubContext hub; + private bool runTeamspeak; + private CancellationTokenSource token; + + public TeamspeakManagerService(IHubContext hub) => this.hub = hub; + + public void Start() { + runTeamspeak = true; + token = new CancellationTokenSource(); + Task.Run(KeepOnline); + } + + public void Stop() { + runTeamspeak = false; + token.Cancel(); + Task.Delay(TimeSpan.FromSeconds(5)).Wait(); + ShutTeamspeak().Wait(); + } + + public async Task SendProcedure(TeamspeakProcedureType procedure, object args) { + await hub.Clients.All.Receive(procedure, args); + } + + private async void KeepOnline() { + await TaskUtilities.Delay(TimeSpan.FromSeconds(5), token.Token); + while (runTeamspeak) { + if (VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_RUN").AsBool()) { + if (!TeamspeakHubState.Connected) { + if (Process.GetProcessesByName("ts3client_win64").Length == 0) { + await LaunchTeamspeak(); + } else { + await ShutTeamspeak(); + continue; + } + } + } + + await TaskUtilities.Delay(TimeSpan.FromSeconds(10), token.Token); + } + } + + private static async Task LaunchTeamspeak() { + await ProcessHelper.LaunchProcess("Teamspeak", $"start \"\" \"{VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_PATH").AsString()}\""); + } + + private async Task ShutTeamspeak() { + while (Process.GetProcessesByName("ts3client_win64").Length > 0) { + foreach (Process processToKill in Process.GetProcesses().Where(x => x.ProcessName == "ts3client_win64")) { + processToKill.Kill(); + await TaskUtilities.Delay(TimeSpan.FromMilliseconds(100), token.Token); + } + } + } + } +} diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs index e0588d34..43a9d2e0 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs @@ -16,13 +16,13 @@ public class TeamspeakService : ITeamspeakService { private readonly SemaphoreSlim clientsSemaphore = new SemaphoreSlim(1); private readonly IMongoDatabase database; private readonly IHubContext teamspeakClientsHub; - private readonly ITeamspeakManager teamspeakManager; + private readonly ITeamspeakManagerService teamspeakManagerService; private HashSet clients = new HashSet(); - public TeamspeakService(IMongoDatabase database, IHubContext teamspeakClientsHub, ITeamspeakManager teamspeakManager) { + public TeamspeakService(IMongoDatabase database, IHubContext teamspeakClientsHub, ITeamspeakManagerService teamspeakManagerService) { this.database = database; this.teamspeakClientsHub = teamspeakClientsHub; - this.teamspeakManager = teamspeakManager; + this.teamspeakManagerService = teamspeakManagerService; } public HashSet GetOnlineTeamspeakClients() => clients; @@ -37,7 +37,7 @@ public async Task UpdateClients(HashSet newClients) { public void UpdateAccountTeamspeakGroups(Account account) { if (account?.teamspeakIdentities == null) return; foreach (double clientDbId in account.teamspeakIdentities) { - teamspeakManager.SendProcedure(TeamspeakProcedureType.GROUPS, new {clientDbId}); + teamspeakManagerService.SendProcedure(TeamspeakProcedureType.GROUPS, new {clientDbId}); } } @@ -50,7 +50,7 @@ public void SendTeamspeakMessageToClient(Account account, string message) { public void SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message) { message = FormatTeamspeakMessage(message); foreach (double clientDbId in clientDbIds) { - teamspeakManager.SendProcedure(TeamspeakProcedureType.MESSAGE, new {clientDbId, message}); + teamspeakManagerService.SendProcedure(TeamspeakProcedureType.MESSAGE, new {clientDbId, message}); } } @@ -65,7 +65,7 @@ public async Task StoreTeamspeakServerSnapshot() { } public void Shutdown() { - teamspeakManager.SendProcedure(TeamspeakProcedureType.SHUTDOWN, new {}); + teamspeakManagerService.SendProcedure(TeamspeakProcedureType.SHUTDOWN, new {}); } public object GetFormattedClients() { diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index d835211c..7e1e1a68 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -21,6 +21,7 @@ + diff --git a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs index 0f461a7a..63a81faa 100644 --- a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs +++ b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs @@ -1,5 +1,7 @@ -using System.Diagnostics; +using System; using System.Management; +using Microsoft.Win32.TaskScheduler; +using Task = System.Threading.Tasks.Task; namespace UKSFWebsite.Api.Services.Utility { public static class ProcessHelper { @@ -15,17 +17,18 @@ public static int LaunchManagedProcess(string executable, string arguments = nul ManagementBaseObject result = managementClass.InvokeMethod("Create", inParameters, null); if (result != null && (uint) result.Properties["ReturnValue"].Value == 0) { - processId = (int) result.Properties["ProcessId"].Value; + processId = Convert.ToInt32(result.Properties["ProcessId"].Value.ToString()); } return processId; } - public static int LaunchProcess(string executable, string arguments = null) { - using Process process = new Process {StartInfo = {UseShellExecute = true, FileName = executable, Arguments = arguments, Verb = "runas"}}; - process.Start(); - - return process.Id; + public static async Task LaunchProcess(string name, string command) { + using TaskDefinition taskDefinition = TaskService.Instance.NewTask(); + taskDefinition.Actions.Add(new ExecAction("cmd", $"/C {command}")); + taskDefinition.Triggers.Add(new TimeTrigger(DateTime.Now.AddSeconds(1))); + TaskService.Instance.RootFolder.RegisterTaskDefinition(name, taskDefinition); + await Task.Delay(TimeSpan.FromSeconds(1)); } } } diff --git a/UKSFWebsite.Api.Services/Utility/TaskUtilities.cs b/UKSFWebsite.Api.Services/Utility/TaskUtilities.cs new file mode 100644 index 00000000..c96d73a1 --- /dev/null +++ b/UKSFWebsite.Api.Services/Utility/TaskUtilities.cs @@ -0,0 +1,15 @@ +using System; +using System.Threading; +using System.Threading.Tasks; + +namespace UKSFWebsite.Api.Services.Utility { + public static class TaskUtilities { + public static async Task Delay(TimeSpan timeSpan, CancellationToken token) { + try { + await Task.Delay(timeSpan, token); + } catch (Exception) { + // Ignored + } + } + } +} diff --git a/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs b/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs index 5c4359e2..d5480bfe 100644 --- a/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs +++ b/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs @@ -5,31 +5,31 @@ using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Models.Events; using UKSFWebsite.Api.Models.Events.Types; -// ReSharper disable UnusedMember.Global namespace UKSFWebsite.Api.Signalr.Hubs.Integrations { public static class TeamspeakHubState { public static bool Connected; } - + public class TeamspeakHub : Hub { - private readonly ISignalrEventBus eventBus; public const string END_POINT = "teamspeak"; + private readonly ISignalrEventBus eventBus; public TeamspeakHub(ISignalrEventBus eventBus) => this.eventBus = eventBus; + // ReSharper disable once UnusedMember.Global public void Invoke(int procedure, object args) { - eventBus.Send(EventModelFactory.CreateSignalrEvent((TeamspeakEventType)procedure, args)); + eventBus.Send(EventModelFactory.CreateSignalrEvent((TeamspeakEventType) procedure, args)); } public override Task OnConnectedAsync() { TeamspeakHubState.Connected = true; return base.OnConnectedAsync(); } - - public override Task OnDisconnectedAsync(Exception exception) { + + public override async Task OnDisconnectedAsync(Exception exception) { TeamspeakHubState.Connected = false; - return base.OnDisconnectedAsync(exception); + await base.OnDisconnectedAsync(exception); } } } diff --git a/UKSFWebsite.Api/Controllers/TestController.cs b/UKSFWebsite.Api/Controllers/TestController.cs index 7785225b..4240fe6b 100644 --- a/UKSFWebsite.Api/Controllers/TestController.cs +++ b/UKSFWebsite.Api/Controllers/TestController.cs @@ -1,20 +1,31 @@ +using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; +using Microsoft.Extensions.Hosting; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Signalr.Hubs.Integrations; namespace UKSFWebsite.Api.Controllers { [Route("[controller]")] public class TestController : Controller { + private readonly IHostApplicationLifetime hostApplicationLifetime; private readonly IHubContext hub; - public TestController(IHubContext hub) => this.hub = hub; - - [HttpGet] - public async Task Get() { -// await hub.Clients.All.Receive("TEST"); - return Ok(); + public TestController(IHubContext hub, IHostApplicationLifetime hostApplicationLifetime) { + this.hub = hub; + this.hostApplicationLifetime = hostApplicationLifetime; } + +// [HttpGet] +// public async Task Get() { +// Task unused = Task.Run( +// () => { +// Task.Delay(TimeSpan.FromSeconds(1)); +// hostApplicationLifetime.StopApplication(); +// } +// ); +// return Ok(); +// } } } diff --git a/UKSFWebsite.Api/Program.cs b/UKSFWebsite.Api/Program.cs index 5e9bffd3..1ee7f156 100644 --- a/UKSFWebsite.Api/Program.cs +++ b/UKSFWebsite.Api/Program.cs @@ -20,7 +20,6 @@ public static void Main(string[] args) { .ForEach(x => AppDomain.CurrentDomain.GetAssemblies().ToList().Add(AppDomain.CurrentDomain.Load(x))); string environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); - Console.Out.WriteLine(environment); bool isDevelopment = environment == Environments.Development; if (isDevelopment) { diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 420f56ab..fbe9bad1 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -73,7 +73,6 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration this.currentEnvironment = currentEnvironment; IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); builder.Build(); - Console.Out.WriteLine(configuration.GetChildren().Select(x => $"{x.Key}, {x.Value}").Aggregate((x,y) => $"{x}, {y}")); LoginService.SecurityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetSection("Secrets")["tokenKey"])); LoginService.TokenIssuer = Global.TOKEN_ISSUER; LoginService.TokenAudience = Global.TOKEN_AUDIENCE; @@ -125,7 +124,8 @@ public void ConfigureServices(IServiceCollection services) { } // ReSharper disable once UnusedMember.Global - public void Configure(IApplicationBuilder app) { + public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostApplicationLifetime) { + hostApplicationLifetime.ApplicationStopping.Register(OnShutdown); app.UseStaticFiles(); app.UseRouting(); app.UseCors("CorsPolicy"); @@ -166,7 +166,7 @@ public void Configure(IApplicationBuilder app) { Global.ServiceProvider.GetService().InitEventHandlers(); // Start teamspeak manager -// Global.ServiceProvider.GetService().Start(); + Global.ServiceProvider.GetService().Start(); // Connect discord bot Global.ServiceProvider.GetService().ConnectDiscord(); @@ -188,6 +188,11 @@ private static void WarmDataServices() { dataCacheService.InvalidateDataCaches(); } + + private static void OnShutdown() { + // Stop teamspeak + Global.ServiceProvider.GetService().Stop(); + } } public static class ServiceExtensions { @@ -226,10 +231,10 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddSingleton(); if (currentEnvironment.IsDevelopment()) { - services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); } else { - services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); } } From 65cedcb8f6da37def4eff5a3b8a4810c4d37af3f Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 21 Nov 2019 00:27:07 +0000 Subject: [PATCH 049/369] Fix async for teamspeak procedures. Better management of teamspeak process --- UKSFWebsite.Api.Data/CachedDataService.cs | 3 --- UKSFWebsite.Api.Data/DataService.cs | 1 - .../Message/CommentThreadDataService.cs | 2 -- .../Personnel/AccountDataService.cs | 3 +-- .../Handlers/TeamspeakEventHandler.cs | 2 +- .../SignalrServer/SignalrEventBus.cs | 2 -- .../Events/IDataEventBus.cs | 1 - .../Teamspeak/ITeamspeakGroupService.cs | 3 ++- .../Integrations/Teamspeak/ITeamspeakService.cs | 8 ++++---- .../Message/INotificationsService.cs | 4 ++-- .../Fake/FakeNotificationsService.cs | 4 ++-- .../Teamspeak/TeamspeakGroupService.cs | 15 ++++++++------- .../Teamspeak/TeamspeakManagerService.cs | 1 - .../Integrations/Teamspeak/TeamspeakService.cs | 16 ++++++++-------- .../Message/NotificationsService.cs | 10 +++++----- .../Personnel/AssignmentService.cs | 2 +- .../Accounts/CommunicationsController.cs | 6 +++--- .../Controllers/TeamspeakController.cs | 2 +- UKSFWebsite.Api/Controllers/UnitsController.cs | 4 ++-- UKSFWebsite.Integrations/Startup.cs | 1 - 20 files changed, 40 insertions(+), 50 deletions(-) diff --git a/UKSFWebsite.Api.Data/CachedDataService.cs b/UKSFWebsite.Api.Data/CachedDataService.cs index 8ee92237..a97ba6cd 100644 --- a/UKSFWebsite.Api.Data/CachedDataService.cs +++ b/UKSFWebsite.Api.Data/CachedDataService.cs @@ -3,9 +3,6 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Events; -using UKSFWebsite.Api.Events.Data; -using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Events; diff --git a/UKSFWebsite.Api.Data/DataService.cs b/UKSFWebsite.Api.Data/DataService.cs index 3f7af094..f16613ac 100644 --- a/UKSFWebsite.Api.Data/DataService.cs +++ b/UKSFWebsite.Api.Data/DataService.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Events; using UKSFWebsite.Api.Events.Data; using UKSFWebsite.Api.Interfaces.Data; using UKSFWebsite.Api.Interfaces.Events; diff --git a/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs b/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs index c12fa098..a8570377 100644 --- a/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs +++ b/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs @@ -1,7 +1,5 @@ using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Events; -using UKSFWebsite.Api.Events.Data; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Events; diff --git a/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs b/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs index 3a96f083..06b445db 100644 --- a/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs +++ b/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs @@ -1,5 +1,4 @@ -using System.Threading.Tasks; -using MongoDB.Driver; +using MongoDB.Driver; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Personnel; diff --git a/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs index 7e34be94..cd94de70 100644 --- a/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs +++ b/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs @@ -89,7 +89,7 @@ private void UpdateClientServerGroups(string args) { private void ProcessAccountData(double clientDbId, ICollection serverGroups) { Console.WriteLine($"Processing server groups for {clientDbId}"); Account account = accountService.Data().GetSingle(x => x.teamspeakIdentities != null && x.teamspeakIdentities.Any(y => y.Equals(clientDbId))); - teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); + Task unused = teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); lock (serverGroupUpdates) { serverGroupUpdates.Remove(clientDbId); diff --git a/UKSFWebsite.Api.Events/SignalrServer/SignalrEventBus.cs b/UKSFWebsite.Api.Events/SignalrServer/SignalrEventBus.cs index 990e21b9..b9f433b8 100644 --- a/UKSFWebsite.Api.Events/SignalrServer/SignalrEventBus.cs +++ b/UKSFWebsite.Api.Events/SignalrServer/SignalrEventBus.cs @@ -1,5 +1,3 @@ -using System; -using System.Reactive.Linq; using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Models.Events; diff --git a/UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs b/UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs index 3b6afbbf..5f6ef51a 100644 --- a/UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs +++ b/UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs @@ -1,4 +1,3 @@ -using System; using UKSFWebsite.Api.Models.Events; namespace UKSFWebsite.Api.Interfaces.Events { diff --git a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs index f2fd21e5..55267e65 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; +using System.Threading.Tasks; using UKSFWebsite.Api.Models.Personnel; namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { public interface ITeamspeakGroupService { - void UpdateAccountGroups(Account account, ICollection serverGroups, double clientDbId); + Task UpdateAccountGroups(Account account, ICollection serverGroups, double clientDbId); } } diff --git a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs index 5c6426d3..d64ba992 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs +++ b/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs @@ -9,10 +9,10 @@ public interface ITeamspeakService { (bool online, string nickname) GetOnlineUserDetails(Account account); object GetFormattedClients(); Task UpdateClients(HashSet newClients); - void UpdateAccountTeamspeakGroups(Account account); - void SendTeamspeakMessageToClient(Account account, string message); - void SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message); - void Shutdown(); + Task UpdateAccountTeamspeakGroups(Account account); + Task SendTeamspeakMessageToClient(Account account, string message); + Task SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message); + Task Shutdown(); Task StoreTeamspeakServerSnapshot(); } } diff --git a/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs b/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs index 413b8dee..783344b8 100644 --- a/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs +++ b/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs @@ -7,8 +7,8 @@ namespace UKSFWebsite.Api.Interfaces.Message { public interface INotificationsService : IDataBackedService { void Add(Notification notification); - void SendTeamspeakNotification(Account account, string rawMessage); - void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage); + Task SendTeamspeakNotification(Account account, string rawMessage); + Task SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage); IEnumerable GetNotificationsForContext(); Task MarkNotificationsAsRead(IEnumerable ids); Task Delete(IEnumerable ids); diff --git a/UKSFWebsite.Api.Services/Fake/FakeNotificationsService.cs b/UKSFWebsite.Api.Services/Fake/FakeNotificationsService.cs index 59b6a9b9..ca34f309 100644 --- a/UKSFWebsite.Api.Services/Fake/FakeNotificationsService.cs +++ b/UKSFWebsite.Api.Services/Fake/FakeNotificationsService.cs @@ -7,9 +7,9 @@ namespace UKSFWebsite.Api.Services.Fake { public class FakeNotificationsService : INotificationsService { - public void SendTeamspeakNotification(Account account, string rawMessage) { } + public Task SendTeamspeakNotification(Account account, string rawMessage) => Task.CompletedTask; - public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { } + public Task SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) => Task.CompletedTask; public IEnumerable GetNotificationsForContext() => new List(); diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs index c1520c3b..b02dc39a 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Units; @@ -21,7 +22,7 @@ public TeamspeakGroupService(IRanksService ranksService, IUnitsService unitsServ this.teamspeakManagerService = teamspeakManagerService; } - public void UpdateAccountGroups(Account account, ICollection serverGroups, double clientDbId) { + public async Task UpdateAccountGroups(Account account, ICollection serverGroups, double clientDbId) { HashSet allowedGroups = new HashSet(); if (account == null || account.membershipState == MembershipState.UNCONFIRMED) { @@ -40,12 +41,12 @@ public void UpdateAccountGroups(Account account, ICollection serverGroup List groupsBlacklist = VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_BLACKLIST").AsDoublesArray().ToList(); foreach (double serverGroup in serverGroups) { if (!allowedGroups.Contains(serverGroup) && !groupsBlacklist.Contains(serverGroup)) { - RemoveServerGroup(clientDbId, serverGroup); + await RemoveServerGroup(clientDbId, serverGroup); } } foreach (double serverGroup in allowedGroups.Where(serverGroup => !serverGroups.Contains(serverGroup))) { - AddServerGroup(clientDbId, serverGroup); + await AddServerGroup(clientDbId, serverGroup); } } @@ -72,12 +73,12 @@ private void UpdateUnits(Account account, ISet allowedGroups) { accountUnitParents.ForEach(x => allowedGroups.Add(x.teamspeakGroup.ToDouble())); } - private void AddServerGroup(double clientDbId, double serverGroup) { - teamspeakManagerService.SendProcedure(TeamspeakProcedureType.ASSIGN, new {clientDbId, serverGroup}); + private async Task AddServerGroup(double clientDbId, double serverGroup) { + await teamspeakManagerService.SendProcedure(TeamspeakProcedureType.ASSIGN, new {clientDbId, serverGroup}); } - private void RemoveServerGroup(double clientDbId, double serverGroup) { - teamspeakManagerService.SendProcedure(TeamspeakProcedureType.UNASSIGN, new {clientDbId, serverGroup}); + private async Task RemoveServerGroup(double clientDbId, double serverGroup) { + await teamspeakManagerService.SendProcedure(TeamspeakProcedureType.UNASSIGN, new {clientDbId, serverGroup}); } } } diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs index 9648f898..21c0f607 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Threading; diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs index 43a9d2e0..5cc24c31 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs @@ -34,23 +34,23 @@ public async Task UpdateClients(HashSet newClients) { await teamspeakClientsHub.Clients.All.ReceiveClients(GetFormattedClients()); } - public void UpdateAccountTeamspeakGroups(Account account) { + public async Task UpdateAccountTeamspeakGroups(Account account) { if (account?.teamspeakIdentities == null) return; foreach (double clientDbId in account.teamspeakIdentities) { - teamspeakManagerService.SendProcedure(TeamspeakProcedureType.GROUPS, new {clientDbId}); + await teamspeakManagerService.SendProcedure(TeamspeakProcedureType.GROUPS, new {clientDbId}); } } - public void SendTeamspeakMessageToClient(Account account, string message) { + public async Task SendTeamspeakMessageToClient(Account account, string message) { if (account.teamspeakIdentities == null) return; if (account.teamspeakIdentities.Count == 0) return; - SendTeamspeakMessageToClient(account.teamspeakIdentities, message); + await SendTeamspeakMessageToClient(account.teamspeakIdentities, message); } - public void SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message) { + public async Task SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message) { message = FormatTeamspeakMessage(message); foreach (double clientDbId in clientDbIds) { - teamspeakManagerService.SendProcedure(TeamspeakProcedureType.MESSAGE, new {clientDbId, message}); + await teamspeakManagerService.SendProcedure(TeamspeakProcedureType.MESSAGE, new {clientDbId, message}); } } @@ -64,8 +64,8 @@ public async Task StoreTeamspeakServerSnapshot() { await database.GetCollection("teamspeakSnapshots").InsertOneAsync(teamspeakServerSnapshot); } - public void Shutdown() { - teamspeakManagerService.SendProcedure(TeamspeakProcedureType.SHUTDOWN, new {}); + public async Task Shutdown() { + await teamspeakManagerService.SendProcedure(TeamspeakProcedureType.SHUTDOWN, new {}); } public object GetFormattedClients() { diff --git a/UKSFWebsite.Api.Services/Message/NotificationsService.cs b/UKSFWebsite.Api.Services/Message/NotificationsService.cs index 2684e5b0..0f21211a 100644 --- a/UKSFWebsite.Api.Services/Message/NotificationsService.cs +++ b/UKSFWebsite.Api.Services/Message/NotificationsService.cs @@ -34,14 +34,14 @@ public NotificationsService(INotificationsDataService data, ITeamspeakService te public INotificationsDataService Data() => data; - public void SendTeamspeakNotification(Account account, string rawMessage) { + public async Task SendTeamspeakNotification(Account account, string rawMessage) { rawMessage = rawMessage.Replace("", "[/url]"); - teamspeakService.SendTeamspeakMessageToClient(account, rawMessage); + await teamspeakService.SendTeamspeakMessageToClient(account, rawMessage); } - public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { + public async Task SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { rawMessage = rawMessage.Replace("", "[/url]"); - teamspeakService.SendTeamspeakMessageToClient(clientDbIds, rawMessage); + await teamspeakService.SendTeamspeakMessageToClient(clientDbIds, rawMessage); } public IEnumerable GetNotificationsForContext() { @@ -77,7 +77,7 @@ private async Task AddNotificationAsync(Notification notification) { } if (account.settings.notificationsTeamspeak) { - SendTeamspeakNotification(account, $"{notification.message}{(notification.link != null ? $"\n[url]https://uk-sf.co.uk{notification.link}[/url]" : "")}"); + await SendTeamspeakNotification(account, $"{notification.message}{(notification.link != null ? $"\n[url]https://uk-sf.co.uk{notification.link}[/url]" : "")}"); } } diff --git a/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs b/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs index 01b4a2c4..ee35c849 100644 --- a/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs +++ b/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs @@ -120,7 +120,7 @@ public async Task UnassignUnit(string id, string unitId) { private async Task UpdateGroupsAndRoles(string id) { Account account = accountService.Data().GetSingle(id); - teamspeakService.UpdateAccountTeamspeakGroups(account); + await teamspeakService.UpdateAccountTeamspeakGroups(account); await discordService.UpdateAccount(account); serverService.UpdateSquadXml(); await accountHub.Clients.Group(id).ReceiveAccountUpdate(); diff --git a/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs b/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs index 817ac941..ef4e0395 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs +++ b/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs @@ -55,7 +55,7 @@ public async Task ReceiveCode([FromBody] JObject body) { private async Task SendTeamspeakCode(string teamspeakDbId) { string code = await confirmationCodeService.CreateConfirmationCode(teamspeakDbId); - notificationsService.SendTeamspeakNotification( + await notificationsService.SendTeamspeakNotification( new HashSet {teamspeakDbId.ToDouble()}, $"This Teamspeak ID was selected for connection to the website. Copy this code to your clipboard and return to the UKSF website application page to enter the code:\n{code}\nIf this request was not made by you, please contact an admin" ); @@ -73,8 +73,8 @@ private async Task ReceiveTeamspeakCode(string id, string code, s account.teamspeakIdentities.Add(double.Parse(teamspeakId)); await accountService.Data().Update(account.id, Builders.Update.Set("teamspeakIdentities", account.teamspeakIdentities)); account = accountService.Data().GetSingle(account.id); - teamspeakService.UpdateAccountTeamspeakGroups(account); - notificationsService.SendTeamspeakNotification(new HashSet {teamspeakId.ToDouble()}, $"This teamspeak identity has been linked to the account with email '{account.email}'\nIf this was not done by you, please contact an admin"); + await teamspeakService.UpdateAccountTeamspeakGroups(account); + await notificationsService.SendTeamspeakNotification(new HashSet {teamspeakId.ToDouble()}, $"This teamspeak identity has been linked to the account with email '{account.email}'\nIf this was not done by you, please contact an admin"); LogWrapper.AuditLog(account.id, $"Teamspeak ID {teamspeakId} added for {account.id}"); return Ok(); } diff --git a/UKSFWebsite.Api/Controllers/TeamspeakController.cs b/UKSFWebsite.Api/Controllers/TeamspeakController.cs index d71abb22..a5c92d18 100644 --- a/UKSFWebsite.Api/Controllers/TeamspeakController.cs +++ b/UKSFWebsite.Api/Controllers/TeamspeakController.cs @@ -20,7 +20,7 @@ public IActionResult GetOnlineClients() { [HttpGet("shutdown"), Authorize, Roles(RoleDefinitions.ADMIN)] public async Task Shutdown() { - teamspeakService.Shutdown(); + await teamspeakService.Shutdown(); await Task.Delay(TimeSpan.FromSeconds(3)); return Ok(); } diff --git a/UKSFWebsite.Api/Controllers/UnitsController.cs b/UKSFWebsite.Api/Controllers/UnitsController.cs index 36cf75d6..60c698b3 100644 --- a/UKSFWebsite.Api/Controllers/UnitsController.cs +++ b/UKSFWebsite.Api/Controllers/UnitsController.cs @@ -135,13 +135,13 @@ await unitsService.Data() if (unit.name != oldUnit.name) { foreach (Account account in accountService.Data().Get(x => x.unitAssignment == oldUnit.name)) { await accountService.Data().Update(account.id, "unitAssignment", unit.name); - teamspeakService.UpdateAccountTeamspeakGroups(accountService.Data().GetSingle(account.id)); + await teamspeakService.UpdateAccountTeamspeakGroups(accountService.Data().GetSingle(account.id)); } } if (unit.teamspeakGroup != oldUnit.teamspeakGroup) { foreach (Account account in unit.members.Select(x => accountService.Data().GetSingle(x))) { - teamspeakService.UpdateAccountTeamspeakGroups(account); + await teamspeakService.UpdateAccountTeamspeakGroups(account); } } diff --git a/UKSFWebsite.Integrations/Startup.cs b/UKSFWebsite.Integrations/Startup.cs index ba1c4baf..006fa6d3 100644 --- a/UKSFWebsite.Integrations/Startup.cs +++ b/UKSFWebsite.Integrations/Startup.cs @@ -13,7 +13,6 @@ using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Events; using UKSFWebsite.Api.Services; using UKSFWebsite.Api.Services.Utility; From dd47114936ba393e9200b6626fb19d5a805fb433 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 21 Nov 2019 22:32:29 +0000 Subject: [PATCH 050/369] Properly close process window before killing, more graceful for teamspeak when signalr not connected. More delay between teamspeak up checks --- .../Teamspeak/TeamspeakManagerService.cs | 17 +++++++++++------ .../Utility/ProcessHelper.cs | 13 ++++++++++++- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs index 21c0f607..56cfcce2 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs @@ -28,7 +28,7 @@ public void Start() { public void Stop() { runTeamspeak = false; token.Cancel(); - Task.Delay(TimeSpan.FromSeconds(5)).Wait(); + Task.Delay(TimeSpan.FromSeconds(10)).Wait(); ShutTeamspeak().Wait(); } @@ -37,7 +37,7 @@ public async Task SendProcedure(TeamspeakProcedureType procedure, object args) { } private async void KeepOnline() { - await TaskUtilities.Delay(TimeSpan.FromSeconds(5), token.Token); + await TaskUtilities.Delay(TimeSpan.FromSeconds(10), token.Token); while (runTeamspeak) { if (VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_RUN").AsBool()) { if (!TeamspeakHubState.Connected) { @@ -50,19 +50,24 @@ private async void KeepOnline() { } } - await TaskUtilities.Delay(TimeSpan.FromSeconds(10), token.Token); + await TaskUtilities.Delay(TimeSpan.FromSeconds(30), token.Token); } } private static async Task LaunchTeamspeak() { - await ProcessHelper.LaunchProcess("Teamspeak", $"start \"\" \"{VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_PATH").AsString()}\""); + await ProcessHelper.LaunchExternalProcess("Teamspeak", $"start \"\" \"{VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_PATH").AsString()}\""); } private async Task ShutTeamspeak() { while (Process.GetProcessesByName("ts3client_win64").Length > 0) { foreach (Process processToKill in Process.GetProcesses().Where(x => x.ProcessName == "ts3client_win64")) { - processToKill.Kill(); - await TaskUtilities.Delay(TimeSpan.FromMilliseconds(100), token.Token); + ProcessHelper.CloseProcessGracefully(processToKill.MainWindowHandle); + processToKill.WaitForExit(5000); + processToKill.Refresh(); + if (!processToKill.HasExited) { + processToKill.Kill(); + await TaskUtilities.Delay(TimeSpan.FromMilliseconds(100), token.Token); + } } } } diff --git a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs index 63a81faa..556fe35a 100644 --- a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs +++ b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs @@ -1,10 +1,14 @@ using System; using System.Management; +using System.Runtime.InteropServices; using Microsoft.Win32.TaskScheduler; using Task = System.Threading.Tasks.Task; namespace UKSFWebsite.Api.Services.Utility { public static class ProcessHelper { + private const int SC_CLOSE = 0xF060; + private const int WM_SYSCOMMAND = 0x0112; + public static int LaunchManagedProcess(string executable, string arguments = null) { int processId = default; using ManagementClass managementClass = new ManagementClass("Win32_Process"); @@ -23,12 +27,19 @@ public static int LaunchManagedProcess(string executable, string arguments = nul return processId; } - public static async Task LaunchProcess(string name, string command) { + public static async Task LaunchExternalProcess(string name, string command) { using TaskDefinition taskDefinition = TaskService.Instance.NewTask(); taskDefinition.Actions.Add(new ExecAction("cmd", $"/C {command}")); taskDefinition.Triggers.Add(new TimeTrigger(DateTime.Now.AddSeconds(1))); TaskService.Instance.RootFolder.RegisterTaskDefinition(name, taskDefinition); await Task.Delay(TimeSpan.FromSeconds(1)); } + + [DllImport("user32.dll", CharSet = CharSet.Auto)] + private static extern int PostMessage(IntPtr hwnd, int msg, int wparam, int lparam); + + public static void CloseProcessGracefully(IntPtr mainWindowHandle) { + PostMessage(mainWindowHandle, WM_SYSCOMMAND, SC_CLOSE, 0); + } } } From 666c0689edebf91cd198563c30c430327de963a3 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 22 Nov 2019 00:14:43 +0000 Subject: [PATCH 051/369] Move process close to external program --- PostMessage/PostMessage.csproj | 8 ++++++++ PostMessage/Program.cs | 13 +++++++++++++ .../Teamspeak/TeamspeakManagerService.cs | 8 +++++--- UKSFWebsite.Api.Services/Utility/ProcessHelper.cs | 9 +++------ UKSFWebsite.Backend.sln | 14 ++++++++++++++ 5 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 PostMessage/PostMessage.csproj create mode 100644 PostMessage/Program.cs diff --git a/PostMessage/PostMessage.csproj b/PostMessage/PostMessage.csproj new file mode 100644 index 00000000..7032f0cb --- /dev/null +++ b/PostMessage/PostMessage.csproj @@ -0,0 +1,8 @@ + + + + Exe + netcoreapp3.0 + + + diff --git a/PostMessage/Program.cs b/PostMessage/Program.cs new file mode 100644 index 00000000..010ceb45 --- /dev/null +++ b/PostMessage/Program.cs @@ -0,0 +1,13 @@ +using System; +using System.Runtime.InteropServices; + +namespace PostMessage { + static class Program { + [DllImport("user32.dll", CharSet = CharSet.Auto)] + private static extern int PostMessage(IntPtr hwnd, int msg, int wparam, int lparam); + + public static void Main(string[] args) { + PostMessage(new IntPtr(int.Parse(args[0])), int.Parse(args[1]), int.Parse(args[2]), int.Parse(args[3])); + } + } +} diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs index 56cfcce2..bc2c6531 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs @@ -13,6 +13,8 @@ namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { public class TeamspeakManagerService : ITeamspeakManagerService { + private const int SC_CLOSE = 0xF060; + private const int WM_SYSCOMMAND = 0x0112; private readonly IHubContext hub; private bool runTeamspeak; private CancellationTokenSource token; @@ -28,7 +30,7 @@ public void Start() { public void Stop() { runTeamspeak = false; token.Cancel(); - Task.Delay(TimeSpan.FromSeconds(10)).Wait(); + Task.Delay(TimeSpan.FromSeconds(5)).Wait(); ShutTeamspeak().Wait(); } @@ -37,7 +39,7 @@ public async Task SendProcedure(TeamspeakProcedureType procedure, object args) { } private async void KeepOnline() { - await TaskUtilities.Delay(TimeSpan.FromSeconds(10), token.Token); + await TaskUtilities.Delay(TimeSpan.FromSeconds(5), token.Token); while (runTeamspeak) { if (VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_RUN").AsBool()) { if (!TeamspeakHubState.Connected) { @@ -61,7 +63,7 @@ private static async Task LaunchTeamspeak() { private async Task ShutTeamspeak() { while (Process.GetProcessesByName("ts3client_win64").Length > 0) { foreach (Process processToKill in Process.GetProcesses().Where(x => x.ProcessName == "ts3client_win64")) { - ProcessHelper.CloseProcessGracefully(processToKill.MainWindowHandle); + await processToKill.CloseProcessGracefully(); processToKill.WaitForExit(5000); processToKill.Refresh(); if (!processToKill.HasExited) { diff --git a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs index 556fe35a..f7a8180e 100644 --- a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs +++ b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs @@ -1,6 +1,6 @@ using System; +using System.Diagnostics; using System.Management; -using System.Runtime.InteropServices; using Microsoft.Win32.TaskScheduler; using Task = System.Threading.Tasks.Task; @@ -35,11 +35,8 @@ public static async Task LaunchExternalProcess(string name, string command) { await Task.Delay(TimeSpan.FromSeconds(1)); } - [DllImport("user32.dll", CharSet = CharSet.Auto)] - private static extern int PostMessage(IntPtr hwnd, int msg, int wparam, int lparam); - - public static void CloseProcessGracefully(IntPtr mainWindowHandle) { - PostMessage(mainWindowHandle, WM_SYSCOMMAND, SC_CLOSE, 0); + public static async Task CloseProcessGracefully(this Process process) { + await LaunchExternalProcess("CloseProcess", $"start \"\" \"PostMessage\" \"{process.MainWindowHandle}, {WM_SYSCOMMAND}, {SC_CLOSE}, 0\""); } } } diff --git a/UKSFWebsite.Backend.sln b/UKSFWebsite.Backend.sln index 87bfe351..738e0bf8 100644 --- a/UKSFWebsite.Backend.sln +++ b/UKSFWebsite.Backend.sln @@ -24,6 +24,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Events", "U EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Signalr", "UKSFWebsite.Api.Signalr\UKSFWebsite.Api.Signalr.csproj", "{6F9B12CA-26BE-45D2-B520-A032490A53F0}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostMessage", "PostMessage\PostMessage.csproj", "{B173771C-1AB7-436B-A6FF-0EF50EF5D015}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -130,6 +132,18 @@ Global {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x64.Build.0 = Release|Any CPU {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x86.ActiveCfg = Release|Any CPU {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x86.Build.0 = Release|Any CPU + {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|x64.ActiveCfg = Debug|Any CPU + {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|x64.Build.0 = Debug|Any CPU + {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|x86.ActiveCfg = Debug|Any CPU + {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|x86.Build.0 = Debug|Any CPU + {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|Any CPU.Build.0 = Release|Any CPU + {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|x64.ActiveCfg = Release|Any CPU + {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|x64.Build.0 = Release|Any CPU + {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|x86.ActiveCfg = Release|Any CPU + {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From a2c10f1627018aba564ae035dfe16b3cae20bdcf Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 22 Nov 2019 00:15:51 +0000 Subject: [PATCH 052/369] Remove unused constants --- .../Integrations/Teamspeak/TeamspeakManagerService.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs index bc2c6531..fe5ad28c 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs @@ -13,8 +13,6 @@ namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { public class TeamspeakManagerService : ITeamspeakManagerService { - private const int SC_CLOSE = 0xF060; - private const int WM_SYSCOMMAND = 0x0112; private readonly IHubContext hub; private bool runTeamspeak; private CancellationTokenSource token; From 5d7f91e07918d4bb3bb129d0021e7f7a09678f3b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 22 Nov 2019 00:28:33 +0000 Subject: [PATCH 053/369] Remove task before running to ensure it can't get stuck. Teamspeak is a singleton, don't bother checking for multiple instances --- .../Teamspeak/TeamspeakManagerService.cs | 19 +++++++++---------- .../Utility/ProcessHelper.cs | 2 ++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs index fe5ad28c..8fdac8e7 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs +++ b/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs @@ -59,16 +59,15 @@ private static async Task LaunchTeamspeak() { } private async Task ShutTeamspeak() { - while (Process.GetProcessesByName("ts3client_win64").Length > 0) { - foreach (Process processToKill in Process.GetProcesses().Where(x => x.ProcessName == "ts3client_win64")) { - await processToKill.CloseProcessGracefully(); - processToKill.WaitForExit(5000); - processToKill.Refresh(); - if (!processToKill.HasExited) { - processToKill.Kill(); - await TaskUtilities.Delay(TimeSpan.FromMilliseconds(100), token.Token); - } - } + Process process = Process.GetProcesses().FirstOrDefault(x => x.ProcessName == "ts3client_win64"); + if (process == null) return; + await process.CloseProcessGracefully(); + process.Refresh(); + process.WaitForExit(5000); + process.Refresh(); + if (!process.HasExited) { + process.Kill(); + await TaskUtilities.Delay(TimeSpan.FromMilliseconds(100), token.Token); } } } diff --git a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs index f7a8180e..61bcbf48 100644 --- a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs +++ b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics; +using System.Linq; using System.Management; using Microsoft.Win32.TaskScheduler; using Task = System.Threading.Tasks.Task; @@ -28,6 +29,7 @@ public static int LaunchManagedProcess(string executable, string arguments = nul } public static async Task LaunchExternalProcess(string name, string command) { + TaskService.Instance.RootFolder.DeleteTask(name, false); using TaskDefinition taskDefinition = TaskService.Instance.NewTask(); taskDefinition.Actions.Add(new ExecAction("cmd", $"/C {command}")); taskDefinition.Triggers.Add(new TimeTrigger(DateTime.Now.AddSeconds(1))); From 22a86c13169f31ae72512debe9b22759201328bd Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 22 Nov 2019 00:35:56 +0000 Subject: [PATCH 054/369] Use process name to close instead of window handle --- PostMessage/Program.cs | 6 +++++- UKSFWebsite.Api.Services/Utility/ProcessHelper.cs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/PostMessage/Program.cs b/PostMessage/Program.cs index 010ceb45..7e24396d 100644 --- a/PostMessage/Program.cs +++ b/PostMessage/Program.cs @@ -1,4 +1,6 @@ using System; +using System.Diagnostics; +using System.Linq; using System.Runtime.InteropServices; namespace PostMessage { @@ -7,7 +9,9 @@ static class Program { private static extern int PostMessage(IntPtr hwnd, int msg, int wparam, int lparam); public static void Main(string[] args) { - PostMessage(new IntPtr(int.Parse(args[0])), int.Parse(args[1]), int.Parse(args[2]), int.Parse(args[3])); + Process process = Process.GetProcesses().FirstOrDefault(x => x.ProcessName == args[0]); + if (process == null) return; + PostMessage(process.MainWindowHandle, int.Parse(args[1]), int.Parse(args[2]), int.Parse(args[3])); } } } diff --git a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs index 61bcbf48..cd5cb807 100644 --- a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs +++ b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs @@ -38,7 +38,7 @@ public static async Task LaunchExternalProcess(string name, string command) { } public static async Task CloseProcessGracefully(this Process process) { - await LaunchExternalProcess("CloseProcess", $"start \"\" \"PostMessage\" \"{process.MainWindowHandle}, {WM_SYSCOMMAND}, {SC_CLOSE}, 0\""); + await LaunchExternalProcess("CloseProcess", $"start \"\" \"PostMessage\" \"{process.ProcessName}, {WM_SYSCOMMAND}, {SC_CLOSE}, 0\""); } } } From 7a81819b292bbae80e61b73d2823e925c6bf2dc6 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 22 Nov 2019 00:42:14 +0000 Subject: [PATCH 055/369] Don't mess up the damn arguments --- UKSFWebsite.Api.Services/Utility/ProcessHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs index cd5cb807..9b2891af 100644 --- a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs +++ b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs @@ -38,7 +38,7 @@ public static async Task LaunchExternalProcess(string name, string command) { } public static async Task CloseProcessGracefully(this Process process) { - await LaunchExternalProcess("CloseProcess", $"start \"\" \"PostMessage\" \"{process.ProcessName}, {WM_SYSCOMMAND}, {SC_CLOSE}, 0\""); + await LaunchExternalProcess("CloseProcess", $"start \"\" \"PostMessage\" \"{process.ProcessName} {WM_SYSCOMMAND} {SC_CLOSE} 0\""); } } } From 0da13bb974a30081cd3dfcff52fb8f4a66843112 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 22 Nov 2019 00:50:51 +0000 Subject: [PATCH 056/369] Fixed arguments for postmessage --- UKSFWebsite.Api.Services/Utility/ProcessHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs index 9b2891af..55dc96ef 100644 --- a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs +++ b/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs @@ -38,7 +38,7 @@ public static async Task LaunchExternalProcess(string name, string command) { } public static async Task CloseProcessGracefully(this Process process) { - await LaunchExternalProcess("CloseProcess", $"start \"\" \"PostMessage\" \"{process.ProcessName} {WM_SYSCOMMAND} {SC_CLOSE} 0\""); + await LaunchExternalProcess("CloseProcess", $"start \"\" \"PostMessage\" {process.ProcessName} {WM_SYSCOMMAND} {SC_CLOSE} 0"); } } } From 22b26a1e81780d761c808d78c4f0fc7c2077f7ff Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 19 Dec 2019 22:26:16 +0000 Subject: [PATCH 057/369] Report discord username when nickname not found --- UKSFWebsite.Api.Services/Integrations/DiscordService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSFWebsite.Api.Services/Integrations/DiscordService.cs b/UKSFWebsite.Api.Services/Integrations/DiscordService.cs index 4190f708..3bf09ef3 100644 --- a/UKSFWebsite.Api.Services/Integrations/DiscordService.cs +++ b/UKSFWebsite.Api.Services/Integrations/DiscordService.cs @@ -130,7 +130,7 @@ private async Task UpdateAccountNickname(IGuildUser user, Account account) { try { await user.ModifyAsync(x => x.Nickname = name); } catch (Exception) { - LogWrapper.Log($"Failed to update nickname for {user.Nickname}. Must manually be changed to: {name}"); + LogWrapper.Log($"Failed to update nickname for {(string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname)}. Must manually be changed to: {name}"); } } } From cb2d727de668231e7666c7d5ad5a1d9c11657c51 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 26 Dec 2019 02:20:30 +0000 Subject: [PATCH 058/369] Don't need to authorize for teamspeak clients hub --- UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs b/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs index 2b7b1d15..d5c65848 100644 --- a/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs +++ b/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs @@ -3,7 +3,6 @@ using UKSFWebsite.Api.Interfaces.Hubs; namespace UKSFWebsite.Api.Signalr.Hubs.Integrations { - [Authorize] public class TeamspeakClientsHub : Hub { public const string END_POINT = "teamspeakClients"; } From 3ebad8c5c6f455d6e5bbfcd2956276a41e62e0e9 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 2 Jan 2020 20:52:24 +0000 Subject: [PATCH 059/369] Change logging to use a data service and an event bus. Added logging to discord connect. Fail discord connect properly when user cancels authorization --- .../Message/LogDataService.cs | 34 +++++++++++++ .../EventHandlerInitialiser.cs | 12 ++++- .../Handlers/LogEventHandler.cs | 50 +++++++++++++++++++ .../Data/ILogDataService.cs | 10 ++++ .../Events/Handlers/ILogEventHandler.cs | 3 ++ .../Message/ILoggingService.cs | 3 +- .../Events/EventModelFactory.cs | 1 + .../Message/LoggingService.cs | 27 +++++----- UKSFWebsite.Api/Startup.cs | 5 +- .../Controllers/DiscordController.cs | 12 ++++- UKSFWebsite.Integrations/Startup.cs | 17 +++++++ 11 files changed, 154 insertions(+), 20 deletions(-) create mode 100644 UKSFWebsite.Api.Data/Message/LogDataService.cs create mode 100644 UKSFWebsite.Api.Events/Handlers/LogEventHandler.cs create mode 100644 UKSFWebsite.Api.Interfaces/Data/ILogDataService.cs create mode 100644 UKSFWebsite.Api.Interfaces/Events/Handlers/ILogEventHandler.cs diff --git a/UKSFWebsite.Api.Data/Message/LogDataService.cs b/UKSFWebsite.Api.Data/Message/LogDataService.cs new file mode 100644 index 00000000..58f97fe5 --- /dev/null +++ b/UKSFWebsite.Api.Data/Message/LogDataService.cs @@ -0,0 +1,34 @@ +using System.Threading.Tasks; +using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Models.Events; +using UKSFWebsite.Api.Models.Message.Logging; + +namespace UKSFWebsite.Api.Data.Message { + public class LogDataService : DataService, ILogDataService { + private readonly IMongoDatabase database; + + public LogDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "logs") => this.database = database; + + public override async Task Add(BasicLogMessage log) { + await base.Add(log); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(log), log)); + } + + public async Task Add(AuditLogMessage log) { + await database.GetCollection("auditLogs").InsertOneAsync(log); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(log), log)); + } + + public async Task Add(LauncherLogMessage log) { + await database.GetCollection("launcherLogs").InsertOneAsync(log); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(log), log)); + } + + public async Task Add(WebLogMessage log) { + await database.GetCollection("errorLogs").InsertOneAsync(log); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(log), log)); + } + } +} diff --git a/UKSFWebsite.Api.Events/EventHandlerInitialiser.cs b/UKSFWebsite.Api.Events/EventHandlerInitialiser.cs index d503db21..61264bdb 100644 --- a/UKSFWebsite.Api.Events/EventHandlerInitialiser.cs +++ b/UKSFWebsite.Api.Events/EventHandlerInitialiser.cs @@ -5,13 +5,22 @@ public class EventHandlerInitialiser { private readonly IAccountEventHandler accountEventHandler; private readonly ICommandRequestEventHandler commandRequestEventHandler; private readonly ICommentThreadEventHandler commentThreadEventHandler; + private readonly ILogEventHandler logEventHandler; private readonly INotificationsEventHandler notificationsEventHandler; private readonly ITeamspeakEventHandler teamspeakEventHandler; - public EventHandlerInitialiser(IAccountEventHandler accountEventHandler, ICommandRequestEventHandler commandRequestEventHandler, ICommentThreadEventHandler commentThreadEventHandler, INotificationsEventHandler notificationsEventHandler, ITeamspeakEventHandler teamspeakEventHandler) { + public EventHandlerInitialiser( + IAccountEventHandler accountEventHandler, + ICommandRequestEventHandler commandRequestEventHandler, + ICommentThreadEventHandler commentThreadEventHandler, + ILogEventHandler logEventHandler, + INotificationsEventHandler notificationsEventHandler, + ITeamspeakEventHandler teamspeakEventHandler + ) { this.accountEventHandler = accountEventHandler; this.commandRequestEventHandler = commandRequestEventHandler; this.commentThreadEventHandler = commentThreadEventHandler; + this.logEventHandler = logEventHandler; this.notificationsEventHandler = notificationsEventHandler; this.teamspeakEventHandler = teamspeakEventHandler; } @@ -20,6 +29,7 @@ public void InitEventHandlers() { accountEventHandler.Init(); commandRequestEventHandler.Init(); commentThreadEventHandler.Init(); + logEventHandler.Init(); notificationsEventHandler.Init(); teamspeakEventHandler.Init(); } diff --git a/UKSFWebsite.Api.Events/Handlers/LogEventHandler.cs b/UKSFWebsite.Api.Events/Handlers/LogEventHandler.cs new file mode 100644 index 00000000..7660dc51 --- /dev/null +++ b/UKSFWebsite.Api.Events/Handlers/LogEventHandler.cs @@ -0,0 +1,50 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.SignalR; +using UKSFWebsite.Api.Interfaces.Data; +using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSFWebsite.Api.Interfaces.Events.Handlers; +using UKSFWebsite.Api.Interfaces.Hubs; +using UKSFWebsite.Api.Models.Events; +using UKSFWebsite.Api.Models.Message.Logging; +using UKSFWebsite.Api.Signalr.Hubs.Personnel; +using UKSFWebsite.Api.Signalr.Hubs.Utility; + +namespace UKSFWebsite.Api.Events.Handlers { + public class LogEventHandler : ILogEventHandler { + private readonly ILogDataService data; + private readonly IHubContext hub; + + public LogEventHandler(ILogDataService data, IHubContext hub) { + this.data = data; + this.hub = hub; + } + + public void Init() { + data.EventBus() + .Subscribe( + async x => { + if (x.type == DataEventType.ADD) await AddedEvent(x.data); + } + ); + } + + private async Task AddedEvent(object log) { + switch (log) { + case AuditLogMessage message: + await hub.Clients.All.ReceiveAuditLog(message); + break; + case LauncherLogMessage message: + await hub.Clients.All.ReceiveLauncherLog(message); + break; + case WebLogMessage message: + await hub.Clients.All.ReceiveErrorLog(message); + break; + default: + BasicLogMessage basicLogMessage = log as BasicLogMessage; + await hub.Clients.All.ReceiveLog(basicLogMessage); + break; + } + } + } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/ILogDataService.cs b/UKSFWebsite.Api.Interfaces/Data/ILogDataService.cs new file mode 100644 index 00000000..576f4240 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Data/ILogDataService.cs @@ -0,0 +1,10 @@ +using System.Threading.Tasks; +using UKSFWebsite.Api.Models.Message.Logging; + +namespace UKSFWebsite.Api.Interfaces.Data { + public interface ILogDataService : IDataService { + Task Add(AuditLogMessage log); + Task Add(LauncherLogMessage log); + Task Add(WebLogMessage log); + } +} diff --git a/UKSFWebsite.Api.Interfaces/Events/Handlers/ILogEventHandler.cs b/UKSFWebsite.Api.Interfaces/Events/Handlers/ILogEventHandler.cs new file mode 100644 index 00000000..c7584a67 --- /dev/null +++ b/UKSFWebsite.Api.Interfaces/Events/Handlers/ILogEventHandler.cs @@ -0,0 +1,3 @@ +namespace UKSFWebsite.Api.Interfaces.Events.Handlers { + public interface ILogEventHandler : IEventHandler { } +} diff --git a/UKSFWebsite.Api.Interfaces/Message/ILoggingService.cs b/UKSFWebsite.Api.Interfaces/Message/ILoggingService.cs index f4185fb3..5b653da4 100644 --- a/UKSFWebsite.Api.Interfaces/Message/ILoggingService.cs +++ b/UKSFWebsite.Api.Interfaces/Message/ILoggingService.cs @@ -1,8 +1,9 @@ using System; +using UKSFWebsite.Api.Interfaces.Data; using UKSFWebsite.Api.Models.Message.Logging; namespace UKSFWebsite.Api.Interfaces.Message { - public interface ILoggingService { + public interface ILoggingService : IDataBackedService { void Log(string message); void Log(BasicLogMessage log); void Log(Exception exception); diff --git a/UKSFWebsite.Api.Models/Events/EventModelFactory.cs b/UKSFWebsite.Api.Models/Events/EventModelFactory.cs index 4d414d7f..9c689bd2 100644 --- a/UKSFWebsite.Api.Models/Events/EventModelFactory.cs +++ b/UKSFWebsite.Api.Models/Events/EventModelFactory.cs @@ -1,4 +1,5 @@ using UKSFWebsite.Api.Models.Events.Types; +using UKSFWebsite.Api.Models.Message.Logging; namespace UKSFWebsite.Api.Models.Events { public static class EventModelFactory { diff --git a/UKSFWebsite.Api.Services/Message/LoggingService.cs b/UKSFWebsite.Api.Services/Message/LoggingService.cs index f012f6c5..445e317a 100644 --- a/UKSFWebsite.Api.Services/Message/LoggingService.cs +++ b/UKSFWebsite.Api.Services/Message/LoggingService.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; +using UKSFWebsite.Api.Interfaces.Data; using UKSFWebsite.Api.Interfaces.Hubs; using UKSFWebsite.Api.Interfaces.Message; using UKSFWebsite.Api.Interfaces.Personnel; @@ -11,16 +12,16 @@ namespace UKSFWebsite.Api.Services.Message { public class LoggingService : ILoggingService { - private readonly IHubContext adminHub; - private readonly IMongoDatabase database; + private readonly ILogDataService data; private readonly IDisplayNameService displayNameService; - public LoggingService(IMongoDatabase database, IDisplayNameService displayNameService, IHubContext adminHub) { - this.database = database; + public LoggingService(ILogDataService data, IDisplayNameService displayNameService) { + this.data = data; this.displayNameService = displayNameService; - this.adminHub = adminHub; } + public ILogDataService Data() => data; + public void Log(string message) { Task unused = LogAsync(new BasicLogMessage(message)); } @@ -45,21 +46,17 @@ public void Log(Exception exception) { private async Task LogToStorage(BasicLogMessage log) { switch (log) { - case WebLogMessage message: - await database.GetCollection("errorLogs").InsertOneAsync(message); - await adminHub.Clients.All.ReceiveErrorLog(message); - break; case AuditLogMessage message: - await database.GetCollection("auditLogs").InsertOneAsync(message); - await adminHub.Clients.All.ReceiveAuditLog(message); + await data.Add(message); break; case LauncherLogMessage message: - await database.GetCollection("launcherLogs").InsertOneAsync(message); - await adminHub.Clients.All.ReceiveLauncherLog(message); + await data.Add(message); + break; + case WebLogMessage message: + await data.Add(message); break; default: - await database.GetCollection("logs").InsertOneAsync(log); - await adminHub.Clients.All.ReceiveLog(log); + await data.Add(log); break; } } diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index fbe9bad1..205da7cf 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -227,7 +227,6 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); if (currentEnvironment.IsDevelopment()) { @@ -250,6 +249,7 @@ private static void RegisterEventServices(this IServiceCollection services) { services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); @@ -265,6 +265,7 @@ private static void RegisterEventServices(this IServiceCollection services) { services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); } @@ -272,6 +273,7 @@ private static void RegisterEventServices(this IServiceCollection services) { private static void RegisterDataServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { // Non-Cached services.AddTransient(); + services.AddSingleton(); services.AddTransient(); // Cached @@ -300,6 +302,7 @@ private static void RegisterDataServices(this IServiceCollection services, IHost private static void RegisterDataBackedServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { // Non-Cached services.AddTransient(); + services.AddSingleton(); services.AddTransient(); // Cached diff --git a/UKSFWebsite.Integrations/Controllers/DiscordController.cs b/UKSFWebsite.Integrations/Controllers/DiscordController.cs index 3fe7362b..eab04e83 100644 --- a/UKSFWebsite.Integrations/Controllers/DiscordController.cs +++ b/UKSFWebsite.Integrations/Controllers/DiscordController.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Net.Http; using System.Net.Http.Headers; using System.Text; @@ -10,6 +11,7 @@ using Newtonsoft.Json.Linq; using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Services.Admin; +using UKSFWebsite.Api.Services.Message; namespace UKSFWebsite.Integrations.Controllers { [Route("[controller]")] @@ -60,13 +62,19 @@ private async Task GetUrlParameters(string code, string redirectUrl) { ) ); string result = await response.Content.ReadAsStringAsync(); + if (!response.IsSuccessStatusCode) { + LogWrapper.Log("A discord connection request was denied"); + return "discordid=fail"; + } string token = JObject.Parse(result)["access_token"].ToString(); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token); response = await client.GetAsync("https://discordapp.com/api/users/@me"); string user = await response.Content.ReadAsStringAsync(); string id = JObject.Parse(user)["id"].ToString(); + string username = JObject.Parse(user)["username"].ToString(); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bot", botToken); - await client.PutAsync($"https://discordapp.com/api/guilds/{VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json")); + response = await client.PutAsync($"https://discordapp.com/api/guilds/{VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json")); + LogWrapper.Log($"Tried to add '{username}' to guild: {response.StatusCode}, {response.Content.ReadAsStringAsync().Result}"); string confirmationCode = await confirmationCodeService.CreateConfirmationCode(id, true); return $"validation={confirmationCode}&discordid={id}"; } diff --git a/UKSFWebsite.Integrations/Startup.cs b/UKSFWebsite.Integrations/Startup.cs index 006fa6d3..b482442d 100644 --- a/UKSFWebsite.Integrations/Startup.cs +++ b/UKSFWebsite.Integrations/Startup.cs @@ -7,13 +7,19 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using UKSFWebsite.Api.Data.Admin; +using UKSFWebsite.Api.Data.Message; +using UKSFWebsite.Api.Data.Personnel; using UKSFWebsite.Api.Data.Utility; using UKSFWebsite.Api.Events.Data; using UKSFWebsite.Api.Interfaces.Data; using UKSFWebsite.Api.Interfaces.Data.Cached; using UKSFWebsite.Api.Interfaces.Events; +using UKSFWebsite.Api.Interfaces.Message; +using UKSFWebsite.Api.Interfaces.Personnel; using UKSFWebsite.Api.Interfaces.Utility; using UKSFWebsite.Api.Services; +using UKSFWebsite.Api.Services.Message; +using UKSFWebsite.Api.Services.Personnel; using UKSFWebsite.Api.Services.Utility; namespace UKSFWebsite.Integrations { @@ -63,12 +69,23 @@ public static IServiceCollection RegisterServices(this IServiceCollection servic services.AddSingleton(configuration); services.AddSingleton(_ => MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); services.AddSingleton(); + services.AddSingleton(); + services.AddTransient(); + services.AddSingleton(); + services.AddTransient(); + + services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); // Event Buses + services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); From b8a4f5cef5c9108dd2f359e5bec183b2412e1788 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 4 Jan 2020 13:33:35 +0000 Subject: [PATCH 060/369] Added parameter to discord connect output to indicate if user was added to guild --- .../Controllers/DiscordController.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/UKSFWebsite.Integrations/Controllers/DiscordController.cs b/UKSFWebsite.Integrations/Controllers/DiscordController.cs index eab04e83..8075df75 100644 --- a/UKSFWebsite.Integrations/Controllers/DiscordController.cs +++ b/UKSFWebsite.Integrations/Controllers/DiscordController.cs @@ -74,9 +74,14 @@ private async Task GetUrlParameters(string code, string redirectUrl) { string username = JObject.Parse(user)["username"].ToString(); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bot", botToken); response = await client.PutAsync($"https://discordapp.com/api/guilds/{VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json")); - LogWrapper.Log($"Tried to add '{username}' to guild: {response.StatusCode}, {response.Content.ReadAsStringAsync().Result}"); + string added = "true"; + if (!response.IsSuccessStatusCode) { + LogWrapper.Log($"Failed to add '{username}' to guild: {response.StatusCode}, {response.Content.ReadAsStringAsync().Result}"); + added = "false"; + } + string confirmationCode = await confirmationCodeService.CreateConfirmationCode(id, true); - return $"validation={confirmationCode}&discordid={id}"; + return $"validation={confirmationCode}&discordid={id}&added={added}"; } } } From 1509469b37d4a9f392a17670ac2825c52c6e5947 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 4 Jan 2020 16:48:36 +0000 Subject: [PATCH 061/369] Formatting --- UKSFWebsite.Integrations/Controllers/DiscordController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/UKSFWebsite.Integrations/Controllers/DiscordController.cs b/UKSFWebsite.Integrations/Controllers/DiscordController.cs index 8075df75..7bf16ae0 100644 --- a/UKSFWebsite.Integrations/Controllers/DiscordController.cs +++ b/UKSFWebsite.Integrations/Controllers/DiscordController.cs @@ -72,6 +72,7 @@ private async Task GetUrlParameters(string code, string redirectUrl) { string user = await response.Content.ReadAsStringAsync(); string id = JObject.Parse(user)["id"].ToString(); string username = JObject.Parse(user)["username"].ToString(); + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bot", botToken); response = await client.PutAsync($"https://discordapp.com/api/guilds/{VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json")); string added = "true"; From 7edf7653a9cf08bba56394cdf00d7528585a5c93 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 5 Jan 2020 16:42:43 +0000 Subject: [PATCH 062/369] Revert "Temporarily disable signature checking" This reverts commit 6107ef76 --- UKSFWebsite.Api.Services/Game/GameServerHelpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs b/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs index 3110e07d..2d7fe86d 100644 --- a/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs +++ b/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs @@ -19,7 +19,7 @@ public static class GameServerHelpers { "motdInterval = 999999;", "maxPlayers = {3};", "kickDuplicate = 1;", - "verifySignatures = 0;", + "verifySignatures = 2;", "allowedFilePatching = 1;", "unsafeCVL = 1;", "disableVoN = 1;", From 3816034543499adb6ae71ce3a002782daee7a31d Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 6 Jan 2020 00:52:08 +0000 Subject: [PATCH 063/369] Revert "Revert "Temporarily disable signature checking"" This reverts commit 7edf7653a9cf08bba56394cdf00d7528585a5c93. --- UKSFWebsite.Api.Services/Game/GameServerHelpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs b/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs index 2d7fe86d..3110e07d 100644 --- a/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs +++ b/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs @@ -19,7 +19,7 @@ public static class GameServerHelpers { "motdInterval = 999999;", "maxPlayers = {3};", "kickDuplicate = 1;", - "verifySignatures = 2;", + "verifySignatures = 0;", "allowedFilePatching = 1;", "unsafeCVL = 1;", "disableVoN = 1;", From bdb4f25f142a763ad1b5ee318911ec7d1c53c776 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 20 Jan 2020 10:14:17 +0000 Subject: [PATCH 064/369] Added swagger api docs --- .../CommandRequests/CommandRequestsCreationController.cs | 2 +- UKSFWebsite.Api/Startup.cs | 4 ++++ UKSFWebsite.Api/UKSFWebsite.Api.csproj | 1 + UKSFWebsite.Integrations/Startup.cs | 4 ++++ UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj | 1 + 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs b/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs index e1bcd273..ae678c43 100644 --- a/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs +++ b/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs @@ -13,7 +13,7 @@ using UKSFWebsite.Api.Services.Personnel; namespace UKSFWebsite.Api.Controllers.CommandRequests { - [Route("commandrequests/create")] + [Route("CommandRequests/Create")] public class CommandRequestsCreationController : Controller { private readonly IAccountService accountService; private readonly ICommandRequestService commandRequestService; diff --git a/UKSFWebsite.Api/Startup.cs b/UKSFWebsite.Api/Startup.cs index 205da7cf..c9790f4e 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSFWebsite.Api/Startup.cs @@ -13,6 +13,7 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Primitives; using Microsoft.IdentityModel.Tokens; +using Microsoft.OpenApi.Models; using UKSFWebsite.Api.Data; using UKSFWebsite.Api.Data.Admin; using UKSFWebsite.Api.Data.Command; @@ -120,6 +121,7 @@ public void ConfigureServices(IServiceCollection services) { ExceptionHandler.Instance = new ExceptionHandler(); services.AddControllers(); + services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo {Title = "UKSF API", Version = "v1"}); }); services.AddMvc(options => { options.Filters.Add(ExceptionHandler.Instance); }).AddNewtonsoftJson(); } @@ -127,6 +129,8 @@ public void ConfigureServices(IServiceCollection services) { public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostApplicationLifetime) { hostApplicationLifetime.ApplicationStopping.Register(OnShutdown); app.UseStaticFiles(); + app.UseSwagger(); + app.UseSwaggerUI(options => {options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF API v1");}); app.UseRouting(); app.UseCors("CorsPolicy"); app.UseCorsMiddleware(); diff --git a/UKSFWebsite.Api/UKSFWebsite.Api.csproj b/UKSFWebsite.Api/UKSFWebsite.Api.csproj index 9e02c126..e5b6d2d4 100644 --- a/UKSFWebsite.Api/UKSFWebsite.Api.csproj +++ b/UKSFWebsite.Api/UKSFWebsite.Api.csproj @@ -28,6 +28,7 @@ + diff --git a/UKSFWebsite.Integrations/Startup.cs b/UKSFWebsite.Integrations/Startup.cs index b482442d..2141b736 100644 --- a/UKSFWebsite.Integrations/Startup.cs +++ b/UKSFWebsite.Integrations/Startup.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using Microsoft.OpenApi.Models; using UKSFWebsite.Api.Data.Admin; using UKSFWebsite.Api.Data.Message; using UKSFWebsite.Api.Data.Personnel; @@ -39,10 +40,13 @@ public void ConfigureServices(IServiceCollection services) { services.AddAuthentication(options => { options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme; }).AddCookie().AddSteam(); services.AddControllers(); + services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo {Title = "UKSF Integrations API", Version = "v1"}); }); services.AddMvc().AddNewtonsoftJson(); } public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFactory loggerFactory) { + app.UseSwagger(); + app.UseSwaggerUI(options => {options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF Integrations API v1");}); app.UseRouting(); app.UseCors("CorsPolicy"); app.UseAuthentication(); diff --git a/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj b/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj index 9f131455..1bc3f768 100644 --- a/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj +++ b/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj @@ -14,6 +14,7 @@ + From bb714cfdaaf4c5b616a955a7bdd5cfcb45b3429f Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 21 Jan 2020 23:13:55 +0000 Subject: [PATCH 065/369] Update some packages --- UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj | 2 +- UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj | 4 ++-- UKSFWebsite.Api/UKSFWebsite.Api.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj b/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj index 5b383b8b..e6700787 100644 --- a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj +++ b/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj @@ -10,6 +10,6 @@ true - + \ No newline at end of file diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index 7e1e1a68..8160eae4 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -16,12 +16,12 @@ - + - + diff --git a/UKSFWebsite.Api/UKSFWebsite.Api.csproj b/UKSFWebsite.Api/UKSFWebsite.Api.csproj index e5b6d2d4..d8e880c8 100644 --- a/UKSFWebsite.Api/UKSFWebsite.Api.csproj +++ b/UKSFWebsite.Api/UKSFWebsite.Api.csproj @@ -26,7 +26,7 @@ - + From 2cbad8952b301bbdeeb4921e5c168779f3eee6e8 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 22 Jan 2020 10:46:47 +0000 Subject: [PATCH 066/369] Update .net.http and .text.regex packages --- UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj | 1 + UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj | 1 + UKSFWebsite.Api/UKSFWebsite.Api.csproj | 2 ++ UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj | 1 + 4 files changed, 5 insertions(+) diff --git a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj b/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj index e6700787..8afd3b16 100644 --- a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj +++ b/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj @@ -11,5 +11,6 @@ + \ No newline at end of file diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index 8160eae4..11ae451e 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -21,6 +21,7 @@ + diff --git a/UKSFWebsite.Api/UKSFWebsite.Api.csproj b/UKSFWebsite.Api/UKSFWebsite.Api.csproj index d8e880c8..4d9f205b 100644 --- a/UKSFWebsite.Api/UKSFWebsite.Api.csproj +++ b/UKSFWebsite.Api/UKSFWebsite.Api.csproj @@ -29,6 +29,8 @@ + + diff --git a/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj b/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj index 1bc3f768..6693bcaf 100644 --- a/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj +++ b/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj @@ -15,6 +15,7 @@ + From 55652ae19bffebbee869ec9d502f651780c8fe05 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 22 Jan 2020 10:48:42 +0000 Subject: [PATCH 067/369] Update regex package for models and services --- UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj | 1 + UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj b/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj index 8afd3b16..9bbae269 100644 --- a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj +++ b/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj @@ -12,5 +12,6 @@ + \ No newline at end of file diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj index 11ae451e..f5f4771f 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj @@ -22,6 +22,7 @@ + From ab8e5779e8eb51c478d8f51fe907660befb792a6 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 30 Jan 2020 17:01:56 +0000 Subject: [PATCH 068/369] Rename UKSFWebsite to UKSF. Namespace root is now UKSF. --- .gitignore | 2 - .vscode/launch.json | 28 ----- .vscode/tasks.json | 15 --- .../Admin/VariablesDataService.cs | 10 +- .../CachedDataService.cs | 6 +- .../CommandRequestArchiveDataService.cs | 8 +- .../Command/CommandRequestDataService.cs | 8 +- .../DataService.cs | 10 +- .../Fake/FakeNotificationsDataService.cs | 8 +- .../Game/GameServersDataService.cs | 8 +- .../Launcher/LauncherFileDataService.cs | 8 +- .../Message/CommentThreadDataService.cs | 10 +- .../Message/LogDataService.cs | 10 +- .../Message/NotificationsDataService.cs | 8 +- .../Operations/OperationOrderDataService.cs | 8 +- .../Operations/OperationReportDataService.cs | 8 +- .../Personnel/AccountDataService.cs | 8 +- .../Personnel/DischargeDataService.cs | 8 +- .../Personnel/LoaDataService.cs | 8 +- .../Personnel/RanksDataService.cs | 8 +- .../Personnel/RolesDataService.cs | 8 +- .../UKSF.Api.Data.csproj | 4 +- .../Units/UnitsDataService.cs | 8 +- .../Utility/ConfirmationCodeDataService.cs | 8 +- .../Utility/SchedulerDataService.cs | 8 +- .../Data/DataEventBacker.cs | 6 +- .../Data/DataEventBus.cs | 6 +- .../EventBus.cs | 4 +- .../EventHandlerInitialiser.cs | 4 +- .../Handlers/AccountEventHandler.cs | 12 +- .../Handlers/CommandRequestEventHandler.cs | 12 +- .../Handlers/CommentThreadEventHandler.cs | 16 +-- .../Handlers/LogEventHandler.cs | 16 ++- .../Handlers/NotificationsEventHandler.cs | 14 +-- .../Handlers/TeamspeakEventHandler.cs | 18 +-- .../SignalrServer/SignalrEventBus.cs | 6 +- .../UKSF.Api.Events.csproj | 8 +- .../Command/IChainOfCommandService.cs | 6 +- .../ICommandRequestCompletionService.cs | 2 +- .../Command/ICommandRequestService.cs | 6 +- .../Data/Cached/IAccountDataService.cs | 4 +- .../Data/Cached/ICommandRequestDataService.cs | 4 +- .../Data/Cached/ICommentThreadDataService.cs | 6 +- .../Data/Cached/IDischargeDataService.cs | 4 +- .../Data/Cached/IGameServersDataService.cs | 4 +- .../Data/Cached/ILauncherFileDataService.cs | 4 +- .../Data/Cached/ILoaDataService.cs | 5 + .../Data/Cached/INotificationsDataService.cs | 4 +- .../Data/Cached/IOperationOrderDataService.cs | 4 +- .../Cached/IOperationReportDataService.cs | 4 +- .../Data/Cached/IRanksDataService.cs | 4 +- .../Data/Cached/IRolesDataService.cs | 4 +- .../Data/Cached/IUnitsDataService.cs | 5 + .../Data/Cached/IVariablesDataService.cs | 4 +- .../Data/ICommandRequestArchiveDataService.cs | 4 +- .../Data/IConfirmationCodeDataService.cs | 4 +- .../Data/IDataService.cs | 4 +- .../Data/ILogDataService.cs | 4 +- .../Data/ISchedulerDataService.cs | 4 +- .../Events/Handlers/IAccountEventHandler.cs | 2 +- .../Handlers/ICommandRequestEventHandler.cs | 2 +- .../Handlers/ICommentThreadEventHandler.cs | 2 +- .../Events/Handlers/IEventHandler.cs | 2 +- .../Events/Handlers/ILogEventHandler.cs | 2 +- .../Handlers/INotificationsEventHandler.cs | 2 +- .../Events/Handlers/ITeamspeakEventHandler.cs | 2 +- .../Events/IDataEventBacker.cs | 4 +- .../Events/IDataEventBus.cs | 4 +- .../Events/IEventBus.cs | 2 +- .../Events/ISignalrEventBus.cs | 5 + .../Game/IGameServersService.cs | 8 +- .../Game/IMissionPatchingService.cs | 4 +- .../Hubs/IAccountClient.cs | 2 +- .../Hubs/IAdminClient.cs | 4 +- .../Hubs/ICommandRequestsClient.cs | 2 +- .../Hubs/ICommentThreadClient.cs | 2 +- .../Hubs/ILauncherClient.cs | 2 +- .../Hubs/INotificationsClient.cs | 2 +- .../Hubs/IServersClient.cs | 2 +- .../Hubs/ITeamspeakClient.cs | 4 +- .../Hubs/ITeamspeakClientsClient.cs | 2 +- .../Hubs/IUtilityClient.cs | 2 +- .../IDataBackedService.cs | 2 +- .../Integrations/IDiscordService.cs | 4 +- .../Integrations/IPipeManager.cs | 2 +- .../Integrations/ISocket.cs | 2 +- .../Teamspeak/ITeamspeakGroupService.cs | 4 +- .../Teamspeak/ITeamspeakManagerService.cs | 4 +- .../Teamspeak/ITeamspeakMetricsService.cs | 2 +- .../Teamspeak/ITeamspeakService.cs | 6 +- .../Launcher/ILauncherFileService.cs | 6 +- .../Launcher/ILauncherService.cs | 3 + .../Message/ICommentThreadService.cs | 6 +- .../Message/IEmailService.cs | 2 +- .../Message/ILoggingService.cs | 6 +- .../Message/INotificationsService.cs | 8 +- .../Operations/IOperationOrderService.cs | 6 +- .../Operations/IOperationReportService.cs | 6 +- .../Personnel/IAccountService.cs | 5 + .../Personnel/IAssignmentService.cs | 4 +- .../Personnel/IAttendanceService.cs | 4 +- .../Personnel/IDischargeService.cs | 5 + .../Personnel/IDisplayNameService.cs | 4 +- .../Personnel/ILoaService.cs | 8 +- .../Personnel/IRanksService.cs | 4 +- .../Personnel/IRecruitmentService.cs | 4 +- .../Personnel/IRolesService.cs | 6 +- .../Personnel/IServiceRecordService.cs | 2 +- .../UKSF.Api.Interfaces.csproj | 2 +- .../Units/IUnitsService.cs | 8 +- .../Utility/IConfirmationCodeService.cs | 4 +- .../Utility/ILoginService.cs | 2 +- .../Utility/ISchedulerService.cs | 6 +- .../Utility/IServerService.cs | 2 +- .../Utility/ISessionService.cs | 4 +- .../Admin/VariableItem.cs | 2 +- .../Command/ChainOfCommandMode.cs | 2 +- .../Command/CommandRequest.cs | 2 +- .../Command/CommandRequestLoa.cs | 2 +- .../Events/DataEventModel.cs | 8 +- .../Events/EventModelFactory.cs | 5 +- .../Events/SignalrEventModel.cs | 4 +- .../Events/Types/TeamspeakEventType.cs | 2 +- .../Game/GameServer.cs | 2 +- .../Game/GameServerMod.cs | 2 +- .../Game/MissionFile.cs | 2 +- .../Integrations/TeamspeakClient.cs | 2 +- .../Integrations/TeamspeakProcedureType.cs | 2 +- .../TeamspeakServerGroupUpdate.cs | 2 +- .../Integrations/TeamspeakServerSnapshot.cs | 2 +- .../Launcher/LauncherFile.cs | 2 +- .../Message/Comment.cs | 2 +- .../Message/CommentThread.cs | 2 +- .../Message/Logging/AuditLogMessage.cs | 2 +- .../Message/Logging/BasicLogMessage.cs | 2 +- .../Message/Logging/LauncherLogMessage.cs | 2 +- .../Message/Logging/WebLogMessage.cs | 2 +- .../Message/Notification.cs | 2 +- .../Message/NotificationIcons.cs | 2 +- .../Mission/Mission.cs | 2 +- .../Mission/MissionEntity.cs | 2 +- .../Mission/MissionEntityItem.cs | 2 +- .../Mission/MissionPatchData.cs | 4 +- .../Mission/MissionPatchingReport.cs | 2 +- .../Mission/MissionPatchingResult.cs | 2 +- .../Mission/MissionPlayer.cs | 4 +- .../Mission/MissionUnit.cs | 4 +- .../Operations/CreateOperationOrderRequest.cs | 2 +- .../Operations/CreateOperationReport.cs | 2 +- .../Operations/Operation.cs | 4 +- .../Operations/Opord.cs | 2 +- .../Operations/Oprep.cs | 4 +- .../Personnel/Account.cs | 2 +- .../Personnel/AccountAttendanceStatus.cs | 2 +- .../Personnel/AccountSettings.cs | 2 +- .../Personnel/Application.cs | 2 +- .../Personnel/AttendanceReport.cs | 2 +- .../Personnel/Discharge.cs | 2 +- .../Personnel/Loa.cs | 2 +- .../Personnel/MembershipState.cs | 2 +- .../Personnel/Rank.cs | 2 +- .../Personnel/Role.cs | 2 +- .../Personnel/ServiceRecord.cs | 2 +- .../UKSF.Api.Models.csproj | 6 +- .../UKSF.Api.Models.csproj.DotSettings | 1 + .../UKSFWebsite.Api.Models.csproj.DotSettings | 0 .../Units/Unit.cs | 2 +- .../Utility/ConfirmationCode.cs | 2 +- .../Utility/ScheduledJob.cs | 2 +- .../Utility/UtilityObject.cs | 2 +- .../Admin/MigrationUtility.cs | 12 +- .../Admin/VariablesService.cs | 6 +- .../Admin/VariablesWrapper.cs | 4 +- .../Command/ChainOfCommandService.cs | 18 +-- .../CommandRequestCompletionService.cs | 30 ++--- .../Command/CommandRequestService.cs | 26 ++--- .../Fake/FakeCachedDataService.cs | 2 +- .../Fake/FakeDataService.cs | 6 +- .../Fake/FakeDiscordService.cs | 10 +- .../Fake/FakeNotificationsService.cs | 10 +- .../Fake/FakePipeManager.cs | 4 +- .../Fake/FakeTeamspeakManagerService.cs | 6 +- .../Game/GameServerHelpers.cs | 8 +- .../Game/GameServersService.cs | 12 +- .../Game/Missions/MissionDataResolver.cs | 4 +- .../Game/Missions/MissionEntityHelper.cs | 4 +- .../Game/Missions/MissionEntityItemHelper.cs | 4 +- .../Game/Missions/MissionPatchDataService.cs | 12 +- .../Game/Missions/MissionPatchingService.cs | 12 +- .../Game/Missions/MissionService.cs | 8 +- .../Game/Missions/MissionUtilities.cs | 2 +- .../Game/ServerService.cs | 14 +-- .../Integrations/DiscordService.cs | 18 +-- .../Integrations/PipeManager.cs | 4 +- .../Integrations/PipeQueueManager.cs | 2 +- .../Teamspeak/TeamspeakGroupService.cs | 18 +-- .../Teamspeak/TeamspeakManagerService.cs | 14 +-- .../Teamspeak/TeamspeakMetricsService.cs | 4 +- .../Teamspeak/TeamspeakService.cs | 12 +- .../Launcher/LauncherFileService.cs | 10 +- .../Launcher/LauncherService.cs | 8 +- .../Message/CommentThreadService.cs | 12 +- .../Message/EmailService.cs | 4 +- .../Message/LogWrapper.cs | 6 +- .../Message/LoggingService.cs | 16 +-- .../Message/NotificationsService.cs | 22 ++-- .../Operations/OperationOrderService.cs | 8 +- .../Operations/OperationReportService.cs | 10 +- .../Personnel/AccountService.cs | 6 +- .../Personnel/AssignmentService.cs | 24 ++-- .../Personnel/AttendanceService.cs | 10 +- .../Personnel/DischargeService.cs | 6 +- .../Personnel/DisplayNameService.cs | 6 +- .../Personnel/LoaService.cs | 10 +- .../Personnel/LoginService.cs | 10 +- .../Personnel/RanksService.cs | 8 +- .../Personnel/RecruitmentService.cs | 20 ++-- .../Personnel/RoleDefinitions.cs | 2 +- .../Personnel/RolesService.cs | 8 +- .../Personnel/ServiceRecordService.cs | 6 +- .../ServiceWrapper.cs | 2 +- .../UKSF.Api.Services.csproj | 10 +- .../Units/UnitsService.cs | 12 +- .../Utility/ChangeHelper.cs | 2 +- .../Utility/ConfirmationCodeService.cs | 8 +- .../Utility/DataCacheService.cs | 2 +- .../Utility/MongoClientFactory.cs | 2 +- .../Utility/ProcessHelper.cs | 3 +- .../Utility/SchedulerActionHelper.cs | 14 +-- .../Utility/SchedulerService.cs | 10 +- .../Utility/SessionService.cs | 8 +- .../Utility/StringUtilities.cs | 8 +- .../Utility/TaskUtilities.cs | 2 +- .../Utility/Utilities.cs | 4 +- .../Hubs/Command/CommandRequestsHub.cs | 4 +- .../Hubs/Game/ServersHub.cs | 4 +- .../Hubs/Integrations/LauncherHub.cs | 4 +- .../Hubs/Integrations/TeamspeakClientsHub.cs | 5 +- .../Hubs/Integrations/TeamspeakHub.cs | 10 +- .../Hubs/Message/CommentThreadHub.cs | 4 +- .../Hubs/Message/NotificationsHub.cs | 4 +- .../Hubs/Personnel/AccountHub.cs | 4 +- .../Hubs/Utility/AdminHub.cs | 4 +- .../Hubs/Utility/UtilityHub.cs | 4 +- .../UKSF.Api.Signalr.csproj | 2 +- UKSFWebsite.Backend.sln => UKSF.Api.sln | 16 +-- ...ln.DotSettings => UKSF.Api.sln.DotSettings | 4 +- .../Accounts/AccountsController.cs | 28 ++--- .../Accounts/CommunicationsController.cs | 16 +-- .../Accounts/ConfirmationCodeReceiver.cs | 10 +- .../Accounts/DiscordCodeController.cs | 12 +- .../Accounts/OperationOrderController.cs | 8 +- .../Accounts/OperationReportController.cs | 8 +- .../Accounts/OperationsController.cs | 6 +- .../Accounts/PasswordResetController.cs | 12 +- .../Accounts/ServiceRecordsController.cs | 2 +- .../Accounts/SteamCodeController.cs | 10 +- .../Controllers/ApplicationsController.cs | 18 +-- .../CommandRequestsController.cs | 22 ++-- .../CommandRequestsCreationController.cs | 18 +-- .../Controllers/CommentThreadController.cs | 14 +-- .../Controllers/DataController.cs | 6 +- .../Controllers/DischargesController.cs | 22 ++-- .../Controllers/DiscordController.cs | 6 +- .../Controllers/DocsController.cs | 2 +- .../Controllers/GameServersController.cs | 26 ++--- .../Controllers/IssueController.cs | 10 +- .../Controllers/LauncherController.cs | 24 ++-- .../Controllers/LoaController.cs | 24 ++-- .../Controllers/LoggingController.cs | 6 +- .../Controllers/LoginController.cs | 6 +- .../Controllers/News/NewsController.cs | 2 +- .../Controllers/NotificationsController.cs | 4 +- .../Controllers/RanksController.cs | 16 +-- .../Controllers/RecruitmentController.cs | 18 +-- .../Controllers/RolesController.cs | 20 ++-- .../Controllers/TeamspeakController.cs | 6 +- .../Controllers/TestController.cs | 8 +- .../Controllers/UnitsController.cs | 22 ++-- .../Controllers/VariablesController.cs | 14 +-- .../Controllers/VersionController.cs | 10 +- {UKSFWebsite.Api => UKSF.Api}/Docs/test.md | 0 .../ExceptionHandler.cs | 10 +- {UKSFWebsite.Api => UKSF.Api}/Global.cs | 2 +- .../ModsController.cs | 4 +- {UKSFWebsite.Api => UKSF.Api}/Program.cs | 4 +- .../Properties/launchSettings.json | 4 +- {UKSFWebsite.Api => UKSF.Api}/Startup.cs | 106 +++++++++--------- .../UKSF.Api.csproj | 14 +-- .../appsettings.json | 0 .../Controllers/DiscordController.cs | 11 +- .../Controllers/SteamController.cs | 4 +- .../Global.cs | 2 +- .../Program.cs | 4 +- .../Properties/launchSettings.json | 4 +- .../Startup.cs | 32 +++--- .../UKSF.Integrations.csproj | 8 +- .../appsettings.json | 0 .../Data/Cached/ILoaDataService.cs | 5 - .../Data/Cached/IUnitsDataService.cs | 5 - .../Events/ISignalrEventBus.cs | 5 - .../Launcher/ILauncherService.cs | 3 - .../Personnel/IAccountService.cs | 5 - .../Personnel/IDischargeService.cs | 5 - 304 files changed, 1025 insertions(+), 1081 deletions(-) delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/tasks.json rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Admin/VariablesDataService.cs (88%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/CachedDataService.cs (95%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Command/CommandRequestArchiveDataService.cs (70%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Command/CommandRequestDataService.cs (67%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/DataService.cs (93%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Fake/FakeNotificationsDataService.cs (72%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Game/GameServersDataService.cs (77%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Launcher/LauncherFileDataService.cs (66%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Message/CommentThreadDataService.cs (85%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Message/LogDataService.cs (87%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Message/NotificationsDataService.cs (83%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Operations/OperationOrderDataService.cs (81%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Operations/OperationReportDataService.cs (81%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Personnel/AccountDataService.cs (63%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Personnel/DischargeDataService.cs (75%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Personnel/LoaDataService.cs (61%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Personnel/RanksDataService.cs (82%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Personnel/RolesDataService.cs (77%) rename UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj => UKSF.Api.Data/UKSF.Api.Data.csproj (67%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Units/UnitsDataService.cs (75%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Utility/ConfirmationCodeDataService.cs (69%) rename {UKSFWebsite.Api.Data => UKSF.Api.Data}/Utility/SchedulerDataService.cs (66%) rename {UKSFWebsite.Api.Events => UKSF.Api.Events}/Data/DataEventBacker.cs (80%) rename {UKSFWebsite.Api.Events => UKSF.Api.Events}/Data/DataEventBus.cs (69%) rename {UKSFWebsite.Api.Events => UKSF.Api.Events}/EventBus.cs (82%) rename {UKSFWebsite.Api.Events => UKSF.Api.Events}/EventHandlerInitialiser.cs (94%) rename {UKSFWebsite.Api.Events => UKSF.Api.Events}/Handlers/AccountEventHandler.cs (82%) rename {UKSFWebsite.Api.Events => UKSF.Api.Events}/Handlers/CommandRequestEventHandler.cs (82%) rename {UKSFWebsite.Api.Events => UKSF.Api.Events}/Handlers/CommentThreadEventHandler.cs (83%) rename {UKSFWebsite.Api.Events => UKSF.Api.Events}/Handlers/LogEventHandler.cs (78%) rename {UKSFWebsite.Api.Events => UKSF.Api.Events}/Handlers/NotificationsEventHandler.cs (75%) rename {UKSFWebsite.Api.Events => UKSF.Api.Events}/Handlers/TeamspeakEventHandler.cs (91%) rename {UKSFWebsite.Api.Events => UKSF.Api.Events}/SignalrServer/SignalrEventBus.cs (62%) rename UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj => UKSF.Api.Events/UKSF.Api.Events.csproj (55%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Command/IChainOfCommandService.cs (67%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Command/ICommandRequestCompletionService.cs (73%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Command/ICommandRequestService.cs (84%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/Cached/IAccountDataService.cs (50%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/Cached/ICommandRequestDataService.cs (56%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/Cached/ICommentThreadDataService.cs (68%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/Cached/IDischargeDataService.cs (54%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/Cached/IGameServersDataService.cs (54%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/Cached/ILauncherFileDataService.cs (54%) create mode 100644 UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/Cached/INotificationsDataService.cs (78%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/Cached/IOperationOrderDataService.cs (65%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/Cached/IOperationReportDataService.cs (65%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/Cached/IRanksDataService.cs (72%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/Cached/IRolesDataService.cs (68%) create mode 100644 UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/Cached/IVariablesDataService.cs (68%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/ICommandRequestArchiveDataService.cs (60%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/IConfirmationCodeDataService.cs (59%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/IDataService.cs (85%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/ILogDataService.cs (73%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Data/ISchedulerDataService.cs (55%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Events/Handlers/IAccountEventHandler.cs (53%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Events/Handlers/ICommandRequestEventHandler.cs (56%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Events/Handlers/ICommentThreadEventHandler.cs (56%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Events/Handlers/IEventHandler.cs (54%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Events/Handlers/ILogEventHandler.cs (52%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Events/Handlers/INotificationsEventHandler.cs (56%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Events/Handlers/ITeamspeakEventHandler.cs (54%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Events/IDataEventBacker.cs (60%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Events/IDataEventBus.cs (50%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Events/IEventBus.cs (73%) create mode 100644 UKSF.Api.Interfaces/Events/ISignalrEventBus.cs rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Game/IGameServersService.cs (82%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Game/IMissionPatchingService.cs (64%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Hubs/IAccountClient.cs (72%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Hubs/IAdminClient.cs (75%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Hubs/ICommandRequestsClient.cs (73%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Hubs/ICommentThreadClient.cs (79%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Hubs/ILauncherClient.cs (74%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Hubs/INotificationsClient.cs (86%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Hubs/IServersClient.cs (73%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Hubs/ITeamspeakClient.cs (62%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Hubs/ITeamspeakClientsClient.cs (74%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Hubs/IUtilityClient.cs (74%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/IDataBackedService.cs (65%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Integrations/IDiscordService.cs (82%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Integrations/IPipeManager.cs (64%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Integrations/ISocket.cs (86%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Integrations/Teamspeak/ITeamspeakGroupService.cs (68%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Integrations/Teamspeak/ITeamspeakManagerService.cs (66%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Integrations/Teamspeak/ITeamspeakMetricsService.cs (73%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Integrations/Teamspeak/ITeamspeakService.cs (81%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Launcher/ILauncherFileService.cs (74%) create mode 100644 UKSF.Api.Interfaces/Launcher/ILauncherService.cs rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Message/ICommentThreadService.cs (77%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Message/IEmailService.cs (71%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Message/ILoggingService.cs (61%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Message/INotificationsService.cs (76%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Operations/IOperationOrderService.cs (58%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Operations/IOperationReportService.cs (59%) create mode 100644 UKSF.Api.Interfaces/Personnel/IAccountService.cs rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Personnel/IAssignmentService.cs (86%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Personnel/IAttendanceService.cs (67%) create mode 100644 UKSF.Api.Interfaces/Personnel/IDischargeService.cs rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Personnel/IDisplayNameService.cs (68%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Personnel/ILoaService.cs (69%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Personnel/IRanksService.cs (78%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Personnel/IRecruitmentService.cs (87%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Personnel/IRolesService.cs (56%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Personnel/IServiceRecordService.cs (70%) rename UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj => UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj (88%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Units/IUnitsService.cs (89%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Utility/IConfirmationCodeService.cs (76%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Utility/ILoginService.cs (79%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Utility/ISchedulerService.cs (74%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Utility/IServerService.cs (60%) rename {UKSFWebsite.Api.Interfaces => UKSF.Api.Interfaces}/Utility/ISessionService.cs (68%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Admin/VariableItem.cs (85%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Command/ChainOfCommandMode.cs (85%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Command/CommandRequest.cs (97%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Command/CommandRequestLoa.cs (82%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Events/DataEventModel.cs (85%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Events/EventModelFactory.cs (75%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Events/SignalrEventModel.cs (58%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Events/Types/TeamspeakEventType.cs (68%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Game/GameServer.cs (97%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Game/GameServerMod.cs (85%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Game/MissionFile.cs (90%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Integrations/TeamspeakClient.cs (77%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Integrations/TeamspeakProcedureType.cs (75%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Integrations/TeamspeakServerGroupUpdate.cs (83%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Integrations/TeamspeakServerSnapshot.cs (79%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Launcher/LauncherFile.cs (84%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Message/Comment.cs (88%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Message/CommentThread.cs (91%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Message/Logging/AuditLogMessage.cs (61%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Message/Logging/BasicLogMessage.cs (95%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Message/Logging/LauncherLogMessage.cs (82%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Message/Logging/WebLogMessage.cs (90%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Message/Notification.cs (91%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Message/NotificationIcons.cs (87%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Mission/Mission.cs (93%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Mission/MissionEntity.cs (82%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Mission/MissionEntityItem.cs (89%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Mission/MissionPatchData.cs (77%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Mission/MissionPatchingReport.cs (93%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Mission/MissionPatchingResult.cs (84%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Mission/MissionPlayer.cs (69%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Mission/MissionUnit.cs (80%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Operations/CreateOperationOrderRequest.cs (80%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Operations/CreateOperationReport.cs (80%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Operations/Operation.cs (79%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Operations/Opord.cs (85%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Operations/Oprep.cs (79%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Personnel/Account.cs (96%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Personnel/AccountAttendanceStatus.cs (92%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Personnel/AccountSettings.cs (87%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Personnel/Application.cs (94%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Personnel/AttendanceReport.cs (65%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Personnel/Discharge.cs (94%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Personnel/Loa.cs (92%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Personnel/MembershipState.cs (75%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Personnel/Rank.cs (88%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Personnel/Role.cs (88%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Personnel/ServiceRecord.cs (78%) rename UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj => UKSF.Api.Models/UKSF.Api.Models.csproj (82%) create mode 100644 UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/UKSFWebsite.Api.Models.csproj.DotSettings (100%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Units/Unit.cs (96%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Utility/ConfirmationCode.cs (86%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Utility/ScheduledJob.cs (93%) rename {UKSFWebsite.Api.Models => UKSF.Api.Models}/Utility/UtilityObject.cs (87%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Admin/MigrationUtility.cs (92%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Admin/VariablesService.cs (93%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Admin/VariablesWrapper.cs (72%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Command/ChainOfCommandService.cs (94%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Command/CommandRequestCompletionService.cs (96%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Command/CommandRequestService.cs (91%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Fake/FakeCachedDataService.cs (74%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Fake/FakeDataService.cs (87%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Fake/FakeDiscordService.cs (76%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Fake/FakeNotificationsService.cs (78%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Fake/FakePipeManager.cs (58%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Fake/FakeTeamspeakManagerService.cs (66%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Game/GameServerHelpers.cs (97%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Game/GameServersService.cs (97%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Game/Missions/MissionDataResolver.cs (99%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Game/Missions/MissionEntityHelper.cs (96%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Game/Missions/MissionEntityItemHelper.cs (98%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Game/Missions/MissionPatchDataService.cs (93%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Game/Missions/MissionPatchingService.cs (94%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Game/Missions/MissionService.cs (98%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Game/Missions/MissionUtilities.cs (97%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Game/ServerService.cs (93%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Integrations/DiscordService.cs (96%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Integrations/PipeManager.cs (98%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Integrations/PipeQueueManager.cs (91%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Integrations/Teamspeak/TeamspeakGroupService.cs (90%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Integrations/Teamspeak/TeamspeakManagerService.cs (88%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Integrations/Teamspeak/TeamspeakMetricsService.cs (64%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Integrations/Teamspeak/TeamspeakService.cs (93%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Launcher/LauncherFileService.cs (95%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Launcher/LauncherService.cs (62%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Message/CommentThreadService.cs (86%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Message/EmailService.cs (92%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Message/LogWrapper.cs (83%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Message/LoggingService.cs (81%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Message/NotificationsService.cs (89%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Operations/OperationOrderService.cs (80%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Operations/OperationReportService.cs (83%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Personnel/AccountService.cs (63%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Personnel/AssignmentService.cs (95%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Personnel/AttendanceService.cs (93%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Personnel/DischargeService.cs (64%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Personnel/DisplayNameService.cs (90%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Personnel/LoaService.cs (87%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Personnel/LoginService.cs (96%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Personnel/RanksService.cs (90%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Personnel/RecruitmentService.cs (96%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Personnel/RoleDefinitions.cs (94%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Personnel/RolesService.cs (79%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Personnel/ServiceRecordService.cs (80%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/ServiceWrapper.cs (76%) rename UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj => UKSF.Api.Services/UKSF.Api.Services.csproj (78%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Units/UnitsService.cs (96%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Utility/ChangeHelper.cs (99%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Utility/ConfirmationCodeService.cs (90%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Utility/DataCacheService.cs (90%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Utility/MongoClientFactory.cs (92%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Utility/ProcessHelper.cs (96%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Utility/SchedulerActionHelper.cs (85%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Utility/SchedulerService.cs (96%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Utility/SessionService.cs (85%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Utility/StringUtilities.cs (93%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Utility/TaskUtilities.cs (88%) rename {UKSFWebsite.Api.Services => UKSF.Api.Services}/Utility/Utilities.cs (94%) rename {UKSFWebsite.Api.Signalr => UKSF.Api.Signalr}/Hubs/Command/CommandRequestsHub.cs (72%) rename {UKSFWebsite.Api.Signalr => UKSF.Api.Signalr}/Hubs/Game/ServersHub.cs (63%) rename {UKSFWebsite.Api.Signalr => UKSF.Api.Signalr}/Hubs/Integrations/LauncherHub.cs (69%) rename {UKSFWebsite.Api.Signalr => UKSF.Api.Signalr}/Hubs/Integrations/TeamspeakClientsHub.cs (56%) rename {UKSFWebsite.Api.Signalr => UKSF.Api.Signalr}/Hubs/Integrations/TeamspeakHub.cs (82%) rename {UKSFWebsite.Api.Signalr => UKSF.Api.Signalr}/Hubs/Message/CommentThreadHub.cs (91%) rename {UKSFWebsite.Api.Signalr => UKSF.Api.Signalr}/Hubs/Message/NotificationsHub.cs (90%) rename {UKSFWebsite.Api.Signalr => UKSF.Api.Signalr}/Hubs/Personnel/AccountHub.cs (90%) rename {UKSFWebsite.Api.Signalr => UKSF.Api.Signalr}/Hubs/Utility/AdminHub.cs (69%) rename {UKSFWebsite.Api.Signalr => UKSF.Api.Signalr}/Hubs/Utility/UtilityHub.cs (62%) rename UKSFWebsite.Api.Signalr/UKSFWebsite.Api.Signalr.csproj => UKSF.Api.Signalr/UKSF.Api.Signalr.csproj (75%) rename UKSFWebsite.Backend.sln => UKSF.Api.sln (87%) rename UKSFWebsite.Backend.sln.DotSettings => UKSF.Api.sln.DotSettings (99%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/Accounts/AccountsController.cs (95%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/Accounts/CommunicationsController.cs (92%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/Accounts/ConfirmationCodeReceiver.cs (91%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/Accounts/DiscordCodeController.cs (87%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/Accounts/OperationOrderController.cs (86%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/Accounts/OperationReportController.cs (88%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/Accounts/OperationsController.cs (95%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/Accounts/PasswordResetController.cs (89%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/Accounts/ServiceRecordsController.cs (74%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/Accounts/SteamCodeController.cs (87%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/ApplicationsController.cs (94%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/CommandRequests/CommandRequestsController.cs (93%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/CommandRequests/CommandRequestsCreationController.cs (96%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/CommentThreadController.cs (94%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/DataController.cs (81%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/DischargesController.cs (87%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/DiscordController.cs (88%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/DocsController.cs (97%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/GameServersController.cs (96%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/IssueController.cs (92%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/LauncherController.cs (86%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/LoaController.cs (92%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/LoggingController.cs (92%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/LoginController.cs (93%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/News/NewsController.cs (97%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/NotificationsController.cs (94%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/RanksController.cs (93%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/RecruitmentController.cs (96%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/RolesController.cs (93%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/TeamspeakController.cs (87%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/TestController.cs (84%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/UnitsController.cs (97%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/VariablesController.cs (91%) rename {UKSFWebsite.Api => UKSF.Api}/Controllers/VersionController.cs (84%) rename {UKSFWebsite.Api => UKSF.Api}/Docs/test.md (100%) rename {UKSFWebsite.Api => UKSF.Api}/ExceptionHandler.cs (92%) rename {UKSFWebsite.Api => UKSF.Api}/Global.cs (91%) rename {UKSFWebsite.Api => UKSF.Api}/ModsController.cs (83%) rename {UKSFWebsite.Api => UKSF.Api}/Program.cs (97%) rename {UKSFWebsite.Api => UKSF.Api}/Properties/launchSettings.json (95%) rename {UKSFWebsite.Api => UKSF.Api}/Startup.cs (89%) rename UKSFWebsite.Api/UKSFWebsite.Api.csproj => UKSF.Api/UKSF.Api.csproj (78%) rename {UKSFWebsite.Api => UKSF.Api}/appsettings.json (100%) rename {UKSFWebsite.Integrations => UKSF.Integrations}/Controllers/DiscordController.cs (95%) rename {UKSFWebsite.Integrations => UKSF.Integrations}/Controllers/SteamController.cs (95%) rename {UKSFWebsite.Integrations => UKSF.Integrations}/Global.cs (75%) rename {UKSFWebsite.Integrations => UKSF.Integrations}/Program.cs (96%) rename {UKSFWebsite.Integrations => UKSF.Integrations}/Properties/launchSettings.json (94%) rename {UKSFWebsite.Integrations => UKSF.Integrations}/Startup.cs (88%) rename UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj => UKSF.Integrations/UKSF.Integrations.csproj (78%) rename {UKSFWebsite.Integrations => UKSF.Integrations}/appsettings.json (100%) delete mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/ILoaDataService.cs delete mode 100644 UKSFWebsite.Api.Interfaces/Data/Cached/IUnitsDataService.cs delete mode 100644 UKSFWebsite.Api.Interfaces/Events/ISignalrEventBus.cs delete mode 100644 UKSFWebsite.Api.Interfaces/Launcher/ILauncherService.cs delete mode 100644 UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs delete mode 100644 UKSFWebsite.Api.Interfaces/Personnel/IDischargeService.cs diff --git a/.gitignore b/.gitignore index 5b63458e..a2ec3237 100644 --- a/.gitignore +++ b/.gitignore @@ -232,7 +232,6 @@ _Pvt_Extensions # Sensitive configs **/appconfig/** -/UKSFWebsite.Api/website-backend-config/** **/build_output/** **/build_tests/** **/__pycache__/** @@ -260,5 +259,4 @@ coverage.xml .idea/ # Specific -!UKSFWebsite.Api.Services/Debug** appsettings.Development.json diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 5dffe88a..00000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - // Use IntelliSense to find out which attributes exist for C# debugging - // Use hover for the description of the existing attributes - // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md - "version": "0.2.0", - "configurations": [ - { - "name": ".NET Core Launch (console)", - "type": "coreclr", - "request": "launch", - "preLaunchTask": "build", - // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/TaskRunner/bin/Debug/netcoreapp2.1/TaskRunner.dll", - "args": [], - "cwd": "${workspaceFolder}/TaskRunner", - // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window - "console": "internalConsole", - "stopAtEntry": false, - "internalConsoleOptions": "openOnSessionStart" - }, - { - "name": ".NET Core Attach", - "type": "coreclr", - "request": "attach", - "processId": "${command:pickProcess}" - } - ,] -} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index 6e27c3df..00000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "label": "build", - "command": "dotnet", - "type": "process", - "args": [ - "build", - "${workspaceFolder}/UKSFWebsite.Api/UKSFWebsite.Api.csproj" - ], - "problemMatcher": "$msCompile" - } - ] -} diff --git a/UKSFWebsite.Api.Data/Admin/VariablesDataService.cs b/UKSF.Api.Data/Admin/VariablesDataService.cs similarity index 88% rename from UKSFWebsite.Api.Data/Admin/VariablesDataService.cs rename to UKSF.Api.Data/Admin/VariablesDataService.cs index 3fd4851e..c6b1d57c 100644 --- a/UKSFWebsite.Api.Data/Admin/VariablesDataService.cs +++ b/UKSF.Api.Data/Admin/VariablesDataService.cs @@ -2,12 +2,12 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Admin; -using UKSFWebsite.Api.Services.Utility; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Admin; +using UKSF.Api.Services.Utility; -namespace UKSFWebsite.Api.Data.Admin { +namespace UKSF.Api.Data.Admin { public class VariablesDataService : CachedDataService, IVariablesDataService { public VariablesDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "variables") { } diff --git a/UKSFWebsite.Api.Data/CachedDataService.cs b/UKSF.Api.Data/CachedDataService.cs similarity index 95% rename from UKSFWebsite.Api.Data/CachedDataService.cs rename to UKSF.Api.Data/CachedDataService.cs index a97ba6cd..e0acb967 100644 --- a/UKSFWebsite.Api.Data/CachedDataService.cs +++ b/UKSF.Api.Data/CachedDataService.cs @@ -3,10 +3,10 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Events; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; -namespace UKSFWebsite.Api.Data { +namespace UKSF.Api.Data { public abstract class CachedDataService : DataService { protected List Collection; diff --git a/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs b/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs similarity index 70% rename from UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs rename to UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs index d8e54708..55d53ffd 100644 --- a/UKSFWebsite.Api.Data/Command/CommandRequestArchiveDataService.cs +++ b/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs @@ -1,9 +1,9 @@ using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Command; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Command; -namespace UKSFWebsite.Api.Data.Command { +namespace UKSF.Api.Data.Command { public class CommandRequestArchiveDataService : DataService, ICommandRequestArchiveDataService { public CommandRequestArchiveDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commandRequestsArchive") { } } diff --git a/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs b/UKSF.Api.Data/Command/CommandRequestDataService.cs similarity index 67% rename from UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs rename to UKSF.Api.Data/Command/CommandRequestDataService.cs index 42cda11a..9468ea4f 100644 --- a/UKSFWebsite.Api.Data/Command/CommandRequestDataService.cs +++ b/UKSF.Api.Data/Command/CommandRequestDataService.cs @@ -1,9 +1,9 @@ using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Command; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Command; -namespace UKSFWebsite.Api.Data.Command { +namespace UKSF.Api.Data.Command { public class CommandRequestDataService : CachedDataService, ICommandRequestDataService { public CommandRequestDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commandRequests") { } } diff --git a/UKSFWebsite.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs similarity index 93% rename from UKSFWebsite.Api.Data/DataService.cs rename to UKSF.Api.Data/DataService.cs index f16613ac..2273ee4d 100644 --- a/UKSFWebsite.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -3,12 +3,12 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Events.Data; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Events; +using UKSF.Api.Events.Data; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; -namespace UKSFWebsite.Api.Data { +namespace UKSF.Api.Data { public abstract class DataService : DataEventBacker, IDataService { protected readonly IMongoDatabase Database; protected readonly string DatabaseCollection; diff --git a/UKSFWebsite.Api.Data/Fake/FakeNotificationsDataService.cs b/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs similarity index 72% rename from UKSFWebsite.Api.Data/Fake/FakeNotificationsDataService.cs rename to UKSF.Api.Data/Fake/FakeNotificationsDataService.cs index 932fc5bc..d810be13 100644 --- a/UKSFWebsite.Api.Data/Fake/FakeNotificationsDataService.cs +++ b/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Services.Fake; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Message; +using UKSF.Api.Services.Fake; -namespace UKSFWebsite.Api.Data.Fake { +namespace UKSF.Api.Data.Fake { public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { public Task UpdateMany(FilterDefinition filter, UpdateDefinition update) => Task.CompletedTask; diff --git a/UKSFWebsite.Api.Data/Game/GameServersDataService.cs b/UKSF.Api.Data/Game/GameServersDataService.cs similarity index 77% rename from UKSFWebsite.Api.Data/Game/GameServersDataService.cs rename to UKSF.Api.Data/Game/GameServersDataService.cs index 493482ad..f369118d 100644 --- a/UKSFWebsite.Api.Data/Game/GameServersDataService.cs +++ b/UKSF.Api.Data/Game/GameServersDataService.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Linq; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Game; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Game; -namespace UKSFWebsite.Api.Data.Game { +namespace UKSF.Api.Data.Game { public class GameServersDataService : CachedDataService, IGameServersDataService { public GameServersDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "gameServers") { } diff --git a/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs b/UKSF.Api.Data/Launcher/LauncherFileDataService.cs similarity index 66% rename from UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs rename to UKSF.Api.Data/Launcher/LauncherFileDataService.cs index 391b2036..413d6ec5 100644 --- a/UKSFWebsite.Api.Data/Launcher/LauncherFileDataService.cs +++ b/UKSF.Api.Data/Launcher/LauncherFileDataService.cs @@ -1,9 +1,9 @@ using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Launcher; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Launcher; -namespace UKSFWebsite.Api.Data.Launcher { +namespace UKSF.Api.Data.Launcher { public class LauncherFileDataService : CachedDataService, ILauncherFileDataService { public LauncherFileDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "launcherFiles") { } } diff --git a/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs b/UKSF.Api.Data/Message/CommentThreadDataService.cs similarity index 85% rename from UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs rename to UKSF.Api.Data/Message/CommentThreadDataService.cs index a8570377..01d5ed4b 100644 --- a/UKSFWebsite.Api.Data/Message/CommentThreadDataService.cs +++ b/UKSF.Api.Data/Message/CommentThreadDataService.cs @@ -1,11 +1,11 @@ using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Events; -using UKSFWebsite.Api.Models.Message; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Message; -namespace UKSFWebsite.Api.Data.Message { +namespace UKSF.Api.Data.Message { public class CommentThreadDataService : CachedDataService, ICommentThreadDataService { public CommentThreadDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commentThreads") { } diff --git a/UKSFWebsite.Api.Data/Message/LogDataService.cs b/UKSF.Api.Data/Message/LogDataService.cs similarity index 87% rename from UKSFWebsite.Api.Data/Message/LogDataService.cs rename to UKSF.Api.Data/Message/LogDataService.cs index 58f97fe5..f47c6065 100644 --- a/UKSFWebsite.Api.Data/Message/LogDataService.cs +++ b/UKSF.Api.Data/Message/LogDataService.cs @@ -1,11 +1,11 @@ using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Events; -using UKSFWebsite.Api.Models.Message.Logging; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Message.Logging; -namespace UKSFWebsite.Api.Data.Message { +namespace UKSF.Api.Data.Message { public class LogDataService : DataService, ILogDataService { private readonly IMongoDatabase database; diff --git a/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs b/UKSF.Api.Data/Message/NotificationsDataService.cs similarity index 83% rename from UKSFWebsite.Api.Data/Message/NotificationsDataService.cs rename to UKSF.Api.Data/Message/NotificationsDataService.cs index d16fa0ba..9bb6629f 100644 --- a/UKSFWebsite.Api.Data/Message/NotificationsDataService.cs +++ b/UKSF.Api.Data/Message/NotificationsDataService.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Message; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Message; -namespace UKSFWebsite.Api.Data.Message { +namespace UKSF.Api.Data.Message { public class NotificationsDataService : CachedDataService, INotificationsDataService { public NotificationsDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "notifications") { } diff --git a/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs b/UKSF.Api.Data/Operations/OperationOrderDataService.cs similarity index 81% rename from UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs rename to UKSF.Api.Data/Operations/OperationOrderDataService.cs index 18abad9c..cdafc423 100644 --- a/UKSFWebsite.Api.Data/Operations/OperationOrderDataService.cs +++ b/UKSF.Api.Data/Operations/OperationOrderDataService.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Operations; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Operations; -namespace UKSFWebsite.Api.Data.Operations { +namespace UKSF.Api.Data.Operations { public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { public OperationOrderDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "opord") { } diff --git a/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs b/UKSF.Api.Data/Operations/OperationReportDataService.cs similarity index 81% rename from UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs rename to UKSF.Api.Data/Operations/OperationReportDataService.cs index 1743cac1..00d056d0 100644 --- a/UKSFWebsite.Api.Data/Operations/OperationReportDataService.cs +++ b/UKSF.Api.Data/Operations/OperationReportDataService.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Operations; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Operations; -namespace UKSFWebsite.Api.Data.Operations { +namespace UKSF.Api.Data.Operations { public class OperationReportDataService : CachedDataService, IOperationReportDataService { public OperationReportDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "oprep") { } diff --git a/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs b/UKSF.Api.Data/Personnel/AccountDataService.cs similarity index 63% rename from UKSFWebsite.Api.Data/Personnel/AccountDataService.cs rename to UKSF.Api.Data/Personnel/AccountDataService.cs index 06b445db..e351c48a 100644 --- a/UKSFWebsite.Api.Data/Personnel/AccountDataService.cs +++ b/UKSF.Api.Data/Personnel/AccountDataService.cs @@ -1,9 +1,9 @@ using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Data.Personnel { +namespace UKSF.Api.Data.Personnel { public class AccountDataService : CachedDataService, IAccountDataService { public AccountDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "accounts") { } } diff --git a/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs b/UKSF.Api.Data/Personnel/DischargeDataService.cs similarity index 75% rename from UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs rename to UKSF.Api.Data/Personnel/DischargeDataService.cs index f4a0fe08..76badc9f 100644 --- a/UKSFWebsite.Api.Data/Personnel/DischargeDataService.cs +++ b/UKSF.Api.Data/Personnel/DischargeDataService.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Linq; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Data.Personnel { +namespace UKSF.Api.Data.Personnel { public class DischargeDataService : CachedDataService, IDischargeDataService { public DischargeDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "discharges") { } diff --git a/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs b/UKSF.Api.Data/Personnel/LoaDataService.cs similarity index 61% rename from UKSFWebsite.Api.Data/Personnel/LoaDataService.cs rename to UKSF.Api.Data/Personnel/LoaDataService.cs index 3e432946..8437d323 100644 --- a/UKSFWebsite.Api.Data/Personnel/LoaDataService.cs +++ b/UKSF.Api.Data/Personnel/LoaDataService.cs @@ -1,9 +1,9 @@ using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Data.Personnel { +namespace UKSF.Api.Data.Personnel { public class LoaDataService : CachedDataService, ILoaDataService { public LoaDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "loas") { } } diff --git a/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs b/UKSF.Api.Data/Personnel/RanksDataService.cs similarity index 82% rename from UKSFWebsite.Api.Data/Personnel/RanksDataService.cs rename to UKSF.Api.Data/Personnel/RanksDataService.cs index 7e700176..81dfd95e 100644 --- a/UKSFWebsite.Api.Data/Personnel/RanksDataService.cs +++ b/UKSF.Api.Data/Personnel/RanksDataService.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Data.Personnel { +namespace UKSF.Api.Data.Personnel { public class RanksDataService : CachedDataService, IRanksDataService { public RanksDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "ranks") { } diff --git a/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs b/UKSF.Api.Data/Personnel/RolesDataService.cs similarity index 77% rename from UKSFWebsite.Api.Data/Personnel/RolesDataService.cs rename to UKSF.Api.Data/Personnel/RolesDataService.cs index 04f3bb6c..ab358673 100644 --- a/UKSFWebsite.Api.Data/Personnel/RolesDataService.cs +++ b/UKSF.Api.Data/Personnel/RolesDataService.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Linq; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Data.Personnel { +namespace UKSF.Api.Data.Personnel { public class RolesDataService : CachedDataService, IRolesDataService { public RolesDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "roles") { } diff --git a/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj b/UKSF.Api.Data/UKSF.Api.Data.csproj similarity index 67% rename from UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj rename to UKSF.Api.Data/UKSF.Api.Data.csproj index de3ab1ae..3c5cae12 100644 --- a/UKSFWebsite.Api.Data/UKSFWebsite.Api.Data.csproj +++ b/UKSF.Api.Data/UKSF.Api.Data.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/UKSFWebsite.Api.Data/Units/UnitsDataService.cs b/UKSF.Api.Data/Units/UnitsDataService.cs similarity index 75% rename from UKSFWebsite.Api.Data/Units/UnitsDataService.cs rename to UKSF.Api.Data/Units/UnitsDataService.cs index ff793a93..9b10488d 100644 --- a/UKSFWebsite.Api.Data/Units/UnitsDataService.cs +++ b/UKSF.Api.Data/Units/UnitsDataService.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Linq; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Units; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Units; -namespace UKSFWebsite.Api.Data.Units { +namespace UKSF.Api.Data.Units { public class UnitsDataService : CachedDataService, IUnitsDataService { public UnitsDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "units") { } diff --git a/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs b/UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs similarity index 69% rename from UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs rename to UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs index c2b630dc..1e02fb35 100644 --- a/UKSFWebsite.Api.Data/Utility/ConfirmationCodeDataService.cs +++ b/UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs @@ -1,9 +1,9 @@ using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Utility; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Utility; -namespace UKSFWebsite.Api.Data.Utility { +namespace UKSF.Api.Data.Utility { public class ConfirmationCodeDataService : DataService, IConfirmationCodeDataService { public ConfirmationCodeDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "confirmationCodes") { } } diff --git a/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs b/UKSF.Api.Data/Utility/SchedulerDataService.cs similarity index 66% rename from UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs rename to UKSF.Api.Data/Utility/SchedulerDataService.cs index a262a8e3..e21422ad 100644 --- a/UKSFWebsite.Api.Data/Utility/SchedulerDataService.cs +++ b/UKSF.Api.Data/Utility/SchedulerDataService.cs @@ -1,9 +1,9 @@ using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Utility; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Utility; -namespace UKSFWebsite.Api.Data.Utility { +namespace UKSF.Api.Data.Utility { public class SchedulerDataService : DataService, ISchedulerDataService { public SchedulerDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "scheduledJobs") { } } diff --git a/UKSFWebsite.Api.Events/Data/DataEventBacker.cs b/UKSF.Api.Events/Data/DataEventBacker.cs similarity index 80% rename from UKSFWebsite.Api.Events/Data/DataEventBacker.cs rename to UKSF.Api.Events/Data/DataEventBacker.cs index b479ebc6..565a0cee 100644 --- a/UKSFWebsite.Api.Events/Data/DataEventBacker.cs +++ b/UKSF.Api.Events/Data/DataEventBacker.cs @@ -1,8 +1,8 @@ using System; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Events; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; -namespace UKSFWebsite.Api.Events.Data { +namespace UKSF.Api.Events.Data { public abstract class DataEventBacker : IDataEventBacker { private readonly IDataEventBus dataEventBus; diff --git a/UKSFWebsite.Api.Events/Data/DataEventBus.cs b/UKSF.Api.Events/Data/DataEventBus.cs similarity index 69% rename from UKSFWebsite.Api.Events/Data/DataEventBus.cs rename to UKSF.Api.Events/Data/DataEventBus.cs index e2a90ad7..f0805fc2 100644 --- a/UKSFWebsite.Api.Events/Data/DataEventBus.cs +++ b/UKSF.Api.Events/Data/DataEventBus.cs @@ -1,9 +1,9 @@ using System; using System.Reactive.Linq; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Events; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; -namespace UKSFWebsite.Api.Events.Data { +namespace UKSF.Api.Events.Data { public class DataEventBus : EventBus>, IDataEventBus { public override IObservable> AsObservable() => Subject.OfType>(); } diff --git a/UKSFWebsite.Api.Events/EventBus.cs b/UKSF.Api.Events/EventBus.cs similarity index 82% rename from UKSFWebsite.Api.Events/EventBus.cs rename to UKSF.Api.Events/EventBus.cs index 0919b8c0..89a29c4a 100644 --- a/UKSFWebsite.Api.Events/EventBus.cs +++ b/UKSF.Api.Events/EventBus.cs @@ -1,9 +1,9 @@ using System; using System.Reactive.Linq; using System.Reactive.Subjects; -using UKSFWebsite.Api.Interfaces.Events; +using UKSF.Api.Interfaces.Events; -namespace UKSFWebsite.Api.Events { +namespace UKSF.Api.Events { public class EventBus : IEventBus { protected readonly Subject Subject = new Subject(); diff --git a/UKSFWebsite.Api.Events/EventHandlerInitialiser.cs b/UKSF.Api.Events/EventHandlerInitialiser.cs similarity index 94% rename from UKSFWebsite.Api.Events/EventHandlerInitialiser.cs rename to UKSF.Api.Events/EventHandlerInitialiser.cs index 61264bdb..a833c85a 100644 --- a/UKSFWebsite.Api.Events/EventHandlerInitialiser.cs +++ b/UKSF.Api.Events/EventHandlerInitialiser.cs @@ -1,6 +1,6 @@ -using UKSFWebsite.Api.Interfaces.Events.Handlers; +using UKSF.Api.Interfaces.Events.Handlers; -namespace UKSFWebsite.Api.Events { +namespace UKSF.Api.Events { public class EventHandlerInitialiser { private readonly IAccountEventHandler accountEventHandler; private readonly ICommandRequestEventHandler commandRequestEventHandler; diff --git a/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs b/UKSF.Api.Events/Handlers/AccountEventHandler.cs similarity index 82% rename from UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs rename to UKSF.Api.Events/Handlers/AccountEventHandler.cs index 68f24a85..e985c0db 100644 --- a/UKSFWebsite.Api.Events/Handlers/AccountEventHandler.cs +++ b/UKSF.Api.Events/Handlers/AccountEventHandler.cs @@ -1,13 +1,13 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events.Handlers; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Models.Events; -using UKSFWebsite.Api.Signalr.Hubs.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events.Handlers; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Models.Events; +using UKSF.Api.Signalr.Hubs.Personnel; -namespace UKSFWebsite.Api.Events.Handlers { +namespace UKSF.Api.Events.Handlers { public class AccountEventHandler : IAccountEventHandler { private readonly IAccountDataService accountData; private readonly IHubContext hub; diff --git a/UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs b/UKSF.Api.Events/Handlers/CommandRequestEventHandler.cs similarity index 82% rename from UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs rename to UKSF.Api.Events/Handlers/CommandRequestEventHandler.cs index 5384338a..b9bcd369 100644 --- a/UKSFWebsite.Api.Events/Handlers/CommandRequestEventHandler.cs +++ b/UKSF.Api.Events/Handlers/CommandRequestEventHandler.cs @@ -1,13 +1,13 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events.Handlers; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Models.Events; -using UKSFWebsite.Api.Signalr.Hubs.Command; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events.Handlers; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Models.Events; +using UKSF.Api.Signalr.Hubs.Command; -namespace UKSFWebsite.Api.Events.Handlers { +namespace UKSF.Api.Events.Handlers { public class CommandRequestEventHandler : ICommandRequestEventHandler { private readonly ICommandRequestDataService data; private readonly IHubContext hub; diff --git a/UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs b/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs similarity index 83% rename from UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs rename to UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs index 580ca085..22616787 100644 --- a/UKSFWebsite.Api.Events/Handlers/CommentThreadEventHandler.cs +++ b/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs @@ -1,15 +1,15 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events.Handlers; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Models.Events; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Signalr.Hubs.Message; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events.Handlers; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Message; +using UKSF.Api.Signalr.Hubs.Message; -namespace UKSFWebsite.Api.Events.Handlers { +namespace UKSF.Api.Events.Handlers { public class CommentThreadEventHandler : ICommentThreadEventHandler { private readonly IHubContext hub; private readonly ICommentThreadService commentThreadService; diff --git a/UKSFWebsite.Api.Events/Handlers/LogEventHandler.cs b/UKSF.Api.Events/Handlers/LogEventHandler.cs similarity index 78% rename from UKSFWebsite.Api.Events/Handlers/LogEventHandler.cs rename to UKSF.Api.Events/Handlers/LogEventHandler.cs index 7660dc51..0929d14d 100644 --- a/UKSFWebsite.Api.Events/Handlers/LogEventHandler.cs +++ b/UKSF.Api.Events/Handlers/LogEventHandler.cs @@ -1,16 +1,14 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events.Handlers; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Models.Events; -using UKSFWebsite.Api.Models.Message.Logging; -using UKSFWebsite.Api.Signalr.Hubs.Personnel; -using UKSFWebsite.Api.Signalr.Hubs.Utility; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events.Handlers; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Signalr.Hubs.Utility; -namespace UKSFWebsite.Api.Events.Handlers { +namespace UKSF.Api.Events.Handlers { public class LogEventHandler : ILogEventHandler { private readonly ILogDataService data; private readonly IHubContext hub; diff --git a/UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs b/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs similarity index 75% rename from UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs rename to UKSF.Api.Events/Handlers/NotificationsEventHandler.cs index eecc1f8c..df1694f4 100644 --- a/UKSFWebsite.Api.Events/Handlers/NotificationsEventHandler.cs +++ b/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs @@ -1,14 +1,14 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events.Handlers; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Models.Events; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Signalr.Hubs.Message; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events.Handlers; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Message; +using UKSF.Api.Signalr.Hubs.Message; -namespace UKSFWebsite.Api.Events.Handlers { +namespace UKSF.Api.Events.Handlers { public class NotificationsEventHandler : INotificationsEventHandler { private readonly INotificationsDataService data; private readonly IHubContext hub; diff --git a/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs b/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs similarity index 91% rename from UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs rename to UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs index cd94de70..345c0b1b 100644 --- a/UKSFWebsite.Api.Events/Handlers/TeamspeakEventHandler.cs +++ b/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs @@ -4,16 +4,16 @@ using System.Threading; using System.Threading.Tasks; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Interfaces.Events.Handlers; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Models.Events; -using UKSFWebsite.Api.Models.Events.Types; -using UKSFWebsite.Api.Models.Integrations; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Interfaces.Events.Handlers; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Events.Types; +using UKSF.Api.Models.Integrations; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Events.Handlers { +namespace UKSF.Api.Events.Handlers { public class TeamspeakEventHandler : ITeamspeakEventHandler { private readonly ISignalrEventBus eventBus; private readonly ITeamspeakService teamspeakService; diff --git a/UKSFWebsite.Api.Events/SignalrServer/SignalrEventBus.cs b/UKSF.Api.Events/SignalrServer/SignalrEventBus.cs similarity index 62% rename from UKSFWebsite.Api.Events/SignalrServer/SignalrEventBus.cs rename to UKSF.Api.Events/SignalrServer/SignalrEventBus.cs index b9f433b8..2b16424b 100644 --- a/UKSFWebsite.Api.Events/SignalrServer/SignalrEventBus.cs +++ b/UKSF.Api.Events/SignalrServer/SignalrEventBus.cs @@ -1,7 +1,7 @@ -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Models.Events; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; -namespace UKSFWebsite.Api.Events.SignalrServer { +namespace UKSF.Api.Events.SignalrServer { public class SignalrEventBus : EventBus, ISignalrEventBus { // public IObservable AsObservable(string clientName) => Subject.OfType(); } diff --git a/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj b/UKSF.Api.Events/UKSF.Api.Events.csproj similarity index 55% rename from UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj rename to UKSF.Api.Events/UKSF.Api.Events.csproj index b5c94345..9c785687 100644 --- a/UKSFWebsite.Api.Events/UKSFWebsite.Api.Events.csproj +++ b/UKSF.Api.Events/UKSF.Api.Events.csproj @@ -13,13 +13,13 @@ - - + + - - ..\UKSFWebsite.Api\bin\Release\netcoreapp3.0\win7-x64\UKSFWebsite.Api.Services.dll + + ..\UKSF.Api\bin\Release\netcoreapp3.0\win7-x64\UKSF.Api.Services.dll diff --git a/UKSFWebsite.Api.Interfaces/Command/IChainOfCommandService.cs b/UKSF.Api.Interfaces/Command/IChainOfCommandService.cs similarity index 67% rename from UKSFWebsite.Api.Interfaces/Command/IChainOfCommandService.cs rename to UKSF.Api.Interfaces/Command/IChainOfCommandService.cs index 3c9ef5e3..034b1628 100644 --- a/UKSFWebsite.Api.Interfaces/Command/IChainOfCommandService.cs +++ b/UKSF.Api.Interfaces/Command/IChainOfCommandService.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using UKSFWebsite.Api.Models.Command; -using UKSFWebsite.Api.Models.Units; +using UKSF.Api.Models.Command; +using UKSF.Api.Models.Units; -namespace UKSFWebsite.Api.Interfaces.Command { +namespace UKSF.Api.Interfaces.Command { public interface IChainOfCommandService { HashSet ResolveChain(ChainOfCommandMode mode, string recipient, Unit start, Unit target); bool InContextChainOfCommand(string id); diff --git a/UKSFWebsite.Api.Interfaces/Command/ICommandRequestCompletionService.cs b/UKSF.Api.Interfaces/Command/ICommandRequestCompletionService.cs similarity index 73% rename from UKSFWebsite.Api.Interfaces/Command/ICommandRequestCompletionService.cs rename to UKSF.Api.Interfaces/Command/ICommandRequestCompletionService.cs index 47d2ee17..4933cfaa 100644 --- a/UKSFWebsite.Api.Interfaces/Command/ICommandRequestCompletionService.cs +++ b/UKSF.Api.Interfaces/Command/ICommandRequestCompletionService.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Interfaces.Command { +namespace UKSF.Api.Interfaces.Command { public interface ICommandRequestCompletionService { Task Resolve(string id); } diff --git a/UKSFWebsite.Api.Interfaces/Command/ICommandRequestService.cs b/UKSF.Api.Interfaces/Command/ICommandRequestService.cs similarity index 84% rename from UKSFWebsite.Api.Interfaces/Command/ICommandRequestService.cs rename to UKSF.Api.Interfaces/Command/ICommandRequestService.cs index b351089d..6f09e4a1 100644 --- a/UKSFWebsite.Api.Interfaces/Command/ICommandRequestService.cs +++ b/UKSF.Api.Interfaces/Command/ICommandRequestService.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Models.Command; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Command; -namespace UKSFWebsite.Api.Interfaces.Command { +namespace UKSF.Api.Interfaces.Command { public interface ICommandRequestService : IDataBackedService { Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE); Task ArchiveRequest(string id); diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IAccountDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs similarity index 50% rename from UKSFWebsite.Api.Interfaces/Data/Cached/IAccountDataService.cs rename to UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs index cd59131d..20394ad0 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IAccountDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs @@ -1,5 +1,5 @@ -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Data.Cached { +namespace UKSF.Api.Interfaces.Data.Cached { public interface IAccountDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs similarity index 56% rename from UKSFWebsite.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs rename to UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs index 60aa3ecd..b53fde15 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs @@ -1,5 +1,5 @@ -using UKSFWebsite.Api.Models.Command; +using UKSF.Api.Models.Command; -namespace UKSFWebsite.Api.Interfaces.Data.Cached { +namespace UKSF.Api.Interfaces.Data.Cached { public interface ICommandRequestDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs similarity index 68% rename from UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs rename to UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs index 0677ad85..a7204eea 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Events; -using UKSFWebsite.Api.Models.Message; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Message; -namespace UKSFWebsite.Api.Interfaces.Data.Cached { +namespace UKSF.Api.Interfaces.Data.Cached { public interface ICommentThreadDataService : IDataService { new Task Add(CommentThread commentThread); Task Update(string id, Comment comment, DataEventType updateType); diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IDischargeDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs similarity index 54% rename from UKSFWebsite.Api.Interfaces/Data/Cached/IDischargeDataService.cs rename to UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs index ae9c2abb..e2d314be 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IDischargeDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs @@ -1,5 +1,5 @@ -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Data.Cached { +namespace UKSF.Api.Interfaces.Data.Cached { public interface IDischargeDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IGameServersDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs similarity index 54% rename from UKSFWebsite.Api.Interfaces/Data/Cached/IGameServersDataService.cs rename to UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs index a22c6a93..b829bfc6 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IGameServersDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs @@ -1,5 +1,5 @@ -using UKSFWebsite.Api.Models.Game; +using UKSF.Api.Models.Game; -namespace UKSFWebsite.Api.Interfaces.Data.Cached { +namespace UKSF.Api.Interfaces.Data.Cached { public interface IGameServersDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs similarity index 54% rename from UKSFWebsite.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs rename to UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs index fc74e7c4..9fd4a477 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs @@ -1,5 +1,5 @@ -using UKSFWebsite.Api.Models.Launcher; +using UKSF.Api.Models.Launcher; -namespace UKSFWebsite.Api.Interfaces.Data.Cached { +namespace UKSF.Api.Interfaces.Data.Cached { public interface ILauncherFileDataService : IDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs new file mode 100644 index 00000000..fe032d86 --- /dev/null +++ b/UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs @@ -0,0 +1,5 @@ +using UKSF.Api.Models.Personnel; + +namespace UKSF.Api.Interfaces.Data.Cached { + public interface ILoaDataService : IDataService { } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/INotificationsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs similarity index 78% rename from UKSFWebsite.Api.Interfaces/Data/Cached/INotificationsDataService.cs rename to UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs index 7df8f973..13aef413 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/INotificationsDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Models.Message; +using UKSF.Api.Models.Message; -namespace UKSFWebsite.Api.Interfaces.Data.Cached { +namespace UKSF.Api.Interfaces.Data.Cached { public interface INotificationsDataService : IDataService { Task UpdateMany(FilterDefinition filter, UpdateDefinition update); Task DeleteMany(FilterDefinition filter); diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs similarity index 65% rename from UKSFWebsite.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs rename to UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs index 126dcd25..9785a414 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Operations; +using UKSF.Api.Models.Operations; -namespace UKSFWebsite.Api.Interfaces.Data.Cached { +namespace UKSF.Api.Interfaces.Data.Cached { public interface IOperationOrderDataService : IDataService { Task Replace(Opord opord); } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationReportDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs similarity index 65% rename from UKSFWebsite.Api.Interfaces/Data/Cached/IOperationReportDataService.cs rename to UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs index 9eba9019..561179e3 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IOperationReportDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Operations; +using UKSF.Api.Models.Operations; -namespace UKSFWebsite.Api.Interfaces.Data.Cached { +namespace UKSF.Api.Interfaces.Data.Cached { public interface IOperationReportDataService : IDataService { Task Replace(Oprep oprep); } diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IRanksDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs similarity index 72% rename from UKSFWebsite.Api.Interfaces/Data/Cached/IRanksDataService.cs rename to UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs index 45da54a1..03efb678 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IRanksDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Data.Cached { +namespace UKSF.Api.Interfaces.Data.Cached { public interface IRanksDataService : IDataService { new List Get(); new Rank GetSingle(string name); diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IRolesDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs similarity index 68% rename from UKSFWebsite.Api.Interfaces/Data/Cached/IRolesDataService.cs rename to UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs index 3e8a93c4..eefa39b5 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IRolesDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Data.Cached { +namespace UKSF.Api.Interfaces.Data.Cached { public interface IRolesDataService : IDataService { new List Get(); new Role GetSingle(string name); diff --git a/UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs new file mode 100644 index 00000000..b47a88aa --- /dev/null +++ b/UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs @@ -0,0 +1,5 @@ +using UKSF.Api.Models.Units; + +namespace UKSF.Api.Interfaces.Data.Cached { + public interface IUnitsDataService : IDataService { } +} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IVariablesDataService.cs similarity index 68% rename from UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs rename to UKSF.Api.Interfaces/Data/Cached/IVariablesDataService.cs index 586655ce..8b40cf50 100644 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IVariablesDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IVariablesDataService.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Admin; +using UKSF.Api.Models.Admin; -namespace UKSFWebsite.Api.Interfaces.Data.Cached { +namespace UKSF.Api.Interfaces.Data.Cached { public interface IVariablesDataService : IDataService { Task Update(string key, object value); } diff --git a/UKSFWebsite.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs b/UKSF.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs similarity index 60% rename from UKSFWebsite.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs rename to UKSF.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs index 3313b4d3..cf55d8d4 100644 --- a/UKSFWebsite.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs +++ b/UKSF.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs @@ -1,5 +1,5 @@ -using UKSFWebsite.Api.Models.Command; +using UKSF.Api.Models.Command; -namespace UKSFWebsite.Api.Interfaces.Data { +namespace UKSF.Api.Interfaces.Data { public interface ICommandRequestArchiveDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/IConfirmationCodeDataService.cs b/UKSF.Api.Interfaces/Data/IConfirmationCodeDataService.cs similarity index 59% rename from UKSFWebsite.Api.Interfaces/Data/IConfirmationCodeDataService.cs rename to UKSF.Api.Interfaces/Data/IConfirmationCodeDataService.cs index 0ba14e8c..fa598cca 100644 --- a/UKSFWebsite.Api.Interfaces/Data/IConfirmationCodeDataService.cs +++ b/UKSF.Api.Interfaces/Data/IConfirmationCodeDataService.cs @@ -1,5 +1,5 @@ -using UKSFWebsite.Api.Models.Utility; +using UKSF.Api.Models.Utility; -namespace UKSFWebsite.Api.Interfaces.Data { +namespace UKSF.Api.Interfaces.Data { public interface IConfirmationCodeDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Data/IDataService.cs b/UKSF.Api.Interfaces/Data/IDataService.cs similarity index 85% rename from UKSFWebsite.Api.Interfaces/Data/IDataService.cs rename to UKSF.Api.Interfaces/Data/IDataService.cs index 2aa4c508..c21c102f 100644 --- a/UKSFWebsite.Api.Interfaces/Data/IDataService.cs +++ b/UKSF.Api.Interfaces/Data/IDataService.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Events; +using UKSF.Api.Interfaces.Events; -namespace UKSFWebsite.Api.Interfaces.Data { +namespace UKSF.Api.Interfaces.Data { public interface IDataService : IDataEventBacker { List Get(); List Get(Func predicate); diff --git a/UKSFWebsite.Api.Interfaces/Data/ILogDataService.cs b/UKSF.Api.Interfaces/Data/ILogDataService.cs similarity index 73% rename from UKSFWebsite.Api.Interfaces/Data/ILogDataService.cs rename to UKSF.Api.Interfaces/Data/ILogDataService.cs index 576f4240..61383ec6 100644 --- a/UKSFWebsite.Api.Interfaces/Data/ILogDataService.cs +++ b/UKSF.Api.Interfaces/Data/ILogDataService.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Message.Logging; +using UKSF.Api.Models.Message.Logging; -namespace UKSFWebsite.Api.Interfaces.Data { +namespace UKSF.Api.Interfaces.Data { public interface ILogDataService : IDataService { Task Add(AuditLogMessage log); Task Add(LauncherLogMessage log); diff --git a/UKSFWebsite.Api.Interfaces/Data/ISchedulerDataService.cs b/UKSF.Api.Interfaces/Data/ISchedulerDataService.cs similarity index 55% rename from UKSFWebsite.Api.Interfaces/Data/ISchedulerDataService.cs rename to UKSF.Api.Interfaces/Data/ISchedulerDataService.cs index c4efac43..539bd3ee 100644 --- a/UKSFWebsite.Api.Interfaces/Data/ISchedulerDataService.cs +++ b/UKSF.Api.Interfaces/Data/ISchedulerDataService.cs @@ -1,5 +1,5 @@ -using UKSFWebsite.Api.Models.Utility; +using UKSF.Api.Models.Utility; -namespace UKSFWebsite.Api.Interfaces.Data { +namespace UKSF.Api.Interfaces.Data { public interface ISchedulerDataService : IDataService { } } diff --git a/UKSFWebsite.Api.Interfaces/Events/Handlers/IAccountEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/IAccountEventHandler.cs similarity index 53% rename from UKSFWebsite.Api.Interfaces/Events/Handlers/IAccountEventHandler.cs rename to UKSF.Api.Interfaces/Events/Handlers/IAccountEventHandler.cs index f6112067..fe94344e 100644 --- a/UKSFWebsite.Api.Interfaces/Events/Handlers/IAccountEventHandler.cs +++ b/UKSF.Api.Interfaces/Events/Handlers/IAccountEventHandler.cs @@ -1,3 +1,3 @@ -namespace UKSFWebsite.Api.Interfaces.Events.Handlers { +namespace UKSF.Api.Interfaces.Events.Handlers { public interface IAccountEventHandler : IEventHandler { } } diff --git a/UKSFWebsite.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs similarity index 56% rename from UKSFWebsite.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs rename to UKSF.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs index e586e36f..a1f5c33a 100644 --- a/UKSFWebsite.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs +++ b/UKSF.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs @@ -1,3 +1,3 @@ -namespace UKSFWebsite.Api.Interfaces.Events.Handlers { +namespace UKSF.Api.Interfaces.Events.Handlers { public interface ICommandRequestEventHandler : IEventHandler { } } diff --git a/UKSFWebsite.Api.Interfaces/Events/Handlers/ICommentThreadEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/ICommentThreadEventHandler.cs similarity index 56% rename from UKSFWebsite.Api.Interfaces/Events/Handlers/ICommentThreadEventHandler.cs rename to UKSF.Api.Interfaces/Events/Handlers/ICommentThreadEventHandler.cs index 6b4684cf..5e005697 100644 --- a/UKSFWebsite.Api.Interfaces/Events/Handlers/ICommentThreadEventHandler.cs +++ b/UKSF.Api.Interfaces/Events/Handlers/ICommentThreadEventHandler.cs @@ -1,3 +1,3 @@ -namespace UKSFWebsite.Api.Interfaces.Events.Handlers { +namespace UKSF.Api.Interfaces.Events.Handlers { public interface ICommentThreadEventHandler : IEventHandler { } } diff --git a/UKSFWebsite.Api.Interfaces/Events/Handlers/IEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/IEventHandler.cs similarity index 54% rename from UKSFWebsite.Api.Interfaces/Events/Handlers/IEventHandler.cs rename to UKSF.Api.Interfaces/Events/Handlers/IEventHandler.cs index c1e2d5e5..b86e3ff1 100644 --- a/UKSFWebsite.Api.Interfaces/Events/Handlers/IEventHandler.cs +++ b/UKSF.Api.Interfaces/Events/Handlers/IEventHandler.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Interfaces.Events.Handlers { +namespace UKSF.Api.Interfaces.Events.Handlers { public interface IEventHandler { void Init(); } diff --git a/UKSFWebsite.Api.Interfaces/Events/Handlers/ILogEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/ILogEventHandler.cs similarity index 52% rename from UKSFWebsite.Api.Interfaces/Events/Handlers/ILogEventHandler.cs rename to UKSF.Api.Interfaces/Events/Handlers/ILogEventHandler.cs index c7584a67..d2e876e8 100644 --- a/UKSFWebsite.Api.Interfaces/Events/Handlers/ILogEventHandler.cs +++ b/UKSF.Api.Interfaces/Events/Handlers/ILogEventHandler.cs @@ -1,3 +1,3 @@ -namespace UKSFWebsite.Api.Interfaces.Events.Handlers { +namespace UKSF.Api.Interfaces.Events.Handlers { public interface ILogEventHandler : IEventHandler { } } diff --git a/UKSFWebsite.Api.Interfaces/Events/Handlers/INotificationsEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/INotificationsEventHandler.cs similarity index 56% rename from UKSFWebsite.Api.Interfaces/Events/Handlers/INotificationsEventHandler.cs rename to UKSF.Api.Interfaces/Events/Handlers/INotificationsEventHandler.cs index 0ea0eeef..ae298ced 100644 --- a/UKSFWebsite.Api.Interfaces/Events/Handlers/INotificationsEventHandler.cs +++ b/UKSF.Api.Interfaces/Events/Handlers/INotificationsEventHandler.cs @@ -1,3 +1,3 @@ -namespace UKSFWebsite.Api.Interfaces.Events.Handlers { +namespace UKSF.Api.Interfaces.Events.Handlers { public interface INotificationsEventHandler : IEventHandler { } } diff --git a/UKSFWebsite.Api.Interfaces/Events/Handlers/ITeamspeakEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/ITeamspeakEventHandler.cs similarity index 54% rename from UKSFWebsite.Api.Interfaces/Events/Handlers/ITeamspeakEventHandler.cs rename to UKSF.Api.Interfaces/Events/Handlers/ITeamspeakEventHandler.cs index 5987d30f..998e542c 100644 --- a/UKSFWebsite.Api.Interfaces/Events/Handlers/ITeamspeakEventHandler.cs +++ b/UKSF.Api.Interfaces/Events/Handlers/ITeamspeakEventHandler.cs @@ -1,3 +1,3 @@ -namespace UKSFWebsite.Api.Interfaces.Events.Handlers { +namespace UKSF.Api.Interfaces.Events.Handlers { public interface ITeamspeakEventHandler : IEventHandler { } } diff --git a/UKSFWebsite.Api.Interfaces/Events/IDataEventBacker.cs b/UKSF.Api.Interfaces/Events/IDataEventBacker.cs similarity index 60% rename from UKSFWebsite.Api.Interfaces/Events/IDataEventBacker.cs rename to UKSF.Api.Interfaces/Events/IDataEventBacker.cs index 06e83a28..e760f455 100644 --- a/UKSFWebsite.Api.Interfaces/Events/IDataEventBacker.cs +++ b/UKSF.Api.Interfaces/Events/IDataEventBacker.cs @@ -1,7 +1,7 @@ using System; -using UKSFWebsite.Api.Models.Events; +using UKSF.Api.Models.Events; -namespace UKSFWebsite.Api.Interfaces.Events { +namespace UKSF.Api.Interfaces.Events { public interface IDataEventBacker { IObservable> EventBus(); } diff --git a/UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs b/UKSF.Api.Interfaces/Events/IDataEventBus.cs similarity index 50% rename from UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs rename to UKSF.Api.Interfaces/Events/IDataEventBus.cs index 5f6ef51a..fe112db8 100644 --- a/UKSFWebsite.Api.Interfaces/Events/IDataEventBus.cs +++ b/UKSF.Api.Interfaces/Events/IDataEventBus.cs @@ -1,5 +1,5 @@ -using UKSFWebsite.Api.Models.Events; +using UKSF.Api.Models.Events; -namespace UKSFWebsite.Api.Interfaces.Events { +namespace UKSF.Api.Interfaces.Events { public interface IDataEventBus : IEventBus> { } } diff --git a/UKSFWebsite.Api.Interfaces/Events/IEventBus.cs b/UKSF.Api.Interfaces/Events/IEventBus.cs similarity index 73% rename from UKSFWebsite.Api.Interfaces/Events/IEventBus.cs rename to UKSF.Api.Interfaces/Events/IEventBus.cs index 738824ac..66f0687b 100644 --- a/UKSFWebsite.Api.Interfaces/Events/IEventBus.cs +++ b/UKSF.Api.Interfaces/Events/IEventBus.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Interfaces.Events { +namespace UKSF.Api.Interfaces.Events { public interface IEventBus { void Send(T message); IObservable AsObservable(); diff --git a/UKSF.Api.Interfaces/Events/ISignalrEventBus.cs b/UKSF.Api.Interfaces/Events/ISignalrEventBus.cs new file mode 100644 index 00000000..e4ec03f7 --- /dev/null +++ b/UKSF.Api.Interfaces/Events/ISignalrEventBus.cs @@ -0,0 +1,5 @@ +using UKSF.Api.Models.Events; + +namespace UKSF.Api.Interfaces.Events { + public interface ISignalrEventBus : IEventBus { } +} diff --git a/UKSFWebsite.Api.Interfaces/Game/IGameServersService.cs b/UKSF.Api.Interfaces/Game/IGameServersService.cs similarity index 82% rename from UKSFWebsite.Api.Interfaces/Game/IGameServersService.cs rename to UKSF.Api.Interfaces/Game/IGameServersService.cs index e6e2726d..925f8fbd 100644 --- a/UKSFWebsite.Api.Interfaces/Game/IGameServersService.cs +++ b/UKSF.Api.Interfaces/Game/IGameServersService.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Models.Game; -using UKSFWebsite.Api.Models.Mission; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Game; +using UKSF.Api.Models.Mission; -namespace UKSFWebsite.Api.Interfaces.Game { +namespace UKSF.Api.Interfaces.Game { public interface IGameServersService : IDataBackedService { int GetGameInstanceCount(); Task UploadMissionFile(IFormFile file); diff --git a/UKSFWebsite.Api.Interfaces/Game/IMissionPatchingService.cs b/UKSF.Api.Interfaces/Game/IMissionPatchingService.cs similarity index 64% rename from UKSFWebsite.Api.Interfaces/Game/IMissionPatchingService.cs rename to UKSF.Api.Interfaces/Game/IMissionPatchingService.cs index 592abcdd..7a2663f6 100644 --- a/UKSFWebsite.Api.Interfaces/Game/IMissionPatchingService.cs +++ b/UKSF.Api.Interfaces/Game/IMissionPatchingService.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Mission; +using UKSF.Api.Models.Mission; -namespace UKSFWebsite.Api.Interfaces.Game { +namespace UKSF.Api.Interfaces.Game { public interface IMissionPatchingService { Task PatchMission(string path); } diff --git a/UKSFWebsite.Api.Interfaces/Hubs/IAccountClient.cs b/UKSF.Api.Interfaces/Hubs/IAccountClient.cs similarity index 72% rename from UKSFWebsite.Api.Interfaces/Hubs/IAccountClient.cs rename to UKSF.Api.Interfaces/Hubs/IAccountClient.cs index e859ea4f..8fe5a0c1 100644 --- a/UKSFWebsite.Api.Interfaces/Hubs/IAccountClient.cs +++ b/UKSF.Api.Interfaces/Hubs/IAccountClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Interfaces.Hubs { +namespace UKSF.Api.Interfaces.Hubs { public interface IAccountClient { Task ReceiveAccountUpdate(); } diff --git a/UKSFWebsite.Api.Interfaces/Hubs/IAdminClient.cs b/UKSF.Api.Interfaces/Hubs/IAdminClient.cs similarity index 75% rename from UKSFWebsite.Api.Interfaces/Hubs/IAdminClient.cs rename to UKSF.Api.Interfaces/Hubs/IAdminClient.cs index 6da26f29..80430fe5 100644 --- a/UKSFWebsite.Api.Interfaces/Hubs/IAdminClient.cs +++ b/UKSF.Api.Interfaces/Hubs/IAdminClient.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Message.Logging; +using UKSF.Api.Models.Message.Logging; -namespace UKSFWebsite.Api.Interfaces.Hubs { +namespace UKSF.Api.Interfaces.Hubs { public interface IAdminClient { Task ReceiveAuditLog(AuditLogMessage log); Task ReceiveErrorLog(WebLogMessage log); diff --git a/UKSFWebsite.Api.Interfaces/Hubs/ICommandRequestsClient.cs b/UKSF.Api.Interfaces/Hubs/ICommandRequestsClient.cs similarity index 73% rename from UKSFWebsite.Api.Interfaces/Hubs/ICommandRequestsClient.cs rename to UKSF.Api.Interfaces/Hubs/ICommandRequestsClient.cs index 35de85a2..257052e9 100644 --- a/UKSFWebsite.Api.Interfaces/Hubs/ICommandRequestsClient.cs +++ b/UKSF.Api.Interfaces/Hubs/ICommandRequestsClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Interfaces.Hubs { +namespace UKSF.Api.Interfaces.Hubs { public interface ICommandRequestsClient { Task ReceiveRequestUpdate(); } diff --git a/UKSFWebsite.Api.Interfaces/Hubs/ICommentThreadClient.cs b/UKSF.Api.Interfaces/Hubs/ICommentThreadClient.cs similarity index 79% rename from UKSFWebsite.Api.Interfaces/Hubs/ICommentThreadClient.cs rename to UKSF.Api.Interfaces/Hubs/ICommentThreadClient.cs index fdcba1f4..8049fb7a 100644 --- a/UKSFWebsite.Api.Interfaces/Hubs/ICommentThreadClient.cs +++ b/UKSF.Api.Interfaces/Hubs/ICommentThreadClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Interfaces.Hubs { +namespace UKSF.Api.Interfaces.Hubs { public interface ICommentThreadClient { Task ReceiveComment(object comment); Task DeleteComment(string id); diff --git a/UKSFWebsite.Api.Interfaces/Hubs/ILauncherClient.cs b/UKSF.Api.Interfaces/Hubs/ILauncherClient.cs similarity index 74% rename from UKSFWebsite.Api.Interfaces/Hubs/ILauncherClient.cs rename to UKSF.Api.Interfaces/Hubs/ILauncherClient.cs index 4a4acf26..0ace0f82 100644 --- a/UKSFWebsite.Api.Interfaces/Hubs/ILauncherClient.cs +++ b/UKSF.Api.Interfaces/Hubs/ILauncherClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Interfaces.Hubs { +namespace UKSF.Api.Interfaces.Hubs { public interface ILauncherClient { Task ReceiveLauncherVersion(string version); } diff --git a/UKSFWebsite.Api.Interfaces/Hubs/INotificationsClient.cs b/UKSF.Api.Interfaces/Hubs/INotificationsClient.cs similarity index 86% rename from UKSFWebsite.Api.Interfaces/Hubs/INotificationsClient.cs rename to UKSF.Api.Interfaces/Hubs/INotificationsClient.cs index 71b50e60..4a7839eb 100644 --- a/UKSFWebsite.Api.Interfaces/Hubs/INotificationsClient.cs +++ b/UKSF.Api.Interfaces/Hubs/INotificationsClient.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace UKSFWebsite.Api.Interfaces.Hubs { +namespace UKSF.Api.Interfaces.Hubs { public interface INotificationsClient { Task ReceiveNotification(object notification); Task ReceiveRead(IEnumerable ids); diff --git a/UKSFWebsite.Api.Interfaces/Hubs/IServersClient.cs b/UKSF.Api.Interfaces/Hubs/IServersClient.cs similarity index 73% rename from UKSFWebsite.Api.Interfaces/Hubs/IServersClient.cs rename to UKSF.Api.Interfaces/Hubs/IServersClient.cs index b4177eb5..15e36182 100644 --- a/UKSFWebsite.Api.Interfaces/Hubs/IServersClient.cs +++ b/UKSF.Api.Interfaces/Hubs/IServersClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Interfaces.Hubs { +namespace UKSF.Api.Interfaces.Hubs { public interface IServersClient { Task ReceiveDisabledState(bool state); } diff --git a/UKSFWebsite.Api.Interfaces/Hubs/ITeamspeakClient.cs b/UKSF.Api.Interfaces/Hubs/ITeamspeakClient.cs similarity index 62% rename from UKSFWebsite.Api.Interfaces/Hubs/ITeamspeakClient.cs rename to UKSF.Api.Interfaces/Hubs/ITeamspeakClient.cs index f1b87534..ef64b9f2 100644 --- a/UKSFWebsite.Api.Interfaces/Hubs/ITeamspeakClient.cs +++ b/UKSF.Api.Interfaces/Hubs/ITeamspeakClient.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Integrations; +using UKSF.Api.Models.Integrations; -namespace UKSFWebsite.Api.Interfaces.Hubs { +namespace UKSF.Api.Interfaces.Hubs { public interface ITeamspeakClient { Task Receive(TeamspeakProcedureType procedure, object args); } diff --git a/UKSFWebsite.Api.Interfaces/Hubs/ITeamspeakClientsClient.cs b/UKSF.Api.Interfaces/Hubs/ITeamspeakClientsClient.cs similarity index 74% rename from UKSFWebsite.Api.Interfaces/Hubs/ITeamspeakClientsClient.cs rename to UKSF.Api.Interfaces/Hubs/ITeamspeakClientsClient.cs index de5423a2..2389140d 100644 --- a/UKSFWebsite.Api.Interfaces/Hubs/ITeamspeakClientsClient.cs +++ b/UKSF.Api.Interfaces/Hubs/ITeamspeakClientsClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Interfaces.Hubs { +namespace UKSF.Api.Interfaces.Hubs { public interface ITeamspeakClientsClient { Task ReceiveClients(object clients); } diff --git a/UKSFWebsite.Api.Interfaces/Hubs/IUtilityClient.cs b/UKSF.Api.Interfaces/Hubs/IUtilityClient.cs similarity index 74% rename from UKSFWebsite.Api.Interfaces/Hubs/IUtilityClient.cs rename to UKSF.Api.Interfaces/Hubs/IUtilityClient.cs index f63c949b..fdf43530 100644 --- a/UKSFWebsite.Api.Interfaces/Hubs/IUtilityClient.cs +++ b/UKSF.Api.Interfaces/Hubs/IUtilityClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSFWebsite.Api.Interfaces.Hubs { +namespace UKSF.Api.Interfaces.Hubs { public interface IUtilityClient { Task ReceiveFrontendUpdate(string version); } diff --git a/UKSFWebsite.Api.Interfaces/IDataBackedService.cs b/UKSF.Api.Interfaces/IDataBackedService.cs similarity index 65% rename from UKSFWebsite.Api.Interfaces/IDataBackedService.cs rename to UKSF.Api.Interfaces/IDataBackedService.cs index 20614fac..b49ae86d 100644 --- a/UKSFWebsite.Api.Interfaces/IDataBackedService.cs +++ b/UKSF.Api.Interfaces/IDataBackedService.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Interfaces { +namespace UKSF.Api.Interfaces { public interface IDataBackedService { T Data(); } diff --git a/UKSFWebsite.Api.Interfaces/Integrations/IDiscordService.cs b/UKSF.Api.Interfaces/Integrations/IDiscordService.cs similarity index 82% rename from UKSFWebsite.Api.Interfaces/Integrations/IDiscordService.cs rename to UKSF.Api.Interfaces/Integrations/IDiscordService.cs index be9d8758..2d0d6562 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/IDiscordService.cs +++ b/UKSF.Api.Interfaces/Integrations/IDiscordService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Threading.Tasks; using Discord.WebSocket; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Integrations { +namespace UKSF.Api.Interfaces.Integrations { public interface IDiscordService { Task ConnectDiscord(); bool IsAccountOnline(Account account); diff --git a/UKSFWebsite.Api.Interfaces/Integrations/IPipeManager.cs b/UKSF.Api.Interfaces/Integrations/IPipeManager.cs similarity index 64% rename from UKSFWebsite.Api.Interfaces/Integrations/IPipeManager.cs rename to UKSF.Api.Interfaces/Integrations/IPipeManager.cs index cd1efdfb..ac03d0d3 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/IPipeManager.cs +++ b/UKSF.Api.Interfaces/Integrations/IPipeManager.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Interfaces.Integrations { +namespace UKSF.Api.Interfaces.Integrations { public interface IPipeManager : IDisposable { void Start(); } diff --git a/UKSFWebsite.Api.Interfaces/Integrations/ISocket.cs b/UKSF.Api.Interfaces/Integrations/ISocket.cs similarity index 86% rename from UKSFWebsite.Api.Interfaces/Integrations/ISocket.cs rename to UKSF.Api.Interfaces/Integrations/ISocket.cs index aadaecd9..8f2f26eb 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/ISocket.cs +++ b/UKSF.Api.Interfaces/Integrations/ISocket.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Interfaces.Integrations { +namespace UKSF.Api.Interfaces.Integrations { public interface ISocket { void Start(string port); void Stop(); diff --git a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs similarity index 68% rename from UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs rename to UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs index 55267e65..4cc49dd9 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs +++ b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { +namespace UKSF.Api.Interfaces.Integrations.Teamspeak { public interface ITeamspeakGroupService { Task UpdateAccountGroups(Account account, ICollection serverGroups, double clientDbId); } diff --git a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs similarity index 66% rename from UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs rename to UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs index af4dac56..77f0e62b 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs +++ b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Integrations; +using UKSF.Api.Models.Integrations; -namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { +namespace UKSF.Api.Interfaces.Integrations.Teamspeak { public interface ITeamspeakManagerService { void Start(); void Stop(); diff --git a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs similarity index 73% rename from UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs rename to UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs index 6dd1222e..db62a706 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs +++ b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { +namespace UKSF.Api.Interfaces.Integrations.Teamspeak { public interface ITeamspeakMetricsService { float GetWeeklyParticipationTrend(HashSet teamspeakIdentities); } diff --git a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs similarity index 81% rename from UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs rename to UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs index d64ba992..f625e903 100644 --- a/UKSFWebsite.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs +++ b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Integrations; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Integrations; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Integrations.Teamspeak { +namespace UKSF.Api.Interfaces.Integrations.Teamspeak { public interface ITeamspeakService { HashSet GetOnlineTeamspeakClients(); (bool online, string nickname) GetOnlineUserDetails(Account account); diff --git a/UKSFWebsite.Api.Interfaces/Launcher/ILauncherFileService.cs b/UKSF.Api.Interfaces/Launcher/ILauncherFileService.cs similarity index 74% rename from UKSFWebsite.Api.Interfaces/Launcher/ILauncherFileService.cs rename to UKSF.Api.Interfaces/Launcher/ILauncherFileService.cs index 2815de0d..665468f9 100644 --- a/UKSFWebsite.Api.Interfaces/Launcher/ILauncherFileService.cs +++ b/UKSF.Api.Interfaces/Launcher/ILauncherFileService.cs @@ -2,10 +2,10 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Models.Launcher; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Launcher; -namespace UKSFWebsite.Api.Interfaces.Launcher { +namespace UKSF.Api.Interfaces.Launcher { public interface ILauncherFileService : IDataBackedService { Task UpdateAllVersions(); FileStreamResult GetLauncherFile(params string[] file); diff --git a/UKSF.Api.Interfaces/Launcher/ILauncherService.cs b/UKSF.Api.Interfaces/Launcher/ILauncherService.cs new file mode 100644 index 00000000..a5c5b0ef --- /dev/null +++ b/UKSF.Api.Interfaces/Launcher/ILauncherService.cs @@ -0,0 +1,3 @@ +namespace UKSF.Api.Interfaces.Launcher { + public interface ILauncherService { } +} diff --git a/UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs b/UKSF.Api.Interfaces/Message/ICommentThreadService.cs similarity index 77% rename from UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs rename to UKSF.Api.Interfaces/Message/ICommentThreadService.cs index 60d00c9f..8aa47a55 100644 --- a/UKSFWebsite.Api.Interfaces/Message/ICommentThreadService.cs +++ b/UKSF.Api.Interfaces/Message/ICommentThreadService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Models.Message; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Message; -namespace UKSFWebsite.Api.Interfaces.Message { +namespace UKSF.Api.Interfaces.Message { public interface ICommentThreadService : IDataBackedService { IEnumerable GetCommentThreadComments(string id); Task InsertComment(string id, Comment comment); diff --git a/UKSFWebsite.Api.Interfaces/Message/IEmailService.cs b/UKSF.Api.Interfaces/Message/IEmailService.cs similarity index 71% rename from UKSFWebsite.Api.Interfaces/Message/IEmailService.cs rename to UKSF.Api.Interfaces/Message/IEmailService.cs index 3eadc121..f3fa1dbd 100644 --- a/UKSFWebsite.Api.Interfaces/Message/IEmailService.cs +++ b/UKSF.Api.Interfaces/Message/IEmailService.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Interfaces.Message { +namespace UKSF.Api.Interfaces.Message { public interface IEmailService { void SendEmail(string targetEmail, string subject, string htmlEmail); } diff --git a/UKSFWebsite.Api.Interfaces/Message/ILoggingService.cs b/UKSF.Api.Interfaces/Message/ILoggingService.cs similarity index 61% rename from UKSFWebsite.Api.Interfaces/Message/ILoggingService.cs rename to UKSF.Api.Interfaces/Message/ILoggingService.cs index 5b653da4..8e360d08 100644 --- a/UKSFWebsite.Api.Interfaces/Message/ILoggingService.cs +++ b/UKSF.Api.Interfaces/Message/ILoggingService.cs @@ -1,8 +1,8 @@ using System; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Models.Message.Logging; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Models.Message.Logging; -namespace UKSFWebsite.Api.Interfaces.Message { +namespace UKSF.Api.Interfaces.Message { public interface ILoggingService : IDataBackedService { void Log(string message); void Log(BasicLogMessage log); diff --git a/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs b/UKSF.Api.Interfaces/Message/INotificationsService.cs similarity index 76% rename from UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs rename to UKSF.Api.Interfaces/Message/INotificationsService.cs index 783344b8..894645aa 100644 --- a/UKSFWebsite.Api.Interfaces/Message/INotificationsService.cs +++ b/UKSF.Api.Interfaces/Message/INotificationsService.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Message { +namespace UKSF.Api.Interfaces.Message { public interface INotificationsService : IDataBackedService { void Add(Notification notification); Task SendTeamspeakNotification(Account account, string rawMessage); diff --git a/UKSFWebsite.Api.Interfaces/Operations/IOperationOrderService.cs b/UKSF.Api.Interfaces/Operations/IOperationOrderService.cs similarity index 58% rename from UKSFWebsite.Api.Interfaces/Operations/IOperationOrderService.cs rename to UKSF.Api.Interfaces/Operations/IOperationOrderService.cs index 998202cb..c60d7500 100644 --- a/UKSFWebsite.Api.Interfaces/Operations/IOperationOrderService.cs +++ b/UKSF.Api.Interfaces/Operations/IOperationOrderService.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Models.Operations; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Operations; -namespace UKSFWebsite.Api.Interfaces.Operations { +namespace UKSF.Api.Interfaces.Operations { public interface IOperationOrderService : IDataBackedService { Task Add(CreateOperationOrderRequest request); } diff --git a/UKSFWebsite.Api.Interfaces/Operations/IOperationReportService.cs b/UKSF.Api.Interfaces/Operations/IOperationReportService.cs similarity index 59% rename from UKSFWebsite.Api.Interfaces/Operations/IOperationReportService.cs rename to UKSF.Api.Interfaces/Operations/IOperationReportService.cs index efd88b29..581e3aa4 100644 --- a/UKSFWebsite.Api.Interfaces/Operations/IOperationReportService.cs +++ b/UKSF.Api.Interfaces/Operations/IOperationReportService.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Models.Operations; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Operations; -namespace UKSFWebsite.Api.Interfaces.Operations { +namespace UKSF.Api.Interfaces.Operations { public interface IOperationReportService : IDataBackedService { Task Create(CreateOperationReportRequest request); } diff --git a/UKSF.Api.Interfaces/Personnel/IAccountService.cs b/UKSF.Api.Interfaces/Personnel/IAccountService.cs new file mode 100644 index 00000000..ea775a25 --- /dev/null +++ b/UKSF.Api.Interfaces/Personnel/IAccountService.cs @@ -0,0 +1,5 @@ +using UKSF.Api.Interfaces.Data.Cached; + +namespace UKSF.Api.Interfaces.Personnel { + public interface IAccountService : IDataBackedService { } +} diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IAssignmentService.cs b/UKSF.Api.Interfaces/Personnel/IAssignmentService.cs similarity index 86% rename from UKSFWebsite.Api.Interfaces/Personnel/IAssignmentService.cs rename to UKSF.Api.Interfaces/Personnel/IAssignmentService.cs index 543a36a7..0e2d037b 100644 --- a/UKSFWebsite.Api.Interfaces/Personnel/IAssignmentService.cs +++ b/UKSF.Api.Interfaces/Personnel/IAssignmentService.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Message; +using UKSF.Api.Models.Message; -namespace UKSFWebsite.Api.Interfaces.Personnel { +namespace UKSF.Api.Interfaces.Personnel { public interface IAssignmentService { Task AssignUnitRole(string id, string unitId, string role); Task UnassignAllUnits(string id); diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IAttendanceService.cs b/UKSF.Api.Interfaces/Personnel/IAttendanceService.cs similarity index 67% rename from UKSFWebsite.Api.Interfaces/Personnel/IAttendanceService.cs rename to UKSF.Api.Interfaces/Personnel/IAttendanceService.cs index 5a6e860f..18023e0f 100644 --- a/UKSFWebsite.Api.Interfaces/Personnel/IAttendanceService.cs +++ b/UKSF.Api.Interfaces/Personnel/IAttendanceService.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Personnel { +namespace UKSF.Api.Interfaces.Personnel { public interface IAttendanceService { Task GenerateAttendanceReport(DateTime start, DateTime end); } diff --git a/UKSF.Api.Interfaces/Personnel/IDischargeService.cs b/UKSF.Api.Interfaces/Personnel/IDischargeService.cs new file mode 100644 index 00000000..6f1535d5 --- /dev/null +++ b/UKSF.Api.Interfaces/Personnel/IDischargeService.cs @@ -0,0 +1,5 @@ +using UKSF.Api.Interfaces.Data.Cached; + +namespace UKSF.Api.Interfaces.Personnel { + public interface IDischargeService : IDataBackedService { } +} diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IDisplayNameService.cs b/UKSF.Api.Interfaces/Personnel/IDisplayNameService.cs similarity index 68% rename from UKSFWebsite.Api.Interfaces/Personnel/IDisplayNameService.cs rename to UKSF.Api.Interfaces/Personnel/IDisplayNameService.cs index 8dc5e66b..ecb77f61 100644 --- a/UKSFWebsite.Api.Interfaces/Personnel/IDisplayNameService.cs +++ b/UKSF.Api.Interfaces/Personnel/IDisplayNameService.cs @@ -1,6 +1,6 @@ -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Personnel { +namespace UKSF.Api.Interfaces.Personnel { public interface IDisplayNameService { string GetDisplayName(Account account); string GetDisplayName(string id); diff --git a/UKSFWebsite.Api.Interfaces/Personnel/ILoaService.cs b/UKSF.Api.Interfaces/Personnel/ILoaService.cs similarity index 69% rename from UKSFWebsite.Api.Interfaces/Personnel/ILoaService.cs rename to UKSF.Api.Interfaces/Personnel/ILoaService.cs index 5395c6e4..3f3082d1 100644 --- a/UKSFWebsite.Api.Interfaces/Personnel/ILoaService.cs +++ b/UKSF.Api.Interfaces/Personnel/ILoaService.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Models.Command; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Command; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Personnel { +namespace UKSF.Api.Interfaces.Personnel { public interface ILoaService : IDataBackedService { IEnumerable Get(List ids); Task Add(CommandRequestLoa requestBase); diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IRanksService.cs b/UKSF.Api.Interfaces/Personnel/IRanksService.cs similarity index 78% rename from UKSFWebsite.Api.Interfaces/Personnel/IRanksService.cs rename to UKSF.Api.Interfaces/Personnel/IRanksService.cs index aa78602e..34f0bab6 100644 --- a/UKSFWebsite.Api.Interfaces/Personnel/IRanksService.cs +++ b/UKSF.Api.Interfaces/Personnel/IRanksService.cs @@ -1,6 +1,6 @@ -using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Data.Cached; -namespace UKSFWebsite.Api.Interfaces.Personnel { +namespace UKSF.Api.Interfaces.Personnel { public interface IRanksService : IDataBackedService { int GetRankIndex(string rankName); int Sort(string nameA, string nameB); diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IRecruitmentService.cs b/UKSF.Api.Interfaces/Personnel/IRecruitmentService.cs similarity index 87% rename from UKSFWebsite.Api.Interfaces/Personnel/IRecruitmentService.cs rename to UKSF.Api.Interfaces/Personnel/IRecruitmentService.cs index c7773507..84323dc2 100644 --- a/UKSFWebsite.Api.Interfaces/Personnel/IRecruitmentService.cs +++ b/UKSF.Api.Interfaces/Personnel/IRecruitmentService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Threading.Tasks; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Personnel { +namespace UKSF.Api.Interfaces.Personnel { public interface IRecruitmentService { object GetAllApplications(); JObject GetApplication(Account account); diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IRolesService.cs b/UKSF.Api.Interfaces/Personnel/IRolesService.cs similarity index 56% rename from UKSFWebsite.Api.Interfaces/Personnel/IRolesService.cs rename to UKSF.Api.Interfaces/Personnel/IRolesService.cs index 52fddf81..a9dc6fa9 100644 --- a/UKSFWebsite.Api.Interfaces/Personnel/IRolesService.cs +++ b/UKSF.Api.Interfaces/Personnel/IRolesService.cs @@ -1,7 +1,7 @@ -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Personnel { +namespace UKSF.Api.Interfaces.Personnel { public interface IRolesService : IDataBackedService { int Sort(string nameA, string nameB); Role GetUnitRoleByOrder(int order); diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IServiceRecordService.cs b/UKSF.Api.Interfaces/Personnel/IServiceRecordService.cs similarity index 70% rename from UKSFWebsite.Api.Interfaces/Personnel/IServiceRecordService.cs rename to UKSF.Api.Interfaces/Personnel/IServiceRecordService.cs index c3689455..b9cc64ca 100644 --- a/UKSFWebsite.Api.Interfaces/Personnel/IServiceRecordService.cs +++ b/UKSF.Api.Interfaces/Personnel/IServiceRecordService.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Interfaces.Personnel { +namespace UKSF.Api.Interfaces.Personnel { public interface IServiceRecordService { void AddServiceRecord(string id, string occurence, string notes); } diff --git a/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj b/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj similarity index 88% rename from UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj rename to UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj index a886f294..d64cac4b 100644 --- a/UKSFWebsite.Api.Interfaces/UKSFWebsite.Api.Interfaces.csproj +++ b/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj @@ -15,7 +15,7 @@ - + diff --git a/UKSFWebsite.Api.Interfaces/Units/IUnitsService.cs b/UKSF.Api.Interfaces/Units/IUnitsService.cs similarity index 89% rename from UKSFWebsite.Api.Interfaces/Units/IUnitsService.cs rename to UKSF.Api.Interfaces/Units/IUnitsService.cs index c5ff5607..25dc81f2 100644 --- a/UKSFWebsite.Api.Interfaces/Units/IUnitsService.cs +++ b/UKSF.Api.Interfaces/Units/IUnitsService.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; -namespace UKSFWebsite.Api.Interfaces.Units { +namespace UKSF.Api.Interfaces.Units { public interface IUnitsService : IDataBackedService { IEnumerable GetSortedUnits(Func predicate = null); Task AddMember(string id, string unitId); diff --git a/UKSFWebsite.Api.Interfaces/Utility/IConfirmationCodeService.cs b/UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs similarity index 76% rename from UKSFWebsite.Api.Interfaces/Utility/IConfirmationCodeService.cs rename to UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs index 7b204f06..47595afc 100644 --- a/UKSFWebsite.Api.Interfaces/Utility/IConfirmationCodeService.cs +++ b/UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data; -namespace UKSFWebsite.Api.Interfaces.Utility { +namespace UKSF.Api.Interfaces.Utility { public interface IConfirmationCodeService : IDataBackedService { Task CreateConfirmationCode(string value, bool integration = false); Task GetConfirmationCode(string id); diff --git a/UKSFWebsite.Api.Interfaces/Utility/ILoginService.cs b/UKSF.Api.Interfaces/Utility/ILoginService.cs similarity index 79% rename from UKSFWebsite.Api.Interfaces/Utility/ILoginService.cs rename to UKSF.Api.Interfaces/Utility/ILoginService.cs index 4534088c..07ee232c 100644 --- a/UKSFWebsite.Api.Interfaces/Utility/ILoginService.cs +++ b/UKSF.Api.Interfaces/Utility/ILoginService.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Interfaces.Utility { +namespace UKSF.Api.Interfaces.Utility { public interface ILoginService { string Login(string email, string password); string LoginWithoutPassword(string email); diff --git a/UKSFWebsite.Api.Interfaces/Utility/ISchedulerService.cs b/UKSF.Api.Interfaces/Utility/ISchedulerService.cs similarity index 74% rename from UKSFWebsite.Api.Interfaces/Utility/ISchedulerService.cs rename to UKSF.Api.Interfaces/Utility/ISchedulerService.cs index 5972f0d8..5b4116b9 100644 --- a/UKSFWebsite.Api.Interfaces/Utility/ISchedulerService.cs +++ b/UKSF.Api.Interfaces/Utility/ISchedulerService.cs @@ -1,9 +1,9 @@ using System; using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Models.Utility; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Models.Utility; -namespace UKSFWebsite.Api.Interfaces.Utility { +namespace UKSF.Api.Interfaces.Utility { public interface ISchedulerService : IDataBackedService { void Load(bool integration = false); Task Create(DateTime next, TimeSpan interval, ScheduledJobType type, string action, params object[] actionParameters); diff --git a/UKSFWebsite.Api.Interfaces/Utility/IServerService.cs b/UKSF.Api.Interfaces/Utility/IServerService.cs similarity index 60% rename from UKSFWebsite.Api.Interfaces/Utility/IServerService.cs rename to UKSF.Api.Interfaces/Utility/IServerService.cs index 6b7e6292..1f326a57 100644 --- a/UKSFWebsite.Api.Interfaces/Utility/IServerService.cs +++ b/UKSF.Api.Interfaces/Utility/IServerService.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Interfaces.Utility { +namespace UKSF.Api.Interfaces.Utility { public interface IServerService { void UpdateSquadXml(); } diff --git a/UKSFWebsite.Api.Interfaces/Utility/ISessionService.cs b/UKSF.Api.Interfaces/Utility/ISessionService.cs similarity index 68% rename from UKSFWebsite.Api.Interfaces/Utility/ISessionService.cs rename to UKSF.Api.Interfaces/Utility/ISessionService.cs index 97ecc22e..a51edcfc 100644 --- a/UKSFWebsite.Api.Interfaces/Utility/ISessionService.cs +++ b/UKSF.Api.Interfaces/Utility/ISessionService.cs @@ -1,6 +1,6 @@ -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Interfaces.Utility { +namespace UKSF.Api.Interfaces.Utility { public interface ISessionService { Account GetContextAccount(); string GetContextEmail(); diff --git a/UKSFWebsite.Api.Models/Admin/VariableItem.cs b/UKSF.Api.Models/Admin/VariableItem.cs similarity index 85% rename from UKSFWebsite.Api.Models/Admin/VariableItem.cs rename to UKSF.Api.Models/Admin/VariableItem.cs index c5fb02de..58fb5b50 100644 --- a/UKSFWebsite.Api.Models/Admin/VariableItem.cs +++ b/UKSF.Api.Models/Admin/VariableItem.cs @@ -1,7 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Admin { +namespace UKSF.Api.Models.Admin { public class VariableItem { [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public object item; diff --git a/UKSFWebsite.Api.Models/Command/ChainOfCommandMode.cs b/UKSF.Api.Models/Command/ChainOfCommandMode.cs similarity index 85% rename from UKSFWebsite.Api.Models/Command/ChainOfCommandMode.cs rename to UKSF.Api.Models/Command/ChainOfCommandMode.cs index 55f283d3..eb1d4a13 100644 --- a/UKSFWebsite.Api.Models/Command/ChainOfCommandMode.cs +++ b/UKSF.Api.Models/Command/ChainOfCommandMode.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models.Command { +namespace UKSF.Api.Models.Command { public enum ChainOfCommandMode { FULL, NEXT_COMMANDER, diff --git a/UKSFWebsite.Api.Models/Command/CommandRequest.cs b/UKSF.Api.Models/Command/CommandRequest.cs similarity index 97% rename from UKSFWebsite.Api.Models/Command/CommandRequest.cs rename to UKSF.Api.Models/Command/CommandRequest.cs index 394f7fe8..ccb263cf 100644 --- a/UKSFWebsite.Api.Models/Command/CommandRequest.cs +++ b/UKSF.Api.Models/Command/CommandRequest.cs @@ -3,7 +3,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Command { +namespace UKSF.Api.Models.Command { public enum ReviewState { APPROVED, REJECTED, diff --git a/UKSFWebsite.Api.Models/Command/CommandRequestLoa.cs b/UKSF.Api.Models/Command/CommandRequestLoa.cs similarity index 82% rename from UKSFWebsite.Api.Models/Command/CommandRequestLoa.cs rename to UKSF.Api.Models/Command/CommandRequestLoa.cs index dae94036..3fd68164 100644 --- a/UKSFWebsite.Api.Models/Command/CommandRequestLoa.cs +++ b/UKSF.Api.Models/Command/CommandRequestLoa.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Models.Command { +namespace UKSF.Api.Models.Command { public class CommandRequestLoa : CommandRequest { public string emergency; public DateTime end; diff --git a/UKSFWebsite.Api.Models/Events/DataEventModel.cs b/UKSF.Api.Models/Events/DataEventModel.cs similarity index 85% rename from UKSFWebsite.Api.Models/Events/DataEventModel.cs rename to UKSF.Api.Models/Events/DataEventModel.cs index 884e2e25..c3ea60c8 100644 --- a/UKSFWebsite.Api.Models/Events/DataEventModel.cs +++ b/UKSF.Api.Models/Events/DataEventModel.cs @@ -1,14 +1,14 @@ -namespace UKSFWebsite.Api.Models.Events { +namespace UKSF.Api.Models.Events { public enum DataEventType { ADD, UPDATE, DELETE } - + // ReSharper disable once UnusedTypeParameter public class DataEventModel { - public DataEventType type; - public string id; public object data; + public string id; + public DataEventType type; } } diff --git a/UKSFWebsite.Api.Models/Events/EventModelFactory.cs b/UKSF.Api.Models/Events/EventModelFactory.cs similarity index 75% rename from UKSFWebsite.Api.Models/Events/EventModelFactory.cs rename to UKSF.Api.Models/Events/EventModelFactory.cs index 9c689bd2..dfdbdd3c 100644 --- a/UKSFWebsite.Api.Models/Events/EventModelFactory.cs +++ b/UKSF.Api.Models/Events/EventModelFactory.cs @@ -1,7 +1,6 @@ -using UKSFWebsite.Api.Models.Events.Types; -using UKSFWebsite.Api.Models.Message.Logging; +using UKSF.Api.Models.Events.Types; -namespace UKSFWebsite.Api.Models.Events { +namespace UKSF.Api.Models.Events { public static class EventModelFactory { public static DataEventModel CreateDataEvent(DataEventType type, string id, object data = null) => new DataEventModel {type = type, id = id, data = data}; public static SignalrEventModel CreateSignalrEvent(TeamspeakEventType procedure, object args) => new SignalrEventModel {procedure = procedure, args = args}; diff --git a/UKSFWebsite.Api.Models/Events/SignalrEventModel.cs b/UKSF.Api.Models/Events/SignalrEventModel.cs similarity index 58% rename from UKSFWebsite.Api.Models/Events/SignalrEventModel.cs rename to UKSF.Api.Models/Events/SignalrEventModel.cs index 173c5739..c82de4c1 100644 --- a/UKSFWebsite.Api.Models/Events/SignalrEventModel.cs +++ b/UKSF.Api.Models/Events/SignalrEventModel.cs @@ -1,6 +1,6 @@ -using UKSFWebsite.Api.Models.Events.Types; +using UKSF.Api.Models.Events.Types; -namespace UKSFWebsite.Api.Models.Events { +namespace UKSF.Api.Models.Events { public class SignalrEventModel { public TeamspeakEventType procedure; public object args; diff --git a/UKSFWebsite.Api.Models/Events/Types/TeamspeakEventType.cs b/UKSF.Api.Models/Events/Types/TeamspeakEventType.cs similarity index 68% rename from UKSFWebsite.Api.Models/Events/Types/TeamspeakEventType.cs rename to UKSF.Api.Models/Events/Types/TeamspeakEventType.cs index b1ad2f7c..72fc7ebd 100644 --- a/UKSFWebsite.Api.Models/Events/Types/TeamspeakEventType.cs +++ b/UKSF.Api.Models/Events/Types/TeamspeakEventType.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models.Events.Types { +namespace UKSF.Api.Models.Events.Types { public enum TeamspeakEventType { EMPTY, CLIENTS, diff --git a/UKSFWebsite.Api.Models/Game/GameServer.cs b/UKSF.Api.Models/Game/GameServer.cs similarity index 97% rename from UKSFWebsite.Api.Models/Game/GameServer.cs rename to UKSF.Api.Models/Game/GameServer.cs index e769ba91..5b2215d0 100644 --- a/UKSFWebsite.Api.Models/Game/GameServer.cs +++ b/UKSF.Api.Models/Game/GameServer.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Game { +namespace UKSF.Api.Models.Game { public enum GameServerOption { NONE, SINGLETON, diff --git a/UKSFWebsite.Api.Models/Game/GameServerMod.cs b/UKSF.Api.Models/Game/GameServerMod.cs similarity index 85% rename from UKSFWebsite.Api.Models/Game/GameServerMod.cs rename to UKSF.Api.Models/Game/GameServerMod.cs index 0762cc9c..cc0dcfff 100644 --- a/UKSFWebsite.Api.Models/Game/GameServerMod.cs +++ b/UKSF.Api.Models/Game/GameServerMod.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models.Game { +namespace UKSF.Api.Models.Game { public class GameServerMod { public bool isDuplicate; public string name; diff --git a/UKSFWebsite.Api.Models/Game/MissionFile.cs b/UKSF.Api.Models/Game/MissionFile.cs similarity index 90% rename from UKSFWebsite.Api.Models/Game/MissionFile.cs rename to UKSF.Api.Models/Game/MissionFile.cs index 40226b4d..d91e7ba6 100644 --- a/UKSFWebsite.Api.Models/Game/MissionFile.cs +++ b/UKSF.Api.Models/Game/MissionFile.cs @@ -1,6 +1,6 @@ using System.IO; -namespace UKSFWebsite.Api.Models.Game { +namespace UKSF.Api.Models.Game { public class MissionFile { public string map; public string name; diff --git a/UKSFWebsite.Api.Models/Integrations/TeamspeakClient.cs b/UKSF.Api.Models/Integrations/TeamspeakClient.cs similarity index 77% rename from UKSFWebsite.Api.Models/Integrations/TeamspeakClient.cs rename to UKSF.Api.Models/Integrations/TeamspeakClient.cs index c6840e63..b6053b47 100644 --- a/UKSFWebsite.Api.Models/Integrations/TeamspeakClient.cs +++ b/UKSF.Api.Models/Integrations/TeamspeakClient.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models.Integrations { +namespace UKSF.Api.Models.Integrations { public class TeamspeakClient { public double channelId; public string channelName; diff --git a/UKSFWebsite.Api.Models/Integrations/TeamspeakProcedureType.cs b/UKSF.Api.Models/Integrations/TeamspeakProcedureType.cs similarity index 75% rename from UKSFWebsite.Api.Models/Integrations/TeamspeakProcedureType.cs rename to UKSF.Api.Models/Integrations/TeamspeakProcedureType.cs index d0e0342b..69618f1e 100644 --- a/UKSFWebsite.Api.Models/Integrations/TeamspeakProcedureType.cs +++ b/UKSF.Api.Models/Integrations/TeamspeakProcedureType.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models.Integrations { +namespace UKSF.Api.Models.Integrations { public enum TeamspeakProcedureType { EMPTY, ASSIGN, diff --git a/UKSFWebsite.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs b/UKSF.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs similarity index 83% rename from UKSFWebsite.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs rename to UKSF.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs index d85f6e53..fe8fc8a4 100644 --- a/UKSFWebsite.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs +++ b/UKSF.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading; -namespace UKSFWebsite.Api.Models.Integrations { +namespace UKSF.Api.Models.Integrations { public class TeamspeakServerGroupUpdate { public readonly List serverGroups = new List(); public CancellationTokenSource cancellationTokenSource; diff --git a/UKSFWebsite.Api.Models/Integrations/TeamspeakServerSnapshot.cs b/UKSF.Api.Models/Integrations/TeamspeakServerSnapshot.cs similarity index 79% rename from UKSFWebsite.Api.Models/Integrations/TeamspeakServerSnapshot.cs rename to UKSF.Api.Models/Integrations/TeamspeakServerSnapshot.cs index 18bbe806..520434fd 100644 --- a/UKSFWebsite.Api.Models/Integrations/TeamspeakServerSnapshot.cs +++ b/UKSF.Api.Models/Integrations/TeamspeakServerSnapshot.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace UKSFWebsite.Api.Models.Integrations { +namespace UKSF.Api.Models.Integrations { public class TeamspeakServerSnapshot { public DateTime timestamp; public HashSet users; diff --git a/UKSFWebsite.Api.Models/Launcher/LauncherFile.cs b/UKSF.Api.Models/Launcher/LauncherFile.cs similarity index 84% rename from UKSFWebsite.Api.Models/Launcher/LauncherFile.cs rename to UKSF.Api.Models/Launcher/LauncherFile.cs index 46367a64..550da158 100644 --- a/UKSFWebsite.Api.Models/Launcher/LauncherFile.cs +++ b/UKSF.Api.Models/Launcher/LauncherFile.cs @@ -1,7 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Launcher { +namespace UKSF.Api.Models.Launcher { public class LauncherFile { public string fileName; [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; diff --git a/UKSFWebsite.Api.Models/Message/Comment.cs b/UKSF.Api.Models/Message/Comment.cs similarity index 88% rename from UKSFWebsite.Api.Models/Message/Comment.cs rename to UKSF.Api.Models/Message/Comment.cs index dd44b4b2..3a786d18 100644 --- a/UKSFWebsite.Api.Models/Message/Comment.cs +++ b/UKSF.Api.Models/Message/Comment.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Message { +namespace UKSF.Api.Models.Message { public class Comment { [BsonRepresentation(BsonType.ObjectId)] public string author; public string content; diff --git a/UKSFWebsite.Api.Models/Message/CommentThread.cs b/UKSF.Api.Models/Message/CommentThread.cs similarity index 91% rename from UKSFWebsite.Api.Models/Message/CommentThread.cs rename to UKSF.Api.Models/Message/CommentThread.cs index 4b64de88..55d17487 100644 --- a/UKSFWebsite.Api.Models/Message/CommentThread.cs +++ b/UKSF.Api.Models/Message/CommentThread.cs @@ -1,7 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Message { +namespace UKSF.Api.Models.Message { public enum ThreadMode { ALL, SR1, diff --git a/UKSFWebsite.Api.Models/Message/Logging/AuditLogMessage.cs b/UKSF.Api.Models/Message/Logging/AuditLogMessage.cs similarity index 61% rename from UKSFWebsite.Api.Models/Message/Logging/AuditLogMessage.cs rename to UKSF.Api.Models/Message/Logging/AuditLogMessage.cs index 33607fc3..f5ad2b40 100644 --- a/UKSFWebsite.Api.Models/Message/Logging/AuditLogMessage.cs +++ b/UKSF.Api.Models/Message/Logging/AuditLogMessage.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models.Message.Logging { +namespace UKSF.Api.Models.Message.Logging { public class AuditLogMessage : BasicLogMessage { public string who; } diff --git a/UKSFWebsite.Api.Models/Message/Logging/BasicLogMessage.cs b/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs similarity index 95% rename from UKSFWebsite.Api.Models/Message/Logging/BasicLogMessage.cs rename to UKSF.Api.Models/Message/Logging/BasicLogMessage.cs index 7563c547..69be4966 100644 --- a/UKSFWebsite.Api.Models/Message/Logging/BasicLogMessage.cs +++ b/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Message.Logging { +namespace UKSF.Api.Models.Message.Logging { public enum LogLevel { DEBUG, INFO, diff --git a/UKSFWebsite.Api.Models/Message/Logging/LauncherLogMessage.cs b/UKSF.Api.Models/Message/Logging/LauncherLogMessage.cs similarity index 82% rename from UKSFWebsite.Api.Models/Message/Logging/LauncherLogMessage.cs rename to UKSF.Api.Models/Message/Logging/LauncherLogMessage.cs index cd0fb711..c925255c 100644 --- a/UKSFWebsite.Api.Models/Message/Logging/LauncherLogMessage.cs +++ b/UKSF.Api.Models/Message/Logging/LauncherLogMessage.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models.Message.Logging { +namespace UKSF.Api.Models.Message.Logging { public class LauncherLogMessage : BasicLogMessage { public string name; public string userId; diff --git a/UKSFWebsite.Api.Models/Message/Logging/WebLogMessage.cs b/UKSF.Api.Models/Message/Logging/WebLogMessage.cs similarity index 90% rename from UKSFWebsite.Api.Models/Message/Logging/WebLogMessage.cs rename to UKSF.Api.Models/Message/Logging/WebLogMessage.cs index 978bc532..2d305944 100644 --- a/UKSFWebsite.Api.Models/Message/Logging/WebLogMessage.cs +++ b/UKSF.Api.Models/Message/Logging/WebLogMessage.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Models.Message.Logging { +namespace UKSF.Api.Models.Message.Logging { public class WebLogMessage : BasicLogMessage { public string exception; public string httpMethod; diff --git a/UKSFWebsite.Api.Models/Message/Notification.cs b/UKSF.Api.Models/Message/Notification.cs similarity index 91% rename from UKSFWebsite.Api.Models/Message/Notification.cs rename to UKSF.Api.Models/Message/Notification.cs index 71034b18..b8d7b1a0 100644 --- a/UKSFWebsite.Api.Models/Message/Notification.cs +++ b/UKSF.Api.Models/Message/Notification.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Message { +namespace UKSF.Api.Models.Message { public class Notification { public string icon; [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; diff --git a/UKSFWebsite.Api.Models/Message/NotificationIcons.cs b/UKSF.Api.Models/Message/NotificationIcons.cs similarity index 87% rename from UKSFWebsite.Api.Models/Message/NotificationIcons.cs rename to UKSF.Api.Models/Message/NotificationIcons.cs index 28a537f1..233898e8 100644 --- a/UKSFWebsite.Api.Models/Message/NotificationIcons.cs +++ b/UKSF.Api.Models/Message/NotificationIcons.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models.Message { +namespace UKSF.Api.Models.Message { public static class NotificationIcons { public const string APPLICATION = "group_add"; public const string COMMENT = "comment"; diff --git a/UKSFWebsite.Api.Models/Mission/Mission.cs b/UKSF.Api.Models/Mission/Mission.cs similarity index 93% rename from UKSFWebsite.Api.Models/Mission/Mission.cs rename to UKSF.Api.Models/Mission/Mission.cs index 318ea48c..79fefe38 100644 --- a/UKSFWebsite.Api.Models/Mission/Mission.cs +++ b/UKSF.Api.Models/Mission/Mission.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSFWebsite.Api.Models.Mission { +namespace UKSF.Api.Models.Mission { public class Mission { public static int nextId; public readonly string descriptionPath; diff --git a/UKSFWebsite.Api.Models/Mission/MissionEntity.cs b/UKSF.Api.Models/Mission/MissionEntity.cs similarity index 82% rename from UKSFWebsite.Api.Models/Mission/MissionEntity.cs rename to UKSF.Api.Models/Mission/MissionEntity.cs index 31199671..eb4d582b 100644 --- a/UKSFWebsite.Api.Models/Mission/MissionEntity.cs +++ b/UKSF.Api.Models/Mission/MissionEntity.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSFWebsite.Api.Models.Mission { +namespace UKSF.Api.Models.Mission { public class MissionEntity { public readonly List missionEntityItems = new List(); public int itemsCount; diff --git a/UKSFWebsite.Api.Models/Mission/MissionEntityItem.cs b/UKSF.Api.Models/Mission/MissionEntityItem.cs similarity index 89% rename from UKSFWebsite.Api.Models/Mission/MissionEntityItem.cs rename to UKSF.Api.Models/Mission/MissionEntityItem.cs index a9369101..51a4b046 100644 --- a/UKSFWebsite.Api.Models/Mission/MissionEntityItem.cs +++ b/UKSF.Api.Models/Mission/MissionEntityItem.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSFWebsite.Api.Models.Mission { +namespace UKSF.Api.Models.Mission { public class MissionEntityItem { public static double position = 10; public bool isPlayable; diff --git a/UKSFWebsite.Api.Models/Mission/MissionPatchData.cs b/UKSF.Api.Models/Mission/MissionPatchData.cs similarity index 77% rename from UKSFWebsite.Api.Models/Mission/MissionPatchData.cs rename to UKSF.Api.Models/Mission/MissionPatchData.cs index d463f155..67cdcc98 100644 --- a/UKSFWebsite.Api.Models/Mission/MissionPatchData.cs +++ b/UKSF.Api.Models/Mission/MissionPatchData.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Models.Mission { +namespace UKSF.Api.Models.Mission { public class MissionPatchData { public static MissionPatchData instance; public List orderedUnits; diff --git a/UKSFWebsite.Api.Models/Mission/MissionPatchingReport.cs b/UKSF.Api.Models/Mission/MissionPatchingReport.cs similarity index 93% rename from UKSFWebsite.Api.Models/Mission/MissionPatchingReport.cs rename to UKSF.Api.Models/Mission/MissionPatchingReport.cs index a2772886..df6a78f8 100644 --- a/UKSFWebsite.Api.Models/Mission/MissionPatchingReport.cs +++ b/UKSF.Api.Models/Mission/MissionPatchingReport.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Models.Mission { +namespace UKSF.Api.Models.Mission { public class MissionPatchingReport { public string detail; public bool error; diff --git a/UKSFWebsite.Api.Models/Mission/MissionPatchingResult.cs b/UKSF.Api.Models/Mission/MissionPatchingResult.cs similarity index 84% rename from UKSFWebsite.Api.Models/Mission/MissionPatchingResult.cs rename to UKSF.Api.Models/Mission/MissionPatchingResult.cs index f761c23d..8095cb01 100644 --- a/UKSFWebsite.Api.Models/Mission/MissionPatchingResult.cs +++ b/UKSF.Api.Models/Mission/MissionPatchingResult.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSFWebsite.Api.Models.Mission { +namespace UKSF.Api.Models.Mission { public class MissionPatchingResult { public int playerCount; public List reports = new List(); diff --git a/UKSFWebsite.Api.Models/Mission/MissionPlayer.cs b/UKSF.Api.Models/Mission/MissionPlayer.cs similarity index 69% rename from UKSFWebsite.Api.Models/Mission/MissionPlayer.cs rename to UKSF.Api.Models/Mission/MissionPlayer.cs index 27613daa..72c9808a 100644 --- a/UKSFWebsite.Api.Models/Mission/MissionPlayer.cs +++ b/UKSF.Api.Models/Mission/MissionPlayer.cs @@ -1,6 +1,6 @@ -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Models.Mission { +namespace UKSF.Api.Models.Mission { public class MissionPlayer { public Account account; public string name; diff --git a/UKSFWebsite.Api.Models/Mission/MissionUnit.cs b/UKSF.Api.Models/Mission/MissionUnit.cs similarity index 80% rename from UKSFWebsite.Api.Models/Mission/MissionUnit.cs rename to UKSF.Api.Models/Mission/MissionUnit.cs index 9010d435..f4e4c8a6 100644 --- a/UKSFWebsite.Api.Models/Mission/MissionUnit.cs +++ b/UKSF.Api.Models/Mission/MissionUnit.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using UKSFWebsite.Api.Models.Units; +using UKSF.Api.Models.Units; -namespace UKSFWebsite.Api.Models.Mission { +namespace UKSF.Api.Models.Mission { public class MissionUnit { public string callsign; public int depth; diff --git a/UKSFWebsite.Api.Models/Operations/CreateOperationOrderRequest.cs b/UKSF.Api.Models/Operations/CreateOperationOrderRequest.cs similarity index 80% rename from UKSFWebsite.Api.Models/Operations/CreateOperationOrderRequest.cs rename to UKSF.Api.Models/Operations/CreateOperationOrderRequest.cs index 974159d2..73fec615 100644 --- a/UKSFWebsite.Api.Models/Operations/CreateOperationOrderRequest.cs +++ b/UKSF.Api.Models/Operations/CreateOperationOrderRequest.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Models.Operations { +namespace UKSF.Api.Models.Operations { public class CreateOperationOrderRequest { public string name, map, type; public DateTime start, end; diff --git a/UKSFWebsite.Api.Models/Operations/CreateOperationReport.cs b/UKSF.Api.Models/Operations/CreateOperationReport.cs similarity index 80% rename from UKSFWebsite.Api.Models/Operations/CreateOperationReport.cs rename to UKSF.Api.Models/Operations/CreateOperationReport.cs index db0c17de..94b0cd8f 100644 --- a/UKSFWebsite.Api.Models/Operations/CreateOperationReport.cs +++ b/UKSF.Api.Models/Operations/CreateOperationReport.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Models.Operations { +namespace UKSF.Api.Models.Operations { public class CreateOperationReportRequest { public string name, map, type, result; public DateTime start, end; diff --git a/UKSFWebsite.Api.Models/Operations/Operation.cs b/UKSF.Api.Models/Operations/Operation.cs similarity index 79% rename from UKSFWebsite.Api.Models/Operations/Operation.cs rename to UKSF.Api.Models/Operations/Operation.cs index bf160198..3bba5adf 100644 --- a/UKSFWebsite.Api.Models/Operations/Operation.cs +++ b/UKSF.Api.Models/Operations/Operation.cs @@ -1,9 +1,9 @@ using System; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Models.Operations { +namespace UKSF.Api.Models.Operations { public class Operation { public AttendanceReport attendanceReport; [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; diff --git a/UKSFWebsite.Api.Models/Operations/Opord.cs b/UKSF.Api.Models/Operations/Opord.cs similarity index 85% rename from UKSFWebsite.Api.Models/Operations/Opord.cs rename to UKSF.Api.Models/Operations/Opord.cs index e782eb1c..94351cfc 100644 --- a/UKSFWebsite.Api.Models/Operations/Opord.cs +++ b/UKSF.Api.Models/Operations/Opord.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Operations { +namespace UKSF.Api.Models.Operations { public class Opord { [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public string name, map, type, description; diff --git a/UKSFWebsite.Api.Models/Operations/Oprep.cs b/UKSF.Api.Models/Operations/Oprep.cs similarity index 79% rename from UKSFWebsite.Api.Models/Operations/Oprep.cs rename to UKSF.Api.Models/Operations/Oprep.cs index 985b0124..207bd498 100644 --- a/UKSFWebsite.Api.Models/Operations/Oprep.cs +++ b/UKSF.Api.Models/Operations/Oprep.cs @@ -1,9 +1,9 @@ using System; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Models.Operations { +namespace UKSF.Api.Models.Operations { public class Oprep { public AttendanceReport attendanceReport; [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; diff --git a/UKSFWebsite.Api.Models/Personnel/Account.cs b/UKSF.Api.Models/Personnel/Account.cs similarity index 96% rename from UKSFWebsite.Api.Models/Personnel/Account.cs rename to UKSF.Api.Models/Personnel/Account.cs index 485ae100..4553614a 100644 --- a/UKSFWebsite.Api.Models/Personnel/Account.cs +++ b/UKSF.Api.Models/Personnel/Account.cs @@ -3,7 +3,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Personnel { +namespace UKSF.Api.Models.Personnel { public class Account { public Application application; public string armaExperience; diff --git a/UKSFWebsite.Api.Models/Personnel/AccountAttendanceStatus.cs b/UKSF.Api.Models/Personnel/AccountAttendanceStatus.cs similarity index 92% rename from UKSFWebsite.Api.Models/Personnel/AccountAttendanceStatus.cs rename to UKSF.Api.Models/Personnel/AccountAttendanceStatus.cs index 85203545..625e374e 100644 --- a/UKSFWebsite.Api.Models/Personnel/AccountAttendanceStatus.cs +++ b/UKSF.Api.Models/Personnel/AccountAttendanceStatus.cs @@ -1,7 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Personnel { +namespace UKSF.Api.Models.Personnel { public class AccountAttendanceStatus { [BsonRepresentation(BsonType.ObjectId)] public string accountId; public float attendancePercent; diff --git a/UKSFWebsite.Api.Models/Personnel/AccountSettings.cs b/UKSF.Api.Models/Personnel/AccountSettings.cs similarity index 87% rename from UKSFWebsite.Api.Models/Personnel/AccountSettings.cs rename to UKSF.Api.Models/Personnel/AccountSettings.cs index 598b90b7..c2e783bb 100644 --- a/UKSFWebsite.Api.Models/Personnel/AccountSettings.cs +++ b/UKSF.Api.Models/Personnel/AccountSettings.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models.Personnel { +namespace UKSF.Api.Models.Personnel { public class AccountSettings { public bool errorEmails = false; public bool notificationsEmail = true; diff --git a/UKSFWebsite.Api.Models/Personnel/Application.cs b/UKSF.Api.Models/Personnel/Application.cs similarity index 94% rename from UKSFWebsite.Api.Models/Personnel/Application.cs rename to UKSF.Api.Models/Personnel/Application.cs index 82a1059f..83fa74d8 100644 --- a/UKSFWebsite.Api.Models/Personnel/Application.cs +++ b/UKSF.Api.Models/Personnel/Application.cs @@ -3,7 +3,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Personnel { +namespace UKSF.Api.Models.Personnel { public enum ApplicationState { ACCEPTED, REJECTED, diff --git a/UKSFWebsite.Api.Models/Personnel/AttendanceReport.cs b/UKSF.Api.Models/Personnel/AttendanceReport.cs similarity index 65% rename from UKSFWebsite.Api.Models/Personnel/AttendanceReport.cs rename to UKSF.Api.Models/Personnel/AttendanceReport.cs index d25385bf..69efe35c 100644 --- a/UKSFWebsite.Api.Models/Personnel/AttendanceReport.cs +++ b/UKSF.Api.Models/Personnel/AttendanceReport.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models.Personnel { +namespace UKSF.Api.Models.Personnel { public class AttendanceReport { public AccountAttendanceStatus[] users; } diff --git a/UKSFWebsite.Api.Models/Personnel/Discharge.cs b/UKSF.Api.Models/Personnel/Discharge.cs similarity index 94% rename from UKSFWebsite.Api.Models/Personnel/Discharge.cs rename to UKSF.Api.Models/Personnel/Discharge.cs index 0a454d18..df1a9a85 100644 --- a/UKSFWebsite.Api.Models/Personnel/Discharge.cs +++ b/UKSF.Api.Models/Personnel/Discharge.cs @@ -3,7 +3,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Personnel { +namespace UKSF.Api.Models.Personnel { public class DischargeCollection { [BsonRepresentation(BsonType.ObjectId)] public string accountId; public List discharges = new List(); diff --git a/UKSFWebsite.Api.Models/Personnel/Loa.cs b/UKSF.Api.Models/Personnel/Loa.cs similarity index 92% rename from UKSFWebsite.Api.Models/Personnel/Loa.cs rename to UKSF.Api.Models/Personnel/Loa.cs index 6c32e4c5..26b91ea8 100644 --- a/UKSFWebsite.Api.Models/Personnel/Loa.cs +++ b/UKSF.Api.Models/Personnel/Loa.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Personnel { +namespace UKSF.Api.Models.Personnel { public enum LoaReviewState { PENDING, APPROVED, diff --git a/UKSFWebsite.Api.Models/Personnel/MembershipState.cs b/UKSF.Api.Models/Personnel/MembershipState.cs similarity index 75% rename from UKSFWebsite.Api.Models/Personnel/MembershipState.cs rename to UKSF.Api.Models/Personnel/MembershipState.cs index 48f1fe29..063e244c 100644 --- a/UKSFWebsite.Api.Models/Personnel/MembershipState.cs +++ b/UKSF.Api.Models/Personnel/MembershipState.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Models.Personnel { +namespace UKSF.Api.Models.Personnel { public enum MembershipState { UNCONFIRMED, CONFIRMED, diff --git a/UKSFWebsite.Api.Models/Personnel/Rank.cs b/UKSF.Api.Models/Personnel/Rank.cs similarity index 88% rename from UKSFWebsite.Api.Models/Personnel/Rank.cs rename to UKSF.Api.Models/Personnel/Rank.cs index 0d2581a9..bbe6da25 100644 --- a/UKSFWebsite.Api.Models/Personnel/Rank.cs +++ b/UKSF.Api.Models/Personnel/Rank.cs @@ -1,7 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Personnel { +namespace UKSF.Api.Models.Personnel { public class Rank { public string abbreviation; public string discordRoleId; diff --git a/UKSFWebsite.Api.Models/Personnel/Role.cs b/UKSF.Api.Models/Personnel/Role.cs similarity index 88% rename from UKSFWebsite.Api.Models/Personnel/Role.cs rename to UKSF.Api.Models/Personnel/Role.cs index f3bb0381..bb417bb1 100644 --- a/UKSFWebsite.Api.Models/Personnel/Role.cs +++ b/UKSF.Api.Models/Personnel/Role.cs @@ -1,7 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Personnel { +namespace UKSF.Api.Models.Personnel { public enum RoleType { INDIVIDUAL, UNIT diff --git a/UKSFWebsite.Api.Models/Personnel/ServiceRecord.cs b/UKSF.Api.Models/Personnel/ServiceRecord.cs similarity index 78% rename from UKSFWebsite.Api.Models/Personnel/ServiceRecord.cs rename to UKSF.Api.Models/Personnel/ServiceRecord.cs index b6769634..5bd54ed8 100644 --- a/UKSFWebsite.Api.Models/Personnel/ServiceRecord.cs +++ b/UKSF.Api.Models/Personnel/ServiceRecord.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Models.Personnel { +namespace UKSF.Api.Models.Personnel { public class ServiceRecordEntry { public string notes; public string occurence; diff --git a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj b/UKSF.Api.Models/UKSF.Api.Models.csproj similarity index 82% rename from UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj rename to UKSF.Api.Models/UKSF.Api.Models.csproj index 9bbae269..627f4318 100644 --- a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj +++ b/UKSF.Api.Models/UKSF.Api.Models.csproj @@ -1,8 +1,8 @@  netcoreapp3.0 - UKSFWebsite.Api.Models - UKSFWebsite.Api.Models + UKSF.Api.Models + UKSF.Api.Models disable @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings b/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings new file mode 100644 index 00000000..e7d45a2a --- /dev/null +++ b/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj.DotSettings b/UKSF.Api.Models/UKSFWebsite.Api.Models.csproj.DotSettings similarity index 100% rename from UKSFWebsite.Api.Models/UKSFWebsite.Api.Models.csproj.DotSettings rename to UKSF.Api.Models/UKSFWebsite.Api.Models.csproj.DotSettings diff --git a/UKSFWebsite.Api.Models/Units/Unit.cs b/UKSF.Api.Models/Units/Unit.cs similarity index 96% rename from UKSFWebsite.Api.Models/Units/Unit.cs rename to UKSF.Api.Models/Units/Unit.cs index c2d266e0..fd0f1912 100644 --- a/UKSFWebsite.Api.Models/Units/Unit.cs +++ b/UKSF.Api.Models/Units/Unit.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Units { +namespace UKSF.Api.Models.Units { public class Unit { public UnitBranch branch = UnitBranch.COMBAT; public string callsign; diff --git a/UKSFWebsite.Api.Models/Utility/ConfirmationCode.cs b/UKSF.Api.Models/Utility/ConfirmationCode.cs similarity index 86% rename from UKSFWebsite.Api.Models/Utility/ConfirmationCode.cs rename to UKSF.Api.Models/Utility/ConfirmationCode.cs index f271ff74..b5f934ca 100644 --- a/UKSFWebsite.Api.Models/Utility/ConfirmationCode.cs +++ b/UKSF.Api.Models/Utility/ConfirmationCode.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Utility { +namespace UKSF.Api.Models.Utility { public class ConfirmationCode { [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public DateTime timestamp = DateTime.UtcNow; diff --git a/UKSFWebsite.Api.Models/Utility/ScheduledJob.cs b/UKSF.Api.Models/Utility/ScheduledJob.cs similarity index 93% rename from UKSFWebsite.Api.Models/Utility/ScheduledJob.cs rename to UKSF.Api.Models/Utility/ScheduledJob.cs index 9aa9bd02..60ec0c52 100644 --- a/UKSFWebsite.Api.Models/Utility/ScheduledJob.cs +++ b/UKSF.Api.Models/Utility/ScheduledJob.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Utility { +namespace UKSF.Api.Models.Utility { public enum ScheduledJobType { NORMAL, TEAMSPEAK_SNAPSHOT, diff --git a/UKSFWebsite.Api.Models/Utility/UtilityObject.cs b/UKSF.Api.Models/Utility/UtilityObject.cs similarity index 87% rename from UKSFWebsite.Api.Models/Utility/UtilityObject.cs rename to UKSF.Api.Models/Utility/UtilityObject.cs index 2b9ba349..a189c017 100644 --- a/UKSFWebsite.Api.Models/Utility/UtilityObject.cs +++ b/UKSF.Api.Models/Utility/UtilityObject.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSFWebsite.Api.Models.Utility { +namespace UKSF.Api.Models.Utility { public class UtilityObject { [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public Dictionary values = new Dictionary(); diff --git a/UKSFWebsite.Api.Services/Admin/MigrationUtility.cs b/UKSF.Api.Services/Admin/MigrationUtility.cs similarity index 92% rename from UKSFWebsite.Api.Services/Admin/MigrationUtility.cs rename to UKSF.Api.Services/Admin/MigrationUtility.cs index d4f6c9a1..2368e15f 100644 --- a/UKSFWebsite.Api.Services/Admin/MigrationUtility.cs +++ b/UKSF.Api.Services/Admin/MigrationUtility.cs @@ -6,13 +6,13 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Services.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; +using UKSF.Api.Services.Message; -namespace UKSFWebsite.Api.Services.Admin { +namespace UKSF.Api.Services.Admin { public class MigrationUtility { private const string KEY = "MIGRATED"; private readonly IHostEnvironment currentEnvironment; diff --git a/UKSFWebsite.Api.Services/Admin/VariablesService.cs b/UKSF.Api.Services/Admin/VariablesService.cs similarity index 93% rename from UKSFWebsite.Api.Services/Admin/VariablesService.cs rename to UKSF.Api.Services/Admin/VariablesService.cs index c01073ff..d0bf52c6 100644 --- a/UKSFWebsite.Api.Services/Admin/VariablesService.cs +++ b/UKSF.Api.Services/Admin/VariablesService.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -using UKSFWebsite.Api.Models.Admin; -using UKSFWebsite.Api.Services.Utility; +using UKSF.Api.Models.Admin; +using UKSF.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Admin { +namespace UKSF.Api.Services.Admin { public static class VariablesService { public static string AsString(this VariableItem variable) => variable?.item.ToString(); public static double AsDouble(this VariableItem variable) => double.Parse(variable?.item.ToString() ?? throw new Exception("Variable does not exist")); diff --git a/UKSFWebsite.Api.Services/Admin/VariablesWrapper.cs b/UKSF.Api.Services/Admin/VariablesWrapper.cs similarity index 72% rename from UKSFWebsite.Api.Services/Admin/VariablesWrapper.cs rename to UKSF.Api.Services/Admin/VariablesWrapper.cs index 04f23bd0..1e567cb6 100644 --- a/UKSFWebsite.Api.Services/Admin/VariablesWrapper.cs +++ b/UKSF.Api.Services/Admin/VariablesWrapper.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.DependencyInjection; -using UKSFWebsite.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Data.Cached; -namespace UKSFWebsite.Api.Services.Admin { +namespace UKSF.Api.Services.Admin { public static class VariablesWrapper { public static IVariablesDataService VariablesDataService() => ServiceWrapper.ServiceProvider.GetService(); } diff --git a/UKSFWebsite.Api.Services/Command/ChainOfCommandService.cs b/UKSF.Api.Services/Command/ChainOfCommandService.cs similarity index 94% rename from UKSFWebsite.Api.Services/Command/ChainOfCommandService.cs rename to UKSF.Api.Services/Command/ChainOfCommandService.cs index 68a614c8..cb103a57 100644 --- a/UKSFWebsite.Api.Services/Command/ChainOfCommandService.cs +++ b/UKSF.Api.Services/Command/ChainOfCommandService.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; using System.Linq; -using UKSFWebsite.Api.Interfaces.Command; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Command; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; - -namespace UKSFWebsite.Api.Services.Command { +using UKSF.Api.Interfaces.Command; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Command; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; + +namespace UKSF.Api.Services.Command { public class ChainOfCommandService : IChainOfCommandService { private readonly string commanderRoleName; private readonly ISessionService sessionService; diff --git a/UKSFWebsite.Api.Services/Command/CommandRequestCompletionService.cs b/UKSF.Api.Services/Command/CommandRequestCompletionService.cs similarity index 96% rename from UKSFWebsite.Api.Services/Command/CommandRequestCompletionService.cs rename to UKSF.Api.Services/Command/CommandRequestCompletionService.cs index f3428cc0..e64da14d 100644 --- a/UKSFWebsite.Api.Services/Command/CommandRequestCompletionService.cs +++ b/UKSF.Api.Services/Command/CommandRequestCompletionService.cs @@ -3,21 +3,21 @@ using AvsAnLib; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Command; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Command; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Personnel; -using UKSFWebsite.Api.Signalr.Hubs.Command; - -namespace UKSFWebsite.Api.Services.Command { +using UKSF.Api.Interfaces.Command; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Command; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Signalr.Hubs.Command; + +namespace UKSF.Api.Services.Command { public class CommandRequestCompletionService : ICommandRequestCompletionService { private readonly IAccountService accountService; private readonly IAssignmentService assignmentService; diff --git a/UKSFWebsite.Api.Services/Command/CommandRequestService.cs b/UKSF.Api.Services/Command/CommandRequestService.cs similarity index 91% rename from UKSFWebsite.Api.Services/Command/CommandRequestService.cs rename to UKSF.Api.Services/Command/CommandRequestService.cs index 37ec8412..ce70a128 100644 --- a/UKSFWebsite.Api.Services/Command/CommandRequestService.cs +++ b/UKSF.Api.Services/Command/CommandRequestService.cs @@ -4,20 +4,20 @@ using System.Threading.Tasks; using AvsAnLib; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Command; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Command; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Command; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Command; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Services.Command { +namespace UKSF.Api.Services.Command { public class CommandRequestService : ICommandRequestService { private readonly IAccountService accountService; private readonly IChainOfCommandService chainOfCommandService; diff --git a/UKSFWebsite.Api.Services/Fake/FakeCachedDataService.cs b/UKSF.Api.Services/Fake/FakeCachedDataService.cs similarity index 74% rename from UKSFWebsite.Api.Services/Fake/FakeCachedDataService.cs rename to UKSF.Api.Services/Fake/FakeCachedDataService.cs index e64cf7d4..5eaba547 100644 --- a/UKSFWebsite.Api.Services/Fake/FakeCachedDataService.cs +++ b/UKSF.Api.Services/Fake/FakeCachedDataService.cs @@ -1,4 +1,4 @@ -namespace UKSFWebsite.Api.Services.Fake { +namespace UKSF.Api.Services.Fake { public class FakeCachedDataService : FakeDataService { public void Refresh() { } } diff --git a/UKSFWebsite.Api.Services/Fake/FakeDataService.cs b/UKSF.Api.Services/Fake/FakeDataService.cs similarity index 87% rename from UKSFWebsite.Api.Services/Fake/FakeDataService.cs rename to UKSF.Api.Services/Fake/FakeDataService.cs index 385ad4d1..8faa9357 100644 --- a/UKSFWebsite.Api.Services/Fake/FakeDataService.cs +++ b/UKSF.Api.Services/Fake/FakeDataService.cs @@ -3,10 +3,10 @@ using System.Reactive.Subjects; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Models.Events; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Models.Events; -namespace UKSFWebsite.Api.Services.Fake { +namespace UKSF.Api.Services.Fake { public abstract class FakeDataService : IDataService { public List Get() => new List(); diff --git a/UKSFWebsite.Api.Services/Fake/FakeDiscordService.cs b/UKSF.Api.Services/Fake/FakeDiscordService.cs similarity index 76% rename from UKSFWebsite.Api.Services/Fake/FakeDiscordService.cs rename to UKSF.Api.Services/Fake/FakeDiscordService.cs index f57e63ee..e98e2145 100644 --- a/UKSFWebsite.Api.Services/Fake/FakeDiscordService.cs +++ b/UKSF.Api.Services/Fake/FakeDiscordService.cs @@ -1,11 +1,11 @@ using System.Threading.Tasks; using Microsoft.Extensions.Configuration; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Integrations; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Integrations; -namespace UKSFWebsite.Api.Services.Fake { +namespace UKSF.Api.Services.Fake { public class FakeDiscordService : DiscordService { public FakeDiscordService(IConfiguration configuration, IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService) : base(configuration, ranksService, unitsService, accountService, displayNameService) { } diff --git a/UKSFWebsite.Api.Services/Fake/FakeNotificationsService.cs b/UKSF.Api.Services/Fake/FakeNotificationsService.cs similarity index 78% rename from UKSFWebsite.Api.Services/Fake/FakeNotificationsService.cs rename to UKSF.Api.Services/Fake/FakeNotificationsService.cs index ca34f309..374a1640 100644 --- a/UKSFWebsite.Api.Services/Fake/FakeNotificationsService.cs +++ b/UKSF.Api.Services/Fake/FakeNotificationsService.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Fake { +namespace UKSF.Api.Services.Fake { public class FakeNotificationsService : INotificationsService { public Task SendTeamspeakNotification(Account account, string rawMessage) => Task.CompletedTask; diff --git a/UKSFWebsite.Api.Services/Fake/FakePipeManager.cs b/UKSF.Api.Services/Fake/FakePipeManager.cs similarity index 58% rename from UKSFWebsite.Api.Services/Fake/FakePipeManager.cs rename to UKSF.Api.Services/Fake/FakePipeManager.cs index 4c06486c..a106f1fc 100644 --- a/UKSFWebsite.Api.Services/Fake/FakePipeManager.cs +++ b/UKSF.Api.Services/Fake/FakePipeManager.cs @@ -1,6 +1,6 @@ -using UKSFWebsite.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Integrations; -namespace UKSFWebsite.Api.Services.Fake { +namespace UKSF.Api.Services.Fake { public class FakePipeManager : IPipeManager { public void Dispose() { } diff --git a/UKSFWebsite.Api.Services/Fake/FakeTeamspeakManagerService.cs b/UKSF.Api.Services/Fake/FakeTeamspeakManagerService.cs similarity index 66% rename from UKSFWebsite.Api.Services/Fake/FakeTeamspeakManagerService.cs rename to UKSF.Api.Services/Fake/FakeTeamspeakManagerService.cs index de245db3..f92228f9 100644 --- a/UKSFWebsite.Api.Services/Fake/FakeTeamspeakManagerService.cs +++ b/UKSF.Api.Services/Fake/FakeTeamspeakManagerService.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Models.Integrations; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Models.Integrations; -namespace UKSFWebsite.Api.Services.Fake { +namespace UKSF.Api.Services.Fake { public class FakeTeamspeakManagerService : ITeamspeakManagerService { public void Start() { } diff --git a/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.Services/Game/GameServerHelpers.cs similarity index 97% rename from UKSFWebsite.Api.Services/Game/GameServerHelpers.cs rename to UKSF.Api.Services/Game/GameServerHelpers.cs index 3110e07d..6b1b7a0a 100644 --- a/UKSFWebsite.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.Services/Game/GameServerHelpers.cs @@ -3,11 +3,11 @@ using System.Diagnostics; using System.IO; using System.Linq; -using UKSFWebsite.Api.Models.Game; -using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Utility; +using UKSF.Api.Models.Game; +using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Game { +namespace UKSF.Api.Services.Game { public static class GameServerHelpers { private static readonly string[] BASE_CONFIG = { "hostname = \"{0}\";", diff --git a/UKSFWebsite.Api.Services/Game/GameServersService.cs b/UKSF.Api.Services/Game/GameServersService.cs similarity index 97% rename from UKSFWebsite.Api.Services/Game/GameServersService.cs rename to UKSF.Api.Services/Game/GameServersService.cs index 36d4753b..b016fa39 100644 --- a/UKSFWebsite.Api.Services/Game/GameServersService.cs +++ b/UKSF.Api.Services/Game/GameServersService.cs @@ -8,13 +8,13 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Newtonsoft.Json; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Game; -using UKSFWebsite.Api.Models.Game; -using UKSFWebsite.Api.Models.Mission; -using UKSFWebsite.Api.Services.Utility; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Game; +using UKSF.Api.Models.Game; +using UKSF.Api.Models.Mission; +using UKSF.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Game { +namespace UKSF.Api.Services.Game { public class GameServersService : IGameServersService { private readonly IGameServersDataService data; private readonly IMissionPatchingService missionPatchingService; diff --git a/UKSFWebsite.Api.Services/Game/Missions/MissionDataResolver.cs b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs similarity index 99% rename from UKSFWebsite.Api.Services/Game/Missions/MissionDataResolver.cs rename to UKSF.Api.Services/Game/Missions/MissionDataResolver.cs index 3b071c66..ba8f5a03 100644 --- a/UKSFWebsite.Api.Services/Game/Missions/MissionDataResolver.cs +++ b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; -using UKSFWebsite.Api.Models.Mission; +using UKSF.Api.Models.Mission; -namespace UKSFWebsite.Api.Services.Game.Missions { +namespace UKSF.Api.Services.Game.Missions { public class MissionDataResolver { private static readonly string[] ENGINEER_IDS = { "5a1e894463d0f71710089106", // Bridg diff --git a/UKSFWebsite.Api.Services/Game/Missions/MissionEntityHelper.cs b/UKSF.Api.Services/Game/Missions/MissionEntityHelper.cs similarity index 96% rename from UKSFWebsite.Api.Services/Game/Missions/MissionEntityHelper.cs rename to UKSF.Api.Services/Game/Missions/MissionEntityHelper.cs index 6968b31f..157e7d6e 100644 --- a/UKSFWebsite.Api.Services/Game/Missions/MissionEntityHelper.cs +++ b/UKSF.Api.Services/Game/Missions/MissionEntityHelper.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using UKSFWebsite.Api.Models.Mission; +using UKSF.Api.Models.Mission; -namespace UKSFWebsite.Api.Services.Game.Missions { +namespace UKSF.Api.Services.Game.Missions { public static class MissionEntityHelper { public static MissionEntity CreateFromItems(List rawEntities) { MissionEntity missionEntity = new MissionEntity {itemsCount = Convert.ToInt32(MissionUtilities.ReadSingleDataByKey(rawEntities, "items"))}; diff --git a/UKSFWebsite.Api.Services/Game/Missions/MissionEntityItemHelper.cs b/UKSF.Api.Services/Game/Missions/MissionEntityItemHelper.cs similarity index 98% rename from UKSFWebsite.Api.Services/Game/Missions/MissionEntityItemHelper.cs rename to UKSF.Api.Services/Game/Missions/MissionEntityItemHelper.cs index b8fd367e..8d414f96 100644 --- a/UKSFWebsite.Api.Services/Game/Missions/MissionEntityItemHelper.cs +++ b/UKSF.Api.Services/Game/Missions/MissionEntityItemHelper.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; -using UKSFWebsite.Api.Models.Mission; +using UKSF.Api.Models.Mission; -namespace UKSFWebsite.Api.Services.Game.Missions { +namespace UKSF.Api.Services.Game.Missions { public static class MissionEntityItemHelper { public static MissionEntityItem CreateFromList(List rawItem) { MissionEntityItem missionEntityItem = new MissionEntityItem {rawMissionEntityItem = rawItem}; diff --git a/UKSFWebsite.Api.Services/Game/Missions/MissionPatchDataService.cs b/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs similarity index 93% rename from UKSFWebsite.Api.Services/Game/Missions/MissionPatchDataService.cs rename to UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs index f933a0f9..5599badf 100644 --- a/UKSFWebsite.Api.Services/Game/Missions/MissionPatchDataService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using System.Linq; using MongoDB.Bson; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Models.Mission; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Models.Mission; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; -namespace UKSFWebsite.Api.Services.Game.Missions { +namespace UKSF.Api.Services.Game.Missions { public class MissionPatchDataService { private readonly IAccountService accountService; private readonly IDisplayNameService displayNameService; diff --git a/UKSFWebsite.Api.Services/Game/Missions/MissionPatchingService.cs b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs similarity index 94% rename from UKSFWebsite.Api.Services/Game/Missions/MissionPatchingService.cs rename to UKSF.Api.Services/Game/Missions/MissionPatchingService.cs index 333ca674..d6d58e7f 100644 --- a/UKSFWebsite.Api.Services/Game/Missions/MissionPatchingService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs @@ -5,13 +5,13 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Game; -using UKSFWebsite.Api.Models.Mission; -using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Utility; +using UKSF.Api.Interfaces.Game; +using UKSF.Api.Models.Mission; +using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Game.Missions { +namespace UKSF.Api.Services.Game.Missions { public class MissionPatchingService : IMissionPatchingService { private const string EXTRACT_PBO = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\ExtractPboDos.exe"; private const string MAKE_PBO = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\MakePbo.exe"; diff --git a/UKSFWebsite.Api.Services/Game/Missions/MissionService.cs b/UKSF.Api.Services/Game/Missions/MissionService.cs similarity index 98% rename from UKSFWebsite.Api.Services/Game/Missions/MissionService.cs rename to UKSF.Api.Services/Game/Missions/MissionService.cs index e5deb446..f58cbb3c 100644 --- a/UKSFWebsite.Api.Services/Game/Missions/MissionService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionService.cs @@ -3,11 +3,11 @@ using System.Diagnostics; using System.IO; using System.Linq; -using UKSFWebsite.Api.Models.Mission; -using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Utility; +using UKSF.Api.Models.Mission; +using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Game.Missions { +namespace UKSF.Api.Services.Game.Missions { public class MissionService { private const string UNBIN = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\DeRapDos.exe"; diff --git a/UKSFWebsite.Api.Services/Game/Missions/MissionUtilities.cs b/UKSF.Api.Services/Game/Missions/MissionUtilities.cs similarity index 97% rename from UKSFWebsite.Api.Services/Game/Missions/MissionUtilities.cs rename to UKSF.Api.Services/Game/Missions/MissionUtilities.cs index 6949949a..47ed894f 100644 --- a/UKSFWebsite.Api.Services/Game/Missions/MissionUtilities.cs +++ b/UKSF.Api.Services/Game/Missions/MissionUtilities.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace UKSFWebsite.Api.Services.Game.Missions { +namespace UKSF.Api.Services.Game.Missions { public static class MissionUtilities { public static List ReadDataFromIndex(List source, ref int index) { List data = new List {source[index]}; diff --git a/UKSFWebsite.Api.Services/Game/ServerService.cs b/UKSF.Api.Services/Game/ServerService.cs similarity index 93% rename from UKSFWebsite.Api.Services/Game/ServerService.cs rename to UKSF.Api.Services/Game/ServerService.cs index ed1fa828..03b7fe8c 100644 --- a/UKSFWebsite.Api.Services/Game/ServerService.cs +++ b/UKSF.Api.Services/Game/ServerService.cs @@ -4,17 +4,17 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; +using UKSF.Api.Services.Personnel; // ReSharper disable HeuristicUnreachableCode #pragma warning disable 162 -namespace UKSFWebsite.Api.Services.Game { +namespace UKSF.Api.Services.Game { public class ServerService : IServerService { private const string FILE_BACKUP = "backup.xml"; private const string FILE_SQUAD = "squad.xml"; diff --git a/UKSFWebsite.Api.Services/Integrations/DiscordService.cs b/UKSF.Api.Services/Integrations/DiscordService.cs similarity index 96% rename from UKSFWebsite.Api.Services/Integrations/DiscordService.cs rename to UKSF.Api.Services/Integrations/DiscordService.cs index 3bf09ef3..47a8dab8 100644 --- a/UKSFWebsite.Api.Services/Integrations/DiscordService.cs +++ b/UKSF.Api.Services/Integrations/DiscordService.cs @@ -5,15 +5,15 @@ using Discord; using Discord.WebSocket; using Microsoft.Extensions.Configuration; -using UKSFWebsite.Api.Interfaces.Integrations; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Message; - -namespace UKSFWebsite.Api.Services.Integrations { +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; +using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Message; + +namespace UKSF.Api.Services.Integrations { public class DiscordService : IDiscordService, IDisposable { private static readonly string[] REPLIES = {"Why thank you {0}", "Thank you {0}, you're too kind", "Thank you so much {0}", "Aw shucks {0} you're embarrassing me"}; private static readonly string[] TRIGGERS = {"thank you", "thank", "best", "mvp", "love you", "appreciate you", "good"}; diff --git a/UKSFWebsite.Api.Services/Integrations/PipeManager.cs b/UKSF.Api.Services/Integrations/PipeManager.cs similarity index 98% rename from UKSFWebsite.Api.Services/Integrations/PipeManager.cs rename to UKSF.Api.Services/Integrations/PipeManager.cs index 1b7371c8..920d2e1f 100644 --- a/UKSFWebsite.Api.Services/Integrations/PipeManager.cs +++ b/UKSF.Api.Services/Integrations/PipeManager.cs @@ -1,9 +1,9 @@ using System; using System.Runtime.InteropServices; using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Integrations; -namespace UKSFWebsite.Api.Services.Integrations { +namespace UKSF.Api.Services.Integrations { public class PipeManager : IPipeManager { private const string PIPE_COMMAND_CLOSE = "1"; private const string PIPE_COMMAND_OPEN = "0"; diff --git a/UKSFWebsite.Api.Services/Integrations/PipeQueueManager.cs b/UKSF.Api.Services/Integrations/PipeQueueManager.cs similarity index 91% rename from UKSFWebsite.Api.Services/Integrations/PipeQueueManager.cs rename to UKSF.Api.Services/Integrations/PipeQueueManager.cs index d1c78955..d3822bad 100644 --- a/UKSFWebsite.Api.Services/Integrations/PipeQueueManager.cs +++ b/UKSF.Api.Services/Integrations/PipeQueueManager.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; -namespace UKSFWebsite.Api.Services.Integrations { +namespace UKSF.Api.Services.Integrations { public static class PipeQueueManager { private static readonly ConcurrentQueue PIPE_QUEUE = new ConcurrentQueue(); diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs similarity index 90% rename from UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs rename to UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs index b02dc39a..407fef83 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs @@ -1,16 +1,16 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Models.Integrations; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Utility; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Models.Integrations; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; +using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { +namespace UKSF.Api.Services.Integrations.Teamspeak { public class TeamspeakGroupService : ITeamspeakGroupService { private readonly IRanksService ranksService; private readonly IUnitsService unitsService; diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs similarity index 88% rename from UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs rename to UKSF.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs index 8fdac8e7..d1132c97 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs @@ -4,14 +4,14 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Models.Integrations; -using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Utility; -using UKSFWebsite.Api.Signalr.Hubs.Integrations; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Models.Integrations; +using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Utility; +using UKSF.Api.Signalr.Hubs.Integrations; -namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { +namespace UKSF.Api.Services.Integrations.Teamspeak { public class TeamspeakManagerService : ITeamspeakManagerService { private readonly IHubContext hub; private bool runTeamspeak; diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs similarity index 64% rename from UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs rename to UKSF.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs index 96fabd77..f5847905 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Integrations.Teamspeak; -namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { +namespace UKSF.Api.Services.Integrations.Teamspeak { public class TeamspeakMetricsService : ITeamspeakMetricsService { public float GetWeeklyParticipationTrend(HashSet teamspeakIdentities) => 3; } diff --git a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs similarity index 93% rename from UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs rename to UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs index 5cc24c31..6070de50 100644 --- a/UKSFWebsite.Api.Services/Integrations/Teamspeak/TeamspeakService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs @@ -5,13 +5,13 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Models.Integrations; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Signalr.Hubs.Integrations; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Models.Integrations; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Signalr.Hubs.Integrations; -namespace UKSFWebsite.Api.Services.Integrations.Teamspeak { +namespace UKSF.Api.Services.Integrations.Teamspeak { public class TeamspeakService : ITeamspeakService { private readonly SemaphoreSlim clientsSemaphore = new SemaphoreSlim(1); private readonly IMongoDatabase database; diff --git a/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs b/UKSF.Api.Services/Launcher/LauncherFileService.cs similarity index 95% rename from UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs rename to UKSF.Api.Services/Launcher/LauncherFileService.cs index 01874d29..0d2f0568 100644 --- a/UKSFWebsite.Api.Services/Launcher/LauncherFileService.cs +++ b/UKSF.Api.Services/Launcher/LauncherFileService.cs @@ -8,12 +8,12 @@ using Microsoft.AspNetCore.Mvc; using MimeMapping; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Launcher; -using UKSFWebsite.Api.Models.Launcher; -using UKSFWebsite.Api.Services.Admin; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Launcher; +using UKSF.Api.Models.Launcher; +using UKSF.Api.Services.Admin; -namespace UKSFWebsite.Api.Services.Launcher { +namespace UKSF.Api.Services.Launcher { public class LauncherFileService : ILauncherFileService { private readonly ILauncherFileDataService data; diff --git a/UKSFWebsite.Api.Services/Launcher/LauncherService.cs b/UKSF.Api.Services/Launcher/LauncherService.cs similarity index 62% rename from UKSFWebsite.Api.Services/Launcher/LauncherService.cs rename to UKSF.Api.Services/Launcher/LauncherService.cs index dbf7cef9..60244169 100644 --- a/UKSFWebsite.Api.Services/Launcher/LauncherService.cs +++ b/UKSF.Api.Services/Launcher/LauncherService.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Interfaces.Launcher; -using UKSFWebsite.Api.Signalr.Hubs.Integrations; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Launcher; +using UKSF.Api.Signalr.Hubs.Integrations; -namespace UKSFWebsite.Api.Services.Launcher { +namespace UKSF.Api.Services.Launcher { public class LauncherService : ILauncherService { private readonly IHubContext launcherHub; diff --git a/UKSFWebsite.Api.Services/Message/CommentThreadService.cs b/UKSF.Api.Services/Message/CommentThreadService.cs similarity index 86% rename from UKSFWebsite.Api.Services/Message/CommentThreadService.cs rename to UKSF.Api.Services/Message/CommentThreadService.cs index 8763d903..5d3a336c 100644 --- a/UKSFWebsite.Api.Services/Message/CommentThreadService.cs +++ b/UKSF.Api.Services/Message/CommentThreadService.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Models.Events; -using UKSFWebsite.Api.Models.Message; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Message; -namespace UKSFWebsite.Api.Services.Message { +namespace UKSF.Api.Services.Message { public class CommentThreadService : ICommentThreadService { private readonly ICommentThreadDataService data; private readonly IDisplayNameService displayNameService; diff --git a/UKSFWebsite.Api.Services/Message/EmailService.cs b/UKSF.Api.Services/Message/EmailService.cs similarity index 92% rename from UKSFWebsite.Api.Services/Message/EmailService.cs rename to UKSF.Api.Services/Message/EmailService.cs index 92a6ba9a..b411372d 100644 --- a/UKSFWebsite.Api.Services/Message/EmailService.cs +++ b/UKSF.Api.Services/Message/EmailService.cs @@ -1,9 +1,9 @@ using System.Net; using System.Net.Mail; using Microsoft.Extensions.Configuration; -using UKSFWebsite.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Message; -namespace UKSFWebsite.Api.Services.Message { +namespace UKSF.Api.Services.Message { public class EmailService : IEmailService { private readonly string password; private readonly string username; diff --git a/UKSFWebsite.Api.Services/Message/LogWrapper.cs b/UKSF.Api.Services/Message/LogWrapper.cs similarity index 83% rename from UKSFWebsite.Api.Services/Message/LogWrapper.cs rename to UKSF.Api.Services/Message/LogWrapper.cs index 52af7203..742ce102 100644 --- a/UKSFWebsite.Api.Services/Message/LogWrapper.cs +++ b/UKSF.Api.Services/Message/LogWrapper.cs @@ -1,9 +1,9 @@ using System; using Microsoft.Extensions.DependencyInjection; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Models.Message.Logging; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Models.Message.Logging; -namespace UKSFWebsite.Api.Services.Message { +namespace UKSF.Api.Services.Message { public static class LogWrapper { public static void Log(string message) => ServiceWrapper.ServiceProvider.GetService().Log(message); diff --git a/UKSFWebsite.Api.Services/Message/LoggingService.cs b/UKSF.Api.Services/Message/LoggingService.cs similarity index 81% rename from UKSFWebsite.Api.Services/Message/LoggingService.cs rename to UKSF.Api.Services/Message/LoggingService.cs index 445e317a..53e8a135 100644 --- a/UKSFWebsite.Api.Services/Message/LoggingService.cs +++ b/UKSF.Api.Services/Message/LoggingService.cs @@ -1,16 +1,12 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNetCore.SignalR; -using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Models.Message.Logging; -using UKSFWebsite.Api.Services.Utility; -using UKSFWebsite.Api.Signalr.Hubs.Utility; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Services.Utility; -namespace UKSFWebsite.Api.Services.Message { +namespace UKSF.Api.Services.Message { public class LoggingService : ILoggingService { private readonly ILogDataService data; private readonly IDisplayNameService displayNameService; diff --git a/UKSFWebsite.Api.Services/Message/NotificationsService.cs b/UKSF.Api.Services/Message/NotificationsService.cs similarity index 89% rename from UKSFWebsite.Api.Services/Message/NotificationsService.cs rename to UKSF.Api.Services/Message/NotificationsService.cs index 0f21211a..425411a6 100644 --- a/UKSFWebsite.Api.Services/Message/NotificationsService.cs +++ b/UKSF.Api.Services/Message/NotificationsService.cs @@ -3,18 +3,18 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Utility; -using UKSFWebsite.Api.Signalr.Hubs.Message; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Utility; +using UKSF.Api.Signalr.Hubs.Message; -namespace UKSFWebsite.Api.Services.Message { +namespace UKSF.Api.Services.Message { public class NotificationsService : INotificationsService { private readonly IAccountService accountService; private readonly INotificationsDataService data; diff --git a/UKSFWebsite.Api.Services/Operations/OperationOrderService.cs b/UKSF.Api.Services/Operations/OperationOrderService.cs similarity index 80% rename from UKSFWebsite.Api.Services/Operations/OperationOrderService.cs rename to UKSF.Api.Services/Operations/OperationOrderService.cs index 618c6606..25d072b9 100644 --- a/UKSFWebsite.Api.Services/Operations/OperationOrderService.cs +++ b/UKSF.Api.Services/Operations/OperationOrderService.cs @@ -1,9 +1,9 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Operations; -using UKSFWebsite.Api.Models.Operations; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Operations; +using UKSF.Api.Models.Operations; -namespace UKSFWebsite.Api.Services.Operations { +namespace UKSF.Api.Services.Operations { public class OperationOrderService : IOperationOrderService { private readonly IOperationOrderDataService data; diff --git a/UKSFWebsite.Api.Services/Operations/OperationReportService.cs b/UKSF.Api.Services/Operations/OperationReportService.cs similarity index 83% rename from UKSFWebsite.Api.Services/Operations/OperationReportService.cs rename to UKSF.Api.Services/Operations/OperationReportService.cs index 953c5a97..54b5e387 100644 --- a/UKSFWebsite.Api.Services/Operations/OperationReportService.cs +++ b/UKSF.Api.Services/Operations/OperationReportService.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Operations; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Models.Operations; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Operations; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Models.Operations; -namespace UKSFWebsite.Api.Services.Operations { +namespace UKSF.Api.Services.Operations { public class OperationReportService : IOperationReportService { private readonly IAttendanceService attendanceService; private readonly IOperationReportDataService data; diff --git a/UKSFWebsite.Api.Services/Personnel/AccountService.cs b/UKSF.Api.Services/Personnel/AccountService.cs similarity index 63% rename from UKSFWebsite.Api.Services/Personnel/AccountService.cs rename to UKSF.Api.Services/Personnel/AccountService.cs index 0a089e34..e93a4296 100644 --- a/UKSFWebsite.Api.Services/Personnel/AccountService.cs +++ b/UKSF.Api.Services/Personnel/AccountService.cs @@ -1,7 +1,7 @@ -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Personnel; -namespace UKSFWebsite.Api.Services.Personnel { +namespace UKSF.Api.Services.Personnel { public class AccountService : IAccountService { private readonly IAccountDataService data; diff --git a/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs b/UKSF.Api.Services/Personnel/AssignmentService.cs similarity index 95% rename from UKSFWebsite.Api.Services/Personnel/AssignmentService.cs rename to UKSF.Api.Services/Personnel/AssignmentService.cs index ee35c849..01819149 100644 --- a/UKSFWebsite.Api.Services/Personnel/AssignmentService.cs +++ b/UKSF.Api.Services/Personnel/AssignmentService.cs @@ -4,18 +4,18 @@ using System.Threading.Tasks; using AvsAnLib; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Interfaces.Integrations; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Signalr.Hubs.Personnel; - -namespace UKSFWebsite.Api.Services.Personnel { +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; +using UKSF.Api.Signalr.Hubs.Personnel; + +namespace UKSF.Api.Services.Personnel { public class AssignmentService : IAssignmentService { public const string REMOVE_FLAG = "REMOVE"; private readonly IHubContext accountHub; diff --git a/UKSFWebsite.Api.Services/Personnel/AttendanceService.cs b/UKSF.Api.Services/Personnel/AttendanceService.cs similarity index 93% rename from UKSFWebsite.Api.Services/Personnel/AttendanceService.cs rename to UKSF.Api.Services/Personnel/AttendanceService.cs index 4af4c09f..7f028a0d 100644 --- a/UKSFWebsite.Api.Services/Personnel/AttendanceService.cs +++ b/UKSF.Api.Services/Personnel/AttendanceService.cs @@ -3,12 +3,12 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Models.Integrations; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Models.Integrations; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Personnel { +namespace UKSF.Api.Services.Personnel { public class AttendanceService : IAttendanceService { private readonly IAccountService accountService; private readonly IMongoDatabase database; diff --git a/UKSFWebsite.Api.Services/Personnel/DischargeService.cs b/UKSF.Api.Services/Personnel/DischargeService.cs similarity index 64% rename from UKSFWebsite.Api.Services/Personnel/DischargeService.cs rename to UKSF.Api.Services/Personnel/DischargeService.cs index 1685bdab..b0922234 100644 --- a/UKSFWebsite.Api.Services/Personnel/DischargeService.cs +++ b/UKSF.Api.Services/Personnel/DischargeService.cs @@ -1,7 +1,7 @@ -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Personnel; -namespace UKSFWebsite.Api.Services.Personnel { +namespace UKSF.Api.Services.Personnel { public class DischargeService : IDischargeService { private readonly IDischargeDataService data; diff --git a/UKSFWebsite.Api.Services/Personnel/DisplayNameService.cs b/UKSF.Api.Services/Personnel/DisplayNameService.cs similarity index 90% rename from UKSFWebsite.Api.Services/Personnel/DisplayNameService.cs rename to UKSF.Api.Services/Personnel/DisplayNameService.cs index b258ad3b..8f484d93 100644 --- a/UKSFWebsite.Api.Services/Personnel/DisplayNameService.cs +++ b/UKSF.Api.Services/Personnel/DisplayNameService.cs @@ -1,7 +1,7 @@ -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Personnel { +namespace UKSF.Api.Services.Personnel { public class DisplayNameService : IDisplayNameService { private readonly IAccountService accountService; private readonly IRanksService ranksService; diff --git a/UKSFWebsite.Api.Services/Personnel/LoaService.cs b/UKSF.Api.Services/Personnel/LoaService.cs similarity index 87% rename from UKSFWebsite.Api.Services/Personnel/LoaService.cs rename to UKSF.Api.Services/Personnel/LoaService.cs index d25d5152..e151e79a 100644 --- a/UKSFWebsite.Api.Services/Personnel/LoaService.cs +++ b/UKSF.Api.Services/Personnel/LoaService.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Threading.Tasks; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Models.Command; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Models.Command; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Personnel { +namespace UKSF.Api.Services.Personnel { public class LoaService : ILoaService { private readonly ILoaDataService data; diff --git a/UKSFWebsite.Api.Services/Personnel/LoginService.cs b/UKSF.Api.Services/Personnel/LoginService.cs similarity index 96% rename from UKSFWebsite.Api.Services/Personnel/LoginService.cs rename to UKSF.Api.Services/Personnel/LoginService.cs index 7b03df82..f5846e9e 100644 --- a/UKSFWebsite.Api.Services/Personnel/LoginService.cs +++ b/UKSF.Api.Services/Personnel/LoginService.cs @@ -5,12 +5,12 @@ using System.Security.Claims; using Microsoft.IdentityModel.Tokens; using Newtonsoft.Json; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Personnel { +namespace UKSF.Api.Services.Personnel { public class LoginService : ILoginService { private readonly IAccountService accountService; diff --git a/UKSFWebsite.Api.Services/Personnel/RanksService.cs b/UKSF.Api.Services/Personnel/RanksService.cs similarity index 90% rename from UKSFWebsite.Api.Services/Personnel/RanksService.cs rename to UKSF.Api.Services/Personnel/RanksService.cs index 0e841b0b..9b3fcf6c 100644 --- a/UKSFWebsite.Api.Services/Personnel/RanksService.cs +++ b/UKSF.Api.Services/Personnel/RanksService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Personnel { +namespace UKSF.Api.Services.Personnel { public class RanksService : IRanksService { private readonly IRanksDataService data; diff --git a/UKSFWebsite.Api.Services/Personnel/RecruitmentService.cs b/UKSF.Api.Services/Personnel/RecruitmentService.cs similarity index 96% rename from UKSFWebsite.Api.Services/Personnel/RecruitmentService.cs rename to UKSF.Api.Services/Personnel/RecruitmentService.cs index 19c1759d..63c33a82 100644 --- a/UKSFWebsite.Api.Services/Personnel/RecruitmentService.cs +++ b/UKSF.Api.Services/Personnel/RecruitmentService.cs @@ -4,16 +4,16 @@ using System.Threading.Tasks; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Integrations; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Services.Utility; - -namespace UKSFWebsite.Api.Services.Personnel { +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; +using UKSF.Api.Services.Utility; + +namespace UKSF.Api.Services.Personnel { public class RecruitmentService : IRecruitmentService { private readonly IAccountService accountService; private readonly IDiscordService discordService; diff --git a/UKSFWebsite.Api.Services/Personnel/RoleDefinitions.cs b/UKSF.Api.Services/Personnel/RoleDefinitions.cs similarity index 94% rename from UKSFWebsite.Api.Services/Personnel/RoleDefinitions.cs rename to UKSF.Api.Services/Personnel/RoleDefinitions.cs index 6dcbdc98..9d186aa0 100644 --- a/UKSFWebsite.Api.Services/Personnel/RoleDefinitions.cs +++ b/UKSF.Api.Services/Personnel/RoleDefinitions.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Authorization; -namespace UKSFWebsite.Api.Services.Personnel { +namespace UKSF.Api.Services.Personnel { public static class RoleDefinitions { public const string ADMIN = "ADMIN"; public const string COMMAND = "COMMAND"; diff --git a/UKSFWebsite.Api.Services/Personnel/RolesService.cs b/UKSF.Api.Services/Personnel/RolesService.cs similarity index 79% rename from UKSFWebsite.Api.Services/Personnel/RolesService.cs rename to UKSF.Api.Services/Personnel/RolesService.cs index e057b3c6..4bf78f52 100644 --- a/UKSFWebsite.Api.Services/Personnel/RolesService.cs +++ b/UKSF.Api.Services/Personnel/RolesService.cs @@ -1,8 +1,8 @@ -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Personnel { +namespace UKSF.Api.Services.Personnel { public class RolesService : IRolesService { private readonly IRolesDataService data; diff --git a/UKSFWebsite.Api.Services/Personnel/ServiceRecordService.cs b/UKSF.Api.Services/Personnel/ServiceRecordService.cs similarity index 80% rename from UKSFWebsite.Api.Services/Personnel/ServiceRecordService.cs rename to UKSF.Api.Services/Personnel/ServiceRecordService.cs index 491ee160..fabc266b 100644 --- a/UKSFWebsite.Api.Services/Personnel/ServiceRecordService.cs +++ b/UKSF.Api.Services/Personnel/ServiceRecordService.cs @@ -1,9 +1,9 @@ using System; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Personnel { +namespace UKSF.Api.Services.Personnel { public class ServiceRecordService : IServiceRecordService { private readonly IAccountService accountService; diff --git a/UKSFWebsite.Api.Services/ServiceWrapper.cs b/UKSF.Api.Services/ServiceWrapper.cs similarity index 76% rename from UKSFWebsite.Api.Services/ServiceWrapper.cs rename to UKSF.Api.Services/ServiceWrapper.cs index fcd71eb1..e7a36bbd 100644 --- a/UKSFWebsite.Api.Services/ServiceWrapper.cs +++ b/UKSF.Api.Services/ServiceWrapper.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api.Services { +namespace UKSF.Api.Services { public static class ServiceWrapper { public static IServiceProvider ServiceProvider; } diff --git a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj b/UKSF.Api.Services/UKSF.Api.Services.csproj similarity index 78% rename from UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj rename to UKSF.Api.Services/UKSF.Api.Services.csproj index f5f4771f..dbff823c 100644 --- a/UKSFWebsite.Api.Services/UKSFWebsite.Api.Services.csproj +++ b/UKSF.Api.Services/UKSF.Api.Services.csproj @@ -1,8 +1,8 @@  netcoreapp3.0 - UKSFWebsite.Api.Services - UKSFWebsite.Api.Services + UKSF.Api.Services + UKSF.Api.Services disable @@ -26,8 +26,8 @@ - - - + + + diff --git a/UKSFWebsite.Api.Services/Units/UnitsService.cs b/UKSF.Api.Services/Units/UnitsService.cs similarity index 96% rename from UKSFWebsite.Api.Services/Units/UnitsService.cs rename to UKSF.Api.Services/Units/UnitsService.cs index 5fbc810a..c0c70a1d 100644 --- a/UKSFWebsite.Api.Services/Units/UnitsService.cs +++ b/UKSF.Api.Services/Units/UnitsService.cs @@ -4,13 +4,13 @@ using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; -namespace UKSFWebsite.Api.Services.Units { +namespace UKSF.Api.Services.Units { public class UnitsService : IUnitsService { private readonly IUnitsDataService data; private readonly IRolesService rolesService; diff --git a/UKSFWebsite.Api.Services/Utility/ChangeHelper.cs b/UKSF.Api.Services/Utility/ChangeHelper.cs similarity index 99% rename from UKSFWebsite.Api.Services/Utility/ChangeHelper.cs rename to UKSF.Api.Services/Utility/ChangeHelper.cs index cf900693..4f0ed0fb 100644 --- a/UKSFWebsite.Api.Services/Utility/ChangeHelper.cs +++ b/UKSF.Api.Services/Utility/ChangeHelper.cs @@ -5,7 +5,7 @@ using MongoDB.Bson.Serialization.Attributes; using Newtonsoft.Json.Linq; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSF.Api.Services.Utility { public static class ChangeHelper { public static string Changes(this T original, T updated) { List fields = typeof(T).GetFields(BindingFlags.Public | BindingFlags.Instance).Where(x => !x.IsDefined(typeof(BsonIgnoreAttribute))).ToList(); diff --git a/UKSFWebsite.Api.Services/Utility/ConfirmationCodeService.cs b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs similarity index 90% rename from UKSFWebsite.Api.Services/Utility/ConfirmationCodeService.cs rename to UKSF.Api.Services/Utility/ConfirmationCodeService.cs index 7945beca..e55a223d 100644 --- a/UKSFWebsite.Api.Services/Utility/ConfirmationCodeService.cs +++ b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs @@ -1,11 +1,11 @@ using System; using System.Threading.Tasks; using Newtonsoft.Json; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Utility; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Utility; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSF.Api.Services.Utility { public class ConfirmationCodeService : IConfirmationCodeService { private readonly IConfirmationCodeDataService data; private readonly ISchedulerService schedulerService; diff --git a/UKSFWebsite.Api.Services/Utility/DataCacheService.cs b/UKSF.Api.Services/Utility/DataCacheService.cs similarity index 90% rename from UKSFWebsite.Api.Services/Utility/DataCacheService.cs rename to UKSF.Api.Services/Utility/DataCacheService.cs index 4b3cea6d..09e5962b 100644 --- a/UKSFWebsite.Api.Services/Utility/DataCacheService.cs +++ b/UKSF.Api.Services/Utility/DataCacheService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSF.Api.Services.Utility { public class DataCacheService { private readonly List dataServices = new List(); diff --git a/UKSFWebsite.Api.Services/Utility/MongoClientFactory.cs b/UKSF.Api.Services/Utility/MongoClientFactory.cs similarity index 92% rename from UKSFWebsite.Api.Services/Utility/MongoClientFactory.cs rename to UKSF.Api.Services/Utility/MongoClientFactory.cs index 50d1386c..37b278fc 100644 --- a/UKSFWebsite.Api.Services/Utility/MongoClientFactory.cs +++ b/UKSF.Api.Services/Utility/MongoClientFactory.cs @@ -1,7 +1,7 @@ using MongoDB.Bson.Serialization.Conventions; using MongoDB.Driver; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSF.Api.Services.Utility { public static class MongoClientFactory { public static IMongoDatabase GetDatabase(string connectionString) { ConventionPack conventionPack = new ConventionPack {new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true)}; diff --git a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs b/UKSF.Api.Services/Utility/ProcessHelper.cs similarity index 96% rename from UKSFWebsite.Api.Services/Utility/ProcessHelper.cs rename to UKSF.Api.Services/Utility/ProcessHelper.cs index 55dc96ef..46d6aa5d 100644 --- a/UKSFWebsite.Api.Services/Utility/ProcessHelper.cs +++ b/UKSF.Api.Services/Utility/ProcessHelper.cs @@ -1,11 +1,10 @@ using System; using System.Diagnostics; -using System.Linq; using System.Management; using Microsoft.Win32.TaskScheduler; using Task = System.Threading.Tasks.Task; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSF.Api.Services.Utility { public static class ProcessHelper { private const int SC_CLOSE = 0xF060; private const int WM_SYSCOMMAND = 0x0112; diff --git a/UKSFWebsite.Api.Services/Utility/SchedulerActionHelper.cs b/UKSF.Api.Services/Utility/SchedulerActionHelper.cs similarity index 85% rename from UKSFWebsite.Api.Services/Utility/SchedulerActionHelper.cs rename to UKSF.Api.Services/Utility/SchedulerActionHelper.cs index a88772c5..f7bba917 100644 --- a/UKSFWebsite.Api.Services/Utility/SchedulerActionHelper.cs +++ b/UKSF.Api.Services/Utility/SchedulerActionHelper.cs @@ -1,14 +1,14 @@ using System; using Microsoft.Extensions.DependencyInjection; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Integrations; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Message.Logging; -using UKSFWebsite.Api.Services.Admin; +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Services.Admin; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSF.Api.Services.Utility { public static class SchedulerActionHelper { private const ulong ID_CHANNEL_GENERAL = 311547576942067713; diff --git a/UKSFWebsite.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs similarity index 96% rename from UKSFWebsite.Api.Services/Utility/SchedulerService.cs rename to UKSF.Api.Services/Utility/SchedulerService.cs index 6ecda117..a457c939 100644 --- a/UKSFWebsite.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -5,12 +5,12 @@ using System.Threading.Tasks; using Microsoft.Extensions.Hosting; using Newtonsoft.Json; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Utility; -using UKSFWebsite.Api.Services.Message; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Utility; +using UKSF.Api.Services.Message; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSF.Api.Services.Utility { public class SchedulerService : ISchedulerService { private static readonly ConcurrentDictionary ACTIVE_TASKS = new ConcurrentDictionary(); private readonly IHostEnvironment currentEnvironment; diff --git a/UKSFWebsite.Api.Services/Utility/SessionService.cs b/UKSF.Api.Services/Utility/SessionService.cs similarity index 85% rename from UKSFWebsite.Api.Services/Utility/SessionService.cs rename to UKSF.Api.Services/Utility/SessionService.cs index 7519fbd6..9af789ae 100644 --- a/UKSFWebsite.Api.Services/Utility/SessionService.cs +++ b/UKSF.Api.Services/Utility/SessionService.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Security.Claims; using Microsoft.AspNetCore.Http; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSF.Api.Services.Utility { public class SessionService : ISessionService { private readonly IAccountService accountService; private readonly IHttpContextAccessor httpContext; diff --git a/UKSFWebsite.Api.Services/Utility/StringUtilities.cs b/UKSF.Api.Services/Utility/StringUtilities.cs similarity index 93% rename from UKSFWebsite.Api.Services/Utility/StringUtilities.cs rename to UKSF.Api.Services/Utility/StringUtilities.cs index 33ac996c..6fa8228c 100644 --- a/UKSFWebsite.Api.Services/Utility/StringUtilities.cs +++ b/UKSF.Api.Services/Utility/StringUtilities.cs @@ -4,11 +4,11 @@ using System.Text.RegularExpressions; using Microsoft.Extensions.DependencyInjection; using MongoDB.Bson; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Models.Units; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Models.Units; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSF.Api.Services.Utility { public static class StringUtilities { public static double ToDouble(this string text) => double.Parse(text); public static string ToTitleCase(string text) => CultureInfo.CurrentCulture.TextInfo.ToTitleCase(text); diff --git a/UKSFWebsite.Api.Services/Utility/TaskUtilities.cs b/UKSF.Api.Services/Utility/TaskUtilities.cs similarity index 88% rename from UKSFWebsite.Api.Services/Utility/TaskUtilities.cs rename to UKSF.Api.Services/Utility/TaskUtilities.cs index c96d73a1..a83a3ee1 100644 --- a/UKSFWebsite.Api.Services/Utility/TaskUtilities.cs +++ b/UKSF.Api.Services/Utility/TaskUtilities.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSF.Api.Services.Utility { public static class TaskUtilities { public static async Task Delay(TimeSpan timeSpan, CancellationToken token) { try { diff --git a/UKSFWebsite.Api.Services/Utility/Utilities.cs b/UKSF.Api.Services/Utility/Utilities.cs similarity index 94% rename from UKSFWebsite.Api.Services/Utility/Utilities.cs rename to UKSF.Api.Services/Utility/Utilities.cs index 18fe55da..84e9337d 100644 --- a/UKSFWebsite.Api.Services/Utility/Utilities.cs +++ b/UKSF.Api.Services/Utility/Utilities.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Dynamic; using System.Reflection; -using UKSFWebsite.Api.Models.Personnel; +using UKSF.Api.Models.Personnel; -namespace UKSFWebsite.Api.Services.Utility { +namespace UKSF.Api.Services.Utility { public static class Utilities { private static dynamic ToDynamic(this T obj) { IDictionary expando = new ExpandoObject(); diff --git a/UKSFWebsite.Api.Signalr/Hubs/Command/CommandRequestsHub.cs b/UKSF.Api.Signalr/Hubs/Command/CommandRequestsHub.cs similarity index 72% rename from UKSFWebsite.Api.Signalr/Hubs/Command/CommandRequestsHub.cs rename to UKSF.Api.Signalr/Hubs/Command/CommandRequestsHub.cs index 7f6aea31..e0085e69 100644 --- a/UKSFWebsite.Api.Signalr/Hubs/Command/CommandRequestsHub.cs +++ b/UKSF.Api.Signalr/Hubs/Command/CommandRequestsHub.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Signalr.Hubs.Command { +namespace UKSF.Api.Signalr.Hubs.Command { [Authorize] public class CommandRequestsHub : Hub { public const string END_POINT = "commandRequests"; diff --git a/UKSFWebsite.Api.Signalr/Hubs/Game/ServersHub.cs b/UKSF.Api.Signalr/Hubs/Game/ServersHub.cs similarity index 63% rename from UKSFWebsite.Api.Signalr/Hubs/Game/ServersHub.cs rename to UKSF.Api.Signalr/Hubs/Game/ServersHub.cs index 876c6c05..511abdd3 100644 --- a/UKSFWebsite.Api.Signalr/Hubs/Game/ServersHub.cs +++ b/UKSF.Api.Signalr/Hubs/Game/ServersHub.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Signalr.Hubs.Game { +namespace UKSF.Api.Signalr.Hubs.Game { public class ServersHub : Hub { public const string END_POINT = "servers"; } diff --git a/UKSFWebsite.Api.Signalr/Hubs/Integrations/LauncherHub.cs b/UKSF.Api.Signalr/Hubs/Integrations/LauncherHub.cs similarity index 69% rename from UKSFWebsite.Api.Signalr/Hubs/Integrations/LauncherHub.cs rename to UKSF.Api.Signalr/Hubs/Integrations/LauncherHub.cs index 1c087f90..e6aecb56 100644 --- a/UKSFWebsite.Api.Signalr/Hubs/Integrations/LauncherHub.cs +++ b/UKSF.Api.Signalr/Hubs/Integrations/LauncherHub.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Signalr.Hubs.Integrations { +namespace UKSF.Api.Signalr.Hubs.Integrations { [Authorize] public class LauncherHub : Hub { public const string END_POINT = "launcher"; diff --git a/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs b/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs similarity index 56% rename from UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs rename to UKSF.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs index d5c65848..9845a905 100644 --- a/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs +++ b/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs @@ -1,8 +1,7 @@ -using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Signalr.Hubs.Integrations { +namespace UKSF.Api.Signalr.Hubs.Integrations { public class TeamspeakClientsHub : Hub { public const string END_POINT = "teamspeakClients"; } diff --git a/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs b/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs similarity index 82% rename from UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs rename to UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs index d5480bfe..54669e74 100644 --- a/UKSFWebsite.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs +++ b/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs @@ -1,12 +1,12 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Models.Events; -using UKSFWebsite.Api.Models.Events.Types; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Events.Types; -namespace UKSFWebsite.Api.Signalr.Hubs.Integrations { +namespace UKSF.Api.Signalr.Hubs.Integrations { public static class TeamspeakHubState { public static bool Connected; } diff --git a/UKSFWebsite.Api.Signalr/Hubs/Message/CommentThreadHub.cs b/UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs similarity index 91% rename from UKSFWebsite.Api.Signalr/Hubs/Message/CommentThreadHub.cs rename to UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs index 681ec4b1..78a86de2 100644 --- a/UKSFWebsite.Api.Signalr/Hubs/Message/CommentThreadHub.cs +++ b/UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; -using UKSFWebsite.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Signalr.Hubs.Message { +namespace UKSF.Api.Signalr.Hubs.Message { [Authorize] public class CommentThreadHub : Hub { public const string END_POINT = "commentThread"; diff --git a/UKSFWebsite.Api.Signalr/Hubs/Message/NotificationsHub.cs b/UKSF.Api.Signalr/Hubs/Message/NotificationsHub.cs similarity index 90% rename from UKSFWebsite.Api.Signalr/Hubs/Message/NotificationsHub.cs rename to UKSF.Api.Signalr/Hubs/Message/NotificationsHub.cs index 507ab999..db500462 100644 --- a/UKSFWebsite.Api.Signalr/Hubs/Message/NotificationsHub.cs +++ b/UKSF.Api.Signalr/Hubs/Message/NotificationsHub.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; -using UKSFWebsite.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Signalr.Hubs.Message { +namespace UKSF.Api.Signalr.Hubs.Message { [Authorize] public class NotificationHub : Hub { public const string END_POINT = "notifications"; diff --git a/UKSFWebsite.Api.Signalr/Hubs/Personnel/AccountHub.cs b/UKSF.Api.Signalr/Hubs/Personnel/AccountHub.cs similarity index 90% rename from UKSFWebsite.Api.Signalr/Hubs/Personnel/AccountHub.cs rename to UKSF.Api.Signalr/Hubs/Personnel/AccountHub.cs index 19076199..9e5dca79 100644 --- a/UKSFWebsite.Api.Signalr/Hubs/Personnel/AccountHub.cs +++ b/UKSF.Api.Signalr/Hubs/Personnel/AccountHub.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; -using UKSFWebsite.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Signalr.Hubs.Personnel { +namespace UKSF.Api.Signalr.Hubs.Personnel { [Authorize] public class AccountHub : Hub { public const string END_POINT = "account"; diff --git a/UKSFWebsite.Api.Signalr/Hubs/Utility/AdminHub.cs b/UKSF.Api.Signalr/Hubs/Utility/AdminHub.cs similarity index 69% rename from UKSFWebsite.Api.Signalr/Hubs/Utility/AdminHub.cs rename to UKSF.Api.Signalr/Hubs/Utility/AdminHub.cs index 5573852f..2a5266b3 100644 --- a/UKSFWebsite.Api.Signalr/Hubs/Utility/AdminHub.cs +++ b/UKSF.Api.Signalr/Hubs/Utility/AdminHub.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Signalr.Hubs.Utility { +namespace UKSF.Api.Signalr.Hubs.Utility { [Authorize] public class AdminHub : Hub { public const string END_POINT = "admin"; diff --git a/UKSFWebsite.Api.Signalr/Hubs/Utility/UtilityHub.cs b/UKSF.Api.Signalr/Hubs/Utility/UtilityHub.cs similarity index 62% rename from UKSFWebsite.Api.Signalr/Hubs/Utility/UtilityHub.cs rename to UKSF.Api.Signalr/Hubs/Utility/UtilityHub.cs index e1ace4d0..2a66b23e 100644 --- a/UKSFWebsite.Api.Signalr/Hubs/Utility/UtilityHub.cs +++ b/UKSF.Api.Signalr/Hubs/Utility/UtilityHub.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.SignalR; -using UKSFWebsite.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Hubs; -namespace UKSFWebsite.Api.Signalr.Hubs.Utility { +namespace UKSF.Api.Signalr.Hubs.Utility { public class UtilityHub : Hub { public const string END_POINT = "utility"; } diff --git a/UKSFWebsite.Api.Signalr/UKSFWebsite.Api.Signalr.csproj b/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj similarity index 75% rename from UKSFWebsite.Api.Signalr/UKSFWebsite.Api.Signalr.csproj rename to UKSF.Api.Signalr/UKSF.Api.Signalr.csproj index 4e757fca..6f852b2c 100644 --- a/UKSFWebsite.Api.Signalr/UKSFWebsite.Api.Signalr.csproj +++ b/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj @@ -5,7 +5,7 @@ - + diff --git a/UKSFWebsite.Backend.sln b/UKSF.Api.sln similarity index 87% rename from UKSFWebsite.Backend.sln rename to UKSF.Api.sln index 738e0bf8..d71defad 100644 --- a/UKSFWebsite.Backend.sln +++ b/UKSF.Api.sln @@ -8,21 +8,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UKSFWebsite.Api", "UKSFWebsite.Api\UKSFWebsite.Api.csproj", "{E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UKSF.Api", "UKSF.Api\UKSF.Api.csproj", "{E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UKSFWebsite.Api.Models", "UKSFWebsite.Api.Models\UKSFWebsite.Api.Models.csproj", "{BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UKSF.Api.Models", "UKSF.Api.Models\UKSF.Api.Models.csproj", "{BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UKSFWebsite.Api.Services", "UKSFWebsite.Api.Services\UKSFWebsite.Api.Services.csproj", "{F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UKSF.Api.Services", "UKSF.Api.Services\UKSF.Api.Services.csproj", "{F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Integrations", "UKSFWebsite.Integrations\UKSFWebsite.Integrations.csproj", "{69AADF01-164E-4AD7-9E67-2974B79D3856}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Integrations", "UKSF.Integrations\UKSF.Integrations.csproj", "{69AADF01-164E-4AD7-9E67-2974B79D3856}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Data", "UKSFWebsite.Api.Data\UKSFWebsite.Api.Data.csproj", "{AE15E44A-DB7B-432F-84BA-7A01E6C54010}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Data", "UKSF.Api.Data\UKSF.Api.Data.csproj", "{AE15E44A-DB7B-432F-84BA-7A01E6C54010}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Interfaces", "UKSFWebsite.Api.Interfaces\UKSFWebsite.Api.Interfaces.csproj", "{462304E4-442D-46F2-B0AD-73BBCEB01C8A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Interfaces", "UKSF.Api.Interfaces\UKSF.Api.Interfaces.csproj", "{462304E4-442D-46F2-B0AD-73BBCEB01C8A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Events", "UKSFWebsite.Api.Events\UKSFWebsite.Api.Events.csproj", "{F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Events", "UKSF.Api.Events\UKSF.Api.Events.csproj", "{F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSFWebsite.Api.Signalr", "UKSFWebsite.Api.Signalr\UKSFWebsite.Api.Signalr.csproj", "{6F9B12CA-26BE-45D2-B520-A032490A53F0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Signalr", "UKSF.Api.Signalr\UKSF.Api.Signalr.csproj", "{6F9B12CA-26BE-45D2-B520-A032490A53F0}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostMessage", "PostMessage\PostMessage.csproj", "{B173771C-1AB7-436B-A6FF-0EF50EF5D015}" EndProject diff --git a/UKSFWebsite.Backend.sln.DotSettings b/UKSF.Api.sln.DotSettings similarity index 99% rename from UKSFWebsite.Backend.sln.DotSettings rename to UKSF.Api.sln.DotSettings index 94323531..886d22f2 100644 --- a/UKSFWebsite.Backend.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -385,8 +385,8 @@ C:\Users\Tim\AppData\Local\JetBrains\Transient\ReSharperPlatformVs15\v11_4a79c293\SolutionCaches True - C:\Storage\UKSF\Website\UKSFWebsite.Backend\UKSFWebsite.Api.Models\UKSFWebsite.Api.Models.csproj.DotSettings - ..\UKSFWebsite.Api.Models\UKSFWebsite.Api.Models.csproj.DotSettings + C:\Storage\UKSF\Website\UKSF.Api.Backend\UKSF.Api.Models\UKSF.Api.Models.csproj.DotSettings + ..\UKSF.Api.Models\UKSF.Api.Models.csproj.DotSettings diff --git a/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs b/UKSF.Api/Controllers/Accounts/AccountsController.cs similarity index 95% rename from UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs rename to UKSF.Api/Controllers/Accounts/AccountsController.cs index 0897a399..1734e705 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSF.Api/Controllers/Accounts/AccountsController.cs @@ -7,19 +7,19 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Integrations; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Integrations; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Personnel; -using UKSFWebsite.Api.Services.Utility; - -namespace UKSFWebsite.Api.Controllers.Accounts { +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Integrations; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Services.Utility; + +namespace UKSF.Api.Controllers.Accounts { [Route("[controller]")] public class AccountsController : Controller { private readonly IAccountService accountService; @@ -154,7 +154,7 @@ public IActionResult GetOnlineAccounts() { var clients = teamnspeakClients.Where(x => x != null).Select(x => new {account = allAccounts.FirstOrDefault(y => y.teamspeakIdentities != null && y.teamspeakIdentities.Any(z => z.Equals(x.clientDbId))), client = x}).ToList(); var clientAccounts = clients.Where(x => x.account != null && x.account.membershipState == MembershipState.MEMBER).OrderBy(x => x.account.rank, new RankComparer(ranksService)).ThenBy(x => x.account.lastname).ThenBy(x => x.account.firstname); List commandAccounts = unitsService.GetAuxilliaryRoot().members; - + List commanders = new List(); List recruiters = new List(); List members = new List(); diff --git a/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs b/UKSF.Api/Controllers/Accounts/CommunicationsController.cs similarity index 92% rename from UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs rename to UKSF.Api/Controllers/Accounts/CommunicationsController.cs index ef4e0395..ce57cbc6 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/CommunicationsController.cs +++ b/UKSF.Api/Controllers/Accounts/CommunicationsController.cs @@ -4,15 +4,15 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Utility; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Utility; -namespace UKSFWebsite.Api.Controllers.Accounts { +namespace UKSF.Api.Controllers.Accounts { [Route("[controller]")] public class CommunicationsController : Controller { private readonly IAccountService accountService; diff --git a/UKSFWebsite.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs b/UKSF.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs similarity index 91% rename from UKSFWebsite.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs rename to UKSF.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs index 840a7346..58cae50c 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs +++ b/UKSF.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs @@ -2,12 +2,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers.Accounts { +namespace UKSF.Api.Controllers.Accounts { public abstract class ConfirmationCodeReceiver : Controller { protected readonly IAccountService AccountService; protected readonly IConfirmationCodeService ConfirmationCodeService; diff --git a/UKSFWebsite.Api/Controllers/Accounts/DiscordCodeController.cs b/UKSF.Api/Controllers/Accounts/DiscordCodeController.cs similarity index 87% rename from UKSFWebsite.Api/Controllers/Accounts/DiscordCodeController.cs rename to UKSF.Api/Controllers/Accounts/DiscordCodeController.cs index b89b6b36..19509600 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/DiscordCodeController.cs +++ b/UKSF.Api/Controllers/Accounts/DiscordCodeController.cs @@ -3,13 +3,13 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Integrations; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Message; +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Message; -namespace UKSFWebsite.Api.Controllers.Accounts { +namespace UKSF.Api.Controllers.Accounts { [Route("[controller]")] public class DiscordCodeController : Controller { private readonly IAccountService accountService; diff --git a/UKSFWebsite.Api/Controllers/Accounts/OperationOrderController.cs b/UKSF.Api/Controllers/Accounts/OperationOrderController.cs similarity index 86% rename from UKSFWebsite.Api/Controllers/Accounts/OperationOrderController.cs rename to UKSF.Api/Controllers/Accounts/OperationOrderController.cs index 220bf918..68c3b9b7 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/OperationOrderController.cs +++ b/UKSF.Api/Controllers/Accounts/OperationOrderController.cs @@ -1,11 +1,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Interfaces.Operations; -using UKSFWebsite.Api.Models.Operations; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Operations; +using UKSF.Api.Models.Operations; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers.Accounts { +namespace UKSF.Api.Controllers.Accounts { [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] public class OperationOrderController : Controller { private readonly IOperationOrderService operationOrderService; diff --git a/UKSFWebsite.Api/Controllers/Accounts/OperationReportController.cs b/UKSF.Api/Controllers/Accounts/OperationReportController.cs similarity index 88% rename from UKSFWebsite.Api/Controllers/Accounts/OperationReportController.cs rename to UKSF.Api/Controllers/Accounts/OperationReportController.cs index 52d4c340..f26068ee 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/OperationReportController.cs +++ b/UKSF.Api/Controllers/Accounts/OperationReportController.cs @@ -2,11 +2,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Interfaces.Operations; -using UKSFWebsite.Api.Models.Operations; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Operations; +using UKSF.Api.Models.Operations; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers.Accounts { +namespace UKSF.Api.Controllers.Accounts { [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] public class OperationReportController : Controller { private readonly IOperationReportService operationReportService; diff --git a/UKSFWebsite.Api/Controllers/Accounts/OperationsController.cs b/UKSF.Api/Controllers/Accounts/OperationsController.cs similarity index 95% rename from UKSFWebsite.Api/Controllers/Accounts/OperationsController.cs rename to UKSF.Api/Controllers/Accounts/OperationsController.cs index e79e91da..8ab4d85e 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/OperationsController.cs +++ b/UKSF.Api/Controllers/Accounts/OperationsController.cs @@ -4,10 +4,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; -using UKSFWebsite.Api.Models.Integrations; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Models.Integrations; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers.Accounts { +namespace UKSF.Api.Controllers.Accounts { [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] public class OperationsController : Controller { private readonly IMongoDatabase database; diff --git a/UKSFWebsite.Api/Controllers/Accounts/PasswordResetController.cs b/UKSF.Api/Controllers/Accounts/PasswordResetController.cs similarity index 89% rename from UKSFWebsite.Api/Controllers/Accounts/PasswordResetController.cs rename to UKSF.Api/Controllers/Accounts/PasswordResetController.cs index 7e294ed4..664211bd 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/PasswordResetController.cs +++ b/UKSF.Api/Controllers/Accounts/PasswordResetController.cs @@ -3,13 +3,13 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Message; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Message; -namespace UKSFWebsite.Api.Controllers.Accounts { +namespace UKSF.Api.Controllers.Accounts { [Route("[controller]")] public class PasswordResetController : ConfirmationCodeReceiver { private readonly IEmailService emailService; diff --git a/UKSFWebsite.Api/Controllers/Accounts/ServiceRecordsController.cs b/UKSF.Api/Controllers/Accounts/ServiceRecordsController.cs similarity index 74% rename from UKSFWebsite.Api/Controllers/Accounts/ServiceRecordsController.cs rename to UKSF.Api/Controllers/Accounts/ServiceRecordsController.cs index bbc60b2d..d4a927ee 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/ServiceRecordsController.cs +++ b/UKSF.Api/Controllers/Accounts/ServiceRecordsController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace UKSFWebsite.Api.Controllers.Accounts { +namespace UKSF.Api.Controllers.Accounts { [Route("users/{userid}/[controller]")] public class ServiceRecordsController : Controller { } } diff --git a/UKSFWebsite.Api/Controllers/Accounts/SteamCodeController.cs b/UKSF.Api/Controllers/Accounts/SteamCodeController.cs similarity index 87% rename from UKSFWebsite.Api/Controllers/Accounts/SteamCodeController.cs rename to UKSF.Api/Controllers/Accounts/SteamCodeController.cs index 99ca1937..b41a852f 100644 --- a/UKSFWebsite.Api/Controllers/Accounts/SteamCodeController.cs +++ b/UKSF.Api/Controllers/Accounts/SteamCodeController.cs @@ -2,12 +2,12 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Message; -namespace UKSFWebsite.Api.Controllers.Accounts { +namespace UKSF.Api.Controllers.Accounts { [Route("[controller]")] public class SteamCodeController : Controller { private readonly IAccountService accountService; diff --git a/UKSFWebsite.Api/Controllers/ApplicationsController.cs b/UKSF.Api/Controllers/ApplicationsController.cs similarity index 94% rename from UKSFWebsite.Api/Controllers/ApplicationsController.cs rename to UKSF.Api/Controllers/ApplicationsController.cs index 74cf2f28..35698182 100644 --- a/UKSFWebsite.Api/Controllers/ApplicationsController.cs +++ b/UKSF.Api/Controllers/ApplicationsController.cs @@ -5,16 +5,16 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Personnel; -using UKSFWebsite.Api.Services.Utility; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Services.Utility; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]")] public class ApplicationsController : Controller { private readonly IAccountService accountService; diff --git a/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs similarity index 93% rename from UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs rename to UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs index 7903c273..6a27ca9b 100644 --- a/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsController.cs +++ b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs @@ -7,18 +7,18 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Command; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Command; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Command; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Command; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers.CommandRequests { +namespace UKSF.Api.Controllers.CommandRequests { [Route("[controller]"), Roles(RoleDefinitions.COMMAND)] public class CommandRequestsController : Controller { private readonly ICommandRequestCompletionService commandRequestCompletionService; diff --git a/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs b/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs similarity index 96% rename from UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs rename to UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs index ae678c43..e286c546 100644 --- a/UKSFWebsite.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs +++ b/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs @@ -4,15 +4,15 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Interfaces.Command; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Command; -using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Services.Personnel; - -namespace UKSFWebsite.Api.Controllers.CommandRequests { +using UKSF.Api.Interfaces.Command; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Command; +using UKSF.Api.Models.Units; +using UKSF.Api.Services.Personnel; + +namespace UKSF.Api.Controllers.CommandRequests { [Route("CommandRequests/Create")] public class CommandRequestsCreationController : Controller { private readonly IAccountService accountService; diff --git a/UKSFWebsite.Api/Controllers/CommentThreadController.cs b/UKSF.Api/Controllers/CommentThreadController.cs similarity index 94% rename from UKSFWebsite.Api/Controllers/CommentThreadController.cs rename to UKSF.Api/Controllers/CommentThreadController.cs index d0b9be49..d56c5575 100644 --- a/UKSFWebsite.Api/Controllers/CommentThreadController.cs +++ b/UKSF.Api/Controllers/CommentThreadController.cs @@ -5,14 +5,14 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Bson; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("commentthread"), Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER, RoleDefinitions.DISCHARGED)] public class CommentThreadController : Controller { private readonly IAccountService accountService; diff --git a/UKSFWebsite.Api/Controllers/DataController.cs b/UKSF.Api/Controllers/DataController.cs similarity index 81% rename from UKSFWebsite.Api/Controllers/DataController.cs rename to UKSF.Api/Controllers/DataController.cs index b3481323..1dba873e 100644 --- a/UKSFWebsite.Api/Controllers/DataController.cs +++ b/UKSF.Api/Controllers/DataController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Services.Personnel; -using UKSFWebsite.Api.Services.Utility; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Services.Utility; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.ADMIN)] public class DataController : Controller { private readonly DataCacheService dataCacheService; diff --git a/UKSFWebsite.Api/Controllers/DischargesController.cs b/UKSF.Api/Controllers/DischargesController.cs similarity index 87% rename from UKSFWebsite.Api/Controllers/DischargesController.cs rename to UKSF.Api/Controllers/DischargesController.cs index 3530c9f7..da7108c1 100644 --- a/UKSFWebsite.Api/Controllers/DischargesController.cs +++ b/UKSF.Api/Controllers/DischargesController.cs @@ -3,18 +3,18 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Command; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Command; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Command; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Command; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.SR10, RoleDefinitions.NCO, RoleDefinitions.SR1)] public class DischargesController : Controller { private readonly IAccountService accountService; diff --git a/UKSFWebsite.Api/Controllers/DiscordController.cs b/UKSF.Api/Controllers/DiscordController.cs similarity index 88% rename from UKSFWebsite.Api/Controllers/DiscordController.cs rename to UKSF.Api/Controllers/DiscordController.cs index b18d468b..c31a2395 100644 --- a/UKSFWebsite.Api/Controllers/DiscordController.cs +++ b/UKSF.Api/Controllers/DiscordController.cs @@ -4,10 +4,10 @@ using Discord.WebSocket; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Interfaces.Integrations; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]")] public class DiscordController : Controller { private readonly IDiscordService discordService; diff --git a/UKSFWebsite.Api/Controllers/DocsController.cs b/UKSF.Api/Controllers/DocsController.cs similarity index 97% rename from UKSFWebsite.Api/Controllers/DocsController.cs rename to UKSF.Api/Controllers/DocsController.cs index 6c917918..861ece11 100644 --- a/UKSFWebsite.Api/Controllers/DocsController.cs +++ b/UKSF.Api/Controllers/DocsController.cs @@ -7,7 +7,7 @@ #pragma warning disable 649 #pragma warning disable 414 -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]")] public class DocsController : Controller { private readonly Doc[] toc = {new Doc {Name = "Getting started"}, new Doc {Name = "Operations", Children = new[] {new Doc {Name = "How they work"}}}}; diff --git a/UKSFWebsite.Api/Controllers/GameServersController.cs b/UKSF.Api/Controllers/GameServersController.cs similarity index 96% rename from UKSFWebsite.Api/Controllers/GameServersController.cs rename to UKSF.Api/Controllers/GameServersController.cs index 45cdff0d..bc65b89e 100644 --- a/UKSFWebsite.Api/Controllers/GameServersController.cs +++ b/UKSF.Api/Controllers/GameServersController.cs @@ -8,19 +8,19 @@ using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Game; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Game; -using UKSFWebsite.Api.Models.Mission; -using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Game; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Personnel; -using UKSFWebsite.Api.Services.Utility; -using UKSFWebsite.Api.Signalr.Hubs.Game; - -namespace UKSFWebsite.Api.Controllers { +using UKSF.Api.Interfaces.Game; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Game; +using UKSF.Api.Models.Mission; +using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Game; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Services.Utility; +using UKSF.Api.Signalr.Hubs.Game; + +namespace UKSF.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.NCO, RoleDefinitions.SR5, RoleDefinitions.COMMAND)] public class GameServersController : Controller { private readonly IGameServersService gameServersService; diff --git a/UKSFWebsite.Api/Controllers/IssueController.cs b/UKSF.Api/Controllers/IssueController.cs similarity index 92% rename from UKSFWebsite.Api/Controllers/IssueController.cs rename to UKSF.Api/Controllers/IssueController.cs index 823b82ce..e8f4cb66 100644 --- a/UKSFWebsite.Api/Controllers/IssueController.cs +++ b/UKSF.Api/Controllers/IssueController.cs @@ -8,12 +8,12 @@ using Microsoft.Extensions.Configuration; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] public class IssueController : Controller { private readonly IDisplayNameService displayNameService; diff --git a/UKSFWebsite.Api/Controllers/LauncherController.cs b/UKSF.Api/Controllers/LauncherController.cs similarity index 86% rename from UKSFWebsite.Api/Controllers/LauncherController.cs rename to UKSF.Api/Controllers/LauncherController.cs index 43405378..b718c90e 100644 --- a/UKSFWebsite.Api/Controllers/LauncherController.cs +++ b/UKSF.Api/Controllers/LauncherController.cs @@ -6,19 +6,19 @@ using Microsoft.AspNetCore.SignalR; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Interfaces.Launcher; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Launcher; -using UKSFWebsite.Api.Models.Message.Logging; -using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Personnel; -using UKSFWebsite.Api.Signalr.Hubs.Integrations; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Launcher; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Launcher; +using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Signalr.Hubs.Integrations; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]"), Authorize, Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER)] public class LauncherController : Controller { private readonly IDisplayNameService displayNameService; diff --git a/UKSFWebsite.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs similarity index 92% rename from UKSFWebsite.Api/Controllers/LoaController.cs rename to UKSF.Api/Controllers/LoaController.cs index c2aa0a98..e44a82f3 100644 --- a/UKSFWebsite.Api/Controllers/LoaController.cs +++ b/UKSF.Api/Controllers/LoaController.cs @@ -4,19 +4,19 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Interfaces.Command; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Command; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Command; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Command; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] public class LoaController : Controller { private readonly IAccountService accountService; diff --git a/UKSFWebsite.Api/Controllers/LoggingController.cs b/UKSF.Api/Controllers/LoggingController.cs similarity index 92% rename from UKSFWebsite.Api/Controllers/LoggingController.cs rename to UKSF.Api/Controllers/LoggingController.cs index c9c7e539..9bd02058 100644 --- a/UKSFWebsite.Api/Controllers/LoggingController.cs +++ b/UKSF.Api/Controllers/LoggingController.cs @@ -2,10 +2,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; -using UKSFWebsite.Api.Models.Message.Logging; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.ADMIN)] public class LoggingController : Controller { private readonly IMongoDatabase database; diff --git a/UKSFWebsite.Api/Controllers/LoginController.cs b/UKSF.Api/Controllers/LoginController.cs similarity index 93% rename from UKSFWebsite.Api/Controllers/LoginController.cs rename to UKSF.Api/Controllers/LoginController.cs index 655828a4..1cf9a19d 100644 --- a/UKSFWebsite.Api/Controllers/LoginController.cs +++ b/UKSF.Api/Controllers/LoginController.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]")] public class LoginController : Controller { private readonly ILoginService loginService; diff --git a/UKSFWebsite.Api/Controllers/News/NewsController.cs b/UKSF.Api/Controllers/News/NewsController.cs similarity index 97% rename from UKSFWebsite.Api/Controllers/News/NewsController.cs rename to UKSF.Api/Controllers/News/NewsController.cs index de145afe..ffd4aa67 100644 --- a/UKSFWebsite.Api/Controllers/News/NewsController.cs +++ b/UKSF.Api/Controllers/News/NewsController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -namespace UKSFWebsite.Api.Controllers.News { +namespace UKSF.Api.Controllers.News { [Route("[controller]")] public class NewsController : Controller { [HttpGet] diff --git a/UKSFWebsite.Api/Controllers/NotificationsController.cs b/UKSF.Api/Controllers/NotificationsController.cs similarity index 94% rename from UKSFWebsite.Api/Controllers/NotificationsController.cs rename to UKSF.Api/Controllers/NotificationsController.cs index 28b728f7..9ce7015d 100644 --- a/UKSFWebsite.Api/Controllers/NotificationsController.cs +++ b/UKSF.Api/Controllers/NotificationsController.cs @@ -4,9 +4,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Message; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]")] public class NotificationsController : Controller { private readonly INotificationsService notificationsService; diff --git a/UKSFWebsite.Api/Controllers/RanksController.cs b/UKSF.Api/Controllers/RanksController.cs similarity index 93% rename from UKSFWebsite.Api/Controllers/RanksController.cs rename to UKSF.Api/Controllers/RanksController.cs index ad40987f..c6b1f502 100644 --- a/UKSFWebsite.Api/Controllers/RanksController.cs +++ b/UKSF.Api/Controllers/RanksController.cs @@ -3,15 +3,15 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]")] public class RanksController : Controller { private readonly IAccountService accountService; diff --git a/UKSFWebsite.Api/Controllers/RecruitmentController.cs b/UKSF.Api/Controllers/RecruitmentController.cs similarity index 96% rename from UKSFWebsite.Api/Controllers/RecruitmentController.cs rename to UKSF.Api/Controllers/RecruitmentController.cs index 5b7bbb05..63a89985 100644 --- a/UKSFWebsite.Api/Controllers/RecruitmentController.cs +++ b/UKSF.Api/Controllers/RecruitmentController.cs @@ -6,15 +6,15 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Personnel; - -namespace UKSFWebsite.Api.Controllers { +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; + +namespace UKSF.Api.Controllers { [Route("[controller]")] public class RecruitmentController : Controller { private readonly IAccountService accountService; diff --git a/UKSFWebsite.Api/Controllers/RolesController.cs b/UKSF.Api/Controllers/RolesController.cs similarity index 93% rename from UKSFWebsite.Api/Controllers/RolesController.cs rename to UKSF.Api/Controllers/RolesController.cs index bf869a7c..311ed66a 100644 --- a/UKSFWebsite.Api/Controllers/RolesController.cs +++ b/UKSF.Api/Controllers/RolesController.cs @@ -3,17 +3,17 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]")] public class RolesController : Controller { private readonly IAccountService accountService; diff --git a/UKSFWebsite.Api/Controllers/TeamspeakController.cs b/UKSF.Api/Controllers/TeamspeakController.cs similarity index 87% rename from UKSFWebsite.Api/Controllers/TeamspeakController.cs rename to UKSF.Api/Controllers/TeamspeakController.cs index a5c92d18..afb2b08d 100644 --- a/UKSFWebsite.Api/Controllers/TeamspeakController.cs +++ b/UKSF.Api/Controllers/TeamspeakController.cs @@ -2,10 +2,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]")] public class TeamspeakController : Controller { private readonly ITeamspeakService teamspeakService; diff --git a/UKSFWebsite.Api/Controllers/TestController.cs b/UKSF.Api/Controllers/TestController.cs similarity index 84% rename from UKSFWebsite.Api/Controllers/TestController.cs rename to UKSF.Api/Controllers/TestController.cs index 4240fe6b..7858d2b8 100644 --- a/UKSFWebsite.Api/Controllers/TestController.cs +++ b/UKSF.Api/Controllers/TestController.cs @@ -1,12 +1,10 @@ -using System; -using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Hosting; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Signalr.Hubs.Integrations; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Signalr.Hubs.Integrations; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]")] public class TestController : Controller { private readonly IHostApplicationLifetime hostApplicationLifetime; diff --git a/UKSFWebsite.Api/Controllers/UnitsController.cs b/UKSF.Api/Controllers/UnitsController.cs similarity index 97% rename from UKSFWebsite.Api/Controllers/UnitsController.cs rename to UKSF.Api/Controllers/UnitsController.cs index 60c698b3..62c075ea 100644 --- a/UKSFWebsite.Api/Controllers/UnitsController.cs +++ b/UKSF.Api/Controllers/UnitsController.cs @@ -7,18 +7,18 @@ using MongoDB.Driver; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Integrations; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Message; -using UKSFWebsite.Api.Models.Personnel; -using UKSFWebsite.Api.Models.Units; -using UKSFWebsite.Api.Services.Message; +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; +using UKSF.Api.Services.Message; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]")] public class UnitsController : Controller { private readonly IAccountService accountService; diff --git a/UKSFWebsite.Api/Controllers/VariablesController.cs b/UKSF.Api/Controllers/VariablesController.cs similarity index 91% rename from UKSFWebsite.Api/Controllers/VariablesController.cs rename to UKSF.Api/Controllers/VariablesController.cs index 89ffb00b..39d31b75 100644 --- a/UKSFWebsite.Api/Controllers/VariablesController.cs +++ b/UKSF.Api/Controllers/VariablesController.cs @@ -1,14 +1,14 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Admin; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Personnel; -using UKSFWebsite.Api.Services.Utility; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Admin; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Services.Utility; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.ADMIN)] public class VariablesController : Controller { private readonly ISessionService sessionService; diff --git a/UKSFWebsite.Api/Controllers/VersionController.cs b/UKSF.Api/Controllers/VersionController.cs similarity index 84% rename from UKSFWebsite.Api/Controllers/VersionController.cs rename to UKSF.Api/Controllers/VersionController.cs index 15210c54..935913c4 100644 --- a/UKSFWebsite.Api/Controllers/VersionController.cs +++ b/UKSF.Api/Controllers/VersionController.cs @@ -3,12 +3,12 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Hubs; -using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Signalr.Hubs.Utility; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Services.Admin; +using UKSF.Api.Signalr.Hubs.Utility; -namespace UKSFWebsite.Api.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]")] public class VersionController : Controller { private readonly IHubContext utilityHub; diff --git a/UKSFWebsite.Api/Docs/test.md b/UKSF.Api/Docs/test.md similarity index 100% rename from UKSFWebsite.Api/Docs/test.md rename to UKSF.Api/Docs/test.md diff --git a/UKSFWebsite.Api/ExceptionHandler.cs b/UKSF.Api/ExceptionHandler.cs similarity index 92% rename from UKSFWebsite.Api/ExceptionHandler.cs rename to UKSF.Api/ExceptionHandler.cs index 492548ad..7f41b08b 100644 --- a/UKSFWebsite.Api/ExceptionHandler.cs +++ b/UKSF.Api/ExceptionHandler.cs @@ -5,12 +5,12 @@ using Microsoft.AspNetCore.Http.Extensions; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Models.Message.Logging; -using UKSFWebsite.Api.Services.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Services.Message; -namespace UKSFWebsite.Api { +namespace UKSF.Api { public class ExceptionHandler : IExceptionFilter { public static ExceptionHandler Instance; private IDisplayNameService displayNameService; diff --git a/UKSFWebsite.Api/Global.cs b/UKSF.Api/Global.cs similarity index 91% rename from UKSFWebsite.Api/Global.cs rename to UKSF.Api/Global.cs index f2d0c988..669ce09c 100644 --- a/UKSFWebsite.Api/Global.cs +++ b/UKSF.Api/Global.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Api { +namespace UKSF.Api { public static class Global { public const string SUPER_ADMIN = "59e38f10594c603b78aa9dbd"; public const string TOKEN_AUDIENCE = "uksf-audience"; diff --git a/UKSFWebsite.Api/ModsController.cs b/UKSF.Api/ModsController.cs similarity index 83% rename from UKSFWebsite.Api/ModsController.cs rename to UKSF.Api/ModsController.cs index 487edac2..fbe71031 100644 --- a/UKSFWebsite.Api/ModsController.cs +++ b/UKSF.Api/ModsController.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSFWebsite.Api.Services.Personnel; +using UKSF.Api.Services.Personnel; -namespace UKSFWebsite.Api { +namespace UKSF.Api { [Route("[controller]"), Authorize, Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER)] public class ModsController : Controller { // TODO: Return size of modpack folder diff --git a/UKSFWebsite.Api/Program.cs b/UKSF.Api/Program.cs similarity index 97% rename from UKSFWebsite.Api/Program.cs rename to UKSF.Api/Program.cs index 1ee7f156..af16fe21 100644 --- a/UKSFWebsite.Api/Program.cs +++ b/UKSF.Api/Program.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting.WindowsServices; using Microsoft.Extensions.Hosting; -namespace UKSFWebsite.Api { +namespace UKSF.Api { public static class Program { public static void Main(string[] args) { AppDomain.CurrentDomain.GetAssemblies() @@ -53,7 +53,7 @@ private static IWebHost BuildProductionWebHost(string[] args) => .Build(); private static void InitLogging() { - string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSFWebsiteApi"); + string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSF.ApiApi"); Directory.CreateDirectory(appData); string[] logFiles = new DirectoryInfo(appData).EnumerateFiles("*.log").OrderByDescending(file => file.LastWriteTime).Select(file => file.Name).ToArray(); if (logFiles.Length > 9) { diff --git a/UKSFWebsite.Api/Properties/launchSettings.json b/UKSF.Api/Properties/launchSettings.json similarity index 95% rename from UKSFWebsite.Api/Properties/launchSettings.json rename to UKSF.Api/Properties/launchSettings.json index f5160fb4..22eb88a1 100644 --- a/UKSFWebsite.Api/Properties/launchSettings.json +++ b/UKSF.Api/Properties/launchSettings.json @@ -15,7 +15,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "UKSFWebsite.Api": { + "UKSF.Api": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { @@ -24,4 +24,4 @@ "applicationUrl": "http://localhost:61508/" } } -} \ No newline at end of file +} diff --git a/UKSFWebsite.Api/Startup.cs b/UKSF.Api/Startup.cs similarity index 89% rename from UKSFWebsite.Api/Startup.cs rename to UKSF.Api/Startup.cs index c9790f4e..0b39d61e 100644 --- a/UKSFWebsite.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -14,57 +14,57 @@ using Microsoft.Extensions.Primitives; using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; -using UKSFWebsite.Api.Data; -using UKSFWebsite.Api.Data.Admin; -using UKSFWebsite.Api.Data.Command; -using UKSFWebsite.Api.Data.Fake; -using UKSFWebsite.Api.Data.Game; -using UKSFWebsite.Api.Data.Launcher; -using UKSFWebsite.Api.Data.Message; -using UKSFWebsite.Api.Data.Operations; -using UKSFWebsite.Api.Data.Personnel; -using UKSFWebsite.Api.Data.Units; -using UKSFWebsite.Api.Data.Utility; -using UKSFWebsite.Api.Events; -using UKSFWebsite.Api.Events.Data; -using UKSFWebsite.Api.Events.Handlers; -using UKSFWebsite.Api.Events.SignalrServer; -using UKSFWebsite.Api.Interfaces.Command; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Interfaces.Events.Handlers; -using UKSFWebsite.Api.Interfaces.Game; -using UKSFWebsite.Api.Interfaces.Integrations; -using UKSFWebsite.Api.Interfaces.Integrations.Teamspeak; -using UKSFWebsite.Api.Interfaces.Launcher; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Operations; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Units; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Services; -using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Command; -using UKSFWebsite.Api.Services.Fake; -using UKSFWebsite.Api.Services.Game; -using UKSFWebsite.Api.Services.Game.Missions; -using UKSFWebsite.Api.Services.Integrations; -using UKSFWebsite.Api.Services.Integrations.Teamspeak; -using UKSFWebsite.Api.Services.Launcher; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Operations; -using UKSFWebsite.Api.Services.Personnel; -using UKSFWebsite.Api.Services.Units; -using UKSFWebsite.Api.Services.Utility; -using UKSFWebsite.Api.Signalr.Hubs.Command; -using UKSFWebsite.Api.Signalr.Hubs.Game; -using UKSFWebsite.Api.Signalr.Hubs.Integrations; -using UKSFWebsite.Api.Signalr.Hubs.Message; -using UKSFWebsite.Api.Signalr.Hubs.Personnel; -using UKSFWebsite.Api.Signalr.Hubs.Utility; - -namespace UKSFWebsite.Api { +using UKSF.Api.Data; +using UKSF.Api.Data.Admin; +using UKSF.Api.Data.Command; +using UKSF.Api.Data.Fake; +using UKSF.Api.Data.Game; +using UKSF.Api.Data.Launcher; +using UKSF.Api.Data.Message; +using UKSF.Api.Data.Operations; +using UKSF.Api.Data.Personnel; +using UKSF.Api.Data.Units; +using UKSF.Api.Data.Utility; +using UKSF.Api.Events; +using UKSF.Api.Events.Data; +using UKSF.Api.Events.Handlers; +using UKSF.Api.Events.SignalrServer; +using UKSF.Api.Interfaces.Command; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Interfaces.Events.Handlers; +using UKSF.Api.Interfaces.Game; +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Launcher; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Operations; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services; +using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Command; +using UKSF.Api.Services.Fake; +using UKSF.Api.Services.Game; +using UKSF.Api.Services.Game.Missions; +using UKSF.Api.Services.Integrations; +using UKSF.Api.Services.Integrations.Teamspeak; +using UKSF.Api.Services.Launcher; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Operations; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Services.Units; +using UKSF.Api.Services.Utility; +using UKSF.Api.Signalr.Hubs.Command; +using UKSF.Api.Signalr.Hubs.Game; +using UKSF.Api.Signalr.Hubs.Integrations; +using UKSF.Api.Signalr.Hubs.Message; +using UKSF.Api.Signalr.Hubs.Personnel; +using UKSF.Api.Signalr.Hubs.Utility; + +namespace UKSF.Api { public class Startup { private readonly IConfiguration configuration; private readonly IHostEnvironment currentEnvironment; @@ -130,7 +130,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl hostApplicationLifetime.ApplicationStopping.Register(OnShutdown); app.UseStaticFiles(); app.UseSwagger(); - app.UseSwaggerUI(options => {options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF API v1");}); + app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF API v1"); }); app.UseRouting(); app.UseCors("CorsPolicy"); app.UseCorsMiddleware(); @@ -192,7 +192,7 @@ private static void WarmDataServices() { dataCacheService.InvalidateDataCaches(); } - + private static void OnShutdown() { // Stop teamspeak Global.ServiceProvider.GetService().Stop(); diff --git a/UKSFWebsite.Api/UKSFWebsite.Api.csproj b/UKSF.Api/UKSF.Api.csproj similarity index 78% rename from UKSFWebsite.Api/UKSFWebsite.Api.csproj rename to UKSF.Api/UKSF.Api.csproj index 4d9f205b..fe099836 100644 --- a/UKSFWebsite.Api/UKSFWebsite.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -2,7 +2,7 @@ netcoreapp3.0 win7-x64 - UKSFWebsite.Api + UKSF.Api Exe win7-x64 default @@ -36,15 +36,15 @@ - - - - - + + + + + Always - \ No newline at end of file + diff --git a/UKSFWebsite.Api/appsettings.json b/UKSF.Api/appsettings.json similarity index 100% rename from UKSFWebsite.Api/appsettings.json rename to UKSF.Api/appsettings.json diff --git a/UKSFWebsite.Integrations/Controllers/DiscordController.cs b/UKSF.Integrations/Controllers/DiscordController.cs similarity index 95% rename from UKSFWebsite.Integrations/Controllers/DiscordController.cs rename to UKSF.Integrations/Controllers/DiscordController.cs index 7bf16ae0..27600e84 100644 --- a/UKSFWebsite.Integrations/Controllers/DiscordController.cs +++ b/UKSF.Integrations/Controllers/DiscordController.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Net.Http; using System.Net.Http.Headers; using System.Text; @@ -9,11 +8,11 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Newtonsoft.Json.Linq; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Services.Admin; -using UKSFWebsite.Api.Services.Message; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Message; -namespace UKSFWebsite.Integrations.Controllers { +namespace UKSF.Api.Integrations.Controllers { [Route("[controller]")] public class DiscordController : Controller { private readonly string botToken; diff --git a/UKSFWebsite.Integrations/Controllers/SteamController.cs b/UKSF.Integrations/Controllers/SteamController.cs similarity index 95% rename from UKSFWebsite.Integrations/Controllers/SteamController.cs rename to UKSF.Integrations/Controllers/SteamController.cs index 596a2ffa..3eef8700 100644 --- a/UKSFWebsite.Integrations/Controllers/SteamController.cs +++ b/UKSF.Integrations/Controllers/SteamController.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Hosting; -using UKSFWebsite.Api.Interfaces.Utility; +using UKSF.Api.Interfaces.Utility; -namespace UKSFWebsite.Integrations.Controllers { +namespace UKSF.Api.Integrations.Controllers { [Route("[controller]")] public class SteamController : Controller { private readonly IConfirmationCodeService confirmationCodeService; diff --git a/UKSFWebsite.Integrations/Global.cs b/UKSF.Integrations/Global.cs similarity index 75% rename from UKSFWebsite.Integrations/Global.cs rename to UKSF.Integrations/Global.cs index 901c7499..9602e669 100644 --- a/UKSFWebsite.Integrations/Global.cs +++ b/UKSF.Integrations/Global.cs @@ -1,6 +1,6 @@ using System; -namespace UKSFWebsite.Integrations { +namespace UKSF.Api.Integrations { public static class Global { public static IServiceProvider ServiceProvider; } diff --git a/UKSFWebsite.Integrations/Program.cs b/UKSF.Integrations/Program.cs similarity index 96% rename from UKSFWebsite.Integrations/Program.cs rename to UKSF.Integrations/Program.cs index 137c9eda..0196985d 100644 --- a/UKSFWebsite.Integrations/Program.cs +++ b/UKSF.Integrations/Program.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting.WindowsServices; using Microsoft.Extensions.Hosting; -namespace UKSFWebsite.Integrations { +namespace UKSF.Api.Integrations { internal static class Program { private static void Main(string[] args) { AppDomain.CurrentDomain.GetAssemblies() @@ -46,7 +46,7 @@ private static IWebHost BuildProductionWebHost(string[] args) => .Build(); private static void InitLogging() { - string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSFWebsiteIntegrations"); + string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSF.ApiIntegrations"); Directory.CreateDirectory(appData); string[] logFiles = new DirectoryInfo(appData).EnumerateFiles("*.log").OrderByDescending(file => file.LastWriteTime).Select(file => file.Name).ToArray(); if (logFiles.Length > 9) { diff --git a/UKSFWebsite.Integrations/Properties/launchSettings.json b/UKSF.Integrations/Properties/launchSettings.json similarity index 94% rename from UKSFWebsite.Integrations/Properties/launchSettings.json rename to UKSF.Integrations/Properties/launchSettings.json index 4852ae47..6257d9c1 100644 --- a/UKSFWebsite.Integrations/Properties/launchSettings.json +++ b/UKSF.Integrations/Properties/launchSettings.json @@ -15,7 +15,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "UKSFWebsite.Integrations": { + "UKSF.Api.Integrations": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { @@ -24,4 +24,4 @@ "applicationUrl": "http://localhost:61507/" } } -} \ No newline at end of file +} diff --git a/UKSFWebsite.Integrations/Startup.cs b/UKSF.Integrations/Startup.cs similarity index 88% rename from UKSFWebsite.Integrations/Startup.cs rename to UKSF.Integrations/Startup.cs index 2141b736..09fbfbd1 100644 --- a/UKSFWebsite.Integrations/Startup.cs +++ b/UKSF.Integrations/Startup.cs @@ -7,23 +7,23 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.OpenApi.Models; -using UKSFWebsite.Api.Data.Admin; -using UKSFWebsite.Api.Data.Message; -using UKSFWebsite.Api.Data.Personnel; -using UKSFWebsite.Api.Data.Utility; -using UKSFWebsite.Api.Events.Data; -using UKSFWebsite.Api.Interfaces.Data; -using UKSFWebsite.Api.Interfaces.Data.Cached; -using UKSFWebsite.Api.Interfaces.Events; -using UKSFWebsite.Api.Interfaces.Message; -using UKSFWebsite.Api.Interfaces.Personnel; -using UKSFWebsite.Api.Interfaces.Utility; -using UKSFWebsite.Api.Services; -using UKSFWebsite.Api.Services.Message; -using UKSFWebsite.Api.Services.Personnel; -using UKSFWebsite.Api.Services.Utility; +using UKSF.Api.Data.Admin; +using UKSF.Api.Data.Message; +using UKSF.Api.Data.Personnel; +using UKSF.Api.Data.Utility; +using UKSF.Api.Events.Data; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Services.Utility; -namespace UKSFWebsite.Integrations { +namespace UKSF.Api.Integrations { public class Startup { private readonly IConfiguration configuration; diff --git a/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj b/UKSF.Integrations/UKSF.Integrations.csproj similarity index 78% rename from UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj rename to UKSF.Integrations/UKSF.Integrations.csproj index 6693bcaf..fdafe6d3 100644 --- a/UKSFWebsite.Integrations/UKSFWebsite.Integrations.csproj +++ b/UKSF.Integrations/UKSF.Integrations.csproj @@ -3,7 +3,7 @@ netcoreapp3.0 Exe win7-x64 - UKSFWebsite.Integrations + UKSF.Api.Integrations disable @@ -18,7 +18,7 @@ - - + + - \ No newline at end of file + diff --git a/UKSFWebsite.Integrations/appsettings.json b/UKSF.Integrations/appsettings.json similarity index 100% rename from UKSFWebsite.Integrations/appsettings.json rename to UKSF.Integrations/appsettings.json diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/ILoaDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/ILoaDataService.cs deleted file mode 100644 index 21f5f848..00000000 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/ILoaDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSFWebsite.Api.Models.Personnel; - -namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface ILoaDataService : IDataService { } -} diff --git a/UKSFWebsite.Api.Interfaces/Data/Cached/IUnitsDataService.cs b/UKSFWebsite.Api.Interfaces/Data/Cached/IUnitsDataService.cs deleted file mode 100644 index 94eae8f2..00000000 --- a/UKSFWebsite.Api.Interfaces/Data/Cached/IUnitsDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSFWebsite.Api.Models.Units; - -namespace UKSFWebsite.Api.Interfaces.Data.Cached { - public interface IUnitsDataService : IDataService { } -} diff --git a/UKSFWebsite.Api.Interfaces/Events/ISignalrEventBus.cs b/UKSFWebsite.Api.Interfaces/Events/ISignalrEventBus.cs deleted file mode 100644 index 1511da8c..00000000 --- a/UKSFWebsite.Api.Interfaces/Events/ISignalrEventBus.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSFWebsite.Api.Models.Events; - -namespace UKSFWebsite.Api.Interfaces.Events { - public interface ISignalrEventBus : IEventBus { } -} diff --git a/UKSFWebsite.Api.Interfaces/Launcher/ILauncherService.cs b/UKSFWebsite.Api.Interfaces/Launcher/ILauncherService.cs deleted file mode 100644 index cb07397e..00000000 --- a/UKSFWebsite.Api.Interfaces/Launcher/ILauncherService.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace UKSFWebsite.Api.Interfaces.Launcher { - public interface ILauncherService { } -} diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs deleted file mode 100644 index f415a977..00000000 --- a/UKSFWebsite.Api.Interfaces/Personnel/IAccountService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSFWebsite.Api.Interfaces.Data.Cached; - -namespace UKSFWebsite.Api.Interfaces.Personnel { - public interface IAccountService : IDataBackedService { } -} diff --git a/UKSFWebsite.Api.Interfaces/Personnel/IDischargeService.cs b/UKSFWebsite.Api.Interfaces/Personnel/IDischargeService.cs deleted file mode 100644 index 7350bf78..00000000 --- a/UKSFWebsite.Api.Interfaces/Personnel/IDischargeService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSFWebsite.Api.Interfaces.Data.Cached; - -namespace UKSFWebsite.Api.Interfaces.Personnel { - public interface IDischargeService : IDataBackedService { } -} From 0139282279cf99ed495bc2440e36942697ececa3 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 30 Jan 2020 17:44:30 +0000 Subject: [PATCH 069/369] Upgrade dotnet core to 3.1. Update packages --- PostMessage/PostMessage.csproj | 8 -------- UKSF.Api.Data/UKSF.Api.Data.csproj | 2 +- UKSF.Api.Events/UKSF.Api.Events.csproj | 10 ++-------- UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj | 4 ++-- UKSF.Api.Models/UKSF.Api.Models.csproj | 2 +- UKSF.Api.Services/UKSF.Api.Services.csproj | 11 +++++------ UKSF.Api.Services/Utility/ProcessHelper.cs | 2 +- UKSF.Api.Signalr/UKSF.Api.Signalr.csproj | 2 +- UKSF.Api.sln | 2 +- UKSF.Api/UKSF.Api.csproj | 10 +++++----- UKSF.Integrations/UKSF.Integrations.csproj | 6 +++--- {PostMessage => UKSF.PostMessage}/Program.cs | 4 ++-- UKSF.PostMessage/UKSF.PostMessage.csproj | 9 +++++++++ 13 files changed, 33 insertions(+), 39 deletions(-) delete mode 100644 PostMessage/PostMessage.csproj rename {PostMessage => UKSF.PostMessage}/Program.cs (89%) create mode 100644 UKSF.PostMessage/UKSF.PostMessage.csproj diff --git a/PostMessage/PostMessage.csproj b/PostMessage/PostMessage.csproj deleted file mode 100644 index 7032f0cb..00000000 --- a/PostMessage/PostMessage.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - Exe - netcoreapp3.0 - - - diff --git a/UKSF.Api.Data/UKSF.Api.Data.csproj b/UKSF.Api.Data/UKSF.Api.Data.csproj index 3c5cae12..16a5cfcd 100644 --- a/UKSF.Api.Data/UKSF.Api.Data.csproj +++ b/UKSF.Api.Data/UKSF.Api.Data.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 disable diff --git a/UKSF.Api.Events/UKSF.Api.Events.csproj b/UKSF.Api.Events/UKSF.Api.Events.csproj index 9c785687..682b3943 100644 --- a/UKSF.Api.Events/UKSF.Api.Events.csproj +++ b/UKSF.Api.Events/UKSF.Api.Events.csproj @@ -1,26 +1,20 @@  - netcoreapp3.0 + netcoreapp3.1 full true - - - - - - ..\UKSF.Api\bin\Release\netcoreapp3.0\win7-x64\UKSF.Api.Services.dll - + diff --git a/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj b/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj index d64cac4b..fdf9fbc5 100644 --- a/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj +++ b/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 full @@ -9,8 +9,8 @@ + - diff --git a/UKSF.Api.Models/UKSF.Api.Models.csproj b/UKSF.Api.Models/UKSF.Api.Models.csproj index 627f4318..ef92a49b 100644 --- a/UKSF.Api.Models/UKSF.Api.Models.csproj +++ b/UKSF.Api.Models/UKSF.Api.Models.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp3.1 UKSF.Api.Models UKSF.Api.Models disable diff --git a/UKSF.Api.Services/UKSF.Api.Services.csproj b/UKSF.Api.Services/UKSF.Api.Services.csproj index dbff823c..e96751c8 100644 --- a/UKSF.Api.Services/UKSF.Api.Services.csproj +++ b/UKSF.Api.Services/UKSF.Api.Services.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp3.1 UKSF.Api.Services UKSF.Api.Services disable @@ -13,15 +13,14 @@ - - + - - - + + + diff --git a/UKSF.Api.Services/Utility/ProcessHelper.cs b/UKSF.Api.Services/Utility/ProcessHelper.cs index 46d6aa5d..e32740b5 100644 --- a/UKSF.Api.Services/Utility/ProcessHelper.cs +++ b/UKSF.Api.Services/Utility/ProcessHelper.cs @@ -37,7 +37,7 @@ public static async Task LaunchExternalProcess(string name, string command) { } public static async Task CloseProcessGracefully(this Process process) { - await LaunchExternalProcess("CloseProcess", $"start \"\" \"PostMessage\" {process.ProcessName} {WM_SYSCOMMAND} {SC_CLOSE} 0"); + await LaunchExternalProcess("CloseProcess", $"start \"\" \"UKSF.PostMessage\" {process.ProcessName} {WM_SYSCOMMAND} {SC_CLOSE} 0"); } } } diff --git a/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj b/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj index 6f852b2c..b802e489 100644 --- a/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj +++ b/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 diff --git a/UKSF.Api.sln b/UKSF.Api.sln index d71defad..aabfdf29 100644 --- a/UKSF.Api.sln +++ b/UKSF.Api.sln @@ -24,7 +24,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Events", "UKSF.Api EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Signalr", "UKSF.Api.Signalr\UKSF.Api.Signalr.csproj", "{6F9B12CA-26BE-45D2-B520-A032490A53F0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostMessage", "PostMessage\PostMessage.csproj", "{B173771C-1AB7-436B-A6FF-0EF50EF5D015}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.PostMessage", "UKSF.PostMessage\UKSF.PostMessage.csproj", "{B173771C-1AB7-436B-A6FF-0EF50EF5D015}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index fe099836..098bd1e8 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp3.1 win7-x64 UKSF.Api Exe @@ -21,10 +21,10 @@ - - - - + + + + diff --git a/UKSF.Integrations/UKSF.Integrations.csproj b/UKSF.Integrations/UKSF.Integrations.csproj index fdafe6d3..5a0c2480 100644 --- a/UKSF.Integrations/UKSF.Integrations.csproj +++ b/UKSF.Integrations/UKSF.Integrations.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp3.1 Exe win7-x64 UKSF.Api.Integrations @@ -12,8 +12,8 @@ - - + + diff --git a/PostMessage/Program.cs b/UKSF.PostMessage/Program.cs similarity index 89% rename from PostMessage/Program.cs rename to UKSF.PostMessage/Program.cs index 7e24396d..21a3c921 100644 --- a/PostMessage/Program.cs +++ b/UKSF.PostMessage/Program.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Runtime.InteropServices; -namespace PostMessage { - static class Program { +namespace UKSF.PostMessage { + internal static class Program { [DllImport("user32.dll", CharSet = CharSet.Auto)] private static extern int PostMessage(IntPtr hwnd, int msg, int wparam, int lparam); diff --git a/UKSF.PostMessage/UKSF.PostMessage.csproj b/UKSF.PostMessage/UKSF.PostMessage.csproj new file mode 100644 index 00000000..f517aabf --- /dev/null +++ b/UKSF.PostMessage/UKSF.PostMessage.csproj @@ -0,0 +1,9 @@ + + + + Exe + netcoreapp3.1 + UKSF.PostMessage + + + From 451d1ddc56448c97a92fae11edfb6997c2646444 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 30 Jan 2020 20:08:28 +0000 Subject: [PATCH 070/369] Cleanup --- UKSF.Api.Services/Utility/SessionService.cs | 12 ++++++------ UKSF.Api.Services/Utility/StringUtilities.cs | 6 ++++++ UKSF.Integrations/Controllers/DiscordController.cs | 2 +- UKSF.Integrations/Controllers/SteamController.cs | 2 +- UKSF.Integrations/Global.cs | 2 +- UKSF.Integrations/Program.cs | 2 +- UKSF.Integrations/Properties/launchSettings.json | 2 +- UKSF.Integrations/Startup.cs | 8 ++++---- UKSF.Integrations/UKSF.Integrations.csproj | 2 +- 9 files changed, 22 insertions(+), 16 deletions(-) diff --git a/UKSF.Api.Services/Utility/SessionService.cs b/UKSF.Api.Services/Utility/SessionService.cs index 9af789ae..53f61f40 100644 --- a/UKSF.Api.Services/Utility/SessionService.cs +++ b/UKSF.Api.Services/Utility/SessionService.cs @@ -8,25 +8,25 @@ namespace UKSF.Api.Services.Utility { public class SessionService : ISessionService { private readonly IAccountService accountService; - private readonly IHttpContextAccessor httpContext; + private readonly IHttpContextAccessor httpContextAccessor; - public SessionService(IHttpContextAccessor httpContext, IAccountService accountService) { - this.httpContext = httpContext; + public SessionService(IHttpContextAccessor httpContextAccessor, IAccountService accountService) { + this.httpContextAccessor = httpContextAccessor; this.accountService = accountService; } public Account GetContextAccount() => accountService.Data().GetSingle(GetContextId()); public string GetContextId() { - return httpContext.HttpContext.User.Claims.Single(x => x.Type == ClaimTypes.Sid).Value; + return httpContextAccessor.HttpContext.User.Claims.Single(x => x.Type == ClaimTypes.Sid).Value; } public string GetContextEmail() { - return httpContext.HttpContext.User.Claims.Single(x => x.Type == ClaimTypes.Email).Value; + return httpContextAccessor.HttpContext.User.Claims.Single(x => x.Type == ClaimTypes.Email).Value; } public bool ContextHasRole(string role) { - return httpContext.HttpContext.User.Claims.Any(x => x.Type == ClaimTypes.Role && x.Value == role); + return httpContextAccessor.HttpContext.User.Claims.Any(x => x.Type == ClaimTypes.Role && x.Value == role); } } } diff --git a/UKSF.Api.Services/Utility/StringUtilities.cs b/UKSF.Api.Services/Utility/StringUtilities.cs index 6fa8228c..34da6983 100644 --- a/UKSF.Api.Services/Utility/StringUtilities.cs +++ b/UKSF.Api.Services/Utility/StringUtilities.cs @@ -11,11 +11,17 @@ namespace UKSF.Api.Services.Utility { public static class StringUtilities { public static double ToDouble(this string text) => double.Parse(text); + public static string ToTitleCase(string text) => CultureInfo.CurrentCulture.TextInfo.ToTitleCase(text); + public static string Keyify(this string key) => key.ToUpper().Replace(" ", "_"); + public static string RemoveSpaces(this string item) => item.Replace(" ", string.Empty); + public static string RemoveNewLines(this string item) => item.Replace("\\n", string.Empty); + public static string RemoveQuotes(this string item) => item.Replace("\"", string.Empty); + public static bool ContainsCaseInsensitive(this string text, string element) => text.ToUpper().Contains(element.ToUpper()); public static string RemoveEmbeddedQuotes(this string item) { diff --git a/UKSF.Integrations/Controllers/DiscordController.cs b/UKSF.Integrations/Controllers/DiscordController.cs index 27600e84..f4b337e5 100644 --- a/UKSF.Integrations/Controllers/DiscordController.cs +++ b/UKSF.Integrations/Controllers/DiscordController.cs @@ -12,7 +12,7 @@ using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; -namespace UKSF.Api.Integrations.Controllers { +namespace UKSF.Integrations.Controllers { [Route("[controller]")] public class DiscordController : Controller { private readonly string botToken; diff --git a/UKSF.Integrations/Controllers/SteamController.cs b/UKSF.Integrations/Controllers/SteamController.cs index 3eef8700..f4a16c79 100644 --- a/UKSF.Integrations/Controllers/SteamController.cs +++ b/UKSF.Integrations/Controllers/SteamController.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.Hosting; using UKSF.Api.Interfaces.Utility; -namespace UKSF.Api.Integrations.Controllers { +namespace UKSF.Integrations.Controllers { [Route("[controller]")] public class SteamController : Controller { private readonly IConfirmationCodeService confirmationCodeService; diff --git a/UKSF.Integrations/Global.cs b/UKSF.Integrations/Global.cs index 9602e669..a8335e77 100644 --- a/UKSF.Integrations/Global.cs +++ b/UKSF.Integrations/Global.cs @@ -1,6 +1,6 @@ using System; -namespace UKSF.Api.Integrations { +namespace UKSF.Integrations { public static class Global { public static IServiceProvider ServiceProvider; } diff --git a/UKSF.Integrations/Program.cs b/UKSF.Integrations/Program.cs index 0196985d..102a9423 100644 --- a/UKSF.Integrations/Program.cs +++ b/UKSF.Integrations/Program.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting.WindowsServices; using Microsoft.Extensions.Hosting; -namespace UKSF.Api.Integrations { +namespace UKSF.Integrations { internal static class Program { private static void Main(string[] args) { AppDomain.CurrentDomain.GetAssemblies() diff --git a/UKSF.Integrations/Properties/launchSettings.json b/UKSF.Integrations/Properties/launchSettings.json index 6257d9c1..f9c295d7 100644 --- a/UKSF.Integrations/Properties/launchSettings.json +++ b/UKSF.Integrations/Properties/launchSettings.json @@ -15,7 +15,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "UKSF.Api.Integrations": { + "UKSF.Integrations": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { diff --git a/UKSF.Integrations/Startup.cs b/UKSF.Integrations/Startup.cs index 09fbfbd1..9ae4dfaa 100644 --- a/UKSF.Integrations/Startup.cs +++ b/UKSF.Integrations/Startup.cs @@ -23,7 +23,7 @@ using UKSF.Api.Services.Personnel; using UKSF.Api.Services.Utility; -namespace UKSF.Api.Integrations { +namespace UKSF.Integrations { public class Startup { private readonly IConfiguration configuration; @@ -46,7 +46,7 @@ public void ConfigureServices(IServiceCollection services) { public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFactory loggerFactory) { app.UseSwagger(); - app.UseSwaggerUI(options => {options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF Integrations API v1");}); + app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF Integrations API v1"); }); app.UseRouting(); app.UseCors("CorsPolicy"); app.UseAuthentication(); @@ -77,14 +77,14 @@ public static IServiceCollection RegisterServices(this IServiceCollection servic services.AddTransient(); services.AddSingleton(); services.AddTransient(); - + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - + // Event Buses services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); diff --git a/UKSF.Integrations/UKSF.Integrations.csproj b/UKSF.Integrations/UKSF.Integrations.csproj index 5a0c2480..d219493d 100644 --- a/UKSF.Integrations/UKSF.Integrations.csproj +++ b/UKSF.Integrations/UKSF.Integrations.csproj @@ -3,7 +3,7 @@ netcoreapp3.1 Exe win7-x64 - UKSF.Api.Integrations + UKSF.Integrations disable From 25e53f261981c730b3e6bde527841e45e79a96bb Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 30 Jan 2020 20:40:02 +0000 Subject: [PATCH 071/369] Fix log folder names --- UKSF.Api/Program.cs | 2 +- UKSF.Integrations/Program.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UKSF.Api/Program.cs b/UKSF.Api/Program.cs index af16fe21..14c11f73 100644 --- a/UKSF.Api/Program.cs +++ b/UKSF.Api/Program.cs @@ -53,7 +53,7 @@ private static IWebHost BuildProductionWebHost(string[] args) => .Build(); private static void InitLogging() { - string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSF.ApiApi"); + string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSF.Api"); Directory.CreateDirectory(appData); string[] logFiles = new DirectoryInfo(appData).EnumerateFiles("*.log").OrderByDescending(file => file.LastWriteTime).Select(file => file.Name).ToArray(); if (logFiles.Length > 9) { diff --git a/UKSF.Integrations/Program.cs b/UKSF.Integrations/Program.cs index 102a9423..eb5d6e8f 100644 --- a/UKSF.Integrations/Program.cs +++ b/UKSF.Integrations/Program.cs @@ -46,7 +46,7 @@ private static IWebHost BuildProductionWebHost(string[] args) => .Build(); private static void InitLogging() { - string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSF.ApiIntegrations"); + string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSF.Integrations"); Directory.CreateDirectory(appData); string[] logFiles = new DirectoryInfo(appData).EnumerateFiles("*.log").OrderByDescending(file => file.LastWriteTime).Select(file => file.Name).ToArray(); if (logFiles.Length > 9) { From a47eaa387736b88c7b2e6415cf828bf6547cc3fb Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 4 Feb 2020 00:44:49 +0000 Subject: [PATCH 072/369] Fix package references for signalr --- UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj | 1 - UKSF.Api.Signalr/UKSF.Api.Signalr.csproj | 4 ---- UKSF.Api/UKSF.Api.csproj | 1 + 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj b/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj index fdf9fbc5..8dc90548 100644 --- a/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj +++ b/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj @@ -11,7 +11,6 @@ - diff --git a/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj b/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj index b802e489..195a163a 100644 --- a/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj +++ b/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj @@ -8,8 +8,4 @@ - - - - diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index 098bd1e8..8579686d 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -25,6 +25,7 @@ + From fe85f17cba7d4287b807991eec59715bd882b4be Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 7 Feb 2020 17:37:36 +0000 Subject: [PATCH 073/369] Add quotes to mission makepbo command exclusion argument --- UKSF.Api.Services/Game/Missions/MissionPatchingService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs index d6d58e7f..b4f7c220 100644 --- a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs @@ -86,7 +86,7 @@ private async Task PackPbo() { StartInfo = { FileName = MAKE_PBO, WorkingDirectory = VariablesWrapper.VariablesDataService().GetSingle("MAKEPBO_WORKING_DIR").AsString(), - Arguments = $"-Z -BD -P -X=thumbs.db,*.txt,*.h,*.dep,*.cpp,*.bak,*.png,*.log,*.pew \"{folderPath}\"", + Arguments = $"-Z -BD -P -X=\"thumbs.db,*.txt,*.h,*.dep,*.cpp,*.bak,*.png,*.log,*.pew\" \"{folderPath}\"", UseShellExecute = false, CreateNoWindow = true, RedirectStandardOutput = true, From 124069c180bc3e7d6bf0c738368d7df270cf715f Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 7 Feb 2020 18:17:56 +0000 Subject: [PATCH 074/369] Update for mikero tool update. No need to remove last line of unbinned mission sqm anymore --- UKSF.Api.Services/Game/Missions/MissionService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Game/Missions/MissionService.cs b/UKSF.Api.Services/Game/Missions/MissionService.cs index f58cbb3c..347c9001 100644 --- a/UKSF.Api.Services/Game/Missions/MissionService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionService.cs @@ -100,7 +100,7 @@ private void Read() { private void RemoveUnbinText() { if (mission.sqmLines.First() != "////////////////////////////////////////////////////////////////////") return; mission.sqmLines = mission.sqmLines.Skip(7).ToList(); - mission.sqmLines = mission.sqmLines.Take(mission.sqmLines.Count - 1).ToList(); + // mission.sqmLines = mission.sqmLines.Take(mission.sqmLines.Count - 1).ToList(); } private void ReadAllData() { From 66c3611d9940f0fe35d1bd57ec7341af31ce3971 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 10 Feb 2020 14:02:09 +0000 Subject: [PATCH 075/369] Re-enable verify signatures --- UKSF.Api.Services/Game/GameServerHelpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.Services/Game/GameServerHelpers.cs index 6b1b7a0a..34c03baa 100644 --- a/UKSF.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.Services/Game/GameServerHelpers.cs @@ -19,7 +19,7 @@ public static class GameServerHelpers { "motdInterval = 999999;", "maxPlayers = {3};", "kickDuplicate = 1;", - "verifySignatures = 0;", + "verifySignatures = 2;", "allowedFilePatching = 1;", "unsafeCVL = 1;", "disableVoN = 1;", From 4505c68c55782d5f52141a76ca1e019dea6fae02 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 11 Feb 2020 19:10:39 +0000 Subject: [PATCH 076/369] Add log when mission upload throws exception --- UKSF.Api/Controllers/GameServersController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/UKSF.Api/Controllers/GameServersController.cs b/UKSF.Api/Controllers/GameServersController.cs index bc65b89e..d54264b0 100644 --- a/UKSF.Api/Controllers/GameServersController.cs +++ b/UKSF.Api/Controllers/GameServersController.cs @@ -115,6 +115,7 @@ public async Task UploadMissionFile() { LogWrapper.AuditLog(sessionService.GetContextId(), $"Uploaded mission '{file.Name}'"); } } catch (Exception exception) { + LogWrapper.Log(exception); return BadRequest(exception); } From 7d50bc8f08ad75fce76dd8abaf6252b826809af2 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 31 Mar 2020 18:33:21 +0100 Subject: [PATCH 077/369] Use lax sitemode for cookies --- UKSF.Api/Startup.cs | 1 + UKSF.Integrations/Startup.cs | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 0b39d61e..0202d47e 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -129,6 +129,7 @@ public void ConfigureServices(IServiceCollection services) { public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostApplicationLifetime) { hostApplicationLifetime.ApplicationStopping.Register(OnShutdown); app.UseStaticFiles(); + app.UseCookiePolicy(new CookiePolicyOptions {MinimumSameSitePolicy = SameSiteMode.Lax}); app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF API v1"); }); app.UseRouting(); diff --git a/UKSF.Integrations/Startup.cs b/UKSF.Integrations/Startup.cs index 9ae4dfaa..39e83103 100644 --- a/UKSF.Integrations/Startup.cs +++ b/UKSF.Integrations/Startup.cs @@ -45,6 +45,11 @@ public void ConfigureServices(IServiceCollection services) { } public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFactory loggerFactory) { + if (env.IsDevelopment()) { + app.UseDeveloperExceptionPage(); + } + + app.UseCookiePolicy(new CookiePolicyOptions {MinimumSameSitePolicy = SameSiteMode.Lax}); app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF Integrations API v1"); }); app.UseRouting(); From 586baffb40e681dd67b7a3b97f470621cfcd42de Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 25 Apr 2020 20:57:08 +0100 Subject: [PATCH 078/369] Add limitFPS parameter --- UKSF.Api.Services/Game/GameServerHelpers.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UKSF.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.Services/Game/GameServerHelpers.cs index 34c03baa..a0c5d1ff 100644 --- a/UKSF.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.Services/Game/GameServerHelpers.cs @@ -71,10 +71,10 @@ public static class GameServerHelpers { public static string FormatGameServerConfig(this GameServer gameServer, int playerCount, string missionSelection) => string.Format(string.Join("\n", BASE_CONFIG), gameServer.hostName, gameServer.password, gameServer.adminPassword, playerCount, missionSelection.Replace(".pbo", "")); public static string FormatGameServerLaunchArguments(this GameServer gameServer) => - $"-config={gameServer.GetGameServerConfigPath()} -profiles={GetGameServerProfilesPath()} -cfg={GetGameServerPerfConfigPath()} -name={gameServer.name} -port={gameServer.port} -apiport=\"{gameServer.apiPort}\" {(string.IsNullOrEmpty(gameServer.serverMods) ? "" : $"-serverMod={gameServer.serverMods}")} -mod={gameServer.FormatGameServerMods()}{(!GetGameServerExecutablePath().Contains("server") ? " -server" : "")} -enableHT -high -bandwidthAlg=2 -hugepages -noSounds -loadMissionToMemory -filePatching"; + $"-config={gameServer.GetGameServerConfigPath()} -profiles={GetGameServerProfilesPath()} -cfg={GetGameServerPerfConfigPath()} -name={gameServer.name} -port={gameServer.port} -apiport=\"{gameServer.apiPort}\" {(string.IsNullOrEmpty(gameServer.serverMods) ? "" : $"-serverMod={gameServer.serverMods}")} -mod={gameServer.FormatGameServerMods()}{(!GetGameServerExecutablePath().Contains("server") ? " -server" : "")} -enableHT -high -bandwidthAlg=2 -hugepages -noSounds -loadMissionToMemory -filePatching -limitFPS=200"; public static string FormatHeadlessClientLaunchArguments(this GameServer gameServer, int index) => - $"-profiles={GetGameServerProfilesPath()} -name={GetHeadlessClientName(index)} -port={gameServer.port} -apiport=\"{gameServer.apiPort + index + 1}\" -mod={gameServer.FormatGameServerMods()} -localhost=127.0.0.1 -connect=localhost -password={gameServer.password} -client -nosound -enableHT -high -hugepages -filePatching"; + $"-profiles={GetGameServerProfilesPath()} -name={GetHeadlessClientName(index)} -port={gameServer.port} -apiport=\"{gameServer.apiPort + index + 1}\" -mod={gameServer.FormatGameServerMods()} -localhost=127.0.0.1 -connect=localhost -password={gameServer.password} -client -nosound -enableHT -high -hugepages -filePatching -limitFPS=200"; public static string GetMaxPlayerCountFromConfig(this GameServer gameServer) { string maxPlayers = File.ReadAllLines(gameServer.GetGameServerConfigPath()).First(x => x.Contains("maxPlayers")); From 616bd00dd75649443ad0047e3867d4a27efd0eab Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 15 May 2020 15:39:51 +0100 Subject: [PATCH 079/369] Added functionality to add curator entities for each mission based on mission and server settings --- UKSF.Api.Models/Mission/Mission.cs | 1 + UKSF.Api.Models/Mission/MissionEntityItem.cs | 4 +- UKSF.Api.Services/Game/GameServerHelpers.cs | 30 +++++- .../Game/Missions/MissionEntityHelper.cs | 17 ++-- .../Game/Missions/MissionEntityItemHelper.cs | 31 +++++- .../Game/Missions/MissionService.cs | 96 +++++++++++++++---- .../Game/Missions/MissionUtilities.cs | 5 +- .../Controllers/DiscordController.cs | 12 +-- 8 files changed, 157 insertions(+), 39 deletions(-) diff --git a/UKSF.Api.Models/Mission/Mission.cs b/UKSF.Api.Models/Mission/Mission.cs index 79fefe38..a6f07bb5 100644 --- a/UKSF.Api.Models/Mission/Mission.cs +++ b/UKSF.Api.Models/Mission/Mission.cs @@ -9,6 +9,7 @@ public class Mission { public List descriptionLines; public MissionEntity missionEntity; public int playerCount; + public int maxCurators; public List rawEntities; public List sqmLines; diff --git a/UKSF.Api.Models/Mission/MissionEntityItem.cs b/UKSF.Api.Models/Mission/MissionEntityItem.cs index 51a4b046..2bd5d551 100644 --- a/UKSF.Api.Models/Mission/MissionEntityItem.cs +++ b/UKSF.Api.Models/Mission/MissionEntityItem.cs @@ -3,8 +3,10 @@ namespace UKSF.Api.Models.Mission { public class MissionEntityItem { public static double position = 10; + public static double curatorPosition = 0.5; public bool isPlayable; - public string itemType; + public string dataType; + public string type; public MissionEntity missionEntity; public List rawMissionEntities = new List(); public List rawMissionEntityItem = new List(); diff --git a/UKSF.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.Services/Game/GameServerHelpers.cs index a0c5d1ff..cc6769b4 100644 --- a/UKSF.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.Services/Game/GameServerHelpers.cs @@ -5,6 +5,7 @@ using System.Linq; using UKSF.Api.Models.Game; using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Message; using UKSF.Api.Services.Utility; namespace UKSF.Api.Services.Game { @@ -54,9 +55,12 @@ public static class GameServerHelpers { public static string GetGameServerExecutablePath() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_EXECUTABLE").AsString(); + public static string GetGameServerSettingsPath() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_SETTINGS").AsString(); + public static string GetGameServerMissionsPath() => VariablesWrapper.VariablesDataService().GetSingle("MISSIONS_PATH").AsString(); - public static string GetGameServerConfigPath(this GameServer gameServer) => Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("SERVERS_PATH").AsString(), "configs", $"{gameServer.profileName}.cfg"); + public static string GetGameServerConfigPath(this GameServer gameServer) => + Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("SERVERS_PATH").AsString(), "configs", $"{gameServer.profileName}.cfg"); private static string GetGameServerProfilesPath() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PROFILES").AsString(); @@ -68,13 +72,20 @@ public static class GameServerHelpers { public static IEnumerable GetGameServerModsPaths() => VariablesWrapper.VariablesDataService().GetSingle("MODS_PATHS").AsArray(x => x.RemoveQuotes()); - public static string FormatGameServerConfig(this GameServer gameServer, int playerCount, string missionSelection) => string.Format(string.Join("\n", BASE_CONFIG), gameServer.hostName, gameServer.password, gameServer.adminPassword, playerCount, missionSelection.Replace(".pbo", "")); + public static string FormatGameServerConfig(this GameServer gameServer, int playerCount, string missionSelection) => + string.Format(string.Join("\n", BASE_CONFIG), gameServer.hostName, gameServer.password, gameServer.adminPassword, playerCount, missionSelection.Replace(".pbo", "")); public static string FormatGameServerLaunchArguments(this GameServer gameServer) => - $"-config={gameServer.GetGameServerConfigPath()} -profiles={GetGameServerProfilesPath()} -cfg={GetGameServerPerfConfigPath()} -name={gameServer.name} -port={gameServer.port} -apiport=\"{gameServer.apiPort}\" {(string.IsNullOrEmpty(gameServer.serverMods) ? "" : $"-serverMod={gameServer.serverMods}")} -mod={gameServer.FormatGameServerMods()}{(!GetGameServerExecutablePath().Contains("server") ? " -server" : "")} -enableHT -high -bandwidthAlg=2 -hugepages -noSounds -loadMissionToMemory -filePatching -limitFPS=200"; + $"-config={gameServer.GetGameServerConfigPath()} -profiles={GetGameServerProfilesPath()} -cfg={GetGameServerPerfConfigPath()} -name={gameServer.name}" + + $"-port={gameServer.port} -apiport=\"{gameServer.apiPort}\" {(string.IsNullOrEmpty(gameServer.serverMods) ? "" : $"-serverMod={gameServer.serverMods}")}" + + $"-mod={gameServer.FormatGameServerMods()}{(!GetGameServerExecutablePath().Contains("server") ? " -server" : "")}" + + "-enableHT -high -bandwidthAlg=2 -hugepages -noSounds -loadMissionToMemory -filePatching -limitFPS=200"; public static string FormatHeadlessClientLaunchArguments(this GameServer gameServer, int index) => - $"-profiles={GetGameServerProfilesPath()} -name={GetHeadlessClientName(index)} -port={gameServer.port} -apiport=\"{gameServer.apiPort + index + 1}\" -mod={gameServer.FormatGameServerMods()} -localhost=127.0.0.1 -connect=localhost -password={gameServer.password} -client -nosound -enableHT -high -hugepages -filePatching -limitFPS=200"; + $"-profiles={GetGameServerProfilesPath()} -name={GetHeadlessClientName(index)}" + + $"-port={gameServer.port} -apiport=\"{gameServer.apiPort + index + 1}\"" + + $"-mod={gameServer.FormatGameServerMods()} -localhost=127.0.0.1 -connect=localhost -password={gameServer.password}" + + "-client -nosound -enableHT -high -hugepages -filePatching -limitFPS=200"; public static string GetMaxPlayerCountFromConfig(this GameServer gameServer) { string maxPlayers = File.ReadAllLines(gameServer.GetGameServerConfigPath()).First(x => x.Contains("maxPlayers")); @@ -82,6 +93,17 @@ public static string GetMaxPlayerCountFromConfig(this GameServer gameServer) { return maxPlayers.Split("=")[1]; } + public static int GetMaxCuratorCountFromSettings() { + string[] lines = File.ReadAllLines(GetGameServerSettingsPath()); + string curatorsMaxString = lines.FirstOrDefault(x => x.Contains("uksf_curator_curatorsMax")); + if (string.IsNullOrEmpty(curatorsMaxString)) { + LogWrapper.Log($"Could not find max curators in server settings file. Loading hardcoded deault '5'"); + return 5; + } + curatorsMaxString = curatorsMaxString.Split("=")[1].RemoveSpaces().Replace(";", ""); + return int.Parse(curatorsMaxString); + } + public static TimeSpan StripMilliseconds(this TimeSpan time) => new TimeSpan(time.Hours, time.Minutes, time.Seconds); public static IEnumerable GetArmaProcesses() => Process.GetProcesses().Where(x => x.ProcessName.StartsWith("arma3")); diff --git a/UKSF.Api.Services/Game/Missions/MissionEntityHelper.cs b/UKSF.Api.Services/Game/Missions/MissionEntityHelper.cs index 157e7d6e..4b0b24c4 100644 --- a/UKSF.Api.Services/Game/Missions/MissionEntityHelper.cs +++ b/UKSF.Api.Services/Game/Missions/MissionEntityHelper.cs @@ -25,17 +25,22 @@ private static MissionEntity CreateFromUnit(MissionUnit unit) { return missionEntity; } - public static void Patch(this MissionEntity missionEntity) { - missionEntity.missionEntityItems.RemoveAll(x => x.itemType.Equals("Group") && x.missionEntity != null && x.missionEntity.missionEntityItems.All(y => y.isPlayable && !y.Ignored())); + public static void Patch(this MissionEntity missionEntity, int maxCurators) { + MissionEntityItem.position = 10; + missionEntity.missionEntityItems.RemoveAll(x => x.dataType.Equals("Group") && x.missionEntity != null && x.missionEntity.missionEntityItems.All(y => y.isPlayable && !y.Ignored())); foreach (MissionUnit unit in MissionPatchData.instance.orderedUnits) { - MissionEntity entity = CreateFromUnit(unit); - missionEntity.missionEntityItems.Add(MissionEntityItemHelper.CreateFromMissionEntity(entity, unit.callsign)); + missionEntity.missionEntityItems.Add(MissionEntityItemHelper.CreateFromMissionEntity(CreateFromUnit(unit), unit.callsign)); + } + + MissionEntityItem.curatorPosition = 0.5; + missionEntity.missionEntityItems.RemoveAll(x => x.dataType == "Logic" && x.type == "ModuleCurator_F"); + for (int index = 0; index < maxCurators; index++) { + missionEntity.missionEntityItems.Add(MissionEntityItemHelper.CreateCuratorEntity()); } missionEntity.itemsCount = missionEntity.missionEntityItems.Count; for (int index = 0; index < missionEntity.missionEntityItems.Count; index++) { - MissionEntityItem item = missionEntity.missionEntityItems[index]; - item.Patch(index); + missionEntity.missionEntityItems[index].Patch(index); } } diff --git a/UKSF.Api.Services/Game/Missions/MissionEntityItemHelper.cs b/UKSF.Api.Services/Game/Missions/MissionEntityItemHelper.cs index 8d414f96..e2396640 100644 --- a/UKSF.Api.Services/Game/Missions/MissionEntityItemHelper.cs +++ b/UKSF.Api.Services/Game/Missions/MissionEntityItemHelper.cs @@ -6,13 +6,13 @@ namespace UKSF.Api.Services.Game.Missions { public static class MissionEntityItemHelper { public static MissionEntityItem CreateFromList(List rawItem) { MissionEntityItem missionEntityItem = new MissionEntityItem {rawMissionEntityItem = rawItem}; - missionEntityItem.itemType = MissionUtilities.ReadSingleDataByKey(missionEntityItem.rawMissionEntityItem, "dataType").ToString(); - if (missionEntityItem.itemType.Equals("Group")) { + missionEntityItem.dataType = MissionUtilities.ReadSingleDataByKey(missionEntityItem.rawMissionEntityItem, "dataType").ToString(); + if (missionEntityItem.dataType.Equals("Group")) { missionEntityItem.rawMissionEntities = MissionUtilities.ReadDataByKey(missionEntityItem.rawMissionEntityItem, "Entities"); if (missionEntityItem.rawMissionEntities.Count > 0) { missionEntityItem.missionEntity = MissionEntityHelper.CreateFromItems(missionEntityItem.rawMissionEntities); } - } else if (missionEntityItem.itemType.Equals("Object")) { + } else if (missionEntityItem.dataType.Equals("Object")) { string isPlayable = MissionUtilities.ReadSingleDataByKey(missionEntityItem.rawMissionEntityItem, "isPlayable").ToString(); string isPlayer = MissionUtilities.ReadSingleDataByKey(missionEntityItem.rawMissionEntityItem, "isPlayer").ToString(); if (!string.IsNullOrEmpty(isPlayable)) { @@ -20,6 +20,11 @@ public static MissionEntityItem CreateFromList(List rawItem) { } else if (!string.IsNullOrEmpty(isPlayer)) { missionEntityItem.isPlayable = isPlayer == "1"; } + } else if (missionEntityItem.dataType.Equals("Logic")) { + string type = MissionUtilities.ReadSingleDataByKey(missionEntityItem.rawMissionEntityItem, "type").ToString(); + if (!string.IsNullOrEmpty(type)) { + missionEntityItem.type = type; + } } return missionEntityItem; @@ -34,7 +39,7 @@ public static MissionEntityItem CreateFromPlayer(MissionPlayer missionPlayer, in missionEntityItem.rawMissionEntityItem.Add($"id={Mission.nextId++};"); missionEntityItem.rawMissionEntityItem.Add("class PositionInfo"); missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("position[]={" + $"{MissionEntityItem.position += 1}" + ",0,0};"); + missionEntityItem.rawMissionEntityItem.Add("position[]={" + $"{MissionEntityItem.position++}" + ",0,0};"); missionEntityItem.rawMissionEntityItem.Add("};"); missionEntityItem.rawMissionEntityItem.Add("side=\"West\";"); missionEntityItem.rawMissionEntityItem.Add($"type=\"{missionPlayer.objectClass}\";"); @@ -88,6 +93,24 @@ public static MissionEntityItem CreateFromMissionEntity(MissionEntity entities, return missionEntityItem; } + public static MissionEntityItem CreateCuratorEntity() { + MissionEntityItem missionEntityItem = new MissionEntityItem(); + missionEntityItem.rawMissionEntityItem.Add("class Item"); + missionEntityItem.rawMissionEntityItem.Add("{"); + missionEntityItem.rawMissionEntityItem.Add("dataType=\"Logic\";"); + missionEntityItem.rawMissionEntityItem.Add($"id={Mission.nextId++};"); + missionEntityItem.rawMissionEntityItem.Add("class PositionInfo"); + missionEntityItem.rawMissionEntityItem.Add("{"); + missionEntityItem.rawMissionEntityItem.Add("position[]={" + $"{MissionEntityItem.curatorPosition++}" + ",0,0.25};"); + missionEntityItem.rawMissionEntityItem.Add("};"); + missionEntityItem.rawMissionEntityItem.Add("type=\"ModuleCurator_F\";"); + missionEntityItem.rawMissionEntityItem.Add("class CustomAttributes"); + missionEntityItem.rawMissionEntityItem.Add("{"); + missionEntityItem.rawMissionEntityItem.Add("};"); + missionEntityItem.rawMissionEntityItem.Add("};"); + return missionEntityItem; + } + public static bool Ignored(this MissionEntityItem missionEntityItem) { return missionEntityItem.rawMissionEntityItem.Any(x => x.ToLower().Contains("@ignore")); } diff --git a/UKSF.Api.Services/Game/Missions/MissionService.cs b/UKSF.Api.Services/Game/Missions/MissionService.cs index 347c9001..5f6f8f26 100644 --- a/UKSF.Api.Services/Game/Missions/MissionService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionService.cs @@ -5,6 +5,7 @@ using System.Linq; using UKSF.Api.Models.Mission; using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Message; using UKSF.Api.Services.Utility; namespace UKSF.Api.Services.Game.Missions { @@ -33,7 +34,13 @@ public List ProcessMission(Mission tempMission) { reports.Add( new MissionPatchingReport( "Mission Patching Ignored", - "Mission patching for this mission was ignored.\nThis means no changes to the mission.sqm were made. This is not an error, however errors may occur in the mission as a result of this.\nEnsure ALL the steps below have been done to the mission.sqm before reporting any errors:\n\n\n1: Remove raw newline characters. Any newline characters (\\n) in code will result in compile errors and that code will NOT run.\nFor example, a line: init = \"myTestVariable = 10; \\n myOtherTestVariable = 20;\" should be replaced with: init = \"myTestVariable = 10; myOtherTestVariable = 20;\"\n\n2: Replace embedded quotes. Any embedded quotes (\"\") in code will result in compile errors and that code will NOT run. They should be replaced with a single quote character (').\nFor example, a line: init = \"myTestVariable = \"\"hello\"\";\" should be replaced with: init = \"myTestVariable = 'hello';\"" + "Mission patching for this mission was ignored.\nThis means no changes to the mission.sqm were made." + + "This is not an error, however errors may occur in the mission as a result of this.\n" + + "Ensure ALL the steps below have been done to the mission.sqm before reporting any errors:\n\n\n" + + "1: Remove raw newline characters. Any newline characters (\\n) in code will result in compile errors and that code will NOT run.\n" + + "For example, a line: init = \"myTestVariable = 10; \\n myOtherTestVariable = 20;\" should be replaced with: init = \"myTestVariable = 10; myOtherTestVariable = 20;\"\n\n" + + "2: Replace embedded quotes. Any embedded quotes (\"\") in code will result in compile errors and that code will NOT run. They should be replaced with a single quote character (').\n" + + "For example, a line: init = \"myTestVariable = \"\"hello\"\";\" should be replaced with: init = \"myTestVariable = 'hello';\"" ) ); PatchDescription(); @@ -49,12 +56,27 @@ public List ProcessMission(Mission tempMission) { private bool AssertRequiredFiles() { if (!File.Exists(mission.descriptionPath)) { - reports.Add(new MissionPatchingReport("Missing file: description.ext", "The mission is missing a required file:\ndescription.ext\n\nIt is advised to copy this file directly from the template mission to your mission\nUKSFTemplate.VR is located in the modpack files", true)); + reports.Add( + new MissionPatchingReport( + "Missing file: description.ext", + "The mission is missing a required file:\ndescription.ext\n\n" + + "It is advised to copy this file directly from the template mission to your mission\nUKSFTemplate.VR is located in the modpack files", + true + ) + ); return false; } if (!File.Exists(Path.Combine(mission.path, "cba_settings.sqf"))) { - reports.Add(new MissionPatchingReport("Missing file: cba_settings.sqf", "The mission is missing a required file:\ncba_settings.sqf\n\nIt is advised to copy this file directly from the template mission to your mission\nUKSFTemplate.VR is located in the modpack files", true)); + reports.Add( + new MissionPatchingReport( + "Missing file: cba_settings.sqf", + "The mission is missing a required file:\ncba_settings.sqf\n\n" + + "It is advised to copy this file directly from the template mission to your mission\n" + + "UKSFTemplate.VR is located in the modpack files and make changes according to the needs of the mission", + true + ) + ); return false; } @@ -95,10 +117,12 @@ private void Read() { mission.sqmLines.RemoveAll(string.IsNullOrEmpty); RemoveUnbinText(); ReadAllData(); + ReadSettings(); } private void RemoveUnbinText() { if (mission.sqmLines.First() != "////////////////////////////////////////////////////////////////////") return; + mission.sqmLines = mission.sqmLines.Skip(7).ToList(); // mission.sqmLines = mission.sqmLines.Take(mission.sqmLines.Count - 1).ToList(); } @@ -109,8 +133,38 @@ private void ReadAllData() { mission.missionEntity = MissionEntityHelper.CreateFromItems(mission.rawEntities); } + private void ReadSettings() { + mission.maxCurators = 5; + string curatorsMaxLine = File.ReadAllLines(Path.Combine(mission.path, "cba_settings.sqf")).FirstOrDefault(x => x.Contains("uksf_curator_curatorsMax")); + if (string.IsNullOrEmpty(curatorsMaxLine)) { + mission.maxCurators = GameServerHelpers.GetMaxCuratorCountFromSettings(); + reports.Add( + new MissionPatchingReport( + "Using server setting 'uksf_curator_curatorsMax'", + "Could not find setting 'uksf_curator_curatorsMax' in cba_settings.sqf" + + "This is required to add the correct nubmer of pre-defined curator objects." + + $"The server setting value ({mission.maxCurators}) for this will be used instead." + ) + ); + return; + } + + string curatorsMaxString = curatorsMaxLine.Split("=")[1].RemoveSpaces().Replace(";", ""); + if (!int.TryParse(curatorsMaxString, out mission.maxCurators)) { + reports.Add( + new MissionPatchingReport( + "Using hardcoded setting 'uksf_curator_curatorsMax'", + $"Could not read malformed setting: '{curatorsMaxLine}' in cba_settings.sqf" + + "This is required to add the correct nubmer of pre-defined curator objects." + + "The hardcoded value (5) will be used instead." + ) + ); + } + } + private void Patch() { - mission.missionEntity.Patch(); + mission.missionEntity.Patch(mission.maxCurators); + if (!CheckIgnoreKey("missionImageIgnore")) { string imagePath = Path.Combine(mission.path, "uksf.paa"); string modpackImagePath = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("PATH_MODPACK").AsString(), "@uksf", "UKSFTemplate.VR", "uksf.paa"); @@ -119,7 +173,9 @@ private void Patch() { reports.Add( new MissionPatchingReport( "Loading image was different", - "The mission loading image `uksf.paa` was different from the default and has been replaced\n\nIf you wish this to be a custom image, see this page for details on how to achieve this" + "The mission loading image `uksf.paa` was found to be different from the default." + + "It has been replaced with the default UKSF image.\n\n" + + "If you wish this to be a custom image, see this page for details on how to configure this" ) ); } @@ -145,24 +201,21 @@ private void PatchDescription() { mission.descriptionLines = File.ReadAllLines(mission.descriptionPath).ToList(); mission.descriptionLines[mission.descriptionLines.FindIndex(x => x.ContainsCaseInsensitive("maxPlayers"))] = $" maxPlayers = {playable};"; - CheckDescriptionRequireds(); - CheckDescriptionConfigurables(); + CheckRequiredDescriptionItems(); + CheckConfigurableDescriptionItems(); - int index = mission.descriptionLines.FindIndex(x => x.Contains("__EXEC")); - if (index != -1) { - mission.descriptionLines.RemoveAt(index); - } + mission.descriptionLines = mission.descriptionLines.Where(x => !x.Contains("__EXEC")).ToList(); File.WriteAllLines(mission.descriptionPath, mission.descriptionLines); } - private void CheckDescriptionConfigurables() { + private void CheckConfigurableDescriptionItems() { CheckDescriptionItem("onLoadName", "\"UKSF: Operation\"", false); CheckDescriptionItem("onLoadMission", "\"UKSF: Operation\"", false); CheckDescriptionItem("overviewText", "\"UKSF: Operation\"", false); } - private void CheckDescriptionRequireds() { + private void CheckRequiredDescriptionItems() { CheckDescriptionItem("author", "\"UKSF\""); CheckDescriptionItem("loadScreen", "\"uksf.paa\""); CheckDescriptionItem("respawn", "\"BASE\""); @@ -184,9 +237,19 @@ private void CheckDescriptionItem(string key, string defaultValue, bool required itemValue = itemValue.Remove(itemValue.Length - 1); bool equal = string.Equals(itemValue, defaultValue, StringComparison.InvariantCultureIgnoreCase); if (!equal && required) { - reports.Add(new MissionPatchingReport($"Required description.ext item {key} value is not default", $"{key} in description.ext is '{itemValue}'\nThe default value is '{defaultValue}'\n\nYou should only change this if you know what you're doing")); + reports.Add( + new MissionPatchingReport( + $"Required description.ext item {key} value is not default", + $"{key} in description.ext is '{itemValue}'\nThe default value is '{defaultValue}'\n\nYou should only change this if you know what you're doing" + ) + ); } else if (equal && !required) { - reports.Add(new MissionPatchingReport($"Configurable description.ext item {key} value is default", $"{key} in description.ext is the same as the default value '{itemValue}'\n\nThis should be changed based on your mission")); + reports.Add( + new MissionPatchingReport( + $"Configurable description.ext item {key} value is default", + $"{key} in description.ext is the same as the default value '{itemValue}'\n\nThis should be changed based on your mission" + ) + ); } return; @@ -198,7 +261,8 @@ private void CheckDescriptionItem(string key, string defaultValue, bool required reports.Add( new MissionPatchingReport( $"Configurable description.ext item {key} is missing", - $"{key} in description.ext is missing\nThis is required for the mission\n\nIt is advised to copy the description.ext file directly from the template mission to your mission\nUKSFTemplate.VR is located in the modpack files", + $"{key} in description.ext is missing\nThis is required for the mission\n\n" + + "It is advised to copy the description.ext file directly from the template mission to your mission\nUKSFTemplate.VR is located in the modpack files", true ) ); diff --git a/UKSF.Api.Services/Game/Missions/MissionUtilities.cs b/UKSF.Api.Services/Game/Missions/MissionUtilities.cs index 47ed894f..2203f0e1 100644 --- a/UKSF.Api.Services/Game/Missions/MissionUtilities.cs +++ b/UKSF.Api.Services/Game/Missions/MissionUtilities.cs @@ -52,8 +52,9 @@ public static object ReadSingleDataByKey(List source, string key) { while (true) { if (index >= source.Count) return ""; string line = source[index]; - if (line.ToLower().Contains(key.ToLower())) { - return line.Split('=').Last().Replace(";", "").Replace("\"", "").Trim(); + string[] parts = line.Split('='); + if (parts.Length == 2 && parts.First().ToLower().Equals(key.ToLower())) { + return parts.Last().Replace(";", "").Replace("\"", "").Trim(); } index++; diff --git a/UKSF.Integrations/Controllers/DiscordController.cs b/UKSF.Integrations/Controllers/DiscordController.cs index f4b337e5..6580f187 100644 --- a/UKSF.Integrations/Controllers/DiscordController.cs +++ b/UKSF.Integrations/Controllers/DiscordController.cs @@ -34,10 +34,10 @@ public DiscordController(IConfirmationCodeService confirmationCodeService, IConf } [HttpGet] - public IActionResult Get() => Redirect($"https://discordapp.com/api/oauth2/authorize?client_id={clientId}&redirect_uri={HttpUtility.UrlEncode($"{url}/discord/success")}&response_type=code&scope=identify%20guilds.join"); + public IActionResult Get() => Redirect($"https://discord.com/api/oauth2/authorize?client_id={clientId}&redirect_uri={HttpUtility.UrlEncode($"{url}/discord/success")}&response_type=code&scope=identify%20guilds.join"); [HttpGet("application")] - public IActionResult GetFromApplication() => Redirect($"https://discordapp.com/api/oauth2/authorize?client_id={clientId}&redirect_uri={HttpUtility.UrlEncode($"{url}/discord/success/application")}&response_type=code&scope=identify%20guilds.join"); + public IActionResult GetFromApplication() => Redirect($"https://discord.com/api/oauth2/authorize?client_id={clientId}&redirect_uri={HttpUtility.UrlEncode($"{url}/discord/success/application")}&response_type=code&scope=identify%20guilds.join"); [HttpGet("success")] public async Task Success([FromQuery] string code) => Redirect($"{urlReturn}/profile?{await GetUrlParameters(code, $"{url}/discord/success")}"); @@ -48,7 +48,7 @@ public DiscordController(IConfirmationCodeService confirmationCodeService, IConf private async Task GetUrlParameters(string code, string redirectUrl) { using HttpClient client = new HttpClient(); HttpResponseMessage response = await client.PostAsync( - "https://discordapp.com/api/oauth2/token", + "https://discord.com/api/oauth2/token", new FormUrlEncodedContent( new Dictionary { {"client_id", clientId}, @@ -62,18 +62,18 @@ private async Task GetUrlParameters(string code, string redirectUrl) { ); string result = await response.Content.ReadAsStringAsync(); if (!response.IsSuccessStatusCode) { - LogWrapper.Log("A discord connection request was denied"); + LogWrapper.Log($"A discord connection request was denied"); return "discordid=fail"; } string token = JObject.Parse(result)["access_token"].ToString(); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token); - response = await client.GetAsync("https://discordapp.com/api/users/@me"); + response = await client.GetAsync("https://discord.com//api/users/@me"); string user = await response.Content.ReadAsStringAsync(); string id = JObject.Parse(user)["id"].ToString(); string username = JObject.Parse(user)["username"].ToString(); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bot", botToken); - response = await client.PutAsync($"https://discordapp.com/api/guilds/{VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json")); + response = await client.PutAsync($"https://discord.com//api/guilds/{VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json")); string added = "true"; if (!response.IsSuccessStatusCode) { LogWrapper.Log($"Failed to add '{username}' to guild: {response.StatusCode}, {response.Content.ReadAsStringAsync().Result}"); From d139f2fb651efe1f5a353b604d002acb76e6d4e6 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 15 May 2020 15:48:58 +0100 Subject: [PATCH 080/369] Trim whitespace from mission item key check --- UKSF.Api.Services/Game/Missions/MissionUtilities.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Game/Missions/MissionUtilities.cs b/UKSF.Api.Services/Game/Missions/MissionUtilities.cs index 2203f0e1..acdc5d49 100644 --- a/UKSF.Api.Services/Game/Missions/MissionUtilities.cs +++ b/UKSF.Api.Services/Game/Missions/MissionUtilities.cs @@ -53,7 +53,7 @@ public static object ReadSingleDataByKey(List source, string key) { if (index >= source.Count) return ""; string line = source[index]; string[] parts = line.Split('='); - if (parts.Length == 2 && parts.First().ToLower().Equals(key.ToLower())) { + if (parts.Length == 2 && parts.First().Trim().ToLower().Equals(key.ToLower())) { return parts.Last().Replace(";", "").Replace("\"", "").Trim(); } From a46588f789efa236f04e639b0594888a0598857b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 15 May 2020 16:06:34 +0100 Subject: [PATCH 081/369] Correct spaces for server command line parameters --- UKSF.Api.Services/Game/GameServerHelpers.cs | 27 ++++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/UKSF.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.Services/Game/GameServerHelpers.cs index cc6769b4..619fc5cf 100644 --- a/UKSF.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.Services/Game/GameServerHelpers.cs @@ -76,16 +76,25 @@ public static string FormatGameServerConfig(this GameServer gameServer, int play string.Format(string.Join("\n", BASE_CONFIG), gameServer.hostName, gameServer.password, gameServer.adminPassword, playerCount, missionSelection.Replace(".pbo", "")); public static string FormatGameServerLaunchArguments(this GameServer gameServer) => - $"-config={gameServer.GetGameServerConfigPath()} -profiles={GetGameServerProfilesPath()} -cfg={GetGameServerPerfConfigPath()} -name={gameServer.name}" + - $"-port={gameServer.port} -apiport=\"{gameServer.apiPort}\" {(string.IsNullOrEmpty(gameServer.serverMods) ? "" : $"-serverMod={gameServer.serverMods}")}" + - $"-mod={gameServer.FormatGameServerMods()}{(!GetGameServerExecutablePath().Contains("server") ? " -server" : "")}" + - "-enableHT -high -bandwidthAlg=2 -hugepages -noSounds -loadMissionToMemory -filePatching -limitFPS=200"; + $"-config={gameServer.GetGameServerConfigPath()}" + + $" -profiles={GetGameServerProfilesPath()}" + + $" -cfg={GetGameServerPerfConfigPath()}" + + $" -name={gameServer.name}" + + $" -port={gameServer.port}" + + $" -apiport=\"{gameServer.apiPort}\"" + + $" {(string.IsNullOrEmpty(gameServer.serverMods) ? "" : $"-serverMod={gameServer.serverMods}")}" + + $" -mod={gameServer.FormatGameServerMods()}" + + $" {(GetGameServerExecutablePath().Contains("server") ? "" : "-server")}" + + " -bandwidthAlg=2 -hugepages -loadMissionToMemory -filePatching -limitFPS=200"; public static string FormatHeadlessClientLaunchArguments(this GameServer gameServer, int index) => - $"-profiles={GetGameServerProfilesPath()} -name={GetHeadlessClientName(index)}" + - $"-port={gameServer.port} -apiport=\"{gameServer.apiPort + index + 1}\"" + - $"-mod={gameServer.FormatGameServerMods()} -localhost=127.0.0.1 -connect=localhost -password={gameServer.password}" + - "-client -nosound -enableHT -high -hugepages -filePatching -limitFPS=200"; + $"-profiles={GetGameServerProfilesPath()}" + + $" -name={GetHeadlessClientName(index)}" + + $" -port={gameServer.port}" + + $" -apiport=\"{gameServer.apiPort + index + 1}\"" + + $" -mod={gameServer.FormatGameServerMods()}" + + $" -password={gameServer.password}" + + " -localhost=127.0.0.1 -connect=localhost -client -hugepages -filePatching -limitFPS=200"; public static string GetMaxPlayerCountFromConfig(this GameServer gameServer) { string maxPlayers = File.ReadAllLines(gameServer.GetGameServerConfigPath()).First(x => x.Contains("maxPlayers")); @@ -97,7 +106,7 @@ public static int GetMaxCuratorCountFromSettings() { string[] lines = File.ReadAllLines(GetGameServerSettingsPath()); string curatorsMaxString = lines.FirstOrDefault(x => x.Contains("uksf_curator_curatorsMax")); if (string.IsNullOrEmpty(curatorsMaxString)) { - LogWrapper.Log($"Could not find max curators in server settings file. Loading hardcoded deault '5'"); + LogWrapper.Log("Could not find max curators in server settings file. Loading hardcoded deault '5'"); return 5; } curatorsMaxString = curatorsMaxString.Split("=")[1].RemoveSpaces().Replace(";", ""); From d4b2fd3476ea03ca6bfce7c3a63b142b446477da Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 17 May 2020 19:19:11 +0100 Subject: [PATCH 082/369] Fix discord api url. Edit mission engineers. Don't add mods string when no mods for servers --- UKSF.Api.Services/Game/GameServerHelpers.cs | 6 +- .../Game/Missions/MissionDataResolver.cs | 88 ++++++++----------- .../Game/Missions/MissionService.cs | 1 - .../Controllers/DiscordController.cs | 4 +- 4 files changed, 41 insertions(+), 58 deletions(-) diff --git a/UKSF.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.Services/Game/GameServerHelpers.cs index 619fc5cf..93f0ed04 100644 --- a/UKSF.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.Services/Game/GameServerHelpers.cs @@ -68,7 +68,7 @@ public static string GetGameServerConfigPath(this GameServer gameServer) => private static string GetHeadlessClientName(int index) => VariablesWrapper.VariablesDataService().GetSingle("HEADLESS_CLIENT_NAMES").AsArray()[index]; - private static string FormatGameServerMods(this GameServer gameServer) => $"{string.Join(";", gameServer.mods.Select(x => x.pathRelativeToServerExecutable ?? x.path))};"; + private static string FormatGameServerMods(this GameServer gameServer) => gameServer.mods.Count > 0 ? $"{string.Join(";", gameServer.mods.Select(x => x.pathRelativeToServerExecutable ?? x.path))};" : string.Empty; public static IEnumerable GetGameServerModsPaths() => VariablesWrapper.VariablesDataService().GetSingle("MODS_PATHS").AsArray(x => x.RemoveQuotes()); @@ -83,7 +83,7 @@ public static string FormatGameServerLaunchArguments(this GameServer gameServer) $" -port={gameServer.port}" + $" -apiport=\"{gameServer.apiPort}\"" + $" {(string.IsNullOrEmpty(gameServer.serverMods) ? "" : $"-serverMod={gameServer.serverMods}")}" + - $" -mod={gameServer.FormatGameServerMods()}" + + $" {(string.IsNullOrEmpty(gameServer.FormatGameServerMods()) ? "" : $"-mod={gameServer.FormatGameServerMods()}")}" + $" {(GetGameServerExecutablePath().Contains("server") ? "" : "-server")}" + " -bandwidthAlg=2 -hugepages -loadMissionToMemory -filePatching -limitFPS=200"; @@ -92,7 +92,7 @@ public static string FormatHeadlessClientLaunchArguments(this GameServer gameSer $" -name={GetHeadlessClientName(index)}" + $" -port={gameServer.port}" + $" -apiport=\"{gameServer.apiPort + index + 1}\"" + - $" -mod={gameServer.FormatGameServerMods()}" + + $" {(string.IsNullOrEmpty(gameServer.FormatGameServerMods()) ? "" : $"-mod={gameServer.FormatGameServerMods()}")}" + $" -password={gameServer.password}" + " -localhost=127.0.0.1 -connect=localhost -client -hugepages -filePatching -limitFPS=200"; diff --git a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs index ba8f5a03..5a6f9873 100644 --- a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs +++ b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs @@ -6,43 +6,30 @@ namespace UKSF.Api.Services.Game.Missions { public class MissionDataResolver { private static readonly string[] ENGINEER_IDS = { "5a1e894463d0f71710089106", // Bridg - "5a4e7effd68b7e16e46fc614", // Woodward - "5a2439443fccaa15902aaa4e", // Mac - "5a1a0ad55d0a76133837eb78", // Pot - "5a4518559220c31b50966811", // Clarke + "59e38f31594c603b78aa9dc3", // Handi "59e38f13594c603b78aa9dbf", // Carr - "59e38f1b594c603b78aa9dc1", // Lars + "5bc3bccdffbf7a11b803c3f6", // Delta + "59e3958b594c603b78aa9dcd", // Joho + "5a2439443fccaa15902aaa4e", // Mac + "5a1a16ce630e7413645b73fd", // Penn "5a1a14b5aacf7b00346dcc37" // Gilbert }; public static string ResolveObjectClass(MissionPlayer player) { - if (player.account?.id == "5b4b568c20e1fd00013752d1") return "UKSF_B_Medic"; // Smith, SAS Medic return player.unit.sourceUnit.id switch { - "5a435eea905d47336442c75a" => // "Joint Special Forces Aviation Wing" - "UKSF_B_Pilot", - "5a848590eab14d12cc7fa618" => // "RAF Cranwell" - "UKSF_B_Pilot", - "5c98d7b396dba31f24cdb19c" => // "51 Squadron" - "UKSF_B_Pilot", - "5a441619730e9d162834500b" => // "7 Squadron" - "UKSF_B_Pilot_7", - "5a441602730e9d162834500a" => // "656 Squadron" - "UKSF_B_Pilot_656", - "5a4415d8730e9d1628345007" => // "617 Squadron" - "UKSF_B_Pilot_617", - "5a68b28e196530164c9b4fed" => // "Sniper Platoon" - "UKSF_B_Sniper", - "5a68c047196530164c9b4fee" => // "The Pathfinder Platoon" - "UKSF_B_Pathfinder", - "5bbbb8875eb3a4170c488b24" => // "Air Troop" - "UKSF_B_SAS", - "5ba8983ee12a331f94cb02d4" => // "SAS" - "UKSF_B_Officer", - "5b9123ca7a6c1f0e9875601c" => // "3 Medical Regiment" - "UKSF_B_Medic", - "5a42835b55d6109bf0b081bd" => // "UKSF" - (ResolvePlayerUnitRole(player) == 3 ? "UKSF_B_Officer" : "UKSF_B_Rifleman"), - _ => (ResolvePlayerUnitRole(player) != -1 ? "UKSF_B_SectionLeader" : "UKSF_B_Rifleman") + "5a435eea905d47336442c75a" => "UKSF_B_Pilot", // "Joint Special Forces Aviation Wing" + "5a848590eab14d12cc7fa618" => "UKSF_B_Pilot", // "RAF Cranwell" + "5c98d7b396dba31f24cdb19c" => "UKSF_B_Pilot", // "51 Squadron" + "5a441619730e9d162834500b" => "UKSF_B_Pilot_7", // "7 Squadron" + "5a441602730e9d162834500a" => "UKSF_B_Pilot_656", // "656 Squadron" + "5a4415d8730e9d1628345007" => "UKSF_B_Pilot_617", // "617 Squadron" + "5a68b28e196530164c9b4fed" => "UKSF_B_Sniper", // "Sniper Platoon" + "5a68c047196530164c9b4fee" => "UKSF_B_Pathfinder", // "The Pathfinder Platoon" + "5bbbb8875eb3a4170c488b24" => "UKSF_B_SAS", // "Air Troop" + "5ba8983ee12a331f94cb02d4" => "UKSF_B_Officer", // "SAS" + "5b9123ca7a6c1f0e9875601c" => "UKSF_B_Medic", // "3 Medical Regiment" + "5a42835b55d6109bf0b081bd" => ResolvePlayerUnitRole(player) == 3 ? "UKSF_B_Officer" : "UKSF_B_Rifleman", // "UKSF" + _ => ResolvePlayerUnitRole(player) != -1 ? "UKSF_B_SectionLeader" : "UKSF_B_Rifleman" }; } @@ -58,18 +45,12 @@ private static int ResolvePlayerUnitRole(MissionPlayer player) { public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) { return unit.sourceUnit.id switch { - "5a435eea905d47336442c75a" => // "Joint Special Forces Aviation Wing" - "JSFAW", - "5a441619730e9d162834500b" => // "7 Squadron" - "JSFAW", - "5a441602730e9d162834500a" => // "656 Squadron" - "JSFAW", - "5a4415d8730e9d1628345007" => // "617 Squadron" - "JSFAW", - "5a848590eab14d12cc7fa618" => // "RAF Cranwell" - "JSFAW", - "5c98d7b396dba31f24cdb19c" => // "51 Squadron" - "JSFAW", + "5a435eea905d47336442c75a" => "JSFAW", // "Joint Special Forces Aviation Wing" + "5a441619730e9d162834500b" => "JSFAW", // "7 Squadron" + "5a441602730e9d162834500a" => "JSFAW", // "656 Squadron" + "5a4415d8730e9d1628345007" => "JSFAW", // "617 Squadron" + "5a848590eab14d12cc7fa618" => "JSFAW", // "RAF Cranwell" + "5c98d7b396dba31f24cdb19c" => "JSFAW", // "51 Squadron" _ => defaultCallsign }; } @@ -152,7 +133,14 @@ public static List ResolveUnitSlots(MissionUnit unit) { int unitOrderB = b.unit.sourceUnit.order; int rankA = MissionPatchData.instance.ranks.IndexOf(a.rank); int rankB = MissionPatchData.instance.ranks.IndexOf(b.rank); - return unitDepthA < unitDepthB ? -1 : unitDepthA > unitDepthB ? 1 : unitOrderA < unitOrderB ? -1 : unitOrderA > unitOrderB ? 1 : roleA < roleB ? 1 : roleA > roleB ? -1 : rankA < rankB ? -1 : rankA > rankB ? 1 : string.CompareOrdinal(a.name, b.name); + return unitDepthA < unitDepthB ? -1 : + unitDepthA > unitDepthB ? 1 : + unitOrderA < unitOrderB ? -1 : + unitOrderA > unitOrderB ? 1 : + roleA < roleB ? 1 : + roleA > roleB ? -1 : + rankA < rankB ? -1 : + rankA > rankB ? 1 : string.CompareOrdinal(a.name, b.name); } ); return slots; @@ -160,14 +148,10 @@ public static List ResolveUnitSlots(MissionUnit unit) { public static bool IsUnitPermanent(MissionUnit unit) { return unit.sourceUnit.id switch { - "5bbbb9645eb3a4170c488b36" => // "Guardian 1-1" - true, - "5bbbbdab5eb3a4170c488f2e" => // "Guardian 1-2" - true, - "5bbbbe365eb3a4170c488f30" => // "Guardian 1-3" - true, - "5ad748e0de5d414f4c4055e0" => // "Guardian 1-R" - true, + "5bbbb9645eb3a4170c488b36" => true, // "Guardian 1-1" + "5bbbbdab5eb3a4170c488f2e" => true, // "Guardian 1-2" + "5bbbbe365eb3a4170c488f30" => true, // "Guardian 1-3" + "5ad748e0de5d414f4c4055e0" => true, // "Guardian 1-R" _ => false }; } diff --git a/UKSF.Api.Services/Game/Missions/MissionService.cs b/UKSF.Api.Services/Game/Missions/MissionService.cs index 5f6f8f26..322bb30f 100644 --- a/UKSF.Api.Services/Game/Missions/MissionService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionService.cs @@ -5,7 +5,6 @@ using System.Linq; using UKSF.Api.Models.Mission; using UKSF.Api.Services.Admin; -using UKSF.Api.Services.Message; using UKSF.Api.Services.Utility; namespace UKSF.Api.Services.Game.Missions { diff --git a/UKSF.Integrations/Controllers/DiscordController.cs b/UKSF.Integrations/Controllers/DiscordController.cs index 6580f187..58963f14 100644 --- a/UKSF.Integrations/Controllers/DiscordController.cs +++ b/UKSF.Integrations/Controllers/DiscordController.cs @@ -67,13 +67,13 @@ private async Task GetUrlParameters(string code, string redirectUrl) { } string token = JObject.Parse(result)["access_token"].ToString(); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token); - response = await client.GetAsync("https://discord.com//api/users/@me"); + response = await client.GetAsync("https://discord.com/api/users/@me"); string user = await response.Content.ReadAsStringAsync(); string id = JObject.Parse(user)["id"].ToString(); string username = JObject.Parse(user)["username"].ToString(); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bot", botToken); - response = await client.PutAsync($"https://discord.com//api/guilds/{VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json")); + response = await client.PutAsync($"https://discord.com/api/guilds/{VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json")); string added = "true"; if (!response.IsSuccessStatusCode) { LogWrapper.Log($"Failed to add '{username}' to guild: {response.StatusCode}, {response.Content.ReadAsStringAsync().Result}"); From 68b667c818ed66e4dc48125672753fc27818b36b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 22 May 2020 13:41:52 +0100 Subject: [PATCH 083/369] Added team medics for mission slots --- .../Game/Missions/MissionDataResolver.cs | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs index 5a6f9873..56af2e79 100644 --- a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs +++ b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs @@ -3,7 +3,7 @@ using UKSF.Api.Models.Mission; namespace UKSF.Api.Services.Game.Missions { - public class MissionDataResolver { + public static class MissionDataResolver { private static readonly string[] ENGINEER_IDS = { "5a1e894463d0f71710089106", // Bridg "59e38f31594c603b78aa9dc3", // Handi @@ -15,7 +15,18 @@ public class MissionDataResolver { "5a1a14b5aacf7b00346dcc37" // Gilbert }; + private static readonly string[] MEDIC_IDS = { + "59e3958b594c603b78aa9dcd", // Joho + "5acfd72259f89d08ec1c21d8", // Stan + "5e0d3273b91cc00aa001213f", // Baxter + "5e0d31c3b91cc00aa001213b", // Gibney + "5a1a14b5aacf7b00346dcc37", // Gilbert + "5e24bbe949ddd04030d72ca5" // Hass + }; + public static string ResolveObjectClass(MissionPlayer player) { + if (IsMedic(player)) return "UKSF_B_Medic"; // Team Medic + return player.unit.sourceUnit.id switch { "5a435eea905d47336442c75a" => "UKSF_B_Pilot", // "Joint Special Forces Aviation Wing" "5a848590eab14d12cc7fa618" => "UKSF_B_Pilot", // "RAF Cranwell" @@ -24,9 +35,6 @@ public static string ResolveObjectClass(MissionPlayer player) { "5a441602730e9d162834500a" => "UKSF_B_Pilot_656", // "656 Squadron" "5a4415d8730e9d1628345007" => "UKSF_B_Pilot_617", // "617 Squadron" "5a68b28e196530164c9b4fed" => "UKSF_B_Sniper", // "Sniper Platoon" - "5a68c047196530164c9b4fee" => "UKSF_B_Pathfinder", // "The Pathfinder Platoon" - "5bbbb8875eb3a4170c488b24" => "UKSF_B_SAS", // "Air Troop" - "5ba8983ee12a331f94cb02d4" => "UKSF_B_Officer", // "SAS" "5b9123ca7a6c1f0e9875601c" => "UKSF_B_Medic", // "3 Medical Regiment" "5a42835b55d6109bf0b081bd" => ResolvePlayerUnitRole(player) == 3 ? "UKSF_B_Officer" : "UKSF_B_Rifleman", // "UKSF" _ => ResolvePlayerUnitRole(player) != -1 ? "UKSF_B_SectionLeader" : "UKSF_B_Rifleman" @@ -41,6 +49,8 @@ private static int ResolvePlayerUnitRole(MissionPlayer player) { return -1; } + private static bool IsMedic(MissionPlayer player) => MEDIC_IDS.Contains(player.account?.id); + public static bool IsEngineer(MissionPlayer player) => ENGINEER_IDS.Contains(player.account?.id); public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) { @@ -80,12 +90,12 @@ public static List ResolveUnitSlots(MissionUnit unit) { int fillerCount; switch (unit.sourceUnit.id) { case "5a435eea905d47336442c75a": // "Joint Special Forces Aviation Wing" - slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a435eea905d47336442c75a").members); - slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a441619730e9d162834500b").members); - slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a441602730e9d162834500a").members); - slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a4415d8730e9d1628345007").members); - slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a848590eab14d12cc7fa618").members); - slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5c98d7b396dba31f24cdb19c").members); + slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a435eea905d47336442c75a")?.members ?? new List()); + slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a441619730e9d162834500b")?.members ?? new List()); + slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a441602730e9d162834500a")?.members ?? new List()); + slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a4415d8730e9d1628345007")?.members ?? new List()); + slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a848590eab14d12cc7fa618")?.members ?? new List()); + slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5c98d7b396dba31f24cdb19c")?.members ?? new List()); break; case "5a68b28e196530164c9b4fed": // "Sniper Platoon" max = 3; From bb29c8cdbdb3da7861f8d66af4720d7ec91ba04b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 30 Jan 2020 22:33:40 +0000 Subject: [PATCH 084/369] Unit tests for utilities class. Changed account formatter to use dedicated model --- UKSF.Api.Models/Personnel/ExtendedAccount.cs | 12 ++++ .../UKSF.Api.Models.csproj.DotSettings | 9 ++- .../UKSFWebsite.Api.Models.csproj.DotSettings | 8 --- UKSF.Api.Services/Utility/Utilities.cs | 29 +++------ UKSF.Api.sln | 14 +++++ UKSF.Api.sln.DotSettings | 1 + .../Accounts/AccountsController.cs | 26 ++++---- UKSF.Tests.Unit/UKSF.Tests.Unit.csproj | 22 +++++++ .../UtilityTests/UtilitiesTests.cs | 59 +++++++++++++++++++ 9 files changed, 137 insertions(+), 43 deletions(-) create mode 100644 UKSF.Api.Models/Personnel/ExtendedAccount.cs delete mode 100644 UKSF.Api.Models/UKSFWebsite.Api.Models.csproj.DotSettings create mode 100644 UKSF.Tests.Unit/UKSF.Tests.Unit.csproj create mode 100644 UKSF.Tests.Unit/UtilityTests/UtilitiesTests.cs diff --git a/UKSF.Api.Models/Personnel/ExtendedAccount.cs b/UKSF.Api.Models/Personnel/ExtendedAccount.cs new file mode 100644 index 00000000..0ca5e920 --- /dev/null +++ b/UKSF.Api.Models/Personnel/ExtendedAccount.cs @@ -0,0 +1,12 @@ +namespace UKSF.Api.Models.Personnel { + public class ExtendedAccount : Account { + public string displayName; + public bool permissionSr1; + public bool permissionSr5; + public bool permissionSr10; + public bool permissionSr1Lead; + public bool permissionCommand; + public bool permissionAdmin; + public bool permissionNco; + } +} diff --git a/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings b/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings index e7d45a2a..6402b607 100644 --- a/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings +++ b/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings @@ -1 +1,8 @@ - \ No newline at end of file + + IF_OWNER_IS_SINGLE_LINE + <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + + True + True + True + True \ No newline at end of file diff --git a/UKSF.Api.Models/UKSFWebsite.Api.Models.csproj.DotSettings b/UKSF.Api.Models/UKSFWebsite.Api.Models.csproj.DotSettings deleted file mode 100644 index 6402b607..00000000 --- a/UKSF.Api.Models/UKSFWebsite.Api.Models.csproj.DotSettings +++ /dev/null @@ -1,8 +0,0 @@ - - IF_OWNER_IS_SINGLE_LINE - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - - True - True - True - True \ No newline at end of file diff --git a/UKSF.Api.Services/Utility/Utilities.cs b/UKSF.Api.Services/Utility/Utilities.cs index 84e9337d..5bcb78a2 100644 --- a/UKSF.Api.Services/Utility/Utilities.cs +++ b/UKSF.Api.Services/Utility/Utilities.cs @@ -1,31 +1,18 @@ using System; -using System.Collections.Generic; -using System.Dynamic; -using System.Reflection; +using Newtonsoft.Json; using UKSF.Api.Models.Personnel; namespace UKSF.Api.Services.Utility { public static class Utilities { - private static dynamic ToDynamic(this T obj) { - IDictionary expando = new ExpandoObject(); - - foreach (PropertyInfo propertyInfo in typeof(T).GetProperties()) { - object currentValue = propertyInfo.GetValue(obj); - expando.Add(propertyInfo.Name, currentValue); - } - - foreach (FieldInfo fieldInfo in typeof(T).GetFields()) { - object currentValue = fieldInfo.GetValue(obj); - expando.Add(fieldInfo.Name, currentValue); - } - - return (ExpandoObject) expando; + private static TOut Copy(this TIn source) { + JsonSerializerSettings deserializeSettings = new JsonSerializerSettings {ObjectCreationHandling = ObjectCreationHandling.Replace}; + return JsonConvert.DeserializeObject(JsonConvert.SerializeObject(source), deserializeSettings); } - public static dynamic ToDynamicAccount(this Account account) { - dynamic dynamicAccount = account.ToDynamic(); - dynamicAccount.password = null; - return dynamicAccount; + public static ExtendedAccount ToExtendedAccount(this Account account) { + ExtendedAccount extendedAccount = account.Copy(); + extendedAccount.password = null; + return extendedAccount; } public static (int years, int months) ToAge(this DateTime dob) { diff --git a/UKSF.Api.sln b/UKSF.Api.sln index aabfdf29..a6482ef1 100644 --- a/UKSF.Api.sln +++ b/UKSF.Api.sln @@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Signalr", "UKSF.Ap EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.PostMessage", "UKSF.PostMessage\UKSF.PostMessage.csproj", "{B173771C-1AB7-436B-A6FF-0EF50EF5D015}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Tests.Unit", "UKSF.Tests.Unit\UKSF.Tests.Unit.csproj", "{09946FE7-A65D-483E-8B5A-ADE729760375}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -144,6 +146,18 @@ Global {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|x64.Build.0 = Release|Any CPU {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|x86.ActiveCfg = Release|Any CPU {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|x86.Build.0 = Release|Any CPU + {09946FE7-A65D-483E-8B5A-ADE729760375}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {09946FE7-A65D-483E-8B5A-ADE729760375}.Debug|Any CPU.Build.0 = Debug|Any CPU + {09946FE7-A65D-483E-8B5A-ADE729760375}.Debug|x64.ActiveCfg = Debug|Any CPU + {09946FE7-A65D-483E-8B5A-ADE729760375}.Debug|x64.Build.0 = Debug|Any CPU + {09946FE7-A65D-483E-8B5A-ADE729760375}.Debug|x86.ActiveCfg = Debug|Any CPU + {09946FE7-A65D-483E-8B5A-ADE729760375}.Debug|x86.Build.0 = Debug|Any CPU + {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|Any CPU.ActiveCfg = Release|Any CPU + {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|Any CPU.Build.0 = Release|Any CPU + {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|x64.ActiveCfg = Release|Any CPU + {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|x64.Build.0 = Release|Any CPU + {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|x86.ActiveCfg = Release|Any CPU + {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index 886d22f2..35e6b171 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -391,6 +391,7 @@ True + 0.5 diff --git a/UKSF.Api/Controllers/Accounts/AccountsController.cs b/UKSF.Api/Controllers/Accounts/AccountsController.cs index 1734e705..266d6db0 100644 --- a/UKSF.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSF.Api/Controllers/Accounts/AccountsController.cs @@ -60,13 +60,13 @@ IUnitsService unitsService [HttpGet, Authorize] public IActionResult Get() { Account account = sessionService.GetContextAccount(); - return Ok(FormatAccount(account)); + return Ok(ExtendAccount(account)); } [HttpGet("{id}"), Authorize] public IActionResult GetById(string id) { Account account = accountService.Data().GetSingle(id); - return Ok(FormatAccount(account)); + return Ok(ExtendAccount(account)); } [HttpPut] @@ -212,17 +212,17 @@ public IActionResult Test() { return Ok(new {value = DateTime.Now.ToLongTimeString()}); } - private dynamic FormatAccount(Account account) { - dynamic responseAccount = account.ToDynamicAccount(); - responseAccount.displayName = displayNameService.GetDisplayName(account); - responseAccount.sr1 = sessionService.ContextHasRole(RoleDefinitions.SR1); - responseAccount.sr5 = sessionService.ContextHasRole(RoleDefinitions.SR5); - responseAccount.sr10 = sessionService.ContextHasRole(RoleDefinitions.SR10); - responseAccount.sr1Lead = sessionService.ContextHasRole(RoleDefinitions.SR1_LEAD); - responseAccount.command = sessionService.ContextHasRole(RoleDefinitions.COMMAND); - responseAccount.admin = sessionService.ContextHasRole(RoleDefinitions.ADMIN); - responseAccount.nco = sessionService.ContextHasRole(RoleDefinitions.NCO); - return responseAccount; + private ExtendedAccount ExtendAccount(Account account) { + ExtendedAccount extendedAccount = account.ToExtendedAccount(); + extendedAccount.displayName = displayNameService.GetDisplayName(account); + extendedAccount.permissionSr1 = sessionService.ContextHasRole(RoleDefinitions.SR1); + extendedAccount.permissionSr5 = sessionService.ContextHasRole(RoleDefinitions.SR5); + extendedAccount.permissionSr10 = sessionService.ContextHasRole(RoleDefinitions.SR10); + extendedAccount.permissionSr1Lead = sessionService.ContextHasRole(RoleDefinitions.SR1_LEAD); + extendedAccount.permissionCommand = sessionService.ContextHasRole(RoleDefinitions.COMMAND); + extendedAccount.permissionAdmin = sessionService.ContextHasRole(RoleDefinitions.ADMIN); + extendedAccount.permissionNco = sessionService.ContextHasRole(RoleDefinitions.NCO); + return extendedAccount; } private async Task SendConfirmationCode(Account account) { diff --git a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj new file mode 100644 index 00000000..8cef21ab --- /dev/null +++ b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj @@ -0,0 +1,22 @@ + + + + netcoreapp3.1 + + false + + + + + + + + + + + + + + + + diff --git a/UKSF.Tests.Unit/UtilityTests/UtilitiesTests.cs b/UKSF.Tests.Unit/UtilityTests/UtilitiesTests.cs new file mode 100644 index 00000000..c0b02c0e --- /dev/null +++ b/UKSF.Tests.Unit/UtilityTests/UtilitiesTests.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using FluentAssertions; +using MongoDB.Bson; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Utility; +using Xunit; + +namespace UKSF.Tests.Unit.UtilityTests { + public class UtilitiesTests { + [Theory, InlineData(25, 4, 25, 4), InlineData(25, 13, 26, 1)] + public void ShouldGiveCorrectAge(int years, int months, int expectedYears, int expectedMonths) { + DateTime dob = DateTime.Today.AddYears(-years).AddMonths(-months); + + (int subjectYears, int subjectMonths) = dob.ToAge(); + + subjectYears.Should().Be(expectedYears); + subjectMonths.Should().Be(expectedMonths); + } + + [Fact] + public void ShouldCopyAccountCorrectly() { + string id = ObjectId.GenerateNewId().ToString(); + DateTime timestamp = DateTime.Now.AddDays(-1); + Account account = new Account { + id = id, + firstname = "Bob", + lastname = "McTest", + membershipState = MembershipState.MEMBER, + teamspeakIdentities = new HashSet {4, 4}, + serviceRecord = new[] {new ServiceRecordEntry {occurence = "Test", timestamp = timestamp}}, + aviation = true, + militaryExperience = false + }; + + ExtendedAccount subject = account.ToExtendedAccount(); + + subject.id.Should().Be(id); + subject.firstname.Should().Be("Bob"); + subject.lastname.Should().Be("McTest"); + subject.membershipState.Should().Be(MembershipState.MEMBER); + subject.teamspeakIdentities.Should().NotBeEmpty().And.HaveCount(1).And.ContainInOrder(new[] {4}); + subject.serviceRecord.Should().NotBeEmpty().And.HaveCount(1).And.OnlyContain(x => x.occurence == "Test" && x.timestamp == timestamp); + subject.aviation.Should().BeTrue(); + subject.militaryExperience.Should().BeFalse(); + } + + [Fact] + public void ShouldNotCopyPassword() { + string id = ObjectId.GenerateNewId().ToString(); + Account account = new Account {id = id, password = "thiswontappear"}; + + ExtendedAccount subject = account.ToExtendedAccount(); + + subject.id.Should().Be(id); + subject.password.Should().BeNull(); + } + } +} From aa1feb79a02b4c1e4c80e82579255242630d89b3 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 31 Jan 2020 13:31:40 +0000 Subject: [PATCH 085/369] Further unit tests. Add mongoobject for models with id created in constructor. --- UKSF.Api.Models/MongoObject.cs | 10 ++++++ UKSF.Api.Models/Utility/ConfirmationCode.cs | 3 +- UKSF.Api.Services/Utility/Utilities.cs | 13 ++++---- .../PersonnelTests/AccountSettingsTests.cs | 27 ++++++++++++++++ UKSF.Tests.Unit/UKSF.Tests.Unit.csproj | 1 + .../ConfirmationCodeServiceTests.cs | 32 +++++++++++++++++++ .../UtilityTests/UtilitiesTests.cs | 9 ++++++ 7 files changed, 87 insertions(+), 8 deletions(-) create mode 100644 UKSF.Api.Models/MongoObject.cs create mode 100644 UKSF.Tests.Unit/PersonnelTests/AccountSettingsTests.cs create mode 100644 UKSF.Tests.Unit/UtilityTests/ConfirmationCodeServiceTests.cs diff --git a/UKSF.Api.Models/MongoObject.cs b/UKSF.Api.Models/MongoObject.cs new file mode 100644 index 00000000..8e36f988 --- /dev/null +++ b/UKSF.Api.Models/MongoObject.cs @@ -0,0 +1,10 @@ +using MongoDB.Bson; +using MongoDB.Bson.Serialization.Attributes; + +namespace UKSF.Api.Models { + public class MongoObject { + [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; + + protected MongoObject() => id = ObjectId.GenerateNewId().ToString(); + } +} diff --git a/UKSF.Api.Models/Utility/ConfirmationCode.cs b/UKSF.Api.Models/Utility/ConfirmationCode.cs index b5f934ca..9c8546cb 100644 --- a/UKSF.Api.Models/Utility/ConfirmationCode.cs +++ b/UKSF.Api.Models/Utility/ConfirmationCode.cs @@ -3,8 +3,7 @@ using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Utility { - public class ConfirmationCode { - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; + public class ConfirmationCode : MongoObject { public DateTime timestamp = DateTime.UtcNow; public string value; } diff --git a/UKSF.Api.Services/Utility/Utilities.cs b/UKSF.Api.Services/Utility/Utilities.cs index 5bcb78a2..e30bf683 100644 --- a/UKSF.Api.Services/Utility/Utilities.cs +++ b/UKSF.Api.Services/Utility/Utilities.cs @@ -4,22 +4,23 @@ namespace UKSF.Api.Services.Utility { public static class Utilities { - private static TOut Copy(this TIn source) { + private static TOut Copy(this object source) { JsonSerializerSettings deserializeSettings = new JsonSerializerSettings {ObjectCreationHandling = ObjectCreationHandling.Replace}; return JsonConvert.DeserializeObject(JsonConvert.SerializeObject(source), deserializeSettings); } public static ExtendedAccount ToExtendedAccount(this Account account) { - ExtendedAccount extendedAccount = account.Copy(); + ExtendedAccount extendedAccount = account.Copy(); extendedAccount.password = null; return extendedAccount; } - public static (int years, int months) ToAge(this DateTime dob) { - int months = DateTime.Today.Month - dob.Month; - int years = DateTime.Today.Year - dob.Year; + public static (int years, int months) ToAge(this DateTime dob, DateTime? date = null) { + DateTime today = date ?? DateTime.Today; + int months = today.Month - dob.Month; + int years = today.Year - dob.Year; - if (DateTime.Today.Day < dob.Day) { + if (today.Day < dob.Day) { months--; } diff --git a/UKSF.Tests.Unit/PersonnelTests/AccountSettingsTests.cs b/UKSF.Tests.Unit/PersonnelTests/AccountSettingsTests.cs new file mode 100644 index 00000000..ffbe9c44 --- /dev/null +++ b/UKSF.Tests.Unit/PersonnelTests/AccountSettingsTests.cs @@ -0,0 +1,27 @@ +using FluentAssertions; +using UKSF.Api.Models.Personnel; +using Xunit; + +namespace UKSF.Tests.Unit.PersonnelTests { + public class AccountSettingsTests { + [Fact] + public void ShouldReturnBool() { + AccountSettings subject = new AccountSettings(); + + bool attribute = subject.GetAttribute("sr1Enabled"); + + attribute.GetType().Should().Be(typeof(bool)); + } + + [Fact] + public void ShouldReturnCorrectValue() { + AccountSettings subject = new AccountSettings {sr1Enabled = false, errorEmails = true}; + + bool sr1Enabled = subject.GetAttribute("sr1Enabled"); + bool errorEmails = subject.GetAttribute("errorEmails"); + + sr1Enabled.Should().BeFalse(); + errorEmails.Should().BeTrue(); + } + } +} diff --git a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj index 8cef21ab..12e25e5e 100644 --- a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj +++ b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj @@ -9,6 +9,7 @@ + diff --git a/UKSF.Tests.Unit/UtilityTests/ConfirmationCodeServiceTests.cs b/UKSF.Tests.Unit/UtilityTests/ConfirmationCodeServiceTests.cs new file mode 100644 index 00000000..ad9073df --- /dev/null +++ b/UKSF.Tests.Unit/UtilityTests/ConfirmationCodeServiceTests.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using FluentAssertions; +using Microsoft.Extensions.Hosting; +using MongoDB.Bson; +using Moq; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Utility; +using UKSF.Api.Services.Utility; +using Xunit; + +namespace UKSF.Tests.Unit.UtilityTests { + public class ConfirmationCodeServiceTests { + + [Fact] + public async Task ShouldReturnCodeId() { + Mock mockConfirmationCodeDataService = new Mock(); + Mock mockSchedulerService = new Mock(); + ConfirmationCodeService confirmationCodeService = new ConfirmationCodeService(mockConfirmationCodeDataService.Object, mockSchedulerService.Object); + + mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + + string id = await confirmationCodeService.CreateConfirmationCode("test"); + + id.Should().HaveLength(24); + ObjectId.TryParse(id, out ObjectId _).Should().BeTrue(); + } + } +} diff --git a/UKSF.Tests.Unit/UtilityTests/UtilitiesTests.cs b/UKSF.Tests.Unit/UtilityTests/UtilitiesTests.cs index c0b02c0e..963a7098 100644 --- a/UKSF.Tests.Unit/UtilityTests/UtilitiesTests.cs +++ b/UKSF.Tests.Unit/UtilityTests/UtilitiesTests.cs @@ -45,6 +45,15 @@ public void ShouldCopyAccountCorrectly() { subject.militaryExperience.Should().BeFalse(); } + [Fact] + public void ShouldGiveCorrectMonths() { + DateTime dob = new DateTime(2019, 1, 20); + + (int _, int subjectMonths) = dob.ToAge(new DateTime(2020, 1, 16)); + + subjectMonths.Should().Be(11); + } + [Fact] public void ShouldNotCopyPassword() { string id = ObjectId.GenerateNewId().ToString(); From 804f2d45d4d0541698ca53bfb81036b900b52fc5 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 31 Jan 2020 18:37:46 +0000 Subject: [PATCH 086/369] Change data service to use DataCollection to abstract mongo away from the data service --- UKSF.Api.Data/Admin/VariablesDataService.cs | 11 ++- UKSF.Api.Data/CachedDataService.cs | 7 +- .../CommandRequestArchiveDataService.cs | 3 +- .../Command/CommandRequestDataService.cs | 4 +- UKSF.Api.Data/DataCollection.cs | 73 +++++++++++++++++++ UKSF.Api.Data/DataService.cs | 39 ++++------ UKSF.Api.Data/DataUtilies.cs | 11 +++ .../Fake/FakeNotificationsDataService.cs | 5 +- UKSF.Api.Data/Game/GameServersDataService.cs | 4 +- .../Launcher/LauncherFileDataService.cs | 4 +- .../Message/CommentThreadDataService.cs | 7 +- UKSF.Api.Data/Message/LogDataService.cs | 19 +++-- .../Message/NotificationsDataService.cs | 16 ++-- .../Operations/OperationOrderDataService.cs | 8 +- .../Operations/OperationReportDataService.cs | 8 +- UKSF.Api.Data/Personnel/AccountDataService.cs | 4 +- .../Personnel/DischargeDataService.cs | 4 +- UKSF.Api.Data/Personnel/LoaDataService.cs | 4 +- UKSF.Api.Data/Personnel/RanksDataService.cs | 4 +- UKSF.Api.Data/Personnel/RolesDataService.cs | 4 +- UKSF.Api.Data/Units/UnitsDataService.cs | 4 +- .../Utility/ConfirmationCodeDataService.cs | 5 +- UKSF.Api.Data/Utility/SchedulerDataService.cs | 3 +- .../Data/Cached/INotificationsDataService.cs | 5 +- UKSF.Api.Interfaces/Data/IDataCollection.cs | 24 ++++++ .../Message/INotificationsService.cs | 4 +- UKSF.Api.Models/Admin/VariableItem.cs | 6 +- UKSF.Api.Models/Command/CommandRequest.cs | 3 +- UKSF.Api.Models/Game/GameServer.cs | 4 +- UKSF.Api.Models/Launcher/LauncherFile.cs | 6 +- UKSF.Api.Models/Message/Comment.cs | 3 +- UKSF.Api.Models/Message/CommentThread.cs | 3 +- .../Message/Logging/BasicLogMessage.cs | 7 +- UKSF.Api.Models/Message/Notification.cs | 3 +- .../Operations/CreateOperationOrderRequest.cs | 10 ++- .../Operations/CreateOperationReport.cs | 11 ++- UKSF.Api.Models/Operations/Operation.cs | 13 ++-- UKSF.Api.Models/Operations/Opord.cs | 13 ++-- UKSF.Api.Models/Operations/Oprep.cs | 14 ++-- UKSF.Api.Models/Personnel/Account.cs | 5 +- UKSF.Api.Models/Personnel/Discharge.cs | 6 +- UKSF.Api.Models/Personnel/Loa.cs | 3 +- UKSF.Api.Models/Personnel/Rank.cs | 8 +- UKSF.Api.Models/Personnel/Role.cs | 8 +- UKSF.Api.Models/Units/Unit.cs | 3 +- UKSF.Api.Models/Utility/ConfirmationCode.cs | 2 - UKSF.Api.Models/Utility/ScheduledJob.cs | 5 +- UKSF.Api.Models/Utility/UtilityObject.cs | 5 +- .../Fake/FakeNotificationsService.cs | 4 +- .../Message/NotificationsService.cs | 11 +-- .../Controllers/NotificationsController.cs | 4 +- UKSF.Api/Startup.cs | 2 + UKSF.Tests.Unit/Data/DataServiceTests.cs | 31 ++++++++ UKSF.Tests.Unit/UKSF.Tests.Unit.csproj | 1 + .../ConfirmationCodeServiceTests.cs | 27 ++++++- 55 files changed, 324 insertions(+), 181 deletions(-) create mode 100644 UKSF.Api.Data/DataCollection.cs create mode 100644 UKSF.Api.Data/DataUtilies.cs create mode 100644 UKSF.Api.Interfaces/Data/IDataCollection.cs create mode 100644 UKSF.Tests.Unit/Data/DataServiceTests.cs diff --git a/UKSF.Api.Data/Admin/VariablesDataService.cs b/UKSF.Api.Data/Admin/VariablesDataService.cs index c6b1d57c..95a79493 100644 --- a/UKSF.Api.Data/Admin/VariablesDataService.cs +++ b/UKSF.Api.Data/Admin/VariablesDataService.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Admin; @@ -9,7 +10,9 @@ namespace UKSF.Api.Data.Admin { public class VariablesDataService : CachedDataService, IVariablesDataService { - public VariablesDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "variables") { } + private readonly IDataCollection dataCollection; + + public VariablesDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "variables") => this.dataCollection = dataCollection; public override List Get() { base.Get(); @@ -23,17 +26,17 @@ public override VariableItem GetSingle(string key) { public async Task Update(string key, object value) { UpdateDefinition update = value == null ? Builders.Update.Unset("item") : Builders.Update.Set("item", value); - await Database.GetCollection(DatabaseCollection).UpdateOneAsync(x => x.key == key.Keyify(), update); + await dataCollection.Update(key.Keyify(), update); Refresh(); } public override async Task Update(string key, UpdateDefinition update) { - await Database.GetCollection(DatabaseCollection).UpdateOneAsync(x => x.key == key.Keyify(), update); + await dataCollection.Update(key.Keyify(), update); Refresh(); } public override async Task Delete(string key) { - await Database.GetCollection(DatabaseCollection).DeleteOneAsync(x => x.key == key.Keyify()); + await dataCollection.Delete(key.Keyify()); Refresh(); } } diff --git a/UKSF.Api.Data/CachedDataService.cs b/UKSF.Api.Data/CachedDataService.cs index e0acb967..5dfb3d38 100644 --- a/UKSF.Api.Data/CachedDataService.cs +++ b/UKSF.Api.Data/CachedDataService.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; @@ -10,7 +11,7 @@ namespace UKSF.Api.Data { public abstract class CachedDataService : DataService { protected List Collection; - protected CachedDataService(IMongoDatabase database, IDataEventBus dataEventBus, string collectionName) : base(database, dataEventBus, collectionName) { } + protected CachedDataService(IDataCollection dataCollection, IDataEventBus dataEventBus, string collectionName) : base(dataCollection, dataEventBus, collectionName) { } // ReSharper disable once MemberCanBeProtected.Global - Used in dynamic call, do not change to protected! public void Refresh() { @@ -34,7 +35,7 @@ public override List Get(Func predicate) { public override T GetSingle(string id) { if (Collection == null) Get(); - return Collection.FirstOrDefault(x => GetIdValue(x) == id); + return Collection.FirstOrDefault(x => x.GetIdValue() == id); } public override T GetSingle(Func predicate) { @@ -45,7 +46,7 @@ public override T GetSingle(Func predicate) { public override async Task Add(T data) { await base.Add(data); Refresh(); - CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(data), data)); + CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, data.GetIdValue(), data)); } public override async Task Update(string id, string fieldName, object value) { diff --git a/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs b/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs index 55d53ffd..330cc17f 100644 --- a/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs +++ b/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs @@ -1,10 +1,9 @@ -using MongoDB.Driver; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Command; namespace UKSF.Api.Data.Command { public class CommandRequestArchiveDataService : DataService, ICommandRequestArchiveDataService { - public CommandRequestArchiveDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commandRequestsArchive") { } + public CommandRequestArchiveDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "commandRequestsArchive") { } } } diff --git a/UKSF.Api.Data/Command/CommandRequestDataService.cs b/UKSF.Api.Data/Command/CommandRequestDataService.cs index 9468ea4f..6db048a9 100644 --- a/UKSF.Api.Data/Command/CommandRequestDataService.cs +++ b/UKSF.Api.Data/Command/CommandRequestDataService.cs @@ -1,10 +1,10 @@ -using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Command; namespace UKSF.Api.Data.Command { public class CommandRequestDataService : CachedDataService, ICommandRequestDataService { - public CommandRequestDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commandRequests") { } + public CommandRequestDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "commandRequests") { } } } diff --git a/UKSF.Api.Data/DataCollection.cs b/UKSF.Api.Data/DataCollection.cs new file mode 100644 index 00000000..2b1ea29c --- /dev/null +++ b/UKSF.Api.Data/DataCollection.cs @@ -0,0 +1,73 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Services; + +namespace UKSF.Api.Data { + public class DataCollection : IDataCollection { + private readonly IMongoDatabase database; + private string collectionName; + + public DataCollection() => database = ServiceWrapper.ServiceProvider.GetService(); + + public void SetCollectionName(string newCollectionName) => collectionName = newCollectionName; + + public void AssertCollectionExists() { + if (Get() == null) { + database.CreateCollection(collectionName); + } + } + + public List Get() => GetCollection().AsQueryable().ToList(); + + public List Get(Func predicate) => GetCollection().AsQueryable().Where(predicate).ToList(); + + public T GetSingle(string id) { + return GetCollection().AsQueryable().FirstOrDefault(x => x.GetIdValue() == id); //Get().FirstOrDefault(x => GetIdValue(x) == id); // TODO: Async + } + + public T GetSingle(Func predicate) => GetCollection().AsQueryable().FirstOrDefault(predicate); //Get().FirstOrDefault(predicate); // TODO: Async + + public async Task Add(T data) { + await GetCollection().InsertOneAsync(data); + } + + public async Task Add(string collection, T data) { + collectionName = collection; + AssertCollectionExists(); + await GetCollection().InsertOneAsync(data); + } + + public async Task Update(string id, string fieldName, object value) { + UpdateDefinition update = value == null ? Builders.Update.Unset(fieldName) : Builders.Update.Set(fieldName, value); + await GetCollection().UpdateOneAsync(Builders.Filter.Eq("id", id), update); + } + + public async Task Update(string id, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter + await GetCollection().UpdateOneAsync(Builders.Filter.Eq("id", id), update); + } + + public async Task UpdateMany(Expression> predicate, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter + await GetCollection().UpdateManyAsync(predicate, update); + } + + public async Task Replace(string id, T value) { + await GetCollection().ReplaceOneAsync(x => x.GetIdValue() == id, value); + } + + public async Task Delete(string id) { + await GetCollection().DeleteOneAsync(Builders.Filter.Eq("id", id)); + } + + public async Task DeleteMany(Expression> predicate) { + await GetCollection().DeleteManyAsync(predicate); + } + + private IMongoCollection GetCollection() => database.GetCollection(collectionName); + } +} diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index 2273ee4d..7423390c 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.Events.Data; @@ -10,48 +9,42 @@ namespace UKSF.Api.Data { public abstract class DataService : DataEventBacker, IDataService { - protected readonly IMongoDatabase Database; - protected readonly string DatabaseCollection; - - protected DataService(IMongoDatabase database, IDataEventBus dataEventBus, string collectionName) : base(dataEventBus) { - Database = database; - DatabaseCollection = collectionName; - if (Database.GetCollection(DatabaseCollection) == null) { - Database.CreateCollection(DatabaseCollection); - } + private readonly IDataCollection dataCollection; + + protected DataService(IDataCollection dataCollection, IDataEventBus dataEventBus, string collectionName) : base(dataEventBus) { + this.dataCollection = dataCollection; + + dataCollection.SetCollectionName(collectionName); + dataCollection.AssertCollectionExists(); } - public virtual List Get() => Database.GetCollection(DatabaseCollection).AsQueryable().ToList(); + public virtual List Get() => dataCollection.Get(); - public virtual List Get(Func predicate) => Database.GetCollection(DatabaseCollection).AsQueryable().Where(predicate).ToList(); + public virtual List Get(Func predicate) => dataCollection.Get(predicate); - public virtual T GetSingle(string id) { - return Database.GetCollection(DatabaseCollection).AsQueryable().ToList().FirstOrDefault(x => GetIdValue(x) == id); - } + public virtual T GetSingle(string id) => dataCollection.GetSingle(id); - public virtual T GetSingle(Func predicate) => Database.GetCollection(DatabaseCollection).AsQueryable().ToList().FirstOrDefault(predicate); + public virtual T GetSingle(Func predicate) => dataCollection.GetSingle(predicate); public virtual async Task Add(T data) { - await Database.GetCollection(DatabaseCollection).InsertOneAsync(data); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(data), data)); + await dataCollection.Add(data); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, data.GetIdValue(), data)); } public virtual async Task Update(string id, string fieldName, object value) { UpdateDefinition update = value == null ? Builders.Update.Unset(fieldName) : Builders.Update.Set(fieldName, value); - await Database.GetCollection(DatabaseCollection).UpdateOneAsync(Builders.Filter.Eq("id", id), update); + await dataCollection.Update(id, update); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public virtual async Task Update(string id, UpdateDefinition update) { - await Database.GetCollection(DatabaseCollection).UpdateOneAsync(Builders.Filter.Eq("id", id), update); + await dataCollection.Update(id, update); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public virtual async Task Delete(string id) { - await Database.GetCollection(DatabaseCollection).DeleteOneAsync(Builders.Filter.Eq("id", id)); + await dataCollection.Delete(id); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } - - internal static string GetIdValue(T data) => data.GetType().GetField("id").GetValue(data) as string; } } diff --git a/UKSF.Api.Data/DataUtilies.cs b/UKSF.Api.Data/DataUtilies.cs new file mode 100644 index 00000000..db02c8d4 --- /dev/null +++ b/UKSF.Api.Data/DataUtilies.cs @@ -0,0 +1,11 @@ +using System.Reflection; + +namespace UKSF.Api.Data { + public static class DataUtilies { + public static string GetIdValue(this T data) { + FieldInfo id = data.GetType().GetField("id"); + if (id == null) return ""; + return id.GetValue(data) as string; + } + } +} diff --git a/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs b/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs index d810be13..3ef8df38 100644 --- a/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs +++ b/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs @@ -1,3 +1,4 @@ +using System; using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.Interfaces.Data.Cached; @@ -6,8 +7,8 @@ namespace UKSF.Api.Data.Fake { public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { - public Task UpdateMany(FilterDefinition filter, UpdateDefinition update) => Task.CompletedTask; + public Task UpdateMany(Func predicate, UpdateDefinition update) => Task.CompletedTask; - public Task DeleteMany(FilterDefinition filter) => Task.CompletedTask; + public Task DeleteMany(Func predicate) => Task.CompletedTask; } } diff --git a/UKSF.Api.Data/Game/GameServersDataService.cs b/UKSF.Api.Data/Game/GameServersDataService.cs index f369118d..83fe7c80 100644 --- a/UKSF.Api.Data/Game/GameServersDataService.cs +++ b/UKSF.Api.Data/Game/GameServersDataService.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using System.Linq; -using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Game; namespace UKSF.Api.Data.Game { public class GameServersDataService : CachedDataService, IGameServersDataService { - public GameServersDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "gameServers") { } + public GameServersDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "gameServers") { } public override List Get() { base.Get(); diff --git a/UKSF.Api.Data/Launcher/LauncherFileDataService.cs b/UKSF.Api.Data/Launcher/LauncherFileDataService.cs index 413d6ec5..52a385fd 100644 --- a/UKSF.Api.Data/Launcher/LauncherFileDataService.cs +++ b/UKSF.Api.Data/Launcher/LauncherFileDataService.cs @@ -1,10 +1,10 @@ -using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Launcher; namespace UKSF.Api.Data.Launcher { public class LauncherFileDataService : CachedDataService, ILauncherFileDataService { - public LauncherFileDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "launcherFiles") { } + public LauncherFileDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "launcherFiles") { } } } diff --git a/UKSF.Api.Data/Message/CommentThreadDataService.cs b/UKSF.Api.Data/Message/CommentThreadDataService.cs index 01d5ed4b..c7e82828 100644 --- a/UKSF.Api.Data/Message/CommentThreadDataService.cs +++ b/UKSF.Api.Data/Message/CommentThreadDataService.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; @@ -7,13 +8,13 @@ namespace UKSF.Api.Data.Message { public class CommentThreadDataService : CachedDataService, ICommentThreadDataService { - public CommentThreadDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "commentThreads") { } + public CommentThreadDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "commentThreads") { } public new async Task Add(CommentThread commentThread) { await base.Add(commentThread); return commentThread.id; } - + public async Task Update(string id, Comment comment, DataEventType updateType) { await base.Update(id, updateType == DataEventType.ADD ? Builders.Update.Push("comments", comment) : Builders.Update.Pull("comments", comment)); CommentThreadDataEvent(EventModelFactory.CreateDataEvent(updateType, id, comment)); @@ -22,7 +23,7 @@ public async Task Update(string id, Comment comment, DataEventType updateType) { private void CommentThreadDataEvent(DataEventModel dataEvent) { base.CachedDataEvent(dataEvent); } - + protected override void CachedDataEvent(DataEventModel dataEvent) { } } } diff --git a/UKSF.Api.Data/Message/LogDataService.cs b/UKSF.Api.Data/Message/LogDataService.cs index f47c6065..9b21ca24 100644 --- a/UKSF.Api.Data/Message/LogDataService.cs +++ b/UKSF.Api.Data/Message/LogDataService.cs @@ -1,5 +1,4 @@ using System.Threading.Tasks; -using MongoDB.Driver; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; @@ -7,28 +6,28 @@ namespace UKSF.Api.Data.Message { public class LogDataService : DataService, ILogDataService { - private readonly IMongoDatabase database; + private readonly IDataCollection dataCollection; - public LogDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "logs") => this.database = database; + public LogDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "logs") => this.dataCollection = dataCollection; public override async Task Add(BasicLogMessage log) { await base.Add(log); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(log), log)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.GetIdValue(), log)); } public async Task Add(AuditLogMessage log) { - await database.GetCollection("auditLogs").InsertOneAsync(log); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(log), log)); + await dataCollection.Add("auditLogs", log); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.GetIdValue(), log)); } public async Task Add(LauncherLogMessage log) { - await database.GetCollection("launcherLogs").InsertOneAsync(log); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(log), log)); + await dataCollection.Add("launcherLogs", log); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.GetIdValue(), log)); } public async Task Add(WebLogMessage log) { - await database.GetCollection("errorLogs").InsertOneAsync(log); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, GetIdValue(log), log)); + await dataCollection.Add("errorLogs", log); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.GetIdValue(), log)); } } } diff --git a/UKSF.Api.Data/Message/NotificationsDataService.cs b/UKSF.Api.Data/Message/NotificationsDataService.cs index 9bb6629f..59f781ce 100644 --- a/UKSF.Api.Data/Message/NotificationsDataService.cs +++ b/UKSF.Api.Data/Message/NotificationsDataService.cs @@ -1,20 +1,24 @@ -using System.Threading.Tasks; +using System; +using System.Threading.Tasks; using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Message; namespace UKSF.Api.Data.Message { public class NotificationsDataService : CachedDataService, INotificationsDataService { - public NotificationsDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "notifications") { } + private readonly IDataCollection dataCollection; + + public NotificationsDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "notifications") => this.dataCollection = dataCollection; - public async Task UpdateMany(FilterDefinition filter, UpdateDefinition update) { - await Database.GetCollection(DatabaseCollection).UpdateManyAsync(filter, update); + public async Task UpdateMany(Func predicate, UpdateDefinition update) { + await dataCollection.UpdateMany(x => predicate(x), update); Refresh(); } - public async Task DeleteMany(FilterDefinition filter) { - await Database.GetCollection(DatabaseCollection).DeleteManyAsync(filter); + public async Task DeleteMany(Func predicate) { + await dataCollection.DeleteMany(x => predicate(x)); Refresh(); } } diff --git a/UKSF.Api.Data/Operations/OperationOrderDataService.cs b/UKSF.Api.Data/Operations/OperationOrderDataService.cs index cdafc423..bff22bbc 100644 --- a/UKSF.Api.Data/Operations/OperationOrderDataService.cs +++ b/UKSF.Api.Data/Operations/OperationOrderDataService.cs @@ -1,13 +1,15 @@ using System.Collections.Generic; using System.Threading.Tasks; -using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Operations; namespace UKSF.Api.Data.Operations { public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { - public OperationOrderDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "opord") { } + private readonly IDataCollection dataCollection; + + public OperationOrderDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "opord") => this.dataCollection = dataCollection; public override List Get() { List reversed = base.Get(); @@ -16,7 +18,7 @@ public override List Get() { } public async Task Replace(Opord opord) { - await Database.GetCollection(DatabaseCollection).ReplaceOneAsync(x => x.id == opord.id, opord); + await dataCollection.Replace(opord.id, opord); Refresh(); } } diff --git a/UKSF.Api.Data/Operations/OperationReportDataService.cs b/UKSF.Api.Data/Operations/OperationReportDataService.cs index 00d056d0..13145243 100644 --- a/UKSF.Api.Data/Operations/OperationReportDataService.cs +++ b/UKSF.Api.Data/Operations/OperationReportDataService.cs @@ -1,13 +1,15 @@ using System.Collections.Generic; using System.Threading.Tasks; -using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Operations; namespace UKSF.Api.Data.Operations { public class OperationReportDataService : CachedDataService, IOperationReportDataService { - public OperationReportDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "oprep") { } + private readonly IDataCollection dataCollection; + + public OperationReportDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "oprep") => this.dataCollection = dataCollection; public override List Get() { List reversed = base.Get(); @@ -16,7 +18,7 @@ public override List Get() { } public async Task Replace(Oprep request) { - await Database.GetCollection(DatabaseCollection).ReplaceOneAsync(x => x.id == request.id, request); + await dataCollection.Replace(request.id, request); Refresh(); } } diff --git a/UKSF.Api.Data/Personnel/AccountDataService.cs b/UKSF.Api.Data/Personnel/AccountDataService.cs index e351c48a..6db83681 100644 --- a/UKSF.Api.Data/Personnel/AccountDataService.cs +++ b/UKSF.Api.Data/Personnel/AccountDataService.cs @@ -1,10 +1,10 @@ -using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Personnel; namespace UKSF.Api.Data.Personnel { public class AccountDataService : CachedDataService, IAccountDataService { - public AccountDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "accounts") { } + public AccountDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "accounts") { } } } diff --git a/UKSF.Api.Data/Personnel/DischargeDataService.cs b/UKSF.Api.Data/Personnel/DischargeDataService.cs index 76badc9f..0d4d20b3 100644 --- a/UKSF.Api.Data/Personnel/DischargeDataService.cs +++ b/UKSF.Api.Data/Personnel/DischargeDataService.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using System.Linq; -using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Personnel; namespace UKSF.Api.Data.Personnel { public class DischargeDataService : CachedDataService, IDischargeDataService { - public DischargeDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "discharges") { } + public DischargeDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "discharges") { } public override List Get() { return base.Get().OrderByDescending(x => x.discharges.Last().timestamp).ToList(); diff --git a/UKSF.Api.Data/Personnel/LoaDataService.cs b/UKSF.Api.Data/Personnel/LoaDataService.cs index 8437d323..3193cf67 100644 --- a/UKSF.Api.Data/Personnel/LoaDataService.cs +++ b/UKSF.Api.Data/Personnel/LoaDataService.cs @@ -1,10 +1,10 @@ -using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Personnel; namespace UKSF.Api.Data.Personnel { public class LoaDataService : CachedDataService, ILoaDataService { - public LoaDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "loas") { } + public LoaDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "loas") { } } } diff --git a/UKSF.Api.Data/Personnel/RanksDataService.cs b/UKSF.Api.Data/Personnel/RanksDataService.cs index 81dfd95e..7175f41d 100644 --- a/UKSF.Api.Data/Personnel/RanksDataService.cs +++ b/UKSF.Api.Data/Personnel/RanksDataService.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; -using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Personnel; namespace UKSF.Api.Data.Personnel { public class RanksDataService : CachedDataService, IRanksDataService { - public RanksDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "ranks") { } + public RanksDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "ranks") { } public override List Get() { base.Get(); diff --git a/UKSF.Api.Data/Personnel/RolesDataService.cs b/UKSF.Api.Data/Personnel/RolesDataService.cs index ab358673..6a6afa7a 100644 --- a/UKSF.Api.Data/Personnel/RolesDataService.cs +++ b/UKSF.Api.Data/Personnel/RolesDataService.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using System.Linq; -using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Personnel; namespace UKSF.Api.Data.Personnel { public class RolesDataService : CachedDataService, IRolesDataService { - public RolesDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "roles") { } + public RolesDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "roles") { } public override List Get() { base.Get(); diff --git a/UKSF.Api.Data/Units/UnitsDataService.cs b/UKSF.Api.Data/Units/UnitsDataService.cs index 9b10488d..1cf71e45 100644 --- a/UKSF.Api.Data/Units/UnitsDataService.cs +++ b/UKSF.Api.Data/Units/UnitsDataService.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using System.Linq; -using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Units; namespace UKSF.Api.Data.Units { public class UnitsDataService : CachedDataService, IUnitsDataService { - public UnitsDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "units") { } + public UnitsDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "units") { } public override List Get() { base.Get(); diff --git a/UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs b/UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs index 1e02fb35..2370a028 100644 --- a/UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs +++ b/UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs @@ -1,10 +1,9 @@ -using MongoDB.Driver; -using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Utility; namespace UKSF.Api.Data.Utility { public class ConfirmationCodeDataService : DataService, IConfirmationCodeDataService { - public ConfirmationCodeDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "confirmationCodes") { } + public ConfirmationCodeDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "confirmationCodes") { } } } diff --git a/UKSF.Api.Data/Utility/SchedulerDataService.cs b/UKSF.Api.Data/Utility/SchedulerDataService.cs index e21422ad..55fb8d4f 100644 --- a/UKSF.Api.Data/Utility/SchedulerDataService.cs +++ b/UKSF.Api.Data/Utility/SchedulerDataService.cs @@ -1,10 +1,9 @@ -using MongoDB.Driver; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Utility; namespace UKSF.Api.Data.Utility { public class SchedulerDataService : DataService, ISchedulerDataService { - public SchedulerDataService(IMongoDatabase database, IDataEventBus dataEventBus) : base(database, dataEventBus, "scheduledJobs") { } + public SchedulerDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "scheduledJobs") { } } } diff --git a/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs index 13aef413..ba9456ea 100644 --- a/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs @@ -1,10 +1,11 @@ +using System; using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.Models.Message; namespace UKSF.Api.Interfaces.Data.Cached { public interface INotificationsDataService : IDataService { - Task UpdateMany(FilterDefinition filter, UpdateDefinition update); - Task DeleteMany(FilterDefinition filter); + Task UpdateMany(Func predicate, UpdateDefinition update); + Task DeleteMany(Func predicate); } } diff --git a/UKSF.Api.Interfaces/Data/IDataCollection.cs b/UKSF.Api.Interfaces/Data/IDataCollection.cs new file mode 100644 index 00000000..6ee3b435 --- /dev/null +++ b/UKSF.Api.Interfaces/Data/IDataCollection.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; +using MongoDB.Driver; + +namespace UKSF.Api.Interfaces.Data { + public interface IDataCollection { + void SetCollectionName(string newCollectionName); + void AssertCollectionExists(); + List Get(); + List Get(Func predicate); + T GetSingle(string id); + T GetSingle(Func predicate); + Task Add(T data); + Task Add(string collection, T data); + Task Update(string id, string fieldName, object value); + Task Update(string id, UpdateDefinition update); + Task UpdateMany(Expression> predicate, UpdateDefinition update); + Task Replace(string id, T value); + Task Delete(string id); + Task DeleteMany(Expression> predicate); + } +} diff --git a/UKSF.Api.Interfaces/Message/INotificationsService.cs b/UKSF.Api.Interfaces/Message/INotificationsService.cs index 894645aa..72067d3e 100644 --- a/UKSF.Api.Interfaces/Message/INotificationsService.cs +++ b/UKSF.Api.Interfaces/Message/INotificationsService.cs @@ -10,7 +10,7 @@ public interface INotificationsService : IDataBackedService clientDbIds, string rawMessage); IEnumerable GetNotificationsForContext(); - Task MarkNotificationsAsRead(IEnumerable ids); - Task Delete(IEnumerable ids); + Task MarkNotificationsAsRead(List ids); + Task Delete(List ids); } } diff --git a/UKSF.Api.Models/Admin/VariableItem.cs b/UKSF.Api.Models/Admin/VariableItem.cs index 58fb5b50..e260fb17 100644 --- a/UKSF.Api.Models/Admin/VariableItem.cs +++ b/UKSF.Api.Models/Admin/VariableItem.cs @@ -1,9 +1,5 @@ -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; - namespace UKSF.Api.Models.Admin { - public class VariableItem { - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; + public class VariableItem : MongoObject { public object item; public string key; } diff --git a/UKSF.Api.Models/Command/CommandRequest.cs b/UKSF.Api.Models/Command/CommandRequest.cs index ccb263cf..5fd0474d 100644 --- a/UKSF.Api.Models/Command/CommandRequest.cs +++ b/UKSF.Api.Models/Command/CommandRequest.cs @@ -24,13 +24,12 @@ public static class CommandRequestType { public const string UNIT_ROLE = "Unit Role"; } - public class CommandRequest { + public class CommandRequest : MongoObject { public DateTime dateCreated; public string displayFrom; public string displayRecipient; public string displayRequester; public string displayValue; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public string reason, type; [BsonRepresentation(BsonType.ObjectId)] public string recipient; [BsonRepresentation(BsonType.ObjectId)] public string requester; diff --git a/UKSF.Api.Models/Game/GameServer.cs b/UKSF.Api.Models/Game/GameServer.cs index 5b2215d0..caf335aa 100644 --- a/UKSF.Api.Models/Game/GameServer.cs +++ b/UKSF.Api.Models/Game/GameServer.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Game { @@ -9,13 +8,12 @@ public enum GameServerOption { DCG } - public class GameServer { + public class GameServer : MongoObject { [BsonIgnore] public readonly List headlessClientProcessIds = new List(); public string adminPassword; public int apiPort; [BsonIgnore] public bool canLaunch; public string hostName; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public List mods = new List(); public string name; public int numberHeadlessClients; diff --git a/UKSF.Api.Models/Launcher/LauncherFile.cs b/UKSF.Api.Models/Launcher/LauncherFile.cs index 550da158..4cec2fde 100644 --- a/UKSF.Api.Models/Launcher/LauncherFile.cs +++ b/UKSF.Api.Models/Launcher/LauncherFile.cs @@ -1,10 +1,6 @@ -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; - namespace UKSF.Api.Models.Launcher { - public class LauncherFile { + public class LauncherFile : MongoObject { public string fileName; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public string version; } } diff --git a/UKSF.Api.Models/Message/Comment.cs b/UKSF.Api.Models/Message/Comment.cs index 3a786d18..7fdafed5 100644 --- a/UKSF.Api.Models/Message/Comment.cs +++ b/UKSF.Api.Models/Message/Comment.cs @@ -3,10 +3,9 @@ using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Message { - public class Comment { + public class Comment : MongoObject { [BsonRepresentation(BsonType.ObjectId)] public string author; public string content; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public DateTime timestamp; } } diff --git a/UKSF.Api.Models/Message/CommentThread.cs b/UKSF.Api.Models/Message/CommentThread.cs index 55d17487..9e11742f 100644 --- a/UKSF.Api.Models/Message/CommentThread.cs +++ b/UKSF.Api.Models/Message/CommentThread.cs @@ -10,10 +10,9 @@ public enum ThreadMode { RANKSUPERIOROREQUAL } - public class CommentThread { + public class CommentThread : MongoObject { [BsonRepresentation(BsonType.ObjectId)] public string[] authors; public Comment[] comments = { }; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public ThreadMode mode; } } diff --git a/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs b/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs index 69be4966..19466387 100644 --- a/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs +++ b/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs @@ -1,6 +1,5 @@ using System; using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Message.Logging { public enum LogLevel { @@ -9,12 +8,12 @@ public enum LogLevel { ERROR } - public class BasicLogMessage { - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; + public class BasicLogMessage : MongoObject { public LogLevel level = LogLevel.INFO; public string message; public DateTime timestamp; - public BasicLogMessage() : this(DateTime.UtcNow) { } + + protected BasicLogMessage() : this(DateTime.UtcNow) { } public BasicLogMessage(string text) : this() => message = text; diff --git a/UKSF.Api.Models/Message/Notification.cs b/UKSF.Api.Models/Message/Notification.cs index b8d7b1a0..3e28b0df 100644 --- a/UKSF.Api.Models/Message/Notification.cs +++ b/UKSF.Api.Models/Message/Notification.cs @@ -3,9 +3,8 @@ using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Message { - public class Notification { + public class Notification : MongoObject { public string icon; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public string link; public string message; [BsonRepresentation(BsonType.ObjectId)] public string owner; diff --git a/UKSF.Api.Models/Operations/CreateOperationOrderRequest.cs b/UKSF.Api.Models/Operations/CreateOperationOrderRequest.cs index 73fec615..70099953 100644 --- a/UKSF.Api.Models/Operations/CreateOperationOrderRequest.cs +++ b/UKSF.Api.Models/Operations/CreateOperationOrderRequest.cs @@ -2,8 +2,12 @@ namespace UKSF.Api.Models.Operations { public class CreateOperationOrderRequest { - public string name, map, type; - public DateTime start, end; - public int starttime, endtime; + public DateTime end; + public int endtime; + public string map; + public string name; + public DateTime start; + public int starttime; + public string type; } } diff --git a/UKSF.Api.Models/Operations/CreateOperationReport.cs b/UKSF.Api.Models/Operations/CreateOperationReport.cs index 94b0cd8f..17b5b7c4 100644 --- a/UKSF.Api.Models/Operations/CreateOperationReport.cs +++ b/UKSF.Api.Models/Operations/CreateOperationReport.cs @@ -2,8 +2,13 @@ namespace UKSF.Api.Models.Operations { public class CreateOperationReportRequest { - public string name, map, type, result; - public DateTime start, end; - public int starttime, endtime; + public DateTime end; + public int endtime; + public string map; + public string name; + public string result; + public DateTime start; + public int starttime; + public string type; } } diff --git a/UKSF.Api.Models/Operations/Operation.cs b/UKSF.Api.Models/Operations/Operation.cs index 3bba5adf..56908331 100644 --- a/UKSF.Api.Models/Operations/Operation.cs +++ b/UKSF.Api.Models/Operations/Operation.cs @@ -1,13 +1,14 @@ using System; -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; using UKSF.Api.Models.Personnel; namespace UKSF.Api.Models.Operations { - public class Operation { + public class Operation : MongoObject { public AttendanceReport attendanceReport; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; - public string name, map, type, result; - public DateTime start, end; + public DateTime end; + public string map; + public string name; + public string result; + public DateTime start; + public string type; } } diff --git a/UKSF.Api.Models/Operations/Opord.cs b/UKSF.Api.Models/Operations/Opord.cs index 94351cfc..3cba6422 100644 --- a/UKSF.Api.Models/Operations/Opord.cs +++ b/UKSF.Api.Models/Operations/Opord.cs @@ -1,11 +1,12 @@ using System; -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Operations { - public class Opord { - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; - public string name, map, type, description; - public DateTime start, end; + public class Opord : MongoObject { + public string description; + public DateTime end; + public string map; + public string name; + public DateTime start; + public string type; } } diff --git a/UKSF.Api.Models/Operations/Oprep.cs b/UKSF.Api.Models/Operations/Oprep.cs index 207bd498..5eda8ac1 100644 --- a/UKSF.Api.Models/Operations/Oprep.cs +++ b/UKSF.Api.Models/Operations/Oprep.cs @@ -1,13 +1,15 @@ using System; -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; using UKSF.Api.Models.Personnel; namespace UKSF.Api.Models.Operations { - public class Oprep { + public class Oprep : MongoObject { public AttendanceReport attendanceReport; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; - public string name, map, type, result, description; - public DateTime start, end; + public string description; + public DateTime end; + public string map; + public string name; + public string result; + public DateTime start; + public string type; } } diff --git a/UKSF.Api.Models/Personnel/Account.cs b/UKSF.Api.Models/Personnel/Account.cs index 4553614a..308f4361 100644 --- a/UKSF.Api.Models/Personnel/Account.cs +++ b/UKSF.Api.Models/Personnel/Account.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Personnel { - public class Account { + public class Account : MongoObject { public Application application; public string armaExperience; public bool aviation; @@ -13,7 +11,6 @@ public class Account { public DateTime dob; public string email; public string firstname; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public string lastname; public MembershipState membershipState = MembershipState.UNCONFIRMED; public bool militaryExperience; diff --git a/UKSF.Api.Models/Personnel/Discharge.cs b/UKSF.Api.Models/Personnel/Discharge.cs index df1a9a85..443f49ce 100644 --- a/UKSF.Api.Models/Personnel/Discharge.cs +++ b/UKSF.Api.Models/Personnel/Discharge.cs @@ -4,18 +4,16 @@ using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Personnel { - public class DischargeCollection { + public class DischargeCollection : MongoObject { [BsonRepresentation(BsonType.ObjectId)] public string accountId; public List discharges = new List(); - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public string name; public bool reinstated; [BsonIgnore] public bool requestExists; } - public class Discharge { + public class Discharge : MongoObject { public string dischargedBy; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public string rank; public string reason; public string role; diff --git a/UKSF.Api.Models/Personnel/Loa.cs b/UKSF.Api.Models/Personnel/Loa.cs index 26b91ea8..7d333f73 100644 --- a/UKSF.Api.Models/Personnel/Loa.cs +++ b/UKSF.Api.Models/Personnel/Loa.cs @@ -9,10 +9,9 @@ public enum LoaReviewState { REJECTED } - public class Loa { + public class Loa : MongoObject { public bool emergency; public DateTime end; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public bool late; public string reason; [BsonRepresentation(BsonType.ObjectId)] public string recipient; diff --git a/UKSF.Api.Models/Personnel/Rank.cs b/UKSF.Api.Models/Personnel/Rank.cs index bbe6da25..6cab249a 100644 --- a/UKSF.Api.Models/Personnel/Rank.cs +++ b/UKSF.Api.Models/Personnel/Rank.cs @@ -1,11 +1,7 @@ -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; - -namespace UKSF.Api.Models.Personnel { - public class Rank { +namespace UKSF.Api.Models.Personnel { + public class Rank : MongoObject { public string abbreviation; public string discordRoleId; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public string name; public int order = 0; public string teamspeakGroup; diff --git a/UKSF.Api.Models/Personnel/Role.cs b/UKSF.Api.Models/Personnel/Role.cs index bb417bb1..8e48a2fe 100644 --- a/UKSF.Api.Models/Personnel/Role.cs +++ b/UKSF.Api.Models/Personnel/Role.cs @@ -1,14 +1,10 @@ -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; - -namespace UKSF.Api.Models.Personnel { +namespace UKSF.Api.Models.Personnel { public enum RoleType { INDIVIDUAL, UNIT } - public class Role { - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; + public class Role : MongoObject { public string name; public int order = 0; public RoleType roleType = RoleType.INDIVIDUAL; diff --git a/UKSF.Api.Models/Units/Unit.cs b/UKSF.Api.Models/Units/Unit.cs index fd0f1912..e62cf2e7 100644 --- a/UKSF.Api.Models/Units/Unit.cs +++ b/UKSF.Api.Models/Units/Unit.cs @@ -3,12 +3,11 @@ using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Units { - public class Unit { + public class Unit : MongoObject { public UnitBranch branch = UnitBranch.COMBAT; public string callsign; public string discordRoleId; public string icon; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; [BsonRepresentation(BsonType.ObjectId)] public List members = new List(); public string name; public int order = 0; diff --git a/UKSF.Api.Models/Utility/ConfirmationCode.cs b/UKSF.Api.Models/Utility/ConfirmationCode.cs index 9c8546cb..3eee261a 100644 --- a/UKSF.Api.Models/Utility/ConfirmationCode.cs +++ b/UKSF.Api.Models/Utility/ConfirmationCode.cs @@ -1,6 +1,4 @@ using System; -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Utility { public class ConfirmationCode : MongoObject { diff --git a/UKSF.Api.Models/Utility/ScheduledJob.cs b/UKSF.Api.Models/Utility/ScheduledJob.cs index 60ec0c52..2a67b361 100644 --- a/UKSF.Api.Models/Utility/ScheduledJob.cs +++ b/UKSF.Api.Models/Utility/ScheduledJob.cs @@ -1,6 +1,4 @@ using System; -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Utility { public enum ScheduledJobType { @@ -11,10 +9,9 @@ public enum ScheduledJobType { DISCORD_VOTE_ANNOUNCEMENT } - public class ScheduledJob { + public class ScheduledJob : MongoObject { public string action; public string actionParameters; - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; public TimeSpan interval; public DateTime next; public bool repeat; diff --git a/UKSF.Api.Models/Utility/UtilityObject.cs b/UKSF.Api.Models/Utility/UtilityObject.cs index a189c017..051b84ef 100644 --- a/UKSF.Api.Models/Utility/UtilityObject.cs +++ b/UKSF.Api.Models/Utility/UtilityObject.cs @@ -1,10 +1,7 @@ using System.Collections.Generic; -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Utility { - public class UtilityObject { - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; + public class UtilityObject : MongoObject { public Dictionary values = new Dictionary(); } } diff --git a/UKSF.Api.Services/Fake/FakeNotificationsService.cs b/UKSF.Api.Services/Fake/FakeNotificationsService.cs index 374a1640..4903baf7 100644 --- a/UKSF.Api.Services/Fake/FakeNotificationsService.cs +++ b/UKSF.Api.Services/Fake/FakeNotificationsService.cs @@ -17,8 +17,8 @@ public class FakeNotificationsService : INotificationsService { public void Add(Notification notification) { } - public Task MarkNotificationsAsRead(IEnumerable ids) => Task.CompletedTask; + public Task MarkNotificationsAsRead(List ids) => Task.CompletedTask; - public Task Delete(IEnumerable ids) => Task.CompletedTask; + public Task Delete(List ids) => Task.CompletedTask; } } diff --git a/UKSF.Api.Services/Message/NotificationsService.cs b/UKSF.Api.Services/Message/NotificationsService.cs index 425411a6..254a18cb 100644 --- a/UKSF.Api.Services/Message/NotificationsService.cs +++ b/UKSF.Api.Services/Message/NotificationsService.cs @@ -54,17 +54,18 @@ public void Add(Notification notification) { Task unused = AddNotificationAsync(notification); } - public async Task MarkNotificationsAsRead(IEnumerable ids) { - ids = ids.ToList(); + public async Task MarkNotificationsAsRead(List ids) { string contextId = sessionService.GetContextId(); - await data.UpdateMany(Builders.Filter.Eq(x => x.owner, contextId) & Builders.Filter.In(x => x.id, ids), Builders.Update.Set(x => x.read, true)); + // await data.UpdateMany(Builders.Filter.Eq(x => x.owner, contextId) & Builders.Filter.In(x => x.id, ids), Builders.Update.Set(x => x.read, true)); + await data.UpdateMany(x => x.owner == contextId && ids.Contains(x.id), Builders.Update.Set(x => x.read, true)); await notificationsHub.Clients.Group(contextId).ReceiveRead(ids); } - public async Task Delete(IEnumerable ids) { + public async Task Delete(List ids) { ids = ids.ToList(); string contextId = sessionService.GetContextId(); - await data.DeleteMany(Builders.Filter.Eq(x => x.owner, contextId) & Builders.Filter.In(x => x.id, ids)); + // await data.DeleteMany(Builders.Filter.Eq(x => x.owner, contextId) & Builders.Filter.In(x => x.id, ids)); + await data.DeleteMany(x => x.owner == contextId && ids.Contains(x.id)); await notificationsHub.Clients.Group(contextId).ReceiveClear(ids); } diff --git a/UKSF.Api/Controllers/NotificationsController.cs b/UKSF.Api/Controllers/NotificationsController.cs index 9ce7015d..7fed020c 100644 --- a/UKSF.Api/Controllers/NotificationsController.cs +++ b/UKSF.Api/Controllers/NotificationsController.cs @@ -20,7 +20,7 @@ public IActionResult Get() { [HttpPost("read"), Authorize] public async Task MarkAsRead([FromBody] JObject jObject) { - IEnumerable ids = JArray.Parse(jObject["notifications"].ToString()).Select(notification => notification["id"].ToString()); + List ids = JArray.Parse(jObject["notifications"].ToString()).Select(notification => notification["id"].ToString()).ToList(); await notificationsService.MarkNotificationsAsRead(ids); return Ok(); } @@ -28,7 +28,7 @@ public async Task MarkAsRead([FromBody] JObject jObject) { [HttpPost("clear"), Authorize] public async Task Clear([FromBody] JObject jObject) { JArray clear = JArray.Parse(jObject["clear"].ToString()); - IEnumerable ids = clear.Select(notification => notification["id"].ToString()); + List ids = clear.Select(notification => notification["id"].ToString()).ToList(); await notificationsService.Delete(ids); return Ok(); } diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 0202d47e..a9d56dce 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -276,6 +276,8 @@ private static void RegisterEventServices(this IServiceCollection services) { } private static void RegisterDataServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { + services.AddTransient(); + // Non-Cached services.AddTransient(); services.AddSingleton(); diff --git a/UKSF.Tests.Unit/Data/DataServiceTests.cs b/UKSF.Tests.Unit/Data/DataServiceTests.cs new file mode 100644 index 00000000..ead1c4ba --- /dev/null +++ b/UKSF.Tests.Unit/Data/DataServiceTests.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using FluentAssertions; +using Microsoft.Win32.TaskScheduler; +using MongoDB.Bson; +using MongoDB.Driver; +using Moq; +using UKSF.Api.Data; +using UKSF.Api.Data.Utility; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Utility; +using UKSF.Api.Services.Utility; +using Xunit; + +namespace UKSF.Tests.Unit.Data { + public class DataServiceTests { + [Fact] + public void ShouldCreateCollection() { + // Mock> mockDataService = new Mock>(); + // Mock mockMongoDatabase = new Mock(); + // Mock> mockDataEventBus = new Mock>(); + // ConfirmationCodeDataService confirmationCodeDataService = new ConfirmationCodeDataService(mockMongoDatabase.Object, mockDataEventBus.Object); + // + // List confirmationCodeData = new List(); + // + // mockMongoDatabase.Setup(x => x.GetCollection("confirmationCodes")).Returns>(confirmationCodeData); + } + } +} diff --git a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj index 12e25e5e..e87c6f73 100644 --- a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj +++ b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj @@ -16,6 +16,7 @@ + diff --git a/UKSF.Tests.Unit/UtilityTests/ConfirmationCodeServiceTests.cs b/UKSF.Tests.Unit/UtilityTests/ConfirmationCodeServiceTests.cs index ad9073df..4d0a8367 100644 --- a/UKSF.Tests.Unit/UtilityTests/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests.Unit/UtilityTests/ConfirmationCodeServiceTests.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using FluentAssertions; -using Microsoft.Extensions.Hosting; using MongoDB.Bson; using Moq; using UKSF.Api.Interfaces.Data; @@ -13,14 +13,14 @@ namespace UKSF.Tests.Unit.UtilityTests { public class ConfirmationCodeServiceTests { - [Fact] public async Task ShouldReturnCodeId() { Mock mockConfirmationCodeDataService = new Mock(); Mock mockSchedulerService = new Mock(); ConfirmationCodeService confirmationCodeService = new ConfirmationCodeService(mockConfirmationCodeDataService.Object, mockSchedulerService.Object); - + mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); string id = await confirmationCodeService.CreateConfirmationCode("test"); @@ -28,5 +28,26 @@ public async Task ShouldReturnCodeId() { id.Should().HaveLength(24); ObjectId.TryParse(id, out ObjectId _).Should().BeTrue(); } + + [Fact] + public async Task ShouldReturnCodeValue() { + Mock mockConfirmationCodeDataService = new Mock(); + Mock mockSchedulerService = new Mock(); + ConfirmationCodeService confirmationCodeService = new ConfirmationCodeService(mockConfirmationCodeDataService.Object, mockSchedulerService.Object); + + List confirmationCodeData = new List(); + + mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.Add(x)); + mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(() => confirmationCodeData.First()); + mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.RemoveAll(y => y.id == x)); + + mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns(Task.CompletedTask); + + string id = await confirmationCodeService.CreateConfirmationCode("test"); + string subject = await confirmationCodeService.GetConfirmationCode(id); + + subject.Should().Be("test"); + } } } From 754a05a9ac6b56a6051cc106d1823ab62ed0ddc2 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 1 Feb 2020 21:31:46 +0000 Subject: [PATCH 087/369] Move utility classes to UKSF.Common package. More tests --- UKSF.Api.Data/Admin/VariablesDataService.cs | 2 +- UKSF.Api.Data/DataCollection.cs | 8 +- UKSF.Api.Data/DataService.cs | 2 +- .../Message/Logging/BasicLogMessage.cs | 5 +- UKSF.Api.Models/MongoObject.cs | 4 +- UKSF.Api.Services/Admin/MigrationUtility.cs | 1 + UKSF.Api.Services/Admin/VariablesService.cs | 2 +- UKSF.Api.Services/Admin/VariablesWrapper.cs | 1 + UKSF.Api.Services/Common/AccountUtilities.cs | 12 ++ .../DisplayNameUtilities.cs} | 25 +-- .../{ => Common}/ServiceWrapper.cs | 2 +- UKSF.Api.Services/Game/GameServerHelpers.cs | 2 +- UKSF.Api.Services/Game/GameServersService.cs | 6 +- .../Game/Missions/MissionPatchingService.cs | 2 +- .../Game/Missions/MissionService.cs | 2 +- .../Teamspeak/TeamspeakGroupService.cs | 2 +- .../Teamspeak/TeamspeakManagerService.cs | 4 +- UKSF.Api.Services/Message/LogWrapper.cs | 1 + UKSF.Api.Services/Message/LoggingService.cs | 2 +- .../Message/NotificationsService.cs | 2 +- .../Personnel/RecruitmentService.cs | 2 +- UKSF.Api.Services/UKSF.Api.Services.csproj | 1 + .../Utility/SchedulerActionHelper.cs | 1 + UKSF.Api.Services/Utility/Utilities.cs | 35 ---- UKSF.Api.sln | 14 ++ .../Accounts/AccountsController.cs | 7 +- .../Accounts/CommunicationsController.cs | 2 +- .../Controllers/ApplicationsController.cs | 2 +- UKSF.Api/Controllers/GameServersController.cs | 2 +- UKSF.Api/Controllers/VariablesController.cs | 2 +- UKSF.Api/Startup.cs | 2 +- .../ChangeUtilities.cs | 4 +- UKSF.Common/DateUtilities.cs | 22 +++ UKSF.Common/JsonUtilities.cs | 33 ++++ .../ProcessUtilities.cs | 4 +- UKSF.Common/StringUtilities.cs | 26 +++ .../Utility => UKSF.Common}/TaskUtilities.cs | 2 +- UKSF.Common/UKSF.Common.csproj | 19 ++ UKSF.Integrations/Startup.cs | 2 +- UKSF.Tests.Unit/Common/DateUtilitiesTests.cs | 27 +++ UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs | 45 +++++ .../Common/StringUtilitiesTests.cs | 71 +++++++ UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs | 29 +++ .../Data/CachedDataServiceTests.cs | 14 ++ UKSF.Tests.Unit/Data/DataServiceTests.cs | 185 ++++++++++++++++-- UKSF.Tests.Unit/Data/IMockDataService.cs | 7 + UKSF.Tests.Unit/Data/MockDataService.cs | 9 + UKSF.Tests.Unit/MockComplexDataModel.cs | 9 + UKSF.Tests.Unit/MockDataModel.cs | 11 ++ UKSF.Tests.Unit/MockPrivateDataModel.cs | 17 ++ .../AccountSettingsTests.cs | 2 +- .../Common}/UtilitiesTests.cs | 23 +-- .../ConfirmationCodeServiceTests.cs | 2 +- UKSF.Tests.Unit/UKSF.Tests.Unit.csproj | 1 + 54 files changed, 586 insertions(+), 135 deletions(-) create mode 100644 UKSF.Api.Services/Common/AccountUtilities.cs rename UKSF.Api.Services/{Utility/StringUtilities.cs => Common/DisplayNameUtilities.cs} (55%) rename UKSF.Api.Services/{ => Common}/ServiceWrapper.cs (76%) delete mode 100644 UKSF.Api.Services/Utility/Utilities.cs rename UKSF.Api.Services/Utility/ChangeHelper.cs => UKSF.Common/ChangeUtilities.cs (98%) create mode 100644 UKSF.Common/DateUtilities.cs create mode 100644 UKSF.Common/JsonUtilities.cs rename UKSF.Api.Services/Utility/ProcessHelper.cs => UKSF.Common/ProcessUtilities.cs (96%) create mode 100644 UKSF.Common/StringUtilities.cs rename {UKSF.Api.Services/Utility => UKSF.Common}/TaskUtilities.cs (90%) create mode 100644 UKSF.Common/UKSF.Common.csproj create mode 100644 UKSF.Tests.Unit/Common/DateUtilitiesTests.cs create mode 100644 UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs create mode 100644 UKSF.Tests.Unit/Common/StringUtilitiesTests.cs create mode 100644 UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs create mode 100644 UKSF.Tests.Unit/Data/CachedDataServiceTests.cs create mode 100644 UKSF.Tests.Unit/Data/IMockDataService.cs create mode 100644 UKSF.Tests.Unit/Data/MockDataService.cs create mode 100644 UKSF.Tests.Unit/MockComplexDataModel.cs create mode 100644 UKSF.Tests.Unit/MockDataModel.cs create mode 100644 UKSF.Tests.Unit/MockPrivateDataModel.cs rename UKSF.Tests.Unit/{PersonnelTests => Models}/AccountSettingsTests.cs (94%) rename UKSF.Tests.Unit/{UtilityTests => Services/Common}/UtilitiesTests.cs (70%) rename UKSF.Tests.Unit/{UtilityTests => Services}/ConfirmationCodeServiceTests.cs (98%) diff --git a/UKSF.Api.Data/Admin/VariablesDataService.cs b/UKSF.Api.Data/Admin/VariablesDataService.cs index 95a79493..f26215b9 100644 --- a/UKSF.Api.Data/Admin/VariablesDataService.cs +++ b/UKSF.Api.Data/Admin/VariablesDataService.cs @@ -6,7 +6,7 @@ using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Admin; -using UKSF.Api.Services.Utility; +using UKSF.Common; namespace UKSF.Api.Data.Admin { public class VariablesDataService : CachedDataService, IVariablesDataService { diff --git a/UKSF.Api.Data/DataCollection.cs b/UKSF.Api.Data/DataCollection.cs index 2b1ea29c..2f49b93a 100644 --- a/UKSF.Api.Data/DataCollection.cs +++ b/UKSF.Api.Data/DataCollection.cs @@ -3,17 +3,15 @@ using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; using MongoDB.Driver; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Services; namespace UKSF.Api.Data { public class DataCollection : IDataCollection { private readonly IMongoDatabase database; private string collectionName; - public DataCollection() => database = ServiceWrapper.ServiceProvider.GetService(); + public DataCollection(IMongoDatabase database) => this.database = database; public void SetCollectionName(string newCollectionName) => collectionName = newCollectionName; @@ -28,10 +26,10 @@ public void AssertCollectionExists() { public List Get(Func predicate) => GetCollection().AsQueryable().Where(predicate).ToList(); public T GetSingle(string id) { - return GetCollection().AsQueryable().FirstOrDefault(x => x.GetIdValue() == id); //Get().FirstOrDefault(x => GetIdValue(x) == id); // TODO: Async + return GetCollection().AsQueryable().FirstOrDefault(x => x.GetIdValue() == id); // TODO: Async } - public T GetSingle(Func predicate) => GetCollection().AsQueryable().FirstOrDefault(predicate); //Get().FirstOrDefault(predicate); // TODO: Async + public T GetSingle(Func predicate) => GetCollection().AsQueryable().FirstOrDefault(predicate); // TODO: Async public async Task Add(T data) { await GetCollection().InsertOneAsync(data); diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index 7423390c..fca4d54d 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -37,7 +37,7 @@ public virtual async Task Update(string id, string fieldName, object value) { DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } - public virtual async Task Update(string id, UpdateDefinition update) { + public virtual async Task Update(string id, UpdateDefinition update) { // TODO: Remove strong typing to UpdateDefinition await dataCollection.Update(id, update); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } diff --git a/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs b/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs index 19466387..cb428f78 100644 --- a/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs +++ b/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs @@ -29,9 +29,6 @@ public BasicLogMessage(Exception logException) : this() { level = LogLevel.ERROR; } - private BasicLogMessage(DateTime time) { - timestamp = time; - id = ObjectId.GenerateNewId(time).ToString(); - } + private BasicLogMessage(DateTime time) : base(ObjectId.GenerateNewId(time).ToString()) => timestamp = time; } } diff --git a/UKSF.Api.Models/MongoObject.cs b/UKSF.Api.Models/MongoObject.cs index 8e36f988..697cfed2 100644 --- a/UKSF.Api.Models/MongoObject.cs +++ b/UKSF.Api.Models/MongoObject.cs @@ -5,6 +5,8 @@ namespace UKSF.Api.Models { public class MongoObject { [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; - protected MongoObject() => id = ObjectId.GenerateNewId().ToString(); + public MongoObject() => id = ObjectId.GenerateNewId().ToString(); + + public MongoObject(string id) => this.id = id; } } diff --git a/UKSF.Api.Services/Admin/MigrationUtility.cs b/UKSF.Api.Services/Admin/MigrationUtility.cs index 2368e15f..0c4858e0 100644 --- a/UKSF.Api.Services/Admin/MigrationUtility.cs +++ b/UKSF.Api.Services/Admin/MigrationUtility.cs @@ -10,6 +10,7 @@ using UKSF.Api.Interfaces.Units; using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Units; +using UKSF.Api.Services.Common; using UKSF.Api.Services.Message; namespace UKSF.Api.Services.Admin { diff --git a/UKSF.Api.Services/Admin/VariablesService.cs b/UKSF.Api.Services/Admin/VariablesService.cs index d0bf52c6..0739fbdf 100644 --- a/UKSF.Api.Services/Admin/VariablesService.cs +++ b/UKSF.Api.Services/Admin/VariablesService.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text.RegularExpressions; using UKSF.Api.Models.Admin; -using UKSF.Api.Services.Utility; +using UKSF.Common; namespace UKSF.Api.Services.Admin { public static class VariablesService { diff --git a/UKSF.Api.Services/Admin/VariablesWrapper.cs b/UKSF.Api.Services/Admin/VariablesWrapper.cs index 1e567cb6..58edbfae 100644 --- a/UKSF.Api.Services/Admin/VariablesWrapper.cs +++ b/UKSF.Api.Services/Admin/VariablesWrapper.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Services.Common; namespace UKSF.Api.Services.Admin { public static class VariablesWrapper { diff --git a/UKSF.Api.Services/Common/AccountUtilities.cs b/UKSF.Api.Services/Common/AccountUtilities.cs new file mode 100644 index 00000000..d3c0c92a --- /dev/null +++ b/UKSF.Api.Services/Common/AccountUtilities.cs @@ -0,0 +1,12 @@ +using UKSF.Api.Models.Personnel; +using UKSF.Common; + +namespace UKSF.Api.Services.Common { + public static class AccountUtilities { + public static ExtendedAccount ToExtendedAccount(this Account account) { + ExtendedAccount extendedAccount = account.Copy(); + extendedAccount.password = null; + return extendedAccount; + } + } +} diff --git a/UKSF.Api.Services/Utility/StringUtilities.cs b/UKSF.Api.Services/Common/DisplayNameUtilities.cs similarity index 55% rename from UKSF.Api.Services/Utility/StringUtilities.cs rename to UKSF.Api.Services/Common/DisplayNameUtilities.cs index 34da6983..35482864 100644 --- a/UKSF.Api.Services/Utility/StringUtilities.cs +++ b/UKSF.Api.Services/Common/DisplayNameUtilities.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Globalization; using System.Linq; using System.Text.RegularExpressions; using Microsoft.Extensions.DependencyInjection; @@ -8,28 +7,8 @@ using UKSF.Api.Interfaces.Units; using UKSF.Api.Models.Units; -namespace UKSF.Api.Services.Utility { - public static class StringUtilities { - public static double ToDouble(this string text) => double.Parse(text); - - public static string ToTitleCase(string text) => CultureInfo.CurrentCulture.TextInfo.ToTitleCase(text); - - public static string Keyify(this string key) => key.ToUpper().Replace(" ", "_"); - - public static string RemoveSpaces(this string item) => item.Replace(" ", string.Empty); - - public static string RemoveNewLines(this string item) => item.Replace("\\n", string.Empty); - - public static string RemoveQuotes(this string item) => item.Replace("\"", string.Empty); - - public static bool ContainsCaseInsensitive(this string text, string element) => text.ToUpper().Contains(element.ToUpper()); - - public static string RemoveEmbeddedQuotes(this string item) { - Match match = new Regex("(\\\".*).+(.*?\\\")").Match(item); - item = item.Remove(match.Index, match.Length).Insert(match.Index, match.ToString().Replace("\"\"", "'")); - return Regex.Replace(item, "\\\"\\s+\\\"", string.Empty); - } - +namespace UKSF.Api.Services.Common { + public static class DisplayNameUtilities { public static string ConvertObjectIds(this string message) { string newMessage = message; if (!string.IsNullOrEmpty(message)) { diff --git a/UKSF.Api.Services/ServiceWrapper.cs b/UKSF.Api.Services/Common/ServiceWrapper.cs similarity index 76% rename from UKSF.Api.Services/ServiceWrapper.cs rename to UKSF.Api.Services/Common/ServiceWrapper.cs index e7a36bbd..91a13286 100644 --- a/UKSF.Api.Services/ServiceWrapper.cs +++ b/UKSF.Api.Services/Common/ServiceWrapper.cs @@ -1,6 +1,6 @@ using System; -namespace UKSF.Api.Services { +namespace UKSF.Api.Services.Common { public static class ServiceWrapper { public static IServiceProvider ServiceProvider; } diff --git a/UKSF.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.Services/Game/GameServerHelpers.cs index 93f0ed04..5a343d90 100644 --- a/UKSF.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.Services/Game/GameServerHelpers.cs @@ -6,7 +6,7 @@ using UKSF.Api.Models.Game; using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; -using UKSF.Api.Services.Utility; +using UKSF.Common; namespace UKSF.Api.Services.Game { public static class GameServerHelpers { diff --git a/UKSF.Api.Services/Game/GameServersService.cs b/UKSF.Api.Services/Game/GameServersService.cs index b016fa39..90da52a1 100644 --- a/UKSF.Api.Services/Game/GameServersService.cs +++ b/UKSF.Api.Services/Game/GameServersService.cs @@ -12,7 +12,7 @@ using UKSF.Api.Interfaces.Game; using UKSF.Api.Models.Game; using UKSF.Api.Models.Mission; -using UKSF.Api.Services.Utility; +using UKSF.Common; namespace UKSF.Api.Services.Game { public class GameServersService : IGameServersService { @@ -76,7 +76,7 @@ public async Task PatchMissionFile(string missionName) { public async Task LaunchGameServer(GameServer gameServer) { string launchArguments = gameServer.FormatGameServerLaunchArguments(); - gameServer.processId = ProcessHelper.LaunchManagedProcess(GameServerHelpers.GetGameServerExecutablePath(), launchArguments); + gameServer.processId = ProcessUtilities.LaunchManagedProcess(GameServerHelpers.GetGameServerExecutablePath(), launchArguments); await Task.Delay(TimeSpan.FromSeconds(1)); @@ -84,7 +84,7 @@ public async Task LaunchGameServer(GameServer gameServer) { if (gameServer.numberHeadlessClients > 0) { for (int index = 0; index < gameServer.numberHeadlessClients; index++) { launchArguments = gameServer.FormatHeadlessClientLaunchArguments(index); - gameServer.headlessClientProcessIds.Add(ProcessHelper.LaunchManagedProcess(GameServerHelpers.GetGameServerExecutablePath(), launchArguments)); + gameServer.headlessClientProcessIds.Add(ProcessUtilities.LaunchManagedProcess(GameServerHelpers.GetGameServerExecutablePath(), launchArguments)); await Task.Delay(TimeSpan.FromSeconds(1)); } diff --git a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs index b4f7c220..8fe2a33c 100644 --- a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs @@ -9,7 +9,7 @@ using UKSF.Api.Models.Mission; using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; -using UKSF.Api.Services.Utility; +using UKSF.Common; namespace UKSF.Api.Services.Game.Missions { public class MissionPatchingService : IMissionPatchingService { diff --git a/UKSF.Api.Services/Game/Missions/MissionService.cs b/UKSF.Api.Services/Game/Missions/MissionService.cs index 322bb30f..2075942d 100644 --- a/UKSF.Api.Services/Game/Missions/MissionService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionService.cs @@ -5,7 +5,7 @@ using System.Linq; using UKSF.Api.Models.Mission; using UKSF.Api.Services.Admin; -using UKSF.Api.Services.Utility; +using UKSF.Common; namespace UKSF.Api.Services.Game.Missions { public class MissionService { diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs index 407fef83..805e8428 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs @@ -8,7 +8,7 @@ using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Units; using UKSF.Api.Services.Admin; -using UKSF.Api.Services.Utility; +using UKSF.Common; namespace UKSF.Api.Services.Integrations.Teamspeak { public class TeamspeakGroupService : ITeamspeakGroupService { diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs index d1132c97..d718d157 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs @@ -8,8 +8,8 @@ using UKSF.Api.Interfaces.Integrations.Teamspeak; using UKSF.Api.Models.Integrations; using UKSF.Api.Services.Admin; -using UKSF.Api.Services.Utility; using UKSF.Api.Signalr.Hubs.Integrations; +using UKSF.Common; namespace UKSF.Api.Services.Integrations.Teamspeak { public class TeamspeakManagerService : ITeamspeakManagerService { @@ -55,7 +55,7 @@ private async void KeepOnline() { } private static async Task LaunchTeamspeak() { - await ProcessHelper.LaunchExternalProcess("Teamspeak", $"start \"\" \"{VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_PATH").AsString()}\""); + await ProcessUtilities.LaunchExternalProcess("Teamspeak", $"start \"\" \"{VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_PATH").AsString()}\""); } private async Task ShutTeamspeak() { diff --git a/UKSF.Api.Services/Message/LogWrapper.cs b/UKSF.Api.Services/Message/LogWrapper.cs index 742ce102..e6d69811 100644 --- a/UKSF.Api.Services/Message/LogWrapper.cs +++ b/UKSF.Api.Services/Message/LogWrapper.cs @@ -2,6 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Interfaces.Message; using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Services.Common; namespace UKSF.Api.Services.Message { public static class LogWrapper { diff --git a/UKSF.Api.Services/Message/LoggingService.cs b/UKSF.Api.Services/Message/LoggingService.cs index 53e8a135..95a9f6cc 100644 --- a/UKSF.Api.Services/Message/LoggingService.cs +++ b/UKSF.Api.Services/Message/LoggingService.cs @@ -4,7 +4,7 @@ using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Models.Message.Logging; -using UKSF.Api.Services.Utility; +using UKSF.Api.Services.Common; namespace UKSF.Api.Services.Message { public class LoggingService : ILoggingService { diff --git a/UKSF.Api.Services/Message/NotificationsService.cs b/UKSF.Api.Services/Message/NotificationsService.cs index 254a18cb..7bdb7956 100644 --- a/UKSF.Api.Services/Message/NotificationsService.cs +++ b/UKSF.Api.Services/Message/NotificationsService.cs @@ -11,7 +11,7 @@ using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Message; using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Utility; +using UKSF.Api.Services.Common; using UKSF.Api.Signalr.Hubs.Message; namespace UKSF.Api.Services.Message { diff --git a/UKSF.Api.Services/Personnel/RecruitmentService.cs b/UKSF.Api.Services/Personnel/RecruitmentService.cs index 63c33a82..9d78eb8a 100644 --- a/UKSF.Api.Services/Personnel/RecruitmentService.cs +++ b/UKSF.Api.Services/Personnel/RecruitmentService.cs @@ -11,7 +11,7 @@ using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Units; -using UKSF.Api.Services.Utility; +using UKSF.Common; namespace UKSF.Api.Services.Personnel { public class RecruitmentService : IRecruitmentService { diff --git a/UKSF.Api.Services/UKSF.Api.Services.csproj b/UKSF.Api.Services/UKSF.Api.Services.csproj index e96751c8..7312846a 100644 --- a/UKSF.Api.Services/UKSF.Api.Services.csproj +++ b/UKSF.Api.Services/UKSF.Api.Services.csproj @@ -28,5 +28,6 @@ + diff --git a/UKSF.Api.Services/Utility/SchedulerActionHelper.cs b/UKSF.Api.Services/Utility/SchedulerActionHelper.cs index f7bba917..afc53941 100644 --- a/UKSF.Api.Services/Utility/SchedulerActionHelper.cs +++ b/UKSF.Api.Services/Utility/SchedulerActionHelper.cs @@ -7,6 +7,7 @@ using UKSF.Api.Models.Message; using UKSF.Api.Models.Message.Logging; using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Common; namespace UKSF.Api.Services.Utility { public static class SchedulerActionHelper { diff --git a/UKSF.Api.Services/Utility/Utilities.cs b/UKSF.Api.Services/Utility/Utilities.cs deleted file mode 100644 index e30bf683..00000000 --- a/UKSF.Api.Services/Utility/Utilities.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using Newtonsoft.Json; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Services.Utility { - public static class Utilities { - private static TOut Copy(this object source) { - JsonSerializerSettings deserializeSettings = new JsonSerializerSettings {ObjectCreationHandling = ObjectCreationHandling.Replace}; - return JsonConvert.DeserializeObject(JsonConvert.SerializeObject(source), deserializeSettings); - } - - public static ExtendedAccount ToExtendedAccount(this Account account) { - ExtendedAccount extendedAccount = account.Copy(); - extendedAccount.password = null; - return extendedAccount; - } - - public static (int years, int months) ToAge(this DateTime dob, DateTime? date = null) { - DateTime today = date ?? DateTime.Today; - int months = today.Month - dob.Month; - int years = today.Year - dob.Year; - - if (today.Day < dob.Day) { - months--; - } - - if (months < 0) { - years--; - months += 12; - } - - return (years, months); - } - } -} diff --git a/UKSF.Api.sln b/UKSF.Api.sln index a6482ef1..94a0dc2e 100644 --- a/UKSF.Api.sln +++ b/UKSF.Api.sln @@ -28,6 +28,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.PostMessage", "UKSF.Po EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Tests.Unit", "UKSF.Tests.Unit\UKSF.Tests.Unit.csproj", "{09946FE7-A65D-483E-8B5A-ADE729760375}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Common", "UKSF.Common\UKSF.Common.csproj", "{9FB41E01-8AD4-4110-8AEE-97800CF565E8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -158,6 +160,18 @@ Global {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|x64.Build.0 = Release|Any CPU {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|x86.ActiveCfg = Release|Any CPU {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|x86.Build.0 = Release|Any CPU + {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|x64.ActiveCfg = Debug|Any CPU + {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|x64.Build.0 = Debug|Any CPU + {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|x86.ActiveCfg = Debug|Any CPU + {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|x86.Build.0 = Debug|Any CPU + {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|Any CPU.Build.0 = Release|Any CPU + {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x64.ActiveCfg = Release|Any CPU + {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x64.Build.0 = Release|Any CPU + {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x86.ActiveCfg = Release|Any CPU + {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UKSF.Api/Controllers/Accounts/AccountsController.cs b/UKSF.Api/Controllers/Accounts/AccountsController.cs index 266d6db0..1cb6cdab 100644 --- a/UKSF.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSF.Api/Controllers/Accounts/AccountsController.cs @@ -15,9 +15,10 @@ using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Integrations; using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Common; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; -using UKSF.Api.Services.Utility; +using UKSF.Common; namespace UKSF.Api.Controllers.Accounts { [Route("[controller]")] @@ -79,8 +80,8 @@ public async Task Put([FromBody] JObject body) { Account account = new Account { email = email, password = BCrypt.Net.BCrypt.HashPassword(body["password"].ToString()), - firstname = StringUtilities.ToTitleCase(body["firstname"].ToString()), - lastname = StringUtilities.ToTitleCase(body["lastname"].ToString()), + firstname = body["firstname"].ToString().ToTitleCase(), + lastname = body["lastname"].ToString().ToTitleCase(), dob = DateTime.ParseExact($"{body["dobGroup"]["year"]}-{body["dobGroup"]["month"]}-{body["dobGroup"]["day"]}", "yyyy-M-d", CultureInfo.InvariantCulture), nation = body["nation"].ToString(), membershipState = MembershipState.UNCONFIRMED diff --git a/UKSF.Api/Controllers/Accounts/CommunicationsController.cs b/UKSF.Api/Controllers/Accounts/CommunicationsController.cs index ce57cbc6..fdb331af 100644 --- a/UKSF.Api/Controllers/Accounts/CommunicationsController.cs +++ b/UKSF.Api/Controllers/Accounts/CommunicationsController.cs @@ -10,7 +10,7 @@ using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Personnel; using UKSF.Api.Services.Message; -using UKSF.Api.Services.Utility; +using UKSF.Common; namespace UKSF.Api.Controllers.Accounts { [Route("[controller]")] diff --git a/UKSF.Api/Controllers/ApplicationsController.cs b/UKSF.Api/Controllers/ApplicationsController.cs index 35698182..56d4b669 100644 --- a/UKSF.Api/Controllers/ApplicationsController.cs +++ b/UKSF.Api/Controllers/ApplicationsController.cs @@ -12,7 +12,7 @@ using UKSF.Api.Models.Personnel; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; -using UKSF.Api.Services.Utility; +using UKSF.Common; namespace UKSF.Api.Controllers { [Route("[controller]")] diff --git a/UKSF.Api/Controllers/GameServersController.cs b/UKSF.Api/Controllers/GameServersController.cs index d54264b0..74b4eab2 100644 --- a/UKSF.Api/Controllers/GameServersController.cs +++ b/UKSF.Api/Controllers/GameServersController.cs @@ -17,8 +17,8 @@ using UKSF.Api.Services.Game; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; -using UKSF.Api.Services.Utility; using UKSF.Api.Signalr.Hubs.Game; +using UKSF.Common; namespace UKSF.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.NCO, RoleDefinitions.SR5, RoleDefinitions.COMMAND)] diff --git a/UKSF.Api/Controllers/VariablesController.cs b/UKSF.Api/Controllers/VariablesController.cs index 39d31b75..d92fde28 100644 --- a/UKSF.Api/Controllers/VariablesController.cs +++ b/UKSF.Api/Controllers/VariablesController.cs @@ -6,7 +6,7 @@ using UKSF.Api.Models.Admin; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; -using UKSF.Api.Services.Utility; +using UKSF.Common; namespace UKSF.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.ADMIN)] diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index a9d56dce..0d443da3 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -43,9 +43,9 @@ using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Services; using UKSF.Api.Services.Admin; using UKSF.Api.Services.Command; +using UKSF.Api.Services.Common; using UKSF.Api.Services.Fake; using UKSF.Api.Services.Game; using UKSF.Api.Services.Game.Missions; diff --git a/UKSF.Api.Services/Utility/ChangeHelper.cs b/UKSF.Common/ChangeUtilities.cs similarity index 98% rename from UKSF.Api.Services/Utility/ChangeHelper.cs rename to UKSF.Common/ChangeUtilities.cs index 4f0ed0fb..d95b38f6 100644 --- a/UKSF.Api.Services/Utility/ChangeHelper.cs +++ b/UKSF.Common/ChangeUtilities.cs @@ -5,8 +5,8 @@ using MongoDB.Bson.Serialization.Attributes; using Newtonsoft.Json.Linq; -namespace UKSF.Api.Services.Utility { - public static class ChangeHelper { +namespace UKSF.Common { + public static class ChangeUtilities { public static string Changes(this T original, T updated) { List fields = typeof(T).GetFields(BindingFlags.Public | BindingFlags.Instance).Where(x => !x.IsDefined(typeof(BsonIgnoreAttribute))).ToList(); IEnumerable changes = FindChanges(JToken.FromObject(original), JToken.FromObject(updated), fields); diff --git a/UKSF.Common/DateUtilities.cs b/UKSF.Common/DateUtilities.cs new file mode 100644 index 00000000..d516ebb1 --- /dev/null +++ b/UKSF.Common/DateUtilities.cs @@ -0,0 +1,22 @@ +using System; + +namespace UKSF.Common { + public static class DateUtilities { + public static (int years, int months) ToAge(this DateTime dob, DateTime? date = null) { + DateTime today = date ?? DateTime.Today; + int months = today.Month - dob.Month; + int years = today.Year - dob.Year; + + if (today.Day < dob.Day) { + months--; + } + + if (months < 0) { + years--; + months += 12; + } + + return (years, months); + } + } +} diff --git a/UKSF.Common/JsonUtilities.cs b/UKSF.Common/JsonUtilities.cs new file mode 100644 index 00000000..93fd2233 --- /dev/null +++ b/UKSF.Common/JsonUtilities.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; + +namespace UKSF.Common { + public static class JsonUtilities { + public static string DeepJsonSerializeObject(this object data) => JsonConvert.SerializeObject(data, new JsonSerializerSettings {ContractResolver = new AllFieldsContractResolver()}); + + public static T Copy(this object source) { + JsonSerializerSettings deserializeSettings = new JsonSerializerSettings {ObjectCreationHandling = ObjectCreationHandling.Replace}; + return JsonConvert.DeserializeObject(JsonConvert.SerializeObject(source), deserializeSettings); + } + + private class AllFieldsContractResolver : DefaultContractResolver { + protected override IList CreateProperties(Type type, MemberSerialization memberSerialization) { + List jsonProperties = type.GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance) + .Select(x => base.CreateProperty(x, memberSerialization)) + .Union(type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance).Select(x => base.CreateProperty(x, memberSerialization))) + .ToList(); + jsonProperties.ForEach( + x => { + x.Writable = true; + x.Readable = true; + } + ); + return jsonProperties; + } + } + } +} diff --git a/UKSF.Api.Services/Utility/ProcessHelper.cs b/UKSF.Common/ProcessUtilities.cs similarity index 96% rename from UKSF.Api.Services/Utility/ProcessHelper.cs rename to UKSF.Common/ProcessUtilities.cs index e32740b5..ac532335 100644 --- a/UKSF.Api.Services/Utility/ProcessHelper.cs +++ b/UKSF.Common/ProcessUtilities.cs @@ -4,8 +4,8 @@ using Microsoft.Win32.TaskScheduler; using Task = System.Threading.Tasks.Task; -namespace UKSF.Api.Services.Utility { - public static class ProcessHelper { +namespace UKSF.Common { + public static class ProcessUtilities { private const int SC_CLOSE = 0xF060; private const int WM_SYSCOMMAND = 0x0112; diff --git a/UKSF.Common/StringUtilities.cs b/UKSF.Common/StringUtilities.cs new file mode 100644 index 00000000..c203ca97 --- /dev/null +++ b/UKSF.Common/StringUtilities.cs @@ -0,0 +1,26 @@ +using System.Globalization; +using System.Text.RegularExpressions; + +namespace UKSF.Common { + public static class StringUtilities { + public static bool ContainsCaseInsensitive(this string text, string searchElement) => !string.IsNullOrEmpty(text) && !string.IsNullOrEmpty(searchElement) && text.ToUpper().Contains(searchElement.ToUpper()); + + public static double ToDouble(this string text) => double.TryParse(text, out double number) ? number : 0d; + + public static string ToTitleCase(this string text) => CultureInfo.CurrentCulture.TextInfo.ToTitleCase(text); + + public static string Keyify(this string key) => key.Trim().ToUpper().Replace(" ", "_"); + + public static string RemoveSpaces(this string item) => item.Replace(" ", string.Empty); + + public static string RemoveNewLines(this string item) => item.Replace("\\n", string.Empty); + + public static string RemoveQuotes(this string item) => item.Replace("\"", string.Empty); + + public static string RemoveEmbeddedQuotes(this string item) { + Match match = new Regex("(\\\".*).+(.*?\\\")").Match(item); + item = item.Remove(match.Index, match.Length).Insert(match.Index, match.ToString().Replace("\"\"", "'")); + return Regex.Replace(item, "\\\"\\s+\\\"", string.Empty); + } + } +} diff --git a/UKSF.Api.Services/Utility/TaskUtilities.cs b/UKSF.Common/TaskUtilities.cs similarity index 90% rename from UKSF.Api.Services/Utility/TaskUtilities.cs rename to UKSF.Common/TaskUtilities.cs index a83a3ee1..3a0f5898 100644 --- a/UKSF.Api.Services/Utility/TaskUtilities.cs +++ b/UKSF.Common/TaskUtilities.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; -namespace UKSF.Api.Services.Utility { +namespace UKSF.Common { public static class TaskUtilities { public static async Task Delay(TimeSpan timeSpan, CancellationToken token) { try { diff --git a/UKSF.Common/UKSF.Common.csproj b/UKSF.Common/UKSF.Common.csproj new file mode 100644 index 00000000..68d7b2da --- /dev/null +++ b/UKSF.Common/UKSF.Common.csproj @@ -0,0 +1,19 @@ + + + + netcoreapp3.1 + + + + + + + + + + + C:\Windows\Microsoft.NET\assembly\GAC_MSIL\System.Management\v4.0_4.0.0.0__b03f5f7f11d50a3a\System.Management.dll + + + + diff --git a/UKSF.Integrations/Startup.cs b/UKSF.Integrations/Startup.cs index 39e83103..1353d0b6 100644 --- a/UKSF.Integrations/Startup.cs +++ b/UKSF.Integrations/Startup.cs @@ -18,7 +18,7 @@ using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Services; +using UKSF.Api.Services.Common; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; using UKSF.Api.Services.Utility; diff --git a/UKSF.Tests.Unit/Common/DateUtilitiesTests.cs b/UKSF.Tests.Unit/Common/DateUtilitiesTests.cs new file mode 100644 index 00000000..cb4ccf7e --- /dev/null +++ b/UKSF.Tests.Unit/Common/DateUtilitiesTests.cs @@ -0,0 +1,27 @@ +using System; +using FluentAssertions; +using UKSF.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Common { + public class DateUtilitiesTests { + [Theory, InlineData(25, 4, 25, 4), InlineData(25, 13, 26, 1)] + public void ShouldGiveCorrectAge(int years, int months, int expectedYears, int expectedMonths) { + DateTime dob = DateTime.Today.AddYears(-years).AddMonths(-months); + + (int subjectYears, int subjectMonths) = dob.ToAge(); + + subjectYears.Should().Be(expectedYears); + subjectMonths.Should().Be(expectedMonths); + } + + [Fact] + public void ShouldGiveCorrectMonths() { + DateTime dob = new DateTime(2019, 1, 20); + + (int _, int subjectMonths) = dob.ToAge(new DateTime(2020, 1, 16)); + + subjectMonths.Should().Be(11); + } + } +} diff --git a/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs b/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs new file mode 100644 index 00000000..be54d8a2 --- /dev/null +++ b/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using FluentAssertions; +using MongoDB.Bson; +using UKSF.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Common { + public class JsonUtilitiesTests { + [Fact] + public void ShouldCopyComplexObject() { + MockDataModel mockDataModel1 = new MockDataModel {Name = "1"}; + MockDataModel mockDataModel2 = new MockDataModel {Name = "2"}; + MockDataModel mockDataModel3 = new MockDataModel {Name = "3"}; + MockComplexDataModel mockComplexDataModel = new MockComplexDataModel {Name = "Test", Data = mockDataModel1, List = new List {"a", "b", "c"}, DataList = new List {mockDataModel1, mockDataModel2, mockDataModel3}}; + + MockComplexDataModel subject = mockComplexDataModel.Copy(); + + subject.id.Should().Be(mockComplexDataModel.id); + subject.Name.Should().Be(mockComplexDataModel.Name); + subject.Data.Should().NotBe(mockDataModel1); + subject.List.Should().HaveCount(3).And.Contain(new List {"a", "b", "c"}); + subject.DataList.Should().HaveCount(3).And.NotContain(new List {mockDataModel1, mockDataModel2, mockDataModel3}); + } + + [Fact] + public void ShouldCopyObject() { + MockDataModel mockDataModel = new MockDataModel {Name = "Test"}; + + MockDataModel subject = mockDataModel.Copy(); + + subject.id.Should().Be(mockDataModel.id); + subject.Name.Should().Be(mockDataModel.Name); + } + + [Fact] + public void ShouldSerializePrivateFields() { + MockPrivateDataModel mockPrivateDataModel = new MockPrivateDataModel("5e35dafaed582b5a4cec346e", "A thing", 4, DateTime.Parse("16/01/1996")) { Name = "Charlie"}; + + string subject = mockPrivateDataModel.DeepJsonSerializeObject(); + + subject.Should().Be("{\"count\":4,\"description\":\"A thing\",\"timestamp\":\"1996-01-16T00:00:00\",\"Name\":\"Charlie\",\"id\":\"5e35dafaed582b5a4cec346e\"}"); + } + } +} diff --git a/UKSF.Tests.Unit/Common/StringUtilitiesTests.cs b/UKSF.Tests.Unit/Common/StringUtilitiesTests.cs new file mode 100644 index 00000000..c3b7b0ad --- /dev/null +++ b/UKSF.Tests.Unit/Common/StringUtilitiesTests.cs @@ -0,0 +1,71 @@ +using System; +using FluentAssertions; +using UKSF.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Common { + public class StringUtilitiesTests { + [Theory, InlineData("", "", false), InlineData("", "hello", false), InlineData("hello world hello world", "hello", true), InlineData("hello", "HELLO", true), InlineData("hello world", "HELLOWORLD", false)] + public void ShouldNotCompareCase(string text, string searchElement, bool expected) { + bool subject = text.ContainsCaseInsensitive(searchElement); + + subject.Should().Be(expected); + } + + [Theory, InlineData(""), InlineData("2"), InlineData("1E+309"), InlineData("-1E+309")] // E+309 is one more than double max/min + public void ShouldNotThrowException(string text) { + Action act = () => text.ToDouble(); + + act.Should().NotThrow(); + } + + [Theory, InlineData("", 0), InlineData("2", 2), InlineData("1.79769313486232E+307", 1.79769313486232E+307d), InlineData("-1.79769313486232E+307", -1.79769313486232E+307d)] // E+307 is one less than double max/min + public void ShouldParseDoubleCorrectly(string text, double expected) { + double subject = text.ToDouble(); + + subject.Should().Be(expected); + } + + [Theory, InlineData("", ""), InlineData("hello", "Hello"), InlineData("hi there my name is bob", "Hi There My Name Is Bob"), InlineData("HELLO BOB", "HELLO BOB")] + public void ShouldConvertToTitleCase(string text, string expected) { + string subject = text.ToTitleCase(); + + subject.Should().Be(expected); + } + + [Theory, InlineData("", ""), InlineData("hello world", "HELLO_WORLD"), InlineData("HELLO_WORLD", "HELLO_WORLD"), InlineData(" i am key ", "I_AM_KEY")] + public void ShouldConvertToKey(string text, string expected) { + string subject = text.Keyify(); + + subject.Should().Be(expected); + } + + [Theory, InlineData("", ""), InlineData("hello world hello world", "helloworldhelloworld"), InlineData("hello", "hello"), InlineData(" hello world ", "helloworld")] + public void ShouldRemoveSpaces(string text, string expected) { + string subject = text.RemoveSpaces(); + + subject.Should().Be(expected); + } + + [Theory, InlineData("", ""), InlineData("hello\\nworld\\n\\nhello world", "helloworldhello world"), InlineData("hello\\n", "hello"), InlineData("\\n hello world \\n", " hello world ")] + public void ShouldRemoveNewLines(string text, string expected) { + string subject = text.RemoveNewLines(); + + subject.Should().Be(expected); + } + + [Theory, InlineData("", ""), InlineData("\"helloworld\" \"hello world\"", "helloworld hello world"), InlineData("hello\"\"", "hello"), InlineData("\" hello world \"", " hello world ")] + public void ShouldRemoveQuotes(string text, string expected) { + string subject = text.RemoveQuotes(); + + subject.Should().Be(expected); + } + + [Theory, InlineData("", ""), InlineData("\"hello \"\"test\"\" world\"", "\"hello 'test' world\""), InlineData("\"hello \" \"test\"\" world\"", "\"hello test' world\""), InlineData("\"\"\"\"", "''")] + public void ShouldRemoveEmbeddedQuotes(string text, string expected) { + string subject = text.RemoveEmbeddedQuotes(); + + subject.Should().Be(expected); + } + } +} diff --git a/UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs b/UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs new file mode 100644 index 00000000..acebb258 --- /dev/null +++ b/UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs @@ -0,0 +1,29 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using FluentAssertions; +using UKSF.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Common { + public class TaskUtilitiesTests { + [Fact] + public void ShouldDelay() { + CancellationTokenSource token = new CancellationTokenSource(); + Action act = async () => await TaskUtilities.Delay(TimeSpan.FromMilliseconds(10), token.Token); + + act.ExecutionTime().Should().BeLessOrEqualTo(TimeSpan.FromMilliseconds(10)); + } + + [Fact] + public void ShouldNotThrowException() { + Action act = () => { + CancellationTokenSource token = new CancellationTokenSource(); + Task unused = TaskUtilities.Delay(TimeSpan.FromSeconds(1), token.Token); + token.Cancel(); + }; + + act.Should().NotThrow(); + } + } +} diff --git a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs new file mode 100644 index 00000000..4227278a --- /dev/null +++ b/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs @@ -0,0 +1,14 @@ +using Moq; +using UKSF.Api.Interfaces.Data; +using Xunit; + +namespace UKSF.Tests.Unit.Data { + public class CachedDataServiceTests { + [Fact] + public void ShouldCreateCollection() { + Mock mockDataCollection = new Mock(); + + // CachedDataService cachedDataService = new + } + } +} diff --git a/UKSF.Tests.Unit/Data/DataServiceTests.cs b/UKSF.Tests.Unit/Data/DataServiceTests.cs index ead1c4ba..de0f55f2 100644 --- a/UKSF.Tests.Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/DataServiceTests.cs @@ -1,31 +1,188 @@ using System; using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using FluentAssertions; -using Microsoft.Win32.TaskScheduler; using MongoDB.Bson; using MongoDB.Driver; using Moq; -using UKSF.Api.Data; -using UKSF.Api.Data.Utility; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Utility; -using UKSF.Api.Services.Utility; +using UKSF.Api.Models.Events; +using UKSF.Common; using Xunit; namespace UKSF.Tests.Unit.Data { public class DataServiceTests { + public DataServiceTests() { + mockDataCollection = new Mock(); + mockDataEventBus = new Mock>(); + + mockDataEventBus.Setup(x => x.Send(It.IsAny>())); + + mockDataCollection.Setup(x => x.SetCollectionName(It.IsAny())); + } + + private readonly Mock mockDataCollection; + private readonly Mock> mockDataEventBus; + private List mockCollection; + + [Fact] + public void ShouldMakeSetUpdate() { + MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; + const string EXPECTED = "{\"_operatorName\":\"$set\",\"_field\":{\"_fieldName\":\"Name\",\"_fieldSerializer\":null},\"_value\":\"2\"}"; + UpdateDefinition subject = null; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string x, UpdateDefinition y) => subject = y); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + mockDataService.Update(item1.id, "Name", "2"); + + subject.DeepJsonSerializeObject().Should().BeEquivalentTo(EXPECTED); + } + + [Fact] + public void ShouldMakeUnsetUpdate() { + MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; + const string EXPECTED = "{\"_operatorName\":\"$unset\",\"_field\":{\"_fieldName\":\"Name\"},\"_value\":1}"; + UpdateDefinition subject = null; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string x, UpdateDefinition y) => subject = y); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + mockDataService.Update(item1.id, "Name", null); + + subject.DeepJsonSerializeObject().Should().BeEquivalentTo(EXPECTED); + } + + [Fact] + public void ShouldAddItem() { + MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + mockDataCollection.Setup(x => x.Add(It.IsAny())).Callback(x => mockCollection.Add(x)); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + mockDataService.Add(item1); + + mockCollection.Should().Contain(item1); + } + [Fact] public void ShouldCreateCollection() { - // Mock> mockDataService = new Mock>(); - // Mock mockMongoDatabase = new Mock(); - // Mock> mockDataEventBus = new Mock>(); - // ConfirmationCodeDataService confirmationCodeDataService = new ConfirmationCodeDataService(mockMongoDatabase.Object, mockDataEventBus.Object); - // - // List confirmationCodeData = new List(); - // - // mockMongoDatabase.Setup(x => x.GetCollection("confirmationCodes")).Returns>(confirmationCodeData); + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + + mockCollection.Should().BeNull(); + MockDataService unused = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + mockCollection.Should().NotBeNull(); + } + + [Fact] + public void ShouldDeleteItem() { + MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + mockDataCollection.Setup(x => x.Delete(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + mockDataService.Delete(item1.id); + + mockCollection.Should().HaveCount(0); + mockCollection.Should().NotContain(item1); + } + + [Fact] + public void ShouldGetItem() { + MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + MockDataModel subject = mockDataService.GetSingle(item1.id); + + subject.Should().Be(item1); + } + + [Fact] + public void ShouldGetItemByPredicate() { + MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; + MockDataModel item2 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "2"}; + string id = item1.id; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); + mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.First(x)); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + MockDataModel subject = mockDataService.GetSingle(x => x.id == id); + + subject.Should().Be(item1); + } + + [Fact] + public void ShouldGetItems() { + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + List subject = mockDataService.Get(); + + subject.Should().BeSameAs(mockCollection); + } + + [Fact] + public void ShouldGetItemsByPredicate() { + MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; + MockDataModel item2 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "2"}; + string id = item1.id; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); + mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockCollection.Where(x).ToList()); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + List subject = mockDataService.Get(x => x.id == id); + + subject.Should().HaveCount(1); + subject.Should().Contain(item1); + } + + [Fact] + public void ShouldSetCollectionName() { + string collectionName = ""; + + mockDataCollection.Setup(x => x.SetCollectionName(It.IsAny())).Callback((string x) => collectionName = x); + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + + MockDataService unused = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + collectionName.Should().Be("test"); + } + + [Fact] + public void ShouldUpdateItemValue() { + MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + mockDataService.Update(item1.id, "Name", "2"); + + item1.Name.Should().Be("2"); + } + + [Fact] + public void ShouldUpdateItemValueByUpdateDefinition() { + MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + mockDataService.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); + + item1.Name.Should().Be("2"); } } } diff --git a/UKSF.Tests.Unit/Data/IMockDataService.cs b/UKSF.Tests.Unit/Data/IMockDataService.cs new file mode 100644 index 00000000..a4c4bf5b --- /dev/null +++ b/UKSF.Tests.Unit/Data/IMockDataService.cs @@ -0,0 +1,7 @@ +using UKSF.Api.Interfaces.Data; + +namespace UKSF.Tests.Unit.Data { + public interface IMockDataService : IDataService { + + } +} diff --git a/UKSF.Tests.Unit/Data/MockDataService.cs b/UKSF.Tests.Unit/Data/MockDataService.cs new file mode 100644 index 00000000..08f2137d --- /dev/null +++ b/UKSF.Tests.Unit/Data/MockDataService.cs @@ -0,0 +1,9 @@ +using UKSF.Api.Data; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; + +namespace UKSF.Tests.Unit.Data { + public class MockDataService : DataService, IMockDataService { + public MockDataService(IDataCollection dataCollection, IDataEventBus dataEventBus, string collectionName) : base(dataCollection, dataEventBus, collectionName) { } + } +} diff --git a/UKSF.Tests.Unit/MockComplexDataModel.cs b/UKSF.Tests.Unit/MockComplexDataModel.cs new file mode 100644 index 00000000..be0e1885 --- /dev/null +++ b/UKSF.Tests.Unit/MockComplexDataModel.cs @@ -0,0 +1,9 @@ +using System.Collections.Generic; + +namespace UKSF.Tests.Unit { + public class MockComplexDataModel : MockDataModel { + public MockDataModel Data; + public List List; + public List DataList; + } +} diff --git a/UKSF.Tests.Unit/MockDataModel.cs b/UKSF.Tests.Unit/MockDataModel.cs new file mode 100644 index 00000000..4de35037 --- /dev/null +++ b/UKSF.Tests.Unit/MockDataModel.cs @@ -0,0 +1,11 @@ +using UKSF.Api.Models; + +namespace UKSF.Tests.Unit { + public class MockDataModel : MongoObject { + public string Name; + + public MockDataModel() { } + + public MockDataModel(string id) : base(id) { } + } +} diff --git a/UKSF.Tests.Unit/MockPrivateDataModel.cs b/UKSF.Tests.Unit/MockPrivateDataModel.cs new file mode 100644 index 00000000..9571feb2 --- /dev/null +++ b/UKSF.Tests.Unit/MockPrivateDataModel.cs @@ -0,0 +1,17 @@ +using System; + +// ReSharper disable NotAccessedField.Local + +namespace UKSF.Tests.Unit { + public class MockPrivateDataModel : MockDataModel { + private readonly int count; + private readonly string description; + private readonly DateTime timestamp; + + public MockPrivateDataModel(string id, string description, int count, DateTime timestamp) : base(id) { + this.description = description; + this.count = count; + this.timestamp = timestamp; + } + } +} diff --git a/UKSF.Tests.Unit/PersonnelTests/AccountSettingsTests.cs b/UKSF.Tests.Unit/Models/AccountSettingsTests.cs similarity index 94% rename from UKSF.Tests.Unit/PersonnelTests/AccountSettingsTests.cs rename to UKSF.Tests.Unit/Models/AccountSettingsTests.cs index ffbe9c44..c797a6ef 100644 --- a/UKSF.Tests.Unit/PersonnelTests/AccountSettingsTests.cs +++ b/UKSF.Tests.Unit/Models/AccountSettingsTests.cs @@ -2,7 +2,7 @@ using UKSF.Api.Models.Personnel; using Xunit; -namespace UKSF.Tests.Unit.PersonnelTests { +namespace UKSF.Tests.Unit.Models { public class AccountSettingsTests { [Fact] public void ShouldReturnBool() { diff --git a/UKSF.Tests.Unit/UtilityTests/UtilitiesTests.cs b/UKSF.Tests.Unit/Services/Common/UtilitiesTests.cs similarity index 70% rename from UKSF.Tests.Unit/UtilityTests/UtilitiesTests.cs rename to UKSF.Tests.Unit/Services/Common/UtilitiesTests.cs index 963a7098..5f2bf3be 100644 --- a/UKSF.Tests.Unit/UtilityTests/UtilitiesTests.cs +++ b/UKSF.Tests.Unit/Services/Common/UtilitiesTests.cs @@ -3,21 +3,11 @@ using FluentAssertions; using MongoDB.Bson; using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Utility; +using UKSF.Api.Services.Common; using Xunit; -namespace UKSF.Tests.Unit.UtilityTests { +namespace UKSF.Tests.Unit.Services.Common { public class UtilitiesTests { - [Theory, InlineData(25, 4, 25, 4), InlineData(25, 13, 26, 1)] - public void ShouldGiveCorrectAge(int years, int months, int expectedYears, int expectedMonths) { - DateTime dob = DateTime.Today.AddYears(-years).AddMonths(-months); - - (int subjectYears, int subjectMonths) = dob.ToAge(); - - subjectYears.Should().Be(expectedYears); - subjectMonths.Should().Be(expectedMonths); - } - [Fact] public void ShouldCopyAccountCorrectly() { string id = ObjectId.GenerateNewId().ToString(); @@ -45,15 +35,6 @@ public void ShouldCopyAccountCorrectly() { subject.militaryExperience.Should().BeFalse(); } - [Fact] - public void ShouldGiveCorrectMonths() { - DateTime dob = new DateTime(2019, 1, 20); - - (int _, int subjectMonths) = dob.ToAge(new DateTime(2020, 1, 16)); - - subjectMonths.Should().Be(11); - } - [Fact] public void ShouldNotCopyPassword() { string id = ObjectId.GenerateNewId().ToString(); diff --git a/UKSF.Tests.Unit/UtilityTests/ConfirmationCodeServiceTests.cs b/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs similarity index 98% rename from UKSF.Tests.Unit/UtilityTests/ConfirmationCodeServiceTests.cs rename to UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs index 4d0a8367..b0e1faac 100644 --- a/UKSF.Tests.Unit/UtilityTests/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs @@ -11,7 +11,7 @@ using UKSF.Api.Services.Utility; using Xunit; -namespace UKSF.Tests.Unit.UtilityTests { +namespace UKSF.Tests.Unit.Services { public class ConfirmationCodeServiceTests { [Fact] public async Task ShouldReturnCodeId() { diff --git a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj index e87c6f73..07efd3bc 100644 --- a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj +++ b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj @@ -19,6 +19,7 @@ + From fbb4225b32d83c881a336af7c77acc710d27bd9d Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 1 Feb 2020 21:44:05 +0000 Subject: [PATCH 088/369] Add tests action --- .github/workflows/test.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 00000000..a84fe4bc --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,25 @@ +name: Run Tests + +on: + push: + branches-ignore: + - master + pull_request: + branches-ignore: + - master + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 3.1.101 + - name: Build with dotnet + run: dotnet build --configuration Release + - name: Test with dotnet + run: dotnet test ./UKSF.Api.sln --configuration Release From ae19aba95b9a11c77023fba27932432eee6a93e0 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 1 Feb 2020 21:53:15 +0000 Subject: [PATCH 089/369] Run action on windows --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a84fe4bc..2c47b101 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,12 +11,12 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: [windows-latest] steps: - uses: actions/checkout@v2 - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v1.4 with: dotnet-version: 3.1.101 - name: Build with dotnet From ee0ca2f542f36c9af929d785c2e79c33c5f82a7c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 1 Feb 2020 21:54:40 +0000 Subject: [PATCH 090/369] Try different setup-dotnet actions url --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2c47b101..0dadf527 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup .NET Core - uses: actions/setup-dotnet@v1.4 + uses: actions/setup-dotnet@v1.4.0 with: dotnet-version: 3.1.101 - name: Build with dotnet From e5fff8d23163f8bfe9c78c19ab92bca2a8f1d059 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 1 Feb 2020 22:09:15 +0000 Subject: [PATCH 091/369] Split test into own job --- .github/workflows/test.yml | 10 ++++++++-- UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0dadf527..6b5ce745 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ on: - master jobs: - build: + Build: runs-on: [windows-latest] @@ -21,5 +21,11 @@ jobs: dotnet-version: 3.1.101 - name: Build with dotnet run: dotnet build --configuration Release - - name: Test with dotnet + + Test: + needs: [Build] + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - name: Run tests run: dotnet test ./UKSF.Api.sln --configuration Release diff --git a/UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs b/UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs index acebb258..e6e6220d 100644 --- a/UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs @@ -19,7 +19,7 @@ public void ShouldDelay() { public void ShouldNotThrowException() { Action act = () => { CancellationTokenSource token = new CancellationTokenSource(); - Task unused = TaskUtilities.Delay(TimeSpan.FromSeconds(1), token.Token); + Task unused = TaskUtilities.Delay(TimeSpan.FromMilliseconds(50), token.Token); token.Cancel(); }; From 530455ba5ed0cdb3177adf8223aed3e886f6453f Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 1 Feb 2020 22:19:59 +0000 Subject: [PATCH 092/369] Specify date format in failing test on CI. Combine buildna test actions --- .github/workflows/test.yml | 18 +++++++----------- UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6b5ce745..b4f634f8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,6 @@ -name: Run Tests +name: Build & Run Tests +env: + DOTNET_CLI_TELEMETRY_OPTOUT: 1 on: push: @@ -9,9 +11,9 @@ on: - master jobs: - Build: + Build & Test: - runs-on: [windows-latest] + runs-on: windows-latest steps: - uses: actions/checkout@v2 @@ -21,11 +23,5 @@ jobs: dotnet-version: 3.1.101 - name: Build with dotnet run: dotnet build --configuration Release - - Test: - needs: [Build] - runs-on: windows-latest - steps: - - uses: actions/checkout@v2 - - name: Run tests - run: dotnet test ./UKSF.Api.sln --configuration Release + - name: Run tests + run: dotnet test ./UKSF.Api.sln --configuration Release diff --git a/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs b/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs index be54d8a2..ae8c1275 100644 --- a/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs @@ -35,7 +35,7 @@ public void ShouldCopyObject() { [Fact] public void ShouldSerializePrivateFields() { - MockPrivateDataModel mockPrivateDataModel = new MockPrivateDataModel("5e35dafaed582b5a4cec346e", "A thing", 4, DateTime.Parse("16/01/1996")) { Name = "Charlie"}; + MockPrivateDataModel mockPrivateDataModel = new MockPrivateDataModel("5e35dafaed582b5a4cec346e", "A thing", 4, DateTime.ParseExact("16/01/1996", "dd/MM/yyyy", null)) { Name = "Charlie"}; string subject = mockPrivateDataModel.DeepJsonSerializeObject(); From 0b32ea4ea4e6c4ed91f81f46f2997e09208dd2b5 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 1 Feb 2020 22:36:53 +0000 Subject: [PATCH 093/369] Fix bad yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b4f634f8..26540500 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,5 +23,5 @@ jobs: dotnet-version: 3.1.101 - name: Build with dotnet run: dotnet build --configuration Release - - name: Run tests - run: dotnet test ./UKSF.Api.sln --configuration Release + - name: Run tests + run: dotnet test ./UKSF.Api.sln --configuration Release From 774de8d2ca9e9584bdd8ad78723c15a657afc40f Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 1 Feb 2020 22:37:36 +0000 Subject: [PATCH 094/369] Fix job name --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 26540500..80315bff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ on: - master jobs: - Build & Test: + Tests: runs-on: windows-latest From b762a3ac889cecb98a5019528b718e8defcd1618 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Feb 2020 00:38:30 +0000 Subject: [PATCH 095/369] Add coveralls to action --- .github/workflows/test.yml | 40 +++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 80315bff..d7e43c25 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,27 +1,23 @@ name: Build & Run Tests env: - DOTNET_CLI_TELEMETRY_OPTOUT: 1 + DOTNET_CLI_TELEMETRY_OPTOUT: 1 -on: - push: - branches-ignore: - - master - pull_request: - branches-ignore: - - master +on: ["push", "pull_request"] jobs: - Tests: - - runs-on: windows-latest - - steps: - - uses: actions/checkout@v2 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1.4.0 - with: - dotnet-version: 3.1.101 - - name: Build with dotnet - run: dotnet build --configuration Release - - name: Run tests - run: dotnet test ./UKSF.Api.sln --configuration Release + Build and Test: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - name: Setup .NET Core + uses: actions/setup-dotnet@v1.4.0 + with: + dotnet-version: 3.1.101 + - name: Build with dotnet + run: dotnet build --configuration Release + - name: Run tests with coverage + run: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=opencover ./UKSF.Api.sln --configuration Release + - name: Coveralls + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.COVERALLS_TOKEN }} From 12dcf73280ecb7260310ba47944f2336ce349286 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Feb 2020 00:41:46 +0000 Subject: [PATCH 096/369] Fix indentation --- .github/workflows/test.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d7e43c25..39561cfc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,23 +1,23 @@ name: Build & Run Tests env: - DOTNET_CLI_TELEMETRY_OPTOUT: 1 + DOTNET_CLI_TELEMETRY_OPTOUT: 1 on: ["push", "pull_request"] jobs: - Build and Test: - runs-on: windows-latest - steps: - - uses: actions/checkout@v2 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1.4.0 - with: - dotnet-version: 3.1.101 - - name: Build with dotnet - run: dotnet build --configuration Release - - name: Run tests with coverage - run: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=opencover ./UKSF.Api.sln --configuration Release - - name: Coveralls - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.COVERALLS_TOKEN }} + Build and Test: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - name: Setup .NET Core + uses: actions/setup-dotnet@v1.4.0 + with: + dotnet-version: 3.1.101 + - name: Build with dotnet + run: dotnet build --configuration Release + - name: Run tests with coverage + run: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=opencover ./UKSF.Api.sln --configuration Release + - name: Coveralls + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.COVERALLS_TOKEN }} From 8c77de3cf66d4f62a740f6c68889bfef92896c9e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Feb 2020 00:44:27 +0000 Subject: [PATCH 097/369] Fix action step name. Add editor config --- .editorconfig | 36 ++++++++++++++++++++++++++++++++++++ .github/workflows/test.yml | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..f15d1074 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,36 @@ +# EditorConfig + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{c,cc,cpp,h,hh,hpp,cs}] +indent_size = 4 +indent_style = space + +[*.{cfg,ini}] +indent_size = 4 +indent_style = space + +[*.json] +indent_size = 4 +indent_style = space + +[*.{markdown,md}] +indent_size = 4 +indent_style = space +trim_trailing_whitespace = false + +[*.xml] +indent_size = 4 +indent_style = space + +[*.{yaml,yml}] +indent_size = 2 +indent_style = space diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 39561cfc..72b3a04e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ env: on: ["push", "pull_request"] jobs: - Build and Test: + Test: runs-on: windows-latest steps: - uses: actions/checkout@v2 From cef810847d5af54db7985c4f5cb39e0c0964b96d Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Feb 2020 01:00:14 +0000 Subject: [PATCH 098/369] Change coverage format --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 72b3a04e..858e4203 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: - name: Build with dotnet run: dotnet build --configuration Release - name: Run tests with coverage - run: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=opencover ./UKSF.Api.sln --configuration Release + run: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov ./UKSF.Api.sln --configuration Release - name: Coveralls uses: coverallsapp/github-action@master with: From 09bb4b67dac20460d94275bb0c7ea313811ff383 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Feb 2020 01:10:21 +0000 Subject: [PATCH 099/369] Fix coverage paths --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 858e4203..a20bbdc6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: - name: Build with dotnet run: dotnet build --configuration Release - name: Run tests with coverage - run: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov ./UKSF.Api.sln --configuration Release + run: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=./coverage/lcov.info ./UKSF.Api.sln --configuration Release - name: Coveralls uses: coverallsapp/github-action@master with: From 839208d3c480a018ff0e9cc18d1dd0cbdf96c643 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Feb 2020 01:28:58 +0000 Subject: [PATCH 100/369] Try use code climate coverage --- .github/workflows/test.yml | 10 ++++++---- UKSF.Tests.Unit/UKSF.Tests.Unit.csproj | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a20bbdc6..2bfce1b7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,8 +16,10 @@ jobs: - name: Build with dotnet run: dotnet build --configuration Release - name: Run tests with coverage - run: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=./coverage/lcov.info ./UKSF.Api.sln --configuration Release - - name: Coveralls - uses: coverallsapp/github-action@master + run: + - name: Test and publish code coverage + uses: paambaati/codeclimate-action@v2.4.0 + env: + CC_TEST_REPORTER_ID: ${{ secrets.CODE_CLIMATE_API_TEST_REPORTER_ID }} with: - github-token: ${{ secrets.COVERALLS_TOKEN }} + coverageCommand: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=./coverage/lcov.info ./UKSF.Api.sln --configuration Release diff --git a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj index 07efd3bc..96813cc5 100644 --- a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj +++ b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj @@ -7,6 +7,10 @@ + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + From 8fd8d1ec3a4030f9e69310a31cbb8b7660636172 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Feb 2020 01:29:43 +0000 Subject: [PATCH 101/369] Remove old test step --- .github/workflows/test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2bfce1b7..e9914dc8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,8 +15,6 @@ jobs: dotnet-version: 3.1.101 - name: Build with dotnet run: dotnet build --configuration Release - - name: Run tests with coverage - run: - name: Test and publish code coverage uses: paambaati/codeclimate-action@v2.4.0 env: From bbbf36c5c8ceca28abe30be16c44fd8852f8d106 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Feb 2020 01:36:24 +0000 Subject: [PATCH 102/369] Revert to coveralls --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e9914dc8..a20bbdc6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,9 +15,9 @@ jobs: dotnet-version: 3.1.101 - name: Build with dotnet run: dotnet build --configuration Release - - name: Test and publish code coverage - uses: paambaati/codeclimate-action@v2.4.0 - env: - CC_TEST_REPORTER_ID: ${{ secrets.CODE_CLIMATE_API_TEST_REPORTER_ID }} + - name: Run tests with coverage + run: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=./coverage/lcov.info ./UKSF.Api.sln --configuration Release + - name: Coveralls + uses: coverallsapp/github-action@master with: - coverageCommand: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=./coverage/lcov.info ./UKSF.Api.sln --configuration Release + github-token: ${{ secrets.COVERALLS_TOKEN }} From 4aa13d08ebedf836ac6da5468df84fb6dffa531c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Feb 2020 01:46:31 +0000 Subject: [PATCH 103/369] Try different path for coverage file --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a20bbdc6..fcf3dbc4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,9 +14,9 @@ jobs: with: dotnet-version: 3.1.101 - name: Build with dotnet - run: dotnet build --configuration Release + run: dotnet build -c Release - name: Run tests with coverage - run: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=./coverage/lcov.info ./UKSF.Api.sln --configuration Release + run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info - name: Coveralls uses: coverallsapp/github-action@master with: From 9546e5af9ec5b0011c06d7bb1a7931c55add6948 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Feb 2020 01:54:43 +0000 Subject: [PATCH 104/369] Use github token for coveralls action step --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fcf3dbc4..ac7695e0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,4 +20,4 @@ jobs: - name: Coveralls uses: coverallsapp/github-action@master with: - github-token: ${{ secrets.COVERALLS_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} From f1d416c40d0484f14d3930ee8d2612f2cfc0195d Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 5 Feb 2020 00:49:16 +0000 Subject: [PATCH 105/369] More unit testing. Added events tests and more data tests. Removed deepserialize in favour of bson render for test equivalence of UpdateDefinition --- UKSF.Api.Data/CachedDataService.cs | 5 +- UKSF.Api.Data/DataCollection.cs | 1 + UKSF.Api.Data/DataService.cs | 1 + UKSF.Api.Data/Message/LogDataService.cs | 1 + UKSF.Api.sln.DotSettings | 408 ++++++++++-------- UKSF.Api/Startup.cs | 3 +- {UKSF.Api.Data => UKSF.Common}/DataUtilies.cs | 2 +- UKSF.Common/JsonUtilities.cs | 25 +- UKSF.Common/ProcessUtilities.cs | 1 + UKSF.Tests.Unit/Common/DataUtilitiesTests.cs | 26 ++ UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs | 13 +- .../Common/ProcessUtilitiesTests.cs | 67 +++ .../Data/CachedDataServiceTests.cs | 153 ++++++- UKSF.Tests.Unit/Data/DataServiceTests.cs | 106 ++--- .../Data/IMockCachedDataService.cs | 7 + UKSF.Tests.Unit/Data/MockCachedDataService.cs | 9 + .../Events/DataEventBackerTests.cs | 46 ++ UKSF.Tests.Unit/Events/EventBusTests.cs | 19 + UKSF.Tests.Unit/MockDataModel.cs | 4 +- 19 files changed, 619 insertions(+), 278 deletions(-) rename {UKSF.Api.Data => UKSF.Common}/DataUtilies.cs (91%) create mode 100644 UKSF.Tests.Unit/Common/DataUtilitiesTests.cs create mode 100644 UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs create mode 100644 UKSF.Tests.Unit/Data/IMockCachedDataService.cs create mode 100644 UKSF.Tests.Unit/Data/MockCachedDataService.cs create mode 100644 UKSF.Tests.Unit/Events/DataEventBackerTests.cs create mode 100644 UKSF.Tests.Unit/Events/EventBusTests.cs diff --git a/UKSF.Api.Data/CachedDataService.cs b/UKSF.Api.Data/CachedDataService.cs index 5dfb3d38..60e39eff 100644 --- a/UKSF.Api.Data/CachedDataService.cs +++ b/UKSF.Api.Data/CachedDataService.cs @@ -6,14 +6,15 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; +using UKSF.Common; namespace UKSF.Api.Data { public abstract class CachedDataService : DataService { - protected List Collection; + public List Collection { get; protected set; } protected CachedDataService(IDataCollection dataCollection, IDataEventBus dataEventBus, string collectionName) : base(dataCollection, dataEventBus, collectionName) { } - // ReSharper disable once MemberCanBeProtected.Global - Used in dynamic call, do not change to protected! + // ReSharper disable once MemberCanBeProtected.Global - Used in dynamic call, do not change to protected! // TODO: Stop using this in dynamic call, switch to register or something less........dynamic public void Refresh() { Collection = null; Get(); diff --git a/UKSF.Api.Data/DataCollection.cs b/UKSF.Api.Data/DataCollection.cs index 2f49b93a..d2bc834a 100644 --- a/UKSF.Api.Data/DataCollection.cs +++ b/UKSF.Api.Data/DataCollection.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.Interfaces.Data; +using UKSF.Common; namespace UKSF.Api.Data { public class DataCollection : IDataCollection { diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index fca4d54d..94d9cdbd 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -6,6 +6,7 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; +using UKSF.Common; namespace UKSF.Api.Data { public abstract class DataService : DataEventBacker, IDataService { diff --git a/UKSF.Api.Data/Message/LogDataService.cs b/UKSF.Api.Data/Message/LogDataService.cs index 9b21ca24..d827b610 100644 --- a/UKSF.Api.Data/Message/LogDataService.cs +++ b/UKSF.Api.Data/Message/LogDataService.cs @@ -3,6 +3,7 @@ using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; using UKSF.Api.Models.Message.Logging; +using UKSF.Common; namespace UKSF.Api.Data.Message { public class LogDataService : DataService, ILogDataService { diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index 35e6b171..2c72efce 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -139,186 +139,234 @@ CHOP_IF_LONG CHOP_IF_LONG CHOP_IF_LONG - <?xml version="1.0" encoding="utf-16"?> -<Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"> - <TypePattern DisplayName="Non-reorderable types"> - <TypePattern.Match> - <Or> - <And> - <Kind Is="Interface" /> - <Or> - <HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /> - <HasAttribute Name="System.Runtime.InteropServices.ComImport" /> - </Or> - </And> - <Kind Is="Struct" /> - <HasAttribute Name="JetBrains.Annotations.NoReorderAttribute" /> - <HasAttribute Name="JetBrains.Annotations.NoReorder" /> - </Or> - </TypePattern.Match> - </TypePattern> - <TypePattern DisplayName="xUnit.net Test Classes" RemoveRegions="All"> - <TypePattern.Match> - <And> - <Kind Is="Class" /> - <HasMember> - <And> - <Kind Is="Method" /> - <HasAttribute Name="Xunit.FactAttribute" Inherited="True" /> - </And> - </HasMember> - </And> - </TypePattern.Match> - <Entry DisplayName="Setup/Teardown Methods"> - <Entry.Match> - <Or> - <Kind Is="Constructor" /> - <And> - <Kind Is="Method" /> - <ImplementsInterface Name="System.IDisposable" /> - </And> - </Or> - </Entry.Match> - <Entry.SortBy> - <Kind Order="Constructor" /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="All other members" /> - <Entry Priority="100" DisplayName="Test Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <HasAttribute Name="Xunit.FactAttribute" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - </TypePattern> - <TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"> - <TypePattern.Match> - <And> - <Kind Is="Class" /> - <HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /> - </And> - </TypePattern.Match> - <Entry DisplayName="Setup/Teardown Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <Or> - <HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /> - </Or> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="All other members" /> - <Entry Priority="100" DisplayName="Test Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <HasAttribute Name="NUnit.Framework.TestAttribute" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - </TypePattern> - <TypePattern DisplayName="Default Pattern"> - <Entry Priority="100" DisplayName="Public Delegates"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Kind Is="Delegate" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - <Entry Priority="100" DisplayName="Public Enums"> - <Entry.Match> - <And> - <Access Is="Public" /> - <Kind Is="Enum" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Static Fields and Constants"> - <Entry.Match> - <Or> - <Kind Is="Constant" /> - <And> - <Kind Is="Field" /> - <Static /> - </And> - </Or> - </Entry.Match> - <Entry.SortBy> - <Kind Is="Member" /> - <Name /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Fields"> - <Entry.Match> - <And> - <Kind Is="Field" /> - <Not> - <Static /> - </Not> - </And> - </Entry.Match> - <Entry.SortBy> - <Readonly /> - <Name /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Constructors"> - <Entry.Match> - <Kind Is="Constructor" /> - </Entry.Match> - <Entry.SortBy> - <Static /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Properties, Indexers"> - <Entry.Match> - <Or> - <Kind Is="Property" /> - <Kind Is="Indexer" /> - </Or> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - <Entry Priority="100" DisplayName="Interface Implementations"> - <Entry.Match> - <And> - <Kind Is="Member" /> - <ImplementsInterface /> - </And> - </Entry.Match> - <Entry.SortBy> - <ImplementsInterface Immediate="True" /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="All other members" /> - <Entry DisplayName="Nested Types"> - <Entry.Match> - <Kind Is="Type" /> - </Entry.Match> - </Entry> - </TypePattern> -</Patterns> + <Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"> + <TypePattern DisplayName="Non-reorderable types"> + <TypePattern.Match> + <Or> + <And> + <Kind Is="Interface" /> + <Or> + <HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /> + <HasAttribute Name="System.Runtime.InteropServices.ComImport" /> + </Or> + </And> + <Kind Is="Struct" /> + <HasAttribute Name="JetBrains.Annotations.NoReorderAttribute" /> + <HasAttribute Name="JetBrains.Annotations.NoReorder" /> + </Or> + </TypePattern.Match> + </TypePattern> + + <TypePattern DisplayName="xUnit.net Test Classes" RemoveRegions="All"> + <TypePattern.Match> + <And> + <Kind Is="Class" /> + <HasMember> + <And> + <Kind Is="Method"></Kind> + <HasAttribute Name="Xunit.FactAttribute" Inherited="True" /> + </And> + </HasMember> + </And> + </TypePattern.Match> + + <Entry DisplayName="Fields"> + <Entry.Match> + <And> + <Kind Is="Field" /> + <Not> + <Static /> + </Not> + </And> + </Entry.Match> + + <Entry.SortBy> + <Readonly /> + <Name /> + </Entry.SortBy> + </Entry> + + <Entry DisplayName="Setup/Teardown Methods"> + <Entry.Match> + <Or> + <Kind Is="Constructor" /> + <And> + <Kind Is="Method"></Kind> + <ImplementsInterface Name="System.IDisposable"></ImplementsInterface> + </And> + </Or> + </Entry.Match> + + <Entry.SortBy> + <Kind> + <Kind.Order> + <DeclarationKind>Constructor</DeclarationKind> + </Kind.Order> + </Kind> + </Entry.SortBy> + </Entry> + + + <Entry DisplayName="All other members" /> + + <Entry DisplayName="Test Methods" Priority="100"> + <Entry.Match> + <And> + <Kind Is="Method" /> + <HasAttribute Name="Xunit.FactAttribute" Inherited="false" /> + </And> + </Entry.Match> + + <Entry.SortBy> + <Name /> + </Entry.SortBy> + </Entry> + </TypePattern> + + <TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"> + <TypePattern.Match> + <And> + <Kind Is="Class" /> + <HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="true" /> + </And> + </TypePattern.Match> + + <Entry DisplayName="Setup/Teardown Methods"> + <Entry.Match> + <And> + <Kind Is="Method" /> + <Or> + <HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="true" /> + <HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="true" /> + <HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="true" /> + <HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="true" /> + </Or> + </And> + </Entry.Match> + </Entry> + + <Entry DisplayName="All other members" /> + + <Entry DisplayName="Test Methods" Priority="100"> + <Entry.Match> + <And> + <Kind Is="Method" /> + <HasAttribute Name="NUnit.Framework.TestAttribute" Inherited="false" /> + </And> + </Entry.Match> + + <Entry.SortBy> + <Name /> + </Entry.SortBy> + </Entry> + </TypePattern> + + <TypePattern DisplayName="Default Pattern"> + <Entry DisplayName="Public Delegates" Priority="100"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Kind Is="Delegate" /> + </And> + </Entry.Match> + + <Entry.SortBy> + <Name /> + </Entry.SortBy> + </Entry> + + <Entry DisplayName="Public Enums" Priority="100"> + <Entry.Match> + <And> + <Access Is="Public" /> + <Kind Is="Enum" /> + </And> + </Entry.Match> + + <Entry.SortBy> + <Name /> + </Entry.SortBy> + </Entry> + + <Entry DisplayName="Static Fields and Constants"> + <Entry.Match> + <Or> + <Kind Is="Constant" /> + <And> + <Kind Is="Field" /> + <Static /> + </And> + </Or> + </Entry.Match> + + <Entry.SortBy> + <Kind> + <Kind.Order> + <DeclarationKind>Constant</DeclarationKind> + <DeclarationKind>Field</DeclarationKind> + </Kind.Order> + </Kind> + </Entry.SortBy> + </Entry> + + <Entry DisplayName="Fields"> + <Entry.Match> + <And> + <Kind Is="Field" /> + <Not> + <Static /> + </Not> + </And> + </Entry.Match> + + <Entry.SortBy> + <Readonly /> + <Name /> + </Entry.SortBy> + </Entry> + + <Entry DisplayName="Constructors"> + <Entry.Match> + <Kind Is="Constructor" /> + </Entry.Match> + + <Entry.SortBy> + <Static/> + </Entry.SortBy> + </Entry> + + <Entry DisplayName="Properties, Indexers"> + <Entry.Match> + <Or> + <Kind Is="Property" /> + <Kind Is="Indexer" /> + </Or> + </Entry.Match> + </Entry> + + <Entry DisplayName="Interface Implementations" Priority="100"> + <Entry.Match> + <And> + <Kind Is="Member" /> + <ImplementsInterface /> + </And> + </Entry.Match> + + <Entry.SortBy> + <ImplementsInterface Immediate="true" /> + </Entry.SortBy> + </Entry> + + <Entry DisplayName="All other members" /> + + <Entry DisplayName="Nested Types"> + <Entry.Match> + <Kind Is="Type" /> + </Entry.Match> + </Entry> + </TypePattern> +</Patterns> + UseExplicitType UseExplicitType UseExplicitType diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 0d443da3..537d2c5d 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -181,6 +181,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl } private static void WarmDataServices() { + // TODO: Redo this trash DataCacheService dataCacheService = Global.ServiceProvider.GetService(); List servicesTypes = AppDomain.CurrentDomain.GetAssemblies() .SelectMany(x => x.GetTypes()) @@ -277,7 +278,7 @@ private static void RegisterEventServices(this IServiceCollection services) { private static void RegisterDataServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { services.AddTransient(); - + // Non-Cached services.AddTransient(); services.AddSingleton(); diff --git a/UKSF.Api.Data/DataUtilies.cs b/UKSF.Common/DataUtilies.cs similarity index 91% rename from UKSF.Api.Data/DataUtilies.cs rename to UKSF.Common/DataUtilies.cs index db02c8d4..6d2e4a3c 100644 --- a/UKSF.Api.Data/DataUtilies.cs +++ b/UKSF.Common/DataUtilies.cs @@ -1,6 +1,6 @@ using System.Reflection; -namespace UKSF.Api.Data { +namespace UKSF.Common { public static class DataUtilies { public static string GetIdValue(this T data) { FieldInfo id = data.GetType().GetField("id"); diff --git a/UKSF.Common/JsonUtilities.cs b/UKSF.Common/JsonUtilities.cs index 93fd2233..a428728d 100644 --- a/UKSF.Common/JsonUtilities.cs +++ b/UKSF.Common/JsonUtilities.cs @@ -1,33 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using Newtonsoft.Json; -using Newtonsoft.Json.Serialization; +using Newtonsoft.Json; namespace UKSF.Common { public static class JsonUtilities { - public static string DeepJsonSerializeObject(this object data) => JsonConvert.SerializeObject(data, new JsonSerializerSettings {ContractResolver = new AllFieldsContractResolver()}); - public static T Copy(this object source) { JsonSerializerSettings deserializeSettings = new JsonSerializerSettings {ObjectCreationHandling = ObjectCreationHandling.Replace}; return JsonConvert.DeserializeObject(JsonConvert.SerializeObject(source), deserializeSettings); } - - private class AllFieldsContractResolver : DefaultContractResolver { - protected override IList CreateProperties(Type type, MemberSerialization memberSerialization) { - List jsonProperties = type.GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance) - .Select(x => base.CreateProperty(x, memberSerialization)) - .Union(type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance).Select(x => base.CreateProperty(x, memberSerialization))) - .ToList(); - jsonProperties.ForEach( - x => { - x.Writable = true; - x.Readable = true; - } - ); - return jsonProperties; - } - } } } diff --git a/UKSF.Common/ProcessUtilities.cs b/UKSF.Common/ProcessUtilities.cs index ac532335..54a1f83f 100644 --- a/UKSF.Common/ProcessUtilities.cs +++ b/UKSF.Common/ProcessUtilities.cs @@ -37,6 +37,7 @@ public static async Task LaunchExternalProcess(string name, string command) { } public static async Task CloseProcessGracefully(this Process process) { + // UKSF.PostMessage exe location should be set as a PATH variable await LaunchExternalProcess("CloseProcess", $"start \"\" \"UKSF.PostMessage\" {process.ProcessName} {WM_SYSCOMMAND} {SC_CLOSE} 0"); } } diff --git a/UKSF.Tests.Unit/Common/DataUtilitiesTests.cs b/UKSF.Tests.Unit/Common/DataUtilitiesTests.cs new file mode 100644 index 00000000..329479d8 --- /dev/null +++ b/UKSF.Tests.Unit/Common/DataUtilitiesTests.cs @@ -0,0 +1,26 @@ +using System; +using FluentAssertions; +using UKSF.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Common { + public class DataUtilitiesTests { + [Fact] + public void ShouldReturnIdValue() { + MockDataModel mockDataModel = new MockDataModel(); + + string subject = mockDataModel.GetIdValue(); + + subject.Should().Be(mockDataModel.id); + } + + [Fact] + public void ShouldReturnEmptyString() { + DateTime dateTime = new DateTime(); + + string subject = dateTime.GetIdValue(); + + subject.Should().Be(string.Empty); + } + } +} diff --git a/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs b/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs index ae8c1275..c239207b 100644 --- a/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using FluentAssertions; -using MongoDB.Bson; using UKSF.Common; using Xunit; @@ -32,14 +30,5 @@ public void ShouldCopyObject() { subject.id.Should().Be(mockDataModel.id); subject.Name.Should().Be(mockDataModel.Name); } - - [Fact] - public void ShouldSerializePrivateFields() { - MockPrivateDataModel mockPrivateDataModel = new MockPrivateDataModel("5e35dafaed582b5a4cec346e", "A thing", 4, DateTime.ParseExact("16/01/1996", "dd/MM/yyyy", null)) { Name = "Charlie"}; - - string subject = mockPrivateDataModel.DeepJsonSerializeObject(); - - subject.Should().Be("{\"count\":4,\"description\":\"A thing\",\"timestamp\":\"1996-01-16T00:00:00\",\"Name\":\"Charlie\",\"id\":\"5e35dafaed582b5a4cec346e\"}"); - } } } diff --git a/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs b/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs new file mode 100644 index 00000000..40ce2c6e --- /dev/null +++ b/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs @@ -0,0 +1,67 @@ +using System; +using System.Diagnostics; +using System.Linq; +using System.Management; +using FluentAssertions; +using Microsoft.Win32.TaskScheduler; +using UKSF.Common; +using Xunit; +using Task = System.Threading.Tasks.Task; + +namespace UKSF.Tests.Unit.Common { + public class ProcessUtilitiesTests { + [Fact] + public void ShouldLaunchManagedProcess() { + int processId = ProcessUtilities.LaunchManagedProcess("cmd", "/C timeout 1"); + + Process subject = Process.GetProcessById(processId); + + subject.Id.Should().Be(processId); + + subject.Kill(); + } + + [Fact] + public async Task ShouldCreateTask() { + const string NAME = "Test"; + await ProcessUtilities.LaunchExternalProcess(NAME, "exit"); + + TaskService.Instance.RootFolder.Tasks.Should().Contain(x => x.Name == NAME); + + TaskService.Instance.RootFolder.DeleteTask(NAME, false); + } + + [Fact] + public async Task ShouldRunTask() { + const string NAME = "Test"; + await ProcessUtilities.LaunchExternalProcess(NAME, "exit"); + + TaskService.Instance.RootFolder.Tasks.First(x => x.Name == NAME).LastRunTime.Should().BeCloseTo(DateTime.Now, TimeSpan.FromSeconds(1)); + + TaskService.Instance.RootFolder.DeleteTask(NAME, false); + } + + [Fact] + public async Task ShouldCloseProcess() { + const string NAME = "Test"; + const string COMMAND = "timeout 5"; + string expected = $"C:\\Windows\\system32\\cmd.EXE /C {COMMAND}"; + + await ProcessUtilities.LaunchExternalProcess(NAME, COMMAND); + await Task.Delay(TimeSpan.FromSeconds(1)); + + Process subject = Process.GetProcessesByName("cmd").FirstOrDefault(x => { + using ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT CommandLine FROM Win32_Process WHERE ProcessId = " + x.Id); + using ManagementObjectCollection objects = searcher.Get(); + return objects.Cast().SingleOrDefault()?["CommandLine"]?.ToString() == expected; + }); + + subject.Should().NotBeNull(); + + await subject.CloseProcessGracefully(); + await Task.Delay(TimeSpan.FromSeconds(1)); + + subject?.HasExited.Should().BeTrue(); + } + } +} diff --git a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs index 4227278a..7e8989e0 100644 --- a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs @@ -1,14 +1,157 @@ -using Moq; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using FluentAssertions; +using MongoDB.Driver; +using Moq; using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; using Xunit; namespace UKSF.Tests.Unit.Data { public class CachedDataServiceTests { + private readonly Mock mockDataCollection; + private readonly Mock> mockDataEventBus; + private List mockCollection; + + public CachedDataServiceTests() { + mockDataCollection = new Mock(); + mockDataEventBus = new Mock>(); + + mockDataEventBus.Setup(x => x.Send(It.IsAny>())); + + mockDataCollection.Setup(x => x.SetCollectionName(It.IsAny())); + } + + [Fact] + public void ShouldRefreshCollection() { + MockDataModel item1 = new MockDataModel {Name = "1"}; + MockDataModel item2 = new MockDataModel {Name = "1"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + + MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + mockCollection.Add(item2); + + subject.Refresh(); + subject.Collection.Should().Contain(item1); + subject.Collection.Should().Contain(item2); + } + + [Fact] + public void ShouldGetCachedItems() { + MockDataModel item1 = new MockDataModel {Name = "1"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + + MockCachedDataService mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + mockCachedDataService.Refresh(); + List subject = mockCachedDataService.Get(); + + subject.Should().BeSameAs(mockCollection); + } + + [Fact] + public void ShouldGetCachedItemsByPredicate() { + MockDataModel item1 = new MockDataModel {Name = "1"}; + MockDataModel item2 = new MockDataModel {Name = "2"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + + MockCachedDataService mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + List subject = mockCachedDataService.Get(x => x.Name == "1"); + + subject.Should().Contain(item1); + } + + [Fact] + public void ShouldGetCachedItem() { + MockDataModel item1 = new MockDataModel {Name = "1"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + + MockCachedDataService mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + MockDataModel subject = mockCachedDataService.GetSingle(item1.id); + + subject.Should().Be(item1); + } + + [Fact] + public void ShouldGetCachedItemByPredicate() { + MockDataModel item1 = new MockDataModel {Name = "1"}; + string id = item1.id; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + + MockCachedDataService mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + MockDataModel subject = mockCachedDataService.GetSingle(x => x.id == id); + + subject.Should().Be(item1); + } + + [Fact] + public async Task ShouldAddItem() { + MockDataModel item1 = new MockDataModel {Name = "1"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Add(It.IsAny())).Callback(x => mockCollection.Add(x)); + + MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + await subject.Add(item1); + + subject.Collection.Should().Contain(item1); + } + + [Fact] + public async Task ShouldUpdateItemValue() { + MockDataModel item1 = new MockDataModel {Name = "1"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + + MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + await subject.Update(item1.id, "Name", "2"); + + subject.Collection.First().Name.Should().Be("2"); + } + + [Fact] + public async Task ShouldUpdateItemValueByUpdateDefinition() { + MockDataModel item1 = new MockDataModel {Name = "1"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + + MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + await subject.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); + + subject.Collection.First().Name.Should().Be("2"); + } + [Fact] - public void ShouldCreateCollection() { - Mock mockDataCollection = new Mock(); - - // CachedDataService cachedDataService = new + public async Task ShouldDeleteItem() { + MockDataModel item1 = new MockDataModel {Name = "1"}; + MockDataModel item2 = new MockDataModel {Name = "2"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Delete(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + + MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + await subject.Delete(item1.id); + + subject.Collection.Should().HaveCount(1); + subject.Collection.Should().NotContain(item1); + subject.Collection.Should().Contain(item2); } } } diff --git a/UKSF.Tests.Unit/Data/DataServiceTests.cs b/UKSF.Tests.Unit/Data/DataServiceTests.cs index de0f55f2..f7708841 100644 --- a/UKSF.Tests.Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/DataServiceTests.cs @@ -4,12 +4,12 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; +using MongoDB.Bson.Serialization; using MongoDB.Driver; using Moq; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; -using UKSF.Common; using Xunit; namespace UKSF.Tests.Unit.Data { @@ -27,45 +27,17 @@ public DataServiceTests() { private readonly Mock> mockDataEventBus; private List mockCollection; - [Fact] - public void ShouldMakeSetUpdate() { - MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; - const string EXPECTED = "{\"_operatorName\":\"$set\",\"_field\":{\"_fieldName\":\"Name\",\"_fieldSerializer\":null},\"_value\":\"2\"}"; - UpdateDefinition subject = null; - - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string x, UpdateDefinition y) => subject = y); - - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - mockDataService.Update(item1.id, "Name", "2"); - - subject.DeepJsonSerializeObject().Should().BeEquivalentTo(EXPECTED); - } - - [Fact] - public void ShouldMakeUnsetUpdate() { - MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; - const string EXPECTED = "{\"_operatorName\":\"$unset\",\"_field\":{\"_fieldName\":\"Name\"},\"_value\":1}"; - UpdateDefinition subject = null; - - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string x, UpdateDefinition y) => subject = y); - - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - mockDataService.Update(item1.id, "Name", null); - - subject.DeepJsonSerializeObject().Should().BeEquivalentTo(EXPECTED); - } + private static BsonValue Render(UpdateDefinition updateDefinition) => updateDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); [Fact] - public void ShouldAddItem() { - MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; + public async Task ShouldAddItem() { + MockDataModel item1 = new MockDataModel {Name = "1"}; mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); mockDataCollection.Setup(x => x.Add(It.IsAny())).Callback(x => mockCollection.Add(x)); MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - mockDataService.Add(item1); + await mockDataService.Add(item1); mockCollection.Should().Contain(item1); } @@ -80,22 +52,24 @@ public void ShouldCreateCollection() { } [Fact] - public void ShouldDeleteItem() { - MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; - - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + public async Task ShouldDeleteItem() { + MockDataModel item1 = new MockDataModel {Name = "1"}; + MockDataModel item2 = new MockDataModel {Name = "2"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); mockDataCollection.Setup(x => x.Delete(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - mockDataService.Delete(item1.id); - - mockCollection.Should().HaveCount(0); + await mockDataService.Delete(item1.id); + + mockCollection.Should().HaveCount(1); mockCollection.Should().NotContain(item1); + mockCollection.Should().Contain(item2); } [Fact] public void ShouldGetItem() { - MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; + MockDataModel item1 = new MockDataModel {Name = "1"}; mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); @@ -108,8 +82,8 @@ public void ShouldGetItem() { [Fact] public void ShouldGetItemByPredicate() { - MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; - MockDataModel item2 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "2"}; + MockDataModel item1 = new MockDataModel {Name = "1"}; + MockDataModel item2 = new MockDataModel {Name = "2"}; string id = item1.id; mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); @@ -134,8 +108,8 @@ public void ShouldGetItems() { [Fact] public void ShouldGetItemsByPredicate() { - MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; - MockDataModel item2 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "2"}; + MockDataModel item1 = new MockDataModel {Name = "1"}; + MockDataModel item2 = new MockDataModel {Name = "2"}; string id = item1.id; mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); @@ -148,6 +122,36 @@ public void ShouldGetItemsByPredicate() { subject.Should().Contain(item1); } + [Fact] + public async Task ShouldMakeSetUpdate() { + MockDataModel item1 = new MockDataModel {Name = "1"}; + BsonValue expected = Render(Builders.Update.Set(x => x.Name, "2")); + UpdateDefinition subject = null; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string x, UpdateDefinition y) => subject = y); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + await mockDataService.Update(item1.id, "Name", "2"); + + Render(subject).Should().BeEquivalentTo(expected); + } + + [Fact] + public async Task ShouldMakeUnsetUpdate() { + MockDataModel item1 = new MockDataModel {Name = "1"}; + BsonValue expected = Render(Builders.Update.Unset(x => x.Name)); + UpdateDefinition subject = null; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string x, UpdateDefinition y) => subject = y); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + await mockDataService.Update(item1.id, "Name", null); + + Render(subject).Should().BeEquivalentTo(expected); + } + [Fact] public void ShouldSetCollectionName() { string collectionName = ""; @@ -160,27 +164,27 @@ public void ShouldSetCollectionName() { } [Fact] - public void ShouldUpdateItemValue() { - MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; + public async Task ShouldUpdateItemValue() { + MockDataModel item1 = new MockDataModel {Name = "1"}; mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - mockDataService.Update(item1.id, "Name", "2"); + await mockDataService.Update(item1.id, "Name", "2"); item1.Name.Should().Be("2"); } [Fact] - public void ShouldUpdateItemValueByUpdateDefinition() { - MockDataModel item1 = new MockDataModel(ObjectId.GenerateNewId().ToString()) {Name = "1"}; + public async Task ShouldUpdateItemValueByUpdateDefinition() { + MockDataModel item1 = new MockDataModel {Name = "1"}; mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - mockDataService.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); + await mockDataService.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); item1.Name.Should().Be("2"); } diff --git a/UKSF.Tests.Unit/Data/IMockCachedDataService.cs b/UKSF.Tests.Unit/Data/IMockCachedDataService.cs new file mode 100644 index 00000000..3ec21b60 --- /dev/null +++ b/UKSF.Tests.Unit/Data/IMockCachedDataService.cs @@ -0,0 +1,7 @@ +using UKSF.Api.Interfaces.Data; + +namespace UKSF.Tests.Unit.Data { + public interface IMockCachedDataService : IDataService { + + } +} diff --git a/UKSF.Tests.Unit/Data/MockCachedDataService.cs b/UKSF.Tests.Unit/Data/MockCachedDataService.cs new file mode 100644 index 00000000..9d2d322d --- /dev/null +++ b/UKSF.Tests.Unit/Data/MockCachedDataService.cs @@ -0,0 +1,9 @@ +using UKSF.Api.Data; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; + +namespace UKSF.Tests.Unit.Data { + public class MockCachedDataService : CachedDataService, IMockCachedDataService { + public MockCachedDataService(IDataCollection dataCollection, IDataEventBus dataEventBus, string collectionName) : base(dataCollection, dataEventBus, collectionName) { } + } +} diff --git a/UKSF.Tests.Unit/Events/DataEventBackerTests.cs b/UKSF.Tests.Unit/Events/DataEventBackerTests.cs new file mode 100644 index 00000000..6459481a --- /dev/null +++ b/UKSF.Tests.Unit/Events/DataEventBackerTests.cs @@ -0,0 +1,46 @@ +using System; +using FluentAssertions; +using MongoDB.Bson; +using Moq; +using UKSF.Api.Events.Data; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; +using UKSF.Tests.Unit.Data; +using Xunit; + +namespace UKSF.Tests.Unit.Events { + public class DataEventBackerTests { + public DataEventBackerTests() { + mockDataCollection = new Mock(); + dataEventBus = new DataEventBus(); + } + + private readonly Mock mockDataCollection; + private readonly IDataEventBus dataEventBus; + + [Fact] + public void ShouldReturnEventBus() { + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, dataEventBus, "test"); + IObservable> subject = mockDataService.EventBus(); + + subject.Should().NotBeNull(); + } + + [Fact] + public void ShouldSendEvent() { + MockDataModel item1 = new MockDataModel {Name = "1"}; + string id = item1.id; + + DataEventModel subject = null; + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, dataEventBus, "test"); + mockDataService.EventBus().Subscribe(x => { subject = x; }); + mockDataService.Add(item1); + + subject.Should().NotBeNull(); + subject.id.Should().Be(id); + subject.type.Should().Be(DataEventType.ADD); + subject.data.Should().Be(item1); + } + } +} diff --git a/UKSF.Tests.Unit/Events/EventBusTests.cs b/UKSF.Tests.Unit/Events/EventBusTests.cs new file mode 100644 index 00000000..5cba037f --- /dev/null +++ b/UKSF.Tests.Unit/Events/EventBusTests.cs @@ -0,0 +1,19 @@ +using System; +using FluentAssertions; +using UKSF.Api.Events; +using UKSF.Api.Models.Events; +using UKSF.Tests.Unit.Data; +using Xunit; + +namespace UKSF.Tests.Unit.Events { + public class EventBusTests { + [Fact] + public void ShouldReturnObservable() { + EventBus> eventBus = new EventBus>(); + + IObservable> subject = eventBus.AsObservable(); + + subject.Should().NotBeNull(); + } + } +} diff --git a/UKSF.Tests.Unit/MockDataModel.cs b/UKSF.Tests.Unit/MockDataModel.cs index 4de35037..851f64a3 100644 --- a/UKSF.Tests.Unit/MockDataModel.cs +++ b/UKSF.Tests.Unit/MockDataModel.cs @@ -3,9 +3,9 @@ namespace UKSF.Tests.Unit { public class MockDataModel : MongoObject { public string Name; - + public MockDataModel() { } - public MockDataModel(string id) : base(id) { } + protected MockDataModel(string id) : base(id) { } } } From 08b9b5e07a0677592dc976805017fffa8a9b683c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 5 Feb 2020 01:11:22 +0000 Subject: [PATCH 106/369] Try adding postmessage to path --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ac7695e0..b70f1b6f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,6 +15,8 @@ jobs: dotnet-version: 3.1.101 - name: Build with dotnet run: dotnet build -c Release + - name: Add Postmessage to path + run: set PATH=%PATH%;D:\a\api\api\UKSF.PostMessage\bin\Release\netcoreapp3.1 - name: Run tests with coverage run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info - name: Coveralls From 4469459ae89675d6308646d5fba4a4e406d54743 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 5 Feb 2020 01:24:18 +0000 Subject: [PATCH 107/369] Try quotes for postmessage path --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b70f1b6f..f4673b9f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: - name: Build with dotnet run: dotnet build -c Release - name: Add Postmessage to path - run: set PATH=%PATH%;D:\a\api\api\UKSF.PostMessage\bin\Release\netcoreapp3.1 + run: set "PATH=%PATH%;D:\a\api\api\UKSF.PostMessage\bin\Release\netcoreapp3.1" - name: Run tests with coverage run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info - name: Coveralls From 4fba852fba2400de7306392458b4dd568ac2b32b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 5 Feb 2020 01:56:25 +0000 Subject: [PATCH 108/369] Don't test CloseProcessGracefully --- .github/workflows/test.yml | 2 - .../Common/ProcessUtilitiesTests.cs | 45 ++++++++++--------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f4673b9f..ac7695e0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,8 +15,6 @@ jobs: dotnet-version: 3.1.101 - name: Build with dotnet run: dotnet build -c Release - - name: Add Postmessage to path - run: set "PATH=%PATH%;D:\a\api\api\UKSF.PostMessage\bin\Release\netcoreapp3.1" - name: Run tests with coverage run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info - name: Coveralls diff --git a/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs b/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs index 40ce2c6e..e7d9044c 100644 --- a/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs @@ -41,27 +41,28 @@ public async Task ShouldRunTask() { TaskService.Instance.RootFolder.DeleteTask(NAME, false); } - [Fact] - public async Task ShouldCloseProcess() { - const string NAME = "Test"; - const string COMMAND = "timeout 5"; - string expected = $"C:\\Windows\\system32\\cmd.EXE /C {COMMAND}"; - - await ProcessUtilities.LaunchExternalProcess(NAME, COMMAND); - await Task.Delay(TimeSpan.FromSeconds(1)); - - Process subject = Process.GetProcessesByName("cmd").FirstOrDefault(x => { - using ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT CommandLine FROM Win32_Process WHERE ProcessId = " + x.Id); - using ManagementObjectCollection objects = searcher.Get(); - return objects.Cast().SingleOrDefault()?["CommandLine"]?.ToString() == expected; - }); - - subject.Should().NotBeNull(); - - await subject.CloseProcessGracefully(); - await Task.Delay(TimeSpan.FromSeconds(1)); - - subject?.HasExited.Should().BeTrue(); - } + // TODO: Rethink this one. Maybe just ignore CloseProcessGracefully + // [Fact] + // public async Task ShouldCloseProcess() { + // const string NAME = "Test"; + // const string COMMAND = "timeout 5"; + // string expected = $"C:\\Windows\\system32\\cmd.EXE /C {COMMAND}"; + // + // await ProcessUtilities.LaunchExternalProcess(NAME, COMMAND); + // await Task.Delay(TimeSpan.FromSeconds(1)); + // + // Process subject = Process.GetProcessesByName("cmd").FirstOrDefault(x => { + // using ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT CommandLine FROM Win32_Process WHERE ProcessId = " + x.Id); + // using ManagementObjectCollection objects = searcher.Get(); + // return objects.Cast().SingleOrDefault()?["CommandLine"]?.ToString() == expected; + // }); + // + // subject.Should().NotBeNull(); + // + // await subject.CloseProcessGracefully(); + // await Task.Delay(TimeSpan.FromSeconds(1)); + // + // subject?.HasExited.Should().BeTrue(); + // } } } From b62a54efdc85b3bfe1c19502b22f1a45bd98bdee Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 6 Feb 2020 02:19:31 +0000 Subject: [PATCH 109/369] More unit tests. Try excluding PostMessage from coverage --- UKSF.Api/Controllers/RanksController.cs | 1 + UKSF.Common/ProcessUtilities.cs | 2 + UKSF.PostMessage/Program.cs | 4 +- UKSF.Tests.Unit/MockDataModel.cs | 4 -- UKSF.Tests.Unit/MockPrivateDataModel.cs | 17 ------ UKSF.Tests.Unit/Signalr/AccountHubTests.cs | 61 +++++++++++++++++++ .../Signalr/CommentThreadHubTests.cs | 61 +++++++++++++++++++ .../Signalr/NotificationHubTests.cs | 61 +++++++++++++++++++ UKSF.Tests.Unit/Signalr/TeamspeakHubTests.cs | 50 +++++++++++++++ 9 files changed, 239 insertions(+), 22 deletions(-) delete mode 100644 UKSF.Tests.Unit/MockPrivateDataModel.cs create mode 100644 UKSF.Tests.Unit/Signalr/AccountHubTests.cs create mode 100644 UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs create mode 100644 UKSF.Tests.Unit/Signalr/NotificationHubTests.cs create mode 100644 UKSF.Tests.Unit/Signalr/TeamspeakHubTests.cs diff --git a/UKSF.Api/Controllers/RanksController.cs b/UKSF.Api/Controllers/RanksController.cs index c6b1f502..7b2ce9a3 100644 --- a/UKSF.Api/Controllers/RanksController.cs +++ b/UKSF.Api/Controllers/RanksController.cs @@ -66,6 +66,7 @@ public async Task EditRank([FromBody] Rank rank) { LogWrapper.AuditLog(sessionService.GetContextId(), $"Rank updated from '{oldRank.name}, {oldRank.abbreviation}, {oldRank.teamspeakGroup}, {oldRank.discordRoleId}' to '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}, {rank.discordRoleId}'"); await ranksService.Data().Update(rank.id, Builders.Update.Set("name", rank.name).Set("abbreviation", rank.abbreviation).Set("teamspeakGroup", rank.teamspeakGroup).Set("discordRoleId", rank.discordRoleId)); foreach (Account account in accountService.Data().Get(x => x.rank == oldRank.name)) { + // TODO: Notify user to update name in TS if rank abbreviate changed await accountService.Data().Update(account.id, "rank", rank.name); } diff --git a/UKSF.Common/ProcessUtilities.cs b/UKSF.Common/ProcessUtilities.cs index 54a1f83f..c11f5feb 100644 --- a/UKSF.Common/ProcessUtilities.cs +++ b/UKSF.Common/ProcessUtilities.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Management; using Microsoft.Win32.TaskScheduler; using Task = System.Threading.Tasks.Task; @@ -36,6 +37,7 @@ public static async Task LaunchExternalProcess(string name, string command) { await Task.Delay(TimeSpan.FromSeconds(1)); } + [ExcludeFromCodeCoverage] public static async Task CloseProcessGracefully(this Process process) { // UKSF.PostMessage exe location should be set as a PATH variable await LaunchExternalProcess("CloseProcess", $"start \"\" \"UKSF.PostMessage\" {process.ProcessName} {WM_SYSCOMMAND} {SC_CLOSE} 0"); diff --git a/UKSF.PostMessage/Program.cs b/UKSF.PostMessage/Program.cs index 21a3c921..624a2af9 100644 --- a/UKSF.PostMessage/Program.cs +++ b/UKSF.PostMessage/Program.cs @@ -1,13 +1,15 @@ using System; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Runtime.InteropServices; namespace UKSF.PostMessage { + [ExcludeFromCodeCoverage] internal static class Program { [DllImport("user32.dll", CharSet = CharSet.Auto)] private static extern int PostMessage(IntPtr hwnd, int msg, int wparam, int lparam); - + public static void Main(string[] args) { Process process = Process.GetProcesses().FirstOrDefault(x => x.ProcessName == args[0]); if (process == null) return; diff --git a/UKSF.Tests.Unit/MockDataModel.cs b/UKSF.Tests.Unit/MockDataModel.cs index 851f64a3..d77e54a5 100644 --- a/UKSF.Tests.Unit/MockDataModel.cs +++ b/UKSF.Tests.Unit/MockDataModel.cs @@ -3,9 +3,5 @@ namespace UKSF.Tests.Unit { public class MockDataModel : MongoObject { public string Name; - - public MockDataModel() { } - - protected MockDataModel(string id) : base(id) { } } } diff --git a/UKSF.Tests.Unit/MockPrivateDataModel.cs b/UKSF.Tests.Unit/MockPrivateDataModel.cs deleted file mode 100644 index 9571feb2..00000000 --- a/UKSF.Tests.Unit/MockPrivateDataModel.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; - -// ReSharper disable NotAccessedField.Local - -namespace UKSF.Tests.Unit { - public class MockPrivateDataModel : MockDataModel { - private readonly int count; - private readonly string description; - private readonly DateTime timestamp; - - public MockPrivateDataModel(string id, string description, int count, DateTime timestamp) : base(id) { - this.description = description; - this.count = count; - this.timestamp = timestamp; - } - } -} diff --git a/UKSF.Tests.Unit/Signalr/AccountHubTests.cs b/UKSF.Tests.Unit/Signalr/AccountHubTests.cs new file mode 100644 index 00000000..2e2cc561 --- /dev/null +++ b/UKSF.Tests.Unit/Signalr/AccountHubTests.cs @@ -0,0 +1,61 @@ +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using FluentAssertions; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Connections.Features; +using Microsoft.AspNetCore.SignalR; +using Microsoft.Extensions.Primitives; +using MongoDB.Bson; +using Moq; +using UKSF.Api.Signalr.Hubs.Personnel; +using Xunit; + +namespace UKSF.Tests.Unit.Signalr { + public class AccountHubTests { + public AccountHubTests() { + id = ObjectId.GenerateNewId().ToString(); + IQueryCollection queryCollection = new QueryCollection(new Dictionary {{"userId", id}}); + + Mock mockHttpContext = new Mock(); + Mock mockHttpContextFeature = new Mock(); + mockHubCallerContext = new Mock(); + mockGroupManager = new Mock(); + + mockHttpContext.Setup(x => x.Request.Query).Returns(queryCollection); + mockHttpContextFeature.Setup(x => x.HttpContext).Returns(mockHttpContext.Object); + mockHubCallerContext.Setup(x => x.ConnectionId).Returns("1"); + mockHubCallerContext.Setup(x => x.Features.Get()).Returns(mockHttpContextFeature.Object); + } + + private readonly string id; + private readonly Mock mockHubCallerContext; + private readonly Mock mockGroupManager; + + [Fact] + public async Task ShouldAddToGroup() { + Dictionary subject = new Dictionary(); + + mockGroupManager.Setup(x => x.AddToGroupAsync(It.IsAny(), It.IsAny(), default)).Callback((string connectionId, string userId, CancellationToken _) => { subject.Add(connectionId, userId); }); + + AccountHub accountHub = new AccountHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; + await accountHub.OnConnectedAsync(); + + subject.Should().HaveCount(1); + subject.Should().ContainKey("1"); + subject.Should().ContainValue(id); + } + + [Fact] + public async Task ShouldRemoveFromGroup() { + Dictionary subject = new Dictionary {{"1", id}}; + + mockGroupManager.Setup(x => x.RemoveFromGroupAsync(It.IsAny(), It.IsAny(), default)).Callback((string connectionId, string userId, CancellationToken _) => { subject.Remove(connectionId); }); + + AccountHub accountHub = new AccountHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; + await accountHub.OnDisconnectedAsync(null); + + subject.Should().HaveCount(0); + } + } +} diff --git a/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs b/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs new file mode 100644 index 00000000..0bb138b2 --- /dev/null +++ b/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs @@ -0,0 +1,61 @@ +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using FluentAssertions; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Connections.Features; +using Microsoft.AspNetCore.SignalR; +using Microsoft.Extensions.Primitives; +using MongoDB.Bson; +using Moq; +using UKSF.Api.Signalr.Hubs.Message; +using Xunit; + +namespace UKSF.Tests.Unit.Signalr { + public class CommentThreadHubTests { + public CommentThreadHubTests() { + id = ObjectId.GenerateNewId().ToString(); + IQueryCollection queryCollection = new QueryCollection(new Dictionary {{"threadId", id}}); + + Mock mockHttpContext = new Mock(); + Mock mockHttpContextFeature = new Mock(); + mockHubCallerContext = new Mock(); + mockGroupManager = new Mock(); + + mockHttpContext.Setup(x => x.Request.Query).Returns(queryCollection); + mockHttpContextFeature.Setup(x => x.HttpContext).Returns(mockHttpContext.Object); + mockHubCallerContext.Setup(x => x.ConnectionId).Returns("1"); + mockHubCallerContext.Setup(x => x.Features.Get()).Returns(mockHttpContextFeature.Object); + } + + private readonly string id; + private readonly Mock mockHubCallerContext; + private readonly Mock mockGroupManager; + + [Fact] + public async Task ShouldAddToGroup() { + Dictionary subject = new Dictionary(); + + mockGroupManager.Setup(x => x.AddToGroupAsync(It.IsAny(), It.IsAny(), default)).Callback((string connectionId, string userId, CancellationToken _) => { subject.Add(connectionId, userId); }); + + CommentThreadHub commentThreadHub = new CommentThreadHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; + await commentThreadHub.OnConnectedAsync(); + + subject.Should().HaveCount(1); + subject.Should().ContainKey("1"); + subject.Should().ContainValue(id); + } + + [Fact] + public async Task ShouldRemoveFromGroup() { + Dictionary subject = new Dictionary {{"1", id}}; + + mockGroupManager.Setup(x => x.RemoveFromGroupAsync(It.IsAny(), It.IsAny(), default)).Callback((string connectionId, string userId, CancellationToken _) => { subject.Remove(connectionId); }); + + CommentThreadHub commentThreadHub = new CommentThreadHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; + await commentThreadHub.OnDisconnectedAsync(null); + + subject.Should().HaveCount(0); + } + } +} diff --git a/UKSF.Tests.Unit/Signalr/NotificationHubTests.cs b/UKSF.Tests.Unit/Signalr/NotificationHubTests.cs new file mode 100644 index 00000000..e24560c9 --- /dev/null +++ b/UKSF.Tests.Unit/Signalr/NotificationHubTests.cs @@ -0,0 +1,61 @@ +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using FluentAssertions; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Connections.Features; +using Microsoft.AspNetCore.SignalR; +using Microsoft.Extensions.Primitives; +using MongoDB.Bson; +using Moq; +using UKSF.Api.Signalr.Hubs.Message; +using Xunit; + +namespace UKSF.Tests.Unit.Signalr { + public class NotificationHubTests { + public NotificationHubTests() { + id = ObjectId.GenerateNewId().ToString(); + IQueryCollection queryCollection = new QueryCollection(new Dictionary {{"userId", id}}); + + Mock mockHttpContext = new Mock(); + Mock mockHttpContextFeature = new Mock(); + mockHubCallerContext = new Mock(); + mockGroupManager = new Mock(); + + mockHttpContext.Setup(x => x.Request.Query).Returns(queryCollection); + mockHttpContextFeature.Setup(x => x.HttpContext).Returns(mockHttpContext.Object); + mockHubCallerContext.Setup(x => x.ConnectionId).Returns("1"); + mockHubCallerContext.Setup(x => x.Features.Get()).Returns(mockHttpContextFeature.Object); + } + + private readonly string id; + private readonly Mock mockHubCallerContext; + private readonly Mock mockGroupManager; + + [Fact] + public async Task ShouldAddToGroup() { + Dictionary subject = new Dictionary(); + + mockGroupManager.Setup(x => x.AddToGroupAsync(It.IsAny(), It.IsAny(), default)).Callback((string connectionId, string userId, CancellationToken _) => { subject.Add(connectionId, userId); }); + + NotificationHub notificationHub = new NotificationHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; + await notificationHub.OnConnectedAsync(); + + subject.Should().HaveCount(1); + subject.Should().ContainKey("1"); + subject.Should().ContainValue(id); + } + + [Fact] + public async Task ShouldRemoveFromGroup() { + Dictionary subject = new Dictionary {{"1", id}}; + + mockGroupManager.Setup(x => x.RemoveFromGroupAsync(It.IsAny(), It.IsAny(), default)).Callback((string connectionId, string userId, CancellationToken _) => { subject.Remove(connectionId); }); + + NotificationHub notificationHub = new NotificationHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; + await notificationHub.OnDisconnectedAsync(null); + + subject.Should().HaveCount(0); + } + } +} diff --git a/UKSF.Tests.Unit/Signalr/TeamspeakHubTests.cs b/UKSF.Tests.Unit/Signalr/TeamspeakHubTests.cs new file mode 100644 index 00000000..085aa2b0 --- /dev/null +++ b/UKSF.Tests.Unit/Signalr/TeamspeakHubTests.cs @@ -0,0 +1,50 @@ +using System.Threading.Tasks; +using FluentAssertions; +using Moq; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Events.Types; +using UKSF.Api.Signalr.Hubs.Integrations; +using Xunit; + +namespace UKSF.Tests.Unit.Signalr { + public class TeamspeakHubTests { + public TeamspeakHubTests() => mockSignalrEventBus = new Mock(); + + private readonly Mock mockSignalrEventBus; + + [Fact] + public void ShouldSendEvent() { + SignalrEventModel expected = new SignalrEventModel {procedure = TeamspeakEventType.EMPTY, args = "test"}; + SignalrEventModel subject = null; + + mockSignalrEventBus.Setup(x => x.Send(It.IsAny())).Callback((SignalrEventModel x) => subject = x); + + TeamspeakHub teamspeakHub = new TeamspeakHub(mockSignalrEventBus.Object); + teamspeakHub.Invoke(0, "test"); + + subject.Should().NotBeNull(); + subject.Should().BeEquivalentTo(expected); + } + + [Fact] + public async Task ShouldSetConnected() { + TeamspeakHubState.Connected = false; + + TeamspeakHub teamspeakHub = new TeamspeakHub(mockSignalrEventBus.Object); + await teamspeakHub.OnConnectedAsync(); + + TeamspeakHubState.Connected.Should().BeTrue(); + } + + [Fact] + public async Task ShouldUnsetConnected() { + TeamspeakHubState.Connected = true; + + TeamspeakHub teamspeakHub = new TeamspeakHub(mockSignalrEventBus.Object); + await teamspeakHub.OnDisconnectedAsync(null); + + TeamspeakHubState.Connected.Should().BeFalse(); + } + } +} From fe826b81d4d48ed33db8f83e34e3cd8abb5facd0 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 6 Feb 2020 11:34:33 +0000 Subject: [PATCH 110/369] Expose more steps in commenthreadhub to see which branch is not covered --- .gitignore | 1 + UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs | 7 ++++++- UKSF.Tests.Unit/UKSF.Tests.Unit.csproj | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a2ec3237..461fa936 100644 --- a/.gitignore +++ b/.gitignore @@ -260,3 +260,4 @@ coverage.xml # Specific appsettings.Development.json +*.info diff --git a/UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs b/UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs index 78a86de2..cece0464 100644 --- a/UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs +++ b/UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; using UKSF.Api.Interfaces.Hubs; @@ -11,7 +12,11 @@ public class CommentThreadHub : Hub { public const string END_POINT = "commentThread"; public override async Task OnConnectedAsync() { - StringValues threadId = Context.GetHttpContext().Request.Query["threadId"]; + HubCallerContext hubCallerContext = Context; + HttpContext httpContext = hubCallerContext.GetHttpContext(); + HttpRequest httpContextRequest = httpContext.Request; + IQueryCollection queryCollection = httpContextRequest.Query; + StringValues threadId = queryCollection["threadId"]; await Groups.AddToGroupAsync(Context.ConnectionId, threadId); await base.OnConnectedAsync(); } diff --git a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj index 96813cc5..60ce797f 100644 --- a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj +++ b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj @@ -12,11 +12,11 @@ all - + - - - + + + From 791e0b96525e095297c6956520f9029666040104 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 6 Feb 2020 11:53:02 +0000 Subject: [PATCH 111/369] Test disposed --- UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs b/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs index 0bb138b2..195156b0 100644 --- a/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs +++ b/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using FluentAssertions; @@ -57,5 +58,14 @@ public async Task ShouldRemoveFromGroup() { subject.Should().HaveCount(0); } + + [Fact] + public void ShouldThrowOnDisposed() { + CommentThreadHub commentThreadHub = new CommentThreadHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; + commentThreadHub.Dispose(); + Func act = async () => await commentThreadHub.OnConnectedAsync(); + + act.Should().Throw(); + } } } From 54442c003c547ac0df56a6d8445fc5d663703b2b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 6 Feb 2020 11:59:59 +0000 Subject: [PATCH 112/369] Explicitly get context object, test for null --- UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs b/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs index 195156b0..0af6ba0e 100644 --- a/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs +++ b/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs @@ -63,9 +63,12 @@ public async Task ShouldRemoveFromGroup() { public void ShouldThrowOnDisposed() { CommentThreadHub commentThreadHub = new CommentThreadHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; commentThreadHub.Dispose(); - Func act = async () => await commentThreadHub.OnConnectedAsync(); + + HubCallerContext subject = null; + Action act = () => subject = commentThreadHub.Context; act.Should().Throw(); + subject.Should().BeNull(); } } } From 1ac9796f36c117238d5eb88d3947068a5212792a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 6 Feb 2020 14:07:04 +0000 Subject: [PATCH 113/369] Test context returns correct object --- UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs b/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs index 0af6ba0e..5070c2e4 100644 --- a/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs +++ b/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs @@ -70,5 +70,16 @@ public void ShouldThrowOnDisposed() { act.Should().Throw(); subject.Should().BeNull(); } + + [Fact] + public void ShouldReturnContext() { + CommentThreadHub commentThreadHub = new CommentThreadHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; + + HubCallerContext subject = null; + Action act = () => subject = commentThreadHub.Context; + + act.Should().NotThrow(); + subject.Should().Be(mockHubCallerContext.Object); + } } } From 3e8c87a3fefcad93a2b45ec58721051a563f295a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 6 Feb 2020 14:15:23 +0000 Subject: [PATCH 114/369] Test when context is null --- UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs b/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs index 5070c2e4..dfc97326 100644 --- a/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs +++ b/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs @@ -61,7 +61,7 @@ public async Task ShouldRemoveFromGroup() { [Fact] public void ShouldThrowOnDisposed() { - CommentThreadHub commentThreadHub = new CommentThreadHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; + CommentThreadHub commentThreadHub = new CommentThreadHub {Context = mockHubCallerContext.Object}; commentThreadHub.Dispose(); HubCallerContext subject = null; @@ -73,7 +73,7 @@ public void ShouldThrowOnDisposed() { [Fact] public void ShouldReturnContext() { - CommentThreadHub commentThreadHub = new CommentThreadHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; + CommentThreadHub commentThreadHub = new CommentThreadHub {Context = mockHubCallerContext.Object}; HubCallerContext subject = null; Action act = () => subject = commentThreadHub.Context; @@ -81,5 +81,14 @@ public void ShouldReturnContext() { act.Should().NotThrow(); subject.Should().Be(mockHubCallerContext.Object); } + + [Fact] + public void ShouldReturnNullContext() { + CommentThreadHub commentThreadHub = new CommentThreadHub(); + + HubCallerContext subject = commentThreadHub.Context; + + subject.Should().BeNull(); + } } } From 0591a7818ff5700c515fcbfa781cb8b8a4d042a6 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 6 Feb 2020 14:16:45 +0000 Subject: [PATCH 115/369] Change test build event parameters --- .github/workflows/test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ac7695e0..f8619b76 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,11 @@ name: Build & Run Tests env: DOTNET_CLI_TELEMETRY_OPTOUT: 1 -on: ["push", "pull_request"] +on: + push: + branches: + - master + pull_request: jobs: Test: From 29aa5b5012da9d322cc2727efc8dc1071c95f88e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 6 Feb 2020 16:07:46 +0000 Subject: [PATCH 116/369] Don't cover signalr and postmessage. Remove signalr unit tests, not needed --- .github/workflows/test.yml | 2 +- .../Hubs/Message/CommentThreadHub.cs | 7 +- UKSF.PostMessage/Program.cs | 1 - UKSF.Tests.Unit/Signalr/AccountHubTests.cs | 61 ------------ .../Signalr/CommentThreadHubTests.cs | 94 ------------------- .../Signalr/NotificationHubTests.cs | 61 ------------ UKSF.Tests.Unit/Signalr/TeamspeakHubTests.cs | 50 ---------- 7 files changed, 2 insertions(+), 274 deletions(-) delete mode 100644 UKSF.Tests.Unit/Signalr/AccountHubTests.cs delete mode 100644 UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs delete mode 100644 UKSF.Tests.Unit/Signalr/NotificationHubTests.cs delete mode 100644 UKSF.Tests.Unit/Signalr/TeamspeakHubTests.cs diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f8619b76..cbdfbeec 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: - name: Build with dotnet run: dotnet build -c Release - name: Run tests with coverage - run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info + run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info /p:Exclude="[UKSF.Api.Signalr]*,[UKSF.PostMessage]*" - name: Coveralls uses: coverallsapp/github-action@master with: diff --git a/UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs b/UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs index cece0464..78a86de2 100644 --- a/UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs +++ b/UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs @@ -1,7 +1,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; using UKSF.Api.Interfaces.Hubs; @@ -12,11 +11,7 @@ public class CommentThreadHub : Hub { public const string END_POINT = "commentThread"; public override async Task OnConnectedAsync() { - HubCallerContext hubCallerContext = Context; - HttpContext httpContext = hubCallerContext.GetHttpContext(); - HttpRequest httpContextRequest = httpContext.Request; - IQueryCollection queryCollection = httpContextRequest.Query; - StringValues threadId = queryCollection["threadId"]; + StringValues threadId = Context.GetHttpContext().Request.Query["threadId"]; await Groups.AddToGroupAsync(Context.ConnectionId, threadId); await base.OnConnectedAsync(); } diff --git a/UKSF.PostMessage/Program.cs b/UKSF.PostMessage/Program.cs index 624a2af9..7f64d4f5 100644 --- a/UKSF.PostMessage/Program.cs +++ b/UKSF.PostMessage/Program.cs @@ -5,7 +5,6 @@ using System.Runtime.InteropServices; namespace UKSF.PostMessage { - [ExcludeFromCodeCoverage] internal static class Program { [DllImport("user32.dll", CharSet = CharSet.Auto)] private static extern int PostMessage(IntPtr hwnd, int msg, int wparam, int lparam); diff --git a/UKSF.Tests.Unit/Signalr/AccountHubTests.cs b/UKSF.Tests.Unit/Signalr/AccountHubTests.cs deleted file mode 100644 index 2e2cc561..00000000 --- a/UKSF.Tests.Unit/Signalr/AccountHubTests.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using FluentAssertions; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Connections.Features; -using Microsoft.AspNetCore.SignalR; -using Microsoft.Extensions.Primitives; -using MongoDB.Bson; -using Moq; -using UKSF.Api.Signalr.Hubs.Personnel; -using Xunit; - -namespace UKSF.Tests.Unit.Signalr { - public class AccountHubTests { - public AccountHubTests() { - id = ObjectId.GenerateNewId().ToString(); - IQueryCollection queryCollection = new QueryCollection(new Dictionary {{"userId", id}}); - - Mock mockHttpContext = new Mock(); - Mock mockHttpContextFeature = new Mock(); - mockHubCallerContext = new Mock(); - mockGroupManager = new Mock(); - - mockHttpContext.Setup(x => x.Request.Query).Returns(queryCollection); - mockHttpContextFeature.Setup(x => x.HttpContext).Returns(mockHttpContext.Object); - mockHubCallerContext.Setup(x => x.ConnectionId).Returns("1"); - mockHubCallerContext.Setup(x => x.Features.Get()).Returns(mockHttpContextFeature.Object); - } - - private readonly string id; - private readonly Mock mockHubCallerContext; - private readonly Mock mockGroupManager; - - [Fact] - public async Task ShouldAddToGroup() { - Dictionary subject = new Dictionary(); - - mockGroupManager.Setup(x => x.AddToGroupAsync(It.IsAny(), It.IsAny(), default)).Callback((string connectionId, string userId, CancellationToken _) => { subject.Add(connectionId, userId); }); - - AccountHub accountHub = new AccountHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; - await accountHub.OnConnectedAsync(); - - subject.Should().HaveCount(1); - subject.Should().ContainKey("1"); - subject.Should().ContainValue(id); - } - - [Fact] - public async Task ShouldRemoveFromGroup() { - Dictionary subject = new Dictionary {{"1", id}}; - - mockGroupManager.Setup(x => x.RemoveFromGroupAsync(It.IsAny(), It.IsAny(), default)).Callback((string connectionId, string userId, CancellationToken _) => { subject.Remove(connectionId); }); - - AccountHub accountHub = new AccountHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; - await accountHub.OnDisconnectedAsync(null); - - subject.Should().HaveCount(0); - } - } -} diff --git a/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs b/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs deleted file mode 100644 index dfc97326..00000000 --- a/UKSF.Tests.Unit/Signalr/CommentThreadHubTests.cs +++ /dev/null @@ -1,94 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using FluentAssertions; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Connections.Features; -using Microsoft.AspNetCore.SignalR; -using Microsoft.Extensions.Primitives; -using MongoDB.Bson; -using Moq; -using UKSF.Api.Signalr.Hubs.Message; -using Xunit; - -namespace UKSF.Tests.Unit.Signalr { - public class CommentThreadHubTests { - public CommentThreadHubTests() { - id = ObjectId.GenerateNewId().ToString(); - IQueryCollection queryCollection = new QueryCollection(new Dictionary {{"threadId", id}}); - - Mock mockHttpContext = new Mock(); - Mock mockHttpContextFeature = new Mock(); - mockHubCallerContext = new Mock(); - mockGroupManager = new Mock(); - - mockHttpContext.Setup(x => x.Request.Query).Returns(queryCollection); - mockHttpContextFeature.Setup(x => x.HttpContext).Returns(mockHttpContext.Object); - mockHubCallerContext.Setup(x => x.ConnectionId).Returns("1"); - mockHubCallerContext.Setup(x => x.Features.Get()).Returns(mockHttpContextFeature.Object); - } - - private readonly string id; - private readonly Mock mockHubCallerContext; - private readonly Mock mockGroupManager; - - [Fact] - public async Task ShouldAddToGroup() { - Dictionary subject = new Dictionary(); - - mockGroupManager.Setup(x => x.AddToGroupAsync(It.IsAny(), It.IsAny(), default)).Callback((string connectionId, string userId, CancellationToken _) => { subject.Add(connectionId, userId); }); - - CommentThreadHub commentThreadHub = new CommentThreadHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; - await commentThreadHub.OnConnectedAsync(); - - subject.Should().HaveCount(1); - subject.Should().ContainKey("1"); - subject.Should().ContainValue(id); - } - - [Fact] - public async Task ShouldRemoveFromGroup() { - Dictionary subject = new Dictionary {{"1", id}}; - - mockGroupManager.Setup(x => x.RemoveFromGroupAsync(It.IsAny(), It.IsAny(), default)).Callback((string connectionId, string userId, CancellationToken _) => { subject.Remove(connectionId); }); - - CommentThreadHub commentThreadHub = new CommentThreadHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; - await commentThreadHub.OnDisconnectedAsync(null); - - subject.Should().HaveCount(0); - } - - [Fact] - public void ShouldThrowOnDisposed() { - CommentThreadHub commentThreadHub = new CommentThreadHub {Context = mockHubCallerContext.Object}; - commentThreadHub.Dispose(); - - HubCallerContext subject = null; - Action act = () => subject = commentThreadHub.Context; - - act.Should().Throw(); - subject.Should().BeNull(); - } - - [Fact] - public void ShouldReturnContext() { - CommentThreadHub commentThreadHub = new CommentThreadHub {Context = mockHubCallerContext.Object}; - - HubCallerContext subject = null; - Action act = () => subject = commentThreadHub.Context; - - act.Should().NotThrow(); - subject.Should().Be(mockHubCallerContext.Object); - } - - [Fact] - public void ShouldReturnNullContext() { - CommentThreadHub commentThreadHub = new CommentThreadHub(); - - HubCallerContext subject = commentThreadHub.Context; - - subject.Should().BeNull(); - } - } -} diff --git a/UKSF.Tests.Unit/Signalr/NotificationHubTests.cs b/UKSF.Tests.Unit/Signalr/NotificationHubTests.cs deleted file mode 100644 index e24560c9..00000000 --- a/UKSF.Tests.Unit/Signalr/NotificationHubTests.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using FluentAssertions; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Connections.Features; -using Microsoft.AspNetCore.SignalR; -using Microsoft.Extensions.Primitives; -using MongoDB.Bson; -using Moq; -using UKSF.Api.Signalr.Hubs.Message; -using Xunit; - -namespace UKSF.Tests.Unit.Signalr { - public class NotificationHubTests { - public NotificationHubTests() { - id = ObjectId.GenerateNewId().ToString(); - IQueryCollection queryCollection = new QueryCollection(new Dictionary {{"userId", id}}); - - Mock mockHttpContext = new Mock(); - Mock mockHttpContextFeature = new Mock(); - mockHubCallerContext = new Mock(); - mockGroupManager = new Mock(); - - mockHttpContext.Setup(x => x.Request.Query).Returns(queryCollection); - mockHttpContextFeature.Setup(x => x.HttpContext).Returns(mockHttpContext.Object); - mockHubCallerContext.Setup(x => x.ConnectionId).Returns("1"); - mockHubCallerContext.Setup(x => x.Features.Get()).Returns(mockHttpContextFeature.Object); - } - - private readonly string id; - private readonly Mock mockHubCallerContext; - private readonly Mock mockGroupManager; - - [Fact] - public async Task ShouldAddToGroup() { - Dictionary subject = new Dictionary(); - - mockGroupManager.Setup(x => x.AddToGroupAsync(It.IsAny(), It.IsAny(), default)).Callback((string connectionId, string userId, CancellationToken _) => { subject.Add(connectionId, userId); }); - - NotificationHub notificationHub = new NotificationHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; - await notificationHub.OnConnectedAsync(); - - subject.Should().HaveCount(1); - subject.Should().ContainKey("1"); - subject.Should().ContainValue(id); - } - - [Fact] - public async Task ShouldRemoveFromGroup() { - Dictionary subject = new Dictionary {{"1", id}}; - - mockGroupManager.Setup(x => x.RemoveFromGroupAsync(It.IsAny(), It.IsAny(), default)).Callback((string connectionId, string userId, CancellationToken _) => { subject.Remove(connectionId); }); - - NotificationHub notificationHub = new NotificationHub {Context = mockHubCallerContext.Object, Groups = mockGroupManager.Object}; - await notificationHub.OnDisconnectedAsync(null); - - subject.Should().HaveCount(0); - } - } -} diff --git a/UKSF.Tests.Unit/Signalr/TeamspeakHubTests.cs b/UKSF.Tests.Unit/Signalr/TeamspeakHubTests.cs deleted file mode 100644 index 085aa2b0..00000000 --- a/UKSF.Tests.Unit/Signalr/TeamspeakHubTests.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System.Threading.Tasks; -using FluentAssertions; -using Moq; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Events.Types; -using UKSF.Api.Signalr.Hubs.Integrations; -using Xunit; - -namespace UKSF.Tests.Unit.Signalr { - public class TeamspeakHubTests { - public TeamspeakHubTests() => mockSignalrEventBus = new Mock(); - - private readonly Mock mockSignalrEventBus; - - [Fact] - public void ShouldSendEvent() { - SignalrEventModel expected = new SignalrEventModel {procedure = TeamspeakEventType.EMPTY, args = "test"}; - SignalrEventModel subject = null; - - mockSignalrEventBus.Setup(x => x.Send(It.IsAny())).Callback((SignalrEventModel x) => subject = x); - - TeamspeakHub teamspeakHub = new TeamspeakHub(mockSignalrEventBus.Object); - teamspeakHub.Invoke(0, "test"); - - subject.Should().NotBeNull(); - subject.Should().BeEquivalentTo(expected); - } - - [Fact] - public async Task ShouldSetConnected() { - TeamspeakHubState.Connected = false; - - TeamspeakHub teamspeakHub = new TeamspeakHub(mockSignalrEventBus.Object); - await teamspeakHub.OnConnectedAsync(); - - TeamspeakHubState.Connected.Should().BeTrue(); - } - - [Fact] - public async Task ShouldUnsetConnected() { - TeamspeakHubState.Connected = true; - - TeamspeakHub teamspeakHub = new TeamspeakHub(mockSignalrEventBus.Object); - await teamspeakHub.OnDisconnectedAsync(null); - - TeamspeakHubState.Connected.Should().BeFalse(); - } - } -} From df341ca7321828eec10240f882d311bf81c7971b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 6 Feb 2020 23:32:58 +0000 Subject: [PATCH 117/369] Fix test command coverage exclude --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cbdfbeec..63b691c9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: - name: Build with dotnet run: dotnet build -c Release - name: Run tests with coverage - run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info /p:Exclude="[UKSF.Api.Signalr]*,[UKSF.PostMessage]*" + run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info /p:Exclude=\"[UKSF.Api.Signalr]*,[UKSF.PostMessage]*\" - name: Coveralls uses: coverallsapp/github-action@master with: From 6a3778830549fcf1df8a103b72db41cfd22ee6a7 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 6 Feb 2020 23:45:22 +0000 Subject: [PATCH 118/369] Change test coverage exclude separator --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 63b691c9..a195fd6e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: - name: Build with dotnet run: dotnet build -c Release - name: Run tests with coverage - run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info /p:Exclude=\"[UKSF.Api.Signalr]*,[UKSF.PostMessage]*\" + run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info /p:Exclude=\"[UKSF.Api.Signalr]*%2c[UKSF.PostMessage]*\" - name: Coveralls uses: coverallsapp/github-action@master with: From a8604f20d1a7285c5589012f684d0cefecab6ad2 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 7 Feb 2020 17:54:56 +0000 Subject: [PATCH 119/369] Added variables service tests --- UKSF.Api.Services/Admin/VariablesService.cs | 50 +++++-- UKSF.Api.Services/Admin/VariablesWrapper.cs | 2 + .../Common/DisplayNameUtilities.cs | 28 ++-- .../Services/Admin/VariablesServiceTests.cs | 127 ++++++++++++++++++ ...itiesTests.cs => AccountUtilitiesTests.cs} | 2 +- .../Common/DisplayNameUtilitiesTests.cs | 33 +++++ 6 files changed, 214 insertions(+), 28 deletions(-) create mode 100644 UKSF.Tests.Unit/Services/Admin/VariablesServiceTests.cs rename UKSF.Tests.Unit/Services/Common/{UtilitiesTests.cs => AccountUtilitiesTests.cs} (97%) create mode 100644 UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs diff --git a/UKSF.Api.Services/Admin/VariablesService.cs b/UKSF.Api.Services/Admin/VariablesService.cs index 0739fbdf..eb3f89fc 100644 --- a/UKSF.Api.Services/Admin/VariablesService.cs +++ b/UKSF.Api.Services/Admin/VariablesService.cs @@ -7,31 +7,55 @@ namespace UKSF.Api.Services.Admin { public static class VariablesService { - public static string AsString(this VariableItem variable) => variable?.item.ToString(); - public static double AsDouble(this VariableItem variable) => double.Parse(variable?.item.ToString() ?? throw new Exception("Variable does not exist")); - public static bool AsBool(this VariableItem variable) => bool.Parse(variable?.item.ToString() ?? throw new Exception("Variable does not exist")); - public static ulong AsUlong(this VariableItem variable) => ulong.Parse(variable?.item.ToString() ?? throw new Exception("Variable does not exist")); + public static VariableItem AssertHasItem(this VariableItem variableItem) { + if (variableItem.item == null) { + throw new Exception($"Variable {variableItem.key} has no item"); + } - public static string[] AsArray(this VariableItem variable, Func predicate = null) { - if (variable == null) { - throw new Exception("Variable does not exist"); + return variableItem; + } + + public static string AsString(this VariableItem variable) => variable.AssertHasItem().item.ToString(); + + public static double AsDouble(this VariableItem variable) { + string item = variable.AsString(); + if (!double.TryParse(item, out double output)) { + throw new InvalidCastException($"Variable item {item} cannot be converted to a double"); } + return output; + } + + public static bool AsBool(this VariableItem variable) { + string item = variable.AsString(); + if (!bool.TryParse(item, out bool output)) { + throw new InvalidCastException($"Variable item {item} cannot be converted to a bool"); + } + + return output; + } + + public static ulong AsUlong(this VariableItem variable) { + string item = variable.AsString(); + if (!ulong.TryParse(item, out ulong output)) { + throw new InvalidCastException($"Variable item {item} cannot be converted to a ulong"); + } + + return output; + } + + public static string[] AsArray(this VariableItem variable, Func predicate = null) { string itemString = variable.AsString(); itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); string[] items = itemString.Split(","); return predicate != null ? items.Select(predicate).ToArray() : items; } - public static IEnumerable AsDoublesArray(this VariableItem variable, Func predicate = null) { - if (variable == null) { - throw new Exception("Variable does not exist"); - } - + public static IEnumerable AsDoublesArray(this VariableItem variable) { string itemString = variable.AsString(); itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); IEnumerable items = itemString.Split(",").Select(x => x.ToDouble()); - return predicate != null ? items.Select(predicate).ToArray() : items; + return items; } } } diff --git a/UKSF.Api.Services/Admin/VariablesWrapper.cs b/UKSF.Api.Services/Admin/VariablesWrapper.cs index 58edbfae..4c821fd9 100644 --- a/UKSF.Api.Services/Admin/VariablesWrapper.cs +++ b/UKSF.Api.Services/Admin/VariablesWrapper.cs @@ -1,8 +1,10 @@ +using System.Diagnostics.CodeAnalysis; using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Services.Common; namespace UKSF.Api.Services.Admin { + [ExcludeFromCodeCoverage] public static class VariablesWrapper { public static IVariablesDataService VariablesDataService() => ServiceWrapper.ServiceProvider.GetService(); } diff --git a/UKSF.Api.Services/Common/DisplayNameUtilities.cs b/UKSF.Api.Services/Common/DisplayNameUtilities.cs index 35482864..eec96db1 100644 --- a/UKSF.Api.Services/Common/DisplayNameUtilities.cs +++ b/UKSF.Api.Services/Common/DisplayNameUtilities.cs @@ -11,22 +11,22 @@ namespace UKSF.Api.Services.Common { public static class DisplayNameUtilities { public static string ConvertObjectIds(this string message) { string newMessage = message; - if (!string.IsNullOrEmpty(message)) { - IDisplayNameService displayNameService = ServiceWrapper.ServiceProvider.GetService(); - IUnitsService unitsService = ServiceWrapper.ServiceProvider.GetService(); - IEnumerable parts = Regex.Split(message, @"\s+").Where(s => s != string.Empty); - foreach (string part in parts) { - if (ObjectId.TryParse(part, out ObjectId _)) { - string displayName = displayNameService.GetDisplayName(part); - if (displayName == part) { - Unit unit = unitsService.Data().GetSingle(x => x.id == part); - if (unit != null) { - displayName = unit.name; - } - } + if (string.IsNullOrEmpty(message)) return newMessage; - newMessage = newMessage.Replace(part, displayName); + IDisplayNameService displayNameService = ServiceWrapper.ServiceProvider.GetService(); + IUnitsService unitsService = ServiceWrapper.ServiceProvider.GetService(); + IEnumerable parts = Regex.Split(message, @"\s+").Where(s => s != string.Empty); + foreach (string part in parts) { + if (ObjectId.TryParse(part, out ObjectId _)) { + string displayName = displayNameService.GetDisplayName(part); + if (displayName == part) { + Unit unit = unitsService.Data().GetSingle(x => x.id == part); + if (unit != null) { + displayName = unit.name; + } } + + newMessage = newMessage.Replace(part, displayName); } } diff --git a/UKSF.Tests.Unit/Services/Admin/VariablesServiceTests.cs b/UKSF.Tests.Unit/Services/Admin/VariablesServiceTests.cs new file mode 100644 index 00000000..ccfe99cf --- /dev/null +++ b/UKSF.Tests.Unit/Services/Admin/VariablesServiceTests.cs @@ -0,0 +1,127 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using FluentAssertions; +using UKSF.Api.Models.Admin; +using UKSF.Api.Services.Admin; +using UKSF.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Services.Admin { + public class VariablesServiceTests { + [Fact] + public void ShouldGetVariableAsString() { + const string EXPECTED = "Value"; + VariableItem variableItem = new VariableItem {key = "Test", item = EXPECTED}; + + string subject = variableItem.AsString(); + + subject.Should().Be(EXPECTED); + } + + [Fact] + public void ShouldGetVariableAsDouble() { + const double EXPECTED = 1.5; + VariableItem variableItem = new VariableItem {key = "Test", item = EXPECTED}; + + double subject = variableItem.AsDouble(); + + subject.Should().Be(EXPECTED); + } + + [Fact] + public void ShouldGetVariableAsBool() { + const bool EXPECTED = true; + VariableItem variableItem = new VariableItem {key = "Test", item = EXPECTED}; + + bool subject = variableItem.AsBool(); + + subject.Should().Be(EXPECTED); + } + + [Fact] + public void ShouldGetVariableAsUlong() { + const ulong EXPECTED = ulong.MaxValue; + VariableItem variableItem = new VariableItem {key = "Test", item = EXPECTED}; + + ulong subject = variableItem.AsUlong(); + + subject.Should().Be(EXPECTED); + } + + [Fact] + public void ShouldGetVariableAsArray() { + VariableItem variableItem = new VariableItem {key = "Test", item = "item1,item2, item3"}; + + string[] subject = variableItem.AsArray(); + + subject.Should().HaveCount(3); + subject.Should().Contain(new string[] {"item1", "item2", "item3"}); + } + + [Fact] + public void ShouldGetVariableAsArrayWithPredicate() { + VariableItem variableItem = new VariableItem {key = "Test", item = "\"item1\",item2"}; + + string[] subject = variableItem.AsArray(x => x.RemoveQuotes()); + + subject.Should().HaveCount(2); + subject.Should().Contain(new string[] {"item1", "item2"}); + } + + [Fact] + public void ShouldGetVariableAsDoublesArray() { + VariableItem variableItem = new VariableItem {key = "Test", item = "1.5,1.67845567657, -0.000000456"}; + + List subject = variableItem.AsDoublesArray().ToList(); + + subject.Should().HaveCount(3); + subject.Should().Contain(new double[] {1.5, 1.67845567657, -0.000000456}); + } + + [Fact] + public void ShouldHaveItem() { + VariableItem variableItem = new VariableItem {key = "Test", item = "test"}; + + Action act = () => variableItem.AssertHasItem(); + + act.Should().NotThrow(); + } + + [Fact] + public void ShouldThrowWithNoItem() { + VariableItem variableItem = new VariableItem {key = "Test"}; + + Action act = () => variableItem.AssertHasItem(); + + act.Should().Throw(); + } + + [Fact] + public void ShouldThrowWithInvalidDouble() { + VariableItem variableItem = new VariableItem {key = "Test", item = "wontwork"}; + + Action act = () => variableItem.AsDouble(); + + act.Should().Throw(); + } + + [Fact] + public void ShouldThrowWithInvalidBool() { + VariableItem variableItem = new VariableItem {key = "Test", item = "wontwork"}; + + Action act = () => variableItem.AsBool(); + + act.Should().Throw(); + } + + [Fact] + public void ShouldThrowWithInvalidUlong() { + VariableItem variableItem = new VariableItem {key = "Test", item = "wontwork"}; + + Action act = () => variableItem.AsUlong(); + + act.Should().Throw(); + } + } +} diff --git a/UKSF.Tests.Unit/Services/Common/UtilitiesTests.cs b/UKSF.Tests.Unit/Services/Common/AccountUtilitiesTests.cs similarity index 97% rename from UKSF.Tests.Unit/Services/Common/UtilitiesTests.cs rename to UKSF.Tests.Unit/Services/Common/AccountUtilitiesTests.cs index 5f2bf3be..73b6d3d5 100644 --- a/UKSF.Tests.Unit/Services/Common/UtilitiesTests.cs +++ b/UKSF.Tests.Unit/Services/Common/AccountUtilitiesTests.cs @@ -7,7 +7,7 @@ using Xunit; namespace UKSF.Tests.Unit.Services.Common { - public class UtilitiesTests { + public class AccountUtilitiesTests { [Fact] public void ShouldCopyAccountCorrectly() { string id = ObjectId.GenerateNewId().ToString(); diff --git a/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs b/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs new file mode 100644 index 00000000..cc2ca137 --- /dev/null +++ b/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs @@ -0,0 +1,33 @@ +using System; +using System.Data; +using FluentAssertions; +using Moq; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Services.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Services.Common { + public class DisplayNameUtilitiesTests { + // [Fact] + // public void ShouldConvertNameObjectIds() { + // // Api.Models.Units.Unit unit = new Api.Models.Units.Unit {name = "7 Squadron"}; + // const string EXPECTED = "Maj.Bridgford.A has requested all the things for Cpl.Carr.C"; + // + // Mock mockDisplayNameService = new Mock(); + // Mock mockUnitsDataService = new Mock(); + // Mock mockUnitsService = new Mock(); + // + // mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); + // mockUnitsService.Setup(x => x.Data()).Returns(mockUnitsDataService.Object); + // mockDisplayNameService.Setup(x => x.GetDisplayName("5e39336e1b92ee2d14b7fe08")).Returns("Maj.Bridgford.A"); + // mockDisplayNameService.Setup(x => x.GetDisplayName("5e3935db1b92ee2d14b7fe09")).Returns("Cpl.Carr.C"); + // + // string subject = "5e39336e1b92ee2d14b7fe08 has requested all the things for 5e3935db1b92ee2d14b7fe09".ConvertObjectIds(); + // + // subject.Should().Be(EXPECTED); + // } + } +} + From 95d40a51ac1026cdc91935b7e0af0685b4d30c6c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 7 Feb 2020 19:46:45 +0000 Subject: [PATCH 120/369] Improved functionality to extract ObjectIds from strings. More testing --- .../Common/DisplayNameUtilities.cs | 25 +++--- UKSF.Common/StringUtilities.cs | 9 +- .../Common/StringUtilitiesTests.cs | 27 ++++-- .../Common/DisplayNameUtilitiesTests.cs | 83 ++++++++++++++----- 4 files changed, 101 insertions(+), 43 deletions(-) diff --git a/UKSF.Api.Services/Common/DisplayNameUtilities.cs b/UKSF.Api.Services/Common/DisplayNameUtilities.cs index eec96db1..3a647fd4 100644 --- a/UKSF.Api.Services/Common/DisplayNameUtilities.cs +++ b/UKSF.Api.Services/Common/DisplayNameUtilities.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Linq; -using System.Text.RegularExpressions; using Microsoft.Extensions.DependencyInjection; -using MongoDB.Bson; +using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; using UKSF.Api.Models.Units; +using UKSF.Common; namespace UKSF.Api.Services.Common { public static class DisplayNameUtilities { @@ -15,19 +15,18 @@ public static string ConvertObjectIds(this string message) { IDisplayNameService displayNameService = ServiceWrapper.ServiceProvider.GetService(); IUnitsService unitsService = ServiceWrapper.ServiceProvider.GetService(); - IEnumerable parts = Regex.Split(message, @"\s+").Where(s => s != string.Empty); - foreach (string part in parts) { - if (ObjectId.TryParse(part, out ObjectId _)) { - string displayName = displayNameService.GetDisplayName(part); - if (displayName == part) { - Unit unit = unitsService.Data().GetSingle(x => x.id == part); - if (unit != null) { - displayName = unit.name; - } + List objectIds = message.ExtractObjectIds().Where(s => s != string.Empty).ToList(); + foreach (string objectId in objectIds) { + string displayString = displayNameService.GetDisplayName(objectId); + if (displayString == objectId) { + IUnitsDataService unitsDataService = unitsService.Data(); + Unit unit = unitsDataService.GetSingle(x => x.id == objectId); + if (unit != null) { + displayString = unit.name; } - - newMessage = newMessage.Replace(part, displayName); } + + newMessage = newMessage.Replace(objectId, displayString); } return newMessage; diff --git a/UKSF.Common/StringUtilities.cs b/UKSF.Common/StringUtilities.cs index c203ca97..24b2dbc9 100644 --- a/UKSF.Common/StringUtilities.cs +++ b/UKSF.Common/StringUtilities.cs @@ -1,5 +1,8 @@ -using System.Globalization; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; using System.Text.RegularExpressions; +using MongoDB.Bson; namespace UKSF.Common { public static class StringUtilities { @@ -22,5 +25,9 @@ public static string RemoveEmbeddedQuotes(this string item) { item = item.Remove(match.Index, match.Length).Insert(match.Index, match.ToString().Replace("\"\"", "'")); return Regex.Replace(item, "\\\"\\s+\\\"", string.Empty); } + + public static IEnumerable ExtractObjectIds(this string text) { + return Regex.Matches(text, @"[{(]?[0-9a-fA-F]{24}[)}]?").Select(x => ObjectId.TryParse(x.Value, out ObjectId unused) ? x.Value : string.Empty); + } } } diff --git a/UKSF.Tests.Unit/Common/StringUtilitiesTests.cs b/UKSF.Tests.Unit/Common/StringUtilitiesTests.cs index c3b7b0ad..33e5ac20 100644 --- a/UKSF.Tests.Unit/Common/StringUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Common/StringUtilitiesTests.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using System.Linq; using FluentAssertions; using UKSF.Common; using Xunit; @@ -8,64 +10,71 @@ public class StringUtilitiesTests { [Theory, InlineData("", "", false), InlineData("", "hello", false), InlineData("hello world hello world", "hello", true), InlineData("hello", "HELLO", true), InlineData("hello world", "HELLOWORLD", false)] public void ShouldNotCompareCase(string text, string searchElement, bool expected) { bool subject = text.ContainsCaseInsensitive(searchElement); - + subject.Should().Be(expected); } [Theory, InlineData(""), InlineData("2"), InlineData("1E+309"), InlineData("-1E+309")] // E+309 is one more than double max/min public void ShouldNotThrowException(string text) { Action act = () => text.ToDouble(); - + act.Should().NotThrow(); } [Theory, InlineData("", 0), InlineData("2", 2), InlineData("1.79769313486232E+307", 1.79769313486232E+307d), InlineData("-1.79769313486232E+307", -1.79769313486232E+307d)] // E+307 is one less than double max/min public void ShouldParseDoubleCorrectly(string text, double expected) { double subject = text.ToDouble(); - + subject.Should().Be(expected); } [Theory, InlineData("", ""), InlineData("hello", "Hello"), InlineData("hi there my name is bob", "Hi There My Name Is Bob"), InlineData("HELLO BOB", "HELLO BOB")] public void ShouldConvertToTitleCase(string text, string expected) { string subject = text.ToTitleCase(); - + subject.Should().Be(expected); } [Theory, InlineData("", ""), InlineData("hello world", "HELLO_WORLD"), InlineData("HELLO_WORLD", "HELLO_WORLD"), InlineData(" i am key ", "I_AM_KEY")] public void ShouldConvertToKey(string text, string expected) { string subject = text.Keyify(); - + subject.Should().Be(expected); } [Theory, InlineData("", ""), InlineData("hello world hello world", "helloworldhelloworld"), InlineData("hello", "hello"), InlineData(" hello world ", "helloworld")] public void ShouldRemoveSpaces(string text, string expected) { string subject = text.RemoveSpaces(); - + subject.Should().Be(expected); } [Theory, InlineData("", ""), InlineData("hello\\nworld\\n\\nhello world", "helloworldhello world"), InlineData("hello\\n", "hello"), InlineData("\\n hello world \\n", " hello world ")] public void ShouldRemoveNewLines(string text, string expected) { string subject = text.RemoveNewLines(); - + subject.Should().Be(expected); } [Theory, InlineData("", ""), InlineData("\"helloworld\" \"hello world\"", "helloworld hello world"), InlineData("hello\"\"", "hello"), InlineData("\" hello world \"", " hello world ")] public void ShouldRemoveQuotes(string text, string expected) { string subject = text.RemoveQuotes(); - + subject.Should().Be(expected); } [Theory, InlineData("", ""), InlineData("\"hello \"\"test\"\" world\"", "\"hello 'test' world\""), InlineData("\"hello \" \"test\"\" world\"", "\"hello test' world\""), InlineData("\"\"\"\"", "''")] public void ShouldRemoveEmbeddedQuotes(string text, string expected) { string subject = text.RemoveEmbeddedQuotes(); - + subject.Should().Be(expected); } + + [Theory, InlineData("Hello I am 5e39336e1b92ee2d14b7fe08", "5e39336e1b92ee2d14b7fe08"), InlineData("Hello I am 5e39336e1b92ee2d14b7fe08, I will be your SR1", "5e39336e1b92ee2d14b7fe08")] + public void ShouldExtractObjectId(string input, string expected) { + List subject = input.ExtractObjectIds().ToList(); + + subject.Should().Contain(expected); + } } } diff --git a/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs b/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs index cc2ca137..61c3e095 100644 --- a/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs @@ -1,6 +1,6 @@ using System; -using System.Data; using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; using Moq; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Personnel; @@ -10,24 +10,67 @@ namespace UKSF.Tests.Unit.Services.Common { public class DisplayNameUtilitiesTests { - // [Fact] - // public void ShouldConvertNameObjectIds() { - // // Api.Models.Units.Unit unit = new Api.Models.Units.Unit {name = "7 Squadron"}; - // const string EXPECTED = "Maj.Bridgford.A has requested all the things for Cpl.Carr.C"; - // - // Mock mockDisplayNameService = new Mock(); - // Mock mockUnitsDataService = new Mock(); - // Mock mockUnitsService = new Mock(); - // - // mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); - // mockUnitsService.Setup(x => x.Data()).Returns(mockUnitsDataService.Object); - // mockDisplayNameService.Setup(x => x.GetDisplayName("5e39336e1b92ee2d14b7fe08")).Returns("Maj.Bridgford.A"); - // mockDisplayNameService.Setup(x => x.GetDisplayName("5e3935db1b92ee2d14b7fe09")).Returns("Cpl.Carr.C"); - // - // string subject = "5e39336e1b92ee2d14b7fe08 has requested all the things for 5e3935db1b92ee2d14b7fe09".ConvertObjectIds(); - // - // subject.Should().Be(EXPECTED); - // } + public DisplayNameUtilitiesTests() { + mockDisplayNameService = new Mock(); + mockUnitsDataService = new Mock(); + mockUnitsService = new Mock(); + + mockUnitsService.Setup(x => x.Data()).Returns(mockUnitsDataService.Object); + + ServiceCollection serviceProvider = new ServiceCollection(); + serviceProvider.AddTransient(provider => mockDisplayNameService.Object); + serviceProvider.AddTransient(provider => mockUnitsService.Object); + ServiceWrapper.ServiceProvider = serviceProvider.BuildServiceProvider(); + } + + private readonly Mock mockDisplayNameService; + private readonly Mock mockUnitsDataService; + private readonly Mock mockUnitsService; + + [Theory, InlineData("5e39336e1b92ee2d14b7fe08", "Maj.Bridgford.A"), InlineData("5e39336e1b92ee2d14b7fe08, 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A, Cpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe085e3935db1b92ee2d14b7fe09", "Maj.Bridgford.ACpl.Carr.C"), + InlineData("5e39336e1b92ee2d14b7fe08 has requested all the things for 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A has requested all the things for Cpl.Carr.C")] + public void ShouldConvertNameObjectIds(string input, string expected) { + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); + mockDisplayNameService.Setup(x => x.GetDisplayName("5e39336e1b92ee2d14b7fe08")).Returns("Maj.Bridgford.A"); + mockDisplayNameService.Setup(x => x.GetDisplayName("5e3935db1b92ee2d14b7fe09")).Returns("Cpl.Carr.C"); + + string subject = input.ConvertObjectIds(); + + subject.Should().Be(expected); + } + + [Fact] + public void ShouldConvertUnitObjectIds() { + const string INPUT = "5e39336e1b92ee2d14b7fe08"; + const string EXPECTED = "7 Squadron"; + Api.Models.Units.Unit unit = new Api.Models.Units.Unit {name = EXPECTED, id = INPUT}; + + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(unit); + mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); + + string subject = INPUT.ConvertObjectIds(); + + subject.Should().Be(EXPECTED); + } + + [Fact] + public void ShouldDoNothingToText() { + const string INPUT = "5e39336e1b92ee2d14b7fe08"; + const string EXPECTED = "5e39336e1b92ee2d14b7fe08"; + + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); + mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); + + string subject = INPUT.ConvertObjectIds(); + + subject.Should().Be(EXPECTED); + } + + [Fact] + public void ShouldReturnEmpty() { + string subject = "".ConvertObjectIds(); + + subject.Should().Be(string.Empty); + } } } - From 3743d54b5817a52db66b894d38ed683e459f1ded Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 7 Feb 2020 19:59:25 +0000 Subject: [PATCH 121/369] Cover case with unit id predicate in display name utilities --- .../Common/DisplayNameUtilities.cs | 4 +--- .../Common/DisplayNameUtilitiesTests.cs | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/UKSF.Api.Services/Common/DisplayNameUtilities.cs b/UKSF.Api.Services/Common/DisplayNameUtilities.cs index 3a647fd4..a149e5a0 100644 --- a/UKSF.Api.Services/Common/DisplayNameUtilities.cs +++ b/UKSF.Api.Services/Common/DisplayNameUtilities.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; using UKSF.Api.Models.Units; @@ -19,8 +18,7 @@ public static string ConvertObjectIds(this string message) { foreach (string objectId in objectIds) { string displayString = displayNameService.GetDisplayName(objectId); if (displayString == objectId) { - IUnitsDataService unitsDataService = unitsService.Data(); - Unit unit = unitsDataService.GetSingle(x => x.id == objectId); + Unit unit = unitsService.Data().GetSingle(x => x.id == objectId); if (unit != null) { displayString = unit.name; } diff --git a/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs b/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs index 61c3e095..90ed7115 100644 --- a/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using System.Linq; using FluentAssertions; using Microsoft.Extensions.DependencyInjection; using Moq; @@ -13,7 +15,7 @@ public class DisplayNameUtilitiesTests { public DisplayNameUtilitiesTests() { mockDisplayNameService = new Mock(); mockUnitsDataService = new Mock(); - mockUnitsService = new Mock(); + Mock mockUnitsService = new Mock(); mockUnitsService.Setup(x => x.Data()).Returns(mockUnitsDataService.Object); @@ -25,7 +27,6 @@ public DisplayNameUtilitiesTests() { private readonly Mock mockDisplayNameService; private readonly Mock mockUnitsDataService; - private readonly Mock mockUnitsService; [Theory, InlineData("5e39336e1b92ee2d14b7fe08", "Maj.Bridgford.A"), InlineData("5e39336e1b92ee2d14b7fe08, 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A, Cpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe085e3935db1b92ee2d14b7fe09", "Maj.Bridgford.ACpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe08 has requested all the things for 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A has requested all the things for Cpl.Carr.C")] @@ -53,6 +54,20 @@ public void ShouldConvertUnitObjectIds() { subject.Should().Be(EXPECTED); } + [Fact] + public void ShouldConvertCorrectUnitWithPredicate() { + Api.Models.Units.Unit unit1 = new Api.Models.Units.Unit {name = "7 Squadron"}; + Api.Models.Units.Unit unit2 = new Api.Models.Units.Unit {name = "656 Squadron"}; + List collection = new List {unit1, unit2}; + + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => collection.FirstOrDefault(x)); + mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); + + string subject = unit1.id.ConvertObjectIds(); + + subject.Should().Be("7 Squadron"); + } + [Fact] public void ShouldDoNothingToText() { const string INPUT = "5e39336e1b92ee2d14b7fe08"; From a8292ebaf4e3eff7633009cfa9de8f8fa9409113 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 7 Feb 2020 20:16:58 +0000 Subject: [PATCH 122/369] Added display name service tests. Cleaned up legacy code case in display name service --- .../Personnel/DisplayNameService.cs | 6 +- .../Personnel/DisplayNameServiceTests.cs | 86 +++++++++++++++++++ 2 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs diff --git a/UKSF.Api.Services/Personnel/DisplayNameService.cs b/UKSF.Api.Services/Personnel/DisplayNameService.cs index 8f484d93..ee2b3b35 100644 --- a/UKSF.Api.Services/Personnel/DisplayNameService.cs +++ b/UKSF.Api.Services/Personnel/DisplayNameService.cs @@ -13,11 +13,7 @@ public DisplayNameService(IRanksService ranksService, IAccountService accountSer public string GetDisplayName(Account account) { Rank rank = account.rank != null ? ranksService.Data().GetSingle(account.rank) : null; - if (account.membershipState == MembershipState.MEMBER) { - return rank == null ? account.lastname + "." + account.firstname[0] : rank.abbreviation + "." + account.lastname + "." + account.firstname[0]; - } - - return $"{(rank != null ? $"{rank.abbreviation}." : "")}{account.lastname}.{account.firstname[0]}"; + return rank == null ? $"{account.lastname}.{account.firstname[0]}" : $"{rank.abbreviation}.{account.lastname}.{account.firstname[0]}"; } public string GetDisplayName(string id) { diff --git a/UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs b/UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs new file mode 100644 index 00000000..eaf9a726 --- /dev/null +++ b/UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs @@ -0,0 +1,86 @@ +using FluentAssertions; +using Moq; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Personnel; +using Xunit; + +namespace UKSF.Tests.Unit.Services.Personnel { + public class DisplayNameServiceTests { + private readonly Mock mockRanksDataService; + private readonly Mock mockAccountDataService; + private readonly DisplayNameService displayNameService; + + public DisplayNameServiceTests() { + mockRanksDataService = new Mock(); + mockAccountDataService = new Mock(); + Mock mockRanksService = new Mock(); + Mock mockAccountService = new Mock(); + + mockRanksService.Setup(x => x.Data()).Returns(mockRanksDataService.Object); + mockAccountService.Setup(x => x.Data()).Returns(mockAccountDataService.Object); + + displayNameService = new DisplayNameService(mockRanksService.Object, mockAccountService.Object); + } + + [Fact] + public void ShouldGetDisplayNameById() { + Account account = new Account {lastname = "Beswick", firstname = "Tim"}; + + mockAccountDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(account); + + string subject = displayNameService.GetDisplayName(account.id); + + subject.Should().Be("Beswick.T"); + } + + [Fact] + public void ShouldGetNoDisplayName() { + mockAccountDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); + + string subject = displayNameService.GetDisplayName("5e39336e1b92ee2d14b7fe08"); + + subject.Should().Be("5e39336e1b92ee2d14b7fe08"); + } + + [Fact] + public void ShouldGetDisplayName() { + Account account = new Account {lastname = "Beswick", firstname = "Tim"}; + + string subject = displayNameService.GetDisplayName(account); + + subject.Should().Be("Beswick.T"); + } + + [Fact] + public void ShouldGetDisplayNameWithRank() { + Account account = new Account {lastname = "Beswick", firstname = "Tim", rank = "Squadron Leader"}; + Rank rank = new Rank {abbreviation = "SqnLdr"}; + + mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(rank); + + string subject = displayNameService.GetDisplayName(account); + + subject.Should().Be("SqnLdr.Beswick.T"); + } + + [Fact] + public void ShouldGetDisplayNameWithoutRank() { + Account account = new Account {lastname = "Beswick", firstname = "Tim"}; + + string subject = displayNameService.GetDisplayNameWithoutRank(account); + + subject.Should().Be("Beswick.T"); + } + + [Fact] + public void ShouldGetGuest() { + Account account = new Account(); + + string subject = displayNameService.GetDisplayNameWithoutRank(account); + + subject.Should().Be("Guest"); + } + } +} From 6d64ef5b25feeec4db41ad53ef827a3ee65ed8ad Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 7 Feb 2020 20:29:07 +0000 Subject: [PATCH 123/369] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a195fd6e..3f3a1a5e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: - name: Build with dotnet run: dotnet build -c Release - name: Run tests with coverage - run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info /p:Exclude=\"[UKSF.Api.Signalr]*%2c[UKSF.PostMessage]*\" + run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info /p:Exclude="[UKSF.Api.Signalr]*%2c[UKSF.PostMessage]*" - name: Coveralls uses: coverallsapp/github-action@master with: From eb2a1ad432f338724ffb15d7ebea0025ace9063c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 8 Feb 2020 13:30:08 +0000 Subject: [PATCH 124/369] Added ranks and roles service tests --- UKSF.Api.Data/Personnel/RanksDataService.cs | 9 +- .../Data/Cached/IRanksDataService.cs | 1 - UKSF.Api.Services/Common/RankUtilities.cs | 11 ++ UKSF.Api.Services/Personnel/RanksService.cs | 11 +- UKSF.PostMessage/Program.cs | 1 - .../Common/ProcessUtilitiesTests.cs | 1 - .../Data/Personnel/RanksDataServiceTests.cs | 51 +++++++++ .../Data/Personnel/RolesDataServiceTests.cs | 51 +++++++++ .../Events/DataEventBackerTests.cs | 1 - .../Services/Admin/VariablesServiceTests.cs | 6 +- .../Services/Common/RankUtilitiesTests.cs | 18 +++ .../Services/Personnel/RanksServiceTests.cs | 108 ++++++++++++++++++ .../Services/Personnel/RolesServiceTests.cs | 67 +++++++++++ 13 files changed, 317 insertions(+), 19 deletions(-) create mode 100644 UKSF.Api.Services/Common/RankUtilities.cs create mode 100644 UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs create mode 100644 UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs create mode 100644 UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs create mode 100644 UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs create mode 100644 UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs diff --git a/UKSF.Api.Data/Personnel/RanksDataService.cs b/UKSF.Api.Data/Personnel/RanksDataService.cs index 7175f41d..a22aa34f 100644 --- a/UKSF.Api.Data/Personnel/RanksDataService.cs +++ b/UKSF.Api.Data/Personnel/RanksDataService.cs @@ -3,6 +3,7 @@ using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Common; namespace UKSF.Api.Data.Personnel { public class RanksDataService : CachedDataService, IRanksDataService { @@ -10,16 +11,10 @@ public RanksDataService(IDataCollection dataCollection, IDataEventBus Get() { base.Get(); - Collection.Sort(Sort); + Collection.Sort(RankUtilities.Sort); return Collection; } public override Rank GetSingle(string name) => GetSingle(x => x.name == name); - - public int Sort(Rank rankA, Rank rankB) { - int rankOrderA = rankA?.order ?? 0; - int rankOrderB = rankB?.order ?? 0; - return rankOrderA < rankOrderB ? -1 : rankOrderA > rankOrderB ? 1 : 0; - } } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs index 03efb678..572c2cc6 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs @@ -5,6 +5,5 @@ namespace UKSF.Api.Interfaces.Data.Cached { public interface IRanksDataService : IDataService { new List Get(); new Rank GetSingle(string name); - int Sort(Rank rankA, Rank rankB); } } diff --git a/UKSF.Api.Services/Common/RankUtilities.cs b/UKSF.Api.Services/Common/RankUtilities.cs new file mode 100644 index 00000000..0e27698f --- /dev/null +++ b/UKSF.Api.Services/Common/RankUtilities.cs @@ -0,0 +1,11 @@ +using UKSF.Api.Models.Personnel; + +namespace UKSF.Api.Services.Common { + public static class RankUtilities { + public static int Sort(this Rank rankA, Rank rankB) { + int rankOrderA = rankA?.order ?? 0; + int rankOrderB = rankB?.order ?? 0; + return rankOrderA < rankOrderB ? -1 : rankOrderA > rankOrderB ? 1 : 0; + } + } +} diff --git a/UKSF.Api.Services/Personnel/RanksService.cs b/UKSF.Api.Services/Personnel/RanksService.cs index 9b3fcf6c..d394b589 100644 --- a/UKSF.Api.Services/Personnel/RanksService.cs +++ b/UKSF.Api.Services/Personnel/RanksService.cs @@ -2,6 +2,7 @@ using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Common; namespace UKSF.Api.Services.Personnel { public class RanksService : IRanksService { @@ -18,22 +19,22 @@ public int GetRankIndex(string rankName) { public int Sort(string nameA, string nameB) { Rank rankA = data.GetSingle(nameA); Rank rankB = data.GetSingle(nameB); - return data.Sort(rankA, rankB); + return rankA.Sort(rankB); } public bool IsSuperior(string nameA, string nameB) { Rank rankA = data.GetSingle(nameA); Rank rankB = data.GetSingle(nameB); - int rankOrderA = rankA?.order ?? 0; - int rankOrderB = rankB?.order ?? 0; + int rankOrderA = rankA?.order ?? int.MaxValue; + int rankOrderB = rankB?.order ?? int.MaxValue; return rankOrderA < rankOrderB; } public bool IsEqual(string nameA, string nameB) { Rank rankA = data.GetSingle(nameA); Rank rankB = data.GetSingle(nameB); - int rankOrderA = rankA?.order ?? 0; - int rankOrderB = rankB?.order ?? 0; + int rankOrderA = rankA?.order ?? int.MinValue; + int rankOrderB = rankB?.order ?? int.MinValue; return rankOrderA == rankOrderB; } diff --git a/UKSF.PostMessage/Program.cs b/UKSF.PostMessage/Program.cs index 7f64d4f5..2d9dde34 100644 --- a/UKSF.PostMessage/Program.cs +++ b/UKSF.PostMessage/Program.cs @@ -1,6 +1,5 @@ using System; using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Runtime.InteropServices; diff --git a/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs b/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs index e7d9044c..36fec6bc 100644 --- a/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs @@ -1,7 +1,6 @@ using System; using System.Diagnostics; using System.Linq; -using System.Management; using FluentAssertions; using Microsoft.Win32.TaskScheduler; using UKSF.Common; diff --git a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs new file mode 100644 index 00000000..8420784c --- /dev/null +++ b/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs @@ -0,0 +1,51 @@ +using System.Collections.Generic; +using FluentAssertions; +using Moq; +using UKSF.Api.Data.Personnel; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Personnel; +using Xunit; + +namespace UKSF.Tests.Unit.Data.Personnel { + public class RanksDataServiceTests { + private readonly Mock mockDataCollection; + private readonly RanksDataService ranksDataService; + + public RanksDataServiceTests() { + mockDataCollection = new Mock(); + Mock> mockDataEventBus = new Mock>(); + + ranksDataService = new RanksDataService(mockDataCollection.Object, mockDataEventBus.Object); + } + + [Fact] + public void ShouldGetSortedCollection() { + Rank rank1 = new Rank {name = "Private", order = 2}; + Rank rank2 = new Rank {name = "Recruit", order = 1}; + Rank rank3 = new Rank {name = "Candidate", order = 0}; + List mockCollection = new List {rank1, rank2, rank3}; + + mockDataCollection.Setup(x => x.Get()).Returns(mockCollection); + + List subject = ranksDataService.Get(); + + subject.Should().ContainInOrder(rank3, rank2, rank1); + } + + [Fact] + public void ShouldGetSingleByName() { + Rank rank1 = new Rank {name = "Private", order = 2}; + Rank rank2 = new Rank {name = "Recruit", order = 1}; + Rank rank3 = new Rank {name = "Candidate", order = 0}; + List mockCollection = new List {rank1, rank2, rank3}; + + mockDataCollection.Setup(x => x.Get()).Returns(mockCollection); + + Rank subject = ranksDataService.GetSingle("Recruit"); + + subject.Should().Be(rank2); + } + } +} diff --git a/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs new file mode 100644 index 00000000..95cd44f4 --- /dev/null +++ b/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs @@ -0,0 +1,51 @@ +using System.Collections.Generic; +using FluentAssertions; +using Moq; +using UKSF.Api.Data.Personnel; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Personnel; +using Xunit; + +namespace UKSF.Tests.Unit.Data.Personnel { + public class RolesDataServiceTests { + private readonly Mock mockDataCollection; + private readonly RolesDataService rolesDataService; + + public RolesDataServiceTests() { + mockDataCollection = new Mock(); + Mock> mockDataEventBus = new Mock>(); + + rolesDataService = new RolesDataService(mockDataCollection.Object, mockDataEventBus.Object); + } + + [Fact] + public void ShouldGetSortedCollection() { + Role role1 = new Role {name = "Rifleman"}; + Role role2 = new Role {name = "Trainee"}; + Role role3 = new Role {name = "Marksman"}; + List mockCollection = new List {role1, role2, role3}; + + mockDataCollection.Setup(x => x.Get()).Returns(mockCollection); + + List subject = rolesDataService.Get(); + + subject.Should().ContainInOrder(role3, role1, role2); + } + + [Fact] + public void ShouldGetSingleByName() { + Role role1 = new Role {name = "Rifleman"}; + Role role2 = new Role {name = "Trainee"}; + Role role3 = new Role {name = "Marksman"}; + List mockCollection = new List {role1, role2, role3}; + + mockDataCollection.Setup(x => x.Get()).Returns(mockCollection); + + Role subject = rolesDataService.GetSingle("Trainee"); + + subject.Should().Be(role2); + } + } +} diff --git a/UKSF.Tests.Unit/Events/DataEventBackerTests.cs b/UKSF.Tests.Unit/Events/DataEventBackerTests.cs index 6459481a..11465e5c 100644 --- a/UKSF.Tests.Unit/Events/DataEventBackerTests.cs +++ b/UKSF.Tests.Unit/Events/DataEventBackerTests.cs @@ -1,6 +1,5 @@ using System; using FluentAssertions; -using MongoDB.Bson; using Moq; using UKSF.Api.Events.Data; using UKSF.Api.Interfaces.Data; diff --git a/UKSF.Tests.Unit/Services/Admin/VariablesServiceTests.cs b/UKSF.Tests.Unit/Services/Admin/VariablesServiceTests.cs index ccfe99cf..3c0fafbf 100644 --- a/UKSF.Tests.Unit/Services/Admin/VariablesServiceTests.cs +++ b/UKSF.Tests.Unit/Services/Admin/VariablesServiceTests.cs @@ -56,7 +56,7 @@ public void ShouldGetVariableAsArray() { string[] subject = variableItem.AsArray(); subject.Should().HaveCount(3); - subject.Should().Contain(new string[] {"item1", "item2", "item3"}); + subject.Should().Contain(new[] {"item1", "item2", "item3"}); } [Fact] @@ -66,7 +66,7 @@ public void ShouldGetVariableAsArrayWithPredicate() { string[] subject = variableItem.AsArray(x => x.RemoveQuotes()); subject.Should().HaveCount(2); - subject.Should().Contain(new string[] {"item1", "item2"}); + subject.Should().Contain(new[] {"item1", "item2"}); } [Fact] @@ -76,7 +76,7 @@ public void ShouldGetVariableAsDoublesArray() { List subject = variableItem.AsDoublesArray().ToList(); subject.Should().HaveCount(3); - subject.Should().Contain(new double[] {1.5, 1.67845567657, -0.000000456}); + subject.Should().Contain(new[] {1.5, 1.67845567657, -0.000000456}); } [Fact] diff --git a/UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs b/UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs new file mode 100644 index 00000000..1158b1b5 --- /dev/null +++ b/UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs @@ -0,0 +1,18 @@ +using FluentAssertions; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Services.Common { + public class RankUtilitiesTests { + [Fact] + public void ShouldReturnCorrectSortValue() { + Rank rank1 = new Rank {name = "Private", order = 1}; + Rank rank2 = new Rank {name = "Recruit", order = 0}; + + int subject = rank1.Sort(rank2); + + subject.Should().Be(1); + } + } +} diff --git a/UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs b/UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs new file mode 100644 index 00000000..57acb080 --- /dev/null +++ b/UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs @@ -0,0 +1,108 @@ +using System.Collections.Generic; +using System.Linq; +using FluentAssertions; +using Moq; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Personnel; +using Xunit; + +namespace UKSF.Tests.Unit.Services.Personnel { + public class RanksServiceTests { + private readonly Mock mockRanksDataService; + private readonly RanksService ranksService; + + public RanksServiceTests() { + mockRanksDataService = new Mock(); + ranksService = new RanksService(mockRanksDataService.Object); + } + + [Fact] + public void ShouldGetCorrectIndex() { + Rank rank1 = new Rank {name = "Private"}; + Rank rank2 = new Rank {name = "Recruit"}; + List mockCollection = new List {rank1, rank2}; + + mockRanksDataService.Setup(x => x.Get()).Returns(mockCollection); + + int subject = ranksService.GetRankIndex("Private"); + + subject.Should().Be(0); + } + + [Fact] + public void ShouldGetCorrectSortValueByName() { + Rank rank1 = new Rank {name = "Private", order = 0}; + Rank rank2 = new Rank {name = "Recruit", order = 1}; + List mockCollection = new List {rank1, rank2}; + + mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.name == x)); + + int subject = ranksService.Sort("Recruit", "Private"); + + subject.Should().Be(1); + } + + [Theory, InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] + public void ShouldResolveSuperior(string rankName1, string rankName2, bool expected) { + Rank rank1 = new Rank {name = "Private", order = 0}; + Rank rank2 = new Rank {name = "Recruit", order = 1}; + Rank rank3 = new Rank {name = "Candidate", order = 2}; + List mockCollection = new List {rank1, rank2, rank3}; + + mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.name == x)); + + bool subject = ranksService.IsSuperior(rankName1, rankName2); + + subject.Should().Be(expected); + } + + [Theory, InlineData("Private", "Private", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] + public void ShouldResolveEqual(string rankName1, string rankName2, bool expected) { + Rank rank1 = new Rank {name = "Private", order = 0}; + Rank rank2 = new Rank {name = "Recruit", order = 1}; + Rank rank3 = new Rank {name = "Candidate", order = 2}; + List mockCollection = new List {rank1, rank2, rank3}; + + mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.name == x)); + + bool subject = ranksService.IsEqual(rankName1, rankName2); + + subject.Should().Be(expected); + } + + [Theory, InlineData("Private", "Private", true), InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] + public void ShouldResolveSuperiorOrEqual(string rankName1, string rankName2, bool expected) { + Rank rank1 = new Rank {name = "Private", order = 0}; + Rank rank2 = new Rank {name = "Recruit", order = 1}; + Rank rank3 = new Rank {name = "Candidate", order = 2}; + List mockCollection = new List {rank1, rank2, rank3}; + + mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.name == x)); + + bool subject = ranksService.IsSuperiorOrEqual(rankName1, rankName2); + + subject.Should().Be(expected); + } + + [Fact] + public void ShouldSortCollection() { + Account account1 = new Account {rank = "Private"}; + Account account2 = new Account {rank = "Candidate"}; + Account account3 = new Account {rank = "Recruit"}; + Account account4 = new Account {rank = "Private"}; + List subject = new List {account1, account2, account3, account4}; + + Rank rank1 = new Rank {name = "Private", order = 0}; + Rank rank2 = new Rank {name = "Recruit", order = 1}; + Rank rank3 = new Rank {name = "Candidate", order = 2}; + List mockCollection = new List {rank1, rank2, rank3}; + + mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.name == x)); + + subject = subject.OrderBy(x => x.rank, new RankComparer(ranksService)).ToList(); + + subject.Should().ContainInOrder(account1, account4, account3, account2); + } + } +} diff --git a/UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs b/UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs new file mode 100644 index 00000000..1342fd00 --- /dev/null +++ b/UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using FluentAssertions; +using Moq; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Personnel; +using Xunit; + +namespace UKSF.Tests.Unit.Services.Personnel { + public class RolesServiceTests { + private readonly Mock mockRolesDataService; + private readonly RolesService rolesService; + + public RolesServiceTests() { + mockRolesDataService = new Mock(); + rolesService = new RolesService(mockRolesDataService.Object); + } + + [Fact] + public void ShouldGetCorrectSortValueByName() { + Role role1 = new Role {name = "Rifleman", order = 0}; + Role role2 = new Role {name = "Trainee", order = 1}; + List mockCollection = new List {role1, role2}; + + mockRolesDataService.Setup(x => x.Get()).Returns(mockCollection); + mockRolesDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.name == x)); + + int subject = rolesService.Sort("Trainee", "Rifleman"); + + subject.Should().Be(1); + } + + [Theory, InlineData(3, "Trainee"), InlineData(0, "Marksman")] + public void ShouldGetUnitRoleByOrder(int order, string expected) { + Role role1 = new Role {name = "Rifleman", order = 0, roleType = RoleType.INDIVIDUAL}; + Role role2 = new Role {name = "Gunner", order = 3, roleType = RoleType.INDIVIDUAL}; + Role role3 = new Role {name = "Marksman", order = 0, roleType = RoleType.UNIT}; + Role role4 = new Role {name = "Trainee", order = 3, roleType = RoleType.UNIT}; + Role role5 = new Role {name = "Gunner", order = 2, roleType = RoleType.INDIVIDUAL}; + List mockCollection = new List {role1, role2, role3, role4, role5}; + + mockRolesDataService.Setup(x => x.Get()).Returns(mockCollection); + mockRolesDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.FirstOrDefault(x)); + + Role subject = rolesService.GetUnitRoleByOrder(order); + + subject.name.Should().Be(expected); + } + + [Fact] + public void ShouldReturnNullWhenNoUnitRoleFound() { + Role role1 = new Role {name = "Gunner", order = 3, roleType = RoleType.INDIVIDUAL}; + Role role2 = new Role {name = "Trainee", order = 3, roleType = RoleType.UNIT}; + Role role3 = new Role {name = "Gunner", order = 2, roleType = RoleType.INDIVIDUAL}; + List mockCollection = new List {role1, role2, role3}; + + mockRolesDataService.Setup(x => x.Get()).Returns(mockCollection); + mockRolesDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.FirstOrDefault(x)); + + Role subject = rolesService.GetUnitRoleByOrder(2); + + subject.Should().BeNull(); + } + } +} From f46d16d1a80e7a25fe01d619fb5e2306c8df87c9 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 8 Feb 2020 15:35:26 +0000 Subject: [PATCH 125/369] Added variables data service tests. Bits of cleanup. Removed some pointless methods. --- UKSF.Api.Data/Admin/VariablesDataService.cs | 18 ++--- UKSF.Api.Data/CachedDataService.cs | 1 + UKSF.Api.Data/DataService.cs | 1 + .../Message/CommentThreadDataService.cs | 7 +- UKSF.Api.Data/Message/LogDataService.cs | 1 + .../Operations/OperationOrderDataService.cs | 4 +- .../Operations/OperationReportDataService.cs | 4 +- .../Data/Cached/ICommentThreadDataService.cs | 1 - .../Hubs/Integrations/TeamspeakHub.cs | 1 + UKSF.Api.Signalr/UKSF.Api.Signalr.csproj | 1 + .../Controllers/ApplicationsController.cs | 8 +- .../EventModelFactory.cs | 3 +- UKSF.Common/UKSF.Common.csproj | 4 + .../Common/EventModelFactoryTests.cs | 36 +++++++++ .../Data/Admin/VariablesDataServiceTests.cs | 78 +++++++++++++++++++ .../Message/CommentThreadDataServiceTests.cs | 31 ++++++++ 16 files changed, 173 insertions(+), 26 deletions(-) rename {UKSF.Api.Models/Events => UKSF.Common}/EventModelFactory.cs (89%) create mode 100644 UKSF.Tests.Unit/Common/EventModelFactoryTests.cs create mode 100644 UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs create mode 100644 UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs diff --git a/UKSF.Api.Data/Admin/VariablesDataService.cs b/UKSF.Api.Data/Admin/VariablesDataService.cs index f26215b9..15a405a7 100644 --- a/UKSF.Api.Data/Admin/VariablesDataService.cs +++ b/UKSF.Api.Data/Admin/VariablesDataService.cs @@ -10,9 +10,7 @@ namespace UKSF.Api.Data.Admin { public class VariablesDataService : CachedDataService, IVariablesDataService { - private readonly IDataCollection dataCollection; - - public VariablesDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "variables") => this.dataCollection = dataCollection; + public VariablesDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "variables") { } public override List Get() { base.Get(); @@ -25,19 +23,13 @@ public override VariableItem GetSingle(string key) { } public async Task Update(string key, object value) { - UpdateDefinition update = value == null ? Builders.Update.Unset("item") : Builders.Update.Set("item", value); - await dataCollection.Update(key.Keyify(), update); - Refresh(); - } - - public override async Task Update(string key, UpdateDefinition update) { - await dataCollection.Update(key.Keyify(), update); - Refresh(); + VariableItem variableItem = GetSingle(key); + await base.Update(variableItem.id, "item", value); } public override async Task Delete(string key) { - await dataCollection.Delete(key.Keyify()); - Refresh(); + VariableItem variableItem = GetSingle(key); + await base.Delete(variableItem.id); } } } diff --git a/UKSF.Api.Data/CachedDataService.cs b/UKSF.Api.Data/CachedDataService.cs index 60e39eff..f9486653 100644 --- a/UKSF.Api.Data/CachedDataService.cs +++ b/UKSF.Api.Data/CachedDataService.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; +using UKSF.Api.Events; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index 94d9cdbd..e1a74aab 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using MongoDB.Driver; +using UKSF.Api.Events; using UKSF.Api.Events.Data; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; diff --git a/UKSF.Api.Data/Message/CommentThreadDataService.cs b/UKSF.Api.Data/Message/CommentThreadDataService.cs index c7e82828..5cfc0ae4 100644 --- a/UKSF.Api.Data/Message/CommentThreadDataService.cs +++ b/UKSF.Api.Data/Message/CommentThreadDataService.cs @@ -1,20 +1,17 @@ using System.Threading.Tasks; using MongoDB.Driver; +using UKSF.Api.Events; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; using UKSF.Api.Models.Message; +using UKSF.Common; namespace UKSF.Api.Data.Message { public class CommentThreadDataService : CachedDataService, ICommentThreadDataService { public CommentThreadDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "commentThreads") { } - public new async Task Add(CommentThread commentThread) { - await base.Add(commentThread); - return commentThread.id; - } - public async Task Update(string id, Comment comment, DataEventType updateType) { await base.Update(id, updateType == DataEventType.ADD ? Builders.Update.Push("comments", comment) : Builders.Update.Pull("comments", comment)); CommentThreadDataEvent(EventModelFactory.CreateDataEvent(updateType, id, comment)); diff --git a/UKSF.Api.Data/Message/LogDataService.cs b/UKSF.Api.Data/Message/LogDataService.cs index d827b610..56a4ab57 100644 --- a/UKSF.Api.Data/Message/LogDataService.cs +++ b/UKSF.Api.Data/Message/LogDataService.cs @@ -1,4 +1,5 @@ using System.Threading.Tasks; +using UKSF.Api.Events; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; diff --git a/UKSF.Api.Data/Operations/OperationOrderDataService.cs b/UKSF.Api.Data/Operations/OperationOrderDataService.cs index bff22bbc..0fdec895 100644 --- a/UKSF.Api.Data/Operations/OperationOrderDataService.cs +++ b/UKSF.Api.Data/Operations/OperationOrderDataService.cs @@ -8,11 +8,11 @@ namespace UKSF.Api.Data.Operations { public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { private readonly IDataCollection dataCollection; - + public OperationOrderDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "opord") => this.dataCollection = dataCollection; public override List Get() { - List reversed = base.Get(); + List reversed = new List(base.Get()); reversed.Reverse(); return reversed; } diff --git a/UKSF.Api.Data/Operations/OperationReportDataService.cs b/UKSF.Api.Data/Operations/OperationReportDataService.cs index 13145243..7f620730 100644 --- a/UKSF.Api.Data/Operations/OperationReportDataService.cs +++ b/UKSF.Api.Data/Operations/OperationReportDataService.cs @@ -8,11 +8,11 @@ namespace UKSF.Api.Data.Operations { public class OperationReportDataService : CachedDataService, IOperationReportDataService { private readonly IDataCollection dataCollection; - + public OperationReportDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "oprep") => this.dataCollection = dataCollection; public override List Get() { - List reversed = base.Get(); + List reversed = new List(base.Get()); reversed.Reverse(); return reversed; } diff --git a/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs index a7204eea..54b6e76f 100644 --- a/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs @@ -4,7 +4,6 @@ namespace UKSF.Api.Interfaces.Data.Cached { public interface ICommentThreadDataService : IDataService { - new Task Add(CommentThread commentThread); Task Update(string id, Comment comment, DataEventType updateType); } } diff --git a/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs b/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs index 54669e74..1fb11207 100644 --- a/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs +++ b/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs @@ -5,6 +5,7 @@ using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Models.Events; using UKSF.Api.Models.Events.Types; +using UKSF.Common; namespace UKSF.Api.Signalr.Hubs.Integrations { public static class TeamspeakHubState { diff --git a/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj b/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj index 195a163a..e7500e83 100644 --- a/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj +++ b/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj @@ -6,6 +6,7 @@ + diff --git a/UKSF.Api/Controllers/ApplicationsController.cs b/UKSF.Api/Controllers/ApplicationsController.cs index 56d4b669..874a5266 100644 --- a/UKSF.Api/Controllers/ApplicationsController.cs +++ b/UKSF.Api/Controllers/ApplicationsController.cs @@ -47,12 +47,16 @@ IDisplayNameService displayNameService public async Task Post([FromBody] JObject body) { Account account = sessionService.GetContextAccount(); await Update(body, account); + CommentThread recruiterCommentThread = new CommentThread {authors = recruitmentService.GetSr1Leads().Values.ToArray(), mode = ThreadMode.SR1}; + CommentThread applicationCommentThread = new CommentThread {authors = new[] {account.id}, mode = ThreadMode.SR1}; + await commentThreadService.Data().Add(recruiterCommentThread); + await commentThreadService.Data().Add(applicationCommentThread); Application application = new Application { dateCreated = DateTime.Now, state = ApplicationState.WAITING, recruiter = recruitmentService.GetRecruiter(), - recruiterCommentThread = await commentThreadService.Data().Add(new CommentThread {authors = recruitmentService.GetSr1Leads().Values.ToArray(), mode = ThreadMode.SR1}), - applicationCommentThread = await commentThreadService.Data().Add(new CommentThread {authors = new[] {account.id}, mode = ThreadMode.SR1}) + recruiterCommentThread = recruiterCommentThread.id, + applicationCommentThread = applicationCommentThread.id }; await accountService.Data().Update(account.id, Builders.Update.Set(x => x.application, application)); account = accountService.Data().GetSingle(account.id); diff --git a/UKSF.Api.Models/Events/EventModelFactory.cs b/UKSF.Common/EventModelFactory.cs similarity index 89% rename from UKSF.Api.Models/Events/EventModelFactory.cs rename to UKSF.Common/EventModelFactory.cs index dfdbdd3c..d612eef8 100644 --- a/UKSF.Api.Models/Events/EventModelFactory.cs +++ b/UKSF.Common/EventModelFactory.cs @@ -1,6 +1,7 @@ +using UKSF.Api.Models.Events; using UKSF.Api.Models.Events.Types; -namespace UKSF.Api.Models.Events { +namespace UKSF.Common { public static class EventModelFactory { public static DataEventModel CreateDataEvent(DataEventType type, string id, object data = null) => new DataEventModel {type = type, id = id, data = data}; public static SignalrEventModel CreateSignalrEvent(TeamspeakEventType procedure, object args) => new SignalrEventModel {procedure = procedure, args = args}; diff --git a/UKSF.Common/UKSF.Common.csproj b/UKSF.Common/UKSF.Common.csproj index 68d7b2da..9cc242f9 100644 --- a/UKSF.Common/UKSF.Common.csproj +++ b/UKSF.Common/UKSF.Common.csproj @@ -16,4 +16,8 @@ + + + + diff --git a/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs b/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs new file mode 100644 index 00000000..408afe92 --- /dev/null +++ b/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs @@ -0,0 +1,36 @@ +using FluentAssertions; +using MongoDB.Bson; +using UKSF.Api.Events; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Events.Types; +using UKSF.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Events { + public class EventModelFactoryTests { + [Fact] + public void ShouldReturnDataEvent() { + string id = ObjectId.GenerateNewId().ToString(); + object data = new[] {"test", "item"}; + + DataEventModel subject = EventModelFactory.CreateDataEvent(DataEventType.ADD, id, data); + + subject.Should().NotBeNull(); + subject.type.Should().Be(DataEventType.ADD); + subject.id.Should().Be(id); + subject.data.Should().Be(data); + } + + [Fact] + public void ShouldReturnSignalrEvent() { + string id = ObjectId.GenerateNewId().ToString(); + object args = new[] {"test", "item"}; + + SignalrEventModel subject = EventModelFactory.CreateSignalrEvent(TeamspeakEventType.CLIENTS, args); + + subject.Should().NotBeNull(); + subject.procedure.Should().Be(TeamspeakEventType.CLIENTS); + subject.args.Should().Be(args); + } + } +} diff --git a/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs new file mode 100644 index 00000000..2c8bf408 --- /dev/null +++ b/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs @@ -0,0 +1,78 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using FluentAssertions; +using MongoDB.Driver; +using Moq; +using UKSF.Api.Data.Admin; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Admin; +using Xunit; + +namespace UKSF.Tests.Unit.Data.Admin { + public class VariablesDataServiceTests { + private readonly VariablesDataService variablesDataService; + private readonly Mock mockDataCollection; + private List mockCollection; + + public VariablesDataServiceTests() { + mockDataCollection = new Mock(); + Mock> mockdataEventBus = new Mock>(); + variablesDataService = new VariablesDataService(mockDataCollection.Object, mockdataEventBus.Object); + + mockCollection = new List(); + + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + } + + [Fact] + public void ShouldGetOrderedCollection() { + VariableItem item1 = new VariableItem {key = "MISSIONS_PATH"}; + VariableItem item2 = new VariableItem {key = "SERVER_PATH"}; + VariableItem item3 = new VariableItem {key = "DISCORD_IDS"}; + mockCollection = new List {item1, item2, item3}; + + List subject = variablesDataService.Get(); + + subject.Should().ContainInOrder(item3, item1, item2); + } + + [Fact] + public void ShouldGetItemByKey() { + VariableItem item1 = new VariableItem {key = "MISSIONS_PATH"}; + VariableItem item2 = new VariableItem {key = "SERVER_PATH"}; + VariableItem item3 = new VariableItem {key = "DISCORD_IDS"}; + mockCollection = new List {item1, item2, item3}; + + VariableItem subject = variablesDataService.GetSingle("server path"); + + subject.Should().Be(item2); + } + + [Fact] + public async Task ShouldUpdateItemValue() { + VariableItem subject = new VariableItem {key = "DISCORD_ID", item = "50"}; + mockCollection = new List {subject}; + + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).item = "75"); + + await variablesDataService.Update("discord id", "75"); + + subject.item.Should().Be("75"); + } + + [Fact] + public async Task ShouldDeleteItem() { + VariableItem item1 = new VariableItem {key = "DISCORD_ID", item = "50"}; + mockCollection = new List {item1}; + + mockDataCollection.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + + await variablesDataService.Delete("discord id"); + + mockCollection.Should().HaveCount(0); + } + } +} diff --git a/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs b/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs new file mode 100644 index 00000000..c375506f --- /dev/null +++ b/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs @@ -0,0 +1,31 @@ +using System.Collections.Generic; +using Moq; +using UKSF.Api.Data.Message; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Message; +using Xunit; + +namespace UKSF.Tests.Unit.Data.Message { + public class CommentThreadDataServiceTests { + private readonly CommentThreadDataService commentThreadDataService; + private readonly Mock mockDataCollection; + private List mockCollection; + + public CommentThreadDataServiceTests() { + mockDataCollection = new Mock(); + Mock> mockdataEventBus = new Mock>(); + commentThreadDataService = new CommentThreadDataService(mockDataCollection.Object, mockdataEventBus.Object); + + mockCollection = new List(); + + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + } + + [Fact] + public void ShouldReturnCommentThreadId() { + + } + } +} From c336ce7a6dac606122515efebc158257a1a956eb Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 10 Feb 2020 13:21:45 +0000 Subject: [PATCH 126/369] Added null tests for rank utilities sort --- UKSF.Api.Services/Common/RankUtilities.cs | 6 ++-- UKSF.Api.Services/Personnel/RanksService.cs | 2 +- .../Services/Common/RankUtilitiesTests.cs | 29 +++++++++++++++++-- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/UKSF.Api.Services/Common/RankUtilities.cs b/UKSF.Api.Services/Common/RankUtilities.cs index 0e27698f..fa5a5b66 100644 --- a/UKSF.Api.Services/Common/RankUtilities.cs +++ b/UKSF.Api.Services/Common/RankUtilities.cs @@ -2,9 +2,9 @@ namespace UKSF.Api.Services.Common { public static class RankUtilities { - public static int Sort(this Rank rankA, Rank rankB) { - int rankOrderA = rankA?.order ?? 0; - int rankOrderB = rankB?.order ?? 0; + public static int Sort(Rank rankA, Rank rankB) { + int rankOrderA = rankA?.order ?? int.MaxValue; + int rankOrderB = rankB?.order ?? int.MaxValue; return rankOrderA < rankOrderB ? -1 : rankOrderA > rankOrderB ? 1 : 0; } } diff --git a/UKSF.Api.Services/Personnel/RanksService.cs b/UKSF.Api.Services/Personnel/RanksService.cs index d394b589..ff91b578 100644 --- a/UKSF.Api.Services/Personnel/RanksService.cs +++ b/UKSF.Api.Services/Personnel/RanksService.cs @@ -19,7 +19,7 @@ public int GetRankIndex(string rankName) { public int Sort(string nameA, string nameB) { Rank rankA = data.GetSingle(nameA); Rank rankB = data.GetSingle(nameB); - return rankA.Sort(rankB); + return RankUtilities.Sort(rankA, rankB); } public bool IsSuperior(string nameA, string nameB) { diff --git a/UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs b/UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs index 1158b1b5..1da527f6 100644 --- a/UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs @@ -7,12 +7,37 @@ namespace UKSF.Tests.Unit.Services.Common { public class RankUtilitiesTests { [Fact] public void ShouldReturnCorrectSortValue() { + Rank rank1 = new Rank {name = "Private", order = 0}; + Rank rank2 = new Rank {name = "Recruit", order = 1}; + + int subject = RankUtilities.Sort(rank1, rank2); + + subject.Should().Be(-1); + } + + [Fact] + public void ShouldSortNullRankFirst() { Rank rank1 = new Rank {name = "Private", order = 1}; - Rank rank2 = new Rank {name = "Recruit", order = 0}; - int subject = rank1.Sort(rank2); + int subject = RankUtilities.Sort(null, rank1); subject.Should().Be(1); } + + [Fact] + public void ShouldSortNullRankSecond() { + Rank rank1 = new Rank {name = "Private", order = 1}; + + int subject = RankUtilities.Sort(rank1, null); + + subject.Should().Be(-1); + } + + [Fact] + public void ShouldSortNullRanks() { + int subject = RankUtilities.Sort(null, null); + + subject.Should().Be(0); + } } } From 1be355e3b7a5d67477b09414a49d753037bd7117 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 10 Feb 2020 19:17:10 +0000 Subject: [PATCH 127/369] Cleaned up some tests. Added empty key or null cases to tests. Added better null or empty key handling to data services --- UKSF.Api.Data/Admin/VariablesDataService.cs | 2 + UKSF.Api.Data/DataService.cs | 4 + UKSF.Api.Models/Personnel/AccountSettings.cs | 11 ++- .../Game/Missions/MissionPatchingService.cs | 2 +- .../Game/Missions/MissionService.cs | 6 +- .../Personnel/DisplayNameService.cs | 2 +- UKSF.Common/StringUtilities.cs | 2 +- UKSF.Tests.Unit/Common/DataUtilitiesTests.cs | 4 +- UKSF.Tests.Unit/Common/DateUtilitiesTests.cs | 2 +- .../Common/EventModelFactoryTests.cs | 3 +- .../Common/ProcessUtilitiesTests.cs | 24 ----- .../Common/StringUtilitiesTests.cs | 10 +- UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs | 2 +- .../Data/Admin/VariablesDataServiceTests.cs | 33 ++++++- .../Data/CachedDataServiceTests.cs | 91 ++++++++++--------- UKSF.Tests.Unit/Data/DataServiceTests.cs | 57 +++++++++++- .../Data/Personnel/RanksDataServiceTests.cs | 11 +++ .../Data/Personnel/RolesDataServiceTests.cs | 11 +++ .../Models/AccountSettingsTests.cs | 14 ++- .../Common/DisplayNameUtilitiesTests.cs | 36 ++++---- .../Services/Common/RankUtilitiesTests.cs | 6 +- .../Services/ConfirmationCodeServiceTests.cs | 30 +++--- .../Personnel/DisplayNameServiceTests.cs | 13 ++- .../Services/Personnel/RanksServiceTests.cs | 35 ++++++- .../Services/Personnel/RolesServiceTests.cs | 17 ++-- 25 files changed, 287 insertions(+), 141 deletions(-) diff --git a/UKSF.Api.Data/Admin/VariablesDataService.cs b/UKSF.Api.Data/Admin/VariablesDataService.cs index 15a405a7..0e03eef2 100644 --- a/UKSF.Api.Data/Admin/VariablesDataService.cs +++ b/UKSF.Api.Data/Admin/VariablesDataService.cs @@ -24,11 +24,13 @@ public override VariableItem GetSingle(string key) { public async Task Update(string key, object value) { VariableItem variableItem = GetSingle(key); + if (variableItem == null) throw new KeyNotFoundException($"Variable Item with key '{key}' does not exist"); await base.Update(variableItem.id, "item", value); } public override async Task Delete(string key) { VariableItem variableItem = GetSingle(key); + if (variableItem == null) throw new KeyNotFoundException($"Variable Item with key '{key}' does not exist"); await base.Delete(variableItem.id); } } diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index e1a74aab..e0daffb3 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -29,22 +29,26 @@ protected DataService(IDataCollection dataCollection, IDataEventBus dataE public virtual T GetSingle(Func predicate) => dataCollection.GetSingle(predicate); public virtual async Task Add(T data) { + if (data == null) throw new ArgumentNullException(nameof(data)); await dataCollection.Add(data); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, data.GetIdValue(), data)); } public virtual async Task Update(string id, string fieldName, object value) { + if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); UpdateDefinition update = value == null ? Builders.Update.Unset(fieldName) : Builders.Update.Set(fieldName, value); await dataCollection.Update(id, update); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public virtual async Task Update(string id, UpdateDefinition update) { // TODO: Remove strong typing to UpdateDefinition + if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); await dataCollection.Update(id, update); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public virtual async Task Delete(string id) { + if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); await dataCollection.Delete(id); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } diff --git a/UKSF.Api.Models/Personnel/AccountSettings.cs b/UKSF.Api.Models/Personnel/AccountSettings.cs index c2e783bb..04debf9a 100644 --- a/UKSF.Api.Models/Personnel/AccountSettings.cs +++ b/UKSF.Api.Models/Personnel/AccountSettings.cs @@ -1,10 +1,17 @@ -namespace UKSF.Api.Models.Personnel { +using System; +using System.Reflection; + +namespace UKSF.Api.Models.Personnel { public class AccountSettings { public bool errorEmails = false; public bool notificationsEmail = true; public bool notificationsTeamspeak = true; public bool sr1Enabled = true; - public T GetAttribute(string name) => (T) typeof(AccountSettings).GetField(name).GetValue(this); + public T GetAttribute(string name) { + FieldInfo setting = typeof(AccountSettings).GetField(name); + if (setting == null) throw new ArgumentException($"Could not find setting with name '{name}'"); + return (T) setting.GetValue(this); + } } } diff --git a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs index 8fe2a33c..c56a8238 100644 --- a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs @@ -100,7 +100,7 @@ private async Task PackPbo() { if (File.Exists(filePath)) return; List outputLines = Regex.Split($"{output}\n{errorOutput}", "\r\n|\r|\n").ToList(); - output = outputLines.Where(x => !string.IsNullOrEmpty(x) && !x.ContainsCaseInsensitive("compressing")).Aggregate((x, y) => $"{x}\n{y}"); + output = outputLines.Where(x => !string.IsNullOrEmpty(x) && !x.ContainsIgnoreCase("compressing")).Aggregate((x, y) => $"{x}\n{y}"); throw new Exception(output); } diff --git a/UKSF.Api.Services/Game/Missions/MissionService.cs b/UKSF.Api.Services/Game/Missions/MissionService.cs index 2075942d..b380e88f 100644 --- a/UKSF.Api.Services/Game/Missions/MissionService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionService.cs @@ -88,7 +88,7 @@ private bool AssertRequiredFiles() { private bool CheckIgnoreKey(string key) { mission.descriptionLines = File.ReadAllLines(mission.descriptionPath).ToList(); - return mission.descriptionLines.Any(x => x.ContainsCaseInsensitive(key)); + return mission.descriptionLines.Any(x => x.ContainsIgnoreCase(key)); } private bool CheckBinned() { @@ -195,11 +195,11 @@ private void Write() { } private void PatchDescription() { - int playable = mission.sqmLines.Select(x => x.RemoveSpaces()).Count(x => x.ContainsCaseInsensitive("isPlayable=1") || x.ContainsCaseInsensitive("isPlayer=1")); + int playable = mission.sqmLines.Select(x => x.RemoveSpaces()).Count(x => x.ContainsIgnoreCase("isPlayable=1") || x.ContainsIgnoreCase("isPlayer=1")); mission.playerCount = playable; mission.descriptionLines = File.ReadAllLines(mission.descriptionPath).ToList(); - mission.descriptionLines[mission.descriptionLines.FindIndex(x => x.ContainsCaseInsensitive("maxPlayers"))] = $" maxPlayers = {playable};"; + mission.descriptionLines[mission.descriptionLines.FindIndex(x => x.ContainsIgnoreCase("maxPlayers"))] = $" maxPlayers = {playable};"; CheckRequiredDescriptionItems(); CheckConfigurableDescriptionItems(); diff --git a/UKSF.Api.Services/Personnel/DisplayNameService.cs b/UKSF.Api.Services/Personnel/DisplayNameService.cs index ee2b3b35..7038a511 100644 --- a/UKSF.Api.Services/Personnel/DisplayNameService.cs +++ b/UKSF.Api.Services/Personnel/DisplayNameService.cs @@ -21,6 +21,6 @@ public string GetDisplayName(string id) { return account != null ? GetDisplayName(account) : id; } - public string GetDisplayNameWithoutRank(Account account) => string.IsNullOrEmpty(account.lastname) ? "Guest" : $"{account.lastname}.{account.firstname[0]}"; + public string GetDisplayNameWithoutRank(Account account) => string.IsNullOrEmpty(account?.lastname) ? "Guest" : $"{account.lastname}.{account.firstname[0]}"; } } diff --git a/UKSF.Common/StringUtilities.cs b/UKSF.Common/StringUtilities.cs index 24b2dbc9..70181ccd 100644 --- a/UKSF.Common/StringUtilities.cs +++ b/UKSF.Common/StringUtilities.cs @@ -6,7 +6,7 @@ namespace UKSF.Common { public static class StringUtilities { - public static bool ContainsCaseInsensitive(this string text, string searchElement) => !string.IsNullOrEmpty(text) && !string.IsNullOrEmpty(searchElement) && text.ToUpper().Contains(searchElement.ToUpper()); + public static bool ContainsIgnoreCase(this string text, string searchElement) => !string.IsNullOrEmpty(text) && !string.IsNullOrEmpty(searchElement) && text.ToUpper().Contains(searchElement.ToUpper()); public static double ToDouble(this string text) => double.TryParse(text, out double number) ? number : 0d; diff --git a/UKSF.Tests.Unit/Common/DataUtilitiesTests.cs b/UKSF.Tests.Unit/Common/DataUtilitiesTests.cs index 329479d8..471bb391 100644 --- a/UKSF.Tests.Unit/Common/DataUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Common/DataUtilitiesTests.cs @@ -6,7 +6,7 @@ namespace UKSF.Tests.Unit.Common { public class DataUtilitiesTests { [Fact] - public void ShouldReturnIdValue() { + public void ShouldReturnIdValueForValidObject() { MockDataModel mockDataModel = new MockDataModel(); string subject = mockDataModel.GetIdValue(); @@ -15,7 +15,7 @@ public void ShouldReturnIdValue() { } [Fact] - public void ShouldReturnEmptyString() { + public void ShouldReturnEmptyStringForInvalidObject() { DateTime dateTime = new DateTime(); string subject = dateTime.GetIdValue(); diff --git a/UKSF.Tests.Unit/Common/DateUtilitiesTests.cs b/UKSF.Tests.Unit/Common/DateUtilitiesTests.cs index cb4ccf7e..f13f6a60 100644 --- a/UKSF.Tests.Unit/Common/DateUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Common/DateUtilitiesTests.cs @@ -16,7 +16,7 @@ public void ShouldGiveCorrectAge(int years, int months, int expectedYears, int e } [Fact] - public void ShouldGiveCorrectMonths() { + public void ShouldGiveCorrectMonthsForDay() { DateTime dob = new DateTime(2019, 1, 20); (int _, int subjectMonths) = dob.ToAge(new DateTime(2020, 1, 16)); diff --git a/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs b/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs index 408afe92..f11f0be4 100644 --- a/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs +++ b/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs @@ -1,12 +1,11 @@ using FluentAssertions; using MongoDB.Bson; -using UKSF.Api.Events; using UKSF.Api.Models.Events; using UKSF.Api.Models.Events.Types; using UKSF.Common; using Xunit; -namespace UKSF.Tests.Unit.Events { +namespace UKSF.Tests.Unit.Common { public class EventModelFactoryTests { [Fact] public void ShouldReturnDataEvent() { diff --git a/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs b/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs index 36fec6bc..b8284320 100644 --- a/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs @@ -39,29 +39,5 @@ public async Task ShouldRunTask() { TaskService.Instance.RootFolder.DeleteTask(NAME, false); } - - // TODO: Rethink this one. Maybe just ignore CloseProcessGracefully - // [Fact] - // public async Task ShouldCloseProcess() { - // const string NAME = "Test"; - // const string COMMAND = "timeout 5"; - // string expected = $"C:\\Windows\\system32\\cmd.EXE /C {COMMAND}"; - // - // await ProcessUtilities.LaunchExternalProcess(NAME, COMMAND); - // await Task.Delay(TimeSpan.FromSeconds(1)); - // - // Process subject = Process.GetProcessesByName("cmd").FirstOrDefault(x => { - // using ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT CommandLine FROM Win32_Process WHERE ProcessId = " + x.Id); - // using ManagementObjectCollection objects = searcher.Get(); - // return objects.Cast().SingleOrDefault()?["CommandLine"]?.ToString() == expected; - // }); - // - // subject.Should().NotBeNull(); - // - // await subject.CloseProcessGracefully(); - // await Task.Delay(TimeSpan.FromSeconds(1)); - // - // subject?.HasExited.Should().BeTrue(); - // } } } diff --git a/UKSF.Tests.Unit/Common/StringUtilitiesTests.cs b/UKSF.Tests.Unit/Common/StringUtilitiesTests.cs index 33e5ac20..42961c4c 100644 --- a/UKSF.Tests.Unit/Common/StringUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Common/StringUtilitiesTests.cs @@ -8,14 +8,14 @@ namespace UKSF.Tests.Unit.Common { public class StringUtilitiesTests { [Theory, InlineData("", "", false), InlineData("", "hello", false), InlineData("hello world hello world", "hello", true), InlineData("hello", "HELLO", true), InlineData("hello world", "HELLOWORLD", false)] - public void ShouldNotCompareCase(string text, string searchElement, bool expected) { - bool subject = text.ContainsCaseInsensitive(searchElement); + public void ShouldIgnoreCase(string text, string searchElement, bool expected) { + bool subject = text.ContainsIgnoreCase(searchElement); subject.Should().Be(expected); } [Theory, InlineData(""), InlineData("2"), InlineData("1E+309"), InlineData("-1E+309")] // E+309 is one more than double max/min - public void ShouldNotThrowException(string text) { + public void ShouldNotThrowExceptionForDouble(string text) { Action act = () => text.ToDouble(); act.Should().NotThrow(); @@ -36,7 +36,7 @@ public void ShouldConvertToTitleCase(string text, string expected) { } [Theory, InlineData("", ""), InlineData("hello world", "HELLO_WORLD"), InlineData("HELLO_WORLD", "HELLO_WORLD"), InlineData(" i am key ", "I_AM_KEY")] - public void ShouldConvertToKey(string text, string expected) { + public void ShouldKeyify(string text, string expected) { string subject = text.Keyify(); subject.Should().Be(expected); @@ -71,7 +71,7 @@ public void ShouldRemoveEmbeddedQuotes(string text, string expected) { } [Theory, InlineData("Hello I am 5e39336e1b92ee2d14b7fe08", "5e39336e1b92ee2d14b7fe08"), InlineData("Hello I am 5e39336e1b92ee2d14b7fe08, I will be your SR1", "5e39336e1b92ee2d14b7fe08")] - public void ShouldExtractObjectId(string input, string expected) { + public void ShouldExtractObjectIds(string input, string expected) { List subject = input.ExtractObjectIds().ToList(); subject.Should().Contain(expected); diff --git a/UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs b/UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs index e6e6220d..9db5f9ec 100644 --- a/UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs @@ -16,7 +16,7 @@ public void ShouldDelay() { } [Fact] - public void ShouldNotThrowException() { + public void ShouldNotThrowExceptionForDelay() { Action act = () => { CancellationTokenSource token = new CancellationTokenSource(); Task unused = TaskUtilities.Delay(TimeSpan.FromMilliseconds(50), token.Token); diff --git a/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs index 2c8bf408..d73f9917 100644 --- a/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using FluentAssertions; @@ -51,6 +52,18 @@ public void ShouldGetItemByKey() { subject.Should().Be(item2); } + [Theory, InlineData(""), InlineData("game path")] + public void ShouldGetNothingWhenNoKeyOrNotFound(string key) { + VariableItem item1 = new VariableItem {key = "MISSIONS_PATH"}; + VariableItem item2 = new VariableItem {key = "SERVER_PATH"}; + VariableItem item3 = new VariableItem {key = "DISCORD_IDS"}; + mockCollection = new List {item1, item2, item3}; + + VariableItem subject = variablesDataService.GetSingle(key); + + subject.Should().Be(null); + } + [Fact] public async Task ShouldUpdateItemValue() { VariableItem subject = new VariableItem {key = "DISCORD_ID", item = "50"}; @@ -63,6 +76,15 @@ public async Task ShouldUpdateItemValue() { subject.item.Should().Be("75"); } + [Theory, InlineData(""), InlineData(null)] + public void ShouldThrowForUpdateWhenNoKeyOrNull(string key) { + mockCollection = new List(); + + Func act = async () => await variablesDataService.Update(key, "75"); + + act.Should().Throw(); + } + [Fact] public async Task ShouldDeleteItem() { VariableItem item1 = new VariableItem {key = "DISCORD_ID", item = "50"}; @@ -74,5 +96,14 @@ public async Task ShouldDeleteItem() { mockCollection.Should().HaveCount(0); } + + [Theory, InlineData(""), InlineData(null)] + public void ShouldThrowForDeleteWhenNoKeyOrNull(string key) { + mockCollection = new List(); + + Func act = async () => await variablesDataService.Delete(key); + + act.Should().Throw(); + } } } diff --git a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs index 7e8989e0..be52076c 100644 --- a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs @@ -24,48 +24,44 @@ public CachedDataServiceTests() { mockDataCollection.Setup(x => x.SetCollectionName(It.IsAny())); } - [Fact] - public void ShouldRefreshCollection() { - MockDataModel item1 = new MockDataModel {Name = "1"}; - MockDataModel item2 = new MockDataModel {Name = "1"}; - - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + [Theory, InlineData(""), InlineData(null)] + public void ShouldGetNothingWhenNoIdOrNull(string id) { + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - mockCollection.Add(item2); + MockCachedDataService mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + MockDataModel subject = mockCachedDataService.GetSingle(id); - subject.Refresh(); - subject.Collection.Should().Contain(item1); - subject.Collection.Should().Contain(item2); + subject.Should().Be(null); } [Fact] - public void ShouldGetCachedItems() { + public async Task ShouldAddItem() { MockDataModel item1 = new MockDataModel {Name = "1"}; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Add(It.IsAny())).Callback(x => mockCollection.Add(x)); - MockCachedDataService mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - mockCachedDataService.Refresh(); - List subject = mockCachedDataService.Get(); + MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + await subject.Add(item1); - subject.Should().BeSameAs(mockCollection); + subject.Collection.Should().Contain(item1); } [Fact] - public void ShouldGetCachedItemsByPredicate() { + public async Task ShouldDeleteItem() { MockDataModel item1 = new MockDataModel {Name = "1"}; MockDataModel item2 = new MockDataModel {Name = "2"}; mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Delete(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); - MockCachedDataService mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - List subject = mockCachedDataService.Get(x => x.Name == "1"); + MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + await subject.Delete(item1.id); - subject.Should().Contain(item1); + subject.Collection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); } [Fact] @@ -96,35 +92,51 @@ public void ShouldGetCachedItemByPredicate() { } [Fact] - public async Task ShouldAddItem() { + public void ShouldGetCachedItems() { MockDataModel item1 = new MockDataModel {Name = "1"}; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.Add(It.IsAny())).Callback(x => mockCollection.Add(x)); - MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - await subject.Add(item1); + MockCachedDataService mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + mockCachedDataService.Refresh(); + List subject = mockCachedDataService.Get(); - subject.Collection.Should().Contain(item1); + subject.Should().BeSameAs(mockCollection); } [Fact] - public async Task ShouldUpdateItemValue() { + public void ShouldGetCachedItemsByPredicate() { MockDataModel item1 = new MockDataModel {Name = "1"}; + MockDataModel item2 = new MockDataModel {Name = "2"}; + + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + + MockCachedDataService mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + List subject = mockCachedDataService.Get(x => x.Name == "1"); + + subject.Should().Contain(item1); + } + + [Fact] + public void ShouldRefreshCollection() { + MockDataModel item1 = new MockDataModel {Name = "1"}; + MockDataModel item2 = new MockDataModel {Name = "1"}; mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - await subject.Update(item1.id, "Name", "2"); + mockCollection.Add(item2); - subject.Collection.First().Name.Should().Be("2"); + subject.Refresh(); + subject.Collection.Should().Contain(item1); + subject.Collection.Should().Contain(item2); } [Fact] - public async Task ShouldUpdateItemValueByUpdateDefinition() { + public async Task ShouldUpdateItemValue() { MockDataModel item1 = new MockDataModel {Name = "1"}; mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); @@ -132,26 +144,23 @@ public async Task ShouldUpdateItemValueByUpdateDefinition() { mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - await subject.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); + await subject.Update(item1.id, "Name", "2"); subject.Collection.First().Name.Should().Be("2"); } [Fact] - public async Task ShouldDeleteItem() { + public async Task ShouldUpdateItemValueByUpdateDefinition() { MockDataModel item1 = new MockDataModel {Name = "1"}; - MockDataModel item2 = new MockDataModel {Name = "2"}; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.Delete(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - await subject.Delete(item1.id); + await subject.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); - subject.Collection.Should().HaveCount(1); - subject.Collection.Should().NotContain(item1); - subject.Collection.Should().Contain(item2); + subject.Collection.First().Name.Should().Be("2"); } } } diff --git a/UKSF.Tests.Unit/Data/DataServiceTests.cs b/UKSF.Tests.Unit/Data/DataServiceTests.cs index f7708841..8dc220d7 100644 --- a/UKSF.Tests.Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/DataServiceTests.cs @@ -42,6 +42,16 @@ public async Task ShouldAddItem() { mockCollection.Should().Contain(item1); } + [Fact] + public void ShouldThrowForAddWhenItemIsNull() { + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + Func act = async () => await mockDataService.Add(null); + + act.Should().Throw(); + } + [Fact] public void ShouldCreateCollection() { mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); @@ -62,9 +72,17 @@ public async Task ShouldDeleteItem() { MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); await mockDataService.Delete(item1.id); - mockCollection.Should().HaveCount(1); - mockCollection.Should().NotContain(item1); - mockCollection.Should().Contain(item2); + mockCollection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); + } + + [Theory, InlineData(""), InlineData(null)] + public void ShouldThrowForDeleteWhenNoKeyOrNull(string id) { + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + Func act = async () => await mockDataService.Delete(id); + + act.Should().Throw(); } [Fact] @@ -80,6 +98,16 @@ public void ShouldGetItem() { subject.Should().Be(item1); } + [Theory, InlineData(""), InlineData(null)] + public void ShouldGetNothingWhenNoKeyOrNull(string id) { + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + MockDataModel subject = mockDataService.GetSingle(id); + + subject.Should().Be(null); + } + [Fact] public void ShouldGetItemByPredicate() { MockDataModel item1 = new MockDataModel {Name = "1"}; @@ -118,8 +146,7 @@ public void ShouldGetItemsByPredicate() { MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); List subject = mockDataService.Get(x => x.id == id); - subject.Should().HaveCount(1); - subject.Should().Contain(item1); + subject.Should().HaveCount(1).And.Contain(item1); } [Fact] @@ -152,6 +179,16 @@ public async Task ShouldMakeUnsetUpdate() { Render(subject).Should().BeEquivalentTo(expected); } + [Theory, InlineData(""), InlineData(null)] + public void ShouldThrowForUpdateWhenNoKeyOrNull(string id) { + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + Func act = async () => await mockDataService.Update(id, "Name", null); + + act.Should().Throw(); + } + [Fact] public void ShouldSetCollectionName() { string collectionName = ""; @@ -188,5 +225,15 @@ public async Task ShouldUpdateItemValueByUpdateDefinition() { item1.Name.Should().Be("2"); } + + [Theory, InlineData(""), InlineData(null)] + public void ShouldThrowForUpdateWithUpdateDefinitionWhenNoKeyOrNull(string id) { + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + + MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + Func act = async () => await mockDataService.Update(id, Builders.Update.Set(x => x.Name, "2")); + + act.Should().Throw(); + } } } diff --git a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs index 8420784c..2d852120 100644 --- a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs @@ -47,5 +47,16 @@ public void ShouldGetSingleByName() { subject.Should().Be(rank2); } + + [Theory, InlineData(""), InlineData(null)] + public void ShouldGetNothingWhenNoNameOrNull(string name) { + List mockCollection = new List(); + + mockDataCollection.Setup(x => x.Get()).Returns(mockCollection); + + Rank subject = ranksDataService.GetSingle(name); + + subject.Should().Be(null); + } } } diff --git a/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs index 95cd44f4..6e3542ee 100644 --- a/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs @@ -47,5 +47,16 @@ public void ShouldGetSingleByName() { subject.Should().Be(role2); } + + [Theory, InlineData(""), InlineData(null)] + public void ShouldGetNothingWhenNoName(string name) { + List mockCollection = new List(); + + mockDataCollection.Setup(x => x.Get()).Returns(mockCollection); + + Role subject = rolesDataService.GetSingle(name); + + subject.Should().Be(null); + } } } diff --git a/UKSF.Tests.Unit/Models/AccountSettingsTests.cs b/UKSF.Tests.Unit/Models/AccountSettingsTests.cs index c797a6ef..3988d0dd 100644 --- a/UKSF.Tests.Unit/Models/AccountSettingsTests.cs +++ b/UKSF.Tests.Unit/Models/AccountSettingsTests.cs @@ -1,4 +1,5 @@ -using FluentAssertions; +using System; +using FluentAssertions; using UKSF.Api.Models.Personnel; using Xunit; @@ -12,7 +13,7 @@ public void ShouldReturnBool() { attribute.GetType().Should().Be(typeof(bool)); } - + [Fact] public void ShouldReturnCorrectValue() { AccountSettings subject = new AccountSettings {sr1Enabled = false, errorEmails = true}; @@ -23,5 +24,14 @@ public void ShouldReturnCorrectValue() { sr1Enabled.Should().BeFalse(); errorEmails.Should().BeTrue(); } + + [Theory, InlineData(""), InlineData(null)] + public void ShouldThrowWhenSettingNotFound(string name) { + AccountSettings accountSettings = new AccountSettings(); + + Action act = () => accountSettings.GetAttribute(name); + + act.Should().Throw(); + } } } diff --git a/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs b/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs index 90ed7115..d2c8eb7e 100644 --- a/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs @@ -12,6 +12,9 @@ namespace UKSF.Tests.Unit.Services.Common { public class DisplayNameUtilitiesTests { + private readonly Mock mockDisplayNameService; + private readonly Mock mockUnitsDataService; + public DisplayNameUtilitiesTests() { mockDisplayNameService = new Mock(); mockUnitsDataService = new Mock(); @@ -25,9 +28,6 @@ public DisplayNameUtilitiesTests() { ServiceWrapper.ServiceProvider = serviceProvider.BuildServiceProvider(); } - private readonly Mock mockDisplayNameService; - private readonly Mock mockUnitsDataService; - [Theory, InlineData("5e39336e1b92ee2d14b7fe08", "Maj.Bridgford.A"), InlineData("5e39336e1b92ee2d14b7fe08, 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A, Cpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe085e3935db1b92ee2d14b7fe09", "Maj.Bridgford.ACpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe08 has requested all the things for 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A has requested all the things for Cpl.Carr.C")] public void ShouldConvertNameObjectIds(string input, string expected) { @@ -40,20 +40,6 @@ public void ShouldConvertNameObjectIds(string input, string expected) { subject.Should().Be(expected); } - [Fact] - public void ShouldConvertUnitObjectIds() { - const string INPUT = "5e39336e1b92ee2d14b7fe08"; - const string EXPECTED = "7 Squadron"; - Api.Models.Units.Unit unit = new Api.Models.Units.Unit {name = EXPECTED, id = INPUT}; - - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(unit); - mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); - - string subject = INPUT.ConvertObjectIds(); - - subject.Should().Be(EXPECTED); - } - [Fact] public void ShouldConvertCorrectUnitWithPredicate() { Api.Models.Units.Unit unit1 = new Api.Models.Units.Unit {name = "7 Squadron"}; @@ -69,7 +55,21 @@ public void ShouldConvertCorrectUnitWithPredicate() { } [Fact] - public void ShouldDoNothingToText() { + public void ShouldConvertUnitObjectIds() { + const string INPUT = "5e39336e1b92ee2d14b7fe08"; + const string EXPECTED = "7 Squadron"; + Api.Models.Units.Unit unit = new Api.Models.Units.Unit {name = EXPECTED, id = INPUT}; + + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(unit); + mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); + + string subject = INPUT.ConvertObjectIds(); + + subject.Should().Be(EXPECTED); + } + + [Fact] + public void ShouldDoNothingToTextWhenNameOrUnitNotFound() { const string INPUT = "5e39336e1b92ee2d14b7fe08"; const string EXPECTED = "5e39336e1b92ee2d14b7fe08"; diff --git a/UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs b/UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs index 1da527f6..87f73087 100644 --- a/UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs @@ -16,7 +16,7 @@ public void ShouldReturnCorrectSortValue() { } [Fact] - public void ShouldSortNullRankFirst() { + public void ShouldSortSecondRankAsFirstWhenFirstRankNull() { Rank rank1 = new Rank {name = "Private", order = 1}; int subject = RankUtilities.Sort(null, rank1); @@ -25,7 +25,7 @@ public void ShouldSortNullRankFirst() { } [Fact] - public void ShouldSortNullRankSecond() { + public void ShouldSortFirstRankAsFirstWhenSecondRankNull() { Rank rank1 = new Rank {name = "Private", order = 1}; int subject = RankUtilities.Sort(rank1, null); @@ -34,7 +34,7 @@ public void ShouldSortNullRankSecond() { } [Fact] - public void ShouldSortNullRanks() { + public void ShouldSortAsEqualWhenBothRanksNull() { int subject = RankUtilities.Sort(null, null); subject.Should().Be(0); diff --git a/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs b/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs index b0e1faac..29a619e5 100644 --- a/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs @@ -13,14 +13,19 @@ namespace UKSF.Tests.Unit.Services { public class ConfirmationCodeServiceTests { - [Fact] - public async Task ShouldReturnCodeId() { - Mock mockConfirmationCodeDataService = new Mock(); - Mock mockSchedulerService = new Mock(); - ConfirmationCodeService confirmationCodeService = new ConfirmationCodeService(mockConfirmationCodeDataService.Object, mockSchedulerService.Object); + private readonly Mock mockConfirmationCodeDataService; + private readonly Mock mockSchedulerService; + private readonly ConfirmationCodeService confirmationCodeService; + + public ConfirmationCodeServiceTests() { + mockConfirmationCodeDataService = new Mock(); + mockSchedulerService = new Mock(); + confirmationCodeService = new ConfirmationCodeService(mockConfirmationCodeDataService.Object, mockSchedulerService.Object); + } + [Fact] + public async Task ShouldReturnValidCodeId() { mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); - mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); string id = await confirmationCodeService.CreateConfirmationCode("test"); @@ -31,21 +36,14 @@ public async Task ShouldReturnCodeId() { [Fact] public async Task ShouldReturnCodeValue() { - Mock mockConfirmationCodeDataService = new Mock(); - Mock mockSchedulerService = new Mock(); - ConfirmationCodeService confirmationCodeService = new ConfirmationCodeService(mockConfirmationCodeDataService.Object, mockSchedulerService.Object); - - List confirmationCodeData = new List(); + ConfirmationCode confirmationCode = new ConfirmationCode {value = "test"}; + List confirmationCodeData = new List {confirmationCode}; - mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.Add(x)); mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(() => confirmationCodeData.First()); mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.RemoveAll(y => y.id == x)); - - mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns(Task.CompletedTask); - string id = await confirmationCodeService.CreateConfirmationCode("test"); - string subject = await confirmationCodeService.GetConfirmationCode(id); + string subject = await confirmationCodeService.GetConfirmationCode(confirmationCode.id); subject.Should().Be("test"); } diff --git a/UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs b/UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs index eaf9a726..62e4e769 100644 --- a/UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs +++ b/UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs @@ -36,7 +36,7 @@ public void ShouldGetDisplayNameById() { } [Fact] - public void ShouldGetNoDisplayName() { + public void ShouldGetNoDisplayNameWhenAccountNotFound() { mockAccountDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); string subject = displayNameService.GetDisplayName("5e39336e1b92ee2d14b7fe08"); @@ -45,7 +45,7 @@ public void ShouldGetNoDisplayName() { } [Fact] - public void ShouldGetDisplayName() { + public void ShouldGetDisplayNameByAccount() { Account account = new Account {lastname = "Beswick", firstname = "Tim"}; string subject = displayNameService.GetDisplayName(account); @@ -75,12 +75,19 @@ public void ShouldGetDisplayNameWithoutRank() { } [Fact] - public void ShouldGetGuest() { + public void ShouldGetGuestWhenAccountHasNoName() { Account account = new Account(); string subject = displayNameService.GetDisplayNameWithoutRank(account); subject.Should().Be("Guest"); } + + [Fact] + public void ShouldGetGuestWhenAccountIsNull() { + string subject = displayNameService.GetDisplayNameWithoutRank(null); + + subject.Should().Be("Guest"); + } } } diff --git a/UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs b/UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs index 57acb080..b9780bf7 100644 --- a/UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs +++ b/UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using FluentAssertions; using Moq; @@ -30,6 +31,17 @@ public void ShouldGetCorrectIndex() { subject.Should().Be(0); } + [Fact] + public void ShouldReturnInvalidIndexGetIndexWhenRankNotFound() { + List mockCollection = new List(); + + mockRanksDataService.Setup(x => x.Get()).Returns(mockCollection); + + int subject = ranksService.GetRankIndex("Private"); + + subject.Should().Be(-1); + } + [Fact] public void ShouldGetCorrectSortValueByName() { Rank rank1 = new Rank {name = "Private", order = 0}; @@ -43,7 +55,16 @@ public void ShouldGetCorrectSortValueByName() { subject.Should().Be(1); } - [Theory, InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] + [Fact] + public void ShouldReturnZeroForSortWhenRanksAreNull() { + mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); + + int subject = ranksService.Sort("Recruit", "Private"); + + subject.Should().Be(0); + } + + [Theory, InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false), InlineData("Sergeant", "Corporal", false)] public void ShouldResolveSuperior(string rankName1, string rankName2, bool expected) { Rank rank1 = new Rank {name = "Private", order = 0}; Rank rank2 = new Rank {name = "Recruit", order = 1}; @@ -71,6 +92,16 @@ public void ShouldResolveEqual(string rankName1, string rankName2, bool expected subject.Should().Be(expected); } + [Fact] + public void ShouldReturnEqualWhenBothNull() { + mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); + + bool subject = ranksService.IsEqual("Private", "Recruit"); + + subject.Should().Be(true); + } + + [Theory, InlineData("Private", "Private", true), InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] public void ShouldResolveSuperiorOrEqual(string rankName1, string rankName2, bool expected) { Rank rank1 = new Rank {name = "Private", order = 0}; diff --git a/UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs b/UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs index 1342fd00..e32ca2f7 100644 --- a/UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs +++ b/UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs @@ -32,6 +32,15 @@ public void ShouldGetCorrectSortValueByName() { subject.Should().Be(1); } + [Fact] + public void ShouldReturnZeroForSortWhenRanksAreNull() { + mockRolesDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); + + int subject = rolesService.Sort("Trainee", "Rifleman"); + + subject.Should().Be(0); + } + [Theory, InlineData(3, "Trainee"), InlineData(0, "Marksman")] public void ShouldGetUnitRoleByOrder(int order, string expected) { Role role1 = new Role {name = "Rifleman", order = 0, roleType = RoleType.INDIVIDUAL}; @@ -51,13 +60,7 @@ public void ShouldGetUnitRoleByOrder(int order, string expected) { [Fact] public void ShouldReturnNullWhenNoUnitRoleFound() { - Role role1 = new Role {name = "Gunner", order = 3, roleType = RoleType.INDIVIDUAL}; - Role role2 = new Role {name = "Trainee", order = 3, roleType = RoleType.UNIT}; - Role role3 = new Role {name = "Gunner", order = 2, roleType = RoleType.INDIVIDUAL}; - List mockCollection = new List {role1, role2, role3}; - - mockRolesDataService.Setup(x => x.Get()).Returns(mockCollection); - mockRolesDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.FirstOrDefault(x)); + mockRolesDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); Role subject = rolesService.GetUnitRoleByOrder(2); From f1f01b8920eba01ba99384f0403dde3f8a896f35 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 11 Feb 2020 18:40:02 +0000 Subject: [PATCH 128/369] Test null id for confirmation code service --- .../Services/ConfirmationCodeServiceTests.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs b/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs index 29a619e5..c01bb72c 100644 --- a/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs @@ -39,13 +39,22 @@ public async Task ShouldReturnCodeValue() { ConfirmationCode confirmationCode = new ConfirmationCode {value = "test"}; List confirmationCodeData = new List {confirmationCode}; - mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(() => confirmationCodeData.First()); + mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => confirmationCodeData.FirstOrDefault(x)); mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.RemoveAll(y => y.id == x)); - mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns>(x => Task.FromResult(new List().FirstOrDefault(x))); string subject = await confirmationCodeService.GetConfirmationCode(confirmationCode.id); subject.Should().Be("test"); } + + [Theory, InlineData(""), InlineData(null)] + public async Task ShouldReturnEmptyStringWhenNoIdOrNull(string id) { + mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); + + string subject = await confirmationCodeService.GetConfirmationCode(id); + + subject.Should().Be(string.Empty); + } } } From fadd7d98fa546c2028738fb83b316be6bfafb090 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 17 Feb 2020 14:30:02 +0000 Subject: [PATCH 129/369] Changed data property to use base method for data services. Added test case for confirmation code scheduled job cancel --- .../Handlers/TeamspeakEventHandler.cs | 2 +- UKSF.Api.Interfaces/IDataBackedService.cs | 4 +- UKSF.Api.Services/Admin/MigrationUtility.cs | 6 +- .../Command/ChainOfCommandService.cs | 6 +- .../CommandRequestCompletionService.cs | 30 +++---- .../Command/CommandRequestService.cs | 8 +- .../Common/DisplayNameUtilities.cs | 2 +- UKSF.Api.Services/DataBackedService.cs | 9 ++ .../Fake/FakeNotificationsService.cs | 6 +- UKSF.Api.Services/Game/GameServersService.cs | 10 +-- .../Game/Missions/MissionPatchDataService.cs | 8 +- UKSF.Api.Services/Game/ServerService.cs | 4 +- .../Integrations/DiscordService.cs | 8 +- .../Teamspeak/TeamspeakGroupService.cs | 6 +- .../Launcher/LauncherFileService.cs | 18 ++-- .../Message/CommentThreadService.cs | 18 ++-- UKSF.Api.Services/Message/LoggingService.cs | 18 ++-- .../Message/NotificationsService.cs | 22 ++--- .../Operations/OperationOrderService.cs | 10 +-- .../Operations/OperationReportService.cs | 12 +-- UKSF.Api.Services/Personnel/AccountService.cs | 8 +- .../Personnel/AssignmentService.cs | 34 ++++---- .../Personnel/AttendanceService.cs | 4 +- .../Personnel/DischargeService.cs | 8 +- .../Personnel/DisplayNameService.cs | 4 +- UKSF.Api.Services/Personnel/LoaService.cs | 16 ++-- UKSF.Api.Services/Personnel/LoginService.cs | 8 +- UKSF.Api.Services/Personnel/RanksService.cs | 21 ++--- .../Personnel/RecruitmentService.cs | 20 ++--- UKSF.Api.Services/Personnel/RolesService.cs | 13 ++- .../Personnel/ServiceRecordService.cs | 2 +- UKSF.Api.Services/Units/UnitsService.cs | 64 +++++++-------- .../Utility/ConfirmationCodeService.cs | 16 ++-- .../Utility/SchedulerActionHelper.cs | 2 +- UKSF.Api.Services/Utility/SchedulerService.cs | 32 +++----- UKSF.Api.Services/Utility/SessionService.cs | 2 +- .../Accounts/AccountsController.cs | 30 +++---- .../Accounts/CommunicationsController.cs | 6 +- .../Accounts/ConfirmationCodeReceiver.cs | 4 +- .../Accounts/DiscordCodeController.cs | 4 +- .../Accounts/OperationOrderController.cs | 6 +- .../Accounts/OperationReportController.cs | 6 +- .../Accounts/PasswordResetController.cs | 4 +- .../Accounts/SteamCodeController.cs | 4 +- .../Controllers/ApplicationsController.cs | 12 +-- .../CommandRequestsController.cs | 6 +- .../CommandRequestsCreationController.cs | 12 +-- .../Controllers/CommentThreadController.cs | 12 +-- UKSF.Api/Controllers/DischargesController.cs | 12 +-- UKSF.Api/Controllers/GameServersController.cs | 48 +++++------ UKSF.Api/Controllers/LoaController.cs | 20 ++--- UKSF.Api/Controllers/RanksController.cs | 38 ++++----- UKSF.Api/Controllers/RecruitmentController.cs | 24 +++--- UKSF.Api/Controllers/RolesController.cs | 42 +++++----- UKSF.Api/Controllers/UnitsController.cs | 82 +++++++++---------- .../Common/DisplayNameUtilitiesTests.cs | 2 +- .../Services/ConfirmationCodeServiceTests.cs | 21 ++++- .../Personnel/DisplayNameServiceTests.cs | 4 +- 58 files changed, 409 insertions(+), 451 deletions(-) create mode 100644 UKSF.Api.Services/DataBackedService.cs diff --git a/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs b/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs index 345c0b1b..a1584a39 100644 --- a/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs +++ b/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs @@ -88,7 +88,7 @@ private void UpdateClientServerGroups(string args) { private void ProcessAccountData(double clientDbId, ICollection serverGroups) { Console.WriteLine($"Processing server groups for {clientDbId}"); - Account account = accountService.Data().GetSingle(x => x.teamspeakIdentities != null && x.teamspeakIdentities.Any(y => y.Equals(clientDbId))); + Account account = accountService.Data.GetSingle(x => x.teamspeakIdentities != null && x.teamspeakIdentities.Any(y => y.Equals(clientDbId))); Task unused = teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); lock (serverGroupUpdates) { diff --git a/UKSF.Api.Interfaces/IDataBackedService.cs b/UKSF.Api.Interfaces/IDataBackedService.cs index b49ae86d..c5ce2cd7 100644 --- a/UKSF.Api.Interfaces/IDataBackedService.cs +++ b/UKSF.Api.Interfaces/IDataBackedService.cs @@ -1,5 +1,5 @@ -namespace UKSF.Api.Interfaces { +namespace UKSF.Api.Interfaces { public interface IDataBackedService { - T Data(); + T Data { get; } } } diff --git a/UKSF.Api.Services/Admin/MigrationUtility.cs b/UKSF.Api.Services/Admin/MigrationUtility.cs index 0c4858e0..930c6fd3 100644 --- a/UKSF.Api.Services/Admin/MigrationUtility.cs +++ b/UKSF.Api.Services/Admin/MigrationUtility.cs @@ -48,9 +48,9 @@ public void Migrate() { private static void ExecuteMigration() { IUnitsService unitsService = ServiceWrapper.ServiceProvider.GetService(); IRolesService rolesService = ServiceWrapper.ServiceProvider.GetService(); - List roles = rolesService.Data().Get(x => x.roleType == RoleType.UNIT); + List roles = rolesService.Data.Get(x => x.roleType == RoleType.UNIT); - foreach (Unit unit in unitsService.Data().Get()) { + foreach (Unit unit in unitsService.Data.Get()) { Dictionary unitRoles = unit.roles; int originalCount = unit.roles.Count; foreach ((string key, string _) in unitRoles.ToList()) { @@ -60,7 +60,7 @@ private static void ExecuteMigration() { } if (roles.Count != originalCount) { - unitsService.Data().Update(unit.id, Builders.Update.Set(x => x.roles, unitRoles)).Wait(); + unitsService.Data.Update(unit.id, Builders.Update.Set(x => x.roles, unitRoles)).Wait(); } } } diff --git a/UKSF.Api.Services/Command/ChainOfCommandService.cs b/UKSF.Api.Services/Command/ChainOfCommandService.cs index cb103a57..793d0e9d 100644 --- a/UKSF.Api.Services/Command/ChainOfCommandService.cs +++ b/UKSF.Api.Services/Command/ChainOfCommandService.cs @@ -31,7 +31,7 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U // If no chain, get root unit child commanders if (chain.Count == 0) { - foreach (Unit unit in unitsService.Data().Get(x => x.parent == unitsService.GetRoot().id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) { + foreach (Unit unit in unitsService.Data.Get(x => x.parent == unitsService.GetRoot().id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) { chain.Add(GetCommander(unit)); } } @@ -47,7 +47,7 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U public bool InContextChainOfCommand(string id) { Account contextAccount = sessionService.GetContextAccount(); if (id == contextAccount.id) return true; - Unit unit = unitsService.Data().GetSingle(x => x.name == contextAccount.unitAssignment); + Unit unit = unitsService.Data.GetSingle(x => x.name == contextAccount.unitAssignment); return unitsService.RolesHasMember(unit, contextAccount.id) && (unit.members.Contains(id) || unitsService.GetAllChildren(unit, true).Any(unitChild => unitChild.members.Contains(id))); } @@ -108,7 +108,7 @@ private IEnumerable GetCommanderAndSr10(Unit unit) { return chain; } - private IEnumerable GetSr10() => unitsService.Data().GetSingle(x => x.shortname == "SR10").members.ToHashSet(); + private IEnumerable GetSr10() => unitsService.Data.GetSingle(x => x.shortname == "SR10").members.ToHashSet(); private IEnumerable GetCommanderAndTargetCommander(Unit unit, Unit targetUnit) => new HashSet {GetNextUnitCommander(unit), GetNextUnitCommander(targetUnit)}; diff --git a/UKSF.Api.Services/Command/CommandRequestCompletionService.cs b/UKSF.Api.Services/Command/CommandRequestCompletionService.cs index e64da14d..9003e2ca 100644 --- a/UKSF.Api.Services/Command/CommandRequestCompletionService.cs +++ b/UKSF.Api.Services/Command/CommandRequestCompletionService.cs @@ -54,7 +54,7 @@ INotificationsService notificationsService public async Task Resolve(string id) { if (commandRequestService.IsRequestApproved(id) || commandRequestService.IsRequestRejected(id)) { - CommandRequest request = commandRequestService.Data().GetSingle(id); + CommandRequest request = commandRequestService.Data.GetSingle(id); switch (request.type) { case CommandRequestType.PROMOTION: case CommandRequestType.DEMOTION: @@ -115,7 +115,7 @@ private async Task Loa(CommandRequest request) { private async Task Discharge(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { - Account account = accountService.Data().GetSingle(request.recipient); + Account account = accountService.Data.GetSingle(request.recipient); Discharge discharge = new Discharge { rank = account.rank, unit = account.unitAssignment, @@ -123,19 +123,19 @@ private async Task Discharge(CommandRequest request) { dischargedBy = request.displayRequester, reason = request.reason }; - DischargeCollection dischargeCollection = dischargeService.Data().GetSingle(x => x.accountId == account.id); + DischargeCollection dischargeCollection = dischargeService.Data.GetSingle(x => x.accountId == account.id); if (dischargeCollection == null) { dischargeCollection = new DischargeCollection {accountId = account.id, name = $"{account.lastname}.{account.firstname[0]}"}; dischargeCollection.discharges.Add(discharge); - await dischargeService.Data().Add(dischargeCollection); + await dischargeService.Data.Add(dischargeCollection); } else { dischargeCollection.discharges.Add(discharge); - await dischargeService.Data().Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, false)); - await dischargeService.Data().Update(dischargeCollection.id, Builders.Update.Set(x => x.name, $"{account.lastname}.{account.firstname[0]}")); - await dischargeService.Data().Update(dischargeCollection.id, Builders.Update.Set(x => x.discharges, dischargeCollection.discharges)); + await dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, false)); + await dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.name, $"{account.lastname}.{account.firstname[0]}")); + await dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.discharges, dischargeCollection.discharges)); } - await accountService.Data().Update(account.id, "membershipState", MembershipState.DISCHARGED); + await accountService.Data.Update(account.id, "membershipState", MembershipState.DISCHARGED); Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, request.reason, "", AssignmentService.REMOVE_FLAG); notificationsService.Add(notification); @@ -168,12 +168,12 @@ private async Task UnitRole(CommandRequest request) { notificationsService.Add(new Notification {owner = request.recipient, message = "You have been unassigned from all roles in all units", icon = NotificationIcons.DEMOTION}); } else { string role = await assignmentService.UnassignUnitRole(request.recipient, request.value); - notificationsService.Add(new Notification {owner = request.recipient, message = $"You have been unassigned as {AvsAn.Query(role).Article} {role} in {unitsService.GetChainString(unitsService.Data().GetSingle(request.value))}", icon = NotificationIcons.DEMOTION}); + notificationsService.Add(new Notification {owner = request.recipient, message = $"You have been unassigned as {AvsAn.Query(role).Article} {role} in {unitsService.GetChainString(unitsService.Data.GetSingle(request.value))}", icon = NotificationIcons.DEMOTION}); } } else { await assignmentService.AssignUnitRole(request.recipient, request.value, request.secondaryValue); notificationsService.Add( - new Notification {owner = request.recipient, message = $"You have been assigned as {AvsAn.Query(request.secondaryValue).Article} {request.secondaryValue} in {unitsService.GetChainString(unitsService.Data().GetSingle(request.value))}", icon = NotificationIcons.PROMOTION} + new Notification {owner = request.recipient, message = $"You have been assigned as {AvsAn.Query(request.secondaryValue).Article} {request.secondaryValue} in {unitsService.GetChainString(unitsService.Data.GetSingle(request.value))}", icon = NotificationIcons.PROMOTION} ); } @@ -187,7 +187,7 @@ private async Task UnitRole(CommandRequest request) { private async Task UnitRemoval(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { - Unit unit = unitsService.Data().GetSingle(request.value); + Unit unit = unitsService.Data.GetSingle(request.value); await assignmentService.UnassignUnit(request.recipient, unit.id); notificationsService.Add(new Notification {owner = request.recipient, message = $"You have been removed from {unitsService.GetChainString(unit)}", icon = NotificationIcons.DEMOTION}); await commandRequestService.ArchiveRequest(request.id); @@ -200,7 +200,7 @@ private async Task UnitRemoval(CommandRequest request) { private async Task Transfer(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { - Unit unit = unitsService.Data().GetSingle(request.value); + Unit unit = unitsService.Data.GetSingle(request.value); Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, unit.name, reason: request.reason); notificationsService.Add(notification); await commandRequestService.ArchiveRequest(request.id); @@ -213,9 +213,9 @@ private async Task Transfer(CommandRequest request) { private async Task Reinstate(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { - DischargeCollection dischargeCollection = dischargeService.Data().GetSingle(x => x.accountId == request.recipient); - await dischargeService.Data().Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); - await accountService.Data().Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); + DischargeCollection dischargeCollection = dischargeService.Data.GetSingle(x => x.accountId == request.recipient); + await dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); + await accountService.Data.Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); Notification notification = await assignmentService.UpdateUnitRankAndRole(dischargeCollection.accountId, "Basic Training Unit", "Trainee", "Recruit", "", "", "your membership was reinstated"); notificationsService.Add(notification); diff --git a/UKSF.Api.Services/Command/CommandRequestService.cs b/UKSF.Api.Services/Command/CommandRequestService.cs index ce70a128..54302508 100644 --- a/UKSF.Api.Services/Command/CommandRequestService.cs +++ b/UKSF.Api.Services/Command/CommandRequestService.cs @@ -51,17 +51,17 @@ IRanksService ranksService this.ranksService = ranksService; } - public ICommandRequestDataService Data() => data; + public ICommandRequestDataService Data => data; public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE) { Account requesterAccount = sessionService.GetContextAccount(); - Account recipientAccount = accountService.Data().GetSingle(request.recipient); + Account recipientAccount = accountService.Data.GetSingle(request.recipient); request.displayRequester = displayNameService.GetDisplayName(requesterAccount); request.displayRecipient = displayNameService.GetDisplayName(recipientAccount); - HashSet ids = chainOfCommandService.ResolveChain(mode, recipientAccount.id, unitsService.Data().GetSingle(x => x.name == recipientAccount.unitAssignment), unitsService.Data().GetSingle(request.value)); + HashSet ids = chainOfCommandService.ResolveChain(mode, recipientAccount.id, unitsService.Data.GetSingle(x => x.name == recipientAccount.unitAssignment), unitsService.Data.GetSingle(request.value)); if (ids.Count == 0) throw new Exception($"Failed to get any commanders for review for {request.type.ToLower()} request for {request.displayRecipient}.\nContact an admin"); - List accounts = ids.Select(x => accountService.Data().GetSingle(x)).OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); + List accounts = ids.Select(x => accountService.Data.GetSingle(x)).OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); foreach (Account account in accounts) { request.reviews.Add(account.id, ReviewState.PENDING); } diff --git a/UKSF.Api.Services/Common/DisplayNameUtilities.cs b/UKSF.Api.Services/Common/DisplayNameUtilities.cs index a149e5a0..e191bb95 100644 --- a/UKSF.Api.Services/Common/DisplayNameUtilities.cs +++ b/UKSF.Api.Services/Common/DisplayNameUtilities.cs @@ -18,7 +18,7 @@ public static string ConvertObjectIds(this string message) { foreach (string objectId in objectIds) { string displayString = displayNameService.GetDisplayName(objectId); if (displayString == objectId) { - Unit unit = unitsService.Data().GetSingle(x => x.id == objectId); + Unit unit = unitsService.Data.GetSingle(x => x.id == objectId); if (unit != null) { displayString = unit.name; } diff --git a/UKSF.Api.Services/DataBackedService.cs b/UKSF.Api.Services/DataBackedService.cs new file mode 100644 index 00000000..3e362ae7 --- /dev/null +++ b/UKSF.Api.Services/DataBackedService.cs @@ -0,0 +1,9 @@ +using UKSF.Api.Interfaces; + +namespace UKSF.Api.Services { + public abstract class DataBackedService : IDataBackedService { + protected DataBackedService(T data) => Data = data; + + public T Data { get; } + } +} diff --git a/UKSF.Api.Services/Fake/FakeNotificationsService.cs b/UKSF.Api.Services/Fake/FakeNotificationsService.cs index 4903baf7..0d1d6fb1 100644 --- a/UKSF.Api.Services/Fake/FakeNotificationsService.cs +++ b/UKSF.Api.Services/Fake/FakeNotificationsService.cs @@ -6,15 +6,15 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Services.Fake { - public class FakeNotificationsService : INotificationsService { + public class FakeNotificationsService : DataBackedService, INotificationsService { + public FakeNotificationsService(INotificationsDataService data) : base(data) { } + public Task SendTeamspeakNotification(Account account, string rawMessage) => Task.CompletedTask; public Task SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) => Task.CompletedTask; public IEnumerable GetNotificationsForContext() => new List(); - public INotificationsDataService Data() => null; - public void Add(Notification notification) { } public Task MarkNotificationsAsRead(List ids) => Task.CompletedTask; diff --git a/UKSF.Api.Services/Game/GameServersService.cs b/UKSF.Api.Services/Game/GameServersService.cs index 90da52a1..6e368f5c 100644 --- a/UKSF.Api.Services/Game/GameServersService.cs +++ b/UKSF.Api.Services/Game/GameServersService.cs @@ -15,17 +15,13 @@ using UKSF.Common; namespace UKSF.Api.Services.Game { - public class GameServersService : IGameServersService { - private readonly IGameServersDataService data; + public class GameServersService : DataBackedService, IGameServersService { private readonly IMissionPatchingService missionPatchingService; - public GameServersService(IGameServersDataService data, IMissionPatchingService missionPatchingService) { - this.data = data; + public GameServersService(IGameServersDataService data, IMissionPatchingService missionPatchingService) : base(data) { this.missionPatchingService = missionPatchingService; } - public IGameServersDataService Data() => data; - public int GetGameInstanceCount() => GameServerHelpers.GetArmaProcesses().Count(); public async Task UploadMissionFile(IFormFile file) { @@ -142,7 +138,7 @@ public int KillAllArmaProcesses() { process.Kill(); } - data.Get() + Data.Get() .ForEach( x => { x.processId = null; diff --git a/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs b/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs index 5599badf..4818cd74 100644 --- a/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs @@ -22,14 +22,14 @@ public MissionPatchDataService(IRanksService ranksService, IUnitsService unitsSe } public void UpdatePatchData() { - MissionPatchData.instance = new MissionPatchData {units = new List(), ranks = ranksService.Data().Get(), players = new List(), orderedUnits = new List()}; + MissionPatchData.instance = new MissionPatchData {units = new List(), ranks = ranksService.Data.Get(), players = new List(), orderedUnits = new List()}; - foreach (Unit unit in unitsService.Data().Get(x => x.branch == UnitBranch.COMBAT).ToList()) { + foreach (Unit unit in unitsService.Data.Get(x => x.branch == UnitBranch.COMBAT).ToList()) { MissionPatchData.instance.units.Add(new MissionUnit {sourceUnit = unit, depth = unitsService.GetUnitDepth(unit)}); } - foreach (Account account in accountService.Data().Get().Where(x => !string.IsNullOrEmpty(x.rank) && ranksService.IsSuperiorOrEqual(x.rank, "Recruit"))) { - MissionPatchData.instance.players.Add(new MissionPlayer {account = account, rank = ranksService.Data().GetSingle(account.rank), name = displayNameService.GetDisplayName(account)}); + foreach (Account account in accountService.Data.Get().Where(x => !string.IsNullOrEmpty(x.rank) && ranksService.IsSuperiorOrEqual(x.rank, "Recruit"))) { + MissionPatchData.instance.players.Add(new MissionPlayer {account = account, rank = ranksService.Data.GetSingle(account.rank), name = displayNameService.GetDisplayName(account)}); } foreach (MissionUnit missionUnit in MissionPatchData.instance.units) { diff --git a/UKSF.Api.Services/Game/ServerService.cs b/UKSF.Api.Services/Game/ServerService.cs index 03b7fe8c..a77d28c2 100644 --- a/UKSF.Api.Services/Game/ServerService.cs +++ b/UKSF.Api.Services/Game/ServerService.cs @@ -36,7 +36,7 @@ public void UpdateSquadXml() { return; Task.Run( () => { - List accounts = accountService.Data().Get(x => x.membershipState == MembershipState.MEMBER && x.rank != null); + List accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER && x.rank != null); accounts = accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); StringBuilder stringBuilder = new StringBuilder(); @@ -46,7 +46,7 @@ public void UpdateSquadXml() { foreach (Account account in accounts.Where(x => ranksService.IsSuperiorOrEqual(x.rank, "Private"))) { StringBuilder accountStringBuilder = new StringBuilder(); - Unit unit = unitsService.Data().GetSingle(x => x.name == account.unitAssignment); + Unit unit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); string unitRole = unit.roles.FirstOrDefault(x => x.Value == account.id).Key; accountStringBuilder.AppendLine($"\t"); accountStringBuilder.AppendLine($"\t\t{unit.callsign}"); diff --git a/UKSF.Api.Services/Integrations/DiscordService.cs b/UKSF.Api.Services/Integrations/DiscordService.cs index 47a8dab8..d3ee40c8 100644 --- a/UKSF.Api.Services/Integrations/DiscordService.cs +++ b/UKSF.Api.Services/Integrations/DiscordService.cs @@ -83,7 +83,7 @@ public virtual async Task UpdateAccount(Account account, ulong discordId = 0) { } if (discordId != 0 && account == null) { - account = accountService.Data().GetSingle(x => !string.IsNullOrEmpty(x.discordId) && x.discordId == discordId.ToString()); + account = accountService.Data.GetSingle(x => !string.IsNullOrEmpty(x.discordId) && x.discordId == discordId.ToString()); } if (discordId == 0) return; @@ -137,14 +137,14 @@ private async Task UpdateAccountNickname(IGuildUser user, Account account) { private void UpdateAccountRanks(Account account, ISet allowedRoles) { string rank = account.rank; - foreach (Rank x in ranksService.Data().Get().Where(x => rank == x.name)) { + foreach (Rank x in ranksService.Data.Get().Where(x => rank == x.name)) { allowedRoles.Add(x.discordRoleId); } } private void UpdateAccountUnits(Account account, ISet allowedRoles) { - Unit accountUnit = unitsService.Data().GetSingle(x => x.name == account.unitAssignment); - List accountUnits = unitsService.Data().Get(x => x.members.Contains(account.id)).Where(x => !string.IsNullOrEmpty(x.discordRoleId)).ToList(); + Unit accountUnit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); + List accountUnits = unitsService.Data.Get(x => x.members.Contains(account.id)).Where(x => !string.IsNullOrEmpty(x.discordRoleId)).ToList(); List accountUnitParents = unitsService.GetParents(accountUnit).Where(x => !string.IsNullOrEmpty(x.discordRoleId)).ToList(); accountUnits.ForEach(x => allowedRoles.Add(x.discordRoleId)); accountUnitParents.ForEach(x => allowedRoles.Add(x.discordRoleId)); diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs index 805e8428..2ae12aa7 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs @@ -52,14 +52,14 @@ public async Task UpdateAccountGroups(Account account, ICollection serve private void UpdateRank(Account account, ISet allowedGroups) { string rank = account.rank; - foreach (Rank x in ranksService.Data().Get().Where(x => rank == x.name)) { + foreach (Rank x in ranksService.Data.Get().Where(x => rank == x.name)) { allowedGroups.Add(x.teamspeakGroup.ToDouble()); } } private void UpdateUnits(Account account, ISet allowedGroups) { - Unit accountUnit = unitsService.Data().GetSingle(x => x.name == account.unitAssignment); - List accountUnits = unitsService.Data().Get(x => x.members.Contains(account.id)).Where(x => !string.IsNullOrEmpty(x.teamspeakGroup)).ToList(); + Unit accountUnit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); + List accountUnits = unitsService.Data.Get(x => x.members.Contains(account.id)).Where(x => !string.IsNullOrEmpty(x.teamspeakGroup)).ToList(); List accountUnitParents = unitsService.GetParents(accountUnit).Where(x => !string.IsNullOrEmpty(x.teamspeakGroup)).ToList(); Unit elcom = unitsService.GetAuxilliaryRoot(); diff --git a/UKSF.Api.Services/Launcher/LauncherFileService.cs b/UKSF.Api.Services/Launcher/LauncherFileService.cs index 0d2f0568..b1bc920f 100644 --- a/UKSF.Api.Services/Launcher/LauncherFileService.cs +++ b/UKSF.Api.Services/Launcher/LauncherFileService.cs @@ -14,15 +14,11 @@ using UKSF.Api.Services.Admin; namespace UKSF.Api.Services.Launcher { - public class LauncherFileService : ILauncherFileService { - private readonly ILauncherFileDataService data; - - public LauncherFileService(ILauncherFileDataService data) => this.data = data; - - public ILauncherFileDataService Data() => data; + public class LauncherFileService : DataBackedService, ILauncherFileService { + public LauncherFileService(ILauncherFileDataService data) : base(data) { } public async Task UpdateAllVersions() { - List storedVersions = data.Get(); + List storedVersions = Data.Get(); string launcherDirectory = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("LAUNCHER_LOCATION").AsString(), "Launcher"); List fileNames = new List(); foreach (string filePath in Directory.EnumerateFiles(launcherDirectory)) { @@ -31,17 +27,17 @@ public async Task UpdateAllVersions() { fileNames.Add(fileName); LauncherFile storedFile = storedVersions.FirstOrDefault(x => x.fileName == fileName); if (storedFile == null) { - await data.Add(new LauncherFile {fileName = fileName, version = version}); + await Data.Add(new LauncherFile {fileName = fileName, version = version}); continue; } if (storedFile.version != version) { - await data.Update(storedFile.id, Builders.Update.Set(x => x.version, version)); + await Data.Update(storedFile.id, Builders.Update.Set(x => x.version, version)); } } foreach (LauncherFile storedVersion in storedVersions.Where(storedVersion => fileNames.All(x => x != storedVersion.fileName))) { - await data.Delete(storedVersion.id); + await Data.Delete(storedVersion.id); } } @@ -54,7 +50,7 @@ public FileStreamResult GetLauncherFile(params string[] file) { public async Task GetUpdatedFiles(IEnumerable files) { string launcherDirectory = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("LAUNCHER_LOCATION").AsString(), "Launcher"); - List storedVersions = data.Get(); + List storedVersions = Data.Get(); List updatedFiles = new List(); List deletedFiles = new List(); foreach (LauncherFile launcherFile in files) { diff --git a/UKSF.Api.Services/Message/CommentThreadService.cs b/UKSF.Api.Services/Message/CommentThreadService.cs index 5d3a336c..841127de 100644 --- a/UKSF.Api.Services/Message/CommentThreadService.cs +++ b/UKSF.Api.Services/Message/CommentThreadService.cs @@ -8,30 +8,24 @@ using UKSF.Api.Models.Message; namespace UKSF.Api.Services.Message { - public class CommentThreadService : ICommentThreadService { - private readonly ICommentThreadDataService data; + public class CommentThreadService : DataBackedService, ICommentThreadService { private readonly IDisplayNameService displayNameService; - public CommentThreadService(ICommentThreadDataService data, IDisplayNameService displayNameService) { - this.data = data; - this.displayNameService = displayNameService; - } - - public ICommentThreadDataService Data() => data; + public CommentThreadService(ICommentThreadDataService data, IDisplayNameService displayNameService) : base(data) => this.displayNameService = displayNameService; - public IEnumerable GetCommentThreadComments(string id) => data.GetSingle(id).comments.Reverse(); + public IEnumerable GetCommentThreadComments(string id) => Data.GetSingle(id).comments.Reverse(); public async Task InsertComment(string id, Comment comment) { - await data.Update(id, comment, DataEventType.ADD); + await Data.Update(id, comment, DataEventType.ADD); } public async Task RemoveComment(string id, Comment comment) { - await data.Update(id, comment, DataEventType.DELETE); + await Data.Update(id, comment, DataEventType.DELETE); } public IEnumerable GetCommentThreadParticipants(string id) { HashSet participants = GetCommentThreadComments(id).Select(x => x.author).ToHashSet(); - participants.UnionWith(data.GetSingle(id).authors); + participants.UnionWith(Data.GetSingle(id).authors); return participants; } diff --git a/UKSF.Api.Services/Message/LoggingService.cs b/UKSF.Api.Services/Message/LoggingService.cs index 95a9f6cc..dd418ed2 100644 --- a/UKSF.Api.Services/Message/LoggingService.cs +++ b/UKSF.Api.Services/Message/LoggingService.cs @@ -7,16 +7,10 @@ using UKSF.Api.Services.Common; namespace UKSF.Api.Services.Message { - public class LoggingService : ILoggingService { - private readonly ILogDataService data; + public class LoggingService : DataBackedService, ILoggingService { private readonly IDisplayNameService displayNameService; - public LoggingService(ILogDataService data, IDisplayNameService displayNameService) { - this.data = data; - this.displayNameService = displayNameService; - } - - public ILogDataService Data() => data; + public LoggingService(ILogDataService data, IDisplayNameService displayNameService) : base(data) => this.displayNameService = displayNameService; public void Log(string message) { Task unused = LogAsync(new BasicLogMessage(message)); @@ -43,16 +37,16 @@ public void Log(Exception exception) { private async Task LogToStorage(BasicLogMessage log) { switch (log) { case AuditLogMessage message: - await data.Add(message); + await Data.Add(message); break; case LauncherLogMessage message: - await data.Add(message); + await Data.Add(message); break; case WebLogMessage message: - await data.Add(message); + await Data.Add(message); break; default: - await data.Add(log); + await Data.Add(log); break; } } diff --git a/UKSF.Api.Services/Message/NotificationsService.cs b/UKSF.Api.Services/Message/NotificationsService.cs index 7bdb7956..8e68698f 100644 --- a/UKSF.Api.Services/Message/NotificationsService.cs +++ b/UKSF.Api.Services/Message/NotificationsService.cs @@ -15,16 +15,14 @@ using UKSF.Api.Signalr.Hubs.Message; namespace UKSF.Api.Services.Message { - public class NotificationsService : INotificationsService { + public class NotificationsService : DataBackedService, INotificationsService { private readonly IAccountService accountService; - private readonly INotificationsDataService data; private readonly IEmailService emailService; private readonly IHubContext notificationsHub; private readonly ISessionService sessionService; private readonly ITeamspeakService teamspeakService; - public NotificationsService(INotificationsDataService data, ITeamspeakService teamspeakService, IAccountService accountService, ISessionService sessionService, IEmailService emailService, IHubContext notificationsHub) { - this.data = data; + public NotificationsService(INotificationsDataService data, ITeamspeakService teamspeakService, IAccountService accountService, ISessionService sessionService, IEmailService emailService, IHubContext notificationsHub) : base(data) { this.teamspeakService = teamspeakService; this.accountService = accountService; this.sessionService = sessionService; @@ -32,8 +30,6 @@ public NotificationsService(INotificationsDataService data, ITeamspeakService te this.notificationsHub = notificationsHub; } - public INotificationsDataService Data() => data; - public async Task SendTeamspeakNotification(Account account, string rawMessage) { rawMessage = rawMessage.Replace("", "[/url]"); await teamspeakService.SendTeamspeakMessageToClient(account, rawMessage); @@ -46,7 +42,7 @@ public async Task SendTeamspeakNotification(IEnumerable clientDbIds, str public IEnumerable GetNotificationsForContext() { string contextId = sessionService.GetContextId(); - return data.Get(x => x.owner == contextId); + return Data.Get(x => x.owner == contextId); } public void Add(Notification notification) { @@ -56,23 +52,23 @@ public void Add(Notification notification) { public async Task MarkNotificationsAsRead(List ids) { string contextId = sessionService.GetContextId(); - // await data.UpdateMany(Builders.Filter.Eq(x => x.owner, contextId) & Builders.Filter.In(x => x.id, ids), Builders.Update.Set(x => x.read, true)); - await data.UpdateMany(x => x.owner == contextId && ids.Contains(x.id), Builders.Update.Set(x => x.read, true)); + // await Data.UpdateMany(Builders.Filter.Eq(x => x.owner, contextId) & Builders.Filter.In(x => x.id, ids), Builders.Update.Set(x => x.read, true)); + await Data.UpdateMany(x => x.owner == contextId && ids.Contains(x.id), Builders.Update.Set(x => x.read, true)); await notificationsHub.Clients.Group(contextId).ReceiveRead(ids); } public async Task Delete(List ids) { ids = ids.ToList(); string contextId = sessionService.GetContextId(); - // await data.DeleteMany(Builders.Filter.Eq(x => x.owner, contextId) & Builders.Filter.In(x => x.id, ids)); - await data.DeleteMany(x => x.owner == contextId && ids.Contains(x.id)); + // await Data.DeleteMany(Builders.Filter.Eq(x => x.owner, contextId) & Builders.Filter.In(x => x.id, ids)); + await Data.DeleteMany(x => x.owner == contextId && ids.Contains(x.id)); await notificationsHub.Clients.Group(contextId).ReceiveClear(ids); } private async Task AddNotificationAsync(Notification notification) { notification.message = notification.message.ConvertObjectIds(); - await data.Add(notification); - Account account = accountService.Data().GetSingle(notification.owner); + await Data.Add(notification); + Account account = accountService.Data.GetSingle(notification.owner); if (account.settings.notificationsEmail) { SendEmailNotification(account.email, $"{notification.message}{(notification.link != null ? $"
https://uk-sf.co.uk{notification.link}" : "")}"); } diff --git a/UKSF.Api.Services/Operations/OperationOrderService.cs b/UKSF.Api.Services/Operations/OperationOrderService.cs index 25d072b9..bac32791 100644 --- a/UKSF.Api.Services/Operations/OperationOrderService.cs +++ b/UKSF.Api.Services/Operations/OperationOrderService.cs @@ -4,12 +4,8 @@ using UKSF.Api.Models.Operations; namespace UKSF.Api.Services.Operations { - public class OperationOrderService : IOperationOrderService { - private readonly IOperationOrderDataService data; - - public OperationOrderService(IOperationOrderDataService data) => this.data = data; - - public IOperationOrderDataService Data() => data; + public class OperationOrderService : DataBackedService, IOperationOrderService { + public OperationOrderService(IOperationOrderDataService data) : base(data) { } public async Task Add(CreateOperationOrderRequest request) { Opord operation = new Opord { @@ -19,7 +15,7 @@ public async Task Add(CreateOperationOrderRequest request) { end = request.end.AddHours((double) request.endtime / 100), type = request.type }; - await data.Add(operation); + await Data.Add(operation); } } } diff --git a/UKSF.Api.Services/Operations/OperationReportService.cs b/UKSF.Api.Services/Operations/OperationReportService.cs index 54b5e387..e66f1331 100644 --- a/UKSF.Api.Services/Operations/OperationReportService.cs +++ b/UKSF.Api.Services/Operations/OperationReportService.cs @@ -5,16 +5,10 @@ using UKSF.Api.Models.Operations; namespace UKSF.Api.Services.Operations { - public class OperationReportService : IOperationReportService { + public class OperationReportService : DataBackedService, IOperationReportService { private readonly IAttendanceService attendanceService; - private readonly IOperationReportDataService data; - public OperationReportService(IOperationReportDataService data, IAttendanceService attendanceService) { - this.data = data; - this.attendanceService = attendanceService; - } - - public IOperationReportDataService Data() => data; + public OperationReportService(IOperationReportDataService data, IAttendanceService attendanceService) : base(data) => this.attendanceService = attendanceService; public async Task Create(CreateOperationReportRequest request) { Oprep operation = new Oprep { @@ -26,7 +20,7 @@ public async Task Create(CreateOperationReportRequest request) { result = request.result }; operation.attendanceReport = await attendanceService.GenerateAttendanceReport(operation.start, operation.end); - await data.Add(operation); + await Data.Add(operation); } } } diff --git a/UKSF.Api.Services/Personnel/AccountService.cs b/UKSF.Api.Services/Personnel/AccountService.cs index e93a4296..71d453c8 100644 --- a/UKSF.Api.Services/Personnel/AccountService.cs +++ b/UKSF.Api.Services/Personnel/AccountService.cs @@ -2,11 +2,7 @@ using UKSF.Api.Interfaces.Personnel; namespace UKSF.Api.Services.Personnel { - public class AccountService : IAccountService { - private readonly IAccountDataService data; - - public AccountService(IAccountDataService data) => this.data = data; - - public IAccountDataService Data() => data; + public class AccountService : DataBackedService, IAccountService { + public AccountService(IAccountDataService data) : base(data) { } } } diff --git a/UKSF.Api.Services/Personnel/AssignmentService.cs b/UKSF.Api.Services/Personnel/AssignmentService.cs index 01819149..46c61021 100644 --- a/UKSF.Api.Services/Personnel/AssignmentService.cs +++ b/UKSF.Api.Services/Personnel/AssignmentService.cs @@ -86,7 +86,7 @@ public async Task AssignUnitRole(string id, string unitId, string role) { } public async Task UnassignAllUnits(string id) { - foreach (Unit unit in unitsService.Data().Get()) { + foreach (Unit unit in unitsService.Data.Get()) { await unitsService.RemoveMember(id, unit); } @@ -94,7 +94,7 @@ public async Task UnassignAllUnits(string id) { } public async Task UnassignAllUnitRoles(string id) { - foreach (Unit unit in unitsService.Data().Get()) { + foreach (Unit unit in unitsService.Data.Get()) { await unitsService.SetMemberRole(id, unit); } @@ -102,7 +102,7 @@ public async Task UnassignAllUnitRoles(string id) { } public async Task UnassignUnitRole(string id, string unitId) { - Unit unit = unitsService.Data().GetSingle(unitId); + Unit unit = unitsService.Data.GetSingle(unitId); string role = unit.roles.FirstOrDefault(x => x.Value == id).Key; if (unitsService.RolesHasMember(unit, id)) { await unitsService.SetMemberRole(id, unitId); @@ -113,13 +113,13 @@ public async Task UnassignUnitRole(string id, string unitId) { } public async Task UnassignUnit(string id, string unitId) { - Unit unit = unitsService.Data().GetSingle(unitId); + Unit unit = unitsService.Data.GetSingle(unitId); await unitsService.RemoveMember(id, unit); await UpdateGroupsAndRoles(unitId); } private async Task UpdateGroupsAndRoles(string id) { - Account account = accountService.Data().GetSingle(id); + Account account = accountService.Data.GetSingle(id); await teamspeakService.UpdateAccountTeamspeakGroups(account); await discordService.UpdateAccount(account); serverService.UpdateSquadXml(); @@ -129,22 +129,22 @@ private async Task UpdateGroupsAndRoles(string id) { private async Task> UpdateUnit(string id, string unitString, StringBuilder notificationMessage) { bool unitUpdate = false; bool positive = true; - Unit unit = unitsService.Data().GetSingle(x => x.name == unitString); + Unit unit = unitsService.Data.GetSingle(x => x.name == unitString); if (unit != null) { if (unit.branch == UnitBranch.COMBAT) { - await unitsService.RemoveMember(id, accountService.Data().GetSingle(id).unitAssignment); - await accountService.Data().Update(id, "unitAssignment", unit.name); + await unitsService.RemoveMember(id, accountService.Data.GetSingle(id).unitAssignment); + await accountService.Data.Update(id, "unitAssignment", unit.name); } await unitsService.AddMember(id, unit.id); notificationMessage.Append($"You have been transfered to {unitsService.GetChainString(unit)}"); unitUpdate = true; } else if (unitString == REMOVE_FLAG) { - string currentUnit = accountService.Data().GetSingle(id).unitAssignment; + string currentUnit = accountService.Data.GetSingle(id).unitAssignment; if (string.IsNullOrEmpty(currentUnit)) return new Tuple(false, false); - unit = unitsService.Data().GetSingle(x => x.name == currentUnit); + unit = unitsService.Data.GetSingle(x => x.name == currentUnit); await unitsService.RemoveMember(id, currentUnit); - await accountService.Data().Update(id, "unitAssignment", null); + await accountService.Data.Update(id, "unitAssignment", null); notificationMessage.Append($"You have been removed from {unitsService.GetChainString(unit)}"); unitUpdate = true; positive = false; @@ -157,12 +157,12 @@ private async Task> UpdateRole(string id, string role, bool un bool roleUpdate = false; bool positive = true; if (!string.IsNullOrEmpty(role) && role != REMOVE_FLAG) { - await accountService.Data().Update(id, "roleAssignment", role); + await accountService.Data.Update(id, "roleAssignment", role); notificationMessage.Append($"{(unitUpdate ? $" as {AvsAn.Query(role).Article} {role}" : $"You have been assigned as {AvsAn.Query(role).Article} {role}")}"); roleUpdate = true; } else if (role == REMOVE_FLAG) { - string currentRole = accountService.Data().GetSingle(id).roleAssignment; - await accountService.Data().Update(id, "roleAssignment", null); + string currentRole = accountService.Data.GetSingle(id).roleAssignment; + await accountService.Data.Update(id, "roleAssignment", null); notificationMessage.Append( string.IsNullOrEmpty(currentRole) ? $"{(unitUpdate ? " and unassigned from your role" : "You have been unassigned from your role")}" @@ -179,15 +179,15 @@ private async Task> UpdateRole(string id, string role, bool un private async Task> UpdateRank(string id, string rank, bool unitUpdate, bool roleUpdate, StringBuilder notificationMessage) { bool rankUpdate = false; bool positive = true; - string currentRank = accountService.Data().GetSingle(id).rank; + string currentRank = accountService.Data.GetSingle(id).rank; if (!string.IsNullOrEmpty(rank) && rank != REMOVE_FLAG) { if (currentRank == rank) return new Tuple(false, true); - await accountService.Data().Update(id, "rank", rank); + await accountService.Data.Update(id, "rank", rank); bool promotion = string.IsNullOrEmpty(currentRank) || ranksService.IsSuperior(rank, currentRank); notificationMessage.Append($"{(unitUpdate || roleUpdate ? $" and {(promotion ? "promoted" : "demoted")} to {rank}" : $"You have been {(promotion ? "promoted" : "demoted")} to {rank}")}"); rankUpdate = true; } else if (rank == REMOVE_FLAG) { - await accountService.Data().Update(id, "rank", null); + await accountService.Data.Update(id, "rank", null); notificationMessage.Append($"{(unitUpdate || roleUpdate ? $" and demoted from {currentRank}" : $"You have been demoted from {currentRank}")}"); rankUpdate = true; positive = false; diff --git a/UKSF.Api.Services/Personnel/AttendanceService.cs b/UKSF.Api.Services/Personnel/AttendanceService.cs index 7f028a0d..593dac7e 100644 --- a/UKSF.Api.Services/Personnel/AttendanceService.cs +++ b/UKSF.Api.Services/Personnel/AttendanceService.cs @@ -35,7 +35,7 @@ public async Task GenerateAttendanceReport(DateTime start, Dat displayName = displayNameService.GetDisplayName(x), attendancePercent = GetAttendancePercent(x.teamspeakIdentities), attendanceState = loaService.IsLoaCovered(x.id, start) ? AttendanceState.LOA : GetAttendanceState(GetAttendancePercent(x.teamspeakIdentities)), - groupId = unitsService.Data().GetSingle(y => y.name == x.unitAssignment).id, + groupId = unitsService.Data.GetSingle(y => y.name == x.unitAssignment).id, groupName = x.unitAssignment } ) @@ -44,7 +44,7 @@ public async Task GenerateAttendanceReport(DateTime start, Dat } private void GetAccounts() { - accounts = accountService.Data().Get(x => x.membershipState == MembershipState.MEMBER); + accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER); } private async Task GetRecords(DateTime start, DateTime end) { diff --git a/UKSF.Api.Services/Personnel/DischargeService.cs b/UKSF.Api.Services/Personnel/DischargeService.cs index b0922234..2b4e4197 100644 --- a/UKSF.Api.Services/Personnel/DischargeService.cs +++ b/UKSF.Api.Services/Personnel/DischargeService.cs @@ -2,11 +2,7 @@ using UKSF.Api.Interfaces.Personnel; namespace UKSF.Api.Services.Personnel { - public class DischargeService : IDischargeService { - private readonly IDischargeDataService data; - - public DischargeService(IDischargeDataService data) => this.data = data; - - public IDischargeDataService Data() => data; + public class DischargeService : DataBackedService, IDischargeService { + public DischargeService(IDischargeDataService data) : base(data) { } } } diff --git a/UKSF.Api.Services/Personnel/DisplayNameService.cs b/UKSF.Api.Services/Personnel/DisplayNameService.cs index 7038a511..d9917e2b 100644 --- a/UKSF.Api.Services/Personnel/DisplayNameService.cs +++ b/UKSF.Api.Services/Personnel/DisplayNameService.cs @@ -12,12 +12,12 @@ public DisplayNameService(IRanksService ranksService, IAccountService accountSer } public string GetDisplayName(Account account) { - Rank rank = account.rank != null ? ranksService.Data().GetSingle(account.rank) : null; + Rank rank = account.rank != null ? ranksService.Data.GetSingle(account.rank) : null; return rank == null ? $"{account.lastname}.{account.firstname[0]}" : $"{rank.abbreviation}.{account.lastname}.{account.firstname[0]}"; } public string GetDisplayName(string id) { - Account account = accountService.Data().GetSingle(id); + Account account = accountService.Data.GetSingle(id); return account != null ? GetDisplayName(account) : id; } diff --git a/UKSF.Api.Services/Personnel/LoaService.cs b/UKSF.Api.Services/Personnel/LoaService.cs index e151e79a..8959ef02 100644 --- a/UKSF.Api.Services/Personnel/LoaService.cs +++ b/UKSF.Api.Services/Personnel/LoaService.cs @@ -8,15 +8,11 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Services.Personnel { - public class LoaService : ILoaService { - private readonly ILoaDataService data; - - public LoaService(ILoaDataService data) => this.data = data; - - public ILoaDataService Data() => data; + public class LoaService : DataBackedService, ILoaService { + public LoaService(ILoaDataService data) : base(data) { } public IEnumerable Get(List ids) { - return data.Get(x => ids.Contains(x.recipient) && x.end > DateTime.Now.AddDays(-30)); + return Data.Get(x => ids.Contains(x.recipient) && x.end > DateTime.Now.AddDays(-30)); } public async Task Add(CommandRequestLoa requestBase) { @@ -29,16 +25,16 @@ public async Task Add(CommandRequestLoa requestBase) { emergency = !string.IsNullOrEmpty(requestBase.emergency) && bool.Parse(requestBase.emergency), late = !string.IsNullOrEmpty(requestBase.late) && bool.Parse(requestBase.late) }; - await data.Add(loa); + await Data.Add(loa); return loa.id; } public async Task SetLoaState(string id, LoaReviewState state) { - await data.Update(id, Builders.Update.Set(x => x.state, state)); + await Data.Update(id, Builders.Update.Set(x => x.state, state)); } public bool IsLoaCovered(string id, DateTime eventStart) { - return data.Get(loa => loa.recipient == id && loa.start < eventStart && loa.end > eventStart).Count > 0; + return Data.Get(loa => loa.recipient == id && loa.start < eventStart && loa.end > eventStart).Count > 0; } } } diff --git a/UKSF.Api.Services/Personnel/LoginService.cs b/UKSF.Api.Services/Personnel/LoginService.cs index f5846e9e..99eb235f 100644 --- a/UKSF.Api.Services/Personnel/LoginService.cs +++ b/UKSF.Api.Services/Personnel/LoginService.cs @@ -43,10 +43,10 @@ public string LoginWithoutPassword(string email) { return GenerateToken(account); } - public string RegenerateToken(string accountId) => GenerateToken(accountService.Data().GetSingle(accountId)); + public string RegenerateToken(string accountId) => GenerateToken(accountService.Data.GetSingle(accountId)); private Account FindAccount(string email, string password) { - Account account = accountService.Data().GetSingle(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)); + Account account = accountService.Data.GetSingle(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)); if (account != null) { if (!isPasswordReset) { if (!BCrypt.Net.BCrypt.Verify(password, account.password)) { @@ -91,11 +91,11 @@ private void ResolveRoles(ICollection claims, Account account) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SR1)); } - if (unitsService.Data().GetSingle(x => x.shortname == "SR10").members.Contains(account.id) || admin) { + if (unitsService.Data.GetSingle(x => x.shortname == "SR10").members.Contains(account.id) || admin) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SR10)); } - if (unitsService.Data().GetSingle(x => x.shortname == "SR5").members.Contains(account.id) || admin) { + if (unitsService.Data.GetSingle(x => x.shortname == "SR5").members.Contains(account.id) || admin) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SR5)); } diff --git a/UKSF.Api.Services/Personnel/RanksService.cs b/UKSF.Api.Services/Personnel/RanksService.cs index ff91b578..6b5aa817 100644 --- a/UKSF.Api.Services/Personnel/RanksService.cs +++ b/UKSF.Api.Services/Personnel/RanksService.cs @@ -5,34 +5,31 @@ using UKSF.Api.Services.Common; namespace UKSF.Api.Services.Personnel { - public class RanksService : IRanksService { - private readonly IRanksDataService data; + public class RanksService : DataBackedService, IRanksService { - public RanksService(IRanksDataService data) => this.data = data; - - public IRanksDataService Data() => data; + public RanksService(IRanksDataService data) : base(data) { } public int GetRankIndex(string rankName) { - return data.Get().FindIndex(x => x.name == rankName); + return Data.Get().FindIndex(x => x.name == rankName); } public int Sort(string nameA, string nameB) { - Rank rankA = data.GetSingle(nameA); - Rank rankB = data.GetSingle(nameB); + Rank rankA = Data.GetSingle(nameA); + Rank rankB = Data.GetSingle(nameB); return RankUtilities.Sort(rankA, rankB); } public bool IsSuperior(string nameA, string nameB) { - Rank rankA = data.GetSingle(nameA); - Rank rankB = data.GetSingle(nameB); + Rank rankA = Data.GetSingle(nameA); + Rank rankB = Data.GetSingle(nameB); int rankOrderA = rankA?.order ?? int.MaxValue; int rankOrderB = rankB?.order ?? int.MaxValue; return rankOrderA < rankOrderB; } public bool IsEqual(string nameA, string nameB) { - Rank rankA = data.GetSingle(nameA); - Rank rankB = data.GetSingle(nameB); + Rank rankA = Data.GetSingle(nameA); + Rank rankB = Data.GetSingle(nameB); int rankOrderA = rankA?.order ?? int.MinValue; int rankOrderB = rankB?.order ?? int.MinValue; return rankOrderA == rankOrderB; diff --git a/UKSF.Api.Services/Personnel/RecruitmentService.cs b/UKSF.Api.Services/Personnel/RecruitmentService.cs index 9d78eb8a..80d8ee99 100644 --- a/UKSF.Api.Services/Personnel/RecruitmentService.cs +++ b/UKSF.Api.Services/Personnel/RecruitmentService.cs @@ -49,8 +49,8 @@ IUnitsService unitsService public Dictionary GetSr1Leads() => GetSr1Group().roles; public IEnumerable GetSr1Members(bool skipSort = false) { - IEnumerable members = unitsService.Data().GetSingle(x => x.name == "SR1 Recruitment").members; - List accounts = members.Select(x => accountService.Data().GetSingle(x)).ToList(); + IEnumerable members = unitsService.Data.GetSingle(x => x.name == "SR1 Recruitment").members; + List accounts = members.Select(x => accountService.Data.GetSingle(x)).ToList(); if (skipSort) return accounts; return accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname); } @@ -61,7 +61,7 @@ public object GetAllApplications() { JArray complete = new JArray(); JArray recruiters = new JArray(); string me = sessionService.GetContextId(); - IEnumerable accounts = accountService.Data().Get(x => x.application != null); + IEnumerable accounts = accountService.Data.Get(x => x.application != null); foreach (Account account in accounts) { if (account.application.state == ApplicationState.WAITING) { if (account.application.recruiter == me) { @@ -82,7 +82,7 @@ public object GetAllApplications() { } public JObject GetApplication(Account account) { - Account recruiterAccount = accountService.Data().GetSingle(account.application.recruiter); + Account recruiterAccount = accountService.Data.GetSingle(account.application.recruiter); (bool tsOnline, string tsNickname, bool discordOnline) = GetOnlineUserDetails(account); (int years, int months) = account.dob.ToAge(); return JObject.FromObject( @@ -108,11 +108,11 @@ public JObject GetApplication(Account account) { public bool IsAccountSr1Lead(Account account = null) => account != null ? GetSr1Group().roles.ContainsValue(account.id) : GetSr1Group().roles.ContainsValue(sessionService.GetContextId()); public async Task SetRecruiter(string id, string newRecruiter) { - await accountService.Data().Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiter)); + await accountService.Data.Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiter)); } public object GetStats(string account, bool monthly) { - List accounts = accountService.Data().Get(x => x.application != null); + List accounts = accountService.Data.Get(x => x.application != null); if (account != string.Empty) { accounts = accounts.Where(x => x.application.recruiter == account).ToList(); } @@ -141,15 +141,15 @@ public object GetStats(string account, bool monthly) { public string GetRecruiter() { List recruiters = GetSr1Members().Where(x => x.settings.sr1Enabled).ToList(); - List waiting = accountService.Data().Get(x => x.application != null && x.application.state == ApplicationState.WAITING); - List complete = accountService.Data().Get(x => x.application != null && x.application.state != ApplicationState.WAITING); + List waiting = accountService.Data.Get(x => x.application != null && x.application.state == ApplicationState.WAITING); + List complete = accountService.Data.Get(x => x.application != null && x.application.state != ApplicationState.WAITING); var unsorted = recruiters.Select(x => new {x.id, complete = complete.Count(y => y.application.recruiter == x.id), waiting = waiting.Count(y => y.application.recruiter == x.id)}); var sorted = unsorted.OrderBy(x => x.waiting).ThenBy(x => x.complete); return sorted.First().id; } private Unit GetSr1Group() { - return unitsService.Data().Get(x => x.name == "SR1 Recruitment").FirstOrDefault(); + return unitsService.Data.Get(x => x.name == "SR1 Recruitment").FirstOrDefault(); } private JObject GetCompletedApplication(Account account) => @@ -194,7 +194,7 @@ private static string GetNextCandidateOp() { } private double GetAverageProcessingTime() { - List waitingApplications = accountService.Data().Get(x => x.application != null && x.application.state != ApplicationState.WAITING).ToList(); + List waitingApplications = accountService.Data.Get(x => x.application != null && x.application.state != ApplicationState.WAITING).ToList(); double days = waitingApplications.Sum(x => (x.application.dateAccepted - x.application.dateCreated).TotalDays); double time = Math.Round(days / waitingApplications.Count, 1); return time; diff --git a/UKSF.Api.Services/Personnel/RolesService.cs b/UKSF.Api.Services/Personnel/RolesService.cs index 4bf78f52..6fff94b9 100644 --- a/UKSF.Api.Services/Personnel/RolesService.cs +++ b/UKSF.Api.Services/Personnel/RolesService.cs @@ -3,21 +3,18 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Services.Personnel { - public class RolesService : IRolesService { - private readonly IRolesDataService data; + public class RolesService : DataBackedService, IRolesService { - public RolesService(IRolesDataService data) => this.data = data; - - public IRolesDataService Data() => data; + public RolesService(IRolesDataService data) : base(data) { } public int Sort(string nameA, string nameB) { - Role roleA = data.GetSingle(nameA); - Role roleB = data.GetSingle(nameB); + Role roleA = Data.GetSingle(nameA); + Role roleB = Data.GetSingle(nameB); int roleOrderA = roleA?.order ?? 0; int roleOrderB = roleB?.order ?? 0; return roleOrderA < roleOrderB ? -1 : roleOrderA > roleOrderB ? 1 : 0; } - public Role GetUnitRoleByOrder(int order) => data.GetSingle(x => x.roleType == RoleType.UNIT && x.order == order); + public Role GetUnitRoleByOrder(int order) => Data.GetSingle(x => x.roleType == RoleType.UNIT && x.order == order); } } diff --git a/UKSF.Api.Services/Personnel/ServiceRecordService.cs b/UKSF.Api.Services/Personnel/ServiceRecordService.cs index fabc266b..5b5dec52 100644 --- a/UKSF.Api.Services/Personnel/ServiceRecordService.cs +++ b/UKSF.Api.Services/Personnel/ServiceRecordService.cs @@ -10,7 +10,7 @@ public class ServiceRecordService : IServiceRecordService { public ServiceRecordService(IAccountService accountService) => this.accountService = accountService; public void AddServiceRecord(string id, string occurence, string notes) { - accountService.Data().Update(id, Builders.Update.Push("serviceRecord", new ServiceRecordEntry {timestamp = DateTime.Now, occurence = occurence, notes = notes})); + accountService.Data.Update(id, Builders.Update.Push("serviceRecord", new ServiceRecordEntry {timestamp = DateTime.Now, occurence = occurence, notes = notes})); } } } diff --git a/UKSF.Api.Services/Units/UnitsService.cs b/UKSF.Api.Services/Units/UnitsService.cs index c0c70a1d..9a621176 100644 --- a/UKSF.Api.Services/Units/UnitsService.cs +++ b/UKSF.Api.Services/Units/UnitsService.cs @@ -11,21 +11,15 @@ using UKSF.Api.Models.Units; namespace UKSF.Api.Services.Units { - public class UnitsService : IUnitsService { - private readonly IUnitsDataService data; + public class UnitsService : DataBackedService, IUnitsService { private readonly IRolesService rolesService; - public UnitsService(IUnitsDataService data, IRolesService rolesService) { - this.data = data; - this.rolesService = rolesService; - } - - public IUnitsDataService Data() => data; + public UnitsService(IUnitsDataService data, IRolesService rolesService) : base(data) => this.rolesService = rolesService; public IEnumerable GetSortedUnits(Func predicate = null) { List sortedUnits = new List(); - Unit combatRoot = data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); - Unit auxiliaryRoot = data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); + Unit combatRoot = Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); + Unit auxiliaryRoot = Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); sortedUnits.Add(combatRoot); sortedUnits.AddRange(GetAllChildren(combatRoot)); sortedUnits.Add(auxiliaryRoot); @@ -35,12 +29,12 @@ public IEnumerable GetSortedUnits(Func predicate = null) { } public async Task AddMember(string id, string unitId) { - if (data.GetSingle(x => x.id == unitId && x.members.Contains(id)) != null) return; - await data.Update(unitId, Builders.Update.Push(x => x.members, id)); + if (Data.GetSingle(x => x.id == unitId && x.members.Contains(id)) != null) return; + await Data.Update(unitId, Builders.Update.Push(x => x.members, id)); } public async Task RemoveMember(string id, string unitName) { - Unit unit = data.GetSingle(x => x.name == unitName); + Unit unit = Data.GetSingle(x => x.name == unitName); if (unit == null) return; await RemoveMember(id, unit); @@ -48,14 +42,14 @@ public async Task RemoveMember(string id, string unitName) { public async Task RemoveMember(string id, Unit unit) { if (unit.members.Contains(id)) { - await data.Update(unit.id, Builders.Update.Pull(x => x.members, id)); + await Data.Update(unit.id, Builders.Update.Pull(x => x.members, id)); } await RemoveMemberRoles(id, unit); } public async Task SetMemberRole(string id, string unitId, string role = "") { - Unit unit = data.GetSingle(x => x.id == unitId); + Unit unit = Data.GetSingle(x => x.id == unitId); if (unit == null) return; await SetMemberRole(id, unit, role); @@ -64,61 +58,61 @@ public async Task SetMemberRole(string id, string unitId, string role = "") { public async Task SetMemberRole(string id, Unit unit, string role = "") { await RemoveMemberRoles(id, unit); if (!string.IsNullOrEmpty(role)) { - await data.Update(unit.id, Builders.Update.Set($"roles.{role}", id)); + await Data.Update(unit.id, Builders.Update.Set($"roles.{role}", id)); } } public async Task RenameRole(string oldName, string newName) { - foreach (Unit unit in data.Get(x => x.roles.ContainsKey(oldName))) { + foreach (Unit unit in Data.Get(x => x.roles.ContainsKey(oldName))) { string id = unit.roles[oldName]; - await data.Update(unit.id, Builders.Update.Unset($"roles.{oldName}")); - await data.Update(unit.id, Builders.Update.Set($"roles.{newName}", id)); + await Data.Update(unit.id, Builders.Update.Unset($"roles.{oldName}")); + await Data.Update(unit.id, Builders.Update.Set($"roles.{newName}", id)); } } public async Task DeleteRole(string role) { - foreach (Unit unit in from unit in data.Get(x => x.roles.ContainsKey(role)) let id = unit.roles[role] select unit) { - await data.Update(unit.id, Builders.Update.Unset($"roles.{role}")); + foreach (Unit unit in from unit in Data.Get(x => x.roles.ContainsKey(role)) let id = unit.roles[role] select unit) { + await Data.Update(unit.id, Builders.Update.Unset($"roles.{role}")); } } public bool HasRole(string unitId, string role) { - Unit unit = data.GetSingle(x => x.id == unitId); + Unit unit = Data.GetSingle(x => x.id == unitId); return HasRole(unit, role); } public bool HasRole(Unit unit, string role) => unit.roles.ContainsKey(role); public bool RolesHasMember(string unitId, string id) { - Unit unit = data.GetSingle(x => x.id == unitId); + Unit unit = Data.GetSingle(x => x.id == unitId); return RolesHasMember(unit, id); } public bool RolesHasMember(Unit unit, string id) => unit.roles.ContainsValue(id); public bool MemberHasRole(string id, string unitId, string role) { - Unit unit = data.GetSingle(x => x.id == unitId); + Unit unit = Data.GetSingle(x => x.id == unitId); return MemberHasRole(id, unit, role); } public bool MemberHasRole(string id, Unit unit, string role) => unit.roles.GetValueOrDefault(role, string.Empty) == id; - public bool MemberHasAnyRole(string id) => data.Get().Any(x => RolesHasMember(x, id)); + public bool MemberHasAnyRole(string id) => Data.Get().Any(x => RolesHasMember(x, id)); public int GetMemberRoleOrder(Account account, Unit unit) { if (RolesHasMember(unit.id, account.id)) { - return int.MaxValue - rolesService.Data().GetSingle(x => x.name == unit.roles.FirstOrDefault(y => y.Value == account.id).Key).order; + return int.MaxValue - rolesService.Data.GetSingle(x => x.name == unit.roles.FirstOrDefault(y => y.Value == account.id).Key).order; } return -1; } - public Unit GetRoot() => data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); + public Unit GetRoot() => Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); - public Unit GetAuxilliaryRoot() => data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); + public Unit GetAuxilliaryRoot() => Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); public Unit GetParent(Unit unit) { - return unit.parent != string.Empty ? data.GetSingle(x => x.id == unit.parent) : null; + return unit.parent != string.Empty ? Data.GetSingle(x => x.id == unit.parent) : null; } public IEnumerable GetParents(Unit unit) { @@ -127,17 +121,17 @@ public IEnumerable GetParents(Unit unit) { do { parentUnits.Add(unit); Unit child = unit; - unit = !string.IsNullOrEmpty(unit.parent) ? data.GetSingle(x => x.id == child.parent) : null; + unit = !string.IsNullOrEmpty(unit.parent) ? Data.GetSingle(x => x.id == child.parent) : null; } while (unit != null); return parentUnits; } - public IEnumerable GetChildren(Unit parent) => data.Get(x => x.parent == parent.id).ToList(); + public IEnumerable GetChildren(Unit parent) => Data.Get(x => x.parent == parent.id).ToList(); public IEnumerable GetAllChildren(Unit parent, bool includeParent = false) { List children = includeParent ? new List {parent} : new List(); - foreach (Unit unit in data.Get(x => x.parent == parent.id)) { + foreach (Unit unit in Data.Get(x => x.parent == parent.id)) { children.Add(unit); children.AddRange(GetAllChildren(unit)); } @@ -151,10 +145,10 @@ public int GetUnitDepth(Unit unit) { } int depth = 0; - Unit parent = data.GetSingle(unit.parent); + Unit parent = Data.GetSingle(unit.parent); while (parent != null) { depth++; - parent = data.GetSingle(parent.parent); + parent = Data.GetSingle(parent.parent); } return depth; @@ -175,7 +169,7 @@ private async Task RemoveMemberRoles(string id, Unit unit) { } if (roles.Count != originalCount) { - await data.Update(unit.id, Builders.Update.Set(x => x.roles, roles)); + await Data.Update(unit.id, Builders.Update.Set(x => x.roles, roles)); } } } diff --git a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs index e55a223d..b261c457 100644 --- a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs +++ b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs @@ -6,28 +6,22 @@ using UKSF.Api.Models.Utility; namespace UKSF.Api.Services.Utility { - public class ConfirmationCodeService : IConfirmationCodeService { - private readonly IConfirmationCodeDataService data; + public class ConfirmationCodeService : DataBackedService, IConfirmationCodeService { private readonly ISchedulerService schedulerService; - public ConfirmationCodeService(IConfirmationCodeDataService data, ISchedulerService schedulerService) { - this.data = data; - this.schedulerService = schedulerService; - } - - public IConfirmationCodeDataService Data() => data; + public ConfirmationCodeService(IConfirmationCodeDataService data, ISchedulerService schedulerService) : base(data) => this.schedulerService = schedulerService; public async Task CreateConfirmationCode(string value, bool integration = false) { ConfirmationCode code = new ConfirmationCode {value = value}; - await data.Add(code); + await Data.Add(code); await schedulerService.Create(DateTime.Now.AddMinutes(30), TimeSpan.Zero, integration ? ScheduledJobType.INTEGRATION : ScheduledJobType.NORMAL, nameof(SchedulerActionHelper.DeleteExpiredConfirmationCode), code.id); return code.id; } public async Task GetConfirmationCode(string id) { - ConfirmationCode confirmationCode = data.GetSingle(x => x.id == id); + ConfirmationCode confirmationCode = Data.GetSingle(x => x.id == id); if (confirmationCode == null) return string.Empty; - await data.Delete(confirmationCode.id); + await Data.Delete(confirmationCode.id); string actionParameters = JsonConvert.SerializeObject(new object[] {confirmationCode.id}); if (actionParameters != null) { await schedulerService.Cancel(x => x.actionParameters == actionParameters); diff --git a/UKSF.Api.Services/Utility/SchedulerActionHelper.cs b/UKSF.Api.Services/Utility/SchedulerActionHelper.cs index afc53941..4d40d0ea 100644 --- a/UKSF.Api.Services/Utility/SchedulerActionHelper.cs +++ b/UKSF.Api.Services/Utility/SchedulerActionHelper.cs @@ -14,7 +14,7 @@ public static class SchedulerActionHelper { private const ulong ID_CHANNEL_GENERAL = 311547576942067713; public static void DeleteExpiredConfirmationCode(string id) { - ServiceWrapper.ServiceProvider.GetService().Data().Delete(id); + ServiceWrapper.ServiceProvider.GetService().Data.Delete(id); } public static void PruneLogs() { diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index a457c939..848afc58 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -11,24 +11,18 @@ using UKSF.Api.Services.Message; namespace UKSF.Api.Services.Utility { - public class SchedulerService : ISchedulerService { + public class SchedulerService : DataBackedService, ISchedulerService { private static readonly ConcurrentDictionary ACTIVE_TASKS = new ConcurrentDictionary(); private readonly IHostEnvironment currentEnvironment; - private readonly ISchedulerDataService data; - public SchedulerService(ISchedulerDataService data, IHostEnvironment currentEnvironment) { - this.data = data; - this.currentEnvironment = currentEnvironment; - } - - public ISchedulerDataService Data() => data; + public SchedulerService(ISchedulerDataService data, IHostEnvironment currentEnvironment) : base(data) => this.currentEnvironment = currentEnvironment; public async void Load(bool integration = false) { if (integration) { - data.Get(x => x.type == ScheduledJobType.INTEGRATION).ForEach(Schedule); + Data.Get(x => x.type == ScheduledJobType.INTEGRATION).ForEach(Schedule); } else { if (!currentEnvironment.IsDevelopment()) await AddUnique(); - data.Get(x => x.type != ScheduledJobType.INTEGRATION).ForEach(Schedule); + Data.Get(x => x.type != ScheduledJobType.INTEGRATION).ForEach(Schedule); } } @@ -43,19 +37,19 @@ public async Task Create(DateTime next, TimeSpan interval, ScheduledJobType type job.repeat = true; } - await data.Add(job); + await Data.Add(job); Schedule(job); } public async Task Cancel(Func predicate) { - ScheduledJob job = data.GetSingle(predicate); + ScheduledJob job = Data.GetSingle(predicate); if (job == null) return; if (ACTIVE_TASKS.TryGetValue(job.id, out CancellationTokenSource token)) { token.Cancel(); ACTIVE_TASKS.TryRemove(job.id, out CancellationTokenSource _); } - await data.Delete(job.id); + await Data.Delete(job.id); } private void Schedule(ScheduledJob job) { @@ -87,7 +81,7 @@ private void Schedule(ScheduledJob job) { await SetNext(job); Schedule(job); } else { - await data.Delete(job.id); + await Data.Delete(job.id); ACTIVE_TASKS.TryRemove(job.id, out CancellationTokenSource _); } }, @@ -97,26 +91,26 @@ private void Schedule(ScheduledJob job) { } private async Task AddUnique() { - if (data.GetSingle(x => x.type == ScheduledJobType.LOG_PRUNE) == null) { + if (Data.GetSingle(x => x.type == ScheduledJobType.LOG_PRUNE) == null) { await Create(DateTime.Today.AddDays(1), TimeSpan.FromDays(1), ScheduledJobType.LOG_PRUNE, nameof(SchedulerActionHelper.PruneLogs)); } - if (data.GetSingle(x => x.type == ScheduledJobType.TEAMSPEAK_SNAPSHOT) == null) { + if (Data.GetSingle(x => x.type == ScheduledJobType.TEAMSPEAK_SNAPSHOT) == null) { await Create(DateTime.Today.AddDays(1), TimeSpan.FromMinutes(5), ScheduledJobType.TEAMSPEAK_SNAPSHOT, nameof(SchedulerActionHelper.TeamspeakSnapshot)); } - if (data.GetSingle(x => x.type == ScheduledJobType.DISCORD_VOTE_ANNOUNCEMENT) == null) { + if (Data.GetSingle(x => x.type == ScheduledJobType.DISCORD_VOTE_ANNOUNCEMENT) == null) { await Create(DateTime.Today.AddHours(19), TimeSpan.FromDays(1), ScheduledJobType.DISCORD_VOTE_ANNOUNCEMENT, nameof(SchedulerActionHelper.DiscordVoteAnnouncement)); } } private async Task SetNext(ScheduledJob job) { - await data.Update(job.id, "next", job.next); + await Data.Update(job.id, "next", job.next); } private bool IsCancelled(ScheduledJob job, CancellationTokenSource token) { if (token.IsCancellationRequested) return true; - return data.GetSingle(job.id) == null; + return Data.GetSingle(job.id) == null; } private static void ExecuteAction(ScheduledJob job) { diff --git a/UKSF.Api.Services/Utility/SessionService.cs b/UKSF.Api.Services/Utility/SessionService.cs index 53f61f40..b8fc40a7 100644 --- a/UKSF.Api.Services/Utility/SessionService.cs +++ b/UKSF.Api.Services/Utility/SessionService.cs @@ -15,7 +15,7 @@ public SessionService(IHttpContextAccessor httpContextAccessor, IAccountService this.accountService = accountService; } - public Account GetContextAccount() => accountService.Data().GetSingle(GetContextId()); + public Account GetContextAccount() => accountService.Data.GetSingle(GetContextId()); public string GetContextId() { return httpContextAccessor.HttpContext.User.Claims.Single(x => x.Type == ClaimTypes.Sid).Value; diff --git a/UKSF.Api/Controllers/Accounts/AccountsController.cs b/UKSF.Api/Controllers/Accounts/AccountsController.cs index 1cb6cdab..9ad81ca1 100644 --- a/UKSF.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSF.Api/Controllers/Accounts/AccountsController.cs @@ -66,14 +66,14 @@ public IActionResult Get() { [HttpGet("{id}"), Authorize] public IActionResult GetById(string id) { - Account account = accountService.Data().GetSingle(id); + Account account = accountService.Data.GetSingle(id); return Ok(ExtendAccount(account)); } [HttpPut] public async Task Put([FromBody] JObject body) { string email = body["email"].ToString(); - if (accountService.Data().Get(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)).Any()) { + if (accountService.Data.Get(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)).Any()) { return BadRequest(new {error = "an account with this email or username exists"}); } @@ -86,9 +86,9 @@ public async Task Put([FromBody] JObject body) { nation = body["nation"].ToString(), membershipState = MembershipState.UNCONFIRMED }; - await accountService.Data().Add(account); + await accountService.Data.Add(account); await SendConfirmationCode(account); - LogWrapper.AuditLog(accountService.Data().GetSingle(x => x.email == account.email).id, $"New account created: '{account.firstname} {account.lastname}, {account.email}'"); + LogWrapper.AuditLog(accountService.Data.GetSingle(x => x.email == account.email).id, $"New account created: '{account.firstname} {account.lastname}, {account.email}'"); return Ok(new {account.email}); } @@ -96,14 +96,14 @@ public async Task Put([FromBody] JObject body) { public async Task ApplyConfirmationCode([FromBody] JObject body) { string code = body["code"].ToString(); string email = body["email"].ToString(); - Account account = accountService.Data().GetSingle(x => x.email == email); + Account account = accountService.Data.GetSingle(x => x.email == email); if (account == null) { return BadRequest(new {error = $"An account with the email '{email}' doesn't exist. This should be impossible so please contact an admin for help"}); } string value = await confirmationCodeService.GetConfirmationCode(code); if (value == email) { - await accountService.Data().Update(account.id, "membershipState", MembershipState.CONFIRMED); + await accountService.Data.Update(account.id, "membershipState", MembershipState.CONFIRMED); LogWrapper.AuditLog(account.id, $"Email address confirmed for {account.id}"); return Ok(); } @@ -116,7 +116,7 @@ public async Task ApplyConfirmationCode([FromBody] JObject body) public IActionResult GetAccountsUnder([FromQuery] bool reverse = false) { List accounts = new List(); - List memberAccounts = accountService.Data().Get(x => x.membershipState == MembershipState.MEMBER).ToList(); + List memberAccounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER).ToList(); if (reverse) { memberAccounts.Sort((x, y) => ranksService.Sort(y.rank, x.rank)); } else { @@ -131,7 +131,7 @@ public IActionResult GetAccountsUnder([FromQuery] bool reverse = false) { [HttpGet("roster"), Authorize] public IActionResult GetRosterAccounts() { List accountObjects = new List(); - List accounts = accountService.Data().Get(x => x.membershipState == MembershipState.MEMBER); + List accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER); accounts = accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); accountObjects.AddRange( accounts.Select( @@ -151,7 +151,7 @@ public IActionResult GetRosterAccounts() { [HttpGet("online")] public IActionResult GetOnlineAccounts() { HashSet teamnspeakClients = teamspeakService.GetOnlineTeamspeakClients(); - List allAccounts = accountService.Data().Get(); + List allAccounts = accountService.Data.Get(); var clients = teamnspeakClients.Where(x => x != null).Select(x => new {account = allAccounts.FirstOrDefault(y => y.teamspeakIdentities != null && y.teamspeakIdentities.Any(z => z.Equals(x.clientDbId))), client = x}).ToList(); var clientAccounts = clients.Where(x => x.account != null && x.account.membershipState == MembershipState.MEMBER).OrderBy(x => x.account.rank, new RankComparer(ranksService)).ThenBy(x => x.account.lastname).ThenBy(x => x.account.firstname); List commandAccounts = unitsService.GetAuxilliaryRoot().members; @@ -179,30 +179,30 @@ public IActionResult GetOnlineAccounts() { [HttpGet("exists")] public IActionResult CheckUsernameOrEmailExists([FromQuery] string check) { - return Ok(accountService.Data().Get().Any(x => string.Equals(x.email, check, StringComparison.InvariantCultureIgnoreCase)) ? new {exists = true} : new {exists = false}); + return Ok(accountService.Data.Get().Any(x => string.Equals(x.email, check, StringComparison.InvariantCultureIgnoreCase)) ? new {exists = true} : new {exists = false}); } [HttpPut("name"), Authorize] public async Task ChangeName([FromBody] JObject changeNameRequest) { Account account = sessionService.GetContextAccount(); - await accountService.Data().Update(account.id, Builders.Update.Set(x => x.firstname, changeNameRequest["firstname"].ToString()).Set(x => x.lastname, changeNameRequest["lastname"].ToString())); + await accountService.Data.Update(account.id, Builders.Update.Set(x => x.firstname, changeNameRequest["firstname"].ToString()).Set(x => x.lastname, changeNameRequest["lastname"].ToString())); LogWrapper.AuditLog(sessionService.GetContextId(), $"{account.lastname}, {account.firstname} changed their name to {changeNameRequest["lastname"]}, {changeNameRequest["firstname"]}"); - await discordService.UpdateAccount(accountService.Data().GetSingle(account.id)); + await discordService.UpdateAccount(accountService.Data.GetSingle(account.id)); return Ok(); } [HttpPut("password"), Authorize] public async Task ChangePassword([FromBody] JObject changePasswordRequest) { string contextId = sessionService.GetContextId(); - await accountService.Data().Update(contextId, "password", BCrypt.Net.BCrypt.HashPassword(changePasswordRequest["password"].ToString())); + await accountService.Data.Update(contextId, "password", BCrypt.Net.BCrypt.HashPassword(changePasswordRequest["password"].ToString())); LogWrapper.AuditLog(contextId, $"Password changed for {contextId}"); return Ok(); } [HttpPost("updatesetting/{id}"), Authorize] public async Task UpdateSetting(string id, [FromBody] JObject body) { - Account account = string.IsNullOrEmpty(id) ? sessionService.GetContextAccount() : accountService.Data().GetSingle(id); - await accountService.Data().Update(account.id, $"settings.{body["name"]}", body["value"]); + Account account = string.IsNullOrEmpty(id) ? sessionService.GetContextAccount() : accountService.Data.GetSingle(id); + await accountService.Data.Update(account.id, $"settings.{body["name"]}", body["value"]); LogWrapper.AuditLog(sessionService.GetContextId(), $"Setting {body["name"]} updated for {account.id} from {account.settings.GetAttribute(body["name"].ToString())} to {body["value"]}"); return Ok(); } diff --git a/UKSF.Api/Controllers/Accounts/CommunicationsController.cs b/UKSF.Api/Controllers/Accounts/CommunicationsController.cs index fdb331af..e8d275e2 100644 --- a/UKSF.Api/Controllers/Accounts/CommunicationsController.cs +++ b/UKSF.Api/Controllers/Accounts/CommunicationsController.cs @@ -63,7 +63,7 @@ await notificationsService.SendTeamspeakNotification( } private async Task ReceiveTeamspeakCode(string id, string code, string checkId) { - Account account = accountService.Data().GetSingle(id); + Account account = accountService.Data.GetSingle(id); string teamspeakId = await confirmationCodeService.GetConfirmationCode(code); if (string.IsNullOrWhiteSpace(teamspeakId) || teamspeakId != checkId) { return BadRequest(new {error = "The confirmation code has expired or is invalid. Please try again"}); @@ -71,8 +71,8 @@ private async Task ReceiveTeamspeakCode(string id, string code, s if (account.teamspeakIdentities == null) account.teamspeakIdentities = new HashSet(); account.teamspeakIdentities.Add(double.Parse(teamspeakId)); - await accountService.Data().Update(account.id, Builders.Update.Set("teamspeakIdentities", account.teamspeakIdentities)); - account = accountService.Data().GetSingle(account.id); + await accountService.Data.Update(account.id, Builders.Update.Set("teamspeakIdentities", account.teamspeakIdentities)); + account = accountService.Data.GetSingle(account.id); await teamspeakService.UpdateAccountTeamspeakGroups(account); await notificationsService.SendTeamspeakNotification(new HashSet {teamspeakId.ToDouble()}, $"This teamspeak identity has been linked to the account with email '{account.email}'\nIf this was not done by you, please contact an admin"); LogWrapper.AuditLog(account.id, $"Teamspeak ID {teamspeakId} added for {account.id}"); diff --git a/UKSF.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs b/UKSF.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs index 58cae50c..99b341e5 100644 --- a/UKSF.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs +++ b/UKSF.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs @@ -27,13 +27,13 @@ protected async Task AttemptLoginValidatedAction(JObject loginFor string validateCode = loginForm["code"].ToString(); if (codeType == "passwordreset") { LoginToken = LoginService.LoginWithoutPassword(loginForm["email"].ToString()); - Account account = AccountService.Data().GetSingle(x => string.Equals(x.email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); + Account account = AccountService.Data.GetSingle(x => string.Equals(x.email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); if (await ConfirmationCodeService.GetConfirmationCode(validateCode) == account.id && LoginToken != null) { return await ApplyValidatedPayload(loginForm["password"].ToString(), account); } } else { LoginToken = LoginService.Login(loginForm["email"].ToString(), loginForm["password"].ToString()); - Account account = AccountService.Data().GetSingle(x => string.Equals(x.email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); + Account account = AccountService.Data.GetSingle(x => string.Equals(x.email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); string codeValue = await ConfirmationCodeService.GetConfirmationCode(validateCode); if (!string.IsNullOrWhiteSpace(codeValue)) { return await ApplyValidatedPayload(codeValue, account); diff --git a/UKSF.Api/Controllers/Accounts/DiscordCodeController.cs b/UKSF.Api/Controllers/Accounts/DiscordCodeController.cs index 19509600..23b4e18f 100644 --- a/UKSF.Api/Controllers/Accounts/DiscordCodeController.cs +++ b/UKSF.Api/Controllers/Accounts/DiscordCodeController.cs @@ -32,8 +32,8 @@ public async Task DiscordConnect(string discordId, [FromBody] JOb } string id = sessionService.GetContextId(); - await accountService.Data().Update(id, Builders.Update.Set(x => x.discordId, discordId)); - Account account = accountService.Data().GetSingle(id); + await accountService.Data.Update(id, Builders.Update.Set(x => x.discordId, discordId)); + Account account = accountService.Data.GetSingle(id); await discordService.UpdateAccount(account); LogWrapper.AuditLog(account.id, $"DiscordID updated for {account.id} to {discordId}"); return Ok(); diff --git a/UKSF.Api/Controllers/Accounts/OperationOrderController.cs b/UKSF.Api/Controllers/Accounts/OperationOrderController.cs index 68c3b9b7..5c8ab8df 100644 --- a/UKSF.Api/Controllers/Accounts/OperationOrderController.cs +++ b/UKSF.Api/Controllers/Accounts/OperationOrderController.cs @@ -13,10 +13,10 @@ public class OperationOrderController : Controller { public OperationOrderController(IOperationOrderService operationOrderService) => this.operationOrderService = operationOrderService; [HttpGet, Authorize] - public IActionResult Get() => Ok(operationOrderService.Data().Get()); + public IActionResult Get() => Ok(operationOrderService.Data.Get()); [HttpGet("{id}"), Authorize] - public IActionResult Get(string id) => Ok(new {result = operationOrderService.Data().GetSingle(id)}); + public IActionResult Get(string id) => Ok(new {result = operationOrderService.Data.GetSingle(id)}); [HttpPost, Authorize] public async Task Post([FromBody] CreateOperationOrderRequest request) { @@ -26,7 +26,7 @@ public async Task Post([FromBody] CreateOperationOrderRequest req [HttpPut, Authorize] public async Task Put([FromBody] Opord request) { - await operationOrderService.Data().Replace(request); + await operationOrderService.Data.Replace(request); return Ok(); } } diff --git a/UKSF.Api/Controllers/Accounts/OperationReportController.cs b/UKSF.Api/Controllers/Accounts/OperationReportController.cs index f26068ee..b3e28046 100644 --- a/UKSF.Api/Controllers/Accounts/OperationReportController.cs +++ b/UKSF.Api/Controllers/Accounts/OperationReportController.cs @@ -15,7 +15,7 @@ public class OperationReportController : Controller { [HttpGet("{id}"), Authorize] public IActionResult Get(string id) { - Oprep oprep = operationReportService.Data().GetSingle(id); + Oprep oprep = operationReportService.Data.GetSingle(id); return Ok(new {operationEntity = oprep, groupedAttendance = oprep.attendanceReport.users.GroupBy(x => x.groupName)}); } @@ -27,11 +27,11 @@ public async Task Post([FromBody] CreateOperationReportRequest re [HttpPut, Authorize] public async Task Put([FromBody] Oprep request) { - await operationReportService.Data().Replace(request); + await operationReportService.Data.Replace(request); return Ok(); } [HttpGet, Authorize] - public IActionResult Get() => Ok(operationReportService.Data().Get()); + public IActionResult Get() => Ok(operationReportService.Data.Get()); } } diff --git a/UKSF.Api/Controllers/Accounts/PasswordResetController.cs b/UKSF.Api/Controllers/Accounts/PasswordResetController.cs index 664211bd..16cf2371 100644 --- a/UKSF.Api/Controllers/Accounts/PasswordResetController.cs +++ b/UKSF.Api/Controllers/Accounts/PasswordResetController.cs @@ -17,7 +17,7 @@ public class PasswordResetController : ConfirmationCodeReceiver { public PasswordResetController(IConfirmationCodeService confirmationCodeService, ILoginService loginService, IEmailService emailService, IAccountService accountService) : base(confirmationCodeService, loginService, accountService) => this.emailService = emailService; protected override async Task ApplyValidatedPayload(string codePayload, Account account) { - await AccountService.Data().Update(account.id, "password", BCrypt.Net.BCrypt.HashPassword(codePayload)); + await AccountService.Data.Update(account.id, "password", BCrypt.Net.BCrypt.HashPassword(codePayload)); LogWrapper.AuditLog(account.id, $"Password changed for {account.id}"); return Ok(LoginService.RegenerateToken(account.id)); } @@ -27,7 +27,7 @@ protected override async Task ApplyValidatedPayload(string codePa [HttpPut] public async Task ResetPassword([FromBody] JObject body) { - Account account = AccountService.Data().GetSingle(x => string.Equals(x.email, body["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); + Account account = AccountService.Data.GetSingle(x => string.Equals(x.email, body["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); if (account == null) { return BadRequest(); } diff --git a/UKSF.Api/Controllers/Accounts/SteamCodeController.cs b/UKSF.Api/Controllers/Accounts/SteamCodeController.cs index b41a852f..5117b488 100644 --- a/UKSF.Api/Controllers/Accounts/SteamCodeController.cs +++ b/UKSF.Api/Controllers/Accounts/SteamCodeController.cs @@ -28,8 +28,8 @@ public async Task SteamConnect(string steamId, [FromBody] JObject } string id = sessionService.GetContextId(); - await accountService.Data().Update(id, "steamname", steamId); - Account account = accountService.Data().GetSingle(id); + await accountService.Data.Update(id, "steamname", steamId); + Account account = accountService.Data.GetSingle(id); LogWrapper.AuditLog(account.id, $"SteamID updated for {account.id} to {steamId}"); return Ok(); } diff --git a/UKSF.Api/Controllers/ApplicationsController.cs b/UKSF.Api/Controllers/ApplicationsController.cs index 874a5266..0e229a7a 100644 --- a/UKSF.Api/Controllers/ApplicationsController.cs +++ b/UKSF.Api/Controllers/ApplicationsController.cs @@ -49,8 +49,8 @@ public async Task Post([FromBody] JObject body) { await Update(body, account); CommentThread recruiterCommentThread = new CommentThread {authors = recruitmentService.GetSr1Leads().Values.ToArray(), mode = ThreadMode.SR1}; CommentThread applicationCommentThread = new CommentThread {authors = new[] {account.id}, mode = ThreadMode.SR1}; - await commentThreadService.Data().Add(recruiterCommentThread); - await commentThreadService.Data().Add(applicationCommentThread); + await commentThreadService.Data.Add(recruiterCommentThread); + await commentThreadService.Data.Add(applicationCommentThread); Application application = new Application { dateCreated = DateTime.Now, state = ApplicationState.WAITING, @@ -58,8 +58,8 @@ public async Task Post([FromBody] JObject body) { recruiterCommentThread = recruiterCommentThread.id, applicationCommentThread = applicationCommentThread.id }; - await accountService.Data().Update(account.id, Builders.Update.Set(x => x.application, application)); - account = accountService.Data().GetSingle(account.id); + await accountService.Data.Update(account.id, Builders.Update.Set(x => x.application, application)); + account = accountService.Data.GetSingle(account.id); Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, "", "Applicant", "Candidate", reason: "you were entered into the recruitment process"); notificationsService.Add(notification); notificationsService.Add(new Notification {owner = application.recruiter, icon = NotificationIcons.APPLICATION, message = $"You have been assigned {account.firstname} {account.lastname}'s application", link = $"/recruitment/{account.id}"}); @@ -78,13 +78,13 @@ public async Task PostUpdate([FromBody] JObject body) { Account account = sessionService.GetContextAccount(); await Update(body, account); notificationsService.Add(new Notification {owner = account.application.recruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname} updated their application", link = $"/recruitment/{account.id}"}); - string difference = account.Changes(accountService.Data().GetSingle(account.id)); + string difference = account.Changes(accountService.Data.GetSingle(account.id)); LogWrapper.AuditLog(account.id, $"Application updated for {account.id}: {difference}"); return Ok(); } private async Task Update(JObject body, Account account) { - await accountService.Data() + await accountService.Data .Update( account.id, Builders.Update.Set(x => x.armaExperience, body["armaExperience"].ToString()) diff --git a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs index 6a27ca9b..778fab41 100644 --- a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs +++ b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs @@ -39,11 +39,11 @@ public CommandRequestsController(ICommandRequestService commandRequestService, I [HttpGet, Authorize] public IActionResult Get() { - List allRequests = commandRequestService.Data().Get(); + List allRequests = commandRequestService.Data.Get(); List myRequests = new List(); List otherRequests = new List(); string contextId = sessionService.GetContextId(); - bool canOverride = unitsService.Data().GetSingle(x => x.shortname == "SR10").members.Any(x => x == contextId); + bool canOverride = unitsService.Data.GetSingle(x => x.shortname == "SR10").members.Any(x => x == contextId); bool superAdmin = contextId == Global.SUPER_ADMIN; DateTime now = DateTime.Now; foreach (CommandRequest commandRequest in allRequests) { @@ -87,7 +87,7 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje bool overriden = bool.Parse(body["overriden"].ToString()); ReviewState state = Enum.Parse(body["reviewState"].ToString()); Account sessionAccount = sessionService.GetContextAccount(); - CommandRequest request = commandRequestService.Data().GetSingle(id); + CommandRequest request = commandRequestService.Data.GetSingle(id); if (request == null) { throw new NullReferenceException($"Failed to get request with id {id}, does not exist"); } diff --git a/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs b/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs index e286c546..60ba65e2 100644 --- a/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs +++ b/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs @@ -38,7 +38,7 @@ public CommandRequestsCreationController(ISessionService sessionService, IAccoun public async Task CreateRequestRank([FromBody] CommandRequest request) { request.requester = sessionId; request.displayValue = request.value; - request.displayFrom = accountService.Data().GetSingle(request.recipient).rank; + request.displayFrom = accountService.Data.GetSingle(request.recipient).rank; if (request.displayValue == request.displayFrom) return BadRequest("Ranks are equal"); bool direction = ranksService.IsSuperior(request.displayValue, request.displayFrom); request.type = string.IsNullOrEmpty(request.displayFrom) ? CommandRequestType.PROMOTION : direction ? CommandRequestType.PROMOTION : CommandRequestType.DEMOTION; @@ -88,7 +88,7 @@ public async Task CreateRequestDischarge([FromBody] CommandReques public async Task CreateRequestIndividualRole([FromBody] CommandRequest request) { request.requester = sessionId; request.displayValue = request.value; - request.displayFrom = accountService.Data().GetSingle(request.recipient).roleAssignment; + request.displayFrom = accountService.Data.GetSingle(request.recipient).roleAssignment; request.type = CommandRequestType.INDIVIDUAL_ROLE; if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); await commandRequestService.Add(request, ChainOfCommandMode.NEXT_COMMANDER); @@ -97,7 +97,7 @@ public async Task CreateRequestIndividualRole([FromBody] CommandR [HttpPut("unitrole"), Authorize, Roles(RoleDefinitions.COMMAND)] public async Task CreateRequestUnitRole([FromBody] CommandRequest request) { - Unit unit = unitsService.Data().GetSingle(request.value); + Unit unit = unitsService.Data.GetSingle(request.value); bool recipientHasUnitRole = unitsService.RolesHasMember(unit, request.recipient); if (!recipientHasUnitRole && request.secondaryValue == "None") { return BadRequest($"{displayNameService.GetDisplayName(request.recipient)} has no unit role in {unit.name}. If you are trying to remove them from the unit, use a Unit Removal request"); @@ -120,7 +120,7 @@ public async Task CreateRequestUnitRole([FromBody] CommandRequest [HttpPut("unitremoval"), Authorize, Roles(RoleDefinitions.COMMAND)] public async Task CreateRequestUnitRemoval([FromBody] CommandRequest request) { - Unit removeUnit = unitsService.Data().GetSingle(request.value); + Unit removeUnit = unitsService.Data.GetSingle(request.value); if (removeUnit.branch == UnitBranch.COMBAT) { return BadRequest("To remove from a combat unit, use a Transfer request"); } @@ -136,7 +136,7 @@ public async Task CreateRequestUnitRemoval([FromBody] CommandRequ [HttpPut("transfer"), Authorize, Roles(RoleDefinitions.COMMAND)] public async Task CreateRequestTransfer([FromBody] CommandRequest request) { - Unit toUnit = unitsService.Data().GetSingle(request.value); + Unit toUnit = unitsService.Data.GetSingle(request.value); request.requester = sessionId; request.displayValue = toUnit.name; if (toUnit.branch == UnitBranch.AUXILIARY) { @@ -145,7 +145,7 @@ public async Task CreateRequestTransfer([FromBody] CommandRequest if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); await commandRequestService.Add(request, ChainOfCommandMode.TARGET_COMMANDER); } else { - request.displayFrom = accountService.Data().GetSingle(request.recipient).unitAssignment; + request.displayFrom = accountService.Data.GetSingle(request.recipient).unitAssignment; request.type = CommandRequestType.TRANSFER; if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); await commandRequestService.Add(request, ChainOfCommandMode.COMMANDER_AND_TARGET_COMMANDER); diff --git a/UKSF.Api/Controllers/CommentThreadController.cs b/UKSF.Api/Controllers/CommentThreadController.cs index d56c5575..6ac28446 100644 --- a/UKSF.Api/Controllers/CommentThreadController.cs +++ b/UKSF.Api/Controllers/CommentThreadController.cs @@ -42,7 +42,7 @@ public IActionResult Get(string id) { comment => new { Id = comment.id.ToString(), Author = comment.author.ToString(), - DisplayName = displayNameService.GetDisplayName(accountService.Data().GetSingle(comment.author)), + DisplayName = displayNameService.GetDisplayName(accountService.Data.GetSingle(comment.author)), Content = comment.content, Timestamp = comment.timestamp } @@ -53,14 +53,14 @@ public IActionResult Get(string id) { [HttpGet("canpost/{id}"), Authorize] public IActionResult GetCanPostComment(string id) { - CommentThread commentThread = commentThreadService.Data().GetSingle(id); + CommentThread commentThread = commentThreadService.Data.GetSingle(id); Account account = sessionService.GetContextAccount(); bool admin = sessionService.ContextHasRole(RoleDefinitions.ADMIN); bool canPost = commentThread.mode switch { ThreadMode.SR1 => (commentThread.authors.Any(x => x == sessionService.GetContextId()) || admin || recruitmentService.IsRecruiter(sessionService.GetContextAccount())), - ThreadMode.RANKSUPERIOR => commentThread.authors.Any(x => admin || ranksService.IsSuperior(account.rank, accountService.Data().GetSingle(x).rank)), - ThreadMode.RANKEQUAL => commentThread.authors.Any(x => admin || ranksService.IsEqual(account.rank, accountService.Data().GetSingle(x).rank)), - ThreadMode.RANKSUPERIOROREQUAL => commentThread.authors.Any(x => admin || ranksService.IsSuperiorOrEqual(account.rank, accountService.Data().GetSingle(x).rank)), + ThreadMode.RANKSUPERIOR => commentThread.authors.Any(x => admin || ranksService.IsSuperior(account.rank, accountService.Data.GetSingle(x).rank)), + ThreadMode.RANKEQUAL => commentThread.authors.Any(x => admin || ranksService.IsEqual(account.rank, accountService.Data.GetSingle(x).rank)), + ThreadMode.RANKSUPERIOROREQUAL => commentThread.authors.Any(x => admin || ranksService.IsSuperiorOrEqual(account.rank, accountService.Data.GetSingle(x).rank)), _ => true }; @@ -73,7 +73,7 @@ public async Task AddComment(string id, [FromBody] Comment commen comment.timestamp = DateTime.Now; comment.author = sessionService.GetContextId(); await commentThreadService.InsertComment(id, comment); - CommentThread thread = commentThreadService.Data().GetSingle(id); + CommentThread thread = commentThreadService.Data.GetSingle(id); IEnumerable participants = commentThreadService.GetCommentThreadParticipants(thread.id); foreach (string objectId in participants.Where(x => x != comment.author)) { notificationsService.Add( // TODO: Set correct link when comment thread is between /application and /recruitment/id diff --git a/UKSF.Api/Controllers/DischargesController.cs b/UKSF.Api/Controllers/DischargesController.cs index da7108c1..8d688292 100644 --- a/UKSF.Api/Controllers/DischargesController.cs +++ b/UKSF.Api/Controllers/DischargesController.cs @@ -37,7 +37,7 @@ public DischargesController(IAccountService accountService, IAssignmentService a [HttpGet] public IActionResult Get() { - IEnumerable discharges = dischargeService.Data().Get(); + IEnumerable discharges = dischargeService.Data.Get(); foreach (DischargeCollection discharge in discharges) { discharge.requestExists = commandRequestService.DoesEquivalentRequestExist(new CommandRequest {recipient = discharge.accountId, type = CommandRequestType.REINSTATE_MEMBER, displayValue = "Member", displayFrom = "Discharged"}); } @@ -47,18 +47,18 @@ public IActionResult Get() { [HttpGet("reinstate/{id}")] public async Task Reinstate(string id) { - DischargeCollection dischargeCollection = dischargeService.Data().GetSingle(id); - await dischargeService.Data().Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); - await accountService.Data().Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); + DischargeCollection dischargeCollection = dischargeService.Data.GetSingle(id); + await dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); + await accountService.Data.Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); Notification notification = await assignmentService.UpdateUnitRankAndRole(dischargeCollection.accountId, "Basic Training Unit", "Trainee", "Recruit", "", "", "your membership was reinstated"); notificationsService.Add(notification); LogWrapper.AuditLog(sessionService.GetContextId(), $"{sessionService.GetContextId()} reinstated {dischargeCollection.name}'s membership"); - foreach (string member in unitsService.Data().GetSingle(x => x.shortname == "SR10").members.Where(x => x != sessionService.GetContextId())) { + foreach (string member in unitsService.Data.GetSingle(x => x.shortname == "SR10").members.Where(x => x != sessionService.GetContextId())) { notificationsService.Add(new Notification {owner = member, icon = NotificationIcons.PROMOTION, message = $"{dischargeCollection.name}'s membership was reinstated by {sessionService.GetContextId()}"}); } - return Ok(dischargeService.Data().Get()); + return Ok(dischargeService.Data.Get()); } } } diff --git a/UKSF.Api/Controllers/GameServersController.cs b/UKSF.Api/Controllers/GameServersController.cs index 74b4eab2..172466c4 100644 --- a/UKSF.Api/Controllers/GameServersController.cs +++ b/UKSF.Api/Controllers/GameServersController.cs @@ -34,11 +34,11 @@ public GameServersController(ISessionService sessionService, IGameServersService } [HttpGet, Authorize] - public IActionResult GetGameServers() => Ok(new {servers = gameServersService.Data().Get(), missions = gameServersService.GetMissionFiles(), instanceCount = gameServersService.GetGameInstanceCount()}); + public IActionResult GetGameServers() => Ok(new {servers = gameServersService.Data.Get(), missions = gameServersService.GetMissionFiles(), instanceCount = gameServersService.GetGameInstanceCount()}); [HttpGet("status/{id}"), Authorize] public async Task GetGameServerStatus(string id) { - GameServer gameServer = gameServersService.Data().GetSingle(id); + GameServer gameServer = gameServersService.Data.GetSingle(id); await gameServersService.GetGameServerStatus(gameServer); return Ok(new {gameServer, instanceCount = gameServersService.GetGameInstanceCount()}); } @@ -47,24 +47,24 @@ public async Task GetGameServerStatus(string id) { public IActionResult CheckGameServers(string check, [FromBody] GameServer gameServer = null) { if (gameServer != null) { GameServer safeGameServer = gameServer; - return Ok(gameServersService.Data().GetSingle(x => x.id != safeGameServer.id && (x.name == check || x.apiPort.ToString() == check))); + return Ok(gameServersService.Data.GetSingle(x => x.id != safeGameServer.id && (x.name == check || x.apiPort.ToString() == check))); } - return Ok(gameServersService.Data().GetSingle(x => x.name == check || x.apiPort.ToString() == check)); + return Ok(gameServersService.Data.GetSingle(x => x.name == check || x.apiPort.ToString() == check)); } [HttpPut, Authorize] public async Task AddServer([FromBody] GameServer gameServer) { - await gameServersService.Data().Add(gameServer); + await gameServersService.Data.Add(gameServer); LogWrapper.AuditLog(sessionService.GetContextId(), $"Server added '{gameServer}'"); return Ok(); } [HttpPatch, Authorize] public async Task EditGameServer([FromBody] GameServer gameServer) { - GameServer oldGameServer = gameServersService.Data().GetSingle(x => x.id == gameServer.id); + GameServer oldGameServer = gameServersService.Data.GetSingle(x => x.id == gameServer.id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server '{gameServer.name}' updated:{oldGameServer.Changes(gameServer)}"); - await gameServersService.Data() + await gameServersService.Data .Update( gameServer.id, Builders.Update.Set("name", gameServer.name) @@ -79,28 +79,28 @@ await gameServersService.Data() .Set("serverMods", gameServer.serverMods) ); - return Ok(gameServersService.Data().Get()); + return Ok(gameServersService.Data.Get()); } [HttpDelete("{id}"), Authorize] public async Task DeleteGameServer(string id) { - GameServer gameServer = gameServersService.Data().GetSingle(x => x.id == id); + GameServer gameServer = gameServersService.Data.GetSingle(x => x.id == id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server deleted '{gameServer.name}'"); - await gameServersService.Data().Delete(id); + await gameServersService.Data.Delete(id); - return Ok(gameServersService.Data().Get()); + return Ok(gameServersService.Data.Get()); } [HttpPost("order"), Authorize] public async Task UpdateOrder([FromBody] List newServerOrder) { for (int index = 0; index < newServerOrder.Count; index++) { GameServer gameServer = newServerOrder[index]; - if (gameServersService.Data().GetSingle(gameServer.id).order != index) { - await gameServersService.Data().Update(gameServer.id, "order", index); + if (gameServersService.Data.GetSingle(gameServer.id).order != index) { + await gameServersService.Data.Update(gameServer.id, "order", index); } } - return Ok(gameServersService.Data().Get()); + return Ok(gameServersService.Data.Get()); } [HttpPost("mission"), Authorize, RequestSizeLimit(10485760), RequestFormLimits(MultipartBodyLengthLimit = 10485760)] @@ -124,22 +124,22 @@ public async Task UploadMissionFile() { [HttpPost("launch/{id}"), Authorize] public async Task LaunchServer(string id, [FromBody] JObject data) { - Task.WaitAll(gameServersService.Data().Get().Select(x => gameServersService.GetGameServerStatus(x)).ToArray()); - GameServer gameServer = gameServersService.Data().GetSingle(id); + Task.WaitAll(gameServersService.Data.Get().Select(x => gameServersService.GetGameServerStatus(x)).ToArray()); + GameServer gameServer = gameServersService.Data.GetSingle(id); if (gameServer.status.running) return BadRequest("Server is already running. This shouldn't happen so please contact an admin"); if (GameServerHelpers.IsMainOpTime()) { if (gameServer.serverOption == GameServerOption.SINGLETON) { - if (gameServersService.Data().Get(x => x.serverOption != GameServerOption.SINGLETON).Any(x => x.status.started || x.status.running)) { + if (gameServersService.Data.Get(x => x.serverOption != GameServerOption.SINGLETON).Any(x => x.status.started || x.status.running)) { return BadRequest("Server must be launched on its own. Stop the other running servers first"); } } - if (gameServersService.Data().Get(x => x.serverOption == GameServerOption.SINGLETON).Any(x => x.status.started || x.status.running)) { + if (gameServersService.Data.Get(x => x.serverOption == GameServerOption.SINGLETON).Any(x => x.status.started || x.status.running)) { return BadRequest("Server cannot be launched whilst main server is running at this time"); } } - if (gameServersService.Data().Get(x => x.port == gameServer.port).Any(x => x.status.started || x.status.running)) { + if (gameServersService.Data.Get(x => x.port == gameServer.port).Any(x => x.status.started || x.status.running)) { return BadRequest("Server cannot be launched while another server with the same port is running"); } @@ -163,7 +163,7 @@ public async Task LaunchServer(string id, [FromBody] JObject data [HttpGet("stop/{id}"), Authorize] public async Task StopServer(string id) { - GameServer gameServer = gameServersService.Data().GetSingle(id); + GameServer gameServer = gameServersService.Data.GetSingle(id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server stopped '{gameServer.name}'"); await gameServersService.GetGameServerStatus(gameServer); if (!gameServer.status.started && !gameServer.status.running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); @@ -174,7 +174,7 @@ public async Task StopServer(string id) { [HttpGet("kill/{id}"), Authorize] public async Task KillServer(string id) { - GameServer gameServer = gameServersService.Data().GetSingle(id); + GameServer gameServer = gameServersService.Data.GetSingle(id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server killed '{gameServer.name}'"); await gameServersService.GetGameServerStatus(gameServer); if (!gameServer.status.started && !gameServer.status.running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); @@ -200,10 +200,10 @@ public IActionResult KillAllArmaProcesses() { [HttpPost("mods/{id}"), Authorize] public async Task SetGameServerMods(string id, [FromBody] List mods) { - GameServer gameServer = gameServersService.Data().GetSingle(id); + GameServer gameServer = gameServersService.Data.GetSingle(id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server '{gameServer.name}' mods updated:{gameServer.mods.Select(x => x.name).Changes(mods.Select(x => x.name))}"); - await gameServersService.Data().Update(id, Builders.Update.Unset(x => x.mods)); - await gameServersService.Data().Update(id, Builders.Update.PushEach(x => x.mods, mods)); + await gameServersService.Data.Update(id, Builders.Update.Unset(x => x.mods)); + await gameServersService.Data.Update(id, Builders.Update.PushEach(x => x.mods, mods)); return Ok(gameServersService.GetAvailableMods()); } diff --git a/UKSF.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs index e44a82f3..f7123e3b 100644 --- a/UKSF.Api/Controllers/LoaController.cs +++ b/UKSF.Api/Controllers/LoaController.cs @@ -53,13 +53,13 @@ public IActionResult Get([FromQuery] string scope = "you") { List objectIds; switch (scope) { case "all": - objectIds = accountService.Data().Get(x => x.membershipState == MembershipState.MEMBER).Select(x => x.id).ToList(); + objectIds = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER).Select(x => x.id).ToList(); break; case "unit": Account account = sessionService.GetContextAccount(); - IEnumerable groups = unitsService.GetAllChildren(unitsService.Data().GetSingle(x => x.name == account.unitAssignment), true); + IEnumerable groups = unitsService.GetAllChildren(unitsService.Data.GetSingle(x => x.name == account.unitAssignment), true); List members = groups.SelectMany(x => x.members.ToList()).ToList(); - objectIds = accountService.Data().Get(x => x.membershipState == MembershipState.MEMBER && members.Contains(x.id)).Select(x => x.id).ToList(); + objectIds = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER && members.Contains(x.id)).Select(x => x.id).ToList(); break; case "you": objectIds = new List {sessionService.GetContextId()}; @@ -77,7 +77,7 @@ public IActionResult Get([FromQuery] string scope = "you") { x.emergency, x.late, x.reason, - name = displayNameService.GetDisplayName(accountService.Data().GetSingle(x.recipient)), + name = displayNameService.GetDisplayName(accountService.Data.GetSingle(x.recipient)), inChainOfCommand = chainOfCommandService.InContextChainOfCommand(x.recipient), longTerm = (x.end - x.start).Days > 21 } @@ -94,19 +94,19 @@ public IActionResult Get([FromQuery] string scope = "you") { [HttpDelete("{id}"), Authorize] public async Task DeleteLoa(string id) { - Loa loa = loaService.Data().GetSingle(id); - CommandRequest request = commandRequestService.Data().GetSingle(x => x.value == id); + Loa loa = loaService.Data.GetSingle(id); + CommandRequest request = commandRequestService.Data.GetSingle(x => x.value == id); if (request != null) { - await commandRequestService.Data().Delete(request.id); + await commandRequestService.Data.Delete(request.id); foreach (string reviewerId in request.reviews.Keys.Where(x => x != request.requester)) { notificationsService.Add(new Notification {owner = reviewerId, icon = NotificationIcons.REQUEST, message = $"Your review for {request.displayRequester}'s LOA is no longer required as they deleted their LOA", link = "/command/requests"}); } - LogWrapper.AuditLog(sessionService.GetContextId(), $"Loa request deleted for '{displayNameService.GetDisplayName(accountService.Data().GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); + LogWrapper.AuditLog(sessionService.GetContextId(), $"Loa request deleted for '{displayNameService.GetDisplayName(accountService.Data.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); } - LogWrapper.AuditLog(sessionService.GetContextId(), $"Loa deleted for '{displayNameService.GetDisplayName(accountService.Data().GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); - await loaService.Data().Delete(loa.id); + LogWrapper.AuditLog(sessionService.GetContextId(), $"Loa deleted for '{displayNameService.GetDisplayName(accountService.Data.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); + await loaService.Data.Delete(loa.id); return Ok(); } diff --git a/UKSF.Api/Controllers/RanksController.cs b/UKSF.Api/Controllers/RanksController.cs index 7b2ce9a3..89db8049 100644 --- a/UKSF.Api/Controllers/RanksController.cs +++ b/UKSF.Api/Controllers/RanksController.cs @@ -29,12 +29,12 @@ public RanksController(IRanksService ranksService, IAccountService accountServic } [HttpGet, Authorize] - public IActionResult GetRanks() => Ok(ranksService.Data().Get()); + public IActionResult GetRanks() => Ok(ranksService.Data.Get()); [HttpGet("{id}"), Authorize] public IActionResult GetRanks(string id) { - Account account = accountService.Data().GetSingle(id); - return Ok(ranksService.Data().Get(x => x.name != account.rank)); + Account account = accountService.Data.GetSingle(id); + return Ok(ranksService.Data.Get(x => x.name != account.rank)); } [HttpPost("{check}"), Authorize] @@ -42,60 +42,60 @@ public IActionResult CheckRank(string check, [FromBody] Rank rank = null) { if (string.IsNullOrEmpty(check)) return Ok(); if (rank != null) { Rank safeRank = rank; - return Ok(ranksService.Data().GetSingle(x => x.id != safeRank.id && (x.name == check || x.teamspeakGroup == check))); + return Ok(ranksService.Data.GetSingle(x => x.id != safeRank.id && (x.name == check || x.teamspeakGroup == check))); } - return Ok(ranksService.Data().GetSingle(x => x.name == check || x.teamspeakGroup == check)); + return Ok(ranksService.Data.GetSingle(x => x.name == check || x.teamspeakGroup == check)); } [HttpPost, Authorize] public IActionResult CheckRank([FromBody] Rank rank) { - return rank != null ? (IActionResult) Ok(ranksService.Data().GetSingle(x => x.id != rank.id && (x.name == rank.name || x.teamspeakGroup == rank.teamspeakGroup))) : Ok(); + return rank != null ? (IActionResult) Ok(ranksService.Data.GetSingle(x => x.id != rank.id && (x.name == rank.name || x.teamspeakGroup == rank.teamspeakGroup))) : Ok(); } [HttpPut, Authorize] public async Task AddRank([FromBody] Rank rank) { - await ranksService.Data().Add(rank); + await ranksService.Data.Add(rank); LogWrapper.AuditLog(sessionService.GetContextId(), $"Rank added '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}'"); return Ok(); } [HttpPatch, Authorize] public async Task EditRank([FromBody] Rank rank) { - Rank oldRank = ranksService.Data().GetSingle(x => x.id == rank.id); + Rank oldRank = ranksService.Data.GetSingle(x => x.id == rank.id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Rank updated from '{oldRank.name}, {oldRank.abbreviation}, {oldRank.teamspeakGroup}, {oldRank.discordRoleId}' to '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}, {rank.discordRoleId}'"); - await ranksService.Data().Update(rank.id, Builders.Update.Set("name", rank.name).Set("abbreviation", rank.abbreviation).Set("teamspeakGroup", rank.teamspeakGroup).Set("discordRoleId", rank.discordRoleId)); - foreach (Account account in accountService.Data().Get(x => x.rank == oldRank.name)) { + await ranksService.Data.Update(rank.id, Builders.Update.Set("name", rank.name).Set("abbreviation", rank.abbreviation).Set("teamspeakGroup", rank.teamspeakGroup).Set("discordRoleId", rank.discordRoleId)); + foreach (Account account in accountService.Data.Get(x => x.rank == oldRank.name)) { // TODO: Notify user to update name in TS if rank abbreviate changed - await accountService.Data().Update(account.id, "rank", rank.name); + await accountService.Data.Update(account.id, "rank", rank.name); } - return Ok(ranksService.Data().Get()); + return Ok(ranksService.Data.Get()); } [HttpDelete("{id}"), Authorize] public async Task DeleteRank(string id) { - Rank rank = ranksService.Data().GetSingle(x => x.id == id); + Rank rank = ranksService.Data.GetSingle(x => x.id == id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Rank deleted '{rank.name}'"); - await ranksService.Data().Delete(id); - foreach (Account account in accountService.Data().Get(x => x.rank == rank.name)) { + await ranksService.Data.Delete(id); + foreach (Account account in accountService.Data.Get(x => x.rank == rank.name)) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, rankString: AssignmentService.REMOVE_FLAG, reason: $"the '{rank.name}' rank was deleted"); notificationsService.Add(notification); } - return Ok(ranksService.Data().Get()); + return Ok(ranksService.Data.Get()); } [HttpPost("order"), Authorize] public async Task UpdateOrder([FromBody] List newRankOrder) { for (int index = 0; index < newRankOrder.Count; index++) { Rank rank = newRankOrder[index]; - if (ranksService.Data().GetSingle(rank.name).order != index) { - await ranksService.Data().Update(rank.id, "order", index); + if (ranksService.Data.GetSingle(rank.name).order != index) { + await ranksService.Data.Update(rank.id, "order", index); } } - return Ok(ranksService.Data().Get()); + return Ok(ranksService.Data.Get()); } } } diff --git a/UKSF.Api/Controllers/RecruitmentController.cs b/UKSF.Api/Controllers/RecruitmentController.cs index 63a89985..c910903c 100644 --- a/UKSF.Api/Controllers/RecruitmentController.cs +++ b/UKSF.Api/Controllers/RecruitmentController.cs @@ -38,7 +38,7 @@ public RecruitmentController(IAccountService accountService, IRecruitmentService [HttpGet("{id}"), Authorize] public IActionResult GetSingle(string id) { - Account account = accountService.Data().GetSingle(id); + Account account = accountService.Data.GetSingle(id); return Ok(recruitmentService.GetApplication(account)); } @@ -50,7 +50,7 @@ public IActionResult GetRecruitmentStats() { string account = sessionService.GetContextId(); List activity = new List(); foreach (Account recruiterAccount in recruitmentService.GetSr1Members()) { - List recruiterApplications = accountService.Data().Get(x => x.application != null && x.application.recruiter == recruiterAccount.id); + List recruiterApplications = accountService.Data.Get(x => x.application != null && x.application.recruiter == recruiterAccount.id); activity.Add( new { account = new {recruiterAccount.id, recruiterAccount.settings}, @@ -68,21 +68,21 @@ public IActionResult GetRecruitmentStats() { [HttpPost("{id}"), Authorize, Roles(RoleDefinitions.SR1)] public async Task UpdateState([FromBody] dynamic body, string id) { ApplicationState updatedState = body.updatedState; - Account account = accountService.Data().GetSingle(id); + Account account = accountService.Data.GetSingle(id); if (updatedState == account.application.state) return Ok(); string sessionId = sessionService.GetContextId(); - await accountService.Data().Update(id, Builders.Update.Set(x => x.application.state, updatedState)); + await accountService.Data.Update(id, Builders.Update.Set(x => x.application.state, updatedState)); LogWrapper.AuditLog(sessionId, $"Application state changed for {id} from {account.application.state} to {updatedState}"); switch (updatedState) { case ApplicationState.ACCEPTED: { - await accountService.Data().Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now).Set(x => x.membershipState, MembershipState.MEMBER)); + await accountService.Data.Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now).Set(x => x.membershipState, MembershipState.MEMBER)); Notification notification = await assignmentService.UpdateUnitRankAndRole(id, "Basic Training Unit", "Trainee", "Recruit", reason: "your application was accepted"); notificationsService.Add(notification); break; } case ApplicationState.REJECTED: { - await accountService.Data().Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now).Set(x => x.membershipState, MembershipState.CONFIRMED)); + await accountService.Data.Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now).Set(x => x.membershipState, MembershipState.CONFIRMED)); Notification notification = await assignmentService.UpdateUnitRankAndRole( id, AssignmentService.REMOVE_FLAG, @@ -95,13 +95,13 @@ public async Task UpdateState([FromBody] dynamic body, string id) break; } case ApplicationState.WAITING: { - await accountService.Data().Update(id, Builders.Update.Set(x => x.application.dateCreated, DateTime.Now).Unset(x => x.application.dateAccepted).Set(x => x.membershipState, MembershipState.CONFIRMED)); + await accountService.Data.Update(id, Builders.Update.Set(x => x.application.dateCreated, DateTime.Now).Unset(x => x.application.dateAccepted).Set(x => x.membershipState, MembershipState.CONFIRMED)); Notification notification = await assignmentService.UpdateUnitRankAndRole(id, AssignmentService.REMOVE_FLAG, "Applicant", "Candidate", reason: "your application was reactivated"); notificationsService.Add(notification); if (recruitmentService.GetSr1Members().All(x => x.id != account.application.recruiter)) { string newRecruiterId = recruitmentService.GetRecruiter(); LogWrapper.AuditLog(sessionId, $"Application recruiter for {id} is no longer SR1, reassigning from {account.application.recruiter} to {newRecruiterId}"); - await accountService.Data().Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiterId)); + await accountService.Data.Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiterId)); } break; @@ -109,7 +109,7 @@ public async Task UpdateState([FromBody] dynamic body, string id) default: throw new ArgumentOutOfRangeException(); } - account = accountService.Data().GetSingle(id); + account = accountService.Data.GetSingle(id); string message = updatedState == ApplicationState.WAITING ? "was reactivated" : $"was {updatedState}"; if (sessionId != account.application.recruiter) { notificationsService.Add( @@ -129,7 +129,7 @@ public async Task PostReassignment([FromBody] JObject newRecruite if (!sessionService.ContextHasRole(RoleDefinitions.ADMIN) && !recruitmentService.IsAccountSr1Lead()) throw new Exception($"attempted to assign recruiter to {newRecruiter}. Context is not recruitment lead."); string recruiter = newRecruiter["newRecruiter"].ToString(); await recruitmentService.SetRecruiter(id, recruiter); - Account account = accountService.Data().GetSingle(id); + Account account = accountService.Data.GetSingle(id); if (account.application.state == ApplicationState.WAITING) { notificationsService.Add(new Notification {owner = recruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application has been transferred to you", link = $"/recruitment/{account.id}"}); } @@ -140,7 +140,7 @@ public async Task PostReassignment([FromBody] JObject newRecruite [HttpPost("ratings/{id}"), Authorize, Roles(RoleDefinitions.SR1)] public async Task> Ratings([FromBody] KeyValuePair value, string id) { - Dictionary ratings = accountService.Data().GetSingle(id).application.ratings; + Dictionary ratings = accountService.Data.GetSingle(id).application.ratings; (string key, uint rating) = value; if (ratings.ContainsKey(key)) { @@ -149,7 +149,7 @@ public async Task> Ratings([FromBody] KeyValuePair.Update.Set(x => x.application.ratings, ratings)); + await accountService.Data.Update(id, Builders.Update.Set(x => x.application.ratings, ratings)); return ratings; } diff --git a/UKSF.Api/Controllers/RolesController.cs b/UKSF.Api/Controllers/RolesController.cs index 311ed66a..3b77a27b 100644 --- a/UKSF.Api/Controllers/RolesController.cs +++ b/UKSF.Api/Controllers/RolesController.cs @@ -35,19 +35,19 @@ public RolesController(IRolesService rolesService, IAccountService accountServic [HttpGet, Authorize] public IActionResult GetRoles([FromQuery] string id = "", [FromQuery] string unitId = "") { if (!string.IsNullOrEmpty(id) && !string.IsNullOrEmpty(unitId)) { - Unit unit = unitsService.Data().GetSingle(unitId); - IOrderedEnumerable unitRoles = rolesService.Data().Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order); + Unit unit = unitsService.Data.GetSingle(unitId); + IOrderedEnumerable unitRoles = rolesService.Data.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order); IEnumerable> existingPairs = unit.roles.Where(x => x.Value == id); IEnumerable filteredRoles = unitRoles.Where(x => existingPairs.All(y => y.Key != x.name)); return Ok(filteredRoles); } if (!string.IsNullOrEmpty(id)) { - Account account = accountService.Data().GetSingle(id); - return Ok(rolesService.Data().Get(x => x.roleType == RoleType.INDIVIDUAL && x.name != account.roleAssignment).OrderBy(x => x.order)); + Account account = accountService.Data.GetSingle(id); + return Ok(rolesService.Data.Get(x => x.roleType == RoleType.INDIVIDUAL && x.name != account.roleAssignment).OrderBy(x => x.order)); } - return Ok(new {individualRoles = rolesService.Data().Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data().Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); + return Ok(new {individualRoles = rolesService.Data.Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); } [HttpPost("{roleType}/{check}"), Authorize] @@ -55,56 +55,56 @@ public IActionResult CheckRole(RoleType roleType, string check, [FromBody] Role if (string.IsNullOrEmpty(check)) return Ok(); if (role != null) { Role safeRole = role; - return Ok(rolesService.Data().GetSingle(x => x.id != safeRole.id && x.roleType == roleType && x.name == check)); + return Ok(rolesService.Data.GetSingle(x => x.id != safeRole.id && x.roleType == roleType && x.name == check)); } - return Ok(rolesService.Data().GetSingle(x => x.roleType == roleType && x.name == check)); + return Ok(rolesService.Data.GetSingle(x => x.roleType == roleType && x.name == check)); } [HttpPut, Authorize] public async Task AddRole([FromBody] Role role) { - await rolesService.Data().Add(role); + await rolesService.Data.Add(role); LogWrapper.AuditLog(sessionService.GetContextId(), $"Role added '{role.name}'"); - return Ok(new {individualRoles = rolesService.Data().Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data().Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); + return Ok(new {individualRoles = rolesService.Data.Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); } [HttpPatch, Authorize] public async Task EditRole([FromBody] Role role) { - Role oldRole = rolesService.Data().GetSingle(x => x.id == role.id); + Role oldRole = rolesService.Data.GetSingle(x => x.id == role.id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Role updated from '{oldRole.name}' to '{role.name}'"); - await rolesService.Data().Update(role.id, "name", role.name); - foreach (Account account in accountService.Data().Get(x => x.roleAssignment == oldRole.name)) { - await accountService.Data().Update(account.id, "roleAssignment", role.name); + await rolesService.Data.Update(role.id, "name", role.name); + foreach (Account account in accountService.Data.Get(x => x.roleAssignment == oldRole.name)) { + await accountService.Data.Update(account.id, "roleAssignment", role.name); } await unitsService.RenameRole(oldRole.name, role.name); - return Ok(new {individualRoles = rolesService.Data().Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data().Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); + return Ok(new {individualRoles = rolesService.Data.Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); } [HttpDelete("{id}"), Authorize] public async Task DeleteRole(string id) { - Role role = rolesService.Data().GetSingle(x => x.id == id); + Role role = rolesService.Data.GetSingle(x => x.id == id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Role deleted '{role.name}'"); - await rolesService.Data().Delete(id); - foreach (Account account in accountService.Data().Get(x => x.roleAssignment == role.name)) { + await rolesService.Data.Delete(id); + foreach (Account account in accountService.Data.Get(x => x.roleAssignment == role.name)) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, role: AssignmentService.REMOVE_FLAG, reason: $"the '{role.name}' role was deleted"); notificationsService.Add(notification); } await unitsService.DeleteRole(role.name); - return Ok(new {individualRoles = rolesService.Data().Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data().Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); + return Ok(new {individualRoles = rolesService.Data.Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); } [HttpPost("order"), Authorize] public async Task UpdateOrder([FromBody] List newRoleOrder) { for (int index = 0; index < newRoleOrder.Count; index++) { Role role = newRoleOrder[index]; - if (rolesService.Data().GetSingle(role.name).order != index) { - await rolesService.Data().Update(role.id, "order", index); + if (rolesService.Data.GetSingle(role.name).order != index) { + await rolesService.Data.Update(role.id, "order", index); } } - return Ok(rolesService.Data().Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)); + return Ok(rolesService.Data.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)); } } } diff --git a/UKSF.Api/Controllers/UnitsController.cs b/UKSF.Api/Controllers/UnitsController.cs index 62c075ea..2179b93d 100644 --- a/UKSF.Api/Controllers/UnitsController.cs +++ b/UKSF.Api/Controllers/UnitsController.cs @@ -73,14 +73,14 @@ public IActionResult GetAccountUnits(string id, [FromQuery] string filter = "") [HttpGet("tree"), Authorize] public IActionResult GetTree() { - Unit combatRoot = unitsService.Data().GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); - Unit auxiliaryRoot = unitsService.Data().GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); + Unit combatRoot = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); + Unit auxiliaryRoot = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); return Ok(new {combatUnits = new[] {new {combatRoot.id, combatRoot.name, children = GetTreeChildren(combatRoot), unit = combatRoot}}, auxiliaryUnits = new[] {new {auxiliaryRoot.id, auxiliaryRoot.name, children = GetTreeChildren(auxiliaryRoot), unit = auxiliaryRoot}}}); } private List GetTreeChildren(Unit parent) { List children = new List(); - foreach (Unit unit in unitsService.Data().Get(x => x.parent == parent.id).OrderBy(x => x.order)) { + foreach (Unit unit in unitsService.Data.Get(x => x.parent == parent.id).OrderBy(x => x.order)) { children.Add(new {unit.id, unit.name, children = GetTreeChildren(unit), unit}); } @@ -92,20 +92,20 @@ public IActionResult CheckUnit(string check, [FromBody] Unit unit = null) { if (string.IsNullOrEmpty(check)) return Ok(); if (unit != null) { Unit safeUnit = unit; - return Ok(unitsService.Data().GetSingle(x => x.id != safeUnit.id && (x.name == check || x.shortname == check || x.teamspeakGroup == check || x.discordRoleId == check || x.callsign == check))); + return Ok(unitsService.Data.GetSingle(x => x.id != safeUnit.id && (x.name == check || x.shortname == check || x.teamspeakGroup == check || x.discordRoleId == check || x.callsign == check))); } - return Ok(unitsService.Data().GetSingle(x => x.name == check || x.shortname == check || x.teamspeakGroup == check || x.discordRoleId == check || x.callsign == check)); + return Ok(unitsService.Data.GetSingle(x => x.name == check || x.shortname == check || x.teamspeakGroup == check || x.discordRoleId == check || x.callsign == check)); } [HttpPost, Authorize] public IActionResult CheckUnit([FromBody] Unit unit) { - return unit != null ? (IActionResult) Ok(unitsService.Data().GetSingle(x => x.id != unit.id && (x.name == unit.name || x.shortname == unit.shortname || x.teamspeakGroup == unit.teamspeakGroup || x.discordRoleId == unit.discordRoleId || x.callsign == unit.callsign))) : Ok(); + return unit != null ? (IActionResult) Ok(unitsService.Data.GetSingle(x => x.id != unit.id && (x.name == unit.name || x.shortname == unit.shortname || x.teamspeakGroup == unit.teamspeakGroup || x.discordRoleId == unit.discordRoleId || x.callsign == unit.callsign))) : Ok(); } [HttpPut, Authorize] public async Task AddUnit([FromBody] Unit unit) { - await unitsService.Data().Add(unit); + await unitsService.Data.Add(unit); LogWrapper.AuditLog(sessionService.GetContextId(), $"New unit added '{unit.name}, {unit.shortname}, {unit.type}, {unit.branch}, {unit.teamspeakGroup}, {unit.discordRoleId}, {unit.callsign}'"); return Ok(); } @@ -113,12 +113,12 @@ public async Task AddUnit([FromBody] Unit unit) { [HttpPatch, Authorize] public async Task EditUnit([FromBody] Unit unit) { Unit localUnit = unit; - Unit oldUnit = unitsService.Data().GetSingle(x => x.id == localUnit.id); + Unit oldUnit = unitsService.Data.GetSingle(x => x.id == localUnit.id); LogWrapper.AuditLog( sessionService.GetContextId(), $"Unit updated from '{oldUnit.name}, {oldUnit.shortname}, {oldUnit.type}, {oldUnit.parent}, {oldUnit.branch}, {oldUnit.teamspeakGroup}, {oldUnit.discordRoleId}, {oldUnit.callsign}, {oldUnit.icon}' to '{unit.name}, {unit.shortname}, {unit.type}, {unit.parent}, {unit.branch}, {unit.teamspeakGroup}, {unit.discordRoleId}, {unit.callsign}, {unit.icon}'" ); - await unitsService.Data() + await unitsService.Data .Update( unit.id, Builders.Update.Set("name", unit.name) @@ -131,22 +131,22 @@ await unitsService.Data() .Set("callsign", unit.callsign) .Set("icon", unit.icon) ); - unit = unitsService.Data().GetSingle(unit.id); + unit = unitsService.Data.GetSingle(unit.id); if (unit.name != oldUnit.name) { - foreach (Account account in accountService.Data().Get(x => x.unitAssignment == oldUnit.name)) { - await accountService.Data().Update(account.id, "unitAssignment", unit.name); - await teamspeakService.UpdateAccountTeamspeakGroups(accountService.Data().GetSingle(account.id)); + foreach (Account account in accountService.Data.Get(x => x.unitAssignment == oldUnit.name)) { + await accountService.Data.Update(account.id, "unitAssignment", unit.name); + await teamspeakService.UpdateAccountTeamspeakGroups(accountService.Data.GetSingle(account.id)); } } if (unit.teamspeakGroup != oldUnit.teamspeakGroup) { - foreach (Account account in unit.members.Select(x => accountService.Data().GetSingle(x))) { + foreach (Account account in unit.members.Select(x => accountService.Data.GetSingle(x))) { await teamspeakService.UpdateAccountTeamspeakGroups(account); } } if (unit.discordRoleId != oldUnit.discordRoleId) { - foreach (Account account in unit.members.Select(x => accountService.Data().GetSingle(x))) { + foreach (Account account in unit.members.Select(x => accountService.Data.GetSingle(x))) { await discordService.UpdateAccount(account); } } @@ -157,14 +157,14 @@ await unitsService.Data() [HttpDelete("{id}"), Authorize] public async Task DeleteUnit(string id) { - Unit unit = unitsService.Data().GetSingle(id); + Unit unit = unitsService.Data.GetSingle(id); LogWrapper.AuditLog(sessionService.GetContextId(), $"Unit deleted '{unit.name}'"); - foreach (Account account in accountService.Data().Get(x => x.unitAssignment == unit.name)) { + foreach (Account account in accountService.Data.Get(x => x.unitAssignment == unit.name)) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, "Reserves", reason: $"{unit.name} was deleted"); notificationsService.Add(notification); } - await unitsService.Data().Delete(id); + await unitsService.Data.Delete(id); serverService.UpdateSquadXml(); return Ok(); } @@ -175,22 +175,22 @@ public async Task UpdateParent([FromBody] JObject data) { Unit parentUnit = JsonConvert.DeserializeObject(data["parentUnit"].ToString()); int index = JsonConvert.DeserializeObject(data["index"].ToString()); if (unit.parent == parentUnit.id) return Ok(); - await unitsService.Data().Update(unit.id, "parent", parentUnit.id); + await unitsService.Data.Update(unit.id, "parent", parentUnit.id); if (unit.branch != parentUnit.branch) { - await unitsService.Data().Update(unit.id, "branch", parentUnit.branch); + await unitsService.Data.Update(unit.id, "branch", parentUnit.branch); } - List parentChildren = unitsService.Data().Get(x => x.parent == parentUnit.id).ToList(); + List parentChildren = unitsService.Data.Get(x => x.parent == parentUnit.id).ToList(); parentChildren.Remove(parentChildren.FirstOrDefault(x => x.id == unit.id)); parentChildren.Insert(index, unit); foreach (Unit child in parentChildren) { - await unitsService.Data().Update(child.id, "order", parentChildren.IndexOf(child)); + await unitsService.Data.Update(child.id, "order", parentChildren.IndexOf(child)); } - unit = unitsService.Data().GetSingle(unit.id); + unit = unitsService.Data.GetSingle(unit.id); foreach (Unit child in unitsService.GetAllChildren(unit, true)) { - foreach (Account account in child.members.Select(x => accountService.Data().GetSingle(x))) { + foreach (Account account in child.members.Select(x => accountService.Data.GetSingle(x))) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, unit.name, reason: $"the hierarchy chain for {unit.name} was updated"); notificationsService.Add(notification); } @@ -203,12 +203,12 @@ public async Task UpdateParent([FromBody] JObject data) { public IActionResult UpdateSortOrder([FromBody] JObject data) { Unit unit = JsonConvert.DeserializeObject(data["unit"].ToString()); int index = JsonConvert.DeserializeObject(data["index"].ToString()); - Unit parentUnit = unitsService.Data().GetSingle(x => x.id == unit.parent); - List parentChildren = unitsService.Data().Get(x => x.parent == parentUnit.id).ToList(); + Unit parentUnit = unitsService.Data.GetSingle(x => x.id == unit.parent); + List parentChildren = unitsService.Data.Get(x => x.parent == parentUnit.id).ToList(); parentChildren.Remove(parentChildren.FirstOrDefault(x => x.id == unit.id)); parentChildren.Insert(index, unit); foreach (Unit child in parentChildren) { - unitsService.Data().Update(child.id, "order", parentChildren.IndexOf(child)); + unitsService.Data.Update(child.id, "order", parentChildren.IndexOf(child)); } return Ok(); @@ -218,10 +218,10 @@ public IActionResult UpdateSortOrder([FromBody] JObject data) { public IActionResult Get([FromQuery] string typeFilter) { switch (typeFilter) { case "regiments": - string combatRootId = unitsService.Data().GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT).id; - return Ok(unitsService.Data().Get(x => x.parent == combatRootId || x.id == combatRootId).ToList().Select(x => new {x.name, x.shortname, id = x.id.ToString(), x.icon})); + string combatRootId = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT).id; + return Ok(unitsService.Data.Get(x => x.parent == combatRootId || x.id == combatRootId).ToList().Select(x => new {x.name, x.shortname, id = x.id.ToString(), x.icon})); case "orgchart": - Unit combatRoot = unitsService.Data().GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); + Unit combatRoot = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); return Ok( new[] { new { @@ -236,7 +236,7 @@ public IActionResult Get([FromQuery] string typeFilter) { } ); case "orgchartaux": - Unit auziliaryRoot = unitsService.Data().GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); + Unit auziliaryRoot = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); return Ok( new[] { new { @@ -250,13 +250,13 @@ public IActionResult Get([FromQuery] string typeFilter) { } } ); - default: return Ok(unitsService.Data().Get().Select(x => new {viewValue = x.name, value = x.id.ToString()})); + default: return Ok(unitsService.Data.Get().Select(x => new {viewValue = x.name, value = x.id.ToString()})); } } [HttpGet("info/{id}"), Authorize] public IActionResult GetInfo(string id) { - Unit unit = unitsService.Data().GetSingle(id); + Unit unit = unitsService.Data.GetSingle(id); IEnumerable parents = unitsService.GetParents(unit).ToList(); Unit regiment = parents.Skip(1).FirstOrDefault(x => x.type == UnitType.REGIMENT); return Ok( @@ -265,9 +265,9 @@ public IActionResult GetInfo(string id) { unit.parent, type = unit.type.ToString(), displayName = unit.name, -// oic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(0).name) ? "" : displayNameService.GetDisplayName(accountService.Data().GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(0).name])), -// xic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(1).name) ? "" : displayNameService.GetDisplayName(accountService.Data().GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(1).name])), -// ncoic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(2).name) ? "" : displayNameService.GetDisplayName(accountService.Data().GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(2).name])), +// oic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(0).name) ? "" : displayNameService.GetDisplayName(accountService.Data.GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(0).name])), +// xic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(1).name) ? "" : displayNameService.GetDisplayName(accountService.Data.GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(1).name])), +// ncoic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(2).name) ? "" : displayNameService.GetDisplayName(accountService.Data.GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(2).name])), code = unitsService.GetChainString(unit), parentDisplay = parents.Skip(1).FirstOrDefault()?.name, regimentDisplay = regiment?.name, @@ -278,20 +278,20 @@ public IActionResult GetInfo(string id) { // coverageLOA = "80%", // casualtyRate = "10010 instances (70% rate)", // fatalityRate = "200 instances (20% rate)", - memberCollection = unit.members.Select(x => accountService.Data().GetSingle(x)).Select(x => new {name = displayNameService.GetDisplayName(x), role = x.roleAssignment}) + memberCollection = unit.members.Select(x => accountService.Data.GetSingle(x)).Select(x => new {name = displayNameService.GetDisplayName(x), role = x.roleAssignment}) } ); } [HttpGet("members/{id}"), Authorize] public IActionResult GetMembers(string id) { - Unit unit = unitsService.Data().GetSingle(id); - return Ok(unit.members.Select(x => accountService.Data().GetSingle(x)).Select(x => new {name = displayNameService.GetDisplayName(x), role = x.roleAssignment})); + Unit unit = unitsService.Data.GetSingle(id); + return Ok(unit.members.Select(x => accountService.Data.GetSingle(x)).Select(x => new {name = displayNameService.GetDisplayName(x), role = x.roleAssignment})); } private object[] GetChartChildren(string parent) { List units = new List(); - foreach (Unit unit in unitsService.Data().Get(x => x.parent == parent)) { + foreach (Unit unit in unitsService.Data.Get(x => x.parent == parent)) { units.Add( new { unit.id, @@ -317,7 +317,7 @@ private string GetRole(Unit unit, string accountId) => private IEnumerable SortMembers(IEnumerable members, Unit unit) { var accounts = members.Select( x => { - Account account = accountService.Data().GetSingle(x); + Account account = accountService.Data.GetSingle(x); return new {account, rankIndex = ranksService.GetRankIndex(account.rank), roleIndex = unitsService.GetMemberRoleOrder(account, unit)}; } ) diff --git a/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs b/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs index d2c8eb7e..bbf66bd4 100644 --- a/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs @@ -20,7 +20,7 @@ public DisplayNameUtilitiesTests() { mockUnitsDataService = new Mock(); Mock mockUnitsService = new Mock(); - mockUnitsService.Setup(x => x.Data()).Returns(mockUnitsDataService.Object); + mockUnitsService.Setup(x => x.Data).Returns(mockUnitsDataService.Object); ServiceCollection serviceProvider = new ServiceCollection(); serviceProvider.AddTransient(provider => mockDisplayNameService.Object); diff --git a/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs b/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs index c01bb72c..7fb0d9da 100644 --- a/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs @@ -5,6 +5,7 @@ using FluentAssertions; using MongoDB.Bson; using Moq; +using Newtonsoft.Json; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Utility; @@ -50,11 +51,29 @@ public async Task ShouldReturnCodeValue() { [Theory, InlineData(""), InlineData(null)] public async Task ShouldReturnEmptyStringWhenNoIdOrNull(string id) { - mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); + mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => new List().FirstOrDefault(x)); string subject = await confirmationCodeService.GetConfirmationCode(id); subject.Should().Be(string.Empty); } + + [Fact] + public async Task ShouldCancelScheduledJob() { + ConfirmationCode confirmationCode = new ConfirmationCode {value = "test"}; + List confirmationCodeData = new List {confirmationCode}; + string actionParameters = JsonConvert.SerializeObject(new object[] {confirmationCode.id}); + + ScheduledJob scheduledJob = new ScheduledJob {actionParameters = actionParameters}; + List subject = new List {scheduledJob}; + + mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => confirmationCodeData.FirstOrDefault(x)); + mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns(Task.CompletedTask).Callback>(x => subject.Remove(subject.FirstOrDefault(x))); + + await confirmationCodeService.GetConfirmationCode(confirmationCode.id); + + subject.Should().BeEmpty(); + } } } diff --git a/UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs b/UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs index 62e4e769..7a7d3f6a 100644 --- a/UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs +++ b/UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs @@ -18,8 +18,8 @@ public DisplayNameServiceTests() { Mock mockRanksService = new Mock(); Mock mockAccountService = new Mock(); - mockRanksService.Setup(x => x.Data()).Returns(mockRanksDataService.Object); - mockAccountService.Setup(x => x.Data()).Returns(mockAccountDataService.Object); + mockRanksService.Setup(x => x.Data).Returns(mockRanksDataService.Object); + mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); displayNameService = new DisplayNameService(mockRanksService.Object, mockAccountService.Object); } From 0e64ded20e641f7785d91ce8f84ad6d850176be7 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 17 Feb 2020 15:05:05 +0000 Subject: [PATCH 130/369] Added further tests cases for confirmation code service --- .editorconfig | 8 -- UKSF.Api.sln.DotSettings | 99 +++++++------------ .../Services/ConfirmationCodeServiceTests.cs | 97 +++++++++++++----- 3 files changed, 109 insertions(+), 95 deletions(-) diff --git a/.editorconfig b/.editorconfig index f15d1074..2f7e5847 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,14 +10,6 @@ end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true -[*.{c,cc,cpp,h,hh,hpp,cs}] -indent_size = 4 -indent_style = space - -[*.{cfg,ini}] -indent_size = 4 -indent_style = space - [*.json] indent_size = 4 indent_style = space diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index 2c72efce..1e9acae4 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -106,7 +106,7 @@ False False False - NEVER + IF_OWNER_IS_SINGLE_LINE False True ALWAYS @@ -139,7 +139,8 @@ CHOP_IF_LONG CHOP_IF_LONG CHOP_IF_LONG - <Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"> + <?xml version="1.0" encoding="utf-16"?> +<Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"> <TypePattern DisplayName="Non-reorderable types"> <TypePattern.Match> <Or> @@ -156,20 +157,32 @@ </Or> </TypePattern.Match> </TypePattern> - <TypePattern DisplayName="xUnit.net Test Classes" RemoveRegions="All"> <TypePattern.Match> <And> <Kind Is="Class" /> <HasMember> <And> - <Kind Is="Method"></Kind> + <Kind Is="Method" /> <HasAttribute Name="Xunit.FactAttribute" Inherited="True" /> </And> </HasMember> </And> </TypePattern.Match> - + <Entry DisplayName="Static Fields and Constants"> + <Entry.Match> + <Or> + <Kind Is="Constant" /> + <And> + <Kind Is="Field" /> + <Static /> + </And> + </Or> + </Entry.Match> + <Entry.SortBy> + <Kind Order="Constant Field" /> + </Entry.SortBy> + </Entry> <Entry DisplayName="Fields"> <Entry.Match> <And> @@ -179,115 +192,94 @@ </Not> </And> </Entry.Match> - <Entry.SortBy> <Readonly /> <Name /> </Entry.SortBy> </Entry> - <Entry DisplayName="Setup/Teardown Methods"> <Entry.Match> <Or> <Kind Is="Constructor" /> <And> - <Kind Is="Method"></Kind> - <ImplementsInterface Name="System.IDisposable"></ImplementsInterface> + <Kind Is="Method" /> + <ImplementsInterface Name="System.IDisposable" /> </And> </Or> </Entry.Match> - <Entry.SortBy> - <Kind> - <Kind.Order> - <DeclarationKind>Constructor</DeclarationKind> - </Kind.Order> - </Kind> + <Kind Order="Constructor" /> </Entry.SortBy> </Entry> - - <Entry DisplayName="All other members" /> - - <Entry DisplayName="Test Methods" Priority="100"> + <Entry Priority="100" DisplayName="Test Methods"> <Entry.Match> <And> <Kind Is="Method" /> - <HasAttribute Name="Xunit.FactAttribute" Inherited="false" /> + <HasAttribute Name="Xunit.FactAttribute" /> </And> </Entry.Match> - <Entry.SortBy> <Name /> </Entry.SortBy> </Entry> </TypePattern> - <TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"> <TypePattern.Match> <And> <Kind Is="Class" /> - <HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="true" /> + <HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /> </And> </TypePattern.Match> - <Entry DisplayName="Setup/Teardown Methods"> <Entry.Match> <And> <Kind Is="Method" /> <Or> - <HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="true" /> - <HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="true" /> - <HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="true" /> - <HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="true" /> + <HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /> + <HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /> + <HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /> + <HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /> </Or> </And> </Entry.Match> </Entry> - <Entry DisplayName="All other members" /> - - <Entry DisplayName="Test Methods" Priority="100"> + <Entry Priority="100" DisplayName="Test Methods"> <Entry.Match> <And> <Kind Is="Method" /> - <HasAttribute Name="NUnit.Framework.TestAttribute" Inherited="false" /> + <HasAttribute Name="NUnit.Framework.TestAttribute" /> </And> </Entry.Match> - <Entry.SortBy> <Name /> </Entry.SortBy> </Entry> </TypePattern> - <TypePattern DisplayName="Default Pattern"> - <Entry DisplayName="Public Delegates" Priority="100"> + <Entry Priority="100" DisplayName="Public Delegates"> <Entry.Match> <And> <Access Is="Public" /> <Kind Is="Delegate" /> </And> </Entry.Match> - <Entry.SortBy> <Name /> </Entry.SortBy> </Entry> - - <Entry DisplayName="Public Enums" Priority="100"> + <Entry Priority="100" DisplayName="Public Enums"> <Entry.Match> <And> <Access Is="Public" /> <Kind Is="Enum" /> </And> </Entry.Match> - <Entry.SortBy> <Name /> </Entry.SortBy> </Entry> - <Entry DisplayName="Static Fields and Constants"> <Entry.Match> <Or> @@ -298,17 +290,10 @@ </And> </Or> </Entry.Match> - <Entry.SortBy> - <Kind> - <Kind.Order> - <DeclarationKind>Constant</DeclarationKind> - <DeclarationKind>Field</DeclarationKind> - </Kind.Order> - </Kind> + <Kind Order="Constant Field" /> </Entry.SortBy> </Entry> - <Entry DisplayName="Fields"> <Entry.Match> <And> @@ -318,23 +303,19 @@ </Not> </And> </Entry.Match> - <Entry.SortBy> <Readonly /> <Name /> </Entry.SortBy> </Entry> - <Entry DisplayName="Constructors"> <Entry.Match> <Kind Is="Constructor" /> </Entry.Match> - <Entry.SortBy> - <Static/> + <Static /> </Entry.SortBy> </Entry> - <Entry DisplayName="Properties, Indexers"> <Entry.Match> <Or> @@ -343,30 +324,25 @@ </Or> </Entry.Match> </Entry> - - <Entry DisplayName="Interface Implementations" Priority="100"> + <Entry Priority="100" DisplayName="Interface Implementations"> <Entry.Match> <And> <Kind Is="Member" /> <ImplementsInterface /> </And> </Entry.Match> - <Entry.SortBy> - <ImplementsInterface Immediate="true" /> + <ImplementsInterface Immediate="True" /> </Entry.SortBy> </Entry> - <Entry DisplayName="All other members" /> - <Entry DisplayName="Nested Types"> <Entry.Match> <Kind Is="Type" /> </Entry.Match> </Entry> </TypePattern> -</Patterns> - +</Patterns> UseExplicitType UseExplicitType UseExplicitType @@ -374,6 +350,7 @@ False True False + True <Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /> <Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /> <Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /> diff --git a/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs b/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs index 7fb0d9da..915ef080 100644 --- a/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs @@ -14,9 +14,9 @@ namespace UKSF.Tests.Unit.Services { public class ConfirmationCodeServiceTests { + private readonly ConfirmationCodeService confirmationCodeService; private readonly Mock mockConfirmationCodeDataService; private readonly Mock mockSchedulerService; - private readonly ConfirmationCodeService confirmationCodeService; public ConfirmationCodeServiceTests() { mockConfirmationCodeDataService = new Mock(); @@ -24,56 +24,101 @@ public ConfirmationCodeServiceTests() { confirmationCodeService = new ConfirmationCodeService(mockConfirmationCodeDataService.Object, mockSchedulerService.Object); } - [Fact] - public async Task ShouldReturnValidCodeId() { + [Theory, InlineData(""), InlineData(null)] + public async Task ShouldReturnEmptyStringWhenNoIdOrNull(string id) { + mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())) + .Returns>(x => new List().FirstOrDefault(x)); + + string subject = await confirmationCodeService.GetConfirmationCode(id); + + subject.Should().Be(string.Empty); + } + + [Theory, InlineData(true, ScheduledJobType.INTEGRATION), InlineData(false, ScheduledJobType.NORMAL)] + public async Task ShouldUseCorrectScheduledJobType(bool integration, ScheduledJobType expectedJobType) { + ScheduledJobType subject = ScheduledJobType.LOG_PRUNE; + mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); - mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(Task.CompletedTask) + .Callback((_1, _2, x, _3, _4) => subject = x); - string id = await confirmationCodeService.CreateConfirmationCode("test"); + await confirmationCodeService.CreateConfirmationCode("test", integration); - id.Should().HaveLength(24); - ObjectId.TryParse(id, out ObjectId _).Should().BeTrue(); + subject.Should().Be(expectedJobType); } [Fact] - public async Task ShouldReturnCodeValue() { + public async Task ShouldCancelScheduledJob() { ConfirmationCode confirmationCode = new ConfirmationCode {value = "test"}; List confirmationCodeData = new List {confirmationCode}; + string actionParameters = JsonConvert.SerializeObject(new object[] {confirmationCode.id}); + + ScheduledJob scheduledJob = new ScheduledJob {actionParameters = actionParameters}; + List subject = new List {scheduledJob}; mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => confirmationCodeData.FirstOrDefault(x)); - mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.RemoveAll(y => y.id == x)); - mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns>(x => Task.FromResult(new List().FirstOrDefault(x))); + mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback>(x => subject.Remove(subject.FirstOrDefault(x))); - string subject = await confirmationCodeService.GetConfirmationCode(confirmationCode.id); + await confirmationCodeService.GetConfirmationCode(confirmationCode.id); - subject.Should().Be("test"); + subject.Should().BeEmpty(); } - [Theory, InlineData(""), InlineData(null)] - public async Task ShouldReturnEmptyStringWhenNoIdOrNull(string id) { - mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => new List().FirstOrDefault(x)); + [Fact] + public async Task ShouldCreateConfirmationCode() { + List subject = new List(); - string subject = await confirmationCodeService.GetConfirmationCode(id); + mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject.Add(x)); + mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); - subject.Should().Be(string.Empty); + await confirmationCodeService.CreateConfirmationCode("test"); + + subject.Should().HaveCount(1); + subject.First().value.Should().Be("test"); } [Fact] - public async Task ShouldCancelScheduledJob() { + public async Task ShouldGetCorrectConfirmationCode() { + ConfirmationCode confirmationCode1 = new ConfirmationCode {value = "test1"}; + ConfirmationCode confirmationCode2 = new ConfirmationCode {value = "test2"}; + List confirmationCodeData = new List {confirmationCode1, confirmationCode2}; + + mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => confirmationCodeData.FirstOrDefault(x)); + mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.RemoveAll(y => y.id == x)); + mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns>(x => Task.FromResult(new List().FirstOrDefault(x))); + + string subject = await confirmationCodeService.GetConfirmationCode(confirmationCode2.id); + + subject.Should().Be("test2"); + } + + [Fact] + public async Task ShouldReturnCodeValue() { ConfirmationCode confirmationCode = new ConfirmationCode {value = "test"}; List confirmationCodeData = new List {confirmationCode}; - string actionParameters = JsonConvert.SerializeObject(new object[] {confirmationCode.id}); - - ScheduledJob scheduledJob = new ScheduledJob {actionParameters = actionParameters}; - List subject = new List {scheduledJob}; mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => confirmationCodeData.FirstOrDefault(x)); - mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask); - mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns(Task.CompletedTask).Callback>(x => subject.Remove(subject.FirstOrDefault(x))); + mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.RemoveAll(y => y.id == x)); + mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns>(x => Task.FromResult(new List().FirstOrDefault(x))); - await confirmationCodeService.GetConfirmationCode(confirmationCode.id); + string subject = await confirmationCodeService.GetConfirmationCode(confirmationCode.id); - subject.Should().BeEmpty(); + subject.Should().Be("test"); + } + + [Fact] + public async Task ShouldReturnValidCodeId() { + mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + + string id = await confirmationCodeService.CreateConfirmationCode("test"); + + id.Should().HaveLength(24); + ObjectId.TryParse(id, out ObjectId _).Should().BeTrue(); } } } From 5bdd5647341abba0c9126bd8473596cda20d3446 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 17 Feb 2020 22:07:39 +0000 Subject: [PATCH 131/369] Some cleanup, further tests. Changed scheduled jobs to use two different collections for api and integrations. --- UKSF.Api.Data/DataService.cs | 9 ++-- UKSF.Api.Interfaces/Data/IDataService.cs | 1 + .../Handlers/ICommandRequestEventHandler.cs | 2 +- .../Utility/IConfirmationCodeService.cs | 2 +- .../Utility/ISchedulerService.cs | 2 +- .../Message/Logging/BasicLogMessage.cs | 7 +-- UKSF.Api.Models/MongoObject.cs | 6 +-- UKSF.Api.Models/Utility/ConfirmationCode.cs | 5 +- UKSF.Api.Models/Utility/ScheduledJob.cs | 1 - UKSF.Api.Services/Fake/FakeDataService.cs | 2 + .../Utility/ConfirmationCodeService.cs | 13 +++-- UKSF.Api.Services/Utility/SchedulerService.cs | 13 +++-- .../Controllers/DiscordController.cs | 4 +- .../Controllers/SteamController.cs | 2 +- .../Common/ProcessUtilitiesTests.cs | 2 +- .../Services/ConfirmationCodeServiceTests.cs | 48 +++++++++++-------- 16 files changed, 66 insertions(+), 53 deletions(-) diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index e0daffb3..214bf9a9 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -15,9 +15,7 @@ public abstract class DataService : DataEventBacker, IDataServi protected DataService(IDataCollection dataCollection, IDataEventBus dataEventBus, string collectionName) : base(dataEventBus) { this.dataCollection = dataCollection; - - dataCollection.SetCollectionName(collectionName); - dataCollection.AssertCollectionExists(); + SetCollectionName(collectionName); } public virtual List Get() => dataCollection.Get(); @@ -52,5 +50,10 @@ public virtual async Task Delete(string id) { await dataCollection.Delete(id); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } + + public void SetCollectionName(string collectionName) { + dataCollection.SetCollectionName(collectionName); + dataCollection.AssertCollectionExists(); + } } } diff --git a/UKSF.Api.Interfaces/Data/IDataService.cs b/UKSF.Api.Interfaces/Data/IDataService.cs index c21c102f..9d993ce1 100644 --- a/UKSF.Api.Interfaces/Data/IDataService.cs +++ b/UKSF.Api.Interfaces/Data/IDataService.cs @@ -14,5 +14,6 @@ public interface IDataService : IDataEventBacker { Task Update(string id, string fieldName, object value); Task Update(string id, UpdateDefinition update); Task Delete(string id); + void SetCollectionName(string collectionName); } } diff --git a/UKSF.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs index a1f5c33a..acc61fa7 100644 --- a/UKSF.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs +++ b/UKSF.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs @@ -1,3 +1,3 @@ -namespace UKSF.Api.Interfaces.Events.Handlers { +namespace UKSF.Api.Interfaces.Events.Handlers { public interface ICommandRequestEventHandler : IEventHandler { } } diff --git a/UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs b/UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs index 47595afc..7c912821 100644 --- a/UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs +++ b/UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs @@ -3,7 +3,7 @@ namespace UKSF.Api.Interfaces.Utility { public interface IConfirmationCodeService : IDataBackedService { - Task CreateConfirmationCode(string value, bool integration = false); + Task CreateConfirmationCode(string value); Task GetConfirmationCode(string id); } } diff --git a/UKSF.Api.Interfaces/Utility/ISchedulerService.cs b/UKSF.Api.Interfaces/Utility/ISchedulerService.cs index 5b4116b9..0168fbdd 100644 --- a/UKSF.Api.Interfaces/Utility/ISchedulerService.cs +++ b/UKSF.Api.Interfaces/Utility/ISchedulerService.cs @@ -5,7 +5,7 @@ namespace UKSF.Api.Interfaces.Utility { public interface ISchedulerService : IDataBackedService { - void Load(bool integration = false); + void Load(bool integrations = false); Task Create(DateTime next, TimeSpan interval, ScheduledJobType type, string action, params object[] actionParameters); Task Cancel(Func predicate); } diff --git a/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs b/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs index cb428f78..8e359858 100644 --- a/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs +++ b/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs @@ -1,5 +1,4 @@ using System; -using MongoDB.Bson; namespace UKSF.Api.Models.Message.Logging { public enum LogLevel { @@ -11,9 +10,9 @@ public enum LogLevel { public class BasicLogMessage : MongoObject { public LogLevel level = LogLevel.INFO; public string message; - public DateTime timestamp; + public DateTime timestamp = DateTime.UtcNow; - protected BasicLogMessage() : this(DateTime.UtcNow) { } + protected BasicLogMessage() { } public BasicLogMessage(string text) : this() => message = text; @@ -28,7 +27,5 @@ public BasicLogMessage(Exception logException) : this() { message = logException.GetBaseException().ToString(); level = LogLevel.ERROR; } - - private BasicLogMessage(DateTime time) : base(ObjectId.GenerateNewId(time).ToString()) => timestamp = time; } } diff --git a/UKSF.Api.Models/MongoObject.cs b/UKSF.Api.Models/MongoObject.cs index 697cfed2..d0dc9822 100644 --- a/UKSF.Api.Models/MongoObject.cs +++ b/UKSF.Api.Models/MongoObject.cs @@ -3,10 +3,6 @@ namespace UKSF.Api.Models { public class MongoObject { - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; - - public MongoObject() => id = ObjectId.GenerateNewId().ToString(); - - public MongoObject(string id) => this.id = id; + [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id = ObjectId.GenerateNewId().ToString(); } } diff --git a/UKSF.Api.Models/Utility/ConfirmationCode.cs b/UKSF.Api.Models/Utility/ConfirmationCode.cs index 3eee261a..934a7ce1 100644 --- a/UKSF.Api.Models/Utility/ConfirmationCode.cs +++ b/UKSF.Api.Models/Utility/ConfirmationCode.cs @@ -1,8 +1,5 @@ -using System; - -namespace UKSF.Api.Models.Utility { +namespace UKSF.Api.Models.Utility { public class ConfirmationCode : MongoObject { - public DateTime timestamp = DateTime.UtcNow; public string value; } } diff --git a/UKSF.Api.Models/Utility/ScheduledJob.cs b/UKSF.Api.Models/Utility/ScheduledJob.cs index 2a67b361..a9a96072 100644 --- a/UKSF.Api.Models/Utility/ScheduledJob.cs +++ b/UKSF.Api.Models/Utility/ScheduledJob.cs @@ -5,7 +5,6 @@ public enum ScheduledJobType { NORMAL, TEAMSPEAK_SNAPSHOT, LOG_PRUNE, - INTEGRATION, DISCORD_VOTE_ANNOUNCEMENT } diff --git a/UKSF.Api.Services/Fake/FakeDataService.cs b/UKSF.Api.Services/Fake/FakeDataService.cs index 8faa9357..5d1efcad 100644 --- a/UKSF.Api.Services/Fake/FakeDataService.cs +++ b/UKSF.Api.Services/Fake/FakeDataService.cs @@ -24,6 +24,8 @@ public abstract class FakeDataService : IDataService { public Task Delete(string id) => Task.CompletedTask; + public void SetCollectionName(string collectionName) { } + public IObservable> EventBus() => new Subject>(); } } diff --git a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs index b261c457..8f95944b 100644 --- a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs +++ b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs @@ -11,15 +11,22 @@ public class ConfirmationCodeService : DataBackedService this.schedulerService = schedulerService; - public async Task CreateConfirmationCode(string value, bool integration = false) { + public async Task CreateConfirmationCode(string value) { + if (string.IsNullOrEmpty(value)) throw new ArgumentNullException(nameof(value), "Value for confirmation code cannot be null or empty"); ConfirmationCode code = new ConfirmationCode {value = value}; await Data.Add(code); - await schedulerService.Create(DateTime.Now.AddMinutes(30), TimeSpan.Zero, integration ? ScheduledJobType.INTEGRATION : ScheduledJobType.NORMAL, nameof(SchedulerActionHelper.DeleteExpiredConfirmationCode), code.id); + await schedulerService.Create( + DateTime.Now.AddMinutes(30), + TimeSpan.Zero, + ScheduledJobType.NORMAL, + nameof(SchedulerActionHelper.DeleteExpiredConfirmationCode), + code.id + ); return code.id; } public async Task GetConfirmationCode(string id) { - ConfirmationCode confirmationCode = Data.GetSingle(x => x.id == id); + ConfirmationCode confirmationCode = Data.GetSingle(id); if (confirmationCode == null) return string.Empty; await Data.Delete(confirmationCode.id); string actionParameters = JsonConvert.SerializeObject(new object[] {confirmationCode.id}); diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index 848afc58..26d2b84d 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -17,13 +17,16 @@ public class SchedulerService : DataBackedService, ISched public SchedulerService(ISchedulerDataService data, IHostEnvironment currentEnvironment) : base(data) => this.currentEnvironment = currentEnvironment; - public async void Load(bool integration = false) { - if (integration) { - Data.Get(x => x.type == ScheduledJobType.INTEGRATION).ForEach(Schedule); + public async void Load(bool integrations = false) { + if (integrations) { + Data.SetCollectionName("scheduledJobsIntegrations"); } else { - if (!currentEnvironment.IsDevelopment()) await AddUnique(); - Data.Get(x => x.type != ScheduledJobType.INTEGRATION).ForEach(Schedule); + if (!currentEnvironment.IsDevelopment()) { + await AddUnique(); + } } + + Data.Get().ForEach(Schedule); } public async Task Create(DateTime next, TimeSpan interval, ScheduledJobType type, string action, params object[] actionParameters) { diff --git a/UKSF.Integrations/Controllers/DiscordController.cs b/UKSF.Integrations/Controllers/DiscordController.cs index 58963f14..d472ff19 100644 --- a/UKSF.Integrations/Controllers/DiscordController.cs +++ b/UKSF.Integrations/Controllers/DiscordController.cs @@ -71,7 +71,7 @@ private async Task GetUrlParameters(string code, string redirectUrl) { string user = await response.Content.ReadAsStringAsync(); string id = JObject.Parse(user)["id"].ToString(); string username = JObject.Parse(user)["username"].ToString(); - + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bot", botToken); response = await client.PutAsync($"https://discord.com/api/guilds/{VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json")); string added = "true"; @@ -80,7 +80,7 @@ private async Task GetUrlParameters(string code, string redirectUrl) { added = "false"; } - string confirmationCode = await confirmationCodeService.CreateConfirmationCode(id, true); + string confirmationCode = await confirmationCodeService.CreateConfirmationCode(id); return $"validation={confirmationCode}&discordid={id}&added={added}"; } } diff --git a/UKSF.Integrations/Controllers/SteamController.cs b/UKSF.Integrations/Controllers/SteamController.cs index f4a16c79..d6d6d558 100644 --- a/UKSF.Integrations/Controllers/SteamController.cs +++ b/UKSF.Integrations/Controllers/SteamController.cs @@ -34,7 +34,7 @@ public SteamController(IConfirmationCodeService confirmationCodeService, IHostEn private async Task GetUrlParameters() { string[] idParts = HttpContext.User.Claims.First(claim => claim.Type == "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier").Value.Split('/'); string id = idParts[^1]; - string code = await confirmationCodeService.CreateConfirmationCode(id, true); + string code = await confirmationCodeService.CreateConfirmationCode(id); return $"validation={code}&steamid={id}"; } } diff --git a/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs b/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs index b8284320..da89e7bc 100644 --- a/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs @@ -35,7 +35,7 @@ public async Task ShouldRunTask() { const string NAME = "Test"; await ProcessUtilities.LaunchExternalProcess(NAME, "exit"); - TaskService.Instance.RootFolder.Tasks.First(x => x.Name == NAME).LastRunTime.Should().BeCloseTo(DateTime.Now, TimeSpan.FromSeconds(1)); + TaskService.Instance.RootFolder.Tasks.First(x => x.Name == NAME).LastRunTime.Should().BeCloseTo(DateTime.Now, TimeSpan.FromSeconds(2)); TaskService.Instance.RootFolder.DeleteTask(NAME, false); } diff --git a/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs b/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs index 915ef080..7c02ca41 100644 --- a/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs @@ -26,26 +26,34 @@ public ConfirmationCodeServiceTests() { [Theory, InlineData(""), InlineData(null)] public async Task ShouldReturnEmptyStringWhenNoIdOrNull(string id) { - mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())) - .Returns>(x => new List().FirstOrDefault(x)); + mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); string subject = await confirmationCodeService.GetConfirmationCode(id); subject.Should().Be(string.Empty); } - [Theory, InlineData(true, ScheduledJobType.INTEGRATION), InlineData(false, ScheduledJobType.NORMAL)] - public async Task ShouldUseCorrectScheduledJobType(bool integration, ScheduledJobType expectedJobType) { - ScheduledJobType subject = ScheduledJobType.LOG_PRUNE; + [Fact] + public async Task ShouldSetConfirmationCodeValue() { + ConfirmationCode subject = null; + + mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); + mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + + await confirmationCodeService.CreateConfirmationCode("test"); + subject.Should().NotBeNull(); + subject.value.Should().Be("test"); + } + + [Theory, InlineData(null), InlineData("")] + public void ShouldThrowForCreateWhenValueNullOrEmpty(string value) { mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); - mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(Task.CompletedTask) - .Callback((_1, _2, x, _3, _4) => subject = x); + mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); - await confirmationCodeService.CreateConfirmationCode("test", integration); + Func act = async () => await confirmationCodeService.CreateConfirmationCode(value); - subject.Should().Be(expectedJobType); + act.Should().Throw(); } [Fact] @@ -57,7 +65,7 @@ public async Task ShouldCancelScheduledJob() { ScheduledJob scheduledJob = new ScheduledJob {actionParameters = actionParameters}; List subject = new List {scheduledJob}; - mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => confirmationCodeData.FirstOrDefault(x)); + mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => confirmationCodeData.FirstOrDefault(y => y.id == x)); mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask); mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())) .Returns(Task.CompletedTask) @@ -70,15 +78,15 @@ public async Task ShouldCancelScheduledJob() { [Fact] public async Task ShouldCreateConfirmationCode() { - List subject = new List(); + ConfirmationCode subject = null; - mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject.Add(x)); + mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); await confirmationCodeService.CreateConfirmationCode("test"); - subject.Should().HaveCount(1); - subject.First().value.Should().Be("test"); + subject.Should().NotBeNull(); + subject.value.Should().Be("test"); } [Fact] @@ -87,7 +95,7 @@ public async Task ShouldGetCorrectConfirmationCode() { ConfirmationCode confirmationCode2 = new ConfirmationCode {value = "test2"}; List confirmationCodeData = new List {confirmationCode1, confirmationCode2}; - mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => confirmationCodeData.FirstOrDefault(x)); + mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => confirmationCodeData.FirstOrDefault(y => y.id == x)); mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.RemoveAll(y => y.id == x)); mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns>(x => Task.FromResult(new List().FirstOrDefault(x))); @@ -101,7 +109,7 @@ public async Task ShouldReturnCodeValue() { ConfirmationCode confirmationCode = new ConfirmationCode {value = "test"}; List confirmationCodeData = new List {confirmationCode}; - mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => confirmationCodeData.FirstOrDefault(x)); + mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => confirmationCodeData.FirstOrDefault(y => y.id == x)); mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.RemoveAll(y => y.id == x)); mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns>(x => Task.FromResult(new List().FirstOrDefault(x))); @@ -115,10 +123,10 @@ public async Task ShouldReturnValidCodeId() { mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); - string id = await confirmationCodeService.CreateConfirmationCode("test"); + string subject = await confirmationCodeService.CreateConfirmationCode("test"); - id.Should().HaveLength(24); - ObjectId.TryParse(id, out ObjectId _).Should().BeTrue(); + subject.Should().HaveLength(24); + ObjectId.TryParse(subject, out ObjectId _).Should().BeTrue(); } } } From c8ffba46c813f88a3074217146126c97225ffe24 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 21 Feb 2020 19:22:40 +0000 Subject: [PATCH 132/369] Further tests. Changed some data tests to only test the concerns of the class. Some cleanup. Fixed cached collection ordering. Added thread safety for cached collection modification --- .github/workflows/test.yml | 4 +- NuGet.Config | 1 + UKSF.Api.Data/CachedDataService.cs | 31 ++- UKSF.Api.Data/DataCollection.cs | 5 - UKSF.Api.Data/DataService.cs | 20 ++ UKSF.Api.Data/Game/GameServersDataService.cs | 4 +- .../Message/NotificationsDataService.cs | 14 +- .../Operations/OperationOrderDataService.cs | 15 +- .../Operations/OperationReportDataService.cs | 15 +- UKSF.Api.Data/Personnel/RanksDataService.cs | 5 +- UKSF.Api.Data/Personnel/RolesDataService.cs | 4 +- UKSF.Api.Data/Units/UnitsDataService.cs | 4 +- .../Data/Cached/INotificationsDataService.cs | 5 +- .../Data/Cached/IOperationOrderDataService.cs | 4 +- .../Cached/IOperationReportDataService.cs | 4 +- UKSF.Api.Interfaces/Data/IDataCollection.cs | 1 - UKSF.Api.Interfaces/Data/IDataService.cs | 3 + UKSF.Api.Services/Common/RankUtilities.cs | 11 - UKSF.Api.Services/Fake/FakeDataService.cs | 6 + UKSF.Api.Services/Personnel/RanksService.cs | 4 +- .../Personnel/RoleDefinitions.cs | 3 +- UKSF.Api.sln.DotSettings | 1 + UKSF.Api/Startup.cs | 2 +- UKSF.Common/ProcessUtilities.cs | 2 +- .../Common/ProcessUtilitiesTests.cs | 43 ---- .../Data/CachedDataServiceTests.cs | 228 ++++++++++++------ UKSF.Tests.Unit/Data/DataServiceTests.cs | 197 ++++++++------- .../OperationOrderDataServiceTests.cs | 50 ++++ .../OperationReportDataServiceTests.cs | 51 ++++ .../Personnel/DischargeDataServiceTests.cs | 32 +++ .../Data/Personnel/RanksDataServiceTests.cs | 16 +- .../Data/Personnel/RolesDataServiceTests.cs | 10 +- .../Data/Units/UnitsDataServiceTests.cs | 31 +++ .../Services/Common/RankUtilitiesTests.cs | 43 ---- .../Services/Personnel/RoleAttributeTests.cs | 16 ++ .../Services/Personnel/RolesServiceTests.cs | 8 +- .../ConfirmationCodeServiceTests.cs | 2 +- UKSF.Tests.Unit/UKSF.Tests.Unit.csproj | 10 +- 38 files changed, 542 insertions(+), 363 deletions(-) delete mode 100644 UKSF.Api.Services/Common/RankUtilities.cs delete mode 100644 UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs create mode 100644 UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs create mode 100644 UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs create mode 100644 UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs create mode 100644 UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs delete mode 100644 UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs create mode 100644 UKSF.Tests.Unit/Services/Personnel/RoleAttributeTests.cs rename UKSF.Tests.Unit/Services/{ => Utility}/ConfirmationCodeServiceTests.cs (99%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3f3a1a5e..a1c7a4b2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,10 +17,8 @@ jobs: uses: actions/setup-dotnet@v1.4.0 with: dotnet-version: 3.1.101 - - name: Build with dotnet - run: dotnet build -c Release - name: Run tests with coverage - run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info /p:Exclude="[UKSF.Api.Signalr]*%2c[UKSF.PostMessage]*" + run: dotnet test ./UKSF.Api.sln /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info /p:Exclude="[UKSF.Api.Signalr]*%2c[UKSF.PostMessage]*" - name: Coveralls uses: coverallsapp/github-action@master with: diff --git a/NuGet.Config b/NuGet.Config index acd3bb9e..4f82a27b 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -7,6 +7,7 @@ + diff --git a/UKSF.Api.Data/CachedDataService.cs b/UKSF.Api.Data/CachedDataService.cs index f9486653..4ee58d84 100644 --- a/UKSF.Api.Data/CachedDataService.cs +++ b/UKSF.Api.Data/CachedDataService.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSF.Api.Events; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; @@ -11,10 +10,18 @@ namespace UKSF.Api.Data { public abstract class CachedDataService : DataService { - public List Collection { get; protected set; } + private List collection; + private readonly object lockObject = new object(); protected CachedDataService(IDataCollection dataCollection, IDataEventBus dataEventBus, string collectionName) : base(dataCollection, dataEventBus, collectionName) { } + public List Collection { + get => collection; + protected set { + lock (lockObject) collection = value; + } + } + // ReSharper disable once MemberCanBeProtected.Global - Used in dynamic call, do not change to protected! // TODO: Stop using this in dynamic call, switch to register or something less........dynamic public void Refresh() { Collection = null; @@ -63,12 +70,32 @@ public override async Task Update(string id, UpdateDefinition update) { CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } + public override async Task UpdateMany(Func predicate, UpdateDefinition update) { + List items = Get(predicate); + await base.UpdateMany(predicate, update); + Refresh(); + items.ForEach(x => CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); + } + + public override async Task Replace(T item) { + await base.Replace(item); + Refresh(); + CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, item.GetIdValue())); + } + public override async Task Delete(string id) { await base.Delete(id); Refresh(); CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } + public override async Task DeleteMany(Func predicate) { + List items = Get(predicate); + await base.DeleteMany(predicate); + Refresh(); + items.ForEach(x => CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, x.GetIdValue()))); + } + protected virtual void CachedDataEvent(DataEventModel dataEvent) { base.DataEvent(dataEvent); } diff --git a/UKSF.Api.Data/DataCollection.cs b/UKSF.Api.Data/DataCollection.cs index d2bc834a..94ac4e26 100644 --- a/UKSF.Api.Data/DataCollection.cs +++ b/UKSF.Api.Data/DataCollection.cs @@ -42,11 +42,6 @@ public async Task Add(string collection, T data) { await GetCollection().InsertOneAsync(data); } - public async Task Update(string id, string fieldName, object value) { - UpdateDefinition update = value == null ? Builders.Update.Unset(fieldName) : Builders.Update.Set(fieldName, value); - await GetCollection().UpdateOneAsync(Builders.Filter.Eq("id", id), update); - } - public async Task Update(string id, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter await GetCollection().UpdateOneAsync(Builders.Filter.Eq("id", id), update); } diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index 214bf9a9..1ebf88de 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -45,12 +45,32 @@ public virtual async Task Update(string id, UpdateDefinition update) { // TOD DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } + public virtual async Task UpdateMany(Func predicate, UpdateDefinition update) { + List items = Get(predicate); + if (items.Count == 0) throw new KeyNotFoundException("Could not find any items to update"); + await dataCollection.UpdateMany(x => predicate(x), update); + items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); + } + + public virtual async Task Replace(T item) { + if (GetSingle(x => x.GetIdValue() == item.GetIdValue()) == null) throw new KeyNotFoundException("Could not find item to replace"); + await dataCollection.Replace(item.GetIdValue(), item); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, item.GetIdValue())); + } + public virtual async Task Delete(string id) { if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); await dataCollection.Delete(id); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } + public virtual async Task DeleteMany(Func predicate) { + List items = Get(predicate); + if (items.Count == 0) throw new KeyNotFoundException("Could not find any items to delete"); + await dataCollection.DeleteMany(x => predicate(x)); + items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, x.GetIdValue()))); + } + public void SetCollectionName(string collectionName) { dataCollection.SetCollectionName(collectionName); dataCollection.AssertCollectionExists(); diff --git a/UKSF.Api.Data/Game/GameServersDataService.cs b/UKSF.Api.Data/Game/GameServersDataService.cs index 83fe7c80..846fb30c 100644 --- a/UKSF.Api.Data/Game/GameServersDataService.cs +++ b/UKSF.Api.Data/Game/GameServersDataService.cs @@ -10,9 +10,7 @@ public class GameServersDataService : CachedDataService dataEventBus) : base(dataCollection, dataEventBus, "gameServers") { } public override List Get() { - base.Get(); - Collection = Collection.OrderBy(x => x.order).ToList(); - return Collection; + return base.Get().OrderBy(x => x.order).ToList(); } } } diff --git a/UKSF.Api.Data/Message/NotificationsDataService.cs b/UKSF.Api.Data/Message/NotificationsDataService.cs index 59f781ce..159d7bc1 100644 --- a/UKSF.Api.Data/Message/NotificationsDataService.cs +++ b/UKSF.Api.Data/Message/NotificationsDataService.cs @@ -8,18 +8,6 @@ namespace UKSF.Api.Data.Message { public class NotificationsDataService : CachedDataService, INotificationsDataService { - private readonly IDataCollection dataCollection; - - public NotificationsDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "notifications") => this.dataCollection = dataCollection; - - public async Task UpdateMany(Func predicate, UpdateDefinition update) { - await dataCollection.UpdateMany(x => predicate(x), update); - Refresh(); - } - - public async Task DeleteMany(Func predicate) { - await dataCollection.DeleteMany(x => predicate(x)); - Refresh(); - } + public NotificationsDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "notifications") { } } } diff --git a/UKSF.Api.Data/Operations/OperationOrderDataService.cs b/UKSF.Api.Data/Operations/OperationOrderDataService.cs index 0fdec895..5fe2145d 100644 --- a/UKSF.Api.Data/Operations/OperationOrderDataService.cs +++ b/UKSF.Api.Data/Operations/OperationOrderDataService.cs @@ -1,5 +1,5 @@ -using System.Collections.Generic; -using System.Threading.Tasks; +using System; +using System.Collections.Generic; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; @@ -7,9 +7,7 @@ namespace UKSF.Api.Data.Operations { public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { - private readonly IDataCollection dataCollection; - - public OperationOrderDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "opord") => this.dataCollection = dataCollection; + public OperationOrderDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "opord") { } public override List Get() { List reversed = new List(base.Get()); @@ -17,9 +15,10 @@ public override List Get() { return reversed; } - public async Task Replace(Opord opord) { - await dataCollection.Replace(opord.id, opord); - Refresh(); + public override List Get(Func predicate) { + List reversed = new List(base.Get(predicate)); + reversed.Reverse(); + return reversed; } } } diff --git a/UKSF.Api.Data/Operations/OperationReportDataService.cs b/UKSF.Api.Data/Operations/OperationReportDataService.cs index 7f620730..b9c5963c 100644 --- a/UKSF.Api.Data/Operations/OperationReportDataService.cs +++ b/UKSF.Api.Data/Operations/OperationReportDataService.cs @@ -1,5 +1,5 @@ -using System.Collections.Generic; -using System.Threading.Tasks; +using System; +using System.Collections.Generic; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; @@ -7,9 +7,7 @@ namespace UKSF.Api.Data.Operations { public class OperationReportDataService : CachedDataService, IOperationReportDataService { - private readonly IDataCollection dataCollection; - - public OperationReportDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "oprep") => this.dataCollection = dataCollection; + public OperationReportDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "oprep") { } public override List Get() { List reversed = new List(base.Get()); @@ -17,9 +15,10 @@ public override List Get() { return reversed; } - public async Task Replace(Oprep request) { - await dataCollection.Replace(request.id, request); - Refresh(); + public override List Get(Func predicate) { + List reversed = new List(base.Get(predicate)); + reversed.Reverse(); + return reversed; } } } diff --git a/UKSF.Api.Data/Personnel/RanksDataService.cs b/UKSF.Api.Data/Personnel/RanksDataService.cs index a22aa34f..5f9f7178 100644 --- a/UKSF.Api.Data/Personnel/RanksDataService.cs +++ b/UKSF.Api.Data/Personnel/RanksDataService.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; @@ -10,9 +11,7 @@ public class RanksDataService : CachedDataService, IRan public RanksDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "ranks") { } public override List Get() { - base.Get(); - Collection.Sort(RankUtilities.Sort); - return Collection; + return base.Get().OrderBy(x => x.order).ToList(); } public override Rank GetSingle(string name) => GetSingle(x => x.name == name); diff --git a/UKSF.Api.Data/Personnel/RolesDataService.cs b/UKSF.Api.Data/Personnel/RolesDataService.cs index 6a6afa7a..cbb05247 100644 --- a/UKSF.Api.Data/Personnel/RolesDataService.cs +++ b/UKSF.Api.Data/Personnel/RolesDataService.cs @@ -10,9 +10,7 @@ public class RolesDataService : CachedDataService, IRol public RolesDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "roles") { } public override List Get() { - base.Get(); - Collection = Collection.OrderBy(x => x.name).ToList(); - return Collection; + return base.Get().OrderBy(x => x.name).ToList(); } public override Role GetSingle(string name) => GetSingle(x => x.name == name); diff --git a/UKSF.Api.Data/Units/UnitsDataService.cs b/UKSF.Api.Data/Units/UnitsDataService.cs index 1cf71e45..9be65c65 100644 --- a/UKSF.Api.Data/Units/UnitsDataService.cs +++ b/UKSF.Api.Data/Units/UnitsDataService.cs @@ -10,9 +10,7 @@ public class UnitsDataService : CachedDataService, IUni public UnitsDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "units") { } public override List Get() { - base.Get(); - Collection = Collection.OrderBy(x => x.order).ToList(); - return Collection; + return base.Get().OrderBy(x => x.order).ToList(); } } } diff --git a/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs index ba9456ea..4ce4f7a6 100644 --- a/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs @@ -4,8 +4,5 @@ using UKSF.Api.Models.Message; namespace UKSF.Api.Interfaces.Data.Cached { - public interface INotificationsDataService : IDataService { - Task UpdateMany(Func predicate, UpdateDefinition update); - Task DeleteMany(Func predicate); - } + public interface INotificationsDataService : IDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs index 9785a414..eed1044d 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs @@ -2,7 +2,5 @@ using UKSF.Api.Models.Operations; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IOperationOrderDataService : IDataService { - Task Replace(Opord opord); - } + public interface IOperationOrderDataService : IDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs index 561179e3..31ee6c46 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs @@ -2,7 +2,5 @@ using UKSF.Api.Models.Operations; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IOperationReportDataService : IDataService { - Task Replace(Oprep oprep); - } + public interface IOperationReportDataService : IDataService { } } diff --git a/UKSF.Api.Interfaces/Data/IDataCollection.cs b/UKSF.Api.Interfaces/Data/IDataCollection.cs index 6ee3b435..36cb047a 100644 --- a/UKSF.Api.Interfaces/Data/IDataCollection.cs +++ b/UKSF.Api.Interfaces/Data/IDataCollection.cs @@ -14,7 +14,6 @@ public interface IDataCollection { T GetSingle(Func predicate); Task Add(T data); Task Add(string collection, T data); - Task Update(string id, string fieldName, object value); Task Update(string id, UpdateDefinition update); Task UpdateMany(Expression> predicate, UpdateDefinition update); Task Replace(string id, T value); diff --git a/UKSF.Api.Interfaces/Data/IDataService.cs b/UKSF.Api.Interfaces/Data/IDataService.cs index 9d993ce1..c52c4026 100644 --- a/UKSF.Api.Interfaces/Data/IDataService.cs +++ b/UKSF.Api.Interfaces/Data/IDataService.cs @@ -13,7 +13,10 @@ public interface IDataService : IDataEventBacker { Task Add(T data); Task Update(string id, string fieldName, object value); Task Update(string id, UpdateDefinition update); + Task UpdateMany(Func predicate, UpdateDefinition update); + Task Replace(T item); Task Delete(string id); + Task DeleteMany(Func predicate); void SetCollectionName(string collectionName); } } diff --git a/UKSF.Api.Services/Common/RankUtilities.cs b/UKSF.Api.Services/Common/RankUtilities.cs deleted file mode 100644 index fa5a5b66..00000000 --- a/UKSF.Api.Services/Common/RankUtilities.cs +++ /dev/null @@ -1,11 +0,0 @@ -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Services.Common { - public static class RankUtilities { - public static int Sort(Rank rankA, Rank rankB) { - int rankOrderA = rankA?.order ?? int.MaxValue; - int rankOrderB = rankB?.order ?? int.MaxValue; - return rankOrderA < rankOrderB ? -1 : rankOrderA > rankOrderB ? 1 : 0; - } - } -} diff --git a/UKSF.Api.Services/Fake/FakeDataService.cs b/UKSF.Api.Services/Fake/FakeDataService.cs index 5d1efcad..0f92739c 100644 --- a/UKSF.Api.Services/Fake/FakeDataService.cs +++ b/UKSF.Api.Services/Fake/FakeDataService.cs @@ -22,8 +22,14 @@ public abstract class FakeDataService : IDataService { public Task Update(string id, UpdateDefinition update) => Task.CompletedTask; + public Task UpdateMany(Func predicate, UpdateDefinition update) => Task.CompletedTask; + + public Task Replace(T item) => Task.CompletedTask; + public Task Delete(string id) => Task.CompletedTask; + public Task DeleteMany(Func predicate) => Task.CompletedTask; + public void SetCollectionName(string collectionName) { } public IObservable> EventBus() => new Subject>(); diff --git a/UKSF.Api.Services/Personnel/RanksService.cs b/UKSF.Api.Services/Personnel/RanksService.cs index 6b5aa817..ca42e74a 100644 --- a/UKSF.Api.Services/Personnel/RanksService.cs +++ b/UKSF.Api.Services/Personnel/RanksService.cs @@ -16,7 +16,9 @@ public int GetRankIndex(string rankName) { public int Sort(string nameA, string nameB) { Rank rankA = Data.GetSingle(nameA); Rank rankB = Data.GetSingle(nameB); - return RankUtilities.Sort(rankA, rankB); + int rankOrderA = rankA?.order ?? int.MaxValue; + int rankOrderB = rankB?.order ?? int.MaxValue; + return rankOrderA < rankOrderB ? -1 : rankOrderA > rankOrderB ? 1 : 0; } public bool IsSuperior(string nameA, string nameB) { diff --git a/UKSF.Api.Services/Personnel/RoleDefinitions.cs b/UKSF.Api.Services/Personnel/RoleDefinitions.cs index 9d186aa0..c792f6be 100644 --- a/UKSF.Api.Services/Personnel/RoleDefinitions.cs +++ b/UKSF.Api.Services/Personnel/RoleDefinitions.cs @@ -1,3 +1,4 @@ +using System.Linq; using Microsoft.AspNetCore.Authorization; namespace UKSF.Api.Services.Personnel { @@ -16,6 +17,6 @@ public static class RoleDefinitions { } public class RolesAttribute : AuthorizeAttribute { - public RolesAttribute(params string[] roles) => Roles = string.Join(",", roles); + public RolesAttribute(params string[] roles) => Roles = string.Join(",", roles.Distinct()); } } diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index 1e9acae4..672d1f76 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -114,6 +114,7 @@ ON_SINGLE_LINE ON_SINGLE_LINE True + True END_OF_LINE diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 537d2c5d..1497596e 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -227,7 +227,7 @@ public static void RegisterServices(this IServiceCollection services, IConfigura // Global Singletons services.AddSingleton(configuration); services.AddSingleton(currentEnvironment); - services.AddSingleton(_ => MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); + services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/UKSF.Common/ProcessUtilities.cs b/UKSF.Common/ProcessUtilities.cs index c11f5feb..952bdc7a 100644 --- a/UKSF.Common/ProcessUtilities.cs +++ b/UKSF.Common/ProcessUtilities.cs @@ -6,6 +6,7 @@ using Task = System.Threading.Tasks.Task; namespace UKSF.Common { + [ExcludeFromCodeCoverage] public static class ProcessUtilities { private const int SC_CLOSE = 0xF060; private const int WM_SYSCOMMAND = 0x0112; @@ -37,7 +38,6 @@ public static async Task LaunchExternalProcess(string name, string command) { await Task.Delay(TimeSpan.FromSeconds(1)); } - [ExcludeFromCodeCoverage] public static async Task CloseProcessGracefully(this Process process) { // UKSF.PostMessage exe location should be set as a PATH variable await LaunchExternalProcess("CloseProcess", $"start \"\" \"UKSF.PostMessage\" {process.ProcessName} {WM_SYSCOMMAND} {SC_CLOSE} 0"); diff --git a/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs b/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs deleted file mode 100644 index da89e7bc..00000000 --- a/UKSF.Tests.Unit/Common/ProcessUtilitiesTests.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Diagnostics; -using System.Linq; -using FluentAssertions; -using Microsoft.Win32.TaskScheduler; -using UKSF.Common; -using Xunit; -using Task = System.Threading.Tasks.Task; - -namespace UKSF.Tests.Unit.Common { - public class ProcessUtilitiesTests { - [Fact] - public void ShouldLaunchManagedProcess() { - int processId = ProcessUtilities.LaunchManagedProcess("cmd", "/C timeout 1"); - - Process subject = Process.GetProcessById(processId); - - subject.Id.Should().Be(processId); - - subject.Kill(); - } - - [Fact] - public async Task ShouldCreateTask() { - const string NAME = "Test"; - await ProcessUtilities.LaunchExternalProcess(NAME, "exit"); - - TaskService.Instance.RootFolder.Tasks.Should().Contain(x => x.Name == NAME); - - TaskService.Instance.RootFolder.DeleteTask(NAME, false); - } - - [Fact] - public async Task ShouldRunTask() { - const string NAME = "Test"; - await ProcessUtilities.LaunchExternalProcess(NAME, "exit"); - - TaskService.Instance.RootFolder.Tasks.First(x => x.Name == NAME).LastRunTime.Should().BeCloseTo(DateTime.Now, TimeSpan.FromSeconds(2)); - - TaskService.Instance.RootFolder.DeleteTask(NAME, false); - } - } -} diff --git a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs index be52076c..b4630759 100644 --- a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs @@ -1,5 +1,7 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; +using System.Linq.Expressions; using System.Threading.Tasks; using FluentAssertions; using MongoDB.Driver; @@ -11,156 +13,232 @@ namespace UKSF.Tests.Unit.Data { public class CachedDataServiceTests { + private readonly MockCachedDataService mockCachedDataService; private readonly Mock mockDataCollection; - private readonly Mock> mockDataEventBus; private List mockCollection; public CachedDataServiceTests() { mockDataCollection = new Mock(); - mockDataEventBus = new Mock>(); + Mock> mockDataEventBus = new Mock>(); + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = null); + mockDataCollection.Setup(x => x.SetCollectionName(It.IsAny())); mockDataEventBus.Setup(x => x.Send(It.IsAny>())); - mockDataCollection.Setup(x => x.SetCollectionName(It.IsAny())); + mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); } - [Theory, InlineData(""), InlineData(null)] - public void ShouldGetNothingWhenNoIdOrNull(string id) { - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + [Fact] + public void ShouldCacheCollectionForGet() { + mockCollection = new List(); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - MockCachedDataService mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - MockDataModel subject = mockCachedDataService.GetSingle(id); + mockCachedDataService.Collection.Should().BeNull(); + + mockCachedDataService.Get(); - subject.Should().Be(null); + mockCachedDataService.Collection.Should().NotBeNull(); + mockCachedDataService.Collection.Should().BeSameAs(mockCollection); } [Fact] - public async Task ShouldAddItem() { - MockDataModel item1 = new MockDataModel {Name = "1"}; + public void ShouldCacheCollectionForGetByPredicate() { + MockDataModel item1 = new MockDataModel { Name = "1" }; + MockDataModel item2 = new MockDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.Add(It.IsAny())).Callback(x => mockCollection.Add(x)); - MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - await subject.Add(item1); + List subject = mockCachedDataService.Get(x => x.Name == "1"); - subject.Collection.Should().Contain(item1); + mockCachedDataService.Collection.Should().NotBeNull(); + subject.Should().BeSubsetOf(mockCachedDataService.Collection); } [Fact] - public async Task ShouldDeleteItem() { - MockDataModel item1 = new MockDataModel {Name = "1"}; - MockDataModel item2 = new MockDataModel {Name = "2"}; + public void ShouldCacheCollectionForGetSingle() { + MockDataModel item1 = new MockDataModel { Name = "1" }; + MockDataModel item2 = new MockDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.Delete(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); - MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - await subject.Delete(item1.id); + MockDataModel subject = mockCachedDataService.GetSingle(item2.id); - subject.Collection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); + mockCachedDataService.Collection.Should().NotBeNull(); + mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + subject.Should().Be(item2); } [Fact] - public void ShouldGetCachedItem() { - MockDataModel item1 = new MockDataModel {Name = "1"}; + public void ShouldCacheCollectionForGetSingleByPredicate() { + MockDataModel item1 = new MockDataModel { Name = "1" }; + MockDataModel item2 = new MockDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - MockCachedDataService mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - MockDataModel subject = mockCachedDataService.GetSingle(item1.id); + MockDataModel subject = mockCachedDataService.GetSingle(x => x.Name == "2"); - subject.Should().Be(item1); + mockCachedDataService.Collection.Should().NotBeNull(); + mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + subject.Should().Be(item2); } [Fact] - public void ShouldGetCachedItemByPredicate() { - MockDataModel item1 = new MockDataModel {Name = "1"}; - string id = item1.id; + public void ShouldCacheCollectionForRefreshWhenNull() { + mockCollection = new List(); - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - MockCachedDataService mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - MockDataModel subject = mockCachedDataService.GetSingle(x => x.id == id); + mockCachedDataService.Collection.Should().BeNull(); + + mockCachedDataService.Refresh(); - subject.Should().Be(item1); + mockCachedDataService.Collection.Should().NotBeNull(); + mockCachedDataService.Collection.Should().BeSameAs(mockCollection); } [Fact] - public void ShouldGetCachedItems() { - MockDataModel item1 = new MockDataModel {Name = "1"}; + public void ShouldGetCachedCollection() { + mockCollection = new List(); - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - MockCachedDataService mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - mockCachedDataService.Refresh(); - List subject = mockCachedDataService.Get(); + mockCachedDataService.Collection.Should().BeNull(); + + List subject1 = mockCachedDataService.Get(); + + subject1.Should().NotBeNull(); + subject1.Should().BeSameAs(mockCollection); - subject.Should().BeSameAs(mockCollection); + List subject2 = mockCachedDataService.Get(); + + subject2.Should().NotBeNull(); + subject2.Should().BeSameAs(mockCollection).And.BeSameAs(subject1); } [Fact] - public void ShouldGetCachedItemsByPredicate() { - MockDataModel item1 = new MockDataModel {Name = "1"}; - MockDataModel item2 = new MockDataModel {Name = "2"}; + public async Task ShouldRefreshCollectionForAdd() { + MockDataModel item1 = new MockDataModel { Name = "1" }; + mockCollection = new List(); - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Add(It.IsAny())).Callback(x => mockCollection.Add(x)); - MockCachedDataService mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - List subject = mockCachedDataService.Get(x => x.Name == "1"); + mockCachedDataService.Collection.Should().BeNull(); + + await mockCachedDataService.Add(item1); - subject.Should().Contain(item1); + mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.Should().Contain(item1); } [Fact] - public void ShouldRefreshCollection() { - MockDataModel item1 = new MockDataModel {Name = "1"}; - MockDataModel item2 = new MockDataModel {Name = "1"}; + public async Task ShouldRefreshCollectionForDelete() { + MockDataModel item1 = new MockDataModel { Name = "1" }; + MockDataModel item2 = new MockDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Delete(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); - MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - mockCollection.Add(item2); + await mockCachedDataService.Delete(item1.id); - subject.Refresh(); - subject.Collection.Should().Contain(item1); - subject.Collection.Should().Contain(item2); + mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); } [Fact] - public async Task ShouldUpdateItemValue() { - MockDataModel item1 = new MockDataModel {Name = "1"}; + public async Task ShouldRefreshCollectionForDeleteMany() { + MockDataModel item1 = new MockDataModel { Name = "1" }; + MockDataModel item2 = new MockDataModel { Name = "1" }; + MockDataModel item3 = new MockDataModel { Name = "3" }; + mockCollection = new List { item1, item2, item3 }; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + mockDataCollection.Setup(x => x.DeleteMany(It.IsAny>>())) + .Returns(Task.CompletedTask) + .Callback((Expression> expression) => mockCollection.RemoveAll(x => mockCollection.Where(expression.Compile()).Contains(x))); - MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - await subject.Update(item1.id, "Name", "2"); + await mockCachedDataService.DeleteMany(x => x.Name == "1"); - subject.Collection.First().Name.Should().Be("2"); + mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.Should().HaveCount(1); + mockCachedDataService.Collection.Should().Contain(item3); } [Fact] - public async Task ShouldUpdateItemValueByUpdateDefinition() { - MockDataModel item1 = new MockDataModel {Name = "1"}; + public async Task ShouldRefreshCollectionForReplace() { + MockDataModel item1 = new MockDataModel { Name = "1" }; + MockDataModel item2 = new MockDataModel { id = item1.id, Name = "2" }; + mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + mockDataCollection.Setup(x => x.Replace(It.IsAny(), It.IsAny())) + .Returns(Task.CompletedTask) + .Callback((string id, MockDataModel value) => mockCollection[mockCollection.FindIndex(x => x.id == id)] = value); - MockCachedDataService subject = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - await subject.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); + await mockCachedDataService.Replace(item2); - subject.Collection.First().Name.Should().Be("2"); + mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.First().Name.Should().Be("2"); + } + + [Fact] + public async Task ShouldRefreshCollectionForUpdate() { + MockDataModel item1 = new MockDataModel { Name = "1" }; + mockCollection = new List { item1 }; + + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + + await mockCachedDataService.Update(item1.id, "Name", "2"); + + mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.First().Name.Should().Be("2"); + } + + [Fact] + public async Task ShouldRefreshCollectionForUpdateByUpdateDefinition() { + MockDataModel item1 = new MockDataModel { Name = "1" }; + mockCollection = new List { item1 }; + + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + + await mockCachedDataService.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); + + mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.First().Name.Should().Be("2"); + } + + [Fact] + public async Task ShouldRefreshCollectionForUpdateMany() { + MockDataModel item1 = new MockDataModel { Name = "1" }; + MockDataModel item2 = new MockDataModel { Name = "1" }; + MockDataModel item3 = new MockDataModel { Name = "3" }; + mockCollection = new List { item1, item2, item3 }; + + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.UpdateMany(It.IsAny>>(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback( + (Expression> expression, UpdateDefinition _) => + mockCollection.Where(expression.Compile()).ToList().ForEach(x => x.Name = "3") + ); + + await mockCachedDataService.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "3")); + + mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection[0].Name.Should().Be("3"); + mockCachedDataService.Collection[1].Name.Should().Be("3"); + mockCachedDataService.Collection[2].Name.Should().Be("3"); } } } diff --git a/UKSF.Tests.Unit/Data/DataServiceTests.cs b/UKSF.Tests.Unit/Data/DataServiceTests.cs index 8dc220d7..6a595b05 100644 --- a/UKSF.Tests.Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/DataServiceTests.cs @@ -14,121 +14,130 @@ namespace UKSF.Tests.Unit.Data { public class DataServiceTests { + private readonly Mock mockDataCollection; + private readonly Mock> mockDataEventBus; + private readonly MockDataService mockDataService; + private List mockCollection; + public DataServiceTests() { mockDataCollection = new Mock(); mockDataEventBus = new Mock>(); mockDataEventBus.Setup(x => x.Send(It.IsAny>())); - + mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); mockDataCollection.Setup(x => x.SetCollectionName(It.IsAny())); - } - private readonly Mock mockDataCollection; - private readonly Mock> mockDataEventBus; - private List mockCollection; + mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + } private static BsonValue Render(UpdateDefinition updateDefinition) => updateDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); + [Theory, InlineData(""), InlineData(null)] + public void ShouldThrowForDeleteWhenNoKeyOrNull(string id) { + + Func act = async () => await mockDataService.Delete(id); + + act.Should().Throw(); + } + [Fact] - public async Task ShouldAddItem() { - MockDataModel item1 = new MockDataModel {Name = "1"}; + public void ShouldThrowForDeleteManyWhenNoMatchingItems() { + mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); + Func act = async () => await mockDataService.DeleteMany(x => x.Name == "2"); - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); - mockDataCollection.Setup(x => x.Add(It.IsAny())).Callback(x => mockCollection.Add(x)); + act.Should().Throw(); + } - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - await mockDataService.Add(item1); + [Theory, InlineData(""), InlineData(null)] + public void ShouldGetNothingWhenNoKeyOrNull(string id) { + MockDataModel subject = mockDataService.GetSingle(id); - mockCollection.Should().Contain(item1); + subject.Should().Be(null); + } + + [Theory, InlineData(""), InlineData(null)] + public void ShouldThrowForUpdateWhenNoKeyOrNull(string id) { + Func act = async () => await mockDataService.Update(id, "Name", null); + + act.Should().Throw(); } [Fact] - public void ShouldThrowForAddWhenItemIsNull() { - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + public void ShouldThrowForReplaceWhenItemNotFound() { + MockDataModel item = new MockDataModel { Name = "1" }; - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - Func act = async () => await mockDataService.Add(null); + Func act = async () => await mockDataService.Replace(item); - act.Should().Throw(); + act.Should().Throw(); } [Fact] - public void ShouldCreateCollection() { - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + public void ShouldThrowForUpdateManyWhenNoMatchingItems() { + mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); + Func act = async () => await mockDataService.UpdateMany(x => x.Name == "2", Builders.Update.Set(x => x.Name, "3")); - mockCollection.Should().BeNull(); - MockDataService unused = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - mockCollection.Should().NotBeNull(); + act.Should().Throw(); + } + + [Theory, InlineData(""), InlineData(null)] + public void ShouldThrowForUpdateWithUpdateDefinitionWhenNoKeyOrNull(string id) { + Func act = async () => await mockDataService.Update(id, Builders.Update.Set(x => x.Name, "2")); + + act.Should().Throw(); } [Fact] - public async Task ShouldDeleteItem() { - MockDataModel item1 = new MockDataModel {Name = "1"}; - MockDataModel item2 = new MockDataModel {Name = "2"}; + public async Task ShouldAddItem() { + MockDataModel item1 = new MockDataModel { Name = "1" }; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); - mockDataCollection.Setup(x => x.Delete(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + mockDataCollection.Setup(x => x.Add(It.IsAny())).Callback(x => mockCollection.Add(x)); - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - await mockDataService.Delete(item1.id); + await mockDataService.Add(item1); - mockCollection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); + mockCollection.Should().Contain(item1); } - [Theory, InlineData(""), InlineData(null)] - public void ShouldThrowForDeleteWhenNoKeyOrNull(string id) { - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); + [Fact] + public async Task ShouldDeleteItem() { + MockDataModel item1 = new MockDataModel { Name = "1" }; + MockDataModel item2 = new MockDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - Func act = async () => await mockDataService.Delete(id); + mockDataCollection.Setup(x => x.Delete(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); - act.Should().Throw(); + await mockDataService.Delete(item1.id); + + mockCollection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); } [Fact] public void ShouldGetItem() { - MockDataModel item1 = new MockDataModel {Name = "1"}; + MockDataModel item1 = new MockDataModel { Name = "1" }; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); MockDataModel subject = mockDataService.GetSingle(item1.id); subject.Should().Be(item1); } - [Theory, InlineData(""), InlineData(null)] - public void ShouldGetNothingWhenNoKeyOrNull(string id) { - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); - - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - MockDataModel subject = mockDataService.GetSingle(id); - - subject.Should().Be(null); - } - [Fact] public void ShouldGetItemByPredicate() { - MockDataModel item1 = new MockDataModel {Name = "1"}; - MockDataModel item2 = new MockDataModel {Name = "2"}; - string id = item1.id; + MockDataModel item1 = new MockDataModel { Name = "1" }; + MockDataModel item2 = new MockDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.First(x)); - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - MockDataModel subject = mockDataService.GetSingle(x => x.id == id); + MockDataModel subject = mockDataService.GetSingle(x => x.id == item1.id); subject.Should().Be(item1); } [Fact] public void ShouldGetItems() { - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); List subject = mockDataService.Get(); subject.Should().BeSameAs(mockCollection); @@ -136,29 +145,28 @@ public void ShouldGetItems() { [Fact] public void ShouldGetItemsByPredicate() { - MockDataModel item1 = new MockDataModel {Name = "1"}; - MockDataModel item2 = new MockDataModel {Name = "2"}; - string id = item1.id; + MockDataModel item1 = new MockDataModel { Name = "1" }; + MockDataModel item2 = new MockDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1, item2}); mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockCollection.Where(x).ToList()); - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - List subject = mockDataService.Get(x => x.id == id); + List subject = mockDataService.Get(x => x.id == item1.id); subject.Should().HaveCount(1).And.Contain(item1); } [Fact] public async Task ShouldMakeSetUpdate() { - MockDataModel item1 = new MockDataModel {Name = "1"}; + MockDataModel item1 = new MockDataModel { Name = "1" }; + mockCollection = new List { item1 }; BsonValue expected = Render(Builders.Update.Set(x => x.Name, "2")); UpdateDefinition subject = null; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string x, UpdateDefinition y) => subject = y); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((string x, UpdateDefinition y) => subject = y); - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); await mockDataService.Update(item1.id, "Name", "2"); Render(subject).Should().BeEquivalentTo(expected); @@ -166,48 +174,46 @@ public async Task ShouldMakeSetUpdate() { [Fact] public async Task ShouldMakeUnsetUpdate() { - MockDataModel item1 = new MockDataModel {Name = "1"}; + MockDataModel item1 = new MockDataModel { Name = "1" }; + mockCollection = new List { item1 }; BsonValue expected = Render(Builders.Update.Unset(x => x.Name)); UpdateDefinition subject = null; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string x, UpdateDefinition y) => subject = y); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((string x, UpdateDefinition y) => subject = y); - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); await mockDataService.Update(item1.id, "Name", null); Render(subject).Should().BeEquivalentTo(expected); } - [Theory, InlineData(""), InlineData(null)] - public void ShouldThrowForUpdateWhenNoKeyOrNull(string id) { - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); - - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - Func act = async () => await mockDataService.Update(id, "Name", null); - - act.Should().Throw(); - } - [Fact] public void ShouldSetCollectionName() { string collectionName = ""; mockDataCollection.Setup(x => x.SetCollectionName(It.IsAny())).Callback((string x) => collectionName = x); - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); MockDataService unused = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); collectionName.Should().Be("test"); } + [Fact] + public void ShouldThrowForAddWhenItemIsNull() { + Func act = async () => await mockDataService.Add(null); + + act.Should().Throw(); + } + [Fact] public async Task ShouldUpdateItemValue() { - MockDataModel item1 = new MockDataModel {Name = "1"}; + MockDataModel item1 = new MockDataModel { Name = "1" }; + mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); await mockDataService.Update(item1.id, "Name", "2"); item1.Name.Should().Be("2"); @@ -215,25 +221,16 @@ public async Task ShouldUpdateItemValue() { [Fact] public async Task ShouldUpdateItemValueByUpdateDefinition() { - MockDataModel item1 = new MockDataModel {Name = "1"}; + MockDataModel item1 = new MockDataModel { Name = "1" }; + mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List {item1}); - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); await mockDataService.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); item1.Name.Should().Be("2"); } - - [Theory, InlineData(""), InlineData(null)] - public void ShouldThrowForUpdateWithUpdateDefinitionWhenNoKeyOrNull(string id) { - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); - - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - Func act = async () => await mockDataService.Update(id, Builders.Update.Set(x => x.Name, "2")); - - act.Should().Throw(); - } } } diff --git a/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs b/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs new file mode 100644 index 00000000..bafc2553 --- /dev/null +++ b/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs @@ -0,0 +1,50 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using FluentAssertions; +using Moq; +using UKSF.Api.Data.Operations; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Operations; +using Xunit; + +namespace UKSF.Tests.Unit.Data.Operations { + public class OperationOrderDataServiceTests { + private readonly Mock mockDataCollection; + private readonly OperationOrderDataService operationOrderDataService; + + public OperationOrderDataServiceTests() { + mockDataCollection = new Mock(); + Mock> mockDataEventBus = new Mock>(); + + operationOrderDataService = new OperationOrderDataService(mockDataCollection.Object, mockDataEventBus.Object); + } + + [Fact] + public void ShouldGetReversedCollection() { + Opord item1 = new Opord(); + Opord item2 = new Opord(); + Opord item3 = new Opord(); + + mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); + + List subject = operationOrderDataService.Get(); + + subject.Should().ContainInOrder(item3, item2, item1); + } + + [Fact] + public void ShouldGetReversedCollectionByPredicate() { + Opord item1 = new Opord { description = "1" }; + Opord item2 = new Opord { description = "2" }; + Opord item3 = new Opord { description = "3" }; + + mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); + + List subject = operationOrderDataService.Get(x => x.description != string.Empty); + + subject.Should().ContainInOrder(item3, item2, item1); + } + } +} diff --git a/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs b/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs new file mode 100644 index 00000000..853d6185 --- /dev/null +++ b/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs @@ -0,0 +1,51 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using FluentAssertions; +using Moq; +using UKSF.Api.Data.Operations; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Operations; +using Xunit; + +namespace UKSF.Tests.Unit.Data.Operations { + public class OperationReportDataServiceTests { + private readonly Mock mockDataCollection; + private readonly OperationReportDataService operationReportDataService; + + public OperationReportDataServiceTests() { + mockDataCollection = new Mock(); + Mock> mockDataEventBus = new Mock>(); + + operationReportDataService = new OperationReportDataService(mockDataCollection.Object, mockDataEventBus.Object); + } + + [Fact] + public void ShouldGetReversedCollection() { + Oprep item1 = new Oprep(); + Oprep item2 = new Oprep(); + Oprep item3 = new Oprep(); + + mockDataCollection.Setup(x => x.Get()).Returns(new List {item1, item2, item3}); + + List subject = operationReportDataService.Get(); + + subject.Should().ContainInOrder(item3, item2, item1); + } + + [Fact] + public void ShouldGetReversedCollectionByPredicate() { + Oprep item1 = new Oprep { description = "1" }; + Oprep item2 = new Oprep { description = "2" }; + Oprep item3 = new Oprep { description = "3" }; + + mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); + + List subject = operationReportDataService.Get(x => x.description != string.Empty); + + subject.Should().ContainInOrder(item3, item2, item1); + } + } +} diff --git a/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs new file mode 100644 index 00000000..4cc6ab11 --- /dev/null +++ b/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using FluentAssertions; +using Moq; +using UKSF.Api.Data.Personnel; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Personnel; +using Xunit; + +namespace UKSF.Tests.Unit.Data.Personnel { + public class DischargeDataServiceTests { + [Fact] + public void ShouldGetOrderedCollection() { + Mock mockDataCollection = new Mock(); + Mock> mockDataEventBus = new Mock>(); + + DischargeDataService dischargeDataService = new DischargeDataService(mockDataCollection.Object, mockDataEventBus.Object); + + DischargeCollection dischargeCollection1 = new DischargeCollection {discharges = new List {new Discharge {timestamp = DateTime.Now.AddDays(-3)}}}; + DischargeCollection dischargeCollection2 = new DischargeCollection {discharges = new List {new Discharge {timestamp = DateTime.Now.AddDays(-10)}, new Discharge {timestamp = DateTime.Now.AddDays(-1)}}}; + DischargeCollection dischargeCollection3 = new DischargeCollection {discharges = new List {new Discharge {timestamp = DateTime.Now.AddDays(-5)}, new Discharge {timestamp = DateTime.Now.AddDays(-2)}}}; + + mockDataCollection.Setup(x => x.Get()).Returns(new List {dischargeCollection1, dischargeCollection2, dischargeCollection3}); + + List subject = dischargeDataService.Get(); + + subject.Should().ContainInOrder(dischargeCollection2, dischargeCollection3, dischargeCollection1); + } + } +} diff --git a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs index 2d852120..d373287e 100644 --- a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs @@ -23,15 +23,14 @@ public RanksDataServiceTests() { [Fact] public void ShouldGetSortedCollection() { Rank rank1 = new Rank {name = "Private", order = 2}; - Rank rank2 = new Rank {name = "Recruit", order = 1}; - Rank rank3 = new Rank {name = "Candidate", order = 0}; - List mockCollection = new List {rank1, rank2, rank3}; + Rank rank2 = new Rank {name = "Recruit", order = 0}; + Rank rank3 = new Rank {name = "Candidate", order = 1}; - mockDataCollection.Setup(x => x.Get()).Returns(mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); List subject = ranksDataService.Get(); - subject.Should().ContainInOrder(rank3, rank2, rank1); + subject.Should().ContainInOrder(rank2, rank3, rank1); } [Fact] @@ -39,9 +38,8 @@ public void ShouldGetSingleByName() { Rank rank1 = new Rank {name = "Private", order = 2}; Rank rank2 = new Rank {name = "Recruit", order = 1}; Rank rank3 = new Rank {name = "Candidate", order = 0}; - List mockCollection = new List {rank1, rank2, rank3}; - mockDataCollection.Setup(x => x.Get()).Returns(mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); Rank subject = ranksDataService.GetSingle("Recruit"); @@ -50,9 +48,7 @@ public void ShouldGetSingleByName() { [Theory, InlineData(""), InlineData(null)] public void ShouldGetNothingWhenNoNameOrNull(string name) { - List mockCollection = new List(); - - mockDataCollection.Setup(x => x.Get()).Returns(mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(new List()); Rank subject = ranksDataService.GetSingle(name); diff --git a/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs index 6e3542ee..86e39647 100644 --- a/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs @@ -25,9 +25,8 @@ public void ShouldGetSortedCollection() { Role role1 = new Role {name = "Rifleman"}; Role role2 = new Role {name = "Trainee"}; Role role3 = new Role {name = "Marksman"}; - List mockCollection = new List {role1, role2, role3}; - mockDataCollection.Setup(x => x.Get()).Returns(mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(new List {role1, role2, role3}); List subject = rolesDataService.Get(); @@ -39,9 +38,8 @@ public void ShouldGetSingleByName() { Role role1 = new Role {name = "Rifleman"}; Role role2 = new Role {name = "Trainee"}; Role role3 = new Role {name = "Marksman"}; - List mockCollection = new List {role1, role2, role3}; - mockDataCollection.Setup(x => x.Get()).Returns(mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(new List {role1, role2, role3}); Role subject = rolesDataService.GetSingle("Trainee"); @@ -50,9 +48,7 @@ public void ShouldGetSingleByName() { [Theory, InlineData(""), InlineData(null)] public void ShouldGetNothingWhenNoName(string name) { - List mockCollection = new List(); - - mockDataCollection.Setup(x => x.Get()).Returns(mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(new List()); Role subject = rolesDataService.GetSingle(name); diff --git a/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs new file mode 100644 index 00000000..450808de --- /dev/null +++ b/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs @@ -0,0 +1,31 @@ +using System.Collections.Generic; +using FluentAssertions; +using Moq; +using UKSF.Api.Data.Units; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using Xunit; +using UUnit = UKSF.Api.Models.Units.Unit; + +namespace UKSF.Tests.Unit.Data.Units { + public class UnitsDataServiceTests { + [Fact] + public void ShouldGetOrderedCollection() { + Mock mockDataCollection = new Mock(); + Mock> mockDataEventBus = new Mock>(); + + UnitsDataService unitsDataService = new UnitsDataService(mockDataCollection.Object, mockDataEventBus.Object); + + UUnit rank1 = new UUnit {name = "Air Troop", order = 2}; + UUnit rank2 = new UUnit {name = "UKSF", order = 0}; + UUnit rank3 = new UUnit {name = "SAS", order = 1}; + + mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); + + List subject = unitsDataService.Get(); + + subject.Should().ContainInOrder(rank2, rank3, rank1); + } + } +} diff --git a/UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs b/UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs deleted file mode 100644 index 87f73087..00000000 --- a/UKSF.Tests.Unit/Services/Common/RankUtilitiesTests.cs +++ /dev/null @@ -1,43 +0,0 @@ -using FluentAssertions; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Common; -using Xunit; - -namespace UKSF.Tests.Unit.Services.Common { - public class RankUtilitiesTests { - [Fact] - public void ShouldReturnCorrectSortValue() { - Rank rank1 = new Rank {name = "Private", order = 0}; - Rank rank2 = new Rank {name = "Recruit", order = 1}; - - int subject = RankUtilities.Sort(rank1, rank2); - - subject.Should().Be(-1); - } - - [Fact] - public void ShouldSortSecondRankAsFirstWhenFirstRankNull() { - Rank rank1 = new Rank {name = "Private", order = 1}; - - int subject = RankUtilities.Sort(null, rank1); - - subject.Should().Be(1); - } - - [Fact] - public void ShouldSortFirstRankAsFirstWhenSecondRankNull() { - Rank rank1 = new Rank {name = "Private", order = 1}; - - int subject = RankUtilities.Sort(rank1, null); - - subject.Should().Be(-1); - } - - [Fact] - public void ShouldSortAsEqualWhenBothRanksNull() { - int subject = RankUtilities.Sort(null, null); - - subject.Should().Be(0); - } - } -} diff --git a/UKSF.Tests.Unit/Services/Personnel/RoleAttributeTests.cs b/UKSF.Tests.Unit/Services/Personnel/RoleAttributeTests.cs new file mode 100644 index 00000000..2eb61c35 --- /dev/null +++ b/UKSF.Tests.Unit/Services/Personnel/RoleAttributeTests.cs @@ -0,0 +1,16 @@ +using FluentAssertions; +using UKSF.Api.Services.Personnel; +using Xunit; + +namespace UKSF.Tests.Unit.Services.Personnel { + public class RoleAttributeTests { + [Theory, InlineData("ADMIN,SR10", RoleDefinitions.ADMIN, RoleDefinitions.SR10), InlineData("ADMIN", RoleDefinitions.ADMIN), InlineData("ADMIN", RoleDefinitions.ADMIN, RoleDefinitions.ADMIN)] + public void ShouldCombineRoles(string expected, params string[] roles) { + RolesAttribute rolesAttribute = new RolesAttribute(roles); + + string subject = rolesAttribute.Roles; + + subject.Should().Be(expected); + } + } +} diff --git a/UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs b/UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs index e32ca2f7..0a7bb283 100644 --- a/UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs +++ b/UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs @@ -18,8 +18,8 @@ public RolesServiceTests() { rolesService = new RolesService(mockRolesDataService.Object); } - [Fact] - public void ShouldGetCorrectSortValueByName() { + [Theory, InlineData("Trainee", "Rifleman", 1), InlineData("Rifleman", "Trainee", -1), InlineData("Rifleman", "Rifleman", 0)] + public void ShouldGetCorrectSortValueByName(string nameA, string nameB, int expected) { Role role1 = new Role {name = "Rifleman", order = 0}; Role role2 = new Role {name = "Trainee", order = 1}; List mockCollection = new List {role1, role2}; @@ -27,9 +27,9 @@ public void ShouldGetCorrectSortValueByName() { mockRolesDataService.Setup(x => x.Get()).Returns(mockCollection); mockRolesDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.name == x)); - int subject = rolesService.Sort("Trainee", "Rifleman"); + int subject = rolesService.Sort(nameA, nameB); - subject.Should().Be(1); + subject.Should().Be(expected); } [Fact] diff --git a/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs b/UKSF.Tests.Unit/Services/Utility/ConfirmationCodeServiceTests.cs similarity index 99% rename from UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs rename to UKSF.Tests.Unit/Services/Utility/ConfirmationCodeServiceTests.cs index 7c02ca41..e6e355ae 100644 --- a/UKSF.Tests.Unit/Services/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests.Unit/Services/Utility/ConfirmationCodeServiceTests.cs @@ -12,7 +12,7 @@ using UKSF.Api.Services.Utility; using Xunit; -namespace UKSF.Tests.Unit.Services { +namespace UKSF.Tests.Unit.Services.Utility { public class ConfirmationCodeServiceTests { private readonly ConfirmationCodeService confirmationCodeService; private readonly Mock mockConfirmationCodeDataService; diff --git a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj index 60ce797f..16d6f8ca 100644 --- a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj +++ b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj @@ -7,16 +7,16 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + - + @@ -26,4 +26,8 @@ + + + + From 33c8623f2abf5b5129c442c64a9a62409d3cb304 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 21 Feb 2020 19:29:52 +0000 Subject: [PATCH 133/369] Remove unused methods in fake notification data service --- UKSF.Api.Data/Fake/FakeNotificationsDataService.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs b/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs index 3ef8df38..1ede8308 100644 --- a/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs +++ b/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs @@ -6,9 +6,5 @@ using UKSF.Api.Services.Fake; namespace UKSF.Api.Data.Fake { - public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { - public Task UpdateMany(Func predicate, UpdateDefinition update) => Task.CompletedTask; - - public Task DeleteMany(Func predicate) => Task.CompletedTask; - } + public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { } } From fc9cc5a79bc0cfce3d8150a9b7c6064ebebf5a97 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 22 Feb 2020 18:27:42 +0000 Subject: [PATCH 134/369] Added further testing. Restore collection name to former at end of add with collection name --- UKSF.Api.Data/DataCollection.cs | 6 +- .../Message/CommentThreadDataService.cs | 2 +- UKSF.Api.Data/Message/LogDataService.cs | 11 +--- UKSF.Tests.Unit/Data/DataServiceTests.cs | 65 ++++++++++++++++--- .../Data/Game/GameServersDataServiceTests.cs | 36 ++++++++++ .../Message/CommentThreadDataServiceTests.cs | 38 ++++++++++- .../Data/Message/LogDataServiceTests.cs | 59 +++++++++++++++++ .../Data/Personnel/RanksDataServiceTests.cs | 36 +++++----- .../Message/Logging/BasicLogMessageTests.cs | 38 +++++++++++ .../Logging/LauncherLogMessageTests.cs | 16 +++++ .../Message/Logging/WebLogMessageTests.cs | 17 +++++ UKSF.Tests.Unit/TestUtilities.cs | 9 +++ 12 files changed, 295 insertions(+), 38 deletions(-) create mode 100644 UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs create mode 100644 UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs create mode 100644 UKSF.Tests.Unit/Models/Message/Logging/BasicLogMessageTests.cs create mode 100644 UKSF.Tests.Unit/Models/Message/Logging/LauncherLogMessageTests.cs create mode 100644 UKSF.Tests.Unit/Models/Message/Logging/WebLogMessageTests.cs create mode 100644 UKSF.Tests.Unit/TestUtilities.cs diff --git a/UKSF.Api.Data/DataCollection.cs b/UKSF.Api.Data/DataCollection.cs index 94ac4e26..40089960 100644 --- a/UKSF.Api.Data/DataCollection.cs +++ b/UKSF.Api.Data/DataCollection.cs @@ -17,7 +17,7 @@ public class DataCollection : IDataCollection { public void SetCollectionName(string newCollectionName) => collectionName = newCollectionName; public void AssertCollectionExists() { - if (Get() == null) { + if (GetCollection() == null) { database.CreateCollection(collectionName); } } @@ -37,9 +37,11 @@ public async Task Add(T data) { } public async Task Add(string collection, T data) { - collectionName = collection; + string oldCollectionName = collectionName; + SetCollectionName(collection); AssertCollectionExists(); await GetCollection().InsertOneAsync(data); + SetCollectionName(oldCollectionName); } public async Task Update(string id, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter diff --git a/UKSF.Api.Data/Message/CommentThreadDataService.cs b/UKSF.Api.Data/Message/CommentThreadDataService.cs index 5cfc0ae4..f18057ca 100644 --- a/UKSF.Api.Data/Message/CommentThreadDataService.cs +++ b/UKSF.Api.Data/Message/CommentThreadDataService.cs @@ -13,7 +13,7 @@ public class CommentThreadDataService : CachedDataService dataEventBus) : base(dataCollection, dataEventBus, "commentThreads") { } public async Task Update(string id, Comment comment, DataEventType updateType) { - await base.Update(id, updateType == DataEventType.ADD ? Builders.Update.Push("comments", comment) : Builders.Update.Pull("comments", comment)); + await base.Update(id, updateType == DataEventType.ADD ? Builders.Update.Push(x => x.comments, comment) : Builders.Update.Pull(x => x.comments, comment)); CommentThreadDataEvent(EventModelFactory.CreateDataEvent(updateType, id, comment)); } diff --git a/UKSF.Api.Data/Message/LogDataService.cs b/UKSF.Api.Data/Message/LogDataService.cs index 56a4ab57..93d90a5c 100644 --- a/UKSF.Api.Data/Message/LogDataService.cs +++ b/UKSF.Api.Data/Message/LogDataService.cs @@ -12,24 +12,19 @@ public class LogDataService : DataService, ILo public LogDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "logs") => this.dataCollection = dataCollection; - public override async Task Add(BasicLogMessage log) { - await base.Add(log); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.GetIdValue(), log)); - } - public async Task Add(AuditLogMessage log) { await dataCollection.Add("auditLogs", log); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.GetIdValue(), log)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); } public async Task Add(LauncherLogMessage log) { await dataCollection.Add("launcherLogs", log); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.GetIdValue(), log)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); } public async Task Add(WebLogMessage log) { await dataCollection.Add("errorLogs", log); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.GetIdValue(), log)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); } } } diff --git a/UKSF.Tests.Unit/Data/DataServiceTests.cs b/UKSF.Tests.Unit/Data/DataServiceTests.cs index 6a595b05..aaadb9df 100644 --- a/UKSF.Tests.Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/DataServiceTests.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Linq.Expressions; using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; @@ -30,8 +31,6 @@ public DataServiceTests() { mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); } - private static BsonValue Render(UpdateDefinition updateDefinition) => updateDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); - [Theory, InlineData(""), InlineData(null)] public void ShouldThrowForDeleteWhenNoKeyOrNull(string id) { @@ -43,7 +42,7 @@ public void ShouldThrowForDeleteWhenNoKeyOrNull(string id) { [Fact] public void ShouldThrowForDeleteManyWhenNoMatchingItems() { mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); - Func act = async () => await mockDataService.DeleteMany(x => x.Name == "2"); + Func act = async () => await mockDataService.DeleteMany(null); act.Should().Throw(); } @@ -74,7 +73,7 @@ public void ShouldThrowForReplaceWhenItemNotFound() { [Fact] public void ShouldThrowForUpdateManyWhenNoMatchingItems() { mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); - Func act = async () => await mockDataService.UpdateMany(x => x.Name == "2", Builders.Update.Set(x => x.Name, "3")); + Func act = async () => await mockDataService.UpdateMany(null, null); act.Should().Throw(); } @@ -160,7 +159,7 @@ public void ShouldGetItemsByPredicate() { public async Task ShouldMakeSetUpdate() { MockDataModel item1 = new MockDataModel { Name = "1" }; mockCollection = new List { item1 }; - BsonValue expected = Render(Builders.Update.Set(x => x.Name, "2")); + BsonValue expected = TestUtilities.Render(Builders.Update.Set(x => x.Name, "2")); UpdateDefinition subject = null; mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) @@ -169,14 +168,14 @@ public async Task ShouldMakeSetUpdate() { await mockDataService.Update(item1.id, "Name", "2"); - Render(subject).Should().BeEquivalentTo(expected); + TestUtilities.Render(subject).Should().BeEquivalentTo(expected); } [Fact] public async Task ShouldMakeUnsetUpdate() { MockDataModel item1 = new MockDataModel { Name = "1" }; mockCollection = new List { item1 }; - BsonValue expected = Render(Builders.Update.Unset(x => x.Name)); + BsonValue expected = TestUtilities.Render(Builders.Update.Unset(x => x.Name)); UpdateDefinition subject = null; mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) @@ -185,7 +184,7 @@ public async Task ShouldMakeUnsetUpdate() { await mockDataService.Update(item1.id, "Name", null); - Render(subject).Should().BeEquivalentTo(expected); + TestUtilities.Render(subject).Should().BeEquivalentTo(expected); } [Fact] @@ -219,6 +218,23 @@ public async Task ShouldUpdateItemValue() { item1.Name.Should().Be("2"); } + [Fact] + public async Task ShouldReplaceItem() { + MockDataModel item1 = new MockDataModel { Name = "1" }; + MockDataModel item2 = new MockDataModel { id = item1.id, Name = "2" }; + mockCollection = new List { item1 }; + + mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns(item1); + mockDataCollection.Setup(x => x.Replace(It.IsAny(), It.IsAny())) + .Returns(Task.CompletedTask) + .Callback((string id, MockDataModel item) => mockCollection[mockCollection.FindIndex(x => x.id == id)] = item); + + await mockDataService.Replace(item2); + + mockCollection.Should().ContainSingle(); + mockCollection.First().Should().Be(item2); + } + [Fact] public async Task ShouldUpdateItemValueByUpdateDefinition() { MockDataModel item1 = new MockDataModel { Name = "1" }; @@ -232,5 +248,38 @@ public async Task ShouldUpdateItemValueByUpdateDefinition() { item1.Name.Should().Be("2"); } + + [Fact] + public async Task ShouldUpdateMany() { + MockDataModel item1 = new MockDataModel { Name = "1" }; + MockDataModel item2 = new MockDataModel { Name = "1" }; + mockCollection = new List { item1, item2 }; + + mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.UpdateMany(It.IsAny>>(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((Expression> expression, UpdateDefinition _) => mockCollection.Where(expression.Compile()).ToList().ForEach(y => y.Name = "2")); + + await mockDataService.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); + + item1.Name.Should().Be("2"); + item2.Name.Should().Be("2"); + } + + [Fact] + public async Task ShouldDeleteMany() { + MockDataModel item1 = new MockDataModel { Name = "1" }; + MockDataModel item2 = new MockDataModel { Name = "1" }; + mockCollection = new List { item1, item2 }; + + mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.DeleteMany(It.IsAny>>())) + .Returns(Task.CompletedTask) + .Callback((Expression> expression) => mockCollection.RemoveAll(x => mockCollection.Where(expression.Compile()).Contains(x))); + + await mockDataService.DeleteMany(x => x.Name == "1"); + + mockCollection.Should().BeEmpty(); + } } } diff --git a/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs b/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs new file mode 100644 index 00000000..8c3774c0 --- /dev/null +++ b/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs @@ -0,0 +1,36 @@ +using System.Collections.Generic; +using FluentAssertions; +using Moq; +using UKSF.Api.Data.Game; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Game; +using Xunit; + +namespace UKSF.Tests.Unit.Data.Game { + public class GameServersDataServiceTests { + private readonly Mock mockDataCollection; + private readonly GameServersDataService gameServersDataService; + + public GameServersDataServiceTests() { + mockDataCollection = new Mock(); + Mock> mockDataEventBus = new Mock>(); + + gameServersDataService = new GameServersDataService(mockDataCollection.Object, mockDataEventBus.Object); + } + + [Fact] + public void ShouldGetSortedCollection() { + GameServer rank1 = new GameServer {order = 2}; + GameServer rank2 = new GameServer {order = 0}; + GameServer rank3 = new GameServer {order = 1}; + + mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); + + List subject = gameServersDataService.Get(); + + subject.Should().ContainInOrder(rank2, rank3, rank1); + } + } +} diff --git a/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs b/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs index c375506f..4c6febd5 100644 --- a/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs @@ -1,9 +1,14 @@ using System.Collections.Generic; +using System.Threading.Tasks; +using FluentAssertions; +using MongoDB.Bson; +using MongoDB.Driver; using Moq; using UKSF.Api.Data.Message; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; using UKSF.Api.Models.Message; using Xunit; @@ -24,8 +29,39 @@ public CommentThreadDataServiceTests() { } [Fact] - public void ShouldReturnCommentThreadId() { + public async Task ShouldCreateCorrectUdpateDefinitionForAdd() { + CommentThread commentThread = new CommentThread(); + mockCollection = new List { commentThread }; + Comment comment = new Comment { author = ObjectId.GenerateNewId().ToString(), content = "Hello there" }; + BsonValue expected = TestUtilities.Render(Builders.Update.Push(x => x.comments, comment)); + UpdateDefinition subject = null; + + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback>((_, update) => subject = update); + + await commentThreadDataService.Update(commentThread.id, comment, DataEventType.ADD); + + TestUtilities.Render(subject).Should().BeEquivalentTo(expected); + } + + [Fact] + public async Task ShouldCreateCorrectUdpateDefinitionForDelete() { + CommentThread commentThread = new CommentThread(); + mockCollection = new List { commentThread }; + + Comment comment = new Comment { author = ObjectId.GenerateNewId().ToString(), content = "Hello there" }; + BsonValue expected = TestUtilities.Render(Builders.Update.Pull(x => x.comments, comment)); + UpdateDefinition subject = null; + + mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback>((_, update) => subject = update); + + await commentThreadDataService.Update(commentThread.id, comment, DataEventType.DELETE); + + TestUtilities.Render(subject).Should().BeEquivalentTo(expected); } } } diff --git a/UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs b/UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs new file mode 100644 index 00000000..87dae4ba --- /dev/null +++ b/UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs @@ -0,0 +1,59 @@ +using System.Diagnostics.Contracts; +using System.Threading.Tasks; +using FluentAssertions; +using Moq; +using UKSF.Api.Data.Message; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Message.Logging; +using Xunit; + +namespace UKSF.Tests.Unit.Data.Message { + public class LogDataServiceTests { + private readonly Mock mockDataCollection; + private readonly LogDataService logDataService; + + public LogDataServiceTests() { + mockDataCollection = new Mock(); + Mock> mockDataEventBus = new Mock>(); + + logDataService = new LogDataService(mockDataCollection.Object, mockDataEventBus.Object); + } + + [Fact] + public async Task ShouldUseAuditLogCollection() { + AuditLogMessage logMessage = new AuditLogMessage(); + string subject = ""; + + mockDataCollection.Setup(x => x.Add(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask).Callback((collectionName, _) => subject = collectionName); + + await logDataService.Add(logMessage); + + subject.Should().Be("auditLogs"); + } + + [Fact] + public async Task ShouldUseLauncherLogCollection() { + LauncherLogMessage logMessage = new LauncherLogMessage("1", "test"); + string subject = ""; + + mockDataCollection.Setup(x => x.Add(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask).Callback((collectionName, _) => subject = collectionName); + + await logDataService.Add(logMessage); + + subject.Should().Be("launcherLogs"); + } + + [Fact] + public async Task ShouldUseErrorLogCollection() { + WebLogMessage logMessage = new WebLogMessage(); + string subject = ""; + + mockDataCollection.Setup(x => x.Add(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask).Callback((collectionName, _) => subject = collectionName); + + await logDataService.Add(logMessage); + + subject.Should().Be("errorLogs"); + } + } +} diff --git a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs index d373287e..2b899502 100644 --- a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs @@ -20,39 +20,39 @@ public RanksDataServiceTests() { ranksDataService = new RanksDataService(mockDataCollection.Object, mockDataEventBus.Object); } - [Fact] - public void ShouldGetSortedCollection() { - Rank rank1 = new Rank {name = "Private", order = 2}; - Rank rank2 = new Rank {name = "Recruit", order = 0}; - Rank rank3 = new Rank {name = "Candidate", order = 1}; - - mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); + [Theory, InlineData(""), InlineData(null)] + public void ShouldGetNothingWhenNoNameOrNull(string name) { + mockDataCollection.Setup(x => x.Get()).Returns(new List()); - List subject = ranksDataService.Get(); + Rank subject = ranksDataService.GetSingle(name); - subject.Should().ContainInOrder(rank2, rank3, rank1); + subject.Should().Be(null); } [Fact] public void ShouldGetSingleByName() { - Rank rank1 = new Rank {name = "Private", order = 2}; - Rank rank2 = new Rank {name = "Recruit", order = 1}; - Rank rank3 = new Rank {name = "Candidate", order = 0}; + Rank rank1 = new Rank { name = "Private", order = 2 }; + Rank rank2 = new Rank { name = "Recruit", order = 1 }; + Rank rank3 = new Rank { name = "Candidate", order = 0 }; - mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); + mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); Rank subject = ranksDataService.GetSingle("Recruit"); subject.Should().Be(rank2); } - [Theory, InlineData(""), InlineData(null)] - public void ShouldGetNothingWhenNoNameOrNull(string name) { - mockDataCollection.Setup(x => x.Get()).Returns(new List()); + [Fact] + public void ShouldGetSortedCollection() { + Rank rank1 = new Rank { order = 2 }; + Rank rank2 = new Rank { order = 0 }; + Rank rank3 = new Rank { order = 1 }; - Rank subject = ranksDataService.GetSingle(name); + mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); - subject.Should().Be(null); + List subject = ranksDataService.Get(); + + subject.Should().ContainInOrder(rank2, rank3, rank1); } } } diff --git a/UKSF.Tests.Unit/Models/Message/Logging/BasicLogMessageTests.cs b/UKSF.Tests.Unit/Models/Message/Logging/BasicLogMessageTests.cs new file mode 100644 index 00000000..8a50df55 --- /dev/null +++ b/UKSF.Tests.Unit/Models/Message/Logging/BasicLogMessageTests.cs @@ -0,0 +1,38 @@ +using System; +using FluentAssertions; +using UKSF.Api.Models.Message.Logging; +using Xunit; + +namespace UKSF.Tests.Unit.Models.Message.Logging { + public class BasicLogMessageTests { + [Fact] + public void ShouldSetText() { + BasicLogMessage subject = new BasicLogMessage("test"); + + subject.message.Should().Be("test"); + } + + [Fact] + public void ShouldSetLogLevel() { + BasicLogMessage subject = new BasicLogMessage(LogLevel.DEBUG); + + subject.level.Should().Be(LogLevel.DEBUG); + } + + [Fact] + public void ShouldSetTextAndLogLevel() { + BasicLogMessage subject = new BasicLogMessage("test", LogLevel.DEBUG); + + subject.message.Should().Be("test"); + subject.level.Should().Be(LogLevel.DEBUG); + } + + [Fact] + public void ShouldSetTextAndLogLevelFromException() { + BasicLogMessage subject = new BasicLogMessage(new Exception("test")); + + subject.message.Should().Be("System.Exception: test"); + subject.level.Should().Be(LogLevel.ERROR); + } + } +} diff --git a/UKSF.Tests.Unit/Models/Message/Logging/LauncherLogMessageTests.cs b/UKSF.Tests.Unit/Models/Message/Logging/LauncherLogMessageTests.cs new file mode 100644 index 00000000..66e7c3b8 --- /dev/null +++ b/UKSF.Tests.Unit/Models/Message/Logging/LauncherLogMessageTests.cs @@ -0,0 +1,16 @@ +using System; +using FluentAssertions; +using UKSF.Api.Models.Message.Logging; +using Xunit; + +namespace UKSF.Tests.Unit.Models.Message.Logging { + public class LauncherLogMessageTests { + [Fact] + public void ShouldSetVersionAndMessage() { + LauncherLogMessage subject = new LauncherLogMessage("1.0.0", "test"); + + subject.message.Should().Be("test"); + subject.version.Should().Be("1.0.0"); + } + } +} diff --git a/UKSF.Tests.Unit/Models/Message/Logging/WebLogMessageTests.cs b/UKSF.Tests.Unit/Models/Message/Logging/WebLogMessageTests.cs new file mode 100644 index 00000000..1d15e487 --- /dev/null +++ b/UKSF.Tests.Unit/Models/Message/Logging/WebLogMessageTests.cs @@ -0,0 +1,17 @@ +using System; +using FluentAssertions; +using UKSF.Api.Models.Message.Logging; +using Xunit; + +namespace UKSF.Tests.Unit.Models.Message.Logging { + public class WebLogMessageTests { + [Fact] + public void ShouldCreateFromException() { + WebLogMessage subject = new WebLogMessage(new Exception("test")); + + subject.message.Should().Be("test"); + subject.exception.Should().Be("System.Exception: test"); + subject.level.Should().Be(LogLevel.ERROR); + } + } +} diff --git a/UKSF.Tests.Unit/TestUtilities.cs b/UKSF.Tests.Unit/TestUtilities.cs new file mode 100644 index 00000000..f2ed6b20 --- /dev/null +++ b/UKSF.Tests.Unit/TestUtilities.cs @@ -0,0 +1,9 @@ +using MongoDB.Bson; +using MongoDB.Bson.Serialization; +using MongoDB.Driver; + +namespace UKSF.Tests.Unit { + public static class TestUtilities { + public static BsonValue Render(UpdateDefinition updateDefinition) => updateDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); + } +} From 172c9d046a5350c06112860543eb21ad4501d475 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 23 Feb 2020 18:55:58 +0000 Subject: [PATCH 135/369] Refactored data collection to use a simple factory method. This makes using several collections in one data service (e.g logs) much cleaner and less ambiguous, and also keeps the data collection class simple and clean. Split startup service registration to separate files for verbosity. --- UKSF.Api.Data/Admin/VariablesDataService.cs | 2 +- UKSF.Api.Data/CachedDataService.cs | 2 +- .../CommandRequestArchiveDataService.cs | 2 +- .../Command/CommandRequestDataService.cs | 2 +- UKSF.Api.Data/DataCollection.cs | 38 ++- UKSF.Api.Data/DataCollectionFactory.cs | 15 ++ UKSF.Api.Data/DataService.cs | 25 +- UKSF.Api.Data/Game/GameServersDataService.cs | 2 +- .../Launcher/LauncherFileDataService.cs | 2 +- .../Message/CommentThreadDataService.cs | 2 +- UKSF.Api.Data/Message/LogDataService.cs | 10 +- .../Message/NotificationsDataService.cs | 2 +- .../Operations/OperationOrderDataService.cs | 2 +- .../Operations/OperationReportDataService.cs | 2 +- UKSF.Api.Data/Personnel/AccountDataService.cs | 2 +- .../Personnel/DischargeDataService.cs | 2 +- UKSF.Api.Data/Personnel/LoaDataService.cs | 2 +- UKSF.Api.Data/Personnel/RanksDataService.cs | 2 +- UKSF.Api.Data/Personnel/RolesDataService.cs | 2 +- UKSF.Api.Data/Units/UnitsDataService.cs | 2 +- .../Utility/ConfirmationCodeDataService.cs | 2 +- UKSF.Api.Data/Utility/SchedulerDataService.cs | 6 +- UKSF.Api.Interfaces/Data/IDataCollection.cs | 16 +- .../Data/IDataCollectionFactory.cs | 5 + UKSF.Api.Interfaces/Data/IDataService.cs | 1 - .../Utility/ISchedulerService.cs | 2 +- UKSF.Api.Models/Admin/VariableItem.cs | 2 +- UKSF.Api.Models/Command/CommandRequest.cs | 2 +- .../{MongoObject.cs => DatabaseObject.cs} | 2 +- UKSF.Api.Models/Game/GameServer.cs | 2 +- UKSF.Api.Models/Launcher/LauncherFile.cs | 2 +- UKSF.Api.Models/Message/Comment.cs | 2 +- UKSF.Api.Models/Message/CommentThread.cs | 2 +- .../Message/Logging/BasicLogMessage.cs | 2 +- UKSF.Api.Models/Message/Notification.cs | 2 +- UKSF.Api.Models/Operations/Operation.cs | 2 +- UKSF.Api.Models/Operations/Opord.cs | 2 +- UKSF.Api.Models/Operations/Oprep.cs | 2 +- UKSF.Api.Models/Personnel/Account.cs | 2 +- UKSF.Api.Models/Personnel/Discharge.cs | 4 +- UKSF.Api.Models/Personnel/Loa.cs | 2 +- UKSF.Api.Models/Personnel/Rank.cs | 2 +- UKSF.Api.Models/Personnel/Role.cs | 2 +- UKSF.Api.Models/Units/Unit.cs | 2 +- UKSF.Api.Models/Utility/ConfirmationCode.cs | 2 +- UKSF.Api.Models/Utility/ScheduledJob.cs | 5 +- UKSF.Api.Models/Utility/UtilityObject.cs | 2 +- UKSF.Api.Services/Fake/FakeDataService.cs | 2 +- .../Utility/SchedulerActionHelper.cs | 6 - UKSF.Api.Services/Utility/SchedulerService.cs | 10 +- .../AppStart/RegisterDataBackedServices.cs | 50 ++++ UKSF.Api/AppStart/RegisterDataServices.cs | 50 ++++ UKSF.Api/AppStart/RegisterEventServices.cs | 45 ++++ UKSF.Api/AppStart/RegisterServices.cs | 69 ++++++ UKSF.Api/Startup.cs | 216 ++---------------- UKSF.Integrations/Startup.cs | 12 +- .../Data/Admin/VariablesDataServiceTests.cs | 14 +- .../Data/CachedDataServiceTests.cs | 23 +- UKSF.Tests.Unit/Data/DataServiceTests.cs | 39 ++-- .../Data/Game/GameServersDataServiceTests.cs | 8 +- .../Message/CommentThreadDataServiceTests.cs | 14 +- .../Data/Message/LogDataServiceTests.cs | 88 +++++-- UKSF.Tests.Unit/Data/MockCachedDataService.cs | 2 +- UKSF.Tests.Unit/Data/MockDataService.cs | 2 +- .../OperationOrderDataServiceTests.cs | 9 +- .../OperationReportDataServiceTests.cs | 8 +- .../Personnel/DischargeDataServiceTests.cs | 9 +- .../Data/Personnel/RanksDataServiceTests.cs | 8 +- .../Data/Personnel/RolesDataServiceTests.cs | 8 +- .../Data/Units/UnitsDataServiceTests.cs | 10 +- .../Events/DataEventBackerTests.cs | 17 +- UKSF.Tests.Unit/MockDataModel.cs | 2 +- 72 files changed, 518 insertions(+), 402 deletions(-) create mode 100644 UKSF.Api.Data/DataCollectionFactory.cs create mode 100644 UKSF.Api.Interfaces/Data/IDataCollectionFactory.cs rename UKSF.Api.Models/{MongoObject.cs => DatabaseObject.cs} (86%) create mode 100644 UKSF.Api/AppStart/RegisterDataBackedServices.cs create mode 100644 UKSF.Api/AppStart/RegisterDataServices.cs create mode 100644 UKSF.Api/AppStart/RegisterEventServices.cs create mode 100644 UKSF.Api/AppStart/RegisterServices.cs diff --git a/UKSF.Api.Data/Admin/VariablesDataService.cs b/UKSF.Api.Data/Admin/VariablesDataService.cs index 0e03eef2..44f858c3 100644 --- a/UKSF.Api.Data/Admin/VariablesDataService.cs +++ b/UKSF.Api.Data/Admin/VariablesDataService.cs @@ -10,7 +10,7 @@ namespace UKSF.Api.Data.Admin { public class VariablesDataService : CachedDataService, IVariablesDataService { - public VariablesDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "variables") { } + public VariablesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "variables") { } public override List Get() { base.Get(); diff --git a/UKSF.Api.Data/CachedDataService.cs b/UKSF.Api.Data/CachedDataService.cs index 4ee58d84..3851934f 100644 --- a/UKSF.Api.Data/CachedDataService.cs +++ b/UKSF.Api.Data/CachedDataService.cs @@ -13,7 +13,7 @@ public abstract class CachedDataService : DataService { private List collection; private readonly object lockObject = new object(); - protected CachedDataService(IDataCollection dataCollection, IDataEventBus dataEventBus, string collectionName) : base(dataCollection, dataEventBus, collectionName) { } + protected CachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } public List Collection { get => collection; diff --git a/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs b/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs index 330cc17f..257a1559 100644 --- a/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs +++ b/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs @@ -4,6 +4,6 @@ namespace UKSF.Api.Data.Command { public class CommandRequestArchiveDataService : DataService, ICommandRequestArchiveDataService { - public CommandRequestArchiveDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "commandRequestsArchive") { } + public CommandRequestArchiveDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "commandRequestsArchive") { } } } diff --git a/UKSF.Api.Data/Command/CommandRequestDataService.cs b/UKSF.Api.Data/Command/CommandRequestDataService.cs index 6db048a9..d4c082d4 100644 --- a/UKSF.Api.Data/Command/CommandRequestDataService.cs +++ b/UKSF.Api.Data/Command/CommandRequestDataService.cs @@ -5,6 +5,6 @@ namespace UKSF.Api.Data.Command { public class CommandRequestDataService : CachedDataService, ICommandRequestDataService { - public CommandRequestDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "commandRequests") { } + public CommandRequestDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "commandRequests") { } } } diff --git a/UKSF.Api.Data/DataCollection.cs b/UKSF.Api.Data/DataCollection.cs index 40089960..e531d217 100644 --- a/UKSF.Api.Data/DataCollection.cs +++ b/UKSF.Api.Data/DataCollection.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; +using MongoDB.Bson; using MongoDB.Driver; using UKSF.Api.Interfaces.Data; using UKSF.Common; @@ -10,15 +11,16 @@ namespace UKSF.Api.Data { public class DataCollection : IDataCollection { private readonly IMongoDatabase database; - private string collectionName; + private readonly string collectionName; - public DataCollection(IMongoDatabase database) => this.database = database; - - public void SetCollectionName(string newCollectionName) => collectionName = newCollectionName; + public DataCollection(IMongoDatabase database, string collectionName) { + this.database = database; + this.collectionName = collectionName; + } - public void AssertCollectionExists() { - if (GetCollection() == null) { - database.CreateCollection(collectionName); + public async Task AssertCollectionExistsAsync() { + if (await CollectionExistsAsync()) { + await database.CreateCollectionAsync(collectionName); } } @@ -32,38 +34,32 @@ public T GetSingle(string id) { public T GetSingle(Func predicate) => GetCollection().AsQueryable().FirstOrDefault(predicate); // TODO: Async - public async Task Add(T data) { - await GetCollection().InsertOneAsync(data); - } - - public async Task Add(string collection, T data) { - string oldCollectionName = collectionName; - SetCollectionName(collection); - AssertCollectionExists(); + public async Task AddAsync(T data) { await GetCollection().InsertOneAsync(data); - SetCollectionName(oldCollectionName); } - public async Task Update(string id, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter + public async Task UpdateAsync(string id, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter await GetCollection().UpdateOneAsync(Builders.Filter.Eq("id", id), update); } - public async Task UpdateMany(Expression> predicate, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter + public async Task UpdateManyAsync(Expression> predicate, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter await GetCollection().UpdateManyAsync(predicate, update); } - public async Task Replace(string id, T value) { + public async Task ReplaceAsync(string id, T value) { await GetCollection().ReplaceOneAsync(x => x.GetIdValue() == id, value); } - public async Task Delete(string id) { + public async Task DeleteAsync(string id) { await GetCollection().DeleteOneAsync(Builders.Filter.Eq("id", id)); } - public async Task DeleteMany(Expression> predicate) { + public async Task DeleteManyAsync(Expression> predicate) { await GetCollection().DeleteManyAsync(predicate); } private IMongoCollection GetCollection() => database.GetCollection(collectionName); + + private async Task CollectionExistsAsync() => await (await database.ListCollectionsAsync(new ListCollectionsOptions { Filter = new BsonDocument("name", collectionName) })).AnyAsync(); } } diff --git a/UKSF.Api.Data/DataCollectionFactory.cs b/UKSF.Api.Data/DataCollectionFactory.cs new file mode 100644 index 00000000..636c3177 --- /dev/null +++ b/UKSF.Api.Data/DataCollectionFactory.cs @@ -0,0 +1,15 @@ +using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; + +namespace UKSF.Api.Data { + public class DataCollectionFactory : IDataCollectionFactory { + private readonly IMongoDatabase database; + + public DataCollectionFactory(IMongoDatabase database) => this.database = database; + + public IDataCollection CreateDataCollection(string collectionName) { + IDataCollection dataCollection = new DataCollection(database, collectionName); + return dataCollection; + } + } +} diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index 1ebf88de..aaeaa7f3 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using MongoDB.Driver; -using UKSF.Api.Events; using UKSF.Api.Events.Data; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; @@ -13,10 +12,7 @@ namespace UKSF.Api.Data { public abstract class DataService : DataEventBacker, IDataService { private readonly IDataCollection dataCollection; - protected DataService(IDataCollection dataCollection, IDataEventBus dataEventBus, string collectionName) : base(dataEventBus) { - this.dataCollection = dataCollection; - SetCollectionName(collectionName); - } + protected DataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataEventBus) => dataCollection = dataCollectionFactory.CreateDataCollection(collectionName); public virtual List Get() => dataCollection.Get(); @@ -28,52 +24,47 @@ protected DataService(IDataCollection dataCollection, IDataEventBus dataE public virtual async Task Add(T data) { if (data == null) throw new ArgumentNullException(nameof(data)); - await dataCollection.Add(data); + await dataCollection.AddAsync(data); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, data.GetIdValue(), data)); } public virtual async Task Update(string id, string fieldName, object value) { if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); UpdateDefinition update = value == null ? Builders.Update.Unset(fieldName) : Builders.Update.Set(fieldName, value); - await dataCollection.Update(id, update); + await dataCollection.UpdateAsync(id, update); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public virtual async Task Update(string id, UpdateDefinition update) { // TODO: Remove strong typing to UpdateDefinition if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); - await dataCollection.Update(id, update); + await dataCollection.UpdateAsync(id, update); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public virtual async Task UpdateMany(Func predicate, UpdateDefinition update) { List items = Get(predicate); if (items.Count == 0) throw new KeyNotFoundException("Could not find any items to update"); - await dataCollection.UpdateMany(x => predicate(x), update); + await dataCollection.UpdateManyAsync(x => predicate(x), update); items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); } public virtual async Task Replace(T item) { if (GetSingle(x => x.GetIdValue() == item.GetIdValue()) == null) throw new KeyNotFoundException("Could not find item to replace"); - await dataCollection.Replace(item.GetIdValue(), item); + await dataCollection.ReplaceAsync(item.GetIdValue(), item); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, item.GetIdValue())); } public virtual async Task Delete(string id) { if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); - await dataCollection.Delete(id); + await dataCollection.DeleteAsync(id); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } public virtual async Task DeleteMany(Func predicate) { List items = Get(predicate); if (items.Count == 0) throw new KeyNotFoundException("Could not find any items to delete"); - await dataCollection.DeleteMany(x => predicate(x)); + await dataCollection.DeleteManyAsync(x => predicate(x)); items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, x.GetIdValue()))); } - - public void SetCollectionName(string collectionName) { - dataCollection.SetCollectionName(collectionName); - dataCollection.AssertCollectionExists(); - } } } diff --git a/UKSF.Api.Data/Game/GameServersDataService.cs b/UKSF.Api.Data/Game/GameServersDataService.cs index 846fb30c..5a828791 100644 --- a/UKSF.Api.Data/Game/GameServersDataService.cs +++ b/UKSF.Api.Data/Game/GameServersDataService.cs @@ -7,7 +7,7 @@ namespace UKSF.Api.Data.Game { public class GameServersDataService : CachedDataService, IGameServersDataService { - public GameServersDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "gameServers") { } + public GameServersDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "gameServers") { } public override List Get() { return base.Get().OrderBy(x => x.order).ToList(); diff --git a/UKSF.Api.Data/Launcher/LauncherFileDataService.cs b/UKSF.Api.Data/Launcher/LauncherFileDataService.cs index 52a385fd..2661d2f1 100644 --- a/UKSF.Api.Data/Launcher/LauncherFileDataService.cs +++ b/UKSF.Api.Data/Launcher/LauncherFileDataService.cs @@ -5,6 +5,6 @@ namespace UKSF.Api.Data.Launcher { public class LauncherFileDataService : CachedDataService, ILauncherFileDataService { - public LauncherFileDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "launcherFiles") { } + public LauncherFileDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "launcherFiles") { } } } diff --git a/UKSF.Api.Data/Message/CommentThreadDataService.cs b/UKSF.Api.Data/Message/CommentThreadDataService.cs index f18057ca..76ac7829 100644 --- a/UKSF.Api.Data/Message/CommentThreadDataService.cs +++ b/UKSF.Api.Data/Message/CommentThreadDataService.cs @@ -10,7 +10,7 @@ namespace UKSF.Api.Data.Message { public class CommentThreadDataService : CachedDataService, ICommentThreadDataService { - public CommentThreadDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "commentThreads") { } + public CommentThreadDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "commentThreads") { } public async Task Update(string id, Comment comment, DataEventType updateType) { await base.Update(id, updateType == DataEventType.ADD ? Builders.Update.Push(x => x.comments, comment) : Builders.Update.Pull(x => x.comments, comment)); diff --git a/UKSF.Api.Data/Message/LogDataService.cs b/UKSF.Api.Data/Message/LogDataService.cs index 93d90a5c..1f2a5c20 100644 --- a/UKSF.Api.Data/Message/LogDataService.cs +++ b/UKSF.Api.Data/Message/LogDataService.cs @@ -8,22 +8,22 @@ namespace UKSF.Api.Data.Message { public class LogDataService : DataService, ILogDataService { - private readonly IDataCollection dataCollection; + private readonly IDataCollectionFactory dataCollectionFactory; - public LogDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "logs") => this.dataCollection = dataCollection; + public LogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "logs") => this.dataCollectionFactory = dataCollectionFactory; public async Task Add(AuditLogMessage log) { - await dataCollection.Add("auditLogs", log); + await dataCollectionFactory.CreateDataCollection("auditLogs").AddAsync(log); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); } public async Task Add(LauncherLogMessage log) { - await dataCollection.Add("launcherLogs", log); + await dataCollectionFactory.CreateDataCollection("launcherLogs").AddAsync(log); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); } public async Task Add(WebLogMessage log) { - await dataCollection.Add("errorLogs", log); + await dataCollectionFactory.CreateDataCollection("errorLogs").AddAsync(log); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); } } diff --git a/UKSF.Api.Data/Message/NotificationsDataService.cs b/UKSF.Api.Data/Message/NotificationsDataService.cs index 159d7bc1..09c8cdfa 100644 --- a/UKSF.Api.Data/Message/NotificationsDataService.cs +++ b/UKSF.Api.Data/Message/NotificationsDataService.cs @@ -8,6 +8,6 @@ namespace UKSF.Api.Data.Message { public class NotificationsDataService : CachedDataService, INotificationsDataService { - public NotificationsDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "notifications") { } + public NotificationsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "notifications") { } } } diff --git a/UKSF.Api.Data/Operations/OperationOrderDataService.cs b/UKSF.Api.Data/Operations/OperationOrderDataService.cs index 5fe2145d..3c35cc39 100644 --- a/UKSF.Api.Data/Operations/OperationOrderDataService.cs +++ b/UKSF.Api.Data/Operations/OperationOrderDataService.cs @@ -7,7 +7,7 @@ namespace UKSF.Api.Data.Operations { public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { - public OperationOrderDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "opord") { } + public OperationOrderDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "opord") { } public override List Get() { List reversed = new List(base.Get()); diff --git a/UKSF.Api.Data/Operations/OperationReportDataService.cs b/UKSF.Api.Data/Operations/OperationReportDataService.cs index b9c5963c..bed26403 100644 --- a/UKSF.Api.Data/Operations/OperationReportDataService.cs +++ b/UKSF.Api.Data/Operations/OperationReportDataService.cs @@ -7,7 +7,7 @@ namespace UKSF.Api.Data.Operations { public class OperationReportDataService : CachedDataService, IOperationReportDataService { - public OperationReportDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "oprep") { } + public OperationReportDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "oprep") { } public override List Get() { List reversed = new List(base.Get()); diff --git a/UKSF.Api.Data/Personnel/AccountDataService.cs b/UKSF.Api.Data/Personnel/AccountDataService.cs index 6db83681..6e277a9c 100644 --- a/UKSF.Api.Data/Personnel/AccountDataService.cs +++ b/UKSF.Api.Data/Personnel/AccountDataService.cs @@ -5,6 +5,6 @@ namespace UKSF.Api.Data.Personnel { public class AccountDataService : CachedDataService, IAccountDataService { - public AccountDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "accounts") { } + public AccountDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "accounts") { } } } diff --git a/UKSF.Api.Data/Personnel/DischargeDataService.cs b/UKSF.Api.Data/Personnel/DischargeDataService.cs index 0d4d20b3..5b34abdd 100644 --- a/UKSF.Api.Data/Personnel/DischargeDataService.cs +++ b/UKSF.Api.Data/Personnel/DischargeDataService.cs @@ -7,7 +7,7 @@ namespace UKSF.Api.Data.Personnel { public class DischargeDataService : CachedDataService, IDischargeDataService { - public DischargeDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "discharges") { } + public DischargeDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "discharges") { } public override List Get() { return base.Get().OrderByDescending(x => x.discharges.Last().timestamp).ToList(); diff --git a/UKSF.Api.Data/Personnel/LoaDataService.cs b/UKSF.Api.Data/Personnel/LoaDataService.cs index 3193cf67..79b149c8 100644 --- a/UKSF.Api.Data/Personnel/LoaDataService.cs +++ b/UKSF.Api.Data/Personnel/LoaDataService.cs @@ -5,6 +5,6 @@ namespace UKSF.Api.Data.Personnel { public class LoaDataService : CachedDataService, ILoaDataService { - public LoaDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "loas") { } + public LoaDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "loas") { } } } diff --git a/UKSF.Api.Data/Personnel/RanksDataService.cs b/UKSF.Api.Data/Personnel/RanksDataService.cs index 5f9f7178..cc5c10e9 100644 --- a/UKSF.Api.Data/Personnel/RanksDataService.cs +++ b/UKSF.Api.Data/Personnel/RanksDataService.cs @@ -8,7 +8,7 @@ namespace UKSF.Api.Data.Personnel { public class RanksDataService : CachedDataService, IRanksDataService { - public RanksDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "ranks") { } + public RanksDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "ranks") { } public override List Get() { return base.Get().OrderBy(x => x.order).ToList(); diff --git a/UKSF.Api.Data/Personnel/RolesDataService.cs b/UKSF.Api.Data/Personnel/RolesDataService.cs index cbb05247..d1d41cec 100644 --- a/UKSF.Api.Data/Personnel/RolesDataService.cs +++ b/UKSF.Api.Data/Personnel/RolesDataService.cs @@ -7,7 +7,7 @@ namespace UKSF.Api.Data.Personnel { public class RolesDataService : CachedDataService, IRolesDataService { - public RolesDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "roles") { } + public RolesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "roles") { } public override List Get() { return base.Get().OrderBy(x => x.name).ToList(); diff --git a/UKSF.Api.Data/Units/UnitsDataService.cs b/UKSF.Api.Data/Units/UnitsDataService.cs index 9be65c65..16f90efb 100644 --- a/UKSF.Api.Data/Units/UnitsDataService.cs +++ b/UKSF.Api.Data/Units/UnitsDataService.cs @@ -7,7 +7,7 @@ namespace UKSF.Api.Data.Units { public class UnitsDataService : CachedDataService, IUnitsDataService { - public UnitsDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "units") { } + public UnitsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "units") { } public override List Get() { return base.Get().OrderBy(x => x.order).ToList(); diff --git a/UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs b/UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs index 2370a028..bf88883f 100644 --- a/UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs +++ b/UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs @@ -4,6 +4,6 @@ namespace UKSF.Api.Data.Utility { public class ConfirmationCodeDataService : DataService, IConfirmationCodeDataService { - public ConfirmationCodeDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "confirmationCodes") { } + public ConfirmationCodeDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "confirmationCodes") { } } } diff --git a/UKSF.Api.Data/Utility/SchedulerDataService.cs b/UKSF.Api.Data/Utility/SchedulerDataService.cs index 55fb8d4f..38327af9 100644 --- a/UKSF.Api.Data/Utility/SchedulerDataService.cs +++ b/UKSF.Api.Data/Utility/SchedulerDataService.cs @@ -4,6 +4,10 @@ namespace UKSF.Api.Data.Utility { public class SchedulerDataService : DataService, ISchedulerDataService { - public SchedulerDataService(IDataCollection dataCollection, IDataEventBus dataEventBus) : base(dataCollection, dataEventBus, "scheduledJobs") { } + public SchedulerDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "scheduledJobs") { } + } + + public class SchedulerIntegrationsDataService : DataService, ISchedulerDataService { + public SchedulerIntegrationsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "scheduledJobsIntegrations") { } } } diff --git a/UKSF.Api.Interfaces/Data/IDataCollection.cs b/UKSF.Api.Interfaces/Data/IDataCollection.cs index 36cb047a..0911b4e4 100644 --- a/UKSF.Api.Interfaces/Data/IDataCollection.cs +++ b/UKSF.Api.Interfaces/Data/IDataCollection.cs @@ -6,18 +6,16 @@ namespace UKSF.Api.Interfaces.Data { public interface IDataCollection { - void SetCollectionName(string newCollectionName); - void AssertCollectionExists(); + Task AssertCollectionExistsAsync(); List Get(); List Get(Func predicate); T GetSingle(string id); T GetSingle(Func predicate); - Task Add(T data); - Task Add(string collection, T data); - Task Update(string id, UpdateDefinition update); - Task UpdateMany(Expression> predicate, UpdateDefinition update); - Task Replace(string id, T value); - Task Delete(string id); - Task DeleteMany(Expression> predicate); + Task AddAsync(T data); + Task UpdateAsync(string id, UpdateDefinition update); + Task UpdateManyAsync(Expression> predicate, UpdateDefinition update); + Task ReplaceAsync(string id, T value); + Task DeleteAsync(string id); + Task DeleteManyAsync(Expression> predicate); } } diff --git a/UKSF.Api.Interfaces/Data/IDataCollectionFactory.cs b/UKSF.Api.Interfaces/Data/IDataCollectionFactory.cs new file mode 100644 index 00000000..95bb7006 --- /dev/null +++ b/UKSF.Api.Interfaces/Data/IDataCollectionFactory.cs @@ -0,0 +1,5 @@ +namespace UKSF.Api.Interfaces.Data { + public interface IDataCollectionFactory { + IDataCollection CreateDataCollection(string collectionName); + } +} diff --git a/UKSF.Api.Interfaces/Data/IDataService.cs b/UKSF.Api.Interfaces/Data/IDataService.cs index c52c4026..e4bc10bd 100644 --- a/UKSF.Api.Interfaces/Data/IDataService.cs +++ b/UKSF.Api.Interfaces/Data/IDataService.cs @@ -17,6 +17,5 @@ public interface IDataService : IDataEventBacker { Task Replace(T item); Task Delete(string id); Task DeleteMany(Func predicate); - void SetCollectionName(string collectionName); } } diff --git a/UKSF.Api.Interfaces/Utility/ISchedulerService.cs b/UKSF.Api.Interfaces/Utility/ISchedulerService.cs index 0168fbdd..a1406945 100644 --- a/UKSF.Api.Interfaces/Utility/ISchedulerService.cs +++ b/UKSF.Api.Interfaces/Utility/ISchedulerService.cs @@ -5,7 +5,7 @@ namespace UKSF.Api.Interfaces.Utility { public interface ISchedulerService : IDataBackedService { - void Load(bool integrations = false); + void Load(bool api = true); Task Create(DateTime next, TimeSpan interval, ScheduledJobType type, string action, params object[] actionParameters); Task Cancel(Func predicate); } diff --git a/UKSF.Api.Models/Admin/VariableItem.cs b/UKSF.Api.Models/Admin/VariableItem.cs index e260fb17..7192af17 100644 --- a/UKSF.Api.Models/Admin/VariableItem.cs +++ b/UKSF.Api.Models/Admin/VariableItem.cs @@ -1,5 +1,5 @@ namespace UKSF.Api.Models.Admin { - public class VariableItem : MongoObject { + public class VariableItem : DatabaseObject { public object item; public string key; } diff --git a/UKSF.Api.Models/Command/CommandRequest.cs b/UKSF.Api.Models/Command/CommandRequest.cs index 5fd0474d..489190be 100644 --- a/UKSF.Api.Models/Command/CommandRequest.cs +++ b/UKSF.Api.Models/Command/CommandRequest.cs @@ -24,7 +24,7 @@ public static class CommandRequestType { public const string UNIT_ROLE = "Unit Role"; } - public class CommandRequest : MongoObject { + public class CommandRequest : DatabaseObject { public DateTime dateCreated; public string displayFrom; public string displayRecipient; diff --git a/UKSF.Api.Models/MongoObject.cs b/UKSF.Api.Models/DatabaseObject.cs similarity index 86% rename from UKSF.Api.Models/MongoObject.cs rename to UKSF.Api.Models/DatabaseObject.cs index d0dc9822..12288106 100644 --- a/UKSF.Api.Models/MongoObject.cs +++ b/UKSF.Api.Models/DatabaseObject.cs @@ -2,7 +2,7 @@ using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models { - public class MongoObject { + public class DatabaseObject { [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id = ObjectId.GenerateNewId().ToString(); } } diff --git a/UKSF.Api.Models/Game/GameServer.cs b/UKSF.Api.Models/Game/GameServer.cs index caf335aa..a0cc6de7 100644 --- a/UKSF.Api.Models/Game/GameServer.cs +++ b/UKSF.Api.Models/Game/GameServer.cs @@ -8,7 +8,7 @@ public enum GameServerOption { DCG } - public class GameServer : MongoObject { + public class GameServer : DatabaseObject { [BsonIgnore] public readonly List headlessClientProcessIds = new List(); public string adminPassword; public int apiPort; diff --git a/UKSF.Api.Models/Launcher/LauncherFile.cs b/UKSF.Api.Models/Launcher/LauncherFile.cs index 4cec2fde..87a4c1e5 100644 --- a/UKSF.Api.Models/Launcher/LauncherFile.cs +++ b/UKSF.Api.Models/Launcher/LauncherFile.cs @@ -1,5 +1,5 @@ namespace UKSF.Api.Models.Launcher { - public class LauncherFile : MongoObject { + public class LauncherFile : DatabaseObject { public string fileName; public string version; } diff --git a/UKSF.Api.Models/Message/Comment.cs b/UKSF.Api.Models/Message/Comment.cs index 7fdafed5..c4f871fd 100644 --- a/UKSF.Api.Models/Message/Comment.cs +++ b/UKSF.Api.Models/Message/Comment.cs @@ -3,7 +3,7 @@ using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Message { - public class Comment : MongoObject { + public class Comment : DatabaseObject { [BsonRepresentation(BsonType.ObjectId)] public string author; public string content; public DateTime timestamp; diff --git a/UKSF.Api.Models/Message/CommentThread.cs b/UKSF.Api.Models/Message/CommentThread.cs index 9e11742f..e5c8538a 100644 --- a/UKSF.Api.Models/Message/CommentThread.cs +++ b/UKSF.Api.Models/Message/CommentThread.cs @@ -10,7 +10,7 @@ public enum ThreadMode { RANKSUPERIOROREQUAL } - public class CommentThread : MongoObject { + public class CommentThread : DatabaseObject { [BsonRepresentation(BsonType.ObjectId)] public string[] authors; public Comment[] comments = { }; public ThreadMode mode; diff --git a/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs b/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs index 8e359858..ff22b630 100644 --- a/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs +++ b/UKSF.Api.Models/Message/Logging/BasicLogMessage.cs @@ -7,7 +7,7 @@ public enum LogLevel { ERROR } - public class BasicLogMessage : MongoObject { + public class BasicLogMessage : DatabaseObject { public LogLevel level = LogLevel.INFO; public string message; public DateTime timestamp = DateTime.UtcNow; diff --git a/UKSF.Api.Models/Message/Notification.cs b/UKSF.Api.Models/Message/Notification.cs index 3e28b0df..909424ad 100644 --- a/UKSF.Api.Models/Message/Notification.cs +++ b/UKSF.Api.Models/Message/Notification.cs @@ -3,7 +3,7 @@ using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Message { - public class Notification : MongoObject { + public class Notification : DatabaseObject { public string icon; public string link; public string message; diff --git a/UKSF.Api.Models/Operations/Operation.cs b/UKSF.Api.Models/Operations/Operation.cs index 56908331..bef329c9 100644 --- a/UKSF.Api.Models/Operations/Operation.cs +++ b/UKSF.Api.Models/Operations/Operation.cs @@ -2,7 +2,7 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Models.Operations { - public class Operation : MongoObject { + public class Operation : DatabaseObject { public AttendanceReport attendanceReport; public DateTime end; public string map; diff --git a/UKSF.Api.Models/Operations/Opord.cs b/UKSF.Api.Models/Operations/Opord.cs index 3cba6422..e268dcfc 100644 --- a/UKSF.Api.Models/Operations/Opord.cs +++ b/UKSF.Api.Models/Operations/Opord.cs @@ -1,7 +1,7 @@ using System; namespace UKSF.Api.Models.Operations { - public class Opord : MongoObject { + public class Opord : DatabaseObject { public string description; public DateTime end; public string map; diff --git a/UKSF.Api.Models/Operations/Oprep.cs b/UKSF.Api.Models/Operations/Oprep.cs index 5eda8ac1..c0033d10 100644 --- a/UKSF.Api.Models/Operations/Oprep.cs +++ b/UKSF.Api.Models/Operations/Oprep.cs @@ -2,7 +2,7 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Models.Operations { - public class Oprep : MongoObject { + public class Oprep : DatabaseObject { public AttendanceReport attendanceReport; public string description; public DateTime end; diff --git a/UKSF.Api.Models/Personnel/Account.cs b/UKSF.Api.Models/Personnel/Account.cs index 308f4361..a1e96e65 100644 --- a/UKSF.Api.Models/Personnel/Account.cs +++ b/UKSF.Api.Models/Personnel/Account.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; namespace UKSF.Api.Models.Personnel { - public class Account : MongoObject { + public class Account : DatabaseObject { public Application application; public string armaExperience; public bool aviation; diff --git a/UKSF.Api.Models/Personnel/Discharge.cs b/UKSF.Api.Models/Personnel/Discharge.cs index 443f49ce..39c007e1 100644 --- a/UKSF.Api.Models/Personnel/Discharge.cs +++ b/UKSF.Api.Models/Personnel/Discharge.cs @@ -4,7 +4,7 @@ using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Personnel { - public class DischargeCollection : MongoObject { + public class DischargeCollection : DatabaseObject { [BsonRepresentation(BsonType.ObjectId)] public string accountId; public List discharges = new List(); public string name; @@ -12,7 +12,7 @@ public class DischargeCollection : MongoObject { [BsonIgnore] public bool requestExists; } - public class Discharge : MongoObject { + public class Discharge : DatabaseObject { public string dischargedBy; public string rank; public string reason; diff --git a/UKSF.Api.Models/Personnel/Loa.cs b/UKSF.Api.Models/Personnel/Loa.cs index 7d333f73..12583aae 100644 --- a/UKSF.Api.Models/Personnel/Loa.cs +++ b/UKSF.Api.Models/Personnel/Loa.cs @@ -9,7 +9,7 @@ public enum LoaReviewState { REJECTED } - public class Loa : MongoObject { + public class Loa : DatabaseObject { public bool emergency; public DateTime end; public bool late; diff --git a/UKSF.Api.Models/Personnel/Rank.cs b/UKSF.Api.Models/Personnel/Rank.cs index 6cab249a..ea68f500 100644 --- a/UKSF.Api.Models/Personnel/Rank.cs +++ b/UKSF.Api.Models/Personnel/Rank.cs @@ -1,5 +1,5 @@ namespace UKSF.Api.Models.Personnel { - public class Rank : MongoObject { + public class Rank : DatabaseObject { public string abbreviation; public string discordRoleId; public string name; diff --git a/UKSF.Api.Models/Personnel/Role.cs b/UKSF.Api.Models/Personnel/Role.cs index 8e48a2fe..e16484b9 100644 --- a/UKSF.Api.Models/Personnel/Role.cs +++ b/UKSF.Api.Models/Personnel/Role.cs @@ -4,7 +4,7 @@ public enum RoleType { UNIT } - public class Role : MongoObject { + public class Role : DatabaseObject { public string name; public int order = 0; public RoleType roleType = RoleType.INDIVIDUAL; diff --git a/UKSF.Api.Models/Units/Unit.cs b/UKSF.Api.Models/Units/Unit.cs index e62cf2e7..884e91b5 100644 --- a/UKSF.Api.Models/Units/Unit.cs +++ b/UKSF.Api.Models/Units/Unit.cs @@ -3,7 +3,7 @@ using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Units { - public class Unit : MongoObject { + public class Unit : DatabaseObject { public UnitBranch branch = UnitBranch.COMBAT; public string callsign; public string discordRoleId; diff --git a/UKSF.Api.Models/Utility/ConfirmationCode.cs b/UKSF.Api.Models/Utility/ConfirmationCode.cs index 934a7ce1..74f11787 100644 --- a/UKSF.Api.Models/Utility/ConfirmationCode.cs +++ b/UKSF.Api.Models/Utility/ConfirmationCode.cs @@ -1,5 +1,5 @@ namespace UKSF.Api.Models.Utility { - public class ConfirmationCode : MongoObject { + public class ConfirmationCode : DatabaseObject { public string value; } } diff --git a/UKSF.Api.Models/Utility/ScheduledJob.cs b/UKSF.Api.Models/Utility/ScheduledJob.cs index a9a96072..e9b47fdb 100644 --- a/UKSF.Api.Models/Utility/ScheduledJob.cs +++ b/UKSF.Api.Models/Utility/ScheduledJob.cs @@ -4,11 +4,10 @@ namespace UKSF.Api.Models.Utility { public enum ScheduledJobType { NORMAL, TEAMSPEAK_SNAPSHOT, - LOG_PRUNE, - DISCORD_VOTE_ANNOUNCEMENT + LOG_PRUNE } - public class ScheduledJob : MongoObject { + public class ScheduledJob : DatabaseObject { public string action; public string actionParameters; public TimeSpan interval; diff --git a/UKSF.Api.Models/Utility/UtilityObject.cs b/UKSF.Api.Models/Utility/UtilityObject.cs index 051b84ef..47686070 100644 --- a/UKSF.Api.Models/Utility/UtilityObject.cs +++ b/UKSF.Api.Models/Utility/UtilityObject.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; namespace UKSF.Api.Models.Utility { - public class UtilityObject : MongoObject { + public class UtilityObject : DatabaseObject { public Dictionary values = new Dictionary(); } } diff --git a/UKSF.Api.Services/Fake/FakeDataService.cs b/UKSF.Api.Services/Fake/FakeDataService.cs index 0f92739c..9bc31fed 100644 --- a/UKSF.Api.Services/Fake/FakeDataService.cs +++ b/UKSF.Api.Services/Fake/FakeDataService.cs @@ -30,7 +30,7 @@ public abstract class FakeDataService : IDataService { public Task DeleteMany(Func predicate) => Task.CompletedTask; - public void SetCollectionName(string collectionName) { } + public Task SetCollectionNameAsync(string collectionName) => Task.CompletedTask; public IObservable> EventBus() => new Subject>(); } diff --git a/UKSF.Api.Services/Utility/SchedulerActionHelper.cs b/UKSF.Api.Services/Utility/SchedulerActionHelper.cs index 4d40d0ea..7434f699 100644 --- a/UKSF.Api.Services/Utility/SchedulerActionHelper.cs +++ b/UKSF.Api.Services/Utility/SchedulerActionHelper.cs @@ -29,11 +29,5 @@ public static void PruneLogs() { public static void TeamspeakSnapshot() { ServiceWrapper.ServiceProvider.GetService().StoreTeamspeakServerSnapshot(); } - - public static void DiscordVoteAnnouncement() { - bool run = bool.Parse(VariablesWrapper.VariablesDataService().GetSingle("RUN_DISCORD_CLANLIST").AsString()); - if (!run) return; - ServiceWrapper.ServiceProvider.GetService().SendMessage(ID_CHANNEL_GENERAL, "@everyone - As part of our recruitment drive, we're aiming to gain exposure through a high ranking on Clanlist. To help with this, please go to https://clanlist.io/vote/UKSFMilsim and vote"); - } } } diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index 26d2b84d..724ced6d 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -17,10 +17,8 @@ public class SchedulerService : DataBackedService, ISched public SchedulerService(ISchedulerDataService data, IHostEnvironment currentEnvironment) : base(data) => this.currentEnvironment = currentEnvironment; - public async void Load(bool integrations = false) { - if (integrations) { - Data.SetCollectionName("scheduledJobsIntegrations"); - } else { + public async void Load(bool api = true) { + if (api) { if (!currentEnvironment.IsDevelopment()) { await AddUnique(); } @@ -101,10 +99,6 @@ private async Task AddUnique() { if (Data.GetSingle(x => x.type == ScheduledJobType.TEAMSPEAK_SNAPSHOT) == null) { await Create(DateTime.Today.AddDays(1), TimeSpan.FromMinutes(5), ScheduledJobType.TEAMSPEAK_SNAPSHOT, nameof(SchedulerActionHelper.TeamspeakSnapshot)); } - - if (Data.GetSingle(x => x.type == ScheduledJobType.DISCORD_VOTE_ANNOUNCEMENT) == null) { - await Create(DateTime.Today.AddHours(19), TimeSpan.FromDays(1), ScheduledJobType.DISCORD_VOTE_ANNOUNCEMENT, nameof(SchedulerActionHelper.DiscordVoteAnnouncement)); - } } private async Task SetNext(ScheduledJob job) { diff --git a/UKSF.Api/AppStart/RegisterDataBackedServices.cs b/UKSF.Api/AppStart/RegisterDataBackedServices.cs new file mode 100644 index 00000000..63259fef --- /dev/null +++ b/UKSF.Api/AppStart/RegisterDataBackedServices.cs @@ -0,0 +1,50 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using UKSF.Api.Interfaces.Command; +using UKSF.Api.Interfaces.Game; +using UKSF.Api.Interfaces.Launcher; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Operations; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services.Command; +using UKSF.Api.Services.Fake; +using UKSF.Api.Services.Game; +using UKSF.Api.Services.Launcher; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Operations; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Services.Units; +using UKSF.Api.Services.Utility; + +namespace UKSF.Api.AppStart { + public static class DataBackedServiceExtensions { + public static void RegisterDataBackedServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { + // Non-Cached + services.AddTransient(); + services.AddSingleton(); + services.AddTransient(); + + // Cached + services.AddSingleton(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + + if (currentEnvironment.IsDevelopment()) { + services.AddTransient(); + } else { + services.AddTransient(); + } + } + } +} diff --git a/UKSF.Api/AppStart/RegisterDataServices.cs b/UKSF.Api/AppStart/RegisterDataServices.cs new file mode 100644 index 00000000..72d662e3 --- /dev/null +++ b/UKSF.Api/AppStart/RegisterDataServices.cs @@ -0,0 +1,50 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using UKSF.Api.Data; +using UKSF.Api.Data.Admin; +using UKSF.Api.Data.Command; +using UKSF.Api.Data.Fake; +using UKSF.Api.Data.Game; +using UKSF.Api.Data.Launcher; +using UKSF.Api.Data.Message; +using UKSF.Api.Data.Operations; +using UKSF.Api.Data.Personnel; +using UKSF.Api.Data.Units; +using UKSF.Api.Data.Utility; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; + +namespace UKSF.Api.AppStart { + public static class DataServiceExtensions { + public static void RegisterDataServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { + services.AddTransient(); + + // Non-Cached + services.AddTransient(); + services.AddSingleton(); + services.AddTransient(); + + // Cached + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + + if (currentEnvironment.IsDevelopment()) { + services.AddSingleton(); + } else { + services.AddSingleton(); + } + } + } +} diff --git a/UKSF.Api/AppStart/RegisterEventServices.cs b/UKSF.Api/AppStart/RegisterEventServices.cs new file mode 100644 index 00000000..5ff8e058 --- /dev/null +++ b/UKSF.Api/AppStart/RegisterEventServices.cs @@ -0,0 +1,45 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Events; +using UKSF.Api.Events.Data; +using UKSF.Api.Events.Handlers; +using UKSF.Api.Events.SignalrServer; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Interfaces.Events.Handlers; + +namespace UKSF.Api.AppStart { + public static class EventServiceExtensions { + public static void RegisterEventServices(this IServiceCollection services) { + // Event Buses + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton(); + + // Event Handlers + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + } + } +} diff --git a/UKSF.Api/AppStart/RegisterServices.cs b/UKSF.Api/AppStart/RegisterServices.cs new file mode 100644 index 00000000..f36c10ac --- /dev/null +++ b/UKSF.Api/AppStart/RegisterServices.cs @@ -0,0 +1,69 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using UKSF.Api.Interfaces.Command; +using UKSF.Api.Interfaces.Game; +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Launcher; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Command; +using UKSF.Api.Services.Fake; +using UKSF.Api.Services.Game; +using UKSF.Api.Services.Game.Missions; +using UKSF.Api.Services.Integrations; +using UKSF.Api.Services.Integrations.Teamspeak; +using UKSF.Api.Services.Launcher; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Services.Utility; + +namespace UKSF.Api.AppStart { + public static class ServiceExtensions { + public static void RegisterServices(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { + services.RegisterEventServices(); + services.RegisterDataServices(currentEnvironment); + services.RegisterDataBackedServices(currentEnvironment); + + // Instance Objects + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + + // Global Singletons + services.AddSingleton(configuration); + services.AddSingleton(currentEnvironment); + services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + + if (currentEnvironment.IsDevelopment()) { + services.AddSingleton(); + services.AddSingleton(); + } else { + services.AddSingleton(); + services.AddSingleton(); + } + } + } +} diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 1497596e..05e56db8 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Net; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication.JwtBearer; @@ -14,48 +13,16 @@ using Microsoft.Extensions.Primitives; using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; +using UKSF.Api.AppStart; using UKSF.Api.Data; -using UKSF.Api.Data.Admin; -using UKSF.Api.Data.Command; -using UKSF.Api.Data.Fake; -using UKSF.Api.Data.Game; -using UKSF.Api.Data.Launcher; -using UKSF.Api.Data.Message; -using UKSF.Api.Data.Operations; -using UKSF.Api.Data.Personnel; -using UKSF.Api.Data.Units; -using UKSF.Api.Data.Utility; using UKSF.Api.Events; -using UKSF.Api.Events.Data; -using UKSF.Api.Events.Handlers; -using UKSF.Api.Events.SignalrServer; -using UKSF.Api.Interfaces.Command; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Interfaces.Events.Handlers; -using UKSF.Api.Interfaces.Game; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Launcher; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Operations; using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Services.Admin; -using UKSF.Api.Services.Command; using UKSF.Api.Services.Common; -using UKSF.Api.Services.Fake; -using UKSF.Api.Services.Game; -using UKSF.Api.Services.Game.Missions; -using UKSF.Api.Services.Integrations; -using UKSF.Api.Services.Integrations.Teamspeak; -using UKSF.Api.Services.Launcher; -using UKSF.Api.Services.Message; -using UKSF.Api.Services.Operations; using UKSF.Api.Services.Personnel; -using UKSF.Api.Services.Units; using UKSF.Api.Services.Utility; using UKSF.Api.Signalr.Hubs.Command; using UKSF.Api.Signalr.Hubs.Game; @@ -81,7 +48,17 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration public void ConfigureServices(IServiceCollection services) { services.RegisterServices(configuration, currentEnvironment); - services.AddCors(options => options.AddPolicy("CorsPolicy", builder => { builder.AllowAnyMethod().AllowAnyHeader().WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://integrations.uk-sf.co.uk").AllowCredentials(); })); + services.AddCors( + options => options.AddPolicy( + "CorsPolicy", + builder => { + builder.AllowAnyMethod() + .AllowAnyHeader() + .WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://integrations.uk-sf.co.uk") + .AllowCredentials(); + } + ) + ); services.AddSignalR().AddNewtonsoftJsonProtocol(); services.AddAuthentication( options => { @@ -121,7 +98,7 @@ public void ConfigureServices(IServiceCollection services) { ExceptionHandler.Instance = new ExceptionHandler(); services.AddControllers(); - services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo {Title = "UKSF API", Version = "v1"}); }); + services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo { Title = "UKSF API", Version = "v1" }); }); services.AddMvc(options => { options.Filters.Add(ExceptionHandler.Instance); }).AddNewtonsoftJson(); } @@ -138,7 +115,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl app.UseAuthentication(); app.UseAuthorization(); app.UseHsts(); - app.UseForwardedHeaders(new ForwardedHeadersOptions {ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto}); + app.UseForwardedHeaders(new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto }); app.UseEndpoints( endpoints => { endpoints.MapControllers().RequireCors("CorsPolicy"); @@ -185,7 +162,13 @@ private static void WarmDataServices() { DataCacheService dataCacheService = Global.ServiceProvider.GetService(); List servicesTypes = AppDomain.CurrentDomain.GetAssemblies() .SelectMany(x => x.GetTypes()) - .Where(x => !x.IsAbstract && !x.IsInterface && x.BaseType != null && x.BaseType.IsGenericType && x.BaseType.GetGenericTypeDefinition() == typeof(CachedDataService<,>)) + .Where( + x => !x.IsAbstract && + !x.IsInterface && + x.BaseType != null && + x.BaseType.IsGenericType && + x.BaseType.GetGenericTypeDefinition() == typeof(CachedDataService<,>) + ) .Select(x => x.GetInterfaces().Reverse().FirstOrDefault(y => !y.IsGenericType)) .ToList(); foreach (object service in servicesTypes.Select(type => Global.ServiceProvider.GetService(type))) { @@ -201,140 +184,6 @@ private static void OnShutdown() { } } - public static class ServiceExtensions { - public static void RegisterServices(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { - RegisterEventServices(services); - RegisterDataServices(services, currentEnvironment); - RegisterDataBackedServices(services, currentEnvironment); - - // Instance Objects - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - - // Global Singletons - services.AddSingleton(configuration); - services.AddSingleton(currentEnvironment); - services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - - if (currentEnvironment.IsDevelopment()) { - services.AddSingleton(); - services.AddSingleton(); - } else { - services.AddSingleton(); - services.AddSingleton(); - } - } - - private static void RegisterEventServices(this IServiceCollection services) { - // Event Buses - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton(); - - // Event Handlers - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - } - - private static void RegisterDataServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { - services.AddTransient(); - - // Non-Cached - services.AddTransient(); - services.AddSingleton(); - services.AddTransient(); - - // Cached - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - - if (currentEnvironment.IsDevelopment()) { - services.AddSingleton(); - } else { - services.AddSingleton(); - } - } - - private static void RegisterDataBackedServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { - // Non-Cached - services.AddTransient(); - services.AddSingleton(); - services.AddTransient(); - - // Cached - services.AddSingleton(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - - if (currentEnvironment.IsDevelopment()) { - services.AddTransient(); - } else { - services.AddTransient(); - } - } - } - // ReSharper disable once ClassNeverInstantiated.Global public class CorsMiddleware { private readonly RequestDelegate next; @@ -356,27 +205,4 @@ public static class CorsMiddlewareExtensions { // ReSharper disable once UnusedMethodReturnValue.Global public static IApplicationBuilder UseCorsMiddleware(this IApplicationBuilder builder) => builder.UseMiddleware(); } - - public static class HttpRequestExtensions { - public static bool IsLocal(this HttpRequest req) { - ConnectionInfo connection = req.HttpContext.Connection; - if (connection.RemoteIpAddress != null) { - if (connection.LocalIpAddress != null) { - return connection.RemoteIpAddress.Equals(connection.LocalIpAddress); - } - - return IPAddress.IsLoopback(connection.RemoteIpAddress); - } - - // for in memory TestServer or when dealing with default connection info - if (connection.RemoteIpAddress == null && connection.LocalIpAddress == null) { - return true; - } - - return false; - } - } } - -// Request Singletons -// services.AddScoped<>(); diff --git a/UKSF.Integrations/Startup.cs b/UKSF.Integrations/Startup.cs index 1353d0b6..f389de6f 100644 --- a/UKSF.Integrations/Startup.cs +++ b/UKSF.Integrations/Startup.cs @@ -7,6 +7,7 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.OpenApi.Models; +using UKSF.Api.Data; using UKSF.Api.Data.Admin; using UKSF.Api.Data.Message; using UKSF.Api.Data.Personnel; @@ -64,30 +65,31 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact ServiceWrapper.ServiceProvider = Global.ServiceProvider; // Start scheduler - Global.ServiceProvider.GetService().Load(true); + Global.ServiceProvider.GetService().Load(false); } } public static class ServiceExtensions { - public static IServiceCollection RegisterServices(this IServiceCollection services, IConfiguration configuration) { + public static void RegisterServices(this IServiceCollection services, IConfiguration configuration) { // Instance Objects services.AddTransient(); services.AddTransient(); // Global Singletons services.AddSingleton(configuration); - services.AddSingleton(_ => MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); services.AddSingleton(); services.AddSingleton(); services.AddTransient(); services.AddSingleton(); services.AddTransient(); + services.AddSingleton(_ => MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); + services.AddTransient(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); // Event Buses @@ -97,8 +99,6 @@ public static IServiceCollection RegisterServices(this IServiceCollection servic services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); - - return services; } } } diff --git a/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs index d73f9917..835938d6 100644 --- a/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs @@ -5,6 +5,7 @@ using FluentAssertions; using MongoDB.Driver; using Moq; +using UKSF.Api.Data; using UKSF.Api.Data.Admin; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; @@ -19,13 +20,14 @@ public class VariablesDataServiceTests { private List mockCollection; public VariablesDataServiceTests() { + Mock mockDataCollectionFactory = new Mock(); + Mock> mockDataEventBus = new Mock>(); mockDataCollection = new Mock(); - Mock> mockdataEventBus = new Mock>(); - variablesDataService = new VariablesDataService(mockDataCollection.Object, mockdataEventBus.Object); - - mockCollection = new List(); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + + variablesDataService = new VariablesDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Fact] @@ -69,7 +71,7 @@ public async Task ShouldUpdateItemValue() { VariableItem subject = new VariableItem {key = "DISCORD_ID", item = "50"}; mockCollection = new List {subject}; - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).item = "75"); + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).item = "75"); await variablesDataService.Update("discord id", "75"); @@ -90,7 +92,7 @@ public async Task ShouldDeleteItem() { VariableItem item1 = new VariableItem {key = "DISCORD_ID", item = "50"}; mockCollection = new List {item1}; - mockDataCollection.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); await variablesDataService.Delete("discord id"); diff --git a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs index b4630759..94df0790 100644 --- a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs @@ -6,6 +6,7 @@ using FluentAssertions; using MongoDB.Driver; using Moq; +using UKSF.Api.Data; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; @@ -18,14 +19,14 @@ public class CachedDataServiceTests { private List mockCollection; public CachedDataServiceTests() { - mockDataCollection = new Mock(); + Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); + mockDataCollection = new Mock(); - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = null); - mockDataCollection.Setup(x => x.SetCollectionName(It.IsAny())); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataEventBus.Setup(x => x.Send(It.IsAny>())); - mockCachedDataService = new MockCachedDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + mockCachedDataService = new MockCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); } [Fact] @@ -125,7 +126,7 @@ public async Task ShouldRefreshCollectionForAdd() { mockCollection = new List(); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.Add(It.IsAny())).Callback(x => mockCollection.Add(x)); + mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Callback(x => mockCollection.Add(x)); mockCachedDataService.Collection.Should().BeNull(); @@ -142,7 +143,7 @@ public async Task ShouldRefreshCollectionForDelete() { mockCollection = new List { item1, item2 }; mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.Delete(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); await mockCachedDataService.Delete(item1.id); @@ -158,7 +159,7 @@ public async Task ShouldRefreshCollectionForDeleteMany() { mockCollection = new List { item1, item2, item3 }; mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.DeleteMany(It.IsAny>>())) + mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) .Returns(Task.CompletedTask) .Callback((Expression> expression) => mockCollection.RemoveAll(x => mockCollection.Where(expression.Compile()).Contains(x))); @@ -176,7 +177,7 @@ public async Task ShouldRefreshCollectionForReplace() { mockCollection = new List { item1 }; mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.Replace(It.IsAny(), It.IsAny())) + mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())) .Returns(Task.CompletedTask) .Callback((string id, MockDataModel value) => mockCollection[mockCollection.FindIndex(x => x.id == id)] = value); @@ -192,7 +193,7 @@ public async Task ShouldRefreshCollectionForUpdate() { mockCollection = new List { item1 }; mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); @@ -208,7 +209,7 @@ public async Task ShouldRefreshCollectionForUpdateByUpdateDefinition() { mockCollection = new List { item1 }; mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); @@ -226,7 +227,7 @@ public async Task ShouldRefreshCollectionForUpdateMany() { mockCollection = new List { item1, item2, item3 }; mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.UpdateMany(It.IsAny>>(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback( (Expression> expression, UpdateDefinition _) => diff --git a/UKSF.Tests.Unit/Data/DataServiceTests.cs b/UKSF.Tests.Unit/Data/DataServiceTests.cs index aaadb9df..07462eb0 100644 --- a/UKSF.Tests.Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/DataServiceTests.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.Serialization; using MongoDB.Driver; using Moq; using UKSF.Api.Interfaces.Data; @@ -16,19 +15,18 @@ namespace UKSF.Tests.Unit.Data { public class DataServiceTests { private readonly Mock mockDataCollection; - private readonly Mock> mockDataEventBus; private readonly MockDataService mockDataService; private List mockCollection; public DataServiceTests() { + Mock mockDataCollectionFactory = new Mock(); + Mock> mockDataEventBus = new Mock>(); mockDataCollection = new Mock(); - mockDataEventBus = new Mock>(); mockDataEventBus.Setup(x => x.Send(It.IsAny>())); - mockDataCollection.Setup(x => x.AssertCollectionExists()).Callback(() => mockCollection = new List()); - mockDataCollection.Setup(x => x.SetCollectionName(It.IsAny())); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataService = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); + mockDataService = new MockDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); } [Theory, InlineData(""), InlineData(null)] @@ -88,8 +86,9 @@ public void ShouldThrowForUpdateWithUpdateDefinitionWhenNoKeyOrNull(string id) { [Fact] public async Task ShouldAddItem() { MockDataModel item1 = new MockDataModel { Name = "1" }; + mockCollection = new List(); - mockDataCollection.Setup(x => x.Add(It.IsAny())).Callback(x => mockCollection.Add(x)); + mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Callback(x => mockCollection.Add(x)); await mockDataService.Add(item1); @@ -102,7 +101,7 @@ public async Task ShouldDeleteItem() { MockDataModel item2 = new MockDataModel { Name = "2" }; mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.Delete(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); await mockDataService.Delete(item1.id); @@ -162,7 +161,7 @@ public async Task ShouldMakeSetUpdate() { BsonValue expected = TestUtilities.Render(Builders.Update.Set(x => x.Name, "2")); UpdateDefinition subject = null; - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback((string x, UpdateDefinition y) => subject = y); @@ -178,7 +177,7 @@ public async Task ShouldMakeUnsetUpdate() { BsonValue expected = TestUtilities.Render(Builders.Update.Unset(x => x.Name)); UpdateDefinition subject = null; - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback((string x, UpdateDefinition y) => subject = y); @@ -187,16 +186,6 @@ public async Task ShouldMakeUnsetUpdate() { TestUtilities.Render(subject).Should().BeEquivalentTo(expected); } - [Fact] - public void ShouldSetCollectionName() { - string collectionName = ""; - - mockDataCollection.Setup(x => x.SetCollectionName(It.IsAny())).Callback((string x) => collectionName = x); - - MockDataService unused = new MockDataService(mockDataCollection.Object, mockDataEventBus.Object, "test"); - collectionName.Should().Be("test"); - } - [Fact] public void ShouldThrowForAddWhenItemIsNull() { Func act = async () => await mockDataService.Add(null); @@ -209,7 +198,7 @@ public async Task ShouldUpdateItemValue() { MockDataModel item1 = new MockDataModel { Name = "1" }; mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); @@ -225,7 +214,7 @@ public async Task ShouldReplaceItem() { mockCollection = new List { item1 }; mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns(item1); - mockDataCollection.Setup(x => x.Replace(It.IsAny(), It.IsAny())) + mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())) .Returns(Task.CompletedTask) .Callback((string id, MockDataModel item) => mockCollection[mockCollection.FindIndex(x => x.id == id)] = item); @@ -240,7 +229,7 @@ public async Task ShouldUpdateItemValueByUpdateDefinition() { MockDataModel item1 = new MockDataModel { Name = "1" }; mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); @@ -256,7 +245,7 @@ public async Task ShouldUpdateMany() { mockCollection = new List { item1, item2 }; mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.UpdateMany(It.IsAny>>(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback((Expression> expression, UpdateDefinition _) => mockCollection.Where(expression.Compile()).ToList().ForEach(y => y.Name = "2")); @@ -273,7 +262,7 @@ public async Task ShouldDeleteMany() { mockCollection = new List { item1, item2 }; mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.DeleteMany(It.IsAny>>())) + mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) .Returns(Task.CompletedTask) .Callback((Expression> expression) => mockCollection.RemoveAll(x => mockCollection.Where(expression.Compile()).Contains(x))); diff --git a/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs b/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs index 8c3774c0..f9dbbcae 100644 --- a/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using FluentAssertions; using Moq; +using UKSF.Api.Data; using UKSF.Api.Data.Game; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; @@ -14,10 +15,13 @@ public class GameServersDataServiceTests { private readonly GameServersDataService gameServersDataService; public GameServersDataServiceTests() { - mockDataCollection = new Mock(); + Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); + mockDataCollection = new Mock(); + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - gameServersDataService = new GameServersDataService(mockDataCollection.Object, mockDataEventBus.Object); + gameServersDataService = new GameServersDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Fact] diff --git a/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs b/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs index 4c6febd5..561a0bde 100644 --- a/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs @@ -4,6 +4,7 @@ using MongoDB.Bson; using MongoDB.Driver; using Moq; +using UKSF.Api.Data; using UKSF.Api.Data.Message; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; @@ -19,13 +20,14 @@ public class CommentThreadDataServiceTests { private List mockCollection; public CommentThreadDataServiceTests() { + Mock mockDataCollectionFactory = new Mock(); + Mock> mockDataEventBus = new Mock>(); mockDataCollection = new Mock(); - Mock> mockdataEventBus = new Mock>(); - commentThreadDataService = new CommentThreadDataService(mockDataCollection.Object, mockdataEventBus.Object); - - mockCollection = new List(); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + + commentThreadDataService = new CommentThreadDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Fact] @@ -37,7 +39,7 @@ public async Task ShouldCreateCorrectUdpateDefinitionForAdd() { BsonValue expected = TestUtilities.Render(Builders.Update.Push(x => x.comments, comment)); UpdateDefinition subject = null; - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback>((_, update) => subject = update); @@ -55,7 +57,7 @@ public async Task ShouldCreateCorrectUdpateDefinitionForDelete() { BsonValue expected = TestUtilities.Render(Builders.Update.Pull(x => x.comments, comment)); UpdateDefinition subject = null; - mockDataCollection.Setup(x => x.Update(It.IsAny(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback>((_, update) => subject = update); diff --git a/UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs b/UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs index 87dae4ba..e7de7067 100644 --- a/UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs @@ -1,4 +1,4 @@ -using System.Diagnostics.Contracts; +using System.Collections.Generic; using System.Threading.Tasks; using FluentAssertions; using Moq; @@ -10,50 +10,106 @@ namespace UKSF.Tests.Unit.Data.Message { public class LogDataServiceTests { - private readonly Mock mockDataCollection; + private readonly List mockBasicCollection; + private readonly List mockAuditCollection; + private readonly List mockLauncherCollection; + private readonly List mockErrorCollection; private readonly LogDataService logDataService; public LogDataServiceTests() { - mockDataCollection = new Mock(); Mock> mockDataEventBus = new Mock>(); + Mock mockDataCollectionFactory = new Mock(); - logDataService = new LogDataService(mockDataCollection.Object, mockDataEventBus.Object); + Mock mockBasicDataCollection = new Mock(); + Mock mockAuditDataCollection = new Mock(); + Mock mockLauncherDataCollection = new Mock(); + Mock mockErrorDataCollection = new Mock(); + + mockBasicCollection = new List(); + mockAuditCollection = new List(); + mockLauncherCollection = new List(); + mockErrorCollection = new List(); + + mockBasicDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockBasicCollection.Add(x)); + + mockAuditDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockAuditCollection.Add(x)); + + mockLauncherDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockLauncherCollection.Add(x)); + + mockErrorDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockErrorCollection.Add(x)); + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("logs")).Returns(mockBasicDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("auditLogs")).Returns(mockAuditDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("launcherLogs")).Returns(mockLauncherDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("errorLogs")).Returns(mockErrorDataCollection.Object); + + logDataService = new LogDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + } + + [Fact] + public async Task ShouldUseLogCollection() { + BasicLogMessage logMessage = new BasicLogMessage("test"); + + await logDataService.Add(logMessage); + + mockBasicCollection.Should().ContainSingle().And.Contain(logMessage); + mockAuditCollection.Should().BeEmpty(); + mockLauncherCollection.Should().BeEmpty(); + mockErrorCollection.Should().BeEmpty(); } [Fact] public async Task ShouldUseAuditLogCollection() { AuditLogMessage logMessage = new AuditLogMessage(); - string subject = ""; - - mockDataCollection.Setup(x => x.Add(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask).Callback((collectionName, _) => subject = collectionName); await logDataService.Add(logMessage); - subject.Should().Be("auditLogs"); + mockBasicCollection.Should().BeEmpty(); + mockAuditCollection.Should().ContainSingle().And.Contain(logMessage); + mockLauncherCollection.Should().BeEmpty(); + mockErrorCollection.Should().BeEmpty(); } [Fact] public async Task ShouldUseLauncherLogCollection() { LauncherLogMessage logMessage = new LauncherLogMessage("1", "test"); - string subject = ""; - - mockDataCollection.Setup(x => x.Add(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask).Callback((collectionName, _) => subject = collectionName); await logDataService.Add(logMessage); - subject.Should().Be("launcherLogs"); + mockBasicCollection.Should().BeEmpty(); + mockAuditCollection.Should().BeEmpty(); + mockLauncherCollection.Should().ContainSingle().And.Contain(logMessage); + mockErrorCollection.Should().BeEmpty(); } [Fact] public async Task ShouldUseErrorLogCollection() { WebLogMessage logMessage = new WebLogMessage(); - string subject = ""; - - mockDataCollection.Setup(x => x.Add(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask).Callback((collectionName, _) => subject = collectionName); await logDataService.Add(logMessage); - subject.Should().Be("errorLogs"); + mockBasicCollection.Should().BeEmpty(); + mockAuditCollection.Should().BeEmpty(); + mockLauncherCollection.Should().BeEmpty(); + mockErrorCollection.Should().ContainSingle().And.Contain(logMessage); + } + + [Fact] + public async Task ShouldUseCorrectCollection() { + BasicLogMessage basicLogMessage = new BasicLogMessage("test"); + AuditLogMessage auditLogMessage = new AuditLogMessage(); + LauncherLogMessage launcherLogMessage = new LauncherLogMessage("1", "test"); + WebLogMessage webLogMessage = new WebLogMessage(); + + await logDataService.Add(basicLogMessage); + await logDataService.Add(auditLogMessage); + await logDataService.Add(launcherLogMessage); + await logDataService.Add(webLogMessage); + + mockBasicCollection.Should().ContainSingle().And.Contain(basicLogMessage); + mockAuditCollection.Should().ContainSingle().And.Contain(auditLogMessage); + mockLauncherCollection.Should().ContainSingle().And.Contain(launcherLogMessage); + mockErrorCollection.Should().ContainSingle().And.Contain(webLogMessage); } } } diff --git a/UKSF.Tests.Unit/Data/MockCachedDataService.cs b/UKSF.Tests.Unit/Data/MockCachedDataService.cs index 9d2d322d..9acec7ac 100644 --- a/UKSF.Tests.Unit/Data/MockCachedDataService.cs +++ b/UKSF.Tests.Unit/Data/MockCachedDataService.cs @@ -4,6 +4,6 @@ namespace UKSF.Tests.Unit.Data { public class MockCachedDataService : CachedDataService, IMockCachedDataService { - public MockCachedDataService(IDataCollection dataCollection, IDataEventBus dataEventBus, string collectionName) : base(dataCollection, dataEventBus, collectionName) { } + public MockCachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } } } diff --git a/UKSF.Tests.Unit/Data/MockDataService.cs b/UKSF.Tests.Unit/Data/MockDataService.cs index 08f2137d..079635f6 100644 --- a/UKSF.Tests.Unit/Data/MockDataService.cs +++ b/UKSF.Tests.Unit/Data/MockDataService.cs @@ -4,6 +4,6 @@ namespace UKSF.Tests.Unit.Data { public class MockDataService : DataService, IMockDataService { - public MockDataService(IDataCollection dataCollection, IDataEventBus dataEventBus, string collectionName) : base(dataCollection, dataEventBus, collectionName) { } + public MockDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } } } diff --git a/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs b/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs index bafc2553..87a904f9 100644 --- a/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs @@ -2,10 +2,12 @@ using System.Threading.Tasks; using FluentAssertions; using Moq; +using UKSF.Api.Data; using UKSF.Api.Data.Operations; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Message; using UKSF.Api.Models.Operations; using Xunit; @@ -15,10 +17,13 @@ public class OperationOrderDataServiceTests { private readonly OperationOrderDataService operationOrderDataService; public OperationOrderDataServiceTests() { - mockDataCollection = new Mock(); + Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); + mockDataCollection = new Mock(); + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - operationOrderDataService = new OperationOrderDataService(mockDataCollection.Object, mockDataEventBus.Object); + operationOrderDataService = new OperationOrderDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Fact] diff --git a/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs b/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs index 853d6185..69b7623b 100644 --- a/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using FluentAssertions; using Moq; +using UKSF.Api.Data; using UKSF.Api.Data.Operations; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; @@ -16,10 +17,13 @@ public class OperationReportDataServiceTests { private readonly OperationReportDataService operationReportDataService; public OperationReportDataServiceTests() { - mockDataCollection = new Mock(); + Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); + mockDataCollection = new Mock(); + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - operationReportDataService = new OperationReportDataService(mockDataCollection.Object, mockDataEventBus.Object); + operationReportDataService = new OperationReportDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Fact] diff --git a/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs index 4cc6ab11..8bc2339e 100644 --- a/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using FluentAssertions; using Moq; +using UKSF.Api.Data; using UKSF.Api.Data.Personnel; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; @@ -13,17 +14,19 @@ namespace UKSF.Tests.Unit.Data.Personnel { public class DischargeDataServiceTests { [Fact] public void ShouldGetOrderedCollection() { - Mock mockDataCollection = new Mock(); + Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); - - DischargeDataService dischargeDataService = new DischargeDataService(mockDataCollection.Object, mockDataEventBus.Object); + Mock mockDataCollection = new Mock(); DischargeCollection dischargeCollection1 = new DischargeCollection {discharges = new List {new Discharge {timestamp = DateTime.Now.AddDays(-3)}}}; DischargeCollection dischargeCollection2 = new DischargeCollection {discharges = new List {new Discharge {timestamp = DateTime.Now.AddDays(-10)}, new Discharge {timestamp = DateTime.Now.AddDays(-1)}}}; DischargeCollection dischargeCollection3 = new DischargeCollection {discharges = new List {new Discharge {timestamp = DateTime.Now.AddDays(-5)}, new Discharge {timestamp = DateTime.Now.AddDays(-2)}}}; + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataCollection.Setup(x => x.Get()).Returns(new List {dischargeCollection1, dischargeCollection2, dischargeCollection3}); + DischargeDataService dischargeDataService = new DischargeDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + List subject = dischargeDataService.Get(); subject.Should().ContainInOrder(dischargeCollection2, dischargeCollection3, dischargeCollection1); diff --git a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs index 2b899502..708a1bbf 100644 --- a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using FluentAssertions; using Moq; +using UKSF.Api.Data; using UKSF.Api.Data.Personnel; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; @@ -14,10 +15,13 @@ public class RanksDataServiceTests { private readonly RanksDataService ranksDataService; public RanksDataServiceTests() { - mockDataCollection = new Mock(); + Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); + mockDataCollection = new Mock(); + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - ranksDataService = new RanksDataService(mockDataCollection.Object, mockDataEventBus.Object); + ranksDataService = new RanksDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Theory, InlineData(""), InlineData(null)] diff --git a/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs index 86e39647..9e9212e0 100644 --- a/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using FluentAssertions; using Moq; +using UKSF.Api.Data; using UKSF.Api.Data.Personnel; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; @@ -14,10 +15,13 @@ public class RolesDataServiceTests { private readonly RolesDataService rolesDataService; public RolesDataServiceTests() { - mockDataCollection = new Mock(); + Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); + mockDataCollection = new Mock(); + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - rolesDataService = new RolesDataService(mockDataCollection.Object, mockDataEventBus.Object); + rolesDataService = new RolesDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Fact] diff --git a/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs index 450808de..96449647 100644 --- a/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs @@ -1,10 +1,12 @@ using System.Collections.Generic; using FluentAssertions; using Moq; +using UKSF.Api.Data; using UKSF.Api.Data.Units; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Message; using Xunit; using UUnit = UKSF.Api.Models.Units.Unit; @@ -12,17 +14,19 @@ namespace UKSF.Tests.Unit.Data.Units { public class UnitsDataServiceTests { [Fact] public void ShouldGetOrderedCollection() { - Mock mockDataCollection = new Mock(); + Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); - - UnitsDataService unitsDataService = new UnitsDataService(mockDataCollection.Object, mockDataEventBus.Object); + Mock mockDataCollection = new Mock(); UUnit rank1 = new UUnit {name = "Air Troop", order = 2}; UUnit rank2 = new UUnit {name = "UKSF", order = 0}; UUnit rank3 = new UUnit {name = "SAS", order = 1}; + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); + UnitsDataService unitsDataService = new UnitsDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + List subject = unitsDataService.Get(); subject.Should().ContainInOrder(rank2, rank3, rank1); diff --git a/UKSF.Tests.Unit/Events/DataEventBackerTests.cs b/UKSF.Tests.Unit/Events/DataEventBackerTests.cs index 11465e5c..5c1c9b5e 100644 --- a/UKSF.Tests.Unit/Events/DataEventBackerTests.cs +++ b/UKSF.Tests.Unit/Events/DataEventBackerTests.cs @@ -1,6 +1,7 @@ using System; using FluentAssertions; using Moq; +using UKSF.Api.Data; using UKSF.Api.Events.Data; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; @@ -10,17 +11,20 @@ namespace UKSF.Tests.Unit.Events { public class DataEventBackerTests { + private readonly MockDataService mockDataService; + public DataEventBackerTests() { - mockDataCollection = new Mock(); - dataEventBus = new DataEventBus(); - } + Mock mockDataCollectionFactory = new Mock(); + IDataEventBus dataEventBus = new DataEventBus(); + Mock mockDataCollection = new Mock(); - private readonly Mock mockDataCollection; - private readonly IDataEventBus dataEventBus; + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + + mockDataService = new MockDataService(mockDataCollectionFactory.Object, dataEventBus, "test"); + } [Fact] public void ShouldReturnEventBus() { - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, dataEventBus, "test"); IObservable> subject = mockDataService.EventBus(); subject.Should().NotBeNull(); @@ -32,7 +36,6 @@ public void ShouldSendEvent() { string id = item1.id; DataEventModel subject = null; - MockDataService mockDataService = new MockDataService(mockDataCollection.Object, dataEventBus, "test"); mockDataService.EventBus().Subscribe(x => { subject = x; }); mockDataService.Add(item1); diff --git a/UKSF.Tests.Unit/MockDataModel.cs b/UKSF.Tests.Unit/MockDataModel.cs index d77e54a5..ffe03378 100644 --- a/UKSF.Tests.Unit/MockDataModel.cs +++ b/UKSF.Tests.Unit/MockDataModel.cs @@ -1,7 +1,7 @@ using UKSF.Api.Models; namespace UKSF.Tests.Unit { - public class MockDataModel : MongoObject { + public class MockDataModel : DatabaseObject { public string Name; } } From a4cb292ba46b251297a3a382cacef14ff2e2e909 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 23 Feb 2020 18:58:59 +0000 Subject: [PATCH 136/369] Cleanup rider warnings --- UKSF.Api.Data/Admin/VariablesDataService.cs | 1 - UKSF.Api.Data/Fake/FakeNotificationsDataService.cs | 3 --- UKSF.Api.Data/Message/CommentThreadDataService.cs | 1 - UKSF.Api.Data/Message/LogDataService.cs | 1 - UKSF.Api.Data/Message/NotificationsDataService.cs | 5 +---- UKSF.Api.Data/Personnel/RanksDataService.cs | 1 - UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs | 3 --- .../Data/Cached/IOperationOrderDataService.cs | 1 - .../Data/Cached/IOperationReportDataService.cs | 1 - UKSF.Api.Services/Game/GameServersService.cs | 4 +--- UKSF.Api.Services/Personnel/RanksService.cs | 1 - UKSF.Api.Services/Utility/SchedulerActionHelper.cs | 4 ---- UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs | 1 - UKSF.Tests.Unit/Common/EventModelFactoryTests.cs | 1 - UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs | 1 - UKSF.Tests.Unit/Data/CachedDataServiceTests.cs | 1 - UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs | 1 - .../Data/Message/CommentThreadDataServiceTests.cs | 1 - .../Data/Operations/OperationOrderDataServiceTests.cs | 3 --- .../Data/Operations/OperationReportDataServiceTests.cs | 3 --- UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs | 1 - UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs | 1 - UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs | 1 - UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs | 2 -- UKSF.Tests.Unit/Events/DataEventBackerTests.cs | 1 - .../Models/Message/Logging/LauncherLogMessageTests.cs | 3 +-- UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs | 3 +-- 27 files changed, 4 insertions(+), 46 deletions(-) diff --git a/UKSF.Api.Data/Admin/VariablesDataService.cs b/UKSF.Api.Data/Admin/VariablesDataService.cs index 44f858c3..27e9a437 100644 --- a/UKSF.Api.Data/Admin/VariablesDataService.cs +++ b/UKSF.Api.Data/Admin/VariablesDataService.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using MongoDB.Driver; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; diff --git a/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs b/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs index 1ede8308..4aebd715 100644 --- a/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs +++ b/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading.Tasks; -using MongoDB.Driver; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Models.Message; using UKSF.Api.Services.Fake; diff --git a/UKSF.Api.Data/Message/CommentThreadDataService.cs b/UKSF.Api.Data/Message/CommentThreadDataService.cs index 76ac7829..06488755 100644 --- a/UKSF.Api.Data/Message/CommentThreadDataService.cs +++ b/UKSF.Api.Data/Message/CommentThreadDataService.cs @@ -1,6 +1,5 @@ using System.Threading.Tasks; using MongoDB.Driver; -using UKSF.Api.Events; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; diff --git a/UKSF.Api.Data/Message/LogDataService.cs b/UKSF.Api.Data/Message/LogDataService.cs index 1f2a5c20..e5eedda6 100644 --- a/UKSF.Api.Data/Message/LogDataService.cs +++ b/UKSF.Api.Data/Message/LogDataService.cs @@ -1,5 +1,4 @@ using System.Threading.Tasks; -using UKSF.Api.Events; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; diff --git a/UKSF.Api.Data/Message/NotificationsDataService.cs b/UKSF.Api.Data/Message/NotificationsDataService.cs index 09c8cdfa..a0329b7c 100644 --- a/UKSF.Api.Data/Message/NotificationsDataService.cs +++ b/UKSF.Api.Data/Message/NotificationsDataService.cs @@ -1,7 +1,4 @@ -using System; -using System.Threading.Tasks; -using MongoDB.Driver; -using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Message; diff --git a/UKSF.Api.Data/Personnel/RanksDataService.cs b/UKSF.Api.Data/Personnel/RanksDataService.cs index cc5c10e9..ba95f889 100644 --- a/UKSF.Api.Data/Personnel/RanksDataService.cs +++ b/UKSF.Api.Data/Personnel/RanksDataService.cs @@ -4,7 +4,6 @@ using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Common; namespace UKSF.Api.Data.Personnel { public class RanksDataService : CachedDataService, IRanksDataService { diff --git a/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs index 4ce4f7a6..485f16da 100644 --- a/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs @@ -1,6 +1,3 @@ -using System; -using System.Threading.Tasks; -using MongoDB.Driver; using UKSF.Api.Models.Message; namespace UKSF.Api.Interfaces.Data.Cached { diff --git a/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs index eed1044d..d4c7d420 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using UKSF.Api.Models.Operations; namespace UKSF.Api.Interfaces.Data.Cached { diff --git a/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs index 31ee6c46..30655ae2 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using UKSF.Api.Models.Operations; namespace UKSF.Api.Interfaces.Data.Cached { diff --git a/UKSF.Api.Services/Game/GameServersService.cs b/UKSF.Api.Services/Game/GameServersService.cs index 6e368f5c..6ff87715 100644 --- a/UKSF.Api.Services/Game/GameServersService.cs +++ b/UKSF.Api.Services/Game/GameServersService.cs @@ -18,9 +18,7 @@ namespace UKSF.Api.Services.Game { public class GameServersService : DataBackedService, IGameServersService { private readonly IMissionPatchingService missionPatchingService; - public GameServersService(IGameServersDataService data, IMissionPatchingService missionPatchingService) : base(data) { - this.missionPatchingService = missionPatchingService; - } + public GameServersService(IGameServersDataService data, IMissionPatchingService missionPatchingService) : base(data) => this.missionPatchingService = missionPatchingService; public int GetGameInstanceCount() => GameServerHelpers.GetArmaProcesses().Count(); diff --git a/UKSF.Api.Services/Personnel/RanksService.cs b/UKSF.Api.Services/Personnel/RanksService.cs index ca42e74a..19879692 100644 --- a/UKSF.Api.Services/Personnel/RanksService.cs +++ b/UKSF.Api.Services/Personnel/RanksService.cs @@ -2,7 +2,6 @@ using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Common; namespace UKSF.Api.Services.Personnel { public class RanksService : DataBackedService, IRanksService { diff --git a/UKSF.Api.Services/Utility/SchedulerActionHelper.cs b/UKSF.Api.Services/Utility/SchedulerActionHelper.cs index 7434f699..c9c6db46 100644 --- a/UKSF.Api.Services/Utility/SchedulerActionHelper.cs +++ b/UKSF.Api.Services/Utility/SchedulerActionHelper.cs @@ -1,18 +1,14 @@ using System; using Microsoft.Extensions.DependencyInjection; using MongoDB.Driver; -using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Integrations.Teamspeak; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Message; using UKSF.Api.Models.Message.Logging; -using UKSF.Api.Services.Admin; using UKSF.Api.Services.Common; namespace UKSF.Api.Services.Utility { public static class SchedulerActionHelper { - private const ulong ID_CHANNEL_GENERAL = 311547576942067713; - public static void DeleteExpiredConfirmationCode(string id) { ServiceWrapper.ServiceProvider.GetService().Data.Delete(id); } diff --git a/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs b/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs index 1fb11207..c90b48fe 100644 --- a/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs +++ b/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.SignalR; using UKSF.Api.Interfaces.Events; using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Models.Events; using UKSF.Api.Models.Events.Types; using UKSF.Common; diff --git a/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs b/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs index f11f0be4..600aa3a0 100644 --- a/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs +++ b/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs @@ -22,7 +22,6 @@ public void ShouldReturnDataEvent() { [Fact] public void ShouldReturnSignalrEvent() { - string id = ObjectId.GenerateNewId().ToString(); object args = new[] {"test", "item"}; SignalrEventModel subject = EventModelFactory.CreateSignalrEvent(TeamspeakEventType.CLIENTS, args); diff --git a/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs index 835938d6..6a89d462 100644 --- a/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs @@ -5,7 +5,6 @@ using FluentAssertions; using MongoDB.Driver; using Moq; -using UKSF.Api.Data; using UKSF.Api.Data.Admin; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; diff --git a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs index 94df0790..fb176fe1 100644 --- a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs @@ -6,7 +6,6 @@ using FluentAssertions; using MongoDB.Driver; using Moq; -using UKSF.Api.Data; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; diff --git a/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs b/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs index f9dbbcae..486ba651 100644 --- a/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Data; using UKSF.Api.Data.Game; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; diff --git a/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs b/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs index 561a0bde..36a3fb24 100644 --- a/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs @@ -4,7 +4,6 @@ using MongoDB.Bson; using MongoDB.Driver; using Moq; -using UKSF.Api.Data; using UKSF.Api.Data.Message; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; diff --git a/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs b/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs index 87a904f9..39af8466 100644 --- a/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs @@ -1,13 +1,10 @@ using System.Collections.Generic; -using System.Threading.Tasks; using FluentAssertions; using Moq; -using UKSF.Api.Data; using UKSF.Api.Data.Operations; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Message; using UKSF.Api.Models.Operations; using Xunit; diff --git a/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs b/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs index 69b7623b..fb547383 100644 --- a/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs @@ -1,9 +1,6 @@ using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using FluentAssertions; using Moq; -using UKSF.Api.Data; using UKSF.Api.Data.Operations; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; diff --git a/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs index 8bc2339e..d5b875c8 100644 --- a/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Data; using UKSF.Api.Data.Personnel; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; diff --git a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs index 708a1bbf..e9e74055 100644 --- a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Data; using UKSF.Api.Data.Personnel; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; diff --git a/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs index 9e9212e0..4dd33e3e 100644 --- a/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Data; using UKSF.Api.Data.Personnel; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; diff --git a/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs index 96449647..49553695 100644 --- a/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs @@ -1,12 +1,10 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Data; using UKSF.Api.Data.Units; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Message; using Xunit; using UUnit = UKSF.Api.Models.Units.Unit; diff --git a/UKSF.Tests.Unit/Events/DataEventBackerTests.cs b/UKSF.Tests.Unit/Events/DataEventBackerTests.cs index 5c1c9b5e..bfb7b1db 100644 --- a/UKSF.Tests.Unit/Events/DataEventBackerTests.cs +++ b/UKSF.Tests.Unit/Events/DataEventBackerTests.cs @@ -1,7 +1,6 @@ using System; using FluentAssertions; using Moq; -using UKSF.Api.Data; using UKSF.Api.Events.Data; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; diff --git a/UKSF.Tests.Unit/Models/Message/Logging/LauncherLogMessageTests.cs b/UKSF.Tests.Unit/Models/Message/Logging/LauncherLogMessageTests.cs index 66e7c3b8..baefd71f 100644 --- a/UKSF.Tests.Unit/Models/Message/Logging/LauncherLogMessageTests.cs +++ b/UKSF.Tests.Unit/Models/Message/Logging/LauncherLogMessageTests.cs @@ -1,5 +1,4 @@ -using System; -using FluentAssertions; +using FluentAssertions; using UKSF.Api.Models.Message.Logging; using Xunit; diff --git a/UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs b/UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs index b9780bf7..6c8061b0 100644 --- a/UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs +++ b/UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using FluentAssertions; using Moq; From 82a5b99d9e2f2d744e72d57c5ea015b1fbf2d135 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 24 Feb 2020 18:43:57 +0000 Subject: [PATCH 137/369] Improved data cache class handling. Removed use of dynamic to use cached data services. Added cached data warming to integrations --- UKSF.Api.Data/CachedDataService.cs | 5 +- UKSF.Api.Data/DataService.cs | 6 +- .../Data/Cached/IAccountDataService.cs | 2 +- .../Data/Cached/ICommandRequestDataService.cs | 2 +- .../Data/Cached/ICommentThreadDataService.cs | 2 +- .../Data/Cached/IDischargeDataService.cs | 2 +- .../Data/Cached/IGameServersDataService.cs | 2 +- .../Data/Cached/ILauncherFileDataService.cs | 2 +- .../Data/Cached/ILoaDataService.cs | 2 +- .../Data/Cached/INotificationsDataService.cs | 2 +- .../Data/Cached/IOperationOrderDataService.cs | 2 +- .../Cached/IOperationReportDataService.cs | 2 +- .../Data/Cached/IRanksDataService.cs | 2 +- .../Data/Cached/IRolesDataService.cs | 2 +- .../Data/Cached/IUnitsDataService.cs | 2 +- .../Data/Cached/IVariablesDataService.cs | 2 +- .../Data/ICachedDataService.cs | 5 ++ UKSF.Api.Services/Utility/DataCacheService.cs | 13 ++-- UKSF.Api/AppStart/RegisterDataServices.cs | 5 +- UKSF.Api/AppStart/RegisterServices.cs | 18 +++-- UKSF.Api/Controllers/DataController.cs | 2 +- UKSF.Api/ExceptionHandler.cs | 8 +- UKSF.Api/Startup.cs | 62 ++++++++++------ UKSF.Integrations/Startup.cs | 74 +++++++++++++------ 24 files changed, 138 insertions(+), 88 deletions(-) create mode 100644 UKSF.Api.Interfaces/Data/ICachedDataService.cs diff --git a/UKSF.Api.Data/CachedDataService.cs b/UKSF.Api.Data/CachedDataService.cs index 3851934f..ff612ba2 100644 --- a/UKSF.Api.Data/CachedDataService.cs +++ b/UKSF.Api.Data/CachedDataService.cs @@ -9,11 +9,11 @@ using UKSF.Common; namespace UKSF.Api.Data { - public abstract class CachedDataService : DataService { + public class CachedDataService : DataService, ICachedDataService { private List collection; private readonly object lockObject = new object(); - protected CachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } + public CachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } public List Collection { get => collection; @@ -22,7 +22,6 @@ protected set { } } - // ReSharper disable once MemberCanBeProtected.Global - Used in dynamic call, do not change to protected! // TODO: Stop using this in dynamic call, switch to register or something less........dynamic public void Refresh() { Collection = null; Get(); diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index aaeaa7f3..1d9e3d27 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -42,14 +42,14 @@ public virtual async Task Update(string id, UpdateDefinition update) { // TOD } public virtual async Task UpdateMany(Func predicate, UpdateDefinition update) { - List items = Get(predicate); + List items = Get(predicate); // TODO: Evaluate performance impact of this presence check if (items.Count == 0) throw new KeyNotFoundException("Could not find any items to update"); await dataCollection.UpdateManyAsync(x => predicate(x), update); items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); } public virtual async Task Replace(T item) { - if (GetSingle(x => x.GetIdValue() == item.GetIdValue()) == null) throw new KeyNotFoundException("Could not find item to replace"); + if (GetSingle(x => x.GetIdValue() == item.GetIdValue()) == null) throw new KeyNotFoundException("Could not find item to replace"); // TODO: Evaluate performance impact of this presence check await dataCollection.ReplaceAsync(item.GetIdValue(), item); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, item.GetIdValue())); } @@ -61,7 +61,7 @@ public virtual async Task Delete(string id) { } public virtual async Task DeleteMany(Func predicate) { - List items = Get(predicate); + List items = Get(predicate); // TODO: Evaluate performance impact of this presence check if (items.Count == 0) throw new KeyNotFoundException("Could not find any items to delete"); await dataCollection.DeleteManyAsync(x => predicate(x)); items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, x.GetIdValue()))); diff --git a/UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs index 20394ad0..aa8761bb 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IAccountDataService : IDataService { } + public interface IAccountDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs index b53fde15..3c08403e 100644 --- a/UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Command; namespace UKSF.Api.Interfaces.Data.Cached { - public interface ICommandRequestDataService : IDataService { } + public interface ICommandRequestDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs index 54b6e76f..c12f2173 100644 --- a/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs @@ -3,7 +3,7 @@ using UKSF.Api.Models.Message; namespace UKSF.Api.Interfaces.Data.Cached { - public interface ICommentThreadDataService : IDataService { + public interface ICommentThreadDataService : IDataService, ICachedDataService { Task Update(string id, Comment comment, DataEventType updateType); } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs index e2d314be..77005326 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IDischargeDataService : IDataService { } + public interface IDischargeDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs index b829bfc6..916a0ce9 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Game; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IGameServersDataService : IDataService { } + public interface IGameServersDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs index 9fd4a477..795c246a 100644 --- a/UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Launcher; namespace UKSF.Api.Interfaces.Data.Cached { - public interface ILauncherFileDataService : IDataService { } + public interface ILauncherFileDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs index fe032d86..ea9fc9f9 100644 --- a/UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Interfaces.Data.Cached { - public interface ILoaDataService : IDataService { } + public interface ILoaDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs index 485f16da..9be7d286 100644 --- a/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Message; namespace UKSF.Api.Interfaces.Data.Cached { - public interface INotificationsDataService : IDataService { } + public interface INotificationsDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs index d4c7d420..d4474ac1 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Operations; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IOperationOrderDataService : IDataService { } + public interface IOperationOrderDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs index 30655ae2..a025a785 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Operations; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IOperationReportDataService : IDataService { } + public interface IOperationReportDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs index 572c2cc6..9b0b31e8 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs @@ -2,7 +2,7 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IRanksDataService : IDataService { + public interface IRanksDataService : IDataService, ICachedDataService { new List Get(); new Rank GetSingle(string name); } diff --git a/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs index eefa39b5..e8591ce7 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs @@ -2,7 +2,7 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IRolesDataService : IDataService { + public interface IRolesDataService : IDataService, ICachedDataService { new List Get(); new Role GetSingle(string name); } diff --git a/UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs index b47a88aa..3052772f 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Units; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IUnitsDataService : IDataService { } + public interface IUnitsDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IVariablesDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IVariablesDataService.cs index 8b40cf50..3ae04a93 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IVariablesDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IVariablesDataService.cs @@ -2,7 +2,7 @@ using UKSF.Api.Models.Admin; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IVariablesDataService : IDataService { + public interface IVariablesDataService : IDataService, ICachedDataService { Task Update(string key, object value); } } diff --git a/UKSF.Api.Interfaces/Data/ICachedDataService.cs b/UKSF.Api.Interfaces/Data/ICachedDataService.cs new file mode 100644 index 00000000..e0a8391f --- /dev/null +++ b/UKSF.Api.Interfaces/Data/ICachedDataService.cs @@ -0,0 +1,5 @@ +namespace UKSF.Api.Interfaces.Data { + public interface ICachedDataService { + void Refresh(); + } +} diff --git a/UKSF.Api.Services/Utility/DataCacheService.cs b/UKSF.Api.Services/Utility/DataCacheService.cs index 09e5962b..389a5608 100644 --- a/UKSF.Api.Services/Utility/DataCacheService.cs +++ b/UKSF.Api.Services/Utility/DataCacheService.cs @@ -1,15 +1,16 @@ using System.Collections.Generic; +using UKSF.Api.Interfaces.Data; namespace UKSF.Api.Services.Utility { public class DataCacheService { - private readonly List dataServices = new List(); + private List cachedDataServices; - public void AddDataService(dynamic dataService) => dataServices.Add(dataService); + public void RegisterCachedDataServices(List newCachedDataServices) { + cachedDataServices = newCachedDataServices; + } - public void InvalidateDataCaches() { - foreach (dynamic dataService in dataServices) { - dataService.Refresh(); - } + public void InvalidateCachedData() { + cachedDataServices.ForEach(x => x.Refresh()); } } } diff --git a/UKSF.Api/AppStart/RegisterDataServices.cs b/UKSF.Api/AppStart/RegisterDataServices.cs index 72d662e3..fb077996 100644 --- a/UKSF.Api/AppStart/RegisterDataServices.cs +++ b/UKSF.Api/AppStart/RegisterDataServices.cs @@ -1,6 +1,5 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using UKSF.Api.Data; using UKSF.Api.Data.Admin; using UKSF.Api.Data.Command; using UKSF.Api.Data.Fake; @@ -17,9 +16,8 @@ namespace UKSF.Api.AppStart { public static class DataServiceExtensions { public static void RegisterDataServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { - services.AddTransient(); - // Non-Cached + services.AddSingleton(); services.AddTransient(); services.AddSingleton(); services.AddTransient(); @@ -27,7 +25,6 @@ public static void RegisterDataServices(this IServiceCollection services, IHostE // Cached services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/UKSF.Api/AppStart/RegisterServices.cs b/UKSF.Api/AppStart/RegisterServices.cs index f36c10ac..57dd79be 100644 --- a/UKSF.Api/AppStart/RegisterServices.cs +++ b/UKSF.Api/AppStart/RegisterServices.cs @@ -2,7 +2,9 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using UKSF.Api.Data; using UKSF.Api.Interfaces.Command; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Game; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Integrations.Teamspeak; @@ -25,11 +27,19 @@ namespace UKSF.Api.AppStart { public static class ServiceExtensions { public static void RegisterServices(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { + services.AddSingleton(configuration); + services.AddSingleton(currentEnvironment); + + services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); + services.AddTransient(); + services.AddSingleton(); + services.AddSingleton(); + services.RegisterEventServices(); services.RegisterDataServices(currentEnvironment); services.RegisterDataBackedServices(currentEnvironment); - // Instance Objects + // Services services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -46,14 +56,8 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddTransient(); services.AddTransient(); - // Global Singletons - services.AddSingleton(configuration); - services.AddSingleton(currentEnvironment); - services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/UKSF.Api/Controllers/DataController.cs b/UKSF.Api/Controllers/DataController.cs index 1dba873e..5054bc7b 100644 --- a/UKSF.Api/Controllers/DataController.cs +++ b/UKSF.Api/Controllers/DataController.cs @@ -12,7 +12,7 @@ public class DataController : Controller { [HttpGet("invalidate"), Authorize] public IActionResult Invalidate() { - dataCacheService.InvalidateDataCaches(); + dataCacheService.InvalidateCachedData(); return Ok(); } } diff --git a/UKSF.Api/ExceptionHandler.cs b/UKSF.Api/ExceptionHandler.cs index 7f41b08b..ba58126e 100644 --- a/UKSF.Api/ExceptionHandler.cs +++ b/UKSF.Api/ExceptionHandler.cs @@ -32,9 +32,9 @@ public void OnException(ExceptionContext filterContext) { } } - public void Initialise(ISessionService tempSessionService, IDisplayNameService tempDisplayNameService) { - sessionService = tempSessionService; - displayNameService = tempDisplayNameService; + public void Initialise(ISessionService newSessionService, IDisplayNameService newDisplayNameService) { + sessionService = newSessionService; + displayNameService = newDisplayNameService; } private void Log(HttpContext context, Exception exception) { @@ -44,7 +44,7 @@ private void Log(HttpContext context, Exception exception) { }; // only log errors GET/POST/PUT/PATCH/DELETE or empty http method - if (!new[] {string.Empty, "POST", "GET", "PUT", "PATCH", "DELETE"}.Any(x => (context?.Request.Method ?? string.Empty).Equals(x, StringComparison.OrdinalIgnoreCase))) return; + if (!new[] {string.Empty, "GET", "POST", "PUT", "PATCH", "DELETE"}.Any(x => (context?.Request.Method ?? string.Empty).Equals(x, StringComparison.OrdinalIgnoreCase))) return; LogWrapper.Log(logMessage); } } diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 05e56db8..3e989c65 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication.JwtBearer; @@ -14,8 +13,9 @@ using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; using UKSF.Api.AppStart; -using UKSF.Api.Data; using UKSF.Api.Events; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Integrations.Teamspeak; using UKSF.Api.Interfaces.Personnel; @@ -142,7 +142,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl Global.ServiceProvider.GetService().Migrate(); // Warm cached data services - WarmDataServices(); + RegisterAndWarmCachedData(); // Add event handlers Global.ServiceProvider.GetService().InitEventHandlers(); @@ -157,25 +157,43 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl Global.ServiceProvider.GetService().Load(); } - private static void WarmDataServices() { - // TODO: Redo this trash - DataCacheService dataCacheService = Global.ServiceProvider.GetService(); - List servicesTypes = AppDomain.CurrentDomain.GetAssemblies() - .SelectMany(x => x.GetTypes()) - .Where( - x => !x.IsAbstract && - !x.IsInterface && - x.BaseType != null && - x.BaseType.IsGenericType && - x.BaseType.GetGenericTypeDefinition() == typeof(CachedDataService<,>) - ) - .Select(x => x.GetInterfaces().Reverse().FirstOrDefault(y => !y.IsGenericType)) - .ToList(); - foreach (object service in servicesTypes.Select(type => Global.ServiceProvider.GetService(type))) { - dataCacheService.AddDataService((dynamic) service); - } - - dataCacheService.InvalidateDataCaches(); + private static void RegisterAndWarmCachedData() { + IServiceProvider serviceProvider = Global.ServiceProvider; + IAccountDataService accountDataService = serviceProvider.GetService(); + ICommandRequestDataService commandRequestDataService = serviceProvider.GetService(); + ICommentThreadDataService commentThreadDataService = serviceProvider.GetService(); + IDischargeDataService dischargeDataService = serviceProvider.GetService(); + IGameServersDataService gameServersDataService = serviceProvider.GetService(); + ILauncherFileDataService launcherFileDataService = serviceProvider.GetService(); + ILoaDataService loaDataService = serviceProvider.GetService(); + INotificationsDataService notificationsDataService = serviceProvider.GetService(); + IOperationOrderDataService operationOrderDataService = serviceProvider.GetService(); + IOperationReportDataService operationReportDataService = serviceProvider.GetService(); + IRanksDataService ranksDataService = serviceProvider.GetService(); + IRolesDataService rolesDataService = serviceProvider.GetService(); + IUnitsDataService unitsDataService = serviceProvider.GetService(); + IVariablesDataService variablesDataService = serviceProvider.GetService(); + + DataCacheService dataCacheService = serviceProvider.GetService(); + dataCacheService.RegisterCachedDataServices( + new List { + accountDataService, + commandRequestDataService, + commentThreadDataService, + dischargeDataService, + gameServersDataService, + launcherFileDataService, + loaDataService, + notificationsDataService, + operationOrderDataService, + operationReportDataService, + ranksDataService, + rolesDataService, + unitsDataService, + variablesDataService + } + ); + dataCacheService.InvalidateCachedData(); } private static void OnShutdown() { diff --git a/UKSF.Integrations/Startup.cs b/UKSF.Integrations/Startup.cs index f389de6f..3b6302ef 100644 --- a/UKSF.Integrations/Startup.cs +++ b/UKSF.Integrations/Startup.cs @@ -1,11 +1,12 @@ -using Microsoft.AspNetCore.Authentication.Cookies; +using System; +using System.Collections.Generic; +using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; using Microsoft.OpenApi.Models; using UKSF.Api.Data; using UKSF.Api.Data.Admin; @@ -37,15 +38,23 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration public void ConfigureServices(IServiceCollection services) { services.RegisterServices(configuration); - services.AddCors(options => options.AddPolicy("CorsPolicy", builder => { builder.AllowAnyMethod().AllowAnyHeader().WithOrigins("http://localhost:4200", "http://localhost:5100", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk").AllowCredentials(); })); + services.AddCors( + options => options.AddPolicy( + "CorsPolicy", + builder => { + builder.AllowAnyMethod().AllowAnyHeader().WithOrigins("http://localhost:4200", "http://localhost:5100", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk").AllowCredentials(); + } + ) + ); services.AddAuthentication(options => { options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme; }).AddCookie().AddSteam(); services.AddControllers(); - services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo {Title = "UKSF Integrations API", Version = "v1"}); }); + services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo { Title = "UKSF Integrations API", Version = "v1" }); }); services.AddMvc().AddNewtonsoftJson(); } - public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFactory loggerFactory) { + // ReSharper disable once UnusedMember.Global + public void Configure(IApplicationBuilder app) { if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); } @@ -58,33 +67,49 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env, ILoggerFact app.UseAuthentication(); app.UseAuthorization(); app.UseHsts(); - app.UseForwardedHeaders(new ForwardedHeadersOptions {ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto}); + app.UseForwardedHeaders(new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto }); app.UseEndpoints(endpoints => { endpoints.MapControllers().RequireCors("CorsPolicy"); }); Global.ServiceProvider = app.ApplicationServices; ServiceWrapper.ServiceProvider = Global.ServiceProvider; + // Warm cached data services + RegisterAndWarmCachedData(); + // Start scheduler Global.ServiceProvider.GetService().Load(false); } + + private static void RegisterAndWarmCachedData() { + IServiceProvider serviceProvider = Global.ServiceProvider; + IAccountDataService accountDataService = serviceProvider.GetService(); + IRanksDataService ranksDataService = serviceProvider.GetService(); + IVariablesDataService variablesDataService = serviceProvider.GetService(); + + DataCacheService dataCacheService = serviceProvider.GetService(); + dataCacheService.RegisterCachedDataServices(new List { accountDataService, ranksDataService, variablesDataService }); + dataCacheService.InvalidateCachedData(); + } } public static class ServiceExtensions { public static void RegisterServices(this IServiceCollection services, IConfiguration configuration) { - // Instance Objects - services.AddTransient(); - services.AddTransient(); - - // Global Singletons services.AddSingleton(configuration); - services.AddSingleton(); - services.AddSingleton(); - services.AddTransient(); - services.AddSingleton(); - services.AddTransient(); + services.AddSingleton(); - services.AddSingleton(_ => MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); + // Event Buses + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + + // Database + services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); services.AddTransient(); + + // Data services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); @@ -92,13 +117,14 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddSingleton(); services.AddSingleton(); - // Event Buses - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); + // Services + services.AddSingleton(); + services.AddSingleton(); + services.AddTransient(); + services.AddTransient(); + services.AddSingleton(); + services.AddTransient(); + services.AddTransient(); } } } From 997fe4488067c5dc70171086e867a5eb12a514be Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 25 Feb 2020 18:49:10 +0000 Subject: [PATCH 138/369] Add integration tests for datacollection. Added test data files Further data tests. Changed datacollection to take a type instead of for each method --- UKSF.Api.Data/CachedDataService.cs | 2 +- UKSF.Api.Data/DataCollection.cs | 44 +- UKSF.Api.Data/DataCollectionFactory.cs | 4 +- UKSF.Api.Data/DataService.cs | 14 +- UKSF.Api.Data/Message/LogDataService.cs | 6 +- UKSF.Api.Interfaces/Data/IDataCollection.cs | 23 +- .../Data/IDataCollectionFactory.cs | 2 +- .../Utility/ISchedulerService.cs | 3 +- .../ExceptionHandler.cs | 21 +- UKSF.Api.Services/Utility/SchedulerService.cs | 20 +- UKSF.Api.sln | 28 + UKSF.Api.sln.DotSettings | 2 + UKSF.Api/AppStart/RegisterServices.cs | 5 +- UKSF.Api/Startup.cs | 19 +- UKSF.Common/TaskUtilities.cs | 3 + UKSF.Integrations/Startup.cs | 31 +- .../IMockCachedDataService.cs | 2 +- .../IMockDataService.cs | 4 +- .../MockCachedDataService.cs | 2 +- .../MockComplexDataModel.cs | 2 +- UKSF.Tests.Common/MockDataModel.cs | 9 + .../MockDataService.cs | 2 +- .../TestUtilities.cs | 2 +- UKSF.Tests.Common/UKSF.Tests.Common.csproj | 12 + UKSF.Tests.Common/testdata/accounts.json | 300 + .../testdata/commentThreads.json | 121 + UKSF.Tests.Common/testdata/discharges.json | 60 + UKSF.Tests.Common/testdata/gameServers.json | 33 + UKSF.Tests.Common/testdata/ranks.json | 59 + UKSF.Tests.Common/testdata/roles.json | 50 + UKSF.Tests.Common/testdata/scheduledJobs.json | 24 + .../testdata/scheduledJobsIntegrations.json | 13 + .../testdata/teamspeakSnapshots.json | 250022 +++++++++++++++ UKSF.Tests.Common/testdata/units.json | 179 + UKSF.Tests.Common/testdata/variables.json | 210 + .../Data/DataCollectionTests.cs | 263 + .../Data/DataPerformanceTests.cs | 46 + .../UKSF.Tests.Integration.csproj | 25 + UKSF.Tests.Integration/xunit.runner.json | 3 + UKSF.Tests.Unit/Common/DataUtilitiesTests.cs | 14 + .../Common/EventModelFactoryTests.cs | 1 + UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs | 1 + .../Data/Admin/VariablesDataServiceTests.cs | 10 +- .../Data/CachedDataServiceTests.cs | 35 +- .../Data/DataCollectionFactoryTests.cs | 22 + UKSF.Tests.Unit/Data/DataServiceTests.cs | 15 +- .../Data/Game/GameServersDataServiceTests.cs | 8 +- .../Message/CommentThreadDataServiceTests.cs | 9 +- .../Data/Message/LogDataServiceTests.cs | 16 +- .../OperationOrderDataServiceTests.cs | 10 +- .../OperationReportDataServiceTests.cs | 10 +- .../Personnel/DischargeDataServiceTests.cs | 6 +- .../Data/Personnel/RanksDataServiceTests.cs | 12 +- .../Data/Personnel/RolesDataServiceTests.cs | 12 +- .../Data/Units/UnitsDataServiceTests.cs | 6 +- .../Events/DataEventBackerTests.cs | 6 +- UKSF.Tests.Unit/Events/EventBusTests.cs | 2 +- UKSF.Tests.Unit/MockDataModel.cs | 7 - UKSF.Tests.Unit/UKSF.Tests.Unit.csproj | 1 + UKSF.Tests.Unit/xunit.runner.json | 3 + 60 files changed, 251700 insertions(+), 176 deletions(-) rename {UKSF.Api => UKSF.Api.Services}/ExceptionHandler.cs (73%) rename {UKSF.Tests.Unit/Data => UKSF.Tests.Common}/IMockCachedDataService.cs (81%) rename {UKSF.Tests.Unit/Data => UKSF.Tests.Common}/IMockDataService.cs (75%) rename {UKSF.Tests.Unit/Data => UKSF.Tests.Common}/MockCachedDataService.cs (93%) rename {UKSF.Tests.Unit => UKSF.Tests.Common}/MockComplexDataModel.cs (87%) create mode 100644 UKSF.Tests.Common/MockDataModel.cs rename {UKSF.Tests.Unit/Data => UKSF.Tests.Common}/MockDataService.cs (92%) rename {UKSF.Tests.Unit => UKSF.Tests.Common}/TestUtilities.cs (91%) create mode 100644 UKSF.Tests.Common/UKSF.Tests.Common.csproj create mode 100644 UKSF.Tests.Common/testdata/accounts.json create mode 100644 UKSF.Tests.Common/testdata/commentThreads.json create mode 100644 UKSF.Tests.Common/testdata/discharges.json create mode 100644 UKSF.Tests.Common/testdata/gameServers.json create mode 100644 UKSF.Tests.Common/testdata/ranks.json create mode 100644 UKSF.Tests.Common/testdata/roles.json create mode 100644 UKSF.Tests.Common/testdata/scheduledJobs.json create mode 100644 UKSF.Tests.Common/testdata/scheduledJobsIntegrations.json create mode 100644 UKSF.Tests.Common/testdata/teamspeakSnapshots.json create mode 100644 UKSF.Tests.Common/testdata/units.json create mode 100644 UKSF.Tests.Common/testdata/variables.json create mode 100644 UKSF.Tests.Integration/Data/DataCollectionTests.cs create mode 100644 UKSF.Tests.Integration/Data/DataPerformanceTests.cs create mode 100644 UKSF.Tests.Integration/UKSF.Tests.Integration.csproj create mode 100644 UKSF.Tests.Integration/xunit.runner.json create mode 100644 UKSF.Tests.Unit/Data/DataCollectionFactoryTests.cs delete mode 100644 UKSF.Tests.Unit/MockDataModel.cs create mode 100644 UKSF.Tests.Unit/xunit.runner.json diff --git a/UKSF.Api.Data/CachedDataService.cs b/UKSF.Api.Data/CachedDataService.cs index ff612ba2..ad2c92dd 100644 --- a/UKSF.Api.Data/CachedDataService.cs +++ b/UKSF.Api.Data/CachedDataService.cs @@ -13,7 +13,7 @@ public class CachedDataService : DataService, ICachedDataSer private List collection; private readonly object lockObject = new object(); - public CachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } + protected CachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } public List Collection { get => collection; diff --git a/UKSF.Api.Data/DataCollection.cs b/UKSF.Api.Data/DataCollection.cs index e531d217..dc3ce4ef 100644 --- a/UKSF.Api.Data/DataCollection.cs +++ b/UKSF.Api.Data/DataCollection.cs @@ -9,7 +9,7 @@ using UKSF.Common; namespace UKSF.Api.Data { - public class DataCollection : IDataCollection { + public class DataCollection : IDataCollection { private readonly IMongoDatabase database; private readonly string collectionName; @@ -18,47 +18,47 @@ public DataCollection(IMongoDatabase database, string collectionName) { this.collectionName = collectionName; } - public async Task AssertCollectionExistsAsync() { - if (await CollectionExistsAsync()) { + public async Task AssertCollectionExistsAsync() { + if (!await CollectionExistsAsync()) { await database.CreateCollectionAsync(collectionName); } } - public List Get() => GetCollection().AsQueryable().ToList(); + public List Get() => GetCollection().AsQueryable().ToList(); - public List Get(Func predicate) => GetCollection().AsQueryable().Where(predicate).ToList(); + public List Get(Func predicate) => GetCollection().AsQueryable().Where(predicate).ToList(); - public T GetSingle(string id) { - return GetCollection().AsQueryable().FirstOrDefault(x => x.GetIdValue() == id); // TODO: Async - } + public T GetSingle(string id) => GetCollection().FindSync(Builders.Filter.Eq("id", id)).FirstOrDefault(); - public T GetSingle(Func predicate) => GetCollection().AsQueryable().FirstOrDefault(predicate); // TODO: Async + public T GetSingle(Func predicate) => GetCollection().AsQueryable().FirstOrDefault(predicate); - public async Task AddAsync(T data) { - await GetCollection().InsertOneAsync(data); + public async Task AddAsync(T data) { + await GetCollection().InsertOneAsync(data); } - public async Task UpdateAsync(string id, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter - await GetCollection().UpdateOneAsync(Builders.Filter.Eq("id", id), update); + public async Task UpdateAsync(string id, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter + await GetCollection().UpdateOneAsync(Builders.Filter.Eq("id", id), update); } - public async Task UpdateManyAsync(Expression> predicate, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter - await GetCollection().UpdateManyAsync(predicate, update); + public async Task UpdateManyAsync(Expression> predicate, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter + IEnumerable ids = Get(predicate.Compile()).Select(x => x.GetIdValue()); // This is necessary for filtering items by a default model value (e.g Role order default 0, may not be stored in document) + await GetCollection().UpdateManyAsync(Builders.Filter.In("id", ids), update); } - public async Task ReplaceAsync(string id, T value) { - await GetCollection().ReplaceOneAsync(x => x.GetIdValue() == id, value); + public async Task ReplaceAsync(string id, T value) { + await GetCollection().ReplaceOneAsync(Builders.Filter.Eq("id", id), value); } - public async Task DeleteAsync(string id) { - await GetCollection().DeleteOneAsync(Builders.Filter.Eq("id", id)); + public async Task DeleteAsync(string id) { + await GetCollection().DeleteOneAsync(Builders.Filter.Eq("id", id)); } - public async Task DeleteManyAsync(Expression> predicate) { - await GetCollection().DeleteManyAsync(predicate); + public async Task DeleteManyAsync(Expression> predicate) { + IEnumerable ids = Get(predicate.Compile()).Select(x => x.GetIdValue()); // This is necessary for filtering items by a default model value (e.g Role order default 0, may not be stored in document) + await GetCollection().DeleteManyAsync(Builders.Filter.In("id", ids)); } - private IMongoCollection GetCollection() => database.GetCollection(collectionName); + private IMongoCollection GetCollection() => database.GetCollection(collectionName); private async Task CollectionExistsAsync() => await (await database.ListCollectionsAsync(new ListCollectionsOptions { Filter = new BsonDocument("name", collectionName) })).AnyAsync(); } diff --git a/UKSF.Api.Data/DataCollectionFactory.cs b/UKSF.Api.Data/DataCollectionFactory.cs index 636c3177..0b38ceb8 100644 --- a/UKSF.Api.Data/DataCollectionFactory.cs +++ b/UKSF.Api.Data/DataCollectionFactory.cs @@ -7,8 +7,8 @@ public class DataCollectionFactory : IDataCollectionFactory { public DataCollectionFactory(IMongoDatabase database) => this.database = database; - public IDataCollection CreateDataCollection(string collectionName) { - IDataCollection dataCollection = new DataCollection(database, collectionName); + public IDataCollection CreateDataCollection(string collectionName) { + IDataCollection dataCollection = new DataCollection(database, collectionName); return dataCollection; } } diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index 1d9e3d27..25107f5f 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -10,15 +10,15 @@ namespace UKSF.Api.Data { public abstract class DataService : DataEventBacker, IDataService { - private readonly IDataCollection dataCollection; + private readonly IDataCollection dataCollection; - protected DataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataEventBus) => dataCollection = dataCollectionFactory.CreateDataCollection(collectionName); + protected DataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataEventBus) => dataCollection = dataCollectionFactory.CreateDataCollection(collectionName); - public virtual List Get() => dataCollection.Get(); + public virtual List Get() => dataCollection.Get(); public virtual List Get(Func predicate) => dataCollection.Get(predicate); - public virtual T GetSingle(string id) => dataCollection.GetSingle(id); + public virtual T GetSingle(string id) => dataCollection.GetSingle(id); public virtual T GetSingle(Func predicate) => dataCollection.GetSingle(predicate); @@ -49,21 +49,21 @@ public virtual async Task UpdateMany(Func predicate, UpdateDefinition x.GetIdValue() == item.GetIdValue()) == null) throw new KeyNotFoundException("Could not find item to replace"); // TODO: Evaluate performance impact of this presence check + if (GetSingle(item.GetIdValue()) == null) throw new KeyNotFoundException("Could not find item to replace"); // TODO: Evaluate performance impact of this presence check await dataCollection.ReplaceAsync(item.GetIdValue(), item); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, item.GetIdValue())); } public virtual async Task Delete(string id) { if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); - await dataCollection.DeleteAsync(id); + await dataCollection.DeleteAsync(id); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } public virtual async Task DeleteMany(Func predicate) { List items = Get(predicate); // TODO: Evaluate performance impact of this presence check if (items.Count == 0) throw new KeyNotFoundException("Could not find any items to delete"); - await dataCollection.DeleteManyAsync(x => predicate(x)); + await dataCollection.DeleteManyAsync(x => predicate(x)); items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, x.GetIdValue()))); } } diff --git a/UKSF.Api.Data/Message/LogDataService.cs b/UKSF.Api.Data/Message/LogDataService.cs index e5eedda6..b3485b94 100644 --- a/UKSF.Api.Data/Message/LogDataService.cs +++ b/UKSF.Api.Data/Message/LogDataService.cs @@ -12,17 +12,17 @@ public class LogDataService : DataService, ILo public LogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "logs") => this.dataCollectionFactory = dataCollectionFactory; public async Task Add(AuditLogMessage log) { - await dataCollectionFactory.CreateDataCollection("auditLogs").AddAsync(log); + await dataCollectionFactory.CreateDataCollection("auditLogs").AddAsync(log); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); } public async Task Add(LauncherLogMessage log) { - await dataCollectionFactory.CreateDataCollection("launcherLogs").AddAsync(log); + await dataCollectionFactory.CreateDataCollection("launcherLogs").AddAsync(log); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); } public async Task Add(WebLogMessage log) { - await dataCollectionFactory.CreateDataCollection("errorLogs").AddAsync(log); + await dataCollectionFactory.CreateDataCollection("errorLogs").AddAsync(log); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); } } diff --git a/UKSF.Api.Interfaces/Data/IDataCollection.cs b/UKSF.Api.Interfaces/Data/IDataCollection.cs index 0911b4e4..13e95e98 100644 --- a/UKSF.Api.Interfaces/Data/IDataCollection.cs +++ b/UKSF.Api.Interfaces/Data/IDataCollection.cs @@ -5,17 +5,16 @@ using MongoDB.Driver; namespace UKSF.Api.Interfaces.Data { - public interface IDataCollection { - Task AssertCollectionExistsAsync(); - List Get(); - List Get(Func predicate); - T GetSingle(string id); - T GetSingle(Func predicate); - Task AddAsync(T data); - Task UpdateAsync(string id, UpdateDefinition update); - Task UpdateManyAsync(Expression> predicate, UpdateDefinition update); - Task ReplaceAsync(string id, T value); - Task DeleteAsync(string id); - Task DeleteManyAsync(Expression> predicate); + public interface IDataCollection { + List Get(); + List Get(Func predicate); + T GetSingle(string id); + T GetSingle(Func predicate); + Task AddAsync(T data); + Task UpdateAsync(string id, UpdateDefinition update); + Task UpdateManyAsync(Expression> predicate, UpdateDefinition update); + Task ReplaceAsync(string id, T value); + Task DeleteAsync(string id); + Task DeleteManyAsync(Expression> predicate); } } diff --git a/UKSF.Api.Interfaces/Data/IDataCollectionFactory.cs b/UKSF.Api.Interfaces/Data/IDataCollectionFactory.cs index 95bb7006..0a405a83 100644 --- a/UKSF.Api.Interfaces/Data/IDataCollectionFactory.cs +++ b/UKSF.Api.Interfaces/Data/IDataCollectionFactory.cs @@ -1,5 +1,5 @@ namespace UKSF.Api.Interfaces.Data { public interface IDataCollectionFactory { - IDataCollection CreateDataCollection(string collectionName); + IDataCollection CreateDataCollection(string collectionName); } } diff --git a/UKSF.Api.Interfaces/Utility/ISchedulerService.cs b/UKSF.Api.Interfaces/Utility/ISchedulerService.cs index a1406945..2b78bbcb 100644 --- a/UKSF.Api.Interfaces/Utility/ISchedulerService.cs +++ b/UKSF.Api.Interfaces/Utility/ISchedulerService.cs @@ -5,7 +5,8 @@ namespace UKSF.Api.Interfaces.Utility { public interface ISchedulerService : IDataBackedService { - void Load(bool api = true); + void LoadApi(); + void LoadIntegrations(); Task Create(DateTime next, TimeSpan interval, ScheduledJobType type, string action, params object[] actionParameters); Task Cancel(Func predicate); } diff --git a/UKSF.Api/ExceptionHandler.cs b/UKSF.Api.Services/ExceptionHandler.cs similarity index 73% rename from UKSF.Api/ExceptionHandler.cs rename to UKSF.Api.Services/ExceptionHandler.cs index ba58126e..dce6dc54 100644 --- a/UKSF.Api/ExceptionHandler.cs +++ b/UKSF.Api.Services/ExceptionHandler.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using System.Net; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Extensions; @@ -10,11 +9,15 @@ using UKSF.Api.Models.Message.Logging; using UKSF.Api.Services.Message; -namespace UKSF.Api { +namespace UKSF.Api.Services { public class ExceptionHandler : IExceptionFilter { - public static ExceptionHandler Instance; - private IDisplayNameService displayNameService; - private ISessionService sessionService; + private readonly IDisplayNameService displayNameService; + private readonly ISessionService sessionService; + + public ExceptionHandler(ISessionService sessionService, IDisplayNameService displayNameService) { + this.sessionService = sessionService; + this.displayNameService = displayNameService; + } public void OnException(ExceptionContext filterContext) { if (filterContext == null) throw new ArgumentNullException(nameof(filterContext)); @@ -32,19 +35,11 @@ public void OnException(ExceptionContext filterContext) { } } - public void Initialise(ISessionService newSessionService, IDisplayNameService newDisplayNameService) { - sessionService = newSessionService; - displayNameService = newDisplayNameService; - } - private void Log(HttpContext context, Exception exception) { bool authenticated = context != null && context.User.Identity.IsAuthenticated; WebLogMessage logMessage = new WebLogMessage(exception) { httpMethod = context?.Request.Method ?? string.Empty, url = context?.Request.GetDisplayUrl(), userId = authenticated ? sessionService.GetContextId() : "GUEST", name = authenticated ? displayNameService.GetDisplayName(sessionService.GetContextAccount()) : "GUEST" }; - - // only log errors GET/POST/PUT/PATCH/DELETE or empty http method - if (!new[] {string.Empty, "GET", "POST", "PUT", "PATCH", "DELETE"}.Any(x => (context?.Request.Method ?? string.Empty).Equals(x, StringComparison.OrdinalIgnoreCase))) return; LogWrapper.Log(logMessage); } } diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index 724ced6d..4a9bc938 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -17,18 +17,20 @@ public class SchedulerService : DataBackedService, ISched public SchedulerService(ISchedulerDataService data, IHostEnvironment currentEnvironment) : base(data) => this.currentEnvironment = currentEnvironment; - public async void Load(bool api = true) { - if (api) { - if (!currentEnvironment.IsDevelopment()) { - await AddUnique(); - } + public async void LoadApi() { + if (!currentEnvironment.IsDevelopment()) { + await AddUnique(); } - Data.Get().ForEach(Schedule); + Load(); + } + + public void LoadIntegrations() { + Load(); } public async Task Create(DateTime next, TimeSpan interval, ScheduledJobType type, string action, params object[] actionParameters) { - ScheduledJob job = new ScheduledJob {next = next, action = action, type = type}; + ScheduledJob job = new ScheduledJob { next = next, action = action, type = type }; if (actionParameters.Length > 0) { job.actionParameters = JsonConvert.SerializeObject(actionParameters); } @@ -53,6 +55,10 @@ public async Task Cancel(Func predicate) { await Data.Delete(job.id); } + private void Load() { + Data.Get().ForEach(Schedule); + } + private void Schedule(ScheduledJob job) { CancellationTokenSource token = new CancellationTokenSource(); Task unused = Task.Run( diff --git a/UKSF.Api.sln b/UKSF.Api.sln index 94a0dc2e..62359bcf 100644 --- a/UKSF.Api.sln +++ b/UKSF.Api.sln @@ -30,6 +30,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Tests.Unit", "UKSF.Tes EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Common", "UKSF.Common\UKSF.Common.csproj", "{9FB41E01-8AD4-4110-8AEE-97800CF565E8}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Tests.Integration", "UKSF.Tests.Integration\UKSF.Tests.Integration.csproj", "{9C6DA990-3F34-42A2-AEF2-66E9E238775C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Tests.Common", "UKSF.Tests.Common\UKSF.Tests.Common.csproj", "{3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -172,6 +176,30 @@ Global {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x64.Build.0 = Release|Any CPU {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x86.ActiveCfg = Release|Any CPU {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x86.Build.0 = Release|Any CPU + {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Debug|x64.ActiveCfg = Debug|Any CPU + {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Debug|x64.Build.0 = Debug|Any CPU + {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Debug|x86.ActiveCfg = Debug|Any CPU + {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Debug|x86.Build.0 = Debug|Any CPU + {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Release|Any CPU.Build.0 = Release|Any CPU + {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Release|x64.ActiveCfg = Release|Any CPU + {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Release|x64.Build.0 = Release|Any CPU + {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Release|x86.ActiveCfg = Release|Any CPU + {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Release|x86.Build.0 = Release|Any CPU + {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Debug|x64.ActiveCfg = Debug|Any CPU + {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Debug|x64.Build.0 = Debug|Any CPU + {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Debug|x86.ActiveCfg = Debug|Any CPU + {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Debug|x86.Build.0 = Debug|Any CPU + {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Release|Any CPU.Build.0 = Release|Any CPU + {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Release|x64.ActiveCfg = Release|Any CPU + {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Release|x64.Build.0 = Release|Any CPU + {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Release|x86.ActiveCfg = Release|Any CPU + {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index 672d1f76..d6b18bd6 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -453,7 +453,9 @@ True True True + 10 <data><AttributeFilter ClassMask="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" IsEnabled="True" /></data> + x64 C:\Users\Tim\AppData\Local\JetBrains\Shared\vAny\Sessions 303 diff --git a/UKSF.Api/AppStart/RegisterServices.cs b/UKSF.Api/AppStart/RegisterServices.cs index 57dd79be..b08cadb5 100644 --- a/UKSF.Api/AppStart/RegisterServices.cs +++ b/UKSF.Api/AppStart/RegisterServices.cs @@ -27,14 +27,17 @@ namespace UKSF.Api.AppStart { public static class ServiceExtensions { public static void RegisterServices(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { + // Base services.AddSingleton(configuration); services.AddSingleton(currentEnvironment); + services.AddSingleton(); + // Data common services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); services.AddTransient(); - services.AddSingleton(); services.AddSingleton(); + // Events & Data services.RegisterEventServices(); services.RegisterDataServices(currentEnvironment); services.RegisterDataBackedServices(currentEnvironment); diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 3e989c65..f7c70251 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -20,6 +20,7 @@ using UKSF.Api.Interfaces.Integrations.Teamspeak; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services; using UKSF.Api.Services.Admin; using UKSF.Api.Services.Common; using UKSF.Api.Services.Personnel; @@ -48,6 +49,16 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration public void ConfigureServices(IServiceCollection services) { services.RegisterServices(configuration, currentEnvironment); + + ExceptionHandler exceptionHandler = null; + services.AddSingleton( + provider => { + exceptionHandler = new ExceptionHandler(provider.GetService(), provider.GetService()); + return exceptionHandler; + } + ); + if (exceptionHandler == null) throw new NullReferenceException("Could not create ExceptionHandler"); + services.AddCors( options => options.AddPolicy( "CorsPolicy", @@ -96,10 +107,9 @@ public void ConfigureServices(IServiceCollection services) { } ); - ExceptionHandler.Instance = new ExceptionHandler(); services.AddControllers(); services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo { Title = "UKSF API", Version = "v1" }); }); - services.AddMvc(options => { options.Filters.Add(ExceptionHandler.Instance); }).AddNewtonsoftJson(); + services.AddMvc(options => { options.Filters.Add(exceptionHandler); }).AddNewtonsoftJson(); } // ReSharper disable once UnusedMember.Global @@ -135,9 +145,6 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl Global.ServiceProvider = app.ApplicationServices; ServiceWrapper.ServiceProvider = Global.ServiceProvider; - // Initialise exception handler - ExceptionHandler.Instance.Initialise(Global.ServiceProvider.GetService(), Global.ServiceProvider.GetService()); - // Execute any DB migration Global.ServiceProvider.GetService().Migrate(); @@ -154,7 +161,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl Global.ServiceProvider.GetService().ConnectDiscord(); // Start scheduler - Global.ServiceProvider.GetService().Load(); + Global.ServiceProvider.GetService().LoadApi(); } private static void RegisterAndWarmCachedData() { diff --git a/UKSF.Common/TaskUtilities.cs b/UKSF.Common/TaskUtilities.cs index 3a0f5898..30ff066e 100644 --- a/UKSF.Common/TaskUtilities.cs +++ b/UKSF.Common/TaskUtilities.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; @@ -11,5 +12,7 @@ public static async Task Delay(TimeSpan timeSpan, CancellationToken token) { // Ignored } } + + public static async Task> WhenAll(this IEnumerable> tasks) => await Task.WhenAll(tasks); } } diff --git a/UKSF.Integrations/Startup.cs b/UKSF.Integrations/Startup.cs index 3b6302ef..922eb362 100644 --- a/UKSF.Integrations/Startup.cs +++ b/UKSF.Integrations/Startup.cs @@ -20,6 +20,7 @@ using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services; using UKSF.Api.Services.Common; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; @@ -38,6 +39,15 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration public void ConfigureServices(IServiceCollection services) { services.RegisterServices(configuration); + ExceptionHandler exceptionHandler = null; + services.AddSingleton( + provider => { + exceptionHandler = new ExceptionHandler(provider.GetService(), provider.GetService()); + return exceptionHandler; + } + ); + if (exceptionHandler == null) throw new NullReferenceException("Could not create ExceptionHandler"); + services.AddCors( options => options.AddPolicy( "CorsPolicy", @@ -50,7 +60,7 @@ public void ConfigureServices(IServiceCollection services) { services.AddControllers(); services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo { Title = "UKSF Integrations API", Version = "v1" }); }); - services.AddMvc().AddNewtonsoftJson(); + services.AddMvc(options => { options.Filters.Add(exceptionHandler); }).AddNewtonsoftJson(); } // ReSharper disable once UnusedMember.Global @@ -77,7 +87,7 @@ public void Configure(IApplicationBuilder app) { RegisterAndWarmCachedData(); // Start scheduler - Global.ServiceProvider.GetService().Load(false); + Global.ServiceProvider.GetService().LoadIntegrations(); } private static void RegisterAndWarmCachedData() { @@ -94,7 +104,13 @@ private static void RegisterAndWarmCachedData() { public static class ServiceExtensions { public static void RegisterServices(this IServiceCollection services, IConfiguration configuration) { + // Base services.AddSingleton(configuration); + services.AddSingleton(); + + // Database + services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); + services.AddTransient(); services.AddSingleton(); // Event Buses @@ -105,10 +121,6 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); - // Database - services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); - services.AddTransient(); - // Data services.AddSingleton(); services.AddSingleton(); @@ -118,13 +130,14 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddSingleton(); // Services - services.AddSingleton(); - services.AddSingleton(); services.AddTransient(); services.AddTransient(); - services.AddSingleton(); services.AddTransient(); services.AddTransient(); + + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); } } } diff --git a/UKSF.Tests.Unit/Data/IMockCachedDataService.cs b/UKSF.Tests.Common/IMockCachedDataService.cs similarity index 81% rename from UKSF.Tests.Unit/Data/IMockCachedDataService.cs rename to UKSF.Tests.Common/IMockCachedDataService.cs index 3ec21b60..110df67c 100644 --- a/UKSF.Tests.Unit/Data/IMockCachedDataService.cs +++ b/UKSF.Tests.Common/IMockCachedDataService.cs @@ -1,6 +1,6 @@ using UKSF.Api.Interfaces.Data; -namespace UKSF.Tests.Unit.Data { +namespace UKSF.Tests.Common { public interface IMockCachedDataService : IDataService { } diff --git a/UKSF.Tests.Unit/Data/IMockDataService.cs b/UKSF.Tests.Common/IMockDataService.cs similarity index 75% rename from UKSF.Tests.Unit/Data/IMockDataService.cs rename to UKSF.Tests.Common/IMockDataService.cs index a4c4bf5b..65d25810 100644 --- a/UKSF.Tests.Unit/Data/IMockDataService.cs +++ b/UKSF.Tests.Common/IMockDataService.cs @@ -1,7 +1,7 @@ using UKSF.Api.Interfaces.Data; -namespace UKSF.Tests.Unit.Data { +namespace UKSF.Tests.Common { public interface IMockDataService : IDataService { - + } } diff --git a/UKSF.Tests.Unit/Data/MockCachedDataService.cs b/UKSF.Tests.Common/MockCachedDataService.cs similarity index 93% rename from UKSF.Tests.Unit/Data/MockCachedDataService.cs rename to UKSF.Tests.Common/MockCachedDataService.cs index 9acec7ac..3bb1966a 100644 --- a/UKSF.Tests.Unit/Data/MockCachedDataService.cs +++ b/UKSF.Tests.Common/MockCachedDataService.cs @@ -2,7 +2,7 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; -namespace UKSF.Tests.Unit.Data { +namespace UKSF.Tests.Common { public class MockCachedDataService : CachedDataService, IMockCachedDataService { public MockCachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } } diff --git a/UKSF.Tests.Unit/MockComplexDataModel.cs b/UKSF.Tests.Common/MockComplexDataModel.cs similarity index 87% rename from UKSF.Tests.Unit/MockComplexDataModel.cs rename to UKSF.Tests.Common/MockComplexDataModel.cs index be0e1885..0ceacace 100644 --- a/UKSF.Tests.Unit/MockComplexDataModel.cs +++ b/UKSF.Tests.Common/MockComplexDataModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSF.Tests.Unit { +namespace UKSF.Tests.Common { public class MockComplexDataModel : MockDataModel { public MockDataModel Data; public List List; diff --git a/UKSF.Tests.Common/MockDataModel.cs b/UKSF.Tests.Common/MockDataModel.cs new file mode 100644 index 00000000..6d6b7b06 --- /dev/null +++ b/UKSF.Tests.Common/MockDataModel.cs @@ -0,0 +1,9 @@ +using System.Collections.Generic; +using UKSF.Api.Models; + +namespace UKSF.Tests.Common { + public class MockDataModel : DatabaseObject { + public string Name; + public List Stuff; + } +} diff --git a/UKSF.Tests.Unit/Data/MockDataService.cs b/UKSF.Tests.Common/MockDataService.cs similarity index 92% rename from UKSF.Tests.Unit/Data/MockDataService.cs rename to UKSF.Tests.Common/MockDataService.cs index 079635f6..1f40fcaa 100644 --- a/UKSF.Tests.Unit/Data/MockDataService.cs +++ b/UKSF.Tests.Common/MockDataService.cs @@ -2,7 +2,7 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; -namespace UKSF.Tests.Unit.Data { +namespace UKSF.Tests.Common { public class MockDataService : DataService, IMockDataService { public MockDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } } diff --git a/UKSF.Tests.Unit/TestUtilities.cs b/UKSF.Tests.Common/TestUtilities.cs similarity index 91% rename from UKSF.Tests.Unit/TestUtilities.cs rename to UKSF.Tests.Common/TestUtilities.cs index f2ed6b20..bc9ef5d2 100644 --- a/UKSF.Tests.Unit/TestUtilities.cs +++ b/UKSF.Tests.Common/TestUtilities.cs @@ -2,7 +2,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Driver; -namespace UKSF.Tests.Unit { +namespace UKSF.Tests.Common { public static class TestUtilities { public static BsonValue Render(UpdateDefinition updateDefinition) => updateDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); } diff --git a/UKSF.Tests.Common/UKSF.Tests.Common.csproj b/UKSF.Tests.Common/UKSF.Tests.Common.csproj new file mode 100644 index 00000000..8ecf844d --- /dev/null +++ b/UKSF.Tests.Common/UKSF.Tests.Common.csproj @@ -0,0 +1,12 @@ + + + + netcoreapp3.1 + + + + + + + + diff --git a/UKSF.Tests.Common/testdata/accounts.json b/UKSF.Tests.Common/testdata/accounts.json new file mode 100644 index 00000000..99e0d257 --- /dev/null +++ b/UKSF.Tests.Common/testdata/accounts.json @@ -0,0 +1,300 @@ +{ + "_id": { + "$oid": "59e38f0f594c603b78aa9dbb" + }, + "application": { + "applicationCommentThread": { + "$oid": "5a6bdf837819f048ecb224d5" + }, + "dateAccepted": { + "$date": "2017-12-04T22:04:05.353Z" + }, + "dateCreated": { + "$date": "2017-12-04T21:45:17.657Z" + }, + "ratings": { + "attitude": 4, + "maturity": 4, + "sociability": 4, + "criticism": 4, + "skills": 4 + }, + "recruiter": { + "$oid": "59e38f1b594c603b78aa9dc1" + }, + "recruiterCommentThread": { + "$oid": "5a6bdf837819f048ecb224d4" + }, + "state": 0 + }, + "armaExperience": "3-4 years", + "aviation": false, + "background": "-", + "dob": { + "$date": "2000-11-08T00:00:00Z" + }, + "email": "Steve.J@uk-sf.co.uk", + "firstname": "Jeff", + "lastname": "Steve", + "membershipState": 3, + "militaryExperience": false, + "nation": "GBR", + "nco": true, + "officer": false, + "password": "", + "reference": "Google", + "serviceRecord": [ + { + "notes": "N/A", + "occurence": "was accepted into the recruitment process", + "timestamp": { + "$date": "2017-12-04T21:45:18.04Z" + } + }, + { + "notes": "comments and ratings from the recruitment process can be viewed in the recruitment centre.", + "occurence": "passed the recruitment process and was accepted into the Basic Training Program", + "timestamp": { + "$date": "2017-12-04T22:04:06.033Z" + } + } + ], + "settings": { + "errorEmails": false, + "notificationsEmail": true, + "notificationsTeamspeak": true, + "sr1Enabled": false + }, + "steamname": "", + "teamspeakIdentities": [], + "unitsExperience": "Ages ago can't actually remember names", + "discordId": "", + "unitAssignment": "Basic Training Unit", + "roleAssignment": "Trainee", + "rank": "Recruit" +} +{ + "_id": { + "$oid": "59e38f10594c603b78aa9dbd" + }, + "application": { + "applicationCommentThread": { + "$oid": "5a6bdf747819f048ecb224a9" + }, + "dateAccepted": { + "$date": "2017-11-28T23:43:45.408Z" + }, + "dateCreated": { + "$date": "2017-11-26T01:43:05.953Z" + }, + "ratings": { + "attitude": 5, + "maturity": 5, + "sociability": 5, + "criticism": 5, + "skills": 5 + }, + "recruiter": { + "$oid": "59e38f10594c603b78aa9dbd" + }, + "recruiterCommentThread": { + "$oid": "5a6bdf737819f048ecb224a8" + }, + "state": 0 + }, + "armaExperience": "Too long", + "aviation": true, + "background": "I'm fine.", + "dob": { + "$date": "1996-01-16T00:00:00Z" + }, + "email": "Bob.F@uk-sf.co.uk", + "firstname": "Fred", + "lastname": "Bob", + "membershipState": 2, + "militaryExperience": false, + "nation": "GBR", + "nco": false, + "officer": true, + "password": "", + "rank": "Sergeant", + "reference": "Google", + "roleAssignment": "Rifleman", + "serviceRecord": [ + { + "notes": "comments and ratings from the recruitment process can be viewed in the recruitment centre.", + "occurence": "passed the recruitment process and was accepted into the Basic Training Program", + "timestamp": { + "$date": "2017-11-28T23:43:46.237Z" + } + }, + { + "notes": "s", + "occurence": "promoted to the rank of Sergeant", + "timestamp": { + "$date": "2017-12-20T15:53:46.875Z" + } + } + ], + "settings": { + "errorEmails": true, + "notificationsEmail": false, + "notificationsTeamspeak": true, + "sr1Enabled": false + }, + "steamname": "", + "unitAssignment": "22nd Special Air Service Regiment", + "unitsExperience": "No", + "discordId": "", + "teamspeakIdentities": [] +} +{ + "_id": { + "$oid": "59e38f13594c603b78aa9dbf" + }, + "application": { + "applicationCommentThread": { + "$oid": "5a6bdf767819f048ecb224af" + }, + "dateAccepted": { + "$date": "2017-11-29T18:33:35.879Z" + }, + "dateCreated": { + "$date": "2017-11-29T18:25:02.282Z" + }, + "ratings": { + "attitude": 4, + "maturity": 4, + "sociability": 4, + "criticism": 4, + "skills": 4 + }, + "recruiter": { + "$oid": "59e38f10594c603b78aa9dbd" + }, + "recruiterCommentThread": { + "$oid": "5a6bdf757819f048ecb224ae" + }, + "state": 0 + }, + "armaExperience": "3 Years", + "aviation": false, + "background": "N/A", + "dob": { + "$date": "1994-03-25T00:00:00Z" + }, + "email": "Adam.K@uk-sf.co.uk", + "firstname": "Kris", + "lastname": "Adam", + "membershipState": 2, + "militaryExperience": false, + "nation": "GBR", + "nco": false, + "officer": false, + "password": "", + "rank": "Sergeant", + "reference": "Reference from friend", + "roleAssignment": "NCOiC Air Troop", + "serviceRecord": [ + { + "notes": "comments and ratings from the recruitment process can be viewed in the recruitment centre.", + "occurence": "passed the recruitment process and was accepted into the Basic Training Program", + "timestamp": { + "$date": "2017-11-29T18:25:02.734Z" + } + }, + { + "notes": "comments and ratings from the recruitment process can be viewed in the recruitment centre.", + "occurence": "passed the recruitment process and was accepted into the Basic Training Program", + "timestamp": { + "$date": "2017-11-29T18:33:36.602Z" + } + } + ], + "settings": { + "errorEmails": false, + "notificationsEmail": true, + "notificationsTeamspeak": false, + "sr1Enabled": true + }, + "steamname": "", + "teamspeakIdentities": [], + "unitAssignment": "Air Troop", + "unitsExperience": "None", + "discordId": "" +} +{ + "_id": { + "$oid": "59e38f1b594c603b78aa9dc1" + }, + "application": { + "applicationCommentThread": { + "$oid": "5a6bdf817819f048ecb224cf" + }, + "dateAccepted": { + "$date": "2017-12-04T20:34:42.123Z" + }, + "dateCreated": { + "$date": "2017-12-04T19:59:28.761Z" + }, + "ratings": { + "attitude": 4, + "maturity": 4, + "sociability": 4, + "criticism": 4, + "skills": 4 + }, + "recruiter": { + "$oid": "59e38f13594c603b78aa9dbf" + }, + "recruiterCommentThread": { + "$oid": "5a6bdf817819f048ecb224ce" + }, + "state": 0 + }, + "armaExperience": "3-4 yrs", + "aviation": false, + "background": "Component maintenance technician", + "dob": { + "$date": "1999-01-21T23:00:00Z" + }, + "email": "Jim.D@uk-sf.co.uk", + "firstname": "Dennis", + "lastname": "Jim", + "membershipState": 2, + "militaryExperience": true, + "nation": "NLD", + "nco": true, + "officer": false, + "password": "", + "rank": "Lance Corporal", + "reference": "Reference from friend", + "roleAssignment": "Marksman", + "serviceRecord": [ + { + "notes": "N/A", + "occurence": "was accepted into the recruitment process", + "timestamp": { + "$date": "2017-12-04T19:59:29.222Z" + } + }, + { + "notes": "comments and ratings from the recruitment process can be viewed in the recruitment centre.", + "occurence": "passed the recruitment process and was accepted into the Basic Training Program", + "timestamp": { + "$date": "2017-12-04T20:34:42.804Z" + } + } + ], + "settings": { + "errorEmails": false, + "notificationsEmail": true, + "notificationsTeamspeak": true, + "sr1Enabled": true + }, + "steamname": "", + "teamspeakIdentities": [], + "unitAssignment": "Air Troop", + "unitsExperience": "No", + "discordId": "" +} diff --git a/UKSF.Tests.Common/testdata/commentThreads.json b/UKSF.Tests.Common/testdata/commentThreads.json new file mode 100644 index 00000000..776475f5 --- /dev/null +++ b/UKSF.Tests.Common/testdata/commentThreads.json @@ -0,0 +1,121 @@ +{ + "_id": { + "$oid": "5a6bdf837819f048ecb224d5" + }, + "authors": [ + { + "$oid": "59e38f0f594c603b78aa9dbb" + } + ], + "comments": [], + "mode": 1 +} +{ + "_id": { + "$oid": "5a6bdf837819f048ecb224d4" + }, + "authors": [ + { + "$oid": "59e38f10594c603b78aa9dbd" + } + ], + "comments": [], + "mode": 1 +} +{ + "_id": { + "$oid": "5a6bdf747819f048ecb224a9" + }, + "authors": [ + { + "$oid": "59e38f10594c603b78aa9dbd" + } + ], + "comments": [], + "mode": 1 +} +{ + "_id": { + "$oid": "5a6bdf737819f048ecb224a8" + }, + "authors": [ + { + "$oid": "59e38f10594c603b78aa9dbd" + } + ], + "comments": [ + { + "author": { + "$oid": "59e38f10594c603b78aa9dbd" + }, + "content": "test\n", + "_id": { + "$oid": "5b72a08ae8a7c24fac9348c7" + }, + "timestamp": { + "$date": "2018-08-14T09:27:38.679Z" + } + }, + { + "author": { + "$oid": "59e38f10594c603b78aa9dbd" + }, + "content": "test\n", + "_id": { + "$oid": "5b72a0cae8a7c24fac9348c8" + }, + "timestamp": { + "$date": "2018-08-14T09:28:42.065Z" + } + } + ], + "mode": 1 +} +{ + "_id": { + "$oid": "5a6bdf767819f048ecb224af" + }, + "authors": [ + { + "$oid": "59e38f13594c603b78aa9dbf" + } + ], + "comments": [], + "mode": 1 +} +{ + "_id": { + "$oid": "5a6bdf757819f048ecb224ae" + }, + "authors": [ + { + "$oid": "59e38f10594c603b78aa9dbd" + } + ], + "comments": [], + "mode": 1 +} +{ + "_id": { + "$oid": "5a6bdf817819f048ecb224cf" + }, + "authors": [ + { + "$oid": "59e38f1b594c603b78aa9dc1" + } + ], + "comments": [], + "mode": 1 +} +{ + "_id": { + "$oid": "5a6bdf817819f048ecb224ce" + }, + "authors": [ + { + "$oid": "59e38f10594c603b78aa9dbd" + } + ], + "comments": [], + "mode": 1 +} diff --git a/UKSF.Tests.Common/testdata/discharges.json b/UKSF.Tests.Common/testdata/discharges.json new file mode 100644 index 00000000..763d490c --- /dev/null +++ b/UKSF.Tests.Common/testdata/discharges.json @@ -0,0 +1,60 @@ +{ + "_id": { + "$oid": "5cc48d75e7a07129285e1a45" + }, + "accountId": { + "$oid": "59e38f0f594c603b78aa9dbb" + }, + "discharges": [ + { + "dischargedBy": "Unknown", + "_id": { + "$oid": "5c7581bfbd84b432dcc16aec" + }, + "rank": "Unknown", + "reason": "None given", + "role": "Unknown", + "timestamp": { + "$date": "2019-02-26T18:13:19.347Z" + }, + "unit": "Unknown" + } + ], + "reinstated": false, + "name": "Steve.J" +} +{ + "_id": { + "$oid": "5cc48d76e7a07129285e1a46" + }, + "accountId": { + "$oid": "59e38f10594c603b78aa9dbd" + }, + "discharges": [ + { + "dischargedBy": "Sgt.Adam.K", + "_id": { + "$oid": "5c7581bfbd84b432dcc16aee" + }, + "rank": "Unknown", + "reason": "Decided to leave, welcome to join again", + "role": "Unknown", + "timestamp": { + "$date": "2018-09-17T21:15:42.114Z" + }, + "unit": "Unknown" + }, + { + "dischargedBy": "Sgt.Jim.D", + "rank": "Private", + "reason": "Didn't turn up for a long time", + "role": "Section Leader", + "timestamp": { + "$date": "2019-10-28T18:52:10.439Z" + }, + "unit": "Reserves" + } + ], + "reinstated": true, + "name": "Bob.F" +} diff --git a/UKSF.Tests.Common/testdata/gameServers.json b/UKSF.Tests.Common/testdata/gameServers.json new file mode 100644 index 00000000..9e543f09 --- /dev/null +++ b/UKSF.Tests.Common/testdata/gameServers.json @@ -0,0 +1,33 @@ +{ + "_id": { + "$oid": "5bd9daa3b1c98150403bccf6" + }, + "order": 0, + "name": "Main", + "port": 2302, + "numberHeadlessClients": 0, + "profileName": "MainServer", + "hostName": "UKSF | Private Operations", + "password": "dfghdtjy", + "adminPassword": "dkjhfrg", + "serverOption": 1, + "apiPort": 6000, + "serverMods": "", + "status": { + "stopping": false + }, + "mods": [ + { + "isDuplicate": false, + "name": "@acre2", + "path": "B:\\Steam\\steamapps\\common\\Arma 3\\uksf\\@acre2", + "pathRelativeToServerExecutable": "uksf/@acre2" + }, + { + "isDuplicate": false, + "name": "@CBA_A3", + "path": "B:\\Steam\\steamapps\\common\\Arma 3\\uksf\\@CBA_A3", + "pathRelativeToServerExecutable": "uksf/@CBA_A3" + } + ] +} diff --git a/UKSF.Tests.Common/testdata/ranks.json b/UKSF.Tests.Common/testdata/ranks.json new file mode 100644 index 00000000..b8cd5ef6 --- /dev/null +++ b/UKSF.Tests.Common/testdata/ranks.json @@ -0,0 +1,59 @@ +{ + "_id": { + "$oid": "5b72fbb52d54990cec7c4b24" + }, + "name": "Sergeant", + "abbreviation": "Sgt", + "teamspeakGroup": "15", + "order": 17, + "discordRoleId": "311546932403240971" +} +{ + "_id": { + "$oid": "5b72fbcd2d54990cec7c4b26" + }, + "name": "Corporal", + "abbreviation": "Cpl", + "teamspeakGroup": "16", + "order": 19, + "discordRoleId": "311546932403240971" +} +{ + "_id": { + "$oid": "5b72fbde2d54990cec7c4b28" + }, + "name": "Lance Corporal", + "abbreviation": "LCpl", + "teamspeakGroup": "17", + "order": 22, + "discordRoleId": "311546932403240971" +} +{ + "_id": { + "$oid": "5b72fd592d54990cec7c4b2d" + }, + "name": "Private", + "abbreviation": "Pte", + "teamspeakGroup": "18", + "order": 24 +} +{ + "_id": { + "$oid": "5b72fbfe2d54990cec7c4b2b" + }, + "name": "Recruit", + "abbreviation": "Rct", + "teamspeakGroup": "19", + "order": 26, + "discordRoleId": "568562800855875605" +} +{ + "_id": { + "$oid": "5b72fc062d54990cec7c4b2c" + }, + "name": "Candidate", + "abbreviation": "Cdt", + "teamspeakGroup": "20", + "order": 27, + "discordRoleId": "318050573997965314" +} diff --git a/UKSF.Tests.Common/testdata/roles.json b/UKSF.Tests.Common/testdata/roles.json new file mode 100644 index 00000000..896d91bd --- /dev/null +++ b/UKSF.Tests.Common/testdata/roles.json @@ -0,0 +1,50 @@ +{ + "_id": { + "$oid": "5b73f047bcd9d4150cce911b" + }, + "name": "Rifleman" +} +{ + "_id": { + "$oid": "5b742439a144bb436484fbc1" + }, + "name": "Trainee" +} +{ + "_id": { + "$oid": "5b7424eda144bb436484fbc2" + }, + "name": "Marksman" +} +{ + "_id": { + "$oid": "5b743cce0349702af02a6cc8" + }, + "name": "1iC", + "roleType": 1, + "order": 0 +} +{ + "_id": { + "$oid": "5b743cfc275f4355fc7b8cde" + }, + "name": "2iC", + "roleType": 1, + "order": 1 +} +{ + "_id": { + "$oid": "5b746d75b5b85b00017f2e56" + }, + "name": "NCOiC", + "roleType": 1, + "order": 3 +} +{ + "_id": { + "$oid": "5b93fc12afe56b00019a8780" + }, + "name": "NCOiC Air Troop", + "roleType": 0, + "order": 0 +} diff --git a/UKSF.Tests.Common/testdata/scheduledJobs.json b/UKSF.Tests.Common/testdata/scheduledJobs.json new file mode 100644 index 00000000..5d1b2427 --- /dev/null +++ b/UKSF.Tests.Common/testdata/scheduledJobs.json @@ -0,0 +1,24 @@ +{ + "_id": { + "$oid": "5c006212238c46637025fdad" + }, + "next": { + "$date": "2020-02-25T00:00:00Z" + }, + "interval": "1.00:00:00", + "action": "PruneLogs", + "repeat": true, + "type": 2 +} +{ + "_id": { + "$oid": "5c006212238c46637025fdaf" + }, + "next": { + "$date": "2020-02-24T18:45:00Z" + }, + "interval": "00:05:00", + "action": "TeamspeakSnapshot", + "repeat": true, + "type": 1 +} diff --git a/UKSF.Tests.Common/testdata/scheduledJobsIntegrations.json b/UKSF.Tests.Common/testdata/scheduledJobsIntegrations.json new file mode 100644 index 00000000..c39f2c33 --- /dev/null +++ b/UKSF.Tests.Common/testdata/scheduledJobsIntegrations.json @@ -0,0 +1,13 @@ +{ + "_id": { + "$oid": "5e5419a5df1b9d802cb3dd19" + }, + "action": "DeleteExpiredConfirmationCode", + "actionParameters": "[\"5e5419a4df1b9d802cb3dd18\"]", + "interval": "00:00:00", + "next": { + "$date": "2020-02-24T19:14:53.008Z" + }, + "repeat": false, + "type": 0 +} diff --git a/UKSF.Tests.Common/testdata/teamspeakSnapshots.json b/UKSF.Tests.Common/testdata/teamspeakSnapshots.json new file mode 100644 index 00000000..32efb686 --- /dev/null +++ b/UKSF.Tests.Common/testdata/teamspeakSnapshots.json @@ -0,0 +1,250022 @@ +{ + "_id": { + "$oid": "5b647806a376d259db58e530" + }, + "timestamp": { + "$date": "2018-08-03T15:42:58.586Z" + }, + "users": [ + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64787fa376d259db58e5ef" + }, + "timestamp": { + "$date": "2018-08-03T15:45:00.307Z" + }, + "users": [ + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6479aba376d259db58e76d" + }, + "timestamp": { + "$date": "2018-08-03T15:50:00.289Z" + }, + "users": [ + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b647ad7a376d259db58e7f3" + }, + "timestamp": { + "$date": "2018-08-03T15:55:00.289Z" + }, + "users": [ + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b647c03a376d259db58e87b" + }, + "timestamp": { + "$date": "2018-08-03T16:00:00.33Z" + }, + "users": [ + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b647d2fa376d259db58e901" + }, + "timestamp": { + "$date": "2018-08-03T16:05:00.28Z" + }, + "users": [ + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b647e5ba376d259db58e987" + }, + "timestamp": { + "$date": "2018-08-03T16:10:00.26Z" + }, + "users": [ + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b647f87a376d259db58ea0f" + }, + "timestamp": { + "$date": "2018-08-03T16:15:00.285Z" + }, + "users": [ + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6480b3a376d259db58eaa7" + }, + "timestamp": { + "$date": "2018-08-03T16:20:00.394Z" + }, + "users": [ + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6481e0a376d259db58eb2e" + }, + "timestamp": { + "$date": "2018-08-03T16:25:00.604Z" + }, + "users": [ + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64830ba376d259db58ebb3" + }, + "timestamp": { + "$date": "2018-08-03T16:30:00.288Z" + }, + "users": [ + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b648437a376d259db58ec39" + }, + "timestamp": { + "$date": "2018-08-03T16:35:00.262Z" + }, + "users": [ + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b648563a376d259db58ed11" + }, + "timestamp": { + "$date": "2018-08-03T16:40:00.297Z" + }, + "users": [ + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64868fa376d259db58ee25" + }, + "timestamp": { + "$date": "2018-08-03T16:45:00.402Z" + }, + "users": [ + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6487bba376d259db58ef25" + }, + "timestamp": { + "$date": "2018-08-03T16:50:00.401Z" + }, + "users": [ + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6488e7a376d259db58f06d" + }, + "timestamp": { + "$date": "2018-08-03T16:55:00.285Z" + }, + "users": [ + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b648a14a376d259db58f1b4" + }, + "timestamp": { + "$date": "2018-08-03T17:00:00.802Z" + }, + "users": [ + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b648b3fa376d259db58f2c1" + }, + "timestamp": { + "$date": "2018-08-03T17:05:00.276Z" + }, + "users": [ + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b648c6ba376d259db58f3ab" + }, + "timestamp": { + "$date": "2018-08-03T17:10:00.258Z" + }, + "users": [ + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b648d97a376d259db58f4be" + }, + "timestamp": { + "$date": "2018-08-03T17:15:00.261Z" + }, + "users": [ + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b648ec3a376d259db58f58c" + }, + "timestamp": { + "$date": "2018-08-03T17:20:00.259Z" + }, + "users": [ + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b648fefa376d259db58f729" + }, + "timestamp": { + "$date": "2018-08-03T17:25:00.314Z" + }, + "users": [ + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64911ca376d259db58f8a0" + }, + "timestamp": { + "$date": "2018-08-03T17:30:00.8Z" + }, + "users": [ + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b649247a376d259db58f997" + }, + "timestamp": { + "$date": "2018-08-03T17:35:00.266Z" + }, + "users": [ + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b649373a376d259db58fa1f" + }, + "timestamp": { + "$date": "2018-08-03T17:40:00.313Z" + }, + "users": [ + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64949fa376d259db58faa5" + }, + "timestamp": { + "$date": "2018-08-03T17:45:00.269Z" + }, + "users": [ + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6495cba376d259db58fb2b" + }, + "timestamp": { + "$date": "2018-08-03T17:50:00.31Z" + }, + "users": [ + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6496f7a376d259db58fbb1" + }, + "timestamp": { + "$date": "2018-08-03T17:55:00.311Z" + }, + "users": [ + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b649823a376d259db58fca9" + }, + "timestamp": { + "$date": "2018-08-03T18:00:00.274Z" + }, + "users": [ + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64994fa376d259db58fd3b" + }, + "timestamp": { + "$date": "2018-08-03T18:05:00.278Z" + }, + "users": [ + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b649a7ba376d259db58fdc3" + }, + "timestamp": { + "$date": "2018-08-03T18:10:00.367Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b649ba7a376d259db58fe4d" + }, + "timestamp": { + "$date": "2018-08-03T18:15:00.298Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b649cd3a376d259db58fed5" + }, + "timestamp": { + "$date": "2018-08-03T18:20:00.268Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b649dffa376d259db58ff5a" + }, + "timestamp": { + "$date": "2018-08-03T18:25:00.323Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b649f2ca376d259db58ffe3" + }, + "timestamp": { + "$date": "2018-08-03T18:30:00.401Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64a057a376d259db59006a" + }, + "timestamp": { + "$date": "2018-08-03T18:35:00.28Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64a183a376d259db59016e" + }, + "timestamp": { + "$date": "2018-08-03T18:40:00.292Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64a2b0a376d259db5901f6" + }, + "timestamp": { + "$date": "2018-08-03T18:45:00.41Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64a3dba376d259db59029e" + }, + "timestamp": { + "$date": "2018-08-03T18:50:00.322Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64a507a376d259db590348" + }, + "timestamp": { + "$date": "2018-08-03T18:55:00.343Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64a634a376d259db5903d1" + }, + "timestamp": { + "$date": "2018-08-03T19:00:00.403Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64a75fa376d259db590456" + }, + "timestamp": { + "$date": "2018-08-03T19:05:00.339Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64a88ba376d259db5904e3" + }, + "timestamp": { + "$date": "2018-08-03T19:10:00.304Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE - Tertiary", + "channelId": "1116", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64a9b8a376d259db59056a" + }, + "timestamp": { + "$date": "2018-08-03T19:15:00.373Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64aae3a376d259db5905eb" + }, + "timestamp": { + "$date": "2018-08-03T19:20:00.265Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64ac0fa376d259db59066c" + }, + "timestamp": { + "$date": "2018-08-03T19:25:00.304Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64ad3ca376d259db5906f5" + }, + "timestamp": { + "$date": "2018-08-03T19:30:00.419Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64ae67a376d259db590776" + }, + "timestamp": { + "$date": "2018-08-03T19:35:00.296Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64af93a376d259db590805" + }, + "timestamp": { + "$date": "2018-08-03T19:40:00.311Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64b0c0a376d259db59088a" + }, + "timestamp": { + "$date": "2018-08-03T19:45:00.52Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64b1eba376d259db59090b" + }, + "timestamp": { + "$date": "2018-08-03T19:50:00.287Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64b318a376d259db59098c" + }, + "timestamp": { + "$date": "2018-08-03T19:55:00.345Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64b444a376d259db590a13" + }, + "timestamp": { + "$date": "2018-08-03T20:00:00.488Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64b570a376d259db590a94" + }, + "timestamp": { + "$date": "2018-08-03T20:05:00.38Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64b69ca376d259db590b15" + }, + "timestamp": { + "$date": "2018-08-03T20:10:00.45Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64b7c8a376d259db590ba2" + }, + "timestamp": { + "$date": "2018-08-03T20:15:00.519Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64b8f4a376d259db590c23" + }, + "timestamp": { + "$date": "2018-08-03T20:20:00.426Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64ba20a376d259db590ca6" + }, + "timestamp": { + "$date": "2018-08-03T20:25:00.455Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64bb4ca376d259db590d2d" + }, + "timestamp": { + "$date": "2018-08-03T20:30:00.577Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64bc78a376d259db590dae" + }, + "timestamp": { + "$date": "2018-08-03T20:35:00.431Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64bda4a376d259db590e2f" + }, + "timestamp": { + "$date": "2018-08-03T20:40:00.352Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64bed0a376d259db590eb1" + }, + "timestamp": { + "$date": "2018-08-03T20:45:00.338Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64bffca376d259db590f40" + }, + "timestamp": { + "$date": "2018-08-03T20:50:00.324Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64c128a376d259db590fc1" + }, + "timestamp": { + "$date": "2018-08-03T20:55:00.368Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64c254a376d259db591098" + }, + "timestamp": { + "$date": "2018-08-03T21:00:01.218Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64c380a376d259db59111f" + }, + "timestamp": { + "$date": "2018-08-03T21:05:00.319Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64c4aca376d259db5911a0" + }, + "timestamp": { + "$date": "2018-08-03T21:10:00.342Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64c5d8a376d259db591223" + }, + "timestamp": { + "$date": "2018-08-03T21:15:00.368Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64c704a376d259db5912e9" + }, + "timestamp": { + "$date": "2018-08-03T21:20:00.355Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64c830a376d259db59136f" + }, + "timestamp": { + "$date": "2018-08-03T21:25:00.356Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64c95ca376d259db5913f4" + }, + "timestamp": { + "$date": "2018-08-03T21:30:00.307Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64ca88a376d259db59147b" + }, + "timestamp": { + "$date": "2018-08-03T21:35:00.553Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64cbb4a376d259db5914fc" + }, + "timestamp": { + "$date": "2018-08-03T21:40:00.31Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64cce0a376d259db59157d" + }, + "timestamp": { + "$date": "2018-08-03T21:45:00.264Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64ce0ca376d259db5915fe" + }, + "timestamp": { + "$date": "2018-08-03T21:50:00.295Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64cf38a376d259db5916d9" + }, + "timestamp": { + "$date": "2018-08-03T21:55:00.282Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64d064a376d259db5917d7" + }, + "timestamp": { + "$date": "2018-08-03T22:00:00.283Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64d190a376d259db591a1a" + }, + "timestamp": { + "$date": "2018-08-03T22:05:00.346Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64d2bca376d259db591b5d" + }, + "timestamp": { + "$date": "2018-08-03T22:10:00.509Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64d3e8a376d259db591c37" + }, + "timestamp": { + "$date": "2018-08-03T22:15:00.872Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "0" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "0" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "0" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "0" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "0" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "0" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "0" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "0" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "0" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Johansson.B", + "clientDbId": "0" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "0" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "0" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "0" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "0" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "0" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "0" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "0" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "0" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "0" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "0" + } + ] +} +{ + "_id": { + "$oid": "5b64d514a376d259db591d0e" + }, + "timestamp": { + "$date": "2018-08-03T22:20:00.318Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64d640a376d259db591d98" + }, + "timestamp": { + "$date": "2018-08-03T22:25:00.264Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b64d76ca376d259db591e20" + }, + "timestamp": { + "$date": "2018-08-03T22:30:00.289Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64d898a376d259db591ea6" + }, + "timestamp": { + "$date": "2018-08-03T22:35:00.266Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64d9c4a376d259db591f2c" + }, + "timestamp": { + "$date": "2018-08-03T22:40:00.264Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64daf0a376d259db591fbe" + }, + "timestamp": { + "$date": "2018-08-03T22:45:00.432Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64dc1ca376d259db59204a" + }, + "timestamp": { + "$date": "2018-08-03T22:50:00.278Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64dd48a376d259db5920d4" + }, + "timestamp": { + "$date": "2018-08-03T22:55:00.263Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64de74a376d259db592483" + }, + "timestamp": { + "$date": "2018-08-03T23:00:00.938Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64dfa0a376d259db59250f" + }, + "timestamp": { + "$date": "2018-08-03T23:05:00.262Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64e0cca376d259db592599" + }, + "timestamp": { + "$date": "2018-08-03T23:10:00.266Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64e1f8a376d259db592625" + }, + "timestamp": { + "$date": "2018-08-03T23:15:00.397Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64e324a376d259db5926ab" + }, + "timestamp": { + "$date": "2018-08-03T23:20:00.283Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64e450a376d259db5927fa" + }, + "timestamp": { + "$date": "2018-08-03T23:25:00.266Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64e57ca376d259db592880" + }, + "timestamp": { + "$date": "2018-08-03T23:30:00.323Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64e6a8a376d259db592906" + }, + "timestamp": { + "$date": "2018-08-03T23:35:00.267Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64e7d4a376d259db59298c" + }, + "timestamp": { + "$date": "2018-08-03T23:40:00.263Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64e900a376d259db592a18" + }, + "timestamp": { + "$date": "2018-08-03T23:45:00.449Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64ea2ca376d259db592ab1" + }, + "timestamp": { + "$date": "2018-08-03T23:50:00.275Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64eb58a376d259db592b3d" + }, + "timestamp": { + "$date": "2018-08-03T23:55:00.285Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64ec84a376d259db592bc5" + }, + "timestamp": { + "$date": "2018-08-04T00:00:00.284Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64edb0a376d259db592c4d" + }, + "timestamp": { + "$date": "2018-08-04T00:05:00.266Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64eedca376d259db592cd3" + }, + "timestamp": { + "$date": "2018-08-04T00:10:00.267Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64f008a376d259db592d5f" + }, + "timestamp": { + "$date": "2018-08-04T00:15:00.286Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64f134a376d259db592de7" + }, + "timestamp": { + "$date": "2018-08-04T00:20:00.383Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64f260a376d259db592e77" + }, + "timestamp": { + "$date": "2018-08-04T00:25:00.263Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64f38ca376d259db592f03" + }, + "timestamp": { + "$date": "2018-08-04T00:30:00.29Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64f4b8a376d259db592f89" + }, + "timestamp": { + "$date": "2018-08-04T00:35:00.328Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64f5e4a376d259db59300f" + }, + "timestamp": { + "$date": "2018-08-04T00:40:00.264Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64f710a376d259db59309b" + }, + "timestamp": { + "$date": "2018-08-04T00:45:00.299Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64f83ca376d259db593121" + }, + "timestamp": { + "$date": "2018-08-04T00:50:00.307Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b64f968a376d259db5931a5" + }, + "timestamp": { + "$date": "2018-08-04T00:55:00.285Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b64fa94a376d259db59322c" + }, + "timestamp": { + "$date": "2018-08-04T01:00:00.367Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b64fbc0a376d259db5932b3" + }, + "timestamp": { + "$date": "2018-08-04T01:05:00.262Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b64fceca376d259db593334" + }, + "timestamp": { + "$date": "2018-08-04T01:10:00.264Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b64fe18a376d259db5933b5" + }, + "timestamp": { + "$date": "2018-08-04T01:15:00.283Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b64ff44a376d259db59343c" + }, + "timestamp": { + "$date": "2018-08-04T01:20:00.409Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b650070a376d259db5934bd" + }, + "timestamp": { + "$date": "2018-08-04T01:25:00.272Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b65019ca376d259db593544" + }, + "timestamp": { + "$date": "2018-08-04T01:30:00.394Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6502c8a376d259db5935c5" + }, + "timestamp": { + "$date": "2018-08-04T01:35:00.261Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6503f4a376d259db59364c" + }, + "timestamp": { + "$date": "2018-08-04T01:40:00.286Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b650520a376d259db5936cd" + }, + "timestamp": { + "$date": "2018-08-04T01:45:00.311Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b65064ca376d259db593754" + }, + "timestamp": { + "$date": "2018-08-04T01:50:00.381Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b650778a376d259db593847" + }, + "timestamp": { + "$date": "2018-08-04T01:55:00.259Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6508a4a376d259db5938c8" + }, + "timestamp": { + "$date": "2018-08-04T02:00:00.279Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6509d0a376d259db593949" + }, + "timestamp": { + "$date": "2018-08-04T02:05:00.262Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b650afca376d259db5939ca" + }, + "timestamp": { + "$date": "2018-08-04T02:10:00.265Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b650c28a376d259db593a4b" + }, + "timestamp": { + "$date": "2018-08-04T02:15:00.322Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b650d54a376d259db593ad2" + }, + "timestamp": { + "$date": "2018-08-04T02:20:00.376Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b650e80a376d259db593b5f" + }, + "timestamp": { + "$date": "2018-08-04T02:25:00.292Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b650faca376d259db593be0" + }, + "timestamp": { + "$date": "2018-08-04T02:30:00.302Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6510d8a376d259db593c61" + }, + "timestamp": { + "$date": "2018-08-04T02:35:00.297Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b651204a376d259db593ce2" + }, + "timestamp": { + "$date": "2018-08-04T02:40:00.263Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b651330a376d259db593d63" + }, + "timestamp": { + "$date": "2018-08-04T02:45:00.348Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b65145ca376d259db593dea" + }, + "timestamp": { + "$date": "2018-08-04T02:50:00.262Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b651588a376d259db593e6b" + }, + "timestamp": { + "$date": "2018-08-04T02:55:00.318Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6516b4a376d259db593ef8" + }, + "timestamp": { + "$date": "2018-08-04T03:00:00.303Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6517e0a376d259db593f79" + }, + "timestamp": { + "$date": "2018-08-04T03:05:00.272Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b65190ca376d259db593ffa" + }, + "timestamp": { + "$date": "2018-08-04T03:10:00.28Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b651a38a376d259db59407b" + }, + "timestamp": { + "$date": "2018-08-04T03:15:00.284Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b651b64a376d259db594102" + }, + "timestamp": { + "$date": "2018-08-04T03:20:00.274Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b651c90a376d259db594183" + }, + "timestamp": { + "$date": "2018-08-04T03:25:00.305Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b651dbca376d259db594204" + }, + "timestamp": { + "$date": "2018-08-04T03:30:00.32Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b651ee8a376d259db594293" + }, + "timestamp": { + "$date": "2018-08-04T03:35:00.26Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b652014a376d259db594314" + }, + "timestamp": { + "$date": "2018-08-04T03:40:00.296Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b652140a376d259db594395" + }, + "timestamp": { + "$date": "2018-08-04T03:45:00.293Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b65226ca376d259db59441c" + }, + "timestamp": { + "$date": "2018-08-04T03:50:00.281Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b652398a376d259db59449d" + }, + "timestamp": { + "$date": "2018-08-04T03:55:00.341Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6524c4a376d259db59451e" + }, + "timestamp": { + "$date": "2018-08-04T04:00:00.327Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6525f0a376d259db5945ab" + }, + "timestamp": { + "$date": "2018-08-04T04:05:00.264Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b65271ca376d259db59462c" + }, + "timestamp": { + "$date": "2018-08-04T04:10:00.303Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b652848a376d259db5946ad" + }, + "timestamp": { + "$date": "2018-08-04T04:15:00.294Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b652974a376d259db59472e" + }, + "timestamp": { + "$date": "2018-08-04T04:20:00.266Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b652aa0a376d259db5947b5" + }, + "timestamp": { + "$date": "2018-08-04T04:25:00.4Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b652bcca376d259db594836" + }, + "timestamp": { + "$date": "2018-08-04T04:30:00.331Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b652cf8a376d259db5948b7" + }, + "timestamp": { + "$date": "2018-08-04T04:35:00.259Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b652e24a376d259db594944" + }, + "timestamp": { + "$date": "2018-08-04T04:40:00.274Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b652f50a376d259db5949c5" + }, + "timestamp": { + "$date": "2018-08-04T04:45:00.282Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b65307ca376d259db594a46" + }, + "timestamp": { + "$date": "2018-08-04T04:50:00.267Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6531a8a376d259db594acd" + }, + "timestamp": { + "$date": "2018-08-04T04:55:00.476Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6532d4a376d259db594b4e" + }, + "timestamp": { + "$date": "2018-08-04T05:00:00.289Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b653400a376d259db594bcf" + }, + "timestamp": { + "$date": "2018-08-04T05:05:00.269Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b65352ca376d259db594c5c" + }, + "timestamp": { + "$date": "2018-08-04T05:10:00.292Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b653658a376d259db594cdd" + }, + "timestamp": { + "$date": "2018-08-04T05:15:00.291Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b653784a376d259db594d5e" + }, + "timestamp": { + "$date": "2018-08-04T05:20:00.309Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6538b0a376d259db594ed3" + }, + "timestamp": { + "$date": "2018-08-04T05:25:00.259Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6539dca376d259db594f59" + }, + "timestamp": { + "$date": "2018-08-04T05:30:00.362Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b653b08a376d259db594fdf" + }, + "timestamp": { + "$date": "2018-08-04T05:35:00.272Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b653c34a376d259db595065" + }, + "timestamp": { + "$date": "2018-08-04T05:40:00.265Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b653d60a376d259db5950f1" + }, + "timestamp": { + "$date": "2018-08-04T05:45:00.342Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b653e8ca376d259db595177" + }, + "timestamp": { + "$date": "2018-08-04T05:50:00.277Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b653fb8a376d259db595209" + }, + "timestamp": { + "$date": "2018-08-04T05:55:00.26Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6540e5a376d259db59529f" + }, + "timestamp": { + "$date": "2018-08-04T06:00:00.829Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b654210a376d259db5953a6" + }, + "timestamp": { + "$date": "2018-08-04T06:05:00.262Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b65433ca376d259db59542c" + }, + "timestamp": { + "$date": "2018-08-04T06:10:00.261Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b654468a376d259db5954b2" + }, + "timestamp": { + "$date": "2018-08-04T06:15:00.326Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b654594a376d259db595540" + }, + "timestamp": { + "$date": "2018-08-04T06:20:00.261Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6546c0a376d259db5955cc" + }, + "timestamp": { + "$date": "2018-08-04T06:25:00.679Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6547eca376d259db595658" + }, + "timestamp": { + "$date": "2018-08-04T06:30:00.454Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b654918a376d259db5956de" + }, + "timestamp": { + "$date": "2018-08-04T06:35:00.26Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b654a44a376d259db595764" + }, + "timestamp": { + "$date": "2018-08-04T06:40:00.281Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b654b70a376d259db5957ea" + }, + "timestamp": { + "$date": "2018-08-04T06:45:00.293Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b654c9ca376d259db595870" + }, + "timestamp": { + "$date": "2018-08-04T06:50:00.262Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b654dc8a376d259db5958fc" + }, + "timestamp": { + "$date": "2018-08-04T06:55:00.262Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b654ef4a376d259db595988" + }, + "timestamp": { + "$date": "2018-08-04T07:00:00.419Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b655020a376d259db595a14" + }, + "timestamp": { + "$date": "2018-08-04T07:05:00.287Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b65514ca376d259db595a9a" + }, + "timestamp": { + "$date": "2018-08-04T07:10:00.263Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b655278a376d259db595b20" + }, + "timestamp": { + "$date": "2018-08-04T07:15:00.284Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6553a4a376d259db595ba6" + }, + "timestamp": { + "$date": "2018-08-04T07:20:00.262Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6554d0a376d259db595c2c" + }, + "timestamp": { + "$date": "2018-08-04T07:25:00.306Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6555fca376d259db595d42" + }, + "timestamp": { + "$date": "2018-08-04T07:30:00.39Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b655728a376d259db595dc9" + }, + "timestamp": { + "$date": "2018-08-04T07:35:00.287Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b655854a376d259db595e4f" + }, + "timestamp": { + "$date": "2018-08-04T07:40:00.317Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b655980a376d259db595f26" + }, + "timestamp": { + "$date": "2018-08-04T07:45:00.282Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b655aaca376d259db595fa7" + }, + "timestamp": { + "$date": "2018-08-04T07:50:00.267Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b655bd8a376d259db596028" + }, + "timestamp": { + "$date": "2018-08-04T07:55:00.264Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b655d04a376d259db5960af" + }, + "timestamp": { + "$date": "2018-08-04T08:00:00.478Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b655e30a376d259db596130" + }, + "timestamp": { + "$date": "2018-08-04T08:05:00.273Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b655f5ca376d259db5961b1" + }, + "timestamp": { + "$date": "2018-08-04T08:10:00.577Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b656088a376d259db596240" + }, + "timestamp": { + "$date": "2018-08-04T08:15:00.377Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6561b4a376d259db5962c1" + }, + "timestamp": { + "$date": "2018-08-04T08:20:00.258Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6562e0a376d259db596342" + }, + "timestamp": { + "$date": "2018-08-04T08:25:00.319Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b65640ca376d259db5963c9" + }, + "timestamp": { + "$date": "2018-08-04T08:30:00.283Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b656538a376d259db59644a" + }, + "timestamp": { + "$date": "2018-08-04T08:35:00.34Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b656664a376d259db5964cb" + }, + "timestamp": { + "$date": "2018-08-04T08:40:00.28Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b656790a376d259db596558" + }, + "timestamp": { + "$date": "2018-08-04T08:45:00.312Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6568bca376d259db5965d9" + }, + "timestamp": { + "$date": "2018-08-04T08:50:00.261Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6569e8a376d259db59665a" + }, + "timestamp": { + "$date": "2018-08-04T08:55:00.264Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b656b14a376d259db5966db" + }, + "timestamp": { + "$date": "2018-08-04T09:00:00.282Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b656c40a376d259db596762" + }, + "timestamp": { + "$date": "2018-08-04T09:05:00.396Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b656d6ca376d259db5967e3" + }, + "timestamp": { + "$date": "2018-08-04T09:10:00.285Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b656e98a376d259db596864" + }, + "timestamp": { + "$date": "2018-08-04T09:15:00.295Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b656fc4a376d259db5968f1" + }, + "timestamp": { + "$date": "2018-08-04T09:20:00.266Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6570f0a376d259db596972" + }, + "timestamp": { + "$date": "2018-08-04T09:25:00.273Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b65721ca376d259db5969f3" + }, + "timestamp": { + "$date": "2018-08-04T09:30:00.288Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b657348a376d259db596a7a" + }, + "timestamp": { + "$date": "2018-08-04T09:35:00.427Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b657474a376d259db596afb" + }, + "timestamp": { + "$date": "2018-08-04T09:40:00.274Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6575a0a376d259db596b7e" + }, + "timestamp": { + "$date": "2018-08-04T09:45:00.304Z" + }, + "users": [ + null, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6576cca376d259db596bff" + }, + "timestamp": { + "$date": "2018-08-04T09:50:00.295Z" + }, + "users": [ + null, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6577f8a376d259db596cb8" + }, + "timestamp": { + "$date": "2018-08-04T09:55:00.259Z" + }, + "users": [ + null, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b657924a376d259db596d40" + }, + "timestamp": { + "$date": "2018-08-04T10:00:00.292Z" + }, + "users": [ + null, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b657a51a376d259db596ec5" + }, + "timestamp": { + "$date": "2018-08-04T10:05:00.786Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b657b7ca376d259db596f4d" + }, + "timestamp": { + "$date": "2018-08-04T10:10:00.264Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b657ca8a376d259db596fd5" + }, + "timestamp": { + "$date": "2018-08-04T10:15:00.287Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b657dd4a376d259db59705b" + }, + "timestamp": { + "$date": "2018-08-04T10:20:00.267Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b657f00a376d259db5970e1" + }, + "timestamp": { + "$date": "2018-08-04T10:25:00.274Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65802ca376d259db597173" + }, + "timestamp": { + "$date": "2018-08-04T10:30:00.286Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b658158a376d259db597206" + }, + "timestamp": { + "$date": "2018-08-04T10:35:00.298Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b658284a376d259db59728c" + }, + "timestamp": { + "$date": "2018-08-04T10:40:00.32Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6583b0a376d259db597317" + }, + "timestamp": { + "$date": "2018-08-04T10:45:00.351Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6584dea376d259db59739f" + }, + "timestamp": { + "$date": "2018-08-04T10:50:01.68Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b658608a376d259db597476" + }, + "timestamp": { + "$date": "2018-08-04T10:55:00.26Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b658734a376d259db5975ef" + }, + "timestamp": { + "$date": "2018-08-04T11:00:00.296Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b658860a376d259db5976fc" + }, + "timestamp": { + "$date": "2018-08-04T11:05:00.279Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65898ca376d259db597788" + }, + "timestamp": { + "$date": "2018-08-04T11:10:00.265Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b658ab8a376d259db59780e" + }, + "timestamp": { + "$date": "2018-08-04T11:15:00.302Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b658be4a376d259db5978c3" + }, + "timestamp": { + "$date": "2018-08-04T11:20:00.262Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b658d10a376d259db597949" + }, + "timestamp": { + "$date": "2018-08-04T11:25:00.275Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b658e3ca376d259db5979d5" + }, + "timestamp": { + "$date": "2018-08-04T11:30:00.3Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b658f68a376d259db597a8b" + }, + "timestamp": { + "$date": "2018-08-04T11:35:00.4Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b659094a376d259db597b3c" + }, + "timestamp": { + "$date": "2018-08-04T11:40:00.273Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6591c0a376d259db597bdc" + }, + "timestamp": { + "$date": "2018-08-04T11:45:00.285Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6592eca376d259db597d2c" + }, + "timestamp": { + "$date": "2018-08-04T11:50:00.335Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b659418a376d259db597de6" + }, + "timestamp": { + "$date": "2018-08-04T11:55:00.263Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b659544a376d259db597ee4" + }, + "timestamp": { + "$date": "2018-08-04T12:00:00.311Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b659670a376d259db597fa7" + }, + "timestamp": { + "$date": "2018-08-04T12:05:00.386Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65979ca376d259db598066" + }, + "timestamp": { + "$date": "2018-08-04T12:10:00.316Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6598c8a376d259db598157" + }, + "timestamp": { + "$date": "2018-08-04T12:15:00.295Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6599f4a376d259db59830b" + }, + "timestamp": { + "$date": "2018-08-04T12:20:00.367Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b659b20a376d259db5984cd" + }, + "timestamp": { + "$date": "2018-08-04T12:25:00.264Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b659c4ca376d259db598615" + }, + "timestamp": { + "$date": "2018-08-04T12:30:00.298Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b659d78a376d259db598758" + }, + "timestamp": { + "$date": "2018-08-04T12:35:00.373Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b659ea4a376d259db5988a3" + }, + "timestamp": { + "$date": "2018-08-04T12:40:00.291Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b659fd0a376d259db598b2d" + }, + "timestamp": { + "$date": "2018-08-04T12:45:00.299Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65a0fca376d259db598c79" + }, + "timestamp": { + "$date": "2018-08-04T12:50:00.267Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65a228a376d259db598e72" + }, + "timestamp": { + "$date": "2018-08-04T12:55:00.303Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65a354a376d259db599080" + }, + "timestamp": { + "$date": "2018-08-04T13:00:00.3Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65a481a376d259db599196" + }, + "timestamp": { + "$date": "2018-08-04T13:05:01.096Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "0" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "0" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65a5aca376d259db5992b2" + }, + "timestamp": { + "$date": "2018-08-04T13:10:00.276Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65a6d8a376d259db59933d" + }, + "timestamp": { + "$date": "2018-08-04T13:15:00.316Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65a804a376d259db5993c8" + }, + "timestamp": { + "$date": "2018-08-04T13:20:00.271Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65a930a376d259db599453" + }, + "timestamp": { + "$date": "2018-08-04T13:25:00.281Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65aa5da376d259db5994de" + }, + "timestamp": { + "$date": "2018-08-04T13:30:00.832Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65ab89a376d259db599571" + }, + "timestamp": { + "$date": "2018-08-04T13:35:01.298Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65acb4a376d259db599608" + }, + "timestamp": { + "$date": "2018-08-04T13:40:00.308Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65ade0a376d259db599693" + }, + "timestamp": { + "$date": "2018-08-04T13:45:00.299Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65af0ca376d259db599720" + }, + "timestamp": { + "$date": "2018-08-04T13:50:00.262Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65b038a376d259db5997ab" + }, + "timestamp": { + "$date": "2018-08-04T13:55:00.274Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65b164a376d259db599836" + }, + "timestamp": { + "$date": "2018-08-04T14:00:00.279Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65b290a376d259db5998c3" + }, + "timestamp": { + "$date": "2018-08-04T14:05:00.268Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65b3bda376d259db59995a" + }, + "timestamp": { + "$date": "2018-08-04T14:10:00.401Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65b4e8a376d259db5999ed" + }, + "timestamp": { + "$date": "2018-08-04T14:15:00.298Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65b614a376d259db599a78" + }, + "timestamp": { + "$date": "2018-08-04T14:20:00.261Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65b741a376d259db599b03" + }, + "timestamp": { + "$date": "2018-08-04T14:25:00.423Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65b86ca376d259db599b8e" + }, + "timestamp": { + "$date": "2018-08-04T14:30:00.279Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65b998a376d259db599c19" + }, + "timestamp": { + "$date": "2018-08-04T14:35:00.263Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65bac5a376d259db599cb0" + }, + "timestamp": { + "$date": "2018-08-04T14:40:00.408Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65bbf0a376d259db599d41" + }, + "timestamp": { + "$date": "2018-08-04T14:45:00.295Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65bd1ca376d259db599dcc" + }, + "timestamp": { + "$date": "2018-08-04T14:50:00.268Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65be48a376d259db599e57" + }, + "timestamp": { + "$date": "2018-08-04T14:55:00.264Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65bf74a376d259db599ee2" + }, + "timestamp": { + "$date": "2018-08-04T15:00:00.304Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65c0a0a376d259db59a0c0" + }, + "timestamp": { + "$date": "2018-08-04T15:05:00.263Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65c1cda376d259db59a20a" + }, + "timestamp": { + "$date": "2018-08-04T15:10:00.407Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65c2f8a376d259db59a34e" + }, + "timestamp": { + "$date": "2018-08-04T15:15:00.297Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65c424a376d259db59a4c0" + }, + "timestamp": { + "$date": "2018-08-04T15:20:00.286Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65c550a376d259db59a632" + }, + "timestamp": { + "$date": "2018-08-04T15:25:00.261Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65c67da376d259db59a77a" + }, + "timestamp": { + "$date": "2018-08-04T15:30:00.364Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65c7a8a376d259db59a8c6" + }, + "timestamp": { + "$date": "2018-08-04T15:35:00.26Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65c8d5a376d259db59aa10" + }, + "timestamp": { + "$date": "2018-08-04T15:40:00.579Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65ca01a376d259db59ab54" + }, + "timestamp": { + "$date": "2018-08-04T15:45:00.34Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65cb2ca376d259db59ac98" + }, + "timestamp": { + "$date": "2018-08-04T15:50:00.272Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65cc58a376d259db59ade4" + }, + "timestamp": { + "$date": "2018-08-04T15:55:00.274Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65cd84a376d259db59af45" + }, + "timestamp": { + "$date": "2018-08-04T16:00:00.298Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65ceb1a376d259db59b0af" + }, + "timestamp": { + "$date": "2018-08-04T16:05:00.303Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65cfdda376d259db59b1f9" + }, + "timestamp": { + "$date": "2018-08-04T16:10:00.261Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65d109a376d259db59b360" + }, + "timestamp": { + "$date": "2018-08-04T16:15:00.301Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b65d234a376d259db59b3fb" + }, + "timestamp": { + "$date": "2018-08-04T16:20:00.267Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65d360a376d259db59b491" + }, + "timestamp": { + "$date": "2018-08-04T16:25:00.274Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65d48da376d259db59b58c" + }, + "timestamp": { + "$date": "2018-08-04T16:30:00.303Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65d5b9a376d259db59b750" + }, + "timestamp": { + "$date": "2018-08-04T16:35:00.368Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65d6e4a376d259db59b89f" + }, + "timestamp": { + "$date": "2018-08-04T16:40:00.259Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65d811a376d259db59b953" + }, + "timestamp": { + "$date": "2018-08-04T16:45:00.326Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65d93da376d259db59b9de" + }, + "timestamp": { + "$date": "2018-08-04T16:50:00.261Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65da69a376d259db59ba6d" + }, + "timestamp": { + "$date": "2018-08-04T16:55:00.282Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65db95a376d259db59bb1c" + }, + "timestamp": { + "$date": "2018-08-04T17:00:00.305Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65dcc1a376d259db59bba7" + }, + "timestamp": { + "$date": "2018-08-04T17:05:00.277Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65ddeda376d259db59bc63" + }, + "timestamp": { + "$date": "2018-08-04T17:10:00.26Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65df19a376d259db59bcf4" + }, + "timestamp": { + "$date": "2018-08-04T17:15:00.438Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65e045a376d259db59bd7f" + }, + "timestamp": { + "$date": "2018-08-04T17:20:00.271Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65e171a376d259db59be2e" + }, + "timestamp": { + "$date": "2018-08-04T17:25:00.26Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65e29da376d259db59beb9" + }, + "timestamp": { + "$date": "2018-08-04T17:30:00.306Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65e3c9a376d259db59bf6c" + }, + "timestamp": { + "$date": "2018-08-04T17:35:00.266Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65e4f5a376d259db59bffd" + }, + "timestamp": { + "$date": "2018-08-04T17:40:00.318Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65e621a376d259db59c094" + }, + "timestamp": { + "$date": "2018-08-04T17:45:00.447Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65e74da376d259db59c146" + }, + "timestamp": { + "$date": "2018-08-04T17:50:00.408Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65e879a376d259db59c1d1" + }, + "timestamp": { + "$date": "2018-08-04T17:55:00.299Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65e9a5a376d259db59c2dc" + }, + "timestamp": { + "$date": "2018-08-04T18:00:00.277Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65ead1a376d259db59c367" + }, + "timestamp": { + "$date": "2018-08-04T18:05:00.287Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65ebfda376d259db59c3f4" + }, + "timestamp": { + "$date": "2018-08-04T18:10:00.261Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65ed29a376d259db59c48d" + }, + "timestamp": { + "$date": "2018-08-04T18:15:00.298Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65ee55a376d259db59c51a" + }, + "timestamp": { + "$date": "2018-08-04T18:20:00.279Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65ef81a376d259db59c5d5" + }, + "timestamp": { + "$date": "2018-08-04T18:25:00.267Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65f0ada376d259db59c6b8" + }, + "timestamp": { + "$date": "2018-08-04T18:30:00.419Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65f1d9a376d259db59c915" + }, + "timestamp": { + "$date": "2018-08-04T18:35:00.266Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65f305a376d259db59cb6e" + }, + "timestamp": { + "$date": "2018-08-04T18:40:00.267Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65f431a376d259db59cc40" + }, + "timestamp": { + "$date": "2018-08-04T18:45:00.311Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "0" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "0" + } + ] +} +{ + "_id": { + "$oid": "5b65f55da376d259db59cd0c" + }, + "timestamp": { + "$date": "2018-08-04T18:50:00.358Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65f689a376d259db59cd92" + }, + "timestamp": { + "$date": "2018-08-04T18:55:00.441Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65f7b5a376d259db59ce18" + }, + "timestamp": { + "$date": "2018-08-04T19:00:00.445Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65f8e1a376d259db59ce9e" + }, + "timestamp": { + "$date": "2018-08-04T19:05:00.407Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65fa0da376d259db59cf24" + }, + "timestamp": { + "$date": "2018-08-04T19:10:00.402Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65fb39a376d259db59cfb6" + }, + "timestamp": { + "$date": "2018-08-04T19:15:00.429Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65fc65a376d259db59d042" + }, + "timestamp": { + "$date": "2018-08-04T19:20:00.456Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65fd91a376d259db59d0c8" + }, + "timestamp": { + "$date": "2018-08-04T19:25:00.427Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65febda376d259db59d14e" + }, + "timestamp": { + "$date": "2018-08-04T19:30:00.446Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b65ffe9a376d259db59d1d4" + }, + "timestamp": { + "$date": "2018-08-04T19:35:00.412Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b660115a376d259db59d25a" + }, + "timestamp": { + "$date": "2018-08-04T19:40:00.413Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b660241a376d259db59d2ec" + }, + "timestamp": { + "$date": "2018-08-04T19:45:00.488Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66036da376d259db59d378" + }, + "timestamp": { + "$date": "2018-08-04T19:50:00.472Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b660499a376d259db59d3fe" + }, + "timestamp": { + "$date": "2018-08-04T19:55:00.474Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6605c5a376d259db59d484" + }, + "timestamp": { + "$date": "2018-08-04T20:00:00.463Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6606f1a376d259db59d50a" + }, + "timestamp": { + "$date": "2018-08-04T20:05:00.411Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66081da376d259db59d590" + }, + "timestamp": { + "$date": "2018-08-04T20:10:00.453Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b660949a376d259db59d726" + }, + "timestamp": { + "$date": "2018-08-04T20:15:00.477Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6609f3a376d259db59d7a4" + }, + "timestamp": { + "$date": "2018-08-04T20:17:50.484Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Zachary Ryn", + "clientDbId": "5463" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b660a75a376d259db59d88a" + }, + "timestamp": { + "$date": "2018-08-04T20:20:00.416Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b660ba1a376d259db59d96f" + }, + "timestamp": { + "$date": "2018-08-04T20:25:00.462Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b660ccda376d259db59da04" + }, + "timestamp": { + "$date": "2018-08-04T20:30:00.546Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b660df9a376d259db59dac0" + }, + "timestamp": { + "$date": "2018-08-04T20:35:00.39Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b660f25a376d259db59db51" + }, + "timestamp": { + "$date": "2018-08-04T20:40:00.417Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b661051a376d259db59dbe1" + }, + "timestamp": { + "$date": "2018-08-04T20:45:00.42Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hardy.J", + "clientDbId": "5421" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66117da376d259db59dc77" + }, + "timestamp": { + "$date": "2018-08-04T20:50:00.547Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6612a9a376d259db59dd07" + }, + "timestamp": { + "$date": "2018-08-04T20:55:00.39Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6613d5a376d259db59dd98" + }, + "timestamp": { + "$date": "2018-08-04T21:00:00.573Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b661501a376d259db59de3a" + }, + "timestamp": { + "$date": "2018-08-04T21:05:00.384Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b661630a376d259db59deca" + }, + "timestamp": { + "$date": "2018-08-04T21:10:03.387Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66175ca376d259db59df5a" + }, + "timestamp": { + "$date": "2018-08-04T21:15:03.201Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b661888a376d259db59dff0" + }, + "timestamp": { + "$date": "2018-08-04T21:20:03.296Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6619b4a376d259db59e082" + }, + "timestamp": { + "$date": "2018-08-04T21:25:03.987Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b661ae0a376d259db59e112" + }, + "timestamp": { + "$date": "2018-08-04T21:30:03.173Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b661c09a376d259db59e1ae" + }, + "timestamp": { + "$date": "2018-08-04T21:35:00.41Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b661d35a376d259db59e23e" + }, + "timestamp": { + "$date": "2018-08-04T21:40:00.376Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b661e61a376d259db59e2ce" + }, + "timestamp": { + "$date": "2018-08-04T21:45:00.39Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b661f8da376d259db59e35e" + }, + "timestamp": { + "$date": "2018-08-04T21:50:00.419Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6620b9a376d259db59e3f4" + }, + "timestamp": { + "$date": "2018-08-04T21:55:00.644Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6621e5a376d259db59e484" + }, + "timestamp": { + "$date": "2018-08-04T22:00:00.48Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b662311a376d259db59e520" + }, + "timestamp": { + "$date": "2018-08-04T22:05:00.47Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b662440a376d259db59e5d9" + }, + "timestamp": { + "$date": "2018-08-04T22:10:03.225Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L1", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b662569a376d259db59e66a" + }, + "timestamp": { + "$date": "2018-08-04T22:15:00.379Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L1", + "clientDbId": "3225" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b662698a376d259db59e6fe" + }, + "timestamp": { + "$date": "2018-08-04T22:20:03.899Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L1", + "clientDbId": "3225" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6627c4a376d259db59e796" + }, + "timestamp": { + "$date": "2018-08-04T22:25:03.344Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Nicholls.C", + "clientDbId": "5402" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Viktus.C", + "clientDbId": "5403" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Penn.L1", + "clientDbId": "3225" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6628f0a376d259db59e826" + }, + "timestamp": { + "$date": "2018-08-04T22:30:03.527Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "0" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "0" + } + ] +} +{ + "_id": { + "$oid": "5b662a1aa376d259db59e8c9" + }, + "timestamp": { + "$date": "2018-08-04T22:35:01.215Z" + }, + "users": [ + { + "channelName": "", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "0" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "0" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "0" + } + ] +} +{ + "_id": { + "$oid": "5b662b45a376d259db59e99b" + }, + "timestamp": { + "$date": "2018-08-04T22:40:00.324Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b662c71a376d259db59ea58" + }, + "timestamp": { + "$date": "2018-08-04T22:45:00.277Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b662d9da376d259db59eae0" + }, + "timestamp": { + "$date": "2018-08-04T22:50:00.284Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b662ec9a376d259db59eb66" + }, + "timestamp": { + "$date": "2018-08-04T22:55:00.318Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b662ff5a376d259db59ec37" + }, + "timestamp": { + "$date": "2018-08-04T23:00:00.273Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b663121a376d259db59ee5d" + }, + "timestamp": { + "$date": "2018-08-04T23:05:00.271Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66324da376d259db59ef8e" + }, + "timestamp": { + "$date": "2018-08-04T23:10:00.425Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b663379a376d259db59f01b" + }, + "timestamp": { + "$date": "2018-08-04T23:15:00.263Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6634a5a376d259db59f0a1" + }, + "timestamp": { + "$date": "2018-08-04T23:20:00.296Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6635d1a376d259db59f127" + }, + "timestamp": { + "$date": "2018-08-04T23:25:00.288Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6636fda376d259db59f1ad" + }, + "timestamp": { + "$date": "2018-08-04T23:30:00.267Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b663829a376d259db59f233" + }, + "timestamp": { + "$date": "2018-08-04T23:35:00.281Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b663955a376d259db59f2c5" + }, + "timestamp": { + "$date": "2018-08-04T23:40:00.422Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b663a81a376d259db59f3d1" + }, + "timestamp": { + "$date": "2018-08-04T23:45:00.268Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b663bada376d259db59f457" + }, + "timestamp": { + "$date": "2018-08-04T23:50:00.276Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "JSFAW 2iC - FltLt.Johnson.R", + "channelId": "1047", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b663cd9a376d259db59f4dd" + }, + "timestamp": { + "$date": "2018-08-04T23:55:00.283Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b663e05a376d259db59f563" + }, + "timestamp": { + "$date": "2018-08-05T00:00:00.264Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b663f31a376d259db59f5e9" + }, + "timestamp": { + "$date": "2018-08-05T00:05:00.268Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b66405da376d259db59f67b" + }, + "timestamp": { + "$date": "2018-08-05T00:10:00.435Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b664189a376d259db59f707" + }, + "timestamp": { + "$date": "2018-08-05T00:15:00.277Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6642b5a376d259db59f78d" + }, + "timestamp": { + "$date": "2018-08-05T00:20:00.264Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6643e1a376d259db59f813" + }, + "timestamp": { + "$date": "2018-08-05T00:25:00.295Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b66450da376d259db59f899" + }, + "timestamp": { + "$date": "2018-08-05T00:30:00.261Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b664639a376d259db59f91f" + }, + "timestamp": { + "$date": "2018-08-05T00:35:00.266Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b664765a376d259db59f9ab" + }, + "timestamp": { + "$date": "2018-08-05T00:40:00.408Z" + }, + "users": [ + null, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b664891a376d259db59fa3d" + }, + "timestamp": { + "$date": "2018-08-05T00:45:00.283Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6649bda376d259db59fac3" + }, + "timestamp": { + "$date": "2018-08-05T00:50:00.26Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b664ae9a376d259db59fb49" + }, + "timestamp": { + "$date": "2018-08-05T00:55:00.293Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b664c15a376d259db59fbd3" + }, + "timestamp": { + "$date": "2018-08-05T01:00:00.261Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b664d41a376d259db59fc59" + }, + "timestamp": { + "$date": "2018-08-05T01:05:00.263Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b664e6da376d259db59fce5" + }, + "timestamp": { + "$date": "2018-08-05T01:10:00.468Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b664f99a376d259db59fda4" + }, + "timestamp": { + "$date": "2018-08-05T01:15:00.274Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6650c5a376d259db59fe83" + }, + "timestamp": { + "$date": "2018-08-05T01:20:00.258Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6651f1a376d259db59ff18" + }, + "timestamp": { + "$date": "2018-08-05T01:25:00.286Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b66531da376d259db59ffa3" + }, + "timestamp": { + "$date": "2018-08-05T01:30:00.262Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b665449a376d259db5a002e" + }, + "timestamp": { + "$date": "2018-08-05T01:35:00.265Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b665575a376d259db5a00bf" + }, + "timestamp": { + "$date": "2018-08-05T01:40:00.499Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b6656a1a376d259db5a0156" + }, + "timestamp": { + "$date": "2018-08-05T01:45:00.281Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b6657cda376d259db5a020c" + }, + "timestamp": { + "$date": "2018-08-05T01:50:00.264Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b6658f9a376d259db5a02ec" + }, + "timestamp": { + "$date": "2018-08-05T01:55:00.284Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b665a25a376d259db5a0379" + }, + "timestamp": { + "$date": "2018-08-05T02:00:00.261Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b665b51a376d259db5a0404" + }, + "timestamp": { + "$date": "2018-08-05T02:05:00.296Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b665c7da376d259db5a0495" + }, + "timestamp": { + "$date": "2018-08-05T02:10:00.286Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b665da9a376d259db5a0526" + }, + "timestamp": { + "$date": "2018-08-05T02:15:00.397Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b665ed5a376d259db5a05b1" + }, + "timestamp": { + "$date": "2018-08-05T02:20:00.273Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b666001a376d259db5a0642" + }, + "timestamp": { + "$date": "2018-08-05T02:25:00.388Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66612da376d259db5a06cd" + }, + "timestamp": { + "$date": "2018-08-05T02:30:00.261Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b666259a376d259db5a0758" + }, + "timestamp": { + "$date": "2018-08-05T02:35:00.264Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b666385a376d259db5a07e7" + }, + "timestamp": { + "$date": "2018-08-05T02:40:00.303Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6664b1a376d259db5a086d" + }, + "timestamp": { + "$date": "2018-08-05T02:45:00.304Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6665dda376d259db5a08f9" + }, + "timestamp": { + "$date": "2018-08-05T02:50:00.277Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b666709a376d259db5a097f" + }, + "timestamp": { + "$date": "2018-08-05T02:55:00.365Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b666835a376d259db5a0a0b" + }, + "timestamp": { + "$date": "2018-08-05T03:00:00.262Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b666961a376d259db5a0a91" + }, + "timestamp": { + "$date": "2018-08-05T03:05:00.264Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b666a8da376d259db5a0b17" + }, + "timestamp": { + "$date": "2018-08-05T03:10:00.283Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b666bb9a376d259db5a0ba3" + }, + "timestamp": { + "$date": "2018-08-05T03:15:00.396Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b666ce5a376d259db5a0c2b" + }, + "timestamp": { + "$date": "2018-08-05T03:20:00.277Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b666e11a376d259db5a0cac" + }, + "timestamp": { + "$date": "2018-08-05T03:25:00.285Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b666f3da376d259db5a0d33" + }, + "timestamp": { + "$date": "2018-08-05T03:30:00.265Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b667069a376d259db5a0db4" + }, + "timestamp": { + "$date": "2018-08-05T03:35:00.273Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b667195a376d259db5a0e35" + }, + "timestamp": { + "$date": "2018-08-05T03:40:00.282Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6672c1a376d259db5a0ebc" + }, + "timestamp": { + "$date": "2018-08-05T03:45:00.438Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6673eda376d259db5a0f3d" + }, + "timestamp": { + "$date": "2018-08-05T03:50:00.271Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b667519a376d259db5a0fc4" + }, + "timestamp": { + "$date": "2018-08-05T03:55:00.313Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b667645a376d259db5a1045" + }, + "timestamp": { + "$date": "2018-08-05T04:00:00.272Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b667771a376d259db5a10cc" + }, + "timestamp": { + "$date": "2018-08-05T04:05:00.261Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66789da376d259db5a114d" + }, + "timestamp": { + "$date": "2018-08-05T04:10:00.288Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6679c9a376d259db5a11d4" + }, + "timestamp": { + "$date": "2018-08-05T04:15:00.264Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b667af5a376d259db5a1255" + }, + "timestamp": { + "$date": "2018-08-05T04:20:00.323Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b667c21a376d259db5a12d6" + }, + "timestamp": { + "$date": "2018-08-05T04:25:00.301Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b667d4da376d259db5a135d" + }, + "timestamp": { + "$date": "2018-08-05T04:30:00.259Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b667e79a376d259db5a13de" + }, + "timestamp": { + "$date": "2018-08-05T04:35:00.266Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b667fa5a376d259db5a1465" + }, + "timestamp": { + "$date": "2018-08-05T04:40:00.369Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6680d1a376d259db5a14e6" + }, + "timestamp": { + "$date": "2018-08-05T04:45:00.26Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6681fda376d259db5a156d" + }, + "timestamp": { + "$date": "2018-08-05T04:50:00.414Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b668329a376d259db5a15ee" + }, + "timestamp": { + "$date": "2018-08-05T04:55:00.312Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b668455a376d259db5a1671" + }, + "timestamp": { + "$date": "2018-08-05T05:00:00.26Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b668581a376d259db5a16f8" + }, + "timestamp": { + "$date": "2018-08-05T05:05:00.264Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6686ada376d259db5a17a1" + }, + "timestamp": { + "$date": "2018-08-05T05:10:00.288Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6687d9a376d259db5a1825" + }, + "timestamp": { + "$date": "2018-08-05T05:15:00.286Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b668905a376d259db5a18ac" + }, + "timestamp": { + "$date": "2018-08-05T05:20:00.261Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b668a31a376d259db5a192d" + }, + "timestamp": { + "$date": "2018-08-05T05:25:00.366Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b668b5da376d259db5a19ae" + }, + "timestamp": { + "$date": "2018-08-05T05:30:00.27Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b668c89a376d259db5a1a2f" + }, + "timestamp": { + "$date": "2018-08-05T05:35:00.271Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b668db5a376d259db5a1ab6" + }, + "timestamp": { + "$date": "2018-08-05T05:40:00.288Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b668ee1a376d259db5a1b3d" + }, + "timestamp": { + "$date": "2018-08-05T05:45:00.292Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66900da376d259db5a1bc4" + }, + "timestamp": { + "$date": "2018-08-05T05:50:00.261Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b669139a376d259db5a1c45" + }, + "timestamp": { + "$date": "2018-08-05T05:55:00.422Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b669265a376d259db5a1cc6" + }, + "timestamp": { + "$date": "2018-08-05T06:00:00.272Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b669391a376d259db5a1d47" + }, + "timestamp": { + "$date": "2018-08-05T06:05:00.267Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6694bda376d259db5a1dce" + }, + "timestamp": { + "$date": "2018-08-05T06:10:00.291Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6695e9a376d259db5a1e57" + }, + "timestamp": { + "$date": "2018-08-05T06:15:00.258Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b669715a376d259db5a1ede" + }, + "timestamp": { + "$date": "2018-08-05T06:20:00.263Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b669841a376d259db5a1f5f" + }, + "timestamp": { + "$date": "2018-08-05T06:25:00.327Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66996da376d259db5a1ff5" + }, + "timestamp": { + "$date": "2018-08-05T06:30:00.266Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b669a99a376d259db5a207b" + }, + "timestamp": { + "$date": "2018-08-05T06:35:00.286Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b669bc5a376d259db5a2159" + }, + "timestamp": { + "$date": "2018-08-05T06:40:00.369Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b669cf1a376d259db5a21e8" + }, + "timestamp": { + "$date": "2018-08-05T06:45:00.276Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b669e1da376d259db5a226e" + }, + "timestamp": { + "$date": "2018-08-05T06:50:00.261Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b669f49a376d259db5a230b" + }, + "timestamp": { + "$date": "2018-08-05T06:55:00.315Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66a075a376d259db5a2393" + }, + "timestamp": { + "$date": "2018-08-05T07:00:00.263Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66a1a1a376d259db5a242c" + }, + "timestamp": { + "$date": "2018-08-05T07:05:00.264Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66a2cda376d259db5a24b2" + }, + "timestamp": { + "$date": "2018-08-05T07:10:00.309Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66a3f9a376d259db5a2584" + }, + "timestamp": { + "$date": "2018-08-05T07:15:00.292Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66a525a376d259db5a262c" + }, + "timestamp": { + "$date": "2018-08-05T07:20:00.296Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66a651a376d259db5a26b3" + }, + "timestamp": { + "$date": "2018-08-05T07:25:00.49Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66a77da376d259db5a2734" + }, + "timestamp": { + "$date": "2018-08-05T07:30:00.276Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66a8a9a376d259db5a27b5" + }, + "timestamp": { + "$date": "2018-08-05T07:35:00.313Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66a9d5a376d259db5a2836" + }, + "timestamp": { + "$date": "2018-08-05T07:40:00.286Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66ab01a376d259db5a28bd" + }, + "timestamp": { + "$date": "2018-08-05T07:45:00.267Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66ac2da376d259db5a2944" + }, + "timestamp": { + "$date": "2018-08-05T07:50:00.303Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66ad59a376d259db5a29cb" + }, + "timestamp": { + "$date": "2018-08-05T07:55:00.287Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66ae85a376d259db5a2a4c" + }, + "timestamp": { + "$date": "2018-08-05T08:00:00.414Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66afb1a376d259db5a2acd" + }, + "timestamp": { + "$date": "2018-08-05T08:05:00.283Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66b0dda376d259db5a2b4e" + }, + "timestamp": { + "$date": "2018-08-05T08:10:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66b209a376d259db5a2bcf" + }, + "timestamp": { + "$date": "2018-08-05T08:15:00.283Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66b335a376d259db5a2c56" + }, + "timestamp": { + "$date": "2018-08-05T08:20:00.317Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66b461a376d259db5a2ce3" + }, + "timestamp": { + "$date": "2018-08-05T08:25:00.303Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66b58da376d259db5a2d64" + }, + "timestamp": { + "$date": "2018-08-05T08:30:00.326Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66b6b9a376d259db5a2de5" + }, + "timestamp": { + "$date": "2018-08-05T08:35:00.286Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66b7e5a376d259db5a2e68" + }, + "timestamp": { + "$date": "2018-08-05T08:40:00.283Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66b911a376d259db5a2ee9" + }, + "timestamp": { + "$date": "2018-08-05T08:45:00.26Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66ba3da376d259db5a2f6a" + }, + "timestamp": { + "$date": "2018-08-05T08:50:00.273Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66bb69a376d259db5a2ff7" + }, + "timestamp": { + "$date": "2018-08-05T08:55:00.289Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66bc95a376d259db5a307e" + }, + "timestamp": { + "$date": "2018-08-05T09:00:00.398Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66bdc1a376d259db5a30ff" + }, + "timestamp": { + "$date": "2018-08-05T09:05:00.34Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66beeda376d259db5a3180" + }, + "timestamp": { + "$date": "2018-08-05T09:10:00.321Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66c019a376d259db5a3201" + }, + "timestamp": { + "$date": "2018-08-05T09:15:00.264Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66c145a376d259db5a3282" + }, + "timestamp": { + "$date": "2018-08-05T09:20:00.26Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66c271a376d259db5a3303" + }, + "timestamp": { + "$date": "2018-08-05T09:25:00.376Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66c39da376d259db5a3396" + }, + "timestamp": { + "$date": "2018-08-05T09:30:00.384Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b66c4c9a376d259db5a3419" + }, + "timestamp": { + "$date": "2018-08-05T09:35:00.273Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66c5f5a376d259db5a349a" + }, + "timestamp": { + "$date": "2018-08-05T09:40:00.285Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66c721a376d259db5a351b" + }, + "timestamp": { + "$date": "2018-08-05T09:45:00.26Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66c84da376d259db5a359c" + }, + "timestamp": { + "$date": "2018-08-05T09:50:00.283Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66c979a376d259db5a361d" + }, + "timestamp": { + "$date": "2018-08-05T09:55:00.39Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66caa5a376d259db5a36b0" + }, + "timestamp": { + "$date": "2018-08-05T10:00:00.384Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66cbd1a376d259db5a3731" + }, + "timestamp": { + "$date": "2018-08-05T10:05:00.281Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66ccfda376d259db5a37b2" + }, + "timestamp": { + "$date": "2018-08-05T10:10:00.394Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66ce29a376d259db5a3833" + }, + "timestamp": { + "$date": "2018-08-05T10:15:00.258Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66cf55a376d259db5a38b4" + }, + "timestamp": { + "$date": "2018-08-05T10:20:00.259Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66d081a376d259db5a3961" + }, + "timestamp": { + "$date": "2018-08-05T10:25:00.293Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66d1ada376d259db5a39f7" + }, + "timestamp": { + "$date": "2018-08-05T10:30:00.258Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66d2d9a376d259db5a3a83" + }, + "timestamp": { + "$date": "2018-08-05T10:35:00.326Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66d405a376d259db5a3b32" + }, + "timestamp": { + "$date": "2018-08-05T10:40:00.315Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Walli", + "clientDbId": "4230" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66d531a376d259db5a3bb8" + }, + "timestamp": { + "$date": "2018-08-05T10:45:00.264Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Walli", + "clientDbId": "4230" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66d65da376d259db5a3c3e" + }, + "timestamp": { + "$date": "2018-08-05T10:50:00.312Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Walli", + "clientDbId": "4230" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66d789a376d259db5a3cc4" + }, + "timestamp": { + "$date": "2018-08-05T10:55:00.301Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Walli", + "clientDbId": "4230" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66d8b5a376d259db5a3d56" + }, + "timestamp": { + "$date": "2018-08-05T11:00:00.263Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Walli", + "clientDbId": "4230" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66d9e1a376d259db5a3de2" + }, + "timestamp": { + "$date": "2018-08-05T11:05:00.314Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Walli", + "clientDbId": "4230" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "UKSF - Dedicated Server Client", + "channelId": "423", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66db0da376d259db5a3e68" + }, + "timestamp": { + "$date": "2018-08-05T11:10:00.3Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Walli", + "clientDbId": "4230" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "UKSF - Dedicated Server Client", + "channelId": "423", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66dc3aa376d259db5a3eee" + }, + "timestamp": { + "$date": "2018-08-05T11:15:00.36Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Walli", + "clientDbId": "4230" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "UKSF - Dedicated Server Client", + "channelId": "423", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66dd65a376d259db5a3f76" + }, + "timestamp": { + "$date": "2018-08-05T11:20:00.282Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Walli", + "clientDbId": "4230" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "UKSF - Dedicated Server Client", + "channelId": "423", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66de91a376d259db5a3ffc" + }, + "timestamp": { + "$date": "2018-08-05T11:25:00.29Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "UKSF - Dedicated Server Client", + "channelId": "423", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66dfbea376d259db5a4088" + }, + "timestamp": { + "$date": "2018-08-05T11:30:00.265Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "UKSF - Dedicated Server Client", + "channelId": "423", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66e0e9a376d259db5a4114" + }, + "timestamp": { + "$date": "2018-08-05T11:35:00.305Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "UKSF - Dedicated Server Client", + "channelId": "423", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66e215a376d259db5a41a0" + }, + "timestamp": { + "$date": "2018-08-05T11:40:00.305Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "UKSF - Dedicated Server Client", + "channelId": "423", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b66e341a376d259db5a422a" + }, + "timestamp": { + "$date": "2018-08-05T11:45:00.284Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "UKSF - Dedicated Server Client", + "channelId": "423", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66e46ea376d259db5a42b0" + }, + "timestamp": { + "$date": "2018-08-05T11:50:00.328Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "UKSF - Dedicated Server Client", + "channelId": "423", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66e599a376d259db5a4336" + }, + "timestamp": { + "$date": "2018-08-05T11:55:00.309Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "UKSF - Dedicated Server Client", + "channelId": "423", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66e6c6a376d259db5a43c8" + }, + "timestamp": { + "$date": "2018-08-05T12:00:00.286Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "UKSF - Dedicated Server Client", + "channelId": "423", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66e7f1a376d259db5a4456" + }, + "timestamp": { + "$date": "2018-08-05T12:05:00.283Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "UKSF - Dedicated Server Client", + "channelId": "423", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66e91ea376d259db5a454b" + }, + "timestamp": { + "$date": "2018-08-05T12:10:00.811Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66ea49a376d259db5a45d6" + }, + "timestamp": { + "$date": "2018-08-05T12:15:00.271Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66eb75a376d259db5a4661" + }, + "timestamp": { + "$date": "2018-08-05T12:20:00.264Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66eca2a376d259db5a474a" + }, + "timestamp": { + "$date": "2018-08-05T12:25:00.449Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66edcda376d259db5a48fb" + }, + "timestamp": { + "$date": "2018-08-05T12:30:00.26Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66eef9a376d259db5a4997" + }, + "timestamp": { + "$date": "2018-08-05T12:35:00.261Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66f026a376d259db5a4a28" + }, + "timestamp": { + "$date": "2018-08-05T12:40:00.428Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66f151a376d259db5a4af3" + }, + "timestamp": { + "$date": "2018-08-05T12:45:00.26Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66f27da376d259db5a4b7b" + }, + "timestamp": { + "$date": "2018-08-05T12:50:00.274Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66f3aaa376d259db5a4c07" + }, + "timestamp": { + "$date": "2018-08-05T12:55:00.286Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66f4d5a376d259db5a4c93" + }, + "timestamp": { + "$date": "2018-08-05T13:00:00.263Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66f602a376d259db5a4d19" + }, + "timestamp": { + "$date": "2018-08-05T13:05:00.282Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66f72ea376d259db5a4dcb" + }, + "timestamp": { + "$date": "2018-08-05T13:10:00.395Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66f85aa376d259db5a4e5c" + }, + "timestamp": { + "$date": "2018-08-05T13:15:00.27Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66f986a376d259db5a4ee7" + }, + "timestamp": { + "$date": "2018-08-05T13:20:00.264Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66fab2a376d259db5a4f72" + }, + "timestamp": { + "$date": "2018-08-05T13:25:00.286Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66fbdea376d259db5a5039" + }, + "timestamp": { + "$date": "2018-08-05T13:30:00.272Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66fd0aa376d259db5a50c1" + }, + "timestamp": { + "$date": "2018-08-05T13:35:00.314Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66fe36a376d259db5a51e7" + }, + "timestamp": { + "$date": "2018-08-05T13:40:00.405Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b66ff62a376d259db5a52af" + }, + "timestamp": { + "$date": "2018-08-05T13:45:00.265Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67008ea376d259db5a5335" + }, + "timestamp": { + "$date": "2018-08-05T13:50:00.275Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6701baa376d259db5a53bd" + }, + "timestamp": { + "$date": "2018-08-05T13:55:00.299Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6702e6a376d259db5a5443" + }, + "timestamp": { + "$date": "2018-08-05T14:00:00.266Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b670412a376d259db5a54c9" + }, + "timestamp": { + "$date": "2018-08-05T14:05:00.317Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67053ea376d259db5a555b" + }, + "timestamp": { + "$date": "2018-08-05T14:10:00.282Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67066aa376d259db5a55e9" + }, + "timestamp": { + "$date": "2018-08-05T14:15:00.301Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b670796a376d259db5a5671" + }, + "timestamp": { + "$date": "2018-08-05T14:20:00.262Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6708c2a376d259db5a56f7" + }, + "timestamp": { + "$date": "2018-08-05T14:25:00.286Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6709eea376d259db5a5781" + }, + "timestamp": { + "$date": "2018-08-05T14:30:00.262Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b670b1aa376d259db5a5807" + }, + "timestamp": { + "$date": "2018-08-05T14:35:00.273Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b670c46a376d259db5a5898" + }, + "timestamp": { + "$date": "2018-08-05T14:40:00.312Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b670d72a376d259db5a592a" + }, + "timestamp": { + "$date": "2018-08-05T14:45:00.363Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b670e9ea376d259db5a59b2" + }, + "timestamp": { + "$date": "2018-08-05T14:50:00.313Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b670fcaa376d259db5a5a38" + }, + "timestamp": { + "$date": "2018-08-05T14:55:00.323Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6710f6a376d259db5a5abe" + }, + "timestamp": { + "$date": "2018-08-05T15:00:00.304Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b671222a376d259db5a5b92" + }, + "timestamp": { + "$date": "2018-08-05T15:05:00.338Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67134ea376d259db5a5c20" + }, + "timestamp": { + "$date": "2018-08-05T15:10:00.327Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67147aa376d259db5a5ca6" + }, + "timestamp": { + "$date": "2018-08-05T15:15:00.361Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6715a6a376d259db5a5d34" + }, + "timestamp": { + "$date": "2018-08-05T15:20:00.319Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6716d2a376d259db5a5dba" + }, + "timestamp": { + "$date": "2018-08-05T15:25:00.441Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6717fea376d259db5a5e40" + }, + "timestamp": { + "$date": "2018-08-05T15:30:00.312Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67192aa376d259db5a5ece" + }, + "timestamp": { + "$date": "2018-08-05T15:35:00.313Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b671a56a376d259db5a5f5a" + }, + "timestamp": { + "$date": "2018-08-05T15:40:00.334Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b671b82a376d259db5a5fe0" + }, + "timestamp": { + "$date": "2018-08-05T15:45:00.423Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b671caea376d259db5a6066" + }, + "timestamp": { + "$date": "2018-08-05T15:50:00.327Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b671ddaa376d259db5a60f4" + }, + "timestamp": { + "$date": "2018-08-05T15:55:00.359Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b671f06a376d259db5a617c" + }, + "timestamp": { + "$date": "2018-08-05T16:00:00.313Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b672032a376d259db5a620c" + }, + "timestamp": { + "$date": "2018-08-05T16:05:00.306Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67215ea376d259db5a6298" + }, + "timestamp": { + "$date": "2018-08-05T16:10:00.388Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67228aa376d259db5a631e" + }, + "timestamp": { + "$date": "2018-08-05T16:15:00.35Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6723b6a376d259db5a63a4" + }, + "timestamp": { + "$date": "2018-08-05T16:20:00.324Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6724e2a376d259db5a642a" + }, + "timestamp": { + "$date": "2018-08-05T16:25:00.345Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67260ea376d259db5a64b6" + }, + "timestamp": { + "$date": "2018-08-05T16:30:00.31Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67273aa376d259db5a6542" + }, + "timestamp": { + "$date": "2018-08-05T16:35:00.365Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b672866a376d259db5a65c8" + }, + "timestamp": { + "$date": "2018-08-05T16:40:00.36Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b672992a376d259db5a6654" + }, + "timestamp": { + "$date": "2018-08-05T16:45:00.447Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b672abea376d259db5a66dc" + }, + "timestamp": { + "$date": "2018-08-05T16:50:00.418Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b672beaa376d259db5a6768" + }, + "timestamp": { + "$date": "2018-08-05T16:55:00.355Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b672d16a376d259db5a67f4" + }, + "timestamp": { + "$date": "2018-08-05T17:00:00.306Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b672e42a376d259db5a687a" + }, + "timestamp": { + "$date": "2018-08-05T17:05:00.328Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b672f6ea376d259db5a6906" + }, + "timestamp": { + "$date": "2018-08-05T17:10:00.325Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67309aa376d259db5a69d9" + }, + "timestamp": { + "$date": "2018-08-05T17:15:00.452Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6731c6a376d259db5a6abf" + }, + "timestamp": { + "$date": "2018-08-05T17:20:00.301Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6732f2a376d259db5a6bbf" + }, + "timestamp": { + "$date": "2018-08-05T17:25:00.311Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67341ea376d259db5a6cef" + }, + "timestamp": { + "$date": "2018-08-05T17:30:00.327Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67354aa376d259db5a6d7e" + }, + "timestamp": { + "$date": "2018-08-05T17:35:00.334Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b673676a376d259db5a6e26" + }, + "timestamp": { + "$date": "2018-08-05T17:40:00.423Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6737a2a376d259db5a6eb7" + }, + "timestamp": { + "$date": "2018-08-05T17:45:00.298Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6738cea376d259db5a6fc7" + }, + "timestamp": { + "$date": "2018-08-05T17:50:00.322Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6739faa376d259db5a705b" + }, + "timestamp": { + "$date": "2018-08-05T17:55:00.341Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b673b26a376d259db5a7112" + }, + "timestamp": { + "$date": "2018-08-05T18:00:00.313Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b673c52a376d259db5a71a2" + }, + "timestamp": { + "$date": "2018-08-05T18:05:00.315Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b673d7ea376d259db5a7236" + }, + "timestamp": { + "$date": "2018-08-05T18:10:00.449Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b673eaaa376d259db5a72d4" + }, + "timestamp": { + "$date": "2018-08-05T18:15:00.354Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b673fd6a376d259db5a7407" + }, + "timestamp": { + "$date": "2018-08-05T18:20:00.3Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b674102a376d259db5a75d6" + }, + "timestamp": { + "$date": "2018-08-05T18:25:00.292Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67422ea376d259db5a7803" + }, + "timestamp": { + "$date": "2018-08-05T18:30:00.279Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67435aa376d259db5a797d" + }, + "timestamp": { + "$date": "2018-08-05T18:35:00.342Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b674486a376d259db5a7b40" + }, + "timestamp": { + "$date": "2018-08-05T18:40:00.327Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6745b2a376d259db5a7c4c" + }, + "timestamp": { + "$date": "2018-08-05T18:45:00.518Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6746dea376d259db5a7d98" + }, + "timestamp": { + "$date": "2018-08-05T18:50:00.493Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67480aa376d259db5a7ea8" + }, + "timestamp": { + "$date": "2018-08-05T18:55:00.701Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b674936a376d259db5a7fba" + }, + "timestamp": { + "$date": "2018-08-05T19:00:00.562Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b674a62a376d259db5a80c2" + }, + "timestamp": { + "$date": "2018-08-05T19:05:00.666Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b674b8ea376d259db5a81ce" + }, + "timestamp": { + "$date": "2018-08-05T19:10:00.515Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b674cbaa376d259db5a82d6" + }, + "timestamp": { + "$date": "2018-08-05T19:15:00.412Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b674de6a376d259db5a83e4" + }, + "timestamp": { + "$date": "2018-08-05T19:20:00.453Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b674f12a376d259db5a851e" + }, + "timestamp": { + "$date": "2018-08-05T19:25:00.478Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67503ea376d259db5a85b9" + }, + "timestamp": { + "$date": "2018-08-05T19:30:00.811Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67516aa376d259db5a8649" + }, + "timestamp": { + "$date": "2018-08-05T19:35:00.381Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Young.J", + "clientDbId": "5457" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b675296a376d259db5a86d9" + }, + "timestamp": { + "$date": "2018-08-05T19:40:00.416Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6753c2a376d259db5a8769" + }, + "timestamp": { + "$date": "2018-08-05T19:45:00.371Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bray.A", + "clientDbId": "3738" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6754eea376d259db5a87fb" + }, + "timestamp": { + "$date": "2018-08-05T19:50:00.327Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67561aa376d259db5a89a1" + }, + "timestamp": { + "$date": "2018-08-05T19:55:00.313Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b675746a376d259db5a8b8e" + }, + "timestamp": { + "$date": "2018-08-05T20:00:00.32Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b675872a376d259db5a8d21" + }, + "timestamp": { + "$date": "2018-08-05T20:05:00.55Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b67599ea376d259db5a8df5" + }, + "timestamp": { + "$date": "2018-08-05T20:10:00.363Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b675acaa376d259db5a8efa" + }, + "timestamp": { + "$date": "2018-08-05T20:15:00.405Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b675bf6a376d259db5a9041" + }, + "timestamp": { + "$date": "2018-08-05T20:20:00.354Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b675d22a376d259db5a9131" + }, + "timestamp": { + "$date": "2018-08-05T20:25:00.366Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b675e4ea376d259db5a91c4" + }, + "timestamp": { + "$date": "2018-08-05T20:30:00.411Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b675f7aa376d259db5a925b" + }, + "timestamp": { + "$date": "2018-08-05T20:35:00.523Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6760a7a376d259db5a932f" + }, + "timestamp": { + "$date": "2018-08-05T20:40:00.908Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6761d2a376d259db5a93ba" + }, + "timestamp": { + "$date": "2018-08-05T20:45:00.312Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6762fea376d259db5a9445" + }, + "timestamp": { + "$date": "2018-08-05T20:50:00.266Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b676d8ba376d259db5a9718" + }, + "timestamp": { + "$date": "2018-08-05T21:35:01.297Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b676eb6a376d259db5a97cf" + }, + "timestamp": { + "$date": "2018-08-05T21:40:00.307Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b676fe2a376d259db5a9860" + }, + "timestamp": { + "$date": "2018-08-05T21:45:00.333Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b67710ea376d259db5a98e8" + }, + "timestamp": { + "$date": "2018-08-05T21:50:00.304Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b67723aa376d259db5a996e" + }, + "timestamp": { + "$date": "2018-08-05T21:55:00.313Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b677366a376d259db5a99f6" + }, + "timestamp": { + "$date": "2018-08-05T22:00:00.326Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Banksy", + "clientDbId": "2692" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b677492a376d259db5a9a82" + }, + "timestamp": { + "$date": "2018-08-05T22:05:00.333Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6775bea376d259db5a9b0e" + }, + "timestamp": { + "$date": "2018-08-05T22:10:00.443Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6776eaa376d259db5a9b9a" + }, + "timestamp": { + "$date": "2018-08-05T22:15:00.352Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b677816a376d259db5a9c22" + }, + "timestamp": { + "$date": "2018-08-05T22:20:00.296Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b677942a376d259db5a9ca8" + }, + "timestamp": { + "$date": "2018-08-05T22:25:00.422Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b677a6ea376d259db5a9d2e" + }, + "timestamp": { + "$date": "2018-08-05T22:30:00.324Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b677b9aa376d259db5a9db4" + }, + "timestamp": { + "$date": "2018-08-05T22:35:00.303Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b677cc6a376d259db5a9e46" + }, + "timestamp": { + "$date": "2018-08-05T22:40:00.444Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b677df2a376d259db5a9ecc" + }, + "timestamp": { + "$date": "2018-08-05T22:45:00.336Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b677f1ea376d259db5a9fc0" + }, + "timestamp": { + "$date": "2018-08-05T22:50:00.292Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b67804aa376d259db5aa0f3" + }, + "timestamp": { + "$date": "2018-08-05T22:55:00.293Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b678176a376d259db5aa1ad" + }, + "timestamp": { + "$date": "2018-08-05T23:00:00.356Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b6782a2a376d259db5aa233" + }, + "timestamp": { + "$date": "2018-08-05T23:05:00.292Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C [Cookie Dough]", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b6783cea376d259db5aa2c5" + }, + "timestamp": { + "$date": "2018-08-05T23:10:00.446Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6784faa376d259db5aa34b" + }, + "timestamp": { + "$date": "2018-08-05T23:15:00.332Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b678626a376d259db5aa473" + }, + "timestamp": { + "$date": "2018-08-05T23:20:00.298Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE - Secondary", + "channelId": "1114", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b678752a376d259db5aa4f9" + }, + "timestamp": { + "$date": "2018-08-05T23:25:00.294Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67887ea376d259db5aa57f" + }, + "timestamp": { + "$date": "2018-08-05T23:30:00.32Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6789aaa376d259db5aa605" + }, + "timestamp": { + "$date": "2018-08-05T23:35:00.287Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b678ad6a376d259db5aa691" + }, + "timestamp": { + "$date": "2018-08-05T23:40:00.452Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b678c02a376d259db5aa717" + }, + "timestamp": { + "$date": "2018-08-05T23:45:00.333Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b678d2ea376d259db5aa7a9" + }, + "timestamp": { + "$date": "2018-08-05T23:50:00.299Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b678e5aa376d259db5aa833" + }, + "timestamp": { + "$date": "2018-08-05T23:55:00.32Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b678f86a376d259db5aa8bb" + }, + "timestamp": { + "$date": "2018-08-06T00:00:00.363Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6790b2a376d259db5aa941" + }, + "timestamp": { + "$date": "2018-08-06T00:05:00.31Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6791dea376d259db5aa9cd" + }, + "timestamp": { + "$date": "2018-08-06T00:10:00.404Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67930aa376d259db5aaa8d" + }, + "timestamp": { + "$date": "2018-08-06T00:15:00.412Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b679436a376d259db5aab53" + }, + "timestamp": { + "$date": "2018-08-06T00:20:00.299Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b679562a376d259db5aabdf" + }, + "timestamp": { + "$date": "2018-08-06T00:25:00.319Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67968ea376d259db5aac65" + }, + "timestamp": { + "$date": "2018-08-06T00:30:00.315Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6797baa376d259db5aaceb" + }, + "timestamp": { + "$date": "2018-08-06T00:35:00.292Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6798e6a376d259db5aad77" + }, + "timestamp": { + "$date": "2018-08-06T00:40:00.459Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b679a12a376d259db5aadfd" + }, + "timestamp": { + "$date": "2018-08-06T00:45:00.333Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b679b3ea376d259db5aae89" + }, + "timestamp": { + "$date": "2018-08-06T00:50:00.457Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b679c6aa376d259db5aaf15" + }, + "timestamp": { + "$date": "2018-08-06T00:55:00.291Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b679d96a376d259db5aaf9b" + }, + "timestamp": { + "$date": "2018-08-06T01:00:00.32Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b679ec2a376d259db5ab021" + }, + "timestamp": { + "$date": "2018-08-06T01:05:00.293Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b679feea376d259db5ab0ad" + }, + "timestamp": { + "$date": "2018-08-06T01:10:00.301Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67a11aa376d259db5ab133" + }, + "timestamp": { + "$date": "2018-08-06T01:15:00.357Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67a246a376d259db5ab1bf" + }, + "timestamp": { + "$date": "2018-08-06T01:20:00.312Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67a372a376d259db5ab245" + }, + "timestamp": { + "$date": "2018-08-06T01:25:00.307Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67a49ea376d259db5ab2ce" + }, + "timestamp": { + "$date": "2018-08-06T01:30:00.369Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67a5caa376d259db5ab34f" + }, + "timestamp": { + "$date": "2018-08-06T01:35:00.304Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67a6f6a376d259db5ab3d0" + }, + "timestamp": { + "$date": "2018-08-06T01:40:00.289Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67a822a376d259db5ab457" + }, + "timestamp": { + "$date": "2018-08-06T01:45:00.473Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67a94ea376d259db5ab4d8" + }, + "timestamp": { + "$date": "2018-08-06T01:50:00.301Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67aa7aa376d259db5ab55f" + }, + "timestamp": { + "$date": "2018-08-06T01:55:00.313Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67aba6a376d259db5ab5e0" + }, + "timestamp": { + "$date": "2018-08-06T02:00:00.33Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67acd2a376d259db5ab667" + }, + "timestamp": { + "$date": "2018-08-06T02:05:00.302Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67adfea376d259db5ab6e8" + }, + "timestamp": { + "$date": "2018-08-06T02:10:00.286Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67af2aa376d259db5ab873" + }, + "timestamp": { + "$date": "2018-08-06T02:15:00.444Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67b056a376d259db5ab8fa" + }, + "timestamp": { + "$date": "2018-08-06T02:20:00.317Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67b182a376d259db5ab97b" + }, + "timestamp": { + "$date": "2018-08-06T02:25:00.3Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67b2aea376d259db5aba5d" + }, + "timestamp": { + "$date": "2018-08-06T02:30:00.332Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67b3daa376d259db5abae9" + }, + "timestamp": { + "$date": "2018-08-06T02:35:00.29Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67b506a376d259db5abb6f" + }, + "timestamp": { + "$date": "2018-08-06T02:40:00.299Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67b632a376d259db5abc26" + }, + "timestamp": { + "$date": "2018-08-06T02:45:00.32Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67b75ea376d259db5abcf6" + }, + "timestamp": { + "$date": "2018-08-06T02:50:00.302Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67b88aa376d259db5abe10" + }, + "timestamp": { + "$date": "2018-08-06T02:55:00.298Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67b9b6a376d259db5abe93" + }, + "timestamp": { + "$date": "2018-08-06T03:00:00.317Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67bae2a376d259db5abf14" + }, + "timestamp": { + "$date": "2018-08-06T03:05:00.339Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67bc0ea376d259db5abf9b" + }, + "timestamp": { + "$date": "2018-08-06T03:10:00.307Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67bd3aa376d259db5ac01c" + }, + "timestamp": { + "$date": "2018-08-06T03:15:00.317Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67be66a376d259db5ac0a3" + }, + "timestamp": { + "$date": "2018-08-06T03:20:00.451Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67bf92a376d259db5ac12a" + }, + "timestamp": { + "$date": "2018-08-06T03:25:00.316Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67c0bea376d259db5ac1ab" + }, + "timestamp": { + "$date": "2018-08-06T03:30:00.32Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67c1eaa376d259db5ac22c" + }, + "timestamp": { + "$date": "2018-08-06T03:35:00.29Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67c316a376d259db5ac2ad" + }, + "timestamp": { + "$date": "2018-08-06T03:40:00.311Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67c442a376d259db5ac334" + }, + "timestamp": { + "$date": "2018-08-06T03:45:00.316Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67c56ea376d259db5ac3bb" + }, + "timestamp": { + "$date": "2018-08-06T03:50:00.295Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67c69aa376d259db5ac43c" + }, + "timestamp": { + "$date": "2018-08-06T03:55:00.36Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67c7c6a376d259db5ac4c3" + }, + "timestamp": { + "$date": "2018-08-06T04:00:00.328Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67c8f2a376d259db5ac544" + }, + "timestamp": { + "$date": "2018-08-06T04:05:00.294Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67ca1ea376d259db5ac5c5" + }, + "timestamp": { + "$date": "2018-08-06T04:10:00.432Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67cb4aa376d259db5ac646" + }, + "timestamp": { + "$date": "2018-08-06T04:15:00.328Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67cc76a376d259db5ac6cd" + }, + "timestamp": { + "$date": "2018-08-06T04:20:00.292Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67cda2a376d259db5ac754" + }, + "timestamp": { + "$date": "2018-08-06T04:25:00.438Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67cecea376d259db5ac7db" + }, + "timestamp": { + "$date": "2018-08-06T04:30:00.333Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67cffaa376d259db5ac85c" + }, + "timestamp": { + "$date": "2018-08-06T04:35:00.302Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67d126a376d259db5ac8dd" + }, + "timestamp": { + "$date": "2018-08-06T04:40:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67d252a376d259db5ac95e" + }, + "timestamp": { + "$date": "2018-08-06T04:45:00.324Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67d37ea376d259db5ac9df" + }, + "timestamp": { + "$date": "2018-08-06T04:50:00.298Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67d4aaa376d259db5aca6c" + }, + "timestamp": { + "$date": "2018-08-06T04:55:00.413Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67d5d6a376d259db5acaf3" + }, + "timestamp": { + "$date": "2018-08-06T05:00:00.353Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67d702a376d259db5acb76" + }, + "timestamp": { + "$date": "2018-08-06T05:05:00.295Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67d82ea376d259db5acbf7" + }, + "timestamp": { + "$date": "2018-08-06T05:10:00.312Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67d95aa376d259db5acc78" + }, + "timestamp": { + "$date": "2018-08-06T05:15:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67da86a376d259db5accf9" + }, + "timestamp": { + "$date": "2018-08-06T05:20:00.295Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67dbb2a376d259db5acd80" + }, + "timestamp": { + "$date": "2018-08-06T05:25:00.407Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67dcdea376d259db5ace07" + }, + "timestamp": { + "$date": "2018-08-06T05:30:00.362Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67de0aa376d259db5ace8e" + }, + "timestamp": { + "$date": "2018-08-06T05:35:00.314Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67df36a376d259db5acf0f" + }, + "timestamp": { + "$date": "2018-08-06T05:40:00.345Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67e062a376d259db5acf90" + }, + "timestamp": { + "$date": "2018-08-06T05:45:00.336Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67e18ea376d259db5ad011" + }, + "timestamp": { + "$date": "2018-08-06T05:50:00.31Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67e2baa376d259db5ad098" + }, + "timestamp": { + "$date": "2018-08-06T05:55:00.417Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67e3e6a376d259db5ad11f" + }, + "timestamp": { + "$date": "2018-08-06T06:00:00.358Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67e512a376d259db5ad1a6" + }, + "timestamp": { + "$date": "2018-08-06T06:05:00.307Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67e63ea376d259db5ad227" + }, + "timestamp": { + "$date": "2018-08-06T06:10:00.302Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67e76aa376d259db5ad2a8" + }, + "timestamp": { + "$date": "2018-08-06T06:15:00.397Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67e896a376d259db5ad329" + }, + "timestamp": { + "$date": "2018-08-06T06:20:00.294Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67e9c3a376d259db5ad3b0" + }, + "timestamp": { + "$date": "2018-08-06T06:25:00.453Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67eaeea376d259db5ad431" + }, + "timestamp": { + "$date": "2018-08-06T06:30:00.339Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67ec1aa376d259db5ad4b8" + }, + "timestamp": { + "$date": "2018-08-06T06:35:00.301Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67ed46a376d259db5ad53f" + }, + "timestamp": { + "$date": "2018-08-06T06:40:00.303Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67ee72a376d259db5ad5c2" + }, + "timestamp": { + "$date": "2018-08-06T06:45:00.327Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67ef9fa376d259db5ad643" + }, + "timestamp": { + "$date": "2018-08-06T06:50:00.377Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67f0cba376d259db5ad6ca" + }, + "timestamp": { + "$date": "2018-08-06T06:55:00.299Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67f1f6a376d259db5ad74b" + }, + "timestamp": { + "$date": "2018-08-06T07:00:00.358Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67f323a376d259db5ad7d2" + }, + "timestamp": { + "$date": "2018-08-06T07:05:00.396Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67f44ea376d259db5ad853" + }, + "timestamp": { + "$date": "2018-08-06T07:10:00.31Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67f57aa376d259db5ad8da" + }, + "timestamp": { + "$date": "2018-08-06T07:15:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67f6a7a376d259db5ad95b" + }, + "timestamp": { + "$date": "2018-08-06T07:20:00.441Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67f7d2a376d259db5ad9dc" + }, + "timestamp": { + "$date": "2018-08-06T07:25:00.296Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67f8ffa376d259db5ada63" + }, + "timestamp": { + "$date": "2018-08-06T07:30:00.474Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67fa2aa376d259db5adaea" + }, + "timestamp": { + "$date": "2018-08-06T07:35:00.304Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67fb56a376d259db5adb6b" + }, + "timestamp": { + "$date": "2018-08-06T07:40:00.308Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67fc82a376d259db5adbec" + }, + "timestamp": { + "$date": "2018-08-06T07:45:00.327Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67fdaea376d259db5adc73" + }, + "timestamp": { + "$date": "2018-08-06T07:50:00.296Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b67fedba376d259db5adcf4" + }, + "timestamp": { + "$date": "2018-08-06T07:55:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b680007a376d259db5add7b" + }, + "timestamp": { + "$date": "2018-08-06T08:00:00.445Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b680133a376d259db5addfc" + }, + "timestamp": { + "$date": "2018-08-06T08:05:00.318Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68025fa376d259db5ade83" + }, + "timestamp": { + "$date": "2018-08-06T08:10:00.341Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68038ba376d259db5adf04" + }, + "timestamp": { + "$date": "2018-08-06T08:15:00.323Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6804b6a376d259db5adf8b" + }, + "timestamp": { + "$date": "2018-08-06T08:20:00.298Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6805e3a376d259db5ae00c" + }, + "timestamp": { + "$date": "2018-08-06T08:25:00.303Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68070fa376d259db5ae093" + }, + "timestamp": { + "$date": "2018-08-06T08:30:00.449Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68083ba376d259db5ae114" + }, + "timestamp": { + "$date": "2018-08-06T08:35:00.323Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b680967a376d259db5ae19b" + }, + "timestamp": { + "$date": "2018-08-06T08:40:00.359Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b680a93a376d259db5ae21c" + }, + "timestamp": { + "$date": "2018-08-06T08:45:00.356Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b680bbfa376d259db5ae29d" + }, + "timestamp": { + "$date": "2018-08-06T08:50:00.3Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b680ceba376d259db5ae324" + }, + "timestamp": { + "$date": "2018-08-06T08:55:00.304Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b680e17a376d259db5ae3ab" + }, + "timestamp": { + "$date": "2018-08-06T09:00:00.309Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b680f43a376d259db5ae42c" + }, + "timestamp": { + "$date": "2018-08-06T09:05:00.341Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68106fa376d259db5ae4b3" + }, + "timestamp": { + "$date": "2018-08-06T09:10:00.316Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68119ba376d259db5ae534" + }, + "timestamp": { + "$date": "2018-08-06T09:15:00.388Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6813eba376d259db5ae62d" + }, + "timestamp": { + "$date": "2018-08-06T09:25:04.1Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b681513a376d259db5ae6b4" + }, + "timestamp": { + "$date": "2018-08-06T09:30:00.273Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b68163fa376d259db5ae735" + }, + "timestamp": { + "$date": "2018-08-06T09:35:00.273Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b68176ba376d259db5ae7b6" + }, + "timestamp": { + "$date": "2018-08-06T09:40:00.29Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b681897a376d259db5ae841" + }, + "timestamp": { + "$date": "2018-08-06T09:45:00.3Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6819c4a376d259db5ae8ee" + }, + "timestamp": { + "$date": "2018-08-06T09:50:01.011Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b681aefa376d259db5aea11" + }, + "timestamp": { + "$date": "2018-08-06T09:55:00.293Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b681c1ba376d259db5aea9b" + }, + "timestamp": { + "$date": "2018-08-06T10:00:00.394Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b681d47a376d259db5aeb1d" + }, + "timestamp": { + "$date": "2018-08-06T10:05:00.306Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b681e73a376d259db5aeba0" + }, + "timestamp": { + "$date": "2018-08-06T10:10:00.314Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b681f9fa376d259db5aec22" + }, + "timestamp": { + "$date": "2018-08-06T10:15:00.313Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6820cba376d259db5aecb2" + }, + "timestamp": { + "$date": "2018-08-06T10:20:00.315Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6821f7a376d259db5aed3c" + }, + "timestamp": { + "$date": "2018-08-06T10:25:00.33Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b682324a376d259db5aedc7" + }, + "timestamp": { + "$date": "2018-08-06T10:30:00.349Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b68244fa376d259db5aee48" + }, + "timestamp": { + "$date": "2018-08-06T10:35:00.34Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b68257ba376d259db5aeecb" + }, + "timestamp": { + "$date": "2018-08-06T10:40:00.356Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6826a7a376d259db5aef4d" + }, + "timestamp": { + "$date": "2018-08-06T10:45:00.333Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6827d4a376d259db5aefdd" + }, + "timestamp": { + "$date": "2018-08-06T10:50:00.47Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6828ffa376d259db5af05e" + }, + "timestamp": { + "$date": "2018-08-06T10:55:00.348Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b682a2ca376d259db5af0e7" + }, + "timestamp": { + "$date": "2018-08-06T11:00:00.438Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b682b57a376d259db5af169" + }, + "timestamp": { + "$date": "2018-08-06T11:05:00.323Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b682c84a376d259db5af1f2" + }, + "timestamp": { + "$date": "2018-08-06T11:10:00.35Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b682db0a376d259db5af274" + }, + "timestamp": { + "$date": "2018-08-06T11:15:00.344Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b682edba376d259db5af2fd" + }, + "timestamp": { + "$date": "2018-08-06T11:20:00.321Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b683007a376d259db5af385" + }, + "timestamp": { + "$date": "2018-08-06T11:25:00.313Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b683134a376d259db5af408" + }, + "timestamp": { + "$date": "2018-08-06T11:30:00.346Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b68325fa376d259db5af490" + }, + "timestamp": { + "$date": "2018-08-06T11:35:00.292Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b68338ca376d259db5af51c" + }, + "timestamp": { + "$date": "2018-08-06T11:40:00.455Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6834b8a376d259db5af59d" + }, + "timestamp": { + "$date": "2018-08-06T11:45:00.332Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6835e4a376d259db5af620" + }, + "timestamp": { + "$date": "2018-08-06T11:50:00.316Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b683710a376d259db5af6ae" + }, + "timestamp": { + "$date": "2018-08-06T11:55:00.334Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b68383ca376d259db5af732" + }, + "timestamp": { + "$date": "2018-08-06T12:00:00.342Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b683967a376d259db5af7b9" + }, + "timestamp": { + "$date": "2018-08-06T12:05:00.291Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b683a94a376d259db5af841" + }, + "timestamp": { + "$date": "2018-08-06T12:10:00.349Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b683bc0a376d259db5af8c4" + }, + "timestamp": { + "$date": "2018-08-06T12:15:00.331Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b683ceca376d259db5af948" + }, + "timestamp": { + "$date": "2018-08-06T12:20:00.311Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b683e18a376d259db5af9c9" + }, + "timestamp": { + "$date": "2018-08-06T12:25:00.294Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b683f44a376d259db5afa87" + }, + "timestamp": { + "$date": "2018-08-06T12:30:00.485Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b684070a376d259db5afb0f" + }, + "timestamp": { + "$date": "2018-08-06T12:35:00.324Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b68419ca376d259db5afb9f" + }, + "timestamp": { + "$date": "2018-08-06T12:40:00.312Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6842c8a376d259db5afc2c" + }, + "timestamp": { + "$date": "2018-08-06T12:45:00.387Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6843f4a376d259db5afcb5" + }, + "timestamp": { + "$date": "2018-08-06T12:50:00.323Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b684520a376d259db5afd3b" + }, + "timestamp": { + "$date": "2018-08-06T12:55:00.319Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b68464ca376d259db5afdce" + }, + "timestamp": { + "$date": "2018-08-06T13:00:00.342Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b684778a376d259db5afe56" + }, + "timestamp": { + "$date": "2018-08-06T13:05:00.301Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6848a4a376d259db5afee7" + }, + "timestamp": { + "$date": "2018-08-06T13:10:00.312Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6849d0a376d259db5aff73" + }, + "timestamp": { + "$date": "2018-08-06T13:15:00.373Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b684afca376d259db5affff" + }, + "timestamp": { + "$date": "2018-08-06T13:20:00.357Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b684c28a376d259db5b0086" + }, + "timestamp": { + "$date": "2018-08-06T13:25:00.294Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b684d54a376d259db5b0119" + }, + "timestamp": { + "$date": "2018-08-06T13:30:00.383Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b684e80a376d259db5b01a1" + }, + "timestamp": { + "$date": "2018-08-06T13:35:00.302Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b684faca376d259db5b0229" + }, + "timestamp": { + "$date": "2018-08-06T13:40:00.325Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6850d8a376d259db5b02bc" + }, + "timestamp": { + "$date": "2018-08-06T13:45:00.363Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b685204a376d259db5b0345" + }, + "timestamp": { + "$date": "2018-08-06T13:50:00.327Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b685330a376d259db5b03cd" + }, + "timestamp": { + "$date": "2018-08-06T13:55:00.318Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b68545ca376d259db5b0455" + }, + "timestamp": { + "$date": "2018-08-06T14:00:00.34Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b685588a376d259db5b04e2" + }, + "timestamp": { + "$date": "2018-08-06T14:05:00.296Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6856b4a376d259db5b0571" + }, + "timestamp": { + "$date": "2018-08-06T14:10:00.454Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6857e0a376d259db5b061f" + }, + "timestamp": { + "$date": "2018-08-06T14:15:00.349Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b68590ca376d259db5b06b2" + }, + "timestamp": { + "$date": "2018-08-06T14:20:00.317Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b685a38a376d259db5b073a" + }, + "timestamp": { + "$date": "2018-08-06T14:25:00.305Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b685b64a376d259db5b07c3" + }, + "timestamp": { + "$date": "2018-08-06T14:30:00.421Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b685c90a376d259db5b084f" + }, + "timestamp": { + "$date": "2018-08-06T14:35:00.29Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b685dbca376d259db5b08dd" + }, + "timestamp": { + "$date": "2018-08-06T14:40:00.349Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b685ee8a376d259db5b0964" + }, + "timestamp": { + "$date": "2018-08-06T14:45:00.332Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b686014a376d259db5b09f3" + }, + "timestamp": { + "$date": "2018-08-06T14:50:00.445Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b686140a376d259db5b0a7f" + }, + "timestamp": { + "$date": "2018-08-06T14:55:00.302Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b68626ca376d259db5b0b09" + }, + "timestamp": { + "$date": "2018-08-06T15:00:00.338Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b686398a376d259db5b0b92" + }, + "timestamp": { + "$date": "2018-08-06T15:05:00.292Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6864c4a376d259db5b0c25" + }, + "timestamp": { + "$date": "2018-08-06T15:10:00.326Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6865f0a376d259db5b0cad" + }, + "timestamp": { + "$date": "2018-08-06T15:15:00.348Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68671ca376d259db5b0d3c" + }, + "timestamp": { + "$date": "2018-08-06T15:20:00.452Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b686848a376d259db5b0dc8" + }, + "timestamp": { + "$date": "2018-08-06T15:25:00.326Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b686974a376d259db5b0e53" + }, + "timestamp": { + "$date": "2018-08-06T15:30:00.361Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b686aa0a376d259db5b0ed9" + }, + "timestamp": { + "$date": "2018-08-06T15:35:00.314Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b686bcca376d259db5b0f70" + }, + "timestamp": { + "$date": "2018-08-06T15:40:00.45Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b686cf8a376d259db5b0ff6" + }, + "timestamp": { + "$date": "2018-08-06T15:45:00.346Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b686e24a376d259db5b1085" + }, + "timestamp": { + "$date": "2018-08-06T15:50:00.454Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b686f50a376d259db5b1111" + }, + "timestamp": { + "$date": "2018-08-06T15:55:00.307Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68707ca376d259db5b119a" + }, + "timestamp": { + "$date": "2018-08-06T16:00:00.336Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6871a8a376d259db5b1220" + }, + "timestamp": { + "$date": "2018-08-06T16:05:00.292Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6872d4a376d259db5b12b0" + }, + "timestamp": { + "$date": "2018-08-06T16:10:00.321Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b687400a376d259db5b133d" + }, + "timestamp": { + "$date": "2018-08-06T16:15:00.357Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68752ca376d259db5b13cb" + }, + "timestamp": { + "$date": "2018-08-06T16:20:00.335Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b687658a376d259db5b1452" + }, + "timestamp": { + "$date": "2018-08-06T16:25:00.313Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b687784a376d259db5b14e3" + }, + "timestamp": { + "$date": "2018-08-06T16:30:00.366Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6878b0a376d259db5b1569" + }, + "timestamp": { + "$date": "2018-08-06T16:35:00.296Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6879dca376d259db5b15f1" + }, + "timestamp": { + "$date": "2018-08-06T16:40:00.337Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b687b08a376d259db5b1684" + }, + "timestamp": { + "$date": "2018-08-06T16:45:00.38Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b687c34a376d259db5b1786" + }, + "timestamp": { + "$date": "2018-08-06T16:50:00.313Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b687d60a376d259db5b1826" + }, + "timestamp": { + "$date": "2018-08-06T16:55:00.326Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b687e8ca376d259db5b18b5" + }, + "timestamp": { + "$date": "2018-08-06T17:00:00.397Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b687fb8a376d259db5b193f" + }, + "timestamp": { + "$date": "2018-08-06T17:05:00.317Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6880e4a376d259db5b1a76" + }, + "timestamp": { + "$date": "2018-08-06T17:10:00.329Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b688210a376d259db5b1afc" + }, + "timestamp": { + "$date": "2018-08-06T17:15:00.333Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68833ca376d259db5b1b98" + }, + "timestamp": { + "$date": "2018-08-06T17:20:00.314Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b688468a376d259db5b1d23" + }, + "timestamp": { + "$date": "2018-08-06T17:25:00.303Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Aziz", + "clientDbId": "5465" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b688594a376d259db5b1fcc" + }, + "timestamp": { + "$date": "2018-08-06T17:30:00.365Z" + }, + "users": [ + { + "channelName": "Recruitment Room", + "channelId": "856", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Recruitment Room", + "channelId": "856", + "clientName": "Aziz A.", + "clientDbId": "5465" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6886c0a376d259db5b214a" + }, + "timestamp": { + "$date": "2018-08-06T17:35:00.37Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6887eca376d259db5b21dc" + }, + "timestamp": { + "$date": "2018-08-06T17:40:00.313Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b688918a376d259db5b22b5" + }, + "timestamp": { + "$date": "2018-08-06T17:45:00.32Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b688a44a376d259db5b2402" + }, + "timestamp": { + "$date": "2018-08-06T17:50:00.534Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b688b70a376d259db5b2504" + }, + "timestamp": { + "$date": "2018-08-06T17:55:00.324Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b688c9ca376d259db5b2683" + }, + "timestamp": { + "$date": "2018-08-06T18:00:00.378Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b688dc8a376d259db5b2731" + }, + "timestamp": { + "$date": "2018-08-06T18:05:00.304Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b688ef4a376d259db5b2856" + }, + "timestamp": { + "$date": "2018-08-06T18:10:00.341Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b689020a376d259db5b2914" + }, + "timestamp": { + "$date": "2018-08-06T18:15:00.381Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68914ca376d259db5b29f0" + }, + "timestamp": { + "$date": "2018-08-06T18:20:00.355Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b689278a376d259db5b2a77" + }, + "timestamp": { + "$date": "2018-08-06T18:25:00.329Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6893a4a376d259db5b2b11" + }, + "timestamp": { + "$date": "2018-08-06T18:30:00.594Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6894d0a376d259db5b2ba0" + }, + "timestamp": { + "$date": "2018-08-06T18:35:00.398Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6895fca376d259db5b2caf" + }, + "timestamp": { + "$date": "2018-08-06T18:40:00.635Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b689728a376d259db5b2d41" + }, + "timestamp": { + "$date": "2018-08-06T18:45:00.386Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b689854a376d259db5b2dcf" + }, + "timestamp": { + "$date": "2018-08-06T18:50:00.43Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b689980a376d259db5b2e5a" + }, + "timestamp": { + "$date": "2018-08-06T18:55:00.348Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b689aada376d259db5b2efa" + }, + "timestamp": { + "$date": "2018-08-06T19:00:01.366Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b689bd8a376d259db5b2f85" + }, + "timestamp": { + "$date": "2018-08-06T19:05:00.452Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b689d04a376d259db5b3018" + }, + "timestamp": { + "$date": "2018-08-06T19:10:00.361Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b689e30a376d259db5b30a6" + }, + "timestamp": { + "$date": "2018-08-06T19:15:00.381Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b689f5ca376d259db5b3134" + }, + "timestamp": { + "$date": "2018-08-06T19:20:00.365Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68a088a376d259db5b31bf" + }, + "timestamp": { + "$date": "2018-08-06T19:25:00.328Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68a1b4a376d259db5b3259" + }, + "timestamp": { + "$date": "2018-08-06T19:30:00.392Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68a2e0a376d259db5b32ea" + }, + "timestamp": { + "$date": "2018-08-06T19:35:00.331Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68a40ca376d259db5b33a3" + }, + "timestamp": { + "$date": "2018-08-06T19:40:00.356Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68a538a376d259db5b342a" + }, + "timestamp": { + "$date": "2018-08-06T19:45:00.36Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68a664a376d259db5b34b5" + }, + "timestamp": { + "$date": "2018-08-06T19:50:00.336Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68a790a376d259db5b353b" + }, + "timestamp": { + "$date": "2018-08-06T19:55:00.348Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68a8bca376d259db5b363a" + }, + "timestamp": { + "$date": "2018-08-06T20:00:00.345Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68a9e8a376d259db5b36e8" + }, + "timestamp": { + "$date": "2018-08-06T20:05:00.361Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68ab14a376d259db5b3777" + }, + "timestamp": { + "$date": "2018-08-06T20:10:00.483Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68ac40a376d259db5b3824" + }, + "timestamp": { + "$date": "2018-08-06T20:15:00.336Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68ad6ca376d259db5b38b2" + }, + "timestamp": { + "$date": "2018-08-06T20:20:00.321Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68ae98a376d259db5b393d" + }, + "timestamp": { + "$date": "2018-08-06T20:25:00.29Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68afc4a376d259db5b39cb" + }, + "timestamp": { + "$date": "2018-08-06T20:30:00.39Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68b0f0a376d259db5b3a56" + }, + "timestamp": { + "$date": "2018-08-06T20:35:00.375Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68b21ca376d259db5b3af0" + }, + "timestamp": { + "$date": "2018-08-06T20:40:00.446Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68b348a376d259db5b3b87" + }, + "timestamp": { + "$date": "2018-08-06T20:45:00.559Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68b474a376d259db5b3c15" + }, + "timestamp": { + "$date": "2018-08-06T20:50:00.327Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68b5a0a376d259db5b3ca0" + }, + "timestamp": { + "$date": "2018-08-06T20:55:00.294Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68b6cca376d259db5b3d30" + }, + "timestamp": { + "$date": "2018-08-06T21:00:00.37Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68b7f8a376d259db5b3dbb" + }, + "timestamp": { + "$date": "2018-08-06T21:05:00.293Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68b924a376d259db5b3e4f" + }, + "timestamp": { + "$date": "2018-08-06T21:10:00.436Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68ba50a376d259db5b3ee8" + }, + "timestamp": { + "$date": "2018-08-06T21:15:00.334Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68bb7ca376d259db5b3f7a" + }, + "timestamp": { + "$date": "2018-08-06T21:20:00.314Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68bca8a376d259db5b4009" + }, + "timestamp": { + "$date": "2018-08-06T21:25:00.296Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68bdd4a376d259db5b4097" + }, + "timestamp": { + "$date": "2018-08-06T21:30:00.365Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68bf00a376d259db5b417f" + }, + "timestamp": { + "$date": "2018-08-06T21:35:00.305Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68c02ca376d259db5b4212" + }, + "timestamp": { + "$date": "2018-08-06T21:40:00.315Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68c158a376d259db5b42a0" + }, + "timestamp": { + "$date": "2018-08-06T21:45:00.336Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68c284a376d259db5b4330" + }, + "timestamp": { + "$date": "2018-08-06T21:50:00.314Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68c3b0a376d259db5b43b7" + }, + "timestamp": { + "$date": "2018-08-06T21:55:00.332Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68c4dca376d259db5b443f" + }, + "timestamp": { + "$date": "2018-08-06T22:00:00.373Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68c608a376d259db5b44ce" + }, + "timestamp": { + "$date": "2018-08-06T22:05:00.316Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68c734a376d259db5b455d" + }, + "timestamp": { + "$date": "2018-08-06T22:10:00.313Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68c860a376d259db5b45e3" + }, + "timestamp": { + "$date": "2018-08-06T22:15:00.415Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68c98ca376d259db5b4677" + }, + "timestamp": { + "$date": "2018-08-06T22:20:00.325Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68cab8a376d259db5b46fe" + }, + "timestamp": { + "$date": "2018-08-06T22:25:00.316Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68cbe4a376d259db5b4787" + }, + "timestamp": { + "$date": "2018-08-06T22:30:00.36Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68cd10a376d259db5b4815" + }, + "timestamp": { + "$date": "2018-08-06T22:35:00.286Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68ce3ca376d259db5b489d" + }, + "timestamp": { + "$date": "2018-08-06T22:40:00.359Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68cf68a376d259db5b492a" + }, + "timestamp": { + "$date": "2018-08-06T22:45:00.503Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68d094a376d259db5b49b9" + }, + "timestamp": { + "$date": "2018-08-06T22:50:00.451Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68d1c0a376d259db5b4a45" + }, + "timestamp": { + "$date": "2018-08-06T22:55:00.311Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68d2eca376d259db5b4ad2" + }, + "timestamp": { + "$date": "2018-08-06T23:00:00.514Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68d418a376d259db5b4b5e" + }, + "timestamp": { + "$date": "2018-08-06T23:05:00.291Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68d544a376d259db5b4bef" + }, + "timestamp": { + "$date": "2018-08-06T23:10:00.317Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68d670a376d259db5b4c75" + }, + "timestamp": { + "$date": "2018-08-06T23:15:00.317Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b68d79ca376d259db5b4d0a" + }, + "timestamp": { + "$date": "2018-08-06T23:20:00.65Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b68d8c8a376d259db5b4d90" + }, + "timestamp": { + "$date": "2018-08-06T23:25:00.313Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b68d9f4a376d259db5b4e20" + }, + "timestamp": { + "$date": "2018-08-06T23:30:00.326Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b68db20a376d259db5b4ea6" + }, + "timestamp": { + "$date": "2018-08-06T23:35:00.295Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b68dc4ca376d259db5b4f35" + }, + "timestamp": { + "$date": "2018-08-06T23:40:00.368Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b68dd78a376d259db5b4fd4" + }, + "timestamp": { + "$date": "2018-08-06T23:45:00.292Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b68dea4a376d259db5b505d" + }, + "timestamp": { + "$date": "2018-08-06T23:50:00.345Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b68dfd0a376d259db5b50e9" + }, + "timestamp": { + "$date": "2018-08-06T23:55:00.451Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b68e0fca376d259db5b517e" + }, + "timestamp": { + "$date": "2018-08-07T00:00:00.452Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b68e228a376d259db5b5204" + }, + "timestamp": { + "$date": "2018-08-07T00:05:00.304Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b68e354a376d259db5b5293" + }, + "timestamp": { + "$date": "2018-08-07T00:10:00.338Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68e480a376d259db5b5319" + }, + "timestamp": { + "$date": "2018-08-07T00:15:00.313Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68e5aca376d259db5b53a1" + }, + "timestamp": { + "$date": "2018-08-07T00:20:00.303Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68e6d8a376d259db5b5428" + }, + "timestamp": { + "$date": "2018-08-07T00:25:00.323Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68e804a376d259db5b54c2" + }, + "timestamp": { + "$date": "2018-08-07T00:30:00.422Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68e930a376d259db5b5549" + }, + "timestamp": { + "$date": "2018-08-07T00:35:00.307Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68ea5ca376d259db5b55d3" + }, + "timestamp": { + "$date": "2018-08-07T00:40:00.354Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68eb88a376d259db5b5660" + }, + "timestamp": { + "$date": "2018-08-07T00:45:00.306Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68ecb4a376d259db5b56eb" + }, + "timestamp": { + "$date": "2018-08-07T00:50:00.335Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68ede0a376d259db5b5771" + }, + "timestamp": { + "$date": "2018-08-07T00:55:00.322Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68ef0ca376d259db5b5806" + }, + "timestamp": { + "$date": "2018-08-07T01:00:00.469Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68f038a376d259db5b5892" + }, + "timestamp": { + "$date": "2018-08-07T01:05:00.306Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68f164a376d259db5b591b" + }, + "timestamp": { + "$date": "2018-08-07T01:10:00.344Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68f290a376d259db5b59a1" + }, + "timestamp": { + "$date": "2018-08-07T01:15:00.293Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68f3bca376d259db5b5a30" + }, + "timestamp": { + "$date": "2018-08-07T01:20:00.311Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68f4e8a376d259db5b5ab7" + }, + "timestamp": { + "$date": "2018-08-07T01:25:00.32Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68f614a376d259db5b5b4d" + }, + "timestamp": { + "$date": "2018-08-07T01:30:00.308Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68f740a376d259db5b5bd9" + }, + "timestamp": { + "$date": "2018-08-07T01:35:00.406Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68f86ca376d259db5b5c62" + }, + "timestamp": { + "$date": "2018-08-07T01:40:00.389Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68f998a376d259db5b5ce8" + }, + "timestamp": { + "$date": "2018-08-07T01:45:00.304Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68fac4a376d259db5b5d71" + }, + "timestamp": { + "$date": "2018-08-07T01:50:00.352Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68fbf0a376d259db5b5dfd" + }, + "timestamp": { + "$date": "2018-08-07T01:55:00.349Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68fd1ca376d259db5b5e91" + }, + "timestamp": { + "$date": "2018-08-07T02:00:00.323Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68fe48a376d259db5b5f1f" + }, + "timestamp": { + "$date": "2018-08-07T02:05:00.304Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b68ff74a376d259db5b5fa9" + }, + "timestamp": { + "$date": "2018-08-07T02:10:00.441Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6900a0a376d259db5b602e" + }, + "timestamp": { + "$date": "2018-08-07T02:15:00.314Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6901cca376d259db5b60b6" + }, + "timestamp": { + "$date": "2018-08-07T02:20:00.315Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6902f8a376d259db5b6144" + }, + "timestamp": { + "$date": "2018-08-07T02:25:00.359Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b690424a376d259db5b61e7" + }, + "timestamp": { + "$date": "2018-08-07T02:30:00.334Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b690550a376d259db5b6273" + }, + "timestamp": { + "$date": "2018-08-07T02:35:00.343Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b69067ca376d259db5b62ff" + }, + "timestamp": { + "$date": "2018-08-07T02:40:00.339Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6907aca376d259db5b6390" + }, + "timestamp": { + "$date": "2018-08-07T02:45:00.32Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6908d8a376d259db5b6414" + }, + "timestamp": { + "$date": "2018-08-07T02:50:00.313Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b690a04a376d259db5b649b" + }, + "timestamp": { + "$date": "2018-08-07T02:55:00.313Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b690b30a376d259db5b651f" + }, + "timestamp": { + "$date": "2018-08-07T03:00:00.312Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b690c5ca376d259db5b65a0" + }, + "timestamp": { + "$date": "2018-08-07T03:05:00.304Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b690d88a376d259db5b6635" + }, + "timestamp": { + "$date": "2018-08-07T03:10:00.514Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b690eb4a376d259db5b66b7" + }, + "timestamp": { + "$date": "2018-08-07T03:15:00.305Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b690fe0a376d259db5b673c" + }, + "timestamp": { + "$date": "2018-08-07T03:20:00.343Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b69110ca376d259db5b6807" + }, + "timestamp": { + "$date": "2018-08-07T03:25:00.322Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b691238a376d259db5b68ea" + }, + "timestamp": { + "$date": "2018-08-07T03:30:00.318Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b691364a376d259db5b697e" + }, + "timestamp": { + "$date": "2018-08-07T03:35:00.322Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b691490a376d259db5b6a1b" + }, + "timestamp": { + "$date": "2018-08-07T03:40:00.336Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6915bca376d259db5b6b68" + }, + "timestamp": { + "$date": "2018-08-07T03:45:00.314Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6916e8a376d259db5b6c0f" + }, + "timestamp": { + "$date": "2018-08-07T03:50:00.357Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b691814a376d259db5b6ca1" + }, + "timestamp": { + "$date": "2018-08-07T03:55:00.322Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b691940a376d259db5b6d29" + }, + "timestamp": { + "$date": "2018-08-07T04:00:00.309Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b691a6ca376d259db5b6db0" + }, + "timestamp": { + "$date": "2018-08-07T04:05:00.295Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b691b98a376d259db5b6e44" + }, + "timestamp": { + "$date": "2018-08-07T04:10:00.349Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b691cc4a376d259db5b6f39" + }, + "timestamp": { + "$date": "2018-08-07T04:15:00.304Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b691df0a376d259db5b6fbf" + }, + "timestamp": { + "$date": "2018-08-07T04:20:00.362Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b691f1ca376d259db5b707d" + }, + "timestamp": { + "$date": "2018-08-07T04:25:00.322Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b692048a376d259db5b714d" + }, + "timestamp": { + "$date": "2018-08-07T04:30:00.318Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b692174a376d259db5b729d" + }, + "timestamp": { + "$date": "2018-08-07T04:35:00.312Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6922a0a376d259db5b734f" + }, + "timestamp": { + "$date": "2018-08-07T04:40:00.388Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6923cca376d259db5b73d6" + }, + "timestamp": { + "$date": "2018-08-07T04:45:00.338Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6924f8a376d259db5b745e" + }, + "timestamp": { + "$date": "2018-08-07T04:50:00.328Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b692624a376d259db5b7506" + }, + "timestamp": { + "$date": "2018-08-07T04:55:00.313Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b692750a376d259db5b758d" + }, + "timestamp": { + "$date": "2018-08-07T05:00:00.36Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b69287ca376d259db5b760e" + }, + "timestamp": { + "$date": "2018-08-07T05:05:00.289Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6929a8a376d259db5b769f" + }, + "timestamp": { + "$date": "2018-08-07T05:10:00.391Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b692ad4a376d259db5b7721" + }, + "timestamp": { + "$date": "2018-08-07T05:15:00.337Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b692c00a376d259db5b77d0" + }, + "timestamp": { + "$date": "2018-08-07T05:20:00.362Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b692d2ca376d259db5b78ae" + }, + "timestamp": { + "$date": "2018-08-07T05:25:00.324Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b692e58a376d259db5b7955" + }, + "timestamp": { + "$date": "2018-08-07T05:30:00.317Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b692f84a376d259db5b79d6" + }, + "timestamp": { + "$date": "2018-08-07T05:35:00.291Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6930b0a376d259db5b7a65" + }, + "timestamp": { + "$date": "2018-08-07T05:40:00.467Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6931dca376d259db5b7ae7" + }, + "timestamp": { + "$date": "2018-08-07T05:45:00.333Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b693308a376d259db5b7b6b" + }, + "timestamp": { + "$date": "2018-08-07T05:50:00.446Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b693434a376d259db5b7bec" + }, + "timestamp": { + "$date": "2018-08-07T05:55:00.315Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b693560a376d259db5b7c7c" + }, + "timestamp": { + "$date": "2018-08-07T06:00:00.333Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b69368ca376d259db5b7cfd" + }, + "timestamp": { + "$date": "2018-08-07T06:05:00.291Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6937b8a376d259db5b7d81" + }, + "timestamp": { + "$date": "2018-08-07T06:10:00.331Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6938e4a376d259db5b7e08" + }, + "timestamp": { + "$date": "2018-08-07T06:15:00.428Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b693a10a376d259db5b7e90" + }, + "timestamp": { + "$date": "2018-08-07T06:20:00.348Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b693b3ca376d259db5b7f13" + }, + "timestamp": { + "$date": "2018-08-07T06:25:00.334Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b693c68a376d259db5b7fa3" + }, + "timestamp": { + "$date": "2018-08-07T06:30:00.325Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b693d94a376d259db5b8024" + }, + "timestamp": { + "$date": "2018-08-07T06:35:00.303Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b693ec0a376d259db5b80a8" + }, + "timestamp": { + "$date": "2018-08-07T06:40:00.333Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b693feca376d259db5b812f" + }, + "timestamp": { + "$date": "2018-08-07T06:45:00.449Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b694118a376d259db5b81b9" + }, + "timestamp": { + "$date": "2018-08-07T06:50:00.439Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b694244a376d259db5b823a" + }, + "timestamp": { + "$date": "2018-08-07T06:55:00.379Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b694370a376d259db5b82ca" + }, + "timestamp": { + "$date": "2018-08-07T07:00:00.335Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b69449ca376d259db5b834b" + }, + "timestamp": { + "$date": "2018-08-07T07:05:00.287Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6945c8a376d259db5b83cf" + }, + "timestamp": { + "$date": "2018-08-07T07:10:00.343Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6946f4a376d259db5b8450" + }, + "timestamp": { + "$date": "2018-08-07T07:15:00.29Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b694820a376d259db5b84e0" + }, + "timestamp": { + "$date": "2018-08-07T07:20:00.46Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b69494ca376d259db5b8561" + }, + "timestamp": { + "$date": "2018-08-07T07:25:00.368Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b694a78a376d259db5b85f1" + }, + "timestamp": { + "$date": "2018-08-07T07:30:00.342Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b694ba4a376d259db5b8672" + }, + "timestamp": { + "$date": "2018-08-07T07:35:00.313Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b694cd0a376d259db5b86f6" + }, + "timestamp": { + "$date": "2018-08-07T07:40:00.346Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b694dfca376d259db5b8777" + }, + "timestamp": { + "$date": "2018-08-07T07:45:00.336Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b694f28a376d259db5b8800" + }, + "timestamp": { + "$date": "2018-08-07T07:50:00.309Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b695054a376d259db5b8882" + }, + "timestamp": { + "$date": "2018-08-07T07:55:00.465Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b695180a376d259db5b890a" + }, + "timestamp": { + "$date": "2018-08-07T08:00:00.322Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6952aca376d259db5b8999" + }, + "timestamp": { + "$date": "2018-08-07T08:05:00.342Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6953d8a376d259db5b8a1c" + }, + "timestamp": { + "$date": "2018-08-07T08:10:00.367Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b695504a376d259db5b8aa0" + }, + "timestamp": { + "$date": "2018-08-07T08:15:00.295Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b695630a376d259db5b8b2a" + }, + "timestamp": { + "$date": "2018-08-07T08:20:00.34Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b69575ca376d259db5b8bad" + }, + "timestamp": { + "$date": "2018-08-07T08:25:00.334Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b695888a376d259db5b8c37" + }, + "timestamp": { + "$date": "2018-08-07T08:30:00.458Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6959b4a376d259db5b8cc4" + }, + "timestamp": { + "$date": "2018-08-07T08:35:00.314Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b695ae0a376d259db5b8d48" + }, + "timestamp": { + "$date": "2018-08-07T08:40:00.33Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b695c0ca376d259db5b8dc9" + }, + "timestamp": { + "$date": "2018-08-07T08:45:00.293Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b695d38a376d259db5b8e53" + }, + "timestamp": { + "$date": "2018-08-07T08:50:00.445Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b695e64a376d259db5b8ed4" + }, + "timestamp": { + "$date": "2018-08-07T08:55:00.334Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b695f90a376d259db5b8f5e" + }, + "timestamp": { + "$date": "2018-08-07T09:00:00.501Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6960bca376d259db5b8fdf" + }, + "timestamp": { + "$date": "2018-08-07T09:05:00.304Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6961e8a376d259db5b906f" + }, + "timestamp": { + "$date": "2018-08-07T09:10:00.387Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b696314a376d259db5b90f0" + }, + "timestamp": { + "$date": "2018-08-07T09:15:00.37Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b696440a376d259db5b9173" + }, + "timestamp": { + "$date": "2018-08-07T09:20:00.316Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b69656ca376d259db5b9257" + }, + "timestamp": { + "$date": "2018-08-07T09:25:00.329Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b696698a376d259db5b92e3" + }, + "timestamp": { + "$date": "2018-08-07T09:30:00.313Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6967c4a376d259db5b9364" + }, + "timestamp": { + "$date": "2018-08-07T09:35:00.405Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6968f0a376d259db5b93ee" + }, + "timestamp": { + "$date": "2018-08-07T09:40:00.36Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b696a1ca376d259db5b946f" + }, + "timestamp": { + "$date": "2018-08-07T09:45:00.29Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b696b48a376d259db5b94f2" + }, + "timestamp": { + "$date": "2018-08-07T09:50:00.327Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b696c74a376d259db5b9580" + }, + "timestamp": { + "$date": "2018-08-07T09:55:00.386Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b696da0a376d259db5b960a" + }, + "timestamp": { + "$date": "2018-08-07T10:00:00.322Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b696ecca376d259db5b968b" + }, + "timestamp": { + "$date": "2018-08-07T10:05:00.371Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b696ff8a376d259db5b970e" + }, + "timestamp": { + "$date": "2018-08-07T10:10:00.347Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b697124a376d259db5b9796" + }, + "timestamp": { + "$date": "2018-08-07T10:15:00.372Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b697250a376d259db5b9819" + }, + "timestamp": { + "$date": "2018-08-07T10:20:00.313Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b69737ca376d259db5b98a1" + }, + "timestamp": { + "$date": "2018-08-07T10:25:00.309Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6974a8a376d259db5b9929" + }, + "timestamp": { + "$date": "2018-08-07T10:30:00.315Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6975d4a376d259db5b99ac" + }, + "timestamp": { + "$date": "2018-08-07T10:35:00.31Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b697700a376d259db5b9a38" + }, + "timestamp": { + "$date": "2018-08-07T10:40:00.475Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b69782ca376d259db5b9ad4" + }, + "timestamp": { + "$date": "2018-08-07T10:45:00.293Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b697958a376d259db5b9b5f" + }, + "timestamp": { + "$date": "2018-08-07T10:50:00.315Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b697a84a376d259db5b9beb" + }, + "timestamp": { + "$date": "2018-08-07T10:55:00.319Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b697bb0a376d259db5b9c7a" + }, + "timestamp": { + "$date": "2018-08-07T11:00:00.421Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b697cdca376d259db5b9d00" + }, + "timestamp": { + "$date": "2018-08-07T11:05:00.357Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b697e08a376d259db5b9d8f" + }, + "timestamp": { + "$date": "2018-08-07T11:10:00.463Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b697f34a376d259db5b9e19" + }, + "timestamp": { + "$date": "2018-08-07T11:15:00.305Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b698060a376d259db5b9eaa" + }, + "timestamp": { + "$date": "2018-08-07T11:20:00.319Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b69818ca376d259db5b9f36" + }, + "timestamp": { + "$date": "2018-08-07T11:25:00.408Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6982b8a376d259db5b9fc5" + }, + "timestamp": { + "$date": "2018-08-07T11:30:00.444Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6983e4a376d259db5ba04b" + }, + "timestamp": { + "$date": "2018-08-07T11:35:00.313Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b698510a376d259db5ba0d3" + }, + "timestamp": { + "$date": "2018-08-07T11:40:00.335Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b69863ca376d259db5ba160" + }, + "timestamp": { + "$date": "2018-08-07T11:45:00.336Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b698768a376d259db5ba1e9" + }, + "timestamp": { + "$date": "2018-08-07T11:50:00.333Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b698894a376d259db5ba275" + }, + "timestamp": { + "$date": "2018-08-07T11:55:00.313Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6989c0a376d259db5ba303" + }, + "timestamp": { + "$date": "2018-08-07T12:00:00.312Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b698aeca376d259db5ba392" + }, + "timestamp": { + "$date": "2018-08-07T12:05:00.305Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b698c18a376d259db5ba423" + }, + "timestamp": { + "$date": "2018-08-07T12:10:00.363Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b698d44a376d259db5ba4ab" + }, + "timestamp": { + "$date": "2018-08-07T12:15:00.334Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b698e70a376d259db5ba559" + }, + "timestamp": { + "$date": "2018-08-07T12:20:00.311Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b698f9ca376d259db5ba5e0" + }, + "timestamp": { + "$date": "2018-08-07T12:25:00.323Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6990c8a376d259db5ba66f" + }, + "timestamp": { + "$date": "2018-08-07T12:30:00.309Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6991f4a376d259db5ba6f7" + }, + "timestamp": { + "$date": "2018-08-07T12:35:00.308Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b699320a376d259db5ba78b" + }, + "timestamp": { + "$date": "2018-08-07T12:40:00.376Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69944ca376d259db5ba812" + }, + "timestamp": { + "$date": "2018-08-07T12:45:00.353Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b699578a376d259db5ba8a0" + }, + "timestamp": { + "$date": "2018-08-07T12:50:00.351Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6996a4a376d259db5ba927" + }, + "timestamp": { + "$date": "2018-08-07T12:55:00.333Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6997d0a376d259db5ba9b4" + }, + "timestamp": { + "$date": "2018-08-07T13:00:00.313Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6998fca376d259db5baa42" + }, + "timestamp": { + "$date": "2018-08-07T13:05:00.303Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b699a28a376d259db5baacb" + }, + "timestamp": { + "$date": "2018-08-07T13:10:00.337Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b699b54a376d259db5bab51" + }, + "timestamp": { + "$date": "2018-08-07T13:15:00.29Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b699c81a376d259db5babe6" + }, + "timestamp": { + "$date": "2018-08-07T13:20:00.465Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b699daca376d259db5bac70" + }, + "timestamp": { + "$date": "2018-08-07T13:25:00.318Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b699ed8a376d259db5bacff" + }, + "timestamp": { + "$date": "2018-08-07T13:30:00.325Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69a005a376d259db5bad87" + }, + "timestamp": { + "$date": "2018-08-07T13:35:00.416Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69a130a376d259db5bae16" + }, + "timestamp": { + "$date": "2018-08-07T13:40:00.356Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69a25ca376d259db5bae9c" + }, + "timestamp": { + "$date": "2018-08-07T13:45:00.311Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69a388a376d259db5baf30" + }, + "timestamp": { + "$date": "2018-08-07T13:50:00.309Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69a4b4a376d259db5bafb7" + }, + "timestamp": { + "$date": "2018-08-07T13:55:00.347Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69a5e1a376d259db5bb046" + }, + "timestamp": { + "$date": "2018-08-07T14:00:00.435Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69a70da376d259db5bb0cc" + }, + "timestamp": { + "$date": "2018-08-07T14:05:00.633Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69a838a376d259db5bb15c" + }, + "timestamp": { + "$date": "2018-08-07T14:10:00.336Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69a964a376d259db5bb1e3" + }, + "timestamp": { + "$date": "2018-08-07T14:15:00.3Z" + }, + "users": [ + null, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69aa91a376d259db5bb276" + }, + "timestamp": { + "$date": "2018-08-07T14:20:00.438Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69abbca376d259db5bb302" + }, + "timestamp": { + "$date": "2018-08-07T14:25:00.333Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69ace8a376d259db5bb390" + }, + "timestamp": { + "$date": "2018-08-07T14:30:00.351Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69ae15a376d259db5bb417" + }, + "timestamp": { + "$date": "2018-08-07T14:35:00.415Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69af41a376d259db5bb4c9" + }, + "timestamp": { + "$date": "2018-08-07T14:40:00.486Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69b06da376d259db5bb54f" + }, + "timestamp": { + "$date": "2018-08-07T14:45:00.382Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69b199a376d259db5bb5de" + }, + "timestamp": { + "$date": "2018-08-07T14:50:00.52Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69b2c5a376d259db5bb666" + }, + "timestamp": { + "$date": "2018-08-07T14:55:00.341Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69b3f0a376d259db5bb6f4" + }, + "timestamp": { + "$date": "2018-08-07T15:00:00.315Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b69b51ca376d259db5bb7e8" + }, + "timestamp": { + "$date": "2018-08-07T15:05:00.309Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69b649a376d259db5bb87a" + }, + "timestamp": { + "$date": "2018-08-07T15:10:00.34Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69b774a376d259db5bb907" + }, + "timestamp": { + "$date": "2018-08-07T15:15:00.312Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69b8a1a376d259db5bb99b" + }, + "timestamp": { + "$date": "2018-08-07T15:20:00.311Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69b9cda376d259db5bba26" + }, + "timestamp": { + "$date": "2018-08-07T15:25:00.37Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69baf9a376d259db5bbab3" + }, + "timestamp": { + "$date": "2018-08-07T15:30:00.311Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69bc24a376d259db5bbb4d" + }, + "timestamp": { + "$date": "2018-08-07T15:35:00.301Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69bd51a376d259db5bbbe2" + }, + "timestamp": { + "$date": "2018-08-07T15:40:00.335Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69be7da376d259db5bbc6e" + }, + "timestamp": { + "$date": "2018-08-07T15:45:00.334Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69bfa9a376d259db5bbd01" + }, + "timestamp": { + "$date": "2018-08-07T15:50:00.368Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69c0d5a376d259db5bbd8d" + }, + "timestamp": { + "$date": "2018-08-07T15:55:00.417Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69c201a376d259db5bbe1a" + }, + "timestamp": { + "$date": "2018-08-07T16:00:00.37Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69c32da376d259db5bbf05" + }, + "timestamp": { + "$date": "2018-08-07T16:05:00.291Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69c459a376d259db5bbf97" + }, + "timestamp": { + "$date": "2018-08-07T16:10:00.346Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69c585a376d259db5bc024" + }, + "timestamp": { + "$date": "2018-08-07T16:15:00.313Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69c6b1a376d259db5bc0b2" + }, + "timestamp": { + "$date": "2018-08-07T16:20:00.33Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69c7dda376d259db5bc13f" + }, + "timestamp": { + "$date": "2018-08-07T16:25:00.314Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69c909a376d259db5bc1d3" + }, + "timestamp": { + "$date": "2018-08-07T16:30:00.465Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69ca35a376d259db5bc26a" + }, + "timestamp": { + "$date": "2018-08-07T16:35:00.3Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69cb61a376d259db5bc2f9" + }, + "timestamp": { + "$date": "2018-08-07T16:40:00.348Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69cc8da376d259db5bc38b" + }, + "timestamp": { + "$date": "2018-08-07T16:45:00.34Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69cdb9a376d259db5bc419" + }, + "timestamp": { + "$date": "2018-08-07T16:50:00.348Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69cee5a376d259db5bc4a4" + }, + "timestamp": { + "$date": "2018-08-07T16:55:00.33Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69d011a376d259db5bc536" + }, + "timestamp": { + "$date": "2018-08-07T17:00:00.335Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69d13da376d259db5bc5cf" + }, + "timestamp": { + "$date": "2018-08-07T17:05:00.326Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69d269a376d259db5bc65c" + }, + "timestamp": { + "$date": "2018-08-07T17:10:00.353Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69d395a376d259db5bc6ee" + }, + "timestamp": { + "$date": "2018-08-07T17:15:00.385Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69d4c1a376d259db5bc77d" + }, + "timestamp": { + "$date": "2018-08-07T17:20:00.333Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69d5eda376d259db5bc80d" + }, + "timestamp": { + "$date": "2018-08-07T17:25:00.339Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69d719a376d259db5bc89d" + }, + "timestamp": { + "$date": "2018-08-07T17:30:00.324Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69d845a376d259db5bc930" + }, + "timestamp": { + "$date": "2018-08-07T17:35:00.299Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69d971a376d259db5bc9ca" + }, + "timestamp": { + "$date": "2018-08-07T17:40:00.357Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69da9da376d259db5bca86" + }, + "timestamp": { + "$date": "2018-08-07T17:45:00.291Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69dbc9a376d259db5bcb18" + }, + "timestamp": { + "$date": "2018-08-07T17:50:00.318Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69dcf5a376d259db5bcde9" + }, + "timestamp": { + "$date": "2018-08-07T17:55:00.33Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69de21a376d259db5bcf79" + }, + "timestamp": { + "$date": "2018-08-07T18:00:00.433Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69df4da376d259db5bd015" + }, + "timestamp": { + "$date": "2018-08-07T18:05:00.344Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69e079a376d259db5bd0c8" + }, + "timestamp": { + "$date": "2018-08-07T18:10:00.358Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69e1a5a376d259db5bd157" + }, + "timestamp": { + "$date": "2018-08-07T18:15:00.307Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69e2d1a376d259db5bd1ed" + }, + "timestamp": { + "$date": "2018-08-07T18:20:00.426Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69e3fda376d259db5bd288" + }, + "timestamp": { + "$date": "2018-08-07T18:25:00.324Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69e529a376d259db5bd323" + }, + "timestamp": { + "$date": "2018-08-07T18:30:00.608Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69e655a376d259db5bd3f4" + }, + "timestamp": { + "$date": "2018-08-07T18:35:00.309Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69e781a376d259db5bd4c1" + }, + "timestamp": { + "$date": "2018-08-07T18:40:00.358Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69e8ada376d259db5bd554" + }, + "timestamp": { + "$date": "2018-08-07T18:45:00.376Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69e9d9a376d259db5bd5ed" + }, + "timestamp": { + "$date": "2018-08-07T18:50:00.385Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69eb05a376d259db5bd683" + }, + "timestamp": { + "$date": "2018-08-07T18:55:00.401Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69ec31a376d259db5bd76c" + }, + "timestamp": { + "$date": "2018-08-07T19:00:00.648Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69ed5da376d259db5bd7fc" + }, + "timestamp": { + "$date": "2018-08-07T19:05:00.37Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69ee89a376d259db5bd88f" + }, + "timestamp": { + "$date": "2018-08-07T19:10:00.394Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69efb5a376d259db5bd91f" + }, + "timestamp": { + "$date": "2018-08-07T19:15:00.335Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69f0e1a376d259db5bd9b2" + }, + "timestamp": { + "$date": "2018-08-07T19:20:00.383Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69f20da376d259db5bda48" + }, + "timestamp": { + "$date": "2018-08-07T19:25:00.469Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69f339a376d259db5bdae9" + }, + "timestamp": { + "$date": "2018-08-07T19:30:00.55Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69f465a376d259db5bdb79" + }, + "timestamp": { + "$date": "2018-08-07T19:35:00.337Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69f591a376d259db5bdc12" + }, + "timestamp": { + "$date": "2018-08-07T19:40:00.574Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69f6bda376d259db5bdca2" + }, + "timestamp": { + "$date": "2018-08-07T19:45:00.337Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69f7e9a376d259db5bdd37" + }, + "timestamp": { + "$date": "2018-08-07T19:50:00.373Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69f915a376d259db5bddc7" + }, + "timestamp": { + "$date": "2018-08-07T19:55:00.343Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69fa41a376d259db5bde6c" + }, + "timestamp": { + "$date": "2018-08-07T20:00:00.461Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69fb6da376d259db5bdefc" + }, + "timestamp": { + "$date": "2018-08-07T20:05:00.515Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69fc99a376d259db5bdfce" + }, + "timestamp": { + "$date": "2018-08-07T20:10:00.517Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69fdc5a376d259db5be05f" + }, + "timestamp": { + "$date": "2018-08-07T20:15:00.334Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b69fef1a376d259db5be0f2" + }, + "timestamp": { + "$date": "2018-08-07T20:20:00.341Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a001da376d259db5be182" + }, + "timestamp": { + "$date": "2018-08-07T20:25:00.362Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a0149a376d259db5be225" + }, + "timestamp": { + "$date": "2018-08-07T20:30:00.569Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a0275a376d259db5be2b5" + }, + "timestamp": { + "$date": "2018-08-07T20:35:00.354Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a03a1a376d259db5be347" + }, + "timestamp": { + "$date": "2018-08-07T20:40:00.345Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a04cda376d259db5be3df" + }, + "timestamp": { + "$date": "2018-08-07T20:45:00.349Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a05f9a376d259db5be46e" + }, + "timestamp": { + "$date": "2018-08-07T20:50:00.312Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a0725a376d259db5be4fa" + }, + "timestamp": { + "$date": "2018-08-07T20:55:00.314Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a0851a376d259db5be587" + }, + "timestamp": { + "$date": "2018-08-07T21:00:00.313Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a097da376d259db5be61f" + }, + "timestamp": { + "$date": "2018-08-07T21:05:00.351Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a0aa9a376d259db5be6ac" + }, + "timestamp": { + "$date": "2018-08-07T21:10:00.364Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a0bd5a376d259db5be742" + }, + "timestamp": { + "$date": "2018-08-07T21:15:00.295Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a0d01a376d259db5be7d6" + }, + "timestamp": { + "$date": "2018-08-07T21:20:00.331Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a0e2da376d259db5be861" + }, + "timestamp": { + "$date": "2018-08-07T21:25:00.421Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a0f59a376d259db5be9f8" + }, + "timestamp": { + "$date": "2018-08-07T21:30:00.312Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a1085a376d259db5bec96" + }, + "timestamp": { + "$date": "2018-08-07T21:35:00.402Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6a11b1a376d259db5beda6" + }, + "timestamp": { + "$date": "2018-08-07T21:40:00.464Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6a12dda376d259db5bee6f" + }, + "timestamp": { + "$date": "2018-08-07T21:45:00.314Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6a1409a376d259db5beefe" + }, + "timestamp": { + "$date": "2018-08-07T21:50:00.31Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6a1535a376d259db5bef86" + }, + "timestamp": { + "$date": "2018-08-07T21:55:00.326Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6a1661a376d259db5bf00f" + }, + "timestamp": { + "$date": "2018-08-07T22:00:00.309Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Iron", + "clientDbId": "5420" + } + ] +} +{ + "_id": { + "$oid": "5b6a178da376d259db5bf09b" + }, + "timestamp": { + "$date": "2018-08-07T22:05:00.302Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Iron", + "clientDbId": "5420" + } + ] +} +{ + "_id": { + "$oid": "5b6a18b9a376d259db5bf12e" + }, + "timestamp": { + "$date": "2018-08-07T22:10:00.341Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Iron", + "clientDbId": "5420" + } + ] +} +{ + "_id": { + "$oid": "5b6a19e5a376d259db5bf1b8" + }, + "timestamp": { + "$date": "2018-08-07T22:15:00.292Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a1b11a376d259db5bf247" + }, + "timestamp": { + "$date": "2018-08-07T22:20:00.446Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a1c3da376d259db5bf2cd" + }, + "timestamp": { + "$date": "2018-08-07T22:25:00.337Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a1d69a376d259db5bf356" + }, + "timestamp": { + "$date": "2018-08-07T22:30:00.417Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a1e95a376d259db5bf3de" + }, + "timestamp": { + "$date": "2018-08-07T22:35:00.29Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a1fc1a376d259db5bf473" + }, + "timestamp": { + "$date": "2018-08-07T22:40:00.501Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a20eda376d259db5bf4ff" + }, + "timestamp": { + "$date": "2018-08-07T22:45:00.303Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a2219a376d259db5bf58e" + }, + "timestamp": { + "$date": "2018-08-07T22:50:00.443Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a2345a376d259db5bf618" + }, + "timestamp": { + "$date": "2018-08-07T22:55:00.311Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a2471a376d259db5bf6a1" + }, + "timestamp": { + "$date": "2018-08-07T23:00:00.315Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a259da376d259db5bf72a" + }, + "timestamp": { + "$date": "2018-08-07T23:05:00.293Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a26c9a376d259db5bf7b8" + }, + "timestamp": { + "$date": "2018-08-07T23:10:00.342Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a27f5a376d259db5bf84b" + }, + "timestamp": { + "$date": "2018-08-07T23:15:00.335Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a2921a376d259db5bf8da" + }, + "timestamp": { + "$date": "2018-08-07T23:20:00.437Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a2a4da376d259db5bf960" + }, + "timestamp": { + "$date": "2018-08-07T23:25:00.334Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a2b79a376d259db5bf9e9" + }, + "timestamp": { + "$date": "2018-08-07T23:30:00.332Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a2ca5a376d259db5bfa6f" + }, + "timestamp": { + "$date": "2018-08-07T23:35:00.292Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a2dd1a376d259db5bfafa" + }, + "timestamp": { + "$date": "2018-08-07T23:40:00.34Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a2efda376d259db5bfb86" + }, + "timestamp": { + "$date": "2018-08-07T23:45:00.311Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a3029a376d259db5bfc20" + }, + "timestamp": { + "$date": "2018-08-07T23:50:00.308Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a3155a376d259db5bfca7" + }, + "timestamp": { + "$date": "2018-08-07T23:55:00.382Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a3281a376d259db5bfd2f" + }, + "timestamp": { + "$date": "2018-08-08T00:00:00.326Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a33ada376d259db5bfdb6" + }, + "timestamp": { + "$date": "2018-08-08T00:05:00.32Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a34d9a376d259db5bfe3f" + }, + "timestamp": { + "$date": "2018-08-08T00:10:00.344Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a3605a376d259db5bff12" + }, + "timestamp": { + "$date": "2018-08-08T00:15:00.294Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a3731a376d259db5bffab" + }, + "timestamp": { + "$date": "2018-08-08T00:20:00.313Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a385da376d259db5c003d" + }, + "timestamp": { + "$date": "2018-08-08T00:25:00.428Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a3989a376d259db5c00cb" + }, + "timestamp": { + "$date": "2018-08-08T00:30:00.329Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6a3ab5a376d259db5c0156" + }, + "timestamp": { + "$date": "2018-08-08T00:35:00.294Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a3be1a376d259db5c021f" + }, + "timestamp": { + "$date": "2018-08-08T00:40:00.349Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a3d0da376d259db5c02ea" + }, + "timestamp": { + "$date": "2018-08-08T00:45:00.431Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a3e39a376d259db5c0383" + }, + "timestamp": { + "$date": "2018-08-08T00:50:00.343Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a3f65a376d259db5c040f" + }, + "timestamp": { + "$date": "2018-08-08T00:55:00.358Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a4091a376d259db5c049d" + }, + "timestamp": { + "$date": "2018-08-08T01:00:00.319Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a41bea376d259db5c0528" + }, + "timestamp": { + "$date": "2018-08-08T01:05:00.809Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a42e9a376d259db5c05b6" + }, + "timestamp": { + "$date": "2018-08-08T01:10:00.34Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a4415a376d259db5c063d" + }, + "timestamp": { + "$date": "2018-08-08T01:15:00.292Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a4541a376d259db5c06cf" + }, + "timestamp": { + "$date": "2018-08-08T01:20:00.32Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a466da376d259db5c0854" + }, + "timestamp": { + "$date": "2018-08-08T01:25:00.323Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a4799a376d259db5c0a32" + }, + "timestamp": { + "$date": "2018-08-08T01:30:00.456Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a48c5a376d259db5c0adb" + }, + "timestamp": { + "$date": "2018-08-08T01:35:00.305Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a49f1a376d259db5c0b64" + }, + "timestamp": { + "$date": "2018-08-08T01:40:00.338Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a4b1da376d259db5c0bea" + }, + "timestamp": { + "$date": "2018-08-08T01:45:00.294Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a4c49a376d259db5c0c78" + }, + "timestamp": { + "$date": "2018-08-08T01:50:00.313Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a4d75a376d259db5c0d0b" + }, + "timestamp": { + "$date": "2018-08-08T01:55:00.357Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a4ea1a376d259db5c0dd2" + }, + "timestamp": { + "$date": "2018-08-08T02:00:00.326Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a4fcda376d259db5c0e56" + }, + "timestamp": { + "$date": "2018-08-08T02:05:00.34Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a50f9a376d259db5c0ed9" + }, + "timestamp": { + "$date": "2018-08-08T02:10:00.345Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a5225a376d259db5c0f5b" + }, + "timestamp": { + "$date": "2018-08-08T02:15:00.292Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a5351a376d259db5c0fde" + }, + "timestamp": { + "$date": "2018-08-08T02:20:00.355Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a547da376d259db5c106c" + }, + "timestamp": { + "$date": "2018-08-08T02:25:00.358Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a55a9a376d259db5c10fc" + }, + "timestamp": { + "$date": "2018-08-08T02:30:00.476Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a56d5a376d259db5c117d" + }, + "timestamp": { + "$date": "2018-08-08T02:35:00.302Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a5801a376d259db5c1201" + }, + "timestamp": { + "$date": "2018-08-08T02:40:00.376Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a592da376d259db5c12ab" + }, + "timestamp": { + "$date": "2018-08-08T02:45:00.289Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a5a59a376d259db5c1333" + }, + "timestamp": { + "$date": "2018-08-08T02:50:00.32Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a5b85a376d259db5c13b4" + }, + "timestamp": { + "$date": "2018-08-08T02:55:00.311Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a5cb1a376d259db5c1450" + }, + "timestamp": { + "$date": "2018-08-08T03:00:00.47Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a5ddda376d259db5c14d1" + }, + "timestamp": { + "$date": "2018-08-08T03:05:00.336Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a5f09a376d259db5c1555" + }, + "timestamp": { + "$date": "2018-08-08T03:10:00.392Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a6035a376d259db5c15d6" + }, + "timestamp": { + "$date": "2018-08-08T03:15:00.291Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a6161a376d259db5c165a" + }, + "timestamp": { + "$date": "2018-08-08T03:20:00.349Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a628da376d259db5c16db" + }, + "timestamp": { + "$date": "2018-08-08T03:25:00.316Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a63b9a376d259db5c1770" + }, + "timestamp": { + "$date": "2018-08-08T03:30:00.311Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a64e5a376d259db5c17f2" + }, + "timestamp": { + "$date": "2018-08-08T03:35:00.311Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a6611a376d259db5c187a" + }, + "timestamp": { + "$date": "2018-08-08T03:40:00.361Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a673da376d259db5c18fd" + }, + "timestamp": { + "$date": "2018-08-08T03:45:00.303Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a6869a376d259db5c1980" + }, + "timestamp": { + "$date": "2018-08-08T03:50:00.329Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a6995a376d259db5c1a02" + }, + "timestamp": { + "$date": "2018-08-08T03:55:00.31Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a6ac1a376d259db5c1a8b" + }, + "timestamp": { + "$date": "2018-08-08T04:00:00.312Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a6beda376d259db5c1b19" + }, + "timestamp": { + "$date": "2018-08-08T04:05:00.348Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a6d19a376d259db5c1ba2" + }, + "timestamp": { + "$date": "2018-08-08T04:10:00.355Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a6e45a376d259db5c1c24" + }, + "timestamp": { + "$date": "2018-08-08T04:15:00.337Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a6f71a376d259db5c1ca8" + }, + "timestamp": { + "$date": "2018-08-08T04:20:00.322Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a709da376d259db5c1d29" + }, + "timestamp": { + "$date": "2018-08-08T04:25:00.325Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a71c9a376d259db5c1db2" + }, + "timestamp": { + "$date": "2018-08-08T04:30:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a72f5a376d259db5c1e34" + }, + "timestamp": { + "$date": "2018-08-08T04:35:00.302Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a7421a376d259db5c1ec8" + }, + "timestamp": { + "$date": "2018-08-08T04:40:00.444Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a754da376d259db5c1f4b" + }, + "timestamp": { + "$date": "2018-08-08T04:45:00.302Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a7679a376d259db5c1fcf" + }, + "timestamp": { + "$date": "2018-08-08T04:50:00.396Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a77a5a376d259db5c2052" + }, + "timestamp": { + "$date": "2018-08-08T04:55:00.331Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a78d1a376d259db5c20d5" + }, + "timestamp": { + "$date": "2018-08-08T05:00:00.315Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a79fda376d259db5c215f" + }, + "timestamp": { + "$date": "2018-08-08T05:05:00.326Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a7b29a376d259db5c21e2" + }, + "timestamp": { + "$date": "2018-08-08T05:10:00.341Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a7c55a376d259db5c2276" + }, + "timestamp": { + "$date": "2018-08-08T05:15:00.357Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a7d81a376d259db5c22f9" + }, + "timestamp": { + "$date": "2018-08-08T05:20:00.313Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a7eada376d259db5c237b" + }, + "timestamp": { + "$date": "2018-08-08T05:25:00.312Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a7fd9a376d259db5c23ff" + }, + "timestamp": { + "$date": "2018-08-08T05:30:00.312Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a8105a376d259db5c2480" + }, + "timestamp": { + "$date": "2018-08-08T05:35:00.294Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a8231a376d259db5c2508" + }, + "timestamp": { + "$date": "2018-08-08T05:40:00.333Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a835da376d259db5c2599" + }, + "timestamp": { + "$date": "2018-08-08T05:45:00.292Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a8489a376d259db5c2621" + }, + "timestamp": { + "$date": "2018-08-08T05:50:00.311Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a85b5a376d259db5c26a4" + }, + "timestamp": { + "$date": "2018-08-08T05:55:00.405Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a86e1a376d259db5c272a" + }, + "timestamp": { + "$date": "2018-08-08T06:00:00.312Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a880da376d259db5c27ab" + }, + "timestamp": { + "$date": "2018-08-08T06:05:00.303Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a8939a376d259db5c2835" + }, + "timestamp": { + "$date": "2018-08-08T06:10:00.444Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a8a65a376d259db5c28b6" + }, + "timestamp": { + "$date": "2018-08-08T06:15:00.306Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a8b91a376d259db5c294a" + }, + "timestamp": { + "$date": "2018-08-08T06:20:00.342Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a8cbda376d259db5c29cd" + }, + "timestamp": { + "$date": "2018-08-08T06:25:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a8de9a376d259db5c2a51" + }, + "timestamp": { + "$date": "2018-08-08T06:30:00.411Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a8f15a376d259db5c2ad2" + }, + "timestamp": { + "$date": "2018-08-08T06:35:00.289Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a9041a376d259db5c2b5c" + }, + "timestamp": { + "$date": "2018-08-08T06:40:00.528Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a916da376d259db5c2bdd" + }, + "timestamp": { + "$date": "2018-08-08T06:45:00.304Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a9299a376d259db5c2c67" + }, + "timestamp": { + "$date": "2018-08-08T06:50:00.32Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a93c5a376d259db5c2cf4" + }, + "timestamp": { + "$date": "2018-08-08T06:55:00.367Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a94f1a376d259db5c2d78" + }, + "timestamp": { + "$date": "2018-08-08T07:00:00.359Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a961da376d259db5c2df9" + }, + "timestamp": { + "$date": "2018-08-08T07:05:00.301Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a9749a376d259db5c2e83" + }, + "timestamp": { + "$date": "2018-08-08T07:10:00.339Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a9875a376d259db5c2f5f" + }, + "timestamp": { + "$date": "2018-08-08T07:15:00.304Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a99a1a376d259db5c2fe3" + }, + "timestamp": { + "$date": "2018-08-08T07:20:00.314Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a9acda376d259db5c306a" + }, + "timestamp": { + "$date": "2018-08-08T07:25:00.35Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a9bf9a376d259db5c30f4" + }, + "timestamp": { + "$date": "2018-08-08T07:30:00.478Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a9d25a376d259db5c3175" + }, + "timestamp": { + "$date": "2018-08-08T07:35:00.3Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a9e51a376d259db5c31ff" + }, + "timestamp": { + "$date": "2018-08-08T07:40:00.344Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6a9f7da376d259db5c3286" + }, + "timestamp": { + "$date": "2018-08-08T07:45:00.337Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6aa0a9a376d259db5c3309" + }, + "timestamp": { + "$date": "2018-08-08T07:50:00.318Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6aa1d5a376d259db5c3391" + }, + "timestamp": { + "$date": "2018-08-08T07:55:00.344Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6aa303a376d259db5c3421" + }, + "timestamp": { + "$date": "2018-08-08T08:00:01.476Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6aa42da376d259db5c34a2" + }, + "timestamp": { + "$date": "2018-08-08T08:05:00.332Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6aa559a376d259db5c3526" + }, + "timestamp": { + "$date": "2018-08-08T08:10:00.365Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6aa685a376d259db5c35a7" + }, + "timestamp": { + "$date": "2018-08-08T08:15:00.326Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6aa7b1a376d259db5c3631" + }, + "timestamp": { + "$date": "2018-08-08T08:20:00.314Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6aa8dda376d259db5c36b2" + }, + "timestamp": { + "$date": "2018-08-08T08:25:00.32Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6aaa09a376d259db5c373c" + }, + "timestamp": { + "$date": "2018-08-08T08:30:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6aab35a376d259db5c37c3" + }, + "timestamp": { + "$date": "2018-08-08T08:35:00.437Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6aac61a376d259db5c384b" + }, + "timestamp": { + "$date": "2018-08-08T08:40:00.353Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6aad8da376d259db5c38d0" + }, + "timestamp": { + "$date": "2018-08-08T08:45:00.293Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6aaeb9a376d259db5c3954" + }, + "timestamp": { + "$date": "2018-08-08T08:50:00.315Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6aafe6a376d259db5c3a4c" + }, + "timestamp": { + "$date": "2018-08-08T08:55:01.014Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ab112a376d259db5c3b30" + }, + "timestamp": { + "$date": "2018-08-08T09:00:01.015Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ab23ea376d259db5c3c46" + }, + "timestamp": { + "$date": "2018-08-08T09:05:01.029Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ab369a376d259db5c4295" + }, + "timestamp": { + "$date": "2018-08-08T09:10:00.373Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ab495a376d259db5c4317" + }, + "timestamp": { + "$date": "2018-08-08T09:15:00.293Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ab5c1a376d259db5c439a" + }, + "timestamp": { + "$date": "2018-08-08T09:20:00.316Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ab6eda376d259db5c441c" + }, + "timestamp": { + "$date": "2018-08-08T09:25:00.376Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ab819a376d259db5c44a0" + }, + "timestamp": { + "$date": "2018-08-08T09:30:00.311Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ab946a376d259db5c4527" + }, + "timestamp": { + "$date": "2018-08-08T09:35:00.441Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6aba71a376d259db5c45bb" + }, + "timestamp": { + "$date": "2018-08-08T09:40:00.351Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6abb9da376d259db5c463e" + }, + "timestamp": { + "$date": "2018-08-08T09:45:00.303Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6abcc9a376d259db5c46c2" + }, + "timestamp": { + "$date": "2018-08-08T09:50:00.332Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6abdf5a376d259db5c4745" + }, + "timestamp": { + "$date": "2018-08-08T09:55:00.346Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6abf21a376d259db5c4814" + }, + "timestamp": { + "$date": "2018-08-08T10:00:00.342Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ac04da376d259db5c48bc" + }, + "timestamp": { + "$date": "2018-08-08T10:05:00.325Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ac17aa376d259db5c494e" + }, + "timestamp": { + "$date": "2018-08-08T10:10:00.48Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ac2a5a376d259db5c49d5" + }, + "timestamp": { + "$date": "2018-08-08T10:15:00.306Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ac3d2a376d259db5c4a58" + }, + "timestamp": { + "$date": "2018-08-08T10:20:00.362Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ac4fda376d259db5c4ada" + }, + "timestamp": { + "$date": "2018-08-08T10:25:00.341Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ac629a376d259db5c4b5e" + }, + "timestamp": { + "$date": "2018-08-08T10:30:00.337Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ac755a376d259db5c4be5" + }, + "timestamp": { + "$date": "2018-08-08T10:35:00.289Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ac882a376d259db5c4c75" + }, + "timestamp": { + "$date": "2018-08-08T10:40:00.493Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ac9ada376d259db5c4cfc" + }, + "timestamp": { + "$date": "2018-08-08T10:45:00.301Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6acad9a376d259db5c4d81" + }, + "timestamp": { + "$date": "2018-08-08T10:50:00.331Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6acc05a376d259db5c4e03" + }, + "timestamp": { + "$date": "2018-08-08T10:55:00.323Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6acd31a376d259db5c4e87" + }, + "timestamp": { + "$date": "2018-08-08T11:00:00.311Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ace5ea376d259db5c4f0e" + }, + "timestamp": { + "$date": "2018-08-08T11:05:00.347Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6acf8aa376d259db5c4f9d" + }, + "timestamp": { + "$date": "2018-08-08T11:10:00.52Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ad0b6a376d259db5c5027" + }, + "timestamp": { + "$date": "2018-08-08T11:15:00.311Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ad1e2a376d259db5c50ab" + }, + "timestamp": { + "$date": "2018-08-08T11:20:00.323Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ad30ea376d259db5c512e" + }, + "timestamp": { + "$date": "2018-08-08T11:25:00.369Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ad43aa376d259db5c5251" + }, + "timestamp": { + "$date": "2018-08-08T11:30:00.31Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ad566a376d259db5c52dd" + }, + "timestamp": { + "$date": "2018-08-08T11:35:00.296Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ad692a376d259db5c5377" + }, + "timestamp": { + "$date": "2018-08-08T11:40:00.57Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ad7bea376d259db5c543d" + }, + "timestamp": { + "$date": "2018-08-08T11:45:00.292Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ad8eaa376d259db5c54cd" + }, + "timestamp": { + "$date": "2018-08-08T11:50:00.383Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ada16a376d259db5c5558" + }, + "timestamp": { + "$date": "2018-08-08T11:55:00.379Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6adb42a376d259db5c55e6" + }, + "timestamp": { + "$date": "2018-08-08T12:00:00.333Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6adc6ea376d259db5c5671" + }, + "timestamp": { + "$date": "2018-08-08T12:05:00.289Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6add9aa376d259db5c570a" + }, + "timestamp": { + "$date": "2018-08-08T12:10:00.715Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6adec6a376d259db5c57a2" + }, + "timestamp": { + "$date": "2018-08-08T12:15:00.302Z" + }, + "users": [ + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6adff2a376d259db5c5846" + }, + "timestamp": { + "$date": "2018-08-08T12:20:00.327Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ae11ea376d259db5c58d7" + }, + "timestamp": { + "$date": "2018-08-08T12:25:00.343Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ae24aa376d259db5c596a" + }, + "timestamp": { + "$date": "2018-08-08T12:30:00.313Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ae376a376d259db5c59fa" + }, + "timestamp": { + "$date": "2018-08-08T12:35:00.303Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ae4a2a376d259db5c5a8d" + }, + "timestamp": { + "$date": "2018-08-08T12:40:00.37Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ae5cea376d259db5c5b31" + }, + "timestamp": { + "$date": "2018-08-08T12:45:00.313Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ae6faa376d259db5c5bc8" + }, + "timestamp": { + "$date": "2018-08-08T12:50:00.312Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ae826a376d259db5c5c5a" + }, + "timestamp": { + "$date": "2018-08-08T12:55:00.342Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ae952a376d259db5c5ced" + }, + "timestamp": { + "$date": "2018-08-08T13:00:00.313Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6aea7ea376d259db5c5d7d" + }, + "timestamp": { + "$date": "2018-08-08T13:05:00.316Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6aebaaa376d259db5c5e10" + }, + "timestamp": { + "$date": "2018-08-08T13:10:00.768Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6aecd6a376d259db5c5ea6" + }, + "timestamp": { + "$date": "2018-08-08T13:15:00.292Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6aee02a376d259db5c5f4a" + }, + "timestamp": { + "$date": "2018-08-08T13:20:00.514Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6aef2ea376d259db5c5fdb" + }, + "timestamp": { + "$date": "2018-08-08T13:25:00.336Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6af05aa376d259db5c606d" + }, + "timestamp": { + "$date": "2018-08-08T13:30:00.36Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6af186a376d259db5c60fe" + }, + "timestamp": { + "$date": "2018-08-08T13:35:00.325Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6af2b2a376d259db5c6192" + }, + "timestamp": { + "$date": "2018-08-08T13:40:00.336Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6af3dea376d259db5c6223" + }, + "timestamp": { + "$date": "2018-08-08T13:45:00.325Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6af50aa376d259db5c62cd" + }, + "timestamp": { + "$date": "2018-08-08T13:50:00.925Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6af636a376d259db5c635e" + }, + "timestamp": { + "$date": "2018-08-08T13:55:00.323Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6af762a376d259db5c63f1" + }, + "timestamp": { + "$date": "2018-08-08T14:00:00.339Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6af88ea376d259db5c6481" + }, + "timestamp": { + "$date": "2018-08-08T14:05:00.29Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6af9baa376d259db5c651a" + }, + "timestamp": { + "$date": "2018-08-08T14:10:00.476Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6afae6a376d259db5c65ac" + }, + "timestamp": { + "$date": "2018-08-08T14:15:00.301Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6afc12a376d259db5c6645" + }, + "timestamp": { + "$date": "2018-08-08T14:20:00.337Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6afd3ea376d259db5c66db" + }, + "timestamp": { + "$date": "2018-08-08T14:25:00.337Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6afe6aa376d259db5c6772" + }, + "timestamp": { + "$date": "2018-08-08T14:30:00.317Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6aff96a376d259db5c6804" + }, + "timestamp": { + "$date": "2018-08-08T14:35:00.303Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6b00c2a376d259db5c6896" + }, + "timestamp": { + "$date": "2018-08-08T14:40:00.355Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6b01eea376d259db5c692d" + }, + "timestamp": { + "$date": "2018-08-08T14:45:00.336Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6b031aa376d259db5c69bf" + }, + "timestamp": { + "$date": "2018-08-08T14:50:00.32Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6b0446a376d259db5c6a5c" + }, + "timestamp": { + "$date": "2018-08-08T14:55:00.414Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6b0572a376d259db5c6aed" + }, + "timestamp": { + "$date": "2018-08-08T15:00:00.322Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6b069ea376d259db5c6b7f" + }, + "timestamp": { + "$date": "2018-08-08T15:05:00.31Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6b07caa376d259db5c6c18" + }, + "timestamp": { + "$date": "2018-08-08T15:10:00.35Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6b08f6a376d259db5c6caa" + }, + "timestamp": { + "$date": "2018-08-08T15:15:00.305Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + } + ] +} +{ + "_id": { + "$oid": "5b6b0a22a376d259db5c6d47" + }, + "timestamp": { + "$date": "2018-08-08T15:20:00.45Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b0b4ea376d259db5c6de3" + }, + "timestamp": { + "$date": "2018-08-08T15:25:00.392Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b0c7aa376d259db5c6e76" + }, + "timestamp": { + "$date": "2018-08-08T15:30:00.311Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b0da6a376d259db5c6f06" + }, + "timestamp": { + "$date": "2018-08-08T15:35:00.84Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b0ed5a376d259db5c6fa9" + }, + "timestamp": { + "$date": "2018-08-08T15:40:03.905Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b0ffea376d259db5c7035" + }, + "timestamp": { + "$date": "2018-08-08T15:45:00.313Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b112aa376d259db5c70c7" + }, + "timestamp": { + "$date": "2018-08-08T15:50:00.345Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b1256a376d259db5c715e" + }, + "timestamp": { + "$date": "2018-08-08T15:55:00.327Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b1382a376d259db5c71f6" + }, + "timestamp": { + "$date": "2018-08-08T16:00:00.35Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b14aea376d259db5c7289" + }, + "timestamp": { + "$date": "2018-08-08T16:05:00.331Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b15daa376d259db5c731b" + }, + "timestamp": { + "$date": "2018-08-08T16:10:00.324Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b1706a376d259db5c73b2" + }, + "timestamp": { + "$date": "2018-08-08T16:15:00.482Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b1832a376d259db5c7449" + }, + "timestamp": { + "$date": "2018-08-08T16:20:00.327Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b195ea376d259db5c74dd" + }, + "timestamp": { + "$date": "2018-08-08T16:25:00.298Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b1a8aa376d259db5c757e" + }, + "timestamp": { + "$date": "2018-08-08T16:30:00.396Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b1bb6a376d259db5c7610" + }, + "timestamp": { + "$date": "2018-08-08T16:35:00.289Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b1ce2a376d259db5c76a3" + }, + "timestamp": { + "$date": "2018-08-08T16:40:00.556Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Woody", + "clientDbId": "5464" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b1e0ea376d259db5c7735" + }, + "timestamp": { + "$date": "2018-08-08T16:45:00.328Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b1f3aa376d259db5c77d8" + }, + "timestamp": { + "$date": "2018-08-08T16:50:00.45Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b2066a376d259db5c786a" + }, + "timestamp": { + "$date": "2018-08-08T16:55:00.324Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b2192a376d259db5c7907" + }, + "timestamp": { + "$date": "2018-08-08T17:00:00.989Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b22bea376d259db5c799f" + }, + "timestamp": { + "$date": "2018-08-08T17:05:00.335Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b23eaa376d259db5c7a34" + }, + "timestamp": { + "$date": "2018-08-08T17:10:00.308Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b2516a376d259db5c7ac4" + }, + "timestamp": { + "$date": "2018-08-08T17:15:00.333Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b2642a376d259db5c7b5d" + }, + "timestamp": { + "$date": "2018-08-08T17:20:00.486Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b276ea376d259db5c7bed" + }, + "timestamp": { + "$date": "2018-08-08T17:25:00.306Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b289aa376d259db5c7c7f" + }, + "timestamp": { + "$date": "2018-08-08T17:30:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b29c6a376d259db5c7d1c" + }, + "timestamp": { + "$date": "2018-08-08T17:35:00.44Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b2af2a376d259db5c7db5" + }, + "timestamp": { + "$date": "2018-08-08T17:40:00.449Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b2c1ea376d259db5c7e47" + }, + "timestamp": { + "$date": "2018-08-08T17:45:00.295Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b2d4aa376d259db5c7ee2" + }, + "timestamp": { + "$date": "2018-08-08T17:50:00.421Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b2e76a376d259db5c7f74" + }, + "timestamp": { + "$date": "2018-08-08T17:55:00.322Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b2fa2a376d259db5c8007" + }, + "timestamp": { + "$date": "2018-08-08T18:00:00.328Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b30cea376d259db5c80a3" + }, + "timestamp": { + "$date": "2018-08-08T18:05:00.376Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b31faa376d259db5c81f0" + }, + "timestamp": { + "$date": "2018-08-08T18:10:00.306Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b3326a376d259db5c8287" + }, + "timestamp": { + "$date": "2018-08-08T18:15:00.321Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b3452a376d259db5c831b" + }, + "timestamp": { + "$date": "2018-08-08T18:20:00.359Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "1st Platoon OC - 2Lt.Perlaky.A", + "channelId": "1039", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b357ea376d259db5c83b8" + }, + "timestamp": { + "$date": "2018-08-08T18:25:00.297Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b36aaa376d259db5c844d" + }, + "timestamp": { + "$date": "2018-08-08T18:30:00.343Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b37d6a376d259db5c84e9" + }, + "timestamp": { + "$date": "2018-08-08T18:35:00.326Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b3902a376d259db5c8588" + }, + "timestamp": { + "$date": "2018-08-08T18:40:00.496Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b3a2ea376d259db5c8618" + }, + "timestamp": { + "$date": "2018-08-08T18:45:00.325Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b3b5aa376d259db5c86b5" + }, + "timestamp": { + "$date": "2018-08-08T18:50:00.363Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b3c86a376d259db5c87c7" + }, + "timestamp": { + "$date": "2018-08-08T18:55:00.355Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b3db2a376d259db5c888f" + }, + "timestamp": { + "$date": "2018-08-08T19:00:00.349Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Bennett.D", + "clientDbId": "5453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b3edea376d259db5c8939" + }, + "timestamp": { + "$date": "2018-08-08T19:05:00.341Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Bennett.D", + "clientDbId": "5453" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b400aa376d259db5c8b7e" + }, + "timestamp": { + "$date": "2018-08-08T19:10:00.772Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Bennett.D", + "clientDbId": "5453" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b4136a376d259db5c8c7f" + }, + "timestamp": { + "$date": "2018-08-08T19:15:00.327Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Bennett.D", + "clientDbId": "5453" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b4262a376d259db5c8d22" + }, + "timestamp": { + "$date": "2018-08-08T19:20:00.399Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b438ea376d259db5c8dcc" + }, + "timestamp": { + "$date": "2018-08-08T19:25:00.327Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b44baa376d259db5c8eab" + }, + "timestamp": { + "$date": "2018-08-08T19:30:00.362Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b45e6a376d259db5c8fa2" + }, + "timestamp": { + "$date": "2018-08-08T19:35:00.359Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b4712a376d259db5c9037" + }, + "timestamp": { + "$date": "2018-08-08T19:40:00.364Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b483ea376d259db5c90ca" + }, + "timestamp": { + "$date": "2018-08-08T19:45:00.359Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b496aa376d259db5c9165" + }, + "timestamp": { + "$date": "2018-08-08T19:50:00.509Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b4a96a376d259db5c91f5" + }, + "timestamp": { + "$date": "2018-08-08T19:55:00.339Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b4bc2a376d259db5c9292" + }, + "timestamp": { + "$date": "2018-08-08T20:00:00.348Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b4ceea376d259db5c940f" + }, + "timestamp": { + "$date": "2018-08-08T20:05:00.363Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b4e1aa376d259db5c95c4" + }, + "timestamp": { + "$date": "2018-08-08T20:10:00.379Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b4f46a376d259db5c9659" + }, + "timestamp": { + "$date": "2018-08-08T20:15:00.326Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b5072a376d259db5c96f5" + }, + "timestamp": { + "$date": "2018-08-08T20:20:00.496Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b519ea376d259db5c9787" + }, + "timestamp": { + "$date": "2018-08-08T20:25:00.334Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b52caa376d259db5c9824" + }, + "timestamp": { + "$date": "2018-08-08T20:30:00.414Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b53f6a376d259db5c98bc" + }, + "timestamp": { + "$date": "2018-08-08T20:35:00.357Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b5522a376d259db5c994f" + }, + "timestamp": { + "$date": "2018-08-08T20:40:00.377Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b564ea376d259db5c99df" + }, + "timestamp": { + "$date": "2018-08-08T20:45:00.326Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b577aa376d259db5c9a78" + }, + "timestamp": { + "$date": "2018-08-08T20:50:00.505Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b58a6a376d259db5c9b08" + }, + "timestamp": { + "$date": "2018-08-08T20:55:00.351Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b59d2a376d259db5c9ba7" + }, + "timestamp": { + "$date": "2018-08-08T21:00:00.431Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6b5afea376d259db5c9c37" + }, + "timestamp": { + "$date": "2018-08-08T21:05:00.515Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6b5c2aa376d259db5c9cd0" + }, + "timestamp": { + "$date": "2018-08-08T21:10:00.424Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6b5d56a376d259db5c9d60" + }, + "timestamp": { + "$date": "2018-08-08T21:15:00.351Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6b5e82a376d259db5c9df9" + }, + "timestamp": { + "$date": "2018-08-08T21:20:00.537Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6b5faea376d259db5c9e89" + }, + "timestamp": { + "$date": "2018-08-08T21:25:00.334Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6b60daa376d259db5c9f1b" + }, + "timestamp": { + "$date": "2018-08-08T21:30:00.48Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6b6206a376d259db5ca020" + }, + "timestamp": { + "$date": "2018-08-08T21:35:00.347Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6b6332a376d259db5ca0b8" + }, + "timestamp": { + "$date": "2018-08-08T21:40:00.354Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6b645ea376d259db5ca14d" + }, + "timestamp": { + "$date": "2018-08-08T21:45:00.35Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6b658aa376d259db5ca1df" + }, + "timestamp": { + "$date": "2018-08-08T21:50:00.374Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6b66b6a376d259db5ca276" + }, + "timestamp": { + "$date": "2018-08-08T21:55:00.415Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6b67e2a376d259db5ca308" + }, + "timestamp": { + "$date": "2018-08-08T22:00:00.35Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6b690ea376d259db5ca39f" + }, + "timestamp": { + "$date": "2018-08-08T22:05:00.345Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6b6a3aa376d259db5ca438" + }, + "timestamp": { + "$date": "2018-08-08T22:10:00.314Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6b6b66a376d259db5ca4d0" + }, + "timestamp": { + "$date": "2018-08-08T22:15:00.306Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6b6c92a376d259db5ca562" + }, + "timestamp": { + "$date": "2018-08-08T22:20:00.361Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6b6dbea376d259db5ca8ca" + }, + "timestamp": { + "$date": "2018-08-08T22:25:00.294Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Parle.H.", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6b6eeaa376d259db5caabf" + }, + "timestamp": { + "$date": "2018-08-08T22:30:00.321Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6b7016a376d259db5cab63" + }, + "timestamp": { + "$date": "2018-08-08T22:35:00.449Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6b7142a376d259db5cadfb" + }, + "timestamp": { + "$date": "2018-08-08T22:40:00.435Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6b726ea376d259db5cb00f" + }, + "timestamp": { + "$date": "2018-08-08T22:45:00.291Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6b739aa376d259db5cb0f6" + }, + "timestamp": { + "$date": "2018-08-08T22:50:00.394Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6b74c6a376d259db5cb290" + }, + "timestamp": { + "$date": "2018-08-08T22:55:00.293Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6b75f2a376d259db5cb37e" + }, + "timestamp": { + "$date": "2018-08-08T23:00:00.314Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6b771ea376d259db5cb543" + }, + "timestamp": { + "$date": "2018-08-08T23:05:00.35Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b784aa376d259db5cb61f" + }, + "timestamp": { + "$date": "2018-08-08T23:10:00.363Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b7976a376d259db5cb700" + }, + "timestamp": { + "$date": "2018-08-08T23:15:00.292Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b7aa2a376d259db5cb79a" + }, + "timestamp": { + "$date": "2018-08-08T23:20:00.399Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b7bcea376d259db5cb82f" + }, + "timestamp": { + "$date": "2018-08-08T23:25:00.292Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b7cfaa376d259db5cb8cb" + }, + "timestamp": { + "$date": "2018-08-08T23:30:00.471Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b7e26a376d259db5cb95b" + }, + "timestamp": { + "$date": "2018-08-08T23:35:00.351Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b7f52a376d259db5cb9fa" + }, + "timestamp": { + "$date": "2018-08-08T23:40:00.325Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b807ea376d259db5cba8a" + }, + "timestamp": { + "$date": "2018-08-08T23:45:00.335Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b81aaa376d259db5cbb23" + }, + "timestamp": { + "$date": "2018-08-08T23:50:00.358Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b82d6a376d259db5cbc7b" + }, + "timestamp": { + "$date": "2018-08-08T23:55:00.289Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b8402a376d259db5cbd0f" + }, + "timestamp": { + "$date": "2018-08-09T00:00:00.315Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b852ea376d259db5cbd9a" + }, + "timestamp": { + "$date": "2018-08-09T00:05:00.371Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b865aa376d259db5cbe27" + }, + "timestamp": { + "$date": "2018-08-09T00:10:00.316Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b8786a376d259db5cbeb9" + }, + "timestamp": { + "$date": "2018-08-09T00:15:00.318Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b88b2a376d259db5cbf4e" + }, + "timestamp": { + "$date": "2018-08-09T00:20:00.336Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b89dea376d259db5cbfda" + }, + "timestamp": { + "$date": "2018-08-09T00:25:00.296Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b8b0aa376d259db5cc06c" + }, + "timestamp": { + "$date": "2018-08-09T00:30:00.309Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b8c36a376d259db5cc0f9" + }, + "timestamp": { + "$date": "2018-08-09T00:35:00.321Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b8d62a376d259db5cc18d" + }, + "timestamp": { + "$date": "2018-08-09T00:40:00.448Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b8e8ea376d259db5cc225" + }, + "timestamp": { + "$date": "2018-08-09T00:45:00.295Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b8fbaa376d259db5cc2ae" + }, + "timestamp": { + "$date": "2018-08-09T00:50:00.329Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b90e6a376d259db5cc33a" + }, + "timestamp": { + "$date": "2018-08-09T00:55:00.368Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6b9212a376d259db5cc3db" + }, + "timestamp": { + "$date": "2018-08-09T01:00:00.455Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6b933ea376d259db5cc45c" + }, + "timestamp": { + "$date": "2018-08-09T01:05:00.38Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6b946aa376d259db5cc554" + }, + "timestamp": { + "$date": "2018-08-09T01:10:00.435Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6b9596a376d259db5cc5dc" + }, + "timestamp": { + "$date": "2018-08-09T01:15:00.304Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6b96c2a376d259db5cc664" + }, + "timestamp": { + "$date": "2018-08-09T01:20:00.334Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6b97eea376d259db5cc6f1" + }, + "timestamp": { + "$date": "2018-08-09T01:25:00.292Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6b991aa376d259db5cc77f" + }, + "timestamp": { + "$date": "2018-08-09T01:30:00.342Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6b9a46a376d259db5cc804" + }, + "timestamp": { + "$date": "2018-08-09T01:35:00.307Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6b9b72a376d259db5cc88c" + }, + "timestamp": { + "$date": "2018-08-09T01:40:00.345Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6b9c9ea376d259db5cc90f" + }, + "timestamp": { + "$date": "2018-08-09T01:45:00.299Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6b9dcaa376d259db5cc993" + }, + "timestamp": { + "$date": "2018-08-09T01:50:00.446Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6b9ef6a376d259db5cca14" + }, + "timestamp": { + "$date": "2018-08-09T01:55:00.288Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6ba023a376d259db5ccaac" + }, + "timestamp": { + "$date": "2018-08-09T02:00:01.498Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6ba14ea376d259db5ccb31" + }, + "timestamp": { + "$date": "2018-08-09T02:05:00.32Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6ba27aa376d259db5ccbb5" + }, + "timestamp": { + "$date": "2018-08-09T02:10:00.326Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6ba3a6a376d259db5ccc36" + }, + "timestamp": { + "$date": "2018-08-09T02:15:00.301Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6ba4d3a376d259db5cccba" + }, + "timestamp": { + "$date": "2018-08-09T02:20:00.685Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6ba5fea376d259db5ccd3b" + }, + "timestamp": { + "$date": "2018-08-09T02:25:00.296Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6ba72aa376d259db5cce25" + }, + "timestamp": { + "$date": "2018-08-09T02:30:00.311Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6ba856a376d259db5cceb2" + }, + "timestamp": { + "$date": "2018-08-09T02:35:00.454Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6ba982a376d259db5ccfd8" + }, + "timestamp": { + "$date": "2018-08-09T02:40:00.319Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6baaaea376d259db5cd061" + }, + "timestamp": { + "$date": "2018-08-09T02:45:00.316Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6babdaa376d259db5cd0e5" + }, + "timestamp": { + "$date": "2018-08-09T02:50:00.348Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bad06a376d259db5cd166" + }, + "timestamp": { + "$date": "2018-08-09T02:55:00.287Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bae32a376d259db5cd1f0" + }, + "timestamp": { + "$date": "2018-08-09T03:00:00.325Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6baf5ea376d259db5cd271" + }, + "timestamp": { + "$date": "2018-08-09T03:05:00.331Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bb08ba376d259db5cd330" + }, + "timestamp": { + "$date": "2018-08-09T03:10:00.545Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bb1b6a376d259db5cd3b3" + }, + "timestamp": { + "$date": "2018-08-09T03:15:00.298Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bb2e2a376d259db5cd437" + }, + "timestamp": { + "$date": "2018-08-09T03:20:00.363Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bb40ea376d259db5cd4b8" + }, + "timestamp": { + "$date": "2018-08-09T03:25:00.288Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bb53aa376d259db5cd542" + }, + "timestamp": { + "$date": "2018-08-09T03:30:00.32Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bb666a376d259db5cd5c3" + }, + "timestamp": { + "$date": "2018-08-09T03:35:00.329Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bb792a376d259db5cd653" + }, + "timestamp": { + "$date": "2018-08-09T03:40:00.338Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bb8bea376d259db5cd6da" + }, + "timestamp": { + "$date": "2018-08-09T03:45:00.335Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bb9eaa376d259db5cd75e" + }, + "timestamp": { + "$date": "2018-08-09T03:50:00.38Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bbb16a376d259db5cd7df" + }, + "timestamp": { + "$date": "2018-08-09T03:55:00.301Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bbc42a376d259db5cd863" + }, + "timestamp": { + "$date": "2018-08-09T04:00:00.315Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bbd6ea376d259db5cd8ea" + }, + "timestamp": { + "$date": "2018-08-09T04:05:00.309Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bbe9aa376d259db5cd96e" + }, + "timestamp": { + "$date": "2018-08-09T04:10:00.316Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bbfc6a376d259db5cd9f5" + }, + "timestamp": { + "$date": "2018-08-09T04:15:00.455Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bc0f2a376d259db5cda83" + }, + "timestamp": { + "$date": "2018-08-09T04:20:00.347Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bc21ea376d259db5cdb06" + }, + "timestamp": { + "$date": "2018-08-09T04:25:00.302Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bc34aa376d259db5cdb89" + }, + "timestamp": { + "$date": "2018-08-09T04:30:00.309Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bc476a376d259db5cdc26" + }, + "timestamp": { + "$date": "2018-08-09T04:35:00.32Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bc5a2a376d259db5cdcac" + }, + "timestamp": { + "$date": "2018-08-09T04:40:00.315Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bc6cfa376d259db5cdd33" + }, + "timestamp": { + "$date": "2018-08-09T04:45:00.543Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bc7fba376d259db5cddc3" + }, + "timestamp": { + "$date": "2018-08-09T04:50:00.855Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bc926a376d259db5cde44" + }, + "timestamp": { + "$date": "2018-08-09T04:55:00.349Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bca52a376d259db5cdeca" + }, + "timestamp": { + "$date": "2018-08-09T05:00:00.307Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bcb7ea376d259db5cdf4b" + }, + "timestamp": { + "$date": "2018-08-09T05:05:00.332Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bccaaa376d259db5cdfd5" + }, + "timestamp": { + "$date": "2018-08-09T05:10:00.314Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bcdd6a376d259db5ce056" + }, + "timestamp": { + "$date": "2018-08-09T05:15:00.295Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bcf03a376d259db5ce140" + }, + "timestamp": { + "$date": "2018-08-09T05:20:00.472Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bd02ea376d259db5ce1c6" + }, + "timestamp": { + "$date": "2018-08-09T05:25:00.303Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bd15ba376d259db5ce262" + }, + "timestamp": { + "$date": "2018-08-09T05:30:00.451Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bd286a376d259db5ce2e3" + }, + "timestamp": { + "$date": "2018-08-09T05:35:00.359Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bd3b2a376d259db5ce367" + }, + "timestamp": { + "$date": "2018-08-09T05:40:00.323Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bd4dea376d259db5ce3e8" + }, + "timestamp": { + "$date": "2018-08-09T05:45:00.294Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bd60aa376d259db5ce46c" + }, + "timestamp": { + "$date": "2018-08-09T05:50:00.392Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bd736a376d259db5ce4f9" + }, + "timestamp": { + "$date": "2018-08-09T05:55:00.297Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bd863a376d259db5ce589" + }, + "timestamp": { + "$date": "2018-08-09T06:00:00.509Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bd991a376d259db5ce60e" + }, + "timestamp": { + "$date": "2018-08-09T06:05:03.031Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bdabea376d259db5ce73c" + }, + "timestamp": { + "$date": "2018-08-09T06:10:03.481Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bdbeaa376d259db5ce7be" + }, + "timestamp": { + "$date": "2018-08-09T06:15:03.944Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bdd15a376d259db5ce842" + }, + "timestamp": { + "$date": "2018-08-09T06:20:03.384Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bde41a376d259db5ce8c9" + }, + "timestamp": { + "$date": "2018-08-09T06:25:02.959Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bdf6aa376d259db5ce948" + }, + "timestamp": { + "$date": "2018-08-09T06:30:00.322Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6be097a376d259db5ce9d0" + }, + "timestamp": { + "$date": "2018-08-09T06:35:00.374Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6be1c2a376d259db5cea59" + }, + "timestamp": { + "$date": "2018-08-09T06:40:00.344Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6be2eea376d259db5ceadb" + }, + "timestamp": { + "$date": "2018-08-09T06:45:00.335Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6be41aa376d259db5ceb63" + }, + "timestamp": { + "$date": "2018-08-09T06:50:00.337Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6be546a376d259db5cebe6" + }, + "timestamp": { + "$date": "2018-08-09T06:55:00.329Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6be672a376d259db5cec70" + }, + "timestamp": { + "$date": "2018-08-09T07:00:00.337Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6be79ea376d259db5ced8c" + }, + "timestamp": { + "$date": "2018-08-09T07:05:00.328Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6be8cba376d259db5cee14" + }, + "timestamp": { + "$date": "2018-08-09T07:10:00.459Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6be9f6a376d259db5cee97" + }, + "timestamp": { + "$date": "2018-08-09T07:15:00.305Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6beb22a376d259db5cef21" + }, + "timestamp": { + "$date": "2018-08-09T07:20:00.335Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bec4fa376d259db5cefa4" + }, + "timestamp": { + "$date": "2018-08-09T07:25:00.35Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bed7ba376d259db5cf02d" + }, + "timestamp": { + "$date": "2018-08-09T07:30:00.36Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6beea6a376d259db5cf0b5" + }, + "timestamp": { + "$date": "2018-08-09T07:35:00.291Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6befd3a376d259db5cf13f" + }, + "timestamp": { + "$date": "2018-08-09T07:40:00.354Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6bf0fea376d259db5cf1c2" + }, + "timestamp": { + "$date": "2018-08-09T07:45:00.302Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6bf22ba376d259db5cf24b" + }, + "timestamp": { + "$date": "2018-08-09T07:50:00.321Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6bf357a376d259db5cf2cd" + }, + "timestamp": { + "$date": "2018-08-09T07:55:00.342Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6bf483a376d259db5cf351" + }, + "timestamp": { + "$date": "2018-08-09T08:00:00.334Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6bf5aea376d259db5cf3d8" + }, + "timestamp": { + "$date": "2018-08-09T08:05:00.296Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6bf6dba376d259db5cf461" + }, + "timestamp": { + "$date": "2018-08-09T08:10:00.44Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6bf807a376d259db5cf4e9" + }, + "timestamp": { + "$date": "2018-08-09T08:15:00.341Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6bf933a376d259db5cf573" + }, + "timestamp": { + "$date": "2018-08-09T08:20:00.501Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6bfa5fa376d259db5cf5f4" + }, + "timestamp": { + "$date": "2018-08-09T08:25:00.339Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6bfb8ba376d259db5cf678" + }, + "timestamp": { + "$date": "2018-08-09T08:30:00.322Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6bfcb7a376d259db5cf6ff" + }, + "timestamp": { + "$date": "2018-08-09T08:35:00.412Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6bfde3a376d259db5cf789" + }, + "timestamp": { + "$date": "2018-08-09T08:40:00.354Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6bff0fa376d259db5cf80a" + }, + "timestamp": { + "$date": "2018-08-09T08:45:00.294Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c003ba376d259db5cf899" + }, + "timestamp": { + "$date": "2018-08-09T08:50:00.338Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c0167a376d259db5cf91b" + }, + "timestamp": { + "$date": "2018-08-09T08:55:00.382Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c0293a376d259db5cf99f" + }, + "timestamp": { + "$date": "2018-08-09T09:00:00.357Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c03bfa376d259db5cfa20" + }, + "timestamp": { + "$date": "2018-08-09T09:05:00.292Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c04eba376d259db5cfab0" + }, + "timestamp": { + "$date": "2018-08-09T09:10:00.483Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c0617a376d259db5cfb35" + }, + "timestamp": { + "$date": "2018-08-09T09:15:00.313Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c0743a376d259db5cfbbd" + }, + "timestamp": { + "$date": "2018-08-09T09:20:00.32Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c086fa376d259db5cfc40" + }, + "timestamp": { + "$date": "2018-08-09T09:25:00.335Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c099ba376d259db5cfcca" + }, + "timestamp": { + "$date": "2018-08-09T09:30:00.463Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c0ac7a376d259db5cfd4b" + }, + "timestamp": { + "$date": "2018-08-09T09:35:00.327Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c0bf3a376d259db5cfddb" + }, + "timestamp": { + "$date": "2018-08-09T09:40:00.355Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c0d1fa376d259db5cfe5d" + }, + "timestamp": { + "$date": "2018-08-09T09:45:00.332Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c0e4ba376d259db5cfeec" + }, + "timestamp": { + "$date": "2018-08-09T09:50:00.443Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c0f77a376d259db5cff6d" + }, + "timestamp": { + "$date": "2018-08-09T09:55:00.351Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c10a3a376d259db5cfff7" + }, + "timestamp": { + "$date": "2018-08-09T10:00:00.444Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c11cfa376d259db5d0078" + }, + "timestamp": { + "$date": "2018-08-09T10:05:00.396Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c12fba376d259db5d00fe" + }, + "timestamp": { + "$date": "2018-08-09T10:10:00.339Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c1427a376d259db5d018d" + }, + "timestamp": { + "$date": "2018-08-09T10:15:00.43Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c1553a376d259db5d0210" + }, + "timestamp": { + "$date": "2018-08-09T10:20:00.322Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c167fa376d259db5d0292" + }, + "timestamp": { + "$date": "2018-08-09T10:25:00.313Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c17aba376d259db5d0322" + }, + "timestamp": { + "$date": "2018-08-09T10:30:00.455Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c18d7a376d259db5d03a3" + }, + "timestamp": { + "$date": "2018-08-09T10:35:00.393Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c1a03a376d259db5d0428" + }, + "timestamp": { + "$date": "2018-08-09T10:40:00.388Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c1b2fa376d259db5d04b6" + }, + "timestamp": { + "$date": "2018-08-09T10:45:00.317Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c1c5ba376d259db5d053a" + }, + "timestamp": { + "$date": "2018-08-09T10:50:00.314Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c1d87a376d259db5d05bb" + }, + "timestamp": { + "$date": "2018-08-09T10:55:00.325Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c1eb3a376d259db5d064b" + }, + "timestamp": { + "$date": "2018-08-09T11:00:00.407Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c1fdfa376d259db5d06cc" + }, + "timestamp": { + "$date": "2018-08-09T11:05:00.347Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c210ba376d259db5d074f" + }, + "timestamp": { + "$date": "2018-08-09T11:10:00.355Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c2237a376d259db5d07d1" + }, + "timestamp": { + "$date": "2018-08-09T11:15:00.339Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c2363a376d259db5d0861" + }, + "timestamp": { + "$date": "2018-08-09T11:20:00.328Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c248fa376d259db5d08e2" + }, + "timestamp": { + "$date": "2018-08-09T11:25:00.449Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c25bba376d259db5d0966" + }, + "timestamp": { + "$date": "2018-08-09T11:30:00.319Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c26e7a376d259db5d09ed" + }, + "timestamp": { + "$date": "2018-08-09T11:35:00.433Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c2813a376d259db5d0a75" + }, + "timestamp": { + "$date": "2018-08-09T11:40:00.431Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c293fa376d259db5d0af8" + }, + "timestamp": { + "$date": "2018-08-09T11:45:00.306Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c2a6ba376d259db5d0b88" + }, + "timestamp": { + "$date": "2018-08-09T11:50:00.371Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c2b97a376d259db5d0c09" + }, + "timestamp": { + "$date": "2018-08-09T11:55:00.314Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c2cc3a376d259db5d0c8d" + }, + "timestamp": { + "$date": "2018-08-09T12:00:00.361Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c2defa376d259db5d0d0e" + }, + "timestamp": { + "$date": "2018-08-09T12:05:00.306Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c2f1ba376d259db5d0d9e" + }, + "timestamp": { + "$date": "2018-08-09T12:10:00.49Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c3047a376d259db5d0e1f" + }, + "timestamp": { + "$date": "2018-08-09T12:15:00.342Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c3173a376d259db5d0eaf" + }, + "timestamp": { + "$date": "2018-08-09T12:20:00.365Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c329fa376d259db5d0f36" + }, + "timestamp": { + "$date": "2018-08-09T12:25:00.311Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c33cba376d259db5d0fba" + }, + "timestamp": { + "$date": "2018-08-09T12:30:00.353Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c34f7a376d259db5d103d" + }, + "timestamp": { + "$date": "2018-08-09T12:35:00.304Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c3623a376d259db5d10ce" + }, + "timestamp": { + "$date": "2018-08-09T12:40:00.35Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c374fa376d259db5d1154" + }, + "timestamp": { + "$date": "2018-08-09T12:45:00.294Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c387ba376d259db5d11d7" + }, + "timestamp": { + "$date": "2018-08-09T12:50:00.33Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c39a7a376d259db5d1265" + }, + "timestamp": { + "$date": "2018-08-09T12:55:00.324Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c3ad3a376d259db5d12e9" + }, + "timestamp": { + "$date": "2018-08-09T13:00:00.325Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c3bffa376d259db5d136a" + }, + "timestamp": { + "$date": "2018-08-09T13:05:00.381Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c3d2ba376d259db5d13f3" + }, + "timestamp": { + "$date": "2018-08-09T13:10:00.337Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c3e57a376d259db5d1475" + }, + "timestamp": { + "$date": "2018-08-09T13:15:00.317Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c3f83a376d259db5d14ff" + }, + "timestamp": { + "$date": "2018-08-09T13:20:00.347Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c40afa376d259db5d1582" + }, + "timestamp": { + "$date": "2018-08-09T13:25:00.366Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c41dba376d259db5d1612" + }, + "timestamp": { + "$date": "2018-08-09T13:30:00.333Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6c4307a376d259db5d1693" + }, + "timestamp": { + "$date": "2018-08-09T13:35:00.293Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c4433a376d259db5d1717" + }, + "timestamp": { + "$date": "2018-08-09T13:40:00.756Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c455fa376d259db5d1798" + }, + "timestamp": { + "$date": "2018-08-09T13:45:00.305Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c468ba376d259db5d1827" + }, + "timestamp": { + "$date": "2018-08-09T13:50:00.472Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c47b7a376d259db5d18a9" + }, + "timestamp": { + "$date": "2018-08-09T13:55:00.325Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c48e3a376d259db5d192f" + }, + "timestamp": { + "$date": "2018-08-09T14:00:00.418Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c4a0fa376d259db5d19bc" + }, + "timestamp": { + "$date": "2018-08-09T14:05:00.303Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c4b3ea376d259db5d1a4a" + }, + "timestamp": { + "$date": "2018-08-09T14:10:03.176Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c4c67a376d259db5d1ac7" + }, + "timestamp": { + "$date": "2018-08-09T14:15:00.304Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c4d93a376d259db5d1b52" + }, + "timestamp": { + "$date": "2018-08-09T14:20:00.323Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c4ebfa376d259db5d1bd4" + }, + "timestamp": { + "$date": "2018-08-09T14:25:00.352Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c4feba376d259db5d1c58" + }, + "timestamp": { + "$date": "2018-08-09T14:30:00.376Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c5117a376d259db5d1ce5" + }, + "timestamp": { + "$date": "2018-08-09T14:35:00.402Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c5243a376d259db5d1d6b" + }, + "timestamp": { + "$date": "2018-08-09T14:40:00.332Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c536fa376d259db5d1dec" + }, + "timestamp": { + "$date": "2018-08-09T14:45:00.324Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c549ba376d259db5d1e7c" + }, + "timestamp": { + "$date": "2018-08-09T14:50:00.456Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c55c7a376d259db5d1efd" + }, + "timestamp": { + "$date": "2018-08-09T14:55:00.356Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c56f3a376d259db5d1f81" + }, + "timestamp": { + "$date": "2018-08-09T15:00:00.387Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c581fa376d259db5d200e" + }, + "timestamp": { + "$date": "2018-08-09T15:05:00.295Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c594ba376d259db5d2091" + }, + "timestamp": { + "$date": "2018-08-09T15:10:00.32Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c5a77a376d259db5d2117" + }, + "timestamp": { + "$date": "2018-08-09T15:15:00.359Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c5ba3a376d259db5d21a6" + }, + "timestamp": { + "$date": "2018-08-09T15:20:00.349Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c5ccfa376d259db5d222c" + }, + "timestamp": { + "$date": "2018-08-09T15:25:00.296Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c5dfba376d259db5d22af" + }, + "timestamp": { + "$date": "2018-08-09T15:30:00.35Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c5f27a376d259db5d2333" + }, + "timestamp": { + "$date": "2018-08-09T15:35:00.295Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c6053a376d259db5d296b" + }, + "timestamp": { + "$date": "2018-08-09T15:40:00.339Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c617fa376d259db5d2b5e" + }, + "timestamp": { + "$date": "2018-08-09T15:45:00.412Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6c62aba376d259db5d2c2d" + }, + "timestamp": { + "$date": "2018-08-09T15:50:00.737Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c63d7a376d259db5d2ce8" + }, + "timestamp": { + "$date": "2018-08-09T15:55:00.359Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c6503a376d259db5d2d83" + }, + "timestamp": { + "$date": "2018-08-09T16:00:00.515Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c662fa376d259db5d2e3a" + }, + "timestamp": { + "$date": "2018-08-09T16:05:00.298Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c675ba376d259db5d2ed5" + }, + "timestamp": { + "$date": "2018-08-09T16:10:00.386Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c6887a376d259db5d2f68" + }, + "timestamp": { + "$date": "2018-08-09T16:15:00.315Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c69b3a376d259db5d2ffa" + }, + "timestamp": { + "$date": "2018-08-09T16:20:00.388Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c6adfa376d259db5d3086" + }, + "timestamp": { + "$date": "2018-08-09T16:25:00.325Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c6c0ba376d259db5d3115" + }, + "timestamp": { + "$date": "2018-08-09T16:30:00.503Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c6d37a376d259db5d319d" + }, + "timestamp": { + "$date": "2018-08-09T16:35:00.296Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c6e63a376d259db5d322c" + }, + "timestamp": { + "$date": "2018-08-09T16:40:00.372Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c6f8fa376d259db5d32b2" + }, + "timestamp": { + "$date": "2018-08-09T16:45:00.311Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c70bba376d259db5d3340" + }, + "timestamp": { + "$date": "2018-08-09T16:50:00.361Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c71e7a376d259db5d33d1" + }, + "timestamp": { + "$date": "2018-08-09T16:55:00.305Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c7313a376d259db5d345e" + }, + "timestamp": { + "$date": "2018-08-09T17:00:00.405Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c743fa376d259db5d34e6" + }, + "timestamp": { + "$date": "2018-08-09T17:05:00.318Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c756ba376d259db5d3575" + }, + "timestamp": { + "$date": "2018-08-09T17:10:00.326Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c7697a376d259db5d35fd" + }, + "timestamp": { + "$date": "2018-08-09T17:15:00.332Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c77c3a376d259db5d36b5" + }, + "timestamp": { + "$date": "2018-08-09T17:20:00.323Z" + }, + "users": [ + null, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c78efa376d259db5d3748" + }, + "timestamp": { + "$date": "2018-08-09T17:25:00.58Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c7a1ba376d259db5d37e2" + }, + "timestamp": { + "$date": "2018-08-09T17:30:00.497Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c7b47a376d259db5d388c" + }, + "timestamp": { + "$date": "2018-08-09T17:35:00.307Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c7c73a376d259db5d398e" + }, + "timestamp": { + "$date": "2018-08-09T17:40:00.33Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c7d9fa376d259db5d3a1f" + }, + "timestamp": { + "$date": "2018-08-09T17:45:00.313Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c7ecba376d259db5d3ab2" + }, + "timestamp": { + "$date": "2018-08-09T17:50:00.393Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6c7ff7a376d259db5d3b4a" + }, + "timestamp": { + "$date": "2018-08-09T17:55:00.296Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c8123a376d259db5d3be9" + }, + "timestamp": { + "$date": "2018-08-09T18:00:00.813Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c824fa376d259db5d3cb4" + }, + "timestamp": { + "$date": "2018-08-09T18:05:00.303Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c837ba376d259db5d3d4d" + }, + "timestamp": { + "$date": "2018-08-09T18:10:00.361Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c84a7a376d259db5d3ddd" + }, + "timestamp": { + "$date": "2018-08-09T18:15:00.319Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c85d3a376d259db5d3e70" + }, + "timestamp": { + "$date": "2018-08-09T18:20:00.342Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c86ffa376d259db5d3f12" + }, + "timestamp": { + "$date": "2018-08-09T18:25:00.304Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c882ea376d259db5d3fbc" + }, + "timestamp": { + "$date": "2018-08-09T18:30:03.343Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c8957a376d259db5d4050" + }, + "timestamp": { + "$date": "2018-08-09T18:35:00.303Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c8a86a376d259db5d40ec" + }, + "timestamp": { + "$date": "2018-08-09T18:40:03.321Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c8bb2a376d259db5d417e" + }, + "timestamp": { + "$date": "2018-08-09T18:45:03.069Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c8cdba376d259db5d4211" + }, + "timestamp": { + "$date": "2018-08-09T18:50:00.334Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c8e07a376d259db5d42a8" + }, + "timestamp": { + "$date": "2018-08-09T18:55:00.338Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c8f33a376d259db5d433d" + }, + "timestamp": { + "$date": "2018-08-09T19:00:00.351Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c9062a376d259db5d441d" + }, + "timestamp": { + "$date": "2018-08-09T19:05:03.115Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c918ea376d259db5d44bc" + }, + "timestamp": { + "$date": "2018-08-09T19:10:03.179Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c92bba376d259db5d454e" + }, + "timestamp": { + "$date": "2018-08-09T19:15:03.795Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c93e6a376d259db5d4660" + }, + "timestamp": { + "$date": "2018-08-09T19:20:03.584Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c9512a376d259db5d47be" + }, + "timestamp": { + "$date": "2018-08-09T19:25:03.553Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c963ea376d259db5d4851" + }, + "timestamp": { + "$date": "2018-08-09T19:30:03.526Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c976ba376d259db5d48e7" + }, + "timestamp": { + "$date": "2018-08-09T19:35:03.967Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c9897a376d259db5d49d7" + }, + "timestamp": { + "$date": "2018-08-09T19:40:03.786Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c99c2a376d259db5d4a70" + }, + "timestamp": { + "$date": "2018-08-09T19:45:03.628Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c9aeea376d259db5d4b0c" + }, + "timestamp": { + "$date": "2018-08-09T19:50:03.232Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c9c1ba376d259db5d4ba7" + }, + "timestamp": { + "$date": "2018-08-09T19:55:04.197Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c9d47a376d259db5d4c44" + }, + "timestamp": { + "$date": "2018-08-09T20:00:04.05Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c9e72a376d259db5d4cda" + }, + "timestamp": { + "$date": "2018-08-09T20:05:03.239Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6c9f9ea376d259db5d4d79" + }, + "timestamp": { + "$date": "2018-08-09T20:10:03.553Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ca0caa376d259db5d4e13" + }, + "timestamp": { + "$date": "2018-08-09T20:15:02.795Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ca1faa376d259db5d4ead" + }, + "timestamp": { + "$date": "2018-08-09T20:20:07.508Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ca322a376d259db5d4f3c" + }, + "timestamp": { + "$date": "2018-08-09T20:25:03.452Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6ca44da376d259db5d4fd5" + }, + "timestamp": { + "$date": "2018-08-09T20:30:02.119Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6ca57aa376d259db5d5065" + }, + "timestamp": { + "$date": "2018-08-09T20:35:03.298Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6ca6a6a376d259db5d50fe" + }, + "timestamp": { + "$date": "2018-08-09T20:40:02.954Z" + }, + "users": [ + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6ca7cfa376d259db5d51f0" + }, + "timestamp": { + "$date": "2018-08-09T20:45:00.363Z" + }, + "users": [ + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6ca8fea376d259db5d528c" + }, + "timestamp": { + "$date": "2018-08-09T20:50:03.459Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6caa27a376d259db5d5319" + }, + "timestamp": { + "$date": "2018-08-09T20:55:00.394Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6cab57a376d259db5d53b5" + }, + "timestamp": { + "$date": "2018-08-09T21:00:03.821Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6cac82a376d259db5d5446" + }, + "timestamp": { + "$date": "2018-08-09T21:05:03.52Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6cadaea376d259db5d54d9" + }, + "timestamp": { + "$date": "2018-08-09T21:10:03.512Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6caed7a376d259db5d5571" + }, + "timestamp": { + "$date": "2018-08-09T21:15:00.377Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b6cb006a376d259db5d5608" + }, + "timestamp": { + "$date": "2018-08-09T21:20:02.715Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cb12fa376d259db5d5696" + }, + "timestamp": { + "$date": "2018-08-09T21:25:00.531Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cb25ca376d259db5d572e" + }, + "timestamp": { + "$date": "2018-08-09T21:30:01.297Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cb387a376d259db5d57bf" + }, + "timestamp": { + "$date": "2018-08-09T21:35:00.343Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Clarke.S", + "clientDbId": "4472" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cb4b3a376d259db5d5856" + }, + "timestamp": { + "$date": "2018-08-09T21:40:00.353Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cb5dfa376d259db5d58f2" + }, + "timestamp": { + "$date": "2018-08-09T21:45:00.295Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cb70ba376d259db5d598a" + }, + "timestamp": { + "$date": "2018-08-09T21:50:00.334Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cb837a376d259db5d5a1b" + }, + "timestamp": { + "$date": "2018-08-09T21:55:00.323Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cb963a376d259db5d5aae" + }, + "timestamp": { + "$date": "2018-08-09T22:00:00.32Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cba8fa376d259db5d5b3e" + }, + "timestamp": { + "$date": "2018-08-09T22:05:00.29Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cbbbba376d259db5d5bdf" + }, + "timestamp": { + "$date": "2018-08-09T22:10:00.529Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cbce7a376d259db5d5c6f" + }, + "timestamp": { + "$date": "2018-08-09T22:15:00.305Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cbe13a376d259db5d5d4c" + }, + "timestamp": { + "$date": "2018-08-09T22:20:00.335Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cbf3fa376d259db5d5de0" + }, + "timestamp": { + "$date": "2018-08-09T22:25:00.355Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cc06ba376d259db5d5e73" + }, + "timestamp": { + "$date": "2018-08-09T22:30:00.329Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cc197a376d259db5d5f03" + }, + "timestamp": { + "$date": "2018-08-09T22:35:00.322Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cc2c3a376d259db5d5fa1" + }, + "timestamp": { + "$date": "2018-08-09T22:40:00.37Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cc3efa376d259db5d6032" + }, + "timestamp": { + "$date": "2018-08-09T22:45:00.34Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cc51ba376d259db5d60cb" + }, + "timestamp": { + "$date": "2018-08-09T22:50:00.355Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cc647a376d259db5d6161" + }, + "timestamp": { + "$date": "2018-08-09T22:55:00.327Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cc773a376d259db5d61f4" + }, + "timestamp": { + "$date": "2018-08-09T23:00:00.324Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cc89fa376d259db5d6289" + }, + "timestamp": { + "$date": "2018-08-09T23:05:00.293Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cc9cba376d259db5d63a0" + }, + "timestamp": { + "$date": "2018-08-09T23:10:00.393Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6ccaf7a376d259db5d6435" + }, + "timestamp": { + "$date": "2018-08-09T23:15:00.339Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6ccc23a376d259db5d64cd" + }, + "timestamp": { + "$date": "2018-08-09T23:20:00.376Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6ccd4fa376d259db5d656e" + }, + "timestamp": { + "$date": "2018-08-09T23:25:00.376Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cce7ba376d259db5d6626" + }, + "timestamp": { + "$date": "2018-08-09T23:30:00.344Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6ccfa7a376d259db5d66ce" + }, + "timestamp": { + "$date": "2018-08-09T23:35:00.321Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cd0d3a376d259db5d6771" + }, + "timestamp": { + "$date": "2018-08-09T23:40:00.449Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cd1ffa376d259db5d6807" + }, + "timestamp": { + "$date": "2018-08-09T23:45:00.339Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cd32ba376d259db5d689f" + }, + "timestamp": { + "$date": "2018-08-09T23:50:00.37Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cd457a376d259db5d693a" + }, + "timestamp": { + "$date": "2018-08-09T23:55:00.317Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cd583a376d259db5d69d2" + }, + "timestamp": { + "$date": "2018-08-10T00:00:00.33Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cd6afa376d259db5d6a65" + }, + "timestamp": { + "$date": "2018-08-10T00:05:00.327Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cd7dba376d259db5d6afd" + }, + "timestamp": { + "$date": "2018-08-10T00:10:00.375Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cd907a376d259db5d6b94" + }, + "timestamp": { + "$date": "2018-08-10T00:15:00.365Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cda33a376d259db5d6c2a" + }, + "timestamp": { + "$date": "2018-08-10T00:20:00.455Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cdb5fa376d259db5d6cb9" + }, + "timestamp": { + "$date": "2018-08-10T00:25:00.349Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cdc8ba376d259db5d6d4f" + }, + "timestamp": { + "$date": "2018-08-10T00:30:00.318Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cddb7a376d259db5d6df6" + }, + "timestamp": { + "$date": "2018-08-10T00:35:00.3Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6cdee3a376d259db5d6e8a" + }, + "timestamp": { + "$date": "2018-08-10T00:40:00.341Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6ce00fa376d259db5d6f1d" + }, + "timestamp": { + "$date": "2018-08-10T00:45:00.295Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6ce13ba376d259db5d6fb6" + }, + "timestamp": { + "$date": "2018-08-10T00:50:00.457Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6ce267a376d259db5d7044" + }, + "timestamp": { + "$date": "2018-08-10T00:55:00.356Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6ce393a376d259db5d70d2" + }, + "timestamp": { + "$date": "2018-08-10T01:00:00.328Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6ce4bfa376d259db5d715e" + }, + "timestamp": { + "$date": "2018-08-10T01:05:00.295Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6ce5eba376d259db5d71fd" + }, + "timestamp": { + "$date": "2018-08-10T01:10:00.369Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6ce717a376d259db5d7286" + }, + "timestamp": { + "$date": "2018-08-10T01:15:00.303Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6ce843a376d259db5d730f" + }, + "timestamp": { + "$date": "2018-08-10T01:20:00.325Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6ce96fa376d259db5d7391" + }, + "timestamp": { + "$date": "2018-08-10T01:25:00.335Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cea9ba376d259db5d7415" + }, + "timestamp": { + "$date": "2018-08-10T01:30:00.319Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cebc7a376d259db5d749c" + }, + "timestamp": { + "$date": "2018-08-10T01:35:00.294Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cecf3a376d259db5d7525" + }, + "timestamp": { + "$date": "2018-08-10T01:40:00.365Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cee1fa376d259db5d75a7" + }, + "timestamp": { + "$date": "2018-08-10T01:45:00.33Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cef4ba376d259db5d7637" + }, + "timestamp": { + "$date": "2018-08-10T01:50:00.329Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cf077a376d259db5d76b8" + }, + "timestamp": { + "$date": "2018-08-10T01:55:00.412Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cf1a3a376d259db5d773c" + }, + "timestamp": { + "$date": "2018-08-10T02:00:00.324Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cf2cfa376d259db5d77bd" + }, + "timestamp": { + "$date": "2018-08-10T02:05:00.313Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cf3fba376d259db5d7846" + }, + "timestamp": { + "$date": "2018-08-10T02:10:00.348Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cf527a376d259db5d78d3" + }, + "timestamp": { + "$date": "2018-08-10T02:15:00.338Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cf653a376d259db5d795d" + }, + "timestamp": { + "$date": "2018-08-10T02:20:00.337Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cf77fa376d259db5d79e4" + }, + "timestamp": { + "$date": "2018-08-10T02:25:00.362Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cf8aba376d259db5d7a68" + }, + "timestamp": { + "$date": "2018-08-10T02:30:00.454Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cf9d7a376d259db5d7ae9" + }, + "timestamp": { + "$date": "2018-08-10T02:35:00.292Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cfb03a376d259db5d7bc2" + }, + "timestamp": { + "$date": "2018-08-10T02:40:00.371Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cfc2fa376d259db5d7c85" + }, + "timestamp": { + "$date": "2018-08-10T02:45:00.316Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cfd5ba376d259db5d7d08" + }, + "timestamp": { + "$date": "2018-08-10T02:50:00.325Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cfe87a376d259db5d7d8a" + }, + "timestamp": { + "$date": "2018-08-10T02:55:00.337Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6cffb3a376d259db5d7e12" + }, + "timestamp": { + "$date": "2018-08-10T03:00:00.394Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d00dfa376d259db5d7e95" + }, + "timestamp": { + "$date": "2018-08-10T03:05:00.305Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d020ca376d259db5d7f1d" + }, + "timestamp": { + "$date": "2018-08-10T03:10:00.452Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d0337a376d259db5d7fac" + }, + "timestamp": { + "$date": "2018-08-10T03:15:00.303Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d0463a376d259db5d8030" + }, + "timestamp": { + "$date": "2018-08-10T03:20:00.392Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d058fa376d259db5d80b1" + }, + "timestamp": { + "$date": "2018-08-10T03:25:00.312Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d06bba376d259db5d813b" + }, + "timestamp": { + "$date": "2018-08-10T03:30:00.323Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d07e7a376d259db5d81bc" + }, + "timestamp": { + "$date": "2018-08-10T03:35:00.352Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d0913a376d259db5d823f" + }, + "timestamp": { + "$date": "2018-08-10T03:40:00.354Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d0a40a376d259db5d82c7" + }, + "timestamp": { + "$date": "2018-08-10T03:45:00.453Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d0b6ba376d259db5d8356" + }, + "timestamp": { + "$date": "2018-08-10T03:50:00.322Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d0c97a376d259db5d83d8" + }, + "timestamp": { + "$date": "2018-08-10T03:55:00.351Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d0dc4a376d259db5d8462" + }, + "timestamp": { + "$date": "2018-08-10T04:00:00.325Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d0eefa376d259db5d84e3" + }, + "timestamp": { + "$date": "2018-08-10T04:05:00.369Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d101ca376d259db5d8569" + }, + "timestamp": { + "$date": "2018-08-10T04:10:00.395Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d1147a376d259db5d85ea" + }, + "timestamp": { + "$date": "2018-08-10T04:15:00.358Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d1273a376d259db5d867e" + }, + "timestamp": { + "$date": "2018-08-10T04:20:00.346Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d139fa376d259db5d8701" + }, + "timestamp": { + "$date": "2018-08-10T04:25:00.337Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d14cca376d259db5d878b" + }, + "timestamp": { + "$date": "2018-08-10T04:30:00.338Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d15f7a376d259db5d880c" + }, + "timestamp": { + "$date": "2018-08-10T04:35:00.358Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d1723a376d259db5d8890" + }, + "timestamp": { + "$date": "2018-08-10T04:40:00.356Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d184fa376d259db5d893c" + }, + "timestamp": { + "$date": "2018-08-10T04:45:00.297Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d197ca376d259db5d89d5" + }, + "timestamp": { + "$date": "2018-08-10T04:50:00.436Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d1aa8a376d259db5d8a58" + }, + "timestamp": { + "$date": "2018-08-10T04:55:00.393Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d1bd3a376d259db5d8ade" + }, + "timestamp": { + "$date": "2018-08-10T05:00:00.325Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d1cffa376d259db5d8b5f" + }, + "timestamp": { + "$date": "2018-08-10T05:05:00.31Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d1e2ca376d259db5d8be7" + }, + "timestamp": { + "$date": "2018-08-10T05:10:00.366Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d1f57a376d259db5d8c6a" + }, + "timestamp": { + "$date": "2018-08-10T05:15:00.305Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d2084a376d259db5d8cf4" + }, + "timestamp": { + "$date": "2018-08-10T05:20:00.362Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d21b0a376d259db5d8d81" + }, + "timestamp": { + "$date": "2018-08-10T05:25:00.385Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d22dca376d259db5d8e05" + }, + "timestamp": { + "$date": "2018-08-10T05:30:00.339Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d2408a376d259db5d8e86" + }, + "timestamp": { + "$date": "2018-08-10T05:35:00.368Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d2534a376d259db5d8f09" + }, + "timestamp": { + "$date": "2018-08-10T05:40:00.345Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d265fa376d259db5d900e" + }, + "timestamp": { + "$date": "2018-08-10T05:45:00.299Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d278ca376d259db5d9092" + }, + "timestamp": { + "$date": "2018-08-10T05:50:00.323Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d28b8a376d259db5d9113" + }, + "timestamp": { + "$date": "2018-08-10T05:55:00.321Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d29e4a376d259db5d919d" + }, + "timestamp": { + "$date": "2018-08-10T06:00:00.454Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d2b10a376d259db5d921e" + }, + "timestamp": { + "$date": "2018-08-10T06:05:00.341Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d2c3ca376d259db5d92a1" + }, + "timestamp": { + "$date": "2018-08-10T06:10:00.376Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d2d68a376d259db5d9335" + }, + "timestamp": { + "$date": "2018-08-10T06:15:00.347Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d2e94a376d259db5d93b9" + }, + "timestamp": { + "$date": "2018-08-10T06:20:00.451Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d2fc0a376d259db5d943a" + }, + "timestamp": { + "$date": "2018-08-10T06:25:00.349Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d30eca376d259db5d94c4" + }, + "timestamp": { + "$date": "2018-08-10T06:30:00.462Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d3218a376d259db5d9545" + }, + "timestamp": { + "$date": "2018-08-10T06:35:00.306Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d3344a376d259db5d95c9" + }, + "timestamp": { + "$date": "2018-08-10T06:40:00.358Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d3470a376d259db5d964a" + }, + "timestamp": { + "$date": "2018-08-10T06:45:00.316Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d359ca376d259db5d96e0" + }, + "timestamp": { + "$date": "2018-08-10T06:50:00.458Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d36c8a376d259db5d9761" + }, + "timestamp": { + "$date": "2018-08-10T06:55:00.326Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d37f4a376d259db5d97ea" + }, + "timestamp": { + "$date": "2018-08-10T07:00:00.321Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d3920a376d259db5d986c" + }, + "timestamp": { + "$date": "2018-08-10T07:05:00.324Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d3a4ca376d259db5d98ef" + }, + "timestamp": { + "$date": "2018-08-10T07:10:00.348Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d3b78a376d259db5d9971" + }, + "timestamp": { + "$date": "2018-08-10T07:15:00.306Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d3ca4a376d259db5d9a06" + }, + "timestamp": { + "$date": "2018-08-10T07:20:00.32Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d3dd0a376d259db5d9a88" + }, + "timestamp": { + "$date": "2018-08-10T07:25:00.492Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d3efca376d259db5d9b12" + }, + "timestamp": { + "$date": "2018-08-10T07:30:00.449Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d4028a376d259db5d9b93" + }, + "timestamp": { + "$date": "2018-08-10T07:35:00.305Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6d4154a376d259db5d9c19" + }, + "timestamp": { + "$date": "2018-08-10T07:40:00.339Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d4280a376d259db5d9cc3" + }, + "timestamp": { + "$date": "2018-08-10T07:45:00.293Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d43aca376d259db5d9d58" + }, + "timestamp": { + "$date": "2018-08-10T07:50:00.335Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d44d8a376d259db5d9dda" + }, + "timestamp": { + "$date": "2018-08-10T07:55:00.335Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d4604a376d259db5d9e87" + }, + "timestamp": { + "$date": "2018-08-10T08:00:00.322Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d4730a376d259db5d9f14" + }, + "timestamp": { + "$date": "2018-08-10T08:05:00.338Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d485ca376d259db5d9f9d" + }, + "timestamp": { + "$date": "2018-08-10T08:10:00.353Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d4988a376d259db5da023" + }, + "timestamp": { + "$date": "2018-08-10T08:15:00.294Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d4ab4a376d259db5da0b1" + }, + "timestamp": { + "$date": "2018-08-10T08:20:00.339Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d4be0a376d259db5da197" + }, + "timestamp": { + "$date": "2018-08-10T08:25:00.333Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d4d0ca376d259db5da22c" + }, + "timestamp": { + "$date": "2018-08-10T08:30:00.598Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d4e38a376d259db5da2b2" + }, + "timestamp": { + "$date": "2018-08-10T08:35:00.319Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d4f64a376d259db5da33b" + }, + "timestamp": { + "$date": "2018-08-10T08:40:00.367Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d5090a376d259db5da518" + }, + "timestamp": { + "$date": "2018-08-10T08:45:00.311Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d51bca376d259db5da61f" + }, + "timestamp": { + "$date": "2018-08-10T08:50:00.319Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d52e8a376d259db5da6ab" + }, + "timestamp": { + "$date": "2018-08-10T08:55:00.384Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d5414a376d259db5da739" + }, + "timestamp": { + "$date": "2018-08-10T09:00:00.318Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d5540a376d259db5da7c0" + }, + "timestamp": { + "$date": "2018-08-10T09:05:00.297Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d566ca376d259db5da84b" + }, + "timestamp": { + "$date": "2018-08-10T09:10:00.496Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d5798a376d259db5da8e4" + }, + "timestamp": { + "$date": "2018-08-10T09:15:00.308Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d58c4a376d259db5da96d" + }, + "timestamp": { + "$date": "2018-08-10T09:20:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d59f0a376d259db5da9f9" + }, + "timestamp": { + "$date": "2018-08-10T09:25:00.424Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d5b1ca376d259db5daaa1" + }, + "timestamp": { + "$date": "2018-08-10T09:30:00.315Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d5c48a376d259db5dab2c" + }, + "timestamp": { + "$date": "2018-08-10T09:35:00.49Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d5d74a376d259db5dabbf" + }, + "timestamp": { + "$date": "2018-08-10T09:40:00.346Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d5ea0a376d259db5dac4b" + }, + "timestamp": { + "$date": "2018-08-10T09:45:00.331Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d5fcca376d259db5dace2" + }, + "timestamp": { + "$date": "2018-08-10T09:50:00.339Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d60f8a376d259db5dad68" + }, + "timestamp": { + "$date": "2018-08-10T09:55:00.361Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d6224a376d259db5dadf7" + }, + "timestamp": { + "$date": "2018-08-10T10:00:00.324Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d6350a376d259db5dae7d" + }, + "timestamp": { + "$date": "2018-08-10T10:05:00.308Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d647ca376d259db5daf0e" + }, + "timestamp": { + "$date": "2018-08-10T10:10:00.336Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d65a8a376d259db5daf94" + }, + "timestamp": { + "$date": "2018-08-10T10:15:00.348Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d66d4a376d259db5db01d" + }, + "timestamp": { + "$date": "2018-08-10T10:20:00.331Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d6800a376d259db5db0a9" + }, + "timestamp": { + "$date": "2018-08-10T10:25:00.317Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d692ca376d259db5db14f" + }, + "timestamp": { + "$date": "2018-08-10T10:30:00.319Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d6a58a376d259db5db1d7" + }, + "timestamp": { + "$date": "2018-08-10T10:35:00.315Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d6b84a376d259db5db264" + }, + "timestamp": { + "$date": "2018-08-10T10:40:00.479Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d6cb0a376d259db5db2ec" + }, + "timestamp": { + "$date": "2018-08-10T10:45:00.307Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d6ddca376d259db5db375" + }, + "timestamp": { + "$date": "2018-08-10T10:50:00.428Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d6f08a376d259db5db401" + }, + "timestamp": { + "$date": "2018-08-10T10:55:00.328Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d7034a376d259db5db490" + }, + "timestamp": { + "$date": "2018-08-10T11:00:00.454Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d7160a376d259db5db51c" + }, + "timestamp": { + "$date": "2018-08-10T11:05:00.326Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d728ca376d259db5db5a4" + }, + "timestamp": { + "$date": "2018-08-10T11:10:00.355Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d73b8a376d259db5db625" + }, + "timestamp": { + "$date": "2018-08-10T11:15:00.292Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d74e4a376d259db5db6af" + }, + "timestamp": { + "$date": "2018-08-10T11:20:00.473Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d7610a376d259db5db736" + }, + "timestamp": { + "$date": "2018-08-10T11:25:00.322Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d773ca376d259db5db7eb" + }, + "timestamp": { + "$date": "2018-08-10T11:30:00.326Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d7868a376d259db5db878" + }, + "timestamp": { + "$date": "2018-08-10T11:35:00.318Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d7994a376d259db5db900" + }, + "timestamp": { + "$date": "2018-08-10T11:40:00.337Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d7ac0a376d259db5db987" + }, + "timestamp": { + "$date": "2018-08-10T11:45:00.294Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d7beca376d259db5dba16" + }, + "timestamp": { + "$date": "2018-08-10T11:50:00.438Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d7d18a376d259db5dba9c" + }, + "timestamp": { + "$date": "2018-08-10T11:55:00.32Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d7e44a376d259db5dbb2b" + }, + "timestamp": { + "$date": "2018-08-10T12:00:00.344Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d7f70a376d259db5dbbb9" + }, + "timestamp": { + "$date": "2018-08-10T12:05:00.318Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d809ca376d259db5dbc48" + }, + "timestamp": { + "$date": "2018-08-10T12:10:00.518Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d81c8a376d259db5dbcce" + }, + "timestamp": { + "$date": "2018-08-10T12:15:00.309Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d82f4a376d259db5dbd56" + }, + "timestamp": { + "$date": "2018-08-10T12:20:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d8420a376d259db5dbde3" + }, + "timestamp": { + "$date": "2018-08-10T12:25:00.378Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d854ca376d259db5dbe6c" + }, + "timestamp": { + "$date": "2018-08-10T12:30:00.342Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d8678a376d259db5dbef8" + }, + "timestamp": { + "$date": "2018-08-10T12:35:00.328Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d87a4a376d259db5dbfde" + }, + "timestamp": { + "$date": "2018-08-10T12:40:00.394Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d88d0a376d259db5dc069" + }, + "timestamp": { + "$date": "2018-08-10T12:45:00.316Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d89fca376d259db5dc0fe" + }, + "timestamp": { + "$date": "2018-08-10T12:50:00.342Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d8b28a376d259db5dc1fe" + }, + "timestamp": { + "$date": "2018-08-10T12:55:00.318Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d8c54a376d259db5dc289" + }, + "timestamp": { + "$date": "2018-08-10T13:00:00.463Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d8d80a376d259db5dc30f" + }, + "timestamp": { + "$date": "2018-08-10T13:05:00.292Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d8eaca376d259db5dc3dd" + }, + "timestamp": { + "$date": "2018-08-10T13:10:00.359Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d8fd8a376d259db5dc46a" + }, + "timestamp": { + "$date": "2018-08-10T13:15:00.337Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d9104a376d259db5dc4f5" + }, + "timestamp": { + "$date": "2018-08-10T13:20:00.325Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d9230a376d259db5dc595" + }, + "timestamp": { + "$date": "2018-08-10T13:25:00.319Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d935ca376d259db5dc622" + }, + "timestamp": { + "$date": "2018-08-10T13:30:00.321Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d9488a376d259db5dc6aa" + }, + "timestamp": { + "$date": "2018-08-10T13:35:00.308Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d95b4a376d259db5dc739" + }, + "timestamp": { + "$date": "2018-08-10T13:40:00.372Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d96e0a376d259db5dc7c5" + }, + "timestamp": { + "$date": "2018-08-10T13:45:00.34Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d980ca376d259db5dc84e" + }, + "timestamp": { + "$date": "2018-08-10T13:50:00.346Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d9938a376d259db5dc8d4" + }, + "timestamp": { + "$date": "2018-08-10T13:55:00.332Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d9a64a376d259db5dc969" + }, + "timestamp": { + "$date": "2018-08-10T14:00:00.454Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d9b90a376d259db5dc9ef" + }, + "timestamp": { + "$date": "2018-08-10T14:05:00.306Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d9cbca376d259db5dca76" + }, + "timestamp": { + "$date": "2018-08-10T14:10:00.452Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d9de8a376d259db5dcb33" + }, + "timestamp": { + "$date": "2018-08-10T14:15:00.305Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6d9f14a376d259db5dcbc5" + }, + "timestamp": { + "$date": "2018-08-10T14:20:00.334Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6da040a376d259db5dcce2" + }, + "timestamp": { + "$date": "2018-08-10T14:25:00.32Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6da16ca376d259db5dcd7e" + }, + "timestamp": { + "$date": "2018-08-10T14:30:00.459Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6da298a376d259db5dce09" + }, + "timestamp": { + "$date": "2018-08-10T14:35:00.316Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6da3c4a376d259db5dce97" + }, + "timestamp": { + "$date": "2018-08-10T14:40:00.342Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6da4f0a376d259db5dcf22" + }, + "timestamp": { + "$date": "2018-08-10T14:45:00.296Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6da61ca376d259db5dcfbe" + }, + "timestamp": { + "$date": "2018-08-10T14:50:00.495Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6da748a376d259db5dd04b" + }, + "timestamp": { + "$date": "2018-08-10T14:55:00.328Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6da874a376d259db5dd0df" + }, + "timestamp": { + "$date": "2018-08-10T15:00:00.465Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6da9a0a376d259db5dd170" + }, + "timestamp": { + "$date": "2018-08-10T15:05:00.302Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6daacca376d259db5dd21d" + }, + "timestamp": { + "$date": "2018-08-10T15:10:00.372Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dabf8a376d259db5dd2c6" + }, + "timestamp": { + "$date": "2018-08-10T15:15:00.293Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S1", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dad24a376d259db5dd394" + }, + "timestamp": { + "$date": "2018-08-10T15:20:00.498Z" + }, + "users": [ + null, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dae50a376d259db5dd429" + }, + "timestamp": { + "$date": "2018-08-10T15:25:00.325Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6daf7ca376d259db5dd4c7" + }, + "timestamp": { + "$date": "2018-08-10T15:30:00.455Z" + }, + "users": [ + null, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6db0a8a376d259db5dd55a" + }, + "timestamp": { + "$date": "2018-08-10T15:35:00.34Z" + }, + "users": [ + null, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6db1d4a376d259db5dd5ef" + }, + "timestamp": { + "$date": "2018-08-10T15:40:00.593Z" + }, + "users": [ + null, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6db300a376d259db5dd67c" + }, + "timestamp": { + "$date": "2018-08-10T15:45:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6db42ca376d259db5dd715" + }, + "timestamp": { + "$date": "2018-08-10T15:50:00.378Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6db558a376d259db5dd7ca" + }, + "timestamp": { + "$date": "2018-08-10T15:55:00.335Z" + }, + "users": [ + null, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6db684a376d259db5dd863" + }, + "timestamp": { + "$date": "2018-08-10T16:00:00.534Z" + }, + "users": [ + null, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6db7b3a376d259db5dd8f9" + }, + "timestamp": { + "$date": "2018-08-10T16:05:03.326Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6db8dfa376d259db5dd993" + }, + "timestamp": { + "$date": "2018-08-10T16:10:03.296Z" + }, + "users": [ + null, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dba0ba376d259db5dda24" + }, + "timestamp": { + "$date": "2018-08-10T16:15:03.14Z" + }, + "users": [ + null, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dbb39a376d259db5ddac5" + }, + "timestamp": { + "$date": "2018-08-10T16:20:04.943Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dbc63a376d259db5ddb5d" + }, + "timestamp": { + "$date": "2018-08-10T16:25:03.211Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dbd8fa376d259db5ddbef" + }, + "timestamp": { + "$date": "2018-08-10T16:30:03.375Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dbebba376d259db5ddc7c" + }, + "timestamp": { + "$date": "2018-08-10T16:35:03.151Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dbfe7a376d259db5ddd10" + }, + "timestamp": { + "$date": "2018-08-10T16:40:03.401Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dc110a376d259db5ddd99" + }, + "timestamp": { + "$date": "2018-08-10T16:45:00.314Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dc23fa376d259db5dde52" + }, + "timestamp": { + "$date": "2018-08-10T16:50:03.154Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dc36ba376d259db5ddf80" + }, + "timestamp": { + "$date": "2018-08-10T16:55:03.209Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dc497a376d259db5de01c" + }, + "timestamp": { + "$date": "2018-08-10T17:00:03.186Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dc5c0a376d259db5de0d8" + }, + "timestamp": { + "$date": "2018-08-10T17:05:00.291Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dc6eca376d259db5de16a" + }, + "timestamp": { + "$date": "2018-08-10T17:10:00.335Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dc818a376d259db5de1f7" + }, + "timestamp": { + "$date": "2018-08-10T17:15:00.318Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dc944a376d259db5de2dd" + }, + "timestamp": { + "$date": "2018-08-10T17:20:00.323Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dca70a376d259db5de36a" + }, + "timestamp": { + "$date": "2018-08-10T17:25:00.331Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dcb9da376d259db5de3fa" + }, + "timestamp": { + "$date": "2018-08-10T17:30:00.776Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dccc8a376d259db5de483" + }, + "timestamp": { + "$date": "2018-08-10T17:35:00.337Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dcdf4a376d259db5de51b" + }, + "timestamp": { + "$date": "2018-08-10T17:40:00.462Z" + }, + "users": [ + null, + { + "channelName": "Reaper NCOiC - Sgt.Large.S", + "channelId": "1142", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dcf20a376d259db5de5a8" + }, + "timestamp": { + "$date": "2018-08-10T17:45:00.322Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dd04ca376d259db5de642" + }, + "timestamp": { + "$date": "2018-08-10T17:50:00.454Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dd178a376d259db5de6d7" + }, + "timestamp": { + "$date": "2018-08-10T17:55:00.296Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dd2a4a376d259db5de765" + }, + "timestamp": { + "$date": "2018-08-10T18:00:00.351Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dd3d0a376d259db5de7f2" + }, + "timestamp": { + "$date": "2018-08-10T18:05:00.315Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dd4fca376d259db5de886" + }, + "timestamp": { + "$date": "2018-08-10T18:10:00.475Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dd628a376d259db5de911" + }, + "timestamp": { + "$date": "2018-08-10T18:15:00.343Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dd757a376d259db5de9b2" + }, + "timestamp": { + "$date": "2018-08-10T18:20:03.384Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dd883a376d259db5dea40" + }, + "timestamp": { + "$date": "2018-08-10T18:25:03.652Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dd9aca376d259db5dead2" + }, + "timestamp": { + "$date": "2018-08-10T18:30:00.415Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ddadba376d259db5deb63" + }, + "timestamp": { + "$date": "2018-08-10T18:35:03.05Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ddc04a376d259db5dec18" + }, + "timestamp": { + "$date": "2018-08-10T18:40:00.546Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ddd33a376d259db5decad" + }, + "timestamp": { + "$date": "2018-08-10T18:45:02.898Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dde5fa376d259db5ded4c" + }, + "timestamp": { + "$date": "2018-08-10T18:50:03.407Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ddf8ca376d259db5dedd8" + }, + "timestamp": { + "$date": "2018-08-10T18:55:04.016Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6de0b8a376d259db5dee72" + }, + "timestamp": { + "$date": "2018-08-10T19:00:03.882Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6de1e4a376d259db5deefd" + }, + "timestamp": { + "$date": "2018-08-10T19:05:04.241Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6de310a376d259db5def92" + }, + "timestamp": { + "$date": "2018-08-10T19:10:04.394Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6de43ba376d259db5df01e" + }, + "timestamp": { + "$date": "2018-08-10T19:15:03.483Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6de567a376d259db5df0ae" + }, + "timestamp": { + "$date": "2018-08-10T19:20:03.249Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6de696a376d259db5df13f" + }, + "timestamp": { + "$date": "2018-08-10T19:25:05.836Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6de7c0a376d259db5df1d8" + }, + "timestamp": { + "$date": "2018-08-10T19:30:04.428Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6de8eba376d259db5df26a" + }, + "timestamp": { + "$date": "2018-08-10T19:35:03.542Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Smith.H", + "clientDbId": "5433" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dea17a376d259db5df2f8" + }, + "timestamp": { + "$date": "2018-08-10T19:40:02.779Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6deb43a376d259db5df383" + }, + "timestamp": { + "$date": "2018-08-10T19:45:03.409Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dec70a376d259db5df417" + }, + "timestamp": { + "$date": "2018-08-10T19:50:04.093Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ded9ba376d259db5df4a9" + }, + "timestamp": { + "$date": "2018-08-10T19:55:03.349Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6deec7a376d259db5df534" + }, + "timestamp": { + "$date": "2018-08-10T20:00:03.23Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6deff0a376d259db5df5b6" + }, + "timestamp": { + "$date": "2018-08-10T20:05:00.367Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6df11fa376d259db5df64f" + }, + "timestamp": { + "$date": "2018-08-10T20:10:03.338Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6df24ca376d259db5df6d5" + }, + "timestamp": { + "$date": "2018-08-10T20:15:03.902Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6df378a376d259db5df763" + }, + "timestamp": { + "$date": "2018-08-10T20:20:04.45Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6df4a4a376d259db5df7ea" + }, + "timestamp": { + "$date": "2018-08-10T20:25:04.064Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6df5d0a376d259db5df8a9" + }, + "timestamp": { + "$date": "2018-08-10T20:30:03.978Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6df6fba376d259db5df937" + }, + "timestamp": { + "$date": "2018-08-10T20:35:03.587Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6df826a376d259db5df9cb" + }, + "timestamp": { + "$date": "2018-08-10T20:40:02.331Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6df954a376d259db5dfa56" + }, + "timestamp": { + "$date": "2018-08-10T20:45:03.84Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dfa80a376d259db5dfaea" + }, + "timestamp": { + "$date": "2018-08-10T20:50:03.902Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dfbaba376d259db5dfb75" + }, + "timestamp": { + "$date": "2018-08-10T20:55:03.086Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dfcd8a376d259db5dfc0e" + }, + "timestamp": { + "$date": "2018-08-10T21:00:04.514Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dfe04a376d259db5dfc9a" + }, + "timestamp": { + "$date": "2018-08-10T21:05:03.721Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6dff30a376d259db5dfd2e" + }, + "timestamp": { + "$date": "2018-08-10T21:10:03.94Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e005ca376d259db5dfdbd" + }, + "timestamp": { + "$date": "2018-08-10T21:15:03.701Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e0188a376d259db5dfe53" + }, + "timestamp": { + "$date": "2018-08-10T21:20:04.151Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e02b4a376d259db5dfee0" + }, + "timestamp": { + "$date": "2018-08-10T21:25:03.981Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e03dfa376d259db5dff74" + }, + "timestamp": { + "$date": "2018-08-10T21:30:03.553Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e050ca376d259db5dffff" + }, + "timestamp": { + "$date": "2018-08-10T21:35:04.334Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e0638a376d259db5e009a" + }, + "timestamp": { + "$date": "2018-08-10T21:40:03.997Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e0763a376d259db5e0243" + }, + "timestamp": { + "$date": "2018-08-10T21:45:03.019Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e088ca376d259db5e03b5" + }, + "timestamp": { + "$date": "2018-08-10T21:50:00.353Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e09b8a376d259db5e0472" + }, + "timestamp": { + "$date": "2018-08-10T21:55:00.318Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e0ae4a376d259db5e0559" + }, + "timestamp": { + "$date": "2018-08-10T22:00:00.364Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e0c10a376d259db5e05e5" + }, + "timestamp": { + "$date": "2018-08-10T22:05:00.307Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e0d3ca376d259db5e0675" + }, + "timestamp": { + "$date": "2018-08-10T22:10:00.366Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e0e68a376d259db5e0700" + }, + "timestamp": { + "$date": "2018-08-10T22:15:00.294Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e0f94a376d259db5e079e" + }, + "timestamp": { + "$date": "2018-08-10T22:20:00.345Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e10c0a376d259db5e082b" + }, + "timestamp": { + "$date": "2018-08-10T22:25:00.332Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e11eca376d259db5e08be" + }, + "timestamp": { + "$date": "2018-08-10T22:30:00.332Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e1318a376d259db5e094a" + }, + "timestamp": { + "$date": "2018-08-10T22:35:00.321Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e1444a376d259db5e09d8" + }, + "timestamp": { + "$date": "2018-08-10T22:40:00.355Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e1570a376d259db5e0a6d" + }, + "timestamp": { + "$date": "2018-08-10T22:45:00.315Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e169ca376d259db5e0b11" + }, + "timestamp": { + "$date": "2018-08-10T22:50:00.327Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6e17c8a376d259db5e0b9b" + }, + "timestamp": { + "$date": "2018-08-10T22:55:00.377Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6e18f4a376d259db5e0c29" + }, + "timestamp": { + "$date": "2018-08-10T23:00:00.34Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e1a20a376d259db5e0cb5" + }, + "timestamp": { + "$date": "2018-08-10T23:05:00.41Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #2", + "channelId": "1038", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e1b4ca376d259db5e0d74" + }, + "timestamp": { + "$date": "2018-08-10T23:10:00.344Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e1c78a376d259db5e0dfa" + }, + "timestamp": { + "$date": "2018-08-10T23:15:00.308Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e1da4a376d259db5e0e89" + }, + "timestamp": { + "$date": "2018-08-10T23:20:00.326Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e1ed0a376d259db5e0f15" + }, + "timestamp": { + "$date": "2018-08-10T23:25:00.316Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e1ffca376d259db5e0fa9" + }, + "timestamp": { + "$date": "2018-08-10T23:30:00.319Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e2128a376d259db5e1030" + }, + "timestamp": { + "$date": "2018-08-10T23:35:00.351Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e2254a376d259db5e10bc" + }, + "timestamp": { + "$date": "2018-08-10T23:40:00.352Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e2380a376d259db5e1143" + }, + "timestamp": { + "$date": "2018-08-10T23:45:00.297Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e24aca376d259db5e11cd" + }, + "timestamp": { + "$date": "2018-08-10T23:50:00.452Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e25d8a376d259db5e1258" + }, + "timestamp": { + "$date": "2018-08-10T23:55:00.313Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e2705a376d259db5e1327" + }, + "timestamp": { + "$date": "2018-08-11T00:00:00.479Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e2830a376d259db5e13e1" + }, + "timestamp": { + "$date": "2018-08-11T00:05:00.307Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e295ca376d259db5e14e4" + }, + "timestamp": { + "$date": "2018-08-11T00:10:00.418Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e2a88a376d259db5e1571" + }, + "timestamp": { + "$date": "2018-08-11T00:15:00.298Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e2bb4a376d259db5e15ff" + }, + "timestamp": { + "$date": "2018-08-11T00:20:00.348Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e2ce0a376d259db5e1691" + }, + "timestamp": { + "$date": "2018-08-11T00:25:00.363Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e2e0da376d259db5e1816" + }, + "timestamp": { + "$date": "2018-08-11T00:30:00.357Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e2f38a376d259db5e18a7" + }, + "timestamp": { + "$date": "2018-08-11T00:35:00.329Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e3064a376d259db5e196d" + }, + "timestamp": { + "$date": "2018-08-11T00:40:00.359Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e3190a376d259db5e1a16" + }, + "timestamp": { + "$date": "2018-08-11T00:45:00.302Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b6e32bda376d259db5e1aa6" + }, + "timestamp": { + "$date": "2018-08-11T00:50:00.58Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e33e8a376d259db5e1c05" + }, + "timestamp": { + "$date": "2018-08-11T00:55:00.322Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e3515a376d259db5e1ca0" + }, + "timestamp": { + "$date": "2018-08-11T01:00:00.741Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e3640a376d259db5e1d2b" + }, + "timestamp": { + "$date": "2018-08-11T01:05:00.321Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e376da376d259db5e1dc1" + }, + "timestamp": { + "$date": "2018-08-11T01:10:00.683Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e3898a376d259db5e1f2b" + }, + "timestamp": { + "$date": "2018-08-11T01:15:00.303Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e39c4a376d259db5e1fbd" + }, + "timestamp": { + "$date": "2018-08-11T01:20:00.344Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e3af0a376d259db5e216b" + }, + "timestamp": { + "$date": "2018-08-11T01:25:00.335Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e3c1ca376d259db5e21fb" + }, + "timestamp": { + "$date": "2018-08-11T01:30:00.361Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e3d48a376d259db5e2286" + }, + "timestamp": { + "$date": "2018-08-11T01:35:00.3Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e3e75a376d259db5e231c" + }, + "timestamp": { + "$date": "2018-08-11T01:40:00.562Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e3fa0a376d259db5e23ab" + }, + "timestamp": { + "$date": "2018-08-11T01:45:00.326Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e40cda376d259db5e2445" + }, + "timestamp": { + "$date": "2018-08-11T01:50:00.529Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e41f9a376d259db5e24d6" + }, + "timestamp": { + "$date": "2018-08-11T01:55:00.37Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e4325a376d259db5e257e" + }, + "timestamp": { + "$date": "2018-08-11T02:00:00.591Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e4450a376d259db5e263f" + }, + "timestamp": { + "$date": "2018-08-11T02:05:00.304Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e457da376d259db5e26d5" + }, + "timestamp": { + "$date": "2018-08-11T02:10:00.524Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e46a8a376d259db5e278f" + }, + "timestamp": { + "$date": "2018-08-11T02:15:00.301Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e47d5a376d259db5e2914" + }, + "timestamp": { + "$date": "2018-08-11T02:20:00.44Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e4901a376d259db5e29ad" + }, + "timestamp": { + "$date": "2018-08-11T02:25:00.357Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e4a2da376d259db5e2b09" + }, + "timestamp": { + "$date": "2018-08-11T02:30:00.374Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e4b58a376d259db5e2c00" + }, + "timestamp": { + "$date": "2018-08-11T02:35:00.308Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e4c85a376d259db5e2c9a" + }, + "timestamp": { + "$date": "2018-08-11T02:40:00.357Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e4db1a376d259db5e2d2b" + }, + "timestamp": { + "$date": "2018-08-11T02:45:00.329Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e4edda376d259db5e2dc3" + }, + "timestamp": { + "$date": "2018-08-11T02:50:00.348Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e5009a376d259db5e2e5a" + }, + "timestamp": { + "$date": "2018-08-11T02:55:00.444Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e5135a376d259db5e2f80" + }, + "timestamp": { + "$date": "2018-08-11T03:00:00.362Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e5261a376d259db5e3028" + }, + "timestamp": { + "$date": "2018-08-11T03:05:00.341Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e538da376d259db5e30db" + }, + "timestamp": { + "$date": "2018-08-11T03:10:00.361Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e54b9a376d259db5e316f" + }, + "timestamp": { + "$date": "2018-08-11T03:15:00.362Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e55e5a376d259db5e3207" + }, + "timestamp": { + "$date": "2018-08-11T03:20:00.341Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e5711a376d259db5e3298" + }, + "timestamp": { + "$date": "2018-08-11T03:25:00.343Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e583da376d259db5e332f" + }, + "timestamp": { + "$date": "2018-08-11T03:30:00.338Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e5969a376d259db5e33c7" + }, + "timestamp": { + "$date": "2018-08-11T03:35:00.415Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e5a95a376d259db5e345f" + }, + "timestamp": { + "$date": "2018-08-11T03:40:00.522Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e5bc1a376d259db5e34ea" + }, + "timestamp": { + "$date": "2018-08-11T03:45:00.332Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e5ceda376d259db5e3578" + }, + "timestamp": { + "$date": "2018-08-11T03:50:00.345Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e5e19a376d259db5e3651" + }, + "timestamp": { + "$date": "2018-08-11T03:55:00.337Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e5f45a376d259db5e36e9" + }, + "timestamp": { + "$date": "2018-08-11T04:00:00.506Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e6071a376d259db5e3781" + }, + "timestamp": { + "$date": "2018-08-11T04:05:00.318Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e619da376d259db5e384c" + }, + "timestamp": { + "$date": "2018-08-11T04:10:00.363Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e62c9a376d259db5e38de" + }, + "timestamp": { + "$date": "2018-08-11T04:15:00.325Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e63f5a376d259db5e39c2" + }, + "timestamp": { + "$date": "2018-08-11T04:20:00.537Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e6521a376d259db5e3a4f" + }, + "timestamp": { + "$date": "2018-08-11T04:25:00.362Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e664da376d259db5e3ae1" + }, + "timestamp": { + "$date": "2018-08-11T04:30:00.391Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e6779a376d259db5e3b6e" + }, + "timestamp": { + "$date": "2018-08-11T04:35:00.323Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e68a5a376d259db5e3c02" + }, + "timestamp": { + "$date": "2018-08-11T04:40:00.567Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e69d1a376d259db5e3c8d" + }, + "timestamp": { + "$date": "2018-08-11T04:45:00.337Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e6afda376d259db5e3d24" + }, + "timestamp": { + "$date": "2018-08-11T04:50:00.52Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e6c29a376d259db5e3dac" + }, + "timestamp": { + "$date": "2018-08-11T04:55:00.323Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e6d55a376d259db5e3e35" + }, + "timestamp": { + "$date": "2018-08-11T05:00:00.345Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e6e81a376d259db5e3ec1" + }, + "timestamp": { + "$date": "2018-08-11T05:05:00.311Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e6fada376d259db5e3f4d" + }, + "timestamp": { + "$date": "2018-08-11T05:10:00.368Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e70d9a376d259db5e3fd6" + }, + "timestamp": { + "$date": "2018-08-11T05:15:00.329Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e7205a376d259db5e4063" + }, + "timestamp": { + "$date": "2018-08-11T05:20:00.344Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e7331a376d259db5e40f0" + }, + "timestamp": { + "$date": "2018-08-11T05:25:00.348Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e745da376d259db5e4179" + }, + "timestamp": { + "$date": "2018-08-11T05:30:00.398Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e7589a376d259db5e422b" + }, + "timestamp": { + "$date": "2018-08-11T05:35:00.323Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e76b5a376d259db5e42b7" + }, + "timestamp": { + "$date": "2018-08-11T05:40:00.349Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e77e1a376d259db5e4340" + }, + "timestamp": { + "$date": "2018-08-11T05:45:00.429Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e790da376d259db5e43cf" + }, + "timestamp": { + "$date": "2018-08-11T05:50:00.496Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e7a39a376d259db5e4455" + }, + "timestamp": { + "$date": "2018-08-11T05:55:00.354Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e7b65a376d259db5e44e3" + }, + "timestamp": { + "$date": "2018-08-11T06:00:00.346Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e7c91a376d259db5e456a" + }, + "timestamp": { + "$date": "2018-08-11T06:05:00.417Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e7dbda376d259db5e45f8" + }, + "timestamp": { + "$date": "2018-08-11T06:10:00.358Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e7ee9a376d259db5e467f" + }, + "timestamp": { + "$date": "2018-08-11T06:15:00.357Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e8015a376d259db5e4714" + }, + "timestamp": { + "$date": "2018-08-11T06:20:00.528Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e8141a376d259db5e479a" + }, + "timestamp": { + "$date": "2018-08-11T06:25:00.424Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e826da376d259db5e4822" + }, + "timestamp": { + "$date": "2018-08-11T06:30:00.349Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e8399a376d259db5e48af" + }, + "timestamp": { + "$date": "2018-08-11T06:35:00.33Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e84c5a376d259db5e493e" + }, + "timestamp": { + "$date": "2018-08-11T06:40:00.381Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e85f1a376d259db5e49c4" + }, + "timestamp": { + "$date": "2018-08-11T06:45:00.316Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e871da376d259db5e4a53" + }, + "timestamp": { + "$date": "2018-08-11T06:50:00.449Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e8849a376d259db5e4ad9" + }, + "timestamp": { + "$date": "2018-08-11T06:55:00.397Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e8975a376d259db5e4b68" + }, + "timestamp": { + "$date": "2018-08-11T07:00:00.472Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e8aa1a376d259db5e4bee" + }, + "timestamp": { + "$date": "2018-08-11T07:05:00.309Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e8bcda376d259db5e4c7d" + }, + "timestamp": { + "$date": "2018-08-11T07:10:00.371Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e8cf9a376d259db5e4d09" + }, + "timestamp": { + "$date": "2018-08-11T07:15:00.299Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e8e25a376d259db5e4d97" + }, + "timestamp": { + "$date": "2018-08-11T07:20:00.338Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e8f51a376d259db5e4e1e" + }, + "timestamp": { + "$date": "2018-08-11T07:25:00.328Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e907da376d259db5e4ead" + }, + "timestamp": { + "$date": "2018-08-11T07:30:00.472Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e91a9a376d259db5e4f33" + }, + "timestamp": { + "$date": "2018-08-11T07:35:00.304Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e92d5a376d259db5e4fc2" + }, + "timestamp": { + "$date": "2018-08-11T07:40:00.363Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e9401a376d259db5e504e" + }, + "timestamp": { + "$date": "2018-08-11T07:45:00.294Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e952da376d259db5e50d6" + }, + "timestamp": { + "$date": "2018-08-11T07:50:00.322Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e9659a376d259db5e5163" + }, + "timestamp": { + "$date": "2018-08-11T07:55:00.365Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e9785a376d259db5e51f1" + }, + "timestamp": { + "$date": "2018-08-11T08:00:00.332Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e98b1a376d259db5e527a" + }, + "timestamp": { + "$date": "2018-08-11T08:05:00.307Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e99dda376d259db5e5309" + }, + "timestamp": { + "$date": "2018-08-11T08:10:00.359Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6e9b09a376d259db5e5391" + }, + "timestamp": { + "$date": "2018-08-11T08:15:00.315Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6e9c35a376d259db5e541f" + }, + "timestamp": { + "$date": "2018-08-11T08:20:00.325Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6e9d61a376d259db5e54fe" + }, + "timestamp": { + "$date": "2018-08-11T08:25:00.316Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6e9e8da376d259db5e558d" + }, + "timestamp": { + "$date": "2018-08-11T08:30:00.451Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6e9fb9a376d259db5e5613" + }, + "timestamp": { + "$date": "2018-08-11T08:35:00.318Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ea0e5a376d259db5e56d8" + }, + "timestamp": { + "$date": "2018-08-11T08:40:00.584Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ea211a376d259db5e575f" + }, + "timestamp": { + "$date": "2018-08-11T08:45:00.312Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ea33da376d259db5e57e7" + }, + "timestamp": { + "$date": "2018-08-11T08:50:00.354Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ea469a376d259db5e5874" + }, + "timestamp": { + "$date": "2018-08-11T08:55:00.385Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ea595a376d259db5e5909" + }, + "timestamp": { + "$date": "2018-08-11T09:00:00.491Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ea6c1a376d259db5e598f" + }, + "timestamp": { + "$date": "2018-08-11T09:05:00.304Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ea7eda376d259db5e5a1d" + }, + "timestamp": { + "$date": "2018-08-11T09:10:00.362Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ea919a376d259db5e5aa4" + }, + "timestamp": { + "$date": "2018-08-11T09:15:00.292Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6eaa45a376d259db5e5b2c" + }, + "timestamp": { + "$date": "2018-08-11T09:20:00.353Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6eab71a376d259db5e5bb9" + }, + "timestamp": { + "$date": "2018-08-11T09:25:00.314Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6eac9da376d259db5e5c4e" + }, + "timestamp": { + "$date": "2018-08-11T09:30:00.331Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6eadc9a376d259db5e5cd6" + }, + "timestamp": { + "$date": "2018-08-11T09:35:00.341Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6eaef5a376d259db5e5d64" + }, + "timestamp": { + "$date": "2018-08-11T09:40:00.397Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6eb021a376d259db5e5e1a" + }, + "timestamp": { + "$date": "2018-08-11T09:45:00.292Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6eb14da376d259db5e5ea6" + }, + "timestamp": { + "$date": "2018-08-11T09:50:00.333Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6eb279a376d259db5e5f2e" + }, + "timestamp": { + "$date": "2018-08-11T09:55:00.314Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6eb3a5a376d259db5e5fbd" + }, + "timestamp": { + "$date": "2018-08-11T10:00:00.319Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6eb4d1a376d259db5e6049" + }, + "timestamp": { + "$date": "2018-08-11T10:05:00.457Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6eb5fda376d259db5e60de" + }, + "timestamp": { + "$date": "2018-08-11T10:10:00.481Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6eb729a376d259db5e6164" + }, + "timestamp": { + "$date": "2018-08-11T10:15:00.306Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6eb855a376d259db5e61ed" + }, + "timestamp": { + "$date": "2018-08-11T10:20:00.368Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6eb981a376d259db5e6273" + }, + "timestamp": { + "$date": "2018-08-11T10:25:00.326Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ebaada376d259db5e62fc" + }, + "timestamp": { + "$date": "2018-08-11T10:30:00.325Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ebbd9a376d259db5e6388" + }, + "timestamp": { + "$date": "2018-08-11T10:35:00.296Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ebd05a376d259db5e641f" + }, + "timestamp": { + "$date": "2018-08-11T10:40:00.496Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ebe31a376d259db5e64ab" + }, + "timestamp": { + "$date": "2018-08-11T10:45:00.307Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ebf5da376d259db5e6534" + }, + "timestamp": { + "$date": "2018-08-11T10:50:00.343Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ec089a376d259db5e65ba" + }, + "timestamp": { + "$date": "2018-08-11T10:55:00.375Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ec1b5a376d259db5e6642" + }, + "timestamp": { + "$date": "2018-08-11T11:00:00.335Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ec2e1a376d259db5e66c9" + }, + "timestamp": { + "$date": "2018-08-11T11:05:00.294Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ec40da376d259db5e6763" + }, + "timestamp": { + "$date": "2018-08-11T11:10:00.585Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ec539a376d259db5e67ea" + }, + "timestamp": { + "$date": "2018-08-11T11:15:00.306Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ec665a376d259db5e6879" + }, + "timestamp": { + "$date": "2018-08-11T11:20:00.336Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ec791a376d259db5e68ff" + }, + "timestamp": { + "$date": "2018-08-11T11:25:00.318Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ec8bda376d259db5e698a" + }, + "timestamp": { + "$date": "2018-08-11T11:30:00.319Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ec9e9a376d259db5e6a10" + }, + "timestamp": { + "$date": "2018-08-11T11:35:00.298Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ecb15a376d259db5e6aad" + }, + "timestamp": { + "$date": "2018-08-11T11:40:00.355Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ecc41a376d259db5e6b39" + }, + "timestamp": { + "$date": "2018-08-11T11:45:00.342Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ecd6da376d259db5e6bcd" + }, + "timestamp": { + "$date": "2018-08-11T11:50:00.518Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ece99a376d259db5e6c5a" + }, + "timestamp": { + "$date": "2018-08-11T11:55:00.329Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ecfc5a376d259db5e6ce9" + }, + "timestamp": { + "$date": "2018-08-11T12:00:00.329Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ed0f1a376d259db5e6d72" + }, + "timestamp": { + "$date": "2018-08-11T12:05:00.298Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ed21da376d259db5e6eb2" + }, + "timestamp": { + "$date": "2018-08-11T12:10:00.366Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ed349a376d259db5e6f3f" + }, + "timestamp": { + "$date": "2018-08-11T12:15:00.393Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ed475a376d259db5e6fcd" + }, + "timestamp": { + "$date": "2018-08-11T12:20:00.374Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ed5a1a376d259db5e7058" + }, + "timestamp": { + "$date": "2018-08-11T12:25:00.404Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ed6cda376d259db5e70e6" + }, + "timestamp": { + "$date": "2018-08-11T12:30:00.351Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ed7f9a376d259db5e7171" + }, + "timestamp": { + "$date": "2018-08-11T12:35:00.329Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ed925a376d259db5e7210" + }, + "timestamp": { + "$date": "2018-08-11T12:40:00.396Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6eda51a376d259db5e72a2" + }, + "timestamp": { + "$date": "2018-08-11T12:45:00.351Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6edb7da376d259db5e7330" + }, + "timestamp": { + "$date": "2018-08-11T12:50:00.338Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6edca9a376d259db5e73bb" + }, + "timestamp": { + "$date": "2018-08-11T12:55:00.344Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6eddd5a376d259db5e7449" + }, + "timestamp": { + "$date": "2018-08-11T13:00:00.319Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6edf01a376d259db5e74d6" + }, + "timestamp": { + "$date": "2018-08-11T13:05:00.296Z" + }, + "users": [ + null, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ee02da376d259db5e756a" + }, + "timestamp": { + "$date": "2018-08-11T13:10:00.347Z" + }, + "users": [ + null, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ee159a376d259db5e75fb" + }, + "timestamp": { + "$date": "2018-08-11T13:15:00.342Z" + }, + "users": [ + null, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ee285a376d259db5e7693" + }, + "timestamp": { + "$date": "2018-08-11T13:20:00.344Z" + }, + "users": [ + null, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ee3b1a376d259db5e7720" + }, + "timestamp": { + "$date": "2018-08-11T13:25:00.342Z" + }, + "users": [ + null, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ee4dda376d259db5e77ae" + }, + "timestamp": { + "$date": "2018-08-11T13:30:00.436Z" + }, + "users": [ + null, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ee609a376d259db5e7839" + }, + "timestamp": { + "$date": "2018-08-11T13:35:00.294Z" + }, + "users": [ + null, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ee735a376d259db5e78c7" + }, + "timestamp": { + "$date": "2018-08-11T13:40:00.341Z" + }, + "users": [ + null, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ee861a376d259db5e7956" + }, + "timestamp": { + "$date": "2018-08-11T13:45:00.295Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ee98da376d259db5e7a1b" + }, + "timestamp": { + "$date": "2018-08-11T13:50:00.442Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6eeab9a376d259db5e7ab2" + }, + "timestamp": { + "$date": "2018-08-11T13:55:00.379Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6eebe5a376d259db5e7b45" + }, + "timestamp": { + "$date": "2018-08-11T14:00:00.354Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6eed11a376d259db5e7bd5" + }, + "timestamp": { + "$date": "2018-08-11T14:05:00.294Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6eee3da376d259db5e7c68" + }, + "timestamp": { + "$date": "2018-08-11T14:10:00.361Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6eef69a376d259db5e7cfa" + }, + "timestamp": { + "$date": "2018-08-11T14:15:00.293Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ef095a376d259db5e7da1" + }, + "timestamp": { + "$date": "2018-08-11T14:20:00.557Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ef1c1a376d259db5e7e31" + }, + "timestamp": { + "$date": "2018-08-11T14:25:00.393Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ef2eda376d259db5e7eca" + }, + "timestamp": { + "$date": "2018-08-11T14:30:00.341Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ef419a376d259db5e7f5a" + }, + "timestamp": { + "$date": "2018-08-11T14:35:00.294Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ef545a376d259db5e7fed" + }, + "timestamp": { + "$date": "2018-08-11T14:40:00.378Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ef671a376d259db5e807d" + }, + "timestamp": { + "$date": "2018-08-11T14:45:00.295Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ef79da376d259db5e8121" + }, + "timestamp": { + "$date": "2018-08-11T14:50:00.35Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ef8c9a376d259db5e81b2" + }, + "timestamp": { + "$date": "2018-08-11T14:55:00.369Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6ef9f5a376d259db5e824b" + }, + "timestamp": { + "$date": "2018-08-11T15:00:00.358Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6efb21a376d259db5e82df" + }, + "timestamp": { + "$date": "2018-08-11T15:05:00.293Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6efc4da376d259db5e8375" + }, + "timestamp": { + "$date": "2018-08-11T15:10:00.358Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6efd79a376d259db5e8408" + }, + "timestamp": { + "$date": "2018-08-11T15:15:00.294Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6efea5a376d259db5e84a1" + }, + "timestamp": { + "$date": "2018-08-11T15:20:00.325Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6effd1a376d259db5e8537" + }, + "timestamp": { + "$date": "2018-08-11T15:25:00.373Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f00fda376d259db5e85cd" + }, + "timestamp": { + "$date": "2018-08-11T15:30:00.339Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f0229a376d259db5e8665" + }, + "timestamp": { + "$date": "2018-08-11T15:35:00.307Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f0355a376d259db5e86f8" + }, + "timestamp": { + "$date": "2018-08-11T15:40:00.458Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f0481a376d259db5e878a" + }, + "timestamp": { + "$date": "2018-08-11T15:45:00.308Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f05ada376d259db5e881c" + }, + "timestamp": { + "$date": "2018-08-11T15:50:00.404Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f06d9a376d259db5e88d2" + }, + "timestamp": { + "$date": "2018-08-11T15:55:00.327Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f0805a376d259db5e8980" + }, + "timestamp": { + "$date": "2018-08-11T16:00:00.346Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "christian hentai club pg 13", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f0931a376d259db5e8a12" + }, + "timestamp": { + "$date": "2018-08-11T16:05:00.305Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f0a5da376d259db5e8aa7" + }, + "timestamp": { + "$date": "2018-08-11T16:10:00.367Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f0b89a376d259db5e8b37" + }, + "timestamp": { + "$date": "2018-08-11T16:15:00.3Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f0cb5a376d259db5e8bca" + }, + "timestamp": { + "$date": "2018-08-11T16:20:00.331Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f0de1a376d259db5e8c5a" + }, + "timestamp": { + "$date": "2018-08-11T16:25:00.323Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f0f0da376d259db5e8d05" + }, + "timestamp": { + "$date": "2018-08-11T16:30:00.487Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f1039a376d259db5e8d95" + }, + "timestamp": { + "$date": "2018-08-11T16:35:00.309Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f1165a376d259db5e8ebb" + }, + "timestamp": { + "$date": "2018-08-11T16:40:00.472Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f1291a376d259db5e8feb" + }, + "timestamp": { + "$date": "2018-08-11T16:45:00.297Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f13bda376d259db5e9083" + }, + "timestamp": { + "$date": "2018-08-11T16:50:00.346Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f14e9a376d259db5e9118" + }, + "timestamp": { + "$date": "2018-08-11T16:55:00.315Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f1615a376d259db5e91bd" + }, + "timestamp": { + "$date": "2018-08-11T17:00:00.327Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Dymz", + "clientDbId": "5215" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f1741a376d259db5e9263" + }, + "timestamp": { + "$date": "2018-08-11T17:05:00.327Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Dymz", + "clientDbId": "5215" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f186da376d259db5e92f5" + }, + "timestamp": { + "$date": "2018-08-11T17:10:00.389Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Dymz", + "clientDbId": "5215" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f1999a376d259db5e93d8" + }, + "timestamp": { + "$date": "2018-08-11T17:15:00.319Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Dymz", + "clientDbId": "5215" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f1ac5a376d259db5e9476" + }, + "timestamp": { + "$date": "2018-08-11T17:20:00.403Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Dymz", + "clientDbId": "5215" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f1bf1a376d259db5e9506" + }, + "timestamp": { + "$date": "2018-08-11T17:25:00.37Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f1d1da376d259db5e95a0" + }, + "timestamp": { + "$date": "2018-08-11T17:30:00.352Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f1e49a376d259db5e9696" + }, + "timestamp": { + "$date": "2018-08-11T17:35:00.328Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Cica", + "clientDbId": "5468" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f1f75a376d259db5e9754" + }, + "timestamp": { + "$date": "2018-08-11T17:40:00.614Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Trigger", + "clientDbId": "5468" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f20a1a376d259db5e97e5" + }, + "timestamp": { + "$date": "2018-08-11T17:45:00.304Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f21cda376d259db5e9878" + }, + "timestamp": { + "$date": "2018-08-11T17:50:00.35Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f22f9a376d259db5e9906" + }, + "timestamp": { + "$date": "2018-08-11T17:55:00.319Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f2425a376d259db5e9996" + }, + "timestamp": { + "$date": "2018-08-11T18:00:00.367Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Rct.Kelly.S", + "clientDbId": "5428" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f2551a376d259db5e9a21" + }, + "timestamp": { + "$date": "2018-08-11T18:05:00.304Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f267da376d259db5e9abb" + }, + "timestamp": { + "$date": "2018-08-11T18:10:00.564Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f27a9a376d259db5e9b50" + }, + "timestamp": { + "$date": "2018-08-11T18:15:00.386Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f28d5a376d259db5e9be3" + }, + "timestamp": { + "$date": "2018-08-11T18:20:00.418Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f2a01a376d259db5e9c75" + }, + "timestamp": { + "$date": "2018-08-11T18:25:00.38Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f2b2da376d259db5e9d70" + }, + "timestamp": { + "$date": "2018-08-11T18:30:00.384Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f2c59a376d259db5e9ea1" + }, + "timestamp": { + "$date": "2018-08-11T18:35:00.337Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f2d85a376d259db5e9f3e" + }, + "timestamp": { + "$date": "2018-08-11T18:40:00.503Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f2eb1a376d259db5ea117" + }, + "timestamp": { + "$date": "2018-08-11T18:45:00.361Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f2fdda376d259db5ea213" + }, + "timestamp": { + "$date": "2018-08-11T18:50:00.471Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f3109a376d259db5ea30a" + }, + "timestamp": { + "$date": "2018-08-11T18:55:00.421Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f3236a376d259db5ea3e9" + }, + "timestamp": { + "$date": "2018-08-11T19:00:00.993Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f3362a376d259db5ea478" + }, + "timestamp": { + "$date": "2018-08-11T19:05:00.584Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f348ea376d259db5ea512" + }, + "timestamp": { + "$date": "2018-08-11T19:10:00.673Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f35b9a376d259db5ea5a3" + }, + "timestamp": { + "$date": "2018-08-11T19:15:00.458Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f36e5a376d259db5ea630" + }, + "timestamp": { + "$date": "2018-08-11T19:20:00.495Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f3811a376d259db5ea6bc" + }, + "timestamp": { + "$date": "2018-08-11T19:25:00.508Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f393da376d259db5ea843" + }, + "timestamp": { + "$date": "2018-08-11T19:30:00.512Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f3a69a376d259db5ea8cd" + }, + "timestamp": { + "$date": "2018-08-11T19:35:00.474Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f3b96a376d259db5ea964" + }, + "timestamp": { + "$date": "2018-08-11T19:40:00.729Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f3cc1a376d259db5ea9f6" + }, + "timestamp": { + "$date": "2018-08-11T19:45:00.439Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Redcoat.C", + "clientDbId": "1845" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f3deda376d259db5eaa82" + }, + "timestamp": { + "$date": "2018-08-11T19:50:00.497Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f3f19a376d259db5eab0c" + }, + "timestamp": { + "$date": "2018-08-11T19:55:00.44Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f4045a376d259db5eacd9" + }, + "timestamp": { + "$date": "2018-08-11T20:00:00.471Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f4171a376d259db5ead61" + }, + "timestamp": { + "$date": "2018-08-11T20:05:00.464Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f429ea376d259db5eadf6" + }, + "timestamp": { + "$date": "2018-08-11T20:10:00.519Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f43caa376d259db5eae82" + }, + "timestamp": { + "$date": "2018-08-11T20:15:00.502Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f44f6a376d259db5eaf69" + }, + "timestamp": { + "$date": "2018-08-11T20:20:00.503Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f4622a376d259db5eaff2" + }, + "timestamp": { + "$date": "2018-08-11T20:25:00.489Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f474ea376d259db5eb081" + }, + "timestamp": { + "$date": "2018-08-11T20:30:00.498Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f4879a376d259db5eb107" + }, + "timestamp": { + "$date": "2018-08-11T20:35:00.422Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f49a6a376d259db5eb18f" + }, + "timestamp": { + "$date": "2018-08-11T20:40:00.502Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f4ad2a376d259db5eb21c" + }, + "timestamp": { + "$date": "2018-08-11T20:45:00.671Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f4bfea376d259db5eb2b1" + }, + "timestamp": { + "$date": "2018-08-11T20:50:00.664Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f4d2aa376d259db5eb337" + }, + "timestamp": { + "$date": "2018-08-11T20:55:00.525Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f4e56a376d259db5eb3c6" + }, + "timestamp": { + "$date": "2018-08-11T21:00:00.482Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f4f81a376d259db5eb44c" + }, + "timestamp": { + "$date": "2018-08-11T21:05:00.31Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f50ada376d259db5eb4d9" + }, + "timestamp": { + "$date": "2018-08-11T21:10:00.363Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f51d9a376d259db5eb5b6" + }, + "timestamp": { + "$date": "2018-08-11T21:15:00.303Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Bishop.S", + "clientDbId": "3382" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f5305a376d259db5eb643" + }, + "timestamp": { + "$date": "2018-08-11T21:20:00.326Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Stanley.E", + "clientDbId": "5352" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f5431a376d259db5eb789" + }, + "timestamp": { + "$date": "2018-08-11T21:25:00.341Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f555ea376d259db5eb87d" + }, + "timestamp": { + "$date": "2018-08-11T21:30:00.479Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f5689a376d259db5ebad8" + }, + "timestamp": { + "$date": "2018-08-11T21:35:00.295Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f57b5a376d259db5ebb79" + }, + "timestamp": { + "$date": "2018-08-11T21:40:00.372Z" + }, + "users": [ + null, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f58e1a376d259db5ebc13" + }, + "timestamp": { + "$date": "2018-08-11T21:45:00.298Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f5a0ea376d259db5ebd06" + }, + "timestamp": { + "$date": "2018-08-11T21:50:00.458Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f5b39a376d259db5ebded" + }, + "timestamp": { + "$date": "2018-08-11T21:55:00.342Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f5c66a376d259db5ebec7" + }, + "timestamp": { + "$date": "2018-08-11T22:00:00.32Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PFC. Bullet Sponge", + "clientDbId": "5467" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f5d91a376d259db5ec0a6" + }, + "timestamp": { + "$date": "2018-08-11T22:05:00.325Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f5ebda376d259db5ec16f" + }, + "timestamp": { + "$date": "2018-08-11T22:10:00.361Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f5feaa376d259db5ec204" + }, + "timestamp": { + "$date": "2018-08-11T22:15:00.42Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f6116a376d259db5ec2a2" + }, + "timestamp": { + "$date": "2018-08-11T22:20:00.472Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f6241a376d259db5ec337" + }, + "timestamp": { + "$date": "2018-08-11T22:25:00.368Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f636ea376d259db5ec436" + }, + "timestamp": { + "$date": "2018-08-11T22:30:00.324Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f6499a376d259db5ec504" + }, + "timestamp": { + "$date": "2018-08-11T22:35:00.307Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f65c5a376d259db5ec5a1" + }, + "timestamp": { + "$date": "2018-08-11T22:40:00.349Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f66f1a376d259db5ec659" + }, + "timestamp": { + "$date": "2018-08-11T22:45:00.303Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f681da376d259db5ec712" + }, + "timestamp": { + "$date": "2018-08-11T22:50:00.353Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b6f6949a376d259db5ec7ae" + }, + "timestamp": { + "$date": "2018-08-11T22:55:00.333Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f6a76a376d259db5ec85d" + }, + "timestamp": { + "$date": "2018-08-11T23:00:00.341Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f6ba1a376d259db5ec8fc" + }, + "timestamp": { + "$date": "2018-08-11T23:05:00.306Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f6ccea376d259db5ec9c9" + }, + "timestamp": { + "$date": "2018-08-11T23:10:00.355Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f6df9a376d259db5eca5e" + }, + "timestamp": { + "$date": "2018-08-11T23:15:00.296Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f6f26a376d259db5ecb2d" + }, + "timestamp": { + "$date": "2018-08-11T23:20:00.339Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f7052a376d259db5ecbc5" + }, + "timestamp": { + "$date": "2018-08-11T23:25:00.336Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f717da376d259db5ecc63" + }, + "timestamp": { + "$date": "2018-08-11T23:30:00.321Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f72a9a376d259db5ecd18" + }, + "timestamp": { + "$date": "2018-08-11T23:35:00.299Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f73d6a376d259db5ecde8" + }, + "timestamp": { + "$date": "2018-08-11T23:40:00.489Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f7501a376d259db5ece82" + }, + "timestamp": { + "$date": "2018-08-11T23:45:00.308Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f762ea376d259db5ecf25" + }, + "timestamp": { + "$date": "2018-08-11T23:50:00.331Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f775aa376d259db5ecfbf" + }, + "timestamp": { + "$date": "2018-08-11T23:55:00.391Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f7886a376d259db5ed05c" + }, + "timestamp": { + "$date": "2018-08-12T00:00:00.334Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f79b1a376d259db5ed196" + }, + "timestamp": { + "$date": "2018-08-12T00:05:00.297Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f7adea376d259db5ed261" + }, + "timestamp": { + "$date": "2018-08-12T00:10:00.459Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f7c0aa376d259db5ed2f8" + }, + "timestamp": { + "$date": "2018-08-12T00:15:00.337Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f7d36a376d259db5ed38a" + }, + "timestamp": { + "$date": "2018-08-12T00:20:00.322Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f7e62a376d259db5ed41b" + }, + "timestamp": { + "$date": "2018-08-12T00:25:00.352Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f7f8ea376d259db5ed4b2" + }, + "timestamp": { + "$date": "2018-08-12T00:30:00.348Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f80baa376d259db5ed550" + }, + "timestamp": { + "$date": "2018-08-12T00:35:00.347Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f81e6a376d259db5ed61a" + }, + "timestamp": { + "$date": "2018-08-12T00:40:00.522Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f8312a376d259db5ed6d6" + }, + "timestamp": { + "$date": "2018-08-12T00:45:00.403Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f843ea376d259db5ed768" + }, + "timestamp": { + "$date": "2018-08-12T00:50:00.321Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f856aa376d259db5ed7f9" + }, + "timestamp": { + "$date": "2018-08-12T00:55:00.322Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f8696a376d259db5ed8f2" + }, + "timestamp": { + "$date": "2018-08-12T01:00:00.331Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f87c2a376d259db5ed9a5" + }, + "timestamp": { + "$date": "2018-08-12T01:05:00.304Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f88eea376d259db5eda39" + }, + "timestamp": { + "$date": "2018-08-12T01:10:00.36Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f8a1aa376d259db5edad2" + }, + "timestamp": { + "$date": "2018-08-12T01:15:00.303Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f8b46a376d259db5edb58" + }, + "timestamp": { + "$date": "2018-08-12T01:20:00.383Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f8c72a376d259db5edbdb" + }, + "timestamp": { + "$date": "2018-08-12T01:25:00.323Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f8d9ea376d259db5edc65" + }, + "timestamp": { + "$date": "2018-08-12T01:30:00.448Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f8ecaa376d259db5edd37" + }, + "timestamp": { + "$date": "2018-08-12T01:35:00.332Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f8ff6a376d259db5ede0c" + }, + "timestamp": { + "$date": "2018-08-12T01:40:00.353Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f9122a376d259db5ede98" + }, + "timestamp": { + "$date": "2018-08-12T01:45:00.296Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f924ea376d259db5edf39" + }, + "timestamp": { + "$date": "2018-08-12T01:50:00.486Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f937aa376d259db5edfdb" + }, + "timestamp": { + "$date": "2018-08-12T01:55:00.337Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f94a6a376d259db5ee0a6" + }, + "timestamp": { + "$date": "2018-08-12T02:00:00.445Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b6f95d2a376d259db5ee130" + }, + "timestamp": { + "$date": "2018-08-12T02:05:00.315Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6f96fea376d259db5ee1b3" + }, + "timestamp": { + "$date": "2018-08-12T02:10:00.35Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6f982aa376d259db5ee235" + }, + "timestamp": { + "$date": "2018-08-12T02:15:00.328Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6f9956a376d259db5ee2b8" + }, + "timestamp": { + "$date": "2018-08-12T02:20:00.426Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6f9a82a376d259db5ee340" + }, + "timestamp": { + "$date": "2018-08-12T02:25:00.387Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6f9baea376d259db5ee3c9" + }, + "timestamp": { + "$date": "2018-08-12T02:30:00.322Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6f9cdaa376d259db5ee457" + }, + "timestamp": { + "$date": "2018-08-12T02:35:00.337Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6f9e06a376d259db5ee4db" + }, + "timestamp": { + "$date": "2018-08-12T02:40:00.372Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6f9f32a376d259db5ee55c" + }, + "timestamp": { + "$date": "2018-08-12T02:45:00.315Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fa05ea376d259db5ee5df" + }, + "timestamp": { + "$date": "2018-08-12T02:50:00.377Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fa18aa376d259db5ee661" + }, + "timestamp": { + "$date": "2018-08-12T02:55:00.403Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fa2b6a376d259db5ee6f7" + }, + "timestamp": { + "$date": "2018-08-12T03:00:00.459Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fa3e2a376d259db5ee77e" + }, + "timestamp": { + "$date": "2018-08-12T03:05:00.339Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fa50ea376d259db5ee802" + }, + "timestamp": { + "$date": "2018-08-12T03:10:00.364Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fa63aa376d259db5ee883" + }, + "timestamp": { + "$date": "2018-08-12T03:15:00.293Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fa766a376d259db5ee907" + }, + "timestamp": { + "$date": "2018-08-12T03:20:00.324Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fa892a376d259db5ee988" + }, + "timestamp": { + "$date": "2018-08-12T03:25:00.364Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fa9bea376d259db5eea18" + }, + "timestamp": { + "$date": "2018-08-12T03:30:00.468Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6faaeaa376d259db5eea99" + }, + "timestamp": { + "$date": "2018-08-12T03:35:00.315Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fac16a376d259db5eeb29" + }, + "timestamp": { + "$date": "2018-08-12T03:40:00.519Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fad42a376d259db5eebaa" + }, + "timestamp": { + "$date": "2018-08-12T03:45:00.316Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fae6ea376d259db5eec2e" + }, + "timestamp": { + "$date": "2018-08-12T03:50:00.377Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6faf9aa376d259db5eecaf" + }, + "timestamp": { + "$date": "2018-08-12T03:55:00.335Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fb0c6a376d259db5eed38" + }, + "timestamp": { + "$date": "2018-08-12T04:00:00.323Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fb1f2a376d259db5eedc0" + }, + "timestamp": { + "$date": "2018-08-12T04:05:00.346Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fb31ea376d259db5eee4f" + }, + "timestamp": { + "$date": "2018-08-12T04:10:00.369Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fb44aa376d259db5eeed1" + }, + "timestamp": { + "$date": "2018-08-12T04:15:00.337Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fb576a376d259db5eef54" + }, + "timestamp": { + "$date": "2018-08-12T04:20:00.324Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fb6a2a376d259db5eefd6" + }, + "timestamp": { + "$date": "2018-08-12T04:25:00.352Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fb7cea376d259db5ef05f" + }, + "timestamp": { + "$date": "2018-08-12T04:30:00.322Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fb8faa376d259db5ef0e1" + }, + "timestamp": { + "$date": "2018-08-12T04:35:00.325Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fba26a376d259db5ef171" + }, + "timestamp": { + "$date": "2018-08-12T04:40:00.584Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fbb52a376d259db5ef1fa" + }, + "timestamp": { + "$date": "2018-08-12T04:45:00.318Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fbc7ea376d259db5ef27e" + }, + "timestamp": { + "$date": "2018-08-12T04:50:00.327Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fbdaaa376d259db5ef2ff" + }, + "timestamp": { + "$date": "2018-08-12T04:55:00.365Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fbed6a376d259db5ef389" + }, + "timestamp": { + "$date": "2018-08-12T05:00:00.443Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fc002a376d259db5ef40a" + }, + "timestamp": { + "$date": "2018-08-12T05:05:00.323Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fc12ea376d259db5ef492" + }, + "timestamp": { + "$date": "2018-08-12T05:10:00.487Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fc25aa376d259db5ef51b" + }, + "timestamp": { + "$date": "2018-08-12T05:15:00.31Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fc386a376d259db5ef5a5" + }, + "timestamp": { + "$date": "2018-08-12T05:20:00.326Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fc4b2a376d259db5ef626" + }, + "timestamp": { + "$date": "2018-08-12T05:25:00.331Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fc5dea376d259db5ef6b0" + }, + "timestamp": { + "$date": "2018-08-12T05:30:00.327Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fc70aa376d259db5ef731" + }, + "timestamp": { + "$date": "2018-08-12T05:35:00.398Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fc836a376d259db5ef7b4" + }, + "timestamp": { + "$date": "2018-08-12T05:40:00.348Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fc962a376d259db5ef83c" + }, + "timestamp": { + "$date": "2018-08-12T05:45:00.377Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fca8ea376d259db5ef8c5" + }, + "timestamp": { + "$date": "2018-08-12T05:50:00.371Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fcbbaa376d259db5ef94d" + }, + "timestamp": { + "$date": "2018-08-12T05:55:00.342Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fcce6a376d259db5ef9d7" + }, + "timestamp": { + "$date": "2018-08-12T06:00:00.334Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fce12a376d259db5efa58" + }, + "timestamp": { + "$date": "2018-08-12T06:05:00.341Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fcf3ea376d259db5efadc" + }, + "timestamp": { + "$date": "2018-08-12T06:10:00.366Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fd06aa376d259db5efb5d" + }, + "timestamp": { + "$date": "2018-08-12T06:15:00.3Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fd196a376d259db5efbe6" + }, + "timestamp": { + "$date": "2018-08-12T06:20:00.318Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fd2c2a376d259db5efc68" + }, + "timestamp": { + "$date": "2018-08-12T06:25:00.323Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fd3eea376d259db5efcf8" + }, + "timestamp": { + "$date": "2018-08-12T06:30:00.475Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fd51aa376d259db5efd79" + }, + "timestamp": { + "$date": "2018-08-12T06:35:00.316Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fd646a376d259db5efe01" + }, + "timestamp": { + "$date": "2018-08-12T06:40:00.354Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fd772a376d259db5efe84" + }, + "timestamp": { + "$date": "2018-08-12T06:45:00.326Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fd89ea376d259db5eff07" + }, + "timestamp": { + "$date": "2018-08-12T06:50:00.326Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fd9caa376d259db5eff8f" + }, + "timestamp": { + "$date": "2018-08-12T06:55:00.339Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fdaf6a376d259db5f001e" + }, + "timestamp": { + "$date": "2018-08-12T07:00:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fdc22a376d259db5f00a0" + }, + "timestamp": { + "$date": "2018-08-12T07:05:00.325Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fdd4ea376d259db5f012a" + }, + "timestamp": { + "$date": "2018-08-12T07:10:00.482Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fde7aa376d259db5f01ab" + }, + "timestamp": { + "$date": "2018-08-12T07:15:00.314Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fdfa6a376d259db5f022f" + }, + "timestamp": { + "$date": "2018-08-12T07:20:00.37Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fe0d2a376d259db5f02b6" + }, + "timestamp": { + "$date": "2018-08-12T07:25:00.317Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fe1fea376d259db5f033e" + }, + "timestamp": { + "$date": "2018-08-12T07:30:00.523Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fe32aa376d259db5f03c7" + }, + "timestamp": { + "$date": "2018-08-12T07:35:00.304Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fe456a376d259db5f0451" + }, + "timestamp": { + "$date": "2018-08-12T07:40:00.467Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fe582a376d259db5f04d2" + }, + "timestamp": { + "$date": "2018-08-12T07:45:00.315Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fe6aea376d259db5f0555" + }, + "timestamp": { + "$date": "2018-08-12T07:50:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fe7daa376d259db5f05d7" + }, + "timestamp": { + "$date": "2018-08-12T07:55:00.318Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fe906a376d259db5f0667" + }, + "timestamp": { + "$date": "2018-08-12T08:00:00.486Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fea32a376d259db5f06ee" + }, + "timestamp": { + "$date": "2018-08-12T08:05:00.301Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6feb5ea376d259db5f0777" + }, + "timestamp": { + "$date": "2018-08-12T08:10:00.358Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fec8aa376d259db5f07f9" + }, + "timestamp": { + "$date": "2018-08-12T08:15:00.323Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6fedb6a376d259db5f087c" + }, + "timestamp": { + "$date": "2018-08-12T08:20:00.351Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6feee2a376d259db5f08fe" + }, + "timestamp": { + "$date": "2018-08-12T08:25:00.316Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6ff00ea376d259db5f0982" + }, + "timestamp": { + "$date": "2018-08-12T08:30:00.406Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b6ff13aa376d259db5f0c26" + }, + "timestamp": { + "$date": "2018-08-12T08:35:00.295Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ff266a376d259db5f0cc6" + }, + "timestamp": { + "$date": "2018-08-12T08:40:00.54Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ff392a376d259db5f0d49" + }, + "timestamp": { + "$date": "2018-08-12T08:45:00.305Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ff4bea376d259db5f0dcc" + }, + "timestamp": { + "$date": "2018-08-12T08:50:00.363Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ff5eaa376d259db5f0e4e" + }, + "timestamp": { + "$date": "2018-08-12T08:55:00.333Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ff716a376d259db5f0ed2" + }, + "timestamp": { + "$date": "2018-08-12T09:00:00.332Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ff842a376d259db5f0f5f" + }, + "timestamp": { + "$date": "2018-08-12T09:05:00.293Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ff96ea376d259db5f0fee" + }, + "timestamp": { + "$date": "2018-08-12T09:10:00.515Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ffa9aa376d259db5f1070" + }, + "timestamp": { + "$date": "2018-08-12T09:15:00.318Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ffbc6a376d259db5f10f3" + }, + "timestamp": { + "$date": "2018-08-12T09:20:00.354Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ffcf2a376d259db5f1177" + }, + "timestamp": { + "$date": "2018-08-12T09:25:00.317Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6ffe1ea376d259db5f122d" + }, + "timestamp": { + "$date": "2018-08-12T09:30:00.319Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b6fff4aa376d259db5f12ea" + }, + "timestamp": { + "$date": "2018-08-12T09:35:00.308Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b700076a376d259db5f13c5" + }, + "timestamp": { + "$date": "2018-08-12T09:40:00.38Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7001a2a376d259db5f1487" + }, + "timestamp": { + "$date": "2018-08-12T09:45:00.307Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7002cea376d259db5f1546" + }, + "timestamp": { + "$date": "2018-08-12T09:50:00.325Z" + }, + "users": [ + null, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7003faa376d259db5f1606" + }, + "timestamp": { + "$date": "2018-08-12T09:55:00.351Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b700526a376d259db5f16c5" + }, + "timestamp": { + "$date": "2018-08-12T10:00:00.321Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b700652a376d259db5f1783" + }, + "timestamp": { + "$date": "2018-08-12T10:05:00.425Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b70077ea376d259db5f184f" + }, + "timestamp": { + "$date": "2018-08-12T10:10:00.371Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7008aaa376d259db5f1912" + }, + "timestamp": { + "$date": "2018-08-12T10:15:00.431Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7009d6a376d259db5f19d8" + }, + "timestamp": { + "$date": "2018-08-12T10:20:00.46Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b700b02a376d259db5f1a95" + }, + "timestamp": { + "$date": "2018-08-12T10:25:00.324Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b700c2ea376d259db5f1b55" + }, + "timestamp": { + "$date": "2018-08-12T10:30:00.321Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b700d5aa376d259db5f1c12" + }, + "timestamp": { + "$date": "2018-08-12T10:35:00.306Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b700e86a376d259db5f1d05" + }, + "timestamp": { + "$date": "2018-08-12T10:40:00.383Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b700fb2a376d259db5f1e71" + }, + "timestamp": { + "$date": "2018-08-12T10:45:00.511Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7010dea376d259db5f21c1" + }, + "timestamp": { + "$date": "2018-08-12T10:50:00.448Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b70120aa376d259db5f2283" + }, + "timestamp": { + "$date": "2018-08-12T10:55:00.34Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b701336a376d259db5f2348" + }, + "timestamp": { + "$date": "2018-08-12T11:00:00.332Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b701462a376d259db5f240a" + }, + "timestamp": { + "$date": "2018-08-12T11:05:00.331Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b70158ea376d259db5f24cd" + }, + "timestamp": { + "$date": "2018-08-12T11:10:00.437Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7016baa376d259db5f2596" + }, + "timestamp": { + "$date": "2018-08-12T11:15:00.296Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7017e6a376d259db5f2663" + }, + "timestamp": { + "$date": "2018-08-12T11:20:00.338Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b701912a376d259db5f2721" + }, + "timestamp": { + "$date": "2018-08-12T11:25:00.358Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b701a3ea376d259db5f27ee" + }, + "timestamp": { + "$date": "2018-08-12T11:30:00.325Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b701b6aa376d259db5f28cc" + }, + "timestamp": { + "$date": "2018-08-12T11:35:00.311Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b701c96a376d259db5f2990" + }, + "timestamp": { + "$date": "2018-08-12T11:40:00.346Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b701dc2a376d259db5f2a79" + }, + "timestamp": { + "$date": "2018-08-12T11:45:00.303Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b701eeea376d259db5f2b55" + }, + "timestamp": { + "$date": "2018-08-12T11:50:00.459Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70201aa376d259db5f2c23" + }, + "timestamp": { + "$date": "2018-08-12T11:55:00.328Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b702146a376d259db5f2ce5" + }, + "timestamp": { + "$date": "2018-08-12T12:00:00.331Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b702272a376d259db5f2dbd" + }, + "timestamp": { + "$date": "2018-08-12T12:05:00.295Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70239ea376d259db5f2e82" + }, + "timestamp": { + "$date": "2018-08-12T12:10:00.35Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7024caa376d259db5f2f73" + }, + "timestamp": { + "$date": "2018-08-12T12:15:00.295Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7025f6a376d259db5f304f" + }, + "timestamp": { + "$date": "2018-08-12T12:20:00.493Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b702722a376d259db5f315e" + }, + "timestamp": { + "$date": "2018-08-12T12:25:00.328Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b70284ea376d259db5f358f" + }, + "timestamp": { + "$date": "2018-08-12T12:30:00.323Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b70297aa376d259db5f36ee" + }, + "timestamp": { + "$date": "2018-08-12T12:35:00.297Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b702aa6a376d259db5f37c2" + }, + "timestamp": { + "$date": "2018-08-12T12:40:00.377Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b702bd2a376d259db5f389a" + }, + "timestamp": { + "$date": "2018-08-12T12:45:00.295Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b702cfea376d259db5f39a4" + }, + "timestamp": { + "$date": "2018-08-12T12:50:00.325Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b702e2aa376d259db5f3aba" + }, + "timestamp": { + "$date": "2018-08-12T12:55:00.318Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b702f56a376d259db5f3b8f" + }, + "timestamp": { + "$date": "2018-08-12T13:00:00.369Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b703082a376d259db5f3c5d" + }, + "timestamp": { + "$date": "2018-08-12T13:05:00.343Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7031aea376d259db5f3d5a" + }, + "timestamp": { + "$date": "2018-08-12T13:10:00.34Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7032daa376d259db5f3e27" + }, + "timestamp": { + "$date": "2018-08-12T13:15:00.332Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b703406a376d259db5f3ef1" + }, + "timestamp": { + "$date": "2018-08-12T13:20:00.318Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b703532a376d259db5f3fbb" + }, + "timestamp": { + "$date": "2018-08-12T13:25:00.479Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b70365ea376d259db5f4086" + }, + "timestamp": { + "$date": "2018-08-12T13:30:00.457Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b70378aa376d259db5f414e" + }, + "timestamp": { + "$date": "2018-08-12T13:35:00.324Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7038b6a376d259db5f4215" + }, + "timestamp": { + "$date": "2018-08-12T13:40:00.352Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7039e2a376d259db5f42dd" + }, + "timestamp": { + "$date": "2018-08-12T13:45:00.297Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b703b0ea376d259db5f43a2" + }, + "timestamp": { + "$date": "2018-08-12T13:50:00.351Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b703c3aa376d259db5f446a" + }, + "timestamp": { + "$date": "2018-08-12T13:55:00.468Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b703d66a376d259db5f45d7" + }, + "timestamp": { + "$date": "2018-08-12T14:00:00.329Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b703e92a376d259db5f46fd" + }, + "timestamp": { + "$date": "2018-08-12T14:05:00.297Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b703fbea376d259db5f47de" + }, + "timestamp": { + "$date": "2018-08-12T14:10:00.357Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7040eaa376d259db5f48a2" + }, + "timestamp": { + "$date": "2018-08-12T14:15:00.295Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b704216a376d259db5f4967" + }, + "timestamp": { + "$date": "2018-08-12T14:20:00.35Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b704342a376d259db5f4a2b" + }, + "timestamp": { + "$date": "2018-08-12T14:25:00.388Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b70446ea376d259db5f4afb" + }, + "timestamp": { + "$date": "2018-08-12T14:30:00.445Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b70459aa376d259db5f4bc4" + }, + "timestamp": { + "$date": "2018-08-12T14:35:00.32Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7046c6a376d259db5f4c8f" + }, + "timestamp": { + "$date": "2018-08-12T14:40:00.357Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7047f2a376d259db5f4d51" + }, + "timestamp": { + "$date": "2018-08-12T14:45:00.293Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b70491ea376d259db5f4e16" + }, + "timestamp": { + "$date": "2018-08-12T14:50:00.328Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b704a4aa376d259db5f4ed8" + }, + "timestamp": { + "$date": "2018-08-12T14:55:00.341Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b704b76a376d259db5f4fa9" + }, + "timestamp": { + "$date": "2018-08-12T15:00:00.481Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b704ca2a376d259db5f5073" + }, + "timestamp": { + "$date": "2018-08-12T15:05:00.295Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b704dcea376d259db5f513b" + }, + "timestamp": { + "$date": "2018-08-12T15:10:00.358Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b704efaa376d259db5f5204" + }, + "timestamp": { + "$date": "2018-08-12T15:15:00.291Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b705026a376d259db5f52c7" + }, + "timestamp": { + "$date": "2018-08-12T15:20:00.371Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b705152a376d259db5f5396" + }, + "timestamp": { + "$date": "2018-08-12T15:25:00.331Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b70527ea376d259db5f5470" + }, + "timestamp": { + "$date": "2018-08-12T15:30:00.517Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7053aaa376d259db5f5538" + }, + "timestamp": { + "$date": "2018-08-12T15:35:00.354Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7054d6a376d259db5f5673" + }, + "timestamp": { + "$date": "2018-08-12T15:40:00.411Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b705602a376d259db5f5744" + }, + "timestamp": { + "$date": "2018-08-12T15:45:00.401Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b70572fa376d259db5f5814" + }, + "timestamp": { + "$date": "2018-08-12T15:50:00.711Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b70585aa376d259db5f58db" + }, + "timestamp": { + "$date": "2018-08-12T15:55:00.433Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b705986a376d259db5f59b7" + }, + "timestamp": { + "$date": "2018-08-12T16:00:00.485Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b705ab2a376d259db5f5a84" + }, + "timestamp": { + "$date": "2018-08-12T16:05:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b705bdea376d259db5f5b5a" + }, + "timestamp": { + "$date": "2018-08-12T16:10:00.446Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b705d0aa376d259db5f5c28" + }, + "timestamp": { + "$date": "2018-08-12T16:15:00.325Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b705e36a376d259db5f5cf9" + }, + "timestamp": { + "$date": "2018-08-12T16:20:00.333Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b705f62a376d259db5f5dfa" + }, + "timestamp": { + "$date": "2018-08-12T16:25:00.326Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b70608ea376d259db5f5f07" + }, + "timestamp": { + "$date": "2018-08-12T16:30:00.336Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7061baa376d259db5f5fd5" + }, + "timestamp": { + "$date": "2018-08-12T16:35:00.353Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7062e6a376d259db5f6216" + }, + "timestamp": { + "$date": "2018-08-12T16:40:00.366Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b706412a376d259db5f638b" + }, + "timestamp": { + "$date": "2018-08-12T16:45:00.299Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b70653ea376d259db5f6464" + }, + "timestamp": { + "$date": "2018-08-12T16:50:00.341Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.Blivejazz.M", + "clientDbId": "5153" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b70666aa376d259db5f6516" + }, + "timestamp": { + "$date": "2018-08-12T16:55:00.319Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b706796a376d259db5f661c" + }, + "timestamp": { + "$date": "2018-08-12T17:00:00.326Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Hoddinott.C", + "clientDbId": "5163" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7068c2a376d259db5f6727" + }, + "timestamp": { + "$date": "2018-08-12T17:05:00.305Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7069efa376d259db5f683a" + }, + "timestamp": { + "$date": "2018-08-12T17:10:00.515Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b706b1aa376d259db5f6908" + }, + "timestamp": { + "$date": "2018-08-12T17:15:00.295Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b706c46a376d259db5f6a52" + }, + "timestamp": { + "$date": "2018-08-12T17:20:00.333Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b706d72a376d259db5f6bef" + }, + "timestamp": { + "$date": "2018-08-12T17:25:00.349Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b706e9ea376d259db5f6cfa" + }, + "timestamp": { + "$date": "2018-08-12T17:30:00.329Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b706fcaa376d259db5f6ebd" + }, + "timestamp": { + "$date": "2018-08-12T17:35:00.298Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7070f7a376d259db5f6fe8" + }, + "timestamp": { + "$date": "2018-08-12T17:40:00.57Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b707222a376d259db5f70a0" + }, + "timestamp": { + "$date": "2018-08-12T17:45:00.33Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b70734ea376d259db5f715b" + }, + "timestamp": { + "$date": "2018-08-12T17:50:00.379Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b70747aa376d259db5f7215" + }, + "timestamp": { + "$date": "2018-08-12T17:55:00.32Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7075a6a376d259db5f72db" + }, + "timestamp": { + "$date": "2018-08-12T18:00:00.341Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7076d2a376d259db5f7394" + }, + "timestamp": { + "$date": "2018-08-12T18:05:00.319Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7077ffa376d259db5f745a" + }, + "timestamp": { + "$date": "2018-08-12T18:10:00.352Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b70792ba376d259db5f7513" + }, + "timestamp": { + "$date": "2018-08-12T18:15:00.426Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b707a56a376d259db5f75cf" + }, + "timestamp": { + "$date": "2018-08-12T18:20:00.343Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b707b83a376d259db5f7688" + }, + "timestamp": { + "$date": "2018-08-12T18:25:00.402Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b707cafa376d259db5f774b" + }, + "timestamp": { + "$date": "2018-08-12T18:30:00.385Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b707ddaa376d259db5f7831" + }, + "timestamp": { + "$date": "2018-08-12T18:35:00.297Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b707f07a376d259db5f78f9" + }, + "timestamp": { + "$date": "2018-08-12T18:40:00.367Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b708032a376d259db5f79ba" + }, + "timestamp": { + "$date": "2018-08-12T18:45:00.307Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70815fa376d259db5f7a82" + }, + "timestamp": { + "$date": "2018-08-12T18:50:00.547Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70828ba376d259db5f7b41" + }, + "timestamp": { + "$date": "2018-08-12T18:55:00.345Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7083b6a376d259db5f7c44" + }, + "timestamp": { + "$date": "2018-08-12T19:00:00.327Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "PltOff.Conway.M", + "clientDbId": "5232" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7084e3a376d259db5f7d1b" + }, + "timestamp": { + "$date": "2018-08-12T19:05:00.366Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70860fa376d259db5f7dbb" + }, + "timestamp": { + "$date": "2018-08-12T19:10:00.388Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70873aa376d259db5f7eb1" + }, + "timestamp": { + "$date": "2018-08-12T19:15:00.311Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b708867a376d259db5f7f45" + }, + "timestamp": { + "$date": "2018-08-12T19:20:00.56Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b708993a376d259db5f7fd0" + }, + "timestamp": { + "$date": "2018-08-12T19:25:00.45Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b708abfa376d259db5f805e" + }, + "timestamp": { + "$date": "2018-08-12T19:30:00.457Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b708beba376d259db5f80f5" + }, + "timestamp": { + "$date": "2018-08-12T19:35:00.404Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b708d17a376d259db5f8183" + }, + "timestamp": { + "$date": "2018-08-12T19:40:00.571Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b708e43a376d259db5f820e" + }, + "timestamp": { + "$date": "2018-08-12T19:45:00.566Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b708f6fa376d259db5f82ae" + }, + "timestamp": { + "$date": "2018-08-12T19:50:00.747Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70909ba376d259db5f833a" + }, + "timestamp": { + "$date": "2018-08-12T19:55:00.529Z" + }, + "users": [ + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Chase.J", + "clientDbId": "4387" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7091c7a376d259db5f83c8" + }, + "timestamp": { + "$date": "2018-08-12T20:00:00.552Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7092f3a376d259db5f8453" + }, + "timestamp": { + "$date": "2018-08-12T20:05:00.421Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70941fa376d259db5f84ed" + }, + "timestamp": { + "$date": "2018-08-12T20:10:00.757Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70954ba376d259db5f857a" + }, + "timestamp": { + "$date": "2018-08-12T20:15:00.461Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b709677a376d259db5f8614" + }, + "timestamp": { + "$date": "2018-08-12T20:20:00.49Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7097a3a376d259db5f869f" + }, + "timestamp": { + "$date": "2018-08-12T20:25:00.526Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7098cfa376d259db5f872c" + }, + "timestamp": { + "$date": "2018-08-12T20:30:00.49Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7099fba376d259db5f87ba" + }, + "timestamp": { + "$date": "2018-08-12T20:35:00.436Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b709b27a376d259db5f8854" + }, + "timestamp": { + "$date": "2018-08-12T20:40:00.492Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b709c53a376d259db5f88db" + }, + "timestamp": { + "$date": "2018-08-12T20:45:00.437Z" + }, + "users": [ + null, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b709d7fa376d259db5f8963" + }, + "timestamp": { + "$date": "2018-08-12T20:50:00.379Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b709eaba376d259db5f8a8c" + }, + "timestamp": { + "$date": "2018-08-12T20:55:00.389Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Brady.L", + "clientDbId": "4770" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Shaggy.M", + "clientDbId": "4865" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b709fd7a376d259db5f8ba3" + }, + "timestamp": { + "$date": "2018-08-12T21:00:00.36Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70a103a376d259db5f8c37" + }, + "timestamp": { + "$date": "2018-08-12T21:05:00.341Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70a22fa376d259db5f8cca" + }, + "timestamp": { + "$date": "2018-08-12T21:10:00.442Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Johansson.B", + "clientDbId": "4654" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70a35ba376d259db5f8e12" + }, + "timestamp": { + "$date": "2018-08-12T21:15:00.339Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70a487a376d259db5f8eb4" + }, + "timestamp": { + "$date": "2018-08-12T21:20:00.393Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70a5b3a376d259db5f8f47" + }, + "timestamp": { + "$date": "2018-08-12T21:25:00.368Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70a6dfa376d259db5f9014" + }, + "timestamp": { + "$date": "2018-08-12T21:30:00.36Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70a80ba376d259db5f90bb" + }, + "timestamp": { + "$date": "2018-08-12T21:35:00.38Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b70a937a376d259db5f9152" + }, + "timestamp": { + "$date": "2018-08-12T21:40:00.407Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b70aa63a376d259db5f91e8" + }, + "timestamp": { + "$date": "2018-08-12T21:45:00.359Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b70ab8fa376d259db5f927a" + }, + "timestamp": { + "$date": "2018-08-12T21:50:00.363Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b70acbba376d259db5f930b" + }, + "timestamp": { + "$date": "2018-08-12T21:55:00.418Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b70ade7a376d259db5f93a9" + }, + "timestamp": { + "$date": "2018-08-12T22:00:00.485Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b70af13a376d259db5f943b" + }, + "timestamp": { + "$date": "2018-08-12T22:05:00.359Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b70b03fa376d259db5f94c9" + }, + "timestamp": { + "$date": "2018-08-12T22:10:00.39Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b70b16ba376d259db5f955a" + }, + "timestamp": { + "$date": "2018-08-12T22:15:00.345Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b70b297a376d259db5f95e7" + }, + "timestamp": { + "$date": "2018-08-12T22:20:00.368Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "2Lt.Perlaky.A", + "clientDbId": "5386" + } + ] +} +{ + "_id": { + "$oid": "5b70b3c3a376d259db5f966d" + }, + "timestamp": { + "$date": "2018-08-12T22:25:00.373Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70b4efa376d259db5f96fc" + }, + "timestamp": { + "$date": "2018-08-12T22:30:00.503Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70b61ba376d259db5f9786" + }, + "timestamp": { + "$date": "2018-08-12T22:35:00.36Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70b747a376d259db5f980a" + }, + "timestamp": { + "$date": "2018-08-12T22:40:00.407Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70b873a376d259db5f988b" + }, + "timestamp": { + "$date": "2018-08-12T22:45:00.344Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70b99fa376d259db5f9916" + }, + "timestamp": { + "$date": "2018-08-12T22:50:00.362Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70bacba376d259db5f9998" + }, + "timestamp": { + "$date": "2018-08-12T22:55:00.353Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70bbf7a376d259db5f9a27" + }, + "timestamp": { + "$date": "2018-08-12T23:00:00.362Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70bd23a376d259db5f9ab4" + }, + "timestamp": { + "$date": "2018-08-12T23:05:00.386Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70be4fa376d259db5f9b4e" + }, + "timestamp": { + "$date": "2018-08-12T23:10:00.441Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70bf7ba376d259db5f9bcf" + }, + "timestamp": { + "$date": "2018-08-12T23:15:00.36Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70c0a7a376d259db5f9c59" + }, + "timestamp": { + "$date": "2018-08-12T23:20:00.387Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70c1d3a376d259db5f9cda" + }, + "timestamp": { + "$date": "2018-08-12T23:25:00.368Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70c2ffa376d259db5f9d69" + }, + "timestamp": { + "$date": "2018-08-12T23:30:00.376Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70c42ba376d259db5f9df3" + }, + "timestamp": { + "$date": "2018-08-12T23:35:00.353Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70c557a376d259db5f9e76" + }, + "timestamp": { + "$date": "2018-08-12T23:40:00.417Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70c683a376d259db5f9ef8" + }, + "timestamp": { + "$date": "2018-08-12T23:45:00.347Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70c7afa376d259db5f9f7c" + }, + "timestamp": { + "$date": "2018-08-12T23:50:00.371Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70c8dba376d259db5fa003" + }, + "timestamp": { + "$date": "2018-08-12T23:55:00.468Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70ca07a376d259db5fa086" + }, + "timestamp": { + "$date": "2018-08-13T00:00:00.37Z" + }, + "users": [ + null, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Handisides.M", + "clientDbId": "3782" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70cb33a376d259db5fa114" + }, + "timestamp": { + "$date": "2018-08-13T00:05:00.492Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70cc5fa376d259db5fa19e" + }, + "timestamp": { + "$date": "2018-08-13T00:10:00.614Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70cd8ba376d259db5fa21f" + }, + "timestamp": { + "$date": "2018-08-13T00:15:00.342Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70ceb7a376d259db5fa2a2" + }, + "timestamp": { + "$date": "2018-08-13T00:20:00.37Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70cfe3a376d259db5fa324" + }, + "timestamp": { + "$date": "2018-08-13T00:25:00.376Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b70d10fa376d259db5fa3ad" + }, + "timestamp": { + "$date": "2018-08-13T00:30:00.363Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70d23ba376d259db5fa435" + }, + "timestamp": { + "$date": "2018-08-13T00:35:00.573Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70d367a376d259db5fa4be" + }, + "timestamp": { + "$date": "2018-08-13T00:40:00.394Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70d493a376d259db5fa546" + }, + "timestamp": { + "$date": "2018-08-13T00:45:00.383Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70d5bfa376d259db5fa5c9" + }, + "timestamp": { + "$date": "2018-08-13T00:50:00.365Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70d6eba376d259db5fa64b" + }, + "timestamp": { + "$date": "2018-08-13T00:55:00.391Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70d817a376d259db5fa6cf" + }, + "timestamp": { + "$date": "2018-08-13T01:00:00.383Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70d943a376d259db5fa75c" + }, + "timestamp": { + "$date": "2018-08-13T01:05:00.348Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70da6fa376d259db5fa7e6" + }, + "timestamp": { + "$date": "2018-08-13T01:10:00.428Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70db9ba376d259db5fa867" + }, + "timestamp": { + "$date": "2018-08-13T01:15:00.346Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70dcc7a376d259db5fa8f0" + }, + "timestamp": { + "$date": "2018-08-13T01:20:00.48Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70ddf3a376d259db5fa972" + }, + "timestamp": { + "$date": "2018-08-13T01:25:00.393Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70df1fa376d259db5fa9f6" + }, + "timestamp": { + "$date": "2018-08-13T01:30:00.368Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70e04ba376d259db5faa77" + }, + "timestamp": { + "$date": "2018-08-13T01:35:00.347Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70e177a376d259db5fab05" + }, + "timestamp": { + "$date": "2018-08-13T01:40:00.38Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70e2a3a376d259db5fab8e" + }, + "timestamp": { + "$date": "2018-08-13T01:45:00.338Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70e3cfa376d259db5fac17" + }, + "timestamp": { + "$date": "2018-08-13T01:50:00.363Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70e4fba376d259db5fac99" + }, + "timestamp": { + "$date": "2018-08-13T01:55:00.386Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70e627a376d259db5fad1c" + }, + "timestamp": { + "$date": "2018-08-13T02:00:00.366Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70e753a376d259db5fad9e" + }, + "timestamp": { + "$date": "2018-08-13T02:05:00.352Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70e87fa376d259db5fae34" + }, + "timestamp": { + "$date": "2018-08-13T02:10:00.787Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70e9aba376d259db5faebb" + }, + "timestamp": { + "$date": "2018-08-13T02:15:00.346Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70ead7a376d259db5faf3e" + }, + "timestamp": { + "$date": "2018-08-13T02:20:00.361Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70ec03a376d259db5fafc0" + }, + "timestamp": { + "$date": "2018-08-13T02:25:00.358Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70ed2fa376d259db5fb048" + }, + "timestamp": { + "$date": "2018-08-13T02:30:00.372Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70ee5ba376d259db5fb0cb" + }, + "timestamp": { + "$date": "2018-08-13T02:35:00.35Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70ef87a376d259db5fb155" + }, + "timestamp": { + "$date": "2018-08-13T02:40:00.415Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70f0b3a376d259db5fb1d6" + }, + "timestamp": { + "$date": "2018-08-13T02:45:00.326Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70f1dfa376d259db5fb266" + }, + "timestamp": { + "$date": "2018-08-13T02:50:00.491Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70f30ba376d259db5fb2e7" + }, + "timestamp": { + "$date": "2018-08-13T02:55:00.378Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70f437a376d259db5fb36a" + }, + "timestamp": { + "$date": "2018-08-13T03:00:00.365Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70f563a376d259db5fb3f4" + }, + "timestamp": { + "$date": "2018-08-13T03:05:00.351Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70f68fa376d259db5fb478" + }, + "timestamp": { + "$date": "2018-08-13T03:10:00.392Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70f7bba376d259db5fb4ff" + }, + "timestamp": { + "$date": "2018-08-13T03:15:00.337Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70f8e7a376d259db5fb58f" + }, + "timestamp": { + "$date": "2018-08-13T03:20:00.496Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70fa13a376d259db5fb610" + }, + "timestamp": { + "$date": "2018-08-13T03:25:00.465Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70fb3fa376d259db5fb69a" + }, + "timestamp": { + "$date": "2018-08-13T03:30:00.379Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70fc6ba376d259db5fb71b" + }, + "timestamp": { + "$date": "2018-08-13T03:35:00.38Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70fd97a376d259db5fb79f" + }, + "timestamp": { + "$date": "2018-08-13T03:40:00.405Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70fec3a376d259db5fb826" + }, + "timestamp": { + "$date": "2018-08-13T03:45:00.338Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b70ffefa376d259db5fb8ae" + }, + "timestamp": { + "$date": "2018-08-13T03:50:00.401Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b71011ba376d259db5fb937" + }, + "timestamp": { + "$date": "2018-08-13T03:55:00.366Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b710247a376d259db5fb9ba" + }, + "timestamp": { + "$date": "2018-08-13T04:00:00.376Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b710373a376d259db5fba3c" + }, + "timestamp": { + "$date": "2018-08-13T04:05:00.346Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b71049fa376d259db5fbac4" + }, + "timestamp": { + "$date": "2018-08-13T04:10:00.387Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7105cba376d259db5fbb47" + }, + "timestamp": { + "$date": "2018-08-13T04:15:00.367Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7106f7a376d259db5fbbd7" + }, + "timestamp": { + "$date": "2018-08-13T04:20:00.357Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b710823a376d259db5fbc58" + }, + "timestamp": { + "$date": "2018-08-13T04:25:00.459Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b71094fa376d259db5fbce2" + }, + "timestamp": { + "$date": "2018-08-13T04:30:00.381Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b710a7ba376d259db5fbd63" + }, + "timestamp": { + "$date": "2018-08-13T04:35:00.361Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b710ba7a376d259db5fbdee" + }, + "timestamp": { + "$date": "2018-08-13T04:40:00.397Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b710cd3a376d259db5fbe70" + }, + "timestamp": { + "$date": "2018-08-13T04:45:00.378Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b710dffa376d259db5fbef9" + }, + "timestamp": { + "$date": "2018-08-13T04:50:00.367Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b710f2ba376d259db5fbf81" + }, + "timestamp": { + "$date": "2018-08-13T04:55:00.396Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b711057a376d259db5fc006" + }, + "timestamp": { + "$date": "2018-08-13T05:00:00.369Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b711183a376d259db5fc08e" + }, + "timestamp": { + "$date": "2018-08-13T05:05:00.335Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7112afa376d259db5fc111" + }, + "timestamp": { + "$date": "2018-08-13T05:10:00.381Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7113dba376d259db5fc199" + }, + "timestamp": { + "$date": "2018-08-13T05:15:00.381Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b711507a376d259db5fc2e9" + }, + "timestamp": { + "$date": "2018-08-13T05:20:00.364Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b711633a376d259db5fc36f" + }, + "timestamp": { + "$date": "2018-08-13T05:25:00.415Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b71175fa376d259db5fc43b" + }, + "timestamp": { + "$date": "2018-08-13T05:30:00.37Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b71188ba376d259db5fc4c0" + }, + "timestamp": { + "$date": "2018-08-13T05:35:00.352Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7119b7a376d259db5fc54a" + }, + "timestamp": { + "$date": "2018-08-13T05:40:00.618Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b711ae3a376d259db5fc5cb" + }, + "timestamp": { + "$date": "2018-08-13T05:45:00.354Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b711c0fa376d259db5fc655" + }, + "timestamp": { + "$date": "2018-08-13T05:50:00.377Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b711d3ba376d259db5fc6d6" + }, + "timestamp": { + "$date": "2018-08-13T05:55:00.374Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b711e67a376d259db5fc766" + }, + "timestamp": { + "$date": "2018-08-13T06:00:00.493Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b711f93a376d259db5fc7e7" + }, + "timestamp": { + "$date": "2018-08-13T06:05:00.36Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7120bfa376d259db5fc882" + }, + "timestamp": { + "$date": "2018-08-13T06:10:00.402Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7121eba376d259db5fc904" + }, + "timestamp": { + "$date": "2018-08-13T06:15:00.36Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b712317a376d259db5fc98e" + }, + "timestamp": { + "$date": "2018-08-13T06:20:00.512Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b712443a376d259db5fca15" + }, + "timestamp": { + "$date": "2018-08-13T06:25:00.386Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b71256fa376d259db5fca9f" + }, + "timestamp": { + "$date": "2018-08-13T06:30:00.39Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b71269ba376d259db5fcb20" + }, + "timestamp": { + "$date": "2018-08-13T06:35:00.368Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7127c7a376d259db5fcbaa" + }, + "timestamp": { + "$date": "2018-08-13T06:40:00.573Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7128f3a376d259db5fcc2b" + }, + "timestamp": { + "$date": "2018-08-13T06:45:00.364Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b712a1fa376d259db5fccb5" + }, + "timestamp": { + "$date": "2018-08-13T06:50:00.495Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b712b4ba376d259db5fcd36" + }, + "timestamp": { + "$date": "2018-08-13T06:55:00.405Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b712c77a376d259db5fcdc0" + }, + "timestamp": { + "$date": "2018-08-13T07:00:00.408Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b712da3a376d259db5fce47" + }, + "timestamp": { + "$date": "2018-08-13T07:05:00.336Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b712ecfa376d259db5fceca" + }, + "timestamp": { + "$date": "2018-08-13T07:10:00.419Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b712ffba376d259db5fcf52" + }, + "timestamp": { + "$date": "2018-08-13T07:15:00.384Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b713127a376d259db5fcfd5" + }, + "timestamp": { + "$date": "2018-08-13T07:20:00.365Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b713253a376d259db5fd057" + }, + "timestamp": { + "$date": "2018-08-13T07:25:00.379Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b71337fa376d259db5fd0e7" + }, + "timestamp": { + "$date": "2018-08-13T07:30:00.508Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7134aba376d259db5fd168" + }, + "timestamp": { + "$date": "2018-08-13T07:35:00.359Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7135d7a376d259db5fd1f1" + }, + "timestamp": { + "$date": "2018-08-13T07:40:00.415Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b713703a376d259db5fd273" + }, + "timestamp": { + "$date": "2018-08-13T07:45:00.352Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b71382fa376d259db5fd2fb" + }, + "timestamp": { + "$date": "2018-08-13T07:50:00.358Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b71395ba376d259db5fd37e" + }, + "timestamp": { + "$date": "2018-08-13T07:55:00.383Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b713a87a376d259db5fd408" + }, + "timestamp": { + "$date": "2018-08-13T08:00:00.482Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b713bb3a376d259db5fd48f" + }, + "timestamp": { + "$date": "2018-08-13T08:05:00.502Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b713cdfa376d259db5fd513" + }, + "timestamp": { + "$date": "2018-08-13T08:10:00.414Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b713e0ba376d259db5fd59a" + }, + "timestamp": { + "$date": "2018-08-13T08:15:00.34Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b713f37a376d259db5fd623" + }, + "timestamp": { + "$date": "2018-08-13T08:20:00.363Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b714063a376d259db5fd6a5" + }, + "timestamp": { + "$date": "2018-08-13T08:25:00.409Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b71418fa376d259db5fd72e" + }, + "timestamp": { + "$date": "2018-08-13T08:30:00.389Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7142bba376d259db5fd7b6" + }, + "timestamp": { + "$date": "2018-08-13T08:35:00.422Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7143e7a376d259db5fd839" + }, + "timestamp": { + "$date": "2018-08-13T08:40:00.459Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b714513a376d259db5fd8c1" + }, + "timestamp": { + "$date": "2018-08-13T08:45:00.361Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b71463fa376d259db5fd94a" + }, + "timestamp": { + "$date": "2018-08-13T08:50:00.383Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b71476ba376d259db5fd9cc" + }, + "timestamp": { + "$date": "2018-08-13T08:55:00.412Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b714897a376d259db5fda4f" + }, + "timestamp": { + "$date": "2018-08-13T09:00:00.364Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7149c3a376d259db5fdad7" + }, + "timestamp": { + "$date": "2018-08-13T09:05:00.394Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b714aefa376d259db5fdb65" + }, + "timestamp": { + "$date": "2018-08-13T09:10:00.525Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b714c1ba376d259db5fdbee" + }, + "timestamp": { + "$date": "2018-08-13T09:15:00.347Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b714d47a376d259db5fdc72" + }, + "timestamp": { + "$date": "2018-08-13T09:20:00.368Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b714e73a376d259db5fdcf3" + }, + "timestamp": { + "$date": "2018-08-13T09:25:00.366Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b714f9fa376d259db5fdd77" + }, + "timestamp": { + "$date": "2018-08-13T09:30:00.361Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7150cba376d259db5fddf8" + }, + "timestamp": { + "$date": "2018-08-13T09:35:00.382Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7151f7a376d259db5fde8e" + }, + "timestamp": { + "$date": "2018-08-13T09:40:00.523Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b715323a376d259db5fdf17" + }, + "timestamp": { + "$date": "2018-08-13T09:45:00.354Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b71544fa376d259db5fdf9d" + }, + "timestamp": { + "$date": "2018-08-13T09:50:00.387Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b71557ba376d259db5fe01e" + }, + "timestamp": { + "$date": "2018-08-13T09:55:00.374Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7156a7a376d259db5fe0a1" + }, + "timestamp": { + "$date": "2018-08-13T10:00:00.371Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7157d3a376d259db5fe123" + }, + "timestamp": { + "$date": "2018-08-13T10:05:00.345Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7158ffa376d259db5fe1b3" + }, + "timestamp": { + "$date": "2018-08-13T10:10:00.508Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b715a2ba376d259db5fe234" + }, + "timestamp": { + "$date": "2018-08-13T10:15:00.373Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b715b57a376d259db5fe2d8" + }, + "timestamp": { + "$date": "2018-08-13T10:20:00.493Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b715c83a376d259db5fe360" + }, + "timestamp": { + "$date": "2018-08-13T10:25:00.399Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b715dafa376d259db5fe424" + }, + "timestamp": { + "$date": "2018-08-13T10:30:00.356Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b715edba376d259db5fe4b0" + }, + "timestamp": { + "$date": "2018-08-13T10:35:00.348Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b716007a376d259db5fe558" + }, + "timestamp": { + "$date": "2018-08-13T10:40:00.393Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b716133a376d259db5fe5e5" + }, + "timestamp": { + "$date": "2018-08-13T10:45:00.368Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b71625fa376d259db5fe674" + }, + "timestamp": { + "$date": "2018-08-13T10:50:00.374Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b71638ba376d259db5fe6fa" + }, + "timestamp": { + "$date": "2018-08-13T10:55:00.405Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7164b7a376d259db5fe78e" + }, + "timestamp": { + "$date": "2018-08-13T11:00:00.319Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7165e3a376d259db5fe815" + }, + "timestamp": { + "$date": "2018-08-13T11:05:00.318Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b71670fa376d259db5fe8a4" + }, + "timestamp": { + "$date": "2018-08-13T11:10:00.507Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b71683ba376d259db5fe92c" + }, + "timestamp": { + "$date": "2018-08-13T11:15:00.297Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b716967a376d259db5fe9d3" + }, + "timestamp": { + "$date": "2018-08-13T11:20:00.338Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b716a93a376d259db5fea98" + }, + "timestamp": { + "$date": "2018-08-13T11:25:00.341Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b716bbfa376d259db5feb21" + }, + "timestamp": { + "$date": "2018-08-13T11:30:00.325Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b716ceba376d259db5feba4" + }, + "timestamp": { + "$date": "2018-08-13T11:35:00.308Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b716e17a376d259db5fec9c" + }, + "timestamp": { + "$date": "2018-08-13T11:40:00.358Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b716f43a376d259db5fed2c" + }, + "timestamp": { + "$date": "2018-08-13T11:45:00.306Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b71706fa376d259db5fede7" + }, + "timestamp": { + "$date": "2018-08-13T11:50:00.33Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b71719ba376d259db5fee8f" + }, + "timestamp": { + "$date": "2018-08-13T11:55:00.32Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7172c7a376d259db5fef90" + }, + "timestamp": { + "$date": "2018-08-13T12:00:00.432Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7173f3a376d259db5ff036" + }, + "timestamp": { + "$date": "2018-08-13T12:05:00.309Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b717520a376d259db5ff101" + }, + "timestamp": { + "$date": "2018-08-13T12:10:00.405Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b71764ba376d259db5ff18b" + }, + "timestamp": { + "$date": "2018-08-13T12:15:00.306Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b717777a376d259db5ff215" + }, + "timestamp": { + "$date": "2018-08-13T12:20:00.34Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7178a3a376d259db5ff296" + }, + "timestamp": { + "$date": "2018-08-13T12:25:00.358Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7179cfa376d259db5ff3b4" + }, + "timestamp": { + "$date": "2018-08-13T12:30:00.416Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b717afba376d259db5ff4b2" + }, + "timestamp": { + "$date": "2018-08-13T12:35:00.305Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b717c27a376d259db5ff58e" + }, + "timestamp": { + "$date": "2018-08-13T12:40:00.357Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b717d53a376d259db5ff778" + }, + "timestamp": { + "$date": "2018-08-13T12:45:00.333Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b717e80a376d259db5ff8b1" + }, + "timestamp": { + "$date": "2018-08-13T12:50:00.458Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b717faba376d259db5ff9ab" + }, + "timestamp": { + "$date": "2018-08-13T12:55:00.327Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7180d7a376d259db5ffaa8" + }, + "timestamp": { + "$date": "2018-08-13T13:00:00.316Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b718203a376d259db5ffc60" + }, + "timestamp": { + "$date": "2018-08-13T13:05:00.341Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b71832fa376d259db5ffd6a" + }, + "timestamp": { + "$date": "2018-08-13T13:10:00.348Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b71845ba376d259db5ffe5f" + }, + "timestamp": { + "$date": "2018-08-13T13:15:00.292Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b718588a376d259db5fff5c" + }, + "timestamp": { + "$date": "2018-08-13T13:20:00.473Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7186b3a376d259db600050" + }, + "timestamp": { + "$date": "2018-08-13T13:25:00.35Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7187e0a376d259db600153" + }, + "timestamp": { + "$date": "2018-08-13T13:30:00.372Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b71890ba376d259db60029a" + }, + "timestamp": { + "$date": "2018-08-13T13:35:00.293Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b718a37a376d259db600398" + }, + "timestamp": { + "$date": "2018-08-13T13:40:00.356Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b718b63a376d259db60048d" + }, + "timestamp": { + "$date": "2018-08-13T13:45:00.307Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b718c90a376d259db60059e" + }, + "timestamp": { + "$date": "2018-08-13T13:50:00.543Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b718dbba376d259db600692" + }, + "timestamp": { + "$date": "2018-08-13T13:55:00.346Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b718ee7a376d259db6007a5" + }, + "timestamp": { + "$date": "2018-08-13T14:00:00.324Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b719013a376d259db6008c3" + }, + "timestamp": { + "$date": "2018-08-13T14:05:00.307Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b719140a376d259db6009ce" + }, + "timestamp": { + "$date": "2018-08-13T14:10:00.479Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b71926ba376d259db600ac8" + }, + "timestamp": { + "$date": "2018-08-13T14:15:00.311Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b719398a376d259db600bcd" + }, + "timestamp": { + "$date": "2018-08-13T14:20:00.334Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7194c3a376d259db600cc9" + }, + "timestamp": { + "$date": "2018-08-13T14:25:00.327Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b7195efa376d259db600dcd" + }, + "timestamp": { + "$date": "2018-08-13T14:30:00.339Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b71971ba376d259db600ecb" + }, + "timestamp": { + "$date": "2018-08-13T14:35:00.296Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b719848a376d259db600fcc" + }, + "timestamp": { + "$date": "2018-08-13T14:40:00.429Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b719973a376d259db6010cc" + }, + "timestamp": { + "$date": "2018-08-13T14:45:00.304Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b719a9fa376d259db6011c3" + }, + "timestamp": { + "$date": "2018-08-13T14:50:00.319Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b719bcca376d259db6012bd" + }, + "timestamp": { + "$date": "2018-08-13T14:55:00.374Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b719cf7a376d259db6013b8" + }, + "timestamp": { + "$date": "2018-08-13T15:00:00.327Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + } + ] +} +{ + "_id": { + "$oid": "5b719e23a376d259db6014b0" + }, + "timestamp": { + "$date": "2018-08-13T15:05:00.315Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b719f50a376d259db6015bc" + }, + "timestamp": { + "$date": "2018-08-13T15:10:00.348Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71a07ca376d259db6016cd" + }, + "timestamp": { + "$date": "2018-08-13T15:15:00.379Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71a1a8a376d259db6017c4" + }, + "timestamp": { + "$date": "2018-08-13T15:20:00.338Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71a2d4a376d259db6018b8" + }, + "timestamp": { + "$date": "2018-08-13T15:25:00.316Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71a400a376d259db6019b7" + }, + "timestamp": { + "$date": "2018-08-13T15:30:00.338Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71a52ca376d259db601aaf" + }, + "timestamp": { + "$date": "2018-08-13T15:35:00.335Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71a658a376d259db601ba5" + }, + "timestamp": { + "$date": "2018-08-13T15:40:00.343Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71a784a376d259db601cae" + }, + "timestamp": { + "$date": "2018-08-13T15:45:00.323Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71a8b0a376d259db601dc6" + }, + "timestamp": { + "$date": "2018-08-13T15:50:00.67Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71a9dca376d259db601ec2" + }, + "timestamp": { + "$date": "2018-08-13T15:55:00.383Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71ab09a376d259db60203a" + }, + "timestamp": { + "$date": "2018-08-13T16:00:01.357Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71ac34a376d259db6020c9" + }, + "timestamp": { + "$date": "2018-08-13T16:05:00.299Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71ad60a376d259db602151" + }, + "timestamp": { + "$date": "2018-08-13T16:10:00.352Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71ae8ca376d259db6021f4" + }, + "timestamp": { + "$date": "2018-08-13T16:15:00.32Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71afb8a376d259db6022bc" + }, + "timestamp": { + "$date": "2018-08-13T16:20:01.057Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71b0e4a376d259db602354" + }, + "timestamp": { + "$date": "2018-08-13T16:25:00.341Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71b210a376d259db6023e0" + }, + "timestamp": { + "$date": "2018-08-13T16:30:00.318Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71b33ca376d259db6024b0" + }, + "timestamp": { + "$date": "2018-08-13T16:35:00.409Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71b468a376d259db60255b" + }, + "timestamp": { + "$date": "2018-08-13T16:40:00.359Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71b594a376d259db6025e1" + }, + "timestamp": { + "$date": "2018-08-13T16:45:00.298Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71b6c0a376d259db602675" + }, + "timestamp": { + "$date": "2018-08-13T16:50:00.489Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71b7eca376d259db602708" + }, + "timestamp": { + "$date": "2018-08-13T16:55:00.331Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71b918a376d259db602791" + }, + "timestamp": { + "$date": "2018-08-13T17:00:00.349Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71ba44a376d259db602817" + }, + "timestamp": { + "$date": "2018-08-13T17:05:00.304Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71bb70a376d259db6028a2" + }, + "timestamp": { + "$date": "2018-08-13T17:10:00.587Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71bc9ca376d259db60292c" + }, + "timestamp": { + "$date": "2018-08-13T17:15:00.302Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71bdc8a376d259db6029e8" + }, + "timestamp": { + "$date": "2018-08-13T17:20:00.588Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71bef4a376d259db602b61" + }, + "timestamp": { + "$date": "2018-08-13T17:25:00.349Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71c020a376d259db602cb8" + }, + "timestamp": { + "$date": "2018-08-13T17:30:01.121Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71c14ca376d259db602db5" + }, + "timestamp": { + "$date": "2018-08-13T17:35:00.976Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71c278a376d259db602dfe" + }, + "timestamp": { + "$date": "2018-08-13T17:40:00.319Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71c3a4a376d259db602e47" + }, + "timestamp": { + "$date": "2018-08-13T17:45:00.295Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71c4d0a376d259db602e8f" + }, + "timestamp": { + "$date": "2018-08-13T17:50:00.325Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71c5fca376d259db602ed4" + }, + "timestamp": { + "$date": "2018-08-13T17:55:00.294Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71c728a376d259db602f98" + }, + "timestamp": { + "$date": "2018-08-13T18:00:01.02Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71c854a376d259db6030bb" + }, + "timestamp": { + "$date": "2018-08-13T18:05:00.358Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5287" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71c980a376d259db603140" + }, + "timestamp": { + "$date": "2018-08-13T18:10:00.328Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71caaca376d259db6031c7" + }, + "timestamp": { + "$date": "2018-08-13T18:15:00.301Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71cbd8a376d259db6032d9" + }, + "timestamp": { + "$date": "2018-08-13T18:20:00.719Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71cd04a376d259db603425" + }, + "timestamp": { + "$date": "2018-08-13T18:25:00.325Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71ce30a376d259db6034c9" + }, + "timestamp": { + "$date": "2018-08-13T18:30:00.438Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71cf5ca376d259db6036fb" + }, + "timestamp": { + "$date": "2018-08-13T18:35:00.357Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Conway.M", + "clientDbId": "5193" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71d088a376d259db6037a6" + }, + "timestamp": { + "$date": "2018-08-13T18:40:00.465Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71d1b4a376d259db60382d" + }, + "timestamp": { + "$date": "2018-08-13T18:45:00.327Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Max Conway", + "clientDbId": "5472" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71d2e0a376d259db603abf" + }, + "timestamp": { + "$date": "2018-08-13T18:50:00.456Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Max Conway", + "clientDbId": "5472" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71d40fa376d259db603e3f" + }, + "timestamp": { + "$date": "2018-08-13T18:55:04.053Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Max Conway", + "clientDbId": "5472" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71d538a376d259db603f29" + }, + "timestamp": { + "$date": "2018-08-13T19:00:00.388Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Max Conway", + "clientDbId": "5472" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71d664a376d259db604030" + }, + "timestamp": { + "$date": "2018-08-13T19:05:00.366Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Max Conway", + "clientDbId": "5472" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71d790a376d259db6040fb" + }, + "timestamp": { + "$date": "2018-08-13T19:10:00.373Z" + }, + "users": [ + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Max Conway", + "clientDbId": "5472" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71d8bca376d259db604188" + }, + "timestamp": { + "$date": "2018-08-13T19:15:00.518Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71d9e8a376d259db60424a" + }, + "timestamp": { + "$date": "2018-08-13T19:20:00.423Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Carr", + "clientDbId": "5474" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71db14a376d259db60430c" + }, + "timestamp": { + "$date": "2018-08-13T19:25:00.396Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "TeamSpeakUser", + "clientDbId": "5475" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Carr", + "clientDbId": "5474" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71dc40a376d259db6043bf" + }, + "timestamp": { + "$date": "2018-08-13T19:30:00.528Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Carr", + "clientDbId": "5474" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71dd6ca376d259db604449" + }, + "timestamp": { + "$date": "2018-08-13T19:35:00.382Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "TeamSpeakUser", + "clientDbId": "5474" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71de98a376d259db6044d3" + }, + "timestamp": { + "$date": "2018-08-13T19:40:00.381Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "TeamSpeakUser", + "clientDbId": "5474" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71dfc4a376d259db60455c" + }, + "timestamp": { + "$date": "2018-08-13T19:45:00.352Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "TeamSpeakUser", + "clientDbId": "5474" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71e0f3a376d259db6045ef" + }, + "timestamp": { + "$date": "2018-08-13T19:50:03.399Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "FltLt.Johnson.R", + "clientDbId": "4062" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "TeamSpeakUser", + "clientDbId": "5474" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71e21ca376d259db6046c9" + }, + "timestamp": { + "$date": "2018-08-13T19:55:00.974Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "TeamSpeakUser", + "clientDbId": "5474" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71e34ba376d259db604778" + }, + "timestamp": { + "$date": "2018-08-13T20:00:03.079Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "TeamSpeakUser", + "clientDbId": "5474" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71e476a376d259db604842" + }, + "timestamp": { + "$date": "2018-08-13T20:05:02.608Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "TeamSpeakUser", + "clientDbId": "5474" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71e5a3a376d259db60491a" + }, + "timestamp": { + "$date": "2018-08-13T20:10:03.373Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "TeamSpeakUser", + "clientDbId": "5474" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71e6cfa376d259db6049e7" + }, + "timestamp": { + "$date": "2018-08-13T20:15:03.519Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71e7fba376d259db604acd" + }, + "timestamp": { + "$date": "2018-08-13T20:20:03.209Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71e927a376d259db604ba3" + }, + "timestamp": { + "$date": "2018-08-13T20:25:03.306Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71ea53a376d259db604c76" + }, + "timestamp": { + "$date": "2018-08-13T20:30:03.305Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71eb7fa376d259db604d5e" + }, + "timestamp": { + "$date": "2018-08-13T20:35:03.441Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71ecaba376d259db604e4c" + }, + "timestamp": { + "$date": "2018-08-13T20:40:03.553Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71edd6a376d259db604f38" + }, + "timestamp": { + "$date": "2018-08-13T20:45:02.565Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71ef02a376d259db60501f" + }, + "timestamp": { + "$date": "2018-08-13T20:50:03.011Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71f02fa376d259db605186" + }, + "timestamp": { + "$date": "2018-08-13T20:55:03.289Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71f15ba376d259db60531e" + }, + "timestamp": { + "$date": "2018-08-13T21:00:03.39Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71f284a376d259db605407" + }, + "timestamp": { + "$date": "2018-08-13T21:05:00.385Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71f3b2a376d259db6054f5" + }, + "timestamp": { + "$date": "2018-08-13T21:10:02.994Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "ACRE", + "channelId": "1040", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71f4dca376d259db6055c3" + }, + "timestamp": { + "$date": "2018-08-13T21:15:00.32Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71f608a376d259db605694" + }, + "timestamp": { + "$date": "2018-08-13T21:20:00.327Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71f734a376d259db60576e" + }, + "timestamp": { + "$date": "2018-08-13T21:25:00.335Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71f860a376d259db605872" + }, + "timestamp": { + "$date": "2018-08-13T21:30:00.437Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71f98ca376d259db605946" + }, + "timestamp": { + "$date": "2018-08-13T21:35:00.44Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71fab8a376d259db605a4e" + }, + "timestamp": { + "$date": "2018-08-13T21:40:00.461Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71fbe4a376d259db605b3a" + }, + "timestamp": { + "$date": "2018-08-13T21:45:00.336Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71fd10a376d259db605c19" + }, + "timestamp": { + "$date": "2018-08-13T21:50:00.334Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71fe3ca376d259db605d51" + }, + "timestamp": { + "$date": "2018-08-13T21:55:00.308Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Mission Creation/Modding/Work Room", + "channelId": "1001", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b71ff68a376d259db605e79" + }, + "timestamp": { + "$date": "2018-08-13T22:00:00.365Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b720094a376d259db606091" + }, + "timestamp": { + "$date": "2018-08-13T22:05:00.3Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7201c0a376d259db60618a" + }, + "timestamp": { + "$date": "2018-08-13T22:10:00.464Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7202eca376d259db60620d" + }, + "timestamp": { + "$date": "2018-08-13T22:15:00.343Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b720418a376d259db606292" + }, + "timestamp": { + "$date": "2018-08-13T22:20:00.322Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b720544a376d259db606316" + }, + "timestamp": { + "$date": "2018-08-13T22:25:00.34Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b720670a376d259db6063a8" + }, + "timestamp": { + "$date": "2018-08-13T22:30:00.522Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b72079ca376d259db606431" + }, + "timestamp": { + "$date": "2018-08-13T22:35:00.329Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7208c8a376d259db6064bd" + }, + "timestamp": { + "$date": "2018-08-13T22:40:00.45Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7209f4a376d259db606548" + }, + "timestamp": { + "$date": "2018-08-13T22:45:00.348Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b720b20a376d259db6065e1" + }, + "timestamp": { + "$date": "2018-08-13T22:50:00.325Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b720c4ca376d259db6067af" + }, + "timestamp": { + "$date": "2018-08-13T22:55:00.302Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b720d78a376d259db6068ea" + }, + "timestamp": { + "$date": "2018-08-13T23:00:00.366Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b720ea4a376d259db6069ab" + }, + "timestamp": { + "$date": "2018-08-13T23:05:00.297Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b720fd0a376d259db606ae1" + }, + "timestamp": { + "$date": "2018-08-13T23:10:00.334Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7210fca376d259db606c15" + }, + "timestamp": { + "$date": "2018-08-13T23:15:00.35Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b721228a376d259db606ca0" + }, + "timestamp": { + "$date": "2018-08-13T23:20:00.359Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b721354a376d259db606d8c" + }, + "timestamp": { + "$date": "2018-08-13T23:25:00.298Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b721480a376d259db606e11" + }, + "timestamp": { + "$date": "2018-08-13T23:30:00.386Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b7215aca376d259db606e9b" + }, + "timestamp": { + "$date": "2018-08-13T23:35:00.342Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b7216d8a376d259db606f27" + }, + "timestamp": { + "$date": "2018-08-13T23:40:00.337Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b721804a376d259db606faa" + }, + "timestamp": { + "$date": "2018-08-13T23:45:00.374Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b721930a376d259db60702f" + }, + "timestamp": { + "$date": "2018-08-13T23:50:00.432Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b721a5ca376d259db6070b9" + }, + "timestamp": { + "$date": "2018-08-13T23:55:00.296Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b721b88a376d259db60713e" + }, + "timestamp": { + "$date": "2018-08-14T00:00:00.41Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b721cb4a376d259db6071c8" + }, + "timestamp": { + "$date": "2018-08-14T00:05:00.344Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b721de0a376d259db607272" + }, + "timestamp": { + "$date": "2018-08-14T00:10:00.331Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b721f0ca376d259db6072f5" + }, + "timestamp": { + "$date": "2018-08-14T00:15:00.329Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b722038a376d259db60737f" + }, + "timestamp": { + "$date": "2018-08-14T00:20:00.328Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b722164a376d259db607406" + }, + "timestamp": { + "$date": "2018-08-14T00:25:00.297Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b722290a376d259db60748f" + }, + "timestamp": { + "$date": "2018-08-14T00:30:00.378Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7223bca376d259db607514" + }, + "timestamp": { + "$date": "2018-08-14T00:35:00.294Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7224e8a376d259db6075a4" + }, + "timestamp": { + "$date": "2018-08-14T00:40:00.337Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b722614a376d259db607629" + }, + "timestamp": { + "$date": "2018-08-14T00:45:00.334Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b722740a376d259db6076b5" + }, + "timestamp": { + "$date": "2018-08-14T00:50:00.459Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72286ca376d259db607738" + }, + "timestamp": { + "$date": "2018-08-14T00:55:00.308Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b722998a376d259db6077ec" + }, + "timestamp": { + "$date": "2018-08-14T01:00:00.459Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b722ac4a376d259db607b93" + }, + "timestamp": { + "$date": "2018-08-14T01:05:00.304Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b722bf0a376d259db607cee" + }, + "timestamp": { + "$date": "2018-08-14T01:10:00.472Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b722d1ca376d259db607f9e" + }, + "timestamp": { + "$date": "2018-08-14T01:15:00.334Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b722e48a376d259db60802e" + }, + "timestamp": { + "$date": "2018-08-14T01:20:00.459Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b722f74a376d259db6080b1" + }, + "timestamp": { + "$date": "2018-08-14T01:25:00.312Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7230a0a376d259db608132" + }, + "timestamp": { + "$date": "2018-08-14T01:30:00.358Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7231cca376d259db6081c0" + }, + "timestamp": { + "$date": "2018-08-14T01:35:00.296Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7232f8a376d259db608249" + }, + "timestamp": { + "$date": "2018-08-14T01:40:00.451Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b723424a376d259db6082c7" + }, + "timestamp": { + "$date": "2018-08-14T01:45:00.364Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b723550a376d259db60834e" + }, + "timestamp": { + "$date": "2018-08-14T01:50:00.462Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72367ca376d259db6083cc" + }, + "timestamp": { + "$date": "2018-08-14T01:55:00.306Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7237a8a376d259db60844d" + }, + "timestamp": { + "$date": "2018-08-14T02:00:00.348Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7238d4a376d259db6084cb" + }, + "timestamp": { + "$date": "2018-08-14T02:05:00.294Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b723a00a376d259db608551" + }, + "timestamp": { + "$date": "2018-08-14T02:10:00.366Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b723b2ca376d259db6085d0" + }, + "timestamp": { + "$date": "2018-08-14T02:15:00.339Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b723c58a376d259db608657" + }, + "timestamp": { + "$date": "2018-08-14T02:20:00.487Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b723d84a376d259db6086d5" + }, + "timestamp": { + "$date": "2018-08-14T02:25:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b723eb0a376d259db608756" + }, + "timestamp": { + "$date": "2018-08-14T02:30:00.371Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b723fdca376d259db6087d4" + }, + "timestamp": { + "$date": "2018-08-14T02:35:00.297Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b724108a376d259db608854" + }, + "timestamp": { + "$date": "2018-08-14T02:40:00.332Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b724234a376d259db6088d9" + }, + "timestamp": { + "$date": "2018-08-14T02:45:00.365Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b724360a376d259db608959" + }, + "timestamp": { + "$date": "2018-08-14T02:50:00.324Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72448ca376d259db6089de" + }, + "timestamp": { + "$date": "2018-08-14T02:55:00.402Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7245b8a376d259db608a5e" + }, + "timestamp": { + "$date": "2018-08-14T03:00:00.36Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7246dca376d259db608adb" + }, + "timestamp": { + "$date": "2018-08-14T03:05:00.296Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b724808a376d259db608b62" + }, + "timestamp": { + "$date": "2018-08-14T03:10:00.333Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b724934a376d259db608be0" + }, + "timestamp": { + "$date": "2018-08-14T03:15:00.344Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b724a60a376d259db608c60" + }, + "timestamp": { + "$date": "2018-08-14T03:20:00.377Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b724b8ca376d259db608ce5" + }, + "timestamp": { + "$date": "2018-08-14T03:25:00.367Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b724cb8a376d259db608d66" + }, + "timestamp": { + "$date": "2018-08-14T03:30:00.33Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b724de4a376d259db608de4" + }, + "timestamp": { + "$date": "2018-08-14T03:35:00.334Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b724f10a376d259db608e6b" + }, + "timestamp": { + "$date": "2018-08-14T03:40:00.376Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72503ca376d259db608ee9" + }, + "timestamp": { + "$date": "2018-08-14T03:45:00.344Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b725168a376d259db608f69" + }, + "timestamp": { + "$date": "2018-08-14T03:50:00.371Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b725294a376d259db608fe8" + }, + "timestamp": { + "$date": "2018-08-14T03:55:00.297Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7253c0a376d259db60906f" + }, + "timestamp": { + "$date": "2018-08-14T04:00:00.494Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7254eca376d259db6090ed" + }, + "timestamp": { + "$date": "2018-08-14T04:05:00.397Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b725618a376d259db60916e" + }, + "timestamp": { + "$date": "2018-08-14T04:10:00.34Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b725744a376d259db6091ec" + }, + "timestamp": { + "$date": "2018-08-14T04:15:00.296Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b725870a376d259db609271" + }, + "timestamp": { + "$date": "2018-08-14T04:20:00.362Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72599ca376d259db6092f1" + }, + "timestamp": { + "$date": "2018-08-14T04:25:00.318Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b725ac8a376d259db609378" + }, + "timestamp": { + "$date": "2018-08-14T04:30:00.583Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b725bf4a376d259db6093f6" + }, + "timestamp": { + "$date": "2018-08-14T04:35:00.356Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b725d20a376d259db609505" + }, + "timestamp": { + "$date": "2018-08-14T04:40:00.456Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b725e4ca376d259db609583" + }, + "timestamp": { + "$date": "2018-08-14T04:45:00.295Z" + }, + "users": [ + null, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b725f78a376d259db60960a" + }, + "timestamp": { + "$date": "2018-08-14T04:50:00.384Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7260a4a376d259db60968a" + }, + "timestamp": { + "$date": "2018-08-14T04:55:00.306Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7261d0a376d259db609711" + }, + "timestamp": { + "$date": "2018-08-14T05:00:00.331Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7262fca376d259db60978f" + }, + "timestamp": { + "$date": "2018-08-14T05:05:00.368Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b726428a376d259db60980f" + }, + "timestamp": { + "$date": "2018-08-14T05:10:00.344Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b726554a376d259db60988e" + }, + "timestamp": { + "$date": "2018-08-14T05:15:00.296Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b726680a376d259db609915" + }, + "timestamp": { + "$date": "2018-08-14T05:20:00.563Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7267aca376d259db609993" + }, + "timestamp": { + "$date": "2018-08-14T05:25:00.306Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7268d8a376d259db609a1a" + }, + "timestamp": { + "$date": "2018-08-14T05:30:00.359Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b726a04a376d259db609a98" + }, + "timestamp": { + "$date": "2018-08-14T05:35:00.39Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b726b30a376d259db609b18" + }, + "timestamp": { + "$date": "2018-08-14T05:40:00.351Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b726c5ca376d259db609b97" + }, + "timestamp": { + "$date": "2018-08-14T05:45:00.299Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b726d88a376d259db609c17" + }, + "timestamp": { + "$date": "2018-08-14T05:50:00.363Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b726eb4a376d259db609c9c" + }, + "timestamp": { + "$date": "2018-08-14T05:55:00.34Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b726fe0a376d259db609d1c" + }, + "timestamp": { + "$date": "2018-08-14T06:00:00.367Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72710ca376d259db609da1" + }, + "timestamp": { + "$date": "2018-08-14T06:05:00.441Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b727238a376d259db609e21" + }, + "timestamp": { + "$date": "2018-08-14T06:10:00.344Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b727364a376d259db609ea0" + }, + "timestamp": { + "$date": "2018-08-14T06:15:00.295Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b727490a376d259db609f27" + }, + "timestamp": { + "$date": "2018-08-14T06:20:00.391Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7275bca376d259db609fa5" + }, + "timestamp": { + "$date": "2018-08-14T06:25:00.341Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7276e8a376d259db60a025" + }, + "timestamp": { + "$date": "2018-08-14T06:30:00.329Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b727814a376d259db60a0a4" + }, + "timestamp": { + "$date": "2018-08-14T06:35:00.319Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b727940a376d259db60a129" + }, + "timestamp": { + "$date": "2018-08-14T06:40:00.327Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b727a6ca376d259db60a1a9" + }, + "timestamp": { + "$date": "2018-08-14T06:45:00.307Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b727b98a376d259db60a22a" + }, + "timestamp": { + "$date": "2018-08-14T06:50:00.356Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b727cc4a376d259db60a2a8" + }, + "timestamp": { + "$date": "2018-08-14T06:55:00.298Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b727df0a376d259db60a32d" + }, + "timestamp": { + "$date": "2018-08-14T07:00:00.327Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b727f1ca376d259db60a3ad" + }, + "timestamp": { + "$date": "2018-08-14T07:05:00.331Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b728048a376d259db60a433" + }, + "timestamp": { + "$date": "2018-08-14T07:10:00.356Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b728174a376d259db60a4b2" + }, + "timestamp": { + "$date": "2018-08-14T07:15:00.296Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7282a0a376d259db60a533" + }, + "timestamp": { + "$date": "2018-08-14T07:20:00.392Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7283cca376d259db60a5c1" + }, + "timestamp": { + "$date": "2018-08-14T07:25:00.296Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7284f8a376d259db60a64c" + }, + "timestamp": { + "$date": "2018-08-14T07:30:00.47Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b728624a376d259db60a6ca" + }, + "timestamp": { + "$date": "2018-08-14T07:35:00.337Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b728750a376d259db60a751" + }, + "timestamp": { + "$date": "2018-08-14T07:40:00.464Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72887ca376d259db60a7cf" + }, + "timestamp": { + "$date": "2018-08-14T07:45:00.319Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7289a8a376d259db60a850" + }, + "timestamp": { + "$date": "2018-08-14T07:50:00.368Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b728ad4a376d259db60a8ce" + }, + "timestamp": { + "$date": "2018-08-14T07:55:00.297Z" + }, + "users": [ + null, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b728c00a376d259db60a957" + }, + "timestamp": { + "$date": "2018-08-14T08:00:00.489Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b728d2ca376d259db60a9d5" + }, + "timestamp": { + "$date": "2018-08-14T08:05:00.333Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b728e58a376d259db60aa55" + }, + "timestamp": { + "$date": "2018-08-14T08:10:00.33Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b728f84a376d259db60aada" + }, + "timestamp": { + "$date": "2018-08-14T08:15:00.364Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7290b0a376d259db60ab5b" + }, + "timestamp": { + "$date": "2018-08-14T08:20:00.364Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7291dca376d259db60abd9" + }, + "timestamp": { + "$date": "2018-08-14T08:25:00.301Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b729308a376d259db60ac5e" + }, + "timestamp": { + "$date": "2018-08-14T08:30:00.456Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b729434a376d259db60ad03" + }, + "timestamp": { + "$date": "2018-08-14T08:35:00.358Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b729560a376d259db60ad8f" + }, + "timestamp": { + "$date": "2018-08-14T08:40:00.336Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72968ca376d259db60ae1d" + }, + "timestamp": { + "$date": "2018-08-14T08:45:00.324Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7297b8a376d259db60aea3" + }, + "timestamp": { + "$date": "2018-08-14T08:50:00.351Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7298e4a376d259db60af30" + }, + "timestamp": { + "$date": "2018-08-14T08:55:00.303Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b729a10a376d259db60aff1" + }, + "timestamp": { + "$date": "2018-08-14T09:00:00.356Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b729b3ca376d259db60b125" + }, + "timestamp": { + "$date": "2018-08-14T09:05:00.36Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b729c68a376d259db60b34b" + }, + "timestamp": { + "$date": "2018-08-14T09:10:00.34Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b729d94a376d259db60b4ea" + }, + "timestamp": { + "$date": "2018-08-14T09:15:00.344Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b729ec0a376d259db60b667" + }, + "timestamp": { + "$date": "2018-08-14T09:20:00.368Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b729feca376d259db60b7b8" + }, + "timestamp": { + "$date": "2018-08-14T09:25:00.299Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72a118a376d259db60b949" + }, + "timestamp": { + "$date": "2018-08-14T09:30:00.332Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72a244a376d259db60bad4" + }, + "timestamp": { + "$date": "2018-08-14T09:35:00.436Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72a370a376d259db60bc00" + }, + "timestamp": { + "$date": "2018-08-14T09:40:00.342Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72a49ca376d259db60bcf3" + }, + "timestamp": { + "$date": "2018-08-14T09:45:00.344Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72a5c8a376d259db60bdd9" + }, + "timestamp": { + "$date": "2018-08-14T09:50:00.386Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72a6f4a376d259db60bebe" + }, + "timestamp": { + "$date": "2018-08-14T09:55:00.299Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72a820a376d259db60bfa3" + }, + "timestamp": { + "$date": "2018-08-14T10:00:00.33Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72a94ca376d259db60c085" + }, + "timestamp": { + "$date": "2018-08-14T10:05:00.327Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72aa78a376d259db60c1a6" + }, + "timestamp": { + "$date": "2018-08-14T10:10:00.454Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72aba4a376d259db60c2e1" + }, + "timestamp": { + "$date": "2018-08-14T10:15:00.298Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72acd0a376d259db60c3d0" + }, + "timestamp": { + "$date": "2018-08-14T10:20:00.366Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72adfca376d259db60c49b" + }, + "timestamp": { + "$date": "2018-08-14T10:25:00.306Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72af28a376d259db60c56b" + }, + "timestamp": { + "$date": "2018-08-14T10:30:00.498Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72b054a376d259db60c636" + }, + "timestamp": { + "$date": "2018-08-14T10:35:00.349Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72b180a376d259db60c70e" + }, + "timestamp": { + "$date": "2018-08-14T10:40:00.607Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72b2aca376d259db60c7d7" + }, + "timestamp": { + "$date": "2018-08-14T10:45:00.295Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72b3d8a376d259db60c8ab" + }, + "timestamp": { + "$date": "2018-08-14T10:50:00.52Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72b504a376d259db60c982" + }, + "timestamp": { + "$date": "2018-08-14T10:55:00.307Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72b630a376d259db60ca4e" + }, + "timestamp": { + "$date": "2018-08-14T11:00:00.337Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72b75ca376d259db60cb2c" + }, + "timestamp": { + "$date": "2018-08-14T11:05:00.348Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72b888a376d259db60cc29" + }, + "timestamp": { + "$date": "2018-08-14T11:10:00.471Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72b9b4a376d259db60cd98" + }, + "timestamp": { + "$date": "2018-08-14T11:15:00.319Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72bae0a376d259db60cfeb" + }, + "timestamp": { + "$date": "2018-08-14T11:20:00.398Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72bc0ca376d259db60d112" + }, + "timestamp": { + "$date": "2018-08-14T11:25:00.308Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72bd38a376d259db60d1de" + }, + "timestamp": { + "$date": "2018-08-14T11:30:00.351Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72be64a376d259db60d2b5" + }, + "timestamp": { + "$date": "2018-08-14T11:35:00.323Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72bf90a376d259db60d38c" + }, + "timestamp": { + "$date": "2018-08-14T11:40:00.372Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72c0bca376d259db60d456" + }, + "timestamp": { + "$date": "2018-08-14T11:45:00.386Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72c1e8a376d259db60d528" + }, + "timestamp": { + "$date": "2018-08-14T11:50:00.43Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72c314a376d259db60d675" + }, + "timestamp": { + "$date": "2018-08-14T11:55:00.303Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72c440a376d259db60d73f" + }, + "timestamp": { + "$date": "2018-08-14T12:00:00.326Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72c56ca376d259db60d838" + }, + "timestamp": { + "$date": "2018-08-14T12:05:00.396Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72c698a376d259db60d90a" + }, + "timestamp": { + "$date": "2018-08-14T12:10:00.435Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72c7c4a376d259db60d9e0" + }, + "timestamp": { + "$date": "2018-08-14T12:15:00.319Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72c8f0a376d259db60dab7" + }, + "timestamp": { + "$date": "2018-08-14T12:20:00.349Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72ca1ca376d259db60db86" + }, + "timestamp": { + "$date": "2018-08-14T12:25:00.352Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72cb48a376d259db60dc52" + }, + "timestamp": { + "$date": "2018-08-14T12:30:00.337Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72cc74a376d259db60dd21" + }, + "timestamp": { + "$date": "2018-08-14T12:35:00.368Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72cda0a376d259db60ddf2" + }, + "timestamp": { + "$date": "2018-08-14T12:40:00.325Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72cecca376d259db60dece" + }, + "timestamp": { + "$date": "2018-08-14T12:45:00.38Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72cff8a376d259db60dfa9" + }, + "timestamp": { + "$date": "2018-08-14T12:50:00.389Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72d124a376d259db60e093" + }, + "timestamp": { + "$date": "2018-08-14T12:55:00.342Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72d250a376d259db60e20c" + }, + "timestamp": { + "$date": "2018-08-14T13:00:00.347Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72d37ca376d259db60e367" + }, + "timestamp": { + "$date": "2018-08-14T13:05:00.405Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72d4a8a376d259db60e476" + }, + "timestamp": { + "$date": "2018-08-14T13:10:00.358Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72d5d4a376d259db60e57d" + }, + "timestamp": { + "$date": "2018-08-14T13:15:00.323Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72d701a376d259db60e682" + }, + "timestamp": { + "$date": "2018-08-14T13:20:00.681Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72d82ca376d259db60e78c" + }, + "timestamp": { + "$date": "2018-08-14T13:25:00.342Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72d958a376d259db60e894" + }, + "timestamp": { + "$date": "2018-08-14T13:30:00.343Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72da84a376d259db60e99b" + }, + "timestamp": { + "$date": "2018-08-14T13:35:00.35Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72dbb0a376d259db60eab9" + }, + "timestamp": { + "$date": "2018-08-14T13:40:00.332Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72dcdca376d259db60ebb5" + }, + "timestamp": { + "$date": "2018-08-14T13:45:00.328Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72de09a376d259db60ecb9" + }, + "timestamp": { + "$date": "2018-08-14T13:50:00.477Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72df34a376d259db60edca" + }, + "timestamp": { + "$date": "2018-08-14T13:55:00.297Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72e061a376d259db60eeea" + }, + "timestamp": { + "$date": "2018-08-14T14:00:00.472Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72e18ca376d259db60f034" + }, + "timestamp": { + "$date": "2018-08-14T14:05:00.344Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72e2b8a376d259db60f14a" + }, + "timestamp": { + "$date": "2018-08-14T14:10:00.344Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72e3e4a376d259db60f25b" + }, + "timestamp": { + "$date": "2018-08-14T14:15:00.347Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72e510a376d259db60f358" + }, + "timestamp": { + "$date": "2018-08-14T14:20:00.353Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72e63ca376d259db60f488" + }, + "timestamp": { + "$date": "2018-08-14T14:25:00.319Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72e768a376d259db60f5d3" + }, + "timestamp": { + "$date": "2018-08-14T14:30:00.424Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72e894a376d259db60f710" + }, + "timestamp": { + "$date": "2018-08-14T14:35:00.332Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72e9c1a376d259db60f827" + }, + "timestamp": { + "$date": "2018-08-14T14:40:00.351Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72eaeca376d259db60f942" + }, + "timestamp": { + "$date": "2018-08-14T14:45:00.347Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72ec18a376d259db60fa4b" + }, + "timestamp": { + "$date": "2018-08-14T14:50:00.345Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72ed44a376d259db60fb4b" + }, + "timestamp": { + "$date": "2018-08-14T14:55:00.307Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72ee70a376d259db60fc69" + }, + "timestamp": { + "$date": "2018-08-14T15:00:00.329Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72ef9da376d259db60fd89" + }, + "timestamp": { + "$date": "2018-08-14T15:05:00.463Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72f0c8a376d259db60fe87" + }, + "timestamp": { + "$date": "2018-08-14T15:10:00.341Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72f1f4a376d259db60ffb2" + }, + "timestamp": { + "$date": "2018-08-14T15:15:00.371Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72f321a376d259db6100e0" + }, + "timestamp": { + "$date": "2018-08-14T15:20:00.394Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72f44ca376d259db6101f6" + }, + "timestamp": { + "$date": "2018-08-14T15:25:00.314Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72f579a376d259db61036a" + }, + "timestamp": { + "$date": "2018-08-14T15:30:00.362Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72f6a5a376d259db61046b" + }, + "timestamp": { + "$date": "2018-08-14T15:35:00.492Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72f7d0a376d259db610588" + }, + "timestamp": { + "$date": "2018-08-14T15:40:00.344Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72f8fca376d259db6106b6" + }, + "timestamp": { + "$date": "2018-08-14T15:45:00.297Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72fa29a376d259db6107db" + }, + "timestamp": { + "$date": "2018-08-14T15:50:00.614Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72fb54a376d259db610908" + }, + "timestamp": { + "$date": "2018-08-14T15:55:00.312Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72fc81a376d259db610ab9" + }, + "timestamp": { + "$date": "2018-08-14T16:00:00.469Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72fdada376d259db610c73" + }, + "timestamp": { + "$date": "2018-08-14T16:05:00.441Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b72fed9a376d259db610d63" + }, + "timestamp": { + "$date": "2018-08-14T16:10:01.007Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b730004a376d259db610deb" + }, + "timestamp": { + "$date": "2018-08-14T16:15:00.325Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b730131a376d259db610f1b" + }, + "timestamp": { + "$date": "2018-08-14T16:20:00.366Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b73025ca376d259db610fa3" + }, + "timestamp": { + "$date": "2018-08-14T16:25:00.292Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b730389a376d259db61102e" + }, + "timestamp": { + "$date": "2018-08-14T16:30:00.327Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b7304b4a376d259db6110b8" + }, + "timestamp": { + "$date": "2018-08-14T16:35:00.32Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b7305e1a376d259db611156" + }, + "timestamp": { + "$date": "2018-08-14T16:40:00.875Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b73070ca376d259db6111dd" + }, + "timestamp": { + "$date": "2018-08-14T16:45:00.303Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b730839a376d259db61127b" + }, + "timestamp": { + "$date": "2018-08-14T16:50:00.428Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Public Game Room #1", + "channelId": "1002", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b730964a376d259db611304" + }, + "timestamp": { + "$date": "2018-08-14T16:55:00.295Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b730a91a376d259db61139d" + }, + "timestamp": { + "$date": "2018-08-14T17:00:00.316Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b730bbda376d259db611429" + }, + "timestamp": { + "$date": "2018-08-14T17:05:00.325Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b730ce9a376d259db6114e5" + }, + "timestamp": { + "$date": "2018-08-14T17:10:00.323Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Maverick Training Room", + "channelId": "1134", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Pte.Parle.H", + "clientDbId": "5411" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b730e15a376d259db611575" + }, + "timestamp": { + "$date": "2018-08-14T17:15:00.424Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b730f41a376d259db611604" + }, + "timestamp": { + "$date": "2018-08-14T17:20:00.362Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b73106da376d259db6116a3" + }, + "timestamp": { + "$date": "2018-08-14T17:25:00.292Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b731199a376d259db61173f" + }, + "timestamp": { + "$date": "2018-08-14T17:30:00.358Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b7312c5a376d259db6117c2" + }, + "timestamp": { + "$date": "2018-08-14T17:35:00.369Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b7313f1a376d259db611851" + }, + "timestamp": { + "$date": "2018-08-14T17:40:00.312Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b73151da376d259db6118df" + }, + "timestamp": { + "$date": "2018-08-14T17:45:00.467Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b731649a376d259db61196d" + }, + "timestamp": { + "$date": "2018-08-14T17:50:00.769Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b731775a376d259db6119f2" + }, + "timestamp": { + "$date": "2018-08-14T17:55:00.294Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7318a1a376d259db611ab8" + }, + "timestamp": { + "$date": "2018-08-14T18:00:00.795Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7319cda376d259db611b79" + }, + "timestamp": { + "$date": "2018-08-14T18:05:00.378Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b731af9a376d259db611c40" + }, + "timestamp": { + "$date": "2018-08-14T18:10:00.313Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b731c25a376d259db611d00" + }, + "timestamp": { + "$date": "2018-08-14T18:15:00.333Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b731d51a376d259db611dcc" + }, + "timestamp": { + "$date": "2018-08-14T18:20:00.362Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b731e7da376d259db611ef1" + }, + "timestamp": { + "$date": "2018-08-14T18:25:00.393Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b731fa9a376d259db611fbd" + }, + "timestamp": { + "$date": "2018-08-14T18:30:00.445Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7320d5a376d259db61207e" + }, + "timestamp": { + "$date": "2018-08-14T18:35:00.349Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b732201a376d259db612140" + }, + "timestamp": { + "$date": "2018-08-14T18:40:00.321Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Woodward.D", + "clientDbId": "5267" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b73232da376d259db6122cd" + }, + "timestamp": { + "$date": "2018-08-14T18:45:00.326Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b732459a376d259db612527" + }, + "timestamp": { + "$date": "2018-08-14T18:50:00.343Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b732585a376d259db6125e6" + }, + "timestamp": { + "$date": "2018-08-14T18:55:00.308Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7326b1a376d259db6126b2" + }, + "timestamp": { + "$date": "2018-08-14T19:00:00.346Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b7327dda376d259db6127d3" + }, + "timestamp": { + "$date": "2018-08-14T19:05:00.352Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b732909a376d259db612906" + }, + "timestamp": { + "$date": "2018-08-14T19:10:00.316Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "LCpl.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b732a35a376d259db612b0d" + }, + "timestamp": { + "$date": "2018-08-14T19:15:00.307Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b732b61a376d259db612c4e" + }, + "timestamp": { + "$date": "2018-08-14T19:20:00.486Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Room.S", + "clientDbId": "5061" + } + ] +} +{ + "_id": { + "$oid": "5b732c8da376d259db612d0d" + }, + "timestamp": { + "$date": "2018-08-14T19:25:00.319Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Hutton.D", + "clientDbId": "5194" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b732db9a376d259db612f59" + }, + "timestamp": { + "$date": "2018-08-14T19:30:00.32Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b732ee5a376d259db613169" + }, + "timestamp": { + "$date": "2018-08-14T19:35:00.378Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Downey", + "clientDbId": "4987" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b733011a376d259db6133ec" + }, + "timestamp": { + "$date": "2018-08-14T19:40:00.318Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b73313da376d259db6134a1" + }, + "timestamp": { + "$date": "2018-08-14T19:45:00.317Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b733269a376d259db61352b" + }, + "timestamp": { + "$date": "2018-08-14T19:50:00.369Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b733395a376d259db613696" + }, + "timestamp": { + "$date": "2018-08-14T19:55:00.297Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b7334c1a376d259db61387a" + }, + "timestamp": { + "$date": "2018-08-14T20:00:00.336Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b7335eda376d259db613904" + }, + "timestamp": { + "$date": "2018-08-14T20:05:00.361Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b733719a376d259db61398a" + }, + "timestamp": { + "$date": "2018-08-14T20:10:00.413Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b733845a376d259db613a0d" + }, + "timestamp": { + "$date": "2018-08-14T20:15:00.292Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b733971a376d259db613a99" + }, + "timestamp": { + "$date": "2018-08-14T20:20:00.515Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b733a9da376d259db613b22" + }, + "timestamp": { + "$date": "2018-08-14T20:25:00.301Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b733bc9a376d259db613ba8" + }, + "timestamp": { + "$date": "2018-08-14T20:30:00.315Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + } + ] +} +{ + "_id": { + "$oid": "5b733cf5a376d259db613c2d" + }, + "timestamp": { + "$date": "2018-08-14T20:35:00.313Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b733e21a376d259db613cb9" + }, + "timestamp": { + "$date": "2018-08-14T20:40:00.452Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b733f4da376d259db613d40" + }, + "timestamp": { + "$date": "2018-08-14T20:45:00.307Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b734079a376d259db613dda" + }, + "timestamp": { + "$date": "2018-08-14T20:50:00.346Z" + }, + "users": [ + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b7341a5a376d259db613e65" + }, + "timestamp": { + "$date": "2018-08-14T20:55:00.327Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b7342d1a376d259db613eed" + }, + "timestamp": { + "$date": "2018-08-14T21:00:00.332Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b7343fda376d259db613f70" + }, + "timestamp": { + "$date": "2018-08-14T21:05:00.337Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b734529a376d259db613ffe" + }, + "timestamp": { + "$date": "2018-08-14T21:10:00.465Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b734655a376d259db614081" + }, + "timestamp": { + "$date": "2018-08-14T21:15:00.327Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b734781a376d259db61410d" + }, + "timestamp": { + "$date": "2018-08-14T21:20:00.411Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b7348ada376d259db614196" + }, + "timestamp": { + "$date": "2018-08-14T21:25:00.339Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b7349d9a376d259db61421b" + }, + "timestamp": { + "$date": "2018-08-14T21:30:00.416Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b734b05a376d259db61429f" + }, + "timestamp": { + "$date": "2018-08-14T21:35:00.35Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b734c31a376d259db61432a" + }, + "timestamp": { + "$date": "2018-08-14T21:40:00.341Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b734d5da376d259db6143d2" + }, + "timestamp": { + "$date": "2018-08-14T21:45:00.318Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b734e89a376d259db614458" + }, + "timestamp": { + "$date": "2018-08-14T21:50:00.36Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b734fb5a376d259db6144e1" + }, + "timestamp": { + "$date": "2018-08-14T21:55:00.316Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b7350e1a376d259db61456f" + }, + "timestamp": { + "$date": "2018-08-14T22:00:00.483Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b73520da376d259db6145f2" + }, + "timestamp": { + "$date": "2018-08-14T22:05:00.326Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b735339a376d259db61467e" + }, + "timestamp": { + "$date": "2018-08-14T22:10:00.316Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b735465a376d259db614701" + }, + "timestamp": { + "$date": "2018-08-14T22:15:00.367Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b735591a376d259db61478b" + }, + "timestamp": { + "$date": "2018-08-14T22:20:00.362Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b7356bda376d259db614888" + }, + "timestamp": { + "$date": "2018-08-14T22:25:00.29Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Hughes.S", + "clientDbId": "5364" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b7357e9a376d259db614914" + }, + "timestamp": { + "$date": "2018-08-14T22:30:00.329Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b735915a376d259db6149a6" + }, + "timestamp": { + "$date": "2018-08-14T22:35:00.38Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b735a41a376d259db614a27" + }, + "timestamp": { + "$date": "2018-08-14T22:40:00.316Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b735b6da376d259db614aa5" + }, + "timestamp": { + "$date": "2018-08-14T22:45:00.293Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b735c99a376d259db614b2a" + }, + "timestamp": { + "$date": "2018-08-14T22:50:00.341Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b735dc5a376d259db614baa" + }, + "timestamp": { + "$date": "2018-08-14T22:55:00.298Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b735ef1a376d259db614c2a" + }, + "timestamp": { + "$date": "2018-08-14T23:00:00.737Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b73601da376d259db614cb4" + }, + "timestamp": { + "$date": "2018-08-14T23:05:00.346Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b736149a376d259db614d35" + }, + "timestamp": { + "$date": "2018-08-14T23:10:00.841Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b736275a376d259db614db5" + }, + "timestamp": { + "$date": "2018-08-14T23:15:00.293Z" + }, + "users": [ + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "PltOff.Conway.M", + "clientDbId": "5472" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "FgOff.Greaves.A", + "clientDbId": "4068" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b7363a1a376d259db614e3c" + }, + "timestamp": { + "$date": "2018-08-14T23:20:00.485Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b7364cda376d259db614eba" + }, + "timestamp": { + "$date": "2018-08-14T23:25:00.305Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b7365f9a376d259db614f3b" + }, + "timestamp": { + "$date": "2018-08-14T23:30:00.505Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b736725a376d259db614fb9" + }, + "timestamp": { + "$date": "2018-08-14T23:35:00.327Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b736851a376d259db615040" + }, + "timestamp": { + "$date": "2018-08-14T23:40:00.46Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b73697da376d259db6150be" + }, + "timestamp": { + "$date": "2018-08-14T23:45:00.304Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + } + ] +} +{ + "_id": { + "$oid": "5b736aa9a376d259db615145" + }, + "timestamp": { + "$date": "2018-08-14T23:50:00.463Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b736bd5a376d259db6151c3" + }, + "timestamp": { + "$date": "2018-08-14T23:55:00.3Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b736d01a376d259db615244" + }, + "timestamp": { + "$date": "2018-08-15T00:00:00.315Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b736e2da376d259db6152c2" + }, + "timestamp": { + "$date": "2018-08-15T00:05:00.321Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b736f59a376d259db615349" + }, + "timestamp": { + "$date": "2018-08-15T00:10:00.468Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b737085a376d259db6153c7" + }, + "timestamp": { + "$date": "2018-08-15T00:15:00.313Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7371b1a376d259db615449" + }, + "timestamp": { + "$date": "2018-08-15T00:20:00.355Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7372dda376d259db6154d4" + }, + "timestamp": { + "$date": "2018-08-15T00:25:00.292Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Keesa.L", + "clientDbId": "5234" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b737409a376d259db615555" + }, + "timestamp": { + "$date": "2018-08-15T00:30:00.313Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b737535a376d259db6155d3" + }, + "timestamp": { + "$date": "2018-08-15T00:35:00.33Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Bart.McD", + "clientDbId": "4073" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b737661a376d259db615659" + }, + "timestamp": { + "$date": "2018-08-15T00:40:00.326Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73778da376d259db6156d8" + }, + "timestamp": { + "$date": "2018-08-15T00:45:00.311Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7378b9a376d259db61577c" + }, + "timestamp": { + "$date": "2018-08-15T00:50:00.375Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7379e5a376d259db615801" + }, + "timestamp": { + "$date": "2018-08-15T00:55:00.335Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b737b11a376d259db615882" + }, + "timestamp": { + "$date": "2018-08-15T01:00:00.377Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b737c3da376d259db615900" + }, + "timestamp": { + "$date": "2018-08-15T01:05:00.332Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b737d69a376d259db615980" + }, + "timestamp": { + "$date": "2018-08-15T01:10:00.311Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b737e95a376d259db615a05" + }, + "timestamp": { + "$date": "2018-08-15T01:15:00.362Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b737fc1a376d259db615aa5" + }, + "timestamp": { + "$date": "2018-08-15T01:20:00.336Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7380eda376d259db615c4f" + }, + "timestamp": { + "$date": "2018-08-15T01:25:00.293Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b738219a376d259db615ed6" + }, + "timestamp": { + "$date": "2018-08-15T01:30:00.313Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b738345a376d259db615fe0" + }, + "timestamp": { + "$date": "2018-08-15T01:35:00.349Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b738471a376d259db6160a9" + }, + "timestamp": { + "$date": "2018-08-15T01:40:00.316Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73859da376d259db61616e" + }, + "timestamp": { + "$date": "2018-08-15T01:45:00.295Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7386c9a376d259db616294" + }, + "timestamp": { + "$date": "2018-08-15T01:50:00.344Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Penn.L", + "clientDbId": "3225" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7387f5a376d259db6164c9" + }, + "timestamp": { + "$date": "2018-08-15T01:55:00.29Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b738921a376d259db616560" + }, + "timestamp": { + "$date": "2018-08-15T02:00:00.461Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b738a4da376d259db6165e8" + }, + "timestamp": { + "$date": "2018-08-15T02:05:00.338Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b738b79a376d259db616673" + }, + "timestamp": { + "$date": "2018-08-15T02:10:00.374Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b738ca5a376d259db6166f6" + }, + "timestamp": { + "$date": "2018-08-15T02:15:00.321Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b738dd1a376d259db616788" + }, + "timestamp": { + "$date": "2018-08-15T02:20:00.491Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b738efda376d259db61680b" + }, + "timestamp": { + "$date": "2018-08-15T02:25:00.333Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b739029a376d259db616890" + }, + "timestamp": { + "$date": "2018-08-15T02:30:00.328Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b739155a376d259db616974" + }, + "timestamp": { + "$date": "2018-08-15T02:35:00.368Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b739281a376d259db616a04" + }, + "timestamp": { + "$date": "2018-08-15T02:40:00.37Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7393ada376d259db616a89" + }, + "timestamp": { + "$date": "2018-08-15T02:45:00.373Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7394d9a376d259db616b62" + }, + "timestamp": { + "$date": "2018-08-15T02:50:00.335Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b739605a376d259db616cc2" + }, + "timestamp": { + "$date": "2018-08-15T02:55:00.323Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b739731a376d259db616e1b" + }, + "timestamp": { + "$date": "2018-08-15T03:00:00.314Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73985da376d259db616e99" + }, + "timestamp": { + "$date": "2018-08-15T03:05:00.343Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b739989a376d259db616f5a" + }, + "timestamp": { + "$date": "2018-08-15T03:10:00.306Z" + }, + "users": [ + null, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b739ab5a376d259db616fdd" + }, + "timestamp": { + "$date": "2018-08-15T03:15:00.338Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b739be1a376d259db61705e" + }, + "timestamp": { + "$date": "2018-08-15T03:20:00.34Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b739d0da376d259db6170ed" + }, + "timestamp": { + "$date": "2018-08-15T03:25:00.326Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b739e39a376d259db61716d" + }, + "timestamp": { + "$date": "2018-08-15T03:30:00.312Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b739f65a376d259db6171ec" + }, + "timestamp": { + "$date": "2018-08-15T03:35:00.336Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73a091a376d259db61726d" + }, + "timestamp": { + "$date": "2018-08-15T03:40:00.335Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73a1bda376d259db6172eb" + }, + "timestamp": { + "$date": "2018-08-15T03:45:00.347Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73a2e9a376d259db617378" + }, + "timestamp": { + "$date": "2018-08-15T03:50:00.497Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73a415a376d259db6173f6" + }, + "timestamp": { + "$date": "2018-08-15T03:55:00.335Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73a541a376d259db617477" + }, + "timestamp": { + "$date": "2018-08-15T04:00:00.346Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73a66da376d259db6174f5" + }, + "timestamp": { + "$date": "2018-08-15T04:05:00.324Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73a799a376d259db617576" + }, + "timestamp": { + "$date": "2018-08-15T04:10:00.314Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73a8c5a376d259db6175f4" + }, + "timestamp": { + "$date": "2018-08-15T04:15:00.295Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73a9f1a376d259db617679" + }, + "timestamp": { + "$date": "2018-08-15T04:20:00.353Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73ab1da376d259db6176f9" + }, + "timestamp": { + "$date": "2018-08-15T04:25:00.306Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73ac49a376d259db61777e" + }, + "timestamp": { + "$date": "2018-08-15T04:30:00.338Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73ad75a376d259db6177fe" + }, + "timestamp": { + "$date": "2018-08-15T04:35:00.355Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73aea1a376d259db61787f" + }, + "timestamp": { + "$date": "2018-08-15T04:40:00.317Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73afcda376d259db6178fd" + }, + "timestamp": { + "$date": "2018-08-15T04:45:00.292Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73b0f9a376d259db617984" + }, + "timestamp": { + "$date": "2018-08-15T04:50:00.448Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73b225a376d259db617a02" + }, + "timestamp": { + "$date": "2018-08-15T04:55:00.316Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73b351a376d259db617a89" + }, + "timestamp": { + "$date": "2018-08-15T05:00:00.362Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73b47da376d259db617b09" + }, + "timestamp": { + "$date": "2018-08-15T05:05:00.329Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73b5a9a376d259db617b8a" + }, + "timestamp": { + "$date": "2018-08-15T05:10:00.401Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73b6d5a376d259db617c08" + }, + "timestamp": { + "$date": "2018-08-15T05:15:00.286Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73b801a376d259db617c8d" + }, + "timestamp": { + "$date": "2018-08-15T05:20:00.365Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73b92da376d259db617d0d" + }, + "timestamp": { + "$date": "2018-08-15T05:25:00.312Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73ba59a376d259db617d94" + }, + "timestamp": { + "$date": "2018-08-15T05:30:00.328Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73bb85a376d259db617e12" + }, + "timestamp": { + "$date": "2018-08-15T05:35:00.358Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73bcb1a376d259db617e92" + }, + "timestamp": { + "$date": "2018-08-15T05:40:00.315Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73bddda376d259db617f11" + }, + "timestamp": { + "$date": "2018-08-15T05:45:00.29Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73bf09a376d259db617f9e" + }, + "timestamp": { + "$date": "2018-08-15T05:50:00.65Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73c035a376d259db61801c" + }, + "timestamp": { + "$date": "2018-08-15T05:55:00.298Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73c161a376d259db61809d" + }, + "timestamp": { + "$date": "2018-08-15T06:00:00.326Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73c28da376d259db61811b" + }, + "timestamp": { + "$date": "2018-08-15T06:05:00.324Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73c3b9a376d259db61819c" + }, + "timestamp": { + "$date": "2018-08-15T06:10:00.32Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73c4e5a376d259db61821a" + }, + "timestamp": { + "$date": "2018-08-15T06:15:00.319Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73c611a376d259db61829b" + }, + "timestamp": { + "$date": "2018-08-15T06:20:00.335Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73c73da376d259db61831f" + }, + "timestamp": { + "$date": "2018-08-15T06:25:00.428Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73c869a376d259db6183a5" + }, + "timestamp": { + "$date": "2018-08-15T06:30:00.321Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73c995a376d259db618424" + }, + "timestamp": { + "$date": "2018-08-15T06:35:00.314Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73cac1a376d259db6184a4" + }, + "timestamp": { + "$date": "2018-08-15T06:40:00.345Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73cbeda376d259db618523" + }, + "timestamp": { + "$date": "2018-08-15T06:45:00.303Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73cd19a376d259db6185a4" + }, + "timestamp": { + "$date": "2018-08-15T06:50:00.351Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73ce45a376d259db618622" + }, + "timestamp": { + "$date": "2018-08-15T06:55:00.29Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73cf71a376d259db6186a9" + }, + "timestamp": { + "$date": "2018-08-15T07:00:00.448Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73d09da376d259db618727" + }, + "timestamp": { + "$date": "2018-08-15T07:05:00.324Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73d1c9a376d259db6187ac" + }, + "timestamp": { + "$date": "2018-08-15T07:10:00.325Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73d2f5a376d259db61882c" + }, + "timestamp": { + "$date": "2018-08-15T07:15:00.3Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73d421a376d259db6188ad" + }, + "timestamp": { + "$date": "2018-08-15T07:20:00.335Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73d54da376d259db61892b" + }, + "timestamp": { + "$date": "2018-08-15T07:25:00.288Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73d679a376d259db6189b0" + }, + "timestamp": { + "$date": "2018-08-15T07:30:00.334Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73d7a5a376d259db618a30" + }, + "timestamp": { + "$date": "2018-08-15T07:35:00.392Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73d8d1a376d259db618ab6" + }, + "timestamp": { + "$date": "2018-08-15T07:40:00.315Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73d9fda376d259db618b35" + }, + "timestamp": { + "$date": "2018-08-15T07:45:00.312Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73db29a376d259db618bb6" + }, + "timestamp": { + "$date": "2018-08-15T07:50:00.473Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73dc55a376d259db618c47" + }, + "timestamp": { + "$date": "2018-08-15T07:55:00.289Z" + }, + "users": [ + null, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73dd81a376d259db618cd5" + }, + "timestamp": { + "$date": "2018-08-15T08:00:00.467Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73deada376d259db618d58" + }, + "timestamp": { + "$date": "2018-08-15T08:05:00.344Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73dfd9a376d259db618e15" + }, + "timestamp": { + "$date": "2018-08-15T08:10:00.332Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73e105a376d259db61906b" + }, + "timestamp": { + "$date": "2018-08-15T08:15:00.3Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73e231a376d259db6191f5" + }, + "timestamp": { + "$date": "2018-08-15T08:20:00.342Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73e35da376d259db619278" + }, + "timestamp": { + "$date": "2018-08-15T08:25:00.295Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73e489a376d259db619304" + }, + "timestamp": { + "$date": "2018-08-15T08:30:00.482Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73e5b5a376d259db619387" + }, + "timestamp": { + "$date": "2018-08-15T08:35:00.355Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73e6e2a376d259db619413" + }, + "timestamp": { + "$date": "2018-08-15T08:40:00.611Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73e80da376d259db61949e" + }, + "timestamp": { + "$date": "2018-08-15T08:45:00.302Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73e939a376d259db619524" + }, + "timestamp": { + "$date": "2018-08-15T08:50:00.382Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73ea65a376d259db6195a7" + }, + "timestamp": { + "$date": "2018-08-15T08:55:00.29Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73eb92a376d259db619631" + }, + "timestamp": { + "$date": "2018-08-15T09:00:00.58Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73ecbda376d259db6196b6" + }, + "timestamp": { + "$date": "2018-08-15T09:05:00.336Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73ede9a376d259db61973b" + }, + "timestamp": { + "$date": "2018-08-15T09:10:00.343Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73ef15a376d259db6197c5" + }, + "timestamp": { + "$date": "2018-08-15T09:15:00.289Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73f041a376d259db619901" + }, + "timestamp": { + "$date": "2018-08-15T09:20:00.477Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73f16da376d259db619a1b" + }, + "timestamp": { + "$date": "2018-08-15T09:25:00.302Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73f299a376d259db619b15" + }, + "timestamp": { + "$date": "2018-08-15T09:30:00.323Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73f3c5a376d259db619c17" + }, + "timestamp": { + "$date": "2018-08-15T09:35:00.316Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73f4f1a376d259db619d78" + }, + "timestamp": { + "$date": "2018-08-15T09:40:00.455Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73f61da376d259db619e7d" + }, + "timestamp": { + "$date": "2018-08-15T09:45:00.302Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73f74aa376d259db619f83" + }, + "timestamp": { + "$date": "2018-08-15T09:50:00.483Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73f875a376d259db61a094" + }, + "timestamp": { + "$date": "2018-08-15T09:55:00.35Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73f9a1a376d259db61a1b4" + }, + "timestamp": { + "$date": "2018-08-15T10:00:00.311Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73facda376d259db61a2bd" + }, + "timestamp": { + "$date": "2018-08-15T10:05:00.367Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73fbf9a376d259db61a3bf" + }, + "timestamp": { + "$date": "2018-08-15T10:10:00.452Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73fd25a376d259db61a4ca" + }, + "timestamp": { + "$date": "2018-08-15T10:15:00.311Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73fe51a376d259db61a5d3" + }, + "timestamp": { + "$date": "2018-08-15T10:20:00.365Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b73ff7da376d259db61a6cc" + }, + "timestamp": { + "$date": "2018-08-15T10:25:00.34Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7400a9a376d259db61a7dd" + }, + "timestamp": { + "$date": "2018-08-15T10:30:00.309Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7401d5a376d259db61a8f5" + }, + "timestamp": { + "$date": "2018-08-15T10:35:00.339Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b740301a376d259db61aa13" + }, + "timestamp": { + "$date": "2018-08-15T10:40:00.316Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b74042da376d259db61ab0b" + }, + "timestamp": { + "$date": "2018-08-15T10:45:00.341Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b740559a376d259db61ac1a" + }, + "timestamp": { + "$date": "2018-08-15T10:50:00.366Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b740685a376d259db61ad3f" + }, + "timestamp": { + "$date": "2018-08-15T10:55:00.312Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7407b1a376d259db61adf3" + }, + "timestamp": { + "$date": "2018-08-15T11:00:00.335Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7408dda376d259db61aeed" + }, + "timestamp": { + "$date": "2018-08-15T11:05:00.308Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b740a0aa376d259db61b03b" + }, + "timestamp": { + "$date": "2018-08-15T11:10:00.599Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b740b35a376d259db61b1dc" + }, + "timestamp": { + "$date": "2018-08-15T11:15:00.312Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b740c61a376d259db61b2ed" + }, + "timestamp": { + "$date": "2018-08-15T11:20:00.365Z" + }, + "users": [ + null, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b740d8ea376d259db61b429" + }, + "timestamp": { + "$date": "2018-08-15T11:25:01.059Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b740eb9a376d259db61b536" + }, + "timestamp": { + "$date": "2018-08-15T11:30:00.322Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b740fe6a376d259db61b6ec" + }, + "timestamp": { + "$date": "2018-08-15T11:35:00.433Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b741111a376d259db61b8e0" + }, + "timestamp": { + "$date": "2018-08-15T11:40:00.313Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b74123da376d259db61b9ee" + }, + "timestamp": { + "$date": "2018-08-15T11:45:00.294Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b741369a376d259db61bae7" + }, + "timestamp": { + "$date": "2018-08-15T11:50:00.331Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b741496a376d259db61bc60" + }, + "timestamp": { + "$date": "2018-08-15T11:55:00.44Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7415c2a376d259db61bdd0" + }, + "timestamp": { + "$date": "2018-08-15T12:00:00.461Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b7416eda376d259db61bf91" + }, + "timestamp": { + "$date": "2018-08-15T12:05:00.358Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b741819a376d259db61c0fb" + }, + "timestamp": { + "$date": "2018-08-15T12:10:00.318Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b741945a376d259db61c290" + }, + "timestamp": { + "$date": "2018-08-15T12:15:00.294Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b741a71a376d259db61c3e3" + }, + "timestamp": { + "$date": "2018-08-15T12:20:00.355Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b741b9ea376d259db61c586" + }, + "timestamp": { + "$date": "2018-08-15T12:25:00.443Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b741ccaa376d259db61c740" + }, + "timestamp": { + "$date": "2018-08-15T12:30:00.423Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Cpl.Darrington.J", + "clientDbId": "3260" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b741df5a376d259db61c855" + }, + "timestamp": { + "$date": "2018-08-15T12:35:00.339Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b741f21a376d259db61c953" + }, + "timestamp": { + "$date": "2018-08-15T12:40:00.311Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b74204ea376d259db61ca58" + }, + "timestamp": { + "$date": "2018-08-15T12:45:00.351Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + } + ] +} +{ + "_id": { + "$oid": "5b74217aa376d259db61cba0" + }, + "timestamp": { + "$date": "2018-08-15T12:50:00.339Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7422a5a376d259db61cd14" + }, + "timestamp": { + "$date": "2018-08-15T12:55:00.297Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7423d2a376d259db61ce36" + }, + "timestamp": { + "$date": "2018-08-15T13:00:00.427Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7424fea376d259db61d008" + }, + "timestamp": { + "$date": "2018-08-15T13:05:01.009Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b74262aa376d259db61d13a" + }, + "timestamp": { + "$date": "2018-08-15T13:10:00.321Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b742755a376d259db61d23c" + }, + "timestamp": { + "$date": "2018-08-15T13:15:00.296Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b742882a376d259db61d34d" + }, + "timestamp": { + "$date": "2018-08-15T13:20:00.356Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7429ada376d259db61d463" + }, + "timestamp": { + "$date": "2018-08-15T13:25:00.291Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b742adaa376d259db61d58d" + }, + "timestamp": { + "$date": "2018-08-15T13:30:00.395Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b742c06a376d259db61d6a7" + }, + "timestamp": { + "$date": "2018-08-15T13:35:00.466Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b742d32a376d259db61d7a8" + }, + "timestamp": { + "$date": "2018-08-15T13:40:00.47Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b742e5ea376d259db61d91a" + }, + "timestamp": { + "$date": "2018-08-15T13:45:00.295Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b742f8aa376d259db61de5e" + }, + "timestamp": { + "$date": "2018-08-15T13:50:00.457Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7430b6a376d259db61e54a" + }, + "timestamp": { + "$date": "2018-08-15T13:55:00.29Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7431e2a376d259db61ec54" + }, + "timestamp": { + "$date": "2018-08-15T14:00:00.319Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b74330ea376d259db61f336" + }, + "timestamp": { + "$date": "2018-08-15T14:05:00.316Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b74343aa376d259db61fa5f" + }, + "timestamp": { + "$date": "2018-08-15T14:10:00.345Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #2", + "channelId": "865", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b743566a376d259db620086" + }, + "timestamp": { + "$date": "2018-08-15T14:15:00.294Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b743692a376d259db62077f" + }, + "timestamp": { + "$date": "2018-08-15T14:20:00.354Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7437bea376d259db620e5f" + }, + "timestamp": { + "$date": "2018-08-15T14:25:00.293Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b7438eaa376d259db621552" + }, + "timestamp": { + "$date": "2018-08-15T14:30:00.401Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b743a16a376d259db621c18" + }, + "timestamp": { + "$date": "2018-08-15T14:35:00.321Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b743b42a376d259db62231c" + }, + "timestamp": { + "$date": "2018-08-15T14:40:00.471Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b743c6ea376d259db6229ec" + }, + "timestamp": { + "$date": "2018-08-15T14:45:00.378Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b743d9aa376d259db623136" + }, + "timestamp": { + "$date": "2018-08-15T14:50:00.526Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b743ec6a376d259db62382b" + }, + "timestamp": { + "$date": "2018-08-15T14:55:00.384Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Housley.N", + "clientDbId": "5314" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b743ff2a376d259db623f11" + }, + "timestamp": { + "$date": "2018-08-15T15:00:00.326Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b74411ea376d259db624602" + }, + "timestamp": { + "$date": "2018-08-15T15:05:00.321Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b74424aa376d259db624ccc" + }, + "timestamp": { + "$date": "2018-08-15T15:10:00.345Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "S. Blake", + "clientDbId": "5476" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b744376a376d259db625080" + }, + "timestamp": { + "$date": "2018-08-15T15:15:00.291Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b7444a2a376d259db625227" + }, + "timestamp": { + "$date": "2018-08-15T15:20:00.348Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "Pte.Gilbert.M", + "clientDbId": "5046" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b7445cea376d259db625443" + }, + "timestamp": { + "$date": "2018-08-15T15:25:00.43Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b7446faa376d259db6255c4" + }, + "timestamp": { + "$date": "2018-08-15T15:30:00.461Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b744826a376d259db625709" + }, + "timestamp": { + "$date": "2018-08-15T15:35:00.315Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b744952a376d259db62584f" + }, + "timestamp": { + "$date": "2018-08-15T15:40:00.329Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b744a7ea376d259db62594f" + }, + "timestamp": { + "$date": "2018-08-15T15:45:00.657Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "Private Discussion Lobby #4", + "channelId": "1032", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "The Sleeping Quarters/Bunk Rooms", + "channelId": "864", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b744baaa376d259db625a57" + }, + "timestamp": { + "$date": "2018-08-15T15:50:00.346Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b744cd6a376d259db625b58" + }, + "timestamp": { + "$date": "2018-08-15T15:55:00.513Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #6", + "channelId": "1064", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b744e02a376d259db625c5b" + }, + "timestamp": { + "$date": "2018-08-15T16:00:00.353Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b744f2ea376d259db625d5d" + }, + "timestamp": { + "$date": "2018-08-15T16:05:00.343Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b74505aa376d259db625ea8" + }, + "timestamp": { + "$date": "2018-08-15T16:10:00.316Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b745186a376d259db625f73" + }, + "timestamp": { + "$date": "2018-08-15T16:15:00.542Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b7452b2a376d259db62603f" + }, + "timestamp": { + "$date": "2018-08-15T16:20:00.357Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b7453dea376d259db626110" + }, + "timestamp": { + "$date": "2018-08-15T16:25:00.301Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b74550aa376d259db6261e8" + }, + "timestamp": { + "$date": "2018-08-15T16:30:00.452Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b745636a376d259db6262f6" + }, + "timestamp": { + "$date": "2018-08-15T16:35:00.324Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b745762a376d259db62637b" + }, + "timestamp": { + "$date": "2018-08-15T16:40:00.32Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b74588ea376d259db6263ff" + }, + "timestamp": { + "$date": "2018-08-15T16:45:00.321Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b7459baa376d259db62648b" + }, + "timestamp": { + "$date": "2018-08-15T16:50:00.488Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b745ae6a376d259db62650e" + }, + "timestamp": { + "$date": "2018-08-15T16:55:00.309Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b745c12a376d259db626593" + }, + "timestamp": { + "$date": "2018-08-15T17:00:00.333Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b745d3ea376d259db62661d" + }, + "timestamp": { + "$date": "2018-08-15T17:05:00.416Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b745e6aa376d259db6266a9" + }, + "timestamp": { + "$date": "2018-08-15T17:10:00.324Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b745f96a376d259db62672e" + }, + "timestamp": { + "$date": "2018-08-15T17:15:00.33Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b7460c2a376d259db6267be" + }, + "timestamp": { + "$date": "2018-08-15T17:20:00.337Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b7461eea376d259db62685d" + }, + "timestamp": { + "$date": "2018-08-15T17:25:00.338Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #5", + "channelId": "1034", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b74631aa376d259db6268e6" + }, + "timestamp": { + "$date": "2018-08-15T17:30:00.368Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b746446a376d259db626969" + }, + "timestamp": { + "$date": "2018-08-15T17:35:00.309Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b746572a376d259db6269f5" + }, + "timestamp": { + "$date": "2018-08-15T17:40:00.427Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b74669ea376d259db626a79" + }, + "timestamp": { + "$date": "2018-08-15T17:45:00.312Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "Cpl.McClelland.S", + "clientDbId": "3453" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Public Game Room #3", + "channelId": "1143", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b7467caa376d259db626b05" + }, + "timestamp": { + "$date": "2018-08-15T17:50:00.441Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + } + ] +} +{ + "_id": { + "$oid": "5b7468f6a376d259db626b8a" + }, + "timestamp": { + "$date": "2018-08-15T17:55:00.311Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b746a22a376d259db626c16" + }, + "timestamp": { + "$date": "2018-08-15T18:00:00.313Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b746b4ea376d259db626cbc" + }, + "timestamp": { + "$date": "2018-08-15T18:05:00.328Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b746c7aa376d259db626d4d" + }, + "timestamp": { + "$date": "2018-08-15T18:10:00.55Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b746da6a376d259db626f5b" + }, + "timestamp": { + "$date": "2018-08-15T18:15:00.524Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b746ed2a376d259db62700f" + }, + "timestamp": { + "$date": "2018-08-15T18:20:00.34Z" + }, + "users": [ + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b746ffea376d259db627229" + }, + "timestamp": { + "$date": "2018-08-15T18:25:00.96Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b74712aa376d259db6272d5" + }, + "timestamp": { + "$date": "2018-08-15T18:30:00.322Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Oddball.O", + "clientDbId": "5309" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "The Entrance Lobby", + "channelId": "30", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b747256a376d259db627399" + }, + "timestamp": { + "$date": "2018-08-15T18:35:00.356Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Stone Lion Pub-General Discussion Lobby", + "channelId": "854", + "clientName": "Iron", + "clientDbId": "5420" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} +{ + "_id": { + "$oid": "5b747382a376d259db627425" + }, + "timestamp": { + "$date": "2018-08-15T18:40:00.315Z" + }, + "users": [ + { + "channelName": "Pegasus Hall - NCO Mess", + "channelId": "973", + "clientName": "Sgt.Large.S", + "clientDbId": "2614" + }, + { + "channelName": "JSFAW OC - SqnLdr.Beswick.T", + "channelId": "691", + "clientName": "SqnLdr.Beswick.T", + "clientDbId": "5471" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Jenkins.L", + "clientDbId": "4156" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Brzozowski.T", + "clientDbId": "4521" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Viney.C", + "clientDbId": "4841" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Tam.P", + "clientDbId": "4687" + }, + { + "channelName": "The Grub Room/The Canteen/Showers - AFK", + "channelId": "862", + "clientName": "PltOff.Elliott.D", + "clientDbId": "5149" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Auld.K", + "clientDbId": "5427" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Pte.Mortensen.C", + "clientDbId": "4745" + }, + { + "channelName": "Maverick 2iC - Cpl.Pothoven.B", + "channelId": "1136", + "clientName": "Cpl.Pothoven.B", + "clientDbId": "3268" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "LCpl.Lars.R", + "clientDbId": "3013" + }, + { + "channelName": "Maverick OC - Capt.Bridgford.A", + "channelId": "1133", + "clientName": "Capt.Bridgford.A", + "clientDbId": "4869" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "LCpl.Rowe.J", + "clientDbId": "4962" + }, + { + "channelName": "Private Discussion Lobby #3", + "channelId": "971", + "clientName": "Rct.Stanley.J", + "clientDbId": "5330" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "MusicBot", + "clientDbId": "5305" + }, + { + "channelName": "Private Discussion Lobby #1", + "channelId": "858", + "clientName": "LCpl.Carr.C", + "clientDbId": "4430" + }, + { + "channelName": "Port & Cigar - Officer Club", + "channelId": "855", + "clientName": "OffCdt.Woods.A", + "clientDbId": "4596" + }, + { + "channelName": "The Silence Room", + "channelId": "863", + "clientName": "Rct.Skinner.A", + "clientDbId": "5261" + }, + { + "channelName": "Private Discussion Lobby #7", + "channelId": "1066", + "clientName": "Pte.Duncan.D", + "clientDbId": "5299" + } + ] +} diff --git a/UKSF.Tests.Common/testdata/units.json b/UKSF.Tests.Common/testdata/units.json new file mode 100644 index 00000000..43a6098a --- /dev/null +++ b/UKSF.Tests.Common/testdata/units.json @@ -0,0 +1,179 @@ +{ + "_id": { + "$oid": "5a42835b55d6109bf0b081bd" + }, + "branch": 0, + "callsign": "Stonebridge", + "type": 6, + "icon": "https://uk-sf.co.uk/assets/dist/images/orbat/uksf.png", + "members": [], + "name": "UKSF", + "parent": { + "$oid": "000000000000000000000000" + }, + "roles": {}, + "shortname": "UKSF", + "teamspeakGroup": "7", + "discordRoleId": "542441181498310668" +} +{ + "_id": { + "$oid": "5ad748e0de5d414f4c4055e1" + }, + "branch": 0, + "type": 1, + "members": [ + { + "$oid": "59e38f0f594c603b78aa9dbb" + } + ], + "name": "Basic Training Unit", + "parent": { + "$oid": "5a42835b55d6109bf0b081bd" + }, + "roles": {}, + "shortname": "BTU", + "order": 4 +} +{ + "_id": { + "$oid": "5a6917732364471b38dac709" + }, + "branch": 0, + "type": 5, + "icon": "https://uk-sf.co.uk/assets/dist/images/orbat/sas.png", + "members": [ + { + "$oid": "59e38f10594c603b78aa9dbd" + } + ], + "name": "22nd Special Air Service Regiment", + "parent": { + "$oid": "5a42835b55d6109bf0b081bd" + }, + "roles": { + "1iC": { + "$oid": "59e38f10594c603b78aa9dbd" + } + }, + "shortname": "SAS", + "teamspeakGroup": "36", + "order": 0, + "callsign": "Sabre", + "discordRoleId": "495213709107527680" +} +{ + "_id": { + "$oid": "5bbbb8875eb3a4170c488b24" + }, + "branch": 0, + "callsign": "Sabre 1", + "icon": "", + "members": [ + { + "$oid": "59e38f13594c603b78aa9dbf" + }, + { + "$oid": "59e38f1b594c603b78aa9dc1" + } + ], + "name": "Air Troop", + "order": 0, + "parent": { + "$oid": "5a6917732364471b38dac709" + }, + "roles": { + "NCOiC": { + "$oid": "59e38f13594c603b78aa9dbf" + }, + "2iC": { + "$oid": "59e38f1b594c603b78aa9dc1" + } + }, + "shortname": "Air Troop", + "teamspeakGroup": "37", + "type": 1 +} +{ + "_id": { + "$oid": "5a4283ce55d6109bf0b081bf" + }, + "branch": 1, + "type": 0, + "members": [ + { + "$oid": "59e38f10594c603b78aa9dbd" + } + ], + "name": "Command Staff", + "parent": { + "$oid": "000000000000000000000000" + }, + "roles": {}, + "shortname": "CStaff" +} +{ + "_id": { + "$oid": "5a121a2e56134f4654eecee8" + }, + "branch": 1, + "type": 0, + "members": [ + { + "$oid": "59e38f10594c603b78aa9dbd" + }, + { + "$oid": "59e38f1b594c603b78aa9dc1" + }, + { + "$oid": "59e38f13594c603b78aa9dbf" + } + ], + "name": "SR1 Recruitment", + "parent": { + "$oid": "5a4283ce55d6109bf0b081bf" + }, + "roles": { + "1iC": { + "$oid": "59e38f10594c603b78aa9dbd" + }, + "2iC": { + "$oid": "59e38f1b594c603b78aa9dc1" + } + }, + "teamspeakGroup": "26", + "order": 0, + "callsign": null, + "icon": null, + "shortname": "Sr1", + "discordRoleId": "311545206266920960" +} +{ + "_id": { + "$oid": "5a655eaef5336e21e8a8bc1d" + }, + "branch": 1, + "type": 0, + "members": [ + { + "$oid": "59e38f10594c603b78aa9dbd" + }, + { + "$oid": "59e38f13594c603b78aa9dbf" + } + ], + "name": "SR10 Personnel and Processing", + "parent": { + "$oid": "5a4283ce55d6109bf0b081bf" + }, + "roles": { + "1iC": { + "$oid": "59e38f10594c603b78aa9dbd" + } + }, + "shortname": "SR10", + "teamspeakGroup": "35", + "order": 8, + "callsign": null, + "icon": null +} diff --git a/UKSF.Tests.Common/testdata/variables.json b/UKSF.Tests.Common/testdata/variables.json new file mode 100644 index 00000000..8f287b38 --- /dev/null +++ b/UKSF.Tests.Common/testdata/variables.json @@ -0,0 +1,210 @@ +{ + "_id": { + "$oid": "5bfd3f16827ae9251067284a" + }, + "key": "MISSIONS_PATH", + "item": "C:\\Users\\Tim\\Desktop\\servers\\missions" +} +{ + "_id": { + "$oid": "5bfd4376437576718cef5170" + }, + "key": "SERVER_EXECUTABLE", + "item": "B:\\Steam\\steamapps\\common\\Arma 3\\arma3server_x64.exe" +} +{ + "_id": { + "$oid": "5bfd4402437576718cef5172" + }, + "key": "SERVERS_PATH", + "item": "C:\\Users\\Tim\\Desktop\\servers" +} +{ + "_id": { + "$oid": "5bfd45655f4cff925caf0a0f" + }, + "key": "SERVER_PROFILES", + "item": "C:\\Users\\Tim\\Desktop\\servers\\Profiles" +} +{ + "_id": { + "$oid": "5bfd45925f4cff925caf0a11" + }, + "key": "SERVER_PERF_CONFIG", + "item": "C:\\Users\\Tim\\Desktop\\servers\\perf.cfg" +} +{ + "_id": { + "$oid": "5bfd46a2901e3e870c6c1c57" + }, + "key": "HEADLESS_CLIENT_NAMES", + "item": "Jarvis, Ultron, TheVision" +} +{ + "_id": { + "$oid": "5bfd49676bc4e84354475969" + }, + "key": "TSGID_ELCOM", + "item": "49" +} +{ + "_id": { + "$oid": "5bfd49736bc4e8435447596b" + }, + "key": "TSGID_UNVERIFIED", + "item": "85" +} +{ + "_id": { + "$oid": "5bfd497e6bc4e8435447596d" + }, + "key": "TSGID_DISCHARGED", + "item": "75" +} +{ + "_id": { + "$oid": "5bfd4a356bc4e8435447596f" + }, + "key": "TSGID_BLACKLIST", + "item": "6,8,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,76,77,78,79,80,81,82,83,84,86" +} +{ + "_id": { + "$oid": "5bfd51a77e4b4d2440d33a09" + }, + "key": "MODS_PATHS", + "item": "B:\\Steam\\steamapps\\common\\Arma 3\\uksf,B:\\Steam\\steamapps\\common\\Arma 3,B:\\Steam\\steamapps\\common\\Arma 3\\u,B:\\Steam\\steamapps\\common\\Arma 3\\z\\intercept_cba\\rv,B:\\Steam\\steamapps\\common\\Arma 3\\z\\intercept_cba\\intercept" +} +{ + "_id": { + "$oid": "5bfddfb4774a43837c0a9a5b" + }, + "key": "MIGRATED", + "item": "true" +} +{ + "_id": { + "$oid": "5c1029f144996c3f20b6150c" + }, + "key": "DOCUMENTS_LOCATION", + "item": "F:\\Website\\Documents" +} +{ + "_id": { + "$oid": "5c36743cf2b65905f4a75ea4" + }, + "key": "MAKEPBO_WORKING_DIR", + "item": "F:\\Website" +} +{ + "_id": { + "$oid": "5c3fab36dee76d26cc9f4a02" + }, + "item": "F:\\Website\\Backups", + "key": "MISSION_BACKUPS_FOLDER" +} +{ + "_id": { + "$oid": "5c5a0a03b7864a2c949088ca" + }, + "item": "311543678126653451", + "key": "DID_SERVER" +} +{ + "_id": { + "$oid": "5c5a0a09b7864a2c949088cc" + }, + "item": "147037209621430272", + "key": "DID_U_MASTER" +} +{ + "_id": { + "$oid": "5c5a1fcab7864a2c949088d9" + }, + "item": "311543678126653451,311544735456165898,342023317009465344,523526517997961240,523526922492182538,316364551660765196,311544985998721024,626789351396737044", + "key": "DID_R_BLACKLIST" +} +{ + "_id": { + "$oid": "5c5ace700a407f25b410b379" + }, + "item": "523525678180859924,520619696576266241", + "key": "DID_U_BLACKLIST" +} +{ + "_id": { + "$oid": "5c6ee91d24bfdd792405e014" + }, + "item": "B:\\Steam\\steamapps\\common\\Arma 3\\uksf", + "key": "PATH_MODPACK" +} +{ + "_id": { + "$oid": "5c7ed3a07e6f0f1c183b66b2" + }, + "item": "903", + "key": "FRONTEND_VERSION" +} +{ + "_id": { + "$oid": "5c8d25041e599420e816a233" + }, + "item": false, + "key": "SERVERS_DISABLED" +} +{ + "_id": { + "$oid": "5c90e60c4a264b2508e7d33d" + }, + "item": "E:\\Workspace\\UKSF.Launcher\\Test", + "key": "LAUNCHER_LOCATION" +} +{ + "_id": { + "$oid": "5c90e6134a264b2508e7d33f" + }, + "item": "1.0.0.811", + "key": "LAUNCHER_VERSION" +} +{ + "_id": { + "$oid": "5dcc824c2d5f140f30e61e06" + }, + "item": "6,8,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,76,77,78,79,80,81,82,83,84,86,104", + "key": "TEAMSPEAK_GID_BLACKLIST" +} +{ + "_id": { + "$oid": "5dcc82512d5f140f30e61e08" + }, + "item": "75", + "key": "TEAMSPEAK_GID_DISCHARGED" +} +{ + "_id": { + "$oid": "5dcc82562d5f140f30e61e0a" + }, + "item": "49", + "key": "TEAMSPEAK_GID_ELCOM" +} +{ + "_id": { + "$oid": "5dcc82672d5f140f30e61e0c" + }, + "item": "85", + "key": "TEAMSPEAK_GID_UNVERIFIED" +} +{ + "_id": { + "$oid": "5dcc826c2d5f140f30e61e0e" + }, + "item": "C:\\Program Files\\TeamSpeak 3 Client\\ts3client_win64.exe", + "key": "TEAMSPEAK_PATH" +} +{ + "_id": { + "$oid": "5dcc82722d5f140f30e61e10" + }, + "item": "true", + "key": "TEAMSPEAK_RUN" +} diff --git a/UKSF.Tests.Integration/Data/DataCollectionTests.cs b/UKSF.Tests.Integration/Data/DataCollectionTests.cs new file mode 100644 index 00000000..16e7c39a --- /dev/null +++ b/UKSF.Tests.Integration/Data/DataCollectionTests.cs @@ -0,0 +1,263 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using FluentAssertions; +using Mongo2Go; +using MongoDB.Bson.Serialization.Conventions; +using MongoDB.Driver; +using UKSF.Api.Data; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Utility; +using UKSF.Tests.Common; +using Xunit; + +// Available test collections: +// accounts +// commentThreads +// discharges +// gameServers +// ranks +// roles +// scheduledJobs +// scheduledJobsIntegrations +// teamspeakSnapshots +// units +// variables + +namespace UKSF.Tests.Integration.Data { + public class DataCollectionTests { + private static async Task MongoTest(Func testFunction) { + MongoDbRunner mongoDbRunner = MongoDbRunner.Start(); + ConventionPack conventionPack = new ConventionPack { new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true) }; + ConventionRegistry.Register("DefaultConventions", conventionPack, t => true); + MongoClient mongoClient = new MongoClient(mongoDbRunner.ConnectionString); + IMongoDatabase database = mongoClient.GetDatabase("tests"); + + try { + await testFunction(mongoDbRunner, database); + } finally { + mongoDbRunner.Dispose(); + } + } + + private static void ImportTestCollection(MongoDbRunner mongoDbRunner, string collectionName) { + mongoDbRunner.Import("tests", collectionName, $"../../../../UKSF.Tests.Common/testdata/{collectionName}.json", true); + } + + [Fact] + public async Task ShouldCreateCollection() { + await MongoTest( + async (mongoDbRunner, database) => { + DataCollection dataCollection = new DataCollection(database, "test"); + + await dataCollection.AssertCollectionExistsAsync(); + + IMongoCollection subject = database.GetCollection("test"); + + subject.Should().NotBeNull(); + } + ); + } + + [Fact] + public async Task ShouldNotThrowWhenCollectionExists() { + await MongoTest( + async (mongoDbRunner, database) => { + await database.CreateCollectionAsync("test"); + DataCollection dataCollection = new DataCollection(database, "test"); + + Func act = async () => await dataCollection.AssertCollectionExistsAsync(); + + act.Should().NotThrow(); + } + ); + } + + [Fact] + public async Task ShouldGetCollection() { + await MongoTest( + (mongoDbRunner, database) => { + const string COLLECTION_NAME = "scheduledJobs"; + ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + + List subject = dataCollection.Get(); + + subject.Should().NotBeNull(); + subject.Count.Should().Be(2); + subject.Should().Contain(x => x.action == "PruneLogs"); + + return Task.CompletedTask; + } + ); + } + + [Fact] + public async Task ShouldGetByPredicate() { + await MongoTest( + (mongoDbRunner, database) => { + const string COLLECTION_NAME = "roles"; + ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + + List subject = dataCollection.Get(x => x.order == 0); + + subject.Should().NotBeNull(); + subject.Count.Should().Be(5); + subject.Should().Contain(x => x.name == "Trainee"); + + return Task.CompletedTask; + } + ); + } + + [Fact] + public async Task ShouldGetSingleById() { + await MongoTest( + (mongoDbRunner, database) => { + const string COLLECTION_NAME = "scheduledJobs"; + ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + + ScheduledJob subject = dataCollection.GetSingle("5c006212238c46637025fdad"); + + subject.Should().NotBeNull(); + subject.action.Should().Be("PruneLogs"); + + return Task.CompletedTask; + } + ); + } + + [Fact] + public async Task ShouldGetSingleByPredicate() { + await MongoTest( + (mongoDbRunner, database) => { + const string COLLECTION_NAME = "scheduledJobs"; + ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + + ScheduledJob subject = dataCollection.GetSingle(x => x.type == ScheduledJobType.LOG_PRUNE); + + subject.Should().NotBeNull(); + subject.action.Should().Be("PruneLogs"); + + return Task.CompletedTask; + } + ); + } + + [Fact] + public async Task ShouldAddItem() { + await MongoTest( + async (mongoDbRunner, database) => { + const string COLLECTION_NAME = "ranks"; + ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + + Rank rank = new Rank {name = "Captain"}; + await dataCollection.AddAsync(rank); + + List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().ToList(); + + subject.Should().Contain(x => x.name == rank.name); + } + ); + } + + [Fact] + public async Task ShouldUpdate() { + await MongoTest( + async (mongoDbRunner, database) => { + const string COLLECTION_NAME = "ranks"; + ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + + await dataCollection.UpdateAsync("5b72fbb52d54990cec7c4b24", Builders.Update.Set(x => x.order, 10)); + + Rank subject = database.GetCollection(COLLECTION_NAME).AsQueryable().First(x => x.id == "5b72fbb52d54990cec7c4b24"); + + subject.order.Should().Be(10); + } + ); + } + + [Fact] + public async Task ShouldUpdateMany() { + await MongoTest( + async (mongoDbRunner, database) => { + const string COLLECTION_NAME = "roles"; + ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + + await dataCollection.UpdateManyAsync(x => x.order == 0, Builders.Update.Set(x => x.order, 10)); + + List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().Where(x => x.order == 10).ToList(); + + subject.Count.Should().Be(5); + } + ); + } + + [Fact] + public async Task ShouldReplace() { + await MongoTest( + async (mongoDbRunner, database) => { + const string COLLECTION_NAME = "roles"; + ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + + Role role = new Role {id = "5b7424eda144bb436484fbc2", name = "Sharpshooter"}; + await dataCollection.ReplaceAsync(role.id, role); + + Role subject = database.GetCollection(COLLECTION_NAME).AsQueryable().First(x => x.id == "5b7424eda144bb436484fbc2"); + + subject.name.Should().Be(role.name); + subject.order.Should().Be(0); + subject.roleType.Should().Be(RoleType.INDIVIDUAL); + } + ); + } + + [Fact] + public async Task ShouldDelete() { + await MongoTest( + async (mongoDbRunner, database) => { + const string COLLECTION_NAME = "roles"; + ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + + await dataCollection.DeleteAsync("5b7424eda144bb436484fbc2"); + + List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().ToList(); + + subject.Should().NotContain(x => x.id == "5b7424eda144bb436484fbc2"); + } + ); + } + + [Fact] + public async Task ShouldDeleteMany() { + await MongoTest( + async (mongoDbRunner, database) => { + const string COLLECTION_NAME = "roles"; + ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + + await dataCollection.DeleteManyAsync(x => x.order == 0); + + List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().ToList(); + + subject.Should().NotContain(x => x.order == 0); + } + ); + } + } +} diff --git a/UKSF.Tests.Integration/Data/DataPerformanceTests.cs b/UKSF.Tests.Integration/Data/DataPerformanceTests.cs new file mode 100644 index 00000000..df614459 --- /dev/null +++ b/UKSF.Tests.Integration/Data/DataPerformanceTests.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using FluentAssertions; +using Mongo2Go; +using MongoDB.Bson.Serialization.Conventions; +using MongoDB.Driver; +using UKSF.Api.Data; +using UKSF.Api.Models.Integrations; +using Xunit; + +namespace UKSF.Tests.Integration.Data { + public class DataPerformanceTests { + private static async Task MongoTest(Func testFunction) { + MongoDbRunner mongoDbRunner = MongoDbRunner.Start(); + ConventionPack conventionPack = new ConventionPack { new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true) }; + ConventionRegistry.Register("DefaultConventions", conventionPack, t => true); + MongoClient mongoClient = new MongoClient(mongoDbRunner.ConnectionString); + IMongoDatabase database = mongoClient.GetDatabase("tests"); + + try { + await testFunction(mongoDbRunner, database); + } finally { + mongoDbRunner.Dispose(); + } + } + + // This test tests nothing, and is only used for profiling various data retrieval methods + [Fact] + public async Task TestGetPerformance() { + await MongoTest( + (mongoDbRunner, database) => { + const string COLLECTION_NAME = "teamspeakSnapshots"; + mongoDbRunner.Import("tests", COLLECTION_NAME, $"../../../../UKSF.Tests.Common/testdata/{COLLECTION_NAME}.json", true); + + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + List subject = dataCollection.Get(x => x.timestamp > DateTime.Parse("2018-08-09T05:00:00.307Z")); + + subject.Should().NotBeNull(); + + return Task.CompletedTask; + } + ); + } + } +} diff --git a/UKSF.Tests.Integration/UKSF.Tests.Integration.csproj b/UKSF.Tests.Integration/UKSF.Tests.Integration.csproj new file mode 100644 index 00000000..3885ca87 --- /dev/null +++ b/UKSF.Tests.Integration/UKSF.Tests.Integration.csproj @@ -0,0 +1,25 @@ + + + + netcoreapp3.1 + + false + + + + + + + + + + + + + + + + + + + diff --git a/UKSF.Tests.Integration/xunit.runner.json b/UKSF.Tests.Integration/xunit.runner.json new file mode 100644 index 00000000..bcd1a4c8 --- /dev/null +++ b/UKSF.Tests.Integration/xunit.runner.json @@ -0,0 +1,3 @@ +{ + "parallelizeAssembly": true +} diff --git a/UKSF.Tests.Unit/Common/DataUtilitiesTests.cs b/UKSF.Tests.Unit/Common/DataUtilitiesTests.cs index 471bb391..f2dd4a3b 100644 --- a/UKSF.Tests.Unit/Common/DataUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Common/DataUtilitiesTests.cs @@ -1,6 +1,8 @@ using System; +using System.Collections.Generic; using FluentAssertions; using UKSF.Common; +using UKSF.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Common { @@ -22,5 +24,17 @@ public void ShouldReturnEmptyStringForInvalidObject() { subject.Should().Be(string.Empty); } + + [Fact] + public void ShouldReturnIdWithinOneSecond() { + MockDataModel mockDataModel = new MockDataModel { Stuff = new List() }; + for (int i = 0; i < 10000; i++) { + mockDataModel.Stuff.Add(new {index = i, data = Guid.NewGuid(), number = i * 756 * 458 * 5478}); + } + + Action act = () => mockDataModel.GetIdValue(); + + act.ExecutionTime().Should().BeLessThan(TimeSpan.FromSeconds(1)); + } } } diff --git a/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs b/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs index 600aa3a0..ca1d890d 100644 --- a/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs +++ b/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs @@ -3,6 +3,7 @@ using UKSF.Api.Models.Events; using UKSF.Api.Models.Events.Types; using UKSF.Common; +using UKSF.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs b/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs index c239207b..1ab9b5cf 100644 --- a/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs +++ b/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using FluentAssertions; using UKSF.Common; +using UKSF.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs index 6a89d462..318162d0 100644 --- a/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs @@ -15,16 +15,16 @@ namespace UKSF.Tests.Unit.Data.Admin { public class VariablesDataServiceTests { private readonly VariablesDataService variablesDataService; - private readonly Mock mockDataCollection; + private readonly Mock> mockDataCollection; private List mockCollection; public VariablesDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock(); + mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); variablesDataService = new VariablesDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } @@ -91,7 +91,7 @@ public async Task ShouldDeleteItem() { VariableItem item1 = new VariableItem {key = "DISCORD_ID", item = "50"}; mockCollection = new List {item1}; - mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); await variablesDataService.Delete("discord id"); diff --git a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs index fb176fe1..940f5a83 100644 --- a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs @@ -9,20 +9,21 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; +using UKSF.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Data { public class CachedDataServiceTests { private readonly MockCachedDataService mockCachedDataService; - private readonly Mock mockDataCollection; + private readonly Mock> mockDataCollection; private List mockCollection; public CachedDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock(); + mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataEventBus.Setup(x => x.Send(It.IsAny>())); mockCachedDataService = new MockCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); @@ -32,7 +33,7 @@ public CachedDataServiceTests() { public void ShouldCacheCollectionForGet() { mockCollection = new List(); - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); mockCachedDataService.Collection.Should().BeNull(); @@ -48,7 +49,7 @@ public void ShouldCacheCollectionForGetByPredicate() { MockDataModel item2 = new MockDataModel { Name = "2" }; mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); List subject = mockCachedDataService.Get(x => x.Name == "1"); @@ -62,7 +63,7 @@ public void ShouldCacheCollectionForGetSingle() { MockDataModel item2 = new MockDataModel { Name = "2" }; mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); MockDataModel subject = mockCachedDataService.GetSingle(item2.id); @@ -77,7 +78,7 @@ public void ShouldCacheCollectionForGetSingleByPredicate() { MockDataModel item2 = new MockDataModel { Name = "2" }; mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); MockDataModel subject = mockCachedDataService.GetSingle(x => x.Name == "2"); @@ -90,7 +91,7 @@ public void ShouldCacheCollectionForGetSingleByPredicate() { public void ShouldCacheCollectionForRefreshWhenNull() { mockCollection = new List(); - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); mockCachedDataService.Collection.Should().BeNull(); @@ -104,7 +105,7 @@ public void ShouldCacheCollectionForRefreshWhenNull() { public void ShouldGetCachedCollection() { mockCollection = new List(); - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); mockCachedDataService.Collection.Should().BeNull(); @@ -124,7 +125,7 @@ public async Task ShouldRefreshCollectionForAdd() { MockDataModel item1 = new MockDataModel { Name = "1" }; mockCollection = new List(); - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Callback(x => mockCollection.Add(x)); mockCachedDataService.Collection.Should().BeNull(); @@ -141,8 +142,8 @@ public async Task ShouldRefreshCollectionForDelete() { MockDataModel item2 = new MockDataModel { Name = "2" }; mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); await mockCachedDataService.Delete(item1.id); @@ -157,7 +158,7 @@ public async Task ShouldRefreshCollectionForDeleteMany() { MockDataModel item3 = new MockDataModel { Name = "3" }; mockCollection = new List { item1, item2, item3 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) .Returns(Task.CompletedTask) .Callback((Expression> expression) => mockCollection.RemoveAll(x => mockCollection.Where(expression.Compile()).Contains(x))); @@ -175,7 +176,7 @@ public async Task ShouldRefreshCollectionForReplace() { MockDataModel item2 = new MockDataModel { id = item1.id, Name = "2" }; mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())) .Returns(Task.CompletedTask) .Callback((string id, MockDataModel value) => mockCollection[mockCollection.FindIndex(x => x.id == id)] = value); @@ -191,7 +192,7 @@ public async Task ShouldRefreshCollectionForUpdate() { MockDataModel item1 = new MockDataModel { Name = "1" }; mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); @@ -207,7 +208,7 @@ public async Task ShouldRefreshCollectionForUpdateByUpdateDefinition() { MockDataModel item1 = new MockDataModel { Name = "1" }; mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); @@ -225,7 +226,7 @@ public async Task ShouldRefreshCollectionForUpdateMany() { MockDataModel item3 = new MockDataModel { Name = "3" }; mockCollection = new List { item1, item2, item3 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback( diff --git a/UKSF.Tests.Unit/Data/DataCollectionFactoryTests.cs b/UKSF.Tests.Unit/Data/DataCollectionFactoryTests.cs new file mode 100644 index 00000000..d7eb74f7 --- /dev/null +++ b/UKSF.Tests.Unit/Data/DataCollectionFactoryTests.cs @@ -0,0 +1,22 @@ +using FluentAssertions; +using MongoDB.Driver; +using Moq; +using UKSF.Api.Data; +using UKSF.Api.Interfaces.Data; +using UKSF.Tests.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Data { + public class DataCollectionFactoryTests { + [Fact] + public void ShouldCreateDataCollection() { + Mock mockMongoDatabase = new Mock(); + + DataCollectionFactory dataCollectionFactory = new DataCollectionFactory(mockMongoDatabase.Object); + + IDataCollection subject = dataCollectionFactory.CreateDataCollection("test"); + + subject.Should().NotBeNull(); + } + } +} diff --git a/UKSF.Tests.Unit/Data/DataServiceTests.cs b/UKSF.Tests.Unit/Data/DataServiceTests.cs index 07462eb0..428a6222 100644 --- a/UKSF.Tests.Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/DataServiceTests.cs @@ -10,21 +10,22 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; +using UKSF.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Data { public class DataServiceTests { - private readonly Mock mockDataCollection; + private readonly Mock> mockDataCollection; private readonly MockDataService mockDataService; private List mockCollection; public DataServiceTests() { Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock(); + mockDataCollection = new Mock>(); mockDataEventBus.Setup(x => x.Send(It.IsAny>())); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataService = new MockDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); } @@ -101,7 +102,7 @@ public async Task ShouldDeleteItem() { MockDataModel item2 = new MockDataModel { Name = "2" }; mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); await mockDataService.Delete(item1.id); @@ -112,7 +113,7 @@ public async Task ShouldDeleteItem() { public void ShouldGetItem() { MockDataModel item1 = new MockDataModel { Name = "1" }; - mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); + mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); MockDataModel subject = mockDataService.GetSingle(item1.id); @@ -134,7 +135,7 @@ public void ShouldGetItemByPredicate() { [Fact] public void ShouldGetItems() { - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); List subject = mockDataService.Get(); @@ -213,7 +214,7 @@ public async Task ShouldReplaceItem() { MockDataModel item2 = new MockDataModel { id = item1.id, Name = "2" }; mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns(item1); + mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())) .Returns(Task.CompletedTask) .Callback((string id, MockDataModel item) => mockCollection[mockCollection.FindIndex(x => x.id == id)] = item); diff --git a/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs b/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs index 486ba651..83a0efb1 100644 --- a/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs @@ -10,15 +10,15 @@ namespace UKSF.Tests.Unit.Data.Game { public class GameServersDataServiceTests { - private readonly Mock mockDataCollection; + private readonly Mock> mockDataCollection; private readonly GameServersDataService gameServersDataService; public GameServersDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock(); + mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); gameServersDataService = new GameServersDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } @@ -29,7 +29,7 @@ public void ShouldGetSortedCollection() { GameServer rank2 = new GameServer {order = 0}; GameServer rank3 = new GameServer {order = 1}; - mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); + mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); List subject = gameServersDataService.Get(); diff --git a/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs b/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs index 36a3fb24..0c718219 100644 --- a/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs @@ -10,21 +10,22 @@ using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; using UKSF.Api.Models.Message; +using UKSF.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Data.Message { public class CommentThreadDataServiceTests { private readonly CommentThreadDataService commentThreadDataService; - private readonly Mock mockDataCollection; + private readonly Mock> mockDataCollection; private List mockCollection; public CommentThreadDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock(); + mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); commentThreadDataService = new CommentThreadDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } diff --git a/UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs b/UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs index e7de7067..91a8fe92 100644 --- a/UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs @@ -20,10 +20,10 @@ public LogDataServiceTests() { Mock> mockDataEventBus = new Mock>(); Mock mockDataCollectionFactory = new Mock(); - Mock mockBasicDataCollection = new Mock(); - Mock mockAuditDataCollection = new Mock(); - Mock mockLauncherDataCollection = new Mock(); - Mock mockErrorDataCollection = new Mock(); + Mock> mockBasicDataCollection = new Mock>(); + Mock> mockAuditDataCollection = new Mock>(); + Mock> mockLauncherDataCollection = new Mock>(); + Mock> mockErrorDataCollection = new Mock>(); mockBasicCollection = new List(); mockAuditCollection = new List(); @@ -38,10 +38,10 @@ public LogDataServiceTests() { mockErrorDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockErrorCollection.Add(x)); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("logs")).Returns(mockBasicDataCollection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("auditLogs")).Returns(mockAuditDataCollection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("launcherLogs")).Returns(mockLauncherDataCollection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("errorLogs")).Returns(mockErrorDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("logs")).Returns(mockBasicDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("auditLogs")).Returns(mockAuditDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("launcherLogs")).Returns(mockLauncherDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("errorLogs")).Returns(mockErrorDataCollection.Object); logDataService = new LogDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } diff --git a/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs b/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs index 39af8466..1ef09fb6 100644 --- a/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs @@ -10,15 +10,15 @@ namespace UKSF.Tests.Unit.Data.Operations { public class OperationOrderDataServiceTests { - private readonly Mock mockDataCollection; + private readonly Mock> mockDataCollection; private readonly OperationOrderDataService operationOrderDataService; public OperationOrderDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock(); + mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); operationOrderDataService = new OperationOrderDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } @@ -29,7 +29,7 @@ public void ShouldGetReversedCollection() { Opord item2 = new Opord(); Opord item3 = new Opord(); - mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); + mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); List subject = operationOrderDataService.Get(); @@ -42,7 +42,7 @@ public void ShouldGetReversedCollectionByPredicate() { Opord item2 = new Opord { description = "2" }; Opord item3 = new Opord { description = "3" }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); + mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); List subject = operationOrderDataService.Get(x => x.description != string.Empty); diff --git a/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs b/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs index fb547383..6723db1b 100644 --- a/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs @@ -10,15 +10,15 @@ namespace UKSF.Tests.Unit.Data.Operations { public class OperationReportDataServiceTests { - private readonly Mock mockDataCollection; + private readonly Mock> mockDataCollection; private readonly OperationReportDataService operationReportDataService; public OperationReportDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock(); + mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); operationReportDataService = new OperationReportDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } @@ -29,7 +29,7 @@ public void ShouldGetReversedCollection() { Oprep item2 = new Oprep(); Oprep item3 = new Oprep(); - mockDataCollection.Setup(x => x.Get()).Returns(new List {item1, item2, item3}); + mockDataCollection.Setup(x => x.Get()).Returns(new List {item1, item2, item3}); List subject = operationReportDataService.Get(); @@ -42,7 +42,7 @@ public void ShouldGetReversedCollectionByPredicate() { Oprep item2 = new Oprep { description = "2" }; Oprep item3 = new Oprep { description = "3" }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); + mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); List subject = operationReportDataService.Get(x => x.description != string.Empty); diff --git a/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs index d5b875c8..eecf450c 100644 --- a/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -15,14 +15,14 @@ public class DischargeDataServiceTests { public void ShouldGetOrderedCollection() { Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); - Mock mockDataCollection = new Mock(); + Mock> mockDataCollection = new Mock>(); DischargeCollection dischargeCollection1 = new DischargeCollection {discharges = new List {new Discharge {timestamp = DateTime.Now.AddDays(-3)}}}; DischargeCollection dischargeCollection2 = new DischargeCollection {discharges = new List {new Discharge {timestamp = DateTime.Now.AddDays(-10)}, new Discharge {timestamp = DateTime.Now.AddDays(-1)}}}; DischargeCollection dischargeCollection3 = new DischargeCollection {discharges = new List {new Discharge {timestamp = DateTime.Now.AddDays(-5)}, new Discharge {timestamp = DateTime.Now.AddDays(-2)}}}; - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(new List {dischargeCollection1, dischargeCollection2, dischargeCollection3}); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(new List {dischargeCollection1, dischargeCollection2, dischargeCollection3}); DischargeDataService dischargeDataService = new DischargeDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); diff --git a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs index e9e74055..87510a4e 100644 --- a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs @@ -10,22 +10,22 @@ namespace UKSF.Tests.Unit.Data.Personnel { public class RanksDataServiceTests { - private readonly Mock mockDataCollection; + private readonly Mock> mockDataCollection; private readonly RanksDataService ranksDataService; public RanksDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock(); + mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); ranksDataService = new RanksDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Theory, InlineData(""), InlineData(null)] public void ShouldGetNothingWhenNoNameOrNull(string name) { - mockDataCollection.Setup(x => x.Get()).Returns(new List()); + mockDataCollection.Setup(x => x.Get()).Returns(new List()); Rank subject = ranksDataService.GetSingle(name); @@ -38,7 +38,7 @@ public void ShouldGetSingleByName() { Rank rank2 = new Rank { name = "Recruit", order = 1 }; Rank rank3 = new Rank { name = "Candidate", order = 0 }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); + mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); Rank subject = ranksDataService.GetSingle("Recruit"); @@ -51,7 +51,7 @@ public void ShouldGetSortedCollection() { Rank rank2 = new Rank { order = 0 }; Rank rank3 = new Rank { order = 1 }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); + mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); List subject = ranksDataService.Get(); diff --git a/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs index 4dd33e3e..7cc46e08 100644 --- a/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs @@ -10,15 +10,15 @@ namespace UKSF.Tests.Unit.Data.Personnel { public class RolesDataServiceTests { - private readonly Mock mockDataCollection; + private readonly Mock> mockDataCollection; private readonly RolesDataService rolesDataService; public RolesDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock(); + mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); rolesDataService = new RolesDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } @@ -29,7 +29,7 @@ public void ShouldGetSortedCollection() { Role role2 = new Role {name = "Trainee"}; Role role3 = new Role {name = "Marksman"}; - mockDataCollection.Setup(x => x.Get()).Returns(new List {role1, role2, role3}); + mockDataCollection.Setup(x => x.Get()).Returns(new List {role1, role2, role3}); List subject = rolesDataService.Get(); @@ -42,7 +42,7 @@ public void ShouldGetSingleByName() { Role role2 = new Role {name = "Trainee"}; Role role3 = new Role {name = "Marksman"}; - mockDataCollection.Setup(x => x.Get()).Returns(new List {role1, role2, role3}); + mockDataCollection.Setup(x => x.Get()).Returns(new List {role1, role2, role3}); Role subject = rolesDataService.GetSingle("Trainee"); @@ -51,7 +51,7 @@ public void ShouldGetSingleByName() { [Theory, InlineData(""), InlineData(null)] public void ShouldGetNothingWhenNoName(string name) { - mockDataCollection.Setup(x => x.Get()).Returns(new List()); + mockDataCollection.Setup(x => x.Get()).Returns(new List()); Role subject = rolesDataService.GetSingle(name); diff --git a/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs index 49553695..09eafabe 100644 --- a/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs @@ -14,14 +14,14 @@ public class UnitsDataServiceTests { public void ShouldGetOrderedCollection() { Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); - Mock mockDataCollection = new Mock(); + Mock> mockDataCollection = new Mock>(); UUnit rank1 = new UUnit {name = "Air Troop", order = 2}; UUnit rank2 = new UUnit {name = "UKSF", order = 0}; UUnit rank3 = new UUnit {name = "SAS", order = 1}; - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); UnitsDataService unitsDataService = new UnitsDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); diff --git a/UKSF.Tests.Unit/Events/DataEventBackerTests.cs b/UKSF.Tests.Unit/Events/DataEventBackerTests.cs index bfb7b1db..869a7e65 100644 --- a/UKSF.Tests.Unit/Events/DataEventBackerTests.cs +++ b/UKSF.Tests.Unit/Events/DataEventBackerTests.cs @@ -5,7 +5,7 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; -using UKSF.Tests.Unit.Data; +using UKSF.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Events { @@ -15,9 +15,9 @@ public class DataEventBackerTests { public DataEventBackerTests() { Mock mockDataCollectionFactory = new Mock(); IDataEventBus dataEventBus = new DataEventBus(); - Mock mockDataCollection = new Mock(); + Mock> mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataService = new MockDataService(mockDataCollectionFactory.Object, dataEventBus, "test"); } diff --git a/UKSF.Tests.Unit/Events/EventBusTests.cs b/UKSF.Tests.Unit/Events/EventBusTests.cs index 5cba037f..8e17bcb7 100644 --- a/UKSF.Tests.Unit/Events/EventBusTests.cs +++ b/UKSF.Tests.Unit/Events/EventBusTests.cs @@ -2,7 +2,7 @@ using FluentAssertions; using UKSF.Api.Events; using UKSF.Api.Models.Events; -using UKSF.Tests.Unit.Data; +using UKSF.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Events { diff --git a/UKSF.Tests.Unit/MockDataModel.cs b/UKSF.Tests.Unit/MockDataModel.cs deleted file mode 100644 index ffe03378..00000000 --- a/UKSF.Tests.Unit/MockDataModel.cs +++ /dev/null @@ -1,7 +0,0 @@ -using UKSF.Api.Models; - -namespace UKSF.Tests.Unit { - public class MockDataModel : DatabaseObject { - public string Name; - } -} diff --git a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj index 16d6f8ca..bc2ae145 100644 --- a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj +++ b/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj @@ -24,6 +24,7 @@ + diff --git a/UKSF.Tests.Unit/xunit.runner.json b/UKSF.Tests.Unit/xunit.runner.json new file mode 100644 index 00000000..bcd1a4c8 --- /dev/null +++ b/UKSF.Tests.Unit/xunit.runner.json @@ -0,0 +1,3 @@ +{ + "parallelizeAssembly": true +} From d2a36a20741e3aaead1ea26495ba691f3547e483 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 25 Feb 2020 20:02:50 +0000 Subject: [PATCH 139/369] Combine test projects into one, as coverlets doesn't properly work with multiple projects. --- .github/workflows/test.yml | 3 +- UKSF.Api.sln | 30 +--- UKSF.Tests.Common/UKSF.Tests.Common.csproj | 12 -- .../UKSF.Tests.Integration.csproj | 25 ---- UKSF.Tests.Integration/xunit.runner.json | 3 - UKSF.Tests.Unit/xunit.runner.json | 3 - .../Common}/IMockCachedDataService.cs | 6 +- .../Common}/IMockDataService.cs | 6 +- .../Common}/MockCachedDataService.cs | 2 +- .../Common}/MockComplexDataModel.cs | 2 +- .../Common}/MockDataModel.cs | 2 +- .../Common}/MockDataService.cs | 2 +- .../Common}/TestUtilities.cs | 2 +- .../Integration}/Data/DataCollectionTests.cs | 138 +++++++++--------- .../Integration}/Data/DataPerformanceTests.cs | 8 +- .../UKSF.Tests.csproj | 9 +- .../Unit}/Common/DataUtilitiesTests.cs | 4 +- .../Unit}/Common/DateUtilitiesTests.cs | 2 +- .../Unit}/Common/EventModelFactoryTests.cs | 4 +- .../Unit}/Common/JsonUtilitiesTests.cs | 4 +- .../Unit}/Common/StringUtilitiesTests.cs | 2 +- .../Unit}/Common/TaskUtilitiesTests.cs | 2 +- .../Data/Admin/VariablesDataServiceTests.cs | 2 +- .../Unit}/Data/CachedDataServiceTests.cs | 4 +- .../Unit}/Data/DataCollectionFactoryTests.cs | 4 +- .../Unit}/Data/DataServiceTests.cs | 4 +- .../Data/Game/GameServersDataServiceTests.cs | 2 +- .../Message/CommentThreadDataServiceTests.cs | 4 +- .../Unit}/Data/Message/LogDataServiceTests.cs | 2 +- .../OperationOrderDataServiceTests.cs | 2 +- .../OperationReportDataServiceTests.cs | 2 +- .../Personnel/DischargeDataServiceTests.cs | 2 +- .../Data/Personnel/RanksDataServiceTests.cs | 2 +- .../Data/Personnel/RolesDataServiceTests.cs | 2 +- .../Unit}/Data/Units/UnitsDataServiceTests.cs | 2 +- .../Unit}/Events/DataEventBackerTests.cs | 4 +- .../Unit}/Events/EventBusTests.cs | 4 +- .../Unit}/Models/AccountSettingsTests.cs | 2 +- .../Message/Logging/BasicLogMessageTests.cs | 2 +- .../Logging/LauncherLogMessageTests.cs | 2 +- .../Message/Logging/WebLogMessageTests.cs | 2 +- .../Services/Admin/VariablesServiceTests.cs | 2 +- .../Services/Common/AccountUtilitiesTests.cs | 2 +- .../Common/DisplayNameUtilitiesTests.cs | 2 +- .../Personnel/DisplayNameServiceTests.cs | 2 +- .../Services/Personnel/RanksServiceTests.cs | 2 +- .../Services/Personnel/RoleAttributeTests.cs | 2 +- .../Services/Personnel/RolesServiceTests.cs | 2 +- .../Utility/ConfirmationCodeServiceTests.cs | 2 +- .../testdata/accounts.json | 0 .../testdata/commentThreads.json | 0 .../testdata/discharges.json | 0 .../testdata/gameServers.json | 0 .../testdata/ranks.json | 0 .../testdata/roles.json | 0 .../testdata/scheduledJobs.json | 0 .../testdata/scheduledJobsIntegrations.json | 0 .../testdata/teamspeakSnapshots.json | 0 .../testdata/units.json | 0 .../testdata/variables.json | 0 60 files changed, 135 insertions(+), 202 deletions(-) delete mode 100644 UKSF.Tests.Common/UKSF.Tests.Common.csproj delete mode 100644 UKSF.Tests.Integration/UKSF.Tests.Integration.csproj delete mode 100644 UKSF.Tests.Integration/xunit.runner.json delete mode 100644 UKSF.Tests.Unit/xunit.runner.json rename {UKSF.Tests.Common => UKSF.Tests/Common}/IMockCachedDataService.cs (58%) rename {UKSF.Tests.Common => UKSF.Tests/Common}/IMockDataService.cs (62%) rename {UKSF.Tests.Common => UKSF.Tests/Common}/MockCachedDataService.cs (92%) rename {UKSF.Tests.Common => UKSF.Tests/Common}/MockComplexDataModel.cs (86%) rename {UKSF.Tests.Common => UKSF.Tests/Common}/MockDataModel.cs (83%) rename {UKSF.Tests.Common => UKSF.Tests/Common}/MockDataService.cs (92%) rename {UKSF.Tests.Common => UKSF.Tests/Common}/TestUtilities.cs (90%) rename {UKSF.Tests.Integration => UKSF.Tests/Integration}/Data/DataCollectionTests.cs (97%) rename {UKSF.Tests.Integration => UKSF.Tests/Integration}/Data/DataPerformanceTests.cs (83%) rename UKSF.Tests.Unit/UKSF.Tests.Unit.csproj => UKSF.Tests/UKSF.Tests.csproj (85%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Common/DataUtilitiesTests.cs (94%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Common/DateUtilitiesTests.cs (95%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Common/EventModelFactoryTests.cs (93%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Common/JsonUtilitiesTests.cs (95%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Common/StringUtilitiesTests.cs (98%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Common/TaskUtilitiesTests.cs (95%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Data/Admin/VariablesDataServiceTests.cs (99%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Data/CachedDataServiceTests.cs (99%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Data/DataCollectionFactoryTests.cs (90%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Data/DataServiceTests.cs (99%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Data/Game/GameServersDataServiceTests.cs (97%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Data/Message/CommentThreadDataServiceTests.cs (97%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Data/Message/LogDataServiceTests.cs (99%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Data/Operations/OperationOrderDataServiceTests.cs (97%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Data/Operations/OperationReportDataServiceTests.cs (97%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Data/Personnel/DischargeDataServiceTests.cs (97%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Data/Personnel/RanksDataServiceTests.cs (97%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Data/Personnel/RolesDataServiceTests.cs (97%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Data/Units/UnitsDataServiceTests.cs (96%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Events/DataEventBackerTests.cs (95%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Events/EventBusTests.cs (87%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Models/AccountSettingsTests.cs (96%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Models/Message/Logging/BasicLogMessageTests.cs (95%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Models/Message/Logging/LauncherLogMessageTests.cs (87%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Models/Message/Logging/WebLogMessageTests.cs (89%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Services/Admin/VariablesServiceTests.cs (98%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Services/Common/AccountUtilitiesTests.cs (97%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Services/Common/DisplayNameUtilitiesTests.cs (98%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Services/Personnel/DisplayNameServiceTests.cs (98%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Services/Personnel/RanksServiceTests.cs (99%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Services/Personnel/RoleAttributeTests.cs (91%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Services/Personnel/RolesServiceTests.cs (98%) rename {UKSF.Tests.Unit => UKSF.Tests/Unit}/Services/Utility/ConfirmationCodeServiceTests.cs (99%) rename {UKSF.Tests.Common => UKSF.Tests}/testdata/accounts.json (100%) rename {UKSF.Tests.Common => UKSF.Tests}/testdata/commentThreads.json (100%) rename {UKSF.Tests.Common => UKSF.Tests}/testdata/discharges.json (100%) rename {UKSF.Tests.Common => UKSF.Tests}/testdata/gameServers.json (100%) rename {UKSF.Tests.Common => UKSF.Tests}/testdata/ranks.json (100%) rename {UKSF.Tests.Common => UKSF.Tests}/testdata/roles.json (100%) rename {UKSF.Tests.Common => UKSF.Tests}/testdata/scheduledJobs.json (100%) rename {UKSF.Tests.Common => UKSF.Tests}/testdata/scheduledJobsIntegrations.json (100%) rename {UKSF.Tests.Common => UKSF.Tests}/testdata/teamspeakSnapshots.json (100%) rename {UKSF.Tests.Common => UKSF.Tests}/testdata/units.json (100%) rename {UKSF.Tests.Common => UKSF.Tests}/testdata/variables.json (100%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a1c7a4b2..b1dd931f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,8 +18,9 @@ jobs: with: dotnet-version: 3.1.101 - name: Run tests with coverage - run: dotnet test ./UKSF.Api.sln /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info /p:Exclude="[UKSF.Api.Signalr]*%2c[UKSF.PostMessage]*" + run: dotnet test /p:CollectCoverage=true /p:Exclude="[UKSF.Api.Signalr]*%2c[UKSF.PostMessage]*" /p:CoverletOutput=../coverage/coverage.info /p:CoverletOutputFormat=lcov -m:1 - name: Coveralls uses: coverallsapp/github-action@master with: github-token: ${{ secrets.GITHUB_TOKEN }} + path-to-lcov: ./coverage/coverage.info diff --git a/UKSF.Api.sln b/UKSF.Api.sln index 62359bcf..f3a0f208 100644 --- a/UKSF.Api.sln +++ b/UKSF.Api.sln @@ -26,14 +26,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Signalr", "UKSF.Ap EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.PostMessage", "UKSF.PostMessage\UKSF.PostMessage.csproj", "{B173771C-1AB7-436B-A6FF-0EF50EF5D015}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Tests.Unit", "UKSF.Tests.Unit\UKSF.Tests.Unit.csproj", "{09946FE7-A65D-483E-8B5A-ADE729760375}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Tests", "UKSF.Tests\UKSF.Tests.csproj", "{09946FE7-A65D-483E-8B5A-ADE729760375}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Common", "UKSF.Common\UKSF.Common.csproj", "{9FB41E01-8AD4-4110-8AEE-97800CF565E8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Tests.Integration", "UKSF.Tests.Integration\UKSF.Tests.Integration.csproj", "{9C6DA990-3F34-42A2-AEF2-66E9E238775C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Tests.Common", "UKSF.Tests.Common\UKSF.Tests.Common.csproj", "{3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -176,30 +172,6 @@ Global {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x64.Build.0 = Release|Any CPU {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x86.ActiveCfg = Release|Any CPU {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x86.Build.0 = Release|Any CPU - {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Debug|x64.ActiveCfg = Debug|Any CPU - {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Debug|x64.Build.0 = Debug|Any CPU - {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Debug|x86.ActiveCfg = Debug|Any CPU - {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Debug|x86.Build.0 = Debug|Any CPU - {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Release|Any CPU.Build.0 = Release|Any CPU - {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Release|x64.ActiveCfg = Release|Any CPU - {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Release|x64.Build.0 = Release|Any CPU - {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Release|x86.ActiveCfg = Release|Any CPU - {9C6DA990-3F34-42A2-AEF2-66E9E238775C}.Release|x86.Build.0 = Release|Any CPU - {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Debug|x64.ActiveCfg = Debug|Any CPU - {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Debug|x64.Build.0 = Debug|Any CPU - {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Debug|x86.ActiveCfg = Debug|Any CPU - {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Debug|x86.Build.0 = Debug|Any CPU - {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Release|Any CPU.Build.0 = Release|Any CPU - {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Release|x64.ActiveCfg = Release|Any CPU - {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Release|x64.Build.0 = Release|Any CPU - {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Release|x86.ActiveCfg = Release|Any CPU - {3A4BCC6A-B4C3-49E2-B81B-9A67B4335914}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UKSF.Tests.Common/UKSF.Tests.Common.csproj b/UKSF.Tests.Common/UKSF.Tests.Common.csproj deleted file mode 100644 index 8ecf844d..00000000 --- a/UKSF.Tests.Common/UKSF.Tests.Common.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netcoreapp3.1 - - - - - - - - diff --git a/UKSF.Tests.Integration/UKSF.Tests.Integration.csproj b/UKSF.Tests.Integration/UKSF.Tests.Integration.csproj deleted file mode 100644 index 3885ca87..00000000 --- a/UKSF.Tests.Integration/UKSF.Tests.Integration.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - netcoreapp3.1 - - false - - - - - - - - - - - - - - - - - - - diff --git a/UKSF.Tests.Integration/xunit.runner.json b/UKSF.Tests.Integration/xunit.runner.json deleted file mode 100644 index bcd1a4c8..00000000 --- a/UKSF.Tests.Integration/xunit.runner.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parallelizeAssembly": true -} diff --git a/UKSF.Tests.Unit/xunit.runner.json b/UKSF.Tests.Unit/xunit.runner.json deleted file mode 100644 index bcd1a4c8..00000000 --- a/UKSF.Tests.Unit/xunit.runner.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parallelizeAssembly": true -} diff --git a/UKSF.Tests.Common/IMockCachedDataService.cs b/UKSF.Tests/Common/IMockCachedDataService.cs similarity index 58% rename from UKSF.Tests.Common/IMockCachedDataService.cs rename to UKSF.Tests/Common/IMockCachedDataService.cs index 110df67c..b68d5b64 100644 --- a/UKSF.Tests.Common/IMockCachedDataService.cs +++ b/UKSF.Tests/Common/IMockCachedDataService.cs @@ -1,7 +1,5 @@ using UKSF.Api.Interfaces.Data; -namespace UKSF.Tests.Common { - public interface IMockCachedDataService : IDataService { - - } +namespace UKSF.Tests.Unit.Common { + public interface IMockCachedDataService : IDataService { } } diff --git a/UKSF.Tests.Common/IMockDataService.cs b/UKSF.Tests/Common/IMockDataService.cs similarity index 62% rename from UKSF.Tests.Common/IMockDataService.cs rename to UKSF.Tests/Common/IMockDataService.cs index 65d25810..8c87beba 100644 --- a/UKSF.Tests.Common/IMockDataService.cs +++ b/UKSF.Tests/Common/IMockDataService.cs @@ -1,7 +1,5 @@ using UKSF.Api.Interfaces.Data; -namespace UKSF.Tests.Common { - public interface IMockDataService : IDataService { - - } +namespace UKSF.Tests.Unit.Common { + public interface IMockDataService : IDataService { } } diff --git a/UKSF.Tests.Common/MockCachedDataService.cs b/UKSF.Tests/Common/MockCachedDataService.cs similarity index 92% rename from UKSF.Tests.Common/MockCachedDataService.cs rename to UKSF.Tests/Common/MockCachedDataService.cs index 3bb1966a..5416ac21 100644 --- a/UKSF.Tests.Common/MockCachedDataService.cs +++ b/UKSF.Tests/Common/MockCachedDataService.cs @@ -2,7 +2,7 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; -namespace UKSF.Tests.Common { +namespace UKSF.Tests.Unit.Common { public class MockCachedDataService : CachedDataService, IMockCachedDataService { public MockCachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } } diff --git a/UKSF.Tests.Common/MockComplexDataModel.cs b/UKSF.Tests/Common/MockComplexDataModel.cs similarity index 86% rename from UKSF.Tests.Common/MockComplexDataModel.cs rename to UKSF.Tests/Common/MockComplexDataModel.cs index 0ceacace..efd2df2e 100644 --- a/UKSF.Tests.Common/MockComplexDataModel.cs +++ b/UKSF.Tests/Common/MockComplexDataModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSF.Tests.Common { +namespace UKSF.Tests.Unit.Common { public class MockComplexDataModel : MockDataModel { public MockDataModel Data; public List List; diff --git a/UKSF.Tests.Common/MockDataModel.cs b/UKSF.Tests/Common/MockDataModel.cs similarity index 83% rename from UKSF.Tests.Common/MockDataModel.cs rename to UKSF.Tests/Common/MockDataModel.cs index 6d6b7b06..ab2117de 100644 --- a/UKSF.Tests.Common/MockDataModel.cs +++ b/UKSF.Tests/Common/MockDataModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UKSF.Api.Models; -namespace UKSF.Tests.Common { +namespace UKSF.Tests.Unit.Common { public class MockDataModel : DatabaseObject { public string Name; public List Stuff; diff --git a/UKSF.Tests.Common/MockDataService.cs b/UKSF.Tests/Common/MockDataService.cs similarity index 92% rename from UKSF.Tests.Common/MockDataService.cs rename to UKSF.Tests/Common/MockDataService.cs index 1f40fcaa..04c218d7 100644 --- a/UKSF.Tests.Common/MockDataService.cs +++ b/UKSF.Tests/Common/MockDataService.cs @@ -2,7 +2,7 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; -namespace UKSF.Tests.Common { +namespace UKSF.Tests.Unit.Common { public class MockDataService : DataService, IMockDataService { public MockDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } } diff --git a/UKSF.Tests.Common/TestUtilities.cs b/UKSF.Tests/Common/TestUtilities.cs similarity index 90% rename from UKSF.Tests.Common/TestUtilities.cs rename to UKSF.Tests/Common/TestUtilities.cs index bc9ef5d2..eb71c157 100644 --- a/UKSF.Tests.Common/TestUtilities.cs +++ b/UKSF.Tests/Common/TestUtilities.cs @@ -2,7 +2,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Driver; -namespace UKSF.Tests.Common { +namespace UKSF.Tests.Unit.Common { public static class TestUtilities { public static BsonValue Render(UpdateDefinition updateDefinition) => updateDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); } diff --git a/UKSF.Tests.Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs similarity index 97% rename from UKSF.Tests.Integration/Data/DataCollectionTests.cs rename to UKSF.Tests/Integration/Data/DataCollectionTests.cs index 16e7c39a..ed420c12 100644 --- a/UKSF.Tests.Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -9,7 +9,7 @@ using UKSF.Api.Data; using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Utility; -using UKSF.Tests.Common; +using UKSF.Tests.Unit.Common; using Xunit; // Available test collections: @@ -25,7 +25,7 @@ // units // variables -namespace UKSF.Tests.Integration.Data { +namespace UKSF.Tests.Unit.Integration.Data { public class DataCollectionTests { private static async Task MongoTest(Func testFunction) { MongoDbRunner mongoDbRunner = MongoDbRunner.Start(); @@ -42,7 +42,26 @@ private static async Task MongoTest(Func te } private static void ImportTestCollection(MongoDbRunner mongoDbRunner, string collectionName) { - mongoDbRunner.Import("tests", collectionName, $"../../../../UKSF.Tests.Common/testdata/{collectionName}.json", true); + mongoDbRunner.Import("tests", collectionName, $"../../../testdata/{collectionName}.json", true); + } + + [Fact] + public async Task ShouldAddItem() { + await MongoTest( + async (mongoDbRunner, database) => { + const string COLLECTION_NAME = "ranks"; + ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + + Rank rank = new Rank { name = "Captain" }; + await dataCollection.AddAsync(rank); + + List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().ToList(); + + subject.Should().Contain(x => x.name == rank.name); + } + ); } [Fact] @@ -61,34 +80,37 @@ await MongoTest( } [Fact] - public async Task ShouldNotThrowWhenCollectionExists() { + public async Task ShouldDelete() { await MongoTest( async (mongoDbRunner, database) => { - await database.CreateCollectionAsync("test"); - DataCollection dataCollection = new DataCollection(database, "test"); + const string COLLECTION_NAME = "roles"; + ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - Func act = async () => await dataCollection.AssertCollectionExistsAsync(); + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - act.Should().NotThrow(); + await dataCollection.DeleteAsync("5b7424eda144bb436484fbc2"); + + List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().ToList(); + + subject.Should().NotContain(x => x.id == "5b7424eda144bb436484fbc2"); } ); } [Fact] - public async Task ShouldGetCollection() { + public async Task ShouldDeleteMany() { await MongoTest( - (mongoDbRunner, database) => { - const string COLLECTION_NAME = "scheduledJobs"; + async (mongoDbRunner, database) => { + const string COLLECTION_NAME = "roles"; ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - List subject = dataCollection.Get(); + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - subject.Should().NotBeNull(); - subject.Count.Should().Be(2); - subject.Should().Contain(x => x.action == "PruneLogs"); + await dataCollection.DeleteManyAsync(x => x.order == 0); - return Task.CompletedTask; + List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().ToList(); + + subject.Should().NotContain(x => x.order == 0); } ); } @@ -113,17 +135,18 @@ await MongoTest( } [Fact] - public async Task ShouldGetSingleById() { + public async Task ShouldGetCollection() { await MongoTest( (mongoDbRunner, database) => { const string COLLECTION_NAME = "scheduledJobs"; ImportTestCollection(mongoDbRunner, COLLECTION_NAME); DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - ScheduledJob subject = dataCollection.GetSingle("5c006212238c46637025fdad"); + List subject = dataCollection.Get(); subject.Should().NotBeNull(); - subject.action.Should().Be("PruneLogs"); + subject.Count.Should().Be(2); + subject.Should().Contain(x => x.action == "PruneLogs"); return Task.CompletedTask; } @@ -131,14 +154,14 @@ await MongoTest( } [Fact] - public async Task ShouldGetSingleByPredicate() { + public async Task ShouldGetSingleById() { await MongoTest( (mongoDbRunner, database) => { const string COLLECTION_NAME = "scheduledJobs"; ImportTestCollection(mongoDbRunner, COLLECTION_NAME); DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - ScheduledJob subject = dataCollection.GetSingle(x => x.type == ScheduledJobType.LOG_PRUNE); + ScheduledJob subject = dataCollection.GetSingle("5c006212238c46637025fdad"); subject.Should().NotBeNull(); subject.action.Should().Be("PruneLogs"); @@ -149,56 +172,33 @@ await MongoTest( } [Fact] - public async Task ShouldAddItem() { - await MongoTest( - async (mongoDbRunner, database) => { - const string COLLECTION_NAME = "ranks"; - ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - - Rank rank = new Rank {name = "Captain"}; - await dataCollection.AddAsync(rank); - - List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().ToList(); - - subject.Should().Contain(x => x.name == rank.name); - } - ); - } - - [Fact] - public async Task ShouldUpdate() { + public async Task ShouldGetSingleByPredicate() { await MongoTest( - async (mongoDbRunner, database) => { - const string COLLECTION_NAME = "ranks"; + (mongoDbRunner, database) => { + const string COLLECTION_NAME = "scheduledJobs"; ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - - await dataCollection.UpdateAsync("5b72fbb52d54990cec7c4b24", Builders.Update.Set(x => x.order, 10)); + ScheduledJob subject = dataCollection.GetSingle(x => x.type == ScheduledJobType.LOG_PRUNE); - Rank subject = database.GetCollection(COLLECTION_NAME).AsQueryable().First(x => x.id == "5b72fbb52d54990cec7c4b24"); + subject.Should().NotBeNull(); + subject.action.Should().Be("PruneLogs"); - subject.order.Should().Be(10); + return Task.CompletedTask; } ); } [Fact] - public async Task ShouldUpdateMany() { + public async Task ShouldNotThrowWhenCollectionExists() { await MongoTest( async (mongoDbRunner, database) => { - const string COLLECTION_NAME = "roles"; - ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - - await dataCollection.UpdateManyAsync(x => x.order == 0, Builders.Update.Set(x => x.order, 10)); + await database.CreateCollectionAsync("test"); + DataCollection dataCollection = new DataCollection(database, "test"); - List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().Where(x => x.order == 10).ToList(); + Func act = async () => await dataCollection.AssertCollectionExistsAsync(); - subject.Count.Should().Be(5); + act.Should().NotThrow(); } ); } @@ -212,7 +212,7 @@ await MongoTest( DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - Role role = new Role {id = "5b7424eda144bb436484fbc2", name = "Sharpshooter"}; + Role role = new Role { id = "5b7424eda144bb436484fbc2", name = "Sharpshooter" }; await dataCollection.ReplaceAsync(role.id, role); Role subject = database.GetCollection(COLLECTION_NAME).AsQueryable().First(x => x.id == "5b7424eda144bb436484fbc2"); @@ -225,25 +225,25 @@ await MongoTest( } [Fact] - public async Task ShouldDelete() { + public async Task ShouldUpdate() { await MongoTest( async (mongoDbRunner, database) => { - const string COLLECTION_NAME = "roles"; + const string COLLECTION_NAME = "ranks"; ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - await dataCollection.DeleteAsync("5b7424eda144bb436484fbc2"); + await dataCollection.UpdateAsync("5b72fbb52d54990cec7c4b24", Builders.Update.Set(x => x.order, 10)); - List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().ToList(); + Rank subject = database.GetCollection(COLLECTION_NAME).AsQueryable().First(x => x.id == "5b72fbb52d54990cec7c4b24"); - subject.Should().NotContain(x => x.id == "5b7424eda144bb436484fbc2"); + subject.order.Should().Be(10); } ); } [Fact] - public async Task ShouldDeleteMany() { + public async Task ShouldUpdateMany() { await MongoTest( async (mongoDbRunner, database) => { const string COLLECTION_NAME = "roles"; @@ -251,11 +251,11 @@ await MongoTest( DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - await dataCollection.DeleteManyAsync(x => x.order == 0); + await dataCollection.UpdateManyAsync(x => x.order == 0, Builders.Update.Set(x => x.order, 10)); - List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().ToList(); + List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().Where(x => x.order == 10).ToList(); - subject.Should().NotContain(x => x.order == 0); + subject.Count.Should().Be(5); } ); } diff --git a/UKSF.Tests.Integration/Data/DataPerformanceTests.cs b/UKSF.Tests/Integration/Data/DataPerformanceTests.cs similarity index 83% rename from UKSF.Tests.Integration/Data/DataPerformanceTests.cs rename to UKSF.Tests/Integration/Data/DataPerformanceTests.cs index df614459..42105d4b 100644 --- a/UKSF.Tests.Integration/Data/DataPerformanceTests.cs +++ b/UKSF.Tests/Integration/Data/DataPerformanceTests.cs @@ -9,7 +9,7 @@ using UKSF.Api.Models.Integrations; using Xunit; -namespace UKSF.Tests.Integration.Data { +namespace UKSF.Tests.Unit.Integration.Data { public class DataPerformanceTests { private static async Task MongoTest(Func testFunction) { MongoDbRunner mongoDbRunner = MongoDbRunner.Start(); @@ -25,13 +25,17 @@ private static async Task MongoTest(Func te } } + private static void ImportTestCollection(MongoDbRunner mongoDbRunner, string collectionName) { + mongoDbRunner.Import("tests", collectionName, $"../../../testdata/{collectionName}.json", true); + } + // This test tests nothing, and is only used for profiling various data retrieval methods [Fact] public async Task TestGetPerformance() { await MongoTest( (mongoDbRunner, database) => { const string COLLECTION_NAME = "teamspeakSnapshots"; - mongoDbRunner.Import("tests", COLLECTION_NAME, $"../../../../UKSF.Tests.Common/testdata/{COLLECTION_NAME}.json", true); + ImportTestCollection(mongoDbRunner, COLLECTION_NAME); DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); List subject = dataCollection.Get(x => x.timestamp > DateTime.Parse("2018-08-09T05:00:00.307Z")); diff --git a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj b/UKSF.Tests/UKSF.Tests.csproj similarity index 85% rename from UKSF.Tests.Unit/UKSF.Tests.Unit.csproj rename to UKSF.Tests/UKSF.Tests.csproj index bc2ae145..1e20b4aa 100644 --- a/UKSF.Tests.Unit/UKSF.Tests.Unit.csproj +++ b/UKSF.Tests/UKSF.Tests.csproj @@ -4,6 +4,8 @@ netcoreapp3.1 false + + UKSF.Tests.Unit @@ -13,10 +15,11 @@ + - + @@ -24,11 +27,11 @@ - - + + diff --git a/UKSF.Tests.Unit/Common/DataUtilitiesTests.cs b/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs similarity index 94% rename from UKSF.Tests.Unit/Common/DataUtilitiesTests.cs rename to UKSF.Tests/Unit/Common/DataUtilitiesTests.cs index f2dd4a3b..a2c25455 100644 --- a/UKSF.Tests.Unit/Common/DataUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using FluentAssertions; using UKSF.Common; -using UKSF.Tests.Common; +using UKSF.Tests.Unit.Common; using Xunit; -namespace UKSF.Tests.Unit.Common { +namespace UKSF.Tests.Unit.Unit.Common { public class DataUtilitiesTests { [Fact] public void ShouldReturnIdValueForValidObject() { diff --git a/UKSF.Tests.Unit/Common/DateUtilitiesTests.cs b/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs similarity index 95% rename from UKSF.Tests.Unit/Common/DateUtilitiesTests.cs rename to UKSF.Tests/Unit/Common/DateUtilitiesTests.cs index f13f6a60..b11da544 100644 --- a/UKSF.Tests.Unit/Common/DateUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs @@ -3,7 +3,7 @@ using UKSF.Common; using Xunit; -namespace UKSF.Tests.Unit.Common { +namespace UKSF.Tests.Unit.Unit.Common { public class DateUtilitiesTests { [Theory, InlineData(25, 4, 25, 4), InlineData(25, 13, 26, 1)] public void ShouldGiveCorrectAge(int years, int months, int expectedYears, int expectedMonths) { diff --git a/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs b/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs similarity index 93% rename from UKSF.Tests.Unit/Common/EventModelFactoryTests.cs rename to UKSF.Tests/Unit/Common/EventModelFactoryTests.cs index ca1d890d..8d6d2416 100644 --- a/UKSF.Tests.Unit/Common/EventModelFactoryTests.cs +++ b/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs @@ -3,10 +3,10 @@ using UKSF.Api.Models.Events; using UKSF.Api.Models.Events.Types; using UKSF.Common; -using UKSF.Tests.Common; +using UKSF.Tests.Unit.Common; using Xunit; -namespace UKSF.Tests.Unit.Common { +namespace UKSF.Tests.Unit.Unit.Common { public class EventModelFactoryTests { [Fact] public void ShouldReturnDataEvent() { diff --git a/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs b/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs similarity index 95% rename from UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs rename to UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs index 1ab9b5cf..6117fd25 100644 --- a/UKSF.Tests.Unit/Common/JsonUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using FluentAssertions; using UKSF.Common; -using UKSF.Tests.Common; +using UKSF.Tests.Unit.Common; using Xunit; -namespace UKSF.Tests.Unit.Common { +namespace UKSF.Tests.Unit.Unit.Common { public class JsonUtilitiesTests { [Fact] public void ShouldCopyComplexObject() { diff --git a/UKSF.Tests.Unit/Common/StringUtilitiesTests.cs b/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs similarity index 98% rename from UKSF.Tests.Unit/Common/StringUtilitiesTests.cs rename to UKSF.Tests/Unit/Common/StringUtilitiesTests.cs index 42961c4c..d01e711b 100644 --- a/UKSF.Tests.Unit/Common/StringUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs @@ -5,7 +5,7 @@ using UKSF.Common; using Xunit; -namespace UKSF.Tests.Unit.Common { +namespace UKSF.Tests.Unit.Unit.Common { public class StringUtilitiesTests { [Theory, InlineData("", "", false), InlineData("", "hello", false), InlineData("hello world hello world", "hello", true), InlineData("hello", "HELLO", true), InlineData("hello world", "HELLOWORLD", false)] public void ShouldIgnoreCase(string text, string searchElement, bool expected) { diff --git a/UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs similarity index 95% rename from UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs rename to UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs index 9db5f9ec..830f6b64 100644 --- a/UKSF.Tests.Unit/Common/TaskUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs @@ -5,7 +5,7 @@ using UKSF.Common; using Xunit; -namespace UKSF.Tests.Unit.Common { +namespace UKSF.Tests.Unit.Unit.Common { public class TaskUtilitiesTests { [Fact] public void ShouldDelay() { diff --git a/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs similarity index 99% rename from UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs rename to UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs index 318162d0..93045ff2 100644 --- a/UKSF.Tests.Unit/Data/Admin/VariablesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs @@ -12,7 +12,7 @@ using UKSF.Api.Models.Admin; using Xunit; -namespace UKSF.Tests.Unit.Data.Admin { +namespace UKSF.Tests.Unit.Unit.Data.Admin { public class VariablesDataServiceTests { private readonly VariablesDataService variablesDataService; private readonly Mock> mockDataCollection; diff --git a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs similarity index 99% rename from UKSF.Tests.Unit/Data/CachedDataServiceTests.cs rename to UKSF.Tests/Unit/Data/CachedDataServiceTests.cs index 940f5a83..bf850535 100644 --- a/UKSF.Tests.Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs @@ -9,10 +9,10 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; -using UKSF.Tests.Common; +using UKSF.Tests.Unit.Common; using Xunit; -namespace UKSF.Tests.Unit.Data { +namespace UKSF.Tests.Unit.Unit.Data { public class CachedDataServiceTests { private readonly MockCachedDataService mockCachedDataService; private readonly Mock> mockDataCollection; diff --git a/UKSF.Tests.Unit/Data/DataCollectionFactoryTests.cs b/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs similarity index 90% rename from UKSF.Tests.Unit/Data/DataCollectionFactoryTests.cs rename to UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs index d7eb74f7..d372b9a3 100644 --- a/UKSF.Tests.Unit/Data/DataCollectionFactoryTests.cs +++ b/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs @@ -3,10 +3,10 @@ using Moq; using UKSF.Api.Data; using UKSF.Api.Interfaces.Data; -using UKSF.Tests.Common; +using UKSF.Tests.Unit.Common; using Xunit; -namespace UKSF.Tests.Unit.Data { +namespace UKSF.Tests.Unit.Unit.Data { public class DataCollectionFactoryTests { [Fact] public void ShouldCreateDataCollection() { diff --git a/UKSF.Tests.Unit/Data/DataServiceTests.cs b/UKSF.Tests/Unit/Data/DataServiceTests.cs similarity index 99% rename from UKSF.Tests.Unit/Data/DataServiceTests.cs rename to UKSF.Tests/Unit/Data/DataServiceTests.cs index 428a6222..61dedcde 100644 --- a/UKSF.Tests.Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceTests.cs @@ -10,10 +10,10 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; -using UKSF.Tests.Common; +using UKSF.Tests.Unit.Common; using Xunit; -namespace UKSF.Tests.Unit.Data { +namespace UKSF.Tests.Unit.Unit.Data { public class DataServiceTests { private readonly Mock> mockDataCollection; private readonly MockDataService mockDataService; diff --git a/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs similarity index 97% rename from UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs rename to UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs index 83a0efb1..b04e383d 100644 --- a/UKSF.Tests.Unit/Data/Game/GameServersDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs @@ -8,7 +8,7 @@ using UKSF.Api.Models.Game; using Xunit; -namespace UKSF.Tests.Unit.Data.Game { +namespace UKSF.Tests.Unit.Unit.Data.Game { public class GameServersDataServiceTests { private readonly Mock> mockDataCollection; private readonly GameServersDataService gameServersDataService; diff --git a/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs similarity index 97% rename from UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs rename to UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs index 0c718219..8d7f8bc4 100644 --- a/UKSF.Tests.Unit/Data/Message/CommentThreadDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs @@ -10,10 +10,10 @@ using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; using UKSF.Api.Models.Message; -using UKSF.Tests.Common; +using UKSF.Tests.Unit.Common; using Xunit; -namespace UKSF.Tests.Unit.Data.Message { +namespace UKSF.Tests.Unit.Unit.Data.Message { public class CommentThreadDataServiceTests { private readonly CommentThreadDataService commentThreadDataService; private readonly Mock> mockDataCollection; diff --git a/UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs similarity index 99% rename from UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs rename to UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs index 91a8fe92..8be2971b 100644 --- a/UKSF.Tests.Unit/Data/Message/LogDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs @@ -8,7 +8,7 @@ using UKSF.Api.Models.Message.Logging; using Xunit; -namespace UKSF.Tests.Unit.Data.Message { +namespace UKSF.Tests.Unit.Unit.Data.Message { public class LogDataServiceTests { private readonly List mockBasicCollection; private readonly List mockAuditCollection; diff --git a/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs similarity index 97% rename from UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs rename to UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs index 1ef09fb6..6b7285f9 100644 --- a/UKSF.Tests.Unit/Data/Operations/OperationOrderDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs @@ -8,7 +8,7 @@ using UKSF.Api.Models.Operations; using Xunit; -namespace UKSF.Tests.Unit.Data.Operations { +namespace UKSF.Tests.Unit.Unit.Data.Operations { public class OperationOrderDataServiceTests { private readonly Mock> mockDataCollection; private readonly OperationOrderDataService operationOrderDataService; diff --git a/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs similarity index 97% rename from UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs rename to UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs index 6723db1b..085a4c33 100644 --- a/UKSF.Tests.Unit/Data/Operations/OperationReportDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs @@ -8,7 +8,7 @@ using UKSF.Api.Models.Operations; using Xunit; -namespace UKSF.Tests.Unit.Data.Operations { +namespace UKSF.Tests.Unit.Unit.Data.Operations { public class OperationReportDataServiceTests { private readonly Mock> mockDataCollection; private readonly OperationReportDataService operationReportDataService; diff --git a/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs similarity index 97% rename from UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs rename to UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs index eecf450c..46278506 100644 --- a/UKSF.Tests.Unit/Data/Personnel/DischargeDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -9,7 +9,7 @@ using UKSF.Api.Models.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Data.Personnel { +namespace UKSF.Tests.Unit.Unit.Data.Personnel { public class DischargeDataServiceTests { [Fact] public void ShouldGetOrderedCollection() { diff --git a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs similarity index 97% rename from UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs rename to UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs index 87510a4e..2ecf4724 100644 --- a/UKSF.Tests.Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs @@ -8,7 +8,7 @@ using UKSF.Api.Models.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Data.Personnel { +namespace UKSF.Tests.Unit.Unit.Data.Personnel { public class RanksDataServiceTests { private readonly Mock> mockDataCollection; private readonly RanksDataService ranksDataService; diff --git a/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs similarity index 97% rename from UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs rename to UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs index 7cc46e08..e9bb3801 100644 --- a/UKSF.Tests.Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs @@ -8,7 +8,7 @@ using UKSF.Api.Models.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Data.Personnel { +namespace UKSF.Tests.Unit.Unit.Data.Personnel { public class RolesDataServiceTests { private readonly Mock> mockDataCollection; private readonly RolesDataService rolesDataService; diff --git a/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs similarity index 96% rename from UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs rename to UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index 09eafabe..b14fe783 100644 --- a/UKSF.Tests.Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -8,7 +8,7 @@ using Xunit; using UUnit = UKSF.Api.Models.Units.Unit; -namespace UKSF.Tests.Unit.Data.Units { +namespace UKSF.Tests.Unit.Unit.Data.Units { public class UnitsDataServiceTests { [Fact] public void ShouldGetOrderedCollection() { diff --git a/UKSF.Tests.Unit/Events/DataEventBackerTests.cs b/UKSF.Tests/Unit/Events/DataEventBackerTests.cs similarity index 95% rename from UKSF.Tests.Unit/Events/DataEventBackerTests.cs rename to UKSF.Tests/Unit/Events/DataEventBackerTests.cs index 869a7e65..a4cb05de 100644 --- a/UKSF.Tests.Unit/Events/DataEventBackerTests.cs +++ b/UKSF.Tests/Unit/Events/DataEventBackerTests.cs @@ -5,10 +5,10 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; -using UKSF.Tests.Common; +using UKSF.Tests.Unit.Common; using Xunit; -namespace UKSF.Tests.Unit.Events { +namespace UKSF.Tests.Unit.Unit.Events { public class DataEventBackerTests { private readonly MockDataService mockDataService; diff --git a/UKSF.Tests.Unit/Events/EventBusTests.cs b/UKSF.Tests/Unit/Events/EventBusTests.cs similarity index 87% rename from UKSF.Tests.Unit/Events/EventBusTests.cs rename to UKSF.Tests/Unit/Events/EventBusTests.cs index 8e17bcb7..318c0373 100644 --- a/UKSF.Tests.Unit/Events/EventBusTests.cs +++ b/UKSF.Tests/Unit/Events/EventBusTests.cs @@ -2,10 +2,10 @@ using FluentAssertions; using UKSF.Api.Events; using UKSF.Api.Models.Events; -using UKSF.Tests.Common; +using UKSF.Tests.Unit.Common; using Xunit; -namespace UKSF.Tests.Unit.Events { +namespace UKSF.Tests.Unit.Unit.Events { public class EventBusTests { [Fact] public void ShouldReturnObservable() { diff --git a/UKSF.Tests.Unit/Models/AccountSettingsTests.cs b/UKSF.Tests/Unit/Models/AccountSettingsTests.cs similarity index 96% rename from UKSF.Tests.Unit/Models/AccountSettingsTests.cs rename to UKSF.Tests/Unit/Models/AccountSettingsTests.cs index 3988d0dd..60198e8b 100644 --- a/UKSF.Tests.Unit/Models/AccountSettingsTests.cs +++ b/UKSF.Tests/Unit/Models/AccountSettingsTests.cs @@ -3,7 +3,7 @@ using UKSF.Api.Models.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Models { +namespace UKSF.Tests.Unit.Unit.Models { public class AccountSettingsTests { [Fact] public void ShouldReturnBool() { diff --git a/UKSF.Tests.Unit/Models/Message/Logging/BasicLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs similarity index 95% rename from UKSF.Tests.Unit/Models/Message/Logging/BasicLogMessageTests.cs rename to UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs index 8a50df55..2765d5c0 100644 --- a/UKSF.Tests.Unit/Models/Message/Logging/BasicLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs @@ -3,7 +3,7 @@ using UKSF.Api.Models.Message.Logging; using Xunit; -namespace UKSF.Tests.Unit.Models.Message.Logging { +namespace UKSF.Tests.Unit.Unit.Models.Message.Logging { public class BasicLogMessageTests { [Fact] public void ShouldSetText() { diff --git a/UKSF.Tests.Unit/Models/Message/Logging/LauncherLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs similarity index 87% rename from UKSF.Tests.Unit/Models/Message/Logging/LauncherLogMessageTests.cs rename to UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs index baefd71f..40e6012c 100644 --- a/UKSF.Tests.Unit/Models/Message/Logging/LauncherLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs @@ -2,7 +2,7 @@ using UKSF.Api.Models.Message.Logging; using Xunit; -namespace UKSF.Tests.Unit.Models.Message.Logging { +namespace UKSF.Tests.Unit.Unit.Models.Message.Logging { public class LauncherLogMessageTests { [Fact] public void ShouldSetVersionAndMessage() { diff --git a/UKSF.Tests.Unit/Models/Message/Logging/WebLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs similarity index 89% rename from UKSF.Tests.Unit/Models/Message/Logging/WebLogMessageTests.cs rename to UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs index 1d15e487..9fcc2dfa 100644 --- a/UKSF.Tests.Unit/Models/Message/Logging/WebLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs @@ -3,7 +3,7 @@ using UKSF.Api.Models.Message.Logging; using Xunit; -namespace UKSF.Tests.Unit.Models.Message.Logging { +namespace UKSF.Tests.Unit.Unit.Models.Message.Logging { public class WebLogMessageTests { [Fact] public void ShouldCreateFromException() { diff --git a/UKSF.Tests.Unit/Services/Admin/VariablesServiceTests.cs b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs similarity index 98% rename from UKSF.Tests.Unit/Services/Admin/VariablesServiceTests.cs rename to UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs index 3c0fafbf..88572707 100644 --- a/UKSF.Tests.Unit/Services/Admin/VariablesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs @@ -7,7 +7,7 @@ using UKSF.Common; using Xunit; -namespace UKSF.Tests.Unit.Services.Admin { +namespace UKSF.Tests.Unit.Unit.Services.Admin { public class VariablesServiceTests { [Fact] public void ShouldGetVariableAsString() { diff --git a/UKSF.Tests.Unit/Services/Common/AccountUtilitiesTests.cs b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs similarity index 97% rename from UKSF.Tests.Unit/Services/Common/AccountUtilitiesTests.cs rename to UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs index 73b6d3d5..e31a1a37 100644 --- a/UKSF.Tests.Unit/Services/Common/AccountUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs @@ -6,7 +6,7 @@ using UKSF.Api.Services.Common; using Xunit; -namespace UKSF.Tests.Unit.Services.Common { +namespace UKSF.Tests.Unit.Unit.Services.Common { public class AccountUtilitiesTests { [Fact] public void ShouldCopyAccountCorrectly() { diff --git a/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs b/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs similarity index 98% rename from UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs rename to UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs index bbf66bd4..a0f5b8d3 100644 --- a/UKSF.Tests.Unit/Services/Common/DisplayNameUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs @@ -10,7 +10,7 @@ using UKSF.Api.Services.Common; using Xunit; -namespace UKSF.Tests.Unit.Services.Common { +namespace UKSF.Tests.Unit.Unit.Services.Common { public class DisplayNameUtilitiesTests { private readonly Mock mockDisplayNameService; private readonly Mock mockUnitsDataService; diff --git a/UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs similarity index 98% rename from UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs rename to UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs index 7a7d3f6a..db322717 100644 --- a/UKSF.Tests.Unit/Services/Personnel/DisplayNameServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs @@ -6,7 +6,7 @@ using UKSF.Api.Services.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Services.Personnel { +namespace UKSF.Tests.Unit.Unit.Services.Personnel { public class DisplayNameServiceTests { private readonly Mock mockRanksDataService; private readonly Mock mockAccountDataService; diff --git a/UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs similarity index 99% rename from UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs rename to UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs index 6c8061b0..44c81235 100644 --- a/UKSF.Tests.Unit/Services/Personnel/RanksServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs @@ -7,7 +7,7 @@ using UKSF.Api.Services.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Services.Personnel { +namespace UKSF.Tests.Unit.Unit.Services.Personnel { public class RanksServiceTests { private readonly Mock mockRanksDataService; private readonly RanksService ranksService; diff --git a/UKSF.Tests.Unit/Services/Personnel/RoleAttributeTests.cs b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs similarity index 91% rename from UKSF.Tests.Unit/Services/Personnel/RoleAttributeTests.cs rename to UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs index 2eb61c35..4f6db00f 100644 --- a/UKSF.Tests.Unit/Services/Personnel/RoleAttributeTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs @@ -2,7 +2,7 @@ using UKSF.Api.Services.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Services.Personnel { +namespace UKSF.Tests.Unit.Unit.Services.Personnel { public class RoleAttributeTests { [Theory, InlineData("ADMIN,SR10", RoleDefinitions.ADMIN, RoleDefinitions.SR10), InlineData("ADMIN", RoleDefinitions.ADMIN), InlineData("ADMIN", RoleDefinitions.ADMIN, RoleDefinitions.ADMIN)] public void ShouldCombineRoles(string expected, params string[] roles) { diff --git a/UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs similarity index 98% rename from UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs rename to UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs index 0a7bb283..36660c74 100644 --- a/UKSF.Tests.Unit/Services/Personnel/RolesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs @@ -8,7 +8,7 @@ using UKSF.Api.Services.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Services.Personnel { +namespace UKSF.Tests.Unit.Unit.Services.Personnel { public class RolesServiceTests { private readonly Mock mockRolesDataService; private readonly RolesService rolesService; diff --git a/UKSF.Tests.Unit/Services/Utility/ConfirmationCodeServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs similarity index 99% rename from UKSF.Tests.Unit/Services/Utility/ConfirmationCodeServiceTests.cs rename to UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs index e6e355ae..3cec25b6 100644 --- a/UKSF.Tests.Unit/Services/Utility/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs @@ -12,7 +12,7 @@ using UKSF.Api.Services.Utility; using Xunit; -namespace UKSF.Tests.Unit.Services.Utility { +namespace UKSF.Tests.Unit.Unit.Services.Utility { public class ConfirmationCodeServiceTests { private readonly ConfirmationCodeService confirmationCodeService; private readonly Mock mockConfirmationCodeDataService; diff --git a/UKSF.Tests.Common/testdata/accounts.json b/UKSF.Tests/testdata/accounts.json similarity index 100% rename from UKSF.Tests.Common/testdata/accounts.json rename to UKSF.Tests/testdata/accounts.json diff --git a/UKSF.Tests.Common/testdata/commentThreads.json b/UKSF.Tests/testdata/commentThreads.json similarity index 100% rename from UKSF.Tests.Common/testdata/commentThreads.json rename to UKSF.Tests/testdata/commentThreads.json diff --git a/UKSF.Tests.Common/testdata/discharges.json b/UKSF.Tests/testdata/discharges.json similarity index 100% rename from UKSF.Tests.Common/testdata/discharges.json rename to UKSF.Tests/testdata/discharges.json diff --git a/UKSF.Tests.Common/testdata/gameServers.json b/UKSF.Tests/testdata/gameServers.json similarity index 100% rename from UKSF.Tests.Common/testdata/gameServers.json rename to UKSF.Tests/testdata/gameServers.json diff --git a/UKSF.Tests.Common/testdata/ranks.json b/UKSF.Tests/testdata/ranks.json similarity index 100% rename from UKSF.Tests.Common/testdata/ranks.json rename to UKSF.Tests/testdata/ranks.json diff --git a/UKSF.Tests.Common/testdata/roles.json b/UKSF.Tests/testdata/roles.json similarity index 100% rename from UKSF.Tests.Common/testdata/roles.json rename to UKSF.Tests/testdata/roles.json diff --git a/UKSF.Tests.Common/testdata/scheduledJobs.json b/UKSF.Tests/testdata/scheduledJobs.json similarity index 100% rename from UKSF.Tests.Common/testdata/scheduledJobs.json rename to UKSF.Tests/testdata/scheduledJobs.json diff --git a/UKSF.Tests.Common/testdata/scheduledJobsIntegrations.json b/UKSF.Tests/testdata/scheduledJobsIntegrations.json similarity index 100% rename from UKSF.Tests.Common/testdata/scheduledJobsIntegrations.json rename to UKSF.Tests/testdata/scheduledJobsIntegrations.json diff --git a/UKSF.Tests.Common/testdata/teamspeakSnapshots.json b/UKSF.Tests/testdata/teamspeakSnapshots.json similarity index 100% rename from UKSF.Tests.Common/testdata/teamspeakSnapshots.json rename to UKSF.Tests/testdata/teamspeakSnapshots.json diff --git a/UKSF.Tests.Common/testdata/units.json b/UKSF.Tests/testdata/units.json similarity index 100% rename from UKSF.Tests.Common/testdata/units.json rename to UKSF.Tests/testdata/units.json diff --git a/UKSF.Tests.Common/testdata/variables.json b/UKSF.Tests/testdata/variables.json similarity index 100% rename from UKSF.Tests.Common/testdata/variables.json rename to UKSF.Tests/testdata/variables.json From f15af926fcc6f44445fc170a8afa8554e1ea50ab Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 26 Feb 2020 18:54:58 +0000 Subject: [PATCH 140/369] Made data integration tests faster --- .../Integration/Data/DataCollectionTests.cs | 127 ++++++++---------- .../Integration/Data/DataPerformanceTests.cs | 33 ++--- 2 files changed, 72 insertions(+), 88 deletions(-) diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index ed420c12..18da636d 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -4,15 +4,15 @@ using System.Threading.Tasks; using FluentAssertions; using Mongo2Go; +using MongoDB.Bson; using MongoDB.Bson.Serialization.Conventions; using MongoDB.Driver; using UKSF.Api.Data; using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Utility; using UKSF.Tests.Unit.Common; using Xunit; -// Available test collections: +// Available test collections as json: // accounts // commentThreads // discharges @@ -27,6 +27,8 @@ namespace UKSF.Tests.Unit.Integration.Data { public class DataCollectionTests { + private const string TEST_COLLECTION_NAME = "roles"; + private static async Task MongoTest(Func testFunction) { MongoDbRunner mongoDbRunner = MongoDbRunner.Start(); ConventionPack conventionPack = new ConventionPack { new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true) }; @@ -41,25 +43,37 @@ private static async Task MongoTest(Func te } } - private static void ImportTestCollection(MongoDbRunner mongoDbRunner, string collectionName) { - mongoDbRunner.Import("tests", collectionName, $"../../../testdata/{collectionName}.json", true); + private static async Task<(DataCollection dataCollection, string testId)> SetupTestCollection(IMongoDatabase database) { + DataCollection dataCollection = new DataCollection(database, TEST_COLLECTION_NAME); + await dataCollection.AssertCollectionExistsAsync(); + + string testId = ObjectId.GenerateNewId().ToString(); + List roles = new List { + new Role { name = "Rifleman" }, + new Role { name = "Trainee" }, + new Role { name = "Marksman", id = testId }, + new Role { name = "1iC", roleType = RoleType.UNIT, order = 0 }, + new Role { name = "2iC", roleType = RoleType.UNIT, order = 1 }, + new Role { name = "NCOiC", roleType = RoleType.UNIT, order = 3 }, + new Role { name = "NCOiC Air Troop", roleType = RoleType.INDIVIDUAL, order = 0 } + }; + roles.ForEach(async x => await dataCollection.AddAsync(x)); + + return (dataCollection, testId); } [Fact] public async Task ShouldAddItem() { await MongoTest( async (mongoDbRunner, database) => { - const string COLLECTION_NAME = "ranks"; - ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + (DataCollection dataCollection, _) = await SetupTestCollection(database); - Rank rank = new Rank { name = "Captain" }; - await dataCollection.AddAsync(rank); + Role role = new Role { name = "Section Leader" }; + await dataCollection.AddAsync(role); - List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().ToList(); + List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); - subject.Should().Contain(x => x.name == rank.name); + subject.Should().Contain(x => x.name == role.name); } ); } @@ -83,16 +97,13 @@ await MongoTest( public async Task ShouldDelete() { await MongoTest( async (mongoDbRunner, database) => { - const string COLLECTION_NAME = "roles"; - ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + (DataCollection dataCollection, string testId) = await SetupTestCollection(database); - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + await dataCollection.DeleteAsync(testId); - await dataCollection.DeleteAsync("5b7424eda144bb436484fbc2"); + List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); - List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().ToList(); - - subject.Should().NotContain(x => x.id == "5b7424eda144bb436484fbc2"); + subject.Should().NotContain(x => x.id == testId); } ); } @@ -101,14 +112,11 @@ await MongoTest( public async Task ShouldDeleteMany() { await MongoTest( async (mongoDbRunner, database) => { - const string COLLECTION_NAME = "roles"; - ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + (DataCollection dataCollection, _) = await SetupTestCollection(database); await dataCollection.DeleteManyAsync(x => x.order == 0); - List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().ToList(); + List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); subject.Should().NotContain(x => x.order == 0); } @@ -118,18 +126,14 @@ await MongoTest( [Fact] public async Task ShouldGetByPredicate() { await MongoTest( - (mongoDbRunner, database) => { - const string COLLECTION_NAME = "roles"; - ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + async (mongoDbRunner, database) => { + (DataCollection dataCollection, _) = await SetupTestCollection(database); List subject = dataCollection.Get(x => x.order == 0); subject.Should().NotBeNull(); subject.Count.Should().Be(5); subject.Should().Contain(x => x.name == "Trainee"); - - return Task.CompletedTask; } ); } @@ -137,18 +141,14 @@ await MongoTest( [Fact] public async Task ShouldGetCollection() { await MongoTest( - (mongoDbRunner, database) => { - const string COLLECTION_NAME = "scheduledJobs"; - ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + async (mongoDbRunner, database) => { + (DataCollection dataCollection, _) = await SetupTestCollection(database); - List subject = dataCollection.Get(); + List subject = dataCollection.Get(); subject.Should().NotBeNull(); - subject.Count.Should().Be(2); - subject.Should().Contain(x => x.action == "PruneLogs"); - - return Task.CompletedTask; + subject.Count.Should().Be(7); + subject.Should().Contain(x => x.name == "NCOiC"); } ); } @@ -156,17 +156,13 @@ await MongoTest( [Fact] public async Task ShouldGetSingleById() { await MongoTest( - (mongoDbRunner, database) => { - const string COLLECTION_NAME = "scheduledJobs"; - ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + async (mongoDbRunner, database) => { + (DataCollection dataCollection, string testId) = await SetupTestCollection(database); - ScheduledJob subject = dataCollection.GetSingle("5c006212238c46637025fdad"); + Role subject = dataCollection.GetSingle(testId); subject.Should().NotBeNull(); - subject.action.Should().Be("PruneLogs"); - - return Task.CompletedTask; + subject.name.Should().Be("Marksman"); } ); } @@ -174,17 +170,13 @@ await MongoTest( [Fact] public async Task ShouldGetSingleByPredicate() { await MongoTest( - (mongoDbRunner, database) => { - const string COLLECTION_NAME = "scheduledJobs"; - ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + async (mongoDbRunner, database) => { + (DataCollection dataCollection, _) = await SetupTestCollection(database); - ScheduledJob subject = dataCollection.GetSingle(x => x.type == ScheduledJobType.LOG_PRUNE); + Role subject = dataCollection.GetSingle(x => x.roleType == RoleType.UNIT && x.order == 1); subject.Should().NotBeNull(); - subject.action.Should().Be("PruneLogs"); - - return Task.CompletedTask; + subject.name.Should().Be("2iC"); } ); } @@ -207,15 +199,12 @@ await MongoTest( public async Task ShouldReplace() { await MongoTest( async (mongoDbRunner, database) => { - const string COLLECTION_NAME = "roles"; - ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + (DataCollection dataCollection, string testId) = await SetupTestCollection(database); - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - - Role role = new Role { id = "5b7424eda144bb436484fbc2", name = "Sharpshooter" }; + Role role = new Role { id = testId, name = "Sharpshooter" }; await dataCollection.ReplaceAsync(role.id, role); - Role subject = database.GetCollection(COLLECTION_NAME).AsQueryable().First(x => x.id == "5b7424eda144bb436484fbc2"); + Role subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.id == testId); subject.name.Should().Be(role.name); subject.order.Should().Be(0); @@ -228,14 +217,11 @@ await MongoTest( public async Task ShouldUpdate() { await MongoTest( async (mongoDbRunner, database) => { - const string COLLECTION_NAME = "ranks"; - ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + (DataCollection dataCollection, string testId) = await SetupTestCollection(database); - await dataCollection.UpdateAsync("5b72fbb52d54990cec7c4b24", Builders.Update.Set(x => x.order, 10)); + await dataCollection.UpdateAsync(testId, Builders.Update.Set(x => x.order, 10)); - Rank subject = database.GetCollection(COLLECTION_NAME).AsQueryable().First(x => x.id == "5b72fbb52d54990cec7c4b24"); + Rank subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.id == testId); subject.order.Should().Be(10); } @@ -246,14 +232,11 @@ await MongoTest( public async Task ShouldUpdateMany() { await MongoTest( async (mongoDbRunner, database) => { - const string COLLECTION_NAME = "roles"; - ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + (DataCollection dataCollection, _) = await SetupTestCollection(database); await dataCollection.UpdateManyAsync(x => x.order == 0, Builders.Update.Set(x => x.order, 10)); - List subject = database.GetCollection(COLLECTION_NAME).AsQueryable().Where(x => x.order == 10).ToList(); + List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().Where(x => x.order == 10).ToList(); subject.Count.Should().Be(5); } diff --git a/UKSF.Tests/Integration/Data/DataPerformanceTests.cs b/UKSF.Tests/Integration/Data/DataPerformanceTests.cs index 42105d4b..34c6c187 100644 --- a/UKSF.Tests/Integration/Data/DataPerformanceTests.cs +++ b/UKSF.Tests/Integration/Data/DataPerformanceTests.cs @@ -8,6 +8,7 @@ using UKSF.Api.Data; using UKSF.Api.Models.Integrations; using Xunit; +// ReSharper disable UnusedMember.Global namespace UKSF.Tests.Unit.Integration.Data { public class DataPerformanceTests { @@ -30,21 +31,21 @@ private static void ImportTestCollection(MongoDbRunner mongoDbRunner, string col } // This test tests nothing, and is only used for profiling various data retrieval methods - [Fact] - public async Task TestGetPerformance() { - await MongoTest( - (mongoDbRunner, database) => { - const string COLLECTION_NAME = "teamspeakSnapshots"; - ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - - DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - List subject = dataCollection.Get(x => x.timestamp > DateTime.Parse("2018-08-09T05:00:00.307Z")); - - subject.Should().NotBeNull(); - - return Task.CompletedTask; - } - ); - } + // [Fact] + // public async Task TestGetPerformance() { + // await MongoTest( + // (mongoDbRunner, database) => { + // const string COLLECTION_NAME = "teamspeakSnapshots"; + // ImportTestCollection(mongoDbRunner, COLLECTION_NAME); + // + // DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); + // List subject = dataCollection.Get(x => x.timestamp > DateTime.Parse("2018-08-09T05:00:00.307Z")); + // + // subject.Should().NotBeNull(); + // + // return Task.CompletedTask; + // } + // ); + // } } } From ebec0ec14cfe92807bcfea48108442e2143b3750 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 Feb 2020 00:11:17 +0000 Subject: [PATCH 141/369] Force build --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b1dd931f..d3d439d7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,9 +18,8 @@ jobs: with: dotnet-version: 3.1.101 - name: Run tests with coverage - run: dotnet test /p:CollectCoverage=true /p:Exclude="[UKSF.Api.Signalr]*%2c[UKSF.PostMessage]*" /p:CoverletOutput=../coverage/coverage.info /p:CoverletOutputFormat=lcov -m:1 + run: dotnet test /p:CollectCoverage=true /p:Exclude="[UKSF.Api.Signalr]*%2c[UKSF.PostMessage]*" /p:CoverletOutput=../coverage/lcov.info /p:CoverletOutputFormat=lcov -m:1 - name: Coveralls uses: coverallsapp/github-action@master with: github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: ./coverage/coverage.info From 3d8f053378aed306d0345c574e01ae300872c77c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 Feb 2020 00:16:36 +0000 Subject: [PATCH 142/369] Disable mongo2go logging --- UKSF.Tests/Integration/Data/DataCollectionTests.cs | 2 +- UKSF.Tests/Integration/Data/DataPerformanceTests.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index 18da636d..a77da908 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -30,7 +30,7 @@ public class DataCollectionTests { private const string TEST_COLLECTION_NAME = "roles"; private static async Task MongoTest(Func testFunction) { - MongoDbRunner mongoDbRunner = MongoDbRunner.Start(); + MongoDbRunner mongoDbRunner = MongoDbRunner.Start(additionalMongodArguments: "--quiet"); ConventionPack conventionPack = new ConventionPack { new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true) }; ConventionRegistry.Register("DefaultConventions", conventionPack, t => true); MongoClient mongoClient = new MongoClient(mongoDbRunner.ConnectionString); diff --git a/UKSF.Tests/Integration/Data/DataPerformanceTests.cs b/UKSF.Tests/Integration/Data/DataPerformanceTests.cs index 34c6c187..d01e29e7 100644 --- a/UKSF.Tests/Integration/Data/DataPerformanceTests.cs +++ b/UKSF.Tests/Integration/Data/DataPerformanceTests.cs @@ -13,7 +13,7 @@ namespace UKSF.Tests.Unit.Integration.Data { public class DataPerformanceTests { private static async Task MongoTest(Func testFunction) { - MongoDbRunner mongoDbRunner = MongoDbRunner.Start(); + MongoDbRunner mongoDbRunner = MongoDbRunner.Start(additionalMongodArguments: "--quiet"); ConventionPack conventionPack = new ConventionPack { new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true) }; ConventionRegistry.Register("DefaultConventions", conventionPack, t => true); MongoClient mongoClient = new MongoClient(mongoDbRunner.ConnectionString); From 0cd6821a16a478fddebf3060c237f493cbdc2c1e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 Feb 2020 00:21:22 +0000 Subject: [PATCH 143/369] Use separate build step --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d3d439d7..c7f31c40 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,8 +17,10 @@ jobs: uses: actions/setup-dotnet@v1.4.0 with: dotnet-version: 3.1.101 + - name: Build with dotnet + run: dotnet build - name: Run tests with coverage - run: dotnet test /p:CollectCoverage=true /p:Exclude="[UKSF.Api.Signalr]*%2c[UKSF.PostMessage]*" /p:CoverletOutput=../coverage/lcov.info /p:CoverletOutputFormat=lcov -m:1 + run: dotnet test --no-build /p:CollectCoverage=true /p:Exclude="[UKSF.Api.Signalr]*%2c[UKSF.PostMessage]*" /p:CoverletOutput=../coverage/lcov.info /p:CoverletOutputFormat=lcov -m:1 - name: Coveralls uses: coverallsapp/github-action@master with: From 8669cab2de8e5a7855e4e0d5712defa72ca22d04 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 Feb 2020 00:34:33 +0000 Subject: [PATCH 144/369] Revert test build --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c7f31c40..3f3a1a5e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,9 +18,9 @@ jobs: with: dotnet-version: 3.1.101 - name: Build with dotnet - run: dotnet build + run: dotnet build -c Release - name: Run tests with coverage - run: dotnet test --no-build /p:CollectCoverage=true /p:Exclude="[UKSF.Api.Signalr]*%2c[UKSF.PostMessage]*" /p:CoverletOutput=../coverage/lcov.info /p:CoverletOutputFormat=lcov -m:1 + run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info /p:Exclude="[UKSF.Api.Signalr]*%2c[UKSF.PostMessage]*" - name: Coveralls uses: coverallsapp/github-action@master with: From de6e9e693f1c969b6174e5d7b42a7b23bb655b37 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 Feb 2020 00:51:23 +0000 Subject: [PATCH 145/369] Add a small delay before finishing test after disposing test database --- UKSF.Tests/Integration/Data/DataCollectionTests.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index a77da908..bea864eb 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -38,8 +38,12 @@ private static async Task MongoTest(Func te try { await testFunction(mongoDbRunner, database); + } catch (Exception exception) { + Console.Out.WriteLine($"Mongo integration test failed: {exception.Message}"); + throw; } finally { mongoDbRunner.Dispose(); + await Task.Delay(TimeSpan.FromSeconds(1)); } } From 7d8a819145bec7e84a3b81986a478b9781364719 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 Feb 2020 01:03:41 +0000 Subject: [PATCH 146/369] Try using IDisposable --- .../Integration/Data/DataCollectionTests.cs | 47 +++++++++---------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index bea864eb..243d4310 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -26,28 +26,25 @@ // variables namespace UKSF.Tests.Unit.Integration.Data { - public class DataCollectionTests { + public class DataCollectionTests : IDisposable { private const string TEST_COLLECTION_NAME = "roles"; + private MongoDbRunner mongoDbRunner; - private static async Task MongoTest(Func testFunction) { - MongoDbRunner mongoDbRunner = MongoDbRunner.Start(additionalMongodArguments: "--quiet"); + public void Dispose() { + mongoDbRunner.Dispose(); + } + + private async Task MongoTest(Func testFunction) { + mongoDbRunner = MongoDbRunner.Start(additionalMongodArguments: "--quiet"); ConventionPack conventionPack = new ConventionPack { new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true) }; ConventionRegistry.Register("DefaultConventions", conventionPack, t => true); MongoClient mongoClient = new MongoClient(mongoDbRunner.ConnectionString); IMongoDatabase database = mongoClient.GetDatabase("tests"); - try { - await testFunction(mongoDbRunner, database); - } catch (Exception exception) { - Console.Out.WriteLine($"Mongo integration test failed: {exception.Message}"); - throw; - } finally { - mongoDbRunner.Dispose(); - await Task.Delay(TimeSpan.FromSeconds(1)); - } + await testFunction(database); } - private static async Task<(DataCollection dataCollection, string testId)> SetupTestCollection(IMongoDatabase database) { + private async Task<(DataCollection dataCollection, string testId)> SetupTestCollection(IMongoDatabase database) { DataCollection dataCollection = new DataCollection(database, TEST_COLLECTION_NAME); await dataCollection.AssertCollectionExistsAsync(); @@ -69,7 +66,7 @@ private static async Task MongoTest(Func te [Fact] public async Task ShouldAddItem() { await MongoTest( - async (mongoDbRunner, database) => { + async database => { (DataCollection dataCollection, _) = await SetupTestCollection(database); Role role = new Role { name = "Section Leader" }; @@ -85,7 +82,7 @@ await MongoTest( [Fact] public async Task ShouldCreateCollection() { await MongoTest( - async (mongoDbRunner, database) => { + async database => { DataCollection dataCollection = new DataCollection(database, "test"); await dataCollection.AssertCollectionExistsAsync(); @@ -100,7 +97,7 @@ await MongoTest( [Fact] public async Task ShouldDelete() { await MongoTest( - async (mongoDbRunner, database) => { + async database => { (DataCollection dataCollection, string testId) = await SetupTestCollection(database); await dataCollection.DeleteAsync(testId); @@ -115,7 +112,7 @@ await MongoTest( [Fact] public async Task ShouldDeleteMany() { await MongoTest( - async (mongoDbRunner, database) => { + async database => { (DataCollection dataCollection, _) = await SetupTestCollection(database); await dataCollection.DeleteManyAsync(x => x.order == 0); @@ -130,7 +127,7 @@ await MongoTest( [Fact] public async Task ShouldGetByPredicate() { await MongoTest( - async (mongoDbRunner, database) => { + async database => { (DataCollection dataCollection, _) = await SetupTestCollection(database); List subject = dataCollection.Get(x => x.order == 0); @@ -145,7 +142,7 @@ await MongoTest( [Fact] public async Task ShouldGetCollection() { await MongoTest( - async (mongoDbRunner, database) => { + async database => { (DataCollection dataCollection, _) = await SetupTestCollection(database); List subject = dataCollection.Get(); @@ -160,7 +157,7 @@ await MongoTest( [Fact] public async Task ShouldGetSingleById() { await MongoTest( - async (mongoDbRunner, database) => { + async database => { (DataCollection dataCollection, string testId) = await SetupTestCollection(database); Role subject = dataCollection.GetSingle(testId); @@ -174,7 +171,7 @@ await MongoTest( [Fact] public async Task ShouldGetSingleByPredicate() { await MongoTest( - async (mongoDbRunner, database) => { + async database => { (DataCollection dataCollection, _) = await SetupTestCollection(database); Role subject = dataCollection.GetSingle(x => x.roleType == RoleType.UNIT && x.order == 1); @@ -188,7 +185,7 @@ await MongoTest( [Fact] public async Task ShouldNotThrowWhenCollectionExists() { await MongoTest( - async (mongoDbRunner, database) => { + async database => { await database.CreateCollectionAsync("test"); DataCollection dataCollection = new DataCollection(database, "test"); @@ -202,7 +199,7 @@ await MongoTest( [Fact] public async Task ShouldReplace() { await MongoTest( - async (mongoDbRunner, database) => { + async database => { (DataCollection dataCollection, string testId) = await SetupTestCollection(database); Role role = new Role { id = testId, name = "Sharpshooter" }; @@ -220,7 +217,7 @@ await MongoTest( [Fact] public async Task ShouldUpdate() { await MongoTest( - async (mongoDbRunner, database) => { + async database => { (DataCollection dataCollection, string testId) = await SetupTestCollection(database); await dataCollection.UpdateAsync(testId, Builders.Update.Set(x => x.order, 10)); @@ -235,7 +232,7 @@ await MongoTest( [Fact] public async Task ShouldUpdateMany() { await MongoTest( - async (mongoDbRunner, database) => { + async database => { (DataCollection dataCollection, _) = await SetupTestCollection(database); await dataCollection.UpdateManyAsync(x => x.order == 0, Builders.Update.Set(x => x.order, 10)); From 3baf2d1a8ded9ca4525e44aab74460bb0eb3053f Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 Feb 2020 13:19:43 +0000 Subject: [PATCH 147/369] Try using a different database name for each run --- UKSF.Tests/Integration/Data/DataCollectionTests.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index 243d4310..579d1325 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -31,7 +31,7 @@ public class DataCollectionTests : IDisposable { private MongoDbRunner mongoDbRunner; public void Dispose() { - mongoDbRunner.Dispose(); + mongoDbRunner?.Dispose(); } private async Task MongoTest(Func testFunction) { @@ -39,9 +39,11 @@ private async Task MongoTest(Func testFunction) { ConventionPack conventionPack = new ConventionPack { new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true) }; ConventionRegistry.Register("DefaultConventions", conventionPack, t => true); MongoClient mongoClient = new MongoClient(mongoDbRunner.ConnectionString); - IMongoDatabase database = mongoClient.GetDatabase("tests"); + IMongoDatabase database = mongoClient.GetDatabase(Guid.NewGuid().ToString()); await testFunction(database); + + mongoDbRunner.Dispose(); } private async Task<(DataCollection dataCollection, string testId)> SetupTestCollection(IMongoDatabase database) { From 10f1d48931861d1ad221a5fb20664e179f8012c6 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 Feb 2020 13:25:56 +0000 Subject: [PATCH 148/369] Try adding test data synchronously --- UKSF.Tests/Integration/Data/DataCollectionTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index 579d1325..17166d11 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -46,7 +46,7 @@ private async Task MongoTest(Func testFunction) { mongoDbRunner.Dispose(); } - private async Task<(DataCollection dataCollection, string testId)> SetupTestCollection(IMongoDatabase database) { + private static async Task<(DataCollection dataCollection, string testId)> SetupTestCollection(IMongoDatabase database) { DataCollection dataCollection = new DataCollection(database, TEST_COLLECTION_NAME); await dataCollection.AssertCollectionExistsAsync(); @@ -60,7 +60,7 @@ private async Task MongoTest(Func testFunction) { new Role { name = "NCOiC", roleType = RoleType.UNIT, order = 3 }, new Role { name = "NCOiC Air Troop", roleType = RoleType.INDIVIDUAL, order = 0 } }; - roles.ForEach(async x => await dataCollection.AddAsync(x)); + roles.ForEach(x => dataCollection.AddAsync(x).Wait()); return (dataCollection, testId); } From f17ae9e855cb636bc20ae54658f0d265b47b2003 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 7 Mar 2020 01:03:56 +0000 Subject: [PATCH 149/369] Change scheduled actions to use a proper service where actions are registered. More tests. Extracted some parts of startup to separate files. Changed exception filter to use IoC resolution in mvc setup. --- .../Utility/IScheduledActionService.cs | 9 +++ .../IDeleteExpiredConfirmationCodeAction.cs | 3 + .../ScheduledActions/IPruneLogsAction.cs | 3 + .../ScheduledActions/IScheduledAction.cs | 6 ++ .../ITeamspeakSnapshotAction.cs | 3 + .../Utility/ConfirmationCodeService.cs | 9 +-- UKSF.Api.Services/Utility/DataCacheService.cs | 8 +- .../Utility/ScheduledActionService.cs | 23 ++++++ .../DeleteExpiredConfirmationCodeAction.cs | 21 +++++ .../ScheduledActions/PruneLogsAction.cs | 28 +++++++ .../TeamspeakSnapshotAction.cs | 18 +++++ .../Utility/SchedulerActionHelper.cs | 29 ------- UKSF.Api.Services/Utility/SchedulerService.cs | 27 +++---- UKSF.Api.sln.DotSettings | 1 + .../AppStart/RegisterAndWarmCachedData.cs | 50 ++++++++++++ UKSF.Api/AppStart/RegisterScheduledActions.cs | 20 +++++ .../RegisterDataBackedServices.cs | 2 +- .../{ => Services}/RegisterDataServices.cs | 2 +- .../{ => Services}/RegisterEventServices.cs | 2 +- .../RegisterScheduledActionServices.cs | 13 ++++ .../ServiceExtensions.cs} | 8 +- UKSF.Api/AppStart/StartServices.cs | 36 +++++++++ UKSF.Api/Startup.cs | 76 +------------------ UKSF.Integrations/Startup.cs | 31 +++++--- .../Integration/Data/DataCollectionTests.cs | 6 +- .../Services/Utility/DataCacheServiceTests.cs | 30 ++++++++ 26 files changed, 322 insertions(+), 142 deletions(-) create mode 100644 UKSF.Api.Interfaces/Utility/IScheduledActionService.cs create mode 100644 UKSF.Api.Interfaces/Utility/ScheduledActions/IDeleteExpiredConfirmationCodeAction.cs create mode 100644 UKSF.Api.Interfaces/Utility/ScheduledActions/IPruneLogsAction.cs create mode 100644 UKSF.Api.Interfaces/Utility/ScheduledActions/IScheduledAction.cs create mode 100644 UKSF.Api.Interfaces/Utility/ScheduledActions/ITeamspeakSnapshotAction.cs create mode 100644 UKSF.Api.Services/Utility/ScheduledActionService.cs create mode 100644 UKSF.Api.Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeAction.cs create mode 100644 UKSF.Api.Services/Utility/ScheduledActions/PruneLogsAction.cs create mode 100644 UKSF.Api.Services/Utility/ScheduledActions/TeamspeakSnapshotAction.cs delete mode 100644 UKSF.Api.Services/Utility/SchedulerActionHelper.cs create mode 100644 UKSF.Api/AppStart/RegisterAndWarmCachedData.cs create mode 100644 UKSF.Api/AppStart/RegisterScheduledActions.cs rename UKSF.Api/AppStart/{ => Services}/RegisterDataBackedServices.cs (98%) rename UKSF.Api/AppStart/{ => Services}/RegisterDataServices.cs (98%) rename UKSF.Api/AppStart/{ => Services}/RegisterEventServices.cs (98%) create mode 100644 UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs rename UKSF.Api/AppStart/{RegisterServices.cs => Services/ServiceExtensions.cs} (92%) create mode 100644 UKSF.Api/AppStart/StartServices.cs create mode 100644 UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs diff --git a/UKSF.Api.Interfaces/Utility/IScheduledActionService.cs b/UKSF.Api.Interfaces/Utility/IScheduledActionService.cs new file mode 100644 index 00000000..6c95ec1d --- /dev/null +++ b/UKSF.Api.Interfaces/Utility/IScheduledActionService.cs @@ -0,0 +1,9 @@ +using System.Collections.Generic; +using UKSF.Api.Interfaces.Utility.ScheduledActions; + +namespace UKSF.Api.Interfaces.Utility { + public interface IScheduledActionService { + void RegisterScheduledActions(HashSet newScheduledActions); + IScheduledAction GetScheduledAction(string actionName); + } +} diff --git a/UKSF.Api.Interfaces/Utility/ScheduledActions/IDeleteExpiredConfirmationCodeAction.cs b/UKSF.Api.Interfaces/Utility/ScheduledActions/IDeleteExpiredConfirmationCodeAction.cs new file mode 100644 index 00000000..87e7540d --- /dev/null +++ b/UKSF.Api.Interfaces/Utility/ScheduledActions/IDeleteExpiredConfirmationCodeAction.cs @@ -0,0 +1,3 @@ +namespace UKSF.Api.Interfaces.Utility.ScheduledActions { + public interface IDeleteExpiredConfirmationCodeAction : IScheduledAction { } +} diff --git a/UKSF.Api.Interfaces/Utility/ScheduledActions/IPruneLogsAction.cs b/UKSF.Api.Interfaces/Utility/ScheduledActions/IPruneLogsAction.cs new file mode 100644 index 00000000..92b05327 --- /dev/null +++ b/UKSF.Api.Interfaces/Utility/ScheduledActions/IPruneLogsAction.cs @@ -0,0 +1,3 @@ +namespace UKSF.Api.Interfaces.Utility.ScheduledActions { + public interface IPruneLogsAction : IScheduledAction { } +} diff --git a/UKSF.Api.Interfaces/Utility/ScheduledActions/IScheduledAction.cs b/UKSF.Api.Interfaces/Utility/ScheduledActions/IScheduledAction.cs new file mode 100644 index 00000000..4ad35bc9 --- /dev/null +++ b/UKSF.Api.Interfaces/Utility/ScheduledActions/IScheduledAction.cs @@ -0,0 +1,6 @@ +namespace UKSF.Api.Interfaces.Utility.ScheduledActions { + public interface IScheduledAction { + string Name { get; } + void Run(params object[] parameters); + } +} diff --git a/UKSF.Api.Interfaces/Utility/ScheduledActions/ITeamspeakSnapshotAction.cs b/UKSF.Api.Interfaces/Utility/ScheduledActions/ITeamspeakSnapshotAction.cs new file mode 100644 index 00000000..97ebd86d --- /dev/null +++ b/UKSF.Api.Interfaces/Utility/ScheduledActions/ITeamspeakSnapshotAction.cs @@ -0,0 +1,3 @@ +namespace UKSF.Api.Interfaces.Utility.ScheduledActions { + public interface ITeamspeakSnapshotAction : IScheduledAction { } +} diff --git a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs index 8f95944b..749c901e 100644 --- a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs +++ b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs @@ -4,6 +4,7 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Utility; +using UKSF.Api.Services.Utility.ScheduledActions; namespace UKSF.Api.Services.Utility { public class ConfirmationCodeService : DataBackedService, IConfirmationCodeService { @@ -16,10 +17,10 @@ public async Task CreateConfirmationCode(string value) { ConfirmationCode code = new ConfirmationCode {value = value}; await Data.Add(code); await schedulerService.Create( - DateTime.Now.AddMinutes(30), + DateTime.Now.AddSeconds(30), TimeSpan.Zero, ScheduledJobType.NORMAL, - nameof(SchedulerActionHelper.DeleteExpiredConfirmationCode), + DeleteExpiredConfirmationCodeAction.ACTION_NAME, code.id ); return code.id; @@ -30,9 +31,7 @@ public async Task GetConfirmationCode(string id) { if (confirmationCode == null) return string.Empty; await Data.Delete(confirmationCode.id); string actionParameters = JsonConvert.SerializeObject(new object[] {confirmationCode.id}); - if (actionParameters != null) { - await schedulerService.Cancel(x => x.actionParameters == actionParameters); - } + await schedulerService.Cancel(x => x.actionParameters == actionParameters); return confirmationCode.value; } diff --git a/UKSF.Api.Services/Utility/DataCacheService.cs b/UKSF.Api.Services/Utility/DataCacheService.cs index 389a5608..ac7c1003 100644 --- a/UKSF.Api.Services/Utility/DataCacheService.cs +++ b/UKSF.Api.Services/Utility/DataCacheService.cs @@ -3,14 +3,16 @@ namespace UKSF.Api.Services.Utility { public class DataCacheService { - private List cachedDataServices; + private HashSet cachedDataServices; - public void RegisterCachedDataServices(List newCachedDataServices) { + public void RegisterCachedDataServices(HashSet newCachedDataServices) { cachedDataServices = newCachedDataServices; } public void InvalidateCachedData() { - cachedDataServices.ForEach(x => x.Refresh()); + foreach (ICachedDataService cachedDataService in cachedDataServices) { + cachedDataService.Refresh(); + } } } } diff --git a/UKSF.Api.Services/Utility/ScheduledActionService.cs b/UKSF.Api.Services/Utility/ScheduledActionService.cs new file mode 100644 index 00000000..97e09b0e --- /dev/null +++ b/UKSF.Api.Services/Utility/ScheduledActionService.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Interfaces.Utility.ScheduledActions; + +namespace UKSF.Api.Services.Utility { + public class ScheduledActionService : IScheduledActionService { + private readonly Dictionary scheduledActions = new Dictionary(); + + public void RegisterScheduledActions(HashSet newScheduledActions) { + foreach (IScheduledAction scheduledAction in newScheduledActions) { + scheduledActions.Add(scheduledAction.Name, scheduledAction); + } + } + + public IScheduledAction GetScheduledAction(string actionName) { + if (scheduledActions.TryGetValue(actionName, out IScheduledAction action)) { + return action; + } + throw new ArgumentException($"Failed to find action '{actionName}'"); + } + } +} diff --git a/UKSF.Api.Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeAction.cs b/UKSF.Api.Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeAction.cs new file mode 100644 index 00000000..2af13605 --- /dev/null +++ b/UKSF.Api.Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeAction.cs @@ -0,0 +1,21 @@ +using System; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Interfaces.Utility.ScheduledActions; + +namespace UKSF.Api.Services.Utility.ScheduledActions { + public class DeleteExpiredConfirmationCodeAction : IDeleteExpiredConfirmationCodeAction { + public const string ACTION_NAME = nameof(DeleteExpiredConfirmationCodeAction); + + private readonly IConfirmationCodeService confirmationCodeService; + + public DeleteExpiredConfirmationCodeAction(IConfirmationCodeService confirmationCodeService) => this.confirmationCodeService = confirmationCodeService; + + public string Name => ACTION_NAME; + + public void Run(params object[] parameters) { + if (parameters.Length == 0) throw new ArgumentException("DeleteExpiredConfirmationCode action requires an id to be passed as a parameter"); + string id = parameters[0].ToString(); + confirmationCodeService.Data.Delete(id); + } + } +} diff --git a/UKSF.Api.Services/Utility/ScheduledActions/PruneLogsAction.cs b/UKSF.Api.Services/Utility/ScheduledActions/PruneLogsAction.cs new file mode 100644 index 00000000..c8c7b630 --- /dev/null +++ b/UKSF.Api.Services/Utility/ScheduledActions/PruneLogsAction.cs @@ -0,0 +1,28 @@ +using System; +using System.Threading.Tasks; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Utility.ScheduledActions; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Message.Logging; + +namespace UKSF.Api.Services.Utility.ScheduledActions { + public class PruneLogsAction : IPruneLogsAction { + public const string ACTION_NAME = nameof(PruneLogsAction); + + private readonly IDataCollectionFactory dataCollectionFactory; + + public PruneLogsAction(IDataCollectionFactory dataCollectionFactory) => this.dataCollectionFactory = dataCollectionFactory; + + public string Name => ACTION_NAME; + + public void Run(params object[] parameters) { + DateTime now = DateTime.Now; + Task logsTask = dataCollectionFactory.CreateDataCollection("logs").DeleteManyAsync(x => x.timestamp < now.AddDays(-7)); + Task errorLogsTask = dataCollectionFactory.CreateDataCollection("errorLogs").DeleteManyAsync(x => x.timestamp < now.AddDays(-7)); + Task auditLogsTask = dataCollectionFactory.CreateDataCollection("auditLogs").DeleteManyAsync(x => x.timestamp < now.AddMonths(-3)); + Task notificationsTask = dataCollectionFactory.CreateDataCollection("notifications").DeleteManyAsync(x => x.timestamp < now.AddMonths(-1)); + + Task.WaitAll(logsTask, errorLogsTask, auditLogsTask, notificationsTask); + } + } +} diff --git a/UKSF.Api.Services/Utility/ScheduledActions/TeamspeakSnapshotAction.cs b/UKSF.Api.Services/Utility/ScheduledActions/TeamspeakSnapshotAction.cs new file mode 100644 index 00000000..d9513d41 --- /dev/null +++ b/UKSF.Api.Services/Utility/ScheduledActions/TeamspeakSnapshotAction.cs @@ -0,0 +1,18 @@ +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Utility.ScheduledActions; + +namespace UKSF.Api.Services.Utility.ScheduledActions { + public class TeamspeakSnapshotAction : ITeamspeakSnapshotAction { + public const string ACTION_NAME = nameof(TeamspeakSnapshotAction); + + private readonly ITeamspeakService teamspeakService; + + public TeamspeakSnapshotAction(ITeamspeakService teamspeakService) => this.teamspeakService = teamspeakService; + + public string Name => ACTION_NAME; + + public void Run(params object[] parameters) { + teamspeakService.StoreTeamspeakServerSnapshot(); + } + } +} diff --git a/UKSF.Api.Services/Utility/SchedulerActionHelper.cs b/UKSF.Api.Services/Utility/SchedulerActionHelper.cs deleted file mode 100644 index c9c6db46..00000000 --- a/UKSF.Api.Services/Utility/SchedulerActionHelper.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using Microsoft.Extensions.DependencyInjection; -using MongoDB.Driver; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Message.Logging; -using UKSF.Api.Services.Common; - -namespace UKSF.Api.Services.Utility { - public static class SchedulerActionHelper { - public static void DeleteExpiredConfirmationCode(string id) { - ServiceWrapper.ServiceProvider.GetService().Data.Delete(id); - } - - public static void PruneLogs() { - DateTime now = DateTime.Now; - IMongoDatabase database = ServiceWrapper.ServiceProvider.GetService(); - database.GetCollection("logs").DeleteManyAsync(message => message.timestamp < now.AddDays(-7)); - database.GetCollection("errorLogs").DeleteManyAsync(message => message.timestamp < now.AddDays(-7)); - database.GetCollection("auditLogs").DeleteManyAsync(message => message.timestamp < now.AddMonths(-1)); - database.GetCollection("notifications").DeleteManyAsync(message => message.timestamp < now.AddMonths(-1)); - } - - public static void TeamspeakSnapshot() { - ServiceWrapper.ServiceProvider.GetService().StoreTeamspeakServerSnapshot(); - } - } -} diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index 4a9bc938..f79e7c5b 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -1,21 +1,27 @@ using System; using System.Collections.Concurrent; -using System.Reflection; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Hosting; using Newtonsoft.Json; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Interfaces.Utility.ScheduledActions; +using UKSF.Api.Models; using UKSF.Api.Models.Utility; using UKSF.Api.Services.Message; +using UKSF.Api.Services.Utility.ScheduledActions; namespace UKSF.Api.Services.Utility { public class SchedulerService : DataBackedService, ISchedulerService { private static readonly ConcurrentDictionary ACTIVE_TASKS = new ConcurrentDictionary(); + private readonly IScheduledActionService scheduledActionService; private readonly IHostEnvironment currentEnvironment; - public SchedulerService(ISchedulerDataService data, IHostEnvironment currentEnvironment) : base(data) => this.currentEnvironment = currentEnvironment; + public SchedulerService(ISchedulerDataService data, IScheduledActionService scheduledActionService, IHostEnvironment currentEnvironment) : base(data) { + this.scheduledActionService = scheduledActionService; + this.currentEnvironment = currentEnvironment; + } public async void LoadApi() { if (!currentEnvironment.IsDevelopment()) { @@ -99,11 +105,11 @@ private void Schedule(ScheduledJob job) { private async Task AddUnique() { if (Data.GetSingle(x => x.type == ScheduledJobType.LOG_PRUNE) == null) { - await Create(DateTime.Today.AddDays(1), TimeSpan.FromDays(1), ScheduledJobType.LOG_PRUNE, nameof(SchedulerActionHelper.PruneLogs)); + await Create(DateTime.Today.AddDays(1), TimeSpan.FromDays(1), ScheduledJobType.LOG_PRUNE, PruneLogsAction.ACTION_NAME); } if (Data.GetSingle(x => x.type == ScheduledJobType.TEAMSPEAK_SNAPSHOT) == null) { - await Create(DateTime.Today.AddDays(1), TimeSpan.FromMinutes(5), ScheduledJobType.TEAMSPEAK_SNAPSHOT, nameof(SchedulerActionHelper.TeamspeakSnapshot)); + await Create(DateTime.Today.AddDays(1), TimeSpan.FromMinutes(5), ScheduledJobType.TEAMSPEAK_SNAPSHOT, TeamspeakSnapshotAction.ACTION_NAME); } } @@ -111,20 +117,15 @@ private async Task SetNext(ScheduledJob job) { await Data.Update(job.id, "next", job.next); } - private bool IsCancelled(ScheduledJob job, CancellationTokenSource token) { + private bool IsCancelled(DatabaseObject job, CancellationTokenSource token) { if (token.IsCancellationRequested) return true; return Data.GetSingle(job.id) == null; } - private static void ExecuteAction(ScheduledJob job) { - MethodInfo action = typeof(SchedulerActionHelper).GetMethod(job.action); - if (action == null) { - LogWrapper.Log($"Failed to find action '{job.action}' for scheduled job"); - return; - } - + private void ExecuteAction(ScheduledJob job) { + IScheduledAction action = scheduledActionService.GetScheduledAction(job.action); object[] parameters = job.actionParameters == null ? null : JsonConvert.DeserializeObject(job.actionParameters); - action.Invoke(null, parameters); + action.Run(parameters); } } } diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index d6b18bd6..9dc78645 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -453,6 +453,7 @@ True True True + True 10 <data><AttributeFilter ClassMask="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" IsEnabled="True" /></data> x64 diff --git a/UKSF.Api/AppStart/RegisterAndWarmCachedData.cs b/UKSF.Api/AppStart/RegisterAndWarmCachedData.cs new file mode 100644 index 00000000..acdaa43b --- /dev/null +++ b/UKSF.Api/AppStart/RegisterAndWarmCachedData.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Services.Utility; + +namespace UKSF.Api.AppStart { + public static class RegisterAndWarmCachedData { + public static void Warm() { + IServiceProvider serviceProvider = Global.ServiceProvider; + + IAccountDataService accountDataService = serviceProvider.GetService(); + ICommandRequestDataService commandRequestDataService = serviceProvider.GetService(); + ICommentThreadDataService commentThreadDataService = serviceProvider.GetService(); + IDischargeDataService dischargeDataService = serviceProvider.GetService(); + IGameServersDataService gameServersDataService = serviceProvider.GetService(); + ILauncherFileDataService launcherFileDataService = serviceProvider.GetService(); + ILoaDataService loaDataService = serviceProvider.GetService(); + INotificationsDataService notificationsDataService = serviceProvider.GetService(); + IOperationOrderDataService operationOrderDataService = serviceProvider.GetService(); + IOperationReportDataService operationReportDataService = serviceProvider.GetService(); + IRanksDataService ranksDataService = serviceProvider.GetService(); + IRolesDataService rolesDataService = serviceProvider.GetService(); + IUnitsDataService unitsDataService = serviceProvider.GetService(); + IVariablesDataService variablesDataService = serviceProvider.GetService(); + + DataCacheService dataCacheService = serviceProvider.GetService(); + dataCacheService.RegisterCachedDataServices( + new HashSet { + accountDataService, + commandRequestDataService, + commentThreadDataService, + dischargeDataService, + gameServersDataService, + launcherFileDataService, + loaDataService, + notificationsDataService, + operationOrderDataService, + operationReportDataService, + ranksDataService, + rolesDataService, + unitsDataService, + variablesDataService + } + ); + dataCacheService.InvalidateCachedData(); + } + } +} diff --git a/UKSF.Api/AppStart/RegisterScheduledActions.cs b/UKSF.Api/AppStart/RegisterScheduledActions.cs new file mode 100644 index 00000000..82b8b6b0 --- /dev/null +++ b/UKSF.Api/AppStart/RegisterScheduledActions.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Interfaces.Utility.ScheduledActions; + +namespace UKSF.Api.AppStart { + public static class RegisterScheduledActions { + public static void Register() { + IServiceProvider serviceProvider = Global.ServiceProvider; + + IDeleteExpiredConfirmationCodeAction deleteExpiredConfirmationCodeAction = serviceProvider.GetService(); + IPruneLogsAction pruneLogsAction = serviceProvider.GetService(); + ITeamspeakSnapshotAction teamspeakSnapshotAction = serviceProvider.GetService(); + + IScheduledActionService scheduledActionService = serviceProvider.GetService(); + scheduledActionService.RegisterScheduledActions(new HashSet { deleteExpiredConfirmationCodeAction, pruneLogsAction, teamspeakSnapshotAction }); + } + } +} diff --git a/UKSF.Api/AppStart/RegisterDataBackedServices.cs b/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs similarity index 98% rename from UKSF.Api/AppStart/RegisterDataBackedServices.cs rename to UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs index 63259fef..9662bae1 100644 --- a/UKSF.Api/AppStart/RegisterDataBackedServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs @@ -18,7 +18,7 @@ using UKSF.Api.Services.Units; using UKSF.Api.Services.Utility; -namespace UKSF.Api.AppStart { +namespace UKSF.Api.AppStart.Services { public static class DataBackedServiceExtensions { public static void RegisterDataBackedServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { // Non-Cached diff --git a/UKSF.Api/AppStart/RegisterDataServices.cs b/UKSF.Api/AppStart/Services/RegisterDataServices.cs similarity index 98% rename from UKSF.Api/AppStart/RegisterDataServices.cs rename to UKSF.Api/AppStart/Services/RegisterDataServices.cs index fb077996..af7bcf86 100644 --- a/UKSF.Api/AppStart/RegisterDataServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterDataServices.cs @@ -13,7 +13,7 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; -namespace UKSF.Api.AppStart { +namespace UKSF.Api.AppStart.Services { public static class DataServiceExtensions { public static void RegisterDataServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { // Non-Cached diff --git a/UKSF.Api/AppStart/RegisterEventServices.cs b/UKSF.Api/AppStart/Services/RegisterEventServices.cs similarity index 98% rename from UKSF.Api/AppStart/RegisterEventServices.cs rename to UKSF.Api/AppStart/Services/RegisterEventServices.cs index 5ff8e058..4281ecd6 100644 --- a/UKSF.Api/AppStart/RegisterEventServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterEventServices.cs @@ -8,7 +8,7 @@ using UKSF.Api.Interfaces.Events; using UKSF.Api.Interfaces.Events.Handlers; -namespace UKSF.Api.AppStart { +namespace UKSF.Api.AppStart.Services { public static class EventServiceExtensions { public static void RegisterEventServices(this IServiceCollection services) { // Event Buses diff --git a/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs b/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs new file mode 100644 index 00000000..dbe0ebac --- /dev/null +++ b/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Interfaces.Utility.ScheduledActions; +using UKSF.Api.Services.Utility.ScheduledActions; + +namespace UKSF.Api.AppStart.Services { + public static class ScheduledActionServiceExtensions { + public static void RegisterScheduledActionServices(this IServiceCollection services) { + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + } + } +} diff --git a/UKSF.Api/AppStart/RegisterServices.cs b/UKSF.Api/AppStart/Services/ServiceExtensions.cs similarity index 92% rename from UKSF.Api/AppStart/RegisterServices.cs rename to UKSF.Api/AppStart/Services/ServiceExtensions.cs index b08cadb5..0595ae9f 100644 --- a/UKSF.Api/AppStart/RegisterServices.cs +++ b/UKSF.Api/AppStart/Services/ServiceExtensions.cs @@ -12,6 +12,7 @@ using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services; using UKSF.Api.Services.Admin; using UKSF.Api.Services.Command; using UKSF.Api.Services.Fake; @@ -24,13 +25,14 @@ using UKSF.Api.Services.Personnel; using UKSF.Api.Services.Utility; -namespace UKSF.Api.AppStart { +namespace UKSF.Api.AppStart.Services { public static class ServiceExtensions { public static void RegisterServices(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { // Base services.AddSingleton(configuration); services.AddSingleton(currentEnvironment); services.AddSingleton(); + services.AddSingleton(); // Data common services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); @@ -42,6 +44,10 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.RegisterDataServices(currentEnvironment); services.RegisterDataBackedServices(currentEnvironment); + // Scheduled action services + services.AddSingleton(); + services.RegisterScheduledActionServices(); + // Services services.AddTransient(); services.AddTransient(); diff --git a/UKSF.Api/AppStart/StartServices.cs b/UKSF.Api/AppStart/StartServices.cs new file mode 100644 index 00000000..1085ea1e --- /dev/null +++ b/UKSF.Api/AppStart/StartServices.cs @@ -0,0 +1,36 @@ +using System; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Events; +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services.Admin; + +namespace UKSF.Api.AppStart { + public static class StartServices { + public static void Start() { + IServiceProvider serviceProvider = Global.ServiceProvider; + + // Execute any DB migration + serviceProvider.GetService().Migrate(); + + // Warm cached data services + RegisterAndWarmCachedData.Warm(); + + // Register scheduled actions + RegisterScheduledActions.Register(); + + // Add event handlers + serviceProvider.GetService().InitEventHandlers(); + + // Start teamspeak manager + serviceProvider.GetService().Start(); + + // Connect discord bot + serviceProvider.GetService().ConnectDiscord(); + + // Start scheduler + serviceProvider.GetService().LoadApi(); + } + } +} diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index f7c70251..a26915f0 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication.JwtBearer; @@ -13,18 +12,13 @@ using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; using UKSF.Api.AppStart; -using UKSF.Api.Events; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.AppStart.Services; using UKSF.Api.Interfaces.Integrations.Teamspeak; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Services; -using UKSF.Api.Services.Admin; using UKSF.Api.Services.Common; using UKSF.Api.Services.Personnel; -using UKSF.Api.Services.Utility; using UKSF.Api.Signalr.Hubs.Command; using UKSF.Api.Signalr.Hubs.Game; using UKSF.Api.Signalr.Hubs.Integrations; @@ -50,15 +44,6 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration public void ConfigureServices(IServiceCollection services) { services.RegisterServices(configuration, currentEnvironment); - ExceptionHandler exceptionHandler = null; - services.AddSingleton( - provider => { - exceptionHandler = new ExceptionHandler(provider.GetService(), provider.GetService()); - return exceptionHandler; - } - ); - if (exceptionHandler == null) throw new NullReferenceException("Could not create ExceptionHandler"); - services.AddCors( options => options.AddPolicy( "CorsPolicy", @@ -109,7 +94,7 @@ public void ConfigureServices(IServiceCollection services) { services.AddControllers(); services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo { Title = "UKSF API", Version = "v1" }); }); - services.AddMvc(options => { options.Filters.Add(exceptionHandler); }).AddNewtonsoftJson(); + services.AddMvc(options => { options.Filters.Add(); }).AddNewtonsoftJson(); } // ReSharper disable once UnusedMember.Global @@ -145,62 +130,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl Global.ServiceProvider = app.ApplicationServices; ServiceWrapper.ServiceProvider = Global.ServiceProvider; - // Execute any DB migration - Global.ServiceProvider.GetService().Migrate(); - - // Warm cached data services - RegisterAndWarmCachedData(); - - // Add event handlers - Global.ServiceProvider.GetService().InitEventHandlers(); - - // Start teamspeak manager - Global.ServiceProvider.GetService().Start(); - - // Connect discord bot - Global.ServiceProvider.GetService().ConnectDiscord(); - - // Start scheduler - Global.ServiceProvider.GetService().LoadApi(); - } - - private static void RegisterAndWarmCachedData() { - IServiceProvider serviceProvider = Global.ServiceProvider; - IAccountDataService accountDataService = serviceProvider.GetService(); - ICommandRequestDataService commandRequestDataService = serviceProvider.GetService(); - ICommentThreadDataService commentThreadDataService = serviceProvider.GetService(); - IDischargeDataService dischargeDataService = serviceProvider.GetService(); - IGameServersDataService gameServersDataService = serviceProvider.GetService(); - ILauncherFileDataService launcherFileDataService = serviceProvider.GetService(); - ILoaDataService loaDataService = serviceProvider.GetService(); - INotificationsDataService notificationsDataService = serviceProvider.GetService(); - IOperationOrderDataService operationOrderDataService = serviceProvider.GetService(); - IOperationReportDataService operationReportDataService = serviceProvider.GetService(); - IRanksDataService ranksDataService = serviceProvider.GetService(); - IRolesDataService rolesDataService = serviceProvider.GetService(); - IUnitsDataService unitsDataService = serviceProvider.GetService(); - IVariablesDataService variablesDataService = serviceProvider.GetService(); - - DataCacheService dataCacheService = serviceProvider.GetService(); - dataCacheService.RegisterCachedDataServices( - new List { - accountDataService, - commandRequestDataService, - commentThreadDataService, - dischargeDataService, - gameServersDataService, - launcherFileDataService, - loaDataService, - notificationsDataService, - operationOrderDataService, - operationReportDataService, - ranksDataService, - rolesDataService, - unitsDataService, - variablesDataService - } - ); - dataCacheService.InvalidateCachedData(); + StartServices.Start(); } private static void OnShutdown() { diff --git a/UKSF.Integrations/Startup.cs b/UKSF.Integrations/Startup.cs index 922eb362..5b43f5c4 100644 --- a/UKSF.Integrations/Startup.cs +++ b/UKSF.Integrations/Startup.cs @@ -20,11 +20,13 @@ using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Interfaces.Utility.ScheduledActions; using UKSF.Api.Services; using UKSF.Api.Services.Common; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; using UKSF.Api.Services.Utility; +using UKSF.Api.Services.Utility.ScheduledActions; namespace UKSF.Integrations { public class Startup { @@ -39,15 +41,6 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration public void ConfigureServices(IServiceCollection services) { services.RegisterServices(configuration); - ExceptionHandler exceptionHandler = null; - services.AddSingleton( - provider => { - exceptionHandler = new ExceptionHandler(provider.GetService(), provider.GetService()); - return exceptionHandler; - } - ); - if (exceptionHandler == null) throw new NullReferenceException("Could not create ExceptionHandler"); - services.AddCors( options => options.AddPolicy( "CorsPolicy", @@ -60,7 +53,7 @@ public void ConfigureServices(IServiceCollection services) { services.AddControllers(); services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo { Title = "UKSF Integrations API", Version = "v1" }); }); - services.AddMvc(options => { options.Filters.Add(exceptionHandler); }).AddNewtonsoftJson(); + services.AddMvc(options => { options.Filters.Add(); }).AddNewtonsoftJson(); } // ReSharper disable once UnusedMember.Global @@ -86,6 +79,9 @@ public void Configure(IApplicationBuilder app) { // Warm cached data services RegisterAndWarmCachedData(); + // Register scheduled actions + RegisterScheduledActions(); + // Start scheduler Global.ServiceProvider.GetService().LoadIntegrations(); } @@ -97,9 +93,17 @@ private static void RegisterAndWarmCachedData() { IVariablesDataService variablesDataService = serviceProvider.GetService(); DataCacheService dataCacheService = serviceProvider.GetService(); - dataCacheService.RegisterCachedDataServices(new List { accountDataService, ranksDataService, variablesDataService }); + dataCacheService.RegisterCachedDataServices(new HashSet { accountDataService, ranksDataService, variablesDataService }); dataCacheService.InvalidateCachedData(); } + + private static void RegisterScheduledActions() { + IServiceProvider serviceProvider = Global.ServiceProvider; + IDeleteExpiredConfirmationCodeAction deleteExpiredConfirmationCodeAction = serviceProvider.GetService(); + + IScheduledActionService scheduledActionService = serviceProvider.GetService(); + scheduledActionService.RegisterScheduledActions(new HashSet { deleteExpiredConfirmationCodeAction }); + } } public static class ServiceExtensions { @@ -107,6 +111,7 @@ public static void RegisterServices(this IServiceCollection services, IConfigura // Base services.AddSingleton(configuration); services.AddSingleton(); + services.AddSingleton(); // Database services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); @@ -129,10 +134,14 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddSingleton(); services.AddSingleton(); + // Scheduled Actions + services.AddTransient(); + // Services services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddSingleton(); services.AddTransient(); services.AddSingleton(); diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index 17166d11..8138daae 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -9,6 +9,7 @@ using MongoDB.Driver; using UKSF.Api.Data; using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Utility; using UKSF.Tests.Unit.Common; using Xunit; @@ -36,10 +37,7 @@ public void Dispose() { private async Task MongoTest(Func testFunction) { mongoDbRunner = MongoDbRunner.Start(additionalMongodArguments: "--quiet"); - ConventionPack conventionPack = new ConventionPack { new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true) }; - ConventionRegistry.Register("DefaultConventions", conventionPack, t => true); - MongoClient mongoClient = new MongoClient(mongoDbRunner.ConnectionString); - IMongoDatabase database = mongoClient.GetDatabase(Guid.NewGuid().ToString()); + IMongoDatabase database = MongoClientFactory.GetDatabase($"{mongoDbRunner.ConnectionString}{Guid.NewGuid()}"); await testFunction(database); diff --git a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs new file mode 100644 index 00000000..ba5bd985 --- /dev/null +++ b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs @@ -0,0 +1,30 @@ +using System.Collections.Generic; +using Moq; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Services.Utility; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Services.Utility { + public class DataCacheServiceTests { + [Fact] + public void ShouldCallDataServiceRefresh() { + Mock mockAccountDataService = new Mock(); + Mock mockRanksDataService = new Mock(); + Mock mockRolesDataService = new Mock(); + + mockAccountDataService.Setup(x => x.Refresh()); + mockRanksDataService.Setup(x => x.Refresh()); + mockRolesDataService.Setup(x => x.Refresh()); + + DataCacheService dataCacheService = new DataCacheService(); + + dataCacheService.RegisterCachedDataServices(new HashSet {mockAccountDataService.Object, mockRanksDataService.Object, mockRolesDataService.Object}); + dataCacheService.InvalidateCachedData(); + + mockAccountDataService.Verify(x => x.Refresh(), Times.Once); + mockRanksDataService.Verify(x => x.Refresh(), Times.Once); + mockRolesDataService.Verify(x => x.Refresh(), Times.Once); + } + } +} From def99fc69edf387913a2aa631e7bc50feacd359a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 23 May 2020 13:31:56 +0100 Subject: [PATCH 150/369] Changed integration startup structure - Use same as API with classes per service type - Add more error checking and reporting to discord connection --- .../Utility/ConfirmationCodeService.cs | 2 +- .../Utility/ScheduledActionService.cs | 1 + UKSF.Api/Startup.cs | 2 - .../AppStart/RegisterAndWarmCachedData.cs | 22 ++++ .../AppStart/RegisterScheduledActions.cs | 18 +++ .../Services/RegisterDataBackedServices.cs | 23 ++++ .../AppStart/Services/RegisterDataServices.cs | 23 ++++ .../Services/RegisterEventServices.cs | 21 ++++ .../RegisterScheduledActionServices.cs | 11 ++ .../AppStart/Services/ServiceExtensions.cs | 42 +++++++ UKSF.Integrations/AppStart/StartServices.cs | 24 ++++ .../Controllers/DiscordController.cs | 45 +++++--- UKSF.Integrations/Startup.cs | 103 ++---------------- 13 files changed, 226 insertions(+), 111 deletions(-) create mode 100644 UKSF.Integrations/AppStart/RegisterAndWarmCachedData.cs create mode 100644 UKSF.Integrations/AppStart/RegisterScheduledActions.cs create mode 100644 UKSF.Integrations/AppStart/Services/RegisterDataBackedServices.cs create mode 100644 UKSF.Integrations/AppStart/Services/RegisterDataServices.cs create mode 100644 UKSF.Integrations/AppStart/Services/RegisterEventServices.cs create mode 100644 UKSF.Integrations/AppStart/Services/RegisterScheduledActionServices.cs create mode 100644 UKSF.Integrations/AppStart/Services/ServiceExtensions.cs create mode 100644 UKSF.Integrations/AppStart/StartServices.cs diff --git a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs index 749c901e..aa53069c 100644 --- a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs +++ b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs @@ -17,7 +17,7 @@ public async Task CreateConfirmationCode(string value) { ConfirmationCode code = new ConfirmationCode {value = value}; await Data.Add(code); await schedulerService.Create( - DateTime.Now.AddSeconds(30), + DateTime.Now.AddMinutes(30), TimeSpan.Zero, ScheduledJobType.NORMAL, DeleteExpiredConfirmationCodeAction.ACTION_NAME, diff --git a/UKSF.Api.Services/Utility/ScheduledActionService.cs b/UKSF.Api.Services/Utility/ScheduledActionService.cs index 97e09b0e..96614569 100644 --- a/UKSF.Api.Services/Utility/ScheduledActionService.cs +++ b/UKSF.Api.Services/Utility/ScheduledActionService.cs @@ -17,6 +17,7 @@ public IScheduledAction GetScheduledAction(string actionName) { if (scheduledActions.TryGetValue(actionName, out IScheduledAction action)) { return action; } + throw new ArgumentException($"Failed to find action '{actionName}'"); } } diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index a26915f0..a9642591 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -14,8 +14,6 @@ using UKSF.Api.AppStart; using UKSF.Api.AppStart.Services; using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; using UKSF.Api.Services; using UKSF.Api.Services.Common; using UKSF.Api.Services.Personnel; diff --git a/UKSF.Integrations/AppStart/RegisterAndWarmCachedData.cs b/UKSF.Integrations/AppStart/RegisterAndWarmCachedData.cs new file mode 100644 index 00000000..49605745 --- /dev/null +++ b/UKSF.Integrations/AppStart/RegisterAndWarmCachedData.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Services.Utility; + +namespace UKSF.Integrations.AppStart { + public static class RegisterAndWarmCachedData { + public static void Warm() { + IServiceProvider serviceProvider = Global.ServiceProvider; + + IAccountDataService accountDataService = serviceProvider.GetService(); + IRanksDataService ranksDataService = serviceProvider.GetService(); + IVariablesDataService variablesDataService = serviceProvider.GetService(); + + DataCacheService dataCacheService = serviceProvider.GetService(); + dataCacheService.RegisterCachedDataServices(new HashSet { accountDataService, ranksDataService, variablesDataService }); + dataCacheService.InvalidateCachedData(); + } + } +} diff --git a/UKSF.Integrations/AppStart/RegisterScheduledActions.cs b/UKSF.Integrations/AppStart/RegisterScheduledActions.cs new file mode 100644 index 00000000..cb47d9c5 --- /dev/null +++ b/UKSF.Integrations/AppStart/RegisterScheduledActions.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Interfaces.Utility.ScheduledActions; + +namespace UKSF.Integrations.AppStart { + public static class RegisterScheduledActions { + public static void Register() { + IServiceProvider serviceProvider = Global.ServiceProvider; + + IDeleteExpiredConfirmationCodeAction deleteExpiredConfirmationCodeAction = serviceProvider.GetService(); + + IScheduledActionService scheduledActionService = serviceProvider.GetService(); + scheduledActionService.RegisterScheduledActions(new HashSet { deleteExpiredConfirmationCodeAction }); + } + } +} diff --git a/UKSF.Integrations/AppStart/Services/RegisterDataBackedServices.cs b/UKSF.Integrations/AppStart/Services/RegisterDataBackedServices.cs new file mode 100644 index 00000000..25d5094c --- /dev/null +++ b/UKSF.Integrations/AppStart/Services/RegisterDataBackedServices.cs @@ -0,0 +1,23 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services.Message; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Services.Utility; + +namespace UKSF.Integrations.AppStart.Services { + public static class DataBackedServiceExtensions { + public static void RegisterDataBackedServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { + // Non-Cached + services.AddTransient(); + services.AddSingleton(); + services.AddTransient(); + + // Cached + services.AddSingleton(); + services.AddTransient(); + } + } +} diff --git a/UKSF.Integrations/AppStart/Services/RegisterDataServices.cs b/UKSF.Integrations/AppStart/Services/RegisterDataServices.cs new file mode 100644 index 00000000..d7399058 --- /dev/null +++ b/UKSF.Integrations/AppStart/Services/RegisterDataServices.cs @@ -0,0 +1,23 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Data.Admin; +using UKSF.Api.Data.Message; +using UKSF.Api.Data.Personnel; +using UKSF.Api.Data.Utility; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; + +namespace UKSF.Integrations.AppStart.Services { + public static class DataServiceExtensions { + public static void RegisterDataServices(this IServiceCollection services) { + // Non-Cached + services.AddTransient(); + services.AddSingleton(); + services.AddTransient(); + + // Cached + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + } + } +} diff --git a/UKSF.Integrations/AppStart/Services/RegisterEventServices.cs b/UKSF.Integrations/AppStart/Services/RegisterEventServices.cs new file mode 100644 index 00000000..a1af0fe3 --- /dev/null +++ b/UKSF.Integrations/AppStart/Services/RegisterEventServices.cs @@ -0,0 +1,21 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Events.Data; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; + +namespace UKSF.Integrations.AppStart.Services { + public static class EventServiceExtensions { + public static void RegisterEventServices(this IServiceCollection services) { + // Event Buses + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + + // Event Handlers + } + } +} diff --git a/UKSF.Integrations/AppStart/Services/RegisterScheduledActionServices.cs b/UKSF.Integrations/AppStart/Services/RegisterScheduledActionServices.cs new file mode 100644 index 00000000..f0497cd8 --- /dev/null +++ b/UKSF.Integrations/AppStart/Services/RegisterScheduledActionServices.cs @@ -0,0 +1,11 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Interfaces.Utility.ScheduledActions; +using UKSF.Api.Services.Utility.ScheduledActions; + +namespace UKSF.Integrations.AppStart.Services { + public static class ScheduledActionServiceExtensions { + public static void RegisterScheduledActionServices(this IServiceCollection services) { + services.AddTransient(); + } + } +} diff --git a/UKSF.Integrations/AppStart/Services/ServiceExtensions.cs b/UKSF.Integrations/AppStart/Services/ServiceExtensions.cs new file mode 100644 index 00000000..f475ffbd --- /dev/null +++ b/UKSF.Integrations/AppStart/Services/ServiceExtensions.cs @@ -0,0 +1,42 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using UKSF.Api.Data; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Services.Utility; + +namespace UKSF.Integrations.AppStart.Services { + public static class ServiceExtensions { + public static void RegisterServices(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { + // Base + services.AddSingleton(configuration); + services.AddSingleton(currentEnvironment); + services.AddSingleton(); + services.AddSingleton(); + + // Data common + services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); + services.AddTransient(); + services.AddSingleton(); + + // Events & Data + services.RegisterEventServices(); + services.RegisterDataServices(); + services.RegisterDataBackedServices(currentEnvironment); + + // Scheduled action services + services.AddSingleton(); + services.RegisterScheduledActionServices(); + + // Services + services.AddTransient(); + + services.AddSingleton(); + } + } +} diff --git a/UKSF.Integrations/AppStart/StartServices.cs b/UKSF.Integrations/AppStart/StartServices.cs new file mode 100644 index 00000000..29a73c96 --- /dev/null +++ b/UKSF.Integrations/AppStart/StartServices.cs @@ -0,0 +1,24 @@ +using System; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Events; +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services.Admin; + +namespace UKSF.Integrations.AppStart { + public static class StartServices { + public static void Start() { + IServiceProvider serviceProvider = Global.ServiceProvider; + + // Warm cached data services + RegisterAndWarmCachedData.Warm(); + + // Register scheduled actions + RegisterScheduledActions.Register(); + + // Start scheduler + serviceProvider.GetService().LoadApi(); + } + } +} diff --git a/UKSF.Integrations/Controllers/DiscordController.cs b/UKSF.Integrations/Controllers/DiscordController.cs index d472ff19..60e37fbe 100644 --- a/UKSF.Integrations/Controllers/DiscordController.cs +++ b/UKSF.Integrations/Controllers/DiscordController.cs @@ -34,10 +34,14 @@ public DiscordController(IConfirmationCodeService confirmationCodeService, IConf } [HttpGet] - public IActionResult Get() => Redirect($"https://discord.com/api/oauth2/authorize?client_id={clientId}&redirect_uri={HttpUtility.UrlEncode($"{url}/discord/success")}&response_type=code&scope=identify%20guilds.join"); + public IActionResult Get() => + Redirect($"https://discord.com/api/oauth2/authorize?client_id={clientId}&redirect_uri={HttpUtility.UrlEncode($"{url}/discord/success")}&response_type=code&scope=identify%20guilds.join"); [HttpGet("application")] - public IActionResult GetFromApplication() => Redirect($"https://discord.com/api/oauth2/authorize?client_id={clientId}&redirect_uri={HttpUtility.UrlEncode($"{url}/discord/success/application")}&response_type=code&scope=identify%20guilds.join"); + public IActionResult GetFromApplication() => + Redirect( + $"https://discord.com/api/oauth2/authorize?client_id={clientId}&redirect_uri={HttpUtility.UrlEncode($"{url}/discord/success/application")}&response_type=code&scope=identify%20guilds.join" + ); [HttpGet("success")] public async Task Success([FromQuery] string code) => Redirect($"{urlReturn}/profile?{await GetUrlParameters(code, $"{url}/discord/success")}"); @@ -51,29 +55,42 @@ private async Task GetUrlParameters(string code, string redirectUrl) { "https://discord.com/api/oauth2/token", new FormUrlEncodedContent( new Dictionary { - {"client_id", clientId}, - {"client_secret", clientSecret}, - {"grant_type", "authorization_code"}, - {"code", code}, - {"redirect_uri", redirectUrl}, - {"scope", "identify guilds.join"} + { "client_id", clientId }, + { "client_secret", clientSecret }, + { "grant_type", "authorization_code" }, + { "code", code }, + { "redirect_uri", redirectUrl }, + { "scope", "identify guilds.join" } } ) ); string result = await response.Content.ReadAsStringAsync(); if (!response.IsSuccessStatusCode) { - LogWrapper.Log($"A discord connection request was denied"); + LogWrapper.Log($"A discord connection request was denied by the user, or an error occurred: {result}"); + return "discordid=fail"; + } + + string token = JObject.Parse(result)["access_token"]?.ToString(); + if (string.IsNullOrEmpty(token)) { + LogWrapper.Log("A discord connection request failed. Could not get access token"); return "discordid=fail"; } - string token = JObject.Parse(result)["access_token"].ToString(); + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token); response = await client.GetAsync("https://discord.com/api/users/@me"); - string user = await response.Content.ReadAsStringAsync(); - string id = JObject.Parse(user)["id"].ToString(); - string username = JObject.Parse(user)["username"].ToString(); + result = await response.Content.ReadAsStringAsync(); + string id = JObject.Parse(result)["id"]?.ToString(); + string username = JObject.Parse(result)["username"]?.ToString(); + if (string.IsNullOrEmpty(id) || string.IsNullOrEmpty(username)) { + LogWrapper.Log($"A discord connection request failed. Could not get username ({username}) or id ({id}) or an error occurred: {result}"); + return "discordid=fail"; + } client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bot", botToken); - response = await client.PutAsync($"https://discord.com/api/guilds/{VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json")); + response = await client.PutAsync( + $"https://discord.com/api/guilds/{VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", + new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json") + ); string added = "true"; if (!response.IsSuccessStatusCode) { LogWrapper.Log($"Failed to add '{username}' to guild: {response.StatusCode}, {response.Content.ReadAsStringAsync().Result}"); diff --git a/UKSF.Integrations/Startup.cs b/UKSF.Integrations/Startup.cs index 5b43f5c4..14bffe9f 100644 --- a/UKSF.Integrations/Startup.cs +++ b/UKSF.Integrations/Startup.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.HttpOverrides; @@ -8,38 +6,25 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.OpenApi.Models; -using UKSF.Api.Data; -using UKSF.Api.Data.Admin; -using UKSF.Api.Data.Message; -using UKSF.Api.Data.Personnel; -using UKSF.Api.Data.Utility; -using UKSF.Api.Events.Data; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Interfaces.Utility.ScheduledActions; using UKSF.Api.Services; using UKSF.Api.Services.Common; -using UKSF.Api.Services.Message; -using UKSF.Api.Services.Personnel; -using UKSF.Api.Services.Utility; -using UKSF.Api.Services.Utility.ScheduledActions; +using UKSF.Integrations.AppStart; +using UKSF.Integrations.AppStart.Services; namespace UKSF.Integrations { public class Startup { private readonly IConfiguration configuration; + private readonly IHostEnvironment currentEnvironment; public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration) { this.configuration = configuration; + this.currentEnvironment = currentEnvironment; IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); builder.Build(); } public void ConfigureServices(IServiceCollection services) { - services.RegisterServices(configuration); + services.RegisterServices(configuration, currentEnvironment); services.AddCors( options => options.AddPolicy( @@ -57,12 +42,12 @@ public void ConfigureServices(IServiceCollection services) { } // ReSharper disable once UnusedMember.Global - public void Configure(IApplicationBuilder app) { + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); } - app.UseCookiePolicy(new CookiePolicyOptions {MinimumSameSitePolicy = SameSiteMode.Lax}); + app.UseCookiePolicy(new CookiePolicyOptions { MinimumSameSitePolicy = SameSiteMode.Lax }); app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF Integrations API v1"); }); app.UseRouting(); @@ -76,77 +61,7 @@ public void Configure(IApplicationBuilder app) { Global.ServiceProvider = app.ApplicationServices; ServiceWrapper.ServiceProvider = Global.ServiceProvider; - // Warm cached data services - RegisterAndWarmCachedData(); - - // Register scheduled actions - RegisterScheduledActions(); - - // Start scheduler - Global.ServiceProvider.GetService().LoadIntegrations(); - } - - private static void RegisterAndWarmCachedData() { - IServiceProvider serviceProvider = Global.ServiceProvider; - IAccountDataService accountDataService = serviceProvider.GetService(); - IRanksDataService ranksDataService = serviceProvider.GetService(); - IVariablesDataService variablesDataService = serviceProvider.GetService(); - - DataCacheService dataCacheService = serviceProvider.GetService(); - dataCacheService.RegisterCachedDataServices(new HashSet { accountDataService, ranksDataService, variablesDataService }); - dataCacheService.InvalidateCachedData(); - } - - private static void RegisterScheduledActions() { - IServiceProvider serviceProvider = Global.ServiceProvider; - IDeleteExpiredConfirmationCodeAction deleteExpiredConfirmationCodeAction = serviceProvider.GetService(); - - IScheduledActionService scheduledActionService = serviceProvider.GetService(); - scheduledActionService.RegisterScheduledActions(new HashSet { deleteExpiredConfirmationCodeAction }); - } - } - - public static class ServiceExtensions { - public static void RegisterServices(this IServiceCollection services, IConfiguration configuration) { - // Base - services.AddSingleton(configuration); - services.AddSingleton(); - services.AddSingleton(); - - // Database - services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); - services.AddTransient(); - services.AddSingleton(); - - // Event Buses - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - - // Data - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - - // Scheduled Actions - services.AddTransient(); - - // Services - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddSingleton(); - services.AddTransient(); - - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); + StartServices.Start(); } } } From ed75e64b89b9481f6345c24109d57e0559a1b52a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 23 May 2020 13:37:48 +0100 Subject: [PATCH 151/369] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 729a71f3..b0cff386 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ # UKSF Website Backend + +https://coveralls.io/github/uksf/api From 678d2a69fef0990bb4b6a714698f36833f50ce8b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 23 May 2020 13:44:42 +0100 Subject: [PATCH 152/369] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b0cff386..7982cc61 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # UKSF Website Backend -https://coveralls.io/github/uksf/api +[![Coverage Status](https://coveralls.io/repos/github/uksf/api/badge.svg?branch=master)](https://coveralls.io/github/uksf/api?branch=master) From d27daa5cb0a8c4cf1b49410dab77ddb007a0f90c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 23 May 2020 14:30:33 +0100 Subject: [PATCH 153/369] Remove type from scheduled job model - Migrate old job model to new in database (cherry picked from commit c80316a4d6cc31721906009e61d4afa76eecac74) --- .../Utility/ISchedulerService.cs | 2 +- UKSF.Api.Models/Utility/ScheduledJob.cs | 7 --- UKSF.Api.Services/Admin/MigrationUtility.cs | 63 ++++++++++--------- .../Utility/ConfirmationCodeService.cs | 1 - UKSF.Api.Services/Utility/SchedulerService.cs | 12 ++-- .../Utility/ConfirmationCodeServiceTests.cs | 8 +-- 6 files changed, 45 insertions(+), 48 deletions(-) diff --git a/UKSF.Api.Interfaces/Utility/ISchedulerService.cs b/UKSF.Api.Interfaces/Utility/ISchedulerService.cs index 2b78bbcb..1c85da5b 100644 --- a/UKSF.Api.Interfaces/Utility/ISchedulerService.cs +++ b/UKSF.Api.Interfaces/Utility/ISchedulerService.cs @@ -7,7 +7,7 @@ namespace UKSF.Api.Interfaces.Utility { public interface ISchedulerService : IDataBackedService { void LoadApi(); void LoadIntegrations(); - Task Create(DateTime next, TimeSpan interval, ScheduledJobType type, string action, params object[] actionParameters); + Task Create(DateTime next, TimeSpan interval, string action, params object[] actionParameters); Task Cancel(Func predicate); } } diff --git a/UKSF.Api.Models/Utility/ScheduledJob.cs b/UKSF.Api.Models/Utility/ScheduledJob.cs index e9b47fdb..13c8cc99 100644 --- a/UKSF.Api.Models/Utility/ScheduledJob.cs +++ b/UKSF.Api.Models/Utility/ScheduledJob.cs @@ -1,18 +1,11 @@ using System; namespace UKSF.Api.Models.Utility { - public enum ScheduledJobType { - NORMAL, - TEAMSPEAK_SNAPSHOT, - LOG_PRUNE - } - public class ScheduledJob : DatabaseObject { public string action; public string actionParameters; public TimeSpan interval; public DateTime next; public bool repeat; - public ScheduledJobType type = ScheduledJobType.NORMAL; } } diff --git a/UKSF.Api.Services/Admin/MigrationUtility.cs b/UKSF.Api.Services/Admin/MigrationUtility.cs index 930c6fd3..3e4ffcca 100644 --- a/UKSF.Api.Services/Admin/MigrationUtility.cs +++ b/UKSF.Api.Services/Admin/MigrationUtility.cs @@ -6,10 +6,14 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; +using UKSF.Api.Models; using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Units; +using UKSF.Api.Models.Utility; using UKSF.Api.Services.Common; using UKSF.Api.Services.Message; @@ -17,12 +21,8 @@ namespace UKSF.Api.Services.Admin { public class MigrationUtility { private const string KEY = "MIGRATED"; private readonly IHostEnvironment currentEnvironment; - private readonly IMongoDatabase database; - public MigrationUtility(IMongoDatabase database, IHostEnvironment currentEnvironment) { - this.database = database; - this.currentEnvironment = currentEnvironment; - } + public MigrationUtility(IHostEnvironment currentEnvironment) => this.currentEnvironment = currentEnvironment; public void Migrate() { bool migrated = true; @@ -46,35 +46,40 @@ public void Migrate() { // TODO: CHECK BEFORE RELEASE private static void ExecuteMigration() { - IUnitsService unitsService = ServiceWrapper.ServiceProvider.GetService(); - IRolesService rolesService = ServiceWrapper.ServiceProvider.GetService(); - List roles = rolesService.Data.Get(x => x.roleType == RoleType.UNIT); + IDataCollectionFactory dataCollectionFactory = ServiceWrapper.ServiceProvider.GetService(); + IDataCollection oldDataCollection = dataCollectionFactory.CreateDataCollection("scheduledJobs"); + List oldScheduledJobs = oldDataCollection.Get(); - foreach (Unit unit in unitsService.Data.Get()) { - Dictionary unitRoles = unit.roles; - int originalCount = unit.roles.Count; - foreach ((string key, string _) in unitRoles.ToList()) { - if (roles.All(x => x.name != key)) { - unitRoles.Remove(key); - } - } + ISchedulerDataService schedulerDataService = ServiceWrapper.ServiceProvider.GetService(); - if (roles.Count != originalCount) { - unitsService.Data.Update(unit.id, Builders.Update.Set(x => x.roles, unitRoles)).Wait(); + foreach (ScheduledJob newScheduledJob in oldScheduledJobs.Select( + oldScheduledJob => new ScheduledJob { + id = oldScheduledJob.id, + action = oldScheduledJob.action, + actionParameters = oldScheduledJob.actionParameters, + interval = oldScheduledJob.interval, + next = oldScheduledJob.next, + repeat = oldScheduledJob.repeat } + )) { + schedulerDataService.Delete(newScheduledJob.id).Wait(); + schedulerDataService.Add(newScheduledJob).Wait(); } } } -// public class OldLoa { -// public bool approved; -// [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id; -// public bool late; -// public string reason; -// public string emergency; -// [BsonRepresentation(BsonType.ObjectId)] public string recipient; -// public DateTime start; -// public DateTime end; -// public DateTime submitted; -// } + public enum ScheduledJobType { + NORMAL, + TEAMSPEAK_SNAPSHOT, + LOG_PRUNE + } + + public class OldScheduledJob : DatabaseObject { + public string action; + public string actionParameters; + public TimeSpan interval; + public DateTime next; + public bool repeat; + public ScheduledJobType type = ScheduledJobType.NORMAL; + } } diff --git a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs index aa53069c..f63754cb 100644 --- a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs +++ b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs @@ -19,7 +19,6 @@ public async Task CreateConfirmationCode(string value) { await schedulerService.Create( DateTime.Now.AddMinutes(30), TimeSpan.Zero, - ScheduledJobType.NORMAL, DeleteExpiredConfirmationCodeAction.ACTION_NAME, code.id ); diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index f79e7c5b..47e27d5e 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -35,8 +35,8 @@ public void LoadIntegrations() { Load(); } - public async Task Create(DateTime next, TimeSpan interval, ScheduledJobType type, string action, params object[] actionParameters) { - ScheduledJob job = new ScheduledJob { next = next, action = action, type = type }; + public async Task Create(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { + ScheduledJob job = new ScheduledJob { next = next, action = action }; if (actionParameters.Length > 0) { job.actionParameters = JsonConvert.SerializeObject(actionParameters); } @@ -104,12 +104,12 @@ private void Schedule(ScheduledJob job) { } private async Task AddUnique() { - if (Data.GetSingle(x => x.type == ScheduledJobType.LOG_PRUNE) == null) { - await Create(DateTime.Today.AddDays(1), TimeSpan.FromDays(1), ScheduledJobType.LOG_PRUNE, PruneLogsAction.ACTION_NAME); + if (Data.GetSingle(x => x.action == PruneLogsAction.ACTION_NAME) == null) { + await Create(DateTime.Today.AddDays(1), TimeSpan.FromDays(1), PruneLogsAction.ACTION_NAME); } - if (Data.GetSingle(x => x.type == ScheduledJobType.TEAMSPEAK_SNAPSHOT) == null) { - await Create(DateTime.Today.AddDays(1), TimeSpan.FromMinutes(5), ScheduledJobType.TEAMSPEAK_SNAPSHOT, TeamspeakSnapshotAction.ACTION_NAME); + if (Data.GetSingle(x => x.action == TeamspeakSnapshotAction.ACTION_NAME) == null) { + await Create(DateTime.Today.AddDays(1), TimeSpan.FromMinutes(5), TeamspeakSnapshotAction.ACTION_NAME); } } diff --git a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs index 3cec25b6..46d4c3fc 100644 --- a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs @@ -38,7 +38,7 @@ public async Task ShouldSetConfirmationCodeValue() { ConfirmationCode subject = null; mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); - mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); await confirmationCodeService.CreateConfirmationCode("test"); @@ -49,7 +49,7 @@ public async Task ShouldSetConfirmationCodeValue() { [Theory, InlineData(null), InlineData("")] public void ShouldThrowForCreateWhenValueNullOrEmpty(string value) { mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); - mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); Func act = async () => await confirmationCodeService.CreateConfirmationCode(value); @@ -81,7 +81,7 @@ public async Task ShouldCreateConfirmationCode() { ConfirmationCode subject = null; mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); - mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); await confirmationCodeService.CreateConfirmationCode("test"); @@ -121,7 +121,7 @@ public async Task ShouldReturnCodeValue() { [Fact] public async Task ShouldReturnValidCodeId() { mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); - mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); string subject = await confirmationCodeService.CreateConfirmationCode("test"); From 94e6f0445577c4b9b9a6095d3f25981a28a47a8b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 23 May 2020 14:38:10 +0100 Subject: [PATCH 154/369] Removed unused Task extension method --- UKSF.Common/TaskUtilities.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/UKSF.Common/TaskUtilities.cs b/UKSF.Common/TaskUtilities.cs index 30ff066e..3a0f5898 100644 --- a/UKSF.Common/TaskUtilities.cs +++ b/UKSF.Common/TaskUtilities.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; @@ -12,7 +11,5 @@ public static async Task Delay(TimeSpan timeSpan, CancellationToken token) { // Ignored } } - - public static async Task> WhenAll(this IEnumerable> tasks) => await Task.WhenAll(tasks); } } From a6981f8b76955e8c24f6871c5526a6afd5283b25 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 24 May 2020 18:02:58 +0100 Subject: [PATCH 155/369] Use integrations load for scheduler service --- UKSF.Integrations/AppStart/StartServices.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Integrations/AppStart/StartServices.cs b/UKSF.Integrations/AppStart/StartServices.cs index 29a73c96..02b5fe54 100644 --- a/UKSF.Integrations/AppStart/StartServices.cs +++ b/UKSF.Integrations/AppStart/StartServices.cs @@ -18,7 +18,7 @@ public static void Start() { RegisterScheduledActions.Register(); // Start scheduler - serviceProvider.GetService().LoadApi(); + serviceProvider.GetService().LoadIntegrations(); } } } From 2d2e498b1bb97cf58141060cf180f498596b594b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 24 May 2020 18:28:55 +0100 Subject: [PATCH 156/369] Use correct data instance for integrations scheduled jobs --- UKSF.Integrations/AppStart/Services/RegisterDataServices.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Integrations/AppStart/Services/RegisterDataServices.cs b/UKSF.Integrations/AppStart/Services/RegisterDataServices.cs index d7399058..639f5c99 100644 --- a/UKSF.Integrations/AppStart/Services/RegisterDataServices.cs +++ b/UKSF.Integrations/AppStart/Services/RegisterDataServices.cs @@ -12,7 +12,7 @@ public static void RegisterDataServices(this IServiceCollection services) { // Non-Cached services.AddTransient(); services.AddSingleton(); - services.AddTransient(); + services.AddTransient(); // Cached services.AddSingleton(); From 20273621ee225374fe4d0c9414c1eda597319557 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 25 May 2020 13:43:28 +0100 Subject: [PATCH 157/369] Remove Integrations - Merged Integrations functionality into main API - Added some error checking in communications controller --- UKSF.Api.Data/Utility/SchedulerDataService.cs | 4 -- .../Utility/ISchedulerService.cs | 1 - .../Utility/ConfirmationCodeService.cs | 12 +--- UKSF.Api.Services/Utility/SchedulerService.cs | 4 -- UKSF.Api.sln | 14 ---- .../Accounts/CommunicationsController.cs | 65 +++++++++++++---- .../Accounts/PasswordResetController.cs | 12 +++- .../DiscordConnectionController.cs | 19 ++--- .../Controllers/SteamConnectionController.cs | 27 ++++---- UKSF.Api/Startup.cs | 26 ++++++- UKSF.Api/UKSF.Api.csproj | 2 + UKSF.Api/appsettings.json | 5 ++ .../AppStart/RegisterAndWarmCachedData.cs | 22 ------ .../AppStart/RegisterScheduledActions.cs | 18 ----- .../Services/RegisterDataBackedServices.cs | 23 ------- .../AppStart/Services/RegisterDataServices.cs | 23 ------- .../Services/RegisterEventServices.cs | 21 ------ .../RegisterScheduledActionServices.cs | 11 --- .../AppStart/Services/ServiceExtensions.cs | 42 ----------- UKSF.Integrations/AppStart/StartServices.cs | 24 ------- UKSF.Integrations/Global.cs | 7 -- UKSF.Integrations/Program.cs | 69 ------------------- .../Properties/launchSettings.json | 27 -------- UKSF.Integrations/Startup.cs | 67 ------------------ UKSF.Integrations/UKSF.Integrations.csproj | 24 ------- UKSF.Integrations/appsettings.json | 10 --- .../Integration/Data/DataCollectionTests.cs | 1 - .../testdata/scheduledJobsIntegrations.json | 13 ---- 28 files changed, 119 insertions(+), 474 deletions(-) rename UKSF.Integrations/Controllers/DiscordController.cs => UKSF.Api/Controllers/DiscordConnectionController.cs (84%) rename UKSF.Integrations/Controllers/SteamController.cs => UKSF.Api/Controllers/SteamConnectionController.cs (53%) delete mode 100644 UKSF.Integrations/AppStart/RegisterAndWarmCachedData.cs delete mode 100644 UKSF.Integrations/AppStart/RegisterScheduledActions.cs delete mode 100644 UKSF.Integrations/AppStart/Services/RegisterDataBackedServices.cs delete mode 100644 UKSF.Integrations/AppStart/Services/RegisterDataServices.cs delete mode 100644 UKSF.Integrations/AppStart/Services/RegisterEventServices.cs delete mode 100644 UKSF.Integrations/AppStart/Services/RegisterScheduledActionServices.cs delete mode 100644 UKSF.Integrations/AppStart/Services/ServiceExtensions.cs delete mode 100644 UKSF.Integrations/AppStart/StartServices.cs delete mode 100644 UKSF.Integrations/Global.cs delete mode 100644 UKSF.Integrations/Program.cs delete mode 100644 UKSF.Integrations/Properties/launchSettings.json delete mode 100644 UKSF.Integrations/Startup.cs delete mode 100644 UKSF.Integrations/UKSF.Integrations.csproj delete mode 100644 UKSF.Integrations/appsettings.json delete mode 100644 UKSF.Tests/testdata/scheduledJobsIntegrations.json diff --git a/UKSF.Api.Data/Utility/SchedulerDataService.cs b/UKSF.Api.Data/Utility/SchedulerDataService.cs index 38327af9..8f5768d9 100644 --- a/UKSF.Api.Data/Utility/SchedulerDataService.cs +++ b/UKSF.Api.Data/Utility/SchedulerDataService.cs @@ -6,8 +6,4 @@ namespace UKSF.Api.Data.Utility { public class SchedulerDataService : DataService, ISchedulerDataService { public SchedulerDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "scheduledJobs") { } } - - public class SchedulerIntegrationsDataService : DataService, ISchedulerDataService { - public SchedulerIntegrationsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "scheduledJobsIntegrations") { } - } } diff --git a/UKSF.Api.Interfaces/Utility/ISchedulerService.cs b/UKSF.Api.Interfaces/Utility/ISchedulerService.cs index 1c85da5b..c37916b0 100644 --- a/UKSF.Api.Interfaces/Utility/ISchedulerService.cs +++ b/UKSF.Api.Interfaces/Utility/ISchedulerService.cs @@ -6,7 +6,6 @@ namespace UKSF.Api.Interfaces.Utility { public interface ISchedulerService : IDataBackedService { void LoadApi(); - void LoadIntegrations(); Task Create(DateTime next, TimeSpan interval, string action, params object[] actionParameters); Task Cancel(Func predicate); } diff --git a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs index f63754cb..de614302 100644 --- a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs +++ b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs @@ -14,14 +14,9 @@ public class ConfirmationCodeService : DataBackedService CreateConfirmationCode(string value) { if (string.IsNullOrEmpty(value)) throw new ArgumentNullException(nameof(value), "Value for confirmation code cannot be null or empty"); - ConfirmationCode code = new ConfirmationCode {value = value}; + ConfirmationCode code = new ConfirmationCode { value = value }; await Data.Add(code); - await schedulerService.Create( - DateTime.Now.AddMinutes(30), - TimeSpan.Zero, - DeleteExpiredConfirmationCodeAction.ACTION_NAME, - code.id - ); + await schedulerService.Create(DateTime.Now.AddMinutes(30), TimeSpan.Zero, DeleteExpiredConfirmationCodeAction.ACTION_NAME, code.id); return code.id; } @@ -29,9 +24,8 @@ public async Task GetConfirmationCode(string id) { ConfirmationCode confirmationCode = Data.GetSingle(id); if (confirmationCode == null) return string.Empty; await Data.Delete(confirmationCode.id); - string actionParameters = JsonConvert.SerializeObject(new object[] {confirmationCode.id}); + string actionParameters = JsonConvert.SerializeObject(new object[] { confirmationCode.id }); await schedulerService.Cancel(x => x.actionParameters == actionParameters); - return confirmationCode.value; } } diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index 47e27d5e..a6d6b910 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -31,10 +31,6 @@ public async void LoadApi() { Load(); } - public void LoadIntegrations() { - Load(); - } - public async Task Create(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { ScheduledJob job = new ScheduledJob { next = next, action = action }; if (actionParameters.Length > 0) { diff --git a/UKSF.Api.sln b/UKSF.Api.sln index f3a0f208..a93fd98d 100644 --- a/UKSF.Api.sln +++ b/UKSF.Api.sln @@ -14,8 +14,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UKSF.Api.Models", "UKSF.Api EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UKSF.Api.Services", "UKSF.Api.Services\UKSF.Api.Services.csproj", "{F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Integrations", "UKSF.Integrations\UKSF.Integrations.csproj", "{69AADF01-164E-4AD7-9E67-2974B79D3856}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Data", "UKSF.Api.Data\UKSF.Api.Data.csproj", "{AE15E44A-DB7B-432F-84BA-7A01E6C54010}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Interfaces", "UKSF.Api.Interfaces\UKSF.Api.Interfaces.csproj", "{462304E4-442D-46F2-B0AD-73BBCEB01C8A}" @@ -76,18 +74,6 @@ Global {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Release|x64.Build.0 = Release|Any CPU {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Release|x86.ActiveCfg = Release|Any CPU {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Release|x86.Build.0 = Release|Any CPU - {69AADF01-164E-4AD7-9E67-2974B79D3856}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69AADF01-164E-4AD7-9E67-2974B79D3856}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69AADF01-164E-4AD7-9E67-2974B79D3856}.Debug|x64.ActiveCfg = Debug|Any CPU - {69AADF01-164E-4AD7-9E67-2974B79D3856}.Debug|x64.Build.0 = Debug|Any CPU - {69AADF01-164E-4AD7-9E67-2974B79D3856}.Debug|x86.ActiveCfg = Debug|Any CPU - {69AADF01-164E-4AD7-9E67-2974B79D3856}.Debug|x86.Build.0 = Debug|Any CPU - {69AADF01-164E-4AD7-9E67-2974B79D3856}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69AADF01-164E-4AD7-9E67-2974B79D3856}.Release|Any CPU.Build.0 = Release|Any CPU - {69AADF01-164E-4AD7-9E67-2974B79D3856}.Release|x64.ActiveCfg = Release|Any CPU - {69AADF01-164E-4AD7-9E67-2974B79D3856}.Release|x64.Build.0 = Release|Any CPU - {69AADF01-164E-4AD7-9E67-2974B79D3856}.Release|x86.ActiveCfg = Release|Any CPU - {69AADF01-164E-4AD7-9E67-2974B79D3856}.Release|x86.Build.0 = Release|Any CPU {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|Any CPU.Build.0 = Debug|Any CPU {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|x64.ActiveCfg = Debug|Any CPU diff --git a/UKSF.Api/Controllers/Accounts/CommunicationsController.cs b/UKSF.Api/Controllers/Accounts/CommunicationsController.cs index e8d275e2..6d351fb1 100644 --- a/UKSF.Api/Controllers/Accounts/CommunicationsController.cs +++ b/UKSF.Api/Controllers/Accounts/CommunicationsController.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; @@ -10,6 +11,7 @@ using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Personnel; using UKSF.Api.Services.Message; +using UKSF.Api.Services.Utility.ScheduledActions; using UKSF.Common; namespace UKSF.Api.Controllers.Accounts { @@ -21,7 +23,13 @@ public class CommunicationsController : Controller { private readonly ISessionService sessionService; private readonly ITeamspeakService teamspeakService; - public CommunicationsController(IConfirmationCodeService confirmationCodeService, IAccountService accountService, ISessionService sessionService, ITeamspeakService teamspeakService, INotificationsService notificationsService) { + public CommunicationsController( + IConfirmationCodeService confirmationCodeService, + IAccountService accountService, + ISessionService sessionService, + ITeamspeakService teamspeakService, + INotificationsService notificationsService + ) { this.confirmationCodeService = confirmationCodeService; this.accountService = accountService; this.sessionService = sessionService; @@ -30,33 +38,59 @@ public CommunicationsController(IConfirmationCodeService confirmationCodeService } [HttpGet, Authorize] - public IActionResult GetTeamspeakStatus() => Ok(new {isConnected = sessionService.GetContextAccount().teamspeakIdentities?.Count > 0}); + public IActionResult GetTeamspeakStatus() => Ok(new { isConnected = sessionService.GetContextAccount().teamspeakIdentities?.Count > 0 }); [HttpPost("send"), Authorize] public async Task SendCode([FromBody] JObject body) { - string mode = body["mode"].ToString(); + string mode = body["mode"]?.ToString(); + if (string.IsNullOrEmpty(mode)) { + return BadRequest(new { error = $"Code mode '{mode}' not given" }); + } + + string data = body["data"]?.ToString(); + if (string.IsNullOrEmpty(mode)) { + return BadRequest(new { error = $"Code data '{data}' not given" }); + } + return mode switch { - "teamspeak" => await SendTeamspeakCode(body["data"].ToString()), - _ => BadRequest(new {error = $"Code mode '{mode}' not recognized"}) + "teamspeak" => await SendTeamspeakCode(data), + _ => BadRequest(new { error = $"Code mode '{mode}' not recognized" }) }; } [HttpPost("receive"), Authorize] public async Task ReceiveCode([FromBody] JObject body) { - string mode = body["mode"].ToString(); - string id = body["id"].ToString(); - string code = body["code"].ToString(); - string[] data = body["data"].ToString().Split(','); + string mode = body["mode"]?.ToString(); + if (string.IsNullOrEmpty(mode)) { + return BadRequest(new { error = $"Code mode '{mode}' not given" }); + } + + string id = body["id"]?.ToString(); + if (string.IsNullOrEmpty(id)) { + return BadRequest(new { error = $"Code id '{id}' not given" }); + } + + string code = body["code"]?.ToString(); + if (string.IsNullOrEmpty(code)) { + return BadRequest(new { error = $"Code '{code}' not given" }); + } + + string dataString = body["data"]?.ToString(); + if (string.IsNullOrEmpty(dataString)) { + return BadRequest(new { error = $"Code data '{dataString}' not given" }); + } + + string[] data = dataString.Split(','); return mode switch { "teamspeak" => await ReceiveTeamspeakCode(id, code, data[0]), - _ => BadRequest(new {error = $"Code mode '{mode}' not recognized"}) + _ => BadRequest(new { error = $"Code mode '{mode}' not recognized" }) }; } private async Task SendTeamspeakCode(string teamspeakDbId) { string code = await confirmationCodeService.CreateConfirmationCode(teamspeakDbId); await notificationsService.SendTeamspeakNotification( - new HashSet {teamspeakDbId.ToDouble()}, + new HashSet { teamspeakDbId.ToDouble() }, $"This Teamspeak ID was selected for connection to the website. Copy this code to your clipboard and return to the UKSF website application page to enter the code:\n{code}\nIf this request was not made by you, please contact an admin" ); return Ok(); @@ -66,15 +100,18 @@ private async Task ReceiveTeamspeakCode(string id, string code, s Account account = accountService.Data.GetSingle(id); string teamspeakId = await confirmationCodeService.GetConfirmationCode(code); if (string.IsNullOrWhiteSpace(teamspeakId) || teamspeakId != checkId) { - return BadRequest(new {error = "The confirmation code has expired or is invalid. Please try again"}); + return BadRequest(new { error = "The confirmation code has expired or is invalid. Please try again" }); } - if (account.teamspeakIdentities == null) account.teamspeakIdentities = new HashSet(); + account.teamspeakIdentities ??= new HashSet(); account.teamspeakIdentities.Add(double.Parse(teamspeakId)); await accountService.Data.Update(account.id, Builders.Update.Set("teamspeakIdentities", account.teamspeakIdentities)); account = accountService.Data.GetSingle(account.id); await teamspeakService.UpdateAccountTeamspeakGroups(account); - await notificationsService.SendTeamspeakNotification(new HashSet {teamspeakId.ToDouble()}, $"This teamspeak identity has been linked to the account with email '{account.email}'\nIf this was not done by you, please contact an admin"); + await notificationsService.SendTeamspeakNotification( + new HashSet { teamspeakId.ToDouble() }, + $"This teamspeak identity has been linked to the account with email '{account.email}'\nIf this was not done by you, please contact an admin" + ); LogWrapper.AuditLog(account.id, $"Teamspeak ID {teamspeakId} added for {account.id}"); return Ok(); } diff --git a/UKSF.Api/Controllers/Accounts/PasswordResetController.cs b/UKSF.Api/Controllers/Accounts/PasswordResetController.cs index 16cf2371..61ba2237 100644 --- a/UKSF.Api/Controllers/Accounts/PasswordResetController.cs +++ b/UKSF.Api/Controllers/Accounts/PasswordResetController.cs @@ -14,7 +14,12 @@ namespace UKSF.Api.Controllers.Accounts { public class PasswordResetController : ConfirmationCodeReceiver { private readonly IEmailService emailService; - public PasswordResetController(IConfirmationCodeService confirmationCodeService, ILoginService loginService, IEmailService emailService, IAccountService accountService) : base(confirmationCodeService, loginService, accountService) => this.emailService = emailService; + public PasswordResetController(IConfirmationCodeService confirmationCodeService, ILoginService loginService, IEmailService emailService, IAccountService accountService) : base( + confirmationCodeService, + loginService, + accountService + ) => + this.emailService = emailService; protected override async Task ApplyValidatedPayload(string codePayload, Account account) { await AccountService.Data.Update(account.id, "password", BCrypt.Net.BCrypt.HashPassword(codePayload)); @@ -27,14 +32,15 @@ protected override async Task ApplyValidatedPayload(string codePa [HttpPut] public async Task ResetPassword([FromBody] JObject body) { - Account account = AccountService.Data.GetSingle(x => string.Equals(x.email, body["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); + Account account = AccountService.Data.GetSingle(x => string.Equals(x.email, body["email"]?.ToString(), StringComparison.InvariantCultureIgnoreCase)); if (account == null) { return BadRequest(); } string code = await ConfirmationCodeService.CreateConfirmationCode(account.id); string url = $"https://uk-sf.co.uk/login?validatecode={code}&validatetype={WebUtility.UrlEncode("password reset")}&validateurl={WebUtility.UrlEncode("passwordreset")}"; - string html = $"

UKSF Password Reset


Please reset your password by clicking here." + "

If this request was not made by you seek assistance from UKSF staff.

"; + string html = $"

UKSF Password Reset


Please reset your password by clicking here." + + "

If this request was not made by you seek assistance from UKSF staff.

"; emailService.SendEmail(account.email, "UKSF Password Reset", html); LogWrapper.AuditLog(account.id, $"Password reset request made for {account.id}"); return Ok(LoginToken); diff --git a/UKSF.Integrations/Controllers/DiscordController.cs b/UKSF.Api/Controllers/DiscordConnectionController.cs similarity index 84% rename from UKSF.Integrations/Controllers/DiscordController.cs rename to UKSF.Api/Controllers/DiscordConnectionController.cs index 60e37fbe..e5fdb80e 100644 --- a/UKSF.Integrations/Controllers/DiscordController.cs +++ b/UKSF.Api/Controllers/DiscordConnectionController.cs @@ -12,9 +12,9 @@ using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; -namespace UKSF.Integrations.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]")] - public class DiscordController : Controller { + public class DiscordConnectionController : Controller { private readonly string botToken; private readonly string clientId; private readonly string clientSecret; @@ -23,31 +23,34 @@ public class DiscordController : Controller { private readonly string url; private readonly string urlReturn; - public DiscordController(IConfirmationCodeService confirmationCodeService, IConfiguration configuration, IHostEnvironment currentEnvironment) { + public DiscordConnectionController(IConfirmationCodeService confirmationCodeService, IConfiguration configuration, IHostEnvironment currentEnvironment) { this.confirmationCodeService = confirmationCodeService; clientId = configuration.GetSection("Discord")["clientId"]; clientSecret = configuration.GetSection("Discord")["clientSecret"]; botToken = configuration.GetSection("Discord")["botToken"]; - url = currentEnvironment.IsDevelopment() ? "http://localhost:5100" : "https://integrations.uk-sf.co.uk"; + url = currentEnvironment.IsDevelopment() ? "http://localhost:5000" : "https://uk-sf.co.uk"; urlReturn = currentEnvironment.IsDevelopment() ? "http://localhost:4200" : "https://uk-sf.co.uk"; } [HttpGet] public IActionResult Get() => - Redirect($"https://discord.com/api/oauth2/authorize?client_id={clientId}&redirect_uri={HttpUtility.UrlEncode($"{url}/discord/success")}&response_type=code&scope=identify%20guilds.join"); + Redirect( + $"https://discord.com/api/oauth2/authorize?client_id={clientId}&redirect_uri={HttpUtility.UrlEncode($"{url}/discordconnection/success")}&response_type=code&scope=identify%20guilds.join" + ); [HttpGet("application")] public IActionResult GetFromApplication() => Redirect( - $"https://discord.com/api/oauth2/authorize?client_id={clientId}&redirect_uri={HttpUtility.UrlEncode($"{url}/discord/success/application")}&response_type=code&scope=identify%20guilds.join" + $"https://discord.com/api/oauth2/authorize?client_id={clientId}&redirect_uri={HttpUtility.UrlEncode($"{url}/discordconnection/success/application")}&response_type=code&scope=identify%20guilds.join" ); [HttpGet("success")] - public async Task Success([FromQuery] string code) => Redirect($"{urlReturn}/profile?{await GetUrlParameters(code, $"{url}/discord/success")}"); + public async Task Success([FromQuery] string code) => Redirect($"{urlReturn}/profile?{await GetUrlParameters(code, $"{url}/discordconnection/success")}"); [HttpGet("success/application")] - public async Task SuccessFromApplication([FromQuery] string code) => Redirect($"{urlReturn}/application?{await GetUrlParameters(code, $"{url}/discord/success/application")}"); + public async Task SuccessFromApplication([FromQuery] string code) => + Redirect($"{urlReturn}/application?{await GetUrlParameters(code, $"{url}/discordconnection/success/application")}"); private async Task GetUrlParameters(string code, string redirectUrl) { using HttpClient client = new HttpClient(); diff --git a/UKSF.Integrations/Controllers/SteamController.cs b/UKSF.Api/Controllers/SteamConnectionController.cs similarity index 53% rename from UKSF.Integrations/Controllers/SteamController.cs rename to UKSF.Api/Controllers/SteamConnectionController.cs index d6d6d558..c4ed91c3 100644 --- a/UKSF.Integrations/Controllers/SteamController.cs +++ b/UKSF.Api/Controllers/SteamConnectionController.cs @@ -1,39 +1,40 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Hosting; using UKSF.Api.Interfaces.Utility; -namespace UKSF.Integrations.Controllers { +namespace UKSF.Api.Controllers { [Route("[controller]")] - public class SteamController : Controller { + public class SteamConnectionController : Controller { private readonly IConfirmationCodeService confirmationCodeService; private readonly string url; private readonly string urlReturn; - public SteamController(IConfirmationCodeService confirmationCodeService, IHostEnvironment currentEnvironment) { + public SteamConnectionController(IConfirmationCodeService confirmationCodeService, IHostEnvironment currentEnvironment) { this.confirmationCodeService = confirmationCodeService; - url = currentEnvironment.IsDevelopment() ? "http://localhost:5100" : "https://integrations.uk-sf.co.uk"; + url = currentEnvironment.IsDevelopment() ? "http://localhost:5000" : "https://uk-sf.co.uk"; urlReturn = currentEnvironment.IsDevelopment() ? "http://localhost:4200" : "https://uk-sf.co.uk"; } [HttpGet] - public IActionResult Get() => Challenge(new AuthenticationProperties {RedirectUri = $"{url}/steam/success"}, "Steam"); + public IActionResult Get() => Challenge(new AuthenticationProperties { RedirectUri = $"{url}/steamconnection/success" }, "Steam"); [HttpGet("application")] - public IActionResult GetFromApplication() => Challenge(new AuthenticationProperties {RedirectUri = $"{url}/steam/success/application"}, "Steam"); + public IActionResult GetFromApplication() => Challenge(new AuthenticationProperties { RedirectUri = $"{url}/steamconnection/success/application" }, "Steam"); [HttpGet("success")] - public async Task Success() => Redirect($"{urlReturn}/profile?{await GetUrlParameters()}"); + public async Task Success([FromQuery] string id) => Redirect($"{urlReturn}/profile?{await GetUrlParameters(id)}"); [HttpGet("success/application")] - public async Task SuccessFromApplication() => Redirect($"{urlReturn}/application?{await GetUrlParameters()}"); + public async Task SuccessFromApplication([FromQuery] string id) => Redirect($"{urlReturn}/application?{await GetUrlParameters(id)}"); + + private async Task GetUrlParameters(string id) { + if (string.IsNullOrEmpty(id)) { + return "steamid=fail"; + } - private async Task GetUrlParameters() { - string[] idParts = HttpContext.User.Claims.First(claim => claim.Type == "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier").Value.Split('/'); - string id = idParts[^1]; string code = await confirmationCodeService.CreateConfirmationCode(id); return $"validation={code}&steamid={id}"; } diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index a9642591..ad46fb51 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -1,6 +1,9 @@ using System; +using System.Linq; using System.Text; using System.Threading.Tasks; +using AspNet.Security.OpenId; +using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; @@ -48,7 +51,7 @@ public void ConfigureServices(IServiceCollection services) { builder => { builder.AllowAnyMethod() .AllowAnyHeader() - .WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://integrations.uk-sf.co.uk") + .WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://uk-sf.co.uk") .AllowCredentials(); } ) @@ -58,6 +61,7 @@ public void ConfigureServices(IServiceCollection services) { options => { options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; + options.DefaultSignInScheme = CookieAuthenticationDefaults.AuthenticationScheme; } ) .AddJwtBearer( @@ -84,6 +88,24 @@ public void ConfigureServices(IServiceCollection services) { context.Token = accessToken; } + return Task.CompletedTask; + } + }; + } + ) + .AddCookie() + .AddSteam( + options => { + options.ForwardAuthenticate = JwtBearerDefaults.AuthenticationScheme; + options.Events = new OpenIdAuthenticationEvents { + OnAccessDenied = context => { + context.Response.StatusCode = 401; + return Task.CompletedTask; + }, + OnTicketReceived = context => { + string[] idParts = context.Principal.Claims.First(claim => claim.Type == "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier").Value.Split('/'); + string id = idParts[^1]; + context.ReturnUri = $"{context.ReturnUri}?id={id}"; return Task.CompletedTask; } }; @@ -99,7 +121,7 @@ public void ConfigureServices(IServiceCollection services) { public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostApplicationLifetime) { hostApplicationLifetime.ApplicationStopping.Register(OnShutdown); app.UseStaticFiles(); - app.UseCookiePolicy(new CookiePolicyOptions {MinimumSameSitePolicy = SameSiteMode.Lax}); + app.UseCookiePolicy(new CookiePolicyOptions { MinimumSameSitePolicy = SameSiteMode.Lax }); app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF API v1"); }); app.UseRouting(); diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index 8579686d..a67f59e7 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -20,7 +20,9 @@ + + diff --git a/UKSF.Api/appsettings.json b/UKSF.Api/appsettings.json index 3b346721..5c6108f1 100644 --- a/UKSF.Api/appsettings.json +++ b/UKSF.Api/appsettings.json @@ -10,5 +10,10 @@ "EmailSettings": { "username": "", "password": "" + }, + "Discord": { + "clientId": "", + "clientSecret": "", + "botToken": "" } } diff --git a/UKSF.Integrations/AppStart/RegisterAndWarmCachedData.cs b/UKSF.Integrations/AppStart/RegisterAndWarmCachedData.cs deleted file mode 100644 index 49605745..00000000 --- a/UKSF.Integrations/AppStart/RegisterAndWarmCachedData.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Services.Utility; - -namespace UKSF.Integrations.AppStart { - public static class RegisterAndWarmCachedData { - public static void Warm() { - IServiceProvider serviceProvider = Global.ServiceProvider; - - IAccountDataService accountDataService = serviceProvider.GetService(); - IRanksDataService ranksDataService = serviceProvider.GetService(); - IVariablesDataService variablesDataService = serviceProvider.GetService(); - - DataCacheService dataCacheService = serviceProvider.GetService(); - dataCacheService.RegisterCachedDataServices(new HashSet { accountDataService, ranksDataService, variablesDataService }); - dataCacheService.InvalidateCachedData(); - } - } -} diff --git a/UKSF.Integrations/AppStart/RegisterScheduledActions.cs b/UKSF.Integrations/AppStart/RegisterScheduledActions.cs deleted file mode 100644 index cb47d9c5..00000000 --- a/UKSF.Integrations/AppStart/RegisterScheduledActions.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Interfaces.Utility.ScheduledActions; - -namespace UKSF.Integrations.AppStart { - public static class RegisterScheduledActions { - public static void Register() { - IServiceProvider serviceProvider = Global.ServiceProvider; - - IDeleteExpiredConfirmationCodeAction deleteExpiredConfirmationCodeAction = serviceProvider.GetService(); - - IScheduledActionService scheduledActionService = serviceProvider.GetService(); - scheduledActionService.RegisterScheduledActions(new HashSet { deleteExpiredConfirmationCodeAction }); - } - } -} diff --git a/UKSF.Integrations/AppStart/Services/RegisterDataBackedServices.cs b/UKSF.Integrations/AppStart/Services/RegisterDataBackedServices.cs deleted file mode 100644 index 25d5094c..00000000 --- a/UKSF.Integrations/AppStart/Services/RegisterDataBackedServices.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Services.Message; -using UKSF.Api.Services.Personnel; -using UKSF.Api.Services.Utility; - -namespace UKSF.Integrations.AppStart.Services { - public static class DataBackedServiceExtensions { - public static void RegisterDataBackedServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { - // Non-Cached - services.AddTransient(); - services.AddSingleton(); - services.AddTransient(); - - // Cached - services.AddSingleton(); - services.AddTransient(); - } - } -} diff --git a/UKSF.Integrations/AppStart/Services/RegisterDataServices.cs b/UKSF.Integrations/AppStart/Services/RegisterDataServices.cs deleted file mode 100644 index 639f5c99..00000000 --- a/UKSF.Integrations/AppStart/Services/RegisterDataServices.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Data.Admin; -using UKSF.Api.Data.Message; -using UKSF.Api.Data.Personnel; -using UKSF.Api.Data.Utility; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; - -namespace UKSF.Integrations.AppStart.Services { - public static class DataServiceExtensions { - public static void RegisterDataServices(this IServiceCollection services) { - // Non-Cached - services.AddTransient(); - services.AddSingleton(); - services.AddTransient(); - - // Cached - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - } - } -} diff --git a/UKSF.Integrations/AppStart/Services/RegisterEventServices.cs b/UKSF.Integrations/AppStart/Services/RegisterEventServices.cs deleted file mode 100644 index a1af0fe3..00000000 --- a/UKSF.Integrations/AppStart/Services/RegisterEventServices.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Events.Data; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; - -namespace UKSF.Integrations.AppStart.Services { - public static class EventServiceExtensions { - public static void RegisterEventServices(this IServiceCollection services) { - // Event Buses - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - - // Event Handlers - } - } -} diff --git a/UKSF.Integrations/AppStart/Services/RegisterScheduledActionServices.cs b/UKSF.Integrations/AppStart/Services/RegisterScheduledActionServices.cs deleted file mode 100644 index f0497cd8..00000000 --- a/UKSF.Integrations/AppStart/Services/RegisterScheduledActionServices.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Interfaces.Utility.ScheduledActions; -using UKSF.Api.Services.Utility.ScheduledActions; - -namespace UKSF.Integrations.AppStart.Services { - public static class ScheduledActionServiceExtensions { - public static void RegisterScheduledActionServices(this IServiceCollection services) { - services.AddTransient(); - } - } -} diff --git a/UKSF.Integrations/AppStart/Services/ServiceExtensions.cs b/UKSF.Integrations/AppStart/Services/ServiceExtensions.cs deleted file mode 100644 index f475ffbd..00000000 --- a/UKSF.Integrations/AppStart/Services/ServiceExtensions.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using UKSF.Api.Data; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Services; -using UKSF.Api.Services.Personnel; -using UKSF.Api.Services.Utility; - -namespace UKSF.Integrations.AppStart.Services { - public static class ServiceExtensions { - public static void RegisterServices(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { - // Base - services.AddSingleton(configuration); - services.AddSingleton(currentEnvironment); - services.AddSingleton(); - services.AddSingleton(); - - // Data common - services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); - services.AddTransient(); - services.AddSingleton(); - - // Events & Data - services.RegisterEventServices(); - services.RegisterDataServices(); - services.RegisterDataBackedServices(currentEnvironment); - - // Scheduled action services - services.AddSingleton(); - services.RegisterScheduledActionServices(); - - // Services - services.AddTransient(); - - services.AddSingleton(); - } - } -} diff --git a/UKSF.Integrations/AppStart/StartServices.cs b/UKSF.Integrations/AppStart/StartServices.cs deleted file mode 100644 index 02b5fe54..00000000 --- a/UKSF.Integrations/AppStart/StartServices.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Events; -using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Services.Admin; - -namespace UKSF.Integrations.AppStart { - public static class StartServices { - public static void Start() { - IServiceProvider serviceProvider = Global.ServiceProvider; - - // Warm cached data services - RegisterAndWarmCachedData.Warm(); - - // Register scheduled actions - RegisterScheduledActions.Register(); - - // Start scheduler - serviceProvider.GetService().LoadIntegrations(); - } - } -} diff --git a/UKSF.Integrations/Global.cs b/UKSF.Integrations/Global.cs deleted file mode 100644 index a8335e77..00000000 --- a/UKSF.Integrations/Global.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System; - -namespace UKSF.Integrations { - public static class Global { - public static IServiceProvider ServiceProvider; - } -} diff --git a/UKSF.Integrations/Program.cs b/UKSF.Integrations/Program.cs deleted file mode 100644 index eb5d6e8f..00000000 --- a/UKSF.Integrations/Program.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Net; -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Hosting.WindowsServices; -using Microsoft.Extensions.Hosting; - -namespace UKSF.Integrations { - internal static class Program { - private static void Main(string[] args) { - AppDomain.CurrentDomain.GetAssemblies() - .ToList() - .SelectMany(x => x.GetReferencedAssemblies()) - .Distinct() - .Where(y => AppDomain.CurrentDomain.GetAssemblies().ToList().Any(a => a.FullName == y.FullName) == false) - .ToList() - .ForEach(x => AppDomain.CurrentDomain.GetAssemblies().ToList().Add(AppDomain.CurrentDomain.Load(x))); - - string environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); - bool isDevelopment = environment == Environments.Development; - - if (isDevelopment) { - BuildDebugWebHost(args).Run(); - } else { - InitLogging(); - BuildProductionWebHost(args).RunAsService(); - } - } - - private static IWebHost BuildDebugWebHost(string[] args) => WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel().UseContentRoot(Directory.GetCurrentDirectory()).UseUrls("http://*:5100").UseIISIntegration().Build(); - - private static IWebHost BuildProductionWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup() - .UseKestrel( - options => { - options.Listen(IPAddress.Loopback, 5100); - options.Listen(IPAddress.Loopback, 5101, listenOptions => { listenOptions.UseHttps("C:\\ProgramData\\win-acme\\httpsacme-v01.api.letsencrypt.org\\uk-sf.co.uk-all.pfx"); }); - } - ) - .UseContentRoot(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule?.FileName)) - .UseIISIntegration() - .Build(); - - private static void InitLogging() { - string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSF.Integrations"); - Directory.CreateDirectory(appData); - string[] logFiles = new DirectoryInfo(appData).EnumerateFiles("*.log").OrderByDescending(file => file.LastWriteTime).Select(file => file.Name).ToArray(); - if (logFiles.Length > 9) { - File.Delete(Path.Combine(appData, logFiles.Last())); - } - - string logFile = Path.Combine(appData, $"LOG__{DateTime.Now:yyyy-MM-dd__HH-mm}.log"); - try { - File.Create(logFile).Close(); - } catch (Exception e) { - Console.WriteLine($"Log file not created: {logFile}. {e.Message}"); - } - - FileStream fileStream = new FileStream(logFile, FileMode.Create); - StreamWriter streamWriter = new StreamWriter(fileStream) {AutoFlush = true}; - Console.SetOut(streamWriter); - Console.SetError(streamWriter); - } - } -} diff --git a/UKSF.Integrations/Properties/launchSettings.json b/UKSF.Integrations/Properties/launchSettings.json deleted file mode 100644 index f9c295d7..00000000 --- a/UKSF.Integrations/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:61506/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "UKSF.Integrations": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:61507/" - } - } -} diff --git a/UKSF.Integrations/Startup.cs b/UKSF.Integrations/Startup.cs deleted file mode 100644 index 14bffe9f..00000000 --- a/UKSF.Integrations/Startup.cs +++ /dev/null @@ -1,67 +0,0 @@ -using Microsoft.AspNetCore.Authentication.Cookies; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.HttpOverrides; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using Microsoft.OpenApi.Models; -using UKSF.Api.Services; -using UKSF.Api.Services.Common; -using UKSF.Integrations.AppStart; -using UKSF.Integrations.AppStart.Services; - -namespace UKSF.Integrations { - public class Startup { - private readonly IConfiguration configuration; - private readonly IHostEnvironment currentEnvironment; - - public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration) { - this.configuration = configuration; - this.currentEnvironment = currentEnvironment; - IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); - builder.Build(); - } - - public void ConfigureServices(IServiceCollection services) { - services.RegisterServices(configuration, currentEnvironment); - - services.AddCors( - options => options.AddPolicy( - "CorsPolicy", - builder => { - builder.AllowAnyMethod().AllowAnyHeader().WithOrigins("http://localhost:4200", "http://localhost:5100", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk").AllowCredentials(); - } - ) - ); - services.AddAuthentication(options => { options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme; }).AddCookie().AddSteam(); - - services.AddControllers(); - services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo { Title = "UKSF Integrations API", Version = "v1" }); }); - services.AddMvc(options => { options.Filters.Add(); }).AddNewtonsoftJson(); - } - - // ReSharper disable once UnusedMember.Global - public void Configure(IApplicationBuilder app, IHostEnvironment env) { - if (env.IsDevelopment()) { - app.UseDeveloperExceptionPage(); - } - - app.UseCookiePolicy(new CookiePolicyOptions { MinimumSameSitePolicy = SameSiteMode.Lax }); - app.UseSwagger(); - app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF Integrations API v1"); }); - app.UseRouting(); - app.UseCors("CorsPolicy"); - app.UseAuthentication(); - app.UseAuthorization(); - app.UseHsts(); - app.UseForwardedHeaders(new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto }); - app.UseEndpoints(endpoints => { endpoints.MapControllers().RequireCors("CorsPolicy"); }); - - Global.ServiceProvider = app.ApplicationServices; - ServiceWrapper.ServiceProvider = Global.ServiceProvider; - - StartServices.Start(); - } - } -} diff --git a/UKSF.Integrations/UKSF.Integrations.csproj b/UKSF.Integrations/UKSF.Integrations.csproj deleted file mode 100644 index d219493d..00000000 --- a/UKSF.Integrations/UKSF.Integrations.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - netcoreapp3.1 - Exe - win7-x64 - UKSF.Integrations - disable - - - bin\Debug\ - - - - - - - - - - - - - - diff --git a/UKSF.Integrations/appsettings.json b/UKSF.Integrations/appsettings.json deleted file mode 100644 index fdd87f4d..00000000 --- a/UKSF.Integrations/appsettings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "ConnectionStrings": { - "database": "" - }, - "Discord": { - "clientId": "", - "clientSecret": "", - "botToken": "" - } -} diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index 8138daae..cd7a3f86 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -21,7 +21,6 @@ // ranks // roles // scheduledJobs -// scheduledJobsIntegrations // teamspeakSnapshots // units // variables diff --git a/UKSF.Tests/testdata/scheduledJobsIntegrations.json b/UKSF.Tests/testdata/scheduledJobsIntegrations.json deleted file mode 100644 index c39f2c33..00000000 --- a/UKSF.Tests/testdata/scheduledJobsIntegrations.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "_id": { - "$oid": "5e5419a5df1b9d802cb3dd19" - }, - "action": "DeleteExpiredConfirmationCode", - "actionParameters": "[\"5e5419a4df1b9d802cb3dd18\"]", - "interval": "00:00:00", - "next": { - "$date": "2020-02-24T19:14:53.008Z" - }, - "repeat": false, - "type": 0 -} From 06dd205ac2020cd5e33374bb3ca2f62f8444f232 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 25 May 2020 13:57:55 +0100 Subject: [PATCH 158/369] Use API URL for connection redirect --- UKSF.Api/Controllers/DiscordConnectionController.cs | 2 +- UKSF.Api/Controllers/SteamConnectionController.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UKSF.Api/Controllers/DiscordConnectionController.cs b/UKSF.Api/Controllers/DiscordConnectionController.cs index e5fdb80e..ed59d454 100644 --- a/UKSF.Api/Controllers/DiscordConnectionController.cs +++ b/UKSF.Api/Controllers/DiscordConnectionController.cs @@ -29,7 +29,7 @@ public DiscordConnectionController(IConfirmationCodeService confirmationCodeServ clientSecret = configuration.GetSection("Discord")["clientSecret"]; botToken = configuration.GetSection("Discord")["botToken"]; - url = currentEnvironment.IsDevelopment() ? "http://localhost:5000" : "https://uk-sf.co.uk"; + url = currentEnvironment.IsDevelopment() ? "http://localhost:5000" : "https://api.uk-sf.co.uk"; urlReturn = currentEnvironment.IsDevelopment() ? "http://localhost:4200" : "https://uk-sf.co.uk"; } diff --git a/UKSF.Api/Controllers/SteamConnectionController.cs b/UKSF.Api/Controllers/SteamConnectionController.cs index c4ed91c3..be20f660 100644 --- a/UKSF.Api/Controllers/SteamConnectionController.cs +++ b/UKSF.Api/Controllers/SteamConnectionController.cs @@ -14,7 +14,7 @@ public class SteamConnectionController : Controller { public SteamConnectionController(IConfirmationCodeService confirmationCodeService, IHostEnvironment currentEnvironment) { this.confirmationCodeService = confirmationCodeService; - url = currentEnvironment.IsDevelopment() ? "http://localhost:5000" : "https://uk-sf.co.uk"; + url = currentEnvironment.IsDevelopment() ? "http://localhost:5000" : "https://api.uk-sf.co.uk"; urlReturn = currentEnvironment.IsDevelopment() ? "http://localhost:4200" : "https://uk-sf.co.uk"; } From 381a7d7632a6495e42c1e2835ee104eaff0a4026 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 28 May 2020 22:21:27 +0100 Subject: [PATCH 159/369] More unit tests - Tests for event handlers - Fixes and better error checking and handling - Added some mission tests --- .../Handlers/AccountEventHandler.cs | 33 +-- .../Handlers/CommandRequestEventHandler.cs | 31 +-- .../Handlers/CommentThreadEventHandler.cs | 41 ++-- UKSF.Api.Events/Handlers/LogEventHandler.cs | 25 ++- .../Handlers/NotificationsEventHandler.cs | 19 +- .../Handlers/TeamspeakEventHandler.cs | 72 ++++--- .../Message/ILoggingService.cs | 1 + UKSF.Api.Services/Admin/MigrationUtility.cs | 4 +- UKSF.Api.Services/Admin/VariablesWrapper.cs | 2 +- .../Common/DisplayNameUtilities.cs | 4 +- UKSF.Api.Services/Common/ServiceWrapper.cs | 2 +- UKSF.Api.Services/Integrations/PipeManager.cs | 18 +- .../Teamspeak/TeamspeakService.cs | 2 +- UKSF.Api.Services/Message/LogWrapper.cs | 8 +- UKSF.Api.Services/Message/LoggingService.cs | 5 + .../Utility/ScheduledActionService.cs | 2 +- .../Controllers/NotificationsController.cs | 4 + UKSF.Api/Program.cs | 2 +- UKSF.Api/Startup.cs | 2 +- UKSF.Common/AsyncLock.cs | 18 ++ UKSF.Common/TaskUtilities.cs | 6 + UKSF.Common/UKSF.Common.csproj | 1 + .../Integration/Data/DataPerformanceTests.cs | 102 +++++----- UKSF.Tests/Unit/Common/AsyncLockTests.cs | 34 ++++ UKSF.Tests/Unit/Data/DataServiceTests.cs | 1 - .../Events/EventHandlerInitialiserTests.cs | 43 ++++ .../Handlers/AccountEventHandlerTests.cs | 93 +++++++++ .../CommandRequestEventHandlerTests.cs | 86 ++++++++ .../CommentThreadEventHandlerTests.cs | 109 ++++++++++ .../Events/Handlers/LogEventHandlerTests.cs | 94 +++++++++ .../NotificationsEventHandlerTests.cs | 104 ++++++++++ .../Handlers/TeamspeakEventHandlerTests.cs | 189 ++++++++++++++++++ .../Unit/Models/Game/MissionFileTests.cs | 17 ++ .../Mission/MissionPatchingReportTests.cs | 37 ++++ .../Unit/Models/Mission/MissionTests.cs | 15 ++ .../Common/DisplayNameUtilitiesTests.cs | 2 +- .../Utility/ScheduledActionServiceTests.cs | 50 +++++ UKSF.Tests/testdata/testmission.Altis.pbo | 0 38 files changed, 1117 insertions(+), 161 deletions(-) create mode 100644 UKSF.Common/AsyncLock.cs create mode 100644 UKSF.Tests/Unit/Common/AsyncLockTests.cs create mode 100644 UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs create mode 100644 UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs create mode 100644 UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs create mode 100644 UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs create mode 100644 UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs create mode 100644 UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs create mode 100644 UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs create mode 100644 UKSF.Tests/Unit/Models/Game/MissionFileTests.cs create mode 100644 UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs create mode 100644 UKSF.Tests/Unit/Models/Mission/MissionTests.cs create mode 100644 UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs create mode 100644 UKSF.Tests/testdata/testmission.Altis.pbo diff --git a/UKSF.Api.Events/Handlers/AccountEventHandler.cs b/UKSF.Api.Events/Handlers/AccountEventHandler.cs index e985c0db..c93a8071 100644 --- a/UKSF.Api.Events/Handlers/AccountEventHandler.cs +++ b/UKSF.Api.Events/Handlers/AccountEventHandler.cs @@ -1,37 +1,42 @@ -using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events.Handlers; using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Message; using UKSF.Api.Models.Events; using UKSF.Api.Signalr.Hubs.Personnel; +using UKSF.Common; namespace UKSF.Api.Events.Handlers { public class AccountEventHandler : IAccountEventHandler { private readonly IAccountDataService accountData; private readonly IHubContext hub; + private readonly ILoggingService loggingService; private readonly IUnitsDataService unitsData; - public AccountEventHandler(IAccountDataService accountData, IUnitsDataService unitsData, IHubContext hub) { + public AccountEventHandler(IAccountDataService accountData, IUnitsDataService unitsData, IHubContext hub, ILoggingService loggingService) { this.accountData = accountData; this.unitsData = unitsData; this.hub = hub; + this.loggingService = loggingService; } public void Init() { - accountData.EventBus() - .Subscribe( - async x => { - if (x.type == DataEventType.UPDATE) await UpdatedEvent(x.id); - } - ); - unitsData.EventBus() - .Subscribe( - async x => { - if (x.type == DataEventType.UPDATE) await UpdatedEvent(x.id); - } - ); + accountData.EventBus().SubscribeAsync(HandleAccountsEvent, exception => loggingService.Log(exception)); + unitsData.EventBus().SubscribeAsync(HandleUnitsEvent, exception => loggingService.Log(exception)); + } + + private async Task HandleAccountsEvent(DataEventModel x) { + if (x.type == DataEventType.UPDATE) { + await UpdatedEvent(x.id); + } + } + + private async Task HandleUnitsEvent(DataEventModel x) { + if (x.type == DataEventType.UPDATE) { + await UpdatedEvent(x.id); + } } private async Task UpdatedEvent(string id) { diff --git a/UKSF.Api.Events/Handlers/CommandRequestEventHandler.cs b/UKSF.Api.Events/Handlers/CommandRequestEventHandler.cs index b9bcd369..17a09a30 100644 --- a/UKSF.Api.Events/Handlers/CommandRequestEventHandler.cs +++ b/UKSF.Api.Events/Handlers/CommandRequestEventHandler.cs @@ -4,33 +4,36 @@ using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events.Handlers; using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Message; using UKSF.Api.Models.Events; using UKSF.Api.Signalr.Hubs.Command; +using UKSF.Common; namespace UKSF.Api.Events.Handlers { public class CommandRequestEventHandler : ICommandRequestEventHandler { private readonly ICommandRequestDataService data; private readonly IHubContext hub; + private readonly ILoggingService loggingService; - public CommandRequestEventHandler(ICommandRequestDataService data, IHubContext hub) { + public CommandRequestEventHandler(ICommandRequestDataService data, IHubContext hub, ILoggingService loggingService) { this.data = data; this.hub = hub; + this.loggingService = loggingService; } public void Init() { - data.EventBus() - .Subscribe( - async x => { - switch (x.type) { - case DataEventType.ADD: - case DataEventType.UPDATE: - await UpdatedEvent(); - break; - case DataEventType.DELETE: break; - default: throw new ArgumentOutOfRangeException(); - } - } - ); + data.EventBus().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + } + + private async Task HandleEvent(DataEventModel x) { + switch (x.type) { + case DataEventType.ADD: + case DataEventType.UPDATE: + await UpdatedEvent(); + break; + case DataEventType.DELETE: break; + default: throw new ArgumentOutOfRangeException(); + } } private async Task UpdatedEvent() { diff --git a/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs b/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs index 22616787..12021b7f 100644 --- a/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs +++ b/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs @@ -8,35 +8,42 @@ using UKSF.Api.Models.Events; using UKSF.Api.Models.Message; using UKSF.Api.Signalr.Hubs.Message; +using UKSF.Common; namespace UKSF.Api.Events.Handlers { public class CommentThreadEventHandler : ICommentThreadEventHandler { - private readonly IHubContext hub; private readonly ICommentThreadService commentThreadService; private readonly ICommentThreadDataService data; + private readonly IHubContext hub; + private readonly ILoggingService loggingService; - public CommentThreadEventHandler(ICommentThreadDataService data, IHubContext hub, ICommentThreadService commentThreadService) { + public CommentThreadEventHandler( + ICommentThreadDataService data, + IHubContext hub, + ICommentThreadService commentThreadService, + ILoggingService loggingService + ) { this.data = data; this.hub = hub; this.commentThreadService = commentThreadService; + this.loggingService = loggingService; } public void Init() { - data.EventBus() - .Subscribe( - async x => { - switch (x.type) { - case DataEventType.ADD: - await AddedEvent(x.id, x.data as Comment); - break; - case DataEventType.DELETE: - await DeletedEvent(x.id, x.data as Comment); - break; - case DataEventType.UPDATE: break; - default: throw new ArgumentOutOfRangeException(); - } - } - ); + data.EventBus().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + } + + private async Task HandleEvent(DataEventModel x) { + switch (x.type) { + case DataEventType.ADD: + await AddedEvent(x.id, x.data as Comment); + break; + case DataEventType.DELETE: + await DeletedEvent(x.id, x.data as Comment); + break; + case DataEventType.UPDATE: break; + default: throw new ArgumentOutOfRangeException(); + } } private async Task AddedEvent(string id, Comment comment) { diff --git a/UKSF.Api.Events/Handlers/LogEventHandler.cs b/UKSF.Api.Events/Handlers/LogEventHandler.cs index 0929d14d..c04d7467 100644 --- a/UKSF.Api.Events/Handlers/LogEventHandler.cs +++ b/UKSF.Api.Events/Handlers/LogEventHandler.cs @@ -4,27 +4,32 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events.Handlers; using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Message; using UKSF.Api.Models.Events; using UKSF.Api.Models.Message.Logging; using UKSF.Api.Signalr.Hubs.Utility; +using UKSF.Common; namespace UKSF.Api.Events.Handlers { public class LogEventHandler : ILogEventHandler { private readonly ILogDataService data; private readonly IHubContext hub; + private readonly ILoggingService loggingService; - public LogEventHandler(ILogDataService data, IHubContext hub) { + public LogEventHandler(ILogDataService data, IHubContext hub, ILoggingService loggingService) { this.data = data; this.hub = hub; + this.loggingService = loggingService; } public void Init() { - data.EventBus() - .Subscribe( - async x => { - if (x.type == DataEventType.ADD) await AddedEvent(x.data); - } - ); + data.EventBus().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + } + + private async Task HandleEvent(DataEventModel x) { + if (x.type == DataEventType.ADD) { + await AddedEvent(x.data); + } } private async Task AddedEvent(object log) { @@ -38,10 +43,10 @@ private async Task AddedEvent(object log) { case WebLogMessage message: await hub.Clients.All.ReceiveErrorLog(message); break; - default: - BasicLogMessage basicLogMessage = log as BasicLogMessage; - await hub.Clients.All.ReceiveLog(basicLogMessage); + case BasicLogMessage message: + await hub.Clients.All.ReceiveLog(message); break; + default: throw new ArgumentOutOfRangeException(nameof(log), "Log type is not valid"); } } } diff --git a/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs b/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs index df1694f4..379cf0c7 100644 --- a/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs +++ b/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs @@ -4,27 +4,32 @@ using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events.Handlers; using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Message; using UKSF.Api.Models.Events; using UKSF.Api.Models.Message; using UKSF.Api.Signalr.Hubs.Message; +using UKSF.Common; namespace UKSF.Api.Events.Handlers { public class NotificationsEventHandler : INotificationsEventHandler { private readonly INotificationsDataService data; private readonly IHubContext hub; + private readonly ILoggingService loggingService; - public NotificationsEventHandler(INotificationsDataService data, IHubContext hub) { + public NotificationsEventHandler(INotificationsDataService data, IHubContext hub, ILoggingService loggingService) { this.data = data; this.hub = hub; + this.loggingService = loggingService; } public void Init() { - data.EventBus() - .Subscribe( - async x => { - if (x.type == DataEventType.ADD) await AddedEvent(x.data as Notification); - } - ); + data.EventBus().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + } + + private async Task HandleEvent(DataEventModel x) { + if (x.type == DataEventType.ADD) { + await AddedEvent(x.data as Notification); + } } private async Task AddedEvent(Notification notification) { diff --git a/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs b/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs index a1584a39..9f53e6a3 100644 --- a/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs +++ b/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs @@ -7,42 +7,49 @@ using UKSF.Api.Interfaces.Events; using UKSF.Api.Interfaces.Events.Handlers; using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Models.Events; using UKSF.Api.Models.Events.Types; using UKSF.Api.Models.Integrations; using UKSF.Api.Models.Personnel; +using UKSF.Common; namespace UKSF.Api.Events.Handlers { public class TeamspeakEventHandler : ITeamspeakEventHandler { - private readonly ISignalrEventBus eventBus; - private readonly ITeamspeakService teamspeakService; + private readonly AsyncLock mutex = new AsyncLock(); private readonly IAccountService accountService; - private readonly ITeamspeakGroupService teamspeakGroupService; + private readonly ISignalrEventBus eventBus; + private readonly ILoggingService loggingService; private readonly Dictionary serverGroupUpdates = new Dictionary(); + private readonly ITeamspeakGroupService teamspeakGroupService; + private readonly ITeamspeakService teamspeakService; - public TeamspeakEventHandler(ISignalrEventBus eventBus, ITeamspeakService teamspeakService, IAccountService accountService, ITeamspeakGroupService teamspeakGroupService) { + public TeamspeakEventHandler( + ISignalrEventBus eventBus, + ITeamspeakService teamspeakService, + IAccountService accountService, + ITeamspeakGroupService teamspeakGroupService, + ILoggingService loggingService + ) { this.eventBus = eventBus; this.teamspeakService = teamspeakService; this.accountService = accountService; this.teamspeakGroupService = teamspeakGroupService; + this.loggingService = loggingService; } public void Init() { - eventBus.AsObservable() - .Subscribe( - async x => { await HandleEvent(x); } - ); + eventBus.AsObservable().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); } - private async Task HandleEvent(SignalrEventModel eventModel) { - string args = eventModel.args.ToString(); - switch (eventModel.procedure) { + private async Task HandleEvent(SignalrEventModel x) { + switch (x.procedure) { case TeamspeakEventType.CLIENTS: - await UpdateClients(args); + await UpdateClients(x.args.ToString()); break; case TeamspeakEventType.CLIENT_SERVER_GROUPS: - UpdateClientServerGroups(args); + await UpdateClientServerGroups(x.args.ToString()); break; case TeamspeakEventType.EMPTY: break; default: throw new ArgumentOutOfRangeException(); @@ -50,35 +57,54 @@ private async Task HandleEvent(SignalrEventModel eventModel) { } private async Task UpdateClients(string args) { - Console.Out.WriteLine(args); + await Console.Out.WriteLineAsync(args); JArray clientsArray = JArray.Parse(args); if (clientsArray.Count == 0) return; + HashSet clients = clientsArray.ToObject>(); - Console.WriteLine("Updating online clients"); + await Console.Out.WriteLineAsync("Updating online clients"); await teamspeakService.UpdateClients(clients); } - private void UpdateClientServerGroups(string args) { + private async Task UpdateClientServerGroups(string args) { JObject updateObject = JObject.Parse(args); double clientDbid = double.Parse(updateObject["clientDbid"].ToString()); double serverGroupId = double.Parse(updateObject["serverGroupId"].ToString()); - Console.WriteLine($"Server group for {clientDbid}: {serverGroupId}"); + await Console.Out.WriteLineAsync($"Server group for {clientDbid}: {serverGroupId}"); - lock (serverGroupUpdates) { + // lock (serverGroupUpdates) { + // if (!serverGroupUpdates.ContainsKey(clientDbid)) { + // serverGroupUpdates.Add(clientDbid, new TeamspeakServerGroupUpdate()); + // } + // + // TeamspeakServerGroupUpdate update = serverGroupUpdates[clientDbid]; + // + // update.serverGroups.Add(serverGroupId); + // update.cancellationTokenSource?.Cancel(); + // update.cancellationTokenSource = new CancellationTokenSource(); + // TaskUtilities.DelayWithCallback(TimeSpan.FromMilliseconds(500), update.cancellationTokenSource.Token, () => ); + // // if (!update.cancellationTokenSource.IsCancellationRequested) { + // // update.cancellationTokenSource.Cancel(); + // // + // // } + // } + + using (await mutex.LockAsync()) { if (!serverGroupUpdates.ContainsKey(clientDbid)) { serverGroupUpdates.Add(clientDbid, new TeamspeakServerGroupUpdate()); } TeamspeakServerGroupUpdate update = serverGroupUpdates[clientDbid]; + update.serverGroups.Add(serverGroupId); update.cancellationTokenSource?.Cancel(); update.cancellationTokenSource = new CancellationTokenSource(); - Task.Run( + Task unused = Task.Run( async () => { await Task.Delay(TimeSpan.FromMilliseconds(500), update.cancellationTokenSource.Token); if (!update.cancellationTokenSource.IsCancellationRequested) { update.cancellationTokenSource.Cancel(); - ProcessAccountData(clientDbid, update.serverGroups); + await ProcessAccountData(clientDbid, update.serverGroups); } }, update.cancellationTokenSource.Token @@ -86,12 +112,12 @@ private void UpdateClientServerGroups(string args) { } } - private void ProcessAccountData(double clientDbId, ICollection serverGroups) { - Console.WriteLine($"Processing server groups for {clientDbId}"); + private async Task ProcessAccountData(double clientDbId, ICollection serverGroups) { + await Console.Out.WriteLineAsync($"Processing server groups for {clientDbId}"); Account account = accountService.Data.GetSingle(x => x.teamspeakIdentities != null && x.teamspeakIdentities.Any(y => y.Equals(clientDbId))); Task unused = teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); - lock (serverGroupUpdates) { + using (await mutex.LockAsync()) { serverGroupUpdates.Remove(clientDbId); } } diff --git a/UKSF.Api.Interfaces/Message/ILoggingService.cs b/UKSF.Api.Interfaces/Message/ILoggingService.cs index 8e360d08..3924dbca 100644 --- a/UKSF.Api.Interfaces/Message/ILoggingService.cs +++ b/UKSF.Api.Interfaces/Message/ILoggingService.cs @@ -7,5 +7,6 @@ public interface ILoggingService : IDataBackedService { void Log(string message); void Log(BasicLogMessage log); void Log(Exception exception); + void Log(string userId, string message); } } diff --git a/UKSF.Api.Services/Admin/MigrationUtility.cs b/UKSF.Api.Services/Admin/MigrationUtility.cs index 3e4ffcca..9b65c4bf 100644 --- a/UKSF.Api.Services/Admin/MigrationUtility.cs +++ b/UKSF.Api.Services/Admin/MigrationUtility.cs @@ -46,11 +46,11 @@ public void Migrate() { // TODO: CHECK BEFORE RELEASE private static void ExecuteMigration() { - IDataCollectionFactory dataCollectionFactory = ServiceWrapper.ServiceProvider.GetService(); + IDataCollectionFactory dataCollectionFactory = ServiceWrapper.Provider.GetService(); IDataCollection oldDataCollection = dataCollectionFactory.CreateDataCollection("scheduledJobs"); List oldScheduledJobs = oldDataCollection.Get(); - ISchedulerDataService schedulerDataService = ServiceWrapper.ServiceProvider.GetService(); + ISchedulerDataService schedulerDataService = ServiceWrapper.Provider.GetService(); foreach (ScheduledJob newScheduledJob in oldScheduledJobs.Select( oldScheduledJob => new ScheduledJob { diff --git a/UKSF.Api.Services/Admin/VariablesWrapper.cs b/UKSF.Api.Services/Admin/VariablesWrapper.cs index 4c821fd9..f47a0c12 100644 --- a/UKSF.Api.Services/Admin/VariablesWrapper.cs +++ b/UKSF.Api.Services/Admin/VariablesWrapper.cs @@ -6,6 +6,6 @@ namespace UKSF.Api.Services.Admin { [ExcludeFromCodeCoverage] public static class VariablesWrapper { - public static IVariablesDataService VariablesDataService() => ServiceWrapper.ServiceProvider.GetService(); + public static IVariablesDataService VariablesDataService() => ServiceWrapper.Provider.GetService(); } } diff --git a/UKSF.Api.Services/Common/DisplayNameUtilities.cs b/UKSF.Api.Services/Common/DisplayNameUtilities.cs index e191bb95..46387ede 100644 --- a/UKSF.Api.Services/Common/DisplayNameUtilities.cs +++ b/UKSF.Api.Services/Common/DisplayNameUtilities.cs @@ -12,8 +12,8 @@ public static string ConvertObjectIds(this string message) { string newMessage = message; if (string.IsNullOrEmpty(message)) return newMessage; - IDisplayNameService displayNameService = ServiceWrapper.ServiceProvider.GetService(); - IUnitsService unitsService = ServiceWrapper.ServiceProvider.GetService(); + IDisplayNameService displayNameService = ServiceWrapper.Provider.GetService(); + IUnitsService unitsService = ServiceWrapper.Provider.GetService(); List objectIds = message.ExtractObjectIds().Where(s => s != string.Empty).ToList(); foreach (string objectId in objectIds) { string displayString = displayNameService.GetDisplayName(objectId); diff --git a/UKSF.Api.Services/Common/ServiceWrapper.cs b/UKSF.Api.Services/Common/ServiceWrapper.cs index 91a13286..908977c2 100644 --- a/UKSF.Api.Services/Common/ServiceWrapper.cs +++ b/UKSF.Api.Services/Common/ServiceWrapper.cs @@ -2,6 +2,6 @@ namespace UKSF.Api.Services.Common { public static class ServiceWrapper { - public static IServiceProvider ServiceProvider; + public static IServiceProvider Provider; } } diff --git a/UKSF.Api.Services/Integrations/PipeManager.cs b/UKSF.Api.Services/Integrations/PipeManager.cs index 920d2e1f..47bb70a5 100644 --- a/UKSF.Api.Services/Integrations/PipeManager.cs +++ b/UKSF.Api.Services/Integrations/PipeManager.cs @@ -56,7 +56,7 @@ public void Start() { WriteCheck(); await Task.Delay(TimeSpan.FromMilliseconds(1)); } catch (Exception exception) { - Console.WriteLine(exception); + Console.Out.WriteLine(exception); } } } @@ -71,13 +71,13 @@ private void ConnectionCheck() { if (pipeCode != 1) { try { PongTime = DateTime.Now; - Console.WriteLine("Opening pipe"); + Console.Out.WriteLine("Opening pipe"); string result = ExecutePipeFunction(PIPE_COMMAND_OPEN); - Console.WriteLine(result); + Console.Out.WriteLine(result); int.TryParse(result, out pipeCode); serverStarted = pipeCode == 1; } catch (Exception exception) { - Console.WriteLine(exception); + Console.Out.WriteLine(exception); pipeCode = 0; serverStarted = false; } @@ -87,9 +87,9 @@ private void ConnectionCheck() { private static bool PingCheck() { // ExecutePipeFunction($"{PIPE_COMMAND_WRITE}{ProcedureDefinitons.PROC_PING}:"); if ((DateTime.Now - PongTime).Seconds > 10) { - Console.WriteLine("Resetting pipe"); + Console.Out.WriteLine("Resetting pipe"); string result = ExecutePipeFunction(PIPE_COMMAND_RESET); - Console.WriteLine(result); + Console.Out.WriteLine(result); return false; } @@ -102,9 +102,9 @@ private void ReadCheck() { if (string.IsNullOrEmpty(result)) return; switch (result) { case "FALSE": - Console.WriteLine("Closing pipe"); + Console.Out.WriteLine("Closing pipe"); result = ExecutePipeFunction(PIPE_COMMAND_CLOSE); - Console.WriteLine(result); + Console.Out.WriteLine(result); pipeCode = 0; return; case "NULL": @@ -135,7 +135,7 @@ private void WriteCheck() { if (string.IsNullOrEmpty(message)) return; string result = ExecutePipeFunction($"{PIPE_COMMAND_WRITE}{message}"); if (result != "WRITE") { - Console.WriteLine(result); + Console.Out.WriteLine(result); } } } diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs index 6070de50..6b992c92 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs @@ -56,7 +56,7 @@ public async Task SendTeamspeakMessageToClient(IEnumerable clientDbIds, public async Task StoreTeamspeakServerSnapshot() { if (clients.Count == 0) { - Console.WriteLine("No client data for snapshot"); + await Console.Out.WriteLineAsync("No client data for snapshot"); return; } diff --git a/UKSF.Api.Services/Message/LogWrapper.cs b/UKSF.Api.Services/Message/LogWrapper.cs index e6d69811..be76b26c 100644 --- a/UKSF.Api.Services/Message/LogWrapper.cs +++ b/UKSF.Api.Services/Message/LogWrapper.cs @@ -6,12 +6,12 @@ namespace UKSF.Api.Services.Message { public static class LogWrapper { - public static void Log(string message) => ServiceWrapper.ServiceProvider.GetService().Log(message); + public static void Log(string message) => ServiceWrapper.Provider.GetService().Log(message); - public static void Log(BasicLogMessage log) => ServiceWrapper.ServiceProvider.GetService().Log(log); + public static void Log(BasicLogMessage log) => ServiceWrapper.Provider.GetService().Log(log); - public static void Log(Exception exception) => ServiceWrapper.ServiceProvider.GetService().Log(exception); + public static void Log(Exception exception) => ServiceWrapper.Provider.GetService().Log(exception); - public static void AuditLog(string userId, string message) => Log(new AuditLogMessage {who = userId, level = LogLevel.INFO, message = message}); + public static void AuditLog(string userId, string message) => ServiceWrapper.Provider.GetService().Log(userId, message); } } diff --git a/UKSF.Api.Services/Message/LoggingService.cs b/UKSF.Api.Services/Message/LoggingService.cs index dd418ed2..35b16933 100644 --- a/UKSF.Api.Services/Message/LoggingService.cs +++ b/UKSF.Api.Services/Message/LoggingService.cs @@ -30,6 +30,11 @@ public void Log(Exception exception) { Task unused = LogAsync(exception); } + public void Log(string userId, string message) { + AuditLogMessage log = new AuditLogMessage { who = userId, level = LogLevel.INFO, message = message }; + Log(log); + } + private async Task LogAsync(BasicLogMessage log) => await LogToStorage(log); private async Task LogAsync(Exception exception) => await LogToStorage(new BasicLogMessage(exception)); diff --git a/UKSF.Api.Services/Utility/ScheduledActionService.cs b/UKSF.Api.Services/Utility/ScheduledActionService.cs index 96614569..11a8bcdc 100644 --- a/UKSF.Api.Services/Utility/ScheduledActionService.cs +++ b/UKSF.Api.Services/Utility/ScheduledActionService.cs @@ -9,7 +9,7 @@ public class ScheduledActionService : IScheduledActionService { public void RegisterScheduledActions(HashSet newScheduledActions) { foreach (IScheduledAction scheduledAction in newScheduledActions) { - scheduledActions.Add(scheduledAction.Name, scheduledAction); + scheduledActions[scheduledAction.Name] = scheduledAction; } } diff --git a/UKSF.Api/Controllers/NotificationsController.cs b/UKSF.Api/Controllers/NotificationsController.cs index 7fed020c..6ea8e71b 100644 --- a/UKSF.Api/Controllers/NotificationsController.cs +++ b/UKSF.Api/Controllers/NotificationsController.cs @@ -29,6 +29,10 @@ public async Task MarkAsRead([FromBody] JObject jObject) { public async Task Clear([FromBody] JObject jObject) { JArray clear = JArray.Parse(jObject["clear"].ToString()); List ids = clear.Select(notification => notification["id"].ToString()).ToList(); + if (ids.Count == 0) { + return Ok(); + } + await notificationsService.Delete(ids); return Ok(); } diff --git a/UKSF.Api/Program.cs b/UKSF.Api/Program.cs index 14c11f73..b8ae600b 100644 --- a/UKSF.Api/Program.cs +++ b/UKSF.Api/Program.cs @@ -64,7 +64,7 @@ private static void InitLogging() { try { File.Create(logFile).Close(); } catch (Exception e) { - Console.WriteLine($"Log file not created: {logFile}. {e.Message}"); + Console.Out.WriteLine($"Log file not created: {logFile}. {e.Message}"); } FileStream fileStream = new FileStream(logFile, FileMode.Create); diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index ad46fb51..0e6ae539 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -148,7 +148,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl ); Global.ServiceProvider = app.ApplicationServices; - ServiceWrapper.ServiceProvider = Global.ServiceProvider; + ServiceWrapper.Provider = Global.ServiceProvider; StartServices.Start(); } diff --git a/UKSF.Common/AsyncLock.cs b/UKSF.Common/AsyncLock.cs new file mode 100644 index 00000000..96b186a0 --- /dev/null +++ b/UKSF.Common/AsyncLock.cs @@ -0,0 +1,18 @@ +using System; +using System.Threading; +using System.Threading.Tasks; + +namespace UKSF.Common { + public class AsyncLock : IDisposable { + private readonly SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1, 1); + + public void Dispose() { + semaphoreSlim.Release(); + } + + public async Task LockAsync() { + await semaphoreSlim.WaitAsync(); + return this; + } + } +} diff --git a/UKSF.Common/TaskUtilities.cs b/UKSF.Common/TaskUtilities.cs index 3a0f5898..1cd733ba 100644 --- a/UKSF.Common/TaskUtilities.cs +++ b/UKSF.Common/TaskUtilities.cs @@ -1,4 +1,6 @@ using System; +using System.Reactive.Linq; +using System.Reactive.Threading.Tasks; using System.Threading; using System.Threading.Tasks; @@ -11,5 +13,9 @@ public static async Task Delay(TimeSpan timeSpan, CancellationToken token) { // Ignored } } + + public static void SubscribeAsync(this IObservable source, Func onNext, Action onError) { + source.Select(x => Observable.Defer(() => onNext(x).ToObservable())).Concat().Subscribe(x => { }, onError); + } } } diff --git a/UKSF.Common/UKSF.Common.csproj b/UKSF.Common/UKSF.Common.csproj index 9cc242f9..d726ecb8 100644 --- a/UKSF.Common/UKSF.Common.csproj +++ b/UKSF.Common/UKSF.Common.csproj @@ -7,6 +7,7 @@ + diff --git a/UKSF.Tests/Integration/Data/DataPerformanceTests.cs b/UKSF.Tests/Integration/Data/DataPerformanceTests.cs index d01e29e7..6d7bc605 100644 --- a/UKSF.Tests/Integration/Data/DataPerformanceTests.cs +++ b/UKSF.Tests/Integration/Data/DataPerformanceTests.cs @@ -1,51 +1,51 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FluentAssertions; -using Mongo2Go; -using MongoDB.Bson.Serialization.Conventions; -using MongoDB.Driver; -using UKSF.Api.Data; -using UKSF.Api.Models.Integrations; -using Xunit; -// ReSharper disable UnusedMember.Global - -namespace UKSF.Tests.Unit.Integration.Data { - public class DataPerformanceTests { - private static async Task MongoTest(Func testFunction) { - MongoDbRunner mongoDbRunner = MongoDbRunner.Start(additionalMongodArguments: "--quiet"); - ConventionPack conventionPack = new ConventionPack { new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true) }; - ConventionRegistry.Register("DefaultConventions", conventionPack, t => true); - MongoClient mongoClient = new MongoClient(mongoDbRunner.ConnectionString); - IMongoDatabase database = mongoClient.GetDatabase("tests"); - - try { - await testFunction(mongoDbRunner, database); - } finally { - mongoDbRunner.Dispose(); - } - } - - private static void ImportTestCollection(MongoDbRunner mongoDbRunner, string collectionName) { - mongoDbRunner.Import("tests", collectionName, $"../../../testdata/{collectionName}.json", true); - } - - // This test tests nothing, and is only used for profiling various data retrieval methods - // [Fact] - // public async Task TestGetPerformance() { - // await MongoTest( - // (mongoDbRunner, database) => { - // const string COLLECTION_NAME = "teamspeakSnapshots"; - // ImportTestCollection(mongoDbRunner, COLLECTION_NAME); - // - // DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); - // List subject = dataCollection.Get(x => x.timestamp > DateTime.Parse("2018-08-09T05:00:00.307Z")); - // - // subject.Should().NotBeNull(); - // - // return Task.CompletedTask; - // } - // ); - // } - } -} +// using System; +// using System.Collections.Generic; +// using System.Threading.Tasks; +// using FluentAssertions; +// using Mongo2Go; +// using MongoDB.Bson.Serialization.Conventions; +// using MongoDB.Driver; +// using UKSF.Api.Data; +// using UKSF.Api.Models.Integrations; +// using Xunit; +// // ReSharper disable UnusedMember.Global +// +// namespace UKSF.Tests.Unit.Integration.Data { +// public class DataPerformanceTests { +// private static async Task MongoTest(Func testFunction) { +// MongoDbRunner mongoDbRunner = MongoDbRunner.Start(additionalMongodArguments: "--quiet"); +// ConventionPack conventionPack = new ConventionPack { new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true) }; +// ConventionRegistry.Register("DefaultConventions", conventionPack, t => true); +// MongoClient mongoClient = new MongoClient(mongoDbRunner.ConnectionString); +// IMongoDatabase database = mongoClient.GetDatabase("tests"); +// +// try { +// await testFunction(mongoDbRunner, database); +// } finally { +// mongoDbRunner.Dispose(); +// } +// } +// +// private static void ImportTestCollection(MongoDbRunner mongoDbRunner, string collectionName) { +// mongoDbRunner.Import("tests", collectionName, $"../../../testdata/{collectionName}.json", true); +// } +// +// // This test tests nothing, and is only used for profiling various data retrieval methods +// [Fact] +// public async Task TestGetPerformance() { +// await MongoTest( +// (mongoDbRunner, database) => { +// const string COLLECTION_NAME = "teamspeakSnapshots"; +// ImportTestCollection(mongoDbRunner, COLLECTION_NAME); +// +// DataCollection dataCollection = new DataCollection(database, COLLECTION_NAME); +// List subject = dataCollection.Get(x => x.timestamp > DateTime.Parse("2018-08-09T05:00:00.307Z")); +// +// subject.Should().NotBeNull(); +// +// return Task.CompletedTask; +// } +// ); +// } +// } +// } diff --git a/UKSF.Tests/Unit/Common/AsyncLockTests.cs b/UKSF.Tests/Unit/Common/AsyncLockTests.cs new file mode 100644 index 00000000..9bcd5c75 --- /dev/null +++ b/UKSF.Tests/Unit/Common/AsyncLockTests.cs @@ -0,0 +1,34 @@ +using System; +using System.Threading.Tasks; +using FluentAssertions; +using UKSF.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Common { + public class AsyncLockTests { + [Fact] + public void ShouldGetLock() { + AsyncLock subject = new AsyncLock(); + + Func act = async () => await subject.LockAsync(); + + act.Should().CompleteWithinAsync(TimeSpan.FromMilliseconds(100)); + } + + [Fact] + public void ShouldWaitForLock() { + AsyncLock subject = new AsyncLock(); + + async Task Act1() { + using (await subject.LockAsync()) { + await Task.Delay(TimeSpan.FromSeconds(1)); + } + } + + Func act2 = async () => { await subject.LockAsync(); }; + + Task unused = Act1(); + act2.ExecutionTime().Should().BeGreaterThan(TimeSpan.FromSeconds(1)); + } + } +} diff --git a/UKSF.Tests/Unit/Data/DataServiceTests.cs b/UKSF.Tests/Unit/Data/DataServiceTests.cs index 61dedcde..9180c242 100644 --- a/UKSF.Tests/Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceTests.cs @@ -32,7 +32,6 @@ public DataServiceTests() { [Theory, InlineData(""), InlineData(null)] public void ShouldThrowForDeleteWhenNoKeyOrNull(string id) { - Func act = async () => await mockDataService.Delete(id); act.Should().Throw(); diff --git a/UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs b/UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs new file mode 100644 index 00000000..56ad6da3 --- /dev/null +++ b/UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs @@ -0,0 +1,43 @@ +using Moq; +using UKSF.Api.Events; +using UKSF.Api.Interfaces.Events.Handlers; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Events { + public class EventHandlerInitialiserTests { + [Fact] + public void ShouldInitEventHandlers() { + Mock mockAccountEventHandler = new Mock(); + Mock mockCommandRequestEventHandler = new Mock(); + Mock mockCommentThreadEventHandler = new Mock(); + Mock mockLogEventHandler = new Mock(); + Mock mockNotificationsEventHandler = new Mock(); + Mock mockTeamspeakEventHandler = new Mock(); + + mockAccountEventHandler.Setup(x => x.Init()); + mockCommandRequestEventHandler.Setup(x => x.Init()); + mockCommentThreadEventHandler.Setup(x => x.Init()); + mockLogEventHandler.Setup(x => x.Init()); + mockNotificationsEventHandler.Setup(x => x.Init()); + mockTeamspeakEventHandler.Setup(x => x.Init()); + + EventHandlerInitialiser eventHandlerInitialiser = new EventHandlerInitialiser( + mockAccountEventHandler.Object, + mockCommandRequestEventHandler.Object, + mockCommentThreadEventHandler.Object, + mockLogEventHandler.Object, + mockNotificationsEventHandler.Object, + mockTeamspeakEventHandler.Object + ); + + eventHandlerInitialiser.InitEventHandlers(); + + mockAccountEventHandler.Verify(x => x.Init(), Times.Once); + mockCommandRequestEventHandler.Verify(x => x.Init(), Times.Once); + mockCommentThreadEventHandler.Verify(x => x.Init(), Times.Once); + mockLogEventHandler.Verify(x => x.Init(), Times.Once); + mockNotificationsEventHandler.Verify(x => x.Init(), Times.Once); + mockTeamspeakEventHandler.Verify(x => x.Init(), Times.Once); + } + } +} diff --git a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs new file mode 100644 index 00000000..248c3d2e --- /dev/null +++ b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs @@ -0,0 +1,93 @@ +using System; +using Microsoft.AspNetCore.SignalR; +using Moq; +using UKSF.Api.Data.Personnel; +using UKSF.Api.Data.Units; +using UKSF.Api.Events.Data; +using UKSF.Api.Events.Handlers; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Signalr.Hubs.Personnel; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Events.Handlers { + public class AccountEventHandlerTests { + private readonly DataEventBus accountDataEventBus; + private readonly AccountEventHandler accountEventHandler; + private readonly Mock> mockAccountHub; + private readonly DataEventBus unitsDataEventBus; + private Mock mockLoggingService; + + public AccountEventHandlerTests() { + Mock mockDataCollectionFactory = new Mock(); + mockLoggingService = new Mock(); + mockAccountHub = new Mock>(); + + accountDataEventBus = new DataEventBus(); + unitsDataEventBus = new DataEventBus(); + IAccountDataService accountDataService = new AccountDataService(mockDataCollectionFactory.Object, accountDataEventBus); + IUnitsDataService unitsDataService = new UnitsDataService(mockDataCollectionFactory.Object, unitsDataEventBus); + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); + + accountEventHandler = new AccountEventHandler(accountDataService, unitsDataService, mockAccountHub.Object, mockLoggingService.Object); + } + + [Fact] + public void ShouldNotRunEvent() { + Mock> mockHubClients = new Mock>(); + Mock mockAccountClient = new Mock(); + + mockAccountHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockAccountClient.Object); + mockAccountClient.Setup(x => x.ReceiveAccountUpdate()); + + accountEventHandler.Init(); + + accountDataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); + unitsDataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); + + mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Never); + } + + [Fact] + public void ShouldRunEventOnUpdate() { + Mock> mockHubClients = new Mock>(); + Mock mockAccountClient = new Mock(); + + mockAccountHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockAccountClient.Object); + mockAccountClient.Setup(x => x.ReceiveAccountUpdate()); + + accountEventHandler.Init(); + + accountDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + + mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Exactly(2)); + } + + [Fact] + public void ShouldLogOnException() { + Mock> mockHubClients = new Mock>(); + Mock mockAccountClient = new Mock(); + + mockAccountHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockAccountClient.Object); + mockAccountClient.Setup(x => x.ReceiveAccountUpdate()).Throws(new Exception()); + mockLoggingService.Setup(x => x.Log(It.IsAny())); + + accountEventHandler.Init(); + + accountDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + + mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Exactly(2)); + } + } +} diff --git a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs new file mode 100644 index 00000000..9e16ffd0 --- /dev/null +++ b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs @@ -0,0 +1,86 @@ +using System; +using Microsoft.AspNetCore.SignalR; +using Moq; +using UKSF.Api.Data.Command; +using UKSF.Api.Events.Data; +using UKSF.Api.Events.Handlers; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Models.Command; +using UKSF.Api.Models.Events; +using UKSF.Api.Signalr.Hubs.Command; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Events.Handlers { + public class CommandRequestEventHandlerTests { + private readonly CommandRequestEventHandler commandRequestEventHandler; + private readonly DataEventBus dataEventBus; + private readonly Mock> mockHub; + private Mock mockLoggingService; + + public CommandRequestEventHandlerTests() { + Mock mockDataCollectionFactory = new Mock(); + mockLoggingService = new Mock(); + mockHub = new Mock>(); + + dataEventBus = new DataEventBus(); + ICommandRequestDataService dataService = new CommandRequestDataService(mockDataCollectionFactory.Object, dataEventBus); + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); + + commandRequestEventHandler = new CommandRequestEventHandler(dataService, mockHub.Object, mockLoggingService.Object); + } + + [Fact] + public void ShouldNotRunEventOnDelete() { + Mock> mockHubClients = new Mock>(); + Mock mockClient = new Mock(); + + mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.All).Returns(mockClient.Object); + mockClient.Setup(x => x.ReceiveRequestUpdate()); + + commandRequestEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); + + mockClient.Verify(x => x.ReceiveRequestUpdate(), Times.Never); + } + + [Fact] + public void ShouldRunEventOnUpdateAndAdd() { + Mock> mockHubClients = new Mock>(); + Mock mockClient = new Mock(); + + mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.All).Returns(mockClient.Object); + mockClient.Setup(x => x.ReceiveRequestUpdate()); + + commandRequestEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); + dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + + mockClient.Verify(x => x.ReceiveRequestUpdate(), Times.Exactly(2)); + } + + [Fact] + public void ShouldLogOnException() { + Mock> mockHubClients = new Mock>(); + Mock mockClient = new Mock(); + + mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.All).Returns(mockClient.Object); + mockClient.Setup(x => x.ReceiveRequestUpdate()).Throws(new Exception()); + mockLoggingService.Setup(x => x.Log(It.IsAny())); + + commandRequestEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + + mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); + } + } +} diff --git a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs new file mode 100644 index 00000000..c0d16573 --- /dev/null +++ b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs @@ -0,0 +1,109 @@ +using System; +using Microsoft.AspNetCore.SignalR; +using Moq; +using UKSF.Api.Data.Message; +using UKSF.Api.Events.Data; +using UKSF.Api.Events.Handlers; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Message; +using UKSF.Api.Signalr.Hubs.Message; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Events.Handlers { + public class CommentThreadEventHandlerTests { + private readonly CommentThreadEventHandler commentThreadEventHandler; + private readonly DataEventBus dataEventBus; + private readonly Mock> mockHub; + private Mock mockLoggingService; + + public CommentThreadEventHandlerTests() { + Mock mockDataCollectionFactory = new Mock(); + Mock mockCommentThreadService = new Mock(); + mockLoggingService = new Mock(); + mockHub = new Mock>(); + + dataEventBus = new DataEventBus(); + ICommentThreadDataService dataService = new CommentThreadDataService(mockDataCollectionFactory.Object, dataEventBus); + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); + mockCommentThreadService.Setup(x => x.FormatComment(It.IsAny())).Returns(null); + + commentThreadEventHandler = new CommentThreadEventHandler(dataService, mockHub.Object, mockCommentThreadService.Object, mockLoggingService.Object); + } + + [Fact] + public void ShouldNotRunEventOnUpdate() { + Mock> mockHubClients = new Mock>(); + Mock mockClient = new Mock(); + + mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); + mockClient.Setup(x => x.ReceiveComment(It.IsAny())); + mockClient.Setup(x => x.DeleteComment(It.IsAny())); + + commentThreadEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE, data = new Comment() }); + + mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Never); + mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Never); + } + + [Fact] + public void ShouldRunAddedOnAdd() { + Mock> mockHubClients = new Mock>(); + Mock mockClient = new Mock(); + + mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); + mockClient.Setup(x => x.ReceiveComment(It.IsAny())); + mockClient.Setup(x => x.DeleteComment(It.IsAny())); + + commentThreadEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new Comment() }); + + mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Once); + mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Never); + } + + [Fact] + public void ShouldRunDeletedOnDelete() { + Mock> mockHubClients = new Mock>(); + Mock mockClient = new Mock(); + + mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); + mockClient.Setup(x => x.ReceiveComment(It.IsAny())); + mockClient.Setup(x => x.DeleteComment(It.IsAny())); + + commentThreadEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE, data = new Comment() }); + + mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Never); + mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Once); + } + + [Fact] + public void ShouldLogOnException() { + Mock> mockHubClients = new Mock>(); + Mock mockClient = new Mock(); + + mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); + mockClient.Setup(x => x.ReceiveComment(It.IsAny())).Throws(new Exception()); + mockLoggingService.Setup(x => x.Log(It.IsAny())); + + commentThreadEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); + + mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); + } + } +} diff --git a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs new file mode 100644 index 00000000..92d9c14d --- /dev/null +++ b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs @@ -0,0 +1,94 @@ +using System; +using Microsoft.AspNetCore.SignalR; +using Moq; +using UKSF.Api.Data.Message; +using UKSF.Api.Events.Data; +using UKSF.Api.Events.Handlers; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Signalr.Hubs.Utility; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Events.Handlers { + public class LogEventHandlerTests { + private readonly DataEventBus dataEventBus; + private readonly LogEventHandler logEventHandler; + private readonly Mock> mockHub; + private readonly Mock mockLoggingService; + + public LogEventHandlerTests() { + Mock mockDataCollectionFactory = new Mock(); + mockHub = new Mock>(); + mockLoggingService = new Mock(); + + dataEventBus = new DataEventBus(); + ILogDataService dataService = new LogDataService(mockDataCollectionFactory.Object, dataEventBus); + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); + + logEventHandler = new LogEventHandler(dataService, mockHub.Object, mockLoggingService.Object); + } + + [Fact] + public void ShouldNotRunEventOnUpdateOrDelete() { + Mock> mockHubClients = new Mock>(); + Mock mockClient = new Mock(); + + mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.All).Returns(mockClient.Object); + mockClient.Setup(x => x.ReceiveAuditLog(It.IsAny())); + mockClient.Setup(x => x.ReceiveLauncherLog(It.IsAny())); + mockClient.Setup(x => x.ReceiveErrorLog(It.IsAny())); + mockClient.Setup(x => x.ReceiveLog(It.IsAny())); + + logEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE, data = new BasicLogMessage("test") }); + dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); + + mockClient.Verify(x => x.ReceiveAuditLog(It.IsAny()), Times.Never); + mockClient.Verify(x => x.ReceiveLauncherLog(It.IsAny()), Times.Never); + mockClient.Verify(x => x.ReceiveErrorLog(It.IsAny()), Times.Never); + mockClient.Verify(x => x.ReceiveLog(It.IsAny()), Times.Never); + } + + [Fact] + public void ShouldRunAddedOnAddWithCorrectType() { + Mock> mockHubClients = new Mock>(); + Mock mockClient = new Mock(); + + mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.All).Returns(mockClient.Object); + mockClient.Setup(x => x.ReceiveAuditLog(It.IsAny())); + mockClient.Setup(x => x.ReceiveLauncherLog(It.IsAny())); + mockClient.Setup(x => x.ReceiveErrorLog(It.IsAny())); + mockClient.Setup(x => x.ReceiveLog(It.IsAny())); + + logEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new AuditLogMessage() }); + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new LauncherLogMessage("1.0.0", "test") }); + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new WebLogMessage(new Exception("test")) }); + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new BasicLogMessage("test") }); + + mockClient.Verify(x => x.ReceiveAuditLog(It.IsAny()), Times.Once); + mockClient.Verify(x => x.ReceiveLauncherLog(It.IsAny()), Times.Once); + mockClient.Verify(x => x.ReceiveErrorLog(It.IsAny()), Times.Once); + mockClient.Verify(x => x.ReceiveLog(It.IsAny()), Times.Once); + } + + [Fact] + public void ShouldLogOnException() { + mockLoggingService.Setup(x => x.Log(It.IsAny())); + + logEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new object() }); + + mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); + } + } +} diff --git a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs new file mode 100644 index 00000000..a452d817 --- /dev/null +++ b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs @@ -0,0 +1,104 @@ +using System; +using FluentAssertions; +using Microsoft.AspNetCore.SignalR; +using Moq; +using UKSF.Api.Data.Message; +using UKSF.Api.Events.Data; +using UKSF.Api.Events.Handlers; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Message; +using UKSF.Api.Signalr.Hubs.Message; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Events.Handlers { + public class NotificationsEventHandlerTests { + private readonly DataEventBus dataEventBus; + private readonly Mock> mockHub; + private readonly NotificationsEventHandler notificationsEventHandler; + private Mock mockLoggingService; + + public NotificationsEventHandlerTests() { + Mock mockDataCollectionFactory = new Mock(); + mockLoggingService = new Mock(); + mockHub = new Mock>(); + + dataEventBus = new DataEventBus(); + INotificationsDataService dataService = new NotificationsDataService(mockDataCollectionFactory.Object, dataEventBus); + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); + + notificationsEventHandler = new NotificationsEventHandler(dataService, mockHub.Object, mockLoggingService.Object); + } + + [Fact] + public void ShouldNotRunEventOnUpdateOrDelete() { + Mock> mockHubClients = new Mock>(); + Mock mockClient = new Mock(); + + mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); + mockClient.Setup(x => x.ReceiveNotification(It.IsAny())); + + notificationsEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); + + mockClient.Verify(x => x.ReceiveNotification(It.IsAny()), Times.Never); + } + + [Fact] + public void ShouldRunAddedOnAdd() { + Mock> mockHubClients = new Mock>(); + Mock mockClient = new Mock(); + + mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); + mockClient.Setup(x => x.ReceiveNotification(It.IsAny())); + + notificationsEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new Notification() }); + + mockClient.Verify(x => x.ReceiveNotification(It.IsAny()), Times.Once); + } + + [Fact] + public void ShouldUseOwnerAsIdInAdded() { + Mock> mockHubClients = new Mock>(); + Mock mockClient = new Mock(); + + string subject = ""; + mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.Group("1")).Returns(mockClient.Object).Callback((string x) => subject = x); + mockClient.Setup(x => x.ReceiveNotification(It.IsAny())); + + notificationsEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new Notification { owner = "1" } }); + + subject.Should().Be("1"); + } + + [Fact] + public void ShouldLogOnException() { + Mock> mockHubClients = new Mock>(); + Mock mockClient = new Mock(); + + mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); + mockClient.Setup(x => x.ReceiveNotification(It.IsAny())).Throws(new Exception()); + mockLoggingService.Setup(x => x.Log(It.IsAny())); + + notificationsEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); + + mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); + } + } +} diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs new file mode 100644 index 00000000..854c70e1 --- /dev/null +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -0,0 +1,189 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using FluentAssertions; +using Moq; +using UKSF.Api.Events.Handlers; +using UKSF.Api.Events.SignalrServer; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Events.Types; +using UKSF.Api.Models.Integrations; +using UKSF.Api.Models.Personnel; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Events.Handlers { + public class TeamspeakEventHandlerTests { + private readonly Mock mockAccountService; + private readonly Mock mockLoggingService; + private readonly Mock mockTeamspeakGroupService; + private readonly Mock mockTeamspeakService; + private readonly ISignalrEventBus signalrEventBus; + private readonly TeamspeakEventHandler teamspeakEventHandler; + + public TeamspeakEventHandlerTests() { + signalrEventBus = new SignalrEventBus(); + mockTeamspeakService = new Mock(); + mockAccountService = new Mock(); + mockTeamspeakGroupService = new Mock(); + mockLoggingService = new Mock(); + + teamspeakEventHandler = new TeamspeakEventHandler(signalrEventBus, mockTeamspeakService.Object, mockAccountService.Object, mockTeamspeakGroupService.Object, mockLoggingService.Object); + } + + [Fact] + public void ShouldCorrectlyParseClients() { + HashSet subject = new HashSet(); + mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())).Callback((HashSet x) => subject = x); + + teamspeakEventHandler.Init(); + + signalrEventBus.Send( + new SignalrEventModel { + procedure = TeamspeakEventType.CLIENTS, + args = "[{\"channelId\": 1, \"channelName\": \"Test Channel 1\", \"clientDbId\": 5, \"clientName\": \"Test Name 1\"}," + + "{\"channelId\": 2, \"channelName\": \"Test Channel 2\", \"clientDbId\": 10, \"clientName\": \"Test Name 2\"}]" + } + ); + + subject.Should().HaveCount(2); + subject.Should() + .BeEquivalentTo( + new HashSet { + new TeamspeakClient { channelId = 1, channelName = "Test Channel 1", clientDbId = 5, clientName = "Test Name 1" }, + new TeamspeakClient { channelId = 2, channelName = "Test Channel 2", clientDbId = 10, clientName = "Test Name 2" } + } + ); + } + + [Fact] + public void ShouldNotRunEventOnEmpty() { + mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); + mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); + + teamspeakEventHandler.Init(); + + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.EMPTY }); + + mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Never); + mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny()), Times.Never); + } + + [Fact] + public void ShouldNotRunUpdateClientsForNoClients() { + mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); + + teamspeakEventHandler.Init(); + + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENTS, args = "[]" }); + + mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Never); + } + + [Fact] + public async Task ShouldRunClientGroupsUpdate() { + Account account = new Account { teamspeakIdentities = new HashSet { 1 } }; + Mock mockAccountDataService = new Mock(); + + mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); + mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(account, It.IsAny>(), 1)).Returns(Task.CompletedTask); + + teamspeakEventHandler.Init(); + + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + await Task.Delay(TimeSpan.FromSeconds(1)); + + mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5 }, 1), Times.Once); + } + + [Fact] + public async Task ShouldRunSingleClientGroupsUpdateForEachClient() { + Account account1 = new Account { teamspeakIdentities = new HashSet { 1 } }; + Account account2 = new Account { teamspeakIdentities = new HashSet { 2 } }; + List mockCollection = new List { account1, account2 }; + Mock mockAccountDataService = new Mock(); + + mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.FirstOrDefault(x)); + mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); + + teamspeakEventHandler.Init(); + + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 2, \"serverGroupId\": 10}" }); + await Task.Delay(TimeSpan.FromSeconds(2)); + + mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List {5}, 1), Times.Once); + mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account2, new List {10}, 2), Times.Once); + } + + [Fact] + public async Task ShouldRunSingleClientGroupsUpdateForMultipleEventsWithOneClient() { + Account account = new Account { teamspeakIdentities = new HashSet { 1 } }; + Mock mockAccountDataService = new Mock(); + + mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); + mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); + + teamspeakEventHandler.Init(); + + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + await Task.Delay(TimeSpan.FromMilliseconds(100)); + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); + await Task.Delay(TimeSpan.FromSeconds(1)); + + mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List {5, 10}, 1), Times.Once); + } + + [Fact] + public async Task ShouldRunClientGroupsUpdateTwiceForTwoEventsWithDelay() { + Account account = new Account { teamspeakIdentities = new HashSet { 1 } }; + Mock mockAccountDataService = new Mock(); + + mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); + mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); + + teamspeakEventHandler.Init(); + + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + await Task.Delay(TimeSpan.FromSeconds(1)); + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); + await Task.Delay(TimeSpan.FromSeconds(1)); + + mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List {5}, 1), Times.Once); + mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List {10}, 1), Times.Once); + } + + [Fact] + public void ShouldRunUpdateClients() { + mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); + + teamspeakEventHandler.Init(); + + signalrEventBus.Send( + new SignalrEventModel { procedure = TeamspeakEventType.CLIENTS, args = "[{\"channelId\": 1, \"channelName\": \"Test Channel\", \"clientDbId\": 5, \"clientName\": \"Test Name\"}]" } + ); + + mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Once); + } + + [Fact] + public void LogOnException() { + mockLoggingService.Setup(x => x.Log(It.IsAny())); + + teamspeakEventHandler.Init(); + + signalrEventBus.Send(new SignalrEventModel { procedure = (TeamspeakEventType) 9 }); + + mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); + } + } +} diff --git a/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs b/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs new file mode 100644 index 00000000..5c6e16fc --- /dev/null +++ b/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs @@ -0,0 +1,17 @@ +using System.IO; +using FluentAssertions; +using UKSF.Api.Models.Game; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Models.Game { + public class MissionFileTests { + [Fact] + public void ShouldSetFields() { + MissionFile subject = new MissionFile(new FileInfo("../../../testdata/testmission.Altis.pbo")); + + subject.path.Should().Be("testmission.Altis.pbo"); + subject.map.Should().Be("Altis"); + subject.name.Should().Be("testmission"); + } + } +} diff --git a/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs b/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs new file mode 100644 index 00000000..563a1340 --- /dev/null +++ b/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs @@ -0,0 +1,37 @@ +using System; +using System.IO; +using FluentAssertions; +using UKSF.Api.Models.Game; +using UKSF.Api.Models.Mission; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Models.Mission { + public class MissionPatchingReportTests { + [Fact] + public void ShouldSetFieldsAsError() { + MissionPatchingReport subject = new MissionPatchingReport("Test Title", "Test details, like what went wrong, what needs to be done to fix it", true); + + subject.title.Should().Be("Error: Test Title"); + subject.detail.Should().Be("Test details, like what went wrong, what needs to be done to fix it"); + subject.error.Should().BeTrue(); + } + + [Fact] + public void ShouldSetFieldsAsWarning() { + MissionPatchingReport subject = new MissionPatchingReport("Test Title", "Test details, like what went wrong, what needs to be done to fix it"); + + subject.title.Should().Be("Warning: Test Title"); + subject.detail.Should().Be("Test details, like what went wrong, what needs to be done to fix it"); + subject.error.Should().BeFalse(); + } + + [Fact] + public void ShouldSetFieldsFromException() { + MissionPatchingReport subject = new MissionPatchingReport(new Exception("An error occured")); + + subject.title.Should().Be("An error occured"); + subject.detail.Should().Be("System.Exception: An error occured"); + subject.error.Should().BeTrue(); + } + } +} diff --git a/UKSF.Tests/Unit/Models/Mission/MissionTests.cs b/UKSF.Tests/Unit/Models/Mission/MissionTests.cs new file mode 100644 index 00000000..3beffcba --- /dev/null +++ b/UKSF.Tests/Unit/Models/Mission/MissionTests.cs @@ -0,0 +1,15 @@ +using FluentAssertions; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Models.Mission { + public class MissionTests { + [Fact] + public void ShouldSetFields() { + Api.Models.Mission.Mission subject = new Api.Models.Mission.Mission("testdata/testmission.Altis"); + + subject.path.Should().Be("testdata/testmission.Altis"); + subject.descriptionPath.Should().Be("testdata/testmission.Altis/description.ext"); + subject.sqmPath.Should().Be("testdata/testmission.Altis/mission.sqm"); + } + } +} diff --git a/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs b/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs index a0f5b8d3..6b421ea4 100644 --- a/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs @@ -25,7 +25,7 @@ public DisplayNameUtilitiesTests() { ServiceCollection serviceProvider = new ServiceCollection(); serviceProvider.AddTransient(provider => mockDisplayNameService.Object); serviceProvider.AddTransient(provider => mockUnitsService.Object); - ServiceWrapper.ServiceProvider = serviceProvider.BuildServiceProvider(); + ServiceWrapper.Provider = serviceProvider.BuildServiceProvider(); } [Theory, InlineData("5e39336e1b92ee2d14b7fe08", "Maj.Bridgford.A"), InlineData("5e39336e1b92ee2d14b7fe08, 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A, Cpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe085e3935db1b92ee2d14b7fe09", "Maj.Bridgford.ACpl.Carr.C"), diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs new file mode 100644 index 00000000..9ab40448 --- /dev/null +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using FluentAssertions; +using Moq; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Interfaces.Utility.ScheduledActions; +using UKSF.Api.Services.Utility; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Services.Utility { + public class ScheduledActionServiceTests { + [Fact] + public void ShouldRegisterActions() { + Mock mockDeleteExpiredConfirmationCodeAction = new Mock(); + mockDeleteExpiredConfirmationCodeAction.Setup(x => x.Name).Returns("TestAction"); + + IScheduledActionService scheduledActionService = new ScheduledActionService(); + scheduledActionService.RegisterScheduledActions(new HashSet {mockDeleteExpiredConfirmationCodeAction.Object}); + + IScheduledAction subject = scheduledActionService.GetScheduledAction("TestAction"); + + subject.Should().Be(mockDeleteExpiredConfirmationCodeAction.Object); + } + + [Fact] + public void ShouldOverwriteRegisteredActions() { + Mock mockDeleteExpiredConfirmationCodeAction1 = new Mock(); + Mock mockDeleteExpiredConfirmationCodeAction2 = new Mock(); + mockDeleteExpiredConfirmationCodeAction1.Setup(x => x.Name).Returns("TestAction"); + mockDeleteExpiredConfirmationCodeAction2.Setup(x => x.Name).Returns("TestAction"); + + IScheduledActionService scheduledActionService = new ScheduledActionService(); + scheduledActionService.RegisterScheduledActions(new HashSet {mockDeleteExpiredConfirmationCodeAction1.Object}); + scheduledActionService.RegisterScheduledActions(new HashSet {mockDeleteExpiredConfirmationCodeAction2.Object}); + + IScheduledAction subject = scheduledActionService.GetScheduledAction("TestAction"); + + subject.Should().Be(mockDeleteExpiredConfirmationCodeAction2.Object); + } + + [Fact] + public void ShouldThrowWhenActionNotFound() { + IScheduledActionService scheduledActionService = new ScheduledActionService(); + + Action act = () => scheduledActionService.GetScheduledAction("TestAction"); + + act.Should().Throw(); + } + } +} diff --git a/UKSF.Tests/testdata/testmission.Altis.pbo b/UKSF.Tests/testdata/testmission.Altis.pbo new file mode 100644 index 00000000..e69de29b From a7b19633f4a4f42edba8b5813fe645286f2b2484 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 29 May 2020 10:03:25 +0100 Subject: [PATCH 160/369] Fixed up a few tests, use different method for merging teamspeak group id requests --- .../Handlers/TeamspeakEventHandler.cs | 57 +++++-------------- .../TeamspeakServerGroupUpdate.cs | 2 + UKSF.Common/TaskUtilities.cs | 9 +++ .../Integration/Data/DataCollectionTests.cs | 1 + UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs | 41 +++++++++++++ .../Handlers/TeamspeakEventHandlerTests.cs | 8 ++- 6 files changed, 73 insertions(+), 45 deletions(-) diff --git a/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs b/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs index 9f53e6a3..a83750be 100644 --- a/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs +++ b/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading; @@ -17,11 +18,11 @@ namespace UKSF.Api.Events.Handlers { public class TeamspeakEventHandler : ITeamspeakEventHandler { - private readonly AsyncLock mutex = new AsyncLock(); private readonly IAccountService accountService; private readonly ISignalrEventBus eventBus; private readonly ILoggingService loggingService; - private readonly Dictionary serverGroupUpdates = new Dictionary(); + private readonly AsyncLock mutex = new AsyncLock(); + private readonly ConcurrentDictionary serverGroupUpdates = new ConcurrentDictionary(); private readonly ITeamspeakGroupService teamspeakGroupService; private readonly ITeamspeakService teamspeakService; @@ -72,44 +73,18 @@ private async Task UpdateClientServerGroups(string args) { double serverGroupId = double.Parse(updateObject["serverGroupId"].ToString()); await Console.Out.WriteLineAsync($"Server group for {clientDbid}: {serverGroupId}"); - // lock (serverGroupUpdates) { - // if (!serverGroupUpdates.ContainsKey(clientDbid)) { - // serverGroupUpdates.Add(clientDbid, new TeamspeakServerGroupUpdate()); - // } - // - // TeamspeakServerGroupUpdate update = serverGroupUpdates[clientDbid]; - // - // update.serverGroups.Add(serverGroupId); - // update.cancellationTokenSource?.Cancel(); - // update.cancellationTokenSource = new CancellationTokenSource(); - // TaskUtilities.DelayWithCallback(TimeSpan.FromMilliseconds(500), update.cancellationTokenSource.Token, () => ); - // // if (!update.cancellationTokenSource.IsCancellationRequested) { - // // update.cancellationTokenSource.Cancel(); - // // - // // } - // } - - using (await mutex.LockAsync()) { - if (!serverGroupUpdates.ContainsKey(clientDbid)) { - serverGroupUpdates.Add(clientDbid, new TeamspeakServerGroupUpdate()); + TeamspeakServerGroupUpdate update = serverGroupUpdates.GetOrAdd(clientDbid, x => new TeamspeakServerGroupUpdate()); + update.serverGroups.Add(serverGroupId); + update.cancellationTokenSource?.Cancel(); + update.cancellationTokenSource = new CancellationTokenSource(); + Task unused = TaskUtilities.DelayWithCallback( + TimeSpan.FromMilliseconds(500), + update.cancellationTokenSource.Token, + async () => { + update.cancellationTokenSource.Cancel(); + await ProcessAccountData(clientDbid, update.serverGroups); } - - TeamspeakServerGroupUpdate update = serverGroupUpdates[clientDbid]; - - update.serverGroups.Add(serverGroupId); - update.cancellationTokenSource?.Cancel(); - update.cancellationTokenSource = new CancellationTokenSource(); - Task unused = Task.Run( - async () => { - await Task.Delay(TimeSpan.FromMilliseconds(500), update.cancellationTokenSource.Token); - if (!update.cancellationTokenSource.IsCancellationRequested) { - update.cancellationTokenSource.Cancel(); - await ProcessAccountData(clientDbid, update.serverGroups); - } - }, - update.cancellationTokenSource.Token - ); - } + ); } private async Task ProcessAccountData(double clientDbId, ICollection serverGroups) { @@ -117,9 +92,7 @@ private async Task ProcessAccountData(double clientDbId, ICollection ser Account account = accountService.Data.GetSingle(x => x.teamspeakIdentities != null && x.teamspeakIdentities.Any(y => y.Equals(clientDbId))); Task unused = teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); - using (await mutex.LockAsync()) { - serverGroupUpdates.Remove(clientDbId); - } + serverGroupUpdates.TryRemove(clientDbId, out TeamspeakServerGroupUpdate _); } } } diff --git a/UKSF.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs b/UKSF.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs index fe8fc8a4..454a94ae 100644 --- a/UKSF.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs +++ b/UKSF.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs @@ -1,9 +1,11 @@ using System.Collections.Generic; using System.Threading; +using System.Threading.Tasks; namespace UKSF.Api.Models.Integrations { public class TeamspeakServerGroupUpdate { public readonly List serverGroups = new List(); public CancellationTokenSource cancellationTokenSource; + public Task delayedProcessTask; } } diff --git a/UKSF.Common/TaskUtilities.cs b/UKSF.Common/TaskUtilities.cs index 1cd733ba..d8043d2d 100644 --- a/UKSF.Common/TaskUtilities.cs +++ b/UKSF.Common/TaskUtilities.cs @@ -14,6 +14,15 @@ public static async Task Delay(TimeSpan timeSpan, CancellationToken token) { } } + public static async Task DelayWithCallback(TimeSpan timeSpan, CancellationToken token, Func callback) { + try { + await Task.Delay(timeSpan, token); + await callback(); + } catch (Exception) { + // Ignored + } + } + public static void SubscribeAsync(this IObservable source, Func onNext, Action onError) { source.Select(x => Observable.Defer(() => onNext(x).ToObservable())).Concat().Subscribe(x => { }, onError); } diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index cd7a3f86..89607095 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -36,6 +36,7 @@ public void Dispose() { private async Task MongoTest(Func testFunction) { mongoDbRunner = MongoDbRunner.Start(additionalMongodArguments: "--quiet"); + IMongoDatabase database = MongoClientFactory.GetDatabase($"{mongoDbRunner.ConnectionString}{Guid.NewGuid()}"); await testFunction(database); diff --git a/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs index 830f6b64..f448f6c4 100644 --- a/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs @@ -25,5 +25,46 @@ public void ShouldNotThrowExceptionForDelay() { act.Should().NotThrow(); } + + [Fact] + public void ShouldCallbackAfterDelay() { + bool subject = false; + Func act = async () => { + CancellationTokenSource token = new CancellationTokenSource(); + await TaskUtilities.DelayWithCallback( + TimeSpan.FromMilliseconds(10), + token.Token, + () => { + subject = true; + return Task.CompletedTask; + } + ); + }; + + act.Should().NotThrow(); + act.ExecutionTime().Should().BeGreaterThan(TimeSpan.FromMilliseconds(10)); + subject.Should().BeTrue(); + } + + [Fact] + public void ShouldNotCallbackForCancellation() { + bool subject = false; + Action act = () => { + CancellationTokenSource token = new CancellationTokenSource(); + Task unused = TaskUtilities.DelayWithCallback( + TimeSpan.FromMilliseconds(10), + token.Token, + () => { + subject = true; + return Task.CompletedTask; + } + ); + token.Cancel(); + }; + + act.Should().NotThrow(); + act.ExecutionTime().Should().BeLessThan(TimeSpan.FromMilliseconds(10)); + subject.Should().BeFalse(); + } } } diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs index 854c70e1..8d1c96ca 100644 --- a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -134,9 +134,11 @@ public async Task ShouldRunSingleClientGroupsUpdateForMultipleEventsWithOneClien teamspeakEventHandler.Init(); - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); - await Task.Delay(TimeSpan.FromMilliseconds(100)); - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); + void Act1() => Task.Run(() => signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" })); + void Act2() => Task.Run(() => signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" })); + + Act1(); + Act2(); await Task.Delay(TimeSpan.FromSeconds(1)); mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List {5, 10}, 1), Times.Once); From 352c76e105abb0a932485313616f59ed2e629acc Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 29 May 2020 10:20:16 +0100 Subject: [PATCH 161/369] Removed unused asynclock class --- .../Handlers/TeamspeakEventHandler.cs | 1 - UKSF.Common/AsyncLock.cs | 18 ---------- UKSF.Tests/Unit/Common/AsyncLockTests.cs | 34 ------------------- 3 files changed, 53 deletions(-) delete mode 100644 UKSF.Common/AsyncLock.cs delete mode 100644 UKSF.Tests/Unit/Common/AsyncLockTests.cs diff --git a/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs b/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs index a83750be..09dc0c88 100644 --- a/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs +++ b/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs @@ -21,7 +21,6 @@ public class TeamspeakEventHandler : ITeamspeakEventHandler { private readonly IAccountService accountService; private readonly ISignalrEventBus eventBus; private readonly ILoggingService loggingService; - private readonly AsyncLock mutex = new AsyncLock(); private readonly ConcurrentDictionary serverGroupUpdates = new ConcurrentDictionary(); private readonly ITeamspeakGroupService teamspeakGroupService; private readonly ITeamspeakService teamspeakService; diff --git a/UKSF.Common/AsyncLock.cs b/UKSF.Common/AsyncLock.cs deleted file mode 100644 index 96b186a0..00000000 --- a/UKSF.Common/AsyncLock.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace UKSF.Common { - public class AsyncLock : IDisposable { - private readonly SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1, 1); - - public void Dispose() { - semaphoreSlim.Release(); - } - - public async Task LockAsync() { - await semaphoreSlim.WaitAsync(); - return this; - } - } -} diff --git a/UKSF.Tests/Unit/Common/AsyncLockTests.cs b/UKSF.Tests/Unit/Common/AsyncLockTests.cs deleted file mode 100644 index 9bcd5c75..00000000 --- a/UKSF.Tests/Unit/Common/AsyncLockTests.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Threading.Tasks; -using FluentAssertions; -using UKSF.Common; -using Xunit; - -namespace UKSF.Tests.Unit.Unit.Common { - public class AsyncLockTests { - [Fact] - public void ShouldGetLock() { - AsyncLock subject = new AsyncLock(); - - Func act = async () => await subject.LockAsync(); - - act.Should().CompleteWithinAsync(TimeSpan.FromMilliseconds(100)); - } - - [Fact] - public void ShouldWaitForLock() { - AsyncLock subject = new AsyncLock(); - - async Task Act1() { - using (await subject.LockAsync()) { - await Task.Delay(TimeSpan.FromSeconds(1)); - } - } - - Func act2 = async () => { await subject.LockAsync(); }; - - Task unused = Act1(); - act2.ExecutionTime().Should().BeGreaterThan(TimeSpan.FromSeconds(1)); - } - } -} From 44c8d70bc44332845da77492c8ccf84c8d678c4e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 29 May 2020 10:45:21 +0100 Subject: [PATCH 162/369] Fixed units order using predicate, fixed member order in command requests --- UKSF.Api.Data/Units/UnitsDataService.cs | 7 ++++++- UKSF.Api/Controllers/Accounts/AccountsController.cs | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/UKSF.Api.Data/Units/UnitsDataService.cs b/UKSF.Api.Data/Units/UnitsDataService.cs index 16f90efb..ea17a146 100644 --- a/UKSF.Api.Data/Units/UnitsDataService.cs +++ b/UKSF.Api.Data/Units/UnitsDataService.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; @@ -12,5 +13,9 @@ public UnitsDataService(IDataCollectionFactory dataCollectionFactory, IDataEvent public override List Get() { return base.Get().OrderBy(x => x.order).ToList(); } + + public override List Get(Func predicate) { + return base.Get(predicate).OrderBy(x => x.order).ToList(); + } } } diff --git a/UKSF.Api/Controllers/Accounts/AccountsController.cs b/UKSF.Api/Controllers/Accounts/AccountsController.cs index 9ad81ca1..93858b53 100644 --- a/UKSF.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSF.Api/Controllers/Accounts/AccountsController.cs @@ -117,10 +117,9 @@ public IActionResult GetAccountsUnder([FromQuery] bool reverse = false) { List accounts = new List(); List memberAccounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER).ToList(); + memberAccounts = memberAccounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); if (reverse) { - memberAccounts.Sort((x, y) => ranksService.Sort(y.rank, x.rank)); - } else { - memberAccounts.Sort((x, y) => ranksService.Sort(x.rank, y.rank)); + memberAccounts.Reverse(); } accounts.AddRange(memberAccounts.Select(x => new {value = x.id, displayValue = displayNameService.GetDisplayName(x)})); From 96fceacde174389f1ad5b3287b7f1e4a9fccec6f Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 30 May 2020 01:12:36 +0100 Subject: [PATCH 163/369] Tweaks, discord nickname for application data - Add discord nickname or username to application page - Fail silently for deleting or updating many when no items found - Minor cleanup --- UKSF.Api.Data/DataService.cs | 4 +-- .../Handlers/NotificationsEventHandler.cs | 1 - .../Integrations/IDiscordService.cs | 2 +- .../Command/CommandRequestService.cs | 6 ++-- .../Integrations/DiscordService.cs | 16 +++++++++- .../Personnel/RecruitmentService.cs | 13 +++++---- .../Accounts/CommunicationsController.cs | 2 -- .../Controllers/CommentThreadController.cs | 2 +- .../Controllers/NotificationsController.cs | 4 --- UKSF.Api/Controllers/TestController.cs | 29 ------------------- .../Controllers/Utility/DebugController.cs | 29 +++++++++++++++++++ .../Integration/Data/DataCollectionTests.cs | 1 - .../Mission/MissionPatchingReportTests.cs | 2 -- 13 files changed, 57 insertions(+), 54 deletions(-) delete mode 100644 UKSF.Api/Controllers/TestController.cs create mode 100644 UKSF.Api/Controllers/Utility/DebugController.cs diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index 25107f5f..897a8304 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -43,7 +43,7 @@ public virtual async Task Update(string id, UpdateDefinition update) { // TOD public virtual async Task UpdateMany(Func predicate, UpdateDefinition update) { List items = Get(predicate); // TODO: Evaluate performance impact of this presence check - if (items.Count == 0) throw new KeyNotFoundException("Could not find any items to update"); + if (items.Count == 0) return; // throw new KeyNotFoundException("Could not find any items to update"); await dataCollection.UpdateManyAsync(x => predicate(x), update); items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); } @@ -62,7 +62,7 @@ public virtual async Task Delete(string id) { public virtual async Task DeleteMany(Func predicate) { List items = Get(predicate); // TODO: Evaluate performance impact of this presence check - if (items.Count == 0) throw new KeyNotFoundException("Could not find any items to delete"); + if (items.Count == 0) return; // throw new KeyNotFoundException("Could not find any items to delete"); await dataCollection.DeleteManyAsync(x => predicate(x)); items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, x.GetIdValue()))); } diff --git a/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs b/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs index 379cf0c7..a8fb26b2 100644 --- a/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs +++ b/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs @@ -1,4 +1,3 @@ -using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Interfaces.Data.Cached; diff --git a/UKSF.Api.Interfaces/Integrations/IDiscordService.cs b/UKSF.Api.Interfaces/Integrations/IDiscordService.cs index 2d0d6562..5089eced 100644 --- a/UKSF.Api.Interfaces/Integrations/IDiscordService.cs +++ b/UKSF.Api.Interfaces/Integrations/IDiscordService.cs @@ -6,7 +6,7 @@ namespace UKSF.Api.Interfaces.Integrations { public interface IDiscordService { Task ConnectDiscord(); - bool IsAccountOnline(Account account); + (bool online, string nickname) GetOnlineUserDetails(Account account); Task SendMessage(ulong channelId, string message); Task> GetRoles(); Task UpdateAllUsers(); diff --git a/UKSF.Api.Services/Command/CommandRequestService.cs b/UKSF.Api.Services/Command/CommandRequestService.cs index 54302508..be640931 100644 --- a/UKSF.Api.Services/Command/CommandRequestService.cs +++ b/UKSF.Api.Services/Command/CommandRequestService.cs @@ -18,7 +18,7 @@ using UKSF.Api.Services.Personnel; namespace UKSF.Api.Services.Command { - public class CommandRequestService : ICommandRequestService { + public class CommandRequestService : DataBackedService, ICommandRequestService { private readonly IAccountService accountService; private readonly IChainOfCommandService chainOfCommandService; private readonly ICommandRequestDataService data; @@ -39,7 +39,7 @@ public CommandRequestService( IChainOfCommandService chainOfCommandService, IUnitsService unitsService, IRanksService ranksService - ) { + ) : base(data) { this.data = data; this.dataArchive = dataArchive; this.notificationsService = notificationsService; @@ -51,8 +51,6 @@ IRanksService ranksService this.ranksService = ranksService; } - public ICommandRequestDataService Data => data; - public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE) { Account requesterAccount = sessionService.GetContextAccount(); Account recipientAccount = accountService.Data.GetSingle(request.recipient); diff --git a/UKSF.Api.Services/Integrations/DiscordService.cs b/UKSF.Api.Services/Integrations/DiscordService.cs index d3ee40c8..ead29e7f 100644 --- a/UKSF.Api.Services/Integrations/DiscordService.cs +++ b/UKSF.Api.Services/Integrations/DiscordService.cs @@ -95,7 +95,21 @@ public virtual async Task UpdateAccount(Account account, ulong discordId = 0) { await UpdateAccountNickname(user, account); } - public bool IsAccountOnline(Account account) => account.discordId != null && guild.GetUser(ulong.Parse(account.discordId))?.Status == UserStatus.Online; + public (bool online, string nickname) GetOnlineUserDetails(Account account) { + bool online = IsAccountOnline(account); + string nickname = GetAccountNickname(account); + + return (online, nickname); + } + + private bool IsAccountOnline(Account account) => account.discordId != null && guild.GetUser(ulong.Parse(account.discordId))?.Status == UserStatus.Online; + + private string GetAccountNickname(Account account) { + if (account.discordId == null) return ""; + + SocketGuildUser user = guild.GetUser(ulong.Parse(account.discordId)); + return user == null ? "" : string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname; + } public void Dispose() { client.StopAsync().Wait(TimeSpan.FromSeconds(5)); diff --git a/UKSF.Api.Services/Personnel/RecruitmentService.cs b/UKSF.Api.Services/Personnel/RecruitmentService.cs index 80d8ee99..06035fad 100644 --- a/UKSF.Api.Services/Personnel/RecruitmentService.cs +++ b/UKSF.Api.Services/Personnel/RecruitmentService.cs @@ -83,14 +83,14 @@ public object GetAllApplications() { public JObject GetApplication(Account account) { Account recruiterAccount = accountService.Data.GetSingle(account.application.recruiter); - (bool tsOnline, string tsNickname, bool discordOnline) = GetOnlineUserDetails(account); + (bool tsOnline, string tsNickname, bool discordOnline, string discordNickname) = GetOnlineUserDetails(account); (int years, int months) = account.dob.ToAge(); return JObject.FromObject( new { account, displayName = displayNameService.GetDisplayName(account), age = new {years, months}, - communications = new {tsOnline, tsNickname = tsOnline ? tsNickname : "", discordOnline}, + communications = new {tsOnline, tsNickname = tsOnline ? tsNickname : "", discordOnline, discordNickname}, daysProcessing = Math.Ceiling((DateTime.Now - account.application.dateCreated).TotalDays), daysProcessed = Math.Ceiling((account.application.dateAccepted - account.application.dateCreated).TotalDays), nextCandidateOp = GetNextCandidateOp(), @@ -158,14 +158,14 @@ private JObject GetCompletedApplication(Account account) => ); private JObject GetWaitingApplication(Account account) { - (bool tsOnline, string tsNickname, bool discordOnline) = GetOnlineUserDetails(account); + (bool tsOnline, string tsNickname, bool discordOnline, string discordNickname) = GetOnlineUserDetails(account); double averageProcessingTime = GetAverageProcessingTime(); double daysProcessing = Math.Ceiling((DateTime.Now - account.application.dateCreated).TotalDays); double processingDifference = daysProcessing - averageProcessingTime; return JObject.FromObject( new { account, - communications = new {tsOnline, tsNickname = tsOnline ? tsNickname : "", discordOnline}, + communications = new {tsOnline, tsNickname = tsOnline ? tsNickname : "", discordOnline, discordNickname}, steamprofile = "http://steamcommunity.com/profiles/" + account.steamname, daysProcessing, processingDifference, @@ -174,10 +174,11 @@ private JObject GetWaitingApplication(Account account) { ); } - private (bool tsOnline, string tsNickname, bool discordOnline) GetOnlineUserDetails(Account account) { + private (bool tsOnline, string tsNickname, bool discordOnline, string discordNickname) GetOnlineUserDetails(Account account) { (bool tsOnline, string tsNickname) = teamspeakService.GetOnlineUserDetails(account); + (bool discordOnline, string discordNickname) = discordService.GetOnlineUserDetails(account); - return (tsOnline, tsNickname, discordService.IsAccountOnline(account)); + return (tsOnline, tsNickname, discordOnline, discordNickname); } private static string GetNextCandidateOp() { diff --git a/UKSF.Api/Controllers/Accounts/CommunicationsController.cs b/UKSF.Api/Controllers/Accounts/CommunicationsController.cs index 6d351fb1..51e908fa 100644 --- a/UKSF.Api/Controllers/Accounts/CommunicationsController.cs +++ b/UKSF.Api/Controllers/Accounts/CommunicationsController.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; @@ -11,7 +10,6 @@ using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Personnel; using UKSF.Api.Services.Message; -using UKSF.Api.Services.Utility.ScheduledActions; using UKSF.Common; namespace UKSF.Api.Controllers.Accounts { diff --git a/UKSF.Api/Controllers/CommentThreadController.cs b/UKSF.Api/Controllers/CommentThreadController.cs index 6ac28446..d8f61631 100644 --- a/UKSF.Api/Controllers/CommentThreadController.cs +++ b/UKSF.Api/Controllers/CommentThreadController.cs @@ -57,7 +57,7 @@ public IActionResult GetCanPostComment(string id) { Account account = sessionService.GetContextAccount(); bool admin = sessionService.ContextHasRole(RoleDefinitions.ADMIN); bool canPost = commentThread.mode switch { - ThreadMode.SR1 => (commentThread.authors.Any(x => x == sessionService.GetContextId()) || admin || recruitmentService.IsRecruiter(sessionService.GetContextAccount())), + ThreadMode.SR1 => commentThread.authors.Any(x => x == sessionService.GetContextId()) || admin || recruitmentService.IsRecruiter(sessionService.GetContextAccount()), ThreadMode.RANKSUPERIOR => commentThread.authors.Any(x => admin || ranksService.IsSuperior(account.rank, accountService.Data.GetSingle(x).rank)), ThreadMode.RANKEQUAL => commentThread.authors.Any(x => admin || ranksService.IsEqual(account.rank, accountService.Data.GetSingle(x).rank)), ThreadMode.RANKSUPERIOROREQUAL => commentThread.authors.Any(x => admin || ranksService.IsSuperiorOrEqual(account.rank, accountService.Data.GetSingle(x).rank)), diff --git a/UKSF.Api/Controllers/NotificationsController.cs b/UKSF.Api/Controllers/NotificationsController.cs index 6ea8e71b..7fed020c 100644 --- a/UKSF.Api/Controllers/NotificationsController.cs +++ b/UKSF.Api/Controllers/NotificationsController.cs @@ -29,10 +29,6 @@ public async Task MarkAsRead([FromBody] JObject jObject) { public async Task Clear([FromBody] JObject jObject) { JArray clear = JArray.Parse(jObject["clear"].ToString()); List ids = clear.Select(notification => notification["id"].ToString()).ToList(); - if (ids.Count == 0) { - return Ok(); - } - await notificationsService.Delete(ids); return Ok(); } diff --git a/UKSF.Api/Controllers/TestController.cs b/UKSF.Api/Controllers/TestController.cs deleted file mode 100644 index 7858d2b8..00000000 --- a/UKSF.Api/Controllers/TestController.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.SignalR; -using Microsoft.Extensions.Hosting; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Signalr.Hubs.Integrations; - -namespace UKSF.Api.Controllers { - [Route("[controller]")] - public class TestController : Controller { - private readonly IHostApplicationLifetime hostApplicationLifetime; - private readonly IHubContext hub; - - public TestController(IHubContext hub, IHostApplicationLifetime hostApplicationLifetime) { - this.hub = hub; - this.hostApplicationLifetime = hostApplicationLifetime; - } - -// [HttpGet] -// public async Task Get() { -// Task unused = Task.Run( -// () => { -// Task.Delay(TimeSpan.FromSeconds(1)); -// hostApplicationLifetime.StopApplication(); -// } -// ); -// return Ok(); -// } - } -} diff --git a/UKSF.Api/Controllers/Utility/DebugController.cs b/UKSF.Api/Controllers/Utility/DebugController.cs new file mode 100644 index 00000000..0cbd17a9 --- /dev/null +++ b/UKSF.Api/Controllers/Utility/DebugController.cs @@ -0,0 +1,29 @@ +using System; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Message; + +namespace UKSF.Api.Controllers.Utility { + [Route("[controller]")] + public class DebugController : Controller { + private readonly INotificationsService notificationsService; + private readonly ISessionService sessionService; + + public DebugController(INotificationsService notificationsService, ISessionService sessionService) { + this.notificationsService = notificationsService; + this.sessionService = sessionService; + } + + [HttpGet("notifications-test"), Authorize] + public IActionResult NotificationsTest() { + notificationsService.Add( + new Notification { + owner = sessionService.GetContextId(), message = $"This is a test notification. The time is {DateTime.Now:HH:mm:ss}", timestamp = DateTime.Now, icon = NotificationIcons.REQUEST + } + ); + return Ok(); + } + } +} diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index 89607095..ae1cda66 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -5,7 +5,6 @@ using FluentAssertions; using Mongo2Go; using MongoDB.Bson; -using MongoDB.Bson.Serialization.Conventions; using MongoDB.Driver; using UKSF.Api.Data; using UKSF.Api.Models.Personnel; diff --git a/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs b/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs index 563a1340..4c93c027 100644 --- a/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs +++ b/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs @@ -1,7 +1,5 @@ using System; -using System.IO; using FluentAssertions; -using UKSF.Api.Models.Game; using UKSF.Api.Models.Mission; using Xunit; From d77e5859327ac1ba21cb8646d5a77db35712183c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 30 May 2020 01:19:54 +0100 Subject: [PATCH 164/369] Remove no longer valid tests --- UKSF.Tests/Unit/Data/DataServiceTests.cs | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/UKSF.Tests/Unit/Data/DataServiceTests.cs b/UKSF.Tests/Unit/Data/DataServiceTests.cs index 9180c242..01107bf5 100644 --- a/UKSF.Tests/Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceTests.cs @@ -37,13 +37,13 @@ public void ShouldThrowForDeleteWhenNoKeyOrNull(string id) { act.Should().Throw(); } - [Fact] - public void ShouldThrowForDeleteManyWhenNoMatchingItems() { - mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); - Func act = async () => await mockDataService.DeleteMany(null); - - act.Should().Throw(); - } + // [Fact] + // public void ShouldThrowForDeleteManyWhenNoMatchingItems() { + // mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); + // Func act = async () => await mockDataService.DeleteMany(null); + // + // act.Should().Throw(); + // } [Theory, InlineData(""), InlineData(null)] public void ShouldGetNothingWhenNoKeyOrNull(string id) { @@ -68,13 +68,13 @@ public void ShouldThrowForReplaceWhenItemNotFound() { act.Should().Throw(); } - [Fact] - public void ShouldThrowForUpdateManyWhenNoMatchingItems() { - mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); - Func act = async () => await mockDataService.UpdateMany(null, null); - - act.Should().Throw(); - } + // [Fact] + // public void ShouldThrowForUpdateManyWhenNoMatchingItems() { + // mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); + // Func act = async () => await mockDataService.UpdateMany(null, null); + // + // act.Should().Throw(); + // } [Theory, InlineData(""), InlineData(null)] public void ShouldThrowForUpdateWithUpdateDefinitionWhenNoKeyOrNull(string id) { From edf7b90cf6835399f1a1f4a770e26e255ca911ef Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 30 May 2020 13:42:51 +0100 Subject: [PATCH 165/369] More unit tests --- UKSF.Api.Services/Admin/MigrationUtility.cs | 37 +------ UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs | 17 +-- UKSF.Tests/Unit/Data/DataServiceTests.cs | 30 ++--- .../Unit/Data/SimpleDataServiceTests.cs | 66 +++++++++++ .../Unit/Data/Units/UnitsDataServiceTests.cs | 41 +++++-- ...eleteExpiredConfirmationCodeActionTests.cs | 53 +++++++++ .../ScheduledActions/PruneLogsActionTests.cs | 79 +++++++++++++ .../TeamspeakSnapshotActionTests.cs | 33 ++++++ .../Services/Utility/SessionServiceTests.cs | 104 ++++++++++++++++++ 9 files changed, 390 insertions(+), 70 deletions(-) create mode 100644 UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs create mode 100644 UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs create mode 100644 UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneLogsActionTests.cs create mode 100644 UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs create mode 100644 UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs diff --git a/UKSF.Api.Services/Admin/MigrationUtility.cs b/UKSF.Api.Services/Admin/MigrationUtility.cs index 9b65c4bf..4bf597c8 100644 --- a/UKSF.Api.Services/Admin/MigrationUtility.cs +++ b/UKSF.Api.Services/Admin/MigrationUtility.cs @@ -45,41 +45,6 @@ public void Migrate() { } // TODO: CHECK BEFORE RELEASE - private static void ExecuteMigration() { - IDataCollectionFactory dataCollectionFactory = ServiceWrapper.Provider.GetService(); - IDataCollection oldDataCollection = dataCollectionFactory.CreateDataCollection("scheduledJobs"); - List oldScheduledJobs = oldDataCollection.Get(); - - ISchedulerDataService schedulerDataService = ServiceWrapper.Provider.GetService(); - - foreach (ScheduledJob newScheduledJob in oldScheduledJobs.Select( - oldScheduledJob => new ScheduledJob { - id = oldScheduledJob.id, - action = oldScheduledJob.action, - actionParameters = oldScheduledJob.actionParameters, - interval = oldScheduledJob.interval, - next = oldScheduledJob.next, - repeat = oldScheduledJob.repeat - } - )) { - schedulerDataService.Delete(newScheduledJob.id).Wait(); - schedulerDataService.Add(newScheduledJob).Wait(); - } - } - } - - public enum ScheduledJobType { - NORMAL, - TEAMSPEAK_SNAPSHOT, - LOG_PRUNE - } - - public class OldScheduledJob : DatabaseObject { - public string action; - public string actionParameters; - public TimeSpan interval; - public DateTime next; - public bool repeat; - public ScheduledJobType type = ScheduledJobType.NORMAL; + private static void ExecuteMigration() { } } } diff --git a/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs index f448f6c4..694c4777 100644 --- a/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs @@ -48,23 +48,18 @@ await TaskUtilities.DelayWithCallback( [Fact] public void ShouldNotCallbackForCancellation() { - bool subject = false; - Action act = () => { - CancellationTokenSource token = new CancellationTokenSource(); - Task unused = TaskUtilities.DelayWithCallback( + CancellationTokenSource token = new CancellationTokenSource(); + Func act = async () => { + await TaskUtilities.DelayWithCallback( TimeSpan.FromMilliseconds(10), token.Token, - () => { - subject = true; - return Task.CompletedTask; - } + null ); - token.Cancel(); }; - act.Should().NotThrow(); + act.Should().NotThrowAsync(); + token.Cancel(); act.ExecutionTime().Should().BeLessThan(TimeSpan.FromMilliseconds(10)); - subject.Should().BeFalse(); } } } diff --git a/UKSF.Tests/Unit/Data/DataServiceTests.cs b/UKSF.Tests/Unit/Data/DataServiceTests.cs index 01107bf5..80ce9cf2 100644 --- a/UKSF.Tests/Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceTests.cs @@ -37,13 +37,14 @@ public void ShouldThrowForDeleteWhenNoKeyOrNull(string id) { act.Should().Throw(); } - // [Fact] - // public void ShouldThrowForDeleteManyWhenNoMatchingItems() { - // mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); - // Func act = async () => await mockDataService.DeleteMany(null); - // - // act.Should().Throw(); - // } + [Fact] + public async Task ShouldDoNothingForDeleteManyWhenNoMatchingItems() { + mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); + + await mockDataService.DeleteMany(null); + + mockDataCollection.Verify(x => x.DeleteManyAsync(It.IsAny>>()), Times.Never); + } [Theory, InlineData(""), InlineData(null)] public void ShouldGetNothingWhenNoKeyOrNull(string id) { @@ -68,13 +69,14 @@ public void ShouldThrowForReplaceWhenItemNotFound() { act.Should().Throw(); } - // [Fact] - // public void ShouldThrowForUpdateManyWhenNoMatchingItems() { - // mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); - // Func act = async () => await mockDataService.UpdateMany(null, null); - // - // act.Should().Throw(); - // } + [Fact] + public async Task ShouldDoNothingForUpdateManyWhenNoMatchingItems() { + mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); + + await mockDataService.UpdateMany(null, null); + + mockDataCollection.Verify(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>()), Times.Never); + } [Theory, InlineData(""), InlineData(null)] public void ShouldThrowForUpdateWithUpdateDefinitionWhenNoKeyOrNull(string id) { diff --git a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs new file mode 100644 index 00000000..52d87f6c --- /dev/null +++ b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs @@ -0,0 +1,66 @@ +using Moq; +using UKSF.Api.Data.Command; +using UKSF.Api.Data.Launcher; +using UKSF.Api.Data.Personnel; +using UKSF.Api.Data.Utility; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Command; +using UKSF.Api.Models.Launcher; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Utility; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Data { + public class SimpleDataServiceTests { + private readonly Mock mockDataCollectionFactory; + + public SimpleDataServiceTests() => mockDataCollectionFactory = new Mock(); + + [Fact] + public void ShouldCreateConfirmationCodeDataCollection() { + Mock> mockDataEventBus = new Mock>(); + + ConfirmationCodeDataService unused = new ConfirmationCodeDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + + mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); + } + + [Fact] + public void ShouldCreateSchedulerDataCollection() { + Mock> mockDataEventBus = new Mock>(); + + SchedulerDataService unused = new SchedulerDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + + mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); + } + + [Fact] + public void ShouldCreateCommandRequestArchiveDataCollection() { + Mock> mockDataEventBus = new Mock>(); + + CommandRequestArchiveDataService unused = new CommandRequestArchiveDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + + mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); + } + + [Fact] + public void ShouldCreateLoaDataCollection() { + Mock> mockDataEventBus = new Mock>(); + + LoaDataService unused = new LoaDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + + mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); + } + + [Fact] + public void ShouldCreateLauncherFileDataCollection() { + Mock> mockDataEventBus = new Mock>(); + + LauncherFileDataService unused = new LauncherFileDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + + mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); + } + } +} diff --git a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index b14fe783..3714d739 100644 --- a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -1,12 +1,14 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using FluentAssertions; using Moq; using UKSF.Api.Data.Units; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Units; using Xunit; -using UUnit = UKSF.Api.Models.Units.Unit; +using UksfUnit = UKSF.Api.Models.Units.Unit; namespace UKSF.Tests.Unit.Unit.Data.Units { public class UnitsDataServiceTests { @@ -14,20 +16,41 @@ public class UnitsDataServiceTests { public void ShouldGetOrderedCollection() { Mock mockDataCollectionFactory = new Mock(); Mock> mockDataEventBus = new Mock>(); - Mock> mockDataCollection = new Mock>(); + Mock> mockDataCollection = new Mock>(); - UUnit rank1 = new UUnit {name = "Air Troop", order = 2}; - UUnit rank2 = new UUnit {name = "UKSF", order = 0}; - UUnit rank3 = new UUnit {name = "SAS", order = 1}; + UksfUnit rank1 = new UksfUnit {name = "Air Troop", order = 2}; + UksfUnit rank2 = new UksfUnit {name = "UKSF", order = 0}; + UksfUnit rank3 = new UksfUnit {name = "SAS", order = 1}; - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); UnitsDataService unitsDataService = new UnitsDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); - List subject = unitsDataService.Get(); + List subject = unitsDataService.Get(); subject.Should().ContainInOrder(rank2, rank3, rank1); } + + [Fact] + public void ShouldGetOrderedCollectionFromPredicate() { + Mock mockDataCollectionFactory = new Mock(); + Mock> mockDataEventBus = new Mock>(); + Mock> mockDataCollection = new Mock>(); + + UksfUnit rank1 = new UksfUnit {name = "Air Troop", order = 3, type = UnitType.SECTION}; + UksfUnit rank2 = new UksfUnit {name = "Boat Troop", order = 2, type = UnitType.SECTION}; + UksfUnit rank3 = new UksfUnit {name = "UKSF", order = 0, type = UnitType.TASKFORCE}; + UksfUnit rank4 = new UksfUnit {name = "SAS", order = 1, type = UnitType.REGIMENT}; + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3, rank4}); + + UnitsDataService unitsDataService = new UnitsDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + + List subject = unitsDataService.Get(x => x.type == UnitType.SECTION); + + subject.Should().ContainInOrder(rank2, rank1); + } } } diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs new file mode 100644 index 00000000..993fa413 --- /dev/null +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs @@ -0,0 +1,53 @@ +using System; +using FluentAssertions; +using MongoDB.Bson; +using Moq; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Interfaces.Utility.ScheduledActions; +using UKSF.Api.Services.Utility.ScheduledActions; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Services.Utility.ScheduledActions { + public class DeleteExpiredConfirmationCodeActionTests { + private readonly Mock mockConfirmationCodeDataService; + private readonly Mock mockConfirmationCodeService; + private IDeleteExpiredConfirmationCodeAction deleteExpiredConfirmationCodeAction; + + public DeleteExpiredConfirmationCodeActionTests() { + mockConfirmationCodeDataService = new Mock(); + mockConfirmationCodeService = new Mock(); + + mockConfirmationCodeService.Setup(x => x.Data).Returns(mockConfirmationCodeDataService.Object); + } + + [Fact] + public void ShouldDeleteCorrectId() { + string id = ObjectId.GenerateNewId().ToString(); + + deleteExpiredConfirmationCodeAction = new DeleteExpiredConfirmationCodeAction(mockConfirmationCodeService.Object); + + deleteExpiredConfirmationCodeAction.Run(id); + + mockConfirmationCodeDataService.Verify(x => x.Delete(id), Times.Once); + } + + [Fact] + public void ShouldReturnActionName() { + deleteExpiredConfirmationCodeAction = new DeleteExpiredConfirmationCodeAction(mockConfirmationCodeService.Object); + + string subject = deleteExpiredConfirmationCodeAction.Name; + + subject.Should().Be("DeleteExpiredConfirmationCodeAction"); + } + + [Fact] + public void ShouldThrowForNoId() { + deleteExpiredConfirmationCodeAction = new DeleteExpiredConfirmationCodeAction(mockConfirmationCodeService.Object); + + Action act = () => deleteExpiredConfirmationCodeAction.Run(); + + act.Should().Throw(); + } + } +} diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneLogsActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneLogsActionTests.cs new file mode 100644 index 00000000..f9446add --- /dev/null +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneLogsActionTests.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using FluentAssertions; +using Moq; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Utility.ScheduledActions; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Services.Utility.ScheduledActions; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Services.Utility.ScheduledActions { + public class PruneLogsActionTests { + private readonly Mock mockDataCollectionFactory; + private IPruneLogsAction pruneLogsAction; + + public PruneLogsActionTests() => mockDataCollectionFactory = new Mock(); + + [Fact] + public void ShouldRemoveOldLogsAndNotifications() { + List mockBasicLogMessageCollection = new List { + new BasicLogMessage("test1"), new BasicLogMessage("test2") { timestamp = DateTime.Now.AddDays(-10) }, new BasicLogMessage("test3") { timestamp = DateTime.Now.AddDays(-6) } + }; + List mockWebLogMessageCollection = new List { + new WebLogMessage(new Exception("error1")), + new WebLogMessage(new Exception("error2")) { timestamp = DateTime.Now.AddDays(-10) }, + new WebLogMessage(new Exception("error3")) { timestamp = DateTime.Now.AddDays(-6) } + }; + List mockAuditLogMessageCollection = new List { + new AuditLogMessage { message = "audit1" }, + new AuditLogMessage { message = "audit2", timestamp = DateTime.Now.AddDays(-100) }, + new AuditLogMessage { message = "audit3", timestamp = DateTime.Now.AddMonths(-2) } + }; + List mockNotificationCollection = new List { + new Notification { message = "notification1" }, + new Notification { message = "notification2", timestamp = DateTime.Now.AddDays(-40) }, + new Notification { message = "notification3", timestamp = DateTime.Now.AddDays(-25) } + }; + + Mock> mockBasicLogMessageDataColection = new Mock>(); + Mock> mockWebLogMessageDataColection = new Mock>(); + Mock> mockAuditLogMessageDataColection = new Mock>(); + Mock> mockNotificationDataColection = new Mock>(); + + mockBasicLogMessageDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) + .Callback>>(x => mockBasicLogMessageCollection.RemoveAll(y => x.Compile()(y))); + mockWebLogMessageDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) + .Callback>>(x => mockWebLogMessageCollection.RemoveAll(y => x.Compile()(y))); + mockAuditLogMessageDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) + .Callback>>(x => mockAuditLogMessageCollection.RemoveAll(y => x.Compile()(y))); + mockNotificationDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) + .Callback>>(x => mockNotificationCollection.RemoveAll(y => x.Compile()(y))); + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("logs")).Returns(mockBasicLogMessageDataColection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("errorLogs")).Returns(mockWebLogMessageDataColection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("auditLogs")).Returns(mockAuditLogMessageDataColection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("notifications")).Returns(mockNotificationDataColection.Object); + + pruneLogsAction = new PruneLogsAction(mockDataCollectionFactory.Object); + + pruneLogsAction.Run(); + + mockBasicLogMessageCollection.Should().NotContain(x => x.message == "test2"); + mockWebLogMessageCollection.Should().NotContain(x => x.message == "error2"); + mockAuditLogMessageCollection.Should().NotContain(x => x.message == "audit2"); + mockNotificationCollection.Should().NotContain(x => x.message == "notification2"); + } + + [Fact] + public void ShouldReturnActionName() { + pruneLogsAction = new PruneLogsAction(mockDataCollectionFactory.Object); + + string subject = pruneLogsAction.Name; + + subject.Should().Be("PruneLogsAction"); + } + } +} diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs new file mode 100644 index 00000000..c3b3e799 --- /dev/null +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs @@ -0,0 +1,33 @@ +using FluentAssertions; +using Moq; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Utility.ScheduledActions; +using UKSF.Api.Services.Utility.ScheduledActions; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Services.Utility.ScheduledActions { + public class TeamspeakSnapshotActionTests { + private readonly Mock mockTeamspeakService; + private ITeamspeakSnapshotAction teamspeakSnapshotAction; + + public TeamspeakSnapshotActionTests() => mockTeamspeakService = new Mock(); + + [Fact] + public void ShouldReturnActionName() { + teamspeakSnapshotAction = new TeamspeakSnapshotAction(mockTeamspeakService.Object); + + string subject = teamspeakSnapshotAction.Name; + + subject.Should().Be("TeamspeakSnapshotAction"); + } + + [Fact] + public void ShouldRunSnapshot() { + teamspeakSnapshotAction = new TeamspeakSnapshotAction(mockTeamspeakService.Object); + + teamspeakSnapshotAction.Run(); + + mockTeamspeakService.Verify(x => x.StoreTeamspeakServerSnapshot(), Times.Once); + } + } +} diff --git a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs new file mode 100644 index 00000000..b78baa81 --- /dev/null +++ b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs @@ -0,0 +1,104 @@ +using System.Collections.Generic; +using System.Security.Claims; +using System.Security.Principal; +using FluentAssertions; +using Microsoft.AspNetCore.Http; +using Moq; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Services.Utility; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Services.Utility { + public class SessionServiceTests { + private readonly Mock mockHttpContextAccessor; + private readonly Mock mockAccountDataService; + private readonly Mock mockAccountService; + private ISessionService sessionService; + private DefaultHttpContext httpContext; + + public SessionServiceTests() { + mockHttpContextAccessor = new Mock(); + mockAccountDataService = new Mock(); + mockAccountService = new Mock(); + + mockHttpContextAccessor.Setup(x => x.HttpContext).Returns(() => httpContext); + mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + } + + [Fact] + public void ShouldGetContextId() { + Account account = new Account(); + List claims = new List {new Claim(ClaimTypes.Sid, account.id, ClaimValueTypes.String)}; + ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); + httpContext = new DefaultHttpContext {User = contextUser}; + + sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); + + string subject = sessionService.GetContextId(); + + subject.Should().Be(account.id); + } + + [Fact] + public void ShouldGetContextEmail() { + Account account = new Account {email = "contact.tim.here@gmail.com"}; + List claims = new List {new Claim(ClaimTypes.Email, account.email)}; + ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); + httpContext = new DefaultHttpContext {User = contextUser}; + + sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); + + string subject = sessionService.GetContextEmail(); + + subject.Should().Be(account.email); + } + + [Fact] + public void ShouldGetCorrectAccount() { + Account account1 = new Account(); + Account account2 = new Account(); + List claims = new List {new Claim(ClaimTypes.Sid, account2.id)}; + ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); + httpContext = new DefaultHttpContext {User = contextUser}; + + mockAccountDataService.Setup(x => x.GetSingle(account1.id)).Returns(account1); + mockAccountDataService.Setup(x => x.GetSingle(account2.id)).Returns(account2); + + sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); + + Account subject = sessionService.GetContextAccount(); + + subject.Should().Be(account2); + } + + [Fact] + public void ShouldReturnTrueForValidRole() { + List claims = new List {new Claim(ClaimTypes.Role, RoleDefinitions.ADMIN)}; + ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); + httpContext = new DefaultHttpContext {User = contextUser}; + + sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); + + bool subject = sessionService.ContextHasRole(RoleDefinitions.ADMIN); + + subject.Should().BeTrue(); + } + + [Fact] + public void ShouldReturnFalseForInvalidRole() { + List claims = new List {new Claim(ClaimTypes.Role, RoleDefinitions.ADMIN)}; + ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); + httpContext = new DefaultHttpContext {User = contextUser}; + + sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); + + bool subject = sessionService.ContextHasRole(RoleDefinitions.COMMAND); + + subject.Should().BeFalse(); + } + } +} From 9278cc8291ad7a1edc7c46185b00a42aaea3c7de Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 30 May 2020 14:00:38 +0100 Subject: [PATCH 166/369] Covered some missing test branches --- .../CommandRequestEventHandlerTests.cs | 8 +- .../CommentThreadEventHandlerTests.cs | 10 +-- .../Handlers/TeamspeakEventHandlerTests.cs | 87 +++++++++++-------- 3 files changed, 56 insertions(+), 49 deletions(-) diff --git a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs index 9e16ffd0..0a65f8ec 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs @@ -68,17 +68,11 @@ public void ShouldRunEventOnUpdateAndAdd() { [Fact] public void ShouldLogOnException() { - Mock> mockHubClients = new Mock>(); - Mock mockClient = new Mock(); - - mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); - mockHubClients.Setup(x => x.All).Returns(mockClient.Object); - mockClient.Setup(x => x.ReceiveRequestUpdate()).Throws(new Exception()); mockLoggingService.Setup(x => x.Log(It.IsAny())); commandRequestEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + dataEventBus.Send(new DataEventModel { type = (DataEventType) 5 }); mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); } diff --git a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs index c0d16573..b5751f5c 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs @@ -18,7 +18,7 @@ public class CommentThreadEventHandlerTests { private readonly CommentThreadEventHandler commentThreadEventHandler; private readonly DataEventBus dataEventBus; private readonly Mock> mockHub; - private Mock mockLoggingService; + private readonly Mock mockLoggingService; public CommentThreadEventHandlerTests() { Mock mockDataCollectionFactory = new Mock(); @@ -91,17 +91,11 @@ public void ShouldRunDeletedOnDelete() { [Fact] public void ShouldLogOnException() { - Mock> mockHubClients = new Mock>(); - Mock mockClient = new Mock(); - - mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); - mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); - mockClient.Setup(x => x.ReceiveComment(It.IsAny())).Throws(new Exception()); mockLoggingService.Setup(x => x.Log(It.IsAny())); commentThreadEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); + dataEventBus.Send(new DataEventModel { type = (DataEventType) 5 }); mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); } diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs index 8d1c96ca..b959ebfc 100644 --- a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -36,6 +36,17 @@ public TeamspeakEventHandlerTests() { teamspeakEventHandler = new TeamspeakEventHandler(signalrEventBus, mockTeamspeakService.Object, mockAccountService.Object, mockTeamspeakGroupService.Object, mockLoggingService.Object); } + [Fact] + public void LogOnException() { + mockLoggingService.Setup(x => x.Log(It.IsAny())); + + teamspeakEventHandler.Init(); + + signalrEventBus.Send(new SignalrEventModel { procedure = (TeamspeakEventType) 9 }); + + mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); + } + [Fact] public void ShouldCorrectlyParseClients() { HashSet subject = new HashSet(); @@ -61,6 +72,25 @@ public void ShouldCorrectlyParseClients() { ); } + [Fact] + public async Task ShouldGetCorrectAccount() { + Account account1 = new Account { teamspeakIdentities = new HashSet { 1 } }; + Account account2 = new Account { teamspeakIdentities = new HashSet { 2 } }; + List mockAccountCollection = new List { account1, account2 }; + Mock mockAccountDataService = new Mock(); + + mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockAccountCollection.FirstOrDefault(x)); + mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(account1, It.IsAny>(), 1)).Returns(Task.CompletedTask); + + teamspeakEventHandler.Init(); + + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + await Task.Delay(TimeSpan.FromSeconds(1)); + + mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); + } + [Fact] public void ShouldNotRunEventOnEmpty() { mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); @@ -102,6 +132,26 @@ public async Task ShouldRunClientGroupsUpdate() { mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5 }, 1), Times.Once); } + [Fact] + public async Task ShouldRunClientGroupsUpdateTwiceForTwoEventsWithDelay() { + Account account = new Account { teamspeakIdentities = new HashSet { 1 } }; + Mock mockAccountDataService = new Mock(); + + mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); + mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); + + teamspeakEventHandler.Init(); + + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + await Task.Delay(TimeSpan.FromSeconds(1)); + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); + await Task.Delay(TimeSpan.FromSeconds(1)); + + mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5 }, 1), Times.Once); + mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 10 }, 1), Times.Once); + } + [Fact] public async Task ShouldRunSingleClientGroupsUpdateForEachClient() { Account account1 = new Account { teamspeakIdentities = new HashSet { 1 } }; @@ -119,8 +169,8 @@ public async Task ShouldRunSingleClientGroupsUpdateForEachClient() { signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 2, \"serverGroupId\": 10}" }); await Task.Delay(TimeSpan.FromSeconds(2)); - mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List {5}, 1), Times.Once); - mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account2, new List {10}, 2), Times.Once); + mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); + mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account2, new List { 10 }, 2), Times.Once); } [Fact] @@ -141,27 +191,7 @@ public async Task ShouldRunSingleClientGroupsUpdateForMultipleEventsWithOneClien Act2(); await Task.Delay(TimeSpan.FromSeconds(1)); - mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List {5, 10}, 1), Times.Once); - } - - [Fact] - public async Task ShouldRunClientGroupsUpdateTwiceForTwoEventsWithDelay() { - Account account = new Account { teamspeakIdentities = new HashSet { 1 } }; - Mock mockAccountDataService = new Mock(); - - mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); - mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); - mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); - - teamspeakEventHandler.Init(); - - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); - await Task.Delay(TimeSpan.FromSeconds(1)); - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); - await Task.Delay(TimeSpan.FromSeconds(1)); - - mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List {5}, 1), Times.Once); - mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List {10}, 1), Times.Once); + mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5, 10 }, 1), Times.Once); } [Fact] @@ -176,16 +206,5 @@ public void ShouldRunUpdateClients() { mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Once); } - - [Fact] - public void LogOnException() { - mockLoggingService.Setup(x => x.Log(It.IsAny())); - - teamspeakEventHandler.Init(); - - signalrEventBus.Send(new SignalrEventModel { procedure = (TeamspeakEventType) 9 }); - - mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); - } } } From 6c6ef05f409015d58e6ad0d70bd123aba1d78196 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 30 May 2020 14:20:15 +0100 Subject: [PATCH 167/369] Cover extra branches in teamspeak event handler tests --- .../Handlers/TeamspeakEventHandlerTests.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs index b959ebfc..c57fdb04 100644 --- a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -36,6 +36,24 @@ public TeamspeakEventHandlerTests() { teamspeakEventHandler = new TeamspeakEventHandler(signalrEventBus, mockTeamspeakService.Object, mockAccountService.Object, mockTeamspeakGroupService.Object, mockLoggingService.Object); } + [Theory, InlineData(2), InlineData(-1)] + public async Task ShouldGetNoAccountForNoMatchingIdsOrNull(double id) { + Account account = new Account { teamspeakIdentities = Math.Abs(id - -1) < 0.01 ? null : new HashSet { id } }; + List mockAccountCollection = new List { account }; + Mock mockAccountDataService = new Mock(); + + mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockAccountCollection.FirstOrDefault(x)); + mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())).Returns(Task.CompletedTask); + + teamspeakEventHandler.Init(); + + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + await Task.Delay(TimeSpan.FromSeconds(1)); + + mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(null, new List { 5 }, 1), Times.Once); + } + [Fact] public void LogOnException() { mockLoggingService.Setup(x => x.Log(It.IsAny())); From cb22411f3458bcd243b3d96b55ebf6992ff21e0e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 31 May 2020 23:53:59 +0100 Subject: [PATCH 168/369] Experimentation with controller validation - Added guard utilities to validate some different data types, with tests - Fix teamspeak connection erroring in the wrong place - Data service performs id validation where necessary - Data service assumes data should be correct from the calling source thus throws errors for invalid ids - Added data validation to teamspeak connection endpoints --- UKSF.Api.Data/DataService.cs | 17 ++++-- .../Teamspeak/TeamspeakService.cs | 6 ++- .../Accounts/CommunicationsController.cs | 52 +++++++++---------- UKSF.Common/DataUtilies.cs | 3 ++ UKSF.Common/GuardUtilites.cs | 26 ++++++++++ UKSF.Tests/Unit/Common/GuardUtilitesTests.cs | 45 ++++++++++++++++ UKSF.Tests/Unit/Data/DataServiceTests.cs | 20 +++---- .../Utility/ConfirmationCodeServiceTests.cs | 4 +- 8 files changed, 128 insertions(+), 45 deletions(-) create mode 100644 UKSF.Common/GuardUtilites.cs create mode 100644 UKSF.Tests/Unit/Common/GuardUtilitesTests.cs diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index 897a8304..68f2fc8f 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using MongoDB.Bson; using MongoDB.Driver; using UKSF.Api.Events.Data; using UKSF.Api.Interfaces.Data; @@ -18,7 +19,10 @@ public abstract class DataService : DataEventBacker, IDataServi public virtual List Get(Func predicate) => dataCollection.Get(predicate); - public virtual T GetSingle(string id) => dataCollection.GetSingle(id); + public virtual T GetSingle(string id) { + ValidateId(id); + return dataCollection.GetSingle(id); + } public virtual T GetSingle(Func predicate) => dataCollection.GetSingle(predicate); @@ -29,14 +33,14 @@ public virtual async Task Add(T data) { } public virtual async Task Update(string id, string fieldName, object value) { - if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); + ValidateId(id); UpdateDefinition update = value == null ? Builders.Update.Unset(fieldName) : Builders.Update.Set(fieldName, value); await dataCollection.UpdateAsync(id, update); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public virtual async Task Update(string id, UpdateDefinition update) { // TODO: Remove strong typing to UpdateDefinition - if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); + ValidateId(id); await dataCollection.UpdateAsync(id, update); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } @@ -55,7 +59,7 @@ public virtual async Task Replace(T item) { } public virtual async Task Delete(string id) { - if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); + ValidateId(id); await dataCollection.DeleteAsync(id); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } @@ -66,5 +70,10 @@ public virtual async Task DeleteMany(Func predicate) { await dataCollection.DeleteManyAsync(x => predicate(x)); items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, x.GetIdValue()))); } + + private static void ValidateId(string id) { + if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); + if (!ObjectId.TryParse(id, out ObjectId _)) throw new KeyNotFoundException("Key must be valid"); + } } } diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs index 6b992c92..e0a4c55d 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs @@ -4,6 +4,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; +using Microsoft.Extensions.Hosting; using MongoDB.Driver; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Integrations.Teamspeak; @@ -17,12 +18,14 @@ public class TeamspeakService : ITeamspeakService { private readonly IMongoDatabase database; private readonly IHubContext teamspeakClientsHub; private readonly ITeamspeakManagerService teamspeakManagerService; + private readonly IHostEnvironment environment; private HashSet clients = new HashSet(); - public TeamspeakService(IMongoDatabase database, IHubContext teamspeakClientsHub, ITeamspeakManagerService teamspeakManagerService) { + public TeamspeakService(IMongoDatabase database, IHubContext teamspeakClientsHub, ITeamspeakManagerService teamspeakManagerService, IHostEnvironment environment) { this.database = database; this.teamspeakClientsHub = teamspeakClientsHub; this.teamspeakManagerService = teamspeakManagerService; + this.environment = environment; } public HashSet GetOnlineTeamspeakClients() => clients; @@ -69,6 +72,7 @@ public async Task Shutdown() { } public object GetFormattedClients() { + if (environment.IsDevelopment()) return new List {new {name = $"SqnLdr.Beswick.T", clientDbId = (double) 2}}; return clients.Count == 0 ? null : clients.Where(x => x != null).Select(x => new {name = $"{x.clientName}", x.clientDbId}).ToList(); } diff --git a/UKSF.Api/Controllers/Accounts/CommunicationsController.cs b/UKSF.Api/Controllers/Accounts/CommunicationsController.cs index 51e908fa..42fcd853 100644 --- a/UKSF.Api/Controllers/Accounts/CommunicationsController.cs +++ b/UKSF.Api/Controllers/Accounts/CommunicationsController.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; @@ -40,48 +41,43 @@ INotificationsService notificationsService [HttpPost("send"), Authorize] public async Task SendCode([FromBody] JObject body) { - string mode = body["mode"]?.ToString(); - if (string.IsNullOrEmpty(mode)) { - return BadRequest(new { error = $"Code mode '{mode}' not given" }); - } + string mode = body.GetValueFromBody("mode"); + string data = body.GetValueFromBody("data"); - string data = body["data"]?.ToString(); - if (string.IsNullOrEmpty(mode)) { - return BadRequest(new { error = $"Code data '{data}' not given" }); + try { + GuardUtilites.ValidateString(mode, _ => throw new ArgumentException("Mode is invalid")); + GuardUtilites.ValidateString(data, _ => throw new ArgumentException("Data is invalid")); + } catch (ArgumentException exception) { + return BadRequest(new { error = exception.Message }); } return mode switch { "teamspeak" => await SendTeamspeakCode(data), - _ => BadRequest(new { error = $"Code mode '{mode}' not recognized" }) + _ => BadRequest(new { error = $"Mode '{mode}' not recognized" }) }; } [HttpPost("receive"), Authorize] public async Task ReceiveCode([FromBody] JObject body) { - string mode = body["mode"]?.ToString(); - if (string.IsNullOrEmpty(mode)) { - return BadRequest(new { error = $"Code mode '{mode}' not given" }); - } - - string id = body["id"]?.ToString(); - if (string.IsNullOrEmpty(id)) { - return BadRequest(new { error = $"Code id '{id}' not given" }); - } - - string code = body["code"]?.ToString(); - if (string.IsNullOrEmpty(code)) { - return BadRequest(new { error = $"Code '{code}' not given" }); - } + string id = body.GetValueFromBody("id"); + string code = body.GetValueFromBody("code"); + string mode = body.GetValueFromBody("mode"); + string data = body.GetValueFromBody("data"); + string[] dataArray = data.Split(','); - string dataString = body["data"]?.ToString(); - if (string.IsNullOrEmpty(dataString)) { - return BadRequest(new { error = $"Code data '{dataString}' not given" }); + try { + GuardUtilites.ValidateId(id, _ => throw new ArgumentException($"Id '{id}' is invalid")); + GuardUtilites.ValidateId(code, _ => throw new ArgumentException($"Code '{code}' is invalid. Please try again")); + GuardUtilites.ValidateString(mode, _ => throw new ArgumentException("Mode is invalid")); + GuardUtilites.ValidateString(data, _ => throw new ArgumentException("Data is invalid")); + GuardUtilites.ValidateArray(dataArray, x => x.Length > 0, x => true, () => throw new ArgumentException("Data array is empty")); + } catch (ArgumentException exception) { + return BadRequest(new { error = exception.Message }); } - string[] data = dataString.Split(','); return mode switch { - "teamspeak" => await ReceiveTeamspeakCode(id, code, data[0]), - _ => BadRequest(new { error = $"Code mode '{mode}' not recognized" }) + "teamspeak" => await ReceiveTeamspeakCode(id, code, dataArray[0]), + _ => BadRequest(new { error = $"Mode '{mode}' not recognized" }) }; } diff --git a/UKSF.Common/DataUtilies.cs b/UKSF.Common/DataUtilies.cs index 6d2e4a3c..2264d5a1 100644 --- a/UKSF.Common/DataUtilies.cs +++ b/UKSF.Common/DataUtilies.cs @@ -1,4 +1,5 @@ using System.Reflection; +using Newtonsoft.Json.Linq; namespace UKSF.Common { public static class DataUtilies { @@ -7,5 +8,7 @@ public static string GetIdValue(this T data) { if (id == null) return ""; return id.GetValue(data) as string; } + + public static string GetValueFromBody(this JObject body, string key) => body[key]?.ToString(); } } diff --git a/UKSF.Common/GuardUtilites.cs b/UKSF.Common/GuardUtilites.cs new file mode 100644 index 00000000..4d85efed --- /dev/null +++ b/UKSF.Common/GuardUtilites.cs @@ -0,0 +1,26 @@ +using System; +using System.Linq; +using MongoDB.Bson; + +namespace UKSF.Common { + public static class GuardUtilites { + public static void ValidateString(string text, Action onInvalid) { + if (string.IsNullOrEmpty(text)) onInvalid(text); + } + + public static void ValidateId(string id, Action onInvalid) { + if (string.IsNullOrEmpty(id)) onInvalid(id); + if (!ObjectId.TryParse(id, out ObjectId _)) onInvalid(id); + } + + public static void ValidateArray(T[] array, Func validate, Func elementValidate, Action onInvalid) { + if (!validate(array)) onInvalid(); + if (array.Any(x => !elementValidate(x))) onInvalid(); + } + + public static void ValidateIdArray(string[] array, Func validate, Action onInvalid, Action onIdInvalid) { + if (!validate(array)) onInvalid(); + Array.ForEach(array, x => ValidateId(x, onIdInvalid)); + } + } +} diff --git a/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs b/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs new file mode 100644 index 00000000..fb7bbbb8 --- /dev/null +++ b/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs @@ -0,0 +1,45 @@ +using FluentAssertions; +using UKSF.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Common { + public class GuardUtilitesTests { + [Theory, InlineData("", false), InlineData(null, false), InlineData("1", false), InlineData("5ed43018bea2f1945440f37d", true)] + public void ShouldValidateIdCorrectly(string id, bool valid) { + bool subject = true; + + GuardUtilites.ValidateId(id, _ => subject = false); + + subject.Should().Be(valid); + } + + [Theory, InlineData(new[] { 2, 4, 6, 8, 10, 12 }, false), InlineData(new[] { 2, 4, 5, 6, 8 }, false), InlineData(new[] { 2, 4, 6, 8, 10 }, true)] + public void ShouldValidateArrayCorrectly(int[] array, bool valid) { + bool subject = true; + + GuardUtilites.ValidateArray(array, x => x.Length == 5, x => x % 2 == 0, () => subject = false); + + subject.Should().Be(valid); + } + + [Theory, InlineData("", false), InlineData(null, false), InlineData("1", true)] + public void ShouldValidateStringCorrectly(string text, bool valid) { + bool subject = true; + + GuardUtilites.ValidateString(text, _ => subject = false); + + subject.Should().Be(valid); + } + + [Theory, InlineData(new[] { "" }, false, false), InlineData(new[] { "", "2" }, true, false), InlineData(new[] { "5ed43018bea2f1945440f37d", "2" }, true, false), InlineData(new[] { "5ed43018bea2f1945440f37d", "5ed43018bea2f1945440f37e" }, true, true)] + public void ShouldValidateIdArrayCorrectly(string[] array, bool valid, bool idValid) { + bool subject = true; + bool subjectId = true; + + GuardUtilites.ValidateIdArray(array, x => x.Length == 2, () => subject = false, _ => subjectId = false); + + subject.Should().Be(valid); + subjectId.Should().Be(idValid); + } + } +} diff --git a/UKSF.Tests/Unit/Data/DataServiceTests.cs b/UKSF.Tests/Unit/Data/DataServiceTests.cs index 80ce9cf2..b153097b 100644 --- a/UKSF.Tests/Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceTests.cs @@ -30,8 +30,8 @@ public DataServiceTests() { mockDataService = new MockDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); } - [Theory, InlineData(""), InlineData(null)] - public void ShouldThrowForDeleteWhenNoKeyOrNull(string id) { + [Theory, InlineData(""), InlineData("1"), InlineData(null)] + public void ShouldThrowForDeleteForInvalidKey(string id) { Func act = async () => await mockDataService.Delete(id); act.Should().Throw(); @@ -46,15 +46,15 @@ public async Task ShouldDoNothingForDeleteManyWhenNoMatchingItems() { mockDataCollection.Verify(x => x.DeleteManyAsync(It.IsAny>>()), Times.Never); } - [Theory, InlineData(""), InlineData(null)] - public void ShouldGetNothingWhenNoKeyOrNull(string id) { - MockDataModel subject = mockDataService.GetSingle(id); + [Theory, InlineData(""), InlineData("1"), InlineData(null)] + public void ShouldThrowForInvalidKey(string id) { + Action act = () => mockDataService.GetSingle(id); - subject.Should().Be(null); + act.Should().Throw(); } - [Theory, InlineData(""), InlineData(null)] - public void ShouldThrowForUpdateWhenNoKeyOrNull(string id) { + [Theory, InlineData(""), InlineData("1"), InlineData(null)] + public void ShouldThrowForUpdateForInvalidKey(string id) { Func act = async () => await mockDataService.Update(id, "Name", null); act.Should().Throw(); @@ -78,8 +78,8 @@ public async Task ShouldDoNothingForUpdateManyWhenNoMatchingItems() { mockDataCollection.Verify(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>()), Times.Never); } - [Theory, InlineData(""), InlineData(null)] - public void ShouldThrowForUpdateWithUpdateDefinitionWhenNoKeyOrNull(string id) { + [Theory, InlineData(""), InlineData("1"), InlineData(null)] + public void ShouldThrowForUpdateWithUpdateDefinitionForInvalidKey(string id) { Func act = async () => await mockDataService.Update(id, Builders.Update.Set(x => x.Name, "2")); act.Should().Throw(); diff --git a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs index 46d4c3fc..c791d382 100644 --- a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs @@ -24,8 +24,8 @@ public ConfirmationCodeServiceTests() { confirmationCodeService = new ConfirmationCodeService(mockConfirmationCodeDataService.Object, mockSchedulerService.Object); } - [Theory, InlineData(""), InlineData(null)] - public async Task ShouldReturnEmptyStringWhenNoIdOrNull(string id) { + [Theory, InlineData(""), InlineData("1"), InlineData(null)] + public async Task ShouldReturnEmptyStringWhenBadIdOrNull(string id) { mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); string subject = await confirmationCodeService.GetConfirmationCode(id); From 445c27098aa5b8470ce9c6ea6764e4766ad250c8 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 4 Jun 2020 12:44:21 +0100 Subject: [PATCH 169/369] Few more tests --- UKSF.Api.sln.DotSettings | 1 + UKSF.Common/DataUtilies.cs | 2 +- UKSF.Tests/Unit/Common/DataUtilitiesTests.cs | 28 +++++++++++++ .../Services/Personnel/LoaServiceTests.cs | 39 +++++++++++++++++++ 4 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index 9dc78645..9e0efca1 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -98,6 +98,7 @@ False True 80 + 10 END_OF_LINE NEVER diff --git a/UKSF.Common/DataUtilies.cs b/UKSF.Common/DataUtilies.cs index 2264d5a1..dba3f488 100644 --- a/UKSF.Common/DataUtilies.cs +++ b/UKSF.Common/DataUtilies.cs @@ -9,6 +9,6 @@ public static string GetIdValue(this T data) { return id.GetValue(data) as string; } - public static string GetValueFromBody(this JObject body, string key) => body[key]?.ToString(); + public static string GetValueFromBody(this JObject body, string key) => body[key] != null ? body[key].ToString() : string.Empty; } } diff --git a/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs b/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs index a2c25455..e74786b8 100644 --- a/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using FluentAssertions; +using Newtonsoft.Json.Linq; using UKSF.Common; using UKSF.Tests.Unit.Common; using Xunit; @@ -36,5 +37,32 @@ public void ShouldReturnIdWithinOneSecond() { act.ExecutionTime().Should().BeLessThan(TimeSpan.FromSeconds(1)); } + + [Fact] + public void ShouldGetCorrectValueFromBody() { + JObject jObject = JObject.Parse("{\"key1\":\"item1\", \"key2\":\"item2\"}"); + + string subject = jObject.GetValueFromBody("key2"); + + subject.Should().Be("item2"); + } + + [Fact] + public void ShouldGetValueAsStringFromBody() { + JObject jObject = JObject.Parse("{\"key\":2}"); + + string subject = jObject.GetValueFromBody("key"); + + subject.Should().Be("2"); + } + + [Fact] + public void ShouldReturnEmptyStringFromBodyForInvalidKey() { + JObject jObject = JObject.Parse("{\"key\":\"value\"}"); + + string subject = jObject.GetValueFromBody("notthekey"); + + subject.Should().Be(string.Empty); + } } } diff --git a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs new file mode 100644 index 00000000..7c5ea80f --- /dev/null +++ b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using FluentAssertions; +using Moq; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Personnel; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Services.Personnel { + public class LoaServiceTests { + private readonly ILoaService loaService; + private readonly Mock mockLoaDataService; + + public LoaServiceTests() { + mockLoaDataService = new Mock(); + + loaService = new LoaService(mockLoaDataService.Object); + } + + [Fact] + public void ShouldGetCorrectLoas() { + Loa loa1 = new Loa { recipient = "5ed524b04f5b532a5437bba1", end = DateTime.Now.AddDays(-5) }; + Loa loa2 = new Loa { recipient = "5ed524b04f5b532a5437bba1", end = DateTime.Now.AddDays(-35) }; + Loa loa3 = new Loa { recipient = "5ed524b04f5b532a5437bba2", end = DateTime.Now.AddDays(-45) }; + Loa loa4 = new Loa { recipient = "5ed524b04f5b532a5437bba2", end = DateTime.Now.AddDays(-30).AddSeconds(1) }; + Loa loa5 = new Loa { recipient = "5ed524b04f5b532a5437bba3", end = DateTime.Now.AddDays(-5) }; + List mockCollection = new List { loa1, loa2, loa3, loa4, loa5 }; + + mockLoaDataService.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockCollection.Where(x).ToList()); + + IEnumerable subject = loaService.Get(new List { "5ed524b04f5b532a5437bba1", "5ed524b04f5b532a5437bba2" }); + + subject.Should().Contain(new List { loa1, loa4 }); + } + } +} From 25edeb0c17e15bae0cc9db88dc4795a587502079 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 9 Jun 2020 12:31:03 +0100 Subject: [PATCH 170/369] Update to use variables for unit lookups - Renamed SR1 permissions to recruiter - Renamed SR10 permissions to personnel - Renamed SR5 permissions to servers - Use variable role id lookup to get units for permissions --- .../Personnel/IRecruitmentService.cs | 6 +-- UKSF.Api.Models/Command/ChainOfCommandMode.cs | 4 +- UKSF.Api.Models/Message/CommentThread.cs | 2 +- UKSF.Api.Models/Personnel/ExtendedAccount.cs | 8 ++-- .../Command/ChainOfCommandService.cs | 10 ++--- UKSF.Api.Services/Personnel/LoginService.cs | 23 +++++----- .../Personnel/RecruitmentService.cs | 22 +++++----- .../Personnel/RoleDefinitions.cs | 8 ++-- .../Accounts/AccountsController.cs | 8 ++-- .../Controllers/ApplicationsController.cs | 8 ++-- .../CommandRequestsController.cs | 44 +++++++++++++++---- .../CommandRequestsCreationController.cs | 6 +-- .../Controllers/CommentThreadController.cs | 2 +- UKSF.Api/Controllers/DischargesController.cs | 38 +++++++++++++--- UKSF.Api/Controllers/GameServersController.cs | 2 +- UKSF.Api/Controllers/RecruitmentController.cs | 22 +++++----- .../Services/Personnel/RoleAttributeTests.cs | 2 +- UKSF.Tests/testdata/units.json | 8 ++-- 18 files changed, 141 insertions(+), 82 deletions(-) diff --git a/UKSF.Api.Interfaces/Personnel/IRecruitmentService.cs b/UKSF.Api.Interfaces/Personnel/IRecruitmentService.cs index 84323dc2..1f3825fd 100644 --- a/UKSF.Api.Interfaces/Personnel/IRecruitmentService.cs +++ b/UKSF.Api.Interfaces/Personnel/IRecruitmentService.cs @@ -8,11 +8,11 @@ public interface IRecruitmentService { object GetAllApplications(); JObject GetApplication(Account account); object GetActiveRecruiters(); - IEnumerable GetSr1Members(bool skipSort = false); - Dictionary GetSr1Leads(); + IEnumerable GetRecruiters(bool skipSort = false); + Dictionary GetRecruiterLeads(); object GetStats(string account, bool monthly); string GetRecruiter(); - bool IsAccountSr1Lead(Account account = null); + bool IsRecruiterLead(Account account = null); bool IsRecruiter(Account account); Task SetRecruiter(string id, string newRecruiter); } diff --git a/UKSF.Api.Models/Command/ChainOfCommandMode.cs b/UKSF.Api.Models/Command/ChainOfCommandMode.cs index eb1d4a13..ba157936 100644 --- a/UKSF.Api.Models/Command/ChainOfCommandMode.cs +++ b/UKSF.Api.Models/Command/ChainOfCommandMode.cs @@ -4,9 +4,9 @@ public enum ChainOfCommandMode { NEXT_COMMANDER, NEXT_COMMANDER_EXCLUDE_SELF, COMMANDER_AND_ONE_ABOVE, - COMMANDER_AND_SR10, + COMMANDER_AND_PERSONNEL, COMMANDER_AND_TARGET_COMMANDER, - SR10, + PERSONNEL, TARGET_COMMANDER } } diff --git a/UKSF.Api.Models/Message/CommentThread.cs b/UKSF.Api.Models/Message/CommentThread.cs index e5c8538a..bdff8301 100644 --- a/UKSF.Api.Models/Message/CommentThread.cs +++ b/UKSF.Api.Models/Message/CommentThread.cs @@ -4,7 +4,7 @@ namespace UKSF.Api.Models.Message { public enum ThreadMode { ALL, - SR1, + RECRUITER, RANKSUPERIOR, RANKEQUAL, RANKSUPERIOROREQUAL diff --git a/UKSF.Api.Models/Personnel/ExtendedAccount.cs b/UKSF.Api.Models/Personnel/ExtendedAccount.cs index 0ca5e920..b14b50c4 100644 --- a/UKSF.Api.Models/Personnel/ExtendedAccount.cs +++ b/UKSF.Api.Models/Personnel/ExtendedAccount.cs @@ -1,10 +1,10 @@ namespace UKSF.Api.Models.Personnel { public class ExtendedAccount : Account { public string displayName; - public bool permissionSr1; - public bool permissionSr5; - public bool permissionSr10; - public bool permissionSr1Lead; + public bool permissionRecruiter; + public bool permissionRecruiterLead; + public bool permissionServers; + public bool permissionPersonnel; public bool permissionCommand; public bool permissionAdmin; public bool permissionNco; diff --git a/UKSF.Api.Services/Command/ChainOfCommandService.cs b/UKSF.Api.Services/Command/ChainOfCommandService.cs index 793d0e9d..2c97835d 100644 --- a/UKSF.Api.Services/Command/ChainOfCommandService.cs +++ b/UKSF.Api.Services/Command/ChainOfCommandService.cs @@ -57,9 +57,9 @@ private IEnumerable ResolveMode(ChainOfCommandMode mode, Unit start, Uni ChainOfCommandMode.NEXT_COMMANDER => GetNextCommander(start), ChainOfCommandMode.NEXT_COMMANDER_EXCLUDE_SELF => GetNextCommanderExcludeSelf(start), ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE => CommanderAndOneAbove(start), - ChainOfCommandMode.COMMANDER_AND_SR10 => GetCommanderAndSr10(start), + ChainOfCommandMode.COMMANDER_AND_PERSONNEL => GetCommanderAndPersonnel(start), ChainOfCommandMode.COMMANDER_AND_TARGET_COMMANDER => GetCommanderAndTargetCommander(start, target), - ChainOfCommandMode.SR10 => GetSr10(), + ChainOfCommandMode.PERSONNEL => GetPersonnel(), ChainOfCommandMode.TARGET_COMMANDER => GetNextCommander(target), _ => throw new InvalidOperationException("Chain of command mode not recognized") }; @@ -98,17 +98,17 @@ private IEnumerable CommanderAndOneAbove(Unit unit) { return chain; } - private IEnumerable GetCommanderAndSr10(Unit unit) { + private IEnumerable GetCommanderAndPersonnel(Unit unit) { HashSet chain = new HashSet(); if (UnitHasCommander(unit)) { chain.Add(GetCommander(unit)); } - chain.UnionWith(GetSr10()); + chain.UnionWith(GetPersonnel()); return chain; } - private IEnumerable GetSr10() => unitsService.Data.GetSingle(x => x.shortname == "SR10").members.ToHashSet(); + private IEnumerable GetPersonnel() => unitsService.Data.GetSingle(x => x.shortname == "SR7").members.ToHashSet(); private IEnumerable GetCommanderAndTargetCommander(Unit unit, Unit targetUnit) => new HashSet {GetNextUnitCommander(unit), GetNextUnitCommander(targetUnit)}; diff --git a/UKSF.Api.Services/Personnel/LoginService.cs b/UKSF.Api.Services/Personnel/LoginService.cs index 99eb235f..4f94e258 100644 --- a/UKSF.Api.Services/Personnel/LoginService.cs +++ b/UKSF.Api.Services/Personnel/LoginService.cs @@ -9,6 +9,7 @@ using UKSF.Api.Interfaces.Units; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Admin; namespace UKSF.Api.Services.Personnel { public class LoginService : ILoginService { @@ -75,28 +76,30 @@ private void ResolveRoles(ICollection claims, Account account) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.ADMIN)); } - if (unitsService.MemberHasAnyRole(account.id) || admin) { + if (admin || unitsService.MemberHasAnyRole(account.id)) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.COMMAND)); } - if (account.rank != null && ranksService.IsSuperiorOrEqual(account.rank, "Senior Aircraftman") || admin) { + if (admin || account.rank != null && ranksService.IsSuperiorOrEqual(account.rank, "Senior Aircraftman")) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.NCO)); } - if (recruitmentService.IsAccountSr1Lead(account) || admin) { - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SR1_LEAD)); + if (admin || recruitmentService.IsRecruiterLead(account)) { + claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.RECRUITER_LEAD)); } - if (recruitmentService.IsRecruiter(account) || admin) { - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SR1)); + if (admin || recruitmentService.IsRecruiter(account)) { + claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.RECRUITER)); } - if (unitsService.Data.GetSingle(x => x.shortname == "SR10").members.Contains(account.id) || admin) { - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SR10)); + string personnelId = VariablesWrapper.VariablesDataService().GetSingle("ROLE_ID_PERSONNEL").AsString(); + if (admin || unitsService.Data.GetSingle(personnelId).members.Contains(account.id)) { + claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.PERSONNEL)); } - if (unitsService.Data.GetSingle(x => x.shortname == "SR5").members.Contains(account.id) || admin) { - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SR5)); + string[] missionsId = VariablesWrapper.VariablesDataService().GetSingle("ROLE_ID_MISSIONS").AsArray(); + if (admin || unitsService.Data.GetSingle(x => missionsId.Contains(x.id)).members.Contains(account.id)) { + claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SERVERS)); } break; diff --git a/UKSF.Api.Services/Personnel/RecruitmentService.cs b/UKSF.Api.Services/Personnel/RecruitmentService.cs index 06035fad..a21f42d1 100644 --- a/UKSF.Api.Services/Personnel/RecruitmentService.cs +++ b/UKSF.Api.Services/Personnel/RecruitmentService.cs @@ -11,6 +11,7 @@ using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Units; +using UKSF.Api.Services.Admin; using UKSF.Common; namespace UKSF.Api.Services.Personnel { @@ -44,12 +45,12 @@ IUnitsService unitsService this.discordService = discordService; } - public bool IsRecruiter(Account account) => GetSr1Members(true).Any(x => x.id == account.id); + public bool IsRecruiter(Account account) => GetRecruiters(true).Any(x => x.id == account.id); - public Dictionary GetSr1Leads() => GetSr1Group().roles; + public Dictionary GetRecruiterLeads() => GetRecruiterUnit().roles; - public IEnumerable GetSr1Members(bool skipSort = false) { - IEnumerable members = unitsService.Data.GetSingle(x => x.name == "SR1 Recruitment").members; + public IEnumerable GetRecruiters(bool skipSort = false) { + IEnumerable members = GetRecruiterUnit().members; List accounts = members.Select(x => accountService.Data.GetSingle(x)).ToList(); if (skipSort) return accounts; return accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname); @@ -74,7 +75,7 @@ public object GetAllApplications() { } } - foreach (Account account in GetSr1Members(true)) { + foreach (Account account in GetRecruiters(true)) { recruiters.Add(displayNameService.GetDisplayName(account)); } @@ -103,9 +104,9 @@ public JObject GetApplication(Account account) { ); } - public object GetActiveRecruiters() => GetSr1Members().Where(x => x.settings.sr1Enabled).Select(x => JObject.FromObject(new {value = x.id, viewValue = displayNameService.GetDisplayName(x)})); + public object GetActiveRecruiters() => GetRecruiters().Where(x => x.settings.sr1Enabled).Select(x => JObject.FromObject(new {value = x.id, viewValue = displayNameService.GetDisplayName(x)})); - public bool IsAccountSr1Lead(Account account = null) => account != null ? GetSr1Group().roles.ContainsValue(account.id) : GetSr1Group().roles.ContainsValue(sessionService.GetContextId()); + public bool IsRecruiterLead(Account account = null) => account != null ? GetRecruiterUnit().roles.ContainsValue(account.id) : GetRecruiterUnit().roles.ContainsValue(sessionService.GetContextId()); public async Task SetRecruiter(string id, string newRecruiter) { await accountService.Data.Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiter)); @@ -140,7 +141,7 @@ public object GetStats(string account, bool monthly) { } public string GetRecruiter() { - List recruiters = GetSr1Members().Where(x => x.settings.sr1Enabled).ToList(); + List recruiters = GetRecruiters().Where(x => x.settings.sr1Enabled).ToList(); List waiting = accountService.Data.Get(x => x.application != null && x.application.state == ApplicationState.WAITING); List complete = accountService.Data.Get(x => x.application != null && x.application.state != ApplicationState.WAITING); var unsorted = recruiters.Select(x => new {x.id, complete = complete.Count(y => y.application.recruiter == x.id), waiting = waiting.Count(y => y.application.recruiter == x.id)}); @@ -148,8 +149,9 @@ public string GetRecruiter() { return sorted.First().id; } - private Unit GetSr1Group() { - return unitsService.Data.Get(x => x.name == "SR1 Recruitment").FirstOrDefault(); + private Unit GetRecruiterUnit() { + string id = VariablesWrapper.VariablesDataService().GetSingle("ROLE_ID_RECRUITMENT").AsString(); + return unitsService.Data.GetSingle(id); } private JObject GetCompletedApplication(Account account) => diff --git a/UKSF.Api.Services/Personnel/RoleDefinitions.cs b/UKSF.Api.Services/Personnel/RoleDefinitions.cs index c792f6be..bcfac5b7 100644 --- a/UKSF.Api.Services/Personnel/RoleDefinitions.cs +++ b/UKSF.Api.Services/Personnel/RoleDefinitions.cs @@ -9,10 +9,10 @@ public static class RoleDefinitions { public const string DISCHARGED = "DISCHARGED"; public const string MEMBER = "MEMBER"; public const string NCO = "NCO"; - public const string SR1 = "SR1"; - public const string SR1_LEAD = "SR1_LEAD"; - public const string SR10 = "SR10"; - public const string SR5 = "SR5"; + public const string RECRUITER = "RECRUITER"; + public const string RECRUITER_LEAD = "RECRUITER_LEAD"; + public const string PERSONNEL = "PERSONNEL"; + public const string SERVERS = "SERVERS"; public const string UNCONFIRMED = "UNCONFIRMED"; } diff --git a/UKSF.Api/Controllers/Accounts/AccountsController.cs b/UKSF.Api/Controllers/Accounts/AccountsController.cs index 93858b53..dd22dd81 100644 --- a/UKSF.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSF.Api/Controllers/Accounts/AccountsController.cs @@ -215,10 +215,10 @@ public IActionResult Test() { private ExtendedAccount ExtendAccount(Account account) { ExtendedAccount extendedAccount = account.ToExtendedAccount(); extendedAccount.displayName = displayNameService.GetDisplayName(account); - extendedAccount.permissionSr1 = sessionService.ContextHasRole(RoleDefinitions.SR1); - extendedAccount.permissionSr5 = sessionService.ContextHasRole(RoleDefinitions.SR5); - extendedAccount.permissionSr10 = sessionService.ContextHasRole(RoleDefinitions.SR10); - extendedAccount.permissionSr1Lead = sessionService.ContextHasRole(RoleDefinitions.SR1_LEAD); + extendedAccount.permissionRecruiter = sessionService.ContextHasRole(RoleDefinitions.RECRUITER); + extendedAccount.permissionServers = sessionService.ContextHasRole(RoleDefinitions.SERVERS); + extendedAccount.permissionPersonnel = sessionService.ContextHasRole(RoleDefinitions.PERSONNEL); + extendedAccount.permissionRecruiterLead = sessionService.ContextHasRole(RoleDefinitions.RECRUITER_LEAD); extendedAccount.permissionCommand = sessionService.ContextHasRole(RoleDefinitions.COMMAND); extendedAccount.permissionAdmin = sessionService.ContextHasRole(RoleDefinitions.ADMIN); extendedAccount.permissionNco = sessionService.ContextHasRole(RoleDefinitions.NCO); diff --git a/UKSF.Api/Controllers/ApplicationsController.cs b/UKSF.Api/Controllers/ApplicationsController.cs index 0e229a7a..476be936 100644 --- a/UKSF.Api/Controllers/ApplicationsController.cs +++ b/UKSF.Api/Controllers/ApplicationsController.cs @@ -47,8 +47,8 @@ IDisplayNameService displayNameService public async Task Post([FromBody] JObject body) { Account account = sessionService.GetContextAccount(); await Update(body, account); - CommentThread recruiterCommentThread = new CommentThread {authors = recruitmentService.GetSr1Leads().Values.ToArray(), mode = ThreadMode.SR1}; - CommentThread applicationCommentThread = new CommentThread {authors = new[] {account.id}, mode = ThreadMode.SR1}; + CommentThread recruiterCommentThread = new CommentThread {authors = recruitmentService.GetRecruiterLeads().Values.ToArray(), mode = ThreadMode.RECRUITER}; + CommentThread applicationCommentThread = new CommentThread {authors = new[] {account.id}, mode = ThreadMode.RECRUITER}; await commentThreadService.Data.Add(recruiterCommentThread); await commentThreadService.Data.Add(applicationCommentThread); Application application = new Application { @@ -63,9 +63,9 @@ public async Task Post([FromBody] JObject body) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, "", "Applicant", "Candidate", reason: "you were entered into the recruitment process"); notificationsService.Add(notification); notificationsService.Add(new Notification {owner = application.recruiter, icon = NotificationIcons.APPLICATION, message = $"You have been assigned {account.firstname} {account.lastname}'s application", link = $"/recruitment/{account.id}"}); - foreach (string sr1Id in recruitmentService.GetSr1Leads().Values.Where(sr1Id => account.application.recruiter != sr1Id)) { + foreach (string id in recruitmentService.GetRecruiterLeads().Values.Where(x => account.application.recruiter != x)) { notificationsService.Add( - new Notification {owner = sr1Id, icon = NotificationIcons.APPLICATION, message = $"{displayNameService.GetDisplayName(account.application.recruiter)} has been assigned {account.firstname} {account.lastname}'s application", link = $"/recruitment/{account.id}"} + new Notification {owner = id, icon = NotificationIcons.APPLICATION, message = $"{displayNameService.GetDisplayName(account.application.recruiter)} has been assigned {account.firstname} {account.lastname}'s application", link = $"/recruitment/{account.id}"} ); } diff --git a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs index 778fab41..75091eba 100644 --- a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs +++ b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; using UKSF.Api.Interfaces.Command; +using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; @@ -15,6 +16,7 @@ using UKSF.Api.Models.Command; using UKSF.Api.Models.Message; using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; @@ -27,14 +29,24 @@ public class CommandRequestsController : Controller { private readonly INotificationsService notificationsService; private readonly ISessionService sessionService; private readonly IUnitsService unitsService; + private readonly IVariablesDataService variablesDataService; - public CommandRequestsController(ICommandRequestService commandRequestService, ICommandRequestCompletionService commandRequestCompletionService, ISessionService sessionService, IUnitsService unitsService, IDisplayNameService displayNameService, INotificationsService notificationsService) { + public CommandRequestsController( + ICommandRequestService commandRequestService, + ICommandRequestCompletionService commandRequestCompletionService, + ISessionService sessionService, + IUnitsService unitsService, + IDisplayNameService displayNameService, + INotificationsService notificationsService, + IVariablesDataService variablesDataService + ) { this.commandRequestService = commandRequestService; this.commandRequestCompletionService = commandRequestCompletionService; this.sessionService = sessionService; this.unitsService = unitsService; this.displayNameService = displayNameService; this.notificationsService = notificationsService; + this.variablesDataService = variablesDataService; } [HttpGet, Authorize] @@ -43,7 +55,8 @@ public IActionResult Get() { List myRequests = new List(); List otherRequests = new List(); string contextId = sessionService.GetContextId(); - bool canOverride = unitsService.Data.GetSingle(x => x.shortname == "SR10").members.Any(x => x == contextId); + string id = variablesDataService.GetSingle("ROLE_ID_PERSONNEL").AsString(); + bool canOverride = unitsService.Data.GetSingle(id).members.Any(x => x == contextId); bool superAdmin = contextId == Global.SUPER_ADMIN; DateTime now = DateTime.Now; foreach (CommandRequest commandRequest in allRequests) { @@ -55,7 +68,7 @@ public IActionResult Get() { } } - return Ok(new {myRequests = GetMyRequests(myRequests, contextId, canOverride, superAdmin, now), otherRequests = GetOtherRequests(otherRequests, canOverride, superAdmin, now)}); + return Ok(new { myRequests = GetMyRequests(myRequests, contextId, canOverride, superAdmin, now), otherRequests = GetOtherRequests(otherRequests, canOverride, superAdmin, now) }); } private object GetMyRequests(IEnumerable myRequests, string contextId, bool canOverride, bool superAdmin, DateTime now) { @@ -66,7 +79,7 @@ private object GetMyRequests(IEnumerable myRequests, string cont return new { data = x, canOverride = superAdmin || canOverride && x.reviews.Count > 1 && x.dateCreated.AddDays(1) < now && x.reviews.Any(y => y.Value == ReviewState.PENDING && y.Key != contextId), - reviews = x.reviews.Select(y => new {id = y.Key, name = displayNameService.GetDisplayName(y.Key), state = y.Value}) + reviews = x.reviews.Select(y => new { id = y.Key, name = displayNameService.GetDisplayName(y.Key), state = y.Value }) }; } ); @@ -77,7 +90,11 @@ private object GetOtherRequests(IEnumerable otherRequests, bool x => { if (string.IsNullOrEmpty(x.reason)) x.reason = "None given"; x.type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.type.ToLower()); - return new {data = x, canOverride = superAdmin || canOverride && x.dateCreated.AddDays(1) < now, reviews = x.reviews.Select(y => new {name = displayNameService.GetDisplayName(y.Key), state = y.Value})}; + return new { + data = x, + canOverride = superAdmin || canOverride && x.dateCreated.AddDays(1) < now, + reviews = x.reviews.Select(y => new { name = displayNameService.GetDisplayName(y.Key), state = y.Value }) + }; } ); } @@ -97,16 +114,27 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje await commandRequestService.SetRequestAllReviewStates(request, state); foreach (string reviewerId in request.reviews.Select(x => x.Key).Where(x => x != sessionAccount.id)) { - notificationsService.Add(new Notification {owner = reviewerId, icon = NotificationIcons.REQUEST, message = $"Your review on {AvsAn.Query(request.type).Article} {request.type.ToLower()} request for {request.displayRecipient} was overriden by {sessionAccount.id}"}); + notificationsService.Add( + new Notification { + owner = reviewerId, + icon = NotificationIcons.REQUEST, + message = $"Your review on {AvsAn.Query(request.type).Article} {request.type.ToLower()} request for {request.displayRecipient} was overriden by {sessionAccount.id}" + } + ); } } else { ReviewState currentState = commandRequestService.GetReviewState(request.id, sessionAccount.id); if (currentState == ReviewState.ERROR) { - throw new ArgumentOutOfRangeException($"Getting review state for {sessionAccount} from {request.id} failed. Reviews: \n{request.reviews.Select(x => $"{x.Key}: {x.Value}").Aggregate((x, y) => $"{x}\n{y}")}"); + throw new ArgumentOutOfRangeException( + $"Getting review state for {sessionAccount} from {request.id} failed. Reviews: \n{request.reviews.Select(x => $"{x.Key}: {x.Value}").Aggregate((x, y) => $"{x}\n{y}")}" + ); } if (currentState == state) return Ok(); - LogWrapper.AuditLog(sessionAccount.id, $"Review state of {displayNameService.GetDisplayName(sessionAccount)} for {request.type.ToLower()} request for {request.displayRecipient} updated to {state}"); + LogWrapper.AuditLog( + sessionAccount.id, + $"Review state of {displayNameService.GetDisplayName(sessionAccount)} for {request.type.ToLower()} request for {request.displayRecipient} updated to {state}" + ); await commandRequestService.SetRequestReviewState(request, sessionAccount.id, state); } diff --git a/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs b/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs index 60ba65e2..5f228814 100644 --- a/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs +++ b/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs @@ -80,7 +80,7 @@ public async Task CreateRequestDischarge([FromBody] CommandReques request.displayFrom = "Member"; request.type = CommandRequestType.DISCHARGE; if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); - await commandRequestService.Add(request, ChainOfCommandMode.COMMANDER_AND_SR10); + await commandRequestService.Add(request, ChainOfCommandMode.COMMANDER_AND_PERSONNEL); return Ok(); } @@ -154,14 +154,14 @@ public async Task CreateRequestTransfer([FromBody] CommandRequest return Ok(); } - [HttpPut("reinstate"), Authorize, Roles(RoleDefinitions.COMMAND, RoleDefinitions.SR1, RoleDefinitions.NCO)] + [HttpPut("reinstate"), Authorize, Roles(RoleDefinitions.COMMAND, RoleDefinitions.RECRUITER, RoleDefinitions.NCO)] public async Task CreateRequestReinstateMember([FromBody] CommandRequest request) { request.requester = sessionId; request.displayValue = "Member"; request.displayFrom = "Discharged"; request.type = CommandRequestType.REINSTATE_MEMBER; if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); - await commandRequestService.Add(request, ChainOfCommandMode.SR10); + await commandRequestService.Add(request, ChainOfCommandMode.PERSONNEL); return Ok(); } } diff --git a/UKSF.Api/Controllers/CommentThreadController.cs b/UKSF.Api/Controllers/CommentThreadController.cs index d8f61631..b1c98d83 100644 --- a/UKSF.Api/Controllers/CommentThreadController.cs +++ b/UKSF.Api/Controllers/CommentThreadController.cs @@ -57,7 +57,7 @@ public IActionResult GetCanPostComment(string id) { Account account = sessionService.GetContextAccount(); bool admin = sessionService.ContextHasRole(RoleDefinitions.ADMIN); bool canPost = commentThread.mode switch { - ThreadMode.SR1 => commentThread.authors.Any(x => x == sessionService.GetContextId()) || admin || recruitmentService.IsRecruiter(sessionService.GetContextAccount()), + ThreadMode.RECRUITER => commentThread.authors.Any(x => x == sessionService.GetContextId()) || admin || recruitmentService.IsRecruiter(sessionService.GetContextAccount()), ThreadMode.RANKSUPERIOR => commentThread.authors.Any(x => admin || ranksService.IsSuperior(account.rank, accountService.Data.GetSingle(x).rank)), ThreadMode.RANKEQUAL => commentThread.authors.Any(x => admin || ranksService.IsEqual(account.rank, accountService.Data.GetSingle(x).rank)), ThreadMode.RANKSUPERIOROREQUAL => commentThread.authors.Any(x => admin || ranksService.IsSuperiorOrEqual(account.rank, accountService.Data.GetSingle(x).rank)), diff --git a/UKSF.Api/Controllers/DischargesController.cs b/UKSF.Api/Controllers/DischargesController.cs index 8d688292..c52a73e6 100644 --- a/UKSF.Api/Controllers/DischargesController.cs +++ b/UKSF.Api/Controllers/DischargesController.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using UKSF.Api.Interfaces.Command; +using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; @@ -11,11 +12,12 @@ using UKSF.Api.Models.Command; using UKSF.Api.Models.Message; using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers { - [Route("[controller]"), Roles(RoleDefinitions.SR10, RoleDefinitions.NCO, RoleDefinitions.SR1)] + [Route("[controller]"), Roles(RoleDefinitions.PERSONNEL, RoleDefinitions.NCO, RoleDefinitions.RECRUITER)] public class DischargesController : Controller { private readonly IAccountService accountService; private readonly IAssignmentService assignmentService; @@ -24,8 +26,18 @@ public class DischargesController : Controller { private readonly INotificationsService notificationsService; private readonly ISessionService sessionService; private readonly IUnitsService unitsService; + private readonly IVariablesDataService variablesDataService; - public DischargesController(IAccountService accountService, IAssignmentService assignmentService, ICommandRequestService commandRequestService, IDischargeService dischargeService, INotificationsService notificationsService, ISessionService sessionService, IUnitsService unitsService) { + public DischargesController( + IAccountService accountService, + IAssignmentService assignmentService, + ICommandRequestService commandRequestService, + IDischargeService dischargeService, + INotificationsService notificationsService, + ISessionService sessionService, + IUnitsService unitsService, + IVariablesDataService variablesDataService + ) { this.accountService = accountService; this.assignmentService = assignmentService; this.commandRequestService = commandRequestService; @@ -33,13 +45,16 @@ public DischargesController(IAccountService accountService, IAssignmentService a this.notificationsService = notificationsService; this.sessionService = sessionService; this.unitsService = unitsService; + this.variablesDataService = variablesDataService; } [HttpGet] public IActionResult Get() { IEnumerable discharges = dischargeService.Data.Get(); foreach (DischargeCollection discharge in discharges) { - discharge.requestExists = commandRequestService.DoesEquivalentRequestExist(new CommandRequest {recipient = discharge.accountId, type = CommandRequestType.REINSTATE_MEMBER, displayValue = "Member", displayFrom = "Discharged"}); + discharge.requestExists = commandRequestService.DoesEquivalentRequestExist( + new CommandRequest { recipient = discharge.accountId, type = CommandRequestType.REINSTATE_MEMBER, displayValue = "Member", displayFrom = "Discharged" } + ); } return Ok(discharges); @@ -50,12 +65,23 @@ public async Task Reinstate(string id) { DischargeCollection dischargeCollection = dischargeService.Data.GetSingle(id); await dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); await accountService.Data.Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); - Notification notification = await assignmentService.UpdateUnitRankAndRole(dischargeCollection.accountId, "Basic Training Unit", "Trainee", "Recruit", "", "", "your membership was reinstated"); + Notification notification = await assignmentService.UpdateUnitRankAndRole( + dischargeCollection.accountId, + "Basic Training Unit", + "Trainee", + "Recruit", + "", + "", + "your membership was reinstated" + ); notificationsService.Add(notification); LogWrapper.AuditLog(sessionService.GetContextId(), $"{sessionService.GetContextId()} reinstated {dischargeCollection.name}'s membership"); - foreach (string member in unitsService.Data.GetSingle(x => x.shortname == "SR10").members.Where(x => x != sessionService.GetContextId())) { - notificationsService.Add(new Notification {owner = member, icon = NotificationIcons.PROMOTION, message = $"{dischargeCollection.name}'s membership was reinstated by {sessionService.GetContextId()}"}); + string personnelId = variablesDataService.GetSingle("ROLE_ID_PERSONNEL").AsString(); + foreach (string member in unitsService.Data.GetSingle(personnelId).members.Where(x => x != sessionService.GetContextId())) { + notificationsService.Add( + new Notification { owner = member, icon = NotificationIcons.PROMOTION, message = $"{dischargeCollection.name}'s membership was reinstated by {sessionService.GetContextId()}" } + ); } return Ok(dischargeService.Data.Get()); diff --git a/UKSF.Api/Controllers/GameServersController.cs b/UKSF.Api/Controllers/GameServersController.cs index 172466c4..58e5b870 100644 --- a/UKSF.Api/Controllers/GameServersController.cs +++ b/UKSF.Api/Controllers/GameServersController.cs @@ -21,7 +21,7 @@ using UKSF.Common; namespace UKSF.Api.Controllers { - [Route("[controller]"), Roles(RoleDefinitions.NCO, RoleDefinitions.SR5, RoleDefinitions.COMMAND)] + [Route("[controller]"), Roles(RoleDefinitions.NCO, RoleDefinitions.SERVERS, RoleDefinitions.COMMAND)] public class GameServersController : Controller { private readonly IGameServersService gameServersService; private readonly IHubContext serversHub; diff --git a/UKSF.Api/Controllers/RecruitmentController.cs b/UKSF.Api/Controllers/RecruitmentController.cs index c910903c..ae6ac284 100644 --- a/UKSF.Api/Controllers/RecruitmentController.cs +++ b/UKSF.Api/Controllers/RecruitmentController.cs @@ -33,7 +33,7 @@ public RecruitmentController(IAccountService accountService, IRecruitmentService this.notificationsService = notificationsService; } - [HttpGet, Authorize, Roles(RoleDefinitions.SR1)] + [HttpGet, Authorize, Roles(RoleDefinitions.RECRUITER)] public IActionResult GetAll() => Ok(recruitmentService.GetAllApplications()); [HttpGet("{id}"), Authorize] @@ -42,14 +42,14 @@ public IActionResult GetSingle(string id) { return Ok(recruitmentService.GetApplication(account)); } - [HttpGet("isrecruiter"), Authorize, Roles(RoleDefinitions.SR1)] + [HttpGet("isrecruiter"), Authorize, Roles(RoleDefinitions.RECRUITER)] public IActionResult GetIsRecruiter() => Ok(new {recruiter = recruitmentService.IsRecruiter(sessionService.GetContextAccount())}); - [HttpGet("stats"), Authorize, Roles(RoleDefinitions.SR1)] + [HttpGet("stats"), Authorize, Roles(RoleDefinitions.RECRUITER)] public IActionResult GetRecruitmentStats() { string account = sessionService.GetContextId(); List activity = new List(); - foreach (Account recruiterAccount in recruitmentService.GetSr1Members()) { + foreach (Account recruiterAccount in recruitmentService.GetRecruiters()) { List recruiterApplications = accountService.Data.Get(x => x.application != null && x.application.recruiter == recruiterAccount.id); activity.Add( new { @@ -65,7 +65,7 @@ public IActionResult GetRecruitmentStats() { return Ok(new {activity, yourStats = new {lastMonth = recruitmentService.GetStats(account, true), overall = recruitmentService.GetStats(account, false)}, sr1Stats = new {lastMonth = recruitmentService.GetStats("", true), overall = recruitmentService.GetStats("", false)}}); } - [HttpPost("{id}"), Authorize, Roles(RoleDefinitions.SR1)] + [HttpPost("{id}"), Authorize, Roles(RoleDefinitions.RECRUITER)] public async Task UpdateState([FromBody] dynamic body, string id) { ApplicationState updatedState = body.updatedState; Account account = accountService.Data.GetSingle(id); @@ -98,7 +98,7 @@ public async Task UpdateState([FromBody] dynamic body, string id) await accountService.Data.Update(id, Builders.Update.Set(x => x.application.dateCreated, DateTime.Now).Unset(x => x.application.dateAccepted).Set(x => x.membershipState, MembershipState.CONFIRMED)); Notification notification = await assignmentService.UpdateUnitRankAndRole(id, AssignmentService.REMOVE_FLAG, "Applicant", "Candidate", reason: "your application was reactivated"); notificationsService.Add(notification); - if (recruitmentService.GetSr1Members().All(x => x.id != account.application.recruiter)) { + if (recruitmentService.GetRecruiters().All(x => x.id != account.application.recruiter)) { string newRecruiterId = recruitmentService.GetRecruiter(); LogWrapper.AuditLog(sessionId, $"Application recruiter for {id} is no longer SR1, reassigning from {account.application.recruiter} to {newRecruiterId}"); await accountService.Data.Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiterId)); @@ -117,16 +117,16 @@ public async Task UpdateState([FromBody] dynamic body, string id) ); } - foreach (string value in recruitmentService.GetSr1Leads().Values.Where(value => sessionId != value && account.application.recruiter != value)) { + foreach (string value in recruitmentService.GetRecruiterLeads().Values.Where(value => sessionId != value && account.application.recruiter != value)) { notificationsService.Add(new Notification {owner = value, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application {message} by {displayNameService.GetDisplayName(sessionService.GetContextAccount())}", link = $"/recruitment/{id}"}); } return Ok(); } - [HttpPost("recruiter/{id}"), Authorize, Roles(RoleDefinitions.SR1_LEAD)] + [HttpPost("recruiter/{id}"), Authorize, Roles(RoleDefinitions.RECRUITER_LEAD)] public async Task PostReassignment([FromBody] JObject newRecruiter, string id) { - if (!sessionService.ContextHasRole(RoleDefinitions.ADMIN) && !recruitmentService.IsAccountSr1Lead()) throw new Exception($"attempted to assign recruiter to {newRecruiter}. Context is not recruitment lead."); + if (!sessionService.ContextHasRole(RoleDefinitions.ADMIN) && !recruitmentService.IsRecruiterLead()) throw new Exception($"attempted to assign recruiter to {newRecruiter}. Context is not recruitment lead."); string recruiter = newRecruiter["newRecruiter"].ToString(); await recruitmentService.SetRecruiter(id, recruiter); Account account = accountService.Data.GetSingle(id); @@ -138,7 +138,7 @@ public async Task PostReassignment([FromBody] JObject newRecruite return Ok(); } - [HttpPost("ratings/{id}"), Authorize, Roles(RoleDefinitions.SR1)] + [HttpPost("ratings/{id}"), Authorize, Roles(RoleDefinitions.RECRUITER)] public async Task> Ratings([FromBody] KeyValuePair value, string id) { Dictionary ratings = accountService.Data.GetSingle(id).application.ratings; @@ -153,7 +153,7 @@ public async Task> Ratings([FromBody] KeyValuePair Ok(recruitmentService.GetActiveRecruiters()); } } diff --git a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs index 4f6db00f..66d380ec 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs @@ -4,7 +4,7 @@ namespace UKSF.Tests.Unit.Unit.Services.Personnel { public class RoleAttributeTests { - [Theory, InlineData("ADMIN,SR10", RoleDefinitions.ADMIN, RoleDefinitions.SR10), InlineData("ADMIN", RoleDefinitions.ADMIN), InlineData("ADMIN", RoleDefinitions.ADMIN, RoleDefinitions.ADMIN)] + [Theory, InlineData("ADMIN,PERSONNEL", RoleDefinitions.ADMIN, RoleDefinitions.PERSONNEL), InlineData("ADMIN", RoleDefinitions.ADMIN), InlineData("ADMIN", RoleDefinitions.ADMIN, RoleDefinitions.ADMIN)] public void ShouldCombineRoles(string expected, params string[] roles) { RolesAttribute rolesAttribute = new RolesAttribute(roles); diff --git a/UKSF.Tests/testdata/units.json b/UKSF.Tests/testdata/units.json index 43a6098a..d6fcd31c 100644 --- a/UKSF.Tests/testdata/units.json +++ b/UKSF.Tests/testdata/units.json @@ -139,13 +139,13 @@ }, "2iC": { "$oid": "59e38f1b594c603b78aa9dc1" - } + } }, "teamspeakGroup": "26", "order": 0, "callsign": null, "icon": null, - "shortname": "Sr1", + "shortname": "SR1", "discordRoleId": "311545206266920960" } { @@ -162,7 +162,7 @@ "$oid": "59e38f13594c603b78aa9dbf" } ], - "name": "SR10 Personnel and Processing", + "name": "SR7 Personnel & Processing", "parent": { "$oid": "5a4283ce55d6109bf0b081bf" }, @@ -171,7 +171,7 @@ "$oid": "59e38f10594c603b78aa9dbd" } }, - "shortname": "SR10", + "shortname": "SR7", "teamspeakGroup": "35", "order": 8, "callsign": null, From d9f4b87c3b6da58a00f0222dfe64608200e4a724 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 9 Jun 2020 12:53:20 +0100 Subject: [PATCH 171/369] Fixes to chain of command service - Fall back to personnel members when no other CoC found - Add clean hashset extension method --- .../Command/ChainOfCommandService.cs | 17 ++++++++++++++--- UKSF.Common/CollectionUtilities.cs | 9 +++++++++ .../Unit/Common/CollectionUtilitiesTests.cs | 17 +++++++++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 UKSF.Common/CollectionUtilities.cs create mode 100644 UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs diff --git a/UKSF.Api.Services/Command/ChainOfCommandService.cs b/UKSF.Api.Services/Command/ChainOfCommandService.cs index 2c97835d..b1ed8a51 100644 --- a/UKSF.Api.Services/Command/ChainOfCommandService.cs +++ b/UKSF.Api.Services/Command/ChainOfCommandService.cs @@ -8,6 +8,7 @@ using UKSF.Api.Models.Command; using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Units; +using UKSF.Common; namespace UKSF.Api.Services.Command { public class ChainOfCommandService : IChainOfCommandService { @@ -22,11 +23,13 @@ public ChainOfCommandService(IUnitsService unitsService, IRolesService rolesServ } public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, Unit start, Unit target) { - HashSet chain = ResolveMode(mode, start, target).Where(x => !string.IsNullOrEmpty(x) && x != recipient).ToHashSet(); + HashSet chain = ResolveMode(mode, start, target).Where(x => x != recipient).ToHashSet(); + chain.CleanHashset(); // If no chain, and mode is not next commander, get next commander if (chain.Count == 0 && mode != ChainOfCommandMode.NEXT_COMMANDER && mode != ChainOfCommandMode.NEXT_COMMANDER_EXCLUDE_SELF) { - chain = GetNextCommander(start).Where(x => !string.IsNullOrEmpty(x) && x != recipient).ToHashSet(); + chain = GetNextCommander(start).Where(x => x != recipient).ToHashSet(); + chain.CleanHashset(); } // If no chain, get root unit child commanders @@ -34,14 +37,22 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U foreach (Unit unit in unitsService.Data.Get(x => x.parent == unitsService.GetRoot().id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) { chain.Add(GetCommander(unit)); } + chain.CleanHashset(); } // If no chain, get root unit commander if (chain.Count == 0) { chain.Add(GetCommander(unitsService.GetRoot())); + chain.CleanHashset(); } - return chain.Where(x => !string.IsNullOrEmpty(x)).ToHashSet(); + // If no chain, get personnel + if (chain.Count == 0) { + chain.UnionWith(GetPersonnel()); + chain.CleanHashset(); + } + + return chain; } public bool InContextChainOfCommand(string id) { diff --git a/UKSF.Common/CollectionUtilities.cs b/UKSF.Common/CollectionUtilities.cs new file mode 100644 index 00000000..c34f227d --- /dev/null +++ b/UKSF.Common/CollectionUtilities.cs @@ -0,0 +1,9 @@ +using System.Collections.Generic; + +namespace UKSF.Common { + public static class CollectionUtilities { + public static void CleanHashset(this HashSet collection) { + collection.RemoveWhere(string.IsNullOrEmpty); + } + } +} diff --git a/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs b/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs new file mode 100644 index 00000000..5397f7e6 --- /dev/null +++ b/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; +using FluentAssertions; +using UKSF.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Common { + public class CollectionUtilitiesTests { + [Fact] + public void ShouldCleanHashset() { + HashSet subject = new HashSet {"1", "", "3"}; + + subject.CleanHashset(); + + subject.Should().BeEquivalentTo(new HashSet { "1", "3" }); + } + } +} From 2201eef252f50b8e06357e9d9eb06f3bb9bc07e7 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 12 Jun 2020 15:14:25 +0100 Subject: [PATCH 172/369] Changes to accounts and confirmation codes - Moved account permissions to own object - Renamed extended account to public account - Added resend email confirmation endpoint - Added debug data invalidation endpoint --- .../Utility/IConfirmationCodeService.cs | 5 +- .../Personnel/AccountPermissions.cs | 11 ++++ UKSF.Api.Models/Personnel/ExtendedAccount.cs | 12 ----- UKSF.Api.Models/Personnel/PublicAccount.cs | 8 +++ UKSF.Api.Services/Common/AccountUtilities.cs | 8 +-- .../Utility/ConfirmationCodeService.cs | 4 ++ .../Accounts/AccountsController.cs | 51 +++++++++++++------ .../Controllers/Utility/DebugController.cs | 18 ++++++- .../Services/Common/AccountUtilitiesTests.cs | 4 +- 9 files changed, 85 insertions(+), 36 deletions(-) create mode 100644 UKSF.Api.Models/Personnel/AccountPermissions.cs delete mode 100644 UKSF.Api.Models/Personnel/ExtendedAccount.cs create mode 100644 UKSF.Api.Models/Personnel/PublicAccount.cs diff --git a/UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs b/UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs index 7c912821..8e5277f9 100644 --- a/UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs +++ b/UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs @@ -1,9 +1,12 @@ -using System.Threading.Tasks; +using System; +using System.Threading.Tasks; using UKSF.Api.Interfaces.Data; +using UKSF.Api.Models.Utility; namespace UKSF.Api.Interfaces.Utility { public interface IConfirmationCodeService : IDataBackedService { Task CreateConfirmationCode(string value); Task GetConfirmationCode(string id); + Task ClearConfirmationCodes(Func predicate); } } diff --git a/UKSF.Api.Models/Personnel/AccountPermissions.cs b/UKSF.Api.Models/Personnel/AccountPermissions.cs new file mode 100644 index 00000000..a132ecc2 --- /dev/null +++ b/UKSF.Api.Models/Personnel/AccountPermissions.cs @@ -0,0 +1,11 @@ +namespace UKSF.Api.Models.Personnel { + public class AccountPermissions { + public bool recruiter; + public bool recruiterLead; + public bool servers; + public bool personnel; + public bool command; + public bool admin; + public bool nco; + } +} diff --git a/UKSF.Api.Models/Personnel/ExtendedAccount.cs b/UKSF.Api.Models/Personnel/ExtendedAccount.cs deleted file mode 100644 index b14b50c4..00000000 --- a/UKSF.Api.Models/Personnel/ExtendedAccount.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace UKSF.Api.Models.Personnel { - public class ExtendedAccount : Account { - public string displayName; - public bool permissionRecruiter; - public bool permissionRecruiterLead; - public bool permissionServers; - public bool permissionPersonnel; - public bool permissionCommand; - public bool permissionAdmin; - public bool permissionNco; - } -} diff --git a/UKSF.Api.Models/Personnel/PublicAccount.cs b/UKSF.Api.Models/Personnel/PublicAccount.cs new file mode 100644 index 00000000..28db11ba --- /dev/null +++ b/UKSF.Api.Models/Personnel/PublicAccount.cs @@ -0,0 +1,8 @@ +// ReSharper disable ClassNeverInstantiated.Global + +namespace UKSF.Api.Models.Personnel { + public class PublicAccount : Account { + public string displayName; + public AccountPermissions permissions = new AccountPermissions(); + } +} diff --git a/UKSF.Api.Services/Common/AccountUtilities.cs b/UKSF.Api.Services/Common/AccountUtilities.cs index d3c0c92a..2ee19114 100644 --- a/UKSF.Api.Services/Common/AccountUtilities.cs +++ b/UKSF.Api.Services/Common/AccountUtilities.cs @@ -3,10 +3,10 @@ namespace UKSF.Api.Services.Common { public static class AccountUtilities { - public static ExtendedAccount ToExtendedAccount(this Account account) { - ExtendedAccount extendedAccount = account.Copy(); - extendedAccount.password = null; - return extendedAccount; + public static PublicAccount ToPublicAccount(this Account account) { + PublicAccount publicAccount = account.Copy(); + publicAccount.password = null; + return publicAccount; } } } diff --git a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs index de614302..a622b404 100644 --- a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs +++ b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs @@ -28,5 +28,9 @@ public async Task GetConfirmationCode(string id) { await schedulerService.Cancel(x => x.actionParameters == actionParameters); return confirmationCode.value; } + + public async Task ClearConfirmationCodes(Func predicate) { + await Data.DeleteMany(predicate); + } } } diff --git a/UKSF.Api/Controllers/Accounts/AccountsController.cs b/UKSF.Api/Controllers/Accounts/AccountsController.cs index dd22dd81..de670a09 100644 --- a/UKSF.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSF.Api/Controllers/Accounts/AccountsController.cs @@ -61,13 +61,13 @@ IUnitsService unitsService [HttpGet, Authorize] public IActionResult Get() { Account account = sessionService.GetContextAccount(); - return Ok(ExtendAccount(account)); + return Ok(PubliciseAccount(account)); } [HttpGet("{id}"), Authorize] public IActionResult GetById(string id) { Account account = accountService.Data.GetSingle(id); - return Ok(ExtendAccount(account)); + return Ok(PubliciseAccount(account)); } [HttpPut] @@ -92,10 +92,18 @@ public async Task Put([FromBody] JObject body) { return Ok(new {account.email}); } - [HttpPost] + [HttpPost, Authorize] public async Task ApplyConfirmationCode([FromBody] JObject body) { - string code = body["code"].ToString(); - string email = body["email"].ToString(); + string email = body.GetValueFromBody("email"); + string code = body.GetValueFromBody("code"); + + try { + GuardUtilites.ValidateString(email, _ => throw new ArgumentException($"Email '{email}' is invalid. Please refresh the page.")); + GuardUtilites.ValidateId(code, _ => throw new ArgumentException($"Code '{code}' is invalid. Please try again")); + } catch (ArgumentException exception) { + return BadRequest(new { error = exception.Message }); + } + Account account = accountService.Data.GetSingle(x => x.email == email); if (account == null) { return BadRequest(new {error = $"An account with the email '{email}' doesn't exist. This should be impossible so please contact an admin for help"}); @@ -108,10 +116,19 @@ public async Task ApplyConfirmationCode([FromBody] JObject body) return Ok(); } + await confirmationCodeService.ClearConfirmationCodes(x => x.value == email); await SendConfirmationCode(account); return BadRequest(new {error = $"The confirmation code has expired. A new code has been sent to '{account.email}'"}); } + [HttpGet("resend-email-code"), Authorize] + public async Task ResendConfirmationCode() { + Account account = sessionService.GetContextAccount(); + await confirmationCodeService.ClearConfirmationCodes(x => x.value == account.email); + await SendConfirmationCode(account); + return Ok(PubliciseAccount(account)); + } + [HttpGet("under"), Authorize(Roles = RoleDefinitions.COMMAND)] public IActionResult GetAccountsUnder([FromQuery] bool reverse = false) { List accounts = new List(); @@ -212,17 +229,19 @@ public IActionResult Test() { return Ok(new {value = DateTime.Now.ToLongTimeString()}); } - private ExtendedAccount ExtendAccount(Account account) { - ExtendedAccount extendedAccount = account.ToExtendedAccount(); - extendedAccount.displayName = displayNameService.GetDisplayName(account); - extendedAccount.permissionRecruiter = sessionService.ContextHasRole(RoleDefinitions.RECRUITER); - extendedAccount.permissionServers = sessionService.ContextHasRole(RoleDefinitions.SERVERS); - extendedAccount.permissionPersonnel = sessionService.ContextHasRole(RoleDefinitions.PERSONNEL); - extendedAccount.permissionRecruiterLead = sessionService.ContextHasRole(RoleDefinitions.RECRUITER_LEAD); - extendedAccount.permissionCommand = sessionService.ContextHasRole(RoleDefinitions.COMMAND); - extendedAccount.permissionAdmin = sessionService.ContextHasRole(RoleDefinitions.ADMIN); - extendedAccount.permissionNco = sessionService.ContextHasRole(RoleDefinitions.NCO); - return extendedAccount; + private PublicAccount PubliciseAccount(Account account) { + PublicAccount publicAccount = account.ToPublicAccount(); + publicAccount.displayName = displayNameService.GetDisplayName(account); + publicAccount.permissions = new AccountPermissions { + recruiter = sessionService.ContextHasRole(RoleDefinitions.RECRUITER), + recruiterLead = sessionService.ContextHasRole(RoleDefinitions.RECRUITER_LEAD), + servers = sessionService.ContextHasRole(RoleDefinitions.SERVERS), + personnel = sessionService.ContextHasRole(RoleDefinitions.PERSONNEL), + nco = sessionService.ContextHasRole(RoleDefinitions.NCO), + command = sessionService.ContextHasRole(RoleDefinitions.COMMAND), + admin = sessionService.ContextHasRole(RoleDefinitions.ADMIN) + }; + return publicAccount; } private async Task SendConfirmationCode(Account account) { diff --git a/UKSF.Api/Controllers/Utility/DebugController.cs b/UKSF.Api/Controllers/Utility/DebugController.cs index 0cbd17a9..5b422ae9 100644 --- a/UKSF.Api/Controllers/Utility/DebugController.cs +++ b/UKSF.Api/Controllers/Utility/DebugController.cs @@ -1,23 +1,31 @@ using System; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Hosting; using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Message; +using UKSF.Api.Services.Utility; namespace UKSF.Api.Controllers.Utility { [Route("[controller]")] public class DebugController : Controller { + private readonly IHostEnvironment currentEnvironment; + private readonly DataCacheService dataCacheService; private readonly INotificationsService notificationsService; private readonly ISessionService sessionService; - public DebugController(INotificationsService notificationsService, ISessionService sessionService) { + public DebugController(INotificationsService notificationsService, ISessionService sessionService, IHostEnvironment currentEnvironment, DataCacheService dataCacheService) { this.notificationsService = notificationsService; this.sessionService = sessionService; + this.currentEnvironment = currentEnvironment; + this.dataCacheService = dataCacheService; } [HttpGet("notifications-test"), Authorize] public IActionResult NotificationsTest() { + if (!currentEnvironment.IsDevelopment()) return Ok(); + notificationsService.Add( new Notification { owner = sessionService.GetContextId(), message = $"This is a test notification. The time is {DateTime.Now:HH:mm:ss}", timestamp = DateTime.Now, icon = NotificationIcons.REQUEST @@ -25,5 +33,13 @@ public IActionResult NotificationsTest() { ); return Ok(); } + + [HttpGet("invalidate-data")] + public IActionResult InvalidateData() { + if (!currentEnvironment.IsDevelopment()) return Ok(); + + dataCacheService.InvalidateCachedData(); + return Ok(); + } } } diff --git a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs index e31a1a37..a2e6c89a 100644 --- a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs @@ -23,7 +23,7 @@ public void ShouldCopyAccountCorrectly() { militaryExperience = false }; - ExtendedAccount subject = account.ToExtendedAccount(); + PublicAccount subject = account.ToPublicAccount(); subject.id.Should().Be(id); subject.firstname.Should().Be("Bob"); @@ -40,7 +40,7 @@ public void ShouldNotCopyPassword() { string id = ObjectId.GenerateNewId().ToString(); Account account = new Account {id = id, password = "thiswontappear"}; - ExtendedAccount subject = account.ToExtendedAccount(); + PublicAccount subject = account.ToPublicAccount(); subject.id.Should().Be(id); subject.password.Should().BeNull(); From 07e006753d1d50863dca9b95a5f0153f38a53db9 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 17 Jun 2020 17:42:04 +0100 Subject: [PATCH 173/369] A lesson in annoying people --- UKSF.Api.Services/Integrations/DiscordService.cs | 8 +++++--- UKSF.Tests/testdata/variables.json | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/UKSF.Api.Services/Integrations/DiscordService.cs b/UKSF.Api.Services/Integrations/DiscordService.cs index ead29e7f..a9844dd0 100644 --- a/UKSF.Api.Services/Integrations/DiscordService.cs +++ b/UKSF.Api.Services/Integrations/DiscordService.cs @@ -15,6 +15,7 @@ namespace UKSF.Api.Services.Integrations { public class DiscordService : IDiscordService, IDisposable { + private static readonly string[] OWNER_REPLIES = {"Why thank you {0} owo", "Thank you {0}, you're too kind", "Thank you so much {0} uwu", "Aw shucks {0} you're embarrassing me"}; private static readonly string[] REPLIES = {"Why thank you {0}", "Thank you {0}, you're too kind", "Thank you so much {0}", "Aw shucks {0} you're embarrassing me"}; private static readonly string[] TRIGGERS = {"thank you", "thank", "best", "mvp", "love you", "appreciate you", "good"}; private readonly IAccountService accountService; @@ -34,7 +35,7 @@ public DiscordService(IConfiguration configuration, IRanksService ranksService, this.unitsService = unitsService; this.accountService = accountService; this.displayNameService = displayNameService; - specialUser = VariablesWrapper.VariablesDataService().GetSingle("DID_U_MASTER").AsUlong(); + specialUser = VariablesWrapper.VariablesDataService().GetSingle("DID_U_OWNER").AsUlong(); } public async Task ConnectDiscord() { @@ -188,9 +189,10 @@ private async Task ClientOnUserJoined(SocketGuildUser user) { private async Task ClientOnMessageReceived(SocketMessage incomingMessage) { if (incomingMessage.Content.Contains("bot", StringComparison.InvariantCultureIgnoreCase) || incomingMessage.MentionedUsers.Any(x => x.IsBot)) { if (TRIGGERS.Any(x => incomingMessage.Content.Contains(x, StringComparison.InvariantCultureIgnoreCase))) { - string message = REPLIES[new Random().Next(0, REPLIES.Length)]; + bool owner = incomingMessage.Author.Id == specialUser; + string message = owner ? OWNER_REPLIES[new Random().Next(0, OWNER_REPLIES.Length)] : REPLIES[new Random().Next(0, REPLIES.Length)]; string[] parts = guild.GetUser(incomingMessage.Author.Id).Nickname.Split('.'); - string nickname = incomingMessage.Author.Id == specialUser ? "Master" : parts.Length > 1 ? parts[1] : parts[0]; + string nickname = owner ? "Daddy" : parts.Length > 1 ? parts[1] : parts[0]; await SendMessage(incomingMessage.Channel.Id, string.Format(message, nickname)); } } diff --git a/UKSF.Tests/testdata/variables.json b/UKSF.Tests/testdata/variables.json index 8f287b38..81216e27 100644 --- a/UKSF.Tests/testdata/variables.json +++ b/UKSF.Tests/testdata/variables.json @@ -115,7 +115,7 @@ "$oid": "5c5a0a09b7864a2c949088cc" }, "item": "147037209621430272", - "key": "DID_U_MASTER" + "key": "DID_U_OWNER" } { "_id": { From 2bc5f4f60ec8edfff47715c0ef18a1b0882a6b93 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 21 Jun 2020 13:32:44 +0100 Subject: [PATCH 174/369] Changes for update role preferences - Change role preference data structure to list of strings - Added change mode for JArray (currently only works with collection of strings) - Migration for account data role preference update --- UKSF.Api.Models/Personnel/Account.cs | 4 +- UKSF.Api.Services/Admin/MigrationUtility.cs | 77 ++++++++++++++++++- .../Controllers/ApplicationsController.cs | 5 +- UKSF.Common/ChangeUtilities.cs | 17 +++- .../Services/Common/AccountUtilitiesTests.cs | 4 +- 5 files changed, 96 insertions(+), 11 deletions(-) diff --git a/UKSF.Api.Models/Personnel/Account.cs b/UKSF.Api.Models/Personnel/Account.cs index a1e96e65..b70c1505 100644 --- a/UKSF.Api.Models/Personnel/Account.cs +++ b/UKSF.Api.Models/Personnel/Account.cs @@ -5,7 +5,6 @@ namespace UKSF.Api.Models.Personnel { public class Account : DatabaseObject { public Application application; public string armaExperience; - public bool aviation; public string background; public string discordId; public DateTime dob; @@ -15,12 +14,11 @@ public class Account : DatabaseObject { public MembershipState membershipState = MembershipState.UNCONFIRMED; public bool militaryExperience; public string nation; - public bool nco; - public bool officer; public string password; public string rank; public string reference; public string roleAssignment; + public List rolePreferences = new List(); public ServiceRecordEntry[] serviceRecord = new ServiceRecordEntry[0]; public AccountSettings settings = new AccountSettings(); public string steamname; diff --git a/UKSF.Api.Services/Admin/MigrationUtility.cs b/UKSF.Api.Services/Admin/MigrationUtility.cs index 4bf597c8..d85b07e8 100644 --- a/UKSF.Api.Services/Admin/MigrationUtility.cs +++ b/UKSF.Api.Services/Admin/MigrationUtility.cs @@ -7,6 +7,7 @@ using Microsoft.Extensions.Hosting; using MongoDB.Driver; using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; @@ -45,6 +46,80 @@ public void Migrate() { } // TODO: CHECK BEFORE RELEASE - private static void ExecuteMigration() { } + private static void ExecuteMigration() { + IDataCollectionFactory dataCollectionFactory = ServiceWrapper.Provider.GetService(); + IDataCollection oldDataCollection = dataCollectionFactory.CreateDataCollection("accounts"); + List oldAccounts = oldDataCollection.Get(); + + IAccountDataService accountDataService = ServiceWrapper.Provider.GetService(); + + List newAccounts = new List(); + foreach (OldAccount oldAccount in oldAccounts) { + Account newAccount = new Account { + id = oldAccount.id, + application = oldAccount.application, + armaExperience = oldAccount.armaExperience, + background = oldAccount.background, + discordId = oldAccount.discordId, + dob = oldAccount.dob, + email = oldAccount.email, + firstname = oldAccount.firstname, + lastname = oldAccount.lastname, + membershipState = oldAccount.membershipState, + militaryExperience = oldAccount.militaryExperience, + nation = oldAccount.nation, + password = oldAccount.password, + rank = oldAccount.rank, + reference = oldAccount.reference, + roleAssignment = oldAccount.roleAssignment, + serviceRecord = oldAccount.serviceRecord, + settings = oldAccount.settings, + steamname = oldAccount.steamname, + teamspeakIdentities = oldAccount.teamspeakIdentities, + unitAssignment = oldAccount.unitAssignment, + unitsExperience = oldAccount.unitsExperience + }; + List rolePreferences = new List(); + if (oldAccount.nco) rolePreferences.Add("NCO"); + if (oldAccount.officer) rolePreferences.Add("Officer"); + if (oldAccount.aviation) rolePreferences.Add("Aviation"); + newAccount.rolePreferences = rolePreferences; + + newAccounts.Add(newAccount); + } + + foreach (Account accountnewAccount in newAccounts) { + accountDataService.Delete(accountnewAccount.id).Wait(); + accountDataService.Add(accountnewAccount).Wait(); + } + } + } + + public class OldAccount : DatabaseObject { + public Application application; + public string armaExperience; + public string background; + public string discordId; + public DateTime dob; + public string email; + public string firstname; + public string lastname; + public MembershipState membershipState = MembershipState.UNCONFIRMED; + public bool militaryExperience; + public string nation; + public string password; + public string rank; + public string reference; + public string roleAssignment; + public ServiceRecordEntry[] serviceRecord = new ServiceRecordEntry[0]; + public readonly AccountSettings settings = new AccountSettings(); + public string steamname; + public HashSet teamspeakIdentities; + public string unitAssignment; + public string unitsExperience; + + public bool aviation; + public bool nco; + public bool officer; } } diff --git a/UKSF.Api/Controllers/ApplicationsController.cs b/UKSF.Api/Controllers/ApplicationsController.cs index 476be936..be77c5ff 100644 --- a/UKSF.Api/Controllers/ApplicationsController.cs +++ b/UKSF.Api/Controllers/ApplicationsController.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; @@ -91,9 +92,7 @@ await accountService.Data .Set(x => x.unitsExperience, body["unitsExperience"].ToString()) .Set(x => x.background, body["background"].ToString()) .Set(x => x.militaryExperience, string.Equals(body["militaryExperience"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) - .Set(x => x.officer, string.Equals(body["officer"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) - .Set(x => x.nco, string.Equals(body["nco"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) - .Set(x => x.aviation, string.Equals(body["aviation"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) + .Set(x => x.rolePreferences, body["rolePreferences"].ToObject>()) .Set(x => x.reference, body["reference"].ToString()) ); } diff --git a/UKSF.Common/ChangeUtilities.cs b/UKSF.Common/ChangeUtilities.cs index d95b38f6..449b1c60 100644 --- a/UKSF.Common/ChangeUtilities.cs +++ b/UKSF.Common/ChangeUtilities.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; @@ -75,14 +76,26 @@ private static IEnumerable FindChanges(this JToken original, JToken upda List unchanged = originalObject.Properties().Where(c => JToken.DeepEquals(c.Value, updated[c.Name])).Select(c => c.Name).ToList(); List changed = originalObject.Properties().Select(c => c.Name).Except(added).Except(unchanged).ToList(); - changes.AddRange(added.Where(x => allowedFields.Any(y => y.Name == x)).Select(key => updatedObject.Properties().First(x => x.Name == key)).Select(addedObject => new Change {Name = addedObject.Name, Original = null, Updated = addedObject.Value.Value()})); - changes.AddRange(removed.Where(x => allowedFields.Any(y => y.Name == x)).Select(key => originalObject.Properties().First(x => x.Name == key)).Select(removedObject => new Change {Name = removedObject.Name, Original = removedObject.Value.Value(), Updated = null})); + changes.AddRange( + added.Where(x => allowedFields.Any(y => y.Name == x)) + .Select(key => updatedObject.Properties().First(x => x.Name == key)) + .Select(addedObject => new Change { Name = addedObject.Name, Original = null, Updated = addedObject.Value.Value() }) + ); + changes.AddRange( + removed.Where(x => allowedFields.Any(y => y.Name == x)) + .Select(key => originalObject.Properties().First(x => x.Name == key)) + .Select(removedObject => new Change { Name = removedObject.Name, Original = removedObject.Value.Value(), Updated = null }) + ); foreach (string key in changed.Where(x => allowedFields.Any(y => y.Name == x))) { JToken originalChangedObject = originalObject[key]; JToken updatedChangedObject = updatedObject[key]; changes.AddRange(FindChanges(originalChangedObject, updatedChangedObject, allowedFields)); } + } else if (original.Type == JTokenType.Array) { + string originalString = original.ToObject>().Aggregate(string.Empty, (a, b) => $"{a}, {b}"); + string updatedString = updated.ToObject>().Aggregate(string.Empty, (a, b) => $"{a}, {b}"); + changes.Add(new Change {Name = ((JProperty) updated.Parent).Name, Original = originalString, Updated = updatedString}); } else { changes.Add(new Change {Name = ((JProperty) updated.Parent).Name, Original = original.Value(), Updated = updated.Value()}); } diff --git a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs index a2e6c89a..81c1a2ed 100644 --- a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs @@ -19,7 +19,7 @@ public void ShouldCopyAccountCorrectly() { membershipState = MembershipState.MEMBER, teamspeakIdentities = new HashSet {4, 4}, serviceRecord = new[] {new ServiceRecordEntry {occurence = "Test", timestamp = timestamp}}, - aviation = true, + rolePreferences = new List {"Aviation"}, militaryExperience = false }; @@ -31,7 +31,7 @@ public void ShouldCopyAccountCorrectly() { subject.membershipState.Should().Be(MembershipState.MEMBER); subject.teamspeakIdentities.Should().NotBeEmpty().And.HaveCount(1).And.ContainInOrder(new[] {4}); subject.serviceRecord.Should().NotBeEmpty().And.HaveCount(1).And.OnlyContain(x => x.occurence == "Test" && x.timestamp == timestamp); - subject.aviation.Should().BeTrue(); + subject.rolePreferences.Should().Contain("Aviation"); subject.militaryExperience.Should().BeFalse(); } From 9b711c451413b1b177f53d9096a7f7868ab3b31c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 27 Jun 2020 13:34:21 +0100 Subject: [PATCH 175/369] Added instagram image controller - Use instagram service to cache images from uksf instagram - Use scheduled action to get new images every hour - Split scheduled action Create into 2 methods for granularity --- .../Integrations/IInstagramService.cs | 10 ++++ .../Utility/ISchedulerService.cs | 4 +- .../IInstagramImagesAction.cs | 3 + .../Integrations/InstagramImage.cs | 6 ++ .../Integrations/InstagramService.cs | 45 +++++++++++++++ .../Utility/ConfirmationCodeService.cs | 2 +- .../ScheduledActions/InstagramImagesAction.cs | 19 +++++++ UKSF.Api.Services/Utility/SchedulerService.cs | 57 +++++++++++-------- UKSF.Api/AppStart/RegisterScheduledActions.cs | 3 +- .../RegisterScheduledActionServices.cs | 1 + .../AppStart/Services/ServiceExtensions.cs | 1 + UKSF.Api/AppStart/StartServices.cs | 2 +- UKSF.Api/Controllers/InstagramController.cs | 16 ++++++ .../Utility/ConfirmationCodeServiceTests.cs | 8 +-- 14 files changed, 143 insertions(+), 34 deletions(-) create mode 100644 UKSF.Api.Interfaces/Integrations/IInstagramService.cs create mode 100644 UKSF.Api.Interfaces/Utility/ScheduledActions/IInstagramImagesAction.cs create mode 100644 UKSF.Api.Models/Integrations/InstagramImage.cs create mode 100644 UKSF.Api.Services/Integrations/InstagramService.cs create mode 100644 UKSF.Api.Services/Utility/ScheduledActions/InstagramImagesAction.cs create mode 100644 UKSF.Api/Controllers/InstagramController.cs diff --git a/UKSF.Api.Interfaces/Integrations/IInstagramService.cs b/UKSF.Api.Interfaces/Integrations/IInstagramService.cs new file mode 100644 index 00000000..2ca3522f --- /dev/null +++ b/UKSF.Api.Interfaces/Integrations/IInstagramService.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using UKSF.Api.Models.Integrations; + +namespace UKSF.Api.Interfaces.Integrations { + public interface IInstagramService { + Task CacheInstagramImages(); + List GetImages(); + } +} diff --git a/UKSF.Api.Interfaces/Utility/ISchedulerService.cs b/UKSF.Api.Interfaces/Utility/ISchedulerService.cs index c37916b0..dcc6e75a 100644 --- a/UKSF.Api.Interfaces/Utility/ISchedulerService.cs +++ b/UKSF.Api.Interfaces/Utility/ISchedulerService.cs @@ -5,8 +5,8 @@ namespace UKSF.Api.Interfaces.Utility { public interface ISchedulerService : IDataBackedService { - void LoadApi(); - Task Create(DateTime next, TimeSpan interval, string action, params object[] actionParameters); + void Load(); + Task CreateAndSchedule(DateTime next, TimeSpan interval, string action, params object[] actionParameters); Task Cancel(Func predicate); } } diff --git a/UKSF.Api.Interfaces/Utility/ScheduledActions/IInstagramImagesAction.cs b/UKSF.Api.Interfaces/Utility/ScheduledActions/IInstagramImagesAction.cs new file mode 100644 index 00000000..505b08b3 --- /dev/null +++ b/UKSF.Api.Interfaces/Utility/ScheduledActions/IInstagramImagesAction.cs @@ -0,0 +1,3 @@ +namespace UKSF.Api.Interfaces.Utility.ScheduledActions { + public interface IInstagramImagesAction : IScheduledAction { } +} diff --git a/UKSF.Api.Models/Integrations/InstagramImage.cs b/UKSF.Api.Models/Integrations/InstagramImage.cs new file mode 100644 index 00000000..f65836a5 --- /dev/null +++ b/UKSF.Api.Models/Integrations/InstagramImage.cs @@ -0,0 +1,6 @@ +namespace UKSF.Api.Models.Integrations { + public class InstagramImage { + public string url; + public string shortcode; + } +} diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs new file mode 100644 index 00000000..29b576c5 --- /dev/null +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -0,0 +1,45 @@ +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Threading.Tasks; +using Newtonsoft.Json.Linq; +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Models.Integrations; +using UKSF.Api.Services.Message; + +namespace UKSF.Api.Services.Integrations { + public class InstagramService : IInstagramService { + private List images = new List(); + + public async Task CacheInstagramImages() { + using HttpClient client = new HttpClient(); + HttpResponseMessage response = await client.GetAsync("https://www.instagram.com/uksfmilsim/?__a=1"); + if (!response.IsSuccessStatusCode) { + LogWrapper.Log($"Failed to get instagram images, error: {response}"); + return; + } + + string contentString = await response.Content.ReadAsStringAsync(); + JObject contentObject = JObject.Parse(contentString); + JToken imagesToken = contentObject["graphql"]?["user"]?["edge_owner_to_timeline_media"]?["edges"]; + + if (imagesToken == null) { + LogWrapper.Log($"Instagram response contains no images: {contentObject}"); + return; + } + + List allNewImages = imagesToken.Select(x => new InstagramImage { shortcode = x["node"]?["shortcode"]?.ToString(), url = x["node"]?["display_url"]?.ToString() }).ToList(); + if (images.Count > 0 && allNewImages.First().shortcode == images.First().shortcode) { + // Most recent image is the same, therefore all images are already processed + return; + } + + // Isolate new shortcodes, insert at start of list, and take only 12 + IEnumerable newImages = allNewImages.Where(x => images.All(y => x.shortcode != y.shortcode)); + images.InsertRange(0, newImages); + images = images.Take(12).ToList(); + } + + public List GetImages() => images; + } +} diff --git a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs index a622b404..13075d5e 100644 --- a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs +++ b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs @@ -16,7 +16,7 @@ public async Task CreateConfirmationCode(string value) { if (string.IsNullOrEmpty(value)) throw new ArgumentNullException(nameof(value), "Value for confirmation code cannot be null or empty"); ConfirmationCode code = new ConfirmationCode { value = value }; await Data.Add(code); - await schedulerService.Create(DateTime.Now.AddMinutes(30), TimeSpan.Zero, DeleteExpiredConfirmationCodeAction.ACTION_NAME, code.id); + await schedulerService.CreateAndSchedule(DateTime.Now.AddMinutes(30), TimeSpan.Zero, DeleteExpiredConfirmationCodeAction.ACTION_NAME, code.id); return code.id; } diff --git a/UKSF.Api.Services/Utility/ScheduledActions/InstagramImagesAction.cs b/UKSF.Api.Services/Utility/ScheduledActions/InstagramImagesAction.cs new file mode 100644 index 00000000..b6ff0aa3 --- /dev/null +++ b/UKSF.Api.Services/Utility/ScheduledActions/InstagramImagesAction.cs @@ -0,0 +1,19 @@ +using System.Threading.Tasks; +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Utility.ScheduledActions; + +namespace UKSF.Api.Services.Utility.ScheduledActions { + public class InstagramImagesAction : IInstagramImagesAction { + public const string ACTION_NAME = nameof(InstagramImagesAction); + + private readonly IInstagramService instagramService; + + public InstagramImagesAction(IInstagramService instagramService) => this.instagramService = instagramService; + + public string Name => ACTION_NAME; + + public void Run(params object[] parameters) { + Task unused = instagramService.CacheInstagramImages(); + } + } +} diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index a6d6b910..29298de2 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -15,34 +15,21 @@ namespace UKSF.Api.Services.Utility { public class SchedulerService : DataBackedService, ISchedulerService { private static readonly ConcurrentDictionary ACTIVE_TASKS = new ConcurrentDictionary(); - private readonly IScheduledActionService scheduledActionService; private readonly IHostEnvironment currentEnvironment; + private readonly IScheduledActionService scheduledActionService; public SchedulerService(ISchedulerDataService data, IScheduledActionService scheduledActionService, IHostEnvironment currentEnvironment) : base(data) { this.scheduledActionService = scheduledActionService; this.currentEnvironment = currentEnvironment; } - public async void LoadApi() { - if (!currentEnvironment.IsDevelopment()) { - await AddUnique(); - } - - Load(); + public async void Load() { + await AddUnique(); + Data.Get().ForEach(Schedule); } - public async Task Create(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { - ScheduledJob job = new ScheduledJob { next = next, action = action }; - if (actionParameters.Length > 0) { - job.actionParameters = JsonConvert.SerializeObject(actionParameters); - } - - if (interval != TimeSpan.Zero) { - job.interval = interval; - job.repeat = true; - } - - await Data.Add(job); + public async Task CreateAndSchedule(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { + ScheduledJob job = await Create(next, interval, action, actionParameters); Schedule(job); } @@ -57,8 +44,19 @@ public async Task Cancel(Func predicate) { await Data.Delete(job.id); } - private void Load() { - Data.Get().ForEach(Schedule); + private async Task Create(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { + ScheduledJob job = new ScheduledJob { next = next, action = action }; + if (actionParameters.Length > 0) { + job.actionParameters = JsonConvert.SerializeObject(actionParameters); + } + + if (interval != TimeSpan.Zero) { + job.interval = interval; + job.repeat = true; + } + + await Data.Add(job); + return job; } private void Schedule(ScheduledJob job) { @@ -100,12 +98,21 @@ private void Schedule(ScheduledJob job) { } private async Task AddUnique() { - if (Data.GetSingle(x => x.action == PruneLogsAction.ACTION_NAME) == null) { - await Create(DateTime.Today.AddDays(1), TimeSpan.FromDays(1), PruneLogsAction.ACTION_NAME); + ScheduledJob instagramAction = Data.GetSingle(x => x.action == InstagramImagesAction.ACTION_NAME); + if (instagramAction != null) { + await Data.Delete(instagramAction.id); } - if (Data.GetSingle(x => x.action == TeamspeakSnapshotAction.ACTION_NAME) == null) { - await Create(DateTime.Today.AddDays(1), TimeSpan.FromMinutes(5), TeamspeakSnapshotAction.ACTION_NAME); + await Create(DateTime.Now, TimeSpan.FromHours(1), InstagramImagesAction.ACTION_NAME); + + if (!currentEnvironment.IsDevelopment()) { + if (Data.GetSingle(x => x.action == PruneLogsAction.ACTION_NAME) == null) { + await Create(DateTime.Today.AddDays(1), TimeSpan.FromDays(1), PruneLogsAction.ACTION_NAME); + } + + if (Data.GetSingle(x => x.action == TeamspeakSnapshotAction.ACTION_NAME) == null) { + await Create(DateTime.Today.AddMinutes(5), TimeSpan.FromMinutes(5), TeamspeakSnapshotAction.ACTION_NAME); + } } } diff --git a/UKSF.Api/AppStart/RegisterScheduledActions.cs b/UKSF.Api/AppStart/RegisterScheduledActions.cs index 82b8b6b0..e90f1bc1 100644 --- a/UKSF.Api/AppStart/RegisterScheduledActions.cs +++ b/UKSF.Api/AppStart/RegisterScheduledActions.cs @@ -10,11 +10,12 @@ public static void Register() { IServiceProvider serviceProvider = Global.ServiceProvider; IDeleteExpiredConfirmationCodeAction deleteExpiredConfirmationCodeAction = serviceProvider.GetService(); + IInstagramImagesAction instagramImagesAction = serviceProvider.GetService(); IPruneLogsAction pruneLogsAction = serviceProvider.GetService(); ITeamspeakSnapshotAction teamspeakSnapshotAction = serviceProvider.GetService(); IScheduledActionService scheduledActionService = serviceProvider.GetService(); - scheduledActionService.RegisterScheduledActions(new HashSet { deleteExpiredConfirmationCodeAction, pruneLogsAction, teamspeakSnapshotAction }); + scheduledActionService.RegisterScheduledActions(new HashSet { deleteExpiredConfirmationCodeAction, instagramImagesAction, pruneLogsAction, teamspeakSnapshotAction }); } } } diff --git a/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs b/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs index dbe0ebac..b8e613b6 100644 --- a/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs @@ -6,6 +6,7 @@ namespace UKSF.Api.AppStart.Services { public static class ScheduledActionServiceExtensions { public static void RegisterScheduledActionServices(this IServiceCollection services) { services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); } diff --git a/UKSF.Api/AppStart/Services/ServiceExtensions.cs b/UKSF.Api/AppStart/Services/ServiceExtensions.cs index 0595ae9f..60ee9eec 100644 --- a/UKSF.Api/AppStart/Services/ServiceExtensions.cs +++ b/UKSF.Api/AppStart/Services/ServiceExtensions.cs @@ -67,6 +67,7 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/UKSF.Api/AppStart/StartServices.cs b/UKSF.Api/AppStart/StartServices.cs index 1085ea1e..8b779008 100644 --- a/UKSF.Api/AppStart/StartServices.cs +++ b/UKSF.Api/AppStart/StartServices.cs @@ -30,7 +30,7 @@ public static void Start() { serviceProvider.GetService().ConnectDiscord(); // Start scheduler - serviceProvider.GetService().LoadApi(); + serviceProvider.GetService().Load(); } } } diff --git a/UKSF.Api/Controllers/InstagramController.cs b/UKSF.Api/Controllers/InstagramController.cs new file mode 100644 index 00000000..62daf4dc --- /dev/null +++ b/UKSF.Api/Controllers/InstagramController.cs @@ -0,0 +1,16 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Services.Personnel; + +namespace UKSF.Api.Controllers { + [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] + public class InstagramController : Controller { + private readonly IInstagramService instagramService; + + public InstagramController(IInstagramService instagramService) => this.instagramService = instagramService; + + [HttpGet, Authorize] + public IActionResult GetImages() => Ok(instagramService.GetImages()); + } +} diff --git a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs index c791d382..95a3a1ef 100644 --- a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs @@ -38,7 +38,7 @@ public async Task ShouldSetConfirmationCodeValue() { ConfirmationCode subject = null; mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); - mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.CreateAndSchedule(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); await confirmationCodeService.CreateConfirmationCode("test"); @@ -49,7 +49,7 @@ public async Task ShouldSetConfirmationCodeValue() { [Theory, InlineData(null), InlineData("")] public void ShouldThrowForCreateWhenValueNullOrEmpty(string value) { mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); - mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.CreateAndSchedule(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); Func act = async () => await confirmationCodeService.CreateConfirmationCode(value); @@ -81,7 +81,7 @@ public async Task ShouldCreateConfirmationCode() { ConfirmationCode subject = null; mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); - mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.CreateAndSchedule(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); await confirmationCodeService.CreateConfirmationCode("test"); @@ -121,7 +121,7 @@ public async Task ShouldReturnCodeValue() { [Fact] public async Task ShouldReturnValidCodeId() { mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); - mockSchedulerService.Setup(x => x.Create(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.CreateAndSchedule(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); string subject = await confirmationCodeService.CreateConfirmationCode("test"); From 9297bb1647a766c83008a79c36329169a2b04d80 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 27 Jun 2020 14:22:48 +0100 Subject: [PATCH 176/369] Logging for insta service --- UKSF.Api.Services/Integrations/InstagramService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs index 29b576c5..be698755 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -12,6 +12,7 @@ public class InstagramService : IInstagramService { private List images = new List(); public async Task CacheInstagramImages() { + LogWrapper.Log("Running instagram get"); using HttpClient client = new HttpClient(); HttpResponseMessage response = await client.GetAsync("https://www.instagram.com/uksfmilsim/?__a=1"); if (!response.IsSuccessStatusCode) { @@ -30,7 +31,8 @@ public async Task CacheInstagramImages() { List allNewImages = imagesToken.Select(x => new InstagramImage { shortcode = x["node"]?["shortcode"]?.ToString(), url = x["node"]?["display_url"]?.ToString() }).ToList(); if (images.Count > 0 && allNewImages.First().shortcode == images.First().shortcode) { - // Most recent image is the same, therefore all images are already processed + // Most recent image is the same, therefore all images are already present + LogWrapper.Log("No instagram images processed"); return; } From feaabc2b3fc7ea8ed646fb62268fe8bb4fa90a33 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 27 Jun 2020 14:28:14 +0100 Subject: [PATCH 177/369] Instagram Logging --- UKSF.Api.Services/Integrations/InstagramService.cs | 1 + UKSF.Api.Services/Utility/SchedulerService.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs index be698755..7ada05af 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -40,6 +40,7 @@ public async Task CacheInstagramImages() { IEnumerable newImages = allNewImages.Where(x => images.All(y => x.shortcode != y.shortcode)); images.InsertRange(0, newImages); images = images.Take(12).ToList(); + LogWrapper.Log($"Insta images: {images}"); } public List GetImages() => images; diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index 29298de2..76d1ef3d 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -103,7 +103,7 @@ private async Task AddUnique() { await Data.Delete(instagramAction.id); } - await Create(DateTime.Now, TimeSpan.FromHours(1), InstagramImagesAction.ACTION_NAME); + await Create(DateTime.Today, TimeSpan.FromHours(1), InstagramImagesAction.ACTION_NAME); if (!currentEnvironment.IsDevelopment()) { if (Data.GetSingle(x => x.action == PruneLogsAction.ACTION_NAME) == null) { From 44cc23b784f8fbf86d7b19b0937dded8f7e484ab Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 27 Jun 2020 14:30:22 +0100 Subject: [PATCH 178/369] Wrap instagram in try --- .../Integrations/InstagramService.cs | 59 +++++++++++-------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs index 7ada05af..204fe95a 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Threading.Tasks; @@ -12,35 +13,41 @@ public class InstagramService : IInstagramService { private List images = new List(); public async Task CacheInstagramImages() { - LogWrapper.Log("Running instagram get"); - using HttpClient client = new HttpClient(); - HttpResponseMessage response = await client.GetAsync("https://www.instagram.com/uksfmilsim/?__a=1"); - if (!response.IsSuccessStatusCode) { - LogWrapper.Log($"Failed to get instagram images, error: {response}"); - return; - } + try { + LogWrapper.Log("Running instagram get"); + using HttpClient client = new HttpClient(); + HttpResponseMessage response = await client.GetAsync("https://www.instagram.com/uksfmilsim/?__a=1"); + if (!response.IsSuccessStatusCode) { + LogWrapper.Log($"Failed to get instagram images, error: {response}"); + return; + } - string contentString = await response.Content.ReadAsStringAsync(); - JObject contentObject = JObject.Parse(contentString); - JToken imagesToken = contentObject["graphql"]?["user"]?["edge_owner_to_timeline_media"]?["edges"]; + string contentString = await response.Content.ReadAsStringAsync(); + JObject contentObject = JObject.Parse(contentString); + JToken imagesToken = contentObject["graphql"]?["user"]?["edge_owner_to_timeline_media"]?["edges"]; - if (imagesToken == null) { - LogWrapper.Log($"Instagram response contains no images: {contentObject}"); - return; - } + if (imagesToken == null) { + LogWrapper.Log($"Instagram response contains no images: {contentObject}"); + return; + } - List allNewImages = imagesToken.Select(x => new InstagramImage { shortcode = x["node"]?["shortcode"]?.ToString(), url = x["node"]?["display_url"]?.ToString() }).ToList(); - if (images.Count > 0 && allNewImages.First().shortcode == images.First().shortcode) { - // Most recent image is the same, therefore all images are already present - LogWrapper.Log("No instagram images processed"); - return; - } + List allNewImages = imagesToken.Select(x => new InstagramImage { shortcode = x["node"]?["shortcode"]?.ToString(), url = x["node"]?["display_url"]?.ToString() }) + .ToList(); + if (images.Count > 0 && allNewImages.First().shortcode == images.First().shortcode) { + // Most recent image is the same, therefore all images are already present + LogWrapper.Log("No instagram images processed"); + return; + } - // Isolate new shortcodes, insert at start of list, and take only 12 - IEnumerable newImages = allNewImages.Where(x => images.All(y => x.shortcode != y.shortcode)); - images.InsertRange(0, newImages); - images = images.Take(12).ToList(); - LogWrapper.Log($"Insta images: {images}"); + // Isolate new shortcodes, insert at start of list, and take only 12 + IEnumerable newImages = allNewImages.Where(x => images.All(y => x.shortcode != y.shortcode)); + images.InsertRange(0, newImages); + images = images.Take(12).ToList(); + LogWrapper.Log($"Insta images: {images}"); + + } catch (Exception exception) { + LogWrapper.Log(exception); + } } public List GetImages() => images; From aac74abbff8275cc8fea261d43a279e32016eb39 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 27 Jun 2020 14:32:43 +0100 Subject: [PATCH 179/369] Log insta response --- UKSF.Api.Services/Integrations/InstagramService.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs index 204fe95a..222bb456 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -14,7 +14,6 @@ public class InstagramService : IInstagramService { public async Task CacheInstagramImages() { try { - LogWrapper.Log("Running instagram get"); using HttpClient client = new HttpClient(); HttpResponseMessage response = await client.GetAsync("https://www.instagram.com/uksfmilsim/?__a=1"); if (!response.IsSuccessStatusCode) { @@ -23,6 +22,7 @@ public async Task CacheInstagramImages() { } string contentString = await response.Content.ReadAsStringAsync(); + LogWrapper.Log($"Instagram response: {contentString}"); JObject contentObject = JObject.Parse(contentString); JToken imagesToken = contentObject["graphql"]?["user"]?["edge_owner_to_timeline_media"]?["edges"]; @@ -35,7 +35,6 @@ public async Task CacheInstagramImages() { .ToList(); if (images.Count > 0 && allNewImages.First().shortcode == images.First().shortcode) { // Most recent image is the same, therefore all images are already present - LogWrapper.Log("No instagram images processed"); return; } @@ -43,8 +42,8 @@ public async Task CacheInstagramImages() { IEnumerable newImages = allNewImages.Where(x => images.All(y => x.shortcode != y.shortcode)); images.InsertRange(0, newImages); images = images.Take(12).ToList(); - LogWrapper.Log($"Insta images: {images}"); + LogWrapper.Log($"Insta images: {images}"); } catch (Exception exception) { LogWrapper.Log(exception); } From 7b32b2199f2ee0bc684f8e817767da75402c8209 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 27 Jun 2020 16:03:24 +0100 Subject: [PATCH 180/369] Change to use instagram API - Replace images call to use instagram api - Add instagram access token refresh handling --- .../Integrations/IInstagramService.cs | 1 + .../ScheduledActions/IInstagramTokenAction.cs | 3 + .../Integrations/InstagramImage.cs | 14 ++++- UKSF.Api.Models/UKSF.Api.Models.csproj | 1 + .../Integrations/InstagramService.cs | 57 +++++++++++++++---- .../ScheduledActions/InstagramTokenAction.cs | 19 +++++++ UKSF.Api.Services/Utility/SchedulerService.cs | 4 ++ UKSF.Api/AppStart/RegisterScheduledActions.cs | 3 +- .../RegisterScheduledActionServices.cs | 1 + 9 files changed, 89 insertions(+), 14 deletions(-) create mode 100644 UKSF.Api.Interfaces/Utility/ScheduledActions/IInstagramTokenAction.cs create mode 100644 UKSF.Api.Services/Utility/ScheduledActions/InstagramTokenAction.cs diff --git a/UKSF.Api.Interfaces/Integrations/IInstagramService.cs b/UKSF.Api.Interfaces/Integrations/IInstagramService.cs index 2ca3522f..e18596d5 100644 --- a/UKSF.Api.Interfaces/Integrations/IInstagramService.cs +++ b/UKSF.Api.Interfaces/Integrations/IInstagramService.cs @@ -4,6 +4,7 @@ namespace UKSF.Api.Interfaces.Integrations { public interface IInstagramService { + Task RefreshAccessToken(); Task CacheInstagramImages(); List GetImages(); } diff --git a/UKSF.Api.Interfaces/Utility/ScheduledActions/IInstagramTokenAction.cs b/UKSF.Api.Interfaces/Utility/ScheduledActions/IInstagramTokenAction.cs new file mode 100644 index 00000000..b6878f64 --- /dev/null +++ b/UKSF.Api.Interfaces/Utility/ScheduledActions/IInstagramTokenAction.cs @@ -0,0 +1,3 @@ +namespace UKSF.Api.Interfaces.Utility.ScheduledActions { + public interface IInstagramTokenAction : IScheduledAction { } +} diff --git a/UKSF.Api.Models/Integrations/InstagramImage.cs b/UKSF.Api.Models/Integrations/InstagramImage.cs index f65836a5..0045ae5c 100644 --- a/UKSF.Api.Models/Integrations/InstagramImage.cs +++ b/UKSF.Api.Models/Integrations/InstagramImage.cs @@ -1,6 +1,14 @@ -namespace UKSF.Api.Models.Integrations { +using System; +using Newtonsoft.Json; + +namespace UKSF.Api.Models.Integrations { public class InstagramImage { - public string url; - public string shortcode; + public string id; + + [JsonProperty("media_type")] public string mediaType; + [JsonProperty("media_url")] public string mediaUrl; + + public string permalink; + public DateTime timestamp; } } diff --git a/UKSF.Api.Models/UKSF.Api.Models.csproj b/UKSF.Api.Models/UKSF.Api.Models.csproj index ef92a49b..c4a0c91a 100644 --- a/UKSF.Api.Models/UKSF.Api.Models.csproj +++ b/UKSF.Api.Models/UKSF.Api.Models.csproj @@ -11,6 +11,7 @@ + diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs index 222bb456..09098d3f 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -3,19 +3,51 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Models.Integrations; +using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; namespace UKSF.Api.Services.Integrations { public class InstagramService : IInstagramService { private List images = new List(); + public async Task RefreshAccessToken() { + try { + string accessToken = VariablesWrapper.VariablesDataService().GetSingle("INSTAGRAM_ACCESS_TOKEN").AsString(); + + using HttpClient client = new HttpClient(); + HttpResponseMessage response = await client.GetAsync($"https://graph.instagram.com/refresh_access_token?access_token={accessToken}&grant_type=ig_exchange_token"); + if (!response.IsSuccessStatusCode) { + LogWrapper.Log($"Failed to get instagram access token, error: {response}"); + return; + } + + string contentString = await response.Content.ReadAsStringAsync(); + LogWrapper.Log($"Instagram response: {contentString}"); + string newAccessToken = JObject.Parse(contentString)["access_token"]?.ToString(); + + if (string.IsNullOrEmpty(newAccessToken)) { + LogWrapper.Log($"Failed to get instagram access token from response: {contentString}"); + return; + } + + await VariablesWrapper.VariablesDataService().Update("INSTAGRAM_ACCESS_TOKEN", newAccessToken); + LogWrapper.Log("Updated Instagram access token"); + } catch (Exception exception) { + LogWrapper.Log(exception); + } + } + public async Task CacheInstagramImages() { try { + string userId = VariablesWrapper.VariablesDataService().GetSingle("INSTAGRAM_USER_ID").AsString(); + string accessToken = VariablesWrapper.VariablesDataService().GetSingle("INSTAGRAM_ACCESS_TOKEN").AsString(); + using HttpClient client = new HttpClient(); - HttpResponseMessage response = await client.GetAsync("https://www.instagram.com/uksfmilsim/?__a=1"); + HttpResponseMessage response = await client.GetAsync($"https://graph.instagram.com/{userId}/media?access_token={accessToken}&fields=id,timestamp,media_type,media_url,permalink"); if (!response.IsSuccessStatusCode) { LogWrapper.Log($"Failed to get instagram images, error: {response}"); return; @@ -24,26 +56,31 @@ public async Task CacheInstagramImages() { string contentString = await response.Content.ReadAsStringAsync(); LogWrapper.Log($"Instagram response: {contentString}"); JObject contentObject = JObject.Parse(contentString); - JToken imagesToken = contentObject["graphql"]?["user"]?["edge_owner_to_timeline_media"]?["edges"]; + List allNewImages = JsonConvert.DeserializeObject>(contentObject["data"]?.ToString() ?? ""); - if (imagesToken == null) { + if (allNewImages == null || allNewImages.Count == 0) { LogWrapper.Log($"Instagram response contains no images: {contentObject}"); return; } - List allNewImages = imagesToken.Select(x => new InstagramImage { shortcode = x["node"]?["shortcode"]?.ToString(), url = x["node"]?["display_url"]?.ToString() }) - .ToList(); - if (images.Count > 0 && allNewImages.First().shortcode == images.First().shortcode) { + if (images.Count > 0 && allNewImages.First().id == images.First().id) { // Most recent image is the same, therefore all images are already present return; } - // Isolate new shortcodes, insert at start of list, and take only 12 - IEnumerable newImages = allNewImages.Where(x => images.All(y => x.shortcode != y.shortcode)); + // Isolate new images + List newImages = allNewImages.Where(x => x.mediaType == "IMAGE" && images.All(y => x.id != y.id)).ToList(); + + // // Handle carousel images + // foreach ((InstagramImage value, int index) instagramImage in newImages.Select((value, index) => ( value, index ))) { + // if (instagramImage.value.mediaType == "CAROUSEL_ALBUM ") { + // + // } + // } + + // Insert new images at start of list, and take only 12 images.InsertRange(0, newImages); images = images.Take(12).ToList(); - - LogWrapper.Log($"Insta images: {images}"); } catch (Exception exception) { LogWrapper.Log(exception); } diff --git a/UKSF.Api.Services/Utility/ScheduledActions/InstagramTokenAction.cs b/UKSF.Api.Services/Utility/ScheduledActions/InstagramTokenAction.cs new file mode 100644 index 00000000..edc4b5fb --- /dev/null +++ b/UKSF.Api.Services/Utility/ScheduledActions/InstagramTokenAction.cs @@ -0,0 +1,19 @@ +using System.Threading.Tasks; +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Utility.ScheduledActions; + +namespace UKSF.Api.Services.Utility.ScheduledActions { + public class InstagramTokenAction : IInstagramTokenAction { + public const string ACTION_NAME = nameof(InstagramTokenAction); + + private readonly IInstagramService instagramService; + + public InstagramTokenAction(IInstagramService instagramService) => this.instagramService = instagramService; + + public string Name => ACTION_NAME; + + public void Run(params object[] parameters) { + Task unused = instagramService.RefreshAccessToken(); + } + } +} diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index 76d1ef3d..8a506903 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -106,6 +106,10 @@ private async Task AddUnique() { await Create(DateTime.Today, TimeSpan.FromHours(1), InstagramImagesAction.ACTION_NAME); if (!currentEnvironment.IsDevelopment()) { + if (Data.GetSingle(x => x.action == InstagramTokenAction.ACTION_NAME) == null) { + await Create(DateTime.Today.AddDays(45), TimeSpan.FromDays(45), InstagramTokenAction.ACTION_NAME); + } + if (Data.GetSingle(x => x.action == PruneLogsAction.ACTION_NAME) == null) { await Create(DateTime.Today.AddDays(1), TimeSpan.FromDays(1), PruneLogsAction.ACTION_NAME); } diff --git a/UKSF.Api/AppStart/RegisterScheduledActions.cs b/UKSF.Api/AppStart/RegisterScheduledActions.cs index e90f1bc1..4c97c0d9 100644 --- a/UKSF.Api/AppStart/RegisterScheduledActions.cs +++ b/UKSF.Api/AppStart/RegisterScheduledActions.cs @@ -11,11 +11,12 @@ public static void Register() { IDeleteExpiredConfirmationCodeAction deleteExpiredConfirmationCodeAction = serviceProvider.GetService(); IInstagramImagesAction instagramImagesAction = serviceProvider.GetService(); + IInstagramTokenAction instagramTokenAction = serviceProvider.GetService(); IPruneLogsAction pruneLogsAction = serviceProvider.GetService(); ITeamspeakSnapshotAction teamspeakSnapshotAction = serviceProvider.GetService(); IScheduledActionService scheduledActionService = serviceProvider.GetService(); - scheduledActionService.RegisterScheduledActions(new HashSet { deleteExpiredConfirmationCodeAction, instagramImagesAction, pruneLogsAction, teamspeakSnapshotAction }); + scheduledActionService.RegisterScheduledActions(new HashSet { deleteExpiredConfirmationCodeAction, instagramImagesAction, instagramTokenAction, pruneLogsAction, teamspeakSnapshotAction }); } } } diff --git a/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs b/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs index b8e613b6..62970a3a 100644 --- a/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs @@ -7,6 +7,7 @@ public static class ScheduledActionServiceExtensions { public static void RegisterScheduledActionServices(this IServiceCollection services) { services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); } From 8865cfbaea2e277f203072a53bf685e767da2e89 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 27 Jun 2020 16:06:12 +0100 Subject: [PATCH 181/369] Remove extra log in instagram image get --- UKSF.Api.Services/Integrations/InstagramService.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs index 09098d3f..ee14da8c 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -54,7 +54,6 @@ public async Task CacheInstagramImages() { } string contentString = await response.Content.ReadAsStringAsync(); - LogWrapper.Log($"Instagram response: {contentString}"); JObject contentObject = JObject.Parse(contentString); List allNewImages = JsonConvert.DeserializeObject>(contentObject["data"]?.ToString() ?? ""); From 4012af953d996acfc897527413ead7754b6a0142 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 1 Jul 2020 01:03:21 +0100 Subject: [PATCH 182/369] First work towards modpack builds --- UKSF.Api.Data/CachedDataService.cs | 8 + UKSF.Api.Data/DataCollection.cs | 4 + UKSF.Api.Data/DataService.cs | 8 + UKSF.Api.Data/Modpack/BuildsDataService.cs | 54 ++++++ UKSF.Api.Data/Modpack/ReleasesDataService.cs | 10 + UKSF.Api.Events/EventHandlerInitialiser.cs | 4 + .../Handlers/BuildsEventHandler.cs | 64 +++++++ .../Handlers/CommentThreadEventHandler.cs | 3 +- .../Data/Cached/IBuildsDataService.cs | 9 + .../Data/Cached/IReleasesDataService.cs | 5 + UKSF.Api.Interfaces/Data/IDataCollection.cs | 1 + UKSF.Api.Interfaces/Data/IDataService.cs | 2 + .../Events/Handlers/IBuildsEventHandler.cs | 3 + UKSF.Api.Interfaces/Hubs/IModpackClient.cs | 10 + .../Integrations/Github/IGithubService.cs | 8 + UKSF.Api.Interfaces/Modpack/IBuildsService.cs | 14 ++ .../Modpack/IModpackService.cs | 5 + .../Modpack/IReleaseService.cs | 7 + .../Integrations/Github/GithubPushEvent.cs | 27 +++ UKSF.Api.Models/Modpack/ModpackBuild.cs | 14 ++ .../Modpack/ModpackBuildRelease.cs | 8 + UKSF.Api.Models/Modpack/ModpackBuildStep.cs | 15 ++ UKSF.Api.Models/Modpack/ModpackRelease.cs | 10 + .../Personnel/AccountPermissions.cs | 9 +- UKSF.Api.Services/Fake/FakeDataService.cs | 3 + .../Integrations/Github/GithubService.cs | 36 ++++ .../BuildProcess/Steps/BuildStep0Prep.cs | 5 + .../BuildProcess/Steps/BuildStepBase.cs | 6 + UKSF.Api.Services/Modpack/BuildsService.cs | 71 +++++++ UKSF.Api.Services/Modpack/ModpackService.cs | 7 + UKSF.Api.Services/Modpack/ReleaseService.cs | 10 + UKSF.Api.Services/Personnel/LoginService.cs | 5 + .../Personnel/RoleDefinitions.cs | 16 +- UKSF.Api.Services/UKSF.Api.Services.csproj | 1 + UKSF.Api.Signalr/Hubs/Modpack/BuildsHub.cs | 31 ++++ .../AppStart/RegisterAndWarmCachedData.cs | 4 + .../Services/RegisterDataBackedServices.cs | 6 + .../AppStart/Services/RegisterDataServices.cs | 3 + .../Services/RegisterEventServices.cs | 3 + .../AppStart/Services/ServiceExtensions.cs | 8 + UKSF.Api/AppStart/StartServices.cs | 6 + UKSF.Api/AppStart/TestDataSetup.cs | 174 ++++++++++++++++++ .../Accounts/AccountsController.cs | 9 +- .../Integrations/GithubController.cs | 50 +++++ .../Controllers/Modpack/ModpackController.cs | 82 +++++++++ UKSF.Api/Startup.cs | 6 +- UKSF.Api/appsettings.json | 3 +- .../Events/EventHandlerInitialiserTests.cs | 3 + 48 files changed, 835 insertions(+), 15 deletions(-) create mode 100644 UKSF.Api.Data/Modpack/BuildsDataService.cs create mode 100644 UKSF.Api.Data/Modpack/ReleasesDataService.cs create mode 100644 UKSF.Api.Events/Handlers/BuildsEventHandler.cs create mode 100644 UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs create mode 100644 UKSF.Api.Interfaces/Data/Cached/IReleasesDataService.cs create mode 100644 UKSF.Api.Interfaces/Events/Handlers/IBuildsEventHandler.cs create mode 100644 UKSF.Api.Interfaces/Hubs/IModpackClient.cs create mode 100644 UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs create mode 100644 UKSF.Api.Interfaces/Modpack/IBuildsService.cs create mode 100644 UKSF.Api.Interfaces/Modpack/IModpackService.cs create mode 100644 UKSF.Api.Interfaces/Modpack/IReleaseService.cs create mode 100644 UKSF.Api.Models/Integrations/Github/GithubPushEvent.cs create mode 100644 UKSF.Api.Models/Modpack/ModpackBuild.cs create mode 100644 UKSF.Api.Models/Modpack/ModpackBuildRelease.cs create mode 100644 UKSF.Api.Models/Modpack/ModpackBuildStep.cs create mode 100644 UKSF.Api.Models/Modpack/ModpackRelease.cs create mode 100644 UKSF.Api.Services/Integrations/Github/GithubService.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepBase.cs create mode 100644 UKSF.Api.Services/Modpack/BuildsService.cs create mode 100644 UKSF.Api.Services/Modpack/ModpackService.cs create mode 100644 UKSF.Api.Services/Modpack/ReleaseService.cs create mode 100644 UKSF.Api.Signalr/Hubs/Modpack/BuildsHub.cs create mode 100644 UKSF.Api/AppStart/TestDataSetup.cs create mode 100644 UKSF.Api/Controllers/Integrations/GithubController.cs create mode 100644 UKSF.Api/Controllers/Modpack/ModpackController.cs diff --git a/UKSF.Api.Data/CachedDataService.cs b/UKSF.Api.Data/CachedDataService.cs index ad2c92dd..1e3d2353 100644 --- a/UKSF.Api.Data/CachedDataService.cs +++ b/UKSF.Api.Data/CachedDataService.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Linq.Expressions; using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.Interfaces.Data; @@ -69,6 +70,13 @@ public override async Task Update(string id, UpdateDefinition update) { CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } + public override async Task Update(Expression> filterExpression, UpdateDefinition update) { + await base.Update(filterExpression, update); + Refresh(); + List ids = Get(filterExpression.Compile()).Select(x => x.GetIdValue()).ToList(); + ids.ForEach(x => CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x))); + } + public override async Task UpdateMany(Func predicate, UpdateDefinition update) { List items = Get(predicate); await base.UpdateMany(predicate, update); diff --git a/UKSF.Api.Data/DataCollection.cs b/UKSF.Api.Data/DataCollection.cs index dc3ce4ef..3216a541 100644 --- a/UKSF.Api.Data/DataCollection.cs +++ b/UKSF.Api.Data/DataCollection.cs @@ -40,6 +40,10 @@ public async Task UpdateAsync(string id, UpdateDefinition update) { // TODO: await GetCollection().UpdateOneAsync(Builders.Filter.Eq("id", id), update); } + public async Task UpdateAsync(FilterDefinition filter, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter + await GetCollection().UpdateOneAsync(filter, update); + } + public async Task UpdateManyAsync(Expression> predicate, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter IEnumerable ids = Get(predicate.Compile()).Select(x => x.GetIdValue()); // This is necessary for filtering items by a default model value (e.g Role order default 0, may not be stored in document) await GetCollection().UpdateManyAsync(Builders.Filter.In("id", ids), update); diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index 68f2fc8f..15009048 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -1,5 +1,7 @@ using System; using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; @@ -45,6 +47,12 @@ public virtual async Task Update(string id, UpdateDefinition update) { // TOD DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } + public virtual async Task Update(Expression> filterExpression, UpdateDefinition update) { // TODO: Remove strong typing to UpdateDefinition + List ids = Get(filterExpression.Compile()).Select(x => x.GetIdValue()).ToList(); + await dataCollection.UpdateAsync(Builders.Filter.Where(filterExpression), update); + ids.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x))); + } + public virtual async Task UpdateMany(Func predicate, UpdateDefinition update) { List items = Get(predicate); // TODO: Evaluate performance impact of this presence check if (items.Count == 0) return; // throw new KeyNotFoundException("Could not find any items to update"); diff --git a/UKSF.Api.Data/Modpack/BuildsDataService.cs b/UKSF.Api.Data/Modpack/BuildsDataService.cs new file mode 100644 index 00000000..8ff1c24c --- /dev/null +++ b/UKSF.Api.Data/Modpack/BuildsDataService.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using MongoDB.Bson; +using MongoDB.Driver; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Modpack; +using UKSF.Common; + +namespace UKSF.Api.Data.Modpack { + public class BuildsDataService : CachedDataService, IBuildsDataService { + public BuildsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackBuilds") { } + + public override List Get() { + base.Get(); + Collection = Collection.OrderByDescending(x => x.version).ToList(); + Collection.ForEach(x => x.builds = x.builds.OrderByDescending(y => y.buildNumber).ToList()); + return Collection; + } + + public async Task Update(string id, ModpackBuild build, DataEventType updateType) { + UpdateDefinition updateDefinition; + switch (updateType) { + case DataEventType.ADD: + updateDefinition = Builders.Update.Push(x => x.builds, build); + await base.Update(id, updateDefinition); + break; + case DataEventType.UPDATE: + updateDefinition = Builders.Update.Set(x => x.builds[-1], build); + await base.Update(x => x.id == id && x.builds.Any(y => y.buildNumber == build.buildNumber), updateDefinition); + break; + case DataEventType.DELETE: return; + default: throw new ArgumentOutOfRangeException(nameof(updateType), updateType, null); + } + + Refresh(); + ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(updateType, GetSingle(id).version, build)); + } + + private void ModpackBuildDataEvent(DataEventModel dataEvent) { + base.CachedDataEvent(dataEvent); + } + + protected override void CachedDataEvent(DataEventModel dataEvent) { + if (ObjectId.TryParse(dataEvent.id, out ObjectId unused)) { + base.CachedDataEvent(dataEvent); + } + } + } +} diff --git a/UKSF.Api.Data/Modpack/ReleasesDataService.cs b/UKSF.Api.Data/Modpack/ReleasesDataService.cs new file mode 100644 index 00000000..9c87f413 --- /dev/null +++ b/UKSF.Api.Data/Modpack/ReleasesDataService.cs @@ -0,0 +1,10 @@ +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Data.Modpack { + public class ReleasesDataService : CachedDataService, IReleasesDataService { + public ReleasesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackReleases") { } + } +} diff --git a/UKSF.Api.Events/EventHandlerInitialiser.cs b/UKSF.Api.Events/EventHandlerInitialiser.cs index a833c85a..ab60154c 100644 --- a/UKSF.Api.Events/EventHandlerInitialiser.cs +++ b/UKSF.Api.Events/EventHandlerInitialiser.cs @@ -3,6 +3,7 @@ namespace UKSF.Api.Events { public class EventHandlerInitialiser { private readonly IAccountEventHandler accountEventHandler; + private readonly IBuildsEventHandler buildsEventHandler; private readonly ICommandRequestEventHandler commandRequestEventHandler; private readonly ICommentThreadEventHandler commentThreadEventHandler; private readonly ILogEventHandler logEventHandler; @@ -11,6 +12,7 @@ public class EventHandlerInitialiser { public EventHandlerInitialiser( IAccountEventHandler accountEventHandler, + IBuildsEventHandler buildsEventHandler, ICommandRequestEventHandler commandRequestEventHandler, ICommentThreadEventHandler commentThreadEventHandler, ILogEventHandler logEventHandler, @@ -18,6 +20,7 @@ public EventHandlerInitialiser( ITeamspeakEventHandler teamspeakEventHandler ) { this.accountEventHandler = accountEventHandler; + this.buildsEventHandler = buildsEventHandler; this.commandRequestEventHandler = commandRequestEventHandler; this.commentThreadEventHandler = commentThreadEventHandler; this.logEventHandler = logEventHandler; @@ -27,6 +30,7 @@ ITeamspeakEventHandler teamspeakEventHandler public void InitEventHandlers() { accountEventHandler.Init(); + buildsEventHandler.Init(); commandRequestEventHandler.Init(); commentThreadEventHandler.Init(); logEventHandler.Init(); diff --git a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs new file mode 100644 index 00000000..f6ac2e23 --- /dev/null +++ b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs @@ -0,0 +1,64 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.SignalR; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events.Handlers; +using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Modpack; +using UKSF.Api.Signalr.Hubs.Modpack; +using UKSF.Common; + +namespace UKSF.Api.Events.Handlers { + public class BuildsEventHandler : IBuildsEventHandler { + private readonly IBuildsDataService data; + private readonly IHubContext hub; + private readonly ILoggingService loggingService; + + public BuildsEventHandler(IBuildsDataService data, IHubContext hub, ILoggingService loggingService) { + this.data = data; + this.hub = hub; + this.loggingService = loggingService; + } + + public void Init() { + data.EventBus().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + } + + private async Task HandleEvent(DataEventModel x) { + switch (x.type) { + case DataEventType.ADD: + await AddedEvent(x.id, x.data); + break; + case DataEventType.UPDATE: + await UpdatedEvent(x.id, x.data); + break; + case DataEventType.DELETE: break; + default: throw new ArgumentOutOfRangeException(); + } + } + + private async Task AddedEvent(string version, object dataObject) { + switch (dataObject) { + case ModpackBuild build: + await hub.Clients.All.ReceiveBuild(version, build); + break; + case ModpackBuildRelease buildRelease: + await hub.Clients.All.ReceiveBuildRelease(buildRelease); + break; + } + } + + private async Task UpdatedEvent(string version, object dataObject) { + switch (dataObject) { + case ModpackBuild build: + await hub.Clients.All.ReceiveBuild(version, build); + break; + case ModpackBuildStep step: + await hub.Clients.All.ReceiveBuildStep(step); + break; + } + } + } +} diff --git a/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs b/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs index 12021b7f..4185d7c7 100644 --- a/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs +++ b/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs @@ -5,6 +5,7 @@ using UKSF.Api.Interfaces.Events.Handlers; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; +using UKSF.Api.Models; using UKSF.Api.Models.Events; using UKSF.Api.Models.Message; using UKSF.Api.Signalr.Hubs.Message; @@ -50,7 +51,7 @@ private async Task AddedEvent(string id, Comment comment) { await hub.Clients.Group(id).ReceiveComment(commentThreadService.FormatComment(comment)); } - private async Task DeletedEvent(string id, Comment comment) { + private async Task DeletedEvent(string id, DatabaseObject comment) { await hub.Clients.Group(id).DeleteComment(comment.id); } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs new file mode 100644 index 00000000..5dfb4cba --- /dev/null +++ b/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs @@ -0,0 +1,9 @@ +using System.Threading.Tasks; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Interfaces.Data.Cached { + public interface IBuildsDataService : IDataService, ICachedDataService { + Task Update(string id, ModpackBuild build, DataEventType updateType); + } +} diff --git a/UKSF.Api.Interfaces/Data/Cached/IReleasesDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IReleasesDataService.cs new file mode 100644 index 00000000..a8a729c5 --- /dev/null +++ b/UKSF.Api.Interfaces/Data/Cached/IReleasesDataService.cs @@ -0,0 +1,5 @@ +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Interfaces.Data.Cached { + public interface IReleasesDataService : IDataService, ICachedDataService { } +} diff --git a/UKSF.Api.Interfaces/Data/IDataCollection.cs b/UKSF.Api.Interfaces/Data/IDataCollection.cs index 13e95e98..f9ee9ed9 100644 --- a/UKSF.Api.Interfaces/Data/IDataCollection.cs +++ b/UKSF.Api.Interfaces/Data/IDataCollection.cs @@ -12,6 +12,7 @@ public interface IDataCollection { T GetSingle(Func predicate); Task AddAsync(T data); Task UpdateAsync(string id, UpdateDefinition update); + Task UpdateAsync(FilterDefinition filter, UpdateDefinition update); Task UpdateManyAsync(Expression> predicate, UpdateDefinition update); Task ReplaceAsync(string id, T value); Task DeleteAsync(string id); diff --git a/UKSF.Api.Interfaces/Data/IDataService.cs b/UKSF.Api.Interfaces/Data/IDataService.cs index e4bc10bd..503e6724 100644 --- a/UKSF.Api.Interfaces/Data/IDataService.cs +++ b/UKSF.Api.Interfaces/Data/IDataService.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq.Expressions; using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.Interfaces.Events; @@ -13,6 +14,7 @@ public interface IDataService : IDataEventBacker { Task Add(T data); Task Update(string id, string fieldName, object value); Task Update(string id, UpdateDefinition update); + Task Update(Expression> filterExpression, UpdateDefinition update); Task UpdateMany(Func predicate, UpdateDefinition update); Task Replace(T item); Task Delete(string id); diff --git a/UKSF.Api.Interfaces/Events/Handlers/IBuildsEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/IBuildsEventHandler.cs new file mode 100644 index 00000000..ae5c7283 --- /dev/null +++ b/UKSF.Api.Interfaces/Events/Handlers/IBuildsEventHandler.cs @@ -0,0 +1,3 @@ +namespace UKSF.Api.Interfaces.Events.Handlers { + public interface IBuildsEventHandler : IEventHandler { } +} diff --git a/UKSF.Api.Interfaces/Hubs/IModpackClient.cs b/UKSF.Api.Interfaces/Hubs/IModpackClient.cs new file mode 100644 index 00000000..85e7c9a4 --- /dev/null +++ b/UKSF.Api.Interfaces/Hubs/IModpackClient.cs @@ -0,0 +1,10 @@ +using System.Threading.Tasks; +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Interfaces.Hubs { + public interface IModpackClient { + Task ReceiveBuildRelease(ModpackBuildRelease buildRelease); + Task ReceiveBuild(string version, ModpackBuild build); + Task ReceiveBuildStep(ModpackBuildStep step); + } +} diff --git a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs new file mode 100644 index 00000000..1202af16 --- /dev/null +++ b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs @@ -0,0 +1,8 @@ +using System.Threading.Tasks; + +namespace UKSF.Api.Interfaces.Integrations.Github { + public interface IGithubService { + bool VerifySignature(string signature, string body); + Task GetCommitVersion(string branch); + } +} diff --git a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs new file mode 100644 index 00000000..357e4bc5 --- /dev/null +++ b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs @@ -0,0 +1,14 @@ +using System.Threading.Tasks; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Integrations.Github; +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Interfaces.Modpack { + public interface IBuildsService : IDataBackedService { + Task InsertBuild(string id, ModpackBuild build); + Task UpdateBuild(string id, ModpackBuild build); + Task CreateDevBuild(GithubPushEvent githubPushEvent); + Task CreateRcBuild(GithubPushEvent githubPushEvent); + Task GetBranchVersion(string branch); + } +} diff --git a/UKSF.Api.Interfaces/Modpack/IModpackService.cs b/UKSF.Api.Interfaces/Modpack/IModpackService.cs new file mode 100644 index 00000000..b52b3f0c --- /dev/null +++ b/UKSF.Api.Interfaces/Modpack/IModpackService.cs @@ -0,0 +1,5 @@ +namespace UKSF.Api.Interfaces.Modpack { + public interface IModpackService { + + } +} diff --git a/UKSF.Api.Interfaces/Modpack/IReleaseService.cs b/UKSF.Api.Interfaces/Modpack/IReleaseService.cs new file mode 100644 index 00000000..92c43c8b --- /dev/null +++ b/UKSF.Api.Interfaces/Modpack/IReleaseService.cs @@ -0,0 +1,7 @@ +using UKSF.Api.Interfaces.Data.Cached; + +namespace UKSF.Api.Interfaces.Modpack { + public interface IReleaseService : IDataBackedService { + + } +} diff --git a/UKSF.Api.Models/Integrations/Github/GithubPushEvent.cs b/UKSF.Api.Models/Integrations/Github/GithubPushEvent.cs new file mode 100644 index 00000000..333bd1c0 --- /dev/null +++ b/UKSF.Api.Models/Integrations/Github/GithubPushEvent.cs @@ -0,0 +1,27 @@ +using Newtonsoft.Json; + +namespace UKSF.Api.Models.Integrations.Github { + public class GithubPushEvent { + public string after; + [JsonProperty("base_ref")] public string baseBranch; + public string before; + [JsonProperty("ref")] public string branch; + [JsonProperty("head_commit")] public GithubCommit commit; + public GithubRepository repository; + } + + public class GithubRepository { + [JsonProperty("full_name")] public string name; + } + + public class GithubCommit { + public GithubCommitAuthor author; + public string id; + public string message; + } + + public class GithubCommitAuthor { + public string email; + public string username; + } +} diff --git a/UKSF.Api.Models/Modpack/ModpackBuild.cs b/UKSF.Api.Models/Modpack/ModpackBuild.cs new file mode 100644 index 00000000..dc3c1452 --- /dev/null +++ b/UKSF.Api.Models/Modpack/ModpackBuild.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using UKSF.Api.Models.Integrations.Github; + +namespace UKSF.Api.Models.Modpack { + public class ModpackBuild { + public DateTime timestamp = DateTime.Now; + public int buildNumber; + public GithubPushEvent pushEvent; + public bool isReleaseCandidate; + public bool isNewVersion; + public List steps = new List(); + } +} diff --git a/UKSF.Api.Models/Modpack/ModpackBuildRelease.cs b/UKSF.Api.Models/Modpack/ModpackBuildRelease.cs new file mode 100644 index 00000000..d6064608 --- /dev/null +++ b/UKSF.Api.Models/Modpack/ModpackBuildRelease.cs @@ -0,0 +1,8 @@ +using System.Collections.Generic; + +namespace UKSF.Api.Models.Modpack { + public class ModpackBuildRelease : DatabaseObject { + public string version; + public List builds = new List(); + } +} diff --git a/UKSF.Api.Models/Modpack/ModpackBuildStep.cs b/UKSF.Api.Models/Modpack/ModpackBuildStep.cs new file mode 100644 index 00000000..5fff0c57 --- /dev/null +++ b/UKSF.Api.Models/Modpack/ModpackBuildStep.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; + +namespace UKSF.Api.Models.Modpack { + public class ModpackBuildStep { + public int index; + public DateTime startTime = DateTime.Parse("20000101"); + public DateTime endTime = DateTime.Parse("20000101"); + public string name; + public bool running; + public bool success; + public bool fail; + public List logs = new List(); + } +} diff --git a/UKSF.Api.Models/Modpack/ModpackRelease.cs b/UKSF.Api.Models/Modpack/ModpackRelease.cs new file mode 100644 index 00000000..5cf1b510 --- /dev/null +++ b/UKSF.Api.Models/Modpack/ModpackRelease.cs @@ -0,0 +1,10 @@ +using System; + +namespace UKSF.Api.Models.Modpack { + public class ModpackRelease : DatabaseObject { + public DateTime timestamp; + public string version; + public string description; + public string changelog; + } +} diff --git a/UKSF.Api.Models/Personnel/AccountPermissions.cs b/UKSF.Api.Models/Personnel/AccountPermissions.cs index a132ecc2..3b5815d8 100644 --- a/UKSF.Api.Models/Personnel/AccountPermissions.cs +++ b/UKSF.Api.Models/Personnel/AccountPermissions.cs @@ -1,11 +1,12 @@ namespace UKSF.Api.Models.Personnel { public class AccountPermissions { + public bool admin; + public bool command; + public bool nco; + public bool personnel; public bool recruiter; public bool recruiterLead; public bool servers; - public bool personnel; - public bool command; - public bool admin; - public bool nco; + public bool tester; } } diff --git a/UKSF.Api.Services/Fake/FakeDataService.cs b/UKSF.Api.Services/Fake/FakeDataService.cs index 9bc31fed..fbd2be50 100644 --- a/UKSF.Api.Services/Fake/FakeDataService.cs +++ b/UKSF.Api.Services/Fake/FakeDataService.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq.Expressions; using System.Reactive.Subjects; using System.Threading.Tasks; using MongoDB.Driver; @@ -22,6 +23,8 @@ public abstract class FakeDataService : IDataService { public Task Update(string id, UpdateDefinition update) => Task.CompletedTask; + public Task Update(Expression> filterExpression, UpdateDefinition update) => Task.CompletedTask; + public Task UpdateMany(Func predicate, UpdateDefinition update) => Task.CompletedTask; public Task Replace(T item) => Task.CompletedTask; diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs new file mode 100644 index 00000000..5721e163 --- /dev/null +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Cryptography; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; +using Octokit; +using UKSF.Api.Interfaces.Integrations.Github; + +namespace UKSF.Api.Services.Integrations.Github { + public class GithubService : IGithubService { + private readonly IConfiguration configuration; + + public GithubService(IConfiguration configuration) => this.configuration = configuration; + + public bool VerifySignature(string signature, string body) { + string secret = configuration.GetSection("Secrets")["githubSecret"]; + byte[] data = Encoding.UTF8.GetBytes(body); + byte[] secretData = Encoding.UTF8.GetBytes(secret); + using HMACSHA1 hmac = new HMACSHA1(secretData); + byte[] hash = hmac.ComputeHash(data); + string sha1 = $"sha1={BitConverter.ToString(hash).ToLower().Replace("-", "")}"; + return string.Equals(sha1, signature); + } + + public async Task GetCommitVersion(string branch) { + GitHubClient client = new GitHubClient(new ProductHeaderValue("uksf-api-integration")); + byte[] contentBytes = await client.Repository.Content.GetRawContentByRef("uksf", "modpack", $"addons/main/script_version.hpp", branch); + string content = Encoding.UTF8.GetString(contentBytes); + IEnumerable lines = content.Split("\n").Take(3); + string version = string.Join('.', lines.Select(x => x.Split(' ')[^1])); + return version; + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs new file mode 100644 index 00000000..1286ff3a --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs @@ -0,0 +1,5 @@ +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { + public class BuildStep0Prep : BuildStepBase { + + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepBase.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepBase.cs new file mode 100644 index 00000000..e11ada7f --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepBase.cs @@ -0,0 +1,6 @@ +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { + public class BuildStepBase { + public string Name; + + } +} diff --git a/UKSF.Api.Services/Modpack/BuildsService.cs b/UKSF.Api.Services/Modpack/BuildsService.cs new file mode 100644 index 00000000..fb03af3e --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildsService.cs @@ -0,0 +1,71 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Integrations.Github; +using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Integrations.Github; +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Services.Modpack { + public class BuildsService : DataBackedService, IBuildsService { + private readonly IGithubService githubService; + + public BuildsService(IBuildsDataService data, IGithubService githubService) : base(data) => this.githubService = githubService; + + public async Task InsertBuild(string id, ModpackBuild build) { + await Data.Update(id, build, DataEventType.ADD); + } + + public async Task UpdateBuild(string id, ModpackBuild build) { + await Data.Update(id, build, DataEventType.UPDATE); + } + + public async Task UpdateBuildStep(string id, ModpackBuild build) { + await Data.Update(id, build, DataEventType.UPDATE); + } + + public async Task CreateDevBuild(GithubPushEvent githubPushEvent) { + string version = await GetBranchVersion(githubPushEvent.branch); + ModpackBuildRelease buildRelease = Data.GetSingle(x => x.version == version); + if (buildRelease == null) { + buildRelease = new ModpackBuildRelease { + version = version, builds = new List { new ModpackBuild { buildNumber = 0, isNewVersion = true, pushEvent = githubPushEvent } } + }; + await Data.Add(buildRelease); + return; + } + + ModpackBuild previousBuild = buildRelease.builds.First(); + ModpackBuild build = new ModpackBuild { buildNumber = previousBuild.buildNumber + 1, pushEvent = githubPushEvent }; + + await InsertBuild(buildRelease.id, build); + // run build + } + + public async Task CreateRcBuild(GithubPushEvent githubPushEvent) { + string version = await GetBranchVersion(githubPushEvent.branch); + ModpackBuildRelease buildRelease = Data.GetSingle(x => x.version == version); + if (buildRelease == null) { + throw new NullReferenceException($"CI tried to create RC build for build release {version} which does not exist"); + } + + //this can't be the first RC build + ModpackBuild previousBuild = buildRelease.builds.FirstOrDefault(); + if (previousBuild == null) { + throw new InvalidOperationException("First RC build should not be created by CI. Something went wrong"); + } + + ModpackBuild build = new ModpackBuild { buildNumber = previousBuild.buildNumber + 1, pushEvent = githubPushEvent, isReleaseCandidate = true }; + await InsertBuild(buildRelease.id, build); + // run build + } + + public async Task GetBranchVersion(string branch) { + branch = branch.Split('/')[^1]; + return await githubService.GetCommitVersion(branch); + } + } +} diff --git a/UKSF.Api.Services/Modpack/ModpackService.cs b/UKSF.Api.Services/Modpack/ModpackService.cs new file mode 100644 index 00000000..f451eb84 --- /dev/null +++ b/UKSF.Api.Services/Modpack/ModpackService.cs @@ -0,0 +1,7 @@ +using UKSF.Api.Interfaces.Modpack; + +namespace UKSF.Api.Services.Modpack { + public class ModpackService : IModpackService { + + } +} diff --git a/UKSF.Api.Services/Modpack/ReleaseService.cs b/UKSF.Api.Services/Modpack/ReleaseService.cs new file mode 100644 index 00000000..261fd27b --- /dev/null +++ b/UKSF.Api.Services/Modpack/ReleaseService.cs @@ -0,0 +1,10 @@ +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Modpack; + +namespace UKSF.Api.Services.Modpack { + public class ReleaseService : DataBackedService, IReleaseService { + public ReleaseService(IReleasesDataService data) : base(data) { } + + + } +} diff --git a/UKSF.Api.Services/Personnel/LoginService.cs b/UKSF.Api.Services/Personnel/LoginService.cs index 4f94e258..804babea 100644 --- a/UKSF.Api.Services/Personnel/LoginService.cs +++ b/UKSF.Api.Services/Personnel/LoginService.cs @@ -102,6 +102,11 @@ private void ResolveRoles(ICollection claims, Account account) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SERVERS)); } + string testersId = VariablesWrapper.VariablesDataService().GetSingle("ROLE_ID_TESTERS").AsString(); + if (admin || unitsService.Data.GetSingle(testersId).members.Contains(account.id)) { + claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.TESTER)); + } + break; } diff --git a/UKSF.Api.Services/Personnel/RoleDefinitions.cs b/UKSF.Api.Services/Personnel/RoleDefinitions.cs index bcfac5b7..cf7631f3 100644 --- a/UKSF.Api.Services/Personnel/RoleDefinitions.cs +++ b/UKSF.Api.Services/Personnel/RoleDefinitions.cs @@ -3,17 +3,27 @@ namespace UKSF.Api.Services.Personnel { public static class RoleDefinitions { - public const string ADMIN = "ADMIN"; - public const string COMMAND = "COMMAND"; + #region MemberStates + public const string CONFIRMED = "CONFIRMED"; public const string DISCHARGED = "DISCHARGED"; public const string MEMBER = "MEMBER"; + public const string UNCONFIRMED = "UNCONFIRMED"; + + #endregion + + #region Roles + + public const string ADMIN = "ADMIN"; + public const string COMMAND = "COMMAND"; public const string NCO = "NCO"; public const string RECRUITER = "RECRUITER"; public const string RECRUITER_LEAD = "RECRUITER_LEAD"; public const string PERSONNEL = "PERSONNEL"; public const string SERVERS = "SERVERS"; - public const string UNCONFIRMED = "UNCONFIRMED"; + public const string TESTER = "TESTER"; + + #endregion } public class RolesAttribute : AuthorizeAttribute { diff --git a/UKSF.Api.Services/UKSF.Api.Services.csproj b/UKSF.Api.Services/UKSF.Api.Services.csproj index 7312846a..946f082a 100644 --- a/UKSF.Api.Services/UKSF.Api.Services.csproj +++ b/UKSF.Api.Services/UKSF.Api.Services.csproj @@ -17,6 +17,7 @@ + diff --git a/UKSF.Api.Signalr/Hubs/Modpack/BuildsHub.cs b/UKSF.Api.Signalr/Hubs/Modpack/BuildsHub.cs new file mode 100644 index 00000000..a0c53c1d --- /dev/null +++ b/UKSF.Api.Signalr/Hubs/Modpack/BuildsHub.cs @@ -0,0 +1,31 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.SignalR; +using Microsoft.Extensions.Primitives; +using UKSF.Api.Interfaces.Hubs; + +namespace UKSF.Api.Signalr.Hubs.Modpack { + [Authorize] + public class BuildsHub : Hub { + public const string END_POINT = "builds"; + + public override async Task OnConnectedAsync() { + StringValues version = Context.GetHttpContext().Request.Query["version"]; + if (!string.IsNullOrEmpty(version)) { + await Groups.AddToGroupAsync(Context.ConnectionId, version); + } + + await base.OnConnectedAsync(); + } + + public override async Task OnDisconnectedAsync(Exception exception) { + StringValues version = Context.GetHttpContext().Request.Query["version"]; + if (!string.IsNullOrEmpty(version)) { + await Groups.RemoveFromGroupAsync(Context.ConnectionId, version); + } + + await base.OnDisconnectedAsync(exception); + } + } +} diff --git a/UKSF.Api/AppStart/RegisterAndWarmCachedData.cs b/UKSF.Api/AppStart/RegisterAndWarmCachedData.cs index acdaa43b..e59e2d88 100644 --- a/UKSF.Api/AppStart/RegisterAndWarmCachedData.cs +++ b/UKSF.Api/AppStart/RegisterAndWarmCachedData.cs @@ -11,6 +11,7 @@ public static void Warm() { IServiceProvider serviceProvider = Global.ServiceProvider; IAccountDataService accountDataService = serviceProvider.GetService(); + IBuildsDataService buildsDataService = serviceProvider.GetService(); ICommandRequestDataService commandRequestDataService = serviceProvider.GetService(); ICommentThreadDataService commentThreadDataService = serviceProvider.GetService(); IDischargeDataService dischargeDataService = serviceProvider.GetService(); @@ -21,6 +22,7 @@ public static void Warm() { IOperationOrderDataService operationOrderDataService = serviceProvider.GetService(); IOperationReportDataService operationReportDataService = serviceProvider.GetService(); IRanksDataService ranksDataService = serviceProvider.GetService(); + IReleasesDataService releasesDataService = serviceProvider.GetService(); IRolesDataService rolesDataService = serviceProvider.GetService(); IUnitsDataService unitsDataService = serviceProvider.GetService(); IVariablesDataService variablesDataService = serviceProvider.GetService(); @@ -29,6 +31,7 @@ public static void Warm() { dataCacheService.RegisterCachedDataServices( new HashSet { accountDataService, + buildsDataService, commandRequestDataService, commentThreadDataService, dischargeDataService, @@ -39,6 +42,7 @@ public static void Warm() { operationOrderDataService, operationReportDataService, ranksDataService, + releasesDataService, rolesDataService, unitsDataService, variablesDataService diff --git a/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs b/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs index 9662bae1..169a146f 100644 --- a/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs @@ -1,9 +1,12 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using UKSF.Api.Data.Modpack; using UKSF.Api.Interfaces.Command; +using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Game; using UKSF.Api.Interfaces.Launcher; using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Operations; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; @@ -13,6 +16,7 @@ using UKSF.Api.Services.Game; using UKSF.Api.Services.Launcher; using UKSF.Api.Services.Message; +using UKSF.Api.Services.Modpack; using UKSF.Api.Services.Operations; using UKSF.Api.Services.Personnel; using UKSF.Api.Services.Units; @@ -28,6 +32,7 @@ public static void RegisterDataBackedServices(this IServiceCollection services, // Cached services.AddSingleton(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -37,6 +42,7 @@ public static void RegisterDataBackedServices(this IServiceCollection services, services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/UKSF.Api/AppStart/Services/RegisterDataServices.cs b/UKSF.Api/AppStart/Services/RegisterDataServices.cs index af7bcf86..fb1a4db7 100644 --- a/UKSF.Api/AppStart/Services/RegisterDataServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterDataServices.cs @@ -6,6 +6,7 @@ using UKSF.Api.Data.Game; using UKSF.Api.Data.Launcher; using UKSF.Api.Data.Message; +using UKSF.Api.Data.Modpack; using UKSF.Api.Data.Operations; using UKSF.Api.Data.Personnel; using UKSF.Api.Data.Units; @@ -24,6 +25,7 @@ public static void RegisterDataServices(this IServiceCollection services, IHostE // Cached services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); @@ -33,6 +35,7 @@ public static void RegisterDataServices(this IServiceCollection services, IHostE services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/UKSF.Api/AppStart/Services/RegisterEventServices.cs b/UKSF.Api/AppStart/Services/RegisterEventServices.cs index 4281ecd6..e045ff7c 100644 --- a/UKSF.Api/AppStart/Services/RegisterEventServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterEventServices.cs @@ -13,6 +13,7 @@ public static class EventServiceExtensions { public static void RegisterEventServices(this IServiceCollection services) { // Event Buses services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); @@ -27,6 +28,7 @@ public static void RegisterEventServices(this IServiceCollection services) { services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); @@ -35,6 +37,7 @@ public static void RegisterEventServices(this IServiceCollection services) { // Event Handlers services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/UKSF.Api/AppStart/Services/ServiceExtensions.cs b/UKSF.Api/AppStart/Services/ServiceExtensions.cs index 60ee9eec..6c20dcbd 100644 --- a/UKSF.Api/AppStart/Services/ServiceExtensions.cs +++ b/UKSF.Api/AppStart/Services/ServiceExtensions.cs @@ -7,9 +7,11 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Game; using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Integrations.Teamspeak; using UKSF.Api.Interfaces.Launcher; using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Services; @@ -19,9 +21,11 @@ using UKSF.Api.Services.Game; using UKSF.Api.Services.Game.Missions; using UKSF.Api.Services.Integrations; +using UKSF.Api.Services.Integrations.Github; using UKSF.Api.Services.Integrations.Teamspeak; using UKSF.Api.Services.Launcher; using UKSF.Api.Services.Message; +using UKSF.Api.Services.Modpack; using UKSF.Api.Services.Personnel; using UKSF.Api.Services.Utility; @@ -54,14 +58,17 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); @@ -81,3 +88,4 @@ public static void RegisterServices(this IServiceCollection services, IConfigura } } } + diff --git a/UKSF.Api/AppStart/StartServices.cs b/UKSF.Api/AppStart/StartServices.cs index 8b779008..e3528fc3 100644 --- a/UKSF.Api/AppStart/StartServices.cs +++ b/UKSF.Api/AppStart/StartServices.cs @@ -1,5 +1,6 @@ using System; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using UKSF.Api.Events; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Integrations.Teamspeak; @@ -11,6 +12,11 @@ public static class StartServices { public static void Start() { IServiceProvider serviceProvider = Global.ServiceProvider; + if (serviceProvider.GetService().IsDevelopment()) { + // Do any test data setup + TestDataSetup.Run(serviceProvider); + } + // Execute any DB migration serviceProvider.GetService().Migrate(); diff --git a/UKSF.Api/AppStart/TestDataSetup.cs b/UKSF.Api/AppStart/TestDataSetup.cs new file mode 100644 index 00000000..f4bb4768 --- /dev/null +++ b/UKSF.Api/AppStart/TestDataSetup.cs @@ -0,0 +1,174 @@ +using System; +using System.Collections.Generic; +using Microsoft.Extensions.DependencyInjection; +using MongoDB.Bson; +using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Models.Integrations.Github; +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.AppStart { + public static class TestDataSetup { + public static void Run(IServiceProvider serviceProvider) { + IReleaseService releaseService = serviceProvider.GetService(); + releaseService.Data.Add( + new ModpackRelease { + id = ObjectId.GenerateNewId().ToString(), + timestamp = DateTime.Now.AddDays(-15), + version = "5.17.16", + description = + "Added captive escort animations and different radio backpacks, fixed backpack-on-chest errors, and arsenal adding extra mag error." + + "\nUpdated ACRE, Lambs, and ZEN.", + changelog = "#### Added" + + "\n- Captive escort animations, used base mod animations and custom implementation [(#683)](https://github.com/uksf/modpack/issues/683)" + + "\n
_Note: there is no proper escort animation when unarmed_" + + "\n- Dynamic patrol area zone module [(#684)](https://github.com/uksf/modpack/issues/684)" + + "\n
_See [Dynamic Patrols](https://github.com/uksf/modpack/wiki/Missions:-Dynamic-Patrols)_" + + "\n- Radio backpacks [(#687)](https://github.com/uksf/modpack/issues/687)" + + "\n\n#### Changed" + + "\n- Default radio channels for Apache and other aircraft" + + "\n- Resupply crates to have coded name abbreviations (e.g (AM) = Ammo Mixed)" + + "\n- Use proper F-35 classname for rack init" + + "\n\n#### Fixed" + + "\n- Apache rotor hitbox, removed some hitpoints [(#685)](https://github.com/uksf/modpack/issues/685)" + + "\n- Arsenal adding extra mag when no 3CB weapon swap available [(#679)](https://github.com/uksf/modpack/issues/679)" + + "\n- Backpack-on-chest causing weapons and backpacks to be deleted [(#688)](https://github.com/uksf/modpack/issues/688)" + + "\n- Drone init not running for correct classname" + + "\n- Husky vanilla logistics values (removed them) [(#681)](https://github.com/uksf/modpack/issues/681)" + + "\n\n#### Updated" + + "\n- ACRE to [2.7.4.1027 + Dev](https://github.com/uksf/modpack/issues/691)" + + "\n- Lambs to [2.4.4](https://github.com/uksf/modpack/issues/690)" + + "\n- ZEN to [1.8.0](https://github.com/uksf/modpack/issues/689)" + + "\n\n[Report and track issues here](https://github.com/uksf/modpack/issues)\n" + } + ); + releaseService.Data.Add( + new ModpackRelease { + id = ObjectId.GenerateNewId().ToString(), + timestamp = DateTime.Now.AddDays(-9), + version = "5.17.17", + description = + "Added captive escort animations and different radio backpacks, fixed backpack-on-chest errors, and arsenal adding extra mag error." + + "\nUpdated ACRE, Lambs, and ZEN.", + changelog = "#### Added" + + "\n- Captive escort animations, used base mod animations and custom implementation [(#683)](https://github.com/uksf/modpack/issues/683)" + + "\n
_Note: there is no proper escort animation when unarmed_" + + "\n- Dynamic patrol area zone module [(#684)](https://github.com/uksf/modpack/issues/684)" + + "\n
_See [Dynamic Patrols](https://github.com/uksf/modpack/wiki/Missions:-Dynamic-Patrols)_" + + "\n- Radio backpacks [(#687)](https://github.com/uksf/modpack/issues/687)" + + "\n\n#### Changed" + + "\n- Default radio channels for Apache and other aircraft" + + "\n- Resupply crates to have coded name abbreviations (e.g (AM) = Ammo Mixed)" + + "\n- Use proper F-35 classname for rack init" + + "\n\n#### Fixed" + + "\n- Apache rotor hitbox, removed some hitpoints [(#685)](https://github.com/uksf/modpack/issues/685)" + + "\n- Arsenal adding extra mag when no 3CB weapon swap available [(#679)](https://github.com/uksf/modpack/issues/679)" + + "\n- Backpack-on-chest causing weapons and backpacks to be deleted [(#688)](https://github.com/uksf/modpack/issues/688)" + + "\n- Drone init not running for correct classname" + + "\n- Husky vanilla logistics values (removed them) [(#681)](https://github.com/uksf/modpack/issues/681)" + + "\n\n#### Updated" + + "\n- ACRE to [2.7.4.1027 + Dev](https://github.com/uksf/modpack/issues/691)" + + "\n- Lambs to [2.4.4](https://github.com/uksf/modpack/issues/690)" + + "\n- ZEN to [1.8.0](https://github.com/uksf/modpack/issues/689)" + + "\n\n[Report and track issues here](https://github.com/uksf/modpack/issues)\n" + } + ); + + IBuildsService buildsService = serviceProvider.GetService(); + buildsService.Data.Add( + new ModpackBuildRelease { + id = ObjectId.GenerateNewId().ToString(), + version = "5.17.16", + builds = new List { + new ModpackBuild { + timestamp = DateTime.Now.AddDays(-14), + buildNumber = 0, + pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "New version" } }, + isNewVersion = true + }, + new ModpackBuild { + timestamp = DateTime.Now.AddDays(-16).AddHours(-2), + buildNumber = 1, + pushEvent = new GithubPushEvent { + commit = new GithubCommit { message = "Changed captive escort to be local to unit" + "\n\n- Exit escort if weapon holstered (can't get anims right)" } + } + }, + new ModpackBuild { + timestamp = DateTime.Now.AddDays(-16), + buildNumber = 2, + pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "Fix missing getPos for zeus fps" } } + }, + new ModpackBuild { + timestamp = DateTime.Now.AddDays(-15).AddHours(-1), + buildNumber = 3, + pushEvent = new GithubPushEvent { + commit = new GithubCommit { + message = "Add name abbreviations to resupply crates" + + "\n\n- Add coded name abbreviations (e.g (AM) = Ammo Mixed) to resupply crates" + + "\n- Make identifying in-game easier" + } + } + }, + new ModpackBuild { + timestamp = DateTime.Now.AddDays(-15), + buildNumber = 4, + isReleaseCandidate = true, + pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "Tweak zeus player fps display" } } + } + } + } + ); + buildsService.Data.Add( + new ModpackBuildRelease { + id = ObjectId.GenerateNewId().ToString(), + version = "5.17.17", + builds = new List { + new ModpackBuild { + timestamp = DateTime.Now.AddDays(-14), + buildNumber = 0, + pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "New version" } }, + isNewVersion = true + }, + new ModpackBuild { + timestamp = DateTime.Now.AddDays(-11).AddHours(-2), + buildNumber = 1, + pushEvent = new GithubPushEvent { + commit = new GithubCommit { message = "Changed captive escort to be local to unit" + "\n\n- Exit escort if weapon holstered (can't get anims right)" } + } + }, + new ModpackBuild { + timestamp = DateTime.Now.AddDays(-11), + buildNumber = 2, + pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "Fix missing getPos for zeus fps" } } + }, + new ModpackBuild { + timestamp = DateTime.Now.AddDays(-10).AddHours(-1), + buildNumber = 3, + pushEvent = new GithubPushEvent { + commit = new GithubCommit { + message = "Add name abbreviations to resupply crates" + + "\n\n- Add coded name abbreviations (e.g (AM) = Ammo Mixed) to resupply crates" + + "\n- Make identifying in-game easier" + } + } + }, + new ModpackBuild { + timestamp = DateTime.Now.AddDays(-10), + buildNumber = 4, + pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "Tweak zeus player fps display" } } + }, + new ModpackBuild { + timestamp = DateTime.Now.AddDays(-9), + buildNumber = 5, + isReleaseCandidate = true, + pushEvent = new GithubPushEvent { + commit = new GithubCommit { + message = "Fixed drone interactions" + "\n\n- Functionality was missing from current drone" + "\n- Changed interactions to script added" + } + } + } + } + } + ); + } + } +} diff --git a/UKSF.Api/Controllers/Accounts/AccountsController.cs b/UKSF.Api/Controllers/Accounts/AccountsController.cs index de670a09..9200ca80 100644 --- a/UKSF.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSF.Api/Controllers/Accounts/AccountsController.cs @@ -233,13 +233,14 @@ private PublicAccount PubliciseAccount(Account account) { PublicAccount publicAccount = account.ToPublicAccount(); publicAccount.displayName = displayNameService.GetDisplayName(account); publicAccount.permissions = new AccountPermissions { + admin = sessionService.ContextHasRole(RoleDefinitions.ADMIN), + command = sessionService.ContextHasRole(RoleDefinitions.COMMAND), + nco = sessionService.ContextHasRole(RoleDefinitions.NCO), + personnel = sessionService.ContextHasRole(RoleDefinitions.PERSONNEL), recruiter = sessionService.ContextHasRole(RoleDefinitions.RECRUITER), recruiterLead = sessionService.ContextHasRole(RoleDefinitions.RECRUITER_LEAD), servers = sessionService.ContextHasRole(RoleDefinitions.SERVERS), - personnel = sessionService.ContextHasRole(RoleDefinitions.PERSONNEL), - nco = sessionService.ContextHasRole(RoleDefinitions.NCO), - command = sessionService.ContextHasRole(RoleDefinitions.COMMAND), - admin = sessionService.ContextHasRole(RoleDefinitions.ADMIN) + tester = sessionService.ContextHasRole(RoleDefinitions.TESTER) }; return publicAccount; } diff --git a/UKSF.Api/Controllers/Integrations/GithubController.cs b/UKSF.Api/Controllers/Integrations/GithubController.cs new file mode 100644 index 00000000..ca86bda3 --- /dev/null +++ b/UKSF.Api/Controllers/Integrations/GithubController.cs @@ -0,0 +1,50 @@ +using System; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using UKSF.Api.Interfaces.Integrations.Github; +using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Models.Integrations.Github; + +namespace UKSF.Api.Controllers.Integrations { + [Route("[controller]")] + public class GithubController : Controller { + private readonly IGithubService githubService; + private readonly IBuildsService buildsService; + + // move to app setting + private const string MASTER = "refs/head/master"; + private const string DEV = "refs/head/dev"; + private const string RELEASE = "refs/head/release"; + private const string PUSH_EVENT = "push"; + private const string REPO_NAME = "uksf/modpack"; + + public GithubController(IGithubService githubService, IBuildsService buildsService) { + this.githubService = githubService; + this.buildsService = buildsService; + } + + [HttpPost] + public IActionResult GithubWebhook([FromHeader(Name = "x-hub-signature")] string githubSignature, [FromHeader(Name = "x-github-event")] string githubEvent, [FromBody] JObject body) { + GithubPushEvent githubPushEvent = JsonConvert.DeserializeObject(body.ToString()); + if (githubPushEvent.repository.name != REPO_NAME || githubEvent != PUSH_EVENT) { + return Ok(); + } + + if (!githubService.VerifySignature(githubSignature, body.ToString(Formatting.None))) { + return Unauthorized(); + } + + switch (githubPushEvent.branch) { + case DEV when githubPushEvent.baseBranch == MASTER: + buildsService.CreateDevBuild(githubPushEvent); + return Ok(); + case RELEASE when githubPushEvent.baseBranch == RELEASE: + buildsService.CreateRcBuild(githubPushEvent); + return Ok(); + default: + return Ok(); + } + } + } +} diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs new file mode 100644 index 00000000..ec3118b1 --- /dev/null +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -0,0 +1,82 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Models.Integrations.Github; +using UKSF.Api.Models.Modpack; +using UKSF.Api.Services.Personnel; + +namespace UKSF.Api.Controllers.Modpack { + [Route("[controller]")] + public class ModpackController : Controller { + private readonly IBuildsService buildsService; + private readonly IModpackService modpackService; + private readonly IReleaseService releaseService; + + public ModpackController(IReleaseService releaseService, IBuildsService buildsService, IModpackService modpackService) { + this.releaseService = releaseService; + this.buildsService = buildsService; + this.modpackService = modpackService; + } + + [HttpGet("releases"), Authorize, Roles(RoleDefinitions.MEMBER)] + public IActionResult GetReleases() => Ok(releaseService.Data.Get()); + + [HttpGet("builds"), Authorize, Roles(RoleDefinitions.TESTER, RoleDefinitions.SERVERS)] + public IActionResult GetBuilds() => Ok(buildsService.Data.Get()); + + [HttpGet("builds/{version}/{buildNumber}")] + public IActionResult GetBuild(string version, int buildNumber) { + ModpackBuild build = buildsService.Data.GetSingle(x => x.version == version).builds.FirstOrDefault(x => x.buildNumber == buildNumber); + if (build == null) { + return BadRequest("Build does not exist"); + } + + return Ok(build); + } + + [HttpPost("makerc/{version}")] + public IActionResult MakeRcBuild(string version) { + ModpackBuildRelease buildRelease = buildsService.Data.GetSingle(x => x.version == version); + + return Ok(); + } + + [HttpPost("testRelease")] + public IActionResult TestRelease() { + buildsService.Data.Add( + new ModpackBuildRelease { + version = "5.17.18", + builds = new List { + new ModpackBuild { buildNumber = 0, isNewVersion = true, pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "New version" } } } + } + } + ); + return Ok(); + } + + [HttpPost("testBuild")] + public IActionResult TestBuild([FromBody] ModpackBuild build) { + ModpackBuildRelease buildRelease = buildsService.Data.GetSingle(x => x.version == "5.17.18"); + build.buildNumber = buildRelease.builds.First().buildNumber + 1; + buildsService.InsertBuild(buildRelease.id, build); + return Ok(); + } + + [HttpGet("test")] + public async Task Test() { + string version = await buildsService.GetBranchVersion("refs/head/dev"); + + return Ok(); + } + + // [HttpPost("testBuildLog")] + // public IActionResult TestBuildLog([FromBody] ModpackBuildStep step) { + // ModpackBuildRelease buildRelease = buildsService.Data.GetSingle(x => x.version == "5.17.18"); + // buildsService.InsertBuild(buildRelease.id, build); + // return Ok(); + // } + } +} diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 0e6ae539..f65a092f 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -24,6 +24,7 @@ using UKSF.Api.Signalr.Hubs.Game; using UKSF.Api.Signalr.Hubs.Integrations; using UKSF.Api.Signalr.Hubs.Message; +using UKSF.Api.Signalr.Hubs.Modpack; using UKSF.Api.Signalr.Hubs.Personnel; using UKSF.Api.Signalr.Hubs.Utility; @@ -138,12 +139,13 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl endpoints.MapHub($"/hub/{AdminHub.END_POINT}"); endpoints.MapHub($"/hub/{CommandRequestsHub.END_POINT}"); endpoints.MapHub($"/hub/{CommentThreadHub.END_POINT}"); + endpoints.MapHub($"/hub/{LauncherHub.END_POINT}"); + endpoints.MapHub($"/hub/{BuildsHub.END_POINT}"); endpoints.MapHub($"/hub/{NotificationHub.END_POINT}"); endpoints.MapHub($"/hub/{TeamspeakHub.END_POINT}").RequireHost("localhost"); endpoints.MapHub($"/hub/{TeamspeakClientsHub.END_POINT}"); - endpoints.MapHub($"/hub/{UtilityHub.END_POINT}"); endpoints.MapHub($"/hub/{ServersHub.END_POINT}"); - endpoints.MapHub($"/hub/{LauncherHub.END_POINT}"); + endpoints.MapHub($"/hub/{UtilityHub.END_POINT}"); } ); diff --git a/UKSF.Api/appsettings.json b/UKSF.Api/appsettings.json index 5c6108f1..04716188 100644 --- a/UKSF.Api/appsettings.json +++ b/UKSF.Api/appsettings.json @@ -5,7 +5,8 @@ }, "Secrets": { "tokenKey": "", - "githubToken": "" + "githubToken": "", + "githubSecret": "" }, "EmailSettings": { "username": "", diff --git a/UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs b/UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs index 56ad6da3..40f31ee1 100644 --- a/UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs +++ b/UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs @@ -8,6 +8,7 @@ public class EventHandlerInitialiserTests { [Fact] public void ShouldInitEventHandlers() { Mock mockAccountEventHandler = new Mock(); + Mock mockBuildsEventHandler = new Mock(); Mock mockCommandRequestEventHandler = new Mock(); Mock mockCommentThreadEventHandler = new Mock(); Mock mockLogEventHandler = new Mock(); @@ -23,6 +24,7 @@ public void ShouldInitEventHandlers() { EventHandlerInitialiser eventHandlerInitialiser = new EventHandlerInitialiser( mockAccountEventHandler.Object, + mockBuildsEventHandler.Object, mockCommandRequestEventHandler.Object, mockCommentThreadEventHandler.Object, mockLogEventHandler.Object, @@ -33,6 +35,7 @@ public void ShouldInitEventHandlers() { eventHandlerInitialiser.InitEventHandlers(); mockAccountEventHandler.Verify(x => x.Init(), Times.Once); + mockBuildsEventHandler.Verify(x => x.Init(), Times.Once); mockCommandRequestEventHandler.Verify(x => x.Init(), Times.Once); mockCommentThreadEventHandler.Verify(x => x.Init(), Times.Once); mockLogEventHandler.Verify(x => x.Init(), Times.Once); From 8874c91bf8b73fe9d971bd638281909bb0945759 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 6 Jul 2020 11:32:08 +0100 Subject: [PATCH 183/369] Further additions for building --- UKSF.Api.Data/Modpack/BuildsDataService.cs | 70 +++- UKSF.Api.Data/Modpack/ReleasesDataService.cs | 24 +- .../Handlers/BuildsEventHandler.cs | 2 +- .../Data/Cached/IBuildsDataService.cs | 1 + .../Integrations/Github/IGithubService.cs | 11 +- .../BuildProcess/IBuildProcessorService.cs | 9 + .../BuildProcess/IBuildQueueService.cs | 8 + .../Modpack/BuildProcess/IBuildStepService.cs | 13 + .../Modpack/BuildProcess/IStepLogger.cs | 12 + .../Modpack/BuildProcess/Steps/IBuildStep.cs | 17 + UKSF.Api.Interfaces/Modpack/IBuildsService.cs | 16 +- .../Modpack/IReleaseService.cs | 11 +- .../UKSF.Api.Interfaces.csproj | 1 + .../Integrations/Github/GithubCommit.cs | 9 + .../Integrations/Github/GithubPushEvent.cs | 27 -- UKSF.Api.Models/Modpack/ModpackBuild.cs | 13 +- .../Modpack/ModpackBuildQueueItem.cs | 6 + UKSF.Api.Models/Modpack/ModpackBuildResult.cs | 8 + UKSF.Api.Models/Modpack/ModpackBuildStep.cs | 16 +- UKSF.Api.Models/Modpack/ModpackRelease.cs | 9 +- .../Integrations/Github/GithubService.cs | 169 ++++++++- .../BuildProcess/BuildProcessHelper.cs | 97 +++++ .../BuildProcess/BuildProcessorService.cs | 51 +++ .../Modpack/BuildProcess/BuildQueueService.cs | 51 +++ .../Modpack/BuildProcess/BuildStepService.cs | 30 ++ .../Modpack/BuildProcess/StepLogger.cs | 48 +++ .../Modpack/BuildProcess/Steps/BuildStep.cs | 72 ++++ .../BuildProcess/Steps/BuildStep0Prep.cs | 26 +- .../BuildProcess/Steps/BuildStep1dSource.cs | 31 ++ .../BuildProcess/Steps/BuildStepBase.cs | 6 - UKSF.Api.Services/Modpack/BuildsService.cs | 136 +++++-- UKSF.Api.Services/Modpack/ReleaseService.cs | 46 ++- UKSF.Api.Services/UKSF.Api.Services.csproj | 2 + .../Services/RegisterDataBackedServices.cs | 2 - .../AppStart/Services/ServiceExtensions.cs | 5 + UKSF.Api/AppStart/StartServices.cs | 2 +- UKSF.Api/AppStart/TestDataSetup.cs | 347 +++++++++--------- UKSF.Api/Controllers/DocsController.cs | 3 +- .../Integrations/GithubController.cs | 65 +++- UKSF.Api/Controllers/IssueController.cs | 2 +- .../Controllers/Modpack/ModpackController.cs | 90 ++++- UKSF.Api/Startup.cs | 4 + UKSF.Api/appsettings.json | 9 +- UKSF.Common/ChangeUtilities.cs | 1 - .../Unit/Data/Units/UnitsDataServiceTests.cs | 3 +- .../Services/Modpack/BuildsServiceTests.cs | 138 +++++++ .../Services/Utility/SessionServiceTests.cs | 1 - 47 files changed, 1410 insertions(+), 310 deletions(-) create mode 100644 UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildProcessorService.cs create mode 100644 UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs create mode 100644 UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs create mode 100644 UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs create mode 100644 UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs create mode 100644 UKSF.Api.Models/Integrations/Github/GithubCommit.cs delete mode 100644 UKSF.Api.Models/Integrations/Github/GithubPushEvent.cs create mode 100644 UKSF.Api.Models/Modpack/ModpackBuildQueueItem.cs create mode 100644 UKSF.Api.Models/Modpack/ModpackBuildResult.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1dSource.cs delete mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepBase.cs create mode 100644 UKSF.Tests/Unit/Services/Modpack/BuildsServiceTests.cs diff --git a/UKSF.Api.Data/Modpack/BuildsDataService.cs b/UKSF.Api.Data/Modpack/BuildsDataService.cs index 8ff1c24c..51375a4e 100644 --- a/UKSF.Api.Data/Modpack/BuildsDataService.cs +++ b/UKSF.Api.Data/Modpack/BuildsDataService.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Linq.Expressions; using System.Threading.Tasks; -using MongoDB.Bson; using MongoDB.Driver; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; @@ -17,7 +17,17 @@ public BuildsDataService(IDataCollectionFactory dataCollectionFactory, IDataEven public override List Get() { base.Get(); - Collection = Collection.OrderByDescending(x => x.version).ToList(); + // Collection = Collection.Select( + // x => { + // int[] parts = x.version.Split('.').Select(int.Parse).ToArray(); + // return new { buildRelease = x, major = parts[0], minor = parts[1], patch = parts[2] }; + // } + // ) + // .OrderByDescending(x => x.major) + // .ThenByDescending(x => x.minor) + // .ThenByDescending(x => x.patch) + // .Select(x => x.buildRelease) + // .ToList(); Collection.ForEach(x => x.builds = x.builds.OrderByDescending(y => y.buildNumber).ToList()); return Collection; } @@ -41,14 +51,60 @@ public async Task Update(string id, ModpackBuild build, DataEventType updateType ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(updateType, GetSingle(id).version, build)); } + public async Task Update(string id, ModpackBuild build, ModpackBuildStep buildStep) { + UpdateDefinition updateDefinition = Builders.Update.Set(x => x.builds[-1].steps[buildStep.index], buildStep); + await base.Update(x => x.id == id && x.builds.Any(y => y.buildNumber == build.buildNumber), updateDefinition); + Refresh(); + ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, $"{GetSingle(id).version}.{build.buildNumber}", buildStep)); + } + + public override async Task Add(ModpackBuildRelease data) { + await base.Add(data); + ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, data.GetIdValue(), data)); + } + + public override async Task Update(string id, string fieldName, object value) { + await base.Update(id, fieldName, value); + ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + } + + public override async Task Update(string id, UpdateDefinition update) { + await base.Update(id, update); + ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + } + + public override async Task Update(Expression> filterExpression, UpdateDefinition update) { + await base.Update(filterExpression, update); + List ids = Get(filterExpression.Compile()).Select(x => x.GetIdValue()).ToList(); + ids.ForEach(x => ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x))); + } + + public override async Task UpdateMany(Func predicate, UpdateDefinition update) { + List items = Get(predicate); + await base.UpdateMany(predicate, update); + items.ForEach(x => ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); + } + + public override async Task Replace(ModpackBuildRelease item) { + await base.Replace(item); + ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, item.GetIdValue())); + } + + public override async Task Delete(string id) { + await base.Delete(id); + ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); + } + + public override async Task DeleteMany(Func predicate) { + List items = Get(predicate); + await base.DeleteMany(predicate); + items.ForEach(x => ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, x.GetIdValue()))); + } + private void ModpackBuildDataEvent(DataEventModel dataEvent) { base.CachedDataEvent(dataEvent); } - protected override void CachedDataEvent(DataEventModel dataEvent) { - if (ObjectId.TryParse(dataEvent.id, out ObjectId unused)) { - base.CachedDataEvent(dataEvent); - } - } + protected override void CachedDataEvent(DataEventModel dataEvent) { } } } diff --git a/UKSF.Api.Data/Modpack/ReleasesDataService.cs b/UKSF.Api.Data/Modpack/ReleasesDataService.cs index 9c87f413..443c2848 100644 --- a/UKSF.Api.Data/Modpack/ReleasesDataService.cs +++ b/UKSF.Api.Data/Modpack/ReleasesDataService.cs @@ -1,10 +1,28 @@ -using UKSF.Api.Interfaces.Data; +using System.Collections.Generic; +using System.Linq; +using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Data.Modpack { - public class ReleasesDataService : CachedDataService, IReleasesDataService { - public ReleasesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackReleases") { } + public class ReleasesDataService : CachedDataService, IReleasesDataService { + public ReleasesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackReleases") { } + + public override List Get() { + base.Get(); + Collection = Collection.Select( + x => { + int[] parts = x.version.Split('.').Select(int.Parse).ToArray(); + return new { release = x, major = parts[0], minor = parts[1], patch = parts[2] }; + } + ) + .OrderByDescending(x => x.major) + .ThenByDescending(x => x.minor) + .ThenByDescending(x => x.patch) + .Select(x => x.release) + .ToList(); + return Collection; } + } } diff --git a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs index f6ac2e23..9d74de07 100644 --- a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs +++ b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs @@ -56,7 +56,7 @@ private async Task UpdatedEvent(string version, object dataObject) { await hub.Clients.All.ReceiveBuild(version, build); break; case ModpackBuildStep step: - await hub.Clients.All.ReceiveBuildStep(step); + await hub.Clients.Group(version).ReceiveBuildStep(step); break; } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs index 5dfb4cba..7a8e1cd1 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs @@ -5,5 +5,6 @@ namespace UKSF.Api.Interfaces.Data.Cached { public interface IBuildsDataService : IDataService, ICachedDataService { Task Update(string id, ModpackBuild build, DataEventType updateType); + Task Update(string id, ModpackBuild build, ModpackBuildStep buildStep); } } diff --git a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs index 1202af16..ba5fccaa 100644 --- a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs +++ b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs @@ -1,8 +1,17 @@ -using System.Threading.Tasks; +using System.Collections.Generic; +using System.Threading.Tasks; +using Octokit; +using UKSF.Api.Models.Integrations.Github; +using UKSF.Api.Models.Modpack; namespace UKSF.Api.Interfaces.Integrations.Github { public interface IGithubService { bool VerifySignature(string signature, string body); Task GetCommitVersion(string branch); + Task MergeBranch(string branch, string sourceBranch, string version); + Task GetPushEvent(PushWebhookPayload payload, string latestCommit); + Task GenerateChangelog(string version); + Task> GetHistoricReleases(); + Task PublishRelease(ModpackRelease release); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildProcessorService.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildProcessorService.cs new file mode 100644 index 00000000..2545b412 --- /dev/null +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildProcessorService.cs @@ -0,0 +1,9 @@ +using System.Threading; +using System.Threading.Tasks; +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Interfaces.Modpack.BuildProcess { + public interface IBuildProcessorService { + Task ProcessBuild(string id, ModpackBuild build, CancellationTokenSource cancellationTokenSource); + } +} diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs new file mode 100644 index 00000000..9e423f58 --- /dev/null +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs @@ -0,0 +1,8 @@ +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Interfaces.Modpack.BuildProcess { + public interface IBuildQueueService { + void QueueBuild(string version, ModpackBuild build); + void Cancel(); + } +} diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs new file mode 100644 index 00000000..55a890c3 --- /dev/null +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs @@ -0,0 +1,13 @@ +using System.Collections.Generic; +using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Interfaces.Modpack.BuildProcess { + public interface IBuildStepService { + List GetStepsForNewVersion(); + List GetStepsForRc(); + List GetStepsForRelease(); + List GetStepsForBuild(); + IBuildStep ResolveBuildStep(string buildStepName); + } +} diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs new file mode 100644 index 00000000..fb71bfc0 --- /dev/null +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs @@ -0,0 +1,12 @@ +using System; +using System.Threading.Tasks; + +namespace UKSF.Api.Interfaces.Modpack.BuildProcess { + public interface IStepLogger { + Task LogStart(); + Task LogSuccess(); + Task LogError(Exception exception); + Task LogCancelled(); + Task Log(string log); + } +} diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs new file mode 100644 index 00000000..6513ced8 --- /dev/null +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs @@ -0,0 +1,17 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Interfaces.Modpack.BuildProcess.Steps { + public interface IBuildStep { + void Init(ModpackBuildStep modpackBuildStep, Func updateCallback, CancellationTokenSource cancellationTokenSource); + Task Start(); + Task Setup(); + Task Process(); + Task Teardown(); + Task Succeed(); + Task Fail(Exception exception); + Task Cancel(); + } +} diff --git a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs index 357e4bc5..44615354 100644 --- a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs +++ b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs @@ -5,10 +5,20 @@ namespace UKSF.Api.Interfaces.Modpack { public interface IBuildsService : IDataBackedService { + ModpackBuildRelease GetBuildRelease(string version); + ModpackBuild GetLatestBuild(string version); Task InsertBuild(string id, ModpackBuild build); Task UpdateBuild(string id, ModpackBuild build); - Task CreateDevBuild(GithubPushEvent githubPushEvent); - Task CreateRcBuild(GithubPushEvent githubPushEvent); - Task GetBranchVersion(string branch); + Task UpdateBuildStep(string id, ModpackBuild build, ModpackBuildStep buildStep); + Task CreateDevBuild(string version, GithubCommit commit); + Task CreateFirstRcBuild(string version, ModpackBuild build); + Task CreateRcBuild(string version, GithubCommit commit); + Task CreateReleaseBuild(string version); + Task SetBuildRunning(string id, ModpackBuild build); + Task SucceedBuild(string id, ModpackBuild build); + Task FailBuild(string id, ModpackBuild build); + Task CancelBuild(string id, ModpackBuild build); + Task ResetBuild(string version, ModpackBuild build); + Task CreateRebuild(string version, ModpackBuild build); } } diff --git a/UKSF.Api.Interfaces/Modpack/IReleaseService.cs b/UKSF.Api.Interfaces/Modpack/IReleaseService.cs index 92c43c8b..1f06c2a0 100644 --- a/UKSF.Api.Interfaces/Modpack/IReleaseService.cs +++ b/UKSF.Api.Interfaces/Modpack/IReleaseService.cs @@ -1,7 +1,14 @@ -using UKSF.Api.Interfaces.Data.Cached; +using System.Collections.Generic; +using System.Threading.Tasks; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Modpack; namespace UKSF.Api.Interfaces.Modpack { public interface IReleaseService : IDataBackedService { - + Task MakeDraftRelease(string version, ModpackBuild build); + Task UpdateDraft(ModpackRelease release); + Task PublishRelease(string version); + ModpackRelease GetRelease(string version); + Task AddHistoricReleases(List releases); } } diff --git a/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj b/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj index 8dc90548..caba391f 100644 --- a/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj +++ b/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj @@ -11,6 +11,7 @@ + diff --git a/UKSF.Api.Models/Integrations/Github/GithubCommit.cs b/UKSF.Api.Models/Integrations/Github/GithubCommit.cs new file mode 100644 index 00000000..2f01d1c1 --- /dev/null +++ b/UKSF.Api.Models/Integrations/Github/GithubCommit.cs @@ -0,0 +1,9 @@ +namespace UKSF.Api.Models.Integrations.Github { + public class GithubCommit { + public string after; + public string baseBranch; + public string before; + public string branch; + public string message; + } +} diff --git a/UKSF.Api.Models/Integrations/Github/GithubPushEvent.cs b/UKSF.Api.Models/Integrations/Github/GithubPushEvent.cs deleted file mode 100644 index 333bd1c0..00000000 --- a/UKSF.Api.Models/Integrations/Github/GithubPushEvent.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Newtonsoft.Json; - -namespace UKSF.Api.Models.Integrations.Github { - public class GithubPushEvent { - public string after; - [JsonProperty("base_ref")] public string baseBranch; - public string before; - [JsonProperty("ref")] public string branch; - [JsonProperty("head_commit")] public GithubCommit commit; - public GithubRepository repository; - } - - public class GithubRepository { - [JsonProperty("full_name")] public string name; - } - - public class GithubCommit { - public GithubCommitAuthor author; - public string id; - public string message; - } - - public class GithubCommitAuthor { - public string email; - public string username; - } -} diff --git a/UKSF.Api.Models/Modpack/ModpackBuild.cs b/UKSF.Api.Models/Modpack/ModpackBuild.cs index dc3c1452..adb2aae7 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuild.cs +++ b/UKSF.Api.Models/Modpack/ModpackBuild.cs @@ -1,14 +1,21 @@ using System; using System.Collections.Generic; +using MongoDB.Bson; +using MongoDB.Bson.Serialization.Attributes; using UKSF.Api.Models.Integrations.Github; namespace UKSF.Api.Models.Modpack { public class ModpackBuild { - public DateTime timestamp = DateTime.Now; + [BsonRepresentation(BsonType.ObjectId)] public string builderId; public int buildNumber; - public GithubPushEvent pushEvent; - public bool isReleaseCandidate; + public ModpackBuildResult buildResult = ModpackBuildResult.NONE; + public GithubCommit commit; + public bool finished; public bool isNewVersion; + public bool isRelease; + public bool isReleaseCandidate; + public bool running; public List steps = new List(); + public DateTime timestamp = DateTime.Now; } } diff --git a/UKSF.Api.Models/Modpack/ModpackBuildQueueItem.cs b/UKSF.Api.Models/Modpack/ModpackBuildQueueItem.cs new file mode 100644 index 00000000..4355bc58 --- /dev/null +++ b/UKSF.Api.Models/Modpack/ModpackBuildQueueItem.cs @@ -0,0 +1,6 @@ +namespace UKSF.Api.Models.Modpack { + public class ModpackBuildQueueItem { + public string id; + public ModpackBuild build; + } +} diff --git a/UKSF.Api.Models/Modpack/ModpackBuildResult.cs b/UKSF.Api.Models/Modpack/ModpackBuildResult.cs new file mode 100644 index 00000000..8a84cebe --- /dev/null +++ b/UKSF.Api.Models/Modpack/ModpackBuildResult.cs @@ -0,0 +1,8 @@ +namespace UKSF.Api.Models.Modpack { + public enum ModpackBuildResult { + NONE, + SUCCESS, + FAILED, + CANCELLED + } +} diff --git a/UKSF.Api.Models/Modpack/ModpackBuildStep.cs b/UKSF.Api.Models/Modpack/ModpackBuildStep.cs index 5fff0c57..22900f0b 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuildStep.cs +++ b/UKSF.Api.Models/Modpack/ModpackBuildStep.cs @@ -1,15 +1,21 @@ using System; using System.Collections.Generic; +using System.Globalization; namespace UKSF.Api.Models.Modpack { public class ModpackBuildStep { + public ModpackBuildResult buildResult = ModpackBuildResult.NONE; + public DateTime endTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); + public bool finished; public int index; - public DateTime startTime = DateTime.Parse("20000101"); - public DateTime endTime = DateTime.Parse("20000101"); + public List logs = new List(); public string name; public bool running; - public bool success; - public bool fail; - public List logs = new List(); + public DateTime startTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); + + public ModpackBuildStep(int index, string name) { + this.index = index; + this.name = name; + } } } diff --git a/UKSF.Api.Models/Modpack/ModpackRelease.cs b/UKSF.Api.Models/Modpack/ModpackRelease.cs index 5cf1b510..e5cdfcd8 100644 --- a/UKSF.Api.Models/Modpack/ModpackRelease.cs +++ b/UKSF.Api.Models/Modpack/ModpackRelease.cs @@ -1,10 +1,15 @@ using System; +using MongoDB.Bson; +using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Modpack { public class ModpackRelease : DatabaseObject { + public string changelog; + [BsonRepresentation(BsonType.ObjectId)] public string creatorId; + public string description; + public bool isDraft; + [BsonRepresentation(BsonType.ObjectId)] public string releaserId; public DateTime timestamp; public string version; - public string description; - public string changelog; } } diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 5721e163..a1f09ea0 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -3,19 +3,38 @@ using System.Linq; using System.Security.Cryptography; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; +using GitHubJwt; using Microsoft.Extensions.Configuration; using Octokit; using UKSF.Api.Interfaces.Integrations.Github; +using UKSF.Api.Models.Integrations.Github; +using UKSF.Api.Models.Modpack; +using UKSF.Api.Services.Message; namespace UKSF.Api.Services.Integrations.Github { public class GithubService : IGithubService { + // TODO: Use variables for some of these + private const string REPO_ORG = "uksf"; + private const string REPO_NAME = "BuildTest"; // "modpack"; + private const string VERSION_FILE = "addons/main/script_version.hpp"; + private const int APP_ID = 53456; + private const long APP_INSTALLATION = 6681715; + private const string APP_NAME = "uksf-api-integration"; + private static readonly string[] LABELS_ADDED = { "type/feature", "type/mod addition" }; + private static readonly string[] LABELS_CHANGED = { "type/arsenal", "type/cleanup", "type/enhancement", "type/task" }; + private static readonly string[] LABELS_FIXED = { "type/bug fix", "type/bug" }; + private static readonly string[] LABELS_UPDATED = { "type/mod update" }; + private static readonly string[] LABELS_REMOVED = { "type/mod deletion" }; + private static readonly string[] LABELS_EXCLUDE = { "type/cleanup", "type/by design", "fault/bi", "fault/other mod" }; + private readonly IConfiguration configuration; public GithubService(IConfiguration configuration) => this.configuration = configuration; public bool VerifySignature(string signature, string body) { - string secret = configuration.GetSection("Secrets")["githubSecret"]; + string secret = configuration.GetSection("Github")["webhookSecret"]; byte[] data = Encoding.UTF8.GetBytes(body); byte[] secretData = Encoding.UTF8.GetBytes(secret); using HMACSHA1 hmac = new HMACSHA1(secretData); @@ -25,12 +44,156 @@ public bool VerifySignature(string signature, string body) { } public async Task GetCommitVersion(string branch) { - GitHubClient client = new GitHubClient(new ProductHeaderValue("uksf-api-integration")); - byte[] contentBytes = await client.Repository.Content.GetRawContentByRef("uksf", "modpack", $"addons/main/script_version.hpp", branch); + branch = branch.Split('/')[^1]; + GitHubClient client = await AuthenticateClient(); + byte[] contentBytes = await client.Repository.Content.GetRawContentByRef(REPO_ORG, REPO_NAME, VERSION_FILE, branch); string content = Encoding.UTF8.GetString(contentBytes); IEnumerable lines = content.Split("\n").Take(3); string version = string.Join('.', lines.Select(x => x.Split(' ')[^1])); return version; } + + public async Task MergeBranch(string branch, string sourceBranch, string commitMessage) { + GitHubClient client = await AuthenticateClient(); + Merge result = await client.Repository.Merging.Create(REPO_ORG, REPO_NAME, new NewMerge(branch, sourceBranch) { CommitMessage = commitMessage }); + if (result == null || string.IsNullOrEmpty(result.Sha)) { + throw new Exception($"Merge of {sourceBranch} into {branch} failed"); + } + + return result; + } + + public async Task GetPushEvent(PushWebhookPayload payload, string latestCommit) { + if (string.IsNullOrEmpty(latestCommit)) { + latestCommit = payload.Before; + } + + GitHubClient client = await AuthenticateClient(); + CompareResult result = await client.Repository.Commit.Compare(REPO_ORG, REPO_NAME, latestCommit, payload.After); + string message = result.Commits.Count > 0 ? CombineCommitMessages(result.Commits) : result.BaseCommit.Commit.Message; + return new GithubCommit { branch = payload.Ref, baseBranch = payload.BaseRef, before = payload.Before, after = payload.After, message = message }; + } + + public async Task GenerateChangelog(string version) { + GitHubClient client = await AuthenticateClient(); + + IReadOnlyList milestones = await client.Issue.Milestone.GetAllForRepository( + REPO_ORG, + "modpack", + new MilestoneRequest { State = ItemStateFilter.Open } + ); // TODO: Repo name setting + Milestone milestone = milestones.FirstOrDefault(x => x.Title == version); + if (milestone == null) { + LogWrapper.Log($"Could not find open milestone for version {version}"); + return "No milestone found"; + } + + IReadOnlyList issues = await client.Issue.GetAllForRepository( + REPO_ORG, + "modpack", + new RepositoryIssueRequest { Milestone = milestone.Number.ToString(), State = ItemStateFilter.Closed } + ); + + string changelog = ""; + + List added = issues.Where(x => x.Labels.Any(y => LABELS_ADDED.Contains(y.Name) && !LABELS_EXCLUDE.Contains(y.Name))).OrderBy(x => x.Title).ToList(); + List changed = issues.Where(x => x.Labels.Any(y => LABELS_CHANGED.Contains(y.Name) && !LABELS_EXCLUDE.Contains(y.Name))).OrderBy(x => x.Title).ToList(); + List fixes = issues.Where(x => x.Labels.Any(y => LABELS_FIXED.Contains(y.Name) && !LABELS_EXCLUDE.Contains(y.Name))).OrderBy(x => x.Title).ToList(); + List updated = issues.Where(x => x.Labels.Any(y => LABELS_UPDATED.Contains(y.Name) && !LABELS_EXCLUDE.Contains(y.Name))).OrderBy(x => x.Title).ToList(); + List removed = issues.Where(x => x.Labels.Any(y => LABELS_REMOVED.Contains(y.Name) && !LABELS_EXCLUDE.Contains(y.Name))).OrderBy(x => x.Title).ToList(); + + AddChangelogSection(ref changelog, added, "Added"); + AddChangelogSection(ref changelog, changed, "Changed"); + AddChangelogSection(ref changelog, fixes, "Fixed"); + AddChangelogUpdated(ref changelog, updated, "Updated"); + AddChangelogSection(ref changelog, removed, "Removed"); + + changelog += "SR3 - Development Team"; + changelog += "\n[Report and track issues here](https://github.com/uksf/modpack/issues)"; + + return changelog; + } + + public async Task PublishRelease(ModpackRelease release) { + GitHubClient client = await AuthenticateClient(); + + await client.Repository.Release.Create( + REPO_ORG, + REPO_NAME, + new NewRelease(release.version) { Name = $"Modpack Version {release.version}", Body = $"{release.description}\n\n{release.changelog}" } + ); + } + + public async Task> GetHistoricReleases() { + GitHubClient client = await AuthenticateClient(); + + IReadOnlyList releases = await client.Repository.Release.GetAll(REPO_ORG, "modpack"); + return releases.Select(x => new ModpackRelease { version = x.Name.Split(" ")[^1], timestamp = x.CreatedAt.DateTime, changelog = FormatChangelog(x.Body) }).ToList(); + } + + private static string CombineCommitMessages(IEnumerable commits) { + return commits.Select(x => x.Commit.Message).Reverse().Aggregate((a, b) => $"{a}\n\n{b}"); + } + + private static void AddChangelogSection(ref string changelog, IReadOnlyCollection issues, string header) { + if (issues.Any()) { + changelog += $"#### {header}"; + changelog += issues.Select(x => $"\n- {x.Title} [(#{x.Number})]({x.HtmlUrl})").Aggregate((a, b) => a + b); + changelog += "\n\n"; + } + } + + private static void AddChangelogUpdated(ref string changelog, IReadOnlyCollection issues, string header) { + if (issues.Any()) { + changelog += $"#### {header}"; + changelog += issues.Select( + x => { + string[] titleParts = x.Title.Split(" "); + return $"\n- {titleParts[0]} to [{titleParts[1]}]({x.HtmlUrl})"; + } + ) + .Aggregate((a, b) => a + b); + changelog += "\n\n"; + } + } + + private static string FormatChangelog(string body) { + string changelog = body.Replace("\r\n", "\n").Replace("\n[Report", "
[Report"); + string[] lines = changelog.Split("\n"); + for (int i = 0; i < lines.Length; i++) { + string line = lines[i]; + + if (line.StartsWith(" ") && !Regex.Match(line, @"( {2,})-").Success) { + lines[i] = $"
{line}"; + } + + Match match = Regex.Match(line, @"]\(#\d+\)"); + if (match.Success) { + string number = match.Value.Replace("]", "").Replace("(", "").Replace(")", "").Replace("#", ""); + lines[i] = line.Replace(match.Value, $"](https://github.com/uksf/modpack/issues/{number})"); + } else { + match = Regex.Match(line, @"\(#\d+\)"); + if (match.Success) { + string number = match.Value.Replace("(", "").Replace(")", "").Replace("#", ""); + lines[i] = line.Replace(match.Value, $"[{match.Value}](https://github.com/uksf/modpack/issues/{number})"); + } + } + } + + return string.Join("\n", lines); + } + + private async Task AuthenticateClient() { + GitHubClient client = new GitHubClient(new ProductHeaderValue(APP_NAME)) { Credentials = new Credentials(GetJwtToken(), AuthenticationType.Bearer) }; + AccessToken response = await client.GitHubApps.CreateInstallationToken(APP_INSTALLATION); + GitHubClient installationClient = new GitHubClient(new ProductHeaderValue(APP_NAME)) { Credentials = new Credentials(response.Token) }; + return installationClient; + } + + private string GetJwtToken() { + string privateKey = configuration.GetSection("Github")["appPrivateKey"].Replace("\n", Environment.NewLine, StringComparison.Ordinal); + GitHubJwtFactory generator = new GitHubJwtFactory(new StringPrivateKeySource(privateKey), new GitHubJwtFactoryOptions { AppIntegrationId = APP_ID, ExpirationSeconds = 540 }); + return generator.CreateEncodedJwtToken(); + } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs new file mode 100644 index 00000000..9872ce29 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -0,0 +1,97 @@ +using System; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; +using System.Management.Automation; +using System.Management.Automation.Runspaces; +using System.Threading; +using System.Threading.Tasks; +using UKSF.Api.Interfaces.Modpack.BuildProcess; + +namespace UKSF.Api.Services.Modpack.BuildProcess { + public static class BuildProcessHelper { + public static void RunProcess(IStepLogger logger, CancellationToken cancellationToken, string executable, string args, string workingDirectory) { + using Process process = new Process { + StartInfo = { + FileName = executable, + WorkingDirectory = workingDirectory, + Arguments = args, + UseShellExecute = false, + CreateNoWindow = true, + RedirectStandardOutput = true, + RedirectStandardError = true + } + }; + + try { + process.EnableRaisingEvents = false; + process.OutputDataReceived += (sender, receivedEventArgs) => logger.Log(receivedEventArgs.Data); + process.ErrorDataReceived += (sender, receivedEventArgs) => logger.LogError(new Exception(receivedEventArgs.Data)); + using CancellationTokenRegistration unused = cancellationToken.Register(process.Kill); + process.Start(); + process.BeginOutputReadLine(); + process.BeginErrorReadLine(); + process.WaitForExit(); + + if (process.ExitCode != 0) { + throw new Exception($"Process exited with non-zero exit code of: {process.ExitCode}"); + } + } finally { + process.Close(); + } + } + + [SuppressMessage("ReSharper", "MethodHasAsyncOverload")] + public static async Task RunPowershell(IStepLogger logger, CancellationToken cancellationToken, string command, string workingDirectory, params string[] args) { + using Runspace runspace = RunspaceFactory.CreateRunspace(); + runspace.Open(); + runspace.SessionStateProxy.Path.SetLocation(workingDirectory); + + using PowerShell powerShell = PowerShell.Create(); + powerShell.Runspace = runspace; + powerShell.AddCommand(command); + foreach (string arg in args) { + powerShell.AddArgument(arg); + } + + async void Log(object sender, DataAddedEventArgs eventArgs) { + PSDataCollection streamObjectsReceived = sender as PSDataCollection; + InformationRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; + await logger.Log(currentStreamRecord?.MessageData.ToString()); + } + + async void Error(object sender, DataAddedEventArgs eventArgs) { + PSDataCollection streamObjectsReceived = sender as PSDataCollection; + InformationRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; + await logger.LogError(new Exception(currentStreamRecord?.MessageData.ToString())); + } + + powerShell.Streams.Information.DataAdded += Log; + powerShell.Streams.Warning.DataAdded += Log; + powerShell.Streams.Error.DataAdded += Error; + + PSDataCollection result = await powerShell.InvokeAsync(cancellationToken); + foreach (PSObject psObject in result) { + await logger.Log(psObject.BaseObject.ToString()); + } + + runspace.Close(); + } + + private static Task> InvokeAsync(this PowerShell powerShell, CancellationToken cancellationToken) { + return Task.Factory.StartNew( + () => { + IAsyncResult invocation = powerShell.BeginInvoke(); + WaitHandle.WaitAny(new[] { invocation.AsyncWaitHandle, cancellationToken.WaitHandle }); + + if (cancellationToken.IsCancellationRequested) { + powerShell.Stop(); + } + + cancellationToken.ThrowIfCancellationRequested(); + return powerShell.EndInvoke(invocation); + }, + cancellationToken + ); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs new file mode 100644 index 00000000..8ba5f1a5 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs @@ -0,0 +1,51 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Interfaces.Modpack.BuildProcess; +using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Services.Modpack.BuildProcess { + public class BuildProcessorService : IBuildProcessorService { + private readonly IBuildsService buildsService; + private readonly IBuildStepService buildStepService; + + public BuildProcessorService(IBuildStepService buildStepService, IBuildsService buildsService) { + this.buildStepService = buildStepService; + this.buildsService = buildsService; + } + + public async Task ProcessBuild(string id, ModpackBuild build, CancellationTokenSource cancellationTokenSource) { + await buildsService.SetBuildRunning(id, build); + + foreach (ModpackBuildStep buildStep in build.steps) { + if (cancellationTokenSource.IsCancellationRequested) { + await buildsService.CancelBuild(id, build); + return; + }; + + IBuildStep step = buildStepService.ResolveBuildStep(buildStep.name); + step.Init(buildStep, async () => await buildsService.UpdateBuildStep(id, build, buildStep), cancellationTokenSource); + + try { + await step.Start(); + await step.Setup(); + await step.Process(); + await step.Teardown(); + await step.Succeed(); + } catch (OperationCanceledException) { + await step.Cancel(); + await buildsService.CancelBuild(id, build); + return; + } catch (Exception exception) { + await step.Fail(exception); + await buildsService.FailBuild(id, build); + return; + } + } + + await buildsService.SucceedBuild(id, build); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs new file mode 100644 index 00000000..b78814cc --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Concurrent; +using System.Threading; +using System.Threading.Tasks; +using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Interfaces.Modpack.BuildProcess; +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Services.Modpack.BuildProcess { + public class BuildQueueService : IBuildQueueService { + private readonly IBuildsService buildsService; + private readonly IBuildProcessorService buildProcessorService; + private readonly ConcurrentQueue queue = new ConcurrentQueue(); + private CancellationTokenSource currentCancellationTokenSource; + private bool processing; + + public BuildQueueService(IBuildsService buildsService, IBuildProcessorService buildProcessorService) { + this.buildsService = buildsService; + this.buildProcessorService = buildProcessorService; + } + + public void QueueBuild(string version, ModpackBuild build) { + ModpackBuildRelease buildRelease = buildsService.GetBuildRelease(version); + if (buildRelease == null) { + throw new NullReferenceException($"Tried to add build to queue but could not find build release {version}"); + } + + queue.Enqueue(new ModpackBuildQueueItem {id = buildRelease.id, build = build}); + if (!processing) { + // Processor not running, process as separate task + Task unused = ProcessQueue(); + } + } + + public void Cancel() { + if (processing) { + currentCancellationTokenSource.Cancel(); + } + } + + private async Task ProcessQueue() { + processing = true; + while (queue.TryDequeue(out ModpackBuildQueueItem queueItem)) { + currentCancellationTokenSource = new CancellationTokenSource(); + await buildProcessorService.ProcessBuild(queueItem.id, queueItem.build, currentCancellationTokenSource); + } + + processing = false; + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs new file mode 100644 index 00000000..20650a2f --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using UKSF.Api.Interfaces.Modpack.BuildProcess; +using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; +using UKSF.Api.Models.Modpack; +using UKSF.Api.Services.Modpack.BuildProcess.Steps; + +namespace UKSF.Api.Services.Modpack.BuildProcess { + public class BuildStepService : IBuildStepService { + private readonly Dictionary buildStepDictionary = new Dictionary { { BuildStep0Prep.NAME, typeof(BuildStep0Prep) }, { BuildStep1dSource.NAME, typeof(BuildStep1dSource) } }; + + public IBuildStep ResolveBuildStep(string buildStepName) { + if (!buildStepDictionary.ContainsKey(buildStepName)) { + throw new NullReferenceException($"Build step '{buildStepName}' does not exist in build step dictionary"); + } + + Type type = buildStepDictionary[buildStepName]; + IBuildStep step = Activator.CreateInstance(type) as IBuildStep; + return step; + } + + public List GetStepsForNewVersion() => new List { new ModpackBuildStep(0, BuildStep0Prep.NAME), new ModpackBuildStep(1, BuildStep1dSource.NAME) }; + + public List GetStepsForRc() => new List { new ModpackBuildStep(0, BuildStep0Prep.NAME), new ModpackBuildStep(1, BuildStep1dSource.NAME) }; + + public List GetStepsForRelease() => new List { new ModpackBuildStep(0, BuildStep0Prep.NAME) }; + + public List GetStepsForBuild() => new List { new ModpackBuildStep(0, BuildStep0Prep.NAME), new ModpackBuildStep(1, BuildStep1dSource.NAME) }; + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs new file mode 100644 index 00000000..2f8d7306 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs @@ -0,0 +1,48 @@ +using System; +using System.Threading.Tasks; +using UKSF.Api.Interfaces.Modpack.BuildProcess; +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Services.Modpack.BuildProcess { + public class StepLogger : IStepLogger { + private readonly ModpackBuildStep buildStep; + private readonly Func logCallback; + + public StepLogger(ModpackBuildStep buildStep, Func logCallback) { + this.buildStep = buildStep; + this.logCallback = logCallback; + } + + public async Task LogStart() { + LogLines($"Starting: {buildStep.name}"); + await logCallback(); + } + + public async Task LogSuccess() { + LogLines($"\nFinished: {buildStep.name}"); + await logCallback(); + } + + public async Task LogError(Exception exception) { + LogLines($"\nError: {exception.Message}\n{exception.StackTrace}"); + LogLines($"\nFailed: {buildStep.name}"); + await logCallback(); + } + + public async Task LogCancelled() { + LogLines("\nBuild cancelled"); + await logCallback(); + } + + public async Task Log(string log) { + LogLines(log); + await logCallback(); + } + + private void LogLines(string log) { + foreach (string line in log.Split("\n")) { + buildStep.logs.Add(line); + } + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs new file mode 100644 index 00000000..e2267825 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs @@ -0,0 +1,72 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using UKSF.Api.Interfaces.Modpack.BuildProcess; +using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { + public class BuildStep : IBuildStep { + private ModpackBuildStep buildStep; + protected CancellationTokenSource CancellationTokenSource; + protected IStepLogger Logger; + private Func updateCallback; + + public void Init(ModpackBuildStep modpackBuildStep, Func stepUpdateCallback, CancellationTokenSource newCancellationTokenSource) { + buildStep = modpackBuildStep; + updateCallback = stepUpdateCallback; + CancellationTokenSource = newCancellationTokenSource; + Logger = new StepLogger(buildStep, LogCallback); + } + + public async Task Start() { + CancellationTokenSource.Token.ThrowIfCancellationRequested(); + buildStep.running = true; + buildStep.startTime = DateTime.Now; + await Logger.LogStart(); + } + + public virtual async Task Setup() { + CancellationTokenSource.Token.ThrowIfCancellationRequested(); + await Logger.Log("\nSetup"); + } + + public virtual async Task Process() { + CancellationTokenSource.Token.ThrowIfCancellationRequested(); + await Logger.Log("\nProcess"); + } + + public virtual async Task Teardown() { + CancellationTokenSource.Token.ThrowIfCancellationRequested(); + await Logger.Log("\nTeardown"); + } + + public async Task Succeed() { + Stop(); + buildStep.buildResult = ModpackBuildResult.SUCCESS; + await Logger.LogSuccess(); + } + + public async Task Fail(Exception exception) { + Stop(); + buildStep.buildResult = ModpackBuildResult.FAILED; + await Logger.LogError(exception); + } + + public async Task Cancel() { + Stop(); + buildStep.buildResult = ModpackBuildResult.CANCELLED; + await Logger.LogCancelled(); + } + + private async Task LogCallback() { + await updateCallback(); + } + + private void Stop() { + buildStep.running = false; + buildStep.finished = true; + buildStep.endTime = DateTime.Now; + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs index 1286ff3a..b9335186 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs @@ -1,5 +1,27 @@ -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { - public class BuildStep0Prep : BuildStepBase { +using System; +using System.Threading.Tasks; +using UKSF.Common; +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { + public class BuildStep0Prep : BuildStep { + public const string NAME = "Prep"; + + public override async Task Setup() { + await base.Setup(); + await Logger.Log("Nothing to do"); + } + + public override async Task Process() { + await base.Process(); + await TaskUtilities.Delay(TimeSpan.FromSeconds(2), CancellationTokenSource.Token); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "subst", "C:/", "P:", "\"D:/Arma/Arma 3 Projects\""); + await TaskUtilities.Delay(TimeSpan.FromSeconds(2), CancellationTokenSource.Token); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "subst", "C:/"); + } + + public override async Task Teardown() { + await base.Teardown(); + await Logger.Log("Nothing to do"); + } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1dSource.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1dSource.cs new file mode 100644 index 00000000..63c2b969 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1dSource.cs @@ -0,0 +1,31 @@ +using System; +using System.Threading.Tasks; +using UKSF.Common; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { + public class BuildStep1dSource : BuildStep { + public const string NAME = "Pull source"; + + public override async Task Setup() { + await base.Setup(); + await TaskUtilities.Delay(TimeSpan.FromSeconds(2), CancellationTokenSource.Token); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfihjugdfhjodfgh"); + } + + public override async Task Process() { + await base.Process(); + await TaskUtilities.Delay(TimeSpan.FromSeconds(3), CancellationTokenSource.Token); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfi4y5hu654hhjugdfhjodfgh"); + await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfihjtyfghrtytrtryfghfghfghugdfhjodfgh"); + await TaskUtilities.Delay(TimeSpan.FromSeconds(2), CancellationTokenSource.Token); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "4665uhftfghtfghfhgfgh"); + } + + public override async Task Teardown() { + await base.Teardown(); + await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfihjtyfghfghfghfghugdfhjodfgh"); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepBase.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepBase.cs deleted file mode 100644 index e11ada7f..00000000 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepBase.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { - public class BuildStepBase { - public string Name; - - } -} diff --git a/UKSF.Api.Services/Modpack/BuildsService.cs b/UKSF.Api.Services/Modpack/BuildsService.cs index fb03af3e..49088928 100644 --- a/UKSF.Api.Services/Modpack/BuildsService.cs +++ b/UKSF.Api.Services/Modpack/BuildsService.cs @@ -3,17 +3,17 @@ using System.Linq; using System.Threading.Tasks; using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Models.Events; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Services.Modpack { public class BuildsService : DataBackedService, IBuildsService { - private readonly IGithubService githubService; + private readonly IBuildStepService buildStepService; - public BuildsService(IBuildsDataService data, IGithubService githubService) : base(data) => this.githubService = githubService; + public BuildsService(IBuildsDataService data, IBuildStepService buildStepService) : base(data) => this.buildStepService = buildStepService; public async Task InsertBuild(string id, ModpackBuild build) { await Data.Update(id, build, DataEventType.ADD); @@ -23,49 +23,137 @@ public async Task UpdateBuild(string id, ModpackBuild build) { await Data.Update(id, build, DataEventType.UPDATE); } - public async Task UpdateBuildStep(string id, ModpackBuild build) { - await Data.Update(id, build, DataEventType.UPDATE); + public async Task UpdateBuildStep(string id, ModpackBuild build, ModpackBuildStep buildStep) { + await Data.Update(id, build, buildStep); + } + + public ModpackBuildRelease GetBuildRelease(string version) => Data.GetSingle(x => x.version == version); + + public ModpackBuild GetLatestBuild(string version) { + ModpackBuildRelease buildRelease = GetBuildRelease(version); + if (buildRelease == null || buildRelease.builds.Count == 0) return null; + + return buildRelease.builds[0]; } - public async Task CreateDevBuild(GithubPushEvent githubPushEvent) { - string version = await GetBranchVersion(githubPushEvent.branch); - ModpackBuildRelease buildRelease = Data.GetSingle(x => x.version == version); + public async Task CreateDevBuild(string version, GithubCommit commit) { + ModpackBuildRelease buildRelease = GetBuildRelease(version); if (buildRelease == null) { - buildRelease = new ModpackBuildRelease { - version = version, builds = new List { new ModpackBuild { buildNumber = 0, isNewVersion = true, pushEvent = githubPushEvent } } - }; + // New version build + ModpackBuild newBuild = new ModpackBuild { buildNumber = 0, isNewVersion = true, commit = commit, steps = buildStepService.GetStepsForNewVersion() }; + newBuild.commit.message = "New version (no content changes)"; + buildRelease = new ModpackBuildRelease { version = version, builds = new List { newBuild } }; await Data.Add(buildRelease); - return; + return newBuild; } ModpackBuild previousBuild = buildRelease.builds.First(); - ModpackBuild build = new ModpackBuild { buildNumber = previousBuild.buildNumber + 1, pushEvent = githubPushEvent }; + if (previousBuild.isReleaseCandidate || previousBuild.isRelease) { + throw new InvalidOperationException("Cannot push dev build when RC exists"); + } + ModpackBuild build = new ModpackBuild { buildNumber = previousBuild.buildNumber + 1, commit = commit, steps = buildStepService.GetStepsForBuild() }; await InsertBuild(buildRelease.id, build); - // run build + return build; } - public async Task CreateRcBuild(GithubPushEvent githubPushEvent) { - string version = await GetBranchVersion(githubPushEvent.branch); - ModpackBuildRelease buildRelease = Data.GetSingle(x => x.version == version); + public async Task CreateFirstRcBuild(string version, ModpackBuild build) { + ModpackBuildRelease buildRelease = GetBuildRelease(version); + if (buildRelease == null) { + throw new NullReferenceException($"Cannot create first RC build for build release {version} as it does not exist"); + } + + ModpackBuild newBuild = new ModpackBuild { buildNumber = build.buildNumber + 1, isReleaseCandidate = true, commit = new GithubCommit(), steps = buildStepService.GetStepsForRc() }; + await InsertBuild(buildRelease.id, newBuild); + + return newBuild; + } + + public async Task CreateRcBuild(string version, GithubCommit commit) { + ModpackBuildRelease buildRelease = GetBuildRelease(version); if (buildRelease == null) { throw new NullReferenceException($"CI tried to create RC build for build release {version} which does not exist"); } - //this can't be the first RC build - ModpackBuild previousBuild = buildRelease.builds.FirstOrDefault(); + // This can't be the first RC build + ModpackBuild previousBuild = buildRelease.builds.FirstOrDefault(x => x.isReleaseCandidate); if (previousBuild == null) { throw new InvalidOperationException("First RC build should not be created by CI. Something went wrong"); } - ModpackBuild build = new ModpackBuild { buildNumber = previousBuild.buildNumber + 1, pushEvent = githubPushEvent, isReleaseCandidate = true }; + ModpackBuild build = new ModpackBuild { buildNumber = previousBuild.buildNumber + 1, commit = commit, isReleaseCandidate = true, steps = buildStepService.GetStepsForRc() }; + await InsertBuild(buildRelease.id, build); + return build; + } + + public async Task CreateReleaseBuild(string version) { + ModpackBuildRelease buildRelease = GetBuildRelease(version); + if (buildRelease == null) { + throw new NullReferenceException($"Tried to release version but build release {version} does not exist"); + } + + // There must be at least one RC build to release + ModpackBuild previousBuild = buildRelease.builds.FirstOrDefault(x => x.isReleaseCandidate); + if (previousBuild == null) { + throw new InvalidOperationException("Release build requires a RC build"); + } + + ModpackBuild build = new ModpackBuild { buildNumber = previousBuild.buildNumber + 1, isRelease = true, steps = buildStepService.GetStepsForRelease(), commit = previousBuild.commit }; + build.commit.message = "Release deployment (no content changes)"; await InsertBuild(buildRelease.id, build); - // run build + return build; + } + + public async Task CreateRebuild(string version, ModpackBuild build) { + ModpackBuildRelease buildRelease = GetBuildRelease(version); + if (buildRelease == null) { + throw new NullReferenceException($"Tried to rebuild {build.buildNumber} but build release {version} does not exist"); + } + + ModpackBuild rebuild = new ModpackBuild { + buildNumber = build.buildNumber + 1, + isReleaseCandidate = build.isReleaseCandidate, + steps = build.isReleaseCandidate ? buildStepService.GetStepsForRc() : buildStepService.GetStepsForBuild(), + commit = build.commit + }; + rebuild.commit.message = $"Rebuild of {build.buildNumber}"; + await InsertBuild(buildRelease.id, rebuild); + return rebuild; + } + + public async Task SetBuildRunning(string id, ModpackBuild build) { + build.running = true; + await UpdateBuild(id, build); + } + + public async Task SucceedBuild(string id, ModpackBuild build) { + build.running = false; + build.finished = true; + build.buildResult = ModpackBuildResult.SUCCESS; + await UpdateBuild(id, build); + } + + public async Task FailBuild(string id, ModpackBuild build) { + build.running = false; + build.finished = true; + build.buildResult = ModpackBuildResult.FAILED; + await UpdateBuild(id, build); + } + + public async Task CancelBuild(string id, ModpackBuild build) { + build.running = false; + build.finished = true; + build.buildResult = ModpackBuildResult.CANCELLED; + await UpdateBuild(id, build); } - public async Task GetBranchVersion(string branch) { - branch = branch.Split('/')[^1]; - return await githubService.GetCommitVersion(branch); + public async Task ResetBuild(string version, ModpackBuild build) { + ModpackBuildRelease buildRelease = GetBuildRelease(version); + build.running = false; + build.finished = false; + build.buildResult = ModpackBuildResult.NONE; + build.steps = build.isReleaseCandidate ? buildStepService.GetStepsForRc() : buildStepService.GetStepsForBuild(); + await UpdateBuild(buildRelease.id, build); } } } diff --git a/UKSF.Api.Services/Modpack/ReleaseService.cs b/UKSF.Api.Services/Modpack/ReleaseService.cs index 261fd27b..609acd46 100644 --- a/UKSF.Api.Services/Modpack/ReleaseService.cs +++ b/UKSF.Api.Services/Modpack/ReleaseService.cs @@ -1,10 +1,52 @@ -using UKSF.Api.Interfaces.Data.Cached; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using MongoDB.Driver; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Modpack; namespace UKSF.Api.Services.Modpack { public class ReleaseService : DataBackedService, IReleaseService { - public ReleaseService(IReleasesDataService data) : base(data) { } + private readonly IGithubService githubService; + private readonly ISessionService sessionService; + public ReleaseService(IReleasesDataService data, IGithubService githubService, ISessionService sessionService) : base(data) { + this.githubService = githubService; + this.sessionService = sessionService; + } + public ModpackRelease GetRelease(string version) { + return Data.GetSingle(x => x.version == version); + } + + public async Task MakeDraftRelease(string version, ModpackBuild build) { + string changelog = await githubService.GenerateChangelog(version); + await Data.Add(new ModpackRelease { timestamp = DateTime.Now, version = version, changelog = changelog, isDraft = true, creatorId = sessionService.GetContextId() }); + } + + public async Task UpdateDraft(ModpackRelease release) { + await Data.Update(release.id, Builders.Update.Set(x => x.description, release.description).Set(x => x.changelog, release.changelog)); + } + + public async Task PublishRelease(string version) { + ModpackRelease release = GetRelease(version); + if (release == null) { + throw new NullReferenceException($"Could not find release {version}"); + } + + await Data.Update(release.id, Builders.Update.Set(x => x.timestamp, DateTime.Now).Set(x => x.isDraft, false).Set(x => x.releaserId, sessionService.GetContextId())); + await githubService.PublishRelease(release); + } + + public async Task AddHistoricReleases(List releases) { + List existingReleases = Data.Get(); + foreach (ModpackRelease release in releases.Where(x => existingReleases.All(y => y.version != x.version))) { + await Data.Add(release); + } + } } } diff --git a/UKSF.Api.Services/UKSF.Api.Services.csproj b/UKSF.Api.Services/UKSF.Api.Services.csproj index 946f082a..e54a9b4e 100644 --- a/UKSF.Api.Services/UKSF.Api.Services.csproj +++ b/UKSF.Api.Services/UKSF.Api.Services.csproj @@ -13,8 +13,10 @@ + + diff --git a/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs b/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs index 169a146f..300b92ba 100644 --- a/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs @@ -1,8 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using UKSF.Api.Data.Modpack; using UKSF.Api.Interfaces.Command; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Game; using UKSF.Api.Interfaces.Launcher; using UKSF.Api.Interfaces.Message; diff --git a/UKSF.Api/AppStart/Services/ServiceExtensions.cs b/UKSF.Api/AppStart/Services/ServiceExtensions.cs index 6c20dcbd..33ba7f9a 100644 --- a/UKSF.Api/AppStart/Services/ServiceExtensions.cs +++ b/UKSF.Api/AppStart/Services/ServiceExtensions.cs @@ -12,6 +12,7 @@ using UKSF.Api.Interfaces.Launcher; using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Services; @@ -26,6 +27,7 @@ using UKSF.Api.Services.Launcher; using UKSF.Api.Services.Message; using UKSF.Api.Services.Modpack; +using UKSF.Api.Services.Modpack.BuildProcess; using UKSF.Api.Services.Personnel; using UKSF.Api.Services.Utility; @@ -55,6 +57,7 @@ public static void RegisterServices(this IServiceCollection services, IConfigura // Services services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -73,6 +76,8 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddTransient(); services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/UKSF.Api/AppStart/StartServices.cs b/UKSF.Api/AppStart/StartServices.cs index e3528fc3..6bc73e19 100644 --- a/UKSF.Api/AppStart/StartServices.cs +++ b/UKSF.Api/AppStart/StartServices.cs @@ -14,7 +14,7 @@ public static void Start() { if (serviceProvider.GetService().IsDevelopment()) { // Do any test data setup - TestDataSetup.Run(serviceProvider); + // TestDataSetup.Run(serviceProvider); } // Execute any DB migration diff --git a/UKSF.Api/AppStart/TestDataSetup.cs b/UKSF.Api/AppStart/TestDataSetup.cs index f4bb4768..403f30c8 100644 --- a/UKSF.Api/AppStart/TestDataSetup.cs +++ b/UKSF.Api/AppStart/TestDataSetup.cs @@ -1,174 +1,173 @@ -using System; -using System.Collections.Generic; -using Microsoft.Extensions.DependencyInjection; -using MongoDB.Bson; -using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Models.Integrations.Github; -using UKSF.Api.Models.Modpack; - -namespace UKSF.Api.AppStart { - public static class TestDataSetup { - public static void Run(IServiceProvider serviceProvider) { - IReleaseService releaseService = serviceProvider.GetService(); - releaseService.Data.Add( - new ModpackRelease { - id = ObjectId.GenerateNewId().ToString(), - timestamp = DateTime.Now.AddDays(-15), - version = "5.17.16", - description = - "Added captive escort animations and different radio backpacks, fixed backpack-on-chest errors, and arsenal adding extra mag error." + - "\nUpdated ACRE, Lambs, and ZEN.", - changelog = "#### Added" + - "\n- Captive escort animations, used base mod animations and custom implementation [(#683)](https://github.com/uksf/modpack/issues/683)" + - "\n
_Note: there is no proper escort animation when unarmed_" + - "\n- Dynamic patrol area zone module [(#684)](https://github.com/uksf/modpack/issues/684)" + - "\n
_See [Dynamic Patrols](https://github.com/uksf/modpack/wiki/Missions:-Dynamic-Patrols)_" + - "\n- Radio backpacks [(#687)](https://github.com/uksf/modpack/issues/687)" + - "\n\n#### Changed" + - "\n- Default radio channels for Apache and other aircraft" + - "\n- Resupply crates to have coded name abbreviations (e.g (AM) = Ammo Mixed)" + - "\n- Use proper F-35 classname for rack init" + - "\n\n#### Fixed" + - "\n- Apache rotor hitbox, removed some hitpoints [(#685)](https://github.com/uksf/modpack/issues/685)" + - "\n- Arsenal adding extra mag when no 3CB weapon swap available [(#679)](https://github.com/uksf/modpack/issues/679)" + - "\n- Backpack-on-chest causing weapons and backpacks to be deleted [(#688)](https://github.com/uksf/modpack/issues/688)" + - "\n- Drone init not running for correct classname" + - "\n- Husky vanilla logistics values (removed them) [(#681)](https://github.com/uksf/modpack/issues/681)" + - "\n\n#### Updated" + - "\n- ACRE to [2.7.4.1027 + Dev](https://github.com/uksf/modpack/issues/691)" + - "\n- Lambs to [2.4.4](https://github.com/uksf/modpack/issues/690)" + - "\n- ZEN to [1.8.0](https://github.com/uksf/modpack/issues/689)" + - "\n\n[Report and track issues here](https://github.com/uksf/modpack/issues)\n" - } - ); - releaseService.Data.Add( - new ModpackRelease { - id = ObjectId.GenerateNewId().ToString(), - timestamp = DateTime.Now.AddDays(-9), - version = "5.17.17", - description = - "Added captive escort animations and different radio backpacks, fixed backpack-on-chest errors, and arsenal adding extra mag error." + - "\nUpdated ACRE, Lambs, and ZEN.", - changelog = "#### Added" + - "\n- Captive escort animations, used base mod animations and custom implementation [(#683)](https://github.com/uksf/modpack/issues/683)" + - "\n
_Note: there is no proper escort animation when unarmed_" + - "\n- Dynamic patrol area zone module [(#684)](https://github.com/uksf/modpack/issues/684)" + - "\n
_See [Dynamic Patrols](https://github.com/uksf/modpack/wiki/Missions:-Dynamic-Patrols)_" + - "\n- Radio backpacks [(#687)](https://github.com/uksf/modpack/issues/687)" + - "\n\n#### Changed" + - "\n- Default radio channels for Apache and other aircraft" + - "\n- Resupply crates to have coded name abbreviations (e.g (AM) = Ammo Mixed)" + - "\n- Use proper F-35 classname for rack init" + - "\n\n#### Fixed" + - "\n- Apache rotor hitbox, removed some hitpoints [(#685)](https://github.com/uksf/modpack/issues/685)" + - "\n- Arsenal adding extra mag when no 3CB weapon swap available [(#679)](https://github.com/uksf/modpack/issues/679)" + - "\n- Backpack-on-chest causing weapons and backpacks to be deleted [(#688)](https://github.com/uksf/modpack/issues/688)" + - "\n- Drone init not running for correct classname" + - "\n- Husky vanilla logistics values (removed them) [(#681)](https://github.com/uksf/modpack/issues/681)" + - "\n\n#### Updated" + - "\n- ACRE to [2.7.4.1027 + Dev](https://github.com/uksf/modpack/issues/691)" + - "\n- Lambs to [2.4.4](https://github.com/uksf/modpack/issues/690)" + - "\n- ZEN to [1.8.0](https://github.com/uksf/modpack/issues/689)" + - "\n\n[Report and track issues here](https://github.com/uksf/modpack/issues)\n" - } - ); - - IBuildsService buildsService = serviceProvider.GetService(); - buildsService.Data.Add( - new ModpackBuildRelease { - id = ObjectId.GenerateNewId().ToString(), - version = "5.17.16", - builds = new List { - new ModpackBuild { - timestamp = DateTime.Now.AddDays(-14), - buildNumber = 0, - pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "New version" } }, - isNewVersion = true - }, - new ModpackBuild { - timestamp = DateTime.Now.AddDays(-16).AddHours(-2), - buildNumber = 1, - pushEvent = new GithubPushEvent { - commit = new GithubCommit { message = "Changed captive escort to be local to unit" + "\n\n- Exit escort if weapon holstered (can't get anims right)" } - } - }, - new ModpackBuild { - timestamp = DateTime.Now.AddDays(-16), - buildNumber = 2, - pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "Fix missing getPos for zeus fps" } } - }, - new ModpackBuild { - timestamp = DateTime.Now.AddDays(-15).AddHours(-1), - buildNumber = 3, - pushEvent = new GithubPushEvent { - commit = new GithubCommit { - message = "Add name abbreviations to resupply crates" + - "\n\n- Add coded name abbreviations (e.g (AM) = Ammo Mixed) to resupply crates" + - "\n- Make identifying in-game easier" - } - } - }, - new ModpackBuild { - timestamp = DateTime.Now.AddDays(-15), - buildNumber = 4, - isReleaseCandidate = true, - pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "Tweak zeus player fps display" } } - } - } - } - ); - buildsService.Data.Add( - new ModpackBuildRelease { - id = ObjectId.GenerateNewId().ToString(), - version = "5.17.17", - builds = new List { - new ModpackBuild { - timestamp = DateTime.Now.AddDays(-14), - buildNumber = 0, - pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "New version" } }, - isNewVersion = true - }, - new ModpackBuild { - timestamp = DateTime.Now.AddDays(-11).AddHours(-2), - buildNumber = 1, - pushEvent = new GithubPushEvent { - commit = new GithubCommit { message = "Changed captive escort to be local to unit" + "\n\n- Exit escort if weapon holstered (can't get anims right)" } - } - }, - new ModpackBuild { - timestamp = DateTime.Now.AddDays(-11), - buildNumber = 2, - pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "Fix missing getPos for zeus fps" } } - }, - new ModpackBuild { - timestamp = DateTime.Now.AddDays(-10).AddHours(-1), - buildNumber = 3, - pushEvent = new GithubPushEvent { - commit = new GithubCommit { - message = "Add name abbreviations to resupply crates" + - "\n\n- Add coded name abbreviations (e.g (AM) = Ammo Mixed) to resupply crates" + - "\n- Make identifying in-game easier" - } - } - }, - new ModpackBuild { - timestamp = DateTime.Now.AddDays(-10), - buildNumber = 4, - pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "Tweak zeus player fps display" } } - }, - new ModpackBuild { - timestamp = DateTime.Now.AddDays(-9), - buildNumber = 5, - isReleaseCandidate = true, - pushEvent = new GithubPushEvent { - commit = new GithubCommit { - message = "Fixed drone interactions" + "\n\n- Functionality was missing from current drone" + "\n- Changed interactions to script added" - } - } - } - } - } - ); - } - } -} +// using System; +// using System.Collections.Generic; +// using Microsoft.Extensions.DependencyInjection; +// using MongoDB.Bson; +// using UKSF.Api.Interfaces.Modpack; +// using UKSF.Api.Models.Integrations.Github; +// using UKSF.Api.Models.Modpack; +// +// namespace UKSF.Api.AppStart { +// public static class TestDataSetup { +// public static void Run(IServiceProvider serviceProvider) { +// IReleaseService releaseService = serviceProvider.GetService(); +// releaseService.Data.Add( +// new ModpackRelease { +// id = ObjectId.GenerateNewId().ToString(), +// timestamp = DateTime.Now.AddDays(-15), +// version = "5.17.16", +// description = +// "Added captive escort animations and different radio backpacks, fixed backpack-on-chest errors, and arsenal adding extra mag error." + +// "\nUpdated ACRE, Lambs, and ZEN.", +// changelog = "#### Added" + +// "\n- Captive escort animations, used base mod animations and custom implementation [(#683)](https://github.com/uksf/modpack/issues/683)" + +// "\n
_Note: there is no proper escort animation when unarmed_" + +// "\n- Dynamic patrol area zone module [(#684)](https://github.com/uksf/modpack/issues/684)" + +// "\n
_See [Dynamic Patrols](https://github.com/uksf/modpack/wiki/Missions:-Dynamic-Patrols)_" + +// "\n- Radio backpacks [(#687)](https://github.com/uksf/modpack/issues/687)" + +// "\n\n#### Changed" + +// "\n- Default radio channels for Apache and other aircraft" + +// "\n- Resupply crates to have coded name abbreviations (e.g (AM) = Ammo Mixed)" + +// "\n- Use proper F-35 classname for rack init" + +// "\n\n#### Fixed" + +// "\n- Apache rotor hitbox, removed some hitpoints [(#685)](https://github.com/uksf/modpack/issues/685)" + +// "\n- Arsenal adding extra mag when no 3CB weapon swap available [(#679)](https://github.com/uksf/modpack/issues/679)" + +// "\n- Backpack-on-chest causing weapons and backpacks to be deleted [(#688)](https://github.com/uksf/modpack/issues/688)" + +// "\n- Drone init not running for correct classname" + +// "\n- Husky vanilla logistics values (removed them) [(#681)](https://github.com/uksf/modpack/issues/681)" + +// "\n\n#### Updated" + +// "\n- ACRE to [2.7.4.1027 + Dev](https://github.com/uksf/modpack/issues/691)" + +// "\n- Lambs to [2.4.4](https://github.com/uksf/modpack/issues/690)" + +// "\n- ZEN to [1.8.0](https://github.com/uksf/modpack/issues/689)" + +// "\n\n[Report and track issues here](https://github.com/uksf/modpack/issues)\n" +// } +// ); +// releaseService.Data.Add( +// new ModpackRelease { +// id = ObjectId.GenerateNewId().ToString(), +// timestamp = DateTime.Now.AddDays(-9), +// version = "5.17.17", +// description = +// "Added captive escort animations and different radio backpacks, fixed backpack-on-chest errors, and arsenal adding extra mag error." + +// "\nUpdated ACRE, Lambs, and ZEN.", +// changelog = "#### Added" + +// "\n- Captive escort animations, used base mod animations and custom implementation [(#683)](https://github.com/uksf/modpack/issues/683)" + +// "\n
_Note: there is no proper escort animation when unarmed_" + +// "\n- Dynamic patrol area zone module [(#684)](https://github.com/uksf/modpack/issues/684)" + +// "\n
_See [Dynamic Patrols](https://github.com/uksf/modpack/wiki/Missions:-Dynamic-Patrols)_" + +// "\n- Radio backpacks [(#687)](https://github.com/uksf/modpack/issues/687)" + +// "\n\n#### Changed" + +// "\n- Default radio channels for Apache and other aircraft" + +// "\n- Resupply crates to have coded name abbreviations (e.g (AM) = Ammo Mixed)" + +// "\n- Use proper F-35 classname for rack init" + +// "\n\n#### Fixed" + +// "\n- Apache rotor hitbox, removed some hitpoints [(#685)](https://github.com/uksf/modpack/issues/685)" + +// "\n- Arsenal adding extra mag when no 3CB weapon swap available [(#679)](https://github.com/uksf/modpack/issues/679)" + +// "\n- Backpack-on-chest causing weapons and backpacks to be deleted [(#688)](https://github.com/uksf/modpack/issues/688)" + +// "\n- Drone init not running for correct classname" + +// "\n- Husky vanilla logistics values (removed them) [(#681)](https://github.com/uksf/modpack/issues/681)" + +// "\n\n#### Updated" + +// "\n- ACRE to [2.7.4.1027 + Dev](https://github.com/uksf/modpack/issues/691)" + +// "\n- Lambs to [2.4.4](https://github.com/uksf/modpack/issues/690)" + +// "\n- ZEN to [1.8.0](https://github.com/uksf/modpack/issues/689)" + +// "\n\n[Report and track issues here](https://github.com/uksf/modpack/issues)\n" +// } +// ); +// +// IBuildsService buildsService = serviceProvider.GetService(); +// buildsService.Data.Add( +// new ModpackBuildRelease { +// id = ObjectId.GenerateNewId().ToString(), +// version = "5.17.16", +// builds = new List { +// new ModpackBuild { +// timestamp = DateTime.Now.AddDays(-14), +// buildNumber = 0, +// pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "New version" } }, +// isNewVersion = true +// }, +// new ModpackBuild { +// timestamp = DateTime.Now.AddDays(-16).AddHours(-2), +// buildNumber = 1, +// pushEvent = new GithubPushEvent { +// commit = new GithubCommit { message = "Changed captive escort to be local to unit" + "\n\n- Exit escort if weapon holstered (can't get anims right)" } +// } +// }, +// new ModpackBuild { +// timestamp = DateTime.Now.AddDays(-16), +// buildNumber = 2, +// pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "Fix missing getPos for zeus fps" } } +// }, +// new ModpackBuild { +// timestamp = DateTime.Now.AddDays(-15).AddHours(-1), +// buildNumber = 3, +// pushEvent = new GithubPushEvent { +// commit = new GithubCommit { +// message = "Add name abbreviations to resupply crates" + +// "\n\n- Add coded name abbreviations (e.g (AM) = Ammo Mixed) to resupply crates" + +// "\n- Make identifying in-game easier" +// } +// } +// }, +// new ModpackBuild { +// timestamp = DateTime.Now.AddDays(-15), +// buildNumber = 4, +// isReleaseCandidate = true, +// pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "Tweak zeus player fps display" } } +// } +// } +// } +// ); +// buildsService.Data.Add( +// new ModpackBuildRelease { +// id = ObjectId.GenerateNewId().ToString(), +// version = "5.17.17", +// builds = new List { +// new ModpackBuild { +// timestamp = DateTime.Now.AddDays(-14), +// buildNumber = 0, +// pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "New version" } }, +// isNewVersion = true +// }, +// new ModpackBuild { +// timestamp = DateTime.Now.AddDays(-11).AddHours(-2), +// buildNumber = 1, +// pushEvent = new GithubPushEvent { +// commit = new GithubCommit { message = "Changed captive escort to be local to unit" + "\n\n- Exit escort if weapon holstered (can't get anims right)" } +// } +// }, +// new ModpackBuild { +// timestamp = DateTime.Now.AddDays(-11), +// buildNumber = 2, +// pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "Fix missing getPos for zeus fps" } } +// }, +// new ModpackBuild { +// timestamp = DateTime.Now.AddDays(-10).AddHours(-1), +// buildNumber = 3, +// pushEvent = new GithubPushEvent { +// commit = new GithubCommit { +// message = "Add name abbreviations to resupply crates" + +// "\n\n- Add coded name abbreviations (e.g (AM) = Ammo Mixed) to resupply crates" + +// "\n- Make identifying in-game easier" +// } +// } +// }, +// new ModpackBuild { +// timestamp = DateTime.Now.AddDays(-10), +// buildNumber = 4, +// pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "Tweak zeus player fps display" } } +// }, +// new ModpackBuild { +// timestamp = DateTime.Now.AddDays(-9), +// buildNumber = 5, +// pushEvent = new GithubPushEvent { +// commit = new GithubCommit { +// message = "Fixed drone interactions" + "\n\n- Functionality was missing from current drone" + "\n- Changed interactions to script added" +// } +// } +// } +// } +// } +// ); +// } +// } +// } diff --git a/UKSF.Api/Controllers/DocsController.cs b/UKSF.Api/Controllers/DocsController.cs index 861ece11..92d34c99 100644 --- a/UKSF.Api/Controllers/DocsController.cs +++ b/UKSF.Api/Controllers/DocsController.cs @@ -41,7 +41,8 @@ public IActionResult Get(string id) { if (!System.IO.File.Exists(filePath)) return Ok(new {doc = $"'{filePath}' does not exist"}); try { using StreamReader streamReader = new StreamReader(System.IO.File.Open(filePath, FileMode.Open, FileAccess.Read, FileShare.Read)); - return Ok(new {doc = Markdown.ToHtml(streamReader.ReadToEnd())}); + // return Ok(new {doc = Markdown.ToHtml(streamReader.ReadToEnd())}); + return Ok(); } catch (Exception) { return Ok(new {doc = $"Could not read file '{filePath}'"}); } diff --git a/UKSF.Api/Controllers/Integrations/GithubController.cs b/UKSF.Api/Controllers/Integrations/GithubController.cs index ca86bda3..ebbf1e9c 100644 --- a/UKSF.Api/Controllers/Integrations/GithubController.cs +++ b/UKSF.Api/Controllers/Integrations/GithubController.cs @@ -1,33 +1,46 @@ -using System; +using System.Collections.Generic; +using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using Octokit; +using Octokit.Internal; using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Models.Integrations.Github; +using UKSF.Api.Models.Modpack; namespace UKSF.Api.Controllers.Integrations { [Route("[controller]")] public class GithubController : Controller { - private readonly IGithubService githubService; + private const string PUSH_EVENT = "push"; + private const string REPO_NAME = "BuildTest"; //"modpack"; + private const string MASTER = "refs/heads/master"; + private const string DEV = "refs/heads/dev"; + private const string RELEASE = "refs/heads/release"; private readonly IBuildsService buildsService; - // move to app setting - private const string MASTER = "refs/head/master"; - private const string DEV = "refs/head/dev"; - private const string RELEASE = "refs/head/release"; - private const string PUSH_EVENT = "push"; - private const string REPO_NAME = "uksf/modpack"; + private readonly IGithubService githubService; + private readonly IReleaseService releaseService; + private readonly IBuildQueueService buildQueueService; - public GithubController(IGithubService githubService, IBuildsService buildsService) { + public GithubController(IGithubService githubService, IBuildsService buildsService, IReleaseService releaseService, IBuildQueueService buildQueueService) { this.githubService = githubService; this.buildsService = buildsService; + this.releaseService = releaseService; + this.buildQueueService = buildQueueService; } [HttpPost] - public IActionResult GithubWebhook([FromHeader(Name = "x-hub-signature")] string githubSignature, [FromHeader(Name = "x-github-event")] string githubEvent, [FromBody] JObject body) { - GithubPushEvent githubPushEvent = JsonConvert.DeserializeObject(body.ToString()); - if (githubPushEvent.repository.name != REPO_NAME || githubEvent != PUSH_EVENT) { + public async Task GithubWebhook( + [FromHeader(Name = "x-hub-signature")] string githubSignature, + [FromHeader(Name = "x-github-event")] string githubEvent, + [FromBody] JObject body + ) { + PushWebhookPayload payload = new SimpleJsonSerializer().Deserialize(body.ToString()); + + if (payload.Repository.Name != REPO_NAME || githubEvent != PUSH_EVENT) { return Ok(); } @@ -35,16 +48,30 @@ public IActionResult GithubWebhook([FromHeader(Name = "x-hub-signature")] string return Unauthorized(); } - switch (githubPushEvent.branch) { - case DEV when githubPushEvent.baseBranch == MASTER: - buildsService.CreateDevBuild(githubPushEvent); - return Ok(); - case RELEASE when githubPushEvent.baseBranch == RELEASE: - buildsService.CreateRcBuild(githubPushEvent); + switch (payload.Ref) { + case DEV when payload.BaseRef == MASTER: + string devVersion = await githubService.GetCommitVersion(payload.Ref); + ModpackBuild previousDevBuild = buildsService.GetLatestBuild(devVersion); + GithubCommit devCommit = await githubService.GetPushEvent(payload, previousDevBuild?.commit.after); + ModpackBuild devBuild = await buildsService.CreateDevBuild(devVersion, devCommit); + buildQueueService.QueueBuild(devVersion, devBuild); return Ok(); - default: + case RELEASE when payload.BaseRef == null && !payload.HeadCommit.Message.Contains("Release Candidate"): + string rcVersion = await githubService.GetCommitVersion(payload.Ref); + ModpackBuild previousRcBuild = buildsService.GetLatestBuild(rcVersion); + GithubCommit rcCommit = await githubService.GetPushEvent(payload, previousRcBuild?.commit.after); + ModpackBuild rcBuild = await buildsService.CreateRcBuild(rcVersion, rcCommit); + buildQueueService.QueueBuild(rcVersion, rcBuild); return Ok(); + default: return Ok(); } } + + [HttpGet("populatereleases")] + public async Task Release() { + List releases = await githubService.GetHistoricReleases(); + await releaseService.AddHistoricReleases(releases); + return Ok(); + } } } diff --git a/UKSF.Api/Controllers/IssueController.cs b/UKSF.Api/Controllers/IssueController.cs index e8f4cb66..32e6b9f3 100644 --- a/UKSF.Api/Controllers/IssueController.cs +++ b/UKSF.Api/Controllers/IssueController.cs @@ -25,7 +25,7 @@ public IssueController(ISessionService sessionService, IDisplayNameService displ this.sessionService = sessionService; this.displayNameService = displayNameService; this.emailService = emailService; - githubToken = configuration.GetSection("Secrets")["githubToken"]; + githubToken = configuration.GetSection("Github")["token"]; } [HttpPut, Authorize] diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs index ec3118b1..a7c025be 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -1,9 +1,13 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Octokit; +using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; using UKSF.Api.Services.Personnel; @@ -12,13 +16,15 @@ namespace UKSF.Api.Controllers.Modpack { [Route("[controller]")] public class ModpackController : Controller { private readonly IBuildsService buildsService; - private readonly IModpackService modpackService; + private readonly IGithubService githubService; + private readonly IBuildQueueService buildQueueService; private readonly IReleaseService releaseService; - public ModpackController(IReleaseService releaseService, IBuildsService buildsService, IModpackService modpackService) { + public ModpackController(IReleaseService releaseService, IBuildsService buildsService, IGithubService githubService, IBuildQueueService buildQueueService) { this.releaseService = releaseService; this.buildsService = buildsService; - this.modpackService = modpackService; + this.githubService = githubService; + this.buildQueueService = buildQueueService; } [HttpGet("releases"), Authorize, Roles(RoleDefinitions.MEMBER)] @@ -27,7 +33,7 @@ public ModpackController(IReleaseService releaseService, IBuildsService buildsSe [HttpGet("builds"), Authorize, Roles(RoleDefinitions.TESTER, RoleDefinitions.SERVERS)] public IActionResult GetBuilds() => Ok(buildsService.Data.Get()); - [HttpGet("builds/{version}/{buildNumber}")] + [HttpGet("builds/{version}/{buildNumber}"), Authorize, Roles(RoleDefinitions.TESTER, RoleDefinitions.SERVERS)] public IActionResult GetBuild(string version, int buildNumber) { ModpackBuild build = buildsService.Data.GetSingle(x => x.version == version).builds.FirstOrDefault(x => x.buildNumber == buildNumber); if (build == null) { @@ -37,20 +43,73 @@ public IActionResult GetBuild(string version, int buildNumber) { return Ok(build); } - [HttpPost("makerc/{version}")] - public IActionResult MakeRcBuild(string version) { - ModpackBuildRelease buildRelease = buildsService.Data.GetSingle(x => x.version == version); + [HttpGet("builds/cancel"), Authorize, Roles(RoleDefinitions.ADMIN)] + public IActionResult CancelBuild() { + buildQueueService.Cancel(); + return Ok(); + } + + [HttpPost("makerc/{version}"), Authorize, Roles(RoleDefinitions.ADMIN)] + public async Task MakeRcBuild(string version, [FromBody] ModpackBuild build) { + if (releaseService.GetRelease(version) != null) { + return BadRequest($"{version} has already been released"); + } + + ModpackBuild newBuild = await buildsService.CreateFirstRcBuild(version, build); + Merge mergeResult = await githubService.MergeBranch("release", "dev", $"Release Candidate {version}"); + newBuild.commit.after = mergeResult.Sha; + newBuild.commit.message = mergeResult.Commit.Message; + await buildsService.UpdateBuild(buildsService.GetBuildRelease(version).id, newBuild); + await releaseService.MakeDraftRelease(version, build); + buildQueueService.QueueBuild(version, newBuild); + + // create message on discord modpack tester channel + return Ok(); + } + + [HttpPost("rebuild/{version}"), Authorize, Roles(RoleDefinitions.ADMIN)] + public async Task Rebuild(string version, [FromBody] ModpackBuild build) { + if (build.isNewVersion || build.isRelease) { + return BadRequest("Cannot rebuild new or release version"); + } + + ModpackBuild newBuild = await buildsService.CreateRebuild(version, build); + buildQueueService.QueueBuild(version, newBuild); + return Ok(); + } + [HttpPatch("release/{version}"), Authorize, Roles(RoleDefinitions.ADMIN)] + public async Task UpdateRelease(string version, [FromBody] ModpackRelease release) { + if (!release.isDraft) { + return BadRequest($"Release {version} is not a draft"); + } + + await releaseService.UpdateDraft(release); return Ok(); } + [HttpGet("release/{version}"), Authorize, Roles(RoleDefinitions.ADMIN)] + public async Task Release(string version) { + await releaseService.PublishRelease(version); + ModpackBuild releaseBuild = await buildsService.CreateReleaseBuild(version); + buildQueueService.QueueBuild(version, releaseBuild); + await githubService.MergeBranch("dev", "release", $"Release {version}"); + await githubService.MergeBranch("master", "dev", $"Release {version}"); + + // create message on discord modpack channel + return Ok(); + } + + + + [HttpPost("testRelease")] public IActionResult TestRelease() { buildsService.Data.Add( new ModpackBuildRelease { version = "5.17.18", builds = new List { - new ModpackBuild { buildNumber = 0, isNewVersion = true, pushEvent = new GithubPushEvent { commit = new GithubCommit { message = "New version" } } } + new ModpackBuild { buildNumber = 0, isNewVersion = true, commit = new GithubCommit { message = "New version" } } } } ); @@ -65,12 +124,15 @@ public IActionResult TestBuild([FromBody] ModpackBuild build) { return Ok(); } - [HttpGet("test")] - public async Task Test() { - string version = await buildsService.GetBranchVersion("refs/head/dev"); + // [HttpGet("testrc")] + // public async Task TestRc() { + // await buildsService.CreateFirstRcBuild("5.17.17", new ModpackBuild {pushEvent = new GithubPushEvent {after = "202baae0cdceb1211497ca949c50be11ba11e855"}}); + // + // return Ok(); + // } - return Ok(); - } + [HttpGet("testdraft/{version}")] + public async Task TestDraft(string version) => Ok(await githubService.GenerateChangelog(version)); // [HttpPost("testBuildLog")] // public IActionResult TestBuildLog([FromBody] ModpackBuildStep step) { diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index f65a092f..e623062a 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -17,6 +17,7 @@ using UKSF.Api.AppStart; using UKSF.Api.AppStart.Services; using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Services; using UKSF.Api.Services.Common; using UKSF.Api.Services.Personnel; @@ -156,6 +157,9 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl } private static void OnShutdown() { + // Cancel any running builds + Global.ServiceProvider.GetService().Cancel(); + // Stop teamspeak Global.ServiceProvider.GetService().Stop(); } diff --git a/UKSF.Api/appsettings.json b/UKSF.Api/appsettings.json index 04716188..aac55d0d 100644 --- a/UKSF.Api/appsettings.json +++ b/UKSF.Api/appsettings.json @@ -4,9 +4,7 @@ "discord": "" }, "Secrets": { - "tokenKey": "", - "githubToken": "", - "githubSecret": "" + "tokenKey": "" }, "EmailSettings": { "username": "", @@ -16,5 +14,10 @@ "clientId": "", "clientSecret": "", "botToken": "" + }, + "Github": { + "token": "", + "webhookSecret": "", + "appPrivateKey": "" } } diff --git a/UKSF.Common/ChangeUtilities.cs b/UKSF.Common/ChangeUtilities.cs index 449b1c60..aaea7441 100644 --- a/UKSF.Common/ChangeUtilities.cs +++ b/UKSF.Common/ChangeUtilities.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.Linq; using System.Reflection; diff --git a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index 3714d739..dfc4fd40 100644 --- a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using FluentAssertions; using Moq; using UKSF.Api.Data.Units; diff --git a/UKSF.Tests/Unit/Services/Modpack/BuildsServiceTests.cs b/UKSF.Tests/Unit/Services/Modpack/BuildsServiceTests.cs new file mode 100644 index 00000000..6d137563 --- /dev/null +++ b/UKSF.Tests/Unit/Services/Modpack/BuildsServiceTests.cs @@ -0,0 +1,138 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using FluentAssertions; +using Moq; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Modpack.BuildProcess; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Integrations.Github; +using UKSF.Api.Models.Modpack; +using UKSF.Api.Services.Modpack; +using Xunit; + +namespace UKSF.Tests.Unit.Unit.Services.Modpack { + public class BuildsServiceTests { + private const string VERSION = "5.17.17"; + private readonly BuildsService buildsService; + private readonly Mock mockBuildsDataService; + private readonly Mock mockBuildStepService; + + public BuildsServiceTests() { + mockBuildsDataService = new Mock(); + mockBuildStepService = new Mock(); + buildsService = new BuildsService(mockBuildsDataService.Object, mockBuildStepService.Object); + } + + [Fact] + public async Task ShouldCreateAndAddDevBuild() { + ModpackBuildRelease subject = new ModpackBuildRelease { version = VERSION, builds = new List { new ModpackBuild { buildNumber = 0, isNewVersion = true } } }; + List data = new List { subject }; + GithubCommit commit = new GithubCommit(); + + mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => data.FirstOrDefault(x)); + mockBuildsDataService.Setup(x => x.Update(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(Task.CompletedTask) + .Callback((x1, x2, x3) => subject.builds.Add(x2)); + + ModpackBuild buildSubject = await buildsService.CreateDevBuild(VERSION, commit); + + subject.builds.Should().HaveCount(2); + buildSubject.Should().NotBeNull(); + buildSubject.buildNumber.Should().Be(1); + buildSubject.isNewVersion.Should().BeFalse(); + } + + [Fact] + public async Task ShouldCreateNewDevBuild() { + GithubCommit commit = new GithubCommit(); + ModpackBuildRelease subject = null; + + mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); + mockBuildsDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); + + ModpackBuild buildSubject = await buildsService.CreateDevBuild(VERSION, commit); + + subject.Should().NotBeNull(); + subject.version.Should().Be(VERSION); + + subject.builds.Should().HaveCount(1); + buildSubject.buildNumber.Should().Be(0); + buildSubject.isNewVersion.Should().BeTrue(); + buildSubject.commit.message.Should().Be("New version (no content changes)"); + } + + [Fact] + public async Task ShouldThrowForFirstRcBuildWhenNoBuildRelease() { + ModpackBuild build = new ModpackBuild { buildNumber = 4 }; + + mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); + + Func act = async () => await buildsService.CreateFirstRcBuild(VERSION, build); + + await act.Should().ThrowAsync(); + } + + [Fact] + public async Task ShouldCreateFirstRcBuild() { + ModpackBuild build = new ModpackBuild { buildNumber = 4 }; + ModpackBuildRelease subject = new ModpackBuildRelease { version = VERSION, builds = new List { build } }; + + mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(subject); + mockBuildsDataService.Setup(x => x.Update(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(Task.CompletedTask) + .Callback((x1, x2, x3) => subject.builds.Add(x2)); + + ModpackBuild buildSubject = await buildsService.CreateFirstRcBuild(VERSION, build); + + subject.builds.Should().HaveCount(2); + subject.builds.Where(x => x.isReleaseCandidate).Should().HaveCount(1); + buildSubject.buildNumber.Should().Be(5); + buildSubject.isReleaseCandidate.Should().BeTrue(); + } + + [Fact] + public async Task ShouldThrowForRcBuildWhenNoBuildRelease() { + GithubCommit commit = new GithubCommit(); + + mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); + + Func act = async () => await buildsService.CreateRcBuild(VERSION, commit); + + await act.Should().ThrowAsync(); + } + + [Fact] + public async Task ShouldThrowForRcBuildWhenFirstRcBuild() { + GithubCommit commit = new GithubCommit(); + ModpackBuild build = new ModpackBuild { buildNumber = 4 }; + ModpackBuildRelease subject = new ModpackBuildRelease { version = VERSION, builds = new List { build } }; + + mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(subject); + + Func act = async () => await buildsService.CreateRcBuild(VERSION, commit); + + await act.Should().ThrowAsync(); + } + + [Fact] + public async Task ShouldCreateRcBuild() { + GithubCommit commit = new GithubCommit(); + ModpackBuild build = new ModpackBuild { buildNumber = 4, isReleaseCandidate = true}; + ModpackBuildRelease subject = new ModpackBuildRelease { version = VERSION, builds = new List { build } }; + + mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(subject); + mockBuildsDataService.Setup(x => x.Update(It.IsAny(), It.IsAny(), It.IsAny())) + .Returns(Task.CompletedTask) + .Callback((x1, x2, x3) => subject.builds.Add(x2)); + + ModpackBuild buildSubject = await buildsService.CreateRcBuild(VERSION, commit); + + subject.builds.Should().HaveCount(2); + subject.builds.Where(x => x.isReleaseCandidate).Should().HaveCount(2); + buildSubject.buildNumber.Should().Be(5); + buildSubject.isReleaseCandidate.Should().BeTrue(); + } + } +} diff --git a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs index b78baa81..7c8ab503 100644 --- a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Security.Claims; -using System.Security.Principal; using FluentAssertions; using Microsoft.AspNetCore.Http; using Moq; From 3caffa1950961546b811d9da0ed7e4cc7600a6a2 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 7 Jul 2020 23:55:42 +0100 Subject: [PATCH 184/369] Reworked builds to split into dev and release candidate builds - Flow more traditional with any pushes to dev triggering independent dev build - Pushes to release create release candidate builds --- UKSF.Api.Data/CachedDataService.cs | 4 +- UKSF.Api.Data/Modpack/BuildsDataService.cs | 98 +------ .../Handlers/BuildsEventHandler.cs | 38 +-- .../Data/Cached/IBuildsDataService.cs | 8 +- UKSF.Api.Interfaces/Hubs/IModpackClient.cs | 4 +- .../Integrations/Github/IGithubService.cs | 2 +- .../BuildProcess/IBuildProcessorService.cs | 2 +- .../BuildProcess/IBuildQueueService.cs | 5 +- .../Modpack/BuildProcess/IBuildStepService.cs | 1 - UKSF.Api.Interfaces/Modpack/IBuildsService.cs | 27 +- .../Modpack/IReleaseService.cs | 5 +- .../Integrations/Github/GithubCommit.cs | 1 + UKSF.Api.Models/Modpack/ModpackBuild.cs | 7 +- .../Modpack/ModpackBuildRelease.cs | 8 - .../Integrations/Github/GithubService.cs | 4 +- .../BuildProcess/BuildProcessorService.cs | 14 +- .../Modpack/BuildProcess/BuildQueueService.cs | 46 +-- .../Modpack/BuildProcess/BuildStepService.cs | 2 - UKSF.Api.Services/Modpack/BuildsService.cs | 153 ++++------ UKSF.Api.Services/Modpack/ReleaseService.cs | 13 +- UKSF.Api.Signalr/Hubs/Modpack/BuildsHub.cs | 12 +- .../Integrations/GithubController.cs | 22 +- .../Controllers/Modpack/ModpackController.cs | 102 ++++--- .../Personnel/DisplayNameController.cs | 14 + UKSF.Api/Startup.cs | 4 +- .../Services/Modpack/BuildsServiceTests.cs | 276 +++++++++--------- 26 files changed, 383 insertions(+), 489 deletions(-) delete mode 100644 UKSF.Api.Models/Modpack/ModpackBuildRelease.cs create mode 100644 UKSF.Api/Controllers/Personnel/DisplayNameController.cs diff --git a/UKSF.Api.Data/CachedDataService.cs b/UKSF.Api.Data/CachedDataService.cs index 1e3d2353..8baed28b 100644 --- a/UKSF.Api.Data/CachedDataService.cs +++ b/UKSF.Api.Data/CachedDataService.cs @@ -71,10 +71,10 @@ public override async Task Update(string id, UpdateDefinition update) { } public override async Task Update(Expression> filterExpression, UpdateDefinition update) { + List items = Get(filterExpression.Compile()); await base.Update(filterExpression, update); Refresh(); - List ids = Get(filterExpression.Compile()).Select(x => x.GetIdValue()).ToList(); - ids.ForEach(x => CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x))); + items.ForEach(x => CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); } public override async Task UpdateMany(Func predicate, UpdateDefinition update) { diff --git a/UKSF.Api.Data/Modpack/BuildsDataService.cs b/UKSF.Api.Data/Modpack/BuildsDataService.cs index 51375a4e..c998b131 100644 --- a/UKSF.Api.Data/Modpack/BuildsDataService.cs +++ b/UKSF.Api.Data/Modpack/BuildsDataService.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Linq.Expressions; using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.Interfaces.Data; @@ -12,99 +10,25 @@ using UKSF.Common; namespace UKSF.Api.Data.Modpack { - public class BuildsDataService : CachedDataService, IBuildsDataService { + public class BuildsDataService : CachedDataService, IBuildsDataService { public BuildsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackBuilds") { } - public override List Get() { + public override List Get() { base.Get(); - // Collection = Collection.Select( - // x => { - // int[] parts = x.version.Split('.').Select(int.Parse).ToArray(); - // return new { buildRelease = x, major = parts[0], minor = parts[1], patch = parts[2] }; - // } - // ) - // .OrderByDescending(x => x.major) - // .ThenByDescending(x => x.minor) - // .ThenByDescending(x => x.patch) - // .Select(x => x.buildRelease) - // .ToList(); - Collection.ForEach(x => x.builds = x.builds.OrderByDescending(y => y.buildNumber).ToList()); + Collection = Collection.OrderByDescending(x => x.buildNumber).ToList(); return Collection; } - public async Task Update(string id, ModpackBuild build, DataEventType updateType) { - UpdateDefinition updateDefinition; - switch (updateType) { - case DataEventType.ADD: - updateDefinition = Builders.Update.Push(x => x.builds, build); - await base.Update(id, updateDefinition); - break; - case DataEventType.UPDATE: - updateDefinition = Builders.Update.Set(x => x.builds[-1], build); - await base.Update(x => x.id == id && x.builds.Any(y => y.buildNumber == build.buildNumber), updateDefinition); - break; - case DataEventType.DELETE: return; - default: throw new ArgumentOutOfRangeException(nameof(updateType), updateType, null); - } - - Refresh(); - ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(updateType, GetSingle(id).version, build)); - } - - public async Task Update(string id, ModpackBuild build, ModpackBuildStep buildStep) { - UpdateDefinition updateDefinition = Builders.Update.Set(x => x.builds[-1].steps[buildStep.index], buildStep); - await base.Update(x => x.id == id && x.builds.Any(y => y.buildNumber == build.buildNumber), updateDefinition); + public async Task Update(ModpackBuild build, ModpackBuildStep buildStep) { + UpdateDefinition updateDefinition = Builders.Update.Set(x => x.steps[buildStep.index], buildStep); + await base.Update(x => x.id == build.id, updateDefinition); Refresh(); - ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, $"{GetSingle(id).version}.{build.buildNumber}", buildStep)); - } - - public override async Task Add(ModpackBuildRelease data) { - await base.Add(data); - ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, data.GetIdValue(), data)); + CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, buildStep)); } - public override async Task Update(string id, string fieldName, object value) { - await base.Update(id, fieldName, value); - ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + public async Task Update(ModpackBuild build, UpdateDefinition updateDefinition) { + await base.Update(build.id, updateDefinition); + CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, build)); } - - public override async Task Update(string id, UpdateDefinition update) { - await base.Update(id, update); - ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); - } - - public override async Task Update(Expression> filterExpression, UpdateDefinition update) { - await base.Update(filterExpression, update); - List ids = Get(filterExpression.Compile()).Select(x => x.GetIdValue()).ToList(); - ids.ForEach(x => ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x))); - } - - public override async Task UpdateMany(Func predicate, UpdateDefinition update) { - List items = Get(predicate); - await base.UpdateMany(predicate, update); - items.ForEach(x => ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); - } - - public override async Task Replace(ModpackBuildRelease item) { - await base.Replace(item); - ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, item.GetIdValue())); - } - - public override async Task Delete(string id) { - await base.Delete(id); - ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); - } - - public override async Task DeleteMany(Func predicate) { - List items = Get(predicate); - await base.DeleteMany(predicate); - items.ForEach(x => ModpackBuildDataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, x.GetIdValue()))); - } - - private void ModpackBuildDataEvent(DataEventModel dataEvent) { - base.CachedDataEvent(dataEvent); - } - - protected override void CachedDataEvent(DataEventModel dataEvent) { } } } diff --git a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs index 9d74de07..cdf71885 100644 --- a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs +++ b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs @@ -12,24 +12,24 @@ namespace UKSF.Api.Events.Handlers { public class BuildsEventHandler : IBuildsEventHandler { - private readonly IBuildsDataService data; + private readonly IBuildsDataService buildsData; private readonly IHubContext hub; private readonly ILoggingService loggingService; - public BuildsEventHandler(IBuildsDataService data, IHubContext hub, ILoggingService loggingService) { - this.data = data; + public BuildsEventHandler(IBuildsDataService buildsData, IHubContext hub, ILoggingService loggingService) { + this.buildsData = buildsData; this.hub = hub; this.loggingService = loggingService; } public void Init() { - data.EventBus().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + buildsData.EventBus().SubscribeAsync(HandleBuildEvent, exception => loggingService.Log(exception)); } - private async Task HandleEvent(DataEventModel x) { + private async Task HandleBuildEvent(DataEventModel x) { switch (x.type) { case DataEventType.ADD: - await AddedEvent(x.id, x.data); + await AddedEvent(x.data as ModpackBuild); break; case DataEventType.UPDATE: await UpdatedEvent(x.id, x.data); @@ -39,24 +39,26 @@ private async Task HandleEvent(DataEventModel x) { } } - private async Task AddedEvent(string version, object dataObject) { - switch (dataObject) { - case ModpackBuild build: - await hub.Clients.All.ReceiveBuild(version, build); - break; - case ModpackBuildRelease buildRelease: - await hub.Clients.All.ReceiveBuildRelease(buildRelease); - break; + private async Task AddedEvent(ModpackBuild build) { + if (build.isReleaseCandidate) { + await hub.Clients.All.ReceiveReleaseCandidateBuild(build); + } else { + await hub.Clients.All.ReceiveBuild(build); } } - private async Task UpdatedEvent(string version, object dataObject) { - switch (dataObject) { + private async Task UpdatedEvent(string id, object data) { + switch (data) { case ModpackBuild build: - await hub.Clients.All.ReceiveBuild(version, build); + if (build.isReleaseCandidate) { + await hub.Clients.All.ReceiveReleaseCandidateBuild(build); + } else { + await hub.Clients.All.ReceiveBuild(build); + } + break; case ModpackBuildStep step: - await hub.Clients.Group(version).ReceiveBuildStep(step); + await hub.Clients.Group(id).ReceiveBuildStep(step); break; } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs index 7a8e1cd1..ed612c27 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; -using UKSF.Api.Models.Events; +using MongoDB.Driver; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IBuildsDataService : IDataService, ICachedDataService { - Task Update(string id, ModpackBuild build, DataEventType updateType); - Task Update(string id, ModpackBuild build, ModpackBuildStep buildStep); + public interface IBuildsDataService : IDataService, ICachedDataService { + Task Update(ModpackBuild build, ModpackBuildStep buildStep); + Task Update(ModpackBuild build, UpdateDefinition updateDefinition); } } diff --git a/UKSF.Api.Interfaces/Hubs/IModpackClient.cs b/UKSF.Api.Interfaces/Hubs/IModpackClient.cs index 85e7c9a4..4a869b76 100644 --- a/UKSF.Api.Interfaces/Hubs/IModpackClient.cs +++ b/UKSF.Api.Interfaces/Hubs/IModpackClient.cs @@ -3,8 +3,8 @@ namespace UKSF.Api.Interfaces.Hubs { public interface IModpackClient { - Task ReceiveBuildRelease(ModpackBuildRelease buildRelease); - Task ReceiveBuild(string version, ModpackBuild build); + Task ReceiveReleaseCandidateBuild(ModpackBuild build); + Task ReceiveBuild(ModpackBuild build); Task ReceiveBuildStep(ModpackBuildStep step); } } diff --git a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs index ba5fccaa..f94e3583 100644 --- a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs +++ b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs @@ -9,7 +9,7 @@ public interface IGithubService { bool VerifySignature(string signature, string body); Task GetCommitVersion(string branch); Task MergeBranch(string branch, string sourceBranch, string version); - Task GetPushEvent(PushWebhookPayload payload, string latestCommit); + Task GetPushEvent(PushWebhookPayload payload, string latestCommit = ""); Task GenerateChangelog(string version); Task> GetHistoricReleases(); Task PublishRelease(ModpackRelease release); diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildProcessorService.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildProcessorService.cs index 2545b412..f0dcbbdf 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildProcessorService.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildProcessorService.cs @@ -4,6 +4,6 @@ namespace UKSF.Api.Interfaces.Modpack.BuildProcess { public interface IBuildProcessorService { - Task ProcessBuild(string id, ModpackBuild build, CancellationTokenSource cancellationTokenSource); + Task ProcessBuild(ModpackBuild build, CancellationTokenSource cancellationTokenSource); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs index 9e423f58..fdbcb484 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs @@ -2,7 +2,8 @@ namespace UKSF.Api.Interfaces.Modpack.BuildProcess { public interface IBuildQueueService { - void QueueBuild(string version, ModpackBuild build); - void Cancel(); + void QueueBuild(ModpackBuild build); + void Cancel(string id); + void CancelAll(); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs index 55a890c3..595c26cf 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs @@ -4,7 +4,6 @@ namespace UKSF.Api.Interfaces.Modpack.BuildProcess { public interface IBuildStepService { - List GetStepsForNewVersion(); List GetStepsForRc(); List GetStepsForRelease(); List GetStepsForBuild(); diff --git a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs index 44615354..1750403b 100644 --- a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs +++ b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs @@ -1,24 +1,23 @@ -using System.Threading.Tasks; +using System.Collections.Generic; +using System.Threading.Tasks; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Interfaces.Modpack { public interface IBuildsService : IDataBackedService { - ModpackBuildRelease GetBuildRelease(string version); - ModpackBuild GetLatestBuild(string version); - Task InsertBuild(string id, ModpackBuild build); - Task UpdateBuild(string id, ModpackBuild build); - Task UpdateBuildStep(string id, ModpackBuild build, ModpackBuildStep buildStep); - Task CreateDevBuild(string version, GithubCommit commit); - Task CreateFirstRcBuild(string version, ModpackBuild build); + List GetDevBuilds(); + List GetRcBuilds(); + ModpackBuild GetLatestDevBuild(); + ModpackBuild GetLatestRcBuild(string version); + Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep); + Task CreateDevBuild(GithubCommit commit); Task CreateRcBuild(string version, GithubCommit commit); Task CreateReleaseBuild(string version); - Task SetBuildRunning(string id, ModpackBuild build); - Task SucceedBuild(string id, ModpackBuild build); - Task FailBuild(string id, ModpackBuild build); - Task CancelBuild(string id, ModpackBuild build); - Task ResetBuild(string version, ModpackBuild build); - Task CreateRebuild(string version, ModpackBuild build); + Task SetBuildRunning(ModpackBuild build); + Task SucceedBuild(ModpackBuild build); + Task FailBuild(ModpackBuild build); + Task CancelBuild(ModpackBuild build); + Task CreateRebuild(ModpackBuild build); } } diff --git a/UKSF.Api.Interfaces/Modpack/IReleaseService.cs b/UKSF.Api.Interfaces/Modpack/IReleaseService.cs index 1f06c2a0..eca748a1 100644 --- a/UKSF.Api.Interfaces/Modpack/IReleaseService.cs +++ b/UKSF.Api.Interfaces/Modpack/IReleaseService.cs @@ -1,14 +1,15 @@ using System.Collections.Generic; using System.Threading.Tasks; using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Interfaces.Modpack { public interface IReleaseService : IDataBackedService { - Task MakeDraftRelease(string version, ModpackBuild build); + Task MakeDraftRelease(string version, GithubCommit commit); Task UpdateDraft(ModpackRelease release); Task PublishRelease(string version); ModpackRelease GetRelease(string version); - Task AddHistoricReleases(List releases); + Task AddHistoricReleases(IEnumerable releases); } } diff --git a/UKSF.Api.Models/Integrations/Github/GithubCommit.cs b/UKSF.Api.Models/Integrations/Github/GithubCommit.cs index 2f01d1c1..91c35b19 100644 --- a/UKSF.Api.Models/Integrations/Github/GithubCommit.cs +++ b/UKSF.Api.Models/Integrations/Github/GithubCommit.cs @@ -5,5 +5,6 @@ public class GithubCommit { public string before; public string branch; public string message; + public string author; } } diff --git a/UKSF.Api.Models/Modpack/ModpackBuild.cs b/UKSF.Api.Models/Modpack/ModpackBuild.cs index adb2aae7..2c00dcd3 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuild.cs +++ b/UKSF.Api.Models/Modpack/ModpackBuild.cs @@ -5,17 +5,18 @@ using UKSF.Api.Models.Integrations.Github; namespace UKSF.Api.Models.Modpack { - public class ModpackBuild { + public class ModpackBuild : DatabaseObject { [BsonRepresentation(BsonType.ObjectId)] public string builderId; public int buildNumber; public ModpackBuildResult buildResult = ModpackBuildResult.NONE; public GithubCommit commit; public bool finished; - public bool isNewVersion; public bool isRelease; public bool isReleaseCandidate; public bool running; public List steps = new List(); - public DateTime timestamp = DateTime.Now; + public DateTime startTime = DateTime.Now; + public DateTime endTime = DateTime.Now; + public string version; } } diff --git a/UKSF.Api.Models/Modpack/ModpackBuildRelease.cs b/UKSF.Api.Models/Modpack/ModpackBuildRelease.cs deleted file mode 100644 index d6064608..00000000 --- a/UKSF.Api.Models/Modpack/ModpackBuildRelease.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Collections.Generic; - -namespace UKSF.Api.Models.Modpack { - public class ModpackBuildRelease : DatabaseObject { - public string version; - public List builds = new List(); - } -} diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index a1f09ea0..be8aa9a2 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -63,7 +63,7 @@ public async Task MergeBranch(string branch, string sourceBranch, string return result; } - public async Task GetPushEvent(PushWebhookPayload payload, string latestCommit) { + public async Task GetPushEvent(PushWebhookPayload payload, string latestCommit = "") { if (string.IsNullOrEmpty(latestCommit)) { latestCommit = payload.Before; } @@ -71,7 +71,7 @@ public async Task GetPushEvent(PushWebhookPayload payload, string GitHubClient client = await AuthenticateClient(); CompareResult result = await client.Repository.Commit.Compare(REPO_ORG, REPO_NAME, latestCommit, payload.After); string message = result.Commits.Count > 0 ? CombineCommitMessages(result.Commits) : result.BaseCommit.Commit.Message; - return new GithubCommit { branch = payload.Ref, baseBranch = payload.BaseRef, before = payload.Before, after = payload.After, message = message }; + return new GithubCommit { branch = payload.Ref, baseBranch = payload.BaseRef, before = payload.Before, after = payload.After, message = message, author = payload.HeadCommit.Author.Email }; } public async Task GenerateChangelog(string version) { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs index 8ba5f1a5..7e3c45c3 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs @@ -16,17 +16,17 @@ public BuildProcessorService(IBuildStepService buildStepService, IBuildsService this.buildsService = buildsService; } - public async Task ProcessBuild(string id, ModpackBuild build, CancellationTokenSource cancellationTokenSource) { - await buildsService.SetBuildRunning(id, build); + public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cancellationTokenSource) { + await buildsService.SetBuildRunning(build); foreach (ModpackBuildStep buildStep in build.steps) { if (cancellationTokenSource.IsCancellationRequested) { - await buildsService.CancelBuild(id, build); + await buildsService.CancelBuild(build); return; }; IBuildStep step = buildStepService.ResolveBuildStep(buildStep.name); - step.Init(buildStep, async () => await buildsService.UpdateBuildStep(id, build, buildStep), cancellationTokenSource); + step.Init(buildStep, async () => await buildsService.UpdateBuildStep(build, buildStep), cancellationTokenSource); try { await step.Start(); @@ -36,16 +36,16 @@ public async Task ProcessBuild(string id, ModpackBuild build, CancellationTokenS await step.Succeed(); } catch (OperationCanceledException) { await step.Cancel(); - await buildsService.CancelBuild(id, build); + await buildsService.CancelBuild(build); return; } catch (Exception exception) { await step.Fail(exception); - await buildsService.FailBuild(id, build); + await buildsService.FailBuild(build); return; } } - await buildsService.SucceedBuild(id, build); + await buildsService.SucceedBuild(build); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs index b78814cc..190dd6d6 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs @@ -1,48 +1,50 @@ -using System; -using System.Collections.Concurrent; +using System.Collections.Concurrent; using System.Threading; using System.Threading.Tasks; -using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Services.Modpack.BuildProcess { public class BuildQueueService : IBuildQueueService { - private readonly IBuildsService buildsService; private readonly IBuildProcessorService buildProcessorService; - private readonly ConcurrentQueue queue = new ConcurrentQueue(); - private CancellationTokenSource currentCancellationTokenSource; + private readonly ConcurrentDictionary cancellationTokenSources = new ConcurrentDictionary(); + private readonly ConcurrentQueue queue = new ConcurrentQueue(); private bool processing; - public BuildQueueService(IBuildsService buildsService, IBuildProcessorService buildProcessorService) { - this.buildsService = buildsService; - this.buildProcessorService = buildProcessorService; - } - - public void QueueBuild(string version, ModpackBuild build) { - ModpackBuildRelease buildRelease = buildsService.GetBuildRelease(version); - if (buildRelease == null) { - throw new NullReferenceException($"Tried to add build to queue but could not find build release {version}"); - } + public BuildQueueService(IBuildProcessorService buildProcessorService) => this.buildProcessorService = buildProcessorService; - queue.Enqueue(new ModpackBuildQueueItem {id = buildRelease.id, build = build}); + public void QueueBuild(ModpackBuild build) { + queue.Enqueue(build); + CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(); + cancellationTokenSources.TryAdd(build.id, cancellationTokenSource); if (!processing) { // Processor not running, process as separate task Task unused = ProcessQueue(); } } - public void Cancel() { + public void Cancel(string id) { if (processing) { - currentCancellationTokenSource.Cancel(); + if (cancellationTokenSources.ContainsKey(id)) { + CancellationTokenSource cancellationTokenSource = cancellationTokenSources[id]; + cancellationTokenSource.Cancel(); + } } } + public void CancelAll() { + foreach ((string _, CancellationTokenSource cancellationTokenSource) in cancellationTokenSources) { + cancellationTokenSource.Cancel(); + } + + cancellationTokenSources.Clear(); + } + private async Task ProcessQueue() { processing = true; - while (queue.TryDequeue(out ModpackBuildQueueItem queueItem)) { - currentCancellationTokenSource = new CancellationTokenSource(); - await buildProcessorService.ProcessBuild(queueItem.id, queueItem.build, currentCancellationTokenSource); + while (queue.TryDequeue(out ModpackBuild build)) { + CancellationTokenSource cancellationTokenSource = cancellationTokenSources[build.id]; + await buildProcessorService.ProcessBuild(build, cancellationTokenSource); } processing = false; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index 20650a2f..64029afd 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -19,8 +19,6 @@ public IBuildStep ResolveBuildStep(string buildStepName) { return step; } - public List GetStepsForNewVersion() => new List { new ModpackBuildStep(0, BuildStep0Prep.NAME), new ModpackBuildStep(1, BuildStep1dSource.NAME) }; - public List GetStepsForRc() => new List { new ModpackBuildStep(0, BuildStep0Prep.NAME), new ModpackBuildStep(1, BuildStep1dSource.NAME) }; public List GetStepsForRelease() => new List { new ModpackBuildStep(0, BuildStep0Prep.NAME) }; diff --git a/UKSF.Api.Services/Modpack/BuildsService.cs b/UKSF.Api.Services/Modpack/BuildsService.cs index 49088928..6b499543 100644 --- a/UKSF.Api.Services/Modpack/BuildsService.cs +++ b/UKSF.Api.Services/Modpack/BuildsService.cs @@ -2,158 +2,103 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using MongoDB.Driver; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Api.Models.Events; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Services.Modpack { public class BuildsService : DataBackedService, IBuildsService { private readonly IBuildStepService buildStepService; + private readonly IAccountService accountService; + private readonly ISessionService sessionService; - public BuildsService(IBuildsDataService data, IBuildStepService buildStepService) : base(data) => this.buildStepService = buildStepService; - - public async Task InsertBuild(string id, ModpackBuild build) { - await Data.Update(id, build, DataEventType.ADD); - } - - public async Task UpdateBuild(string id, ModpackBuild build) { - await Data.Update(id, build, DataEventType.UPDATE); + public BuildsService(IBuildsDataService data, IBuildStepService buildStepService, IAccountService accountService, ISessionService sessionService) : base(data) { + this.buildStepService = buildStepService; + this.accountService = accountService; + this.sessionService = sessionService; } - public async Task UpdateBuildStep(string id, ModpackBuild build, ModpackBuildStep buildStep) { - await Data.Update(id, build, buildStep); + public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep) { + await Data.Update(build, buildStep); } - public ModpackBuildRelease GetBuildRelease(string version) => Data.GetSingle(x => x.version == version); - - public ModpackBuild GetLatestBuild(string version) { - ModpackBuildRelease buildRelease = GetBuildRelease(version); - if (buildRelease == null || buildRelease.builds.Count == 0) return null; + public List GetDevBuilds() => Data.Get(x => !x.isReleaseCandidate); - return buildRelease.builds[0]; - } + public List GetRcBuilds() => Data.Get(x => x.isReleaseCandidate); - public async Task CreateDevBuild(string version, GithubCommit commit) { - ModpackBuildRelease buildRelease = GetBuildRelease(version); - if (buildRelease == null) { - // New version build - ModpackBuild newBuild = new ModpackBuild { buildNumber = 0, isNewVersion = true, commit = commit, steps = buildStepService.GetStepsForNewVersion() }; - newBuild.commit.message = "New version (no content changes)"; - buildRelease = new ModpackBuildRelease { version = version, builds = new List { newBuild } }; - await Data.Add(buildRelease); - return newBuild; - } + public ModpackBuild GetLatestDevBuild() => GetDevBuilds().FirstOrDefault(); - ModpackBuild previousBuild = buildRelease.builds.First(); - if (previousBuild.isReleaseCandidate || previousBuild.isRelease) { - throw new InvalidOperationException("Cannot push dev build when RC exists"); - } + public ModpackBuild GetLatestRcBuild(string version) => GetRcBuilds().FirstOrDefault(x => x.version == version); - ModpackBuild build = new ModpackBuild { buildNumber = previousBuild.buildNumber + 1, commit = commit, steps = buildStepService.GetStepsForBuild() }; - await InsertBuild(buildRelease.id, build); + public async Task CreateDevBuild(GithubCommit commit) { + ModpackBuild previousBuild = GetLatestDevBuild(); + string builderId = accountService.Data.GetSingle(x => x.email == commit.author)?.id; + ModpackBuild build = new ModpackBuild { buildNumber = previousBuild?.buildNumber + 1 ?? 0, commit = commit, builderId = builderId, steps = buildStepService.GetStepsForBuild() }; + await Data.Add(build); return build; } - public async Task CreateFirstRcBuild(string version, ModpackBuild build) { - ModpackBuildRelease buildRelease = GetBuildRelease(version); - if (buildRelease == null) { - throw new NullReferenceException($"Cannot create first RC build for build release {version} as it does not exist"); - } - - ModpackBuild newBuild = new ModpackBuild { buildNumber = build.buildNumber + 1, isReleaseCandidate = true, commit = new GithubCommit(), steps = buildStepService.GetStepsForRc() }; - await InsertBuild(buildRelease.id, newBuild); - - return newBuild; - } - public async Task CreateRcBuild(string version, GithubCommit commit) { - ModpackBuildRelease buildRelease = GetBuildRelease(version); - if (buildRelease == null) { - throw new NullReferenceException($"CI tried to create RC build for build release {version} which does not exist"); - } - - // This can't be the first RC build - ModpackBuild previousBuild = buildRelease.builds.FirstOrDefault(x => x.isReleaseCandidate); - if (previousBuild == null) { - throw new InvalidOperationException("First RC build should not be created by CI. Something went wrong"); - } + ModpackBuild previousBuild = GetLatestRcBuild(version); + string builderId = accountService.Data.GetSingle(x => x.email == commit.author)?.id; + ModpackBuild build = new ModpackBuild { + version = version, buildNumber = previousBuild?.buildNumber + 1 ?? 0, isReleaseCandidate = true, commit = commit, builderId = builderId, steps = buildStepService.GetStepsForRc() + }; - ModpackBuild build = new ModpackBuild { buildNumber = previousBuild.buildNumber + 1, commit = commit, isReleaseCandidate = true, steps = buildStepService.GetStepsForRc() }; - await InsertBuild(buildRelease.id, build); + await Data.Add(build); return build; } public async Task CreateReleaseBuild(string version) { - ModpackBuildRelease buildRelease = GetBuildRelease(version); - if (buildRelease == null) { - throw new NullReferenceException($"Tried to release version but build release {version} does not exist"); - } - // There must be at least one RC build to release - ModpackBuild previousBuild = buildRelease.builds.FirstOrDefault(x => x.isReleaseCandidate); + ModpackBuild previousBuild = GetRcBuilds().FirstOrDefault(x => x.version == version); if (previousBuild == null) { - throw new InvalidOperationException("Release build requires a RC build"); + throw new InvalidOperationException("Release build requires at leaste one RC build"); } - ModpackBuild build = new ModpackBuild { buildNumber = previousBuild.buildNumber + 1, isRelease = true, steps = buildStepService.GetStepsForRelease(), commit = previousBuild.commit }; + ModpackBuild build = new ModpackBuild { buildNumber = previousBuild.buildNumber + 1, isRelease = true, commit = previousBuild.commit, builderId = sessionService.GetContextId(), steps = buildStepService.GetStepsForRelease() }; build.commit.message = "Release deployment (no content changes)"; - await InsertBuild(buildRelease.id, build); + await Data.Add(build); return build; } - public async Task CreateRebuild(string version, ModpackBuild build) { - ModpackBuildRelease buildRelease = GetBuildRelease(version); - if (buildRelease == null) { - throw new NullReferenceException($"Tried to rebuild {build.buildNumber} but build release {version} does not exist"); - } - - ModpackBuild rebuild = new ModpackBuild { - buildNumber = build.buildNumber + 1, - isReleaseCandidate = build.isReleaseCandidate, - steps = build.isReleaseCandidate ? buildStepService.GetStepsForRc() : buildStepService.GetStepsForBuild(), - commit = build.commit - }; - rebuild.commit.message = $"Rebuild of {build.buildNumber}"; - await InsertBuild(buildRelease.id, rebuild); + public async Task CreateRebuild(ModpackBuild build) { + ModpackBuild previousBuild = GetLatestDevBuild(); + ModpackBuild rebuild = new ModpackBuild { buildNumber = previousBuild?.buildNumber + 1 ?? 0, steps = buildStepService.GetStepsForBuild(), commit = build.commit, builderId = sessionService.GetContextId() }; + rebuild.commit.message = $"Rebuild of #{build.buildNumber}\n\n{rebuild.commit.message}"; + await Data.Add(rebuild); return rebuild; } - public async Task SetBuildRunning(string id, ModpackBuild build) { + public async Task SetBuildRunning(ModpackBuild build) { build.running = true; - await UpdateBuild(id, build); + build.startTime = DateTime.Now; + await Data.Update(build, Builders.Update.Set(x => x.running, true).Set(x => x.startTime, DateTime.Now)); } - public async Task SucceedBuild(string id, ModpackBuild build) { - build.running = false; - build.finished = true; - build.buildResult = ModpackBuildResult.SUCCESS; - await UpdateBuild(id, build); + public async Task SucceedBuild(ModpackBuild build) { + await FinishBuild(build, ModpackBuildResult.SUCCESS); } - public async Task FailBuild(string id, ModpackBuild build) { - build.running = false; - build.finished = true; - build.buildResult = ModpackBuildResult.FAILED; - await UpdateBuild(id, build); + public async Task FailBuild(ModpackBuild build) { + await FinishBuild(build, ModpackBuildResult.FAILED); } - public async Task CancelBuild(string id, ModpackBuild build) { - build.running = false; - build.finished = true; - build.buildResult = ModpackBuildResult.CANCELLED; - await UpdateBuild(id, build); + public async Task CancelBuild(ModpackBuild build) { + await FinishBuild(build, ModpackBuildResult.CANCELLED); } - public async Task ResetBuild(string version, ModpackBuild build) { - ModpackBuildRelease buildRelease = GetBuildRelease(version); + private async Task FinishBuild(ModpackBuild build, ModpackBuildResult result) { build.running = false; - build.finished = false; - build.buildResult = ModpackBuildResult.NONE; - build.steps = build.isReleaseCandidate ? buildStepService.GetStepsForRc() : buildStepService.GetStepsForBuild(); - await UpdateBuild(buildRelease.id, build); + build.finished = true; + build.buildResult = result; + build.endTime = DateTime.Now; + await Data.Update(build, Builders.Update.Set(x => x.running, false).Set(x => x.finished, true).Set(x => x.buildResult, result).Set(x => x.endTime, DateTime.Now)); } } } diff --git a/UKSF.Api.Services/Modpack/ReleaseService.cs b/UKSF.Api.Services/Modpack/ReleaseService.cs index 609acd46..ba8f1f20 100644 --- a/UKSF.Api.Services/Modpack/ReleaseService.cs +++ b/UKSF.Api.Services/Modpack/ReleaseService.cs @@ -6,26 +6,31 @@ using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Services.Modpack { public class ReleaseService : DataBackedService, IReleaseService { private readonly IGithubService githubService; private readonly ISessionService sessionService; + private readonly IAccountService accountService; - public ReleaseService(IReleasesDataService data, IGithubService githubService, ISessionService sessionService) : base(data) { + public ReleaseService(IReleasesDataService data, IGithubService githubService, ISessionService sessionService, IAccountService accountService) : base(data) { this.githubService = githubService; this.sessionService = sessionService; + this.accountService = accountService; } public ModpackRelease GetRelease(string version) { return Data.GetSingle(x => x.version == version); } - public async Task MakeDraftRelease(string version, ModpackBuild build) { + public async Task MakeDraftRelease(string version, GithubCommit commit) { string changelog = await githubService.GenerateChangelog(version); - await Data.Add(new ModpackRelease { timestamp = DateTime.Now, version = version, changelog = changelog, isDraft = true, creatorId = sessionService.GetContextId() }); + string creatorId = accountService.Data.GetSingle(x => x.email == commit.author)?.id; + await Data.Add(new ModpackRelease { timestamp = DateTime.Now, version = version, changelog = changelog, isDraft = true, creatorId = creatorId }); } public async Task UpdateDraft(ModpackRelease release) { @@ -42,7 +47,7 @@ public async Task PublishRelease(string version) { await githubService.PublishRelease(release); } - public async Task AddHistoricReleases(List releases) { + public async Task AddHistoricReleases(IEnumerable releases) { List existingReleases = Data.Get(); foreach (ModpackRelease release in releases.Where(x => existingReleases.All(y => y.version != x.version))) { await Data.Add(release); diff --git a/UKSF.Api.Signalr/Hubs/Modpack/BuildsHub.cs b/UKSF.Api.Signalr/Hubs/Modpack/BuildsHub.cs index a0c53c1d..8aa5e501 100644 --- a/UKSF.Api.Signalr/Hubs/Modpack/BuildsHub.cs +++ b/UKSF.Api.Signalr/Hubs/Modpack/BuildsHub.cs @@ -11,18 +11,18 @@ public class BuildsHub : Hub { public const string END_POINT = "builds"; public override async Task OnConnectedAsync() { - StringValues version = Context.GetHttpContext().Request.Query["version"]; - if (!string.IsNullOrEmpty(version)) { - await Groups.AddToGroupAsync(Context.ConnectionId, version); + StringValues buildId = Context.GetHttpContext().Request.Query["buildId"]; + if (!string.IsNullOrEmpty(buildId)) { + await Groups.AddToGroupAsync(Context.ConnectionId, buildId); } await base.OnConnectedAsync(); } public override async Task OnDisconnectedAsync(Exception exception) { - StringValues version = Context.GetHttpContext().Request.Query["version"]; - if (!string.IsNullOrEmpty(version)) { - await Groups.RemoveFromGroupAsync(Context.ConnectionId, version); + StringValues buildId = Context.GetHttpContext().Request.Query["buildId"]; + if (!string.IsNullOrEmpty(buildId)) { + await Groups.RemoveFromGroupAsync(Context.ConnectionId, buildId); } await base.OnDisconnectedAsync(exception); diff --git a/UKSF.Api/Controllers/Integrations/GithubController.cs b/UKSF.Api/Controllers/Integrations/GithubController.cs index ebbf1e9c..02c5a01b 100644 --- a/UKSF.Api/Controllers/Integrations/GithubController.cs +++ b/UKSF.Api/Controllers/Integrations/GithubController.cs @@ -49,19 +49,21 @@ [FromBody] JObject body } switch (payload.Ref) { - case DEV when payload.BaseRef == MASTER: - string devVersion = await githubService.GetCommitVersion(payload.Ref); - ModpackBuild previousDevBuild = buildsService.GetLatestBuild(devVersion); - GithubCommit devCommit = await githubService.GetPushEvent(payload, previousDevBuild?.commit.after); - ModpackBuild devBuild = await buildsService.CreateDevBuild(devVersion, devCommit); - buildQueueService.QueueBuild(devVersion, devBuild); + case DEV when payload.BaseRef != RELEASE: + GithubCommit devCommit = await githubService.GetPushEvent(payload); + ModpackBuild devBuild = await buildsService.CreateDevBuild(devCommit); + buildQueueService.QueueBuild(devBuild); return Ok(); - case RELEASE when payload.BaseRef == null && !payload.HeadCommit.Message.Contains("Release Candidate"): + case RELEASE: string rcVersion = await githubService.GetCommitVersion(payload.Ref); - ModpackBuild previousRcBuild = buildsService.GetLatestBuild(rcVersion); - GithubCommit rcCommit = await githubService.GetPushEvent(payload, previousRcBuild?.commit.after); + GithubCommit rcCommit = await githubService.GetPushEvent(payload); + ModpackBuild previousBuild = buildsService.GetLatestRcBuild(rcVersion); + if (previousBuild == null) { + await releaseService.MakeDraftRelease(rcVersion, rcCommit); + } + ModpackBuild rcBuild = await buildsService.CreateRcBuild(rcVersion, rcCommit); - buildQueueService.QueueBuild(rcVersion, rcBuild); + buildQueueService.QueueBuild(rcBuild); return Ok(); default: return Ok(); } diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs index a7c025be..a8a5baa7 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -11,6 +11,7 @@ using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; using UKSF.Api.Services.Personnel; +using UKSF.Common; namespace UKSF.Api.Controllers.Modpack { [Route("[controller]")] @@ -30,12 +31,15 @@ public ModpackController(IReleaseService releaseService, IBuildsService buildsSe [HttpGet("releases"), Authorize, Roles(RoleDefinitions.MEMBER)] public IActionResult GetReleases() => Ok(releaseService.Data.Get()); + [HttpGet("rcs"), Authorize, Roles(RoleDefinitions.TESTER, RoleDefinitions.SERVERS)] + public IActionResult GetReleaseCandidates() => Ok(buildsService.GetRcBuilds()); + [HttpGet("builds"), Authorize, Roles(RoleDefinitions.TESTER, RoleDefinitions.SERVERS)] - public IActionResult GetBuilds() => Ok(buildsService.Data.Get()); + public IActionResult GetBuilds() => Ok(buildsService.GetDevBuilds()); - [HttpGet("builds/{version}/{buildNumber}"), Authorize, Roles(RoleDefinitions.TESTER, RoleDefinitions.SERVERS)] - public IActionResult GetBuild(string version, int buildNumber) { - ModpackBuild build = buildsService.Data.GetSingle(x => x.version == version).builds.FirstOrDefault(x => x.buildNumber == buildNumber); + [HttpGet("builds/{id}"), Authorize, Roles(RoleDefinitions.TESTER, RoleDefinitions.SERVERS)] + public IActionResult GetBuild(string id) { + ModpackBuild build = buildsService.Data.GetSingle(x => x.id == id); if (build == null) { return BadRequest("Build does not exist"); } @@ -43,38 +47,26 @@ public IActionResult GetBuild(string version, int buildNumber) { return Ok(build); } - [HttpGet("builds/cancel"), Authorize, Roles(RoleDefinitions.ADMIN)] - public IActionResult CancelBuild() { - buildQueueService.Cancel(); - return Ok(); - } - - [HttpPost("makerc/{version}"), Authorize, Roles(RoleDefinitions.ADMIN)] - public async Task MakeRcBuild(string version, [FromBody] ModpackBuild build) { - if (releaseService.GetRelease(version) != null) { - return BadRequest($"{version} has already been released"); + [HttpGet("builds/{id}/rebuild"), Authorize, Roles(RoleDefinitions.ADMIN)] + public async Task Rebuild(string id) { + ModpackBuild build = buildsService.Data.GetSingle(x => x.id == id); + if (build == null) { + return BadRequest("Build does not exist"); } - ModpackBuild newBuild = await buildsService.CreateFirstRcBuild(version, build); - Merge mergeResult = await githubService.MergeBranch("release", "dev", $"Release Candidate {version}"); - newBuild.commit.after = mergeResult.Sha; - newBuild.commit.message = mergeResult.Commit.Message; - await buildsService.UpdateBuild(buildsService.GetBuildRelease(version).id, newBuild); - await releaseService.MakeDraftRelease(version, build); - buildQueueService.QueueBuild(version, newBuild); - - // create message on discord modpack tester channel + ModpackBuild rebuild = await buildsService.CreateRebuild(build); + buildQueueService.QueueBuild(rebuild); return Ok(); } - [HttpPost("rebuild/{version}"), Authorize, Roles(RoleDefinitions.ADMIN)] - public async Task Rebuild(string version, [FromBody] ModpackBuild build) { - if (build.isNewVersion || build.isRelease) { - return BadRequest("Cannot rebuild new or release version"); + [HttpGet("builds/{id}/cancel"), Authorize, Roles(RoleDefinitions.ADMIN)] + public IActionResult CancelBuild(string id) { + ModpackBuild build = buildsService.Data.GetSingle(x => x.id == id); + if (build == null) { + return BadRequest("Build does not exist"); } - ModpackBuild newBuild = await buildsService.CreateRebuild(version, build); - buildQueueService.QueueBuild(version, newBuild); + buildQueueService.Cancel(id); return Ok(); } @@ -92,7 +84,7 @@ public async Task UpdateRelease(string version, [FromBody] Modpac public async Task Release(string version) { await releaseService.PublishRelease(version); ModpackBuild releaseBuild = await buildsService.CreateReleaseBuild(version); - buildQueueService.QueueBuild(version, releaseBuild); + buildQueueService.QueueBuild(releaseBuild); await githubService.MergeBranch("dev", "release", $"Release {version}"); await githubService.MergeBranch("master", "dev", $"Release {version}"); @@ -101,26 +93,42 @@ public async Task Release(string version) { } + // [HttpPost("makerc/{version}"), Authorize, Roles(RoleDefinitions.ADMIN)] + // public async Task MakeRcBuild(string version, [FromBody] ModpackBuild build) { + // if (releaseService.GetRelease(version) != null) { + // return BadRequest($"{version} has already been released"); + // } + // + // ModpackBuild newBuild = await buildsService.CreateFirstRcBuild(version, build); + // Merge mergeResult = await githubService.MergeBranch("release", "dev", $"Release Candidate {version}"); + // newBuild.commit.after = mergeResult.Sha; + // newBuild.commit.message = mergeResult.Commit.Message; + // await buildsService.UpdateBuild(buildsService.GetBuildRelease(version).id, newBuild); + // await releaseService.MakeDraftRelease(version, build); + // buildQueueService.QueueBuild(version, newBuild); + // + // // create message on discord modpack tester channel + // return Ok(); + // } - [HttpPost("testRelease")] - public IActionResult TestRelease() { - buildsService.Data.Add( - new ModpackBuildRelease { - version = "5.17.18", - builds = new List { - new ModpackBuild { buildNumber = 0, isNewVersion = true, commit = new GithubCommit { message = "New version" } } - } - } - ); - return Ok(); - } + // [HttpPost("testRelease")] + // public IActionResult TestRelease() { + // buildsService.Data.Add( + // new ModpackReleaseCandidate { + // version = "5.17.18", + // builds = new List { + // new ModpackBuild { buildNumber = 0, isNewVersion = true, commit = new GithubCommit { message = "New version" } } + // } + // } + // ); + // return Ok(); + // } + // [HttpPost("testBuild")] public IActionResult TestBuild([FromBody] ModpackBuild build) { - ModpackBuildRelease buildRelease = buildsService.Data.GetSingle(x => x.version == "5.17.18"); - build.buildNumber = buildRelease.builds.First().buildNumber + 1; - buildsService.InsertBuild(buildRelease.id, build); + buildsService.Data.Add(build); return Ok(); } @@ -131,8 +139,8 @@ public IActionResult TestBuild([FromBody] ModpackBuild build) { // return Ok(); // } - [HttpGet("testdraft/{version}")] - public async Task TestDraft(string version) => Ok(await githubService.GenerateChangelog(version)); + // [HttpGet("testdraft/{version}")] + // public async Task TestDraft(string version) => Ok(await githubService.GenerateChangelog(version)); // [HttpPost("testBuildLog")] // public IActionResult TestBuildLog([FromBody] ModpackBuildStep step) { diff --git a/UKSF.Api/Controllers/Personnel/DisplayNameController.cs b/UKSF.Api/Controllers/Personnel/DisplayNameController.cs new file mode 100644 index 00000000..990bfb0b --- /dev/null +++ b/UKSF.Api/Controllers/Personnel/DisplayNameController.cs @@ -0,0 +1,14 @@ +using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Interfaces.Personnel; + +namespace UKSF.Api.Controllers.Personnel { + [Route("[controller]")] + public class DisplayNameController : Controller { + private readonly IDisplayNameService displayNameService; + + public DisplayNameController(IDisplayNameService displayNameService) => this.displayNameService = displayNameService; + + [HttpGet("{id}")] + public IActionResult GetName(string id) => Ok(new {name = displayNameService.GetDisplayName(id)}); + } +} diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index e623062a..968a11cf 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -143,9 +143,9 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl endpoints.MapHub($"/hub/{LauncherHub.END_POINT}"); endpoints.MapHub($"/hub/{BuildsHub.END_POINT}"); endpoints.MapHub($"/hub/{NotificationHub.END_POINT}"); + endpoints.MapHub($"/hub/{ServersHub.END_POINT}"); endpoints.MapHub($"/hub/{TeamspeakHub.END_POINT}").RequireHost("localhost"); endpoints.MapHub($"/hub/{TeamspeakClientsHub.END_POINT}"); - endpoints.MapHub($"/hub/{ServersHub.END_POINT}"); endpoints.MapHub($"/hub/{UtilityHub.END_POINT}"); } ); @@ -158,7 +158,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl private static void OnShutdown() { // Cancel any running builds - Global.ServiceProvider.GetService().Cancel(); + Global.ServiceProvider.GetService().CancelAll(); // Stop teamspeak Global.ServiceProvider.GetService().Stop(); diff --git a/UKSF.Tests/Unit/Services/Modpack/BuildsServiceTests.cs b/UKSF.Tests/Unit/Services/Modpack/BuildsServiceTests.cs index 6d137563..66c26b4f 100644 --- a/UKSF.Tests/Unit/Services/Modpack/BuildsServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Modpack/BuildsServiceTests.cs @@ -1,138 +1,138 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using FluentAssertions; -using Moq; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Integrations.Github; -using UKSF.Api.Models.Modpack; -using UKSF.Api.Services.Modpack; -using Xunit; - -namespace UKSF.Tests.Unit.Unit.Services.Modpack { - public class BuildsServiceTests { - private const string VERSION = "5.17.17"; - private readonly BuildsService buildsService; - private readonly Mock mockBuildsDataService; - private readonly Mock mockBuildStepService; - - public BuildsServiceTests() { - mockBuildsDataService = new Mock(); - mockBuildStepService = new Mock(); - buildsService = new BuildsService(mockBuildsDataService.Object, mockBuildStepService.Object); - } - - [Fact] - public async Task ShouldCreateAndAddDevBuild() { - ModpackBuildRelease subject = new ModpackBuildRelease { version = VERSION, builds = new List { new ModpackBuild { buildNumber = 0, isNewVersion = true } } }; - List data = new List { subject }; - GithubCommit commit = new GithubCommit(); - - mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => data.FirstOrDefault(x)); - mockBuildsDataService.Setup(x => x.Update(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(Task.CompletedTask) - .Callback((x1, x2, x3) => subject.builds.Add(x2)); - - ModpackBuild buildSubject = await buildsService.CreateDevBuild(VERSION, commit); - - subject.builds.Should().HaveCount(2); - buildSubject.Should().NotBeNull(); - buildSubject.buildNumber.Should().Be(1); - buildSubject.isNewVersion.Should().BeFalse(); - } - - [Fact] - public async Task ShouldCreateNewDevBuild() { - GithubCommit commit = new GithubCommit(); - ModpackBuildRelease subject = null; - - mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); - mockBuildsDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); - - ModpackBuild buildSubject = await buildsService.CreateDevBuild(VERSION, commit); - - subject.Should().NotBeNull(); - subject.version.Should().Be(VERSION); - - subject.builds.Should().HaveCount(1); - buildSubject.buildNumber.Should().Be(0); - buildSubject.isNewVersion.Should().BeTrue(); - buildSubject.commit.message.Should().Be("New version (no content changes)"); - } - - [Fact] - public async Task ShouldThrowForFirstRcBuildWhenNoBuildRelease() { - ModpackBuild build = new ModpackBuild { buildNumber = 4 }; - - mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); - - Func act = async () => await buildsService.CreateFirstRcBuild(VERSION, build); - - await act.Should().ThrowAsync(); - } - - [Fact] - public async Task ShouldCreateFirstRcBuild() { - ModpackBuild build = new ModpackBuild { buildNumber = 4 }; - ModpackBuildRelease subject = new ModpackBuildRelease { version = VERSION, builds = new List { build } }; - - mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(subject); - mockBuildsDataService.Setup(x => x.Update(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(Task.CompletedTask) - .Callback((x1, x2, x3) => subject.builds.Add(x2)); - - ModpackBuild buildSubject = await buildsService.CreateFirstRcBuild(VERSION, build); - - subject.builds.Should().HaveCount(2); - subject.builds.Where(x => x.isReleaseCandidate).Should().HaveCount(1); - buildSubject.buildNumber.Should().Be(5); - buildSubject.isReleaseCandidate.Should().BeTrue(); - } - - [Fact] - public async Task ShouldThrowForRcBuildWhenNoBuildRelease() { - GithubCommit commit = new GithubCommit(); - - mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); - - Func act = async () => await buildsService.CreateRcBuild(VERSION, commit); - - await act.Should().ThrowAsync(); - } - - [Fact] - public async Task ShouldThrowForRcBuildWhenFirstRcBuild() { - GithubCommit commit = new GithubCommit(); - ModpackBuild build = new ModpackBuild { buildNumber = 4 }; - ModpackBuildRelease subject = new ModpackBuildRelease { version = VERSION, builds = new List { build } }; - - mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(subject); - - Func act = async () => await buildsService.CreateRcBuild(VERSION, commit); - - await act.Should().ThrowAsync(); - } - - [Fact] - public async Task ShouldCreateRcBuild() { - GithubCommit commit = new GithubCommit(); - ModpackBuild build = new ModpackBuild { buildNumber = 4, isReleaseCandidate = true}; - ModpackBuildRelease subject = new ModpackBuildRelease { version = VERSION, builds = new List { build } }; - - mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(subject); - mockBuildsDataService.Setup(x => x.Update(It.IsAny(), It.IsAny(), It.IsAny())) - .Returns(Task.CompletedTask) - .Callback((x1, x2, x3) => subject.builds.Add(x2)); - - ModpackBuild buildSubject = await buildsService.CreateRcBuild(VERSION, commit); - - subject.builds.Should().HaveCount(2); - subject.builds.Where(x => x.isReleaseCandidate).Should().HaveCount(2); - buildSubject.buildNumber.Should().Be(5); - buildSubject.isReleaseCandidate.Should().BeTrue(); - } - } -} +// using System; +// using System.Collections.Generic; +// using System.Linq; +// using System.Threading.Tasks; +// using FluentAssertions; +// using Moq; +// using UKSF.Api.Interfaces.Data.Cached; +// using UKSF.Api.Interfaces.Modpack.BuildProcess; +// using UKSF.Api.Models.Events; +// using UKSF.Api.Models.Integrations.Github; +// using UKSF.Api.Models.Modpack; +// using UKSF.Api.Services.Modpack; +// using Xunit; +// +// namespace UKSF.Tests.Unit.Unit.Services.Modpack { +// public class BuildsServiceTests { +// private const string VERSION = "5.17.17"; +// private readonly BuildsService buildsService; +// private readonly Mock mockBuildsDataService; +// private readonly Mock mockBuildStepService; +// +// public BuildsServiceTests() { +// mockBuildsDataService = new Mock(); +// mockBuildStepService = new Mock(); +// buildsService = new BuildsService(mockBuildsDataService.Object, mockBuildStepService.Object); +// } +// +// [Fact] +// public async Task ShouldCreateAndAddDevBuild() { +// ModpackReleaseCandidate subject = new ModpackReleaseCandidate { version = VERSION, builds = new List { new ModpackBuild { buildNumber = 0, isNewVersion = true } } }; +// List data = new List { subject }; +// GithubCommit commit = new GithubCommit(); +// +// mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => data.FirstOrDefault(x)); +// mockBuildsDataService.Setup(x => x.Update(It.IsAny(), It.IsAny(), It.IsAny())) +// .Returns(Task.CompletedTask) +// .Callback((x1, x2, x3) => subject.builds.Add(x2)); +// +// ModpackBuild buildSubject = await buildsService.CreateDevBuild(VERSION, commit); +// +// subject.builds.Should().HaveCount(2); +// buildSubject.Should().NotBeNull(); +// buildSubject.buildNumber.Should().Be(1); +// buildSubject.isNewVersion.Should().BeFalse(); +// } +// +// [Fact] +// public async Task ShouldCreateNewDevBuild() { +// GithubCommit commit = new GithubCommit(); +// ModpackReleaseCandidate subject = null; +// +// mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); +// mockBuildsDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); +// +// ModpackBuild buildSubject = await buildsService.CreateDevBuild(VERSION, commit); +// +// subject.Should().NotBeNull(); +// subject.version.Should().Be(VERSION); +// +// subject.builds.Should().HaveCount(1); +// buildSubject.buildNumber.Should().Be(0); +// buildSubject.isNewVersion.Should().BeTrue(); +// buildSubject.commit.message.Should().Be("New version (no content changes)"); +// } +// +// [Fact] +// public async Task ShouldThrowForFirstRcBuildWhenNoBuildRelease() { +// ModpackBuild build = new ModpackBuild { buildNumber = 4 }; +// +// mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); +// +// Func act = async () => await buildsService.CreateFirstRcBuild(VERSION, build); +// +// await act.Should().ThrowAsync(); +// } +// +// [Fact] +// public async Task ShouldCreateFirstRcBuild() { +// ModpackBuild build = new ModpackBuild { buildNumber = 4 }; +// ModpackReleaseCandidate subject = new ModpackReleaseCandidate { version = VERSION, builds = new List { build } }; +// +// mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(subject); +// mockBuildsDataService.Setup(x => x.Update(It.IsAny(), It.IsAny(), It.IsAny())) +// .Returns(Task.CompletedTask) +// .Callback((x1, x2, x3) => subject.builds.Add(x2)); +// +// ModpackBuild buildSubject = await buildsService.CreateFirstRcBuild(VERSION, build); +// +// subject.builds.Should().HaveCount(2); +// subject.builds.Where(x => x.isReleaseCandidate).Should().HaveCount(1); +// buildSubject.buildNumber.Should().Be(5); +// buildSubject.isReleaseCandidate.Should().BeTrue(); +// } +// +// [Fact] +// public async Task ShouldThrowForRcBuildWhenNoBuildRelease() { +// GithubCommit commit = new GithubCommit(); +// +// mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); +// +// Func act = async () => await buildsService.CreateRcBuild(VERSION, commit); +// +// await act.Should().ThrowAsync(); +// } +// +// [Fact] +// public async Task ShouldThrowForRcBuildWhenFirstRcBuild() { +// GithubCommit commit = new GithubCommit(); +// ModpackBuild build = new ModpackBuild { buildNumber = 4 }; +// ModpackReleaseCandidate subject = new ModpackReleaseCandidate { version = VERSION, builds = new List { build } }; +// +// mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(subject); +// +// Func act = async () => await buildsService.CreateRcBuild(VERSION, commit); +// +// await act.Should().ThrowAsync(); +// } +// +// [Fact] +// public async Task ShouldCreateRcBuild() { +// GithubCommit commit = new GithubCommit(); +// ModpackBuild build = new ModpackBuild { buildNumber = 4, isReleaseCandidate = true}; +// ModpackReleaseCandidate subject = new ModpackReleaseCandidate { version = VERSION, builds = new List { build } }; +// +// mockBuildsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(subject); +// mockBuildsDataService.Setup(x => x.Update(It.IsAny(), It.IsAny(), It.IsAny())) +// .Returns(Task.CompletedTask) +// .Callback((x1, x2, x3) => subject.builds.Add(x2)); +// +// ModpackBuild buildSubject = await buildsService.CreateRcBuild(VERSION, commit); +// +// subject.builds.Should().HaveCount(2); +// subject.builds.Where(x => x.isReleaseCandidate).Should().HaveCount(2); +// buildSubject.buildNumber.Should().Be(5); +// buildSubject.isReleaseCandidate.Should().BeTrue(); +// } +// } +// } From 1f02d8b765b7f51e612dc1bf03090742b34c035a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 9 Jul 2020 16:43:08 +0100 Subject: [PATCH 185/369] Added new build functionality. Moved steps to own service --- .../Integrations/Github/IGithubService.cs | 5 +- .../Integrations/Github/GithubService.cs | 37 ++++++++- .../Modpack/BuildProcess/BuildStepService.cs | 10 ++- ...ildStep1dSource.cs => BuildStep1Source.cs} | 8 +- .../BuildProcess/Steps/BuildStep2Build.cs | 29 +++++++ .../Integrations/GithubController.cs | 22 ++++-- .../Controllers/Modpack/ModpackController.cs | 79 +++++-------------- 7 files changed, 110 insertions(+), 80 deletions(-) rename UKSF.Api.Services/Modpack/BuildProcess/Steps/{BuildStep1dSource.cs => BuildStep1Source.cs} (82%) create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs diff --git a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs index f94e3583..2af9cf59 100644 --- a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs +++ b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs @@ -7,11 +7,14 @@ namespace UKSF.Api.Interfaces.Integrations.Github { public interface IGithubService { bool VerifySignature(string signature, string body); - Task GetCommitVersion(string branch); + Task GetReferenceVersion(string reference); + Task IsReferenceValid(string reference); + Task GetLatestReferenceCommit(string reference); Task MergeBranch(string branch, string sourceBranch, string version); Task GetPushEvent(PushWebhookPayload payload, string latestCommit = ""); Task GenerateChangelog(string version); Task> GetHistoricReleases(); Task PublishRelease(ModpackRelease release); + Task> GetBranches(); } } diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index be8aa9a2..4c52c87b 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -43,16 +43,34 @@ public bool VerifySignature(string signature, string body) { return string.Equals(sha1, signature); } - public async Task GetCommitVersion(string branch) { - branch = branch.Split('/')[^1]; + public async Task GetReferenceVersion(string reference) { + reference = reference.Split('/')[^1]; GitHubClient client = await AuthenticateClient(); - byte[] contentBytes = await client.Repository.Content.GetRawContentByRef(REPO_ORG, REPO_NAME, VERSION_FILE, branch); + byte[] contentBytes = await client.Repository.Content.GetRawContentByRef(REPO_ORG, REPO_NAME, VERSION_FILE, reference); + if (contentBytes.Length == 0) { + return "0.0.0"; + } + string content = Encoding.UTF8.GetString(contentBytes); IEnumerable lines = content.Split("\n").Take(3); string version = string.Join('.', lines.Select(x => x.Split(' ')[^1])); return version; } + public async Task IsReferenceValid(string reference) { + string version = await GetReferenceVersion(reference); + int[] versionParts = version.Split('.').Select(int.Parse).ToArray(); + // TODO: Update minor with version with udpated make for this build system + return versionParts[0] >= 5;// && versionParts[1] > 18; + } + + public async Task GetLatestReferenceCommit(string reference) { + GitHubClient client = await AuthenticateClient(); + GitHubCommit commit = await client.Repository.Commit.Get(REPO_ORG, REPO_NAME, reference); + string branch = Regex.Match(reference, @"^[a-fA-F0-9]{40}$").Success ? "None" : reference; + return new GithubCommit { branch = branch, before = commit.Parents.FirstOrDefault()?.Sha, after = commit.Sha, message = commit.Commit.Message, author = commit.Commit.Author.Email }; + } + public async Task MergeBranch(string branch, string sourceBranch, string commitMessage) { GitHubClient client = await AuthenticateClient(); Merge result = await client.Repository.Merging.Create(REPO_ORG, REPO_NAME, new NewMerge(branch, sourceBranch) { CommitMessage = commitMessage }); @@ -124,6 +142,19 @@ await client.Repository.Release.Create( ); } + public async Task> GetBranches() { + GitHubClient client = await AuthenticateClient(); + IReadOnlyList branches = await client.Repository.Branch.GetAll(REPO_ORG, REPO_NAME); + List validBranches = new List(); + foreach (Branch branch in branches) { + if (await IsReferenceValid(branch.Name)) { + validBranches.Add(branch.Name); + } + } + + return validBranches; + } + public async Task> GetHistoricReleases() { GitHubClient client = await AuthenticateClient(); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index 64029afd..d28b881b 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -7,7 +7,9 @@ namespace UKSF.Api.Services.Modpack.BuildProcess { public class BuildStepService : IBuildStepService { - private readonly Dictionary buildStepDictionary = new Dictionary { { BuildStep0Prep.NAME, typeof(BuildStep0Prep) }, { BuildStep1dSource.NAME, typeof(BuildStep1dSource) } }; + private readonly Dictionary buildStepDictionary = new Dictionary { + { BuildStep0Prep.NAME, typeof(BuildStep0Prep) }, { BuildStep1Source.NAME, typeof(BuildStep1Source) }, { BuildStep2Build.NAME, typeof(BuildStep2Build) } + }; public IBuildStep ResolveBuildStep(string buildStepName) { if (!buildStepDictionary.ContainsKey(buildStepName)) { @@ -19,10 +21,12 @@ public IBuildStep ResolveBuildStep(string buildStepName) { return step; } - public List GetStepsForRc() => new List { new ModpackBuildStep(0, BuildStep0Prep.NAME), new ModpackBuildStep(1, BuildStep1dSource.NAME) }; + public List GetStepsForRc() => + new List { new ModpackBuildStep(0, BuildStep0Prep.NAME), new ModpackBuildStep(1, BuildStep1Source.NAME), new ModpackBuildStep(2, BuildStep2Build.NAME) }; public List GetStepsForRelease() => new List { new ModpackBuildStep(0, BuildStep0Prep.NAME) }; - public List GetStepsForBuild() => new List { new ModpackBuildStep(0, BuildStep0Prep.NAME), new ModpackBuildStep(1, BuildStep1dSource.NAME) }; + public List GetStepsForBuild() => + new List { new ModpackBuildStep(0, BuildStep0Prep.NAME), new ModpackBuildStep(1, BuildStep1Source.NAME), new ModpackBuildStep(2, BuildStep2Build.NAME) }; } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1dSource.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1Source.cs similarity index 82% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1dSource.cs rename to UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1Source.cs index 63c2b969..732d1d8c 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1dSource.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1Source.cs @@ -3,22 +3,20 @@ using UKSF.Common; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { - public class BuildStep1dSource : BuildStep { + public class BuildStep1Source : BuildStep { public const string NAME = "Pull source"; public override async Task Setup() { await base.Setup(); - await TaskUtilities.Delay(TimeSpan.FromSeconds(2), CancellationTokenSource.Token); + await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfihjugdfhjodfgh"); } public override async Task Process() { await base.Process(); - await TaskUtilities.Delay(TimeSpan.FromSeconds(3), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfi4y5hu654hhjugdfhjodfgh"); await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfi4y5hu654hhjugdfhjodfgh"); await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfihjtyfghrtytrtryfghfghfghugdfhjodfgh"); - await TaskUtilities.Delay(TimeSpan.FromSeconds(2), CancellationTokenSource.Token); await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "4665uhftfghtfghfhgfgh"); } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs new file mode 100644 index 00000000..e4e3940b --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs @@ -0,0 +1,29 @@ +using System; +using System.Threading.Tasks; +using UKSF.Common; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { + public class BuildStep2Build : BuildStep { + public const string NAME = "Build"; + + public override async Task Setup() { + await base.Setup(); + await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "y45 4y5 dgfh"); + } + + public override async Task Process() { + await base.Process(); + await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "dfghfgh"); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "h fgd"); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "456"); + } + + public override async Task Teardown() { + await base.Teardown(); + await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "hfg"); + } + } +} diff --git a/UKSF.Api/Controllers/Integrations/GithubController.cs b/UKSF.Api/Controllers/Integrations/GithubController.cs index 02c5a01b..dc810cd6 100644 --- a/UKSF.Api/Controllers/Integrations/GithubController.cs +++ b/UKSF.Api/Controllers/Integrations/GithubController.cs @@ -1,5 +1,7 @@ using System.Collections.Generic; +using System.Runtime.InteropServices.WindowsRuntime; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -10,6 +12,7 @@ using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; +using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers.Integrations { [Route("[controller]")] @@ -38,16 +41,15 @@ public async Task GithubWebhook( [FromHeader(Name = "x-github-event")] string githubEvent, [FromBody] JObject body ) { - PushWebhookPayload payload = new SimpleJsonSerializer().Deserialize(body.ToString()); + if (!githubService.VerifySignature(githubSignature, body.ToString(Formatting.None))) { + return Unauthorized(); + } + PushWebhookPayload payload = new SimpleJsonSerializer().Deserialize(body.ToString()); if (payload.Repository.Name != REPO_NAME || githubEvent != PUSH_EVENT) { return Ok(); } - if (!githubService.VerifySignature(githubSignature, body.ToString(Formatting.None))) { - return Unauthorized(); - } - switch (payload.Ref) { case DEV when payload.BaseRef != RELEASE: GithubCommit devCommit = await githubService.GetPushEvent(payload); @@ -55,7 +57,7 @@ [FromBody] JObject body buildQueueService.QueueBuild(devBuild); return Ok(); case RELEASE: - string rcVersion = await githubService.GetCommitVersion(payload.Ref); + string rcVersion = await githubService.GetReferenceVersion(payload.Ref); GithubCommit rcCommit = await githubService.GetPushEvent(payload); ModpackBuild previousBuild = buildsService.GetLatestRcBuild(rcVersion); if (previousBuild == null) { @@ -69,7 +71,13 @@ [FromBody] JObject body } } - [HttpGet("populatereleases")] + [HttpGet("branches"), Authorize, Roles(RoleDefinitions.TESTER)] + public async Task GetBranches() { + List branches = await githubService.GetBranches(); + return Ok(branches); + } + + [HttpGet("populatereleases"), Authorize, Roles(RoleDefinitions.ADMIN)] public async Task Release() { List releases = await githubService.GetHistoricReleases(); await releaseService.AddHistoricReleases(releases); diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs index a8a5baa7..e9b8d797 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -1,31 +1,29 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Octokit; using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Modpack.BuildProcess; +using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; using UKSF.Api.Services.Personnel; -using UKSF.Common; namespace UKSF.Api.Controllers.Modpack { [Route("[controller]")] public class ModpackController : Controller { + private readonly IBuildQueueService buildQueueService; private readonly IBuildsService buildsService; private readonly IGithubService githubService; - private readonly IBuildQueueService buildQueueService; private readonly IReleaseService releaseService; + private readonly ISessionService sessionService; - public ModpackController(IReleaseService releaseService, IBuildsService buildsService, IGithubService githubService, IBuildQueueService buildQueueService) { + public ModpackController(IReleaseService releaseService, IBuildsService buildsService, IGithubService githubService, IBuildQueueService buildQueueService, ISessionService sessionService) { this.releaseService = releaseService; this.buildsService = buildsService; this.githubService = githubService; this.buildQueueService = buildQueueService; + this.sessionService = sessionService; } [HttpGet("releases"), Authorize, Roles(RoleDefinitions.MEMBER)] @@ -92,61 +90,20 @@ public async Task Release(string version) { return Ok(); } + [HttpGet("newbuild/{reference}"), Authorize, Roles(RoleDefinitions.TESTER)] + public async Task NewBuild(string reference) { + if (!await githubService.IsReferenceValid(reference)) { + return BadRequest($"{reference} cannot be built as its version does not have the required make files"); + } + + GithubCommit commit = await githubService.GetLatestReferenceCommit(reference); + if (!string.IsNullOrEmpty(sessionService.GetContextId())) { + commit.author = sessionService.GetContextEmail(); + } - // [HttpPost("makerc/{version}"), Authorize, Roles(RoleDefinitions.ADMIN)] - // public async Task MakeRcBuild(string version, [FromBody] ModpackBuild build) { - // if (releaseService.GetRelease(version) != null) { - // return BadRequest($"{version} has already been released"); - // } - // - // ModpackBuild newBuild = await buildsService.CreateFirstRcBuild(version, build); - // Merge mergeResult = await githubService.MergeBranch("release", "dev", $"Release Candidate {version}"); - // newBuild.commit.after = mergeResult.Sha; - // newBuild.commit.message = mergeResult.Commit.Message; - // await buildsService.UpdateBuild(buildsService.GetBuildRelease(version).id, newBuild); - // await releaseService.MakeDraftRelease(version, build); - // buildQueueService.QueueBuild(version, newBuild); - // - // // create message on discord modpack tester channel - // return Ok(); - // } - - - - // [HttpPost("testRelease")] - // public IActionResult TestRelease() { - // buildsService.Data.Add( - // new ModpackReleaseCandidate { - // version = "5.17.18", - // builds = new List { - // new ModpackBuild { buildNumber = 0, isNewVersion = true, commit = new GithubCommit { message = "New version" } } - // } - // } - // ); - // return Ok(); - // } - // - [HttpPost("testBuild")] - public IActionResult TestBuild([FromBody] ModpackBuild build) { - buildsService.Data.Add(build); + ModpackBuild build = await buildsService.CreateDevBuild(commit); + buildQueueService.QueueBuild(build); return Ok(); } - - // [HttpGet("testrc")] - // public async Task TestRc() { - // await buildsService.CreateFirstRcBuild("5.17.17", new ModpackBuild {pushEvent = new GithubPushEvent {after = "202baae0cdceb1211497ca949c50be11ba11e855"}}); - // - // return Ok(); - // } - - // [HttpGet("testdraft/{version}")] - // public async Task TestDraft(string version) => Ok(await githubService.GenerateChangelog(version)); - - // [HttpPost("testBuildLog")] - // public IActionResult TestBuildLog([FromBody] ModpackBuildStep step) { - // ModpackBuildRelease buildRelease = buildsService.Data.GetSingle(x => x.version == "5.17.18"); - // buildsService.InsertBuild(buildRelease.id, build); - // return Ok(); - // } } } From 9c5c9e66c71110efb970d28bea13d2b82d0a15b4 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 11 Jul 2020 00:55:34 +0100 Subject: [PATCH 186/369] Order instagram images by date before checking for new ones --- UKSF.Api.Services/Integrations/InstagramService.cs | 3 ++- UKSF.Api.Services/Utility/SchedulerService.cs | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs index ee14da8c..2fb6196a 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -56,8 +56,9 @@ public async Task CacheInstagramImages() { string contentString = await response.Content.ReadAsStringAsync(); JObject contentObject = JObject.Parse(contentString); List allNewImages = JsonConvert.DeserializeObject>(contentObject["data"]?.ToString() ?? ""); + allNewImages = allNewImages.OrderByDescending(x => x.timestamp).ToList(); - if (allNewImages == null || allNewImages.Count == 0) { + if (allNewImages.Count == 0) { LogWrapper.Log($"Instagram response contains no images: {contentObject}"); return; } diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index 8a506903..bb9767a0 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -98,13 +98,10 @@ private void Schedule(ScheduledJob job) { } private async Task AddUnique() { - ScheduledJob instagramAction = Data.GetSingle(x => x.action == InstagramImagesAction.ACTION_NAME); - if (instagramAction != null) { - await Data.Delete(instagramAction.id); + if (Data.GetSingle(x => x.action == InstagramImagesAction.ACTION_NAME) == null) { + await Create(DateTime.Today, TimeSpan.FromHours(1), InstagramImagesAction.ACTION_NAME); } - await Create(DateTime.Today, TimeSpan.FromHours(1), InstagramImagesAction.ACTION_NAME); - if (!currentEnvironment.IsDevelopment()) { if (Data.GetSingle(x => x.action == InstagramTokenAction.ACTION_NAME) == null) { await Create(DateTime.Today.AddDays(45), TimeSpan.FromDays(45), InstagramTokenAction.ACTION_NAME); From e01620441e228038c9b40d9a51b354ba7f0b4c8e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 11 Jul 2020 00:58:01 +0100 Subject: [PATCH 187/369] Run insta action at startup --- UKSF.Api.Services/Utility/SchedulerService.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index bb9767a0..40a3a855 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -102,6 +102,8 @@ private async Task AddUnique() { await Create(DateTime.Today, TimeSpan.FromHours(1), InstagramImagesAction.ACTION_NAME); } + scheduledActionService.GetScheduledAction(InstagramImagesAction.ACTION_NAME).Run(); + if (!currentEnvironment.IsDevelopment()) { if (Data.GetSingle(x => x.action == InstagramTokenAction.ACTION_NAME) == null) { await Create(DateTime.Today.AddDays(45), TimeSpan.FromDays(45), InstagramTokenAction.ACTION_NAME); From c27b40e33e34ece6a2d1fb8813049cc155200e52 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 11 Jul 2020 17:27:36 +0100 Subject: [PATCH 188/369] Added mac and eliason as team medics --- UKSF.Api.Services/Game/Missions/MissionDataResolver.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs index 56af2e79..ad7ad58c 100644 --- a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs +++ b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Models.Mission; +using UKSF.Api.Services.Admin; namespace UKSF.Api.Services.Game.Missions { public static class MissionDataResolver { @@ -17,8 +18,10 @@ public static class MissionDataResolver { private static readonly string[] MEDIC_IDS = { "59e3958b594c603b78aa9dcd", // Joho + "5a2439443fccaa15902aaa4e", // Mac "5acfd72259f89d08ec1c21d8", // Stan "5e0d3273b91cc00aa001213f", // Baxter + "5eee34c8ddf6642260aa6a4b", // Eliason "5e0d31c3b91cc00aa001213b", // Gibney "5a1a14b5aacf7b00346dcc37", // Gilbert "5e24bbe949ddd04030d72ca5" // Hass From ac1703419215e408aa7c176c099c026ab8b8a8ec Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 15 Jul 2020 11:53:27 +0100 Subject: [PATCH 189/369] Few tweaks --- .../Integrations/Github/GithubService.cs | 2 +- .../Modpack/BuildProcess/Steps/BuildStep.cs | 15 ++++++++------- .../Modpack/BuildProcess/Steps/BuildStep2Build.cs | 7 ++++--- .../Controllers/Integrations/GithubController.cs | 1 + 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 4c52c87b..5d8eb539 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -138,7 +138,7 @@ public async Task PublishRelease(ModpackRelease release) { await client.Repository.Release.Create( REPO_ORG, REPO_NAME, - new NewRelease(release.version) { Name = $"Modpack Version {release.version}", Body = $"{release.description}\n\n{release.changelog}" } + new NewRelease(release.version) { Name = $"Modpack Version {release.version}", Body = $"{release.description}\n\n{release.changelog.Replace("
", "")}" } ); } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs index e2267825..5cf9c961 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs @@ -42,31 +42,32 @@ public virtual async Task Teardown() { } public async Task Succeed() { - Stop(); - buildStep.buildResult = ModpackBuildResult.SUCCESS; await Logger.LogSuccess(); + buildStep.buildResult = ModpackBuildResult.SUCCESS; + await Stop(); } public async Task Fail(Exception exception) { - Stop(); - buildStep.buildResult = ModpackBuildResult.FAILED; await Logger.LogError(exception); + buildStep.buildResult = ModpackBuildResult.FAILED; + await Stop(); } public async Task Cancel() { - Stop(); - buildStep.buildResult = ModpackBuildResult.CANCELLED; await Logger.LogCancelled(); + buildStep.buildResult = ModpackBuildResult.CANCELLED; + await Stop(); } private async Task LogCallback() { await updateCallback(); } - private void Stop() { + private async Task Stop() { buildStep.running = false; buildStep.finished = true; buildStep.endTime = DateTime.Now; + await updateCallback(); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs index e4e3940b..281d4090 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs @@ -15,9 +15,10 @@ public override async Task Setup() { public override async Task Process() { await base.Process(); await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "dfghfgh"); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "h fgd"); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "456"); + for (int i = 0; i < 100; i++) { + await TaskUtilities.Delay(TimeSpan.FromMilliseconds(50), CancellationTokenSource.Token); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", Guid.NewGuid().ToString()); + } } public override async Task Teardown() { diff --git a/UKSF.Api/Controllers/Integrations/GithubController.cs b/UKSF.Api/Controllers/Integrations/GithubController.cs index dc810cd6..e0f4af24 100644 --- a/UKSF.Api/Controllers/Integrations/GithubController.cs +++ b/UKSF.Api/Controllers/Integrations/GithubController.cs @@ -57,6 +57,7 @@ [FromBody] JObject body buildQueueService.QueueBuild(devBuild); return Ok(); case RELEASE: + // TODO: Don't make rc build if version has been released string rcVersion = await githubService.GetReferenceVersion(payload.Ref); GithubCommit rcCommit = await githubService.GetPushEvent(payload); ModpackBuild previousBuild = buildsService.GetLatestRcBuild(rcVersion); From 682bbf607a489645bceea9d44fc927810211b6a6 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 18 Jul 2020 15:16:28 +0100 Subject: [PATCH 190/369] Build notifications and build tweaks --- .../Integrations/IDiscordService.cs | 2 + .../Message/ILoggingService.cs | 2 +- .../Modpack/BuildProcess/IBuildStepService.cs | 2 +- .../Modpack/BuildProcess/Steps/IBuildStep.cs | 2 +- UKSF.Api.Models/Message/NotificationIcons.cs | 1 + UKSF.Api.Models/Modpack/ModpackBuildStep.cs | 5 +- UKSF.Api.Models/Personnel/AccountSettings.cs | 1 + UKSF.Api.Services/Admin/MigrationUtility.cs | 2 +- .../CommandRequestCompletionService.cs | 34 ++++----- UKSF.Api.Services/Fake/FakeDiscordService.cs | 4 +- .../Integrations/DiscordService.cs | 4 + .../Integrations/Github/GithubService.cs | 14 ++-- UKSF.Api.Services/Message/LogWrapper.cs | 2 +- UKSF.Api.Services/Message/LoggingService.cs | 13 +++- .../Message/NotificationsService.cs | 2 - .../BuildProcess/BuildProcessorService.cs | 2 +- .../Modpack/BuildProcess/BuildStepService.cs | 35 +++++++-- .../Modpack/BuildProcess/Steps/BuildStep.cs | 4 +- .../BuildProcess/Steps/BuildStep99Notify.cs | 73 +++++++++++++++++++ UKSF.Api.Services/Modpack/BuildsService.cs | 31 ++++++-- UKSF.Api.Services/Modpack/ModpackService.cs | 2 +- .../Accounts/AccountsController.cs | 10 +-- .../Accounts/CommunicationsController.cs | 2 +- .../Accounts/DiscordCodeController.cs | 2 +- .../Accounts/PasswordResetController.cs | 4 +- .../Accounts/SteamCodeController.cs | 2 +- .../Controllers/ApplicationsController.cs | 4 +- .../CommandRequestsController.cs | 7 +- UKSF.Api/Controllers/DischargesController.cs | 2 +- UKSF.Api/Controllers/GameServersController.cs | 18 ++--- .../Integrations/GithubController.cs | 46 ++++++++---- UKSF.Api/Controllers/LoaController.cs | 4 +- .../Controllers/Modpack/ModpackController.cs | 8 +- UKSF.Api/Controllers/RanksController.cs | 6 +- UKSF.Api/Controllers/RecruitmentController.cs | 6 +- UKSF.Api/Controllers/RolesController.cs | 6 +- UKSF.Api/Controllers/VariablesController.cs | 6 +- 37 files changed, 260 insertions(+), 110 deletions(-) create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99Notify.cs diff --git a/UKSF.Api.Interfaces/Integrations/IDiscordService.cs b/UKSF.Api.Interfaces/Integrations/IDiscordService.cs index 5089eced..a9e61c20 100644 --- a/UKSF.Api.Interfaces/Integrations/IDiscordService.cs +++ b/UKSF.Api.Interfaces/Integrations/IDiscordService.cs @@ -1,12 +1,14 @@ using System.Collections.Generic; using System.Threading.Tasks; using Discord.WebSocket; +using Microsoft.AspNetCore.Identity; using UKSF.Api.Models.Personnel; namespace UKSF.Api.Interfaces.Integrations { public interface IDiscordService { Task ConnectDiscord(); (bool online, string nickname) GetOnlineUserDetails(Account account); + Task SendMessageToEveryone(ulong channelId, string message); Task SendMessage(ulong channelId, string message); Task> GetRoles(); Task UpdateAllUsers(); diff --git a/UKSF.Api.Interfaces/Message/ILoggingService.cs b/UKSF.Api.Interfaces/Message/ILoggingService.cs index 3924dbca..34f002d5 100644 --- a/UKSF.Api.Interfaces/Message/ILoggingService.cs +++ b/UKSF.Api.Interfaces/Message/ILoggingService.cs @@ -7,6 +7,6 @@ public interface ILoggingService : IDataBackedService { void Log(string message); void Log(BasicLogMessage log); void Log(Exception exception); - void Log(string userId, string message); + void AuditLog(string message, string userId = ""); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs index 595c26cf..4c65fa50 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs @@ -4,9 +4,9 @@ namespace UKSF.Api.Interfaces.Modpack.BuildProcess { public interface IBuildStepService { + List GetStepsForBuild(); List GetStepsForRc(); List GetStepsForRelease(); - List GetStepsForBuild(); IBuildStep ResolveBuildStep(string buildStepName); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs index 6513ced8..b526a4ac 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs @@ -5,7 +5,7 @@ namespace UKSF.Api.Interfaces.Modpack.BuildProcess.Steps { public interface IBuildStep { - void Init(ModpackBuildStep modpackBuildStep, Func updateCallback, CancellationTokenSource cancellationTokenSource); + void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func updateCallback, CancellationTokenSource cancellationTokenSource); Task Start(); Task Setup(); Task Process(); diff --git a/UKSF.Api.Models/Message/NotificationIcons.cs b/UKSF.Api.Models/Message/NotificationIcons.cs index 233898e8..2f5f9d0d 100644 --- a/UKSF.Api.Models/Message/NotificationIcons.cs +++ b/UKSF.Api.Models/Message/NotificationIcons.cs @@ -1,6 +1,7 @@ namespace UKSF.Api.Models.Message { public static class NotificationIcons { public const string APPLICATION = "group_add"; + public const string BUILD = "build"; public const string COMMENT = "comment"; public const string DEMOTION = "mood_bad"; public const string PROMOTION = "stars"; diff --git a/UKSF.Api.Models/Modpack/ModpackBuildStep.cs b/UKSF.Api.Models/Modpack/ModpackBuildStep.cs index 22900f0b..221ff8b2 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuildStep.cs +++ b/UKSF.Api.Models/Modpack/ModpackBuildStep.cs @@ -13,9 +13,6 @@ public class ModpackBuildStep { public bool running; public DateTime startTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); - public ModpackBuildStep(int index, string name) { - this.index = index; - this.name = name; - } + public ModpackBuildStep(string name) => this.name = name; } } diff --git a/UKSF.Api.Models/Personnel/AccountSettings.cs b/UKSF.Api.Models/Personnel/AccountSettings.cs index 04debf9a..e3051430 100644 --- a/UKSF.Api.Models/Personnel/AccountSettings.cs +++ b/UKSF.Api.Models/Personnel/AccountSettings.cs @@ -6,6 +6,7 @@ public class AccountSettings { public bool errorEmails = false; public bool notificationsEmail = true; public bool notificationsTeamspeak = true; + public bool notificationsBuilds = false; public bool sr1Enabled = true; public T GetAttribute(string name) { diff --git a/UKSF.Api.Services/Admin/MigrationUtility.cs b/UKSF.Api.Services/Admin/MigrationUtility.cs index d85b07e8..92092e6e 100644 --- a/UKSF.Api.Services/Admin/MigrationUtility.cs +++ b/UKSF.Api.Services/Admin/MigrationUtility.cs @@ -36,7 +36,7 @@ public void Migrate() { if (!migrated) { try { ExecuteMigration(); - LogWrapper.AuditLog("SERVER", "Migration utility successfully ran"); + LogWrapper.AuditLog("Migration utility successfully ran", "SERVER"); } catch (Exception e) { LogWrapper.Log(e); } finally { diff --git a/UKSF.Api.Services/Command/CommandRequestCompletionService.cs b/UKSF.Api.Services/Command/CommandRequestCompletionService.cs index 9003e2ca..8befb2e6 100644 --- a/UKSF.Api.Services/Command/CommandRequestCompletionService.cs +++ b/UKSF.Api.Services/Command/CommandRequestCompletionService.cs @@ -94,10 +94,10 @@ private async Task Rank(CommandRequest request) { Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, rankString: request.value, reason: request.reason); notificationsService.Add(notification); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); + LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); } } @@ -105,11 +105,11 @@ private async Task Loa(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { await loaService.SetLoaState(request.value, LoaReviewState.APPROVED); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); + LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await loaService.SetLoaState(request.value, LoaReviewState.REJECTED); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); } } @@ -141,10 +141,10 @@ private async Task Discharge(CommandRequest request) { notificationsService.Add(notification); await assignmentService.UnassignAllUnits(account.id); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); + LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); } } @@ -153,10 +153,10 @@ private async Task IndividualRole(CommandRequest request) { Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, role: request.value == "None" ? AssignmentService.REMOVE_FLAG : request.value, reason: request.reason); notificationsService.Add(notification); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); + LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); } } @@ -178,10 +178,10 @@ private async Task UnitRole(CommandRequest request) { } await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request approved for {request.displayRecipient} as {request.displayValue} in {request.value} because '{request.reason}'"); + LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} as {request.displayValue} in {request.value} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request rejected for {request.displayRecipient} as {request.displayValue} in {request.value}"); + LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} as {request.displayValue} in {request.value}"); } } @@ -191,10 +191,10 @@ private async Task UnitRemoval(CommandRequest request) { await assignmentService.UnassignUnit(request.recipient, unit.id); notificationsService.Add(new Notification {owner = request.recipient, message = $"You have been removed from {unitsService.GetChainString(unit)}", icon = NotificationIcons.DEMOTION}); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} because '{request.reason}'"); + LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom}"); + LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom}"); } } @@ -204,10 +204,10 @@ private async Task Transfer(CommandRequest request) { Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, unit.name, reason: request.reason); notificationsService.Add(notification); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); + LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); } } @@ -219,12 +219,12 @@ private async Task Reinstate(CommandRequest request) { Notification notification = await assignmentService.UpdateUnitRankAndRole(dischargeCollection.accountId, "Basic Training Unit", "Trainee", "Recruit", "", "", "your membership was reinstated"); notificationsService.Add(notification); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{sessionService.GetContextId()} reinstated {dischargeCollection.name}'s membership"); + LogWrapper.AuditLog($"{sessionService.GetContextId()} reinstated {dischargeCollection.name}'s membership"); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); + LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); } } } diff --git a/UKSF.Api.Services/Fake/FakeDiscordService.cs b/UKSF.Api.Services/Fake/FakeDiscordService.cs index e98e2145..3719f257 100644 --- a/UKSF.Api.Services/Fake/FakeDiscordService.cs +++ b/UKSF.Api.Services/Fake/FakeDiscordService.cs @@ -9,7 +9,9 @@ namespace UKSF.Api.Services.Fake { public class FakeDiscordService : DiscordService { public FakeDiscordService(IConfiguration configuration, IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService) : base(configuration, ranksService, unitsService, accountService, displayNameService) { } - public override Task SendMessage(ulong channelId, string message) => Task.CompletedTask; + // public override Task SendMessageToEveryone(ulong channelId, string message) => Task.CompletedTask; + + // public override Task SendMessage(ulong channelId, string message) => Task.CompletedTask; public override Task UpdateAllUsers() => Task.CompletedTask; diff --git a/UKSF.Api.Services/Integrations/DiscordService.cs b/UKSF.Api.Services/Integrations/DiscordService.cs index a9844dd0..61de6359 100644 --- a/UKSF.Api.Services/Integrations/DiscordService.cs +++ b/UKSF.Api.Services/Integrations/DiscordService.cs @@ -61,6 +61,10 @@ public virtual async Task SendMessage(ulong channelId, string message) { await channel.SendMessageAsync(message); } + public virtual async Task SendMessageToEveryone(ulong channelId, string message) { + await SendMessage(channelId, $"{guild.EveryoneRole} - {message}"); + } + public async Task> GetRoles() { await AssertOnline(); return roles; diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 5d8eb539..aa378980 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -135,11 +135,15 @@ public async Task GenerateChangelog(string version) { public async Task PublishRelease(ModpackRelease release) { GitHubClient client = await AuthenticateClient(); - await client.Repository.Release.Create( - REPO_ORG, - REPO_NAME, - new NewRelease(release.version) { Name = $"Modpack Version {release.version}", Body = $"{release.description}\n\n{release.changelog.Replace("
", "")}" } - ); + try { + await client.Repository.Release.Create( + REPO_ORG, + REPO_NAME, + new NewRelease(release.version) { Name = $"Modpack Version {release.version}", Body = $"{release.description}\n\n{release.changelog.Replace("
", "")}" } + ); + } catch (Exception exception) { + LogWrapper.Log(exception); + } } public async Task> GetBranches() { diff --git a/UKSF.Api.Services/Message/LogWrapper.cs b/UKSF.Api.Services/Message/LogWrapper.cs index be76b26c..31b06eb7 100644 --- a/UKSF.Api.Services/Message/LogWrapper.cs +++ b/UKSF.Api.Services/Message/LogWrapper.cs @@ -12,6 +12,6 @@ public static class LogWrapper { public static void Log(Exception exception) => ServiceWrapper.Provider.GetService().Log(exception); - public static void AuditLog(string userId, string message) => ServiceWrapper.Provider.GetService().Log(userId, message); + public static void AuditLog(string message, string userId = "") => ServiceWrapper.Provider.GetService().AuditLog(message, userId); } } diff --git a/UKSF.Api.Services/Message/LoggingService.cs b/UKSF.Api.Services/Message/LoggingService.cs index 35b16933..babeda07 100644 --- a/UKSF.Api.Services/Message/LoggingService.cs +++ b/UKSF.Api.Services/Message/LoggingService.cs @@ -3,14 +3,19 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Message.Logging; using UKSF.Api.Services.Common; namespace UKSF.Api.Services.Message { public class LoggingService : DataBackedService, ILoggingService { private readonly IDisplayNameService displayNameService; + private readonly ISessionService sessionService; - public LoggingService(ILogDataService data, IDisplayNameService displayNameService) : base(data) => this.displayNameService = displayNameService; + public LoggingService(ILogDataService data, IDisplayNameService displayNameService, ISessionService sessionService) : base(data) { + this.displayNameService = displayNameService; + this.sessionService = sessionService; + } public void Log(string message) { Task unused = LogAsync(new BasicLogMessage(message)); @@ -30,7 +35,11 @@ public void Log(Exception exception) { Task unused = LogAsync(exception); } - public void Log(string userId, string message) { + public void AuditLog(string message, string userId = "") { + if (string.IsNullOrEmpty(userId)) { + userId = sessionService.GetContextId(); + } + AuditLogMessage log = new AuditLogMessage { who = userId, level = LogLevel.INFO, message = message }; Log(log); } diff --git a/UKSF.Api.Services/Message/NotificationsService.cs b/UKSF.Api.Services/Message/NotificationsService.cs index 8e68698f..1ad9579c 100644 --- a/UKSF.Api.Services/Message/NotificationsService.cs +++ b/UKSF.Api.Services/Message/NotificationsService.cs @@ -52,7 +52,6 @@ public void Add(Notification notification) { public async Task MarkNotificationsAsRead(List ids) { string contextId = sessionService.GetContextId(); - // await Data.UpdateMany(Builders.Filter.Eq(x => x.owner, contextId) & Builders.Filter.In(x => x.id, ids), Builders.Update.Set(x => x.read, true)); await Data.UpdateMany(x => x.owner == contextId && ids.Contains(x.id), Builders.Update.Set(x => x.read, true)); await notificationsHub.Clients.Group(contextId).ReceiveRead(ids); } @@ -60,7 +59,6 @@ public async Task MarkNotificationsAsRead(List ids) { public async Task Delete(List ids) { ids = ids.ToList(); string contextId = sessionService.GetContextId(); - // await Data.DeleteMany(Builders.Filter.Eq(x => x.owner, contextId) & Builders.Filter.In(x => x.id, ids)); await Data.DeleteMany(x => x.owner == contextId && ids.Contains(x.id)); await notificationsHub.Clients.Group(contextId).ReceiveClear(ids); } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs index 7e3c45c3..44aa6f12 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs @@ -26,7 +26,7 @@ public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cance }; IBuildStep step = buildStepService.ResolveBuildStep(buildStep.name); - step.Init(buildStep, async () => await buildsService.UpdateBuildStep(build, buildStep), cancellationTokenSource); + step.Init(build, buildStep, async () => await buildsService.UpdateBuildStep(build, buildStep), cancellationTokenSource); try { await step.Start(); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index d28b881b..f5aad18b 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -8,7 +8,10 @@ namespace UKSF.Api.Services.Modpack.BuildProcess { public class BuildStepService : IBuildStepService { private readonly Dictionary buildStepDictionary = new Dictionary { - { BuildStep0Prep.NAME, typeof(BuildStep0Prep) }, { BuildStep1Source.NAME, typeof(BuildStep1Source) }, { BuildStep2Build.NAME, typeof(BuildStep2Build) } + { BuildStep0Prep.NAME, typeof(BuildStep0Prep) }, + { BuildStep1Source.NAME, typeof(BuildStep1Source) }, + { BuildStep2Build.NAME, typeof(BuildStep2Build) }, + { BuildStep99Notify.NAME, typeof(BuildStep99Notify) } }; public IBuildStep ResolveBuildStep(string buildStepName) { @@ -21,12 +24,32 @@ public IBuildStep ResolveBuildStep(string buildStepName) { return step; } - public List GetStepsForRc() => - new List { new ModpackBuildStep(0, BuildStep0Prep.NAME), new ModpackBuildStep(1, BuildStep1Source.NAME), new ModpackBuildStep(2, BuildStep2Build.NAME) }; + public List GetStepsForBuild() { + List steps = new List { + new ModpackBuildStep(BuildStep0Prep.NAME), new ModpackBuildStep(BuildStep1Source.NAME), new ModpackBuildStep(BuildStep2Build.NAME), new ModpackBuildStep(BuildStep99Notify.NAME) + }; + ResolveIndices(steps); + return steps; + } + + public List GetStepsForRc() { + List steps = new List { + new ModpackBuildStep(BuildStep0Prep.NAME), new ModpackBuildStep(BuildStep1Source.NAME), new ModpackBuildStep(BuildStep2Build.NAME), new ModpackBuildStep(BuildStep99Notify.NAME) + }; + ResolveIndices(steps); + return steps; + } - public List GetStepsForRelease() => new List { new ModpackBuildStep(0, BuildStep0Prep.NAME) }; + public List GetStepsForRelease() { + List steps = new List { new ModpackBuildStep(BuildStep0Prep.NAME), new ModpackBuildStep(BuildStep99Notify.NAME) }; + ResolveIndices(steps); + return steps; + } - public List GetStepsForBuild() => - new List { new ModpackBuildStep(0, BuildStep0Prep.NAME), new ModpackBuildStep(1, BuildStep1Source.NAME), new ModpackBuildStep(2, BuildStep2Build.NAME) }; + private static void ResolveIndices(IReadOnlyList steps) { + for (int i = 0; i < steps.Count; i++) { + steps[i].index = i; + } + } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs index 5cf9c961..b9770647 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs @@ -7,12 +7,14 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class BuildStep : IBuildStep { + protected ModpackBuild Build; private ModpackBuildStep buildStep; protected CancellationTokenSource CancellationTokenSource; protected IStepLogger Logger; private Func updateCallback; - public void Init(ModpackBuildStep modpackBuildStep, Func stepUpdateCallback, CancellationTokenSource newCancellationTokenSource) { + public void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func stepUpdateCallback, CancellationTokenSource newCancellationTokenSource) { + Build = modpackBuild; buildStep = modpackBuildStep; updateCallback = stepUpdateCallback; CancellationTokenSource = newCancellationTokenSource; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99Notify.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99Notify.cs new file mode 100644 index 00000000..0d122f61 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99Notify.cs @@ -0,0 +1,73 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Interfaces.Message; +using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Modpack; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Services.Admin; +using UKSF.Api.Services.Common; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { + public class BuildStep99Notify : BuildStep { + public const string NAME = "Notify"; + private IAccountService accountService; + private IDiscordService discordService; + private INotificationsService notificationsService; + private IReleaseService releaseService; + private IUnitsService unitsService; + + public override async Task Setup() { + await base.Setup(); + unitsService = ServiceWrapper.Provider.GetService(); + accountService = ServiceWrapper.Provider.GetService(); + notificationsService = ServiceWrapper.Provider.GetService(); + discordService = ServiceWrapper.Provider.GetService(); + releaseService = ServiceWrapper.Provider.GetService(); + await Logger.Log("Retrieved services"); + } + + public override async Task Process() { + await base.Process(); + + if (Build.isRelease) { + ModpackRelease release = releaseService.GetRelease(Build.version); + await discordService.SendMessageToEveryone( + VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_RELEASE").AsUlong(), + $"Modpack Update - {release.version}\nChangelog: \n\n{release.description}" + ); + } else { + string message = GetBuildMessage(); + string link = GetBuildLink(); + + string[] missionsId = VariablesWrapper.VariablesDataService().GetSingle("ROLE_ID_MISSIONS").AsArray(); + string testersId = VariablesWrapper.VariablesDataService().GetSingle("ROLE_ID_TESTERS").AsString(); + List missionMakers = unitsService.Data.GetSingle(x => missionsId.Contains(x.id)).members; + List developers = unitsService.Data.GetSingle(testersId).members; + List accounts = missionMakers.Union(developers).Select(x => accountService.Data.GetSingle(x)).Where(x => x.settings.notificationsBuilds).ToList(); + foreach (Notification notification in accounts.Select(account => new Notification { owner = account.id, icon = NotificationIcons.BUILD, message = message, link = link })) { + notificationsService.Add(notification); + } + + await discordService.SendMessageToEveryone(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_DEV").AsUlong(), GetDiscordMessage()); + } + + await Logger.Log("Notifications sent"); + } + + private string GetBuildMessage() => + Build.isReleaseCandidate + ? $"New dev build available ({Build.buildNumber}) on the dev repository" + : $"New release candidate ({Build.buildNumber}) available for {Build.version} on the stage repository"; + + private string GetBuildLink() => Build.isReleaseCandidate ? $"modpack/builds-rc?version={Build.version}&build={Build.id}" : $"modpack/builds-dev?build={Build.id}"; + + private string GetDiscordMessage() => + $"Modpack {(Build.isReleaseCandidate ? "RC" : "Dev")} Build - {(Build.isReleaseCandidate ? $"{Build.version} RC# {Build.buildNumber}" : $"#{Build.buildNumber}")}"; + } +} diff --git a/UKSF.Api.Services/Modpack/BuildsService.cs b/UKSF.Api.Services/Modpack/BuildsService.cs index 6b499543..ef6b255c 100644 --- a/UKSF.Api.Services/Modpack/BuildsService.cs +++ b/UKSF.Api.Services/Modpack/BuildsService.cs @@ -13,8 +13,8 @@ namespace UKSF.Api.Services.Modpack { public class BuildsService : DataBackedService, IBuildsService { - private readonly IBuildStepService buildStepService; private readonly IAccountService accountService; + private readonly IBuildStepService buildStepService; private readonly ISessionService sessionService; public BuildsService(IBuildsDataService data, IBuildStepService buildStepService, IAccountService accountService, ISessionService sessionService) : base(data) { @@ -27,9 +27,9 @@ public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep await Data.Update(build, buildStep); } - public List GetDevBuilds() => Data.Get(x => !x.isReleaseCandidate); + public List GetDevBuilds() => Data.Get(x => !x.isReleaseCandidate && !x.isRelease); - public List GetRcBuilds() => Data.Get(x => x.isReleaseCandidate); + public List GetRcBuilds() => Data.Get(x => x.isReleaseCandidate || x.isRelease); public ModpackBuild GetLatestDevBuild() => GetDevBuilds().FirstOrDefault(); @@ -38,7 +38,7 @@ public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep public async Task CreateDevBuild(GithubCommit commit) { ModpackBuild previousBuild = GetLatestDevBuild(); string builderId = accountService.Data.GetSingle(x => x.email == commit.author)?.id; - ModpackBuild build = new ModpackBuild { buildNumber = previousBuild?.buildNumber + 1 ?? 0, commit = commit, builderId = builderId, steps = buildStepService.GetStepsForBuild() }; + ModpackBuild build = new ModpackBuild { buildNumber = previousBuild?.buildNumber + 1 ?? 1, commit = commit, builderId = builderId, steps = buildStepService.GetStepsForBuild() }; await Data.Add(build); return build; } @@ -47,7 +47,7 @@ public async Task CreateRcBuild(string version, GithubCommit commi ModpackBuild previousBuild = GetLatestRcBuild(version); string builderId = accountService.Data.GetSingle(x => x.email == commit.author)?.id; ModpackBuild build = new ModpackBuild { - version = version, buildNumber = previousBuild?.buildNumber + 1 ?? 0, isReleaseCandidate = true, commit = commit, builderId = builderId, steps = buildStepService.GetStepsForRc() + version = version, buildNumber = previousBuild?.buildNumber + 1 ?? 1, isReleaseCandidate = true, commit = commit, builderId = builderId, steps = buildStepService.GetStepsForRc() }; await Data.Add(build); @@ -61,15 +61,30 @@ public async Task CreateReleaseBuild(string version) { throw new InvalidOperationException("Release build requires at leaste one RC build"); } - ModpackBuild build = new ModpackBuild { buildNumber = previousBuild.buildNumber + 1, isRelease = true, commit = previousBuild.commit, builderId = sessionService.GetContextId(), steps = buildStepService.GetStepsForRelease() }; + ModpackBuild build = new ModpackBuild { + version = version, + buildNumber = previousBuild.buildNumber + 1, + isRelease = true, + commit = previousBuild.commit, + builderId = sessionService.GetContextId(), + steps = buildStepService.GetStepsForRelease() + }; build.commit.message = "Release deployment (no content changes)"; await Data.Add(build); return build; } public async Task CreateRebuild(ModpackBuild build) { - ModpackBuild previousBuild = GetLatestDevBuild(); - ModpackBuild rebuild = new ModpackBuild { buildNumber = previousBuild?.buildNumber + 1 ?? 0, steps = buildStepService.GetStepsForBuild(), commit = build.commit, builderId = sessionService.GetContextId() }; + ModpackBuild rebuild = new ModpackBuild { + version = build.isRelease || build.isReleaseCandidate ? build.version : null, + buildNumber = build.buildNumber + 1, + isReleaseCandidate = build.isReleaseCandidate, + isRelease = build.isRelease, + steps = build.isReleaseCandidate ? buildStepService.GetStepsForRc() : buildStepService.GetStepsForBuild(), + commit = build.commit, + builderId = sessionService.GetContextId() + }; + rebuild.commit.message = $"Rebuild of #{build.buildNumber}\n\n{rebuild.commit.message}"; await Data.Add(rebuild); return rebuild; diff --git a/UKSF.Api.Services/Modpack/ModpackService.cs b/UKSF.Api.Services/Modpack/ModpackService.cs index f451eb84..c6cc0347 100644 --- a/UKSF.Api.Services/Modpack/ModpackService.cs +++ b/UKSF.Api.Services/Modpack/ModpackService.cs @@ -2,6 +2,6 @@ namespace UKSF.Api.Services.Modpack { public class ModpackService : IModpackService { - + // TODO: extract methods from modpack controller into here } } diff --git a/UKSF.Api/Controllers/Accounts/AccountsController.cs b/UKSF.Api/Controllers/Accounts/AccountsController.cs index 9200ca80..bdb42e8d 100644 --- a/UKSF.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSF.Api/Controllers/Accounts/AccountsController.cs @@ -88,7 +88,7 @@ public async Task Put([FromBody] JObject body) { }; await accountService.Data.Add(account); await SendConfirmationCode(account); - LogWrapper.AuditLog(accountService.Data.GetSingle(x => x.email == account.email).id, $"New account created: '{account.firstname} {account.lastname}, {account.email}'"); + LogWrapper.AuditLog($"New account created: '{account.firstname} {account.lastname}, {account.email}'", accountService.Data.GetSingle(x => x.email == account.email).id); return Ok(new {account.email}); } @@ -112,7 +112,7 @@ public async Task ApplyConfirmationCode([FromBody] JObject body) string value = await confirmationCodeService.GetConfirmationCode(code); if (value == email) { await accountService.Data.Update(account.id, "membershipState", MembershipState.CONFIRMED); - LogWrapper.AuditLog(account.id, $"Email address confirmed for {account.id}"); + LogWrapper.AuditLog($"Email address confirmed for {account.id}"); return Ok(); } @@ -202,7 +202,7 @@ public IActionResult CheckUsernameOrEmailExists([FromQuery] string check) { public async Task ChangeName([FromBody] JObject changeNameRequest) { Account account = sessionService.GetContextAccount(); await accountService.Data.Update(account.id, Builders.Update.Set(x => x.firstname, changeNameRequest["firstname"].ToString()).Set(x => x.lastname, changeNameRequest["lastname"].ToString())); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{account.lastname}, {account.firstname} changed their name to {changeNameRequest["lastname"]}, {changeNameRequest["firstname"]}"); + LogWrapper.AuditLog($"{account.lastname}, {account.firstname} changed their name to {changeNameRequest["lastname"]}, {changeNameRequest["firstname"]}"); await discordService.UpdateAccount(accountService.Data.GetSingle(account.id)); return Ok(); } @@ -211,7 +211,7 @@ public async Task ChangeName([FromBody] JObject changeNameRequest public async Task ChangePassword([FromBody] JObject changePasswordRequest) { string contextId = sessionService.GetContextId(); await accountService.Data.Update(contextId, "password", BCrypt.Net.BCrypt.HashPassword(changePasswordRequest["password"].ToString())); - LogWrapper.AuditLog(contextId, $"Password changed for {contextId}"); + LogWrapper.AuditLog($"Password changed for {contextId}"); return Ok(); } @@ -219,7 +219,7 @@ public async Task ChangePassword([FromBody] JObject changePasswor public async Task UpdateSetting(string id, [FromBody] JObject body) { Account account = string.IsNullOrEmpty(id) ? sessionService.GetContextAccount() : accountService.Data.GetSingle(id); await accountService.Data.Update(account.id, $"settings.{body["name"]}", body["value"]); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Setting {body["name"]} updated for {account.id} from {account.settings.GetAttribute(body["name"].ToString())} to {body["value"]}"); + LogWrapper.AuditLog($"Setting {body["name"]} updated for {account.id} from {account.settings.GetAttribute(body["name"].ToString())} to {body["value"]}"); return Ok(); } diff --git a/UKSF.Api/Controllers/Accounts/CommunicationsController.cs b/UKSF.Api/Controllers/Accounts/CommunicationsController.cs index 42fcd853..4882c8db 100644 --- a/UKSF.Api/Controllers/Accounts/CommunicationsController.cs +++ b/UKSF.Api/Controllers/Accounts/CommunicationsController.cs @@ -106,7 +106,7 @@ await notificationsService.SendTeamspeakNotification( new HashSet { teamspeakId.ToDouble() }, $"This teamspeak identity has been linked to the account with email '{account.email}'\nIf this was not done by you, please contact an admin" ); - LogWrapper.AuditLog(account.id, $"Teamspeak ID {teamspeakId} added for {account.id}"); + LogWrapper.AuditLog($"Teamspeak ID {teamspeakId} added for {account.id}"); return Ok(); } } diff --git a/UKSF.Api/Controllers/Accounts/DiscordCodeController.cs b/UKSF.Api/Controllers/Accounts/DiscordCodeController.cs index 23b4e18f..ff882e8e 100644 --- a/UKSF.Api/Controllers/Accounts/DiscordCodeController.cs +++ b/UKSF.Api/Controllers/Accounts/DiscordCodeController.cs @@ -35,7 +35,7 @@ public async Task DiscordConnect(string discordId, [FromBody] JOb await accountService.Data.Update(id, Builders.Update.Set(x => x.discordId, discordId)); Account account = accountService.Data.GetSingle(id); await discordService.UpdateAccount(account); - LogWrapper.AuditLog(account.id, $"DiscordID updated for {account.id} to {discordId}"); + LogWrapper.AuditLog($"DiscordID updated for {account.id} to {discordId}"); return Ok(); } } diff --git a/UKSF.Api/Controllers/Accounts/PasswordResetController.cs b/UKSF.Api/Controllers/Accounts/PasswordResetController.cs index 61ba2237..474cc812 100644 --- a/UKSF.Api/Controllers/Accounts/PasswordResetController.cs +++ b/UKSF.Api/Controllers/Accounts/PasswordResetController.cs @@ -23,7 +23,7 @@ public PasswordResetController(IConfirmationCodeService confirmationCodeService, protected override async Task ApplyValidatedPayload(string codePayload, Account account) { await AccountService.Data.Update(account.id, "password", BCrypt.Net.BCrypt.HashPassword(codePayload)); - LogWrapper.AuditLog(account.id, $"Password changed for {account.id}"); + LogWrapper.AuditLog($"Password changed for {account.id}"); return Ok(LoginService.RegenerateToken(account.id)); } @@ -42,7 +42,7 @@ public async Task ResetPassword([FromBody] JObject body) { string html = $"

UKSF Password Reset


Please reset your password by clicking here." + "

If this request was not made by you seek assistance from UKSF staff.

"; emailService.SendEmail(account.email, "UKSF Password Reset", html); - LogWrapper.AuditLog(account.id, $"Password reset request made for {account.id}"); + LogWrapper.AuditLog($"Password reset request made for {account.id}", account.id); return Ok(LoginToken); } } diff --git a/UKSF.Api/Controllers/Accounts/SteamCodeController.cs b/UKSF.Api/Controllers/Accounts/SteamCodeController.cs index 5117b488..f5e3a1b4 100644 --- a/UKSF.Api/Controllers/Accounts/SteamCodeController.cs +++ b/UKSF.Api/Controllers/Accounts/SteamCodeController.cs @@ -30,7 +30,7 @@ public async Task SteamConnect(string steamId, [FromBody] JObject string id = sessionService.GetContextId(); await accountService.Data.Update(id, "steamname", steamId); Account account = accountService.Data.GetSingle(id); - LogWrapper.AuditLog(account.id, $"SteamID updated for {account.id} to {steamId}"); + LogWrapper.AuditLog($"SteamID updated for {account.id} to {steamId}"); return Ok(); } } diff --git a/UKSF.Api/Controllers/ApplicationsController.cs b/UKSF.Api/Controllers/ApplicationsController.cs index be77c5ff..4c7f59c2 100644 --- a/UKSF.Api/Controllers/ApplicationsController.cs +++ b/UKSF.Api/Controllers/ApplicationsController.cs @@ -70,7 +70,7 @@ public async Task Post([FromBody] JObject body) { ); } - LogWrapper.AuditLog(account.id, $"Application submitted for {account.id}. Assigned to {displayNameService.GetDisplayName(account.application.recruiter)}"); + LogWrapper.AuditLog($"Application submitted for {account.id}. Assigned to {displayNameService.GetDisplayName(account.application.recruiter)}"); return Ok(); } @@ -80,7 +80,7 @@ public async Task PostUpdate([FromBody] JObject body) { await Update(body, account); notificationsService.Add(new Notification {owner = account.application.recruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname} updated their application", link = $"/recruitment/{account.id}"}); string difference = account.Changes(accountService.Data.GetSingle(account.id)); - LogWrapper.AuditLog(account.id, $"Application updated for {account.id}: {difference}"); + LogWrapper.AuditLog($"Application updated for {account.id}: {difference}"); return Ok(); } diff --git a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs index 75091eba..c0b6660f 100644 --- a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs +++ b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs @@ -110,7 +110,7 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje } if (overriden) { - LogWrapper.AuditLog(sessionAccount.id, $"Review state of {request.type.ToLower()} request for {request.displayRecipient} overriden to {state}"); + LogWrapper.AuditLog($"Review state of {request.type.ToLower()} request for {request.displayRecipient} overriden to {state}"); await commandRequestService.SetRequestAllReviewStates(request, state); foreach (string reviewerId in request.reviews.Select(x => x.Key).Where(x => x != sessionAccount.id)) { @@ -131,10 +131,7 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje } if (currentState == state) return Ok(); - LogWrapper.AuditLog( - sessionAccount.id, - $"Review state of {displayNameService.GetDisplayName(sessionAccount)} for {request.type.ToLower()} request for {request.displayRecipient} updated to {state}" - ); + LogWrapper.AuditLog($"Review state of {displayNameService.GetDisplayName(sessionAccount)} for {request.type.ToLower()} request for {request.displayRecipient} updated to {state}"); await commandRequestService.SetRequestReviewState(request, sessionAccount.id, state); } diff --git a/UKSF.Api/Controllers/DischargesController.cs b/UKSF.Api/Controllers/DischargesController.cs index c52a73e6..372e5fe5 100644 --- a/UKSF.Api/Controllers/DischargesController.cs +++ b/UKSF.Api/Controllers/DischargesController.cs @@ -76,7 +76,7 @@ public async Task Reinstate(string id) { ); notificationsService.Add(notification); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{sessionService.GetContextId()} reinstated {dischargeCollection.name}'s membership"); + LogWrapper.AuditLog($"{sessionService.GetContextId()} reinstated {dischargeCollection.name}'s membership", sessionService.GetContextId()); string personnelId = variablesDataService.GetSingle("ROLE_ID_PERSONNEL").AsString(); foreach (string member in unitsService.Data.GetSingle(personnelId).members.Where(x => x != sessionService.GetContextId())) { notificationsService.Add( diff --git a/UKSF.Api/Controllers/GameServersController.cs b/UKSF.Api/Controllers/GameServersController.cs index 58e5b870..2450d83b 100644 --- a/UKSF.Api/Controllers/GameServersController.cs +++ b/UKSF.Api/Controllers/GameServersController.cs @@ -56,14 +56,14 @@ public IActionResult CheckGameServers(string check, [FromBody] GameServer gameSe [HttpPut, Authorize] public async Task AddServer([FromBody] GameServer gameServer) { await gameServersService.Data.Add(gameServer); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Server added '{gameServer}'"); + LogWrapper.AuditLog($"Server added '{gameServer}'"); return Ok(); } [HttpPatch, Authorize] public async Task EditGameServer([FromBody] GameServer gameServer) { GameServer oldGameServer = gameServersService.Data.GetSingle(x => x.id == gameServer.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server '{gameServer.name}' updated:{oldGameServer.Changes(gameServer)}"); + LogWrapper.AuditLog($"Game server '{gameServer.name}' updated:{oldGameServer.Changes(gameServer)}"); await gameServersService.Data .Update( gameServer.id, @@ -85,7 +85,7 @@ await gameServersService.Data [HttpDelete("{id}"), Authorize] public async Task DeleteGameServer(string id) { GameServer gameServer = gameServersService.Data.GetSingle(x => x.id == id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server deleted '{gameServer.name}'"); + LogWrapper.AuditLog($"Game server deleted '{gameServer.name}'"); await gameServersService.Data.Delete(id); return Ok(gameServersService.Data.Get()); @@ -112,7 +112,7 @@ public async Task UploadMissionFile() { MissionPatchingResult missionPatchingResult = await gameServersService.PatchMissionFile(file.Name); missionPatchingResult.reports = missionPatchingResult.reports.OrderByDescending(x => x.error).ToList(); missionReports.Add(new {mission = file.Name, missionPatchingResult.reports}); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Uploaded mission '{file.Name}'"); + LogWrapper.AuditLog($"Uploaded mission '{file.Name}'"); } } catch (Exception exception) { LogWrapper.Log(exception); @@ -157,14 +157,14 @@ public async Task LaunchServer(string id, [FromBody] JObject data // Execute launch await gameServersService.LaunchGameServer(gameServer); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server launched '{missionSelection}' on '{gameServer.name}'"); + LogWrapper.AuditLog($"Game server launched '{missionSelection}' on '{gameServer.name}'"); return Ok(patchingResult.reports); } [HttpGet("stop/{id}"), Authorize] public async Task StopServer(string id) { GameServer gameServer = gameServersService.Data.GetSingle(id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server stopped '{gameServer.name}'"); + LogWrapper.AuditLog($"Game server stopped '{gameServer.name}'"); await gameServersService.GetGameServerStatus(gameServer); if (!gameServer.status.started && !gameServer.status.running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); await gameServersService.StopGameServer(gameServer); @@ -175,7 +175,7 @@ public async Task StopServer(string id) { [HttpGet("kill/{id}"), Authorize] public async Task KillServer(string id) { GameServer gameServer = gameServersService.Data.GetSingle(id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server killed '{gameServer.name}'"); + LogWrapper.AuditLog($"Game server killed '{gameServer.name}'"); await gameServersService.GetGameServerStatus(gameServer); if (!gameServer.status.started && !gameServer.status.running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); try { @@ -191,7 +191,7 @@ public async Task KillServer(string id) { [HttpGet("killall"), Authorize] public IActionResult KillAllArmaProcesses() { int killed = gameServersService.KillAllArmaProcesses(); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Killed {killed} Arma instances"); + LogWrapper.AuditLog($"Killed {killed} Arma instances"); return Ok(); } @@ -201,7 +201,7 @@ public IActionResult KillAllArmaProcesses() { [HttpPost("mods/{id}"), Authorize] public async Task SetGameServerMods(string id, [FromBody] List mods) { GameServer gameServer = gameServersService.Data.GetSingle(id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Game server '{gameServer.name}' mods updated:{gameServer.mods.Select(x => x.name).Changes(mods.Select(x => x.name))}"); + LogWrapper.AuditLog($"Game server '{gameServer.name}' mods updated:{gameServer.mods.Select(x => x.name).Changes(mods.Select(x => x.name))}"); await gameServersService.Data.Update(id, Builders.Update.Unset(x => x.mods)); await gameServersService.Data.Update(id, Builders.Update.PushEach(x => x.mods, mods)); return Ok(gameServersService.GetAvailableMods()); diff --git a/UKSF.Api/Controllers/Integrations/GithubController.cs b/UKSF.Api/Controllers/Integrations/GithubController.cs index e0f4af24..a625d02a 100644 --- a/UKSF.Api/Controllers/Integrations/GithubController.cs +++ b/UKSF.Api/Controllers/Integrations/GithubController.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Runtime.InteropServices.WindowsRuntime; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; @@ -12,6 +13,7 @@ using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; +using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers.Integrations { @@ -51,22 +53,12 @@ [FromBody] JObject body } switch (payload.Ref) { - case DEV when payload.BaseRef != RELEASE: - GithubCommit devCommit = await githubService.GetPushEvent(payload); - ModpackBuild devBuild = await buildsService.CreateDevBuild(devCommit); - buildQueueService.QueueBuild(devBuild); + case DEV when payload.BaseRef != RELEASE: { + await OnPushDev(payload); return Ok(); + } case RELEASE: - // TODO: Don't make rc build if version has been released - string rcVersion = await githubService.GetReferenceVersion(payload.Ref); - GithubCommit rcCommit = await githubService.GetPushEvent(payload); - ModpackBuild previousBuild = buildsService.GetLatestRcBuild(rcVersion); - if (previousBuild == null) { - await releaseService.MakeDraftRelease(rcVersion, rcCommit); - } - - ModpackBuild rcBuild = await buildsService.CreateRcBuild(rcVersion, rcCommit); - buildQueueService.QueueBuild(rcBuild); + await OnPushRelease(payload); return Ok(); default: return Ok(); } @@ -84,5 +76,29 @@ public async Task Release() { await releaseService.AddHistoricReleases(releases); return Ok(); } + + private async Task OnPushDev(PushWebhookPayload payload) { + GithubCommit devCommit = await githubService.GetPushEvent(payload); + ModpackBuild devBuild = await buildsService.CreateDevBuild(devCommit); + buildQueueService.QueueBuild(devBuild); + } + + private async Task OnPushRelease(PushWebhookPayload payload) { + string rcVersion = await githubService.GetReferenceVersion(payload.Ref); + ModpackRelease release = releaseService.GetRelease(rcVersion); + if (release != null && !release.isDraft) { + LogWrapper.Log($"An attempt to build a release candidate for version {rcVersion} failed because the version has already been released."); + return; + } + + ModpackBuild previousBuild = buildsService.GetLatestRcBuild(rcVersion); + GithubCommit rcCommit = await githubService.GetPushEvent(payload, previousBuild != null ? previousBuild.commit.after : string.Empty); + if (previousBuild == null) { + await releaseService.MakeDraftRelease(rcVersion, rcCommit); + } + + ModpackBuild rcBuild = await buildsService.CreateRcBuild(rcVersion, rcCommit); + buildQueueService.QueueBuild(rcBuild); + } } } diff --git a/UKSF.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs index f7123e3b..e28a4f90 100644 --- a/UKSF.Api/Controllers/LoaController.cs +++ b/UKSF.Api/Controllers/LoaController.cs @@ -102,10 +102,10 @@ public async Task DeleteLoa(string id) { notificationsService.Add(new Notification {owner = reviewerId, icon = NotificationIcons.REQUEST, message = $"Your review for {request.displayRequester}'s LOA is no longer required as they deleted their LOA", link = "/command/requests"}); } - LogWrapper.AuditLog(sessionService.GetContextId(), $"Loa request deleted for '{displayNameService.GetDisplayName(accountService.Data.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); + LogWrapper.AuditLog($"Loa request deleted for '{displayNameService.GetDisplayName(accountService.Data.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); } - LogWrapper.AuditLog(sessionService.GetContextId(), $"Loa deleted for '{displayNameService.GetDisplayName(accountService.Data.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); + LogWrapper.AuditLog($"Loa deleted for '{displayNameService.GetDisplayName(accountService.Data.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); await loaService.Data.Delete(loa.id); return Ok(); diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs index e9b8d797..70680442 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -1,12 +1,14 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; +using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers.Modpack { @@ -52,6 +54,7 @@ public async Task Rebuild(string id) { return BadRequest("Build does not exist"); } + LogWrapper.AuditLog($"Rebuild triggered for {build.buildNumber}."); ModpackBuild rebuild = await buildsService.CreateRebuild(build); buildQueueService.QueueBuild(rebuild); return Ok(); @@ -64,6 +67,7 @@ public IActionResult CancelBuild(string id) { return BadRequest("Build does not exist"); } + LogWrapper.AuditLog($"Build {build.buildNumber} cancelled"); buildQueueService.Cancel(id); return Ok(); } @@ -74,6 +78,7 @@ public async Task UpdateRelease(string version, [FromBody] Modpac return BadRequest($"Release {version} is not a draft"); } + LogWrapper.AuditLog($"Release {version} draft updated"); await releaseService.UpdateDraft(release); return Ok(); } @@ -86,7 +91,7 @@ public async Task Release(string version) { await githubService.MergeBranch("dev", "release", $"Release {version}"); await githubService.MergeBranch("master", "dev", $"Release {version}"); - // create message on discord modpack channel + LogWrapper.AuditLog($"{version} released"); return Ok(); } @@ -102,6 +107,7 @@ public async Task NewBuild(string reference) { } ModpackBuild build = await buildsService.CreateDevBuild(commit); + LogWrapper.AuditLog($"New build created ({build.buildNumber})"); buildQueueService.QueueBuild(build); return Ok(); } diff --git a/UKSF.Api/Controllers/RanksController.cs b/UKSF.Api/Controllers/RanksController.cs index 89db8049..f45ada93 100644 --- a/UKSF.Api/Controllers/RanksController.cs +++ b/UKSF.Api/Controllers/RanksController.cs @@ -56,14 +56,14 @@ public IActionResult CheckRank([FromBody] Rank rank) { [HttpPut, Authorize] public async Task AddRank([FromBody] Rank rank) { await ranksService.Data.Add(rank); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Rank added '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}'"); + LogWrapper.AuditLog($"Rank added '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}'"); return Ok(); } [HttpPatch, Authorize] public async Task EditRank([FromBody] Rank rank) { Rank oldRank = ranksService.Data.GetSingle(x => x.id == rank.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Rank updated from '{oldRank.name}, {oldRank.abbreviation}, {oldRank.teamspeakGroup}, {oldRank.discordRoleId}' to '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}, {rank.discordRoleId}'"); + LogWrapper.AuditLog($"Rank updated from '{oldRank.name}, {oldRank.abbreviation}, {oldRank.teamspeakGroup}, {oldRank.discordRoleId}' to '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}, {rank.discordRoleId}'"); await ranksService.Data.Update(rank.id, Builders.Update.Set("name", rank.name).Set("abbreviation", rank.abbreviation).Set("teamspeakGroup", rank.teamspeakGroup).Set("discordRoleId", rank.discordRoleId)); foreach (Account account in accountService.Data.Get(x => x.rank == oldRank.name)) { // TODO: Notify user to update name in TS if rank abbreviate changed @@ -76,7 +76,7 @@ public async Task EditRank([FromBody] Rank rank) { [HttpDelete("{id}"), Authorize] public async Task DeleteRank(string id) { Rank rank = ranksService.Data.GetSingle(x => x.id == id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Rank deleted '{rank.name}'"); + LogWrapper.AuditLog($"Rank deleted '{rank.name}'"); await ranksService.Data.Delete(id); foreach (Account account in accountService.Data.Get(x => x.rank == rank.name)) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, rankString: AssignmentService.REMOVE_FLAG, reason: $"the '{rank.name}' rank was deleted"); diff --git a/UKSF.Api/Controllers/RecruitmentController.cs b/UKSF.Api/Controllers/RecruitmentController.cs index ae6ac284..93077920 100644 --- a/UKSF.Api/Controllers/RecruitmentController.cs +++ b/UKSF.Api/Controllers/RecruitmentController.cs @@ -72,7 +72,7 @@ public async Task UpdateState([FromBody] dynamic body, string id) if (updatedState == account.application.state) return Ok(); string sessionId = sessionService.GetContextId(); await accountService.Data.Update(id, Builders.Update.Set(x => x.application.state, updatedState)); - LogWrapper.AuditLog(sessionId, $"Application state changed for {id} from {account.application.state} to {updatedState}"); + LogWrapper.AuditLog($"Application state changed for {id} from {account.application.state} to {updatedState}"); switch (updatedState) { case ApplicationState.ACCEPTED: { @@ -100,7 +100,7 @@ public async Task UpdateState([FromBody] dynamic body, string id) notificationsService.Add(notification); if (recruitmentService.GetRecruiters().All(x => x.id != account.application.recruiter)) { string newRecruiterId = recruitmentService.GetRecruiter(); - LogWrapper.AuditLog(sessionId, $"Application recruiter for {id} is no longer SR1, reassigning from {account.application.recruiter} to {newRecruiterId}"); + LogWrapper.AuditLog($"Application recruiter for {id} is no longer SR1, reassigning from {account.application.recruiter} to {newRecruiterId}"); await accountService.Data.Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiterId)); } @@ -134,7 +134,7 @@ public async Task PostReassignment([FromBody] JObject newRecruite notificationsService.Add(new Notification {owner = recruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application has been transferred to you", link = $"/recruitment/{account.id}"}); } - LogWrapper.AuditLog(sessionService.GetContextId(), $"Application recruiter changed for {id} to {newRecruiter["newRecruiter"]}"); + LogWrapper.AuditLog($"Application recruiter changed for {id} to {newRecruiter["newRecruiter"]}"); return Ok(); } diff --git a/UKSF.Api/Controllers/RolesController.cs b/UKSF.Api/Controllers/RolesController.cs index 3b77a27b..7d8d51f4 100644 --- a/UKSF.Api/Controllers/RolesController.cs +++ b/UKSF.Api/Controllers/RolesController.cs @@ -64,14 +64,14 @@ public IActionResult CheckRole(RoleType roleType, string check, [FromBody] Role [HttpPut, Authorize] public async Task AddRole([FromBody] Role role) { await rolesService.Data.Add(role); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Role added '{role.name}'"); + LogWrapper.AuditLog($"Role added '{role.name}'"); return Ok(new {individualRoles = rolesService.Data.Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); } [HttpPatch, Authorize] public async Task EditRole([FromBody] Role role) { Role oldRole = rolesService.Data.GetSingle(x => x.id == role.id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Role updated from '{oldRole.name}' to '{role.name}'"); + LogWrapper.AuditLog($"Role updated from '{oldRole.name}' to '{role.name}'"); await rolesService.Data.Update(role.id, "name", role.name); foreach (Account account in accountService.Data.Get(x => x.roleAssignment == oldRole.name)) { await accountService.Data.Update(account.id, "roleAssignment", role.name); @@ -84,7 +84,7 @@ public async Task EditRole([FromBody] Role role) { [HttpDelete("{id}"), Authorize] public async Task DeleteRole(string id) { Role role = rolesService.Data.GetSingle(x => x.id == id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Role deleted '{role.name}'"); + LogWrapper.AuditLog($"Role deleted '{role.name}'"); await rolesService.Data.Delete(id); foreach (Account account in accountService.Data.Get(x => x.roleAssignment == role.name)) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, role: AssignmentService.REMOVE_FLAG, reason: $"the '{role.name}' role was deleted"); diff --git a/UKSF.Api/Controllers/VariablesController.cs b/UKSF.Api/Controllers/VariablesController.cs index d92fde28..be1047ae 100644 --- a/UKSF.Api/Controllers/VariablesController.cs +++ b/UKSF.Api/Controllers/VariablesController.cs @@ -45,14 +45,14 @@ public IActionResult CheckVariableItem([FromBody] VariableItem variableItem) { public async Task AddVariableItem([FromBody] VariableItem variableItem) { variableItem.key = variableItem.key.Keyify(); await variablesDataService.Add(variableItem); - LogWrapper.AuditLog(sessionService.GetContextId(), $"VariableItem added '{variableItem.key}, {variableItem.item}'"); + LogWrapper.AuditLog($"VariableItem added '{variableItem.key}, {variableItem.item}'"); return Ok(); } [HttpPatch, Authorize] public async Task EditVariableItem([FromBody] VariableItem variableItem) { VariableItem oldVariableItem = variablesDataService.GetSingle(variableItem.key); - LogWrapper.AuditLog(sessionService.GetContextId(), $"VariableItem '{oldVariableItem.key}' updated from '{oldVariableItem.item}' to '{variableItem.item}'"); + LogWrapper.AuditLog($"VariableItem '{oldVariableItem.key}' updated from '{oldVariableItem.item}' to '{variableItem.item}'"); await variablesDataService.Update(variableItem.key, variableItem.item); return Ok(variablesDataService.Get()); } @@ -60,7 +60,7 @@ public async Task EditVariableItem([FromBody] VariableItem variab [HttpDelete("{key}"), Authorize] public async Task DeleteVariableItem(string key) { VariableItem variableItem = variablesDataService.GetSingle(key); - LogWrapper.AuditLog(sessionService.GetContextId(), $"VariableItem deleted '{variableItem.key}, {variableItem.item}'"); + LogWrapper.AuditLog($"VariableItem deleted '{variableItem.key}, {variableItem.item}'"); await variablesDataService.Delete(key); return Ok(variablesDataService.Get()); } From 3e9710f56f6a9f15ebfef49991a4b5ed3557fe4e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 18 Jul 2020 15:28:08 +0100 Subject: [PATCH 191/369] Extracted methods from modpack controller to service --- .../Modpack/IModpackService.cs | 16 +++- UKSF.Api.Services/Fake/FakeDiscordService.cs | 12 ++- .../Integrations/DiscordService.cs | 2 +- UKSF.Api.Services/Modpack/ModpackService.cs | 74 ++++++++++++++++++- .../Controllers/Modpack/ModpackController.cs | 71 ++++-------------- 5 files changed, 111 insertions(+), 64 deletions(-) diff --git a/UKSF.Api.Interfaces/Modpack/IModpackService.cs b/UKSF.Api.Interfaces/Modpack/IModpackService.cs index b52b3f0c..656404c6 100644 --- a/UKSF.Api.Interfaces/Modpack/IModpackService.cs +++ b/UKSF.Api.Interfaces/Modpack/IModpackService.cs @@ -1,5 +1,17 @@ -namespace UKSF.Api.Interfaces.Modpack { +using System.Collections.Generic; +using System.Threading.Tasks; +using UKSF.Api.Models.Modpack; + +namespace UKSF.Api.Interfaces.Modpack { public interface IModpackService { - + List GetReleases(); + List GetRcBuilds(); + List GetDevBuilds(); + ModpackBuild GetBuild(string id); + Task NewBuild(string reference); + Task Rebuild(ModpackBuild build); + void CancelBuild(ModpackBuild build); + Task UpdateReleaseDraft(ModpackRelease release); + Task Release(string version); } } diff --git a/UKSF.Api.Services/Fake/FakeDiscordService.cs b/UKSF.Api.Services/Fake/FakeDiscordService.cs index 3719f257..d3e84079 100644 --- a/UKSF.Api.Services/Fake/FakeDiscordService.cs +++ b/UKSF.Api.Services/Fake/FakeDiscordService.cs @@ -7,11 +7,17 @@ namespace UKSF.Api.Services.Fake { public class FakeDiscordService : DiscordService { - public FakeDiscordService(IConfiguration configuration, IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService) : base(configuration, ranksService, unitsService, accountService, displayNameService) { } + public FakeDiscordService(IConfiguration configuration, IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService) : base( + configuration, + ranksService, + unitsService, + accountService, + displayNameService + ) { } - // public override Task SendMessageToEveryone(ulong channelId, string message) => Task.CompletedTask; + public override Task SendMessageToEveryone(ulong channelId, string message) => Task.CompletedTask; - // public override Task SendMessage(ulong channelId, string message) => Task.CompletedTask; + public override Task SendMessage(ulong channelId, string message) => Task.CompletedTask; public override Task UpdateAllUsers() => Task.CompletedTask; diff --git a/UKSF.Api.Services/Integrations/DiscordService.cs b/UKSF.Api.Services/Integrations/DiscordService.cs index 61de6359..ced4435c 100644 --- a/UKSF.Api.Services/Integrations/DiscordService.cs +++ b/UKSF.Api.Services/Integrations/DiscordService.cs @@ -62,7 +62,7 @@ public virtual async Task SendMessage(ulong channelId, string message) { } public virtual async Task SendMessageToEveryone(ulong channelId, string message) { - await SendMessage(channelId, $"{guild.EveryoneRole} - {message}"); + await SendMessage(channelId, $"{guild.EveryoneRole} {message}"); } public async Task> GetRoles() { diff --git a/UKSF.Api.Services/Modpack/ModpackService.cs b/UKSF.Api.Services/Modpack/ModpackService.cs index c6cc0347..6ff4e3f4 100644 --- a/UKSF.Api.Services/Modpack/ModpackService.cs +++ b/UKSF.Api.Services/Modpack/ModpackService.cs @@ -1,7 +1,77 @@ -using UKSF.Api.Interfaces.Modpack; +using System.Collections.Generic; +using System.Threading.Tasks; +using UKSF.Api.Interfaces.Integrations.Github; +using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Interfaces.Modpack.BuildProcess; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Integrations.Github; +using UKSF.Api.Models.Modpack; +using UKSF.Api.Services.Message; namespace UKSF.Api.Services.Modpack { public class ModpackService : IModpackService { - // TODO: extract methods from modpack controller into here + private readonly IBuildQueueService buildQueueService; + private readonly IBuildsService buildsService; + private readonly IGithubService githubService; + private readonly IReleaseService releaseService; + private readonly ISessionService sessionService; + + public ModpackService(IReleaseService releaseService, IBuildsService buildsService, IBuildQueueService buildQueueService, IGithubService githubService, ISessionService sessionService) { + this.releaseService = releaseService; + this.buildsService = buildsService; + this.buildQueueService = buildQueueService; + this.githubService = githubService; + this.sessionService = sessionService; + } + + public List GetReleases() => releaseService.Data.Get(); + + public List GetRcBuilds() => buildsService.GetRcBuilds(); + + public List GetDevBuilds() => buildsService.GetDevBuilds(); + + public ModpackBuild GetBuild(string id) => buildsService.Data.GetSingle(x => x.id == id); + + public async Task NewBuild(string reference) { + if (!await githubService.IsReferenceValid(reference)) { + return false; + } + + GithubCommit commit = await githubService.GetLatestReferenceCommit(reference); + if (!string.IsNullOrEmpty(sessionService.GetContextId())) { + commit.author = sessionService.GetContextEmail(); + } + + ModpackBuild build = await buildsService.CreateDevBuild(commit); + LogWrapper.AuditLog($"New build created ({build.buildNumber})"); + buildQueueService.QueueBuild(build); + return true; + } + + public async Task Rebuild(ModpackBuild build) { + LogWrapper.AuditLog($"Rebuild triggered for {build.buildNumber}."); + ModpackBuild rebuild = await buildsService.CreateRebuild(build); + buildQueueService.QueueBuild(rebuild); + } + + public void CancelBuild(ModpackBuild build) { + LogWrapper.AuditLog($"Build {build.buildNumber} cancelled"); + buildQueueService.Cancel(build.id); + } + + public async Task UpdateReleaseDraft(ModpackRelease release) { + LogWrapper.AuditLog($"Release {release.version} draft updated"); + await releaseService.UpdateDraft(release); + } + + public async Task Release(string version) { + await releaseService.PublishRelease(version); + ModpackBuild releaseBuild = await buildsService.CreateReleaseBuild(version); + buildQueueService.QueueBuild(releaseBuild); + await githubService.MergeBranch("dev", "release", $"Release {version}"); + await githubService.MergeBranch("master", "dev", $"Release {version}"); + + LogWrapper.AuditLog($"{version} released"); + } } } diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs index 70680442..f0264026 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -1,74 +1,51 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; -using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers.Modpack { [Route("[controller]")] public class ModpackController : Controller { - private readonly IBuildQueueService buildQueueService; - private readonly IBuildsService buildsService; - private readonly IGithubService githubService; - private readonly IReleaseService releaseService; - private readonly ISessionService sessionService; + private readonly IModpackService modpackService; - public ModpackController(IReleaseService releaseService, IBuildsService buildsService, IGithubService githubService, IBuildQueueService buildQueueService, ISessionService sessionService) { - this.releaseService = releaseService; - this.buildsService = buildsService; - this.githubService = githubService; - this.buildQueueService = buildQueueService; - this.sessionService = sessionService; - } + public ModpackController(IModpackService modpackService) => this.modpackService = modpackService; [HttpGet("releases"), Authorize, Roles(RoleDefinitions.MEMBER)] - public IActionResult GetReleases() => Ok(releaseService.Data.Get()); + public IActionResult GetReleases() => Ok(modpackService.GetReleases()); [HttpGet("rcs"), Authorize, Roles(RoleDefinitions.TESTER, RoleDefinitions.SERVERS)] - public IActionResult GetReleaseCandidates() => Ok(buildsService.GetRcBuilds()); + public IActionResult GetReleaseCandidates() => Ok(modpackService.GetRcBuilds()); [HttpGet("builds"), Authorize, Roles(RoleDefinitions.TESTER, RoleDefinitions.SERVERS)] - public IActionResult GetBuilds() => Ok(buildsService.GetDevBuilds()); + public IActionResult GetBuilds() => Ok(modpackService.GetDevBuilds()); [HttpGet("builds/{id}"), Authorize, Roles(RoleDefinitions.TESTER, RoleDefinitions.SERVERS)] public IActionResult GetBuild(string id) { - ModpackBuild build = buildsService.Data.GetSingle(x => x.id == id); - if (build == null) { - return BadRequest("Build does not exist"); - } - - return Ok(build); + ModpackBuild build = modpackService.GetBuild(id); + return build == null ? (IActionResult) BadRequest("Build does not exist") : Ok(build); } [HttpGet("builds/{id}/rebuild"), Authorize, Roles(RoleDefinitions.ADMIN)] public async Task Rebuild(string id) { - ModpackBuild build = buildsService.Data.GetSingle(x => x.id == id); + ModpackBuild build = modpackService.GetBuild(id); if (build == null) { return BadRequest("Build does not exist"); } - LogWrapper.AuditLog($"Rebuild triggered for {build.buildNumber}."); - ModpackBuild rebuild = await buildsService.CreateRebuild(build); - buildQueueService.QueueBuild(rebuild); + await modpackService.Rebuild(build); return Ok(); } [HttpGet("builds/{id}/cancel"), Authorize, Roles(RoleDefinitions.ADMIN)] public IActionResult CancelBuild(string id) { - ModpackBuild build = buildsService.Data.GetSingle(x => x.id == id); + ModpackBuild build = modpackService.GetBuild(id); if (build == null) { return BadRequest("Build does not exist"); } - LogWrapper.AuditLog($"Build {build.buildNumber} cancelled"); - buildQueueService.Cancel(id); + modpackService.CancelBuild(build); return Ok(); } @@ -78,38 +55,20 @@ public async Task UpdateRelease(string version, [FromBody] Modpac return BadRequest($"Release {version} is not a draft"); } - LogWrapper.AuditLog($"Release {version} draft updated"); - await releaseService.UpdateDraft(release); + await modpackService.UpdateReleaseDraft(release); return Ok(); } [HttpGet("release/{version}"), Authorize, Roles(RoleDefinitions.ADMIN)] public async Task Release(string version) { - await releaseService.PublishRelease(version); - ModpackBuild releaseBuild = await buildsService.CreateReleaseBuild(version); - buildQueueService.QueueBuild(releaseBuild); - await githubService.MergeBranch("dev", "release", $"Release {version}"); - await githubService.MergeBranch("master", "dev", $"Release {version}"); - - LogWrapper.AuditLog($"{version} released"); + await modpackService.Release(version); return Ok(); } [HttpGet("newbuild/{reference}"), Authorize, Roles(RoleDefinitions.TESTER)] public async Task NewBuild(string reference) { - if (!await githubService.IsReferenceValid(reference)) { - return BadRequest($"{reference} cannot be built as its version does not have the required make files"); - } - - GithubCommit commit = await githubService.GetLatestReferenceCommit(reference); - if (!string.IsNullOrEmpty(sessionService.GetContextId())) { - commit.author = sessionService.GetContextEmail(); - } - - ModpackBuild build = await buildsService.CreateDevBuild(commit); - LogWrapper.AuditLog($"New build created ({build.buildNumber})"); - buildQueueService.QueueBuild(build); - return Ok(); + bool success = await modpackService.NewBuild(reference); + return !success ? (IActionResult) BadRequest($"{reference} cannot be built as its version does not have the required make files") : Ok(); } } } From a9cff4bf7d3062aa76fb630d3d4b85aa6bed2e73 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 18 Jul 2020 19:10:58 +0100 Subject: [PATCH 192/369] Moved github push methods to modpack service. Added changelog regeneration --- .../Modpack/IModpackService.cs | 6 ++- .../Integrations/Github/GithubService.cs | 18 +++---- UKSF.Api.Services/Modpack/ModpackService.cs | 41 +++++++++++++--- .../Integrations/GithubController.cs | 49 +++---------------- .../Controllers/Modpack/ModpackController.cs | 21 ++++++-- UKSF.Api/Controllers/VariablesController.cs | 5 -- 6 files changed, 74 insertions(+), 66 deletions(-) diff --git a/UKSF.Api.Interfaces/Modpack/IModpackService.cs b/UKSF.Api.Interfaces/Modpack/IModpackService.cs index 656404c6..86349778 100644 --- a/UKSF.Api.Interfaces/Modpack/IModpackService.cs +++ b/UKSF.Api.Interfaces/Modpack/IModpackService.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; +using Octokit; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Interfaces.Modpack { @@ -8,10 +9,13 @@ public interface IModpackService { List GetRcBuilds(); List GetDevBuilds(); ModpackBuild GetBuild(string id); - Task NewBuild(string reference); + Task NewBuild(string reference); Task Rebuild(ModpackBuild build); void CancelBuild(ModpackBuild build); Task UpdateReleaseDraft(ModpackRelease release); Task Release(string version); + Task RegnerateReleaseDraftChangelog(string version); + Task CreateDevBuildFromPush(PushWebhookPayload payload); + Task CreateRcBuildFromPush(PushWebhookPayload payload); } } diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index aa378980..5f99ebf4 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -45,7 +45,7 @@ public bool VerifySignature(string signature, string body) { public async Task GetReferenceVersion(string reference) { reference = reference.Split('/')[^1]; - GitHubClient client = await AuthenticateClient(); + GitHubClient client = await GetAuthenticatedClient(); byte[] contentBytes = await client.Repository.Content.GetRawContentByRef(REPO_ORG, REPO_NAME, VERSION_FILE, reference); if (contentBytes.Length == 0) { return "0.0.0"; @@ -65,14 +65,14 @@ public async Task IsReferenceValid(string reference) { } public async Task GetLatestReferenceCommit(string reference) { - GitHubClient client = await AuthenticateClient(); + GitHubClient client = await GetAuthenticatedClient(); GitHubCommit commit = await client.Repository.Commit.Get(REPO_ORG, REPO_NAME, reference); string branch = Regex.Match(reference, @"^[a-fA-F0-9]{40}$").Success ? "None" : reference; return new GithubCommit { branch = branch, before = commit.Parents.FirstOrDefault()?.Sha, after = commit.Sha, message = commit.Commit.Message, author = commit.Commit.Author.Email }; } public async Task MergeBranch(string branch, string sourceBranch, string commitMessage) { - GitHubClient client = await AuthenticateClient(); + GitHubClient client = await GetAuthenticatedClient(); Merge result = await client.Repository.Merging.Create(REPO_ORG, REPO_NAME, new NewMerge(branch, sourceBranch) { CommitMessage = commitMessage }); if (result == null || string.IsNullOrEmpty(result.Sha)) { throw new Exception($"Merge of {sourceBranch} into {branch} failed"); @@ -86,14 +86,14 @@ public async Task GetPushEvent(PushWebhookPayload payload, string latestCommit = payload.Before; } - GitHubClient client = await AuthenticateClient(); + GitHubClient client = await GetAuthenticatedClient(); CompareResult result = await client.Repository.Commit.Compare(REPO_ORG, REPO_NAME, latestCommit, payload.After); string message = result.Commits.Count > 0 ? CombineCommitMessages(result.Commits) : result.BaseCommit.Commit.Message; return new GithubCommit { branch = payload.Ref, baseBranch = payload.BaseRef, before = payload.Before, after = payload.After, message = message, author = payload.HeadCommit.Author.Email }; } public async Task GenerateChangelog(string version) { - GitHubClient client = await AuthenticateClient(); + GitHubClient client = await GetAuthenticatedClient(); IReadOnlyList milestones = await client.Issue.Milestone.GetAllForRepository( REPO_ORG, @@ -133,7 +133,7 @@ public async Task GenerateChangelog(string version) { } public async Task PublishRelease(ModpackRelease release) { - GitHubClient client = await AuthenticateClient(); + GitHubClient client = await GetAuthenticatedClient(); try { await client.Repository.Release.Create( @@ -147,7 +147,7 @@ await client.Repository.Release.Create( } public async Task> GetBranches() { - GitHubClient client = await AuthenticateClient(); + GitHubClient client = await GetAuthenticatedClient(); IReadOnlyList branches = await client.Repository.Branch.GetAll(REPO_ORG, REPO_NAME); List validBranches = new List(); foreach (Branch branch in branches) { @@ -160,7 +160,7 @@ public async Task> GetBranches() { } public async Task> GetHistoricReleases() { - GitHubClient client = await AuthenticateClient(); + GitHubClient client = await GetAuthenticatedClient(); IReadOnlyList releases = await client.Repository.Release.GetAll(REPO_ORG, "modpack"); return releases.Select(x => new ModpackRelease { version = x.Name.Split(" ")[^1], timestamp = x.CreatedAt.DateTime, changelog = FormatChangelog(x.Body) }).ToList(); @@ -218,7 +218,7 @@ private static string FormatChangelog(string body) { return string.Join("\n", lines); } - private async Task AuthenticateClient() { + private async Task GetAuthenticatedClient() { GitHubClient client = new GitHubClient(new ProductHeaderValue(APP_NAME)) { Credentials = new Credentials(GetJwtToken(), AuthenticationType.Bearer) }; AccessToken response = await client.GitHubApps.CreateInstallationToken(APP_INSTALLATION); GitHubClient installationClient = new GitHubClient(new ProductHeaderValue(APP_NAME)) { Credentials = new Credentials(response.Token) }; diff --git a/UKSF.Api.Services/Modpack/ModpackService.cs b/UKSF.Api.Services/Modpack/ModpackService.cs index 6ff4e3f4..e40719c9 100644 --- a/UKSF.Api.Services/Modpack/ModpackService.cs +++ b/UKSF.Api.Services/Modpack/ModpackService.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; +using Octokit; using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Modpack.BuildProcess; @@ -32,11 +33,7 @@ public ModpackService(IReleaseService releaseService, IBuildsService buildsServi public ModpackBuild GetBuild(string id) => buildsService.Data.GetSingle(x => x.id == id); - public async Task NewBuild(string reference) { - if (!await githubService.IsReferenceValid(reference)) { - return false; - } - + public async Task NewBuild(string reference) { GithubCommit commit = await githubService.GetLatestReferenceCommit(reference); if (!string.IsNullOrEmpty(sessionService.GetContextId())) { commit.author = sessionService.GetContextEmail(); @@ -45,7 +42,6 @@ public async Task NewBuild(string reference) { ModpackBuild build = await buildsService.CreateDevBuild(commit); LogWrapper.AuditLog($"New build created ({build.buildNumber})"); buildQueueService.QueueBuild(build); - return true; } public async Task Rebuild(ModpackBuild build) { @@ -73,5 +69,38 @@ public async Task Release(string version) { LogWrapper.AuditLog($"{version} released"); } + + public async Task RegnerateReleaseDraftChangelog(string version) { + ModpackRelease release = releaseService.GetRelease(version); + string newChangelog = await githubService.GenerateChangelog(version); + release.changelog = newChangelog; + + LogWrapper.AuditLog($"Release {version} draft changelog regenerated from github"); + await releaseService.UpdateDraft(release); + } + + public async Task CreateDevBuildFromPush(PushWebhookPayload payload) { + GithubCommit devCommit = await githubService.GetPushEvent(payload); + ModpackBuild devBuild = await buildsService.CreateDevBuild(devCommit); + buildQueueService.QueueBuild(devBuild); + } + + public async Task CreateRcBuildFromPush(PushWebhookPayload payload) { + string rcVersion = await githubService.GetReferenceVersion(payload.Ref); + ModpackRelease release = releaseService.GetRelease(rcVersion); + if (release != null && !release.isDraft) { + LogWrapper.Log($"An attempt to build a release candidate for version {rcVersion} failed because the version has already been released."); + return; + } + + ModpackBuild previousBuild = buildsService.GetLatestRcBuild(rcVersion); + GithubCommit rcCommit = await githubService.GetPushEvent(payload, previousBuild != null ? previousBuild.commit.after : string.Empty); + if (previousBuild == null) { + await releaseService.MakeDraftRelease(rcVersion, rcCommit); + } + + ModpackBuild rcBuild = await buildsService.CreateRcBuild(rcVersion, rcCommit); + buildQueueService.QueueBuild(rcBuild); + } } } diff --git a/UKSF.Api/Controllers/Integrations/GithubController.cs b/UKSF.Api/Controllers/Integrations/GithubController.cs index a625d02a..5f384747 100644 --- a/UKSF.Api/Controllers/Integrations/GithubController.cs +++ b/UKSF.Api/Controllers/Integrations/GithubController.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Runtime.InteropServices.WindowsRuntime; +using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -10,10 +8,7 @@ using Octokit.Internal; using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; -using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers.Integrations { @@ -21,20 +16,17 @@ namespace UKSF.Api.Controllers.Integrations { public class GithubController : Controller { private const string PUSH_EVENT = "push"; private const string REPO_NAME = "BuildTest"; //"modpack"; - private const string MASTER = "refs/heads/master"; private const string DEV = "refs/heads/dev"; private const string RELEASE = "refs/heads/release"; - private readonly IBuildsService buildsService; private readonly IGithubService githubService; + private readonly IModpackService modpackService; private readonly IReleaseService releaseService; - private readonly IBuildQueueService buildQueueService; - public GithubController(IGithubService githubService, IBuildsService buildsService, IReleaseService releaseService, IBuildQueueService buildQueueService) { + public GithubController(IModpackService modpackService, IGithubService githubService, IReleaseService releaseService) { + this.modpackService = modpackService; this.githubService = githubService; - this.buildsService = buildsService; this.releaseService = releaseService; - this.buildQueueService = buildQueueService; } [HttpPost] @@ -54,21 +46,18 @@ [FromBody] JObject body switch (payload.Ref) { case DEV when payload.BaseRef != RELEASE: { - await OnPushDev(payload); + await modpackService.CreateDevBuildFromPush(payload); return Ok(); } case RELEASE: - await OnPushRelease(payload); + await modpackService.CreateRcBuildFromPush(payload); return Ok(); default: return Ok(); } } [HttpGet("branches"), Authorize, Roles(RoleDefinitions.TESTER)] - public async Task GetBranches() { - List branches = await githubService.GetBranches(); - return Ok(branches); - } + public async Task GetBranches() => Ok(await githubService.GetBranches()); [HttpGet("populatereleases"), Authorize, Roles(RoleDefinitions.ADMIN)] public async Task Release() { @@ -76,29 +65,5 @@ public async Task Release() { await releaseService.AddHistoricReleases(releases); return Ok(); } - - private async Task OnPushDev(PushWebhookPayload payload) { - GithubCommit devCommit = await githubService.GetPushEvent(payload); - ModpackBuild devBuild = await buildsService.CreateDevBuild(devCommit); - buildQueueService.QueueBuild(devBuild); - } - - private async Task OnPushRelease(PushWebhookPayload payload) { - string rcVersion = await githubService.GetReferenceVersion(payload.Ref); - ModpackRelease release = releaseService.GetRelease(rcVersion); - if (release != null && !release.isDraft) { - LogWrapper.Log($"An attempt to build a release candidate for version {rcVersion} failed because the version has already been released."); - return; - } - - ModpackBuild previousBuild = buildsService.GetLatestRcBuild(rcVersion); - GithubCommit rcCommit = await githubService.GetPushEvent(payload, previousBuild != null ? previousBuild.commit.after : string.Empty); - if (previousBuild == null) { - await releaseService.MakeDraftRelease(rcVersion, rcCommit); - } - - ModpackBuild rcBuild = await buildsService.CreateRcBuild(rcVersion, rcCommit); - buildQueueService.QueueBuild(rcBuild); - } } } diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs index f0264026..7d70fa78 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Models.Modpack; using UKSF.Api.Services.Personnel; @@ -9,8 +10,12 @@ namespace UKSF.Api.Controllers.Modpack { [Route("[controller]")] public class ModpackController : Controller { private readonly IModpackService modpackService; + private readonly IGithubService githubService; - public ModpackController(IModpackService modpackService) => this.modpackService = modpackService; + public ModpackController(IModpackService modpackService, IGithubService githubService) { + this.modpackService = modpackService; + this.githubService = githubService; + } [HttpGet("releases"), Authorize, Roles(RoleDefinitions.MEMBER)] public IActionResult GetReleases() => Ok(modpackService.GetReleases()); @@ -65,10 +70,20 @@ public async Task Release(string version) { return Ok(); } + [HttpGet("release/{version}/changelog"), Authorize, Roles(RoleDefinitions.ADMIN)] + public async Task RegenerateChangelog(string version) { + await modpackService.RegnerateReleaseDraftChangelog(version); + return Ok(); + } + [HttpGet("newbuild/{reference}"), Authorize, Roles(RoleDefinitions.TESTER)] public async Task NewBuild(string reference) { - bool success = await modpackService.NewBuild(reference); - return !success ? (IActionResult) BadRequest($"{reference} cannot be built as its version does not have the required make files") : Ok(); + if (!await githubService.IsReferenceValid(reference)) { + return BadRequest($"{reference} cannot be built as its version does not have the required make files"); + } + + await modpackService.NewBuild(reference); + return Ok(); } } } diff --git a/UKSF.Api/Controllers/VariablesController.cs b/UKSF.Api/Controllers/VariablesController.cs index be1047ae..d4970eb3 100644 --- a/UKSF.Api/Controllers/VariablesController.cs +++ b/UKSF.Api/Controllers/VariablesController.cs @@ -36,11 +36,6 @@ public IActionResult CheckVariableItem(string key, [FromBody] VariableItem varia return Ok(variablesDataService.GetSingle(x => x.key == key.Keyify())); } - [HttpPost, Authorize] - public IActionResult CheckVariableItem([FromBody] VariableItem variableItem) { - return variableItem != null ? (IActionResult) Ok(variablesDataService.GetSingle(x => x.id != variableItem.id && x.key == variableItem.key.Keyify())) : Ok(); - } - [HttpPut, Authorize] public async Task AddVariableItem([FromBody] VariableItem variableItem) { variableItem.key = variableItem.key.Keyify(); From 8d4dbb6aab5e9fe522fe3fef68e76a9826c59750 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 20 Jul 2020 14:33:37 +0100 Subject: [PATCH 193/369] Removed notification setting, changed dev/rc notification to discord only --- UKSF.Api.Models/Personnel/AccountSettings.cs | 1 - .../BuildProcess/Steps/BuildStep99Notify.cs | 34 +++---------------- 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/UKSF.Api.Models/Personnel/AccountSettings.cs b/UKSF.Api.Models/Personnel/AccountSettings.cs index e3051430..04debf9a 100644 --- a/UKSF.Api.Models/Personnel/AccountSettings.cs +++ b/UKSF.Api.Models/Personnel/AccountSettings.cs @@ -6,7 +6,6 @@ public class AccountSettings { public bool errorEmails = false; public bool notificationsEmail = true; public bool notificationsTeamspeak = true; - public bool notificationsBuilds = false; public bool sr1Enabled = true; public T GetAttribute(string name) { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99Notify.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99Notify.cs index 0d122f61..4305973b 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99Notify.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99Notify.cs @@ -1,32 +1,19 @@ -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Models.Message; using UKSF.Api.Models.Modpack; -using UKSF.Api.Models.Personnel; using UKSF.Api.Services.Admin; using UKSF.Api.Services.Common; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class BuildStep99Notify : BuildStep { public const string NAME = "Notify"; - private IAccountService accountService; private IDiscordService discordService; - private INotificationsService notificationsService; private IReleaseService releaseService; - private IUnitsService unitsService; public override async Task Setup() { await base.Setup(); - unitsService = ServiceWrapper.Provider.GetService(); - accountService = ServiceWrapper.Provider.GetService(); - notificationsService = ServiceWrapper.Provider.GetService(); discordService = ServiceWrapper.Provider.GetService(); releaseService = ServiceWrapper.Provider.GetService(); await Logger.Log("Retrieved services"); @@ -42,19 +29,7 @@ await discordService.SendMessageToEveryone( $"Modpack Update - {release.version}\nChangelog: \n\n{release.description}" ); } else { - string message = GetBuildMessage(); - string link = GetBuildLink(); - - string[] missionsId = VariablesWrapper.VariablesDataService().GetSingle("ROLE_ID_MISSIONS").AsArray(); - string testersId = VariablesWrapper.VariablesDataService().GetSingle("ROLE_ID_TESTERS").AsString(); - List missionMakers = unitsService.Data.GetSingle(x => missionsId.Contains(x.id)).members; - List developers = unitsService.Data.GetSingle(testersId).members; - List accounts = missionMakers.Union(developers).Select(x => accountService.Data.GetSingle(x)).Where(x => x.settings.notificationsBuilds).ToList(); - foreach (Notification notification in accounts.Select(account => new Notification { owner = account.id, icon = NotificationIcons.BUILD, message = message, link = link })) { - notificationsService.Add(notification); - } - - await discordService.SendMessageToEveryone(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_DEV").AsUlong(), GetDiscordMessage()); + await discordService.SendMessage(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_DEV").AsUlong(), GetDiscordMessage()); } await Logger.Log("Notifications sent"); @@ -65,9 +40,10 @@ private string GetBuildMessage() => ? $"New dev build available ({Build.buildNumber}) on the dev repository" : $"New release candidate ({Build.buildNumber}) available for {Build.version} on the stage repository"; - private string GetBuildLink() => Build.isReleaseCandidate ? $"modpack/builds-rc?version={Build.version}&build={Build.id}" : $"modpack/builds-dev?build={Build.id}"; + private string GetBuildLink() => + Build.isReleaseCandidate ? $"https://uk-sf.co.uk/modpack/builds-rc?version={Build.version}&build={Build.id}" : $"https://uk-sf.co.uk/modpack/builds-dev?build={Build.id}"; private string GetDiscordMessage() => - $"Modpack {(Build.isReleaseCandidate ? "RC" : "Dev")} Build - {(Build.isReleaseCandidate ? $"{Build.version} RC# {Build.buildNumber}" : $"#{Build.buildNumber}")}"; + $"Modpack {(Build.isReleaseCandidate ? "RC" : "Dev")} Build - {(Build.isReleaseCandidate ? $"{Build.version} RC# {Build.buildNumber}" : $"#{Build.buildNumber}")}\n{GetBuildMessage()}\n<{GetBuildLink()}>"; } } From d870a45a0a7bdd25fb05cbd81a43490119458d36 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 23 Jul 2020 18:03:11 +0100 Subject: [PATCH 194/369] Tweaks - Added skipped result. - Moved some release build processes to be build steps - Fixed release builds not rebuilding properly - Correctly throw build process errors - Added build step guard to define conditions for steps. If a guard fails the step is skipped. - Changed step log item to be an object, with option to specify colour. - Split build step virtual substeps into two parts, to ensure empty substeps log something --- .../Modpack/BuildProcess/IStepLogger.cs | 6 ++- .../Modpack/BuildProcess/Steps/IBuildStep.cs | 2 + .../Modpack/IModpackService.cs | 1 + UKSF.Api.Models/Modpack/ModpackBuildResult.cs | 3 +- UKSF.Api.Models/Modpack/ModpackBuildStep.cs | 2 +- .../Modpack/ModpackBuildStepLogItem.cs | 6 +++ UKSF.Api.Models/Modpack/ModpackRelease.cs | 1 - .../Integrations/Github/GithubService.cs | 29 +++++++++----- .../BuildProcess/BuildProcessHelper.cs | 33 +++++++++++---- .../BuildProcess/BuildProcessorService.cs | 5 +++ .../Modpack/BuildProcess/BuildStepService.cs | 18 +++++++-- .../Modpack/BuildProcess/StepLogger.cs | 29 +++++++++----- .../Modpack/BuildProcess/Steps/BuildStep.cs | 40 +++++++++++++++++-- .../BuildProcess/Steps/BuildStep0Prep.cs | 17 ++------ .../BuildProcess/Steps/BuildStep1Source.cs | 19 ++++----- .../BuildProcess/Steps/BuildStep2Build.cs | 17 ++++---- .../Steps/BuildStep90PublishRelease.cs | 26 ++++++++++++ ...ldStep99Notify.cs => BuildStep95Notify.cs} | 20 ++++------ .../Steps/BuildStep99MergeRelease.cs | 27 +++++++++++++ UKSF.Api.Services/Modpack/BuildsService.cs | 3 +- UKSF.Api.Services/Modpack/ModpackService.cs | 14 ++++--- UKSF.Api.Services/Modpack/ReleaseService.cs | 7 +--- .../Controllers/Modpack/ModpackController.cs | 4 +- 23 files changed, 227 insertions(+), 102 deletions(-) create mode 100644 UKSF.Api.Models/Modpack/ModpackBuildStepLogItem.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep90PublishRelease.cs rename UKSF.Api.Services/Modpack/BuildProcess/Steps/{BuildStep99Notify.cs => BuildStep95Notify.cs} (65%) create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99MergeRelease.cs diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs index fb71bfc0..cd42041a 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs @@ -5,8 +5,10 @@ namespace UKSF.Api.Interfaces.Modpack.BuildProcess { public interface IStepLogger { Task LogStart(); Task LogSuccess(); - Task LogError(Exception exception); Task LogCancelled(); - Task Log(string log); + Task LogSkipped(); + Task LogWarning(string message); + Task LogError(Exception exception); + Task Log(string log, string colour = ""); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs index b526a4ac..4364c578 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs @@ -7,11 +7,13 @@ namespace UKSF.Api.Interfaces.Modpack.BuildProcess.Steps { public interface IBuildStep { void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func updateCallback, CancellationTokenSource cancellationTokenSource); Task Start(); + Task CheckGuards(); Task Setup(); Task Process(); Task Teardown(); Task Succeed(); Task Fail(Exception exception); Task Cancel(); + Task Skip(); } } diff --git a/UKSF.Api.Interfaces/Modpack/IModpackService.cs b/UKSF.Api.Interfaces/Modpack/IModpackService.cs index 86349778..cb7a09f1 100644 --- a/UKSF.Api.Interfaces/Modpack/IModpackService.cs +++ b/UKSF.Api.Interfaces/Modpack/IModpackService.cs @@ -8,6 +8,7 @@ public interface IModpackService { List GetReleases(); List GetRcBuilds(); List GetDevBuilds(); + ModpackRelease GetRelease(string version); ModpackBuild GetBuild(string id); Task NewBuild(string reference); Task Rebuild(ModpackBuild build); diff --git a/UKSF.Api.Models/Modpack/ModpackBuildResult.cs b/UKSF.Api.Models/Modpack/ModpackBuildResult.cs index 8a84cebe..2af1adac 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuildResult.cs +++ b/UKSF.Api.Models/Modpack/ModpackBuildResult.cs @@ -3,6 +3,7 @@ public enum ModpackBuildResult { NONE, SUCCESS, FAILED, - CANCELLED + CANCELLED, + SKIPPED } } diff --git a/UKSF.Api.Models/Modpack/ModpackBuildStep.cs b/UKSF.Api.Models/Modpack/ModpackBuildStep.cs index 221ff8b2..d7481e82 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuildStep.cs +++ b/UKSF.Api.Models/Modpack/ModpackBuildStep.cs @@ -8,7 +8,7 @@ public class ModpackBuildStep { public DateTime endTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); public bool finished; public int index; - public List logs = new List(); + public List logs = new List(); public string name; public bool running; public DateTime startTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); diff --git a/UKSF.Api.Models/Modpack/ModpackBuildStepLogItem.cs b/UKSF.Api.Models/Modpack/ModpackBuildStepLogItem.cs new file mode 100644 index 00000000..e10a37c3 --- /dev/null +++ b/UKSF.Api.Models/Modpack/ModpackBuildStepLogItem.cs @@ -0,0 +1,6 @@ +namespace UKSF.Api.Models.Modpack { + public class ModpackBuildStepLogItem { + public string text; + public string colour; + } +} diff --git a/UKSF.Api.Models/Modpack/ModpackRelease.cs b/UKSF.Api.Models/Modpack/ModpackRelease.cs index e5cdfcd8..6e818b07 100644 --- a/UKSF.Api.Models/Modpack/ModpackRelease.cs +++ b/UKSF.Api.Models/Modpack/ModpackRelease.cs @@ -8,7 +8,6 @@ public class ModpackRelease : DatabaseObject { [BsonRepresentation(BsonType.ObjectId)] public string creatorId; public string description; public bool isDraft; - [BsonRepresentation(BsonType.ObjectId)] public string releaserId; public DateTime timestamp; public string version; } diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 5f99ebf4..7a259a37 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -61,7 +61,7 @@ public async Task IsReferenceValid(string reference) { string version = await GetReferenceVersion(reference); int[] versionParts = version.Split('.').Select(int.Parse).ToArray(); // TODO: Update minor with version with udpated make for this build system - return versionParts[0] >= 5;// && versionParts[1] > 18; + return versionParts[0] >= 5; // && versionParts[1] > 18; } public async Task GetLatestReferenceCommit(string reference) { @@ -94,21 +94,14 @@ public async Task GetPushEvent(PushWebhookPayload payload, string public async Task GenerateChangelog(string version) { GitHubClient client = await GetAuthenticatedClient(); - - IReadOnlyList milestones = await client.Issue.Milestone.GetAllForRepository( - REPO_ORG, - "modpack", - new MilestoneRequest { State = ItemStateFilter.Open } - ); // TODO: Repo name setting - Milestone milestone = milestones.FirstOrDefault(x => x.Title == version); + Milestone milestone = await GetOpenMilestone(version); if (milestone == null) { - LogWrapper.Log($"Could not find open milestone for version {version}"); return "No milestone found"; } IReadOnlyList issues = await client.Issue.GetAllForRepository( REPO_ORG, - "modpack", + REPO_NAME, new RepositoryIssueRequest { Milestone = milestone.Number.ToString(), State = ItemStateFilter.Closed } ); @@ -141,6 +134,11 @@ await client.Repository.Release.Create( REPO_NAME, new NewRelease(release.version) { Name = $"Modpack Version {release.version}", Body = $"{release.description}\n\n{release.changelog.Replace("
", "")}" } ); + + Milestone milestone = await GetOpenMilestone(release.version); + if (milestone != null) { + await client.Issue.Milestone.Update(REPO_ORG, REPO_NAME, milestone.Number, new MilestoneUpdate { State = ItemState.Closed }); + } } catch (Exception exception) { LogWrapper.Log(exception); } @@ -170,6 +168,17 @@ private static string CombineCommitMessages(IEnumerable commits) { return commits.Select(x => x.Commit.Message).Reverse().Aggregate((a, b) => $"{a}\n\n{b}"); } + private async Task GetOpenMilestone(string version) { + GitHubClient client = await GetAuthenticatedClient(); + IReadOnlyList milestones = await client.Issue.Milestone.GetAllForRepository(REPO_ORG, REPO_NAME, new MilestoneRequest { State = ItemStateFilter.Open }); + Milestone milestone = milestones.FirstOrDefault(x => x.Title == version); + if (milestone == null) { + LogWrapper.Log($"Could not find open milestone for version {version}"); + } + + return milestone; + } + private static void AddChangelogSection(ref string changelog, IReadOnlyCollection issues, string header) { if (issues.Any()) { changelog += $"#### {header}"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index 9872ce29..6699a715 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -9,7 +9,7 @@ namespace UKSF.Api.Services.Modpack.BuildProcess { public static class BuildProcessHelper { - public static void RunProcess(IStepLogger logger, CancellationToken cancellationToken, string executable, string args, string workingDirectory) { + public static void RunProcess(IStepLogger logger, bool raiseErrors, CancellationToken cancellationToken, string executable, string workingDirectory, string args) { using Process process = new Process { StartInfo = { FileName = executable, @@ -25,7 +25,14 @@ public static void RunProcess(IStepLogger logger, CancellationToken cancellation try { process.EnableRaisingEvents = false; process.OutputDataReceived += (sender, receivedEventArgs) => logger.Log(receivedEventArgs.Data); - process.ErrorDataReceived += (sender, receivedEventArgs) => logger.LogError(new Exception(receivedEventArgs.Data)); + process.ErrorDataReceived += (sender, receivedEventArgs) => { + Exception exception = new Exception(receivedEventArgs.Data); + if (raiseErrors) { + throw exception; + } + + logger.LogError(exception); + }; using CancellationTokenRegistration unused = cancellationToken.Register(process.Kill); process.Start(); process.BeginOutputReadLine(); @@ -40,8 +47,8 @@ public static void RunProcess(IStepLogger logger, CancellationToken cancellation } } - [SuppressMessage("ReSharper", "MethodHasAsyncOverload")] - public static async Task RunPowershell(IStepLogger logger, CancellationToken cancellationToken, string command, string workingDirectory, params string[] args) { + [SuppressMessage("ReSharper", "MethodHasAsyncOverload")] // async runspace.OpenAsync is not as it seems + public static async Task RunPowershell(IStepLogger logger, bool raiseErrors, CancellationToken cancellationToken, string command, string workingDirectory, params string[] args) { using Runspace runspace = RunspaceFactory.CreateRunspace(); runspace.Open(); runspace.SessionStateProxy.Path.SetLocation(workingDirectory); @@ -59,10 +66,11 @@ async void Log(object sender, DataAddedEventArgs eventArgs) { await logger.Log(currentStreamRecord?.MessageData.ToString()); } - async void Error(object sender, DataAddedEventArgs eventArgs) { - PSDataCollection streamObjectsReceived = sender as PSDataCollection; - InformationRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; - await logger.LogError(new Exception(currentStreamRecord?.MessageData.ToString())); + Exception exception = null; + void Error(object sender, DataAddedEventArgs eventArgs) { + PSDataCollection streamObjectsReceived = sender as PSDataCollection; + ErrorRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; + exception = currentStreamRecord?.Exception; } powerShell.Streams.Information.DataAdded += Log; @@ -70,6 +78,15 @@ async void Error(object sender, DataAddedEventArgs eventArgs) { powerShell.Streams.Error.DataAdded += Error; PSDataCollection result = await powerShell.InvokeAsync(cancellationToken); + if (exception != null) { + if (raiseErrors) { + runspace.Close(); + throw exception; + } + + await logger.LogError(exception); + } + foreach (PSObject psObject in result) { await logger.Log(psObject.BaseObject.ToString()); } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs index 44aa6f12..223e371a 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs @@ -30,6 +30,11 @@ public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cance try { await step.Start(); + if (!await step.CheckGuards()) { + await step.Skip(); + continue; + } + await step.Setup(); await step.Process(); await step.Teardown(); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index f5aad18b..453a3cba 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -11,7 +11,9 @@ public class BuildStepService : IBuildStepService { { BuildStep0Prep.NAME, typeof(BuildStep0Prep) }, { BuildStep1Source.NAME, typeof(BuildStep1Source) }, { BuildStep2Build.NAME, typeof(BuildStep2Build) }, - { BuildStep99Notify.NAME, typeof(BuildStep99Notify) } + { BuildStep90PublishRelease.NAME, typeof(BuildStep90PublishRelease) }, + { BuildStep95Notify.NAME, typeof(BuildStep95Notify) }, + { BuildStep99MergeRelease.NAME, typeof(BuildStep99MergeRelease) } }; public IBuildStep ResolveBuildStep(string buildStepName) { @@ -26,7 +28,10 @@ public IBuildStep ResolveBuildStep(string buildStepName) { public List GetStepsForBuild() { List steps = new List { - new ModpackBuildStep(BuildStep0Prep.NAME), new ModpackBuildStep(BuildStep1Source.NAME), new ModpackBuildStep(BuildStep2Build.NAME), new ModpackBuildStep(BuildStep99Notify.NAME) + new ModpackBuildStep(BuildStep0Prep.NAME), + new ModpackBuildStep(BuildStep1Source.NAME), + new ModpackBuildStep(BuildStep2Build.NAME), + new ModpackBuildStep(BuildStep95Notify.NAME) }; ResolveIndices(steps); return steps; @@ -34,14 +39,19 @@ public List GetStepsForBuild() { public List GetStepsForRc() { List steps = new List { - new ModpackBuildStep(BuildStep0Prep.NAME), new ModpackBuildStep(BuildStep1Source.NAME), new ModpackBuildStep(BuildStep2Build.NAME), new ModpackBuildStep(BuildStep99Notify.NAME) + new ModpackBuildStep(BuildStep0Prep.NAME), new ModpackBuildStep(BuildStep1Source.NAME), new ModpackBuildStep(BuildStep2Build.NAME), new ModpackBuildStep(BuildStep95Notify.NAME) }; ResolveIndices(steps); return steps; } public List GetStepsForRelease() { - List steps = new List { new ModpackBuildStep(BuildStep0Prep.NAME), new ModpackBuildStep(BuildStep99Notify.NAME) }; + List steps = new List { + new ModpackBuildStep(BuildStep0Prep.NAME), + new ModpackBuildStep(BuildStep90PublishRelease.NAME), + new ModpackBuildStep(BuildStep95Notify.NAME), + new ModpackBuildStep(BuildStep99MergeRelease.NAME) + }; ResolveIndices(steps); return steps; } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs index 2f8d7306..10e3ad81 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs @@ -19,29 +19,38 @@ public async Task LogStart() { } public async Task LogSuccess() { - LogLines($"\nFinished: {buildStep.name}"); + LogLines($"\nFinished: {buildStep.name}", "green"); await logCallback(); } - public async Task LogError(Exception exception) { - LogLines($"\nError: {exception.Message}\n{exception.StackTrace}"); - LogLines($"\nFailed: {buildStep.name}"); + public async Task LogCancelled() { + LogLines("\nBuild cancelled", "goldenrod"); await logCallback(); } - public async Task LogCancelled() { - LogLines("\nBuild cancelled"); + public async Task LogSkipped() { + LogLines($"\nSkipped: {buildStep.name}", "orange"); + await logCallback(); + } + + public async Task LogWarning(string message) { + LogLines($"Warning\n{message}", "orange"); + await logCallback(); + } + + public async Task LogError(Exception exception) { + LogLines($"Error\n{exception.Message}\n{exception.StackTrace}\n\nFailed: {buildStep.name}", "red"); await logCallback(); } - public async Task Log(string log) { - LogLines(log); + public async Task Log(string log, string colour = "") { + LogLines(log, colour); await logCallback(); } - private void LogLines(string log) { + private void LogLines(string log, string colour = "") { foreach (string line in log.Split("\n")) { - buildStep.logs.Add(line); + buildStep.logs.Add(new ModpackBuildStepLogItem {text = line, colour = string.IsNullOrEmpty(line) ? "" : colour}); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs index b9770647..1cc86353 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs @@ -7,6 +7,8 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class BuildStep : IBuildStep { + protected const string COLOUR_BLUE = "#0c78ff"; + protected ModpackBuild Build; private ModpackBuildStep buildStep; protected CancellationTokenSource CancellationTokenSource; @@ -28,19 +30,24 @@ public async Task Start() { await Logger.LogStart(); } + public virtual Task CheckGuards() => Task.FromResult(true); + public virtual async Task Setup() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); - await Logger.Log("\nSetup"); + await Logger.Log("\nSetup", COLOUR_BLUE); + await SetupExecute(); } public virtual async Task Process() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); - await Logger.Log("\nProcess"); + await Logger.Log("\nProcess", COLOUR_BLUE); + await ProcessExecute(); } public virtual async Task Teardown() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); - await Logger.Log("\nTeardown"); + await Logger.Log("\nTeardown", COLOUR_BLUE); + await TeardownExecute(); } public async Task Succeed() { @@ -61,6 +68,33 @@ public async Task Cancel() { await Stop(); } + public async Task Skip() { + await Logger.LogSkipped(); + buildStep.buildResult = ModpackBuildResult.SKIPPED; + await Stop(); + } + + protected virtual async Task SetupExecute() { + await Logger.Log("---"); + } + + protected virtual async Task ProcessExecute() { + await Logger.Log("---"); + } + + protected virtual async Task TeardownExecute() { + await Logger.Log("---"); + } + + protected async Task ReleaseBuildGuard() { + if (!Build.isRelease) { + await Logger.LogWarning("Build is not a release build, but the definition contains a release step.\nThis is a configuration error, please notify an admin."); + return false; + } + + return true; + } + private async Task LogCallback() { await updateCallback(); } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs index b9335186..52da9053 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs @@ -6,22 +6,11 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class BuildStep0Prep : BuildStep { public const string NAME = "Prep"; - public override async Task Setup() { - await base.Setup(); - await Logger.Log("Nothing to do"); - } - - public override async Task Process() { - await base.Process(); + protected override async Task ProcessExecute() { await TaskUtilities.Delay(TimeSpan.FromSeconds(2), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "subst", "C:/", "P:", "\"D:/Arma/Arma 3 Projects\""); + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "subst", "C:/", "P:", "\"D:/Arma/Arma 3 Projects\""); await TaskUtilities.Delay(TimeSpan.FromSeconds(2), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "subst", "C:/"); - } - - public override async Task Teardown() { - await base.Teardown(); - await Logger.Log("Nothing to do"); + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "subst", "C:/"); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1Source.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1Source.cs index 732d1d8c..835c5907 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1Source.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1Source.cs @@ -6,24 +6,21 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class BuildStep1Source : BuildStep { public const string NAME = "Pull source"; - public override async Task Setup() { - await base.Setup(); + protected override async Task SetupExecute() { await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfihjugdfhjodfgh"); + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfihjugdfhjodfgh"); } - public override async Task Process() { - await base.Process(); + protected override async Task ProcessExecute() { await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfi4y5hu654hhjugdfhjodfgh"); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfihjtyfghrtytrtryfghfghfghugdfhjodfgh"); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "4665uhftfghtfghfhgfgh"); + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfi4y5hu654hhjugdfhjodfgh"); + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfihjtyfghrtytrtryfghfghfghugdfhjodfgh"); + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", "4665uhftfghtfghfhgfgh"); } - public override async Task Teardown() { - await base.Teardown(); + protected override async Task TeardownExecute() { await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfihjtyfghfghfghfghugdfhjodfgh"); + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfihjtyfghfghfghfghugdfhjodfgh"); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs index 281d4090..42d37381 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs @@ -6,25 +6,22 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class BuildStep2Build : BuildStep { public const string NAME = "Build"; - public override async Task Setup() { - await base.Setup(); + protected override async Task SetupExecute() { await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "y45 4y5 dgfh"); + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", "ibguyredsrgiuhbi7dh54t"); } - public override async Task Process() { - await base.Process(); + protected override async Task ProcessExecute() { await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); for (int i = 0; i < 100; i++) { - await TaskUtilities.Delay(TimeSpan.FromMilliseconds(50), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", Guid.NewGuid().ToString()); + await TaskUtilities.Delay(TimeSpan.FromMilliseconds(25), CancellationTokenSource.Token); + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", Guid.NewGuid().ToString()); } } - public override async Task Teardown() { - await base.Teardown(); + protected override async Task TeardownExecute() { await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "echo", "C:/", "hfg"); + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", "hfg"); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep90PublishRelease.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep90PublishRelease.cs new file mode 100644 index 00000000..2913007c --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep90PublishRelease.cs @@ -0,0 +1,26 @@ +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Services.Common; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { + public class BuildStep90PublishRelease : BuildStep { + public const string NAME = "Publish"; + private IReleaseService releaseService; + + public override async Task CheckGuards() { + await Logger.Log("\nChecking step guards", COLOUR_BLUE); + return await ReleaseBuildGuard(); + } + + protected override async Task SetupExecute() { + releaseService = ServiceWrapper.Provider.GetService(); + await Logger.Log("Retrieved services"); + } + + protected override async Task ProcessExecute() { + await releaseService.PublishRelease(Build.version); + await Logger.Log("Release published"); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99Notify.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep95Notify.cs similarity index 65% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99Notify.cs rename to UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep95Notify.cs index 4305973b..c184cfd4 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99Notify.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep95Notify.cs @@ -7,27 +7,21 @@ using UKSF.Api.Services.Common; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { - public class BuildStep99Notify : BuildStep { + public class BuildStep95Notify : BuildStep { public const string NAME = "Notify"; private IDiscordService discordService; private IReleaseService releaseService; - public override async Task Setup() { - await base.Setup(); + protected override async Task SetupExecute() { discordService = ServiceWrapper.Provider.GetService(); releaseService = ServiceWrapper.Provider.GetService(); await Logger.Log("Retrieved services"); } - public override async Task Process() { - await base.Process(); - + protected override async Task ProcessExecute() { if (Build.isRelease) { ModpackRelease release = releaseService.GetRelease(Build.version); - await discordService.SendMessageToEveryone( - VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_RELEASE").AsUlong(), - $"Modpack Update - {release.version}\nChangelog: \n\n{release.description}" - ); + await discordService.SendMessageToEveryone(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_RELEASE").AsUlong(), GetDiscordMessage(release)); } else { await discordService.SendMessage(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_DEV").AsUlong(), GetDiscordMessage()); } @@ -43,7 +37,9 @@ private string GetBuildMessage() => private string GetBuildLink() => Build.isReleaseCandidate ? $"https://uk-sf.co.uk/modpack/builds-rc?version={Build.version}&build={Build.id}" : $"https://uk-sf.co.uk/modpack/builds-dev?build={Build.id}"; - private string GetDiscordMessage() => - $"Modpack {(Build.isReleaseCandidate ? "RC" : "Dev")} Build - {(Build.isReleaseCandidate ? $"{Build.version} RC# {Build.buildNumber}" : $"#{Build.buildNumber}")}\n{GetBuildMessage()}\n<{GetBuildLink()}>"; + private string GetDiscordMessage(ModpackRelease release = null) => + release == null + ? $"Modpack {(Build.isReleaseCandidate ? "RC" : "Dev")} Build - {(Build.isReleaseCandidate ? $"{Build.version} RC# {Build.buildNumber}" : $"#{Build.buildNumber}")}\n{GetBuildMessage()}\n<{GetBuildLink()}>" + : $"Modpack Update - {release.version}\nChangelog: \n\n{release.description}"; } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99MergeRelease.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99MergeRelease.cs new file mode 100644 index 00000000..1b54f5fd --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99MergeRelease.cs @@ -0,0 +1,27 @@ +using System; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Interfaces.Integrations.Github; +using UKSF.Api.Services.Common; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { + public class BuildStep99MergeRelease : BuildStep { + public const string NAME = "Merge"; + private IGithubService githubService; + + protected override async Task SetupExecute() { + githubService = ServiceWrapper.Provider.GetService(); + await Logger.Log("Retrieved services"); + } + + protected override async Task ProcessExecute() { + try { + await githubService.MergeBranch("dev", "release", $"Release {Build.version}"); + await githubService.MergeBranch("master", "dev", $"Release {Build.version}"); + await Logger.Log("Release branch merges complete"); + } catch (Exception exception) { + await Logger.LogWarning($"Release branch merges failed:\n\n{exception}"); + } + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildsService.cs b/UKSF.Api.Services/Modpack/BuildsService.cs index ef6b255c..779ec750 100644 --- a/UKSF.Api.Services/Modpack/BuildsService.cs +++ b/UKSF.Api.Services/Modpack/BuildsService.cs @@ -79,13 +79,12 @@ public async Task CreateRebuild(ModpackBuild build) { version = build.isRelease || build.isReleaseCandidate ? build.version : null, buildNumber = build.buildNumber + 1, isReleaseCandidate = build.isReleaseCandidate, - isRelease = build.isRelease, steps = build.isReleaseCandidate ? buildStepService.GetStepsForRc() : buildStepService.GetStepsForBuild(), commit = build.commit, builderId = sessionService.GetContextId() }; - rebuild.commit.message = $"Rebuild of #{build.buildNumber}\n\n{rebuild.commit.message}"; + rebuild.commit.message = rebuild.isRelease ? $"Re-deployment of release {rebuild.version}" : $"Rebuild of #{build.buildNumber}\n\n{rebuild.commit.message}"; await Data.Add(rebuild); return rebuild; } diff --git a/UKSF.Api.Services/Modpack/ModpackService.cs b/UKSF.Api.Services/Modpack/ModpackService.cs index e40719c9..084b6b9a 100644 --- a/UKSF.Api.Services/Modpack/ModpackService.cs +++ b/UKSF.Api.Services/Modpack/ModpackService.cs @@ -31,6 +31,8 @@ public ModpackService(IReleaseService releaseService, IBuildsService buildsServi public List GetDevBuilds() => buildsService.GetDevBuilds(); + public ModpackRelease GetRelease(string version) => releaseService.GetRelease(version); + public ModpackBuild GetBuild(string id) => buildsService.Data.GetSingle(x => x.id == id); public async Task NewBuild(string reference) { @@ -40,18 +42,18 @@ public async Task NewBuild(string reference) { } ModpackBuild build = await buildsService.CreateDevBuild(commit); - LogWrapper.AuditLog($"New build created ({build.buildNumber})"); + LogWrapper.AuditLog($"New build created ({GetBuildName(build)})"); buildQueueService.QueueBuild(build); } public async Task Rebuild(ModpackBuild build) { - LogWrapper.AuditLog($"Rebuild triggered for {build.buildNumber}."); + LogWrapper.AuditLog($"Rebuild triggered for {GetBuildName(build)}."); ModpackBuild rebuild = await buildsService.CreateRebuild(build); buildQueueService.QueueBuild(rebuild); } public void CancelBuild(ModpackBuild build) { - LogWrapper.AuditLog($"Build {build.buildNumber} cancelled"); + LogWrapper.AuditLog($"Build {GetBuildName(build)} cancelled"); buildQueueService.Cancel(build.id); } @@ -61,11 +63,8 @@ public async Task UpdateReleaseDraft(ModpackRelease release) { } public async Task Release(string version) { - await releaseService.PublishRelease(version); ModpackBuild releaseBuild = await buildsService.CreateReleaseBuild(version); buildQueueService.QueueBuild(releaseBuild); - await githubService.MergeBranch("dev", "release", $"Release {version}"); - await githubService.MergeBranch("master", "dev", $"Release {version}"); LogWrapper.AuditLog($"{version} released"); } @@ -102,5 +101,8 @@ public async Task CreateRcBuildFromPush(PushWebhookPayload payload) { ModpackBuild rcBuild = await buildsService.CreateRcBuild(rcVersion, rcCommit); buildQueueService.QueueBuild(rcBuild); } + + private static string GetBuildName(ModpackBuild build) => + $"{(build.isRelease ? $"release {build.version}" : $"{(build.isReleaseCandidate ? $"{build.version} RC# {build.buildNumber}" : $"#{build.buildNumber}")}")}"; } } diff --git a/UKSF.Api.Services/Modpack/ReleaseService.cs b/UKSF.Api.Services/Modpack/ReleaseService.cs index ba8f1f20..2a6eedc4 100644 --- a/UKSF.Api.Services/Modpack/ReleaseService.cs +++ b/UKSF.Api.Services/Modpack/ReleaseService.cs @@ -7,19 +7,16 @@ using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Services.Modpack { public class ReleaseService : DataBackedService, IReleaseService { private readonly IGithubService githubService; - private readonly ISessionService sessionService; private readonly IAccountService accountService; - public ReleaseService(IReleasesDataService data, IGithubService githubService, ISessionService sessionService, IAccountService accountService) : base(data) { + public ReleaseService(IReleasesDataService data, IGithubService githubService, IAccountService accountService) : base(data) { this.githubService = githubService; - this.sessionService = sessionService; this.accountService = accountService; } @@ -43,7 +40,7 @@ public async Task PublishRelease(string version) { throw new NullReferenceException($"Could not find release {version}"); } - await Data.Update(release.id, Builders.Update.Set(x => x.timestamp, DateTime.Now).Set(x => x.isDraft, false).Set(x => x.releaserId, sessionService.GetContextId())); + await Data.Update(release.id, Builders.Update.Set(x => x.timestamp, DateTime.Now).Set(x => x.isDraft, false)); await githubService.PublishRelease(release); } diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs index 7d70fa78..cc495352 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -9,8 +9,8 @@ namespace UKSF.Api.Controllers.Modpack { [Route("[controller]")] public class ModpackController : Controller { - private readonly IModpackService modpackService; private readonly IGithubService githubService; + private readonly IModpackService modpackService; public ModpackController(IModpackService modpackService, IGithubService githubService) { this.modpackService = modpackService; @@ -73,7 +73,7 @@ public async Task Release(string version) { [HttpGet("release/{version}/changelog"), Authorize, Roles(RoleDefinitions.ADMIN)] public async Task RegenerateChangelog(string version) { await modpackService.RegnerateReleaseDraftChangelog(version); - return Ok(); + return Ok(modpackService.GetRelease(version)); } [HttpGet("newbuild/{reference}"), Authorize, Roles(RoleDefinitions.TESTER)] From 313f276f806f3ec779809010ff6388fd219ae314 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 23 Jul 2020 20:17:44 +0100 Subject: [PATCH 195/369] Edited servers to use modpack environments - Added server environment setting - Make server mods read from environment repo path - Renamed some site variables --- .../Game/IGameServersService.cs | 3 +- UKSF.Api.Models/Game/GameServer.cs | 11 ++- UKSF.Api.Services/Game/GameServerHelpers.cs | 21 ++++- UKSF.Api.Services/Game/GameServersService.cs | 32 ++++++-- .../Game/Missions/MissionPatchingService.cs | 2 +- .../Game/Missions/MissionService.cs | 6 +- UKSF.Api.Services/Personnel/LoginService.cs | 6 +- .../Personnel/RecruitmentService.cs | 2 +- .../CommandRequestsController.cs | 2 +- UKSF.Api/Controllers/DischargesController.cs | 2 +- UKSF.Api/Controllers/GameServersController.cs | 78 ++++++++++++------- UKSF.Common/ChangeUtilities.cs | 10 +-- UKSF.Tests/testdata/variables.json | 2 +- 13 files changed, 115 insertions(+), 62 deletions(-) diff --git a/UKSF.Api.Interfaces/Game/IGameServersService.cs b/UKSF.Api.Interfaces/Game/IGameServersService.cs index 925f8fbd..a07d9aab 100644 --- a/UKSF.Api.Interfaces/Game/IGameServersService.cs +++ b/UKSF.Api.Interfaces/Game/IGameServersService.cs @@ -17,6 +17,7 @@ public interface IGameServersService : IDataBackedService GetAvailableMods(); + List GetAvailableMods(string id); + List GetEnvironmentMods(GameServerEnvironment environment); } } diff --git a/UKSF.Api.Models/Game/GameServer.cs b/UKSF.Api.Models/Game/GameServer.cs index a0cc6de7..8b397e9e 100644 --- a/UKSF.Api.Models/Game/GameServer.cs +++ b/UKSF.Api.Models/Game/GameServer.cs @@ -2,6 +2,12 @@ using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Game { + public enum GameServerEnvironment { + RELEASE, + STAGE, + DEV + } + public enum GameServerOption { NONE, SINGLETON, @@ -22,11 +28,12 @@ public class GameServer : DatabaseObject { public int port; [BsonIgnore] public int? processId; public string profileName; - public string serverMods; + public GameServerEnvironment serverEnvironment; + public List serverMods = new List(); public GameServerOption serverOption; [BsonIgnore] public GameServerStatus status = new GameServerStatus(); - public override string ToString() => $"{name}, {port}, {apiPort}, {numberHeadlessClients}, {profileName}, {hostName}, {password}, {adminPassword}, {serverOption}, {serverMods}"; + public override string ToString() => $"{name}, {port}, {apiPort}, {numberHeadlessClients}, {profileName}, {hostName}, {password}, {adminPassword}, {serverEnvironment}, {serverOption}"; } public class GameServerStatus { diff --git a/UKSF.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.Services/Game/GameServerHelpers.cs index 5a343d90..0a6ff0d0 100644 --- a/UKSF.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.Services/Game/GameServerHelpers.cs @@ -68,9 +68,23 @@ public static string GetGameServerConfigPath(this GameServer gameServer) => private static string GetHeadlessClientName(int index) => VariablesWrapper.VariablesDataService().GetSingle("HEADLESS_CLIENT_NAMES").AsArray()[index]; - private static string FormatGameServerMods(this GameServer gameServer) => gameServer.mods.Count > 0 ? $"{string.Join(";", gameServer.mods.Select(x => x.pathRelativeToServerExecutable ?? x.path))};" : string.Empty; + private static string FormatGameServerMods(this GameServer gameServer) => + gameServer.mods.Count > 0 ? $"{string.Join(";", gameServer.mods.Select(x => x.pathRelativeToServerExecutable ?? x.path))};" : string.Empty; + + private static string FormatGameServerServerMods(this GameServer gameServer) => + gameServer.serverMods.Count > 0 ? $"{string.Join(";", gameServer.serverMods.Select(x => x.name))};" : string.Empty; + + public static string GetGameServerModsPaths(GameServerEnvironment environment) { + string variableKey = environment switch { + GameServerEnvironment.RELEASE => "REPO_RELEASE", + GameServerEnvironment.STAGE => "REPO_STAGE", + GameServerEnvironment.DEV => "REPO_DEV", + _ => throw new ArgumentException("Server environment is invalid") + }; + return VariablesWrapper.VariablesDataService().GetSingle(variableKey).AsString(); + } - public static IEnumerable GetGameServerModsPaths() => VariablesWrapper.VariablesDataService().GetSingle("MODS_PATHS").AsArray(x => x.RemoveQuotes()); + public static IEnumerable GetGameServerExtraModsPaths() => VariablesWrapper.VariablesDataService().GetSingle("SERVERS_EXTRA_MODS").AsArray(x => x.RemoveQuotes()); public static string FormatGameServerConfig(this GameServer gameServer, int playerCount, string missionSelection) => string.Format(string.Join("\n", BASE_CONFIG), gameServer.hostName, gameServer.password, gameServer.adminPassword, playerCount, missionSelection.Replace(".pbo", "")); @@ -82,7 +96,7 @@ public static string FormatGameServerLaunchArguments(this GameServer gameServer) $" -name={gameServer.name}" + $" -port={gameServer.port}" + $" -apiport=\"{gameServer.apiPort}\"" + - $" {(string.IsNullOrEmpty(gameServer.serverMods) ? "" : $"-serverMod={gameServer.serverMods}")}" + + $" {(string.IsNullOrEmpty(gameServer.FormatGameServerServerMods()) ? "" : $"-serverMod={gameServer.FormatGameServerServerMods()}")}" + $" {(string.IsNullOrEmpty(gameServer.FormatGameServerMods()) ? "" : $"-mod={gameServer.FormatGameServerMods()}")}" + $" {(GetGameServerExecutablePath().Contains("server") ? "" : "-server")}" + " -bandwidthAlg=2 -hugepages -loadMissionToMemory -filePatching -limitFPS=200"; @@ -109,6 +123,7 @@ public static int GetMaxCuratorCountFromSettings() { LogWrapper.Log("Could not find max curators in server settings file. Loading hardcoded deault '5'"); return 5; } + curatorsMaxString = curatorsMaxString.Split("=")[1].RemoveSpaces().Replace(";", ""); return int.Parse(curatorsMaxString); } diff --git a/UKSF.Api.Services/Game/GameServersService.cs b/UKSF.Api.Services/Game/GameServersService.cs index 6ff87715..612a11f2 100644 --- a/UKSF.Api.Services/Game/GameServersService.cs +++ b/UKSF.Api.Services/Game/GameServersService.cs @@ -43,6 +43,7 @@ public async Task GetGameServerStatus(GameServer gameServer) { using HttpClient client = new HttpClient(); client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + client.Timeout = TimeSpan.FromMilliseconds(5); // TODO: REMOVE try { HttpResponseMessage response = await client.GetAsync($"http://localhost:{gameServer.apiPort}/server"); if (!response.IsSuccessStatusCode) { @@ -66,7 +67,8 @@ public async Task PatchMissionFile(string missionName) { return result; } - public void WriteServerConfig(GameServer gameServer, int playerCount, string missionSelection) => File.WriteAllText(gameServer.GetGameServerConfigPath(), gameServer.FormatGameServerConfig(playerCount, missionSelection)); + public void WriteServerConfig(GameServer gameServer, int playerCount, string missionSelection) => + File.WriteAllText(gameServer.GetGameServerConfigPath(), gameServer.FormatGameServerConfig(playerCount, missionSelection)); public async Task LaunchGameServer(GameServer gameServer) { string launchArguments = gameServer.FormatGameServerLaunchArguments(); @@ -146,15 +148,22 @@ public int KillAllArmaProcesses() { return processes.Count; } - public List GetAvailableMods() { + public List GetAvailableMods(string id) { + GameServer gameServer = Data.GetSingle(id); Uri serverExecutable = new Uri(GameServerHelpers.GetGameServerExecutablePath()); List mods = new List(); - foreach (string modsPath in GameServerHelpers.GetGameServerModsPaths()) { - IEnumerable folders = new DirectoryInfo(modsPath).EnumerateDirectories("@*", SearchOption.TopDirectoryOnly); - foreach (DirectoryInfo folder in folders) { - IEnumerable modFiles = new DirectoryInfo(folder.FullName).EnumerateFiles("*.pbo", SearchOption.AllDirectories); + IEnumerable availableModsFolders = new[] { GameServerHelpers.GetGameServerModsPaths(gameServer.serverEnvironment) }; + IEnumerable extraModsFolders = GameServerHelpers.GetGameServerExtraModsPaths(); + availableModsFolders = availableModsFolders.Concat(extraModsFolders); + foreach (string modsPath in availableModsFolders) { + IEnumerable modFolders = new DirectoryInfo(modsPath).EnumerateDirectories("@*", SearchOption.TopDirectoryOnly); + foreach (DirectoryInfo modFolder in modFolders) { + if (mods.Any(x => x.path == modFolder.FullName)) continue; + + IEnumerable modFiles = new DirectoryInfo(modFolder.FullName).EnumerateFiles("*.pbo", SearchOption.AllDirectories); if (!modFiles.Any()) continue; - GameServerMod mod = new GameServerMod {name = folder.Name, path = folder.FullName}; + + GameServerMod mod = new GameServerMod { name = modFolder.Name, path = modFolder.FullName }; Uri modFolderUri = new Uri(mod.path); if (serverExecutable.IsBaseOf(modFolderUri)) { mod.pathRelativeToServerExecutable = Uri.UnescapeDataString(serverExecutable.MakeRelativeUri(modFolderUri).ToString()); @@ -176,5 +185,14 @@ public List GetAvailableMods() { return mods; } + + public List GetEnvironmentMods(GameServerEnvironment environment) { + string repoModsFolder = GameServerHelpers.GetGameServerModsPaths(environment); + IEnumerable modFolders = new DirectoryInfo(repoModsFolder).EnumerateDirectories("@*", SearchOption.TopDirectoryOnly); + return modFolders.Select(modFolder => new { modFolder, modFiles = new DirectoryInfo(modFolder.FullName).EnumerateFiles("*.pbo", SearchOption.AllDirectories) }) + .Where(x => x.modFiles.Any()) + .Select(x => new GameServerMod { name = x.modFolder.Name, path = x.modFolder.FullName }) + .ToList(); + } } } diff --git a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs index c56a8238..0ebd524d 100644 --- a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs @@ -53,7 +53,7 @@ public Task PatchMission(string path) { } private void CreateBackup() { - string backupPath = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("MISSION_BACKUPS_FOLDER").AsString(), Path.GetFileName(filePath) ?? throw new FileNotFoundException()); + string backupPath = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("MISSIONS_BACKUPS").AsString(), Path.GetFileName(filePath) ?? throw new FileNotFoundException()); Directory.CreateDirectory(Path.GetDirectoryName(backupPath) ?? throw new DirectoryNotFoundException()); File.Copy(filePath, backupPath, true); diff --git a/UKSF.Api.Services/Game/Missions/MissionService.cs b/UKSF.Api.Services/Game/Missions/MissionService.cs index b380e88f..4671072a 100644 --- a/UKSF.Api.Services/Game/Missions/MissionService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionService.cs @@ -92,14 +92,14 @@ private bool CheckIgnoreKey(string key) { } private bool CheckBinned() { - Process process = new Process {StartInfo = {FileName = UNBIN, Arguments = $"-p -q \"{mission.sqmPath}\"", UseShellExecute = false, CreateNoWindow = true}}; + Process process = new Process { StartInfo = { FileName = UNBIN, Arguments = $"-p -q \"{mission.sqmPath}\"", UseShellExecute = false, CreateNoWindow = true } }; process.Start(); process.WaitForExit(); return process.ExitCode == 0; } private void UnBin() { - Process process = new Process {StartInfo = {FileName = UNBIN, Arguments = $"-p \"{mission.sqmPath}\"", UseShellExecute = false, CreateNoWindow = true}}; + Process process = new Process { StartInfo = { FileName = UNBIN, Arguments = $"-p \"{mission.sqmPath}\"", UseShellExecute = false, CreateNoWindow = true } }; process.Start(); process.WaitForExit(); @@ -166,7 +166,7 @@ private void Patch() { if (!CheckIgnoreKey("missionImageIgnore")) { string imagePath = Path.Combine(mission.path, "uksf.paa"); - string modpackImagePath = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("PATH_MODPACK").AsString(), "@uksf", "UKSFTemplate.VR", "uksf.paa"); + string modpackImagePath = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("REPO_RELEASE").AsString(), "@uksf", "UKSFTemplate.VR", "uksf.paa"); if (File.Exists(modpackImagePath)) { if (File.Exists(imagePath) && new FileInfo(imagePath).Length != new FileInfo(modpackImagePath).Length) { reports.Add( diff --git a/UKSF.Api.Services/Personnel/LoginService.cs b/UKSF.Api.Services/Personnel/LoginService.cs index 804babea..98a45c6a 100644 --- a/UKSF.Api.Services/Personnel/LoginService.cs +++ b/UKSF.Api.Services/Personnel/LoginService.cs @@ -92,17 +92,17 @@ private void ResolveRoles(ICollection claims, Account account) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.RECRUITER)); } - string personnelId = VariablesWrapper.VariablesDataService().GetSingle("ROLE_ID_PERSONNEL").AsString(); + string personnelId = VariablesWrapper.VariablesDataService().GetSingle("UNIT_ID_PERSONNEL").AsString(); if (admin || unitsService.Data.GetSingle(personnelId).members.Contains(account.id)) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.PERSONNEL)); } - string[] missionsId = VariablesWrapper.VariablesDataService().GetSingle("ROLE_ID_MISSIONS").AsArray(); + string[] missionsId = VariablesWrapper.VariablesDataService().GetSingle("UNIT_ID_MISSIONS").AsArray(); if (admin || unitsService.Data.GetSingle(x => missionsId.Contains(x.id)).members.Contains(account.id)) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SERVERS)); } - string testersId = VariablesWrapper.VariablesDataService().GetSingle("ROLE_ID_TESTERS").AsString(); + string testersId = VariablesWrapper.VariablesDataService().GetSingle("UNIT_ID_TESTERS").AsString(); if (admin || unitsService.Data.GetSingle(testersId).members.Contains(account.id)) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.TESTER)); } diff --git a/UKSF.Api.Services/Personnel/RecruitmentService.cs b/UKSF.Api.Services/Personnel/RecruitmentService.cs index a21f42d1..20307443 100644 --- a/UKSF.Api.Services/Personnel/RecruitmentService.cs +++ b/UKSF.Api.Services/Personnel/RecruitmentService.cs @@ -150,7 +150,7 @@ public string GetRecruiter() { } private Unit GetRecruiterUnit() { - string id = VariablesWrapper.VariablesDataService().GetSingle("ROLE_ID_RECRUITMENT").AsString(); + string id = VariablesWrapper.VariablesDataService().GetSingle("UNIT_ID_RECRUITMENT").AsString(); return unitsService.Data.GetSingle(id); } diff --git a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs index c0b6660f..458ad554 100644 --- a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs +++ b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs @@ -55,7 +55,7 @@ public IActionResult Get() { List myRequests = new List(); List otherRequests = new List(); string contextId = sessionService.GetContextId(); - string id = variablesDataService.GetSingle("ROLE_ID_PERSONNEL").AsString(); + string id = variablesDataService.GetSingle("UNIT_ID_PERSONNEL").AsString(); bool canOverride = unitsService.Data.GetSingle(id).members.Any(x => x == contextId); bool superAdmin = contextId == Global.SUPER_ADMIN; DateTime now = DateTime.Now; diff --git a/UKSF.Api/Controllers/DischargesController.cs b/UKSF.Api/Controllers/DischargesController.cs index 372e5fe5..57b24e7f 100644 --- a/UKSF.Api/Controllers/DischargesController.cs +++ b/UKSF.Api/Controllers/DischargesController.cs @@ -77,7 +77,7 @@ public async Task Reinstate(string id) { notificationsService.Add(notification); LogWrapper.AuditLog($"{sessionService.GetContextId()} reinstated {dischargeCollection.name}'s membership", sessionService.GetContextId()); - string personnelId = variablesDataService.GetSingle("ROLE_ID_PERSONNEL").AsString(); + string personnelId = variablesDataService.GetSingle("UNIT_ID_PERSONNEL").AsString(); foreach (string member in unitsService.Data.GetSingle(personnelId).members.Where(x => x != sessionService.GetContextId())) { notificationsService.Add( new Notification { owner = member, icon = NotificationIcons.PROMOTION, message = $"{dischargeCollection.name}'s membership was reinstated by {sessionService.GetContextId()}" } diff --git a/UKSF.Api/Controllers/GameServersController.cs b/UKSF.Api/Controllers/GameServersController.cs index 2450d83b..47aa9220 100644 --- a/UKSF.Api/Controllers/GameServersController.cs +++ b/UKSF.Api/Controllers/GameServersController.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using UKSF.Api.Interfaces.Game; using UKSF.Api.Interfaces.Hubs; @@ -34,13 +35,14 @@ public GameServersController(ISessionService sessionService, IGameServersService } [HttpGet, Authorize] - public IActionResult GetGameServers() => Ok(new {servers = gameServersService.Data.Get(), missions = gameServersService.GetMissionFiles(), instanceCount = gameServersService.GetGameInstanceCount()}); + public IActionResult GetGameServers() => + Ok(new { servers = gameServersService.Data.Get(), missions = gameServersService.GetMissionFiles(), instanceCount = gameServersService.GetGameInstanceCount() }); [HttpGet("status/{id}"), Authorize] public async Task GetGameServerStatus(string id) { GameServer gameServer = gameServersService.Data.GetSingle(id); await gameServersService.GetGameServerStatus(gameServer); - return Ok(new {gameServer, instanceCount = gameServersService.GetGameInstanceCount()}); + return Ok(new { gameServer, instanceCount = gameServersService.GetGameInstanceCount() }); } [HttpPost("{check}"), Authorize] @@ -64,22 +66,29 @@ public async Task AddServer([FromBody] GameServer gameServer) { public async Task EditGameServer([FromBody] GameServer gameServer) { GameServer oldGameServer = gameServersService.Data.GetSingle(x => x.id == gameServer.id); LogWrapper.AuditLog($"Game server '{gameServer.name}' updated:{oldGameServer.Changes(gameServer)}"); - await gameServersService.Data - .Update( - gameServer.id, - Builders.Update.Set("name", gameServer.name) - .Set("port", gameServer.port) - .Set("apiPort", gameServer.apiPort) - .Set("numberHeadlessClients", gameServer.numberHeadlessClients) - .Set("profileName", gameServer.profileName) - .Set("hostName", gameServer.hostName) - .Set("password", gameServer.password) - .Set("adminPassword", gameServer.adminPassword) - .Set("serverOption", gameServer.serverOption) - .Set("serverMods", gameServer.serverMods) - ); + bool environmentChanged = false; + if (oldGameServer.serverEnvironment != gameServer.serverEnvironment) { + environmentChanged = true; + gameServer.mods = gameServersService.GetEnvironmentMods(gameServer.serverEnvironment); + gameServer.serverMods = new List(); + } - return Ok(gameServersService.Data.Get()); + await gameServersService.Data.Update( + gameServer.id, + Builders.Update.Set("name", gameServer.name) + .Set("port", gameServer.port) + .Set("apiPort", gameServer.apiPort) + .Set("numberHeadlessClients", gameServer.numberHeadlessClients) + .Set("profileName", gameServer.profileName) + .Set("hostName", gameServer.hostName) + .Set("password", gameServer.password) + .Set("adminPassword", gameServer.adminPassword) + .Set("serverEnvironment", gameServer.serverEnvironment) + .Set("serverOption", gameServer.serverOption) + .Set("mods", gameServer.mods) + .Set("serverMods", gameServer.serverMods) + ); + return Ok(new { environmentChanged }); } [HttpDelete("{id}"), Authorize] @@ -111,7 +120,7 @@ public async Task UploadMissionFile() { await gameServersService.UploadMissionFile(file); MissionPatchingResult missionPatchingResult = await gameServersService.PatchMissionFile(file.Name); missionPatchingResult.reports = missionPatchingResult.reports.OrderByDescending(x => x.error).ToList(); - missionReports.Add(new {mission = file.Name, missionPatchingResult.reports}); + missionReports.Add(new { mission = file.Name, missionPatchingResult.reports }); LogWrapper.AuditLog($"Uploaded mission '{file.Name}'"); } } catch (Exception exception) { @@ -119,7 +128,7 @@ public async Task UploadMissionFile() { return BadRequest(exception); } - return Ok(new {missions = gameServersService.GetMissionFiles(), missionReports}); + return Ok(new { missions = gameServersService.GetMissionFiles(), missionReports }); } [HttpPost("launch/{id}"), Authorize] @@ -148,7 +157,13 @@ public async Task LaunchServer(string id, [FromBody] JObject data MissionPatchingResult patchingResult = await gameServersService.PatchMissionFile(missionSelection); if (!patchingResult.success) { patchingResult.reports = patchingResult.reports.OrderByDescending(x => x.error).ToList(); - return BadRequest(new {patchingResult.reports, message = $"{(patchingResult.reports.Count > 0 ? "Failed to patch mission for the reasons detailed below" : "Failed to patch mission for an unknown reason")}.\n\nContact an admin for help"}); + return BadRequest( + new { + patchingResult.reports, + message = + $"{(patchingResult.reports.Count > 0 ? "Failed to patch mission for the reasons detailed below" : "Failed to patch mission for an unknown reason")}.\n\nContact an admin for help" + } + ); } // Write config @@ -169,7 +184,7 @@ public async Task StopServer(string id) { if (!gameServer.status.started && !gameServer.status.running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); await gameServersService.StopGameServer(gameServer); await gameServersService.GetGameServerStatus(gameServer); - return Ok(new {gameServer, instanceCount = gameServersService.GetGameInstanceCount()}); + return Ok(new { gameServer, instanceCount = gameServersService.GetGameInstanceCount() }); } [HttpGet("kill/{id}"), Authorize] @@ -185,7 +200,7 @@ public async Task KillServer(string id) { } await gameServersService.GetGameServerStatus(gameServer); - return Ok(new {gameServer, instanceCount = gameServersService.GetGameInstanceCount()}); + return Ok(new { gameServer, instanceCount = gameServersService.GetGameInstanceCount() }); } [HttpGet("killall"), Authorize] @@ -195,20 +210,23 @@ public IActionResult KillAllArmaProcesses() { return Ok(); } - [HttpGet("mods"), Authorize] - public IActionResult GetAvailableMods() => Ok(gameServersService.GetAvailableMods()); + [HttpGet("{id}/mods"), Authorize] + public IActionResult GetAvailableMods(string id) => Ok(gameServersService.GetAvailableMods(id)); - [HttpPost("mods/{id}"), Authorize] - public async Task SetGameServerMods(string id, [FromBody] List mods) { + [HttpPost("{id}/mods"), Authorize] + public async Task SetGameServerMods(string id, [FromBody] JObject body) { + List mods = JsonConvert.DeserializeObject>(body.GetValueFromBody("mods")); + List serverMods = JsonConvert.DeserializeObject>(body.GetValueFromBody("serverMods")); GameServer gameServer = gameServersService.Data.GetSingle(id); LogWrapper.AuditLog($"Game server '{gameServer.name}' mods updated:{gameServer.mods.Select(x => x.name).Changes(mods.Select(x => x.name))}"); - await gameServersService.Data.Update(id, Builders.Update.Unset(x => x.mods)); - await gameServersService.Data.Update(id, Builders.Update.PushEach(x => x.mods, mods)); - return Ok(gameServersService.GetAvailableMods()); + LogWrapper.AuditLog($"Game server '{gameServer.name}' serverMods updated:{gameServer.serverMods.Select(x => x.name).Changes(serverMods.Select(x => x.name))}"); + await gameServersService.Data.Update(id, Builders.Update.Unset(x => x.mods).Unset(x => x.serverMods)); + await gameServersService.Data.Update(id, Builders.Update.Set(x => x.mods, mods).Set(x => x.serverMods, serverMods)); + return Ok(gameServersService.GetAvailableMods(id)); } [HttpGet("disabled"), Authorize] - public IActionResult GetDisabledState() => Ok(new {state = VariablesWrapper.VariablesDataService().GetSingle("SERVERS_DISABLED").AsBool()}); + public IActionResult GetDisabledState() => Ok(new { state = VariablesWrapper.VariablesDataService().GetSingle("SERVERS_DISABLED").AsBool() }); [HttpPost("disabled"), Authorize] public async Task SetDisabledState([FromBody] JObject body) { diff --git a/UKSF.Common/ChangeUtilities.cs b/UKSF.Common/ChangeUtilities.cs index aaea7441..6c1b5456 100644 --- a/UKSF.Common/ChangeUtilities.cs +++ b/UKSF.Common/ChangeUtilities.cs @@ -61,14 +61,8 @@ private static IEnumerable FindChanges(this JToken original, JToken upda if (original.Type == JTokenType.Object) { JObject originalObject = original as JObject; JObject updatedObject = updated as JObject; - - if (originalObject == null) { - originalObject = new JObject(); - } - - if (updatedObject == null) { - updatedObject = new JObject(); - } + originalObject ??= new JObject(); + updatedObject ??= new JObject(); List added = updatedObject.Properties().Select(c => c.Name).Except(originalObject.Properties().Select(c => c.Name)).ToList(); List removed = originalObject.Properties().Select(c => c.Name).Except(updatedObject.Properties().Select(c => c.Name)).ToList(); diff --git a/UKSF.Tests/testdata/variables.json b/UKSF.Tests/testdata/variables.json index 81216e27..ab6efc09 100644 --- a/UKSF.Tests/testdata/variables.json +++ b/UKSF.Tests/testdata/variables.json @@ -101,7 +101,7 @@ "$oid": "5c3fab36dee76d26cc9f4a02" }, "item": "F:\\Website\\Backups", - "key": "MISSION_BACKUPS_FOLDER" + "key": "MISSIONS_BACKUPS" } { "_id": { From d110d6d43f072d28af9bf7410427a024c5f43593 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 23 Jul 2020 23:15:26 +0100 Subject: [PATCH 196/369] Use game service in build queue --- .../Game/IGameServersService.cs | 1 + UKSF.Api.Services/Game/GameServersService.cs | 6 ++++++ .../Modpack/BuildProcess/BuildQueueService.cs | 18 ++++++++++++++++-- .../Modpack/BuildProcess/StepLogger.cs | 4 ++-- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/UKSF.Api.Interfaces/Game/IGameServersService.cs b/UKSF.Api.Interfaces/Game/IGameServersService.cs index a07d9aab..a502018e 100644 --- a/UKSF.Api.Interfaces/Game/IGameServersService.cs +++ b/UKSF.Api.Interfaces/Game/IGameServersService.cs @@ -11,6 +11,7 @@ public interface IGameServersService : IDataBackedService GetMissionFiles(); Task GetGameServerStatus(GameServer gameServer); + Task> GetAllGameServerStatuses(); Task PatchMissionFile(string missionName); void WriteServerConfig(GameServer gameServer, int playerCount, string missionSelection); Task LaunchGameServer(GameServer gameServer); diff --git a/UKSF.Api.Services/Game/GameServersService.cs b/UKSF.Api.Services/Game/GameServersService.cs index 612a11f2..9ae41bf5 100644 --- a/UKSF.Api.Services/Game/GameServersService.cs +++ b/UKSF.Api.Services/Game/GameServersService.cs @@ -61,6 +61,12 @@ public async Task GetGameServerStatus(GameServer gameServer) { } } + public async Task> GetAllGameServerStatuses() { + List gameServers = Data.Get(); + await Task.WhenAll(gameServers.Select(GetGameServerStatus)); + return gameServers; + } + public async Task PatchMissionFile(string missionName) { string missionPath = Path.Combine(GameServerHelpers.GetGameServerMissionsPath(), missionName); MissionPatchingResult result = await missionPatchingService.PatchMission(missionPath); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs index 190dd6d6..1c0cc1f8 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs @@ -1,6 +1,8 @@ -using System.Collections.Concurrent; +using System; +using System.Collections.Concurrent; using System.Threading; using System.Threading.Tasks; +using UKSF.Api.Interfaces.Game; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Models.Modpack; @@ -8,10 +10,14 @@ namespace UKSF.Api.Services.Modpack.BuildProcess { public class BuildQueueService : IBuildQueueService { private readonly IBuildProcessorService buildProcessorService; private readonly ConcurrentDictionary cancellationTokenSources = new ConcurrentDictionary(); + private readonly IGameServersService gameServersService; private readonly ConcurrentQueue queue = new ConcurrentQueue(); private bool processing; - public BuildQueueService(IBuildProcessorService buildProcessorService) => this.buildProcessorService = buildProcessorService; + public BuildQueueService(IBuildProcessorService buildProcessorService, IGameServersService gameServersService) { + this.buildProcessorService = buildProcessorService; + this.gameServersService = gameServersService; + } public void QueueBuild(ModpackBuild build) { queue.Enqueue(build); @@ -43,6 +49,14 @@ public void CancelAll() { private async Task ProcessQueue() { processing = true; while (queue.TryDequeue(out ModpackBuild build)) { + // TODO: Expand this to check if a server is running using the repo for this build. If no servers are running but there are processes, don't build at all. + // Will require better game <-> api interaction to communicate with servers and headless clients properly + if (gameServersService.GetGameInstanceCount() > 0) { + queue.Enqueue(build); + await Task.Delay(TimeSpan.FromSeconds(10)); // TODO: Increase delay + continue; + } + CancellationTokenSource cancellationTokenSource = cancellationTokenSources[build.id]; await buildProcessorService.ProcessBuild(build, cancellationTokenSource); } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs index 10e3ad81..ec285038 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs @@ -29,12 +29,12 @@ public async Task LogCancelled() { } public async Task LogSkipped() { - LogLines($"\nSkipped: {buildStep.name}", "orange"); + LogLines($"\nSkipped: {buildStep.name}", "orangered"); await logCallback(); } public async Task LogWarning(string message) { - LogLines($"Warning\n{message}", "orange"); + LogLines($"Warning\n{message}", "orangered"); await logCallback(); } From 797e36a0e8b91ce464cd772611635f6cb7270830 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 24 Jul 2020 13:19:09 +0100 Subject: [PATCH 197/369] Changed servers to use environment installations - Renamed several variables - Allow reset of server mods to environment repo --- UKSF.Api.Models/Game/GameServer.cs | 2 +- UKSF.Api.Services/Game/GameServerHelpers.cs | 33 ++++++++++++------- UKSF.Api.Services/Game/GameServersService.cs | 17 +++++++--- .../Game/Missions/MissionPatchingService.cs | 10 ++++-- .../Game/Missions/MissionService.cs | 3 +- .../BuildProcess/Steps/BuildStep95Notify.cs | 2 +- UKSF.Api/Controllers/GameServersController.cs | 18 ++++++++-- 7 files changed, 61 insertions(+), 24 deletions(-) diff --git a/UKSF.Api.Models/Game/GameServer.cs b/UKSF.Api.Models/Game/GameServer.cs index 8b397e9e..7983859f 100644 --- a/UKSF.Api.Models/Game/GameServer.cs +++ b/UKSF.Api.Models/Game/GameServer.cs @@ -4,7 +4,7 @@ namespace UKSF.Api.Models.Game { public enum GameServerEnvironment { RELEASE, - STAGE, + RC, DEV } diff --git a/UKSF.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.Services/Game/GameServerHelpers.cs index 0a6ff0d0..024dade3 100644 --- a/UKSF.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.Services/Game/GameServerHelpers.cs @@ -53,20 +53,28 @@ public static class GameServerHelpers { "}};" }; - public static string GetGameServerExecutablePath() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_EXECUTABLE").AsString(); + public static string GetGameServerExecutablePath(this GameServer gameServer) { + string variableKey = gameServer.serverEnvironment switch { + GameServerEnvironment.RELEASE => "SERVER_PATH_RELEASE", + GameServerEnvironment.RC => "SERVER_PATH_RC", + GameServerEnvironment.DEV => "SERVER_PATH_DEV", + _ => throw new ArgumentException("Server environment is invalid") + }; + return Path.Join(VariablesWrapper.VariablesDataService().GetSingle(variableKey).AsString(), "arma3server_x64.exe"); + } - public static string GetGameServerSettingsPath() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_SETTINGS").AsString(); + public static string GetGameServerSettingsPath() => Path.Join(VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_RELEASE").AsString(), "userconfig"); public static string GetGameServerMissionsPath() => VariablesWrapper.VariablesDataService().GetSingle("MISSIONS_PATH").AsString(); public static string GetGameServerConfigPath(this GameServer gameServer) => - Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("SERVERS_PATH").AsString(), "configs", $"{gameServer.profileName}.cfg"); + Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_CONFIGS").AsString(), $"{gameServer.profileName}.cfg"); - private static string GetGameServerProfilesPath() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PROFILES").AsString(); + private static string GetGameServerProfilesPath() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_PROFILES").AsString(); - private static string GetGameServerPerfConfigPath() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PERF_CONFIG").AsString(); + private static string GetGameServerPerfConfigPath() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_PERF").AsString(); - private static string GetHeadlessClientName(int index) => VariablesWrapper.VariablesDataService().GetSingle("HEADLESS_CLIENT_NAMES").AsArray()[index]; + private static string GetHeadlessClientName(int index) => VariablesWrapper.VariablesDataService().GetSingle("SERVER_HEADLESS_NAMES").AsArray()[index]; private static string FormatGameServerMods(this GameServer gameServer) => gameServer.mods.Count > 0 ? $"{string.Join(";", gameServer.mods.Select(x => x.pathRelativeToServerExecutable ?? x.path))};" : string.Empty; @@ -76,15 +84,15 @@ private static string FormatGameServerServerMods(this GameServer gameServer) => public static string GetGameServerModsPaths(GameServerEnvironment environment) { string variableKey = environment switch { - GameServerEnvironment.RELEASE => "REPO_RELEASE", - GameServerEnvironment.STAGE => "REPO_STAGE", - GameServerEnvironment.DEV => "REPO_DEV", + GameServerEnvironment.RELEASE => "MODPACK_PATH_RELEASE", + GameServerEnvironment.RC => "MODPACK_PATH_RC", + GameServerEnvironment.DEV => "MODPACK_PATH_DEV", _ => throw new ArgumentException("Server environment is invalid") }; - return VariablesWrapper.VariablesDataService().GetSingle(variableKey).AsString(); + return Path.Join(VariablesWrapper.VariablesDataService().GetSingle(variableKey).AsString(), "Repo"); } - public static IEnumerable GetGameServerExtraModsPaths() => VariablesWrapper.VariablesDataService().GetSingle("SERVERS_EXTRA_MODS").AsArray(x => x.RemoveQuotes()); + public static IEnumerable GetGameServerExtraModsPaths() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_MODS").AsArray(x => x.RemoveQuotes()); public static string FormatGameServerConfig(this GameServer gameServer, int playerCount, string missionSelection) => string.Format(string.Join("\n", BASE_CONFIG), gameServer.hostName, gameServer.password, gameServer.adminPassword, playerCount, missionSelection.Replace(".pbo", "")); @@ -98,7 +106,6 @@ public static string FormatGameServerLaunchArguments(this GameServer gameServer) $" -apiport=\"{gameServer.apiPort}\"" + $" {(string.IsNullOrEmpty(gameServer.FormatGameServerServerMods()) ? "" : $"-serverMod={gameServer.FormatGameServerServerMods()}")}" + $" {(string.IsNullOrEmpty(gameServer.FormatGameServerMods()) ? "" : $"-mod={gameServer.FormatGameServerMods()}")}" + - $" {(GetGameServerExecutablePath().Contains("server") ? "" : "-server")}" + " -bandwidthAlg=2 -hugepages -loadMissionToMemory -filePatching -limitFPS=200"; public static string FormatHeadlessClientLaunchArguments(this GameServer gameServer, int index) => @@ -138,3 +145,5 @@ public static bool IsMainOpTime() { } } } + +// $" {(GetGameServerExecutablePath().Contains("server") ? "" : "-server")}" + diff --git a/UKSF.Api.Services/Game/GameServersService.cs b/UKSF.Api.Services/Game/GameServersService.cs index 9ae41bf5..8b04a180 100644 --- a/UKSF.Api.Services/Game/GameServersService.cs +++ b/UKSF.Api.Services/Game/GameServersService.cs @@ -12,6 +12,7 @@ using UKSF.Api.Interfaces.Game; using UKSF.Api.Models.Game; using UKSF.Api.Models.Mission; +using UKSF.Api.Services.Message; using UKSF.Common; namespace UKSF.Api.Services.Game { @@ -24,7 +25,8 @@ public class GameServersService : DataBackedService, IG public async Task UploadMissionFile(IFormFile file) { string fileName = ContentDispositionHeaderValue.Parse(file.ContentDisposition).FileName.Trim('"'); - await using FileStream stream = new FileStream(Path.Combine(GameServerHelpers.GetGameServerMissionsPath(), fileName), FileMode.Create); + string filePath = Path.Combine(GameServerHelpers.GetGameServerMissionsPath(), fileName); + await using FileStream stream = new FileStream(filePath, FileMode.Create); await file.CopyToAsync(stream); } @@ -68,6 +70,13 @@ public async Task> GetAllGameServerStatuses() { } public async Task PatchMissionFile(string missionName) { + // if (Data.GetSingle(x => x.status.mission == missionName) != null) { // TODO: Needs better server <-> api interaction to properly get running missions + // return new MissionPatchingResult { + // success = true, + // reports = new List { new MissionPatchingReport("Mission in use", $"'{missionName}' is currently in use by another server.\nIt has not been patched.") } + // }; + // } + string missionPath = Path.Combine(GameServerHelpers.GetGameServerMissionsPath(), missionName); MissionPatchingResult result = await missionPatchingService.PatchMission(missionPath); return result; @@ -78,7 +87,7 @@ public void WriteServerConfig(GameServer gameServer, int playerCount, string mis public async Task LaunchGameServer(GameServer gameServer) { string launchArguments = gameServer.FormatGameServerLaunchArguments(); - gameServer.processId = ProcessUtilities.LaunchManagedProcess(GameServerHelpers.GetGameServerExecutablePath(), launchArguments); + gameServer.processId = ProcessUtilities.LaunchManagedProcess(gameServer.GetGameServerExecutablePath(), launchArguments); await Task.Delay(TimeSpan.FromSeconds(1)); @@ -86,7 +95,7 @@ public async Task LaunchGameServer(GameServer gameServer) { if (gameServer.numberHeadlessClients > 0) { for (int index = 0; index < gameServer.numberHeadlessClients; index++) { launchArguments = gameServer.FormatHeadlessClientLaunchArguments(index); - gameServer.headlessClientProcessIds.Add(ProcessUtilities.LaunchManagedProcess(GameServerHelpers.GetGameServerExecutablePath(), launchArguments)); + gameServer.headlessClientProcessIds.Add(ProcessUtilities.LaunchManagedProcess(gameServer.GetGameServerExecutablePath(), launchArguments)); await Task.Delay(TimeSpan.FromSeconds(1)); } @@ -156,7 +165,7 @@ public int KillAllArmaProcesses() { public List GetAvailableMods(string id) { GameServer gameServer = Data.GetSingle(id); - Uri serverExecutable = new Uri(GameServerHelpers.GetGameServerExecutablePath()); + Uri serverExecutable = new Uri(gameServer.GetGameServerExecutablePath()); List mods = new List(); IEnumerable availableModsFolders = new[] { GameServerHelpers.GetGameServerModsPaths(gameServer.serverEnvironment) }; IEnumerable extraModsFolders = GameServerHelpers.GetGameServerExtraModsPaths(); diff --git a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs index 0ebd524d..ec0092c1 100644 --- a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs @@ -41,7 +41,7 @@ public Task PatchMission(string path) { result.success = result.reports.All(x => !x.error); } catch (Exception exception) { LogWrapper.Log(exception); - result.reports = new List {new MissionPatchingReport(exception)}; + result.reports = new List { new MissionPatchingReport(exception) }; result.success = false; } finally { Cleanup(); @@ -68,7 +68,11 @@ private void UnpackPbo() { } folderPath = Path.Combine(parentFolderPath, Path.GetFileNameWithoutExtension(filePath) ?? throw new FileNotFoundException()); - Process process = new Process {StartInfo = {FileName = EXTRACT_PBO, Arguments = $"-D -P \"{filePath}\"", UseShellExecute = false, CreateNoWindow = true}}; + if (Directory.Exists(folderPath)) { + Directory.Delete(folderPath, true); + } + + Process process = new Process { StartInfo = { FileName = EXTRACT_PBO, Arguments = $"-D -P \"{filePath}\"", UseShellExecute = false, CreateNoWindow = true } }; process.Start(); process.WaitForExit(); @@ -85,7 +89,7 @@ private async Task PackPbo() { Process process = new Process { StartInfo = { FileName = MAKE_PBO, - WorkingDirectory = VariablesWrapper.VariablesDataService().GetSingle("MAKEPBO_WORKING_DIR").AsString(), + WorkingDirectory = VariablesWrapper.VariablesDataService().GetSingle("MISSIONS_WORKING_DIR").AsString(), Arguments = $"-Z -BD -P -X=\"thumbs.db,*.txt,*.h,*.dep,*.cpp,*.bak,*.png,*.log,*.pew\" \"{folderPath}\"", UseShellExecute = false, CreateNoWindow = true, diff --git a/UKSF.Api.Services/Game/Missions/MissionService.cs b/UKSF.Api.Services/Game/Missions/MissionService.cs index 4671072a..4d3d87e3 100644 --- a/UKSF.Api.Services/Game/Missions/MissionService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionService.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.IO; using System.Linq; +using UKSF.Api.Models.Game; using UKSF.Api.Models.Mission; using UKSF.Api.Services.Admin; using UKSF.Common; @@ -166,7 +167,7 @@ private void Patch() { if (!CheckIgnoreKey("missionImageIgnore")) { string imagePath = Path.Combine(mission.path, "uksf.paa"); - string modpackImagePath = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("REPO_RELEASE").AsString(), "@uksf", "UKSFTemplate.VR", "uksf.paa"); + string modpackImagePath = Path.Combine(GameServerHelpers.GetGameServerModsPaths(GameServerEnvironment.RELEASE), "@uksf", "UKSFTemplate.VR", "uksf.paa"); if (File.Exists(modpackImagePath)) { if (File.Exists(imagePath) && new FileInfo(imagePath).Length != new FileInfo(modpackImagePath).Length) { reports.Add( diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep95Notify.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep95Notify.cs index c184cfd4..dbbfdd4f 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep95Notify.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep95Notify.cs @@ -32,7 +32,7 @@ protected override async Task ProcessExecute() { private string GetBuildMessage() => Build.isReleaseCandidate ? $"New dev build available ({Build.buildNumber}) on the dev repository" - : $"New release candidate ({Build.buildNumber}) available for {Build.version} on the stage repository"; + : $"New release candidate ({Build.buildNumber}) available for {Build.version} on the rc repository"; private string GetBuildLink() => Build.isReleaseCandidate ? $"https://uk-sf.co.uk/modpack/builds-rc?version={Build.version}&build={Build.id}" : $"https://uk-sf.co.uk/modpack/builds-dev?build={Build.id}"; diff --git a/UKSF.Api/Controllers/GameServersController.cs b/UKSF.Api/Controllers/GameServersController.cs index 47aa9220..7cb68047 100644 --- a/UKSF.Api/Controllers/GameServersController.cs +++ b/UKSF.Api/Controllers/GameServersController.cs @@ -168,6 +168,7 @@ public async Task LaunchServer(string id, [FromBody] JObject data // Write config gameServersService.WriteServerConfig(gameServer, patchingResult.playerCount, missionSelection); + gameServer.status.mission = missionSelection; // Execute launch await gameServersService.LaunchGameServer(gameServer); @@ -225,13 +226,26 @@ public async Task SetGameServerMods(string id, [FromBody] JObject return Ok(gameServersService.GetAvailableMods(id)); } + [HttpGet("{id}/mods/reset"), Authorize] + public async Task ResetGameServerMods(string id) { + GameServer gameServer = gameServersService.Data.GetSingle(id); + LogWrapper.AuditLog($"Game server '{gameServer.name}' mods & serverMods reset"); + await gameServersService.Data.Update(id, Builders.Update.Unset(x => x.mods).Unset(x => x.serverMods)); + await gameServersService.Data.Update( + id, + Builders.Update.Set(x => x.mods, gameServersService.GetEnvironmentMods(gameServer.serverEnvironment)) + .Set(x => x.serverMods, new List()) + ); + return Ok(gameServersService.GetAvailableMods(id)); + } + [HttpGet("disabled"), Authorize] - public IActionResult GetDisabledState() => Ok(new { state = VariablesWrapper.VariablesDataService().GetSingle("SERVERS_DISABLED").AsBool() }); + public IActionResult GetDisabledState() => Ok(new { state = VariablesWrapper.VariablesDataService().GetSingle("SERVER_CONTROL_DISABLED").AsBool() }); [HttpPost("disabled"), Authorize] public async Task SetDisabledState([FromBody] JObject body) { bool state = bool.Parse(body["state"].ToString()); - await VariablesWrapper.VariablesDataService().Update("SERVERS_DISABLED", state); + await VariablesWrapper.VariablesDataService().Update("SERVER_CONTROL_DISABLED", state); await serversHub.Clients.All.ReceiveDisabledState(state); return Ok(); } From 02622ec00c84e283af5e6cb2839152f0d4eb7999 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 24 Jul 2020 13:26:22 +0100 Subject: [PATCH 198/369] Update cert path --- UKSF.Api/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api/Program.cs b/UKSF.Api/Program.cs index b8ae600b..26fadcad 100644 --- a/UKSF.Api/Program.cs +++ b/UKSF.Api/Program.cs @@ -45,7 +45,7 @@ private static IWebHost BuildProductionWebHost(string[] args) => .UseKestrel( options => { options.Listen(IPAddress.Loopback, 5000); - options.Listen(IPAddress.Loopback, 5001, listenOptions => { listenOptions.UseHttps("C:\\ProgramData\\win-acme\\httpsacme-v01.api.letsencrypt.org\\uk-sf.co.uk-all.pfx"); }); + options.Listen(IPAddress.Loopback, 5001, listenOptions => { listenOptions.UseHttps("C:\\ProgramData\\win-acme\\acme-v02.api.letsencrypt.org\\Certificates\\uk-sf.co.uk.pfx"); }); } ) .UseContentRoot(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule?.FileName)) From a647311eb62015a2125e8c440ad2fe243b5f83ae Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 25 Jul 2020 23:55:44 +0100 Subject: [PATCH 199/369] Lots of fixes, added several build steps, changed game servers to use environments --- .../Handlers/BuildsEventHandler.cs | 16 +- .../Game/IGameServersService.cs | 2 +- .../Modpack/BuildProcess/IBuildStepService.cs | 7 +- .../Modpack/BuildProcess/IStepLogger.cs | 2 + .../Modpack/BuildProcess/Steps/IBuildStep.cs | 1 + UKSF.Api.Models/Game/GameEnvironment.cs | 7 + UKSF.Api.Models/Game/GameServer.cs | 10 +- UKSF.Api.Models/Modpack/ModpackBuild.cs | 5 +- UKSF.Api.Models/Modpack/ModpackBuildResult.cs | 1 + UKSF.Api.Services/Game/GameServerHelpers.cs | 16 +- UKSF.Api.Services/Game/GameServersService.cs | 5 +- .../Game/Missions/MissionDataResolver.cs | 1 - .../Game/Missions/MissionService.cs | 3 +- .../BuildProcess/BuildProcessHelper.cs | 7 +- .../BuildProcess/BuildProcessorService.cs | 38 ++++- .../Modpack/BuildProcess/BuildStepService.cs | 89 +++++++---- .../Modpack/BuildProcess/StepLogger.cs | 17 +- .../Modpack/BuildProcess/Steps/BuildStep.cs | 48 +++++- .../BuildProcess/Steps/BuildStep0Prep.cs | 16 -- .../BuildProcess/Steps/BuildStep1Source.cs | 26 --- .../BuildProcess/Steps/BuildStep2Build.cs | 27 ---- .../Steps/BuildStep90PublishRelease.cs | 26 --- .../Steps/BuildStep99MergeRelease.cs | 27 ---- .../BuildProcess/Steps/BuildStepAttribute.cs | 9 ++ .../Steps/Common/BuildStepBuildRepo.cs | 17 ++ .../Steps/Common/BuildStepCbaSettings.cs | 31 ++++ .../Steps/Common/BuildStepClean.cs | 29 ++++ .../Steps/Common/BuildStepDeploy.cs | 36 +++++ .../Steps/Common/BuildStepKeys.cs | 41 +++++ .../BuildStepNotify.cs} | 14 +- .../Steps/Common/BuildStepSignDependencies.cs | 32 ++++ .../BuildProcess/Steps/FileBuildStep.cs | 148 ++++++++++++++++++ UKSF.Api.Services/Modpack/BuildsService.cs | 32 ++-- UKSF.Api.Services/Modpack/ModpackService.cs | 11 +- UKSF.Api.Services/UKSF.Api.Services.csproj | 2 + UKSF.Api/AppStart/StartServices.cs | 4 + UKSF.Api/Controllers/GameServersController.cs | 8 +- .../Controllers/Utility/DebugController.cs | 5 + UKSF.Common/StringUtilities.cs | 3 +- 39 files changed, 589 insertions(+), 230 deletions(-) create mode 100644 UKSF.Api.Models/Game/GameEnvironment.cs delete mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs delete mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1Source.cs delete mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs delete mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep90PublishRelease.cs delete mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99MergeRelease.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepAttribute.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepCbaSettings.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepDeploy.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepKeys.cs rename UKSF.Api.Services/Modpack/BuildProcess/Steps/{BuildStep95Notify.cs => Common/BuildStepNotify.cs} (71%) create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs diff --git a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs index cdf71885..ef8b7f72 100644 --- a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs +++ b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs @@ -1,14 +1,18 @@ using System; +using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; +using MongoDB.Bson.IO; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events.Handlers; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; using UKSF.Api.Models.Events; +using UKSF.Api.Models.Game; using UKSF.Api.Models.Modpack; using UKSF.Api.Signalr.Hubs.Modpack; using UKSF.Common; +using JsonConvert = Newtonsoft.Json.JsonConvert; namespace UKSF.Api.Events.Handlers { public class BuildsEventHandler : IBuildsEventHandler { @@ -40,20 +44,20 @@ private async Task HandleBuildEvent(DataEventModel x) { } private async Task AddedEvent(ModpackBuild build) { - if (build.isReleaseCandidate) { - await hub.Clients.All.ReceiveReleaseCandidateBuild(build); - } else { + if (build.environment == GameEnvironment.DEV) { await hub.Clients.All.ReceiveBuild(build); + } else { + await hub.Clients.All.ReceiveReleaseCandidateBuild(build); } } private async Task UpdatedEvent(string id, object data) { switch (data) { case ModpackBuild build: - if (build.isReleaseCandidate) { - await hub.Clients.All.ReceiveReleaseCandidateBuild(build); - } else { + if (build.environment == GameEnvironment.DEV) { await hub.Clients.All.ReceiveBuild(build); + } else { + await hub.Clients.All.ReceiveReleaseCandidateBuild(build); } break; diff --git a/UKSF.Api.Interfaces/Game/IGameServersService.cs b/UKSF.Api.Interfaces/Game/IGameServersService.cs index a502018e..8aff5007 100644 --- a/UKSF.Api.Interfaces/Game/IGameServersService.cs +++ b/UKSF.Api.Interfaces/Game/IGameServersService.cs @@ -19,6 +19,6 @@ public interface IGameServersService : IDataBackedService GetAvailableMods(string id); - List GetEnvironmentMods(GameServerEnvironment environment); + List GetEnvironmentMods(GameEnvironment environment); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs index 4c65fa50..e034d083 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs @@ -1,12 +1,13 @@ using System.Collections.Generic; using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; +using UKSF.Api.Models.Game; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Interfaces.Modpack.BuildProcess { public interface IBuildStepService { - List GetStepsForBuild(); - List GetStepsForRc(); - List GetStepsForRelease(); + void RegisterBuildSteps(); + List GetSteps(GameEnvironment environment); + ModpackBuildStep GetRestoreStepForRelease(); IBuildStep ResolveBuildStep(string buildStepName); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs index cd42041a..2d4b352c 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs @@ -9,6 +9,8 @@ public interface IStepLogger { Task LogSkipped(); Task LogWarning(string message); Task LogError(Exception exception); + Task LogSurround(string log); + Task LogInline(string log); Task Log(string log, string colour = ""); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs index 4364c578..bad1566a 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs @@ -14,6 +14,7 @@ public interface IBuildStep { Task Succeed(); Task Fail(Exception exception); Task Cancel(); + Task Warning(string message); Task Skip(); } } diff --git a/UKSF.Api.Models/Game/GameEnvironment.cs b/UKSF.Api.Models/Game/GameEnvironment.cs new file mode 100644 index 00000000..c814d208 --- /dev/null +++ b/UKSF.Api.Models/Game/GameEnvironment.cs @@ -0,0 +1,7 @@ +namespace UKSF.Api.Models.Game { + public enum GameEnvironment { + RELEASE, + RC, + DEV + } +} diff --git a/UKSF.Api.Models/Game/GameServer.cs b/UKSF.Api.Models/Game/GameServer.cs index 7983859f..c5e0a793 100644 --- a/UKSF.Api.Models/Game/GameServer.cs +++ b/UKSF.Api.Models/Game/GameServer.cs @@ -2,12 +2,6 @@ using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Models.Game { - public enum GameServerEnvironment { - RELEASE, - RC, - DEV - } - public enum GameServerOption { NONE, SINGLETON, @@ -28,12 +22,12 @@ public class GameServer : DatabaseObject { public int port; [BsonIgnore] public int? processId; public string profileName; - public GameServerEnvironment serverEnvironment; + public GameEnvironment environment; public List serverMods = new List(); public GameServerOption serverOption; [BsonIgnore] public GameServerStatus status = new GameServerStatus(); - public override string ToString() => $"{name}, {port}, {apiPort}, {numberHeadlessClients}, {profileName}, {hostName}, {password}, {adminPassword}, {serverEnvironment}, {serverOption}"; + public override string ToString() => $"{name}, {port}, {apiPort}, {numberHeadlessClients}, {profileName}, {hostName}, {password}, {adminPassword}, {environment}, {serverOption}"; } public class GameServerStatus { diff --git a/UKSF.Api.Models/Modpack/ModpackBuild.cs b/UKSF.Api.Models/Modpack/ModpackBuild.cs index 2c00dcd3..58462934 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuild.cs +++ b/UKSF.Api.Models/Modpack/ModpackBuild.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; +using UKSF.Api.Models.Game; using UKSF.Api.Models.Integrations.Github; namespace UKSF.Api.Models.Modpack { @@ -11,8 +12,8 @@ public class ModpackBuild : DatabaseObject { public ModpackBuildResult buildResult = ModpackBuildResult.NONE; public GithubCommit commit; public bool finished; - public bool isRelease; - public bool isReleaseCandidate; + public bool isRebuild; + public GameEnvironment environment; public bool running; public List steps = new List(); public DateTime startTime = DateTime.Now; diff --git a/UKSF.Api.Models/Modpack/ModpackBuildResult.cs b/UKSF.Api.Models/Modpack/ModpackBuildResult.cs index 2af1adac..c1b4360b 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuildResult.cs +++ b/UKSF.Api.Models/Modpack/ModpackBuildResult.cs @@ -4,6 +4,7 @@ public enum ModpackBuildResult { SUCCESS, FAILED, CANCELLED, + WARNING, SKIPPED } } diff --git a/UKSF.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.Services/Game/GameServerHelpers.cs index 024dade3..a86d2a49 100644 --- a/UKSF.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.Services/Game/GameServerHelpers.cs @@ -54,10 +54,10 @@ public static class GameServerHelpers { }; public static string GetGameServerExecutablePath(this GameServer gameServer) { - string variableKey = gameServer.serverEnvironment switch { - GameServerEnvironment.RELEASE => "SERVER_PATH_RELEASE", - GameServerEnvironment.RC => "SERVER_PATH_RC", - GameServerEnvironment.DEV => "SERVER_PATH_DEV", + string variableKey = gameServer.environment switch { + GameEnvironment.RELEASE => "SERVER_PATH_RELEASE", + GameEnvironment.RC => "SERVER_PATH_RC", + GameEnvironment.DEV => "SERVER_PATH_DEV", _ => throw new ArgumentException("Server environment is invalid") }; return Path.Join(VariablesWrapper.VariablesDataService().GetSingle(variableKey).AsString(), "arma3server_x64.exe"); @@ -82,11 +82,11 @@ private static string FormatGameServerMods(this GameServer gameServer) => private static string FormatGameServerServerMods(this GameServer gameServer) => gameServer.serverMods.Count > 0 ? $"{string.Join(";", gameServer.serverMods.Select(x => x.name))};" : string.Empty; - public static string GetGameServerModsPaths(GameServerEnvironment environment) { + public static string GetGameServerModsPaths(GameEnvironment environment) { string variableKey = environment switch { - GameServerEnvironment.RELEASE => "MODPACK_PATH_RELEASE", - GameServerEnvironment.RC => "MODPACK_PATH_RC", - GameServerEnvironment.DEV => "MODPACK_PATH_DEV", + GameEnvironment.RELEASE => "MODPACK_PATH_RELEASE", + GameEnvironment.RC => "MODPACK_PATH_RC", + GameEnvironment.DEV => "MODPACK_PATH_DEV", _ => throw new ArgumentException("Server environment is invalid") }; return Path.Join(VariablesWrapper.VariablesDataService().GetSingle(variableKey).AsString(), "Repo"); diff --git a/UKSF.Api.Services/Game/GameServersService.cs b/UKSF.Api.Services/Game/GameServersService.cs index 8b04a180..d8d3ecbe 100644 --- a/UKSF.Api.Services/Game/GameServersService.cs +++ b/UKSF.Api.Services/Game/GameServersService.cs @@ -12,7 +12,6 @@ using UKSF.Api.Interfaces.Game; using UKSF.Api.Models.Game; using UKSF.Api.Models.Mission; -using UKSF.Api.Services.Message; using UKSF.Common; namespace UKSF.Api.Services.Game { @@ -167,7 +166,7 @@ public List GetAvailableMods(string id) { GameServer gameServer = Data.GetSingle(id); Uri serverExecutable = new Uri(gameServer.GetGameServerExecutablePath()); List mods = new List(); - IEnumerable availableModsFolders = new[] { GameServerHelpers.GetGameServerModsPaths(gameServer.serverEnvironment) }; + IEnumerable availableModsFolders = new[] { GameServerHelpers.GetGameServerModsPaths(gameServer.environment) }; IEnumerable extraModsFolders = GameServerHelpers.GetGameServerExtraModsPaths(); availableModsFolders = availableModsFolders.Concat(extraModsFolders); foreach (string modsPath in availableModsFolders) { @@ -201,7 +200,7 @@ public List GetAvailableMods(string id) { return mods; } - public List GetEnvironmentMods(GameServerEnvironment environment) { + public List GetEnvironmentMods(GameEnvironment environment) { string repoModsFolder = GameServerHelpers.GetGameServerModsPaths(environment); IEnumerable modFolders = new DirectoryInfo(repoModsFolder).EnumerateDirectories("@*", SearchOption.TopDirectoryOnly); return modFolders.Select(modFolder => new { modFolder, modFiles = new DirectoryInfo(modFolder.FullName).EnumerateFiles("*.pbo", SearchOption.AllDirectories) }) diff --git a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs index ad7ad58c..11bfdfa4 100644 --- a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs +++ b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Models.Mission; -using UKSF.Api.Services.Admin; namespace UKSF.Api.Services.Game.Missions { public static class MissionDataResolver { diff --git a/UKSF.Api.Services/Game/Missions/MissionService.cs b/UKSF.Api.Services/Game/Missions/MissionService.cs index 4d3d87e3..f440b720 100644 --- a/UKSF.Api.Services/Game/Missions/MissionService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionService.cs @@ -5,7 +5,6 @@ using System.Linq; using UKSF.Api.Models.Game; using UKSF.Api.Models.Mission; -using UKSF.Api.Services.Admin; using UKSF.Common; namespace UKSF.Api.Services.Game.Missions { @@ -167,7 +166,7 @@ private void Patch() { if (!CheckIgnoreKey("missionImageIgnore")) { string imagePath = Path.Combine(mission.path, "uksf.paa"); - string modpackImagePath = Path.Combine(GameServerHelpers.GetGameServerModsPaths(GameServerEnvironment.RELEASE), "@uksf", "UKSFTemplate.VR", "uksf.paa"); + string modpackImagePath = Path.Combine(GameServerHelpers.GetGameServerModsPaths(GameEnvironment.RELEASE), "@uksf", "UKSFTemplate.VR", "uksf.paa"); if (File.Exists(modpackImagePath)) { if (File.Exists(imagePath) && new FileInfo(imagePath).Length != new FileInfo(modpackImagePath).Length) { reports.Add( diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index 6699a715..6510607f 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -48,17 +48,14 @@ public static void RunProcess(IStepLogger logger, bool raiseErrors, Cancellation } [SuppressMessage("ReSharper", "MethodHasAsyncOverload")] // async runspace.OpenAsync is not as it seems - public static async Task RunPowershell(IStepLogger logger, bool raiseErrors, CancellationToken cancellationToken, string command, string workingDirectory, params string[] args) { + public static async Task RunPowershell(IStepLogger logger, bool raiseErrors, CancellationToken cancellationToken, string command, string workingDirectory) { using Runspace runspace = RunspaceFactory.CreateRunspace(); runspace.Open(); runspace.SessionStateProxy.Path.SetLocation(workingDirectory); using PowerShell powerShell = PowerShell.Create(); powerShell.Runspace = runspace; - powerShell.AddCommand(command); - foreach (string arg in args) { - powerShell.AddArgument(arg); - } + powerShell.AddScript(command); async void Log(object sender, DataAddedEventArgs eventArgs) { PSDataCollection streamObjectsReceived = sender as PSDataCollection; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs index 223e371a..f7c04d47 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs @@ -4,7 +4,10 @@ using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; +using UKSF.Api.Models.Game; using UKSF.Api.Models.Modpack; +using UKSF.Api.Services.Modpack.BuildProcess.Steps.Common; +using UKSF.Api.Services.Modpack.BuildProcess.Steps.Release; namespace UKSF.Api.Services.Modpack.BuildProcess { public class BuildProcessorService : IBuildProcessorService { @@ -23,7 +26,7 @@ public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cance if (cancellationTokenSource.IsCancellationRequested) { await buildsService.CancelBuild(build); return; - }; + } IBuildStep step = buildStepService.ResolveBuildStep(buildStep.name); step.Init(build, buildStep, async () => await buildsService.UpdateBuildStep(build, buildStep), cancellationTokenSource); @@ -41,10 +44,12 @@ public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cance await step.Succeed(); } catch (OperationCanceledException) { await step.Cancel(); + await ProcessRestore(step, build); await buildsService.CancelBuild(build); return; } catch (Exception exception) { await step.Fail(exception); + await ProcessRestore(step, build); await buildsService.FailBuild(build); return; } @@ -52,5 +57,36 @@ public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cance await buildsService.SucceedBuild(build); } + + private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) { + if (build.environment != GameEnvironment.RELEASE || runningStep is BuildStepClean || runningStep is BuildStepBackup) return; + + ModpackBuildStep restoreStep = buildStepService.GetRestoreStepForRelease(); + if (restoreStep == null) return; + + async Task UpdateCallback() { + await buildsService.UpdateBuildStep(build, restoreStep); + } + + restoreStep.index = build.steps.Count; + IBuildStep step = buildStepService.ResolveBuildStep(restoreStep.name); + step.Init(build, restoreStep, UpdateCallback, new CancellationTokenSource()); + build.steps.Add(restoreStep); + await UpdateCallback(); + + try { + await step.Start(); + if (!await step.CheckGuards()) { + await step.Skip(); + } else { + await step.Setup(); + await step.Process(); + await step.Teardown(); + await step.Succeed(); + } + } catch (Exception exception) { + await step.Fail(exception); + } + } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index 453a3cba..7df75ff5 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -1,20 +1,40 @@ using System; using System.Collections.Generic; +using System.Linq; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; +using UKSF.Api.Models.Game; using UKSF.Api.Models.Modpack; using UKSF.Api.Services.Modpack.BuildProcess.Steps; +using UKSF.Api.Services.Modpack.BuildProcess.Steps.Build; +using UKSF.Api.Services.Modpack.BuildProcess.Steps.Common; +using UKSF.Api.Services.Modpack.BuildProcess.Steps.Release; namespace UKSF.Api.Services.Modpack.BuildProcess { public class BuildStepService : IBuildStepService { - private readonly Dictionary buildStepDictionary = new Dictionary { - { BuildStep0Prep.NAME, typeof(BuildStep0Prep) }, - { BuildStep1Source.NAME, typeof(BuildStep1Source) }, - { BuildStep2Build.NAME, typeof(BuildStep2Build) }, - { BuildStep90PublishRelease.NAME, typeof(BuildStep90PublishRelease) }, - { BuildStep95Notify.NAME, typeof(BuildStep95Notify) }, - { BuildStep99MergeRelease.NAME, typeof(BuildStep99MergeRelease) } - }; + private Dictionary buildStepDictionary = new Dictionary(); + + public void RegisterBuildSteps() { + buildStepDictionary = AppDomain.CurrentDomain.GetAssemblies() + .SelectMany(x => x.GetTypes(), (_, type) => new { type }) + .Select(x => new { x.type, attributes = x.type.GetCustomAttributes(typeof(BuildStepAttribute), true) }) + .Where(x => x.attributes != null && x.attributes.Length > 0) + .Select(x => new { Key = x.attributes.Cast().First().Name, Value = x.type }) + .ToDictionary(x => x.Key, x => x.Value); + } + + public List GetSteps(GameEnvironment environment) { + List steps = environment switch { + GameEnvironment.RELEASE => GetStepsForRelease(), + GameEnvironment.RC => GetStepsForRc(), + GameEnvironment.DEV => GetStepsForBuild(), + _ => throw new ArgumentException("Invalid build environment") + }; + ResolveIndices(steps); + return steps; + } + + public ModpackBuildStep GetRestoreStepForRelease() => new ModpackBuildStep(BuildStepRestore.NAME); public IBuildStep ResolveBuildStep(string buildStepName) { if (!buildStepDictionary.ContainsKey(buildStepName)) { @@ -26,35 +46,40 @@ public IBuildStep ResolveBuildStep(string buildStepName) { return step; } - public List GetStepsForBuild() { - List steps = new List { - new ModpackBuildStep(BuildStep0Prep.NAME), - new ModpackBuildStep(BuildStep1Source.NAME), - new ModpackBuildStep(BuildStep2Build.NAME), - new ModpackBuildStep(BuildStep95Notify.NAME) + private static List GetStepsForBuild() => + new List { + new ModpackBuildStep(BuildStepPrep.NAME), + new ModpackBuildStep(BuildStepClean.NAME), + new ModpackBuildStep(BuildStepBuild.NAME), + new ModpackBuildStep(BuildStepDeploy.NAME), + new ModpackBuildStep(BuildStepKeys.NAME), + new ModpackBuildStep(BuildStepCbaSettings.NAME), + new ModpackBuildStep(BuildStepNotify.NAME) }; - ResolveIndices(steps); - return steps; - } - public List GetStepsForRc() { - List steps = new List { - new ModpackBuildStep(BuildStep0Prep.NAME), new ModpackBuildStep(BuildStep1Source.NAME), new ModpackBuildStep(BuildStep2Build.NAME), new ModpackBuildStep(BuildStep95Notify.NAME) + private static List GetStepsForRc() => + new List { + new ModpackBuildStep(BuildStepPrep.NAME), + new ModpackBuildStep(BuildStepClean.NAME), + new ModpackBuildStep(BuildStepBuild.NAME), + new ModpackBuildStep(BuildStepDeploy.NAME), + new ModpackBuildStep(BuildStepKeys.NAME), + new ModpackBuildStep(BuildStepCbaSettings.NAME), + new ModpackBuildStep(BuildStepNotify.NAME) }; - ResolveIndices(steps); - return steps; - } - public List GetStepsForRelease() { - List steps = new List { - new ModpackBuildStep(BuildStep0Prep.NAME), - new ModpackBuildStep(BuildStep90PublishRelease.NAME), - new ModpackBuildStep(BuildStep95Notify.NAME), - new ModpackBuildStep(BuildStep99MergeRelease.NAME) + private static List GetStepsForRelease() => + new List { + new ModpackBuildStep(BuildStepClean.NAME), + new ModpackBuildStep(BuildStepBackup.NAME), + new ModpackBuildStep(BuildStepDeploy.NAME), + new ModpackBuildStep(BuildStepReleaseKeys.NAME), + new ModpackBuildStep(BuildStepCbaSettings.NAME), + new ModpackBuildStep(BuildStepBuildRepo.NAME), + new ModpackBuildStep(BuildStepPublish.NAME), + new ModpackBuildStep(BuildStepNotify.NAME), + new ModpackBuildStep(BuildStepMerge.NAME) }; - ResolveIndices(steps); - return steps; - } private static void ResolveIndices(IReadOnlyList steps) { for (int i = 0; i < steps.Count; i++) { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs index ec285038..c8fee254 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs @@ -19,7 +19,10 @@ public async Task LogStart() { } public async Task LogSuccess() { - LogLines($"\nFinished: {buildStep.name}", "green"); + LogLines( + $"\nFinished{(buildStep.buildResult == ModpackBuildResult.WARNING ? " with warning" : "")}: {buildStep.name}", + buildStep.buildResult == ModpackBuildResult.WARNING ? "orangered" : "green" + ); await logCallback(); } @@ -43,6 +46,16 @@ public async Task LogError(Exception exception) { await logCallback(); } + public async Task LogSurround(string log) { + LogLines(log, "cadetblue"); + await logCallback(); + } + + public async Task LogInline(string log) { + buildStep.logs[^1] = new ModpackBuildStepLogItem { text = log }; + await logCallback(); + } + public async Task Log(string log, string colour = "") { LogLines(log, colour); await logCallback(); @@ -50,7 +63,7 @@ public async Task Log(string log, string colour = "") { private void LogLines(string log, string colour = "") { foreach (string line in log.Split("\n")) { - buildStep.logs.Add(new ModpackBuildStepLogItem {text = line, colour = string.IsNullOrEmpty(line) ? "" : colour}); + buildStep.logs.Add(new ModpackBuildStepLogItem { text = line, colour = string.IsNullOrEmpty(line) ? "" : colour }); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs index 1cc86353..d12ec59d 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs @@ -3,7 +3,9 @@ using System.Threading.Tasks; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; +using UKSF.Api.Models.Game; using UKSF.Api.Models.Modpack; +using UKSF.Api.Services.Admin; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class BuildStep : IBuildStep { @@ -32,19 +34,19 @@ public async Task Start() { public virtual Task CheckGuards() => Task.FromResult(true); - public virtual async Task Setup() { + public async Task Setup() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); await Logger.Log("\nSetup", COLOUR_BLUE); await SetupExecute(); } - public virtual async Task Process() { + public async Task Process() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); await Logger.Log("\nProcess", COLOUR_BLUE); await ProcessExecute(); } - public virtual async Task Teardown() { + public async Task Teardown() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); await Logger.Log("\nTeardown", COLOUR_BLUE); await TeardownExecute(); @@ -52,7 +54,10 @@ public virtual async Task Teardown() { public async Task Succeed() { await Logger.LogSuccess(); - buildStep.buildResult = ModpackBuildResult.SUCCESS; + if (buildStep.buildResult != ModpackBuildResult.WARNING) { + buildStep.buildResult = ModpackBuildResult.SUCCESS; + } + await Stop(); } @@ -68,6 +73,11 @@ public async Task Cancel() { await Stop(); } + public async Task Warning(string message) { + await Logger.LogWarning(message); + buildStep.buildResult = ModpackBuildResult.WARNING; + } + public async Task Skip() { await Logger.LogSkipped(); buildStep.buildResult = ModpackBuildResult.SKIPPED; @@ -87,14 +97,40 @@ protected virtual async Task TeardownExecute() { } protected async Task ReleaseBuildGuard() { - if (!Build.isRelease) { - await Logger.LogWarning("Build is not a release build, but the definition contains a release step.\nThis is a configuration error, please notify an admin."); + if (Build.environment != GameEnvironment.RELEASE) { + await Warning("\nBuild is not a release build, but the definition contains a release step.\nThis is a configuration error, please notify an admin."); return false; } return true; } + internal string GetBuildEnvironmentPath() => GetEnvironmentPath(Build.environment); + + internal static string GetEnvironmentPath(GameEnvironment environment) => + environment switch { + GameEnvironment.RELEASE => VariablesWrapper.VariablesDataService().GetSingle("MODPACK_PATH_RELEASE").AsString(), + GameEnvironment.RC => VariablesWrapper.VariablesDataService().GetSingle("MODPACK_PATH_RC").AsString(), + GameEnvironment.DEV => VariablesWrapper.VariablesDataService().GetSingle("MODPACK_PATH_DEV").AsString(), + _ => throw new ArgumentException("Invalid build environment") + }; + + internal static string GetServerEnvironmentPath(GameEnvironment environment) => + environment switch { + GameEnvironment.RELEASE => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_RELEASE").AsString(), + GameEnvironment.RC => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_RC").AsString(), + GameEnvironment.DEV => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_DEV").AsString(), + _ => throw new ArgumentException("Invalid build environment") + }; + + internal string GetEnvironmentRepoName() => + Build.environment switch { + GameEnvironment.RELEASE => "UKSF", + GameEnvironment.RC => "UKSF-Rc", + GameEnvironment.DEV => "UKSF-Dev", + _ => throw new ArgumentException("Invalid build environment") + }; + private async Task LogCallback() { await updateCallback(); } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs deleted file mode 100644 index 52da9053..00000000 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep0Prep.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Threading.Tasks; -using UKSF.Common; - -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { - public class BuildStep0Prep : BuildStep { - public const string NAME = "Prep"; - - protected override async Task ProcessExecute() { - await TaskUtilities.Delay(TimeSpan.FromSeconds(2), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "subst", "C:/", "P:", "\"D:/Arma/Arma 3 Projects\""); - await TaskUtilities.Delay(TimeSpan.FromSeconds(2), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "subst", "C:/"); - } - } -} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1Source.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1Source.cs deleted file mode 100644 index 835c5907..00000000 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep1Source.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Threading.Tasks; -using UKSF.Common; - -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { - public class BuildStep1Source : BuildStep { - public const string NAME = "Pull source"; - - protected override async Task SetupExecute() { - await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfihjugdfhjodfgh"); - } - - protected override async Task ProcessExecute() { - await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfi4y5hu654hhjugdfhjodfgh"); - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfihjtyfghrtytrtryfghfghfghugdfhjodfgh"); - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", "4665uhftfghtfghfhgfgh"); - } - - protected override async Task TeardownExecute() { - await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", "gdfiunjhdgfihjtyfghfghfghfghugdfhjodfgh"); - } - } -} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs deleted file mode 100644 index 42d37381..00000000 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep2Build.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Threading.Tasks; -using UKSF.Common; - -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { - public class BuildStep2Build : BuildStep { - public const string NAME = "Build"; - - protected override async Task SetupExecute() { - await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", "ibguyredsrgiuhbi7dh54t"); - } - - protected override async Task ProcessExecute() { - await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); - for (int i = 0; i < 100; i++) { - await TaskUtilities.Delay(TimeSpan.FromMilliseconds(25), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", Guid.NewGuid().ToString()); - } - } - - protected override async Task TeardownExecute() { - await TaskUtilities.Delay(TimeSpan.FromSeconds(1), CancellationTokenSource.Token); - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, "echo", "C:/", "hfg"); - } - } -} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep90PublishRelease.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep90PublishRelease.cs deleted file mode 100644 index 2913007c..00000000 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep90PublishRelease.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Services.Common; - -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { - public class BuildStep90PublishRelease : BuildStep { - public const string NAME = "Publish"; - private IReleaseService releaseService; - - public override async Task CheckGuards() { - await Logger.Log("\nChecking step guards", COLOUR_BLUE); - return await ReleaseBuildGuard(); - } - - protected override async Task SetupExecute() { - releaseService = ServiceWrapper.Provider.GetService(); - await Logger.Log("Retrieved services"); - } - - protected override async Task ProcessExecute() { - await releaseService.PublishRelease(Build.version); - await Logger.Log("Release published"); - } - } -} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99MergeRelease.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99MergeRelease.cs deleted file mode 100644 index 1b54f5fd..00000000 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep99MergeRelease.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Interfaces.Integrations.Github; -using UKSF.Api.Services.Common; - -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { - public class BuildStep99MergeRelease : BuildStep { - public const string NAME = "Merge"; - private IGithubService githubService; - - protected override async Task SetupExecute() { - githubService = ServiceWrapper.Provider.GetService(); - await Logger.Log("Retrieved services"); - } - - protected override async Task ProcessExecute() { - try { - await githubService.MergeBranch("dev", "release", $"Release {Build.version}"); - await githubService.MergeBranch("master", "dev", $"Release {Build.version}"); - await Logger.Log("Release branch merges complete"); - } catch (Exception exception) { - await Logger.LogWarning($"Release branch merges failed:\n\n{exception}"); - } - } - } -} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepAttribute.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepAttribute.cs new file mode 100644 index 00000000..4240f88f --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepAttribute.cs @@ -0,0 +1,9 @@ +using System; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { + public class BuildStepAttribute : Attribute { + public readonly string Name; + + public BuildStepAttribute(string name) => Name = name; + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs new file mode 100644 index 00000000..b6d3dee2 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs @@ -0,0 +1,17 @@ +using System.Threading.Tasks; +using UKSF.Api.Services.Admin; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { + [BuildStep(NAME)] + public class BuildStepBuildRepo : BuildStep { + public const string NAME = "Build Repo"; + + protected override async Task ProcessExecute() { + string repoName = GetEnvironmentRepoName(); + await Logger.Log($"Building {repoName} repo"); + + string arma3SyncPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_ARMA3SYNC_PATH").AsString(); + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, $"Java -jar .\\ArmA3Sync.jar -BUILD {repoName}", arma3SyncPath); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepCbaSettings.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepCbaSettings.cs new file mode 100644 index 00000000..e115fae7 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepCbaSettings.cs @@ -0,0 +1,31 @@ +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; +using UKSF.Api.Models.Game; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { + [BuildStep(NAME)] + public class BuildStepCbaSettings : FileBuildStep { + public const string NAME = "CBA Settings"; + + protected override async Task ProcessExecute() { + await Logger.Log("Updating CBA settings"); + + string sourceUserconfigPath; + string targetUserconfigPath; + if (Build.environment == GameEnvironment.RELEASE) { + sourceUserconfigPath = Path.Join(GetServerEnvironmentPath(GameEnvironment.RC), "userconfig"); + targetUserconfigPath = Path.Join(GetServerEnvironmentPath(GameEnvironment.RELEASE), "userconfig"); + } else { + sourceUserconfigPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf"); + targetUserconfigPath = Path.Join(GetServerEnvironmentPath(Build.environment), "userconfig"); + } + + FileInfo cbaSettingsFile = new FileInfo(Path.Join(sourceUserconfigPath, "cba_settings.sqf")); + + await Logger.LogSurround("\nCopying cba_settings.sqf..."); + await CopyFiles(new DirectoryInfo(sourceUserconfigPath), new DirectoryInfo(targetUserconfigPath), new List { cbaSettingsFile }); + await Logger.LogSurround("Copied cba_settings.sqf"); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs new file mode 100644 index 00000000..92d9e79f --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs @@ -0,0 +1,29 @@ +using System.IO; +using System.Threading.Tasks; +using UKSF.Api.Models.Game; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { + [BuildStep(NAME)] + public class BuildStepClean : FileBuildStep { + public const string NAME = "Clean folders"; + + protected override async Task ProcessExecute() { + await Logger.Log("Cleaning build environment"); + + string environmentPath = GetBuildEnvironmentPath(); + if (Build.environment == GameEnvironment.RELEASE) { + string repoPath = Path.Join(environmentPath, "Backup", "Repo"); + string keysPath = Path.Join(environmentPath, "Backup", "Keys"); + await Logger.LogSurround("\nCleaning backup folder"); + await DeleteDirectoryContents(repoPath); + await DeleteDirectoryContents(keysPath); + await Logger.LogSurround("Cleaned backup folder"); + } else { + string path = Path.Join(environmentPath, "Build"); + await Logger.LogSurround("\nCleaning build folder"); + await DeleteDirectoryContents(path); + await Logger.LogSurround("Cleaned build folder"); + } + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepDeploy.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepDeploy.cs new file mode 100644 index 00000000..c00c27cb --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepDeploy.cs @@ -0,0 +1,36 @@ +using System.IO; +using System.Threading.Tasks; +using UKSF.Api.Models.Game; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { + [BuildStep(NAME)] + public class BuildStepDeploy : FileBuildStep { + public const string NAME = "Deploy"; + + protected override async Task ProcessExecute() { + await Logger.Log("Deploying files from RC to release"); + + string sourcePath; + string targetPath; + if (Build.environment == GameEnvironment.RELEASE) { + sourcePath = Path.Join(GetEnvironmentPath(GameEnvironment.RC), "Repo"); + targetPath = Path.Join(GetBuildEnvironmentPath(), "Repo"); + } else { + sourcePath = Path.Join(GetBuildEnvironmentPath(), "Build"); + targetPath = Path.Join(GetBuildEnvironmentPath(), "Repo"); + } + + await Logger.LogSurround("\nAdding new files..."); + await AddFiles(sourcePath, targetPath); + await Logger.LogSurround("Added new files"); + + await Logger.LogSurround("\nCopying updated files..."); + await UpdateFiles(sourcePath, targetPath); + await Logger.LogSurround("Copied updated files"); + + await Logger.LogSurround("\nDeleting removed files..."); + await DeleteFiles(sourcePath, targetPath); + await Logger.LogSurround("Deleted removed files"); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepKeys.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepKeys.cs new file mode 100644 index 00000000..120a8c1e --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepKeys.cs @@ -0,0 +1,41 @@ +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { + [BuildStep(NAME)] + public class BuildStepKeys : FileBuildStep { + public const string NAME = "Keys"; + + protected override async Task SetupExecute() { + await Logger.Log("Wiping server keys folder"); + string keysPath = Path.Join(GetBuildEnvironmentPath(), "Keys"); + await DeleteDirectoryContents(keysPath); + await Logger.Log("Server keys folder wiped"); + } + + protected override async Task ProcessExecute() { + await Logger.Log("Updating keys"); + + string sourceBasePath = Path.Join(GetBuildEnvironmentPath(), "BaseKeys"); + string sourceRepoPath = Path.Join(GetBuildEnvironmentPath(), "Repo"); + string targetPath = Path.Join(GetBuildEnvironmentPath(), "Keys"); + + DirectoryInfo sourceBase = new DirectoryInfo(sourceBasePath); + DirectoryInfo sourceRepo = new DirectoryInfo(sourceRepoPath); + DirectoryInfo target = new DirectoryInfo(targetPath); + List baseKeys = GetDirectoryContents(sourceRepo, "*.bikey"); + List repoKeys = GetDirectoryContents(sourceRepo, "*.bikey"); + await Logger.Log($"Found {baseKeys.Count} keys in base keys"); + await Logger.Log($"Found {repoKeys.Count} keys in repo"); + + await Logger.LogSurround("\nCopying base keys..."); + await CopyFiles(sourceBase, target, baseKeys, true); + await Logger.LogSurround("Copied base keys"); + + await Logger.LogSurround("\nCopying repo keys..."); + await CopyFiles(sourceRepo, target, repoKeys, true); + await Logger.LogSurround("Copied repo keys"); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep95Notify.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs similarity index 71% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep95Notify.cs rename to UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs index dbbfdd4f..5db69126 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep95Notify.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs @@ -2,12 +2,14 @@ using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Models.Game; using UKSF.Api.Models.Modpack; using UKSF.Api.Services.Admin; using UKSF.Api.Services.Common; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { - public class BuildStep95Notify : BuildStep { +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { + [BuildStep(NAME)] + public class BuildStepNotify : BuildStep { public const string NAME = "Notify"; private IDiscordService discordService; private IReleaseService releaseService; @@ -19,7 +21,7 @@ protected override async Task SetupExecute() { } protected override async Task ProcessExecute() { - if (Build.isRelease) { + if (Build.environment == GameEnvironment.RELEASE) { ModpackRelease release = releaseService.GetRelease(Build.version); await discordService.SendMessageToEveryone(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_RELEASE").AsUlong(), GetDiscordMessage(release)); } else { @@ -30,16 +32,16 @@ protected override async Task ProcessExecute() { } private string GetBuildMessage() => - Build.isReleaseCandidate + Build.environment == GameEnvironment.RC ? $"New dev build available ({Build.buildNumber}) on the dev repository" : $"New release candidate ({Build.buildNumber}) available for {Build.version} on the rc repository"; private string GetBuildLink() => - Build.isReleaseCandidate ? $"https://uk-sf.co.uk/modpack/builds-rc?version={Build.version}&build={Build.id}" : $"https://uk-sf.co.uk/modpack/builds-dev?build={Build.id}"; + Build.environment == GameEnvironment.RC ? $"https://uk-sf.co.uk/modpack/builds-rc?version={Build.version}&build={Build.id}" : $"https://uk-sf.co.uk/modpack/builds-dev?build={Build.id}"; private string GetDiscordMessage(ModpackRelease release = null) => release == null - ? $"Modpack {(Build.isReleaseCandidate ? "RC" : "Dev")} Build - {(Build.isReleaseCandidate ? $"{Build.version} RC# {Build.buildNumber}" : $"#{Build.buildNumber}")}\n{GetBuildMessage()}\n<{GetBuildLink()}>" + ? $"Modpack {(Build.environment == GameEnvironment.RC ? "RC" : "Dev")} Build - {(Build.environment == GameEnvironment.RC ? $"{Build.version} RC# {Build.buildNumber}" : $"#{Build.buildNumber}")}\n{GetBuildMessage()}\n<{GetBuildLink()}>" : $"Modpack Update - {release.version}\nChangelog: \n\n{release.description}"; } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs new file mode 100644 index 00000000..63048112 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs @@ -0,0 +1,32 @@ +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; +using Microsoft.Win32; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { + public class BuildStepSignDependencies : FileBuildStep { + public const string NAME = "Dependencies"; + + protected override async Task ProcessExecute() { + + string sourcePath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies"); + DirectoryInfo source = new DirectoryInfo(sourcePath); + + await Logger.LogSurround("\nDeleting dependencies signatures..."); + List signatures = GetDirectoryContents(source, "*.bisign"); + List zsyncs = GetDirectoryContents(source, "*.bisign.zsync"); + await DeleteFiles(signatures); + await DeleteFiles(zsyncs); + await Logger.LogSurround("Deleted dependencies signatures"); + + + } + + private string GetArmaToolsPath() { + RegistryKey gameKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\WOW6432Node\bohemia interactive\arma 3 tools"); + if (gameKey == null) return ""; + string install = gameKey.GetValue("main", "").ToString(); + return Directory.Exists(install) ? install : ""; + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs new file mode 100644 index 00000000..f56299b0 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs @@ -0,0 +1,148 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Humanizer; +using MoreLinq; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { + public class FileBuildStep : BuildStep { + private const double FILE_COPY_TASK_SIZE_THRESHOLD = 5_000_000_000; + private const double FILE_COPY_TASK_OUNT_THRESHOLD = 150; + + internal List GetDirectoryContents(DirectoryInfo source, string searchPattern = "*") { + List files = source.GetFiles(searchPattern).ToList(); + foreach (DirectoryInfo subDirectory in source.GetDirectories()) { + CancellationTokenSource.Token.ThrowIfCancellationRequested(); + files.AddRange(GetDirectoryContents(subDirectory)); + } + + return files; + } + + internal async Task AddFiles(string sourcePath, string targetPath) { + DirectoryInfo source = new DirectoryInfo(sourcePath); + DirectoryInfo target = new DirectoryInfo(targetPath); + IEnumerable sourceFiles = GetDirectoryContents(source); + List addedFiles = sourceFiles.Select(sourceFile => new { sourceFile, targetFile = new FileInfo(sourceFile.FullName.Replace(source.FullName, target.FullName)) }) + .Where(x => !x.targetFile.Exists) + .Select(x => x.sourceFile) + .ToList(); + await CopyFiles(source, target, addedFiles); + } + + internal async Task UpdateFiles(string sourcePath, string targetPath) { + DirectoryInfo source = new DirectoryInfo(sourcePath); + DirectoryInfo target = new DirectoryInfo(targetPath); + IEnumerable sourceFiles = GetDirectoryContents(source); + List updatedFiles = sourceFiles.Select(sourceFile => new { sourceFile, targetFile = new FileInfo(sourceFile.FullName.Replace(source.FullName, target.FullName)) }) + .Where(x => x.targetFile.Exists && (x.targetFile.Length != x.sourceFile.Length || x.targetFile.LastWriteTime < x.sourceFile.LastWriteTime)) + .Select(x => x.sourceFile) + .ToList(); + await CopyFiles(source, target, updatedFiles); + } + + internal async Task DeleteFiles(string sourcePath, string targetPath) { + DirectoryInfo source = new DirectoryInfo(sourcePath); + DirectoryInfo target = new DirectoryInfo(targetPath); + IEnumerable targetFiles = GetDirectoryContents(target); + List deletedFiles = targetFiles.Select(targetFile => new { targetFile, sourceFile = new FileInfo(targetFile.FullName.Replace(target.FullName, source.FullName)) }) + .Where(x => !x.sourceFile.Exists) + .Select(x => x.targetFile) + .ToList(); + await DeleteFiles(deletedFiles); + await DeleteEmptyDirectories(target); + } + + internal async Task CopyDirectory(string sourceDirectory, string targetDirectory) { + DirectoryInfo source = new DirectoryInfo(sourceDirectory); + DirectoryInfo target = new DirectoryInfo(targetDirectory); + List files = GetDirectoryContents(source); + await CopyFiles(source, target, files); + } + + internal async Task CopyFiles(FileSystemInfo source, FileSystemInfo target, List files, bool flatten = false) { + Directory.CreateDirectory(target.FullName); + if (files.Count == 0) { + await Logger.Log("No files to copy"); + return; + } + + double totalSize = files.Select(x => x.Length).Sum(); + await Logger.Log($"{totalSize.Bytes().ToString("#.#")} of files to copy"); + if (files.Count > FILE_COPY_TASK_OUNT_THRESHOLD || totalSize > FILE_COPY_TASK_SIZE_THRESHOLD) { + await BatchCopyFiles(source, target, files, totalSize, flatten); + } else { + await SimpleCopyFiles(source, target, files, flatten); + } + } + + internal async Task DeleteDirectoryContents(string path, string searchPattern = "*") { + DirectoryInfo directory = new DirectoryInfo(path); + foreach (DirectoryInfo subDirectory in directory.GetDirectories("*", SearchOption.TopDirectoryOnly)) { + CancellationTokenSource.Token.ThrowIfCancellationRequested(); + await Logger.Log($"Deleting: {subDirectory}"); + subDirectory.Delete(true); + } + + await DeleteFiles(directory.GetFiles("*", SearchOption.AllDirectories)); + } + + internal async Task DeleteFiles(IEnumerable files) { + foreach (FileInfo file in files) { + CancellationTokenSource.Token.ThrowIfCancellationRequested(); + await Logger.Log($"Deleting: {file}"); + file.Delete(); + } + } + + internal async Task DeleteEmptyDirectories(DirectoryInfo directory) { + foreach (DirectoryInfo subDirectory in directory.GetDirectories()) { + await DeleteEmptyDirectories(subDirectory); + if (subDirectory.GetFiles().Length == 0 && subDirectory.GetDirectories().Length == 0) { + await Logger.Log($"Deleting: {subDirectory}"); + subDirectory.Delete(false); + } + } + } + + private async Task SimpleCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, bool flatten = false) { + foreach (FileInfo file in files) { + CancellationTokenSource.Token.ThrowIfCancellationRequested(); + string targetFile = flatten ? Path.Join(target.FullName, file.Name) : file.FullName.Replace(source.FullName, target.FullName); + await Logger.Log($"Copying file: {file}"); + Directory.CreateDirectory(Path.GetDirectoryName(targetFile)); + file.CopyTo(targetFile, true); + } + } + + private async Task BatchCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, double totalSize, bool flatten = false) { + double copiedSize = 0; + await Logger.Log($"Copied {copiedSize.Bytes().ToString("#.#")} of {totalSize.Bytes().ToString("#.#")}"); + IEnumerable> fileBatches = files.Batch(10); + foreach (IEnumerable fileBatch in fileBatches) { + List fileList = fileBatch.ToList(); + IEnumerable tasks = fileList.Select( + file => { + try { + CancellationTokenSource.Token.ThrowIfCancellationRequested(); + string targetFile = flatten ? Path.Join(target.FullName, file.Name) : file.FullName.Replace(source.FullName, target.FullName); + Directory.CreateDirectory(Path.GetDirectoryName(targetFile)); + file.CopyTo(targetFile, true); + } catch (OperationCanceledException) { + throw; + } catch (Exception exception) { + throw new Exception($"Failed copying file '{file}'\n{exception.Message}", exception); + } + + return Task.CompletedTask; + } + ); + await Task.WhenAll(tasks); + copiedSize += fileList.Select(x => x.Length).Sum(); + await Logger.LogInline($"Copied {copiedSize.Bytes().ToString("#.#")} of {totalSize.Bytes().ToString("#.#")}"); + } + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildsService.cs b/UKSF.Api.Services/Modpack/BuildsService.cs index 779ec750..6d812238 100644 --- a/UKSF.Api.Services/Modpack/BuildsService.cs +++ b/UKSF.Api.Services/Modpack/BuildsService.cs @@ -8,6 +8,7 @@ using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Game; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; @@ -27,9 +28,9 @@ public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep await Data.Update(build, buildStep); } - public List GetDevBuilds() => Data.Get(x => !x.isReleaseCandidate && !x.isRelease); + public List GetDevBuilds() => Data.Get(x => x.environment == GameEnvironment.DEV); - public List GetRcBuilds() => Data.Get(x => x.isReleaseCandidate || x.isRelease); + public List GetRcBuilds() => Data.Get(x => x.environment != GameEnvironment.DEV); public ModpackBuild GetLatestDevBuild() => GetDevBuilds().FirstOrDefault(); @@ -38,7 +39,7 @@ public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep public async Task CreateDevBuild(GithubCommit commit) { ModpackBuild previousBuild = GetLatestDevBuild(); string builderId = accountService.Data.GetSingle(x => x.email == commit.author)?.id; - ModpackBuild build = new ModpackBuild { buildNumber = previousBuild?.buildNumber + 1 ?? 1, commit = commit, builderId = builderId, steps = buildStepService.GetStepsForBuild() }; + ModpackBuild build = new ModpackBuild { buildNumber = previousBuild?.buildNumber + 1 ?? 1, environment = GameEnvironment.DEV, commit = commit, builderId = builderId, steps = buildStepService.GetSteps(GameEnvironment.DEV) }; await Data.Add(build); return build; } @@ -47,7 +48,7 @@ public async Task CreateRcBuild(string version, GithubCommit commi ModpackBuild previousBuild = GetLatestRcBuild(version); string builderId = accountService.Data.GetSingle(x => x.email == commit.author)?.id; ModpackBuild build = new ModpackBuild { - version = version, buildNumber = previousBuild?.buildNumber + 1 ?? 1, isReleaseCandidate = true, commit = commit, builderId = builderId, steps = buildStepService.GetStepsForRc() + version = version, buildNumber = previousBuild?.buildNumber + 1 ?? 1, environment = GameEnvironment.RC, commit = commit, builderId = builderId, steps = buildStepService.GetSteps(GameEnvironment.RC) }; await Data.Add(build); @@ -64,10 +65,10 @@ public async Task CreateReleaseBuild(string version) { ModpackBuild build = new ModpackBuild { version = version, buildNumber = previousBuild.buildNumber + 1, - isRelease = true, + environment = GameEnvironment.RELEASE, commit = previousBuild.commit, builderId = sessionService.GetContextId(), - steps = buildStepService.GetStepsForRelease() + steps = buildStepService.GetSteps(GameEnvironment.RELEASE) }; build.commit.message = "Release deployment (no content changes)"; await Data.Add(build); @@ -75,16 +76,17 @@ public async Task CreateReleaseBuild(string version) { } public async Task CreateRebuild(ModpackBuild build) { + ModpackBuild latestBuild = build.environment == GameEnvironment.DEV ? GetLatestDevBuild() : GetLatestRcBuild(build.version); ModpackBuild rebuild = new ModpackBuild { - version = build.isRelease || build.isReleaseCandidate ? build.version : null, - buildNumber = build.buildNumber + 1, - isReleaseCandidate = build.isReleaseCandidate, - steps = build.isReleaseCandidate ? buildStepService.GetStepsForRc() : buildStepService.GetStepsForBuild(), - commit = build.commit, + version = latestBuild.environment == GameEnvironment.DEV ? null : latestBuild.version, + buildNumber = latestBuild.buildNumber + 1, + isRebuild = true, + environment = latestBuild.environment, + steps = buildStepService.GetSteps(build.environment), + commit = latestBuild.commit, builderId = sessionService.GetContextId() }; - - rebuild.commit.message = rebuild.isRelease ? $"Re-deployment of release {rebuild.version}" : $"Rebuild of #{build.buildNumber}\n\n{rebuild.commit.message}"; + rebuild.commit.message = latestBuild.environment == GameEnvironment.RELEASE ? $"Re-deployment of release {rebuild.version}" : $"Rebuild of #{build.buildNumber}\n\n{rebuild.commit.message}"; await Data.Add(rebuild); return rebuild; } @@ -96,7 +98,7 @@ public async Task SetBuildRunning(ModpackBuild build) { } public async Task SucceedBuild(ModpackBuild build) { - await FinishBuild(build, ModpackBuildResult.SUCCESS); + await FinishBuild(build, build.steps.Any(x => x.buildResult == ModpackBuildResult.WARNING) ? ModpackBuildResult.WARNING : ModpackBuildResult.SUCCESS); } public async Task FailBuild(ModpackBuild build) { @@ -104,7 +106,7 @@ public async Task FailBuild(ModpackBuild build) { } public async Task CancelBuild(ModpackBuild build) { - await FinishBuild(build, ModpackBuildResult.CANCELLED); + await FinishBuild(build, build.steps.Any(x => x.buildResult == ModpackBuildResult.WARNING) ? ModpackBuildResult.WARNING : ModpackBuildResult.CANCELLED); } private async Task FinishBuild(ModpackBuild build, ModpackBuildResult result) { diff --git a/UKSF.Api.Services/Modpack/ModpackService.cs b/UKSF.Api.Services/Modpack/ModpackService.cs index 084b6b9a..37b3925c 100644 --- a/UKSF.Api.Services/Modpack/ModpackService.cs +++ b/UKSF.Api.Services/Modpack/ModpackService.cs @@ -1,10 +1,12 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Threading.Tasks; using Octokit; using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models.Game; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; using UKSF.Api.Services.Message; @@ -103,6 +105,11 @@ public async Task CreateRcBuildFromPush(PushWebhookPayload payload) { } private static string GetBuildName(ModpackBuild build) => - $"{(build.isRelease ? $"release {build.version}" : $"{(build.isReleaseCandidate ? $"{build.version} RC# {build.buildNumber}" : $"#{build.buildNumber}")}")}"; + build.environment switch { + GameEnvironment.RELEASE => $"release {build.version}", + GameEnvironment.RC => $"{build.version} RC# {build.buildNumber}", + GameEnvironment.DEV => $"#{build.buildNumber}", + _ => throw new ArgumentException("Invalid build environment") + }; } } diff --git a/UKSF.Api.Services/UKSF.Api.Services.csproj b/UKSF.Api.Services/UKSF.Api.Services.csproj index e54a9b4e..470af3b5 100644 --- a/UKSF.Api.Services/UKSF.Api.Services.csproj +++ b/UKSF.Api.Services/UKSF.Api.Services.csproj @@ -14,10 +14,12 @@ + + diff --git a/UKSF.Api/AppStart/StartServices.cs b/UKSF.Api/AppStart/StartServices.cs index 6bc73e19..10b761a8 100644 --- a/UKSF.Api/AppStart/StartServices.cs +++ b/UKSF.Api/AppStart/StartServices.cs @@ -4,6 +4,7 @@ using UKSF.Api.Events; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Services.Admin; @@ -26,6 +27,9 @@ public static void Start() { // Register scheduled actions RegisterScheduledActions.Register(); + // Register buidl steps + serviceProvider.GetService().RegisterBuildSteps(); + // Add event handlers serviceProvider.GetService().InitEventHandlers(); diff --git a/UKSF.Api/Controllers/GameServersController.cs b/UKSF.Api/Controllers/GameServersController.cs index 7cb68047..691469e1 100644 --- a/UKSF.Api/Controllers/GameServersController.cs +++ b/UKSF.Api/Controllers/GameServersController.cs @@ -67,9 +67,9 @@ public async Task EditGameServer([FromBody] GameServer gameServer GameServer oldGameServer = gameServersService.Data.GetSingle(x => x.id == gameServer.id); LogWrapper.AuditLog($"Game server '{gameServer.name}' updated:{oldGameServer.Changes(gameServer)}"); bool environmentChanged = false; - if (oldGameServer.serverEnvironment != gameServer.serverEnvironment) { + if (oldGameServer.environment != gameServer.environment) { environmentChanged = true; - gameServer.mods = gameServersService.GetEnvironmentMods(gameServer.serverEnvironment); + gameServer.mods = gameServersService.GetEnvironmentMods(gameServer.environment); gameServer.serverMods = new List(); } @@ -83,7 +83,7 @@ await gameServersService.Data.Update( .Set("hostName", gameServer.hostName) .Set("password", gameServer.password) .Set("adminPassword", gameServer.adminPassword) - .Set("serverEnvironment", gameServer.serverEnvironment) + .Set("environment", gameServer.environment) .Set("serverOption", gameServer.serverOption) .Set("mods", gameServer.mods) .Set("serverMods", gameServer.serverMods) @@ -233,7 +233,7 @@ public async Task ResetGameServerMods(string id) { await gameServersService.Data.Update(id, Builders.Update.Unset(x => x.mods).Unset(x => x.serverMods)); await gameServersService.Data.Update( id, - Builders.Update.Set(x => x.mods, gameServersService.GetEnvironmentMods(gameServer.serverEnvironment)) + Builders.Update.Set(x => x.mods, gameServersService.GetEnvironmentMods(gameServer.environment)) .Set(x => x.serverMods, new List()) ); return Ok(gameServersService.GetAvailableMods(id)); diff --git a/UKSF.Api/Controllers/Utility/DebugController.cs b/UKSF.Api/Controllers/Utility/DebugController.cs index 5b422ae9..a5e956d7 100644 --- a/UKSF.Api/Controllers/Utility/DebugController.cs +++ b/UKSF.Api/Controllers/Utility/DebugController.cs @@ -1,4 +1,9 @@ using System; +using System.Diagnostics; +using System.Management.Automation; +using System.Management.Automation.Runspaces; +using System.Threading; +using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Hosting; diff --git a/UKSF.Common/StringUtilities.cs b/UKSF.Common/StringUtilities.cs index 70181ccd..5dee8d63 100644 --- a/UKSF.Common/StringUtilities.cs +++ b/UKSF.Common/StringUtilities.cs @@ -6,7 +6,8 @@ namespace UKSF.Common { public static class StringUtilities { - public static bool ContainsIgnoreCase(this string text, string searchElement) => !string.IsNullOrEmpty(text) && !string.IsNullOrEmpty(searchElement) && text.ToUpper().Contains(searchElement.ToUpper()); + public static bool ContainsIgnoreCase(this string text, string searchElement) => + !string.IsNullOrEmpty(text) && !string.IsNullOrEmpty(searchElement) && text.ToUpper().Contains(searchElement.ToUpper()); public static double ToDouble(this string text) => double.TryParse(text, out double number) ? number : 0d; From 46dcacdcbd7e036fd6a7d85b2739353e8796fab5 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 25 Jul 2020 23:58:04 +0100 Subject: [PATCH 200/369] Added woodward as engineer --- UKSF.Api.Services/Game/Missions/MissionDataResolver.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs index ad7ad58c..402f40d6 100644 --- a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs +++ b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs @@ -12,6 +12,7 @@ public static class MissionDataResolver { "5bc3bccdffbf7a11b803c3f6", // Delta "59e3958b594c603b78aa9dcd", // Joho "5a2439443fccaa15902aaa4e", // Mac + "5a4e7effd68b7e16e46fc614", // Woody "5a1a16ce630e7413645b73fd", // Penn "5a1a14b5aacf7b00346dcc37" // Gilbert }; From a84cf21f557532c3205307418c459fc655086d9a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 27 Jul 2020 00:40:26 +0100 Subject: [PATCH 201/369] Tweaks and bug fixes - Logging no longer pushes to database for every update. - Better handling of parallel tasks, builds much faster as a result --- UKSF.Api.Data/Modpack/BuildsDataService.cs | 4 + .../Handlers/BuildsEventHandler.cs | 3 - .../Data/Cached/IBuildsDataService.cs | 1 + .../Integrations/IDiscordService.cs | 1 - .../Modpack/BuildProcess/IStepLogger.cs | 21 +-- .../Modpack/BuildProcess/Steps/IBuildStep.cs | 6 +- UKSF.Api.Interfaces/Modpack/IBuildsService.cs | 3 +- .../BuildProcess/BuildProcessHelper.cs | 50 +----- .../BuildProcess/BuildProcessorService.cs | 20 ++- .../Modpack/BuildProcess/BuildStepService.cs | 2 + .../Modpack/BuildProcess/StepLogger.cs | 84 ++++++--- .../Modpack/BuildProcess/Steps/BuildStep.cs | 52 +++--- .../Steps/Common/BuildStepBuildRepo.cs | 4 +- .../Steps/Common/BuildStepCbaSettings.cs | 6 +- .../Steps/Common/BuildStepClean.cs | 24 ++- .../Steps/Common/BuildStepDeploy.cs | 18 +- .../Steps/Common/BuildStepKeys.cs | 23 ++- .../Steps/Common/BuildStepNotify.cs | 7 +- .../Steps/Common/BuildStepSignDependencies.cs | 96 ++++++++-- .../BuildProcess/Steps/FileBuildStep.cs | 170 ++++++++++++------ UKSF.Api.Services/Modpack/BuildsService.cs | 26 ++- UKSF.Api.Services/Modpack/ModpackService.cs | 6 +- UKSF.Api/Controllers/DocsController.cs | 1 - UKSF.Api/Controllers/GameServersController.cs | 5 +- UKSF.Api/Controllers/RanksController.cs | 5 +- UKSF.Api/Controllers/RolesController.cs | 5 +- .../Controllers/Utility/DebugController.cs | 5 - UKSF.Api/Controllers/VariablesController.cs | 4 +- 28 files changed, 396 insertions(+), 256 deletions(-) diff --git a/UKSF.Api.Data/Modpack/BuildsDataService.cs b/UKSF.Api.Data/Modpack/BuildsDataService.cs index c998b131..6f9742ca 100644 --- a/UKSF.Api.Data/Modpack/BuildsDataService.cs +++ b/UKSF.Api.Data/Modpack/BuildsDataService.cs @@ -30,5 +30,9 @@ public async Task Update(ModpackBuild build, UpdateDefinition upda await base.Update(build.id, updateDefinition); CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, build)); } + + public void LogEvent(ModpackBuild build, ModpackBuildStep buildStep) { + CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, buildStep)); + } } } diff --git a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs index ef8b7f72..f35e7e28 100644 --- a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs +++ b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs @@ -1,8 +1,6 @@ using System; -using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using MongoDB.Bson.IO; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events.Handlers; using UKSF.Api.Interfaces.Hubs; @@ -12,7 +10,6 @@ using UKSF.Api.Models.Modpack; using UKSF.Api.Signalr.Hubs.Modpack; using UKSF.Common; -using JsonConvert = Newtonsoft.Json.JsonConvert; namespace UKSF.Api.Events.Handlers { public class BuildsEventHandler : IBuildsEventHandler { diff --git a/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs index ed612c27..f3211ac9 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs @@ -6,5 +6,6 @@ namespace UKSF.Api.Interfaces.Data.Cached { public interface IBuildsDataService : IDataService, ICachedDataService { Task Update(ModpackBuild build, ModpackBuildStep buildStep); Task Update(ModpackBuild build, UpdateDefinition updateDefinition); + void LogEvent(ModpackBuild build, ModpackBuildStep buildStep); } } diff --git a/UKSF.Api.Interfaces/Integrations/IDiscordService.cs b/UKSF.Api.Interfaces/Integrations/IDiscordService.cs index a9e61c20..961a8954 100644 --- a/UKSF.Api.Interfaces/Integrations/IDiscordService.cs +++ b/UKSF.Api.Interfaces/Integrations/IDiscordService.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Discord.WebSocket; -using Microsoft.AspNetCore.Identity; using UKSF.Api.Models.Personnel; namespace UKSF.Api.Interfaces.Integrations { diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs index 2d4b352c..b1a1fd6d 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs @@ -1,16 +1,17 @@ using System; -using System.Threading.Tasks; namespace UKSF.Api.Interfaces.Modpack.BuildProcess { public interface IStepLogger { - Task LogStart(); - Task LogSuccess(); - Task LogCancelled(); - Task LogSkipped(); - Task LogWarning(string message); - Task LogError(Exception exception); - Task LogSurround(string log); - Task LogInline(string log); - Task Log(string log, string colour = ""); + void LogStart(); + void LogSuccess(); + void LogCancelled(); + void LogSkipped(); + void LogWarning(string message); + void LogError(Exception exception); + void LogSurround(string log); + void LogInline(string log); + void Log(string log, string colour = ""); + void LogInstant(string log, string colour = ""); + void FlushLogs(bool force = false, bool synchronous = false); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs index bad1566a..a4687f78 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs @@ -5,16 +5,16 @@ namespace UKSF.Api.Interfaces.Modpack.BuildProcess.Steps { public interface IBuildStep { - void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func updateCallback, CancellationTokenSource cancellationTokenSource); + void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func updateCallback, Action logEvent, CancellationTokenSource cancellationTokenSource); Task Start(); - Task CheckGuards(); + bool CheckGuards(); Task Setup(); Task Process(); Task Teardown(); Task Succeed(); Task Fail(Exception exception); Task Cancel(); - Task Warning(string message); + void Warning(string message); Task Skip(); } } diff --git a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs index 1750403b..4c8a3953 100644 --- a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs +++ b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs @@ -11,7 +11,8 @@ public interface IBuildsService : IDataBackedService { ModpackBuild GetLatestDevBuild(); ModpackBuild GetLatestRcBuild(string version); Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep); - Task CreateDevBuild(GithubCommit commit); + void BuildStepLogEvent(ModpackBuild build, ModpackBuildStep buildStep); + Task CreateDevBuild(string version, GithubCommit commit); Task CreateRcBuild(string version, GithubCommit commit); Task CreateReleaseBuild(string version); Task SetBuildRunning(ModpackBuild build); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index 6510607f..b29f6542 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -1,5 +1,4 @@ using System; -using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Management.Automation; using System.Management.Automation.Runspaces; @@ -9,46 +8,8 @@ namespace UKSF.Api.Services.Modpack.BuildProcess { public static class BuildProcessHelper { - public static void RunProcess(IStepLogger logger, bool raiseErrors, CancellationToken cancellationToken, string executable, string workingDirectory, string args) { - using Process process = new Process { - StartInfo = { - FileName = executable, - WorkingDirectory = workingDirectory, - Arguments = args, - UseShellExecute = false, - CreateNoWindow = true, - RedirectStandardOutput = true, - RedirectStandardError = true - } - }; - - try { - process.EnableRaisingEvents = false; - process.OutputDataReceived += (sender, receivedEventArgs) => logger.Log(receivedEventArgs.Data); - process.ErrorDataReceived += (sender, receivedEventArgs) => { - Exception exception = new Exception(receivedEventArgs.Data); - if (raiseErrors) { - throw exception; - } - - logger.LogError(exception); - }; - using CancellationTokenRegistration unused = cancellationToken.Register(process.Kill); - process.Start(); - process.BeginOutputReadLine(); - process.BeginErrorReadLine(); - process.WaitForExit(); - - if (process.ExitCode != 0) { - throw new Exception($"Process exited with non-zero exit code of: {process.ExitCode}"); - } - } finally { - process.Close(); - } - } - [SuppressMessage("ReSharper", "MethodHasAsyncOverload")] // async runspace.OpenAsync is not as it seems - public static async Task RunPowershell(IStepLogger logger, bool raiseErrors, CancellationToken cancellationToken, string command, string workingDirectory) { + public static async Task RunPowershell(IStepLogger logger, bool raiseErrors, CancellationToken cancellationToken, string workingDirectory, string command) { using Runspace runspace = RunspaceFactory.CreateRunspace(); runspace.Open(); runspace.SessionStateProxy.Path.SetLocation(workingDirectory); @@ -57,13 +18,14 @@ public static async Task RunPowershell(IStepLogger logger, bool raiseErrors, Can powerShell.Runspace = runspace; powerShell.AddScript(command); - async void Log(object sender, DataAddedEventArgs eventArgs) { + void Log(object sender, DataAddedEventArgs eventArgs) { PSDataCollection streamObjectsReceived = sender as PSDataCollection; InformationRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; - await logger.Log(currentStreamRecord?.MessageData.ToString()); + logger.Log(currentStreamRecord?.MessageData.ToString()); } Exception exception = null; + void Error(object sender, DataAddedEventArgs eventArgs) { PSDataCollection streamObjectsReceived = sender as PSDataCollection; ErrorRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; @@ -81,11 +43,11 @@ void Error(object sender, DataAddedEventArgs eventArgs) { throw exception; } - await logger.LogError(exception); + logger.LogError(exception); } foreach (PSObject psObject in result) { - await logger.Log(psObject.BaseObject.ToString()); + logger.Log(psObject.BaseObject.ToString()); } runspace.Close(); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs index f7c04d47..44b53f36 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs @@ -29,11 +29,11 @@ public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cance } IBuildStep step = buildStepService.ResolveBuildStep(buildStep.name); - step.Init(build, buildStep, async () => await buildsService.UpdateBuildStep(build, buildStep), cancellationTokenSource); + step.Init(build, buildStep, async () => await buildsService.UpdateBuildStep(build, buildStep), () => buildsService.BuildStepLogEvent(build, buildStep), cancellationTokenSource); try { await step.Start(); - if (!await step.CheckGuards()) { + if (!step.CheckGuards()) { await step.Skip(); continue; } @@ -64,19 +64,21 @@ private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) { ModpackBuildStep restoreStep = buildStepService.GetRestoreStepForRelease(); if (restoreStep == null) return; - async Task UpdateCallback() { - await buildsService.UpdateBuildStep(build, restoreStep); - } - restoreStep.index = build.steps.Count; IBuildStep step = buildStepService.ResolveBuildStep(restoreStep.name); - step.Init(build, restoreStep, UpdateCallback, new CancellationTokenSource()); + step.Init( + build, + restoreStep, + async () => await buildsService.UpdateBuildStep(build, restoreStep), + () => buildsService.BuildStepLogEvent(build, restoreStep), + new CancellationTokenSource() + ); build.steps.Add(restoreStep); - await UpdateCallback(); + await buildsService.UpdateBuildStep(build, restoreStep); try { await step.Start(); - if (!await step.CheckGuards()) { + if (!step.CheckGuards()) { await step.Skip(); } else { await step.Setup(); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index 7df75ff5..5e871672 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -51,6 +51,7 @@ private static List GetStepsForBuild() => new ModpackBuildStep(BuildStepPrep.NAME), new ModpackBuildStep(BuildStepClean.NAME), new ModpackBuildStep(BuildStepBuild.NAME), + new ModpackBuildStep(BuildStepSignDependencies.NAME), new ModpackBuildStep(BuildStepDeploy.NAME), new ModpackBuildStep(BuildStepKeys.NAME), new ModpackBuildStep(BuildStepCbaSettings.NAME), @@ -62,6 +63,7 @@ private static List GetStepsForRc() => new ModpackBuildStep(BuildStepPrep.NAME), new ModpackBuildStep(BuildStepClean.NAME), new ModpackBuildStep(BuildStepBuild.NAME), + new ModpackBuildStep(BuildStepSignDependencies.NAME), new ModpackBuildStep(BuildStepDeploy.NAME), new ModpackBuildStep(BuildStepKeys.NAME), new ModpackBuildStep(BuildStepCbaSettings.NAME), diff --git a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs index c8fee254..3bc23a46 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs @@ -1,70 +1,106 @@ using System; +using System.Threading; using System.Threading.Tasks; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Services.Modpack.BuildProcess { public class StepLogger : IStepLogger { + private const int LOG_COUNT_MAX = 10; private readonly ModpackBuildStep buildStep; - private readonly Func logCallback; + private readonly object lockObject = new object(); + private readonly Action logEvent; + private readonly Func updateCallback; + private int logCount; - public StepLogger(ModpackBuildStep buildStep, Func logCallback) { + public StepLogger(ModpackBuildStep buildStep, Func updateCallback, Action logEvent) { this.buildStep = buildStep; - this.logCallback = logCallback; + this.updateCallback = updateCallback; + this.logEvent = logEvent; } - public async Task LogStart() { + public void LogStart() { LogLines($"Starting: {buildStep.name}"); - await logCallback(); + FlushLogsInstantly(); } - public async Task LogSuccess() { + public void LogSuccess() { LogLines( $"\nFinished{(buildStep.buildResult == ModpackBuildResult.WARNING ? " with warning" : "")}: {buildStep.name}", buildStep.buildResult == ModpackBuildResult.WARNING ? "orangered" : "green" ); - await logCallback(); + FlushLogsInstantly(); } - public async Task LogCancelled() { + public void LogCancelled() { LogLines("\nBuild cancelled", "goldenrod"); - await logCallback(); + FlushLogsInstantly(); } - public async Task LogSkipped() { + public void LogSkipped() { LogLines($"\nSkipped: {buildStep.name}", "orangered"); - await logCallback(); + FlushLogsInstantly(); } - public async Task LogWarning(string message) { + public void LogWarning(string message) { LogLines($"Warning\n{message}", "orangered"); - await logCallback(); + FlushLogsInstantly(); } - public async Task LogError(Exception exception) { + public void LogError(Exception exception) { LogLines($"Error\n{exception.Message}\n{exception.StackTrace}\n\nFailed: {buildStep.name}", "red"); - await logCallback(); + FlushLogsInstantly(); } - public async Task LogSurround(string log) { + public void LogSurround(string log) { LogLines(log, "cadetblue"); - await logCallback(); } - public async Task LogInline(string log) { - buildStep.logs[^1] = new ModpackBuildStepLogItem { text = log }; - await logCallback(); + public void LogInline(string log) { + lock (lockObject) { + buildStep.logs[^1] = new ModpackBuildStepLogItem { text = log }; + } + + IncrementCountAndFlushLogs(); } - public async Task Log(string log, string colour = "") { + public void Log(string log, string colour = "") { LogLines(log, colour); - await logCallback(); + } + + public void LogInstant(string log, string colour = "") { + LogLines(log, colour); + FlushLogsInstantly(); + } + + public void FlushLogs(bool force = false, bool synchronous = false) { + if (force || logCount > LOG_COUNT_MAX) { + logCount = 0; + Task callback = updateCallback(); + if (synchronous) { + callback.Wait(); + } + } + } + + private void FlushLogsInstantly() { + FlushLogs(true, true); } private void LogLines(string log, string colour = "") { - foreach (string line in log.Split("\n")) { - buildStep.logs.Add(new ModpackBuildStepLogItem { text = line, colour = string.IsNullOrEmpty(line) ? "" : colour }); + lock (lockObject) { + foreach (string line in log.Split("\n")) { + buildStep.logs.Add(new ModpackBuildStepLogItem { text = line, colour = string.IsNullOrEmpty(line) ? "" : colour }); + } } + + logEvent(); + IncrementCountAndFlushLogs(); + } + + private void IncrementCountAndFlushLogs() { + Interlocked.Increment(ref logCount); + FlushLogs(); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs index d12ec59d..5242374b 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs @@ -16,44 +16,47 @@ public class BuildStep : IBuildStep { protected CancellationTokenSource CancellationTokenSource; protected IStepLogger Logger; private Func updateCallback; + private Action logEvent; - public void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func stepUpdateCallback, CancellationTokenSource newCancellationTokenSource) { + public void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func stepUpdateCallback, Action stepLogEvent, CancellationTokenSource newCancellationTokenSource) { Build = modpackBuild; buildStep = modpackBuildStep; updateCallback = stepUpdateCallback; + logEvent = stepLogEvent; CancellationTokenSource = newCancellationTokenSource; - Logger = new StepLogger(buildStep, LogCallback); + Logger = new StepLogger(buildStep, async () => await updateCallback(), logEvent); } public async Task Start() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); buildStep.running = true; buildStep.startTime = DateTime.Now; - await Logger.LogStart(); + Logger.LogStart(); + await updateCallback(); } - public virtual Task CheckGuards() => Task.FromResult(true); + public virtual bool CheckGuards() => true; public async Task Setup() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); - await Logger.Log("\nSetup", COLOUR_BLUE); + Logger.Log("\nSetup", COLOUR_BLUE); await SetupExecute(); } public async Task Process() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); - await Logger.Log("\nProcess", COLOUR_BLUE); + Logger.Log("\nProcess", COLOUR_BLUE); await ProcessExecute(); } public async Task Teardown() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); - await Logger.Log("\nTeardown", COLOUR_BLUE); + Logger.Log("\nTeardown", COLOUR_BLUE); await TeardownExecute(); } public async Task Succeed() { - await Logger.LogSuccess(); + Logger.LogSuccess(); if (buildStep.buildResult != ModpackBuildResult.WARNING) { buildStep.buildResult = ModpackBuildResult.SUCCESS; } @@ -62,43 +65,46 @@ public async Task Succeed() { } public async Task Fail(Exception exception) { - await Logger.LogError(exception); + Logger.LogError(exception); buildStep.buildResult = ModpackBuildResult.FAILED; await Stop(); } public async Task Cancel() { - await Logger.LogCancelled(); + Logger.LogCancelled(); buildStep.buildResult = ModpackBuildResult.CANCELLED; await Stop(); } - public async Task Warning(string message) { - await Logger.LogWarning(message); + public void Warning(string message) { + Logger.LogWarning(message); buildStep.buildResult = ModpackBuildResult.WARNING; } public async Task Skip() { - await Logger.LogSkipped(); + Logger.LogSkipped(); buildStep.buildResult = ModpackBuildResult.SKIPPED; await Stop(); } - protected virtual async Task SetupExecute() { - await Logger.Log("---"); + protected virtual Task SetupExecute() { + Logger.Log("---"); + return Task.CompletedTask; } - protected virtual async Task ProcessExecute() { - await Logger.Log("---"); + protected virtual Task ProcessExecute() { + Logger.Log("---"); + return Task.CompletedTask; } - protected virtual async Task TeardownExecute() { - await Logger.Log("---"); + protected virtual Task TeardownExecute() { + Logger.Log("---"); + return Task.CompletedTask; } - protected async Task ReleaseBuildGuard() { + protected bool ReleaseBuildGuard() { if (Build.environment != GameEnvironment.RELEASE) { - await Warning("\nBuild is not a release build, but the definition contains a release step.\nThis is a configuration error, please notify an admin."); + Warning("\nBuild is not a release build, but the definition contains a release step.\nThis is a configuration error, please notify an admin."); return false; } @@ -131,10 +137,6 @@ internal string GetEnvironmentRepoName() => _ => throw new ArgumentException("Invalid build environment") }; - private async Task LogCallback() { - await updateCallback(); - } - private async Task Stop() { buildStep.running = false; buildStep.finished = true; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs index b6d3dee2..0f2d2cb2 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs @@ -8,10 +8,10 @@ public class BuildStepBuildRepo : BuildStep { protected override async Task ProcessExecute() { string repoName = GetEnvironmentRepoName(); - await Logger.Log($"Building {repoName} repo"); + Logger.Log($"Building {repoName} repo"); string arma3SyncPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_ARMA3SYNC_PATH").AsString(); - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, $"Java -jar .\\ArmA3Sync.jar -BUILD {repoName}", arma3SyncPath); + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, arma3SyncPath, $"Java -jar .\\ArmA3Sync.jar -BUILD {repoName}"); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepCbaSettings.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepCbaSettings.cs index e115fae7..6b5df50c 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepCbaSettings.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepCbaSettings.cs @@ -9,7 +9,7 @@ public class BuildStepCbaSettings : FileBuildStep { public const string NAME = "CBA Settings"; protected override async Task ProcessExecute() { - await Logger.Log("Updating CBA settings"); + Logger.Log("Updating CBA settings"); string sourceUserconfigPath; string targetUserconfigPath; @@ -23,9 +23,9 @@ protected override async Task ProcessExecute() { FileInfo cbaSettingsFile = new FileInfo(Path.Join(sourceUserconfigPath, "cba_settings.sqf")); - await Logger.LogSurround("\nCopying cba_settings.sqf..."); + Logger.LogSurround("\nCopying cba_settings.sqf..."); await CopyFiles(new DirectoryInfo(sourceUserconfigPath), new DirectoryInfo(targetUserconfigPath), new List { cbaSettingsFile }); - await Logger.LogSurround("Copied cba_settings.sqf"); + Logger.LogSurround("Copied cba_settings.sqf"); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs index 92d9e79f..3a361a8b 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs @@ -1,4 +1,5 @@ -using System.IO; +using System.Collections.Generic; +using System.IO; using System.Threading.Tasks; using UKSF.Api.Models.Game; @@ -8,21 +9,30 @@ public class BuildStepClean : FileBuildStep { public const string NAME = "Clean folders"; protected override async Task ProcessExecute() { - await Logger.Log("Cleaning build environment"); - string environmentPath = GetBuildEnvironmentPath(); if (Build.environment == GameEnvironment.RELEASE) { string repoPath = Path.Join(environmentPath, "Backup", "Repo"); string keysPath = Path.Join(environmentPath, "Backup", "Keys"); - await Logger.LogSurround("\nCleaning backup folder"); + + Logger.LogSurround("\nCleaning backup folder"); + Logger.Log("Cleaning repo backup"); await DeleteDirectoryContents(repoPath); + Logger.Log("\nCleaning keys backup"); await DeleteDirectoryContents(keysPath); - await Logger.LogSurround("Cleaned backup folder"); + Logger.LogSurround("Cleaned backup folder"); } else { string path = Path.Join(environmentPath, "Build"); - await Logger.LogSurround("\nCleaning build folder"); + string repoPath = Path.Join(environmentPath, "Repo"); + DirectoryInfo repo = new DirectoryInfo(repoPath); + + Logger.LogSurround("\nCleaning build folder"); await DeleteDirectoryContents(path); - await Logger.LogSurround("Cleaned build folder"); + Logger.LogSurround("Cleaned build folder"); + + Logger.LogSurround("\nCleaning repo zsync files..."); + List files = GetDirectoryContents(repo, "*.zsync"); + await DeleteFiles(files); + Logger.LogSurround("Cleaned repo zsync files"); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepDeploy.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepDeploy.cs index c00c27cb..e37ef751 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepDeploy.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepDeploy.cs @@ -8,29 +8,29 @@ public class BuildStepDeploy : FileBuildStep { public const string NAME = "Deploy"; protected override async Task ProcessExecute() { - await Logger.Log("Deploying files from RC to release"); - string sourcePath; string targetPath; if (Build.environment == GameEnvironment.RELEASE) { + Logger.Log("Deploying files from RC to release"); sourcePath = Path.Join(GetEnvironmentPath(GameEnvironment.RC), "Repo"); targetPath = Path.Join(GetBuildEnvironmentPath(), "Repo"); } else { + Logger.Log("Deploying files from build to repo"); sourcePath = Path.Join(GetBuildEnvironmentPath(), "Build"); targetPath = Path.Join(GetBuildEnvironmentPath(), "Repo"); } - await Logger.LogSurround("\nAdding new files..."); + Logger.LogSurround("\nAdding new files..."); await AddFiles(sourcePath, targetPath); - await Logger.LogSurround("Added new files"); + Logger.LogSurround("Added new files"); - await Logger.LogSurround("\nCopying updated files..."); + Logger.LogSurround("\nCopying updated files..."); await UpdateFiles(sourcePath, targetPath); - await Logger.LogSurround("Copied updated files"); + Logger.LogSurround("Copied updated files"); - await Logger.LogSurround("\nDeleting removed files..."); - await DeleteFiles(sourcePath, targetPath); - await Logger.LogSurround("Deleted removed files"); + Logger.LogSurround("\nDeleting removed files..."); + await DeleteFiles(sourcePath, targetPath, Build.environment != GameEnvironment.RELEASE); + Logger.LogSurround("Deleted removed files"); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepKeys.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepKeys.cs index 120a8c1e..91eb680e 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepKeys.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepKeys.cs @@ -8,34 +8,33 @@ public class BuildStepKeys : FileBuildStep { public const string NAME = "Keys"; protected override async Task SetupExecute() { - await Logger.Log("Wiping server keys folder"); + Logger.Log("Wiping server keys folder"); string keysPath = Path.Join(GetBuildEnvironmentPath(), "Keys"); await DeleteDirectoryContents(keysPath); - await Logger.Log("Server keys folder wiped"); + Logger.Log("Server keys folder wiped"); } protected override async Task ProcessExecute() { - await Logger.Log("Updating keys"); + Logger.Log("Updating keys"); string sourceBasePath = Path.Join(GetBuildEnvironmentPath(), "BaseKeys"); string sourceRepoPath = Path.Join(GetBuildEnvironmentPath(), "Repo"); string targetPath = Path.Join(GetBuildEnvironmentPath(), "Keys"); - DirectoryInfo sourceBase = new DirectoryInfo(sourceBasePath); DirectoryInfo sourceRepo = new DirectoryInfo(sourceRepoPath); DirectoryInfo target = new DirectoryInfo(targetPath); - List baseKeys = GetDirectoryContents(sourceRepo, "*.bikey"); - List repoKeys = GetDirectoryContents(sourceRepo, "*.bikey"); - await Logger.Log($"Found {baseKeys.Count} keys in base keys"); - await Logger.Log($"Found {repoKeys.Count} keys in repo"); - await Logger.LogSurround("\nCopying base keys..."); + Logger.LogSurround("\nCopying base keys..."); + List baseKeys = GetDirectoryContents(sourceBase, "*.bikey"); + Logger.Log($"Found {baseKeys.Count} keys in base keys"); await CopyFiles(sourceBase, target, baseKeys, true); - await Logger.LogSurround("Copied base keys"); + Logger.LogSurround("Copied base keys"); - await Logger.LogSurround("\nCopying repo keys..."); + Logger.LogSurround("\nCopying repo keys..."); + List repoKeys = GetDirectoryContents(sourceRepo, "*.bikey"); + Logger.Log($"Found {repoKeys.Count} keys in repo"); await CopyFiles(sourceRepo, target, repoKeys, true); - await Logger.LogSurround("Copied repo keys"); + Logger.LogSurround("Copied repo keys"); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs index 5db69126..76240451 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs @@ -14,10 +14,11 @@ public class BuildStepNotify : BuildStep { private IDiscordService discordService; private IReleaseService releaseService; - protected override async Task SetupExecute() { + protected override Task SetupExecute() { discordService = ServiceWrapper.Provider.GetService(); releaseService = ServiceWrapper.Provider.GetService(); - await Logger.Log("Retrieved services"); + Logger.Log("Retrieved services"); + return Task.CompletedTask; } protected override async Task ProcessExecute() { @@ -28,7 +29,7 @@ protected override async Task ProcessExecute() { await discordService.SendMessage(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_DEV").AsUlong(), GetDiscordMessage()); } - await Logger.Log("Notifications sent"); + Logger.Log("Notifications sent"); } private string GetBuildMessage() => diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs index 63048112..2c665888 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs @@ -1,32 +1,96 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.IO; +using System.Linq; +using System.Threading; using System.Threading.Tasks; -using Microsoft.Win32; +using UKSF.Api.Models.Game; +using UKSF.Api.Services.Admin; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { + [BuildStep(NAME)] public class BuildStepSignDependencies : FileBuildStep { public const string NAME = "Dependencies"; + private string dsCreateKey; + private string dsSignFile; + private string keyName; - protected override async Task ProcessExecute() { + protected override async Task SetupExecute() { + dsSignFile = Path.Join(VariablesWrapper.VariablesDataService().GetSingle("BUILD_DSSIGN_PATH").AsString(), "DSSignFile.exe"); + dsCreateKey = Path.Join(VariablesWrapper.VariablesDataService().GetSingle("BUILD_DSSIGN_PATH").AsString(), "DSCreateKey.exe"); + keyName = GetKeyname(); + + string keygenPath = Path.Join(GetBuildEnvironmentPath(), "PrivateKeys"); + string keysPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies", "keys"); + DirectoryInfo keygen = new DirectoryInfo(keygenPath); + DirectoryInfo keys = new DirectoryInfo(keysPath); + keygen.Create(); + keys.Create(); + + Logger.LogSurround("\nClearing keys directories..."); + await DeleteDirectoryContents(keysPath); + await DeleteDirectoryContents(keygenPath); + Logger.LogSurround("Cleared keys directories"); - string sourcePath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies"); - DirectoryInfo source = new DirectoryInfo(sourcePath); + Logger.LogSurround("\nCreating key..."); + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, keygenPath, $".\"{dsCreateKey}\" {keyName}"); + Logger.Log($"Created {keyName}"); + await CopyFiles(keygen, keys, new List { new FileInfo(Path.Join(keygenPath, $"{keyName}.bikey")) }); + Logger.LogSurround("Created key"); + } - await Logger.LogSurround("\nDeleting dependencies signatures..."); - List signatures = GetDirectoryContents(source, "*.bisign"); - List zsyncs = GetDirectoryContents(source, "*.bisign.zsync"); - await DeleteFiles(signatures); - await DeleteFiles(zsyncs); - await Logger.LogSurround("Deleted dependencies signatures"); + protected override async Task ProcessExecute() { + string addonsPath = Path.Join(Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies"), "addons"); + string keygenPath = Path.Join(GetBuildEnvironmentPath(), "PrivateKeys"); + DirectoryInfo addons = new DirectoryInfo(addonsPath); + Logger.LogSurround("\nDeleting dependencies signatures..."); + await DeleteFiles(GetDirectoryContents(addons, "*.bisign*")); + Logger.LogSurround("Deleted dependencies signatures"); + List files = GetDirectoryContents(addons, "*.pbo"); + Logger.LogSurround("\nSigning dependencies..."); + await SignFiles(keygenPath, addonsPath, files); + Logger.LogSurround("Signed dependencies"); } - private string GetArmaToolsPath() { - RegistryKey gameKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\WOW6432Node\bohemia interactive\arma 3 tools"); - if (gameKey == null) return ""; - string install = gameKey.GetValue("main", "").ToString(); - return Directory.Exists(install) ? install : ""; + private string GetKeyname() { + return Build.environment switch { + GameEnvironment.RELEASE => $"uksf_dependencies_{Build.version}", + GameEnvironment.RC => $"uksf_dependencies_{Build.version}_rc{Build.buildNumber}", + GameEnvironment.DEV => $"uksf_dependencies_dev_{Build.buildNumber}", + _ => throw new ArgumentException("Invalid build environment") + }; + } + + private async Task SignFiles(string keygenPath, string addonsPath, IReadOnlyCollection files) { + string privateKey = Path.Join(keygenPath, $"{keyName}.biprivatekey"); + int signed = 0; + + SemaphoreSlim taskLimiter = new SemaphoreSlim(100); + IEnumerable tasks = files.Select( + async file => { + if (CancellationTokenSource.Token.IsCancellationRequested) return; + + try { + await taskLimiter.WaitAsync(CancellationTokenSource.Token); + if (CancellationTokenSource.Token.IsCancellationRequested) return; + + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, addonsPath, $".\"{dsSignFile}\" \"{privateKey}\" \"{file.FullName}\""); + Interlocked.Increment(ref signed); + Logger.LogInline($"Signed {signed} of {files.Count} files"); + } catch (OperationCanceledException) { + throw; + } catch (Exception exception) { + throw new Exception($"Failed to sign file '{file}'\n{exception.Message}", exception); + } finally { + taskLimiter.Release(); + } + } + ); + + Logger.LogInstant($"Signed {signed} of {files.Count} files"); + await Task.WhenAll(tasks); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs index f56299b0..cecff8d1 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs @@ -2,24 +2,17 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Threading; using System.Threading.Tasks; using Humanizer; -using MoreLinq; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class FileBuildStep : BuildStep { private const double FILE_COPY_TASK_SIZE_THRESHOLD = 5_000_000_000; - private const double FILE_COPY_TASK_OUNT_THRESHOLD = 150; + private const double FILE_COPY_TASK_COUNT_THRESHOLD = 50; + private const double FILE_DELETE_TASK_COUNT_THRESHOLD = 25; - internal List GetDirectoryContents(DirectoryInfo source, string searchPattern = "*") { - List files = source.GetFiles(searchPattern).ToList(); - foreach (DirectoryInfo subDirectory in source.GetDirectories()) { - CancellationTokenSource.Token.ThrowIfCancellationRequested(); - files.AddRange(GetDirectoryContents(subDirectory)); - } - - return files; - } + internal static List GetDirectoryContents(DirectoryInfo source, string searchPattern = "*") => source.GetFiles(searchPattern, SearchOption.AllDirectories).ToList(); internal async Task AddFiles(string sourcePath, string targetPath) { DirectoryInfo source = new DirectoryInfo(sourcePath); @@ -43,12 +36,23 @@ internal async Task UpdateFiles(string sourcePath, string targetPath) { await CopyFiles(source, target, updatedFiles); } - internal async Task DeleteFiles(string sourcePath, string targetPath) { + internal async Task DeleteFiles(string sourcePath, string targetPath, bool matchSubdirectories = false) { DirectoryInfo source = new DirectoryInfo(sourcePath); DirectoryInfo target = new DirectoryInfo(targetPath); IEnumerable targetFiles = GetDirectoryContents(target); List deletedFiles = targetFiles.Select(targetFile => new { targetFile, sourceFile = new FileInfo(targetFile.FullName.Replace(target.FullName, source.FullName)) }) - .Where(x => !x.sourceFile.Exists) + .Where( + x => { + if (x.sourceFile.Exists) return false; + if (!matchSubdirectories) return true; + + string sourceSubdirectoryPath = x.sourceFile.FullName.Replace(sourcePath, "") + .Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries) + .First(); + DirectoryInfo sourceSubdirectory = new DirectoryInfo(Path.Join(sourcePath, sourceSubdirectoryPath)); + return sourceSubdirectory.Exists; + } + ) .Select(x => x.targetFile) .ToList(); await DeleteFiles(deletedFiles); @@ -65,35 +69,47 @@ internal async Task CopyDirectory(string sourceDirectory, string targetDirectory internal async Task CopyFiles(FileSystemInfo source, FileSystemInfo target, List files, bool flatten = false) { Directory.CreateDirectory(target.FullName); if (files.Count == 0) { - await Logger.Log("No files to copy"); + Logger.Log("No files to copy"); return; } - double totalSize = files.Select(x => x.Length).Sum(); - await Logger.Log($"{totalSize.Bytes().ToString("#.#")} of files to copy"); - if (files.Count > FILE_COPY_TASK_OUNT_THRESHOLD || totalSize > FILE_COPY_TASK_SIZE_THRESHOLD) { - await BatchCopyFiles(source, target, files, totalSize, flatten); + long totalSize = files.Select(x => x.Length).Sum(); + if (files.Count > FILE_COPY_TASK_COUNT_THRESHOLD || totalSize > FILE_COPY_TASK_SIZE_THRESHOLD) { + await ParallelCopyFiles(source, target, files, totalSize, flatten); } else { - await SimpleCopyFiles(source, target, files, flatten); + SimpleCopyFiles(source, target, files, flatten); } } - internal async Task DeleteDirectoryContents(string path, string searchPattern = "*") { + internal async Task DeleteDirectoryContents(string path) { DirectoryInfo directory = new DirectoryInfo(path); - foreach (DirectoryInfo subDirectory in directory.GetDirectories("*", SearchOption.TopDirectoryOnly)) { - CancellationTokenSource.Token.ThrowIfCancellationRequested(); - await Logger.Log($"Deleting: {subDirectory}"); - subDirectory.Delete(true); + DeleteDirectories(directory.GetDirectories("*", SearchOption.TopDirectoryOnly).ToList()); + await DeleteFiles(directory.GetFiles("*", SearchOption.AllDirectories).ToList()); + } + + internal void DeleteDirectories(List directories) { + if (directories.Count == 0) { + Logger.Log("No directories to delete"); + return; } - await DeleteFiles(directory.GetFiles("*", SearchOption.AllDirectories)); + foreach (DirectoryInfo directory in directories) { + CancellationTokenSource.Token.ThrowIfCancellationRequested(); + Logger.Log($"Deleting directory: {directory}"); + directory.Delete(true); + } } - internal async Task DeleteFiles(IEnumerable files) { - foreach (FileInfo file in files) { - CancellationTokenSource.Token.ThrowIfCancellationRequested(); - await Logger.Log($"Deleting: {file}"); - file.Delete(); + internal async Task DeleteFiles(List files) { + if (files.Count == 0) { + Logger.Log("No files to delete"); + return; + } + + if (files.Count > FILE_DELETE_TASK_COUNT_THRESHOLD) { + await ParallelDeleteFiles(files); + } else { + SimpleDeleteFiles(files); } } @@ -101,48 +117,88 @@ internal async Task DeleteEmptyDirectories(DirectoryInfo directory) { foreach (DirectoryInfo subDirectory in directory.GetDirectories()) { await DeleteEmptyDirectories(subDirectory); if (subDirectory.GetFiles().Length == 0 && subDirectory.GetDirectories().Length == 0) { - await Logger.Log($"Deleting: {subDirectory}"); + Logger.Log($"Deleting directory: {subDirectory}"); subDirectory.Delete(false); } } } - private async Task SimpleCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, bool flatten = false) { + private void SimpleCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, bool flatten = false) { foreach (FileInfo file in files) { CancellationTokenSource.Token.ThrowIfCancellationRequested(); string targetFile = flatten ? Path.Join(target.FullName, file.Name) : file.FullName.Replace(source.FullName, target.FullName); - await Logger.Log($"Copying file: {file}"); + Logger.Log($"Copying '{file}' to '{target.FullName}'"); Directory.CreateDirectory(Path.GetDirectoryName(targetFile)); file.CopyTo(targetFile, true); } } - private async Task BatchCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, double totalSize, bool flatten = false) { - double copiedSize = 0; - await Logger.Log($"Copied {copiedSize.Bytes().ToString("#.#")} of {totalSize.Bytes().ToString("#.#")}"); - IEnumerable> fileBatches = files.Batch(10); - foreach (IEnumerable fileBatch in fileBatches) { - List fileList = fileBatch.ToList(); - IEnumerable tasks = fileList.Select( - file => { - try { - CancellationTokenSource.Token.ThrowIfCancellationRequested(); - string targetFile = flatten ? Path.Join(target.FullName, file.Name) : file.FullName.Replace(source.FullName, target.FullName); - Directory.CreateDirectory(Path.GetDirectoryName(targetFile)); - file.CopyTo(targetFile, true); - } catch (OperationCanceledException) { - throw; - } catch (Exception exception) { - throw new Exception($"Failed copying file '{file}'\n{exception.Message}", exception); - } - - return Task.CompletedTask; + private async Task ParallelCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, long totalSize, bool flatten = false) { + long copiedSize = 0; + + SemaphoreSlim taskLimiter = new SemaphoreSlim(100); + IEnumerable tasks = files.Select( + async file => { + if (CancellationTokenSource.Token.IsCancellationRequested) return; + + try { + await taskLimiter.WaitAsync(CancellationTokenSource.Token); + if (CancellationTokenSource.Token.IsCancellationRequested) return; + + string targetFile = flatten ? Path.Join(target.FullName, file.Name) : file.FullName.Replace(source.FullName, target.FullName); + Directory.CreateDirectory(Path.GetDirectoryName(targetFile)); + file.CopyTo(targetFile, true); + Interlocked.Add(ref copiedSize, file.Length); + Logger.LogInline($"Copied {copiedSize.Bytes().ToString("#.#")} of {totalSize.Bytes().ToString("#.#")}"); + } catch (OperationCanceledException) { + throw; + } catch (Exception exception) { + throw new Exception($"Failed to copy file '{file}'\n{exception.Message}", exception); + } finally { + taskLimiter.Release(); } - ); - await Task.WhenAll(tasks); - copiedSize += fileList.Select(x => x.Length).Sum(); - await Logger.LogInline($"Copied {copiedSize.Bytes().ToString("#.#")} of {totalSize.Bytes().ToString("#.#")}"); + } + ); + + Logger.LogInstant($"Copied {copiedSize.Bytes().ToString("#.#")} of {totalSize.Bytes().ToString("#.#")}"); + await Task.WhenAll(tasks); + } + + private void SimpleDeleteFiles(IEnumerable files) { + foreach (FileInfo file in files) { + CancellationTokenSource.Token.ThrowIfCancellationRequested(); + Logger.Log($"Deleting file: {file}"); + file.Delete(); } } + + private async Task ParallelDeleteFiles(IReadOnlyCollection files) { + int deleted = 0; + + SemaphoreSlim taskLimiter = new SemaphoreSlim(100); + IEnumerable tasks = files.Select( + async file => { + if (CancellationTokenSource.Token.IsCancellationRequested) return; + + try { + await taskLimiter.WaitAsync(CancellationTokenSource.Token); + if (CancellationTokenSource.Token.IsCancellationRequested) return; + + file.Delete(); + Interlocked.Increment(ref deleted); + Logger.LogInline($"Deleted {deleted} of {files.Count} files"); + } catch (OperationCanceledException) { + throw; + } catch (Exception exception) { + throw new Exception($"Failed to delete file '{file}'\n{exception.Message}", exception); + } finally { + taskLimiter.Release(); + } + } + ); + + Logger.LogInstant($"Deleted {deleted} of {files.Count} files"); + await Task.WhenAll(tasks); + } } } diff --git a/UKSF.Api.Services/Modpack/BuildsService.cs b/UKSF.Api.Services/Modpack/BuildsService.cs index 6d812238..d02e7e31 100644 --- a/UKSF.Api.Services/Modpack/BuildsService.cs +++ b/UKSF.Api.Services/Modpack/BuildsService.cs @@ -28,6 +28,10 @@ public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep await Data.Update(build, buildStep); } + public void BuildStepLogEvent(ModpackBuild build, ModpackBuildStep buildStep) { + Data.LogEvent(build, buildStep); + } + public List GetDevBuilds() => Data.Get(x => x.environment == GameEnvironment.DEV); public List GetRcBuilds() => Data.Get(x => x.environment != GameEnvironment.DEV); @@ -36,10 +40,17 @@ public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep public ModpackBuild GetLatestRcBuild(string version) => GetRcBuilds().FirstOrDefault(x => x.version == version); - public async Task CreateDevBuild(GithubCommit commit) { + public async Task CreateDevBuild(string version, GithubCommit commit) { ModpackBuild previousBuild = GetLatestDevBuild(); string builderId = accountService.Data.GetSingle(x => x.email == commit.author)?.id; - ModpackBuild build = new ModpackBuild { buildNumber = previousBuild?.buildNumber + 1 ?? 1, environment = GameEnvironment.DEV, commit = commit, builderId = builderId, steps = buildStepService.GetSteps(GameEnvironment.DEV) }; + ModpackBuild build = new ModpackBuild { + version = version, + buildNumber = previousBuild?.buildNumber + 1 ?? 1, + environment = GameEnvironment.DEV, + commit = commit, + builderId = builderId, + steps = buildStepService.GetSteps(GameEnvironment.DEV) + }; await Data.Add(build); return build; } @@ -48,7 +59,12 @@ public async Task CreateRcBuild(string version, GithubCommit commi ModpackBuild previousBuild = GetLatestRcBuild(version); string builderId = accountService.Data.GetSingle(x => x.email == commit.author)?.id; ModpackBuild build = new ModpackBuild { - version = version, buildNumber = previousBuild?.buildNumber + 1 ?? 1, environment = GameEnvironment.RC, commit = commit, builderId = builderId, steps = buildStepService.GetSteps(GameEnvironment.RC) + version = version, + buildNumber = previousBuild?.buildNumber + 1 ?? 1, + environment = GameEnvironment.RC, + commit = commit, + builderId = builderId, + steps = buildStepService.GetSteps(GameEnvironment.RC) }; await Data.Add(build); @@ -86,7 +102,9 @@ public async Task CreateRebuild(ModpackBuild build) { commit = latestBuild.commit, builderId = sessionService.GetContextId() }; - rebuild.commit.message = latestBuild.environment == GameEnvironment.RELEASE ? $"Re-deployment of release {rebuild.version}" : $"Rebuild of #{build.buildNumber}\n\n{rebuild.commit.message}"; + rebuild.commit.message = latestBuild.environment == GameEnvironment.RELEASE + ? $"Re-deployment of release {rebuild.version}" + : $"Rebuild of #{build.buildNumber}\n\n{rebuild.commit.message}"; await Data.Add(rebuild); return rebuild; } diff --git a/UKSF.Api.Services/Modpack/ModpackService.cs b/UKSF.Api.Services/Modpack/ModpackService.cs index 37b3925c..4283078a 100644 --- a/UKSF.Api.Services/Modpack/ModpackService.cs +++ b/UKSF.Api.Services/Modpack/ModpackService.cs @@ -43,7 +43,8 @@ public async Task NewBuild(string reference) { commit.author = sessionService.GetContextEmail(); } - ModpackBuild build = await buildsService.CreateDevBuild(commit); + string version = await githubService.GetReferenceVersion(reference); + ModpackBuild build = await buildsService.CreateDevBuild(version, commit); LogWrapper.AuditLog($"New build created ({GetBuildName(build)})"); buildQueueService.QueueBuild(build); } @@ -82,7 +83,8 @@ public async Task RegnerateReleaseDraftChangelog(string version) { public async Task CreateDevBuildFromPush(PushWebhookPayload payload) { GithubCommit devCommit = await githubService.GetPushEvent(payload); - ModpackBuild devBuild = await buildsService.CreateDevBuild(devCommit); + string version = await githubService.GetReferenceVersion(payload.Ref); + ModpackBuild devBuild = await buildsService.CreateDevBuild(version, devCommit); buildQueueService.QueueBuild(devBuild); } diff --git a/UKSF.Api/Controllers/DocsController.cs b/UKSF.Api/Controllers/DocsController.cs index 92d34c99..c3f0aa3f 100644 --- a/UKSF.Api/Controllers/DocsController.cs +++ b/UKSF.Api/Controllers/DocsController.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -using Markdig; using Microsoft.AspNetCore.Mvc; #pragma warning disable 649 diff --git a/UKSF.Api/Controllers/GameServersController.cs b/UKSF.Api/Controllers/GameServersController.cs index 691469e1..e176277e 100644 --- a/UKSF.Api/Controllers/GameServersController.cs +++ b/UKSF.Api/Controllers/GameServersController.cs @@ -11,7 +11,6 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Interfaces.Game; using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Game; using UKSF.Api.Models.Mission; using UKSF.Api.Services.Admin; @@ -26,10 +25,8 @@ namespace UKSF.Api.Controllers { public class GameServersController : Controller { private readonly IGameServersService gameServersService; private readonly IHubContext serversHub; - private readonly ISessionService sessionService; - public GameServersController(ISessionService sessionService, IGameServersService gameServersService, IHubContext serversHub) { - this.sessionService = sessionService; + public GameServersController(IGameServersService gameServersService, IHubContext serversHub) { this.gameServersService = gameServersService; this.serversHub = serversHub; } diff --git a/UKSF.Api/Controllers/RanksController.cs b/UKSF.Api/Controllers/RanksController.cs index f45ada93..4ae29930 100644 --- a/UKSF.Api/Controllers/RanksController.cs +++ b/UKSF.Api/Controllers/RanksController.cs @@ -5,7 +5,6 @@ using MongoDB.Driver; using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Message; using UKSF.Api.Models.Personnel; using UKSF.Api.Services.Message; @@ -18,13 +17,11 @@ public class RanksController : Controller { private readonly IAssignmentService assignmentService; private readonly INotificationsService notificationsService; private readonly IRanksService ranksService; - private readonly ISessionService sessionService; - public RanksController(IRanksService ranksService, IAccountService accountService, IAssignmentService assignmentService, ISessionService sessionService, INotificationsService notificationsService) { + public RanksController(IRanksService ranksService, IAccountService accountService, IAssignmentService assignmentService, INotificationsService notificationsService) { this.ranksService = ranksService; this.accountService = accountService; this.assignmentService = assignmentService; - this.sessionService = sessionService; this.notificationsService = notificationsService; } diff --git a/UKSF.Api/Controllers/RolesController.cs b/UKSF.Api/Controllers/RolesController.cs index 7d8d51f4..bbde17a1 100644 --- a/UKSF.Api/Controllers/RolesController.cs +++ b/UKSF.Api/Controllers/RolesController.cs @@ -6,7 +6,6 @@ using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Message; using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Units; @@ -20,14 +19,12 @@ public class RolesController : Controller { private readonly IAssignmentService assignmentService; private readonly INotificationsService notificationsService; private readonly IRolesService rolesService; - private readonly ISessionService sessionService; private readonly IUnitsService unitsService; - public RolesController(IRolesService rolesService, IAccountService accountService, IAssignmentService assignmentService, ISessionService sessionService, IUnitsService unitsService, INotificationsService notificationsService) { + public RolesController(IRolesService rolesService, IAccountService accountService, IAssignmentService assignmentService, IUnitsService unitsService, INotificationsService notificationsService) { this.rolesService = rolesService; this.accountService = accountService; this.assignmentService = assignmentService; - this.sessionService = sessionService; this.unitsService = unitsService; this.notificationsService = notificationsService; } diff --git a/UKSF.Api/Controllers/Utility/DebugController.cs b/UKSF.Api/Controllers/Utility/DebugController.cs index a5e956d7..5b422ae9 100644 --- a/UKSF.Api/Controllers/Utility/DebugController.cs +++ b/UKSF.Api/Controllers/Utility/DebugController.cs @@ -1,9 +1,4 @@ using System; -using System.Diagnostics; -using System.Management.Automation; -using System.Management.Automation.Runspaces; -using System.Threading; -using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Hosting; diff --git a/UKSF.Api/Controllers/VariablesController.cs b/UKSF.Api/Controllers/VariablesController.cs index d4970eb3..6e0e8d17 100644 --- a/UKSF.Api/Controllers/VariablesController.cs +++ b/UKSF.Api/Controllers/VariablesController.cs @@ -11,12 +11,10 @@ namespace UKSF.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.ADMIN)] public class VariablesController : Controller { - private readonly ISessionService sessionService; private readonly IVariablesDataService variablesDataService; - public VariablesController(IVariablesDataService variablesDataService, ISessionService sessionService) { + public VariablesController(IVariablesDataService variablesDataService) { this.variablesDataService = variablesDataService; - this.sessionService = sessionService; } [HttpGet, Authorize] From 8315a42795eb06614ef81cba65fa9f73601a617d Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 27 Jul 2020 15:32:50 +0100 Subject: [PATCH 202/369] Added intercept move and sign steps - Certificate signing code instead of exe call. Signing doesn't timestamp as it takes ages - General method for parallel file operations with better cancellation handling - Better handling of powershell output --- .../Modpack/BuildProcess/IStepLogger.cs | 2 +- .../BuildProcess/BuildProcessHelper.cs | 25 +- .../Modpack/BuildProcess/BuildStepService.cs | 6 +- .../Modpack/BuildProcess/StepLogger.cs | 9 +- .../Modpack/BuildProcess/Steps/BuildStep.cs | 2 + .../Steps/Common/BuildStepExtensions.cs | 44 ++++ .../Steps/Common/BuildStepIntercept.cs | 22 ++ .../Steps/Common/BuildStepSignDependencies.cs | 47 ++-- .../BuildProcess/Steps/FileBuildStep.cs | 113 +++++---- UKSF.Common/CertificateUtilities.cs | 230 ++++++++++++++++++ 10 files changed, 413 insertions(+), 87 deletions(-) create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepExtensions.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepIntercept.cs create mode 100644 UKSF.Common/CertificateUtilities.cs diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs index b1a1fd6d..42a4f56f 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs @@ -12,6 +12,6 @@ public interface IStepLogger { void LogInline(string log); void Log(string log, string colour = ""); void LogInstant(string log, string colour = ""); - void FlushLogs(bool force = false, bool synchronous = false); + void LogInlineInstant(string log); } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index b29f6542..2cfb4eab 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Management.Automation; using System.Management.Automation.Runspaces; @@ -9,7 +10,7 @@ namespace UKSF.Api.Services.Modpack.BuildProcess { public static class BuildProcessHelper { [SuppressMessage("ReSharper", "MethodHasAsyncOverload")] // async runspace.OpenAsync is not as it seems - public static async Task RunPowershell(IStepLogger logger, bool raiseErrors, CancellationToken cancellationToken, string workingDirectory, string command) { + public static async Task RunPowershell(IStepLogger logger, bool raiseErrors, CancellationToken cancellationToken, string workingDirectory, string command, bool suppressOutput = false) { using Runspace runspace = RunspaceFactory.CreateRunspace(); runspace.Open(); runspace.SessionStateProxy.Path.SetLocation(workingDirectory); @@ -32,22 +33,30 @@ void Error(object sender, DataAddedEventArgs eventArgs) { exception = currentStreamRecord?.Exception; } - powerShell.Streams.Information.DataAdded += Log; - powerShell.Streams.Warning.DataAdded += Log; + if (!suppressOutput) { + powerShell.Streams.Information.DataAdded += Log; + powerShell.Streams.Warning.DataAdded += Log; + } + powerShell.Streams.Error.DataAdded += Error; PSDataCollection result = await powerShell.InvokeAsync(cancellationToken); if (exception != null) { if (raiseErrors) { + LogPowershellResult(logger, result); runspace.Close(); throw exception; } + if (!suppressOutput) { + LogPowershellResult(logger, result); + } + logger.LogError(exception); } - foreach (PSObject psObject in result) { - logger.Log(psObject.BaseObject.ToString()); + if (!suppressOutput) { + LogPowershellResult(logger, result); } runspace.Close(); @@ -69,5 +78,11 @@ private static Task> InvokeAsync(this PowerShell powe cancellationToken ); } + + private static void LogPowershellResult(IStepLogger logger, IEnumerable result) { + foreach (PSObject psObject in result) { + logger.Log(psObject.BaseObject.ToString()); + } + } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index 5e871672..249a2c7b 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -49,8 +49,10 @@ public IBuildStep ResolveBuildStep(string buildStepName) { private static List GetStepsForBuild() => new List { new ModpackBuildStep(BuildStepPrep.NAME), - new ModpackBuildStep(BuildStepClean.NAME), + // new ModpackBuildStep(BuildStepClean.NAME), new ModpackBuildStep(BuildStepBuild.NAME), + new ModpackBuildStep(BuildStepIntercept.NAME), + new ModpackBuildStep(BuildStepExtensions.NAME), new ModpackBuildStep(BuildStepSignDependencies.NAME), new ModpackBuildStep(BuildStepDeploy.NAME), new ModpackBuildStep(BuildStepKeys.NAME), @@ -63,6 +65,8 @@ private static List GetStepsForRc() => new ModpackBuildStep(BuildStepPrep.NAME), new ModpackBuildStep(BuildStepClean.NAME), new ModpackBuildStep(BuildStepBuild.NAME), + new ModpackBuildStep(BuildStepIntercept.NAME), + new ModpackBuildStep(BuildStepExtensions.NAME), new ModpackBuildStep(BuildStepSignDependencies.NAME), new ModpackBuildStep(BuildStepDeploy.NAME), new ModpackBuildStep(BuildStepKeys.NAME), diff --git a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs index 3bc23a46..44a34ed3 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs @@ -73,6 +73,11 @@ public void LogInstant(string log, string colour = "") { FlushLogsInstantly(); } + public void LogInlineInstant(string log) { + LogInline(log); + FlushLogsInstantly(false); + } + public void FlushLogs(bool force = false, bool synchronous = false) { if (force || logCount > LOG_COUNT_MAX) { logCount = 0; @@ -83,8 +88,8 @@ public void FlushLogs(bool force = false, bool synchronous = false) { } } - private void FlushLogsInstantly() { - FlushLogs(true, true); + private void FlushLogsInstantly(bool synchronous = true) { + FlushLogs(true, synchronous); } private void LogLines(string log, string colour = "") { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs index 5242374b..dba7230d 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs @@ -137,6 +137,8 @@ internal string GetEnvironmentRepoName() => _ => throw new ArgumentException("Invalid build environment") }; + internal string GetBuildSourcesPath() => VariablesWrapper.VariablesDataService().GetSingle("BUILD_SOURCES_PATH").AsString(); + private async Task Stop() { buildStep.running = false; buildStep.finished = true; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepExtensions.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepExtensions.cs new file mode 100644 index 00000000..6d3f5798 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepExtensions.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using UKSF.Api.Services.Admin; +using UKSF.Common; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { + [BuildStep(NAME)] + public class BuildStepExtensions : FileBuildStep { + public const string NAME = "Extensions"; + + protected override async Task ProcessExecute() { + string uksfPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf", "intercept"); + string interceptPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@intercept"); + DirectoryInfo uksf = new DirectoryInfo(uksfPath); + DirectoryInfo intercept = new DirectoryInfo(interceptPath); + + Logger.LogSurround("\nSigning extensions..."); + List files = GetDirectoryContents(uksf, "*.dll").Concat(GetDirectoryContents(intercept, "*.dll")).ToList(); + await SignExtensions(files); + Logger.LogSurround("Signed extensions"); + } + + private async Task SignExtensions(IReadOnlyCollection files) { + string thumbprint = VariablesWrapper.VariablesDataService().GetSingle("BUILD_CERTIFICATE_THUMBPRINT").AsString(); + int signed = 0; + await ParallelProcessFiles( + files, + 10, + file => { + CertificateUtilities.SignWithThumbprint(file.FullName, thumbprint); + Interlocked.Increment(ref signed); + return Task.CompletedTask; + }, + () => $"Signed {signed} of {files.Count} extensions", + "Failed to sign extension", + true + ); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepIntercept.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepIntercept.cs new file mode 100644 index 00000000..aa9ec9cc --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepIntercept.cs @@ -0,0 +1,22 @@ +using System.IO; +using System.Threading.Tasks; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { + [BuildStep(NAME)] + public class BuildStepIntercept : FileBuildStep { + public const string NAME = "Intercept"; + + protected override async Task ProcessExecute() { + string sourcePath = Path.Join(GetBuildSourcesPath(), "modpack", "@intercept"); + string targetPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@intercept"); + + Logger.LogSurround("\nCleaning intercept directory..."); + await DeleteDirectoryContents(targetPath); + Logger.LogSurround("Cleaned intercept directory"); + + Logger.LogSurround("\nCopying intercept to build..."); + await CopyDirectory(sourcePath, targetPath); + Logger.LogSurround("Copied intercept to build"); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs index 2c665888..a524cfd0 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Threading; using System.Threading.Tasks; using UKSF.Api.Models.Game; @@ -10,7 +9,7 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { [BuildStep(NAME)] public class BuildStepSignDependencies : FileBuildStep { - public const string NAME = "Dependencies"; + public const string NAME = "Signatures"; private string dsCreateKey; private string dsSignFile; private string keyName; @@ -40,18 +39,25 @@ protected override async Task SetupExecute() { } protected override async Task ProcessExecute() { - string addonsPath = Path.Join(Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies"), "addons"); + string addonsPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies", "addons"); + string interceptPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@intercept", "addons"); string keygenPath = Path.Join(GetBuildEnvironmentPath(), "PrivateKeys"); DirectoryInfo addons = new DirectoryInfo(addonsPath); + DirectoryInfo intercept = new DirectoryInfo(interceptPath); Logger.LogSurround("\nDeleting dependencies signatures..."); await DeleteFiles(GetDirectoryContents(addons, "*.bisign*")); Logger.LogSurround("Deleted dependencies signatures"); - List files = GetDirectoryContents(addons, "*.pbo"); + List repoFiles = GetDirectoryContents(addons, "*.pbo"); Logger.LogSurround("\nSigning dependencies..."); - await SignFiles(keygenPath, addonsPath, files); + await SignFiles(keygenPath, addonsPath, repoFiles); Logger.LogSurround("Signed dependencies"); + + List interceptIiles = GetDirectoryContents(intercept, "*.pbo"); + Logger.LogSurround("\nSigning intercept..."); + await SignFiles(keygenPath, addonsPath, interceptIiles); + Logger.LogSurround("Signed intercept"); } private string GetKeyname() { @@ -66,31 +72,16 @@ private string GetKeyname() { private async Task SignFiles(string keygenPath, string addonsPath, IReadOnlyCollection files) { string privateKey = Path.Join(keygenPath, $"{keyName}.biprivatekey"); int signed = 0; - - SemaphoreSlim taskLimiter = new SemaphoreSlim(100); - IEnumerable tasks = files.Select( + await ParallelProcessFiles( + files, + 100, async file => { - if (CancellationTokenSource.Token.IsCancellationRequested) return; - - try { - await taskLimiter.WaitAsync(CancellationTokenSource.Token); - if (CancellationTokenSource.Token.IsCancellationRequested) return; - - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, addonsPath, $".\"{dsSignFile}\" \"{privateKey}\" \"{file.FullName}\""); - Interlocked.Increment(ref signed); - Logger.LogInline($"Signed {signed} of {files.Count} files"); - } catch (OperationCanceledException) { - throw; - } catch (Exception exception) { - throw new Exception($"Failed to sign file '{file}'\n{exception.Message}", exception); - } finally { - taskLimiter.Release(); - } - } + await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, addonsPath, $".\"{dsSignFile}\" \"{privateKey}\" \"{file.FullName}\""); + Interlocked.Increment(ref signed); + }, + () => $"Signed {signed} of {files.Count} files", + "Failed to sign file" ); - - Logger.LogInstant($"Signed {signed} of {files.Count} files"); - await Task.WhenAll(tasks); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs index cecff8d1..0f8854fe 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs @@ -5,6 +5,7 @@ using System.Threading; using System.Threading.Tasks; using Humanizer; +using MoreLinq; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class FileBuildStep : BuildStep { @@ -83,6 +84,11 @@ internal async Task CopyFiles(FileSystemInfo source, FileSystemInfo target, List internal async Task DeleteDirectoryContents(string path) { DirectoryInfo directory = new DirectoryInfo(path); + if (!directory.Exists) { + Logger.Log("Directory does not exist"); + return; + } + DeleteDirectories(directory.GetDirectories("*", SearchOption.TopDirectoryOnly).ToList()); await DeleteFiles(directory.GetFiles("*", SearchOption.AllDirectories).ToList()); } @@ -123,6 +129,41 @@ internal async Task DeleteEmptyDirectories(DirectoryInfo directory) { } } + internal async Task ParallelProcessFiles(IEnumerable files, int taskLimit, Func process, Func getLog, string error, bool logInstantly = false) { + SemaphoreSlim taskLimiter = new SemaphoreSlim(taskLimit); + IEnumerable tasks = files.Select( + file => { + return Task.Run( + async () => { + CancellationTokenSource.Token.ThrowIfCancellationRequested(); + + try { + await taskLimiter.WaitAsync(CancellationTokenSource.Token); + CancellationTokenSource.Token.ThrowIfCancellationRequested(); + + await process(file); + if (logInstantly) { + Logger.LogInlineInstant(getLog()); + } else { + Logger.LogInline(getLog()); + } + } catch (OperationCanceledException) { + throw; + } catch (Exception exception) { + throw new Exception($"{error} '{file}'\n{exception.Message}", exception); + } finally { + taskLimiter.Release(); + } + }, + CancellationTokenSource.Token + ); + } + ); + + Logger.LogInstant(getLog()); + await Task.WhenAll(tasks); + } + private void SimpleCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, bool flatten = false) { foreach (FileInfo file in files) { CancellationTokenSource.Token.ThrowIfCancellationRequested(); @@ -135,33 +176,19 @@ private void SimpleCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnum private async Task ParallelCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, long totalSize, bool flatten = false) { long copiedSize = 0; - - SemaphoreSlim taskLimiter = new SemaphoreSlim(100); - IEnumerable tasks = files.Select( - async file => { - if (CancellationTokenSource.Token.IsCancellationRequested) return; - - try { - await taskLimiter.WaitAsync(CancellationTokenSource.Token); - if (CancellationTokenSource.Token.IsCancellationRequested) return; - - string targetFile = flatten ? Path.Join(target.FullName, file.Name) : file.FullName.Replace(source.FullName, target.FullName); - Directory.CreateDirectory(Path.GetDirectoryName(targetFile)); - file.CopyTo(targetFile, true); - Interlocked.Add(ref copiedSize, file.Length); - Logger.LogInline($"Copied {copiedSize.Bytes().ToString("#.#")} of {totalSize.Bytes().ToString("#.#")}"); - } catch (OperationCanceledException) { - throw; - } catch (Exception exception) { - throw new Exception($"Failed to copy file '{file}'\n{exception.Message}", exception); - } finally { - taskLimiter.Release(); - } - } + await ParallelProcessFiles( + files, + 100, + file => { + string targetFile = flatten ? Path.Join(target.FullName, file.Name) : file.FullName.Replace(source.FullName, target.FullName); + Directory.CreateDirectory(Path.GetDirectoryName(targetFile)); + file.CopyTo(targetFile, true); + Interlocked.Add(ref copiedSize, file.Length); + return Task.CompletedTask; + }, + () => $"Copied {copiedSize.Bytes().ToString("#.#")} of {totalSize.Bytes().ToString("#.#")}", + "Failed to copy file" ); - - Logger.LogInstant($"Copied {copiedSize.Bytes().ToString("#.#")} of {totalSize.Bytes().ToString("#.#")}"); - await Task.WhenAll(tasks); } private void SimpleDeleteFiles(IEnumerable files) { @@ -174,31 +201,17 @@ private void SimpleDeleteFiles(IEnumerable files) { private async Task ParallelDeleteFiles(IReadOnlyCollection files) { int deleted = 0; - - SemaphoreSlim taskLimiter = new SemaphoreSlim(100); - IEnumerable tasks = files.Select( - async file => { - if (CancellationTokenSource.Token.IsCancellationRequested) return; - - try { - await taskLimiter.WaitAsync(CancellationTokenSource.Token); - if (CancellationTokenSource.Token.IsCancellationRequested) return; - - file.Delete(); - Interlocked.Increment(ref deleted); - Logger.LogInline($"Deleted {deleted} of {files.Count} files"); - } catch (OperationCanceledException) { - throw; - } catch (Exception exception) { - throw new Exception($"Failed to delete file '{file}'\n{exception.Message}", exception); - } finally { - taskLimiter.Release(); - } - } + await ParallelProcessFiles( + files, + 100, + file => { + file.Delete(); + Interlocked.Increment(ref deleted); + return Task.CompletedTask; + }, + () => $"Deleted {deleted} of {files.Count} files", + "Failed to delete file" ); - - Logger.LogInstant($"Deleted {deleted} of {files.Count} files"); - await Task.WhenAll(tasks); } } } diff --git a/UKSF.Common/CertificateUtilities.cs b/UKSF.Common/CertificateUtilities.cs new file mode 100644 index 00000000..10c5ae49 --- /dev/null +++ b/UKSF.Common/CertificateUtilities.cs @@ -0,0 +1,230 @@ +using System; +using System.Runtime.InteropServices; +using System.Security.Cryptography; +using System.Security.Cryptography.X509Certificates; + +namespace UKSF.Common { + // Credit: https://stackoverflow.com/a/26372061/2516910 + public static class CertificateUtilities { + [DllImport("Mssign32.dll", CharSet = CharSet.Unicode, SetLastError = true)] + private static extern int SignerSign( + IntPtr pSubjectInfo, // SIGNER_SUBJECT_INFO + IntPtr pSignerCert, // SIGNER_CERT + IntPtr pSignatureInfo, // SIGNER_SIGNATURE_INFO + IntPtr pProviderInfo, // SIGNER_PROVIDER_INFO + string pwszHttpTimeStamp, // LPCWSTR + IntPtr psRequest, // PCRYPT_ATTRIBUTES + IntPtr pSipData // LPVOID + ); + + [DllImport("Mssign32.dll", CharSet = CharSet.Unicode, SetLastError = true)] + private static extern int SignerTimeStamp( + IntPtr pSubjectInfo, // SIGNER_SUBJECT_INFO + string pwszHttpTimeStamp, // LPCWSTR + IntPtr psRequest, // PCRYPT_ATTRIBUTES + IntPtr pSipData // LPVOID + ); + + [DllImport("Crypt32.dll", EntryPoint = "CertCreateCertificateContext", SetLastError = true, CharSet = CharSet.Unicode, ExactSpelling = false, CallingConvention = CallingConvention.StdCall)] + private static extern IntPtr CertCreateCertificateContext(int dwCertEncodingType, byte[] pbCertEncoded, int cbCertEncoded); + + public static void SignWithThumbprint(string appPath, string thumbprint, string timestampUrl = "") { + IntPtr pSignerCert = IntPtr.Zero; + IntPtr pSubjectInfo = IntPtr.Zero; + IntPtr pSignatureInfo = IntPtr.Zero; + IntPtr pProviderInfo = IntPtr.Zero; + + try { + pSignerCert = CreateSignerCert(thumbprint); + pSubjectInfo = CreateSignerSubjectInfo(appPath); + pSignatureInfo = CreateSignerSignatureInfo(); + + SignCode(pSubjectInfo, pSignerCert, pSignatureInfo, pProviderInfo); + + if (!string.IsNullOrEmpty(timestampUrl)) { + TimeStampSignedCode(pSubjectInfo, timestampUrl); + } + } catch (CryptographicException ce) { + throw new Exception($"An error occurred while attempting to load the signing certificate. {ce.Message}"); + } finally { + if (pSignerCert != IntPtr.Zero) { + Marshal.DestroyStructure(pSignerCert, typeof(SignerCert)); + } + + if (pSubjectInfo != IntPtr.Zero) { + Marshal.DestroyStructure(pSubjectInfo, typeof(SignerSubjectInfo)); + } + + if (pSignatureInfo != IntPtr.Zero) { + Marshal.DestroyStructure(pSignatureInfo, typeof(SignerSignatureInfo)); + } + } + } + + private static IntPtr CreateSignerSubjectInfo(string pathToAssembly) { + SignerSubjectInfo info = new SignerSubjectInfo { cbSize = (uint) Marshal.SizeOf(typeof(SignerSubjectInfo)), pdwIndex = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(uint))) }; + int index = 0; + Marshal.StructureToPtr(index, info.pdwIndex, false); + + info.dwSubjectChoice = 0x1; //SIGNER_SUBJECT_FILE + IntPtr assemblyFilePtr = Marshal.StringToHGlobalUni(pathToAssembly); + + SignerFileInfo fileInfo = new SignerFileInfo { cbSize = (uint) Marshal.SizeOf(typeof(SignerFileInfo)), pwszFileName = assemblyFilePtr, hFile = IntPtr.Zero }; + + info.Union1 = new SignerSubjectInfo.SubjectChoiceUnion { pSignerFileInfo = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(SignerFileInfo))) }; + + Marshal.StructureToPtr(fileInfo, info.Union1.pSignerFileInfo, false); + + IntPtr pSubjectInfo = Marshal.AllocHGlobal(Marshal.SizeOf(info)); + Marshal.StructureToPtr(info, pSubjectInfo, false); + + return pSubjectInfo; + } + + private static X509Certificate2 FindCertByThumbprint(string thumbprint) { + try { + string thumbprintFixed = thumbprint.Replace(" ", string.Empty).ToUpperInvariant(); + + X509Store[] stores = { + new X509Store(StoreName.My, StoreLocation.CurrentUser), + new X509Store(StoreName.My, StoreLocation.LocalMachine), + new X509Store(StoreName.TrustedPublisher, StoreLocation.CurrentUser), + new X509Store(StoreName.TrustedPublisher, StoreLocation.LocalMachine) + }; + + foreach (X509Store store in stores) { + store.Open(OpenFlags.ReadOnly); + X509Certificate2Collection certs = store.Certificates.Find(X509FindType.FindByThumbprint, thumbprintFixed, false); + store.Close(); + + if (certs.Count < 1) { + continue; + } + + return certs[0]; + } + + throw new Exception($"A certificate matching the thumbprint: {thumbprint} could not be found. Make sure that a valid certificate matching the provided thumbprint is installed."); + } catch (Exception e) { + throw new Exception($"{e.Message}"); + } + } + + private static IntPtr CreateSignerCert(string thumbprint) { + SignerCert signerCert = new SignerCert { + cbSize = (uint) Marshal.SizeOf(typeof(SignerCert)), + dwCertChoice = 0x2, + Union1 = new SignerCert.SignerCertUnion { pCertStoreInfo = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(SignerCertStoreInfo))) }, + hwnd = IntPtr.Zero + }; + + const int X509_ASN_ENCODING = 0x00000001; + const int PKCS_7_ASN_ENCODING = 0x00010000; + + X509Certificate2 cert = FindCertByThumbprint(thumbprint); + + IntPtr pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, cert.GetRawCertData(), cert.GetRawCertData().Length); + + SignerCertStoreInfo certStoreInfo = new SignerCertStoreInfo { + cbSize = (uint) Marshal.SizeOf(typeof(SignerCertStoreInfo)), + pSigningCert = pCertContext, + dwCertPolicy = 0x2, // SIGNER_CERT_POLICY_CHAIN + hCertStore = IntPtr.Zero + }; + + Marshal.StructureToPtr(certStoreInfo, signerCert.Union1.pCertStoreInfo, false); + + IntPtr pSignerCert = Marshal.AllocHGlobal(Marshal.SizeOf(signerCert)); + Marshal.StructureToPtr(signerCert, pSignerCert, false); + + return pSignerCert; + } + + private static IntPtr CreateSignerSignatureInfo() { + SignerSignatureInfo signatureInfo = new SignerSignatureInfo { + cbSize = (uint) Marshal.SizeOf(typeof(SignerSignatureInfo)), + algidHash = 0x00008004, // CALG_SHA1 + dwAttrChoice = 0x0, // SIGNER_NO_ATTR + pAttrAuthCode = IntPtr.Zero, + psAuthenticated = IntPtr.Zero, + psUnauthenticated = IntPtr.Zero + }; + + IntPtr pSignatureInfo = Marshal.AllocHGlobal(Marshal.SizeOf(signatureInfo)); + Marshal.StructureToPtr(signatureInfo, pSignatureInfo, false); + + return pSignatureInfo; + } + + private static void SignCode(IntPtr pSubjectInfo, IntPtr pSignerCert, IntPtr pSignatureInfo, IntPtr pProviderInfo) { + int hResult = SignerSign(pSubjectInfo, pSignerCert, pSignatureInfo, pProviderInfo, null, IntPtr.Zero, IntPtr.Zero); + + if (hResult != 0) { + Marshal.ThrowExceptionForHR(Marshal.GetHRForLastWin32Error()); + } + } + + private static void TimeStampSignedCode(IntPtr pSubjectInfo, string timestampUrl) { + int hResult = SignerTimeStamp(pSubjectInfo, timestampUrl, IntPtr.Zero, IntPtr.Zero); + + if (hResult != 0) { + throw new Exception($"{timestampUrl} could not be used at this time. If necessary, check the timestampUrl, internet connection, and try again."); + } + } + + [StructLayout(LayoutKind.Sequential)] + private struct SignerSubjectInfo { + public uint cbSize; + public IntPtr pdwIndex; + public uint dwSubjectChoice; + public SubjectChoiceUnion Union1; + + [StructLayoutAttribute(LayoutKind.Explicit)] + internal struct SubjectChoiceUnion { + [FieldOffsetAttribute(0)] public IntPtr pSignerFileInfo; + [FieldOffsetAttribute(0)] public readonly IntPtr pSignerBlobInfo; + } + } + + [StructLayoutAttribute(LayoutKind.Sequential)] + private struct SignerCert { + public uint cbSize; + public uint dwCertChoice; + public SignerCertUnion Union1; + + [StructLayoutAttribute(LayoutKind.Explicit)] + internal struct SignerCertUnion { + [FieldOffsetAttribute(0)] public readonly IntPtr pwszSpcFile; + [FieldOffsetAttribute(0)] public IntPtr pCertStoreInfo; + [FieldOffsetAttribute(0)] public readonly IntPtr pSpcChainInfo; + } + + public IntPtr hwnd; + } + + [StructLayoutAttribute(LayoutKind.Sequential)] + private struct SignerSignatureInfo { + public uint cbSize; + public uint algidHash; // ALG_ID + public uint dwAttrChoice; + public IntPtr pAttrAuthCode; + public IntPtr psAuthenticated; // PCRYPT_ATTRIBUTES + public IntPtr psUnauthenticated; // PCRYPT_ATTRIBUTES + } + + [StructLayoutAttribute(LayoutKind.Sequential)] + private struct SignerFileInfo { + public uint cbSize; + public IntPtr pwszFileName; + public IntPtr hFile; + } + + [StructLayoutAttribute(LayoutKind.Sequential)] + private struct SignerCertStoreInfo { + public uint cbSize; + public IntPtr pSigningCert; // CERT_CONTEXT + public uint dwCertPolicy; + public IntPtr hCertStore; + } + } +} From 314db1d765bfd1ad21e82070ad755c7694403dcb Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 27 Jul 2020 23:30:12 +0100 Subject: [PATCH 203/369] Added sources step. Added support for build environment variables. --- .../Modpack/BuildProcess/Steps/IBuildStep.cs | 1 - UKSF.Api.Models/Modpack/ModpackBuild.cs | 1 + .../BuildProcess/BuildProcessHelper.cs | 60 +++++++++++-- .../BuildProcess/BuildProcessorService.cs | 2 - .../Modpack/BuildProcess/BuildStepService.cs | 4 +- .../Modpack/BuildProcess/Steps/BuildStep.cs | 34 +++++--- .../Steps/Common/BuildStepBuildRepo.cs | 5 +- .../Steps/Common/BuildStepExtensions.cs | 3 +- .../Steps/Common/BuildStepSignDependencies.cs | 4 +- .../Steps/Common/BuildStepSources.cs | 87 +++++++++++++++++++ .../BuildProcess/Steps/FileBuildStep.cs | 1 - UKSF.Api.sln | 42 --------- .../Controllers/Modpack/ModpackController.cs | 6 +- 13 files changed, 176 insertions(+), 74 deletions(-) create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSources.cs diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs index a4687f78..a7497cd9 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs @@ -10,7 +10,6 @@ public interface IBuildStep { bool CheckGuards(); Task Setup(); Task Process(); - Task Teardown(); Task Succeed(); Task Fail(Exception exception); Task Cancel(); diff --git a/UKSF.Api.Models/Modpack/ModpackBuild.cs b/UKSF.Api.Models/Modpack/ModpackBuild.cs index 58462934..f32fd64b 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuild.cs +++ b/UKSF.Api.Models/Modpack/ModpackBuild.cs @@ -19,5 +19,6 @@ public class ModpackBuild : DatabaseObject { public DateTime startTime = DateTime.Now; public DateTime endTime = DateTime.Now; public string version; + public Dictionary environmentVariables = new Dictionary(); } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index 2cfb4eab..6560b549 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Management.Automation; using System.Management.Automation.Runspaces; @@ -9,15 +10,60 @@ namespace UKSF.Api.Services.Modpack.BuildProcess { public static class BuildProcessHelper { + public static string RunProcess(IStepLogger logger, bool raiseErrors, CancellationToken cancellationToken, string executable, string workingDirectory, string args) { + using Process process = new Process { + StartInfo = { + FileName = executable, + WorkingDirectory = workingDirectory, + Arguments = args, + UseShellExecute = false, + CreateNoWindow = true, + RedirectStandardOutput = true, + RedirectStandardError = true + } + }; + + try { + process.EnableRaisingEvents = false; + string result = ""; + process.OutputDataReceived += (sender, receivedEventArgs) => { + result = receivedEventArgs.Data; + logger.Log(result); + }; + process.ErrorDataReceived += (sender, receivedEventArgs) => { + Exception exception = new Exception(receivedEventArgs.Data); + if (raiseErrors) { + throw exception; + } + + logger.LogError(exception); + }; + using CancellationTokenRegistration unused = cancellationToken.Register(process.Kill); + process.Start(); + process.BeginOutputReadLine(); + process.BeginErrorReadLine(); + process.WaitForExit(); + + if (process.ExitCode != 0) { + throw new Exception($"Process exited with non-zero exit code of: {process.ExitCode}"); + } + + return result; + } finally { + process.Close(); + } + } + [SuppressMessage("ReSharper", "MethodHasAsyncOverload")] // async runspace.OpenAsync is not as it seems - public static async Task RunPowershell(IStepLogger logger, bool raiseErrors, CancellationToken cancellationToken, string workingDirectory, string command, bool suppressOutput = false) { + public static async Task> RunPowershell(IStepLogger logger, CancellationToken cancellationToken, string workingDirectory, List commands, bool suppressOutput = false, bool raiseErrors = true, bool errorSilently = false) { using Runspace runspace = RunspaceFactory.CreateRunspace(); runspace.Open(); runspace.SessionStateProxy.Path.SetLocation(workingDirectory); - using PowerShell powerShell = PowerShell.Create(); - powerShell.Runspace = runspace; - powerShell.AddScript(command); + using PowerShell powerShell = PowerShell.Create(runspace); + foreach (string command in commands) { + powerShell.AddScript(command); + } void Log(object sender, DataAddedEventArgs eventArgs) { PSDataCollection streamObjectsReceived = sender as PSDataCollection; @@ -52,7 +98,9 @@ void Error(object sender, DataAddedEventArgs eventArgs) { LogPowershellResult(logger, result); } - logger.LogError(exception); + if (!errorSilently) { + logger.LogError(exception); + } } if (!suppressOutput) { @@ -60,6 +108,8 @@ void Error(object sender, DataAddedEventArgs eventArgs) { } runspace.Close(); + + return result; } private static Task> InvokeAsync(this PowerShell powerShell, CancellationToken cancellationToken) { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs index 44b53f36..4c15f1ec 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs @@ -40,7 +40,6 @@ public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cance await step.Setup(); await step.Process(); - await step.Teardown(); await step.Succeed(); } catch (OperationCanceledException) { await step.Cancel(); @@ -83,7 +82,6 @@ private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) { } else { await step.Setup(); await step.Process(); - await step.Teardown(); await step.Succeed(); } } catch (Exception exception) { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index 249a2c7b..2bcbde9e 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -50,6 +50,7 @@ private static List GetStepsForBuild() => new List { new ModpackBuildStep(BuildStepPrep.NAME), // new ModpackBuildStep(BuildStepClean.NAME), + new ModpackBuildStep(BuildStepSources.NAME), new ModpackBuildStep(BuildStepBuild.NAME), new ModpackBuildStep(BuildStepIntercept.NAME), new ModpackBuildStep(BuildStepExtensions.NAME), @@ -63,7 +64,8 @@ private static List GetStepsForBuild() => private static List GetStepsForRc() => new List { new ModpackBuildStep(BuildStepPrep.NAME), - new ModpackBuildStep(BuildStepClean.NAME), + // new ModpackBuildStep(BuildStepClean.NAME), + new ModpackBuildStep(BuildStepSources.NAME), new ModpackBuildStep(BuildStepBuild.NAME), new ModpackBuildStep(BuildStepIntercept.NAME), new ModpackBuildStep(BuildStepExtensions.NAME), diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs index dba7230d..ae195969 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs @@ -9,14 +9,14 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class BuildStep : IBuildStep { - protected const string COLOUR_BLUE = "#0c78ff"; + private const string COLOUR_BLUE = "#0c78ff"; protected ModpackBuild Build; private ModpackBuildStep buildStep; protected CancellationTokenSource CancellationTokenSource; + private Action logEvent; protected IStepLogger Logger; private Func updateCallback; - private Action logEvent; public void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func stepUpdateCallback, Action stepLogEvent, CancellationTokenSource newCancellationTokenSource) { Build = modpackBuild; @@ -49,12 +49,6 @@ public async Task Process() { await ProcessExecute(); } - public async Task Teardown() { - CancellationTokenSource.Token.ThrowIfCancellationRequested(); - Logger.Log("\nTeardown", COLOUR_BLUE); - await TeardownExecute(); - } - public async Task Succeed() { Logger.LogSuccess(); if (buildStep.buildResult != ModpackBuildResult.WARNING) { @@ -97,11 +91,6 @@ protected virtual Task ProcessExecute() { return Task.CompletedTask; } - protected virtual Task TeardownExecute() { - Logger.Log("---"); - return Task.CompletedTask; - } - protected bool ReleaseBuildGuard() { if (Build.environment != GameEnvironment.RELEASE) { Warning("\nBuild is not a release build, but the definition contains a release step.\nThis is a configuration error, please notify an admin."); @@ -139,6 +128,25 @@ internal string GetEnvironmentRepoName() => internal string GetBuildSourcesPath() => VariablesWrapper.VariablesDataService().GetSingle("BUILD_SOURCES_PATH").AsString(); + internal void SetEnvironmentVariable(string key, object value) { + if (Build.environmentVariables.ContainsKey(key)) { + Build.environmentVariables[key] = value; + } else { + Build.environmentVariables.Add(key, value); + } + + updateCallback(); + } + + internal T GetEnvironmentVariable(string key) { + if (Build.environmentVariables.ContainsKey(key)) { + object value = Build.environmentVariables[key]; + return (T) value; + } + + return default; + } + private async Task Stop() { buildStep.running = false; buildStep.finished = true; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs index 0f2d2cb2..d4123f34 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs @@ -1,4 +1,5 @@ -using System.Threading.Tasks; +using System.Collections.Generic; +using System.Threading.Tasks; using UKSF.Api.Services.Admin; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { @@ -11,7 +12,7 @@ protected override async Task ProcessExecute() { Logger.Log($"Building {repoName} repo"); string arma3SyncPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_ARMA3SYNC_PATH").AsString(); - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, arma3SyncPath, $"Java -jar .\\ArmA3Sync.jar -BUILD {repoName}"); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, arma3SyncPath, new List { $"Java -jar .\\ArmA3Sync.jar -BUILD {repoName}" }); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepExtensions.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepExtensions.cs index 6d3f5798..43c5db2e 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepExtensions.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepExtensions.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs index a524cfd0..44657957 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs @@ -32,7 +32,7 @@ protected override async Task SetupExecute() { Logger.LogSurround("Cleared keys directories"); Logger.LogSurround("\nCreating key..."); - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, keygenPath, $".\"{dsCreateKey}\" {keyName}"); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, keygenPath, new List { $".\"{dsCreateKey}\" {keyName}" }); Logger.Log($"Created {keyName}"); await CopyFiles(keygen, keys, new List { new FileInfo(Path.Join(keygenPath, $"{keyName}.bikey")) }); Logger.LogSurround("Created key"); @@ -76,7 +76,7 @@ await ParallelProcessFiles( files, 100, async file => { - await BuildProcessHelper.RunPowershell(Logger, true, CancellationTokenSource.Token, addonsPath, $".\"{dsSignFile}\" \"{privateKey}\" \"{file.FullName}\""); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, addonsPath, new List { $".\"{dsSignFile}\" \"{privateKey}\" \"{file.FullName}\"" }); Interlocked.Increment(ref signed); }, () => $"Signed {signed} of {files.Count} files", diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSources.cs new file mode 100644 index 00000000..7c7b0d55 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSources.cs @@ -0,0 +1,87 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Management.Automation; +using System.Threading.Tasks; +using UKSF.Api.Services.Admin; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { + [BuildStep(NAME)] + public class BuildStepSources : BuildStep { + public const string NAME = "Sources"; + private string gitPath; + + protected override async Task ProcessExecute() { + Logger.Log("Checking out latest sources"); + gitPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_GIT_PATH").AsString(); + + await CheckoutStaticSource("ACE", "ace", "uksfcustom"); + await CheckoutStaticSource("ACRE", "acre", "customrelease"); + await CheckoutStaticSource("UKSF F-35", "f35", "master"); + await CheckoutModpack(); + } + + private async Task CheckoutStaticSource(string name, string directoryName, string branchName) { + Logger.LogSurround($"\nChecking out latest {name}"); + string path = Path.Join(GetBuildSourcesPath(), directoryName); + DirectoryInfo directory = new DirectoryInfo(path); + if (!directory.Exists) { + throw new Exception($"{name} source directory does not exist. {name} should be cloned before running a build."); + } + + bool updated; + string releasePath = Path.Join(GetBuildSourcesPath(), directoryName, "release"); + DirectoryInfo release = new DirectoryInfo(releasePath); + + PSDataCollection results = await BuildProcessHelper.RunPowershell( + Logger, + CancellationTokenSource.Token, + path, + new List { GitCommand("fetch"), GitCommand($"checkout {branchName}"), GitCommand("rev-parse HEAD") }, + true, + false, + true + ); + string before = results.First().BaseObject.ToString(); + + results = await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, path, new List { GitCommand("pull"), GitCommand("rev-parse HEAD") }, true, false, true); + string after = results.First().BaseObject.ToString(); + + if (release.Exists) { + Logger.Log($"{before} vs {after}"); + updated = !string.Equals(before, after); + } else { + Logger.Log("No release directory, will build"); + updated = true; + } + + SetEnvironmentVariable($"{directoryName}_updated", updated); + Logger.LogSurround($"Checked out latest {name}{(updated ? "" : " (No Changes)")}"); + } + + private async Task CheckoutModpack() { + string referenceName = string.Equals(Build.commit.branch, "None") ? $"{Build.commit.after}" : $"latest {Build.commit.branch}"; + Logger.LogSurround($"\nChecking out {referenceName}"); + string modpackPath = Path.Join(GetBuildSourcesPath(), "modpack"); + DirectoryInfo modpack = new DirectoryInfo(modpackPath); + if (!modpack.Exists) { + throw new Exception("Modpack source directory does not exist. Modpack should be cloned before running a build."); + } + + await BuildProcessHelper.RunPowershell( + Logger, + CancellationTokenSource.Token, + modpackPath, + new List { GitCommand("reset --hard HEAD"), GitCommand("git clean -d -f"), GitCommand("fetch"), GitCommand($"checkout {Build.commit.after}"), GitCommand("pull") }, + true, + false, + true + ); + + Logger.LogSurround($"Checked out {referenceName}"); + } + + private string GitCommand(string command) => $".\"{gitPath}\" {command}"; + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs index 0f8854fe..69d285e0 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs @@ -5,7 +5,6 @@ using System.Threading; using System.Threading.Tasks; using Humanizer; -using MoreLinq; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class FileBuildStep : BuildStep { diff --git a/UKSF.Api.sln b/UKSF.Api.sln index a93fd98d..79630841 100644 --- a/UKSF.Api.sln +++ b/UKSF.Api.sln @@ -30,130 +30,88 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Common", "UKSF.Common\ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Debug|Any CPU.Build.0 = Debug|Any CPU {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Debug|x64.ActiveCfg = Debug|Any CPU {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Debug|x64.Build.0 = Debug|Any CPU {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Debug|x86.ActiveCfg = Debug|Any CPU {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Debug|x86.Build.0 = Debug|Any CPU - {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Release|Any CPU.Build.0 = Release|Any CPU {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Release|x64.ActiveCfg = Release|Any CPU {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Release|x64.Build.0 = Release|Any CPU {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Release|x86.ActiveCfg = Release|Any CPU {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Release|x86.Build.0 = Release|Any CPU - {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Debug|Any CPU.Build.0 = Debug|Any CPU {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Debug|x64.ActiveCfg = Debug|Any CPU {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Debug|x64.Build.0 = Debug|Any CPU {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Debug|x86.ActiveCfg = Debug|Any CPU {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Debug|x86.Build.0 = Debug|Any CPU - {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Release|Any CPU.Build.0 = Release|Any CPU {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Release|x64.ActiveCfg = Release|Any CPU {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Release|x64.Build.0 = Release|Any CPU {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Release|x86.ActiveCfg = Release|Any CPU {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Release|x86.Build.0 = Release|Any CPU - {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Debug|Any CPU.Build.0 = Debug|Any CPU {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Debug|x64.ActiveCfg = Debug|Any CPU {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Debug|x64.Build.0 = Debug|Any CPU {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Debug|x86.ActiveCfg = Debug|Any CPU {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Debug|x86.Build.0 = Debug|Any CPU - {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Release|Any CPU.Build.0 = Release|Any CPU {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Release|x64.ActiveCfg = Release|Any CPU {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Release|x64.Build.0 = Release|Any CPU {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Release|x86.ActiveCfg = Release|Any CPU {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Release|x86.Build.0 = Release|Any CPU - {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|Any CPU.Build.0 = Debug|Any CPU {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|x64.ActiveCfg = Debug|Any CPU {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|x64.Build.0 = Debug|Any CPU {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|x86.ActiveCfg = Debug|Any CPU {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|x86.Build.0 = Debug|Any CPU - {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|Any CPU.Build.0 = Release|Any CPU {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x64.ActiveCfg = Release|Any CPU {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x64.Build.0 = Release|Any CPU {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x86.ActiveCfg = Release|Any CPU {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x86.Build.0 = Release|Any CPU - {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|Any CPU.Build.0 = Debug|Any CPU {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|x64.ActiveCfg = Debug|Any CPU {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|x64.Build.0 = Debug|Any CPU {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|x86.ActiveCfg = Debug|Any CPU {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|x86.Build.0 = Debug|Any CPU - {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|Any CPU.Build.0 = Release|Any CPU {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x64.ActiveCfg = Release|Any CPU {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x64.Build.0 = Release|Any CPU {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x86.ActiveCfg = Release|Any CPU {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x86.Build.0 = Release|Any CPU - {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|Any CPU.Build.0 = Debug|Any CPU {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|x64.ActiveCfg = Debug|Any CPU {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|x64.Build.0 = Debug|Any CPU {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|x86.ActiveCfg = Debug|Any CPU {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|x86.Build.0 = Debug|Any CPU - {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|Any CPU.Build.0 = Release|Any CPU {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x64.ActiveCfg = Release|Any CPU {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x64.Build.0 = Release|Any CPU {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x86.ActiveCfg = Release|Any CPU {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x86.Build.0 = Release|Any CPU - {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|Any CPU.Build.0 = Debug|Any CPU {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|x64.ActiveCfg = Debug|Any CPU {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|x64.Build.0 = Debug|Any CPU {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|x86.ActiveCfg = Debug|Any CPU {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|x86.Build.0 = Debug|Any CPU - {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|Any CPU.Build.0 = Release|Any CPU {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x64.ActiveCfg = Release|Any CPU {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x64.Build.0 = Release|Any CPU {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x86.ActiveCfg = Release|Any CPU {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x86.Build.0 = Release|Any CPU - {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|Any CPU.Build.0 = Debug|Any CPU {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|x64.ActiveCfg = Debug|Any CPU {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|x64.Build.0 = Debug|Any CPU {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|x86.ActiveCfg = Debug|Any CPU {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|x86.Build.0 = Debug|Any CPU - {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|Any CPU.Build.0 = Release|Any CPU {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|x64.ActiveCfg = Release|Any CPU {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|x64.Build.0 = Release|Any CPU {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|x86.ActiveCfg = Release|Any CPU {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Release|x86.Build.0 = Release|Any CPU - {09946FE7-A65D-483E-8B5A-ADE729760375}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09946FE7-A65D-483E-8B5A-ADE729760375}.Debug|Any CPU.Build.0 = Debug|Any CPU {09946FE7-A65D-483E-8B5A-ADE729760375}.Debug|x64.ActiveCfg = Debug|Any CPU {09946FE7-A65D-483E-8B5A-ADE729760375}.Debug|x64.Build.0 = Debug|Any CPU {09946FE7-A65D-483E-8B5A-ADE729760375}.Debug|x86.ActiveCfg = Debug|Any CPU {09946FE7-A65D-483E-8B5A-ADE729760375}.Debug|x86.Build.0 = Debug|Any CPU - {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|Any CPU.Build.0 = Release|Any CPU {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|x64.ActiveCfg = Release|Any CPU {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|x64.Build.0 = Release|Any CPU {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|x86.ActiveCfg = Release|Any CPU {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|x86.Build.0 = Release|Any CPU - {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|Any CPU.Build.0 = Debug|Any CPU {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|x64.ActiveCfg = Debug|Any CPU {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|x64.Build.0 = Debug|Any CPU {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|x86.ActiveCfg = Debug|Any CPU {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|x86.Build.0 = Debug|Any CPU - {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|Any CPU.Build.0 = Release|Any CPU {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x64.ActiveCfg = Release|Any CPU {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x64.Build.0 = Release|Any CPU {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x86.ActiveCfg = Release|Any CPU diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs index cc495352..8b817510 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -20,13 +20,13 @@ public ModpackController(IModpackService modpackService, IGithubService githubSe [HttpGet("releases"), Authorize, Roles(RoleDefinitions.MEMBER)] public IActionResult GetReleases() => Ok(modpackService.GetReleases()); - [HttpGet("rcs"), Authorize, Roles(RoleDefinitions.TESTER, RoleDefinitions.SERVERS)] + [HttpGet("rcs"), Authorize, Roles(RoleDefinitions.MEMBER)] public IActionResult GetReleaseCandidates() => Ok(modpackService.GetRcBuilds()); - [HttpGet("builds"), Authorize, Roles(RoleDefinitions.TESTER, RoleDefinitions.SERVERS)] + [HttpGet("builds"), Authorize, Roles(RoleDefinitions.MEMBER)] public IActionResult GetBuilds() => Ok(modpackService.GetDevBuilds()); - [HttpGet("builds/{id}"), Authorize, Roles(RoleDefinitions.TESTER, RoleDefinitions.SERVERS)] + [HttpGet("builds/{id}"), Authorize, Roles(RoleDefinitions.MEMBER)] public IActionResult GetBuild(string id) { ModpackBuild build = modpackService.GetBuild(id); return build == null ? (IActionResult) BadRequest("Build does not exist") : Ok(build); From ba49f5432c3558f6cf83843c384715555cf33c13 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 29 Jul 2020 12:23:24 +0100 Subject: [PATCH 204/369] Added mod build steps. Further tweaks and fixes --- UKSF.Api.Data/Modpack/BuildsDataService.cs | 6 +- .../Handlers/BuildsEventHandler.cs | 13 +++- UKSF.Api.Interfaces/Hubs/IModpackClient.cs | 1 + .../Modpack/BuildProcess/IStepLogger.cs | 1 + .../Modpack/BuildProcess/Steps/IBuildStep.cs | 3 +- UKSF.Api.Interfaces/Modpack/IBuildsService.cs | 2 + UKSF.Api.Models/Events/DataEventModel.cs | 3 +- .../Integrations/Github/GithubService.cs | 30 +++++++-- .../BuildProcess/BuildProcessHelper.cs | 34 +++++++--- .../BuildProcess/BuildProcessorService.cs | 15 ++++- .../Modpack/BuildProcess/BuildStepService.cs | 19 ++++-- .../Modpack/BuildProcess/StepLogger.cs | 20 ++++-- .../Modpack/BuildProcess/Steps/BuildStep.cs | 30 ++++----- .../Steps/BuildSteps/BuildStepExtensions.cs | 66 +++++++++++++++++++ .../BuildStepIntercept.cs | 2 +- .../{Common => BuildSteps}/BuildStepKeys.cs | 6 +- .../Steps/BuildSteps/BuildStepPrep.cs | 17 +++++ .../BuildStepSignDependencies.cs | 11 ++-- .../BuildStepSources.cs | 44 +++++++------ .../BuildSteps/Mods/BuildStepBuildAce.cs | 45 +++++++++++++ .../BuildSteps/Mods/BuildStepBuildAcre.cs | 36 ++++++++++ .../BuildSteps/Mods/BuildStepBuildF35.cs | 32 +++++++++ .../BuildSteps/Mods/BuildStepBuildModpack.cs | 27 ++++++++ .../Steps/Common/BuildStepBuildRepo.cs | 2 +- .../Steps/Common/BuildStepClean.cs | 4 +- .../Steps/Common/BuildStepExtensions.cs | 43 ------------ .../BuildProcess/Steps/FileBuildStep.cs | 10 +-- .../BuildProcess/Steps/ModBuildStep.cs | 25 +++++++ .../Steps/ReleaseSteps/BuildStepBackup.cs | 27 ++++++++ .../Steps/ReleaseSteps/BuildStepMerge.cs | 29 ++++++++ .../Steps/ReleaseSteps/BuildStepPublish.cs | 23 +++++++ .../ReleaseSteps/BuildStepReleaseKeys.cs | 29 ++++++++ .../Steps/ReleaseSteps/BuildStepRestore.cs | 28 ++++++++ UKSF.Api.Services/Modpack/BuildsService.cs | 4 ++ ...{PruneLogsAction.cs => PruneDataAction.cs} | 15 +++-- UKSF.Api.Services/Utility/SchedulerService.cs | 4 +- .../RegisterScheduledActionServices.cs | 2 +- .../Integrations/GithubController.cs | 2 +- .../Controllers/Modpack/ModpackController.cs | 14 ++++ .../ScheduledActions/PruneLogsActionTests.cs | 4 +- 40 files changed, 588 insertions(+), 140 deletions(-) create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs rename UKSF.Api.Services/Modpack/BuildProcess/Steps/{Common => BuildSteps}/BuildStepIntercept.cs (92%) rename UKSF.Api.Services/Modpack/BuildProcess/Steps/{Common => BuildSteps}/BuildStepKeys.cs (89%) create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs rename UKSF.Api.Services/Modpack/BuildProcess/Steps/{Common => BuildSteps}/BuildStepSignDependencies.cs (92%) rename UKSF.Api.Services/Modpack/BuildProcess/Steps/{Common => BuildSteps}/BuildStepSources.cs (58%) create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs delete mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepExtensions.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs rename UKSF.Api.Services/Utility/ScheduledActions/{PruneLogsAction.cs => PruneDataAction.cs} (64%) diff --git a/UKSF.Api.Data/Modpack/BuildsDataService.cs b/UKSF.Api.Data/Modpack/BuildsDataService.cs index 6f9742ca..efc4c282 100644 --- a/UKSF.Api.Data/Modpack/BuildsDataService.cs +++ b/UKSF.Api.Data/Modpack/BuildsDataService.cs @@ -32,7 +32,11 @@ public async Task Update(ModpackBuild build, UpdateDefinition upda } public void LogEvent(ModpackBuild build, ModpackBuildStep buildStep) { - CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, buildStep)); + CachedDataEvent( + buildStep.logs.Count > 300 + ? EventModelFactory.CreateDataEvent(DataEventType.SPECIAL, build.id, buildStep.index) + : EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, buildStep) + ); } } } diff --git a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs index f35e7e28..88460029 100644 --- a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs +++ b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs @@ -35,7 +35,10 @@ private async Task HandleBuildEvent(DataEventModel x) { case DataEventType.UPDATE: await UpdatedEvent(x.id, x.data); break; - case DataEventType.DELETE: break; + case DataEventType.DELETE: + await SpecialEvent(x.id, x.data); + break; + case DataEventType.SPECIAL: break; default: throw new ArgumentOutOfRangeException(); } } @@ -63,5 +66,13 @@ private async Task UpdatedEvent(string id, object data) { break; } } + + private async Task SpecialEvent(string id, object data) { + switch (data) { + case int index: + await hub.Clients.Group(id).ReceiveLargeBuildStep(index); + break; + } + } } } diff --git a/UKSF.Api.Interfaces/Hubs/IModpackClient.cs b/UKSF.Api.Interfaces/Hubs/IModpackClient.cs index 4a869b76..0c916374 100644 --- a/UKSF.Api.Interfaces/Hubs/IModpackClient.cs +++ b/UKSF.Api.Interfaces/Hubs/IModpackClient.cs @@ -6,5 +6,6 @@ public interface IModpackClient { Task ReceiveReleaseCandidateBuild(ModpackBuild build); Task ReceiveBuild(ModpackBuild build); Task ReceiveBuildStep(ModpackBuildStep step); + Task ReceiveLargeBuildStep(int index); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs index 42a4f56f..46711cff 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs @@ -8,6 +8,7 @@ public interface IStepLogger { void LogSkipped(); void LogWarning(string message); void LogError(Exception exception); + void LogError(string message); void LogSurround(string log); void LogInline(string log); void Log(string log, string colour = ""); diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs index a7497cd9..f8031fb0 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs @@ -1,11 +1,12 @@ using System; using System.Threading; using System.Threading.Tasks; +using MongoDB.Driver; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Interfaces.Modpack.BuildProcess.Steps { public interface IBuildStep { - void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func updateCallback, Action logEvent, CancellationTokenSource cancellationTokenSource); + void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func, Task> buildUpdateCallback, Func stepUpdateCallback, Action stepLogEvent, CancellationTokenSource cancellationTokenSource); Task Start(); bool CheckGuards(); Task Setup(); diff --git a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs index 4c8a3953..0949e54b 100644 --- a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs +++ b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; +using MongoDB.Driver; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; @@ -10,6 +11,7 @@ public interface IBuildsService : IDataBackedService { List GetRcBuilds(); ModpackBuild GetLatestDevBuild(); ModpackBuild GetLatestRcBuild(string version); + Task UpdateBuild(ModpackBuild build, UpdateDefinition updateDefinition); Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep); void BuildStepLogEvent(ModpackBuild build, ModpackBuildStep buildStep); Task CreateDevBuild(string version, GithubCommit commit); diff --git a/UKSF.Api.Models/Events/DataEventModel.cs b/UKSF.Api.Models/Events/DataEventModel.cs index c3ea60c8..d0f3b41d 100644 --- a/UKSF.Api.Models/Events/DataEventModel.cs +++ b/UKSF.Api.Models/Events/DataEventModel.cs @@ -2,7 +2,8 @@ namespace UKSF.Api.Models.Events { public enum DataEventType { ADD, UPDATE, - DELETE + DELETE, + SPECIAL } // ReSharper disable once UnusedTypeParameter diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 7a259a37..5d7968b0 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Security.Cryptography; @@ -17,7 +18,7 @@ namespace UKSF.Api.Services.Integrations.Github { public class GithubService : IGithubService { // TODO: Use variables for some of these private const string REPO_ORG = "uksf"; - private const string REPO_NAME = "BuildTest"; // "modpack"; + private const string REPO_NAME = "modpack"; // "BuildTest"; private const string VERSION_FILE = "addons/main/script_version.hpp"; private const int APP_ID = 53456; private const long APP_INSTALLATION = 6681715; @@ -147,11 +148,30 @@ await client.Repository.Release.Create( public async Task> GetBranches() { GitHubClient client = await GetAuthenticatedClient(); IReadOnlyList branches = await client.Repository.Branch.GetAll(REPO_ORG, REPO_NAME); - List validBranches = new List(); - foreach (Branch branch in branches) { - if (await IsReferenceValid(branch.Name)) { - validBranches.Add(branch.Name); + ConcurrentBag validBranchesBag = new ConcurrentBag(); + IEnumerable task = branches.Select( + async branch => { + if (await IsReferenceValid(branch.Name)) { + validBranchesBag.Add(branch.Name); + } } + ); + await Task.WhenAll(task); + + List validBranches = validBranchesBag.OrderBy(x => x).ToList(); + if (validBranches.Contains("release")) { + validBranches.Remove("release"); + validBranches.Insert(0, "release"); + } + + if (validBranches.Contains("master")) { + validBranches.Remove("master"); + validBranches.Insert(0, "master"); + } + + if (validBranches.Contains("dev")) { + validBranches.Remove("dev"); + validBranches.Insert(0, "dev"); } return validBranches; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index 6560b549..8ed2afc2 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -2,11 +2,13 @@ using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using System.Linq; using System.Management.Automation; using System.Management.Automation.Runspaces; using System.Threading; using System.Threading.Tasks; using UKSF.Api.Interfaces.Modpack.BuildProcess; +using UKSF.Common; namespace UKSF.Api.Services.Modpack.BuildProcess { public static class BuildProcessHelper { @@ -55,7 +57,16 @@ public static string RunProcess(IStepLogger logger, bool raiseErrors, Cancellati } [SuppressMessage("ReSharper", "MethodHasAsyncOverload")] // async runspace.OpenAsync is not as it seems - public static async Task> RunPowershell(IStepLogger logger, CancellationToken cancellationToken, string workingDirectory, List commands, bool suppressOutput = false, bool raiseErrors = true, bool errorSilently = false) { + public static async Task> RunPowershell( + IStepLogger logger, + CancellationToken cancellationToken, + string workingDirectory, + List commands, + bool suppressOutput = false, + bool raiseErrors = true, + bool errorSilently = false, + List errorExclusions = null + ) { using Runspace runspace = RunspaceFactory.CreateRunspace(); runspace.Open(); runspace.SessionStateProxy.Path.SetLocation(workingDirectory); @@ -71,12 +82,12 @@ void Log(object sender, DataAddedEventArgs eventArgs) { logger.Log(currentStreamRecord?.MessageData.ToString()); } - Exception exception = null; + List exceptions = new List(); void Error(object sender, DataAddedEventArgs eventArgs) { PSDataCollection streamObjectsReceived = sender as PSDataCollection; ErrorRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; - exception = currentStreamRecord?.Exception; + exceptions.Add(currentStreamRecord?.Exception); } if (!suppressOutput) { @@ -87,11 +98,15 @@ void Error(object sender, DataAddedEventArgs eventArgs) { powerShell.Streams.Error.DataAdded += Error; PSDataCollection result = await powerShell.InvokeAsync(cancellationToken); - if (exception != null) { + if (errorExclusions != null) { + exceptions = exceptions.Where(x => errorExclusions.All(y => !x.Message.ContainsIgnoreCase(y))).ToList(); + } + + if (exceptions.Count > 0) { if (raiseErrors) { LogPowershellResult(logger, result); runspace.Close(); - throw exception; + throw exceptions.First(); } if (!suppressOutput) { @@ -99,7 +114,8 @@ void Error(object sender, DataAddedEventArgs eventArgs) { } if (!errorSilently) { - logger.LogError(exception); + IEnumerable exceptionStrings = exceptions.Select(x => x.ToString()); + logger.LogError(string.Join("\n\n", exceptionStrings)); } } @@ -108,7 +124,6 @@ void Error(object sender, DataAddedEventArgs eventArgs) { } runspace.Close(); - return result; } @@ -130,9 +145,8 @@ private static Task> InvokeAsync(this PowerShell powe } private static void LogPowershellResult(IStepLogger logger, IEnumerable result) { - foreach (PSObject psObject in result) { - logger.Log(psObject.BaseObject.ToString()); - } + IEnumerable resultStrings = result.Select(x => x.BaseObject.ToString()); + logger.Log(string.Join("\n", resultStrings)); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs index 4c15f1ec..218a91c8 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs @@ -23,14 +23,22 @@ public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cance await buildsService.SetBuildRunning(build); foreach (ModpackBuildStep buildStep in build.steps) { + IBuildStep step = buildStepService.ResolveBuildStep(buildStep.name); + step.Init( + build, + buildStep, + async updateDefinition => await buildsService.UpdateBuild(build, updateDefinition), + async () => await buildsService.UpdateBuildStep(build, buildStep), + () => buildsService.BuildStepLogEvent(build, buildStep), + cancellationTokenSource + ); + if (cancellationTokenSource.IsCancellationRequested) { + await step.Cancel(); await buildsService.CancelBuild(build); return; } - IBuildStep step = buildStepService.ResolveBuildStep(buildStep.name); - step.Init(build, buildStep, async () => await buildsService.UpdateBuildStep(build, buildStep), () => buildsService.BuildStepLogEvent(build, buildStep), cancellationTokenSource); - try { await step.Start(); if (!step.CheckGuards()) { @@ -68,6 +76,7 @@ private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) { step.Init( build, restoreStep, + async updateDefinition => await buildsService.UpdateBuild(build, updateDefinition), async () => await buildsService.UpdateBuildStep(build, restoreStep), () => buildsService.BuildStepLogEvent(build, restoreStep), new CancellationTokenSource() diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index 2bcbde9e..48f2f48c 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -6,7 +6,8 @@ using UKSF.Api.Models.Game; using UKSF.Api.Models.Modpack; using UKSF.Api.Services.Modpack.BuildProcess.Steps; -using UKSF.Api.Services.Modpack.BuildProcess.Steps.Build; +using UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps; +using UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps.Mods; using UKSF.Api.Services.Modpack.BuildProcess.Steps.Common; using UKSF.Api.Services.Modpack.BuildProcess.Steps.Release; @@ -49,30 +50,38 @@ public IBuildStep ResolveBuildStep(string buildStepName) { private static List GetStepsForBuild() => new List { new ModpackBuildStep(BuildStepPrep.NAME), - // new ModpackBuildStep(BuildStepClean.NAME), + new ModpackBuildStep(BuildStepClean.NAME), new ModpackBuildStep(BuildStepSources.NAME), - new ModpackBuildStep(BuildStepBuild.NAME), + new ModpackBuildStep(BuildStepBuildAce.NAME), + new ModpackBuildStep(BuildStepBuildAcre.NAME), + new ModpackBuildStep(BuildStepBuildF35.NAME), + new ModpackBuildStep(BuildStepBuildModpack.NAME), new ModpackBuildStep(BuildStepIntercept.NAME), new ModpackBuildStep(BuildStepExtensions.NAME), new ModpackBuildStep(BuildStepSignDependencies.NAME), new ModpackBuildStep(BuildStepDeploy.NAME), new ModpackBuildStep(BuildStepKeys.NAME), new ModpackBuildStep(BuildStepCbaSettings.NAME), + new ModpackBuildStep(BuildStepBuildRepo.NAME), new ModpackBuildStep(BuildStepNotify.NAME) }; private static List GetStepsForRc() => new List { new ModpackBuildStep(BuildStepPrep.NAME), - // new ModpackBuildStep(BuildStepClean.NAME), + new ModpackBuildStep(BuildStepClean.NAME), new ModpackBuildStep(BuildStepSources.NAME), - new ModpackBuildStep(BuildStepBuild.NAME), + new ModpackBuildStep(BuildStepBuildAce.NAME), + new ModpackBuildStep(BuildStepBuildAcre.NAME), + new ModpackBuildStep(BuildStepBuildF35.NAME), + new ModpackBuildStep(BuildStepBuildModpack.NAME), new ModpackBuildStep(BuildStepIntercept.NAME), new ModpackBuildStep(BuildStepExtensions.NAME), new ModpackBuildStep(BuildStepSignDependencies.NAME), new ModpackBuildStep(BuildStepDeploy.NAME), new ModpackBuildStep(BuildStepKeys.NAME), new ModpackBuildStep(BuildStepCbaSettings.NAME), + new ModpackBuildStep(BuildStepBuildRepo.NAME), new ModpackBuildStep(BuildStepNotify.NAME) }; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs index 44a34ed3..89e28bad 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs @@ -38,7 +38,7 @@ public void LogCancelled() { } public void LogSkipped() { - LogLines($"\nSkipped: {buildStep.name}", "orangered"); + LogLines($"\nSkipped: {buildStep.name}", "gray"); FlushLogsInstantly(); } @@ -52,6 +52,11 @@ public void LogError(Exception exception) { FlushLogsInstantly(); } + public void LogError(string message) { + LogLines($"Error\n{message}\n\nFailed: {buildStep.name}", "red"); + FlushLogsInstantly(); + } + public void LogSurround(string log) { LogLines(log, "cadetblue"); } @@ -61,6 +66,7 @@ public void LogInline(string log) { buildStep.logs[^1] = new ModpackBuildStepLogItem { text = log }; } + logEvent(); IncrementCountAndFlushLogs(); } @@ -79,11 +85,13 @@ public void LogInlineInstant(string log) { } public void FlushLogs(bool force = false, bool synchronous = false) { - if (force || logCount > LOG_COUNT_MAX) { - logCount = 0; - Task callback = updateCallback(); - if (synchronous) { - callback.Wait(); + lock (lockObject) { + if (force || logCount > LOG_COUNT_MAX) { + logCount = 0; + Task callback = updateCallback(); + if (synchronous) { + callback.Wait(); + } } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs index ae195969..cbc21834 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs @@ -1,6 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; +using MongoDB.Driver; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; using UKSF.Api.Models.Game; @@ -14,17 +15,19 @@ public class BuildStep : IBuildStep { protected ModpackBuild Build; private ModpackBuildStep buildStep; protected CancellationTokenSource CancellationTokenSource; - private Action logEvent; protected IStepLogger Logger; - private Func updateCallback; + private Func, Task> updateBuildCallback; + private Func updateStepCallback; + private Action logEvent; - public void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func stepUpdateCallback, Action stepLogEvent, CancellationTokenSource newCancellationTokenSource) { + public void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func, Task> buildUpdateCallback, Func stepUpdateCallback, Action stepLogEvent, CancellationTokenSource newCancellationTokenSource) { Build = modpackBuild; buildStep = modpackBuildStep; - updateCallback = stepUpdateCallback; + updateBuildCallback = buildUpdateCallback; + updateStepCallback = stepUpdateCallback; logEvent = stepLogEvent; CancellationTokenSource = newCancellationTokenSource; - Logger = new StepLogger(buildStep, async () => await updateCallback(), logEvent); + Logger = new StepLogger(buildStep, async () => await updateStepCallback(), logEvent); } public async Task Start() { @@ -32,7 +35,7 @@ public async Task Start() { buildStep.running = true; buildStep.startTime = DateTime.Now; Logger.LogStart(); - await updateCallback(); + await updateStepCallback(); } public virtual bool CheckGuards() => true; @@ -91,15 +94,6 @@ protected virtual Task ProcessExecute() { return Task.CompletedTask; } - protected bool ReleaseBuildGuard() { - if (Build.environment != GameEnvironment.RELEASE) { - Warning("\nBuild is not a release build, but the definition contains a release step.\nThis is a configuration error, please notify an admin."); - return false; - } - - return true; - } - internal string GetBuildEnvironmentPath() => GetEnvironmentPath(Build.environment); internal static string GetEnvironmentPath(GameEnvironment environment) => @@ -126,7 +120,7 @@ internal string GetEnvironmentRepoName() => _ => throw new ArgumentException("Invalid build environment") }; - internal string GetBuildSourcesPath() => VariablesWrapper.VariablesDataService().GetSingle("BUILD_SOURCES_PATH").AsString(); + internal static string GetBuildSourcesPath() => VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_SOURCES").AsString(); internal void SetEnvironmentVariable(string key, object value) { if (Build.environmentVariables.ContainsKey(key)) { @@ -135,7 +129,7 @@ internal void SetEnvironmentVariable(string key, object value) { Build.environmentVariables.Add(key, value); } - updateCallback(); + updateBuildCallback(Builders.Update.Set(x => x.environmentVariables, Build.environmentVariables)); } internal T GetEnvironmentVariable(string key) { @@ -151,7 +145,7 @@ private async Task Stop() { buildStep.running = false; buildStep.finished = true; buildStep.endTime = DateTime.Now; - await updateCallback(); + await updateStepCallback(); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs new file mode 100644 index 00000000..ab856578 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs @@ -0,0 +1,66 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using UKSF.Api.Services.Admin; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { + [BuildStep(NAME)] + public class BuildStepExtensions : FileBuildStep { + public const string NAME = "Extensions"; + + protected override async Task ProcessExecute() { + string uksfPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf", "intercept"); + string interceptPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@intercept"); + DirectoryInfo uksf = new DirectoryInfo(uksfPath); + DirectoryInfo intercept = new DirectoryInfo(interceptPath); + + Logger.LogSurround("\nSigning extensions..."); + List files = GetDirectoryContents(uksf, "*.dll").Concat(GetDirectoryContents(intercept, "*.dll")).ToList(); + await SignExtensions(files); + Logger.LogSurround("Signed extensions"); + } + + private async Task SignExtensions(IReadOnlyCollection files) { + string certPath = Path.Join(VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_CERTS").AsString(), "UKSFCert.pfx"); + string signTool = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_SIGNTOOL").AsString(); + int signed = 0; + int total = files.Count; + await ParallelProcessFiles( + files, + 10, + async file => { + await BuildProcessHelper.RunPowershell( + Logger, + CancellationTokenSource.Token, + file.DirectoryName, + new List { $".\"{signTool}\" sign /f \"{certPath}\" \"{file.FullName}\"" }, + true + ); + Interlocked.Increment(ref signed); + }, + () => $"Signed {signed} of {total} extensions", + "Failed to sign extension", + true + ); + } + + // private async Task SignExtensions(IReadOnlyCollection files) { + // string thumbprint = VariablesWrapper.VariablesDataService().GetSingle("BUILD_CERTIFICATE_THUMBPRINT").AsString(); + // int signed = 0; + // await ParallelProcessFiles( + // files, + // 10, + // file => { + // CertificateUtilities.SignWithThumbprint(file.FullName, thumbprint); + // Interlocked.Increment(ref signed); + // return Task.CompletedTask; + // }, + // () => $"Signed {signed} of {files.Count} extensions", + // "Failed to sign extension", + // true + // ); + // } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepIntercept.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs similarity index 92% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepIntercept.cs rename to UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs index aa9ec9cc..4df84b64 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepIntercept.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs @@ -1,7 +1,7 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] public class BuildStepIntercept : FileBuildStep { public const string NAME = "Intercept"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepKeys.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs similarity index 89% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepKeys.cs rename to UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs index 91eb680e..03b4bee7 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepKeys.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs @@ -2,16 +2,16 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] public class BuildStepKeys : FileBuildStep { public const string NAME = "Keys"; protected override async Task SetupExecute() { - Logger.Log("Wiping server keys folder"); + Logger.LogSurround("\nWiping server keys folder"); string keysPath = Path.Join(GetBuildEnvironmentPath(), "Keys"); await DeleteDirectoryContents(keysPath); - Logger.Log("Server keys folder wiped"); + Logger.LogSurround("Server keys folder wiped"); } protected override async Task ProcessExecute() { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs new file mode 100644 index 00000000..d4d9f860 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using UKSF.Api.Services.Admin; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { + [BuildStep(NAME)] + public class BuildStepPrep : BuildStep { + public const string NAME = "Prep"; + + protected override async Task ProcessExecute() { + Logger.Log("Mounting build environment"); + + string projectsPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_PROJECTS").AsString(); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "C:/", new List { $"subst P: \"{projectsPath}\"", "subst" }); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs similarity index 92% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs rename to UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs index 44657957..dc87096e 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSignDependencies.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs @@ -6,7 +6,7 @@ using UKSF.Api.Models.Game; using UKSF.Api.Services.Admin; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] public class BuildStepSignDependencies : FileBuildStep { public const string NAME = "Signatures"; @@ -15,8 +15,8 @@ public class BuildStepSignDependencies : FileBuildStep { private string keyName; protected override async Task SetupExecute() { - dsSignFile = Path.Join(VariablesWrapper.VariablesDataService().GetSingle("BUILD_DSSIGN_PATH").AsString(), "DSSignFile.exe"); - dsCreateKey = Path.Join(VariablesWrapper.VariablesDataService().GetSingle("BUILD_DSSIGN_PATH").AsString(), "DSCreateKey.exe"); + dsSignFile = Path.Join(VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_DSSIGN").AsString(), "DSSignFile.exe"); + dsCreateKey = Path.Join(VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_DSSIGN").AsString(), "DSCreateKey.exe"); keyName = GetKeyname(); string keygenPath = Path.Join(GetBuildEnvironmentPath(), "PrivateKeys"); @@ -72,14 +72,15 @@ private string GetKeyname() { private async Task SignFiles(string keygenPath, string addonsPath, IReadOnlyCollection files) { string privateKey = Path.Join(keygenPath, $"{keyName}.biprivatekey"); int signed = 0; + int total = files.Count; await ParallelProcessFiles( files, - 100, + 50, async file => { await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, addonsPath, new List { $".\"{dsSignFile}\" \"{privateKey}\" \"{file.FullName}\"" }); Interlocked.Increment(ref signed); }, - () => $"Signed {signed} of {files.Count} files", + () => $"Signed {signed} of {total} files", "Failed to sign file" ); } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs similarity index 58% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSources.cs rename to UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 7c7b0d55..66637ceb 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using UKSF.Api.Services.Admin; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] public class BuildStepSources : BuildStep { public const string NAME = "Sources"; @@ -14,31 +14,33 @@ public class BuildStepSources : BuildStep { protected override async Task ProcessExecute() { Logger.Log("Checking out latest sources"); - gitPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_GIT_PATH").AsString(); + gitPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_GIT").AsString(); - await CheckoutStaticSource("ACE", "ace", "uksfcustom"); - await CheckoutStaticSource("ACRE", "acre", "customrelease"); - await CheckoutStaticSource("UKSF F-35", "f35", "master"); + await CheckoutStaticSource("ACE", "ace", "@ace", "uksfcustom"); + await CheckoutStaticSource("ACRE", "acre", "@acre2", "customrelease"); + await CheckoutStaticSource("UKSF F-35", "f35", "@uksf_f35", "master"); await CheckoutModpack(); } - private async Task CheckoutStaticSource(string name, string directoryName, string branchName) { - Logger.LogSurround($"\nChecking out latest {name}"); - string path = Path.Join(GetBuildSourcesPath(), directoryName); + private async Task CheckoutStaticSource(string displayName, string modName, string releaseName, string branchName) { + Logger.LogSurround($"\nChecking out latest {displayName}..."); + string path = Path.Join(GetBuildSourcesPath(), modName); DirectoryInfo directory = new DirectoryInfo(path); if (!directory.Exists) { - throw new Exception($"{name} source directory does not exist. {name} should be cloned before running a build."); + throw new Exception($"{displayName} source directory does not exist. {displayName} should be cloned before running a build."); } bool updated; - string releasePath = Path.Join(GetBuildSourcesPath(), directoryName, "release"); + string releasePath = Path.Join(GetBuildSourcesPath(), modName, "release", releaseName); + string repoPath = Path.Join(GetBuildEnvironmentPath(), "Repo", releaseName); DirectoryInfo release = new DirectoryInfo(releasePath); + DirectoryInfo repo = new DirectoryInfo(repoPath); PSDataCollection results = await BuildProcessHelper.RunPowershell( Logger, CancellationTokenSource.Token, path, - new List { GitCommand("fetch"), GitCommand($"checkout {branchName}"), GitCommand("rev-parse HEAD") }, + new List { GitCommand("reset --hard HEAD"), GitCommand("git clean -d -f"), GitCommand("fetch"), GitCommand($"checkout {branchName}"), GitCommand("rev-parse HEAD") }, true, false, true @@ -48,38 +50,40 @@ private async Task CheckoutStaticSource(string name, string directoryName, strin results = await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, path, new List { GitCommand("pull"), GitCommand("rev-parse HEAD") }, true, false, true); string after = results.First().BaseObject.ToString(); - if (release.Exists) { - Logger.Log($"{before} vs {after}"); + if (release.Exists && repo.Exists) { + Logger.Log($"{before?.Substring(0, 7)} vs {after?.Substring(0, 7)}"); updated = !string.Equals(before, after); } else { - Logger.Log("No release directory, will build"); + Logger.Log("No release or repo directory, will build"); updated = true; } - SetEnvironmentVariable($"{directoryName}_updated", updated); - Logger.LogSurround($"Checked out latest {name}{(updated ? "" : " (No Changes)")}"); + SetEnvironmentVariable($"{modName}_updated", updated); + Logger.LogSurround($"Checked out latest {displayName}{(updated ? "" : " (No Changes)")}"); } private async Task CheckoutModpack() { - string referenceName = string.Equals(Build.commit.branch, "None") ? $"{Build.commit.after}" : $"latest {Build.commit.branch}"; - Logger.LogSurround($"\nChecking out {referenceName}"); + string reference = string.Equals(Build.commit.branch, "None") ? Build.commit.after : Build.commit.branch; + string referenceName = string.Equals(Build.commit.branch, "None") ? reference : $"latest {reference}"; + Logger.LogSurround("\nChecking out modpack..."); string modpackPath = Path.Join(GetBuildSourcesPath(), "modpack"); DirectoryInfo modpack = new DirectoryInfo(modpackPath); if (!modpack.Exists) { throw new Exception("Modpack source directory does not exist. Modpack should be cloned before running a build."); } + Logger.Log($"Checking out {referenceName}"); await BuildProcessHelper.RunPowershell( Logger, CancellationTokenSource.Token, modpackPath, - new List { GitCommand("reset --hard HEAD"), GitCommand("git clean -d -f"), GitCommand("fetch"), GitCommand($"checkout {Build.commit.after}"), GitCommand("pull") }, + new List { GitCommand("reset --hard HEAD"), GitCommand("git clean -d -f"), GitCommand("fetch"), GitCommand($"checkout {reference}") }, true, false, true ); - Logger.LogSurround($"Checked out {referenceName}"); + Logger.LogSurround("Checked out modpack"); } private string GitCommand(string command) => $".\"{gitPath}\" {command}"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs new file mode 100644 index 00000000..9a8dab3b --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs @@ -0,0 +1,45 @@ +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps.Mods { + [BuildStep(NAME)] + public class BuildStepBuildAce : ModBuildStep { + public const string NAME = "Build ACE"; + private const string MOD_NAME = "ace"; + private readonly List allowedOptionals = new List { "ace_compat_rksl_pm_ii", "ace_nouniformrestrictions" }; + + public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); + + protected override async Task ProcessExecute() { + Logger.Log("Running build for ACE"); + + string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); + string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@ace"); + string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf_ace"); + + Logger.LogSurround("\nRunning make.py..."); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, toolsPath, new List { MakeCommand() }, true); + Logger.LogSurround("Make.py complete"); + + Logger.LogSurround("\nMoving ACE release to build..."); + await CopyDirectory(releasePath, buildPath); + Logger.LogSurround("Moved ACE release to build"); + + Logger.LogSurround("\nMoving optionals..."); + await MoveOptionals(buildPath); + Logger.LogSurround("Moved optionals"); + } + + private async Task MoveOptionals(string buildPath) { + string optionalsPath = Path.Join(buildPath, "optionals"); + string addonsPath = Path.Join(buildPath, "addons"); + DirectoryInfo addons = new DirectoryInfo(addonsPath); + foreach (string optionalName in allowedOptionals) { + DirectoryInfo optional = new DirectoryInfo(Path.Join(optionalsPath, $"@{optionalName}", "addons")); + List files = GetDirectoryContents(optional); + await CopyFiles(optional, addons, files); + } + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs new file mode 100644 index 00000000..0ee4a12f --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -0,0 +1,36 @@ +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps.Mods { + [BuildStep(NAME)] + public class BuildStepBuildAcre : ModBuildStep { + public const string NAME = "Build ACRE"; + private const string MOD_NAME = "acre"; + private readonly List errorExclusions = new List { + "Found DirectX", + "Linking statically", + "Visual Studio 16", + "INFO: Building", + "Build Type" + }; + + public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); + + protected override async Task ProcessExecute() { + Logger.Log("Running build for ACRE"); + + string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); + string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@acre2"); + string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@acre2"); + + Logger.LogSurround("\nRunning make.py..."); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, toolsPath, new List { MakeCommand("compile") }, true, errorExclusions: errorExclusions); + Logger.LogSurround("Make.py complete"); + + Logger.LogSurround("\nMoving ACRE release to build..."); + await CopyDirectory(releasePath, buildPath); + Logger.LogSurround("Moved ACRE release to build"); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs new file mode 100644 index 00000000..70d8cadc --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs @@ -0,0 +1,32 @@ +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps.Mods { + [BuildStep(NAME)] + public class BuildStepBuildF35 : ModBuildStep { + public const string NAME = "Build F-35"; + private const string MOD_NAME = "f35"; + + public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); + + protected override async Task ProcessExecute() { + Logger.Log("Running build for F-35"); + + string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); + string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@uksf_f35", "addons"); + string dependenciesPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies", "addons"); + DirectoryInfo release = new DirectoryInfo(releasePath); + DirectoryInfo dependencies = new DirectoryInfo(dependenciesPath); + + Logger.LogSurround("\nRunning make.py..."); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, toolsPath, new List { MakeCommand() }, true); + Logger.LogSurround("Make.py complete"); + + Logger.LogSurround("\nMoving F-35 pbos to uksf dependencies..."); + List files = GetDirectoryContents(release, "*.pbo"); + await CopyFiles(release, dependencies, files); + Logger.LogSurround("Moved F-35 pbos to uksf dependencies"); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs new file mode 100644 index 00000000..0bc93dba --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs @@ -0,0 +1,27 @@ +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps.Mods { + [BuildStep(NAME)] + public class BuildStepBuildModpack : ModBuildStep { + public const string NAME = "Build UKSF"; + private const string MOD_NAME = "modpack"; + + protected override async Task ProcessExecute() { + Logger.Log("Running build for UKSF"); + + string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); + string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@uksf"); + string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf"); + + Logger.LogSurround("\nRunning make.py..."); + await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, toolsPath, new List { MakeCommand() }, true); + Logger.LogSurround("Make.py complete"); + + Logger.LogSurround("\nMoving UKSF release to build..."); + await CopyDirectory(releasePath, buildPath); + Logger.LogSurround("Moved UKSF release to build"); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs index d4123f34..2226e665 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs @@ -11,7 +11,7 @@ protected override async Task ProcessExecute() { string repoName = GetEnvironmentRepoName(); Logger.Log($"Building {repoName} repo"); - string arma3SyncPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_ARMA3SYNC_PATH").AsString(); + string arma3SyncPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_ARMA3SYNC").AsString(); await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, arma3SyncPath, new List { $"Java -jar .\\ArmA3Sync.jar -BUILD {repoName}" }); } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs index 3a361a8b..d709f0f5 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs @@ -14,7 +14,7 @@ protected override async Task ProcessExecute() { string repoPath = Path.Join(environmentPath, "Backup", "Repo"); string keysPath = Path.Join(environmentPath, "Backup", "Keys"); - Logger.LogSurround("\nCleaning backup folder"); + Logger.LogSurround("\nCleaning backup folder..."); Logger.Log("Cleaning repo backup"); await DeleteDirectoryContents(repoPath); Logger.Log("\nCleaning keys backup"); @@ -25,7 +25,7 @@ protected override async Task ProcessExecute() { string repoPath = Path.Join(environmentPath, "Repo"); DirectoryInfo repo = new DirectoryInfo(repoPath); - Logger.LogSurround("\nCleaning build folder"); + Logger.LogSurround("\nCleaning build folder..."); await DeleteDirectoryContents(path); Logger.LogSurround("Cleaned build folder"); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepExtensions.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepExtensions.cs deleted file mode 100644 index 43c5db2e..00000000 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepExtensions.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using UKSF.Api.Services.Admin; -using UKSF.Common; - -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { - [BuildStep(NAME)] - public class BuildStepExtensions : FileBuildStep { - public const string NAME = "Extensions"; - - protected override async Task ProcessExecute() { - string uksfPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf", "intercept"); - string interceptPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@intercept"); - DirectoryInfo uksf = new DirectoryInfo(uksfPath); - DirectoryInfo intercept = new DirectoryInfo(interceptPath); - - Logger.LogSurround("\nSigning extensions..."); - List files = GetDirectoryContents(uksf, "*.dll").Concat(GetDirectoryContents(intercept, "*.dll")).ToList(); - await SignExtensions(files); - Logger.LogSurround("Signed extensions"); - } - - private async Task SignExtensions(IReadOnlyCollection files) { - string thumbprint = VariablesWrapper.VariablesDataService().GetSingle("BUILD_CERTIFICATE_THUMBPRINT").AsString(); - int signed = 0; - await ParallelProcessFiles( - files, - 10, - file => { - CertificateUtilities.SignWithThumbprint(file.FullName, thumbprint); - Interlocked.Increment(ref signed); - return Task.CompletedTask; - }, - () => $"Signed {signed} of {files.Count} extensions", - "Failed to sign extension", - true - ); - } - } -} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs index 69d285e0..1334781e 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs @@ -10,7 +10,7 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class FileBuildStep : BuildStep { private const double FILE_COPY_TASK_SIZE_THRESHOLD = 5_000_000_000; private const double FILE_COPY_TASK_COUNT_THRESHOLD = 50; - private const double FILE_DELETE_TASK_COUNT_THRESHOLD = 25; + private const double FILE_DELETE_TASK_COUNT_THRESHOLD = 50; internal static List GetDirectoryContents(DirectoryInfo source, string searchPattern = "*") => source.GetFiles(searchPattern, SearchOption.AllDirectories).ToList(); @@ -175,6 +175,7 @@ private void SimpleCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnum private async Task ParallelCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, long totalSize, bool flatten = false) { long copiedSize = 0; + string totalSizeString = totalSize.Bytes().ToString("#.#"); await ParallelProcessFiles( files, 100, @@ -185,7 +186,7 @@ await ParallelProcessFiles( Interlocked.Add(ref copiedSize, file.Length); return Task.CompletedTask; }, - () => $"Copied {copiedSize.Bytes().ToString("#.#")} of {totalSize.Bytes().ToString("#.#")}", + () => $"Copied {copiedSize.Bytes().ToString("#.#")} of {totalSizeString}", "Failed to copy file" ); } @@ -200,15 +201,16 @@ private void SimpleDeleteFiles(IEnumerable files) { private async Task ParallelDeleteFiles(IReadOnlyCollection files) { int deleted = 0; + int total = files.Count; await ParallelProcessFiles( files, - 100, + 50, file => { file.Delete(); Interlocked.Increment(ref deleted); return Task.CompletedTask; }, - () => $"Deleted {deleted} of {files.Count} files", + () => $"Deleted {deleted} of {total} files", "Failed to delete file" ); } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs new file mode 100644 index 00000000..1fa0c592 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs @@ -0,0 +1,25 @@ +using System.Threading.Tasks; +using UKSF.Api.Services.Admin; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { + public class ModBuildStep : FileBuildStep { + private string pythonPath; + + protected override Task SetupExecute() { + pythonPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_PYTHON").AsString(); + Logger.Log("Retrieved python path"); + return Task.CompletedTask; + } + + internal bool IsBuildNeeded(string key) { + if (!GetEnvironmentVariable($"{key}_updated")) { + Logger.Log("\nBuild is not needed"); + return false; + } + + return true; + } + + internal string MakeCommand(string arguments = "") => $".\"{pythonPath}\" make.py {arguments}"; + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs new file mode 100644 index 00000000..22c76316 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs @@ -0,0 +1,27 @@ +using System.IO; +using System.Threading.Tasks; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Release { + [BuildStep(NAME)] + public class BuildStepBackup : FileBuildStep { + public const string NAME = "Backup"; + + protected override async Task ProcessExecute() { + Logger.Log("Backing up current release"); + + string environmentPath = GetBuildEnvironmentPath(); + string repoPath = Path.Join(environmentPath, "Repo"); + string keysPath = Path.Join(environmentPath, "Keys"); + string repoBackupPath = Path.Join(environmentPath, "Backup", "Repo"); + string keysBackupPath = Path.Join(environmentPath, "Backup", "Keys"); + + Logger.LogSurround("\nBacking up repo..."); + await CopyDirectory(repoPath, repoBackupPath); + Logger.LogSurround("Backed up repo"); + + Logger.LogSurround("\nBacking up keys..."); + await CopyDirectory(keysPath, keysBackupPath); + Logger.LogSurround("Backed up keys"); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs new file mode 100644 index 00000000..023758c5 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs @@ -0,0 +1,29 @@ +using System; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Interfaces.Integrations.Github; +using UKSF.Api.Services.Common; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Release { + [BuildStep(NAME)] + public class BuildStepMerge : BuildStep { + public const string NAME = "Merge"; + private IGithubService githubService; + + protected override Task SetupExecute() { + githubService = ServiceWrapper.Provider.GetService(); + Logger.Log("Retrieved services"); + return Task.CompletedTask; + } + + protected override async Task ProcessExecute() { + try { + await githubService.MergeBranch("dev", "release", $"Release {Build.version}"); + await githubService.MergeBranch("master", "dev", $"Release {Build.version}"); + Logger.Log("Release branch merges complete"); + } catch (Exception exception) { + Warning($"Release branch merges failed:\n{exception}"); + } + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs new file mode 100644 index 00000000..5df7916b --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs @@ -0,0 +1,23 @@ +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Interfaces.Modpack; +using UKSF.Api.Services.Common; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Release { + [BuildStep(NAME)] + public class BuildStepPublish : BuildStep { + public const string NAME = "Publish"; + private IReleaseService releaseService; + + protected override Task SetupExecute() { + releaseService = ServiceWrapper.Provider.GetService(); + Logger.Log("Retrieved services"); + return Task.CompletedTask; + } + + protected override async Task ProcessExecute() { + await releaseService.PublishRelease(Build.version); + Logger.Log("Release published"); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs new file mode 100644 index 00000000..da901413 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs @@ -0,0 +1,29 @@ +using System.IO; +using System.Threading.Tasks; +using UKSF.Api.Models.Game; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Release { + [BuildStep(NAME)] + public class BuildStepReleaseKeys : FileBuildStep { + public const string NAME = "Copy Keys"; + + protected override async Task SetupExecute() { + string keysPath = Path.Join(GetBuildEnvironmentPath(), "Keys"); + + Logger.LogSurround("Wiping release server keys folder"); + await DeleteDirectoryContents(keysPath); + Logger.LogSurround("Release server keys folder wiped"); + } + + protected override async Task ProcessExecute() { + Logger.Log("Copy RC keys to release keys folder"); + + string keysPath = Path.Join(GetBuildEnvironmentPath(), "Keys"); + string rcKeysPath = Path.Join(GetEnvironmentPath(GameEnvironment.RC), "Keys"); + + Logger.LogSurround("\nCopying keys..."); + await CopyDirectory(rcKeysPath, keysPath); + Logger.LogSurround("Copied keys"); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs new file mode 100644 index 00000000..903a94d5 --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs @@ -0,0 +1,28 @@ +using System.IO; +using System.Threading.Tasks; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Release { + [BuildStep(NAME)] + public class BuildStepRestore : FileBuildStep { + public const string NAME = "Restore"; + + protected override async Task ProcessExecute() { + Logger.Log("Restoring previous release"); + string environmentPath = GetBuildEnvironmentPath(); + string repoPath = Path.Join(environmentPath, "Repo"); + string keysPath = Path.Join(environmentPath, "Keys"); + string repoBackupPath = Path.Join(environmentPath, "Backup", "Repo"); + string keysBackupPath = Path.Join(environmentPath, "Backup", "Keys"); + + Logger.LogSurround("\nRestoring repo..."); + await DeleteDirectoryContents(repoPath); + await CopyDirectory(repoBackupPath, repoPath); + Logger.LogSurround("Restored repo"); + + Logger.LogSurround("\nRestoring keys..."); + await DeleteDirectoryContents(keysPath); + await CopyDirectory(keysBackupPath, keysPath); + Logger.LogSurround("Restored keys"); + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildsService.cs b/UKSF.Api.Services/Modpack/BuildsService.cs index d02e7e31..0c9d562f 100644 --- a/UKSF.Api.Services/Modpack/BuildsService.cs +++ b/UKSF.Api.Services/Modpack/BuildsService.cs @@ -24,6 +24,10 @@ public BuildsService(IBuildsDataService data, IBuildStepService buildStepService this.sessionService = sessionService; } + public async Task UpdateBuild(ModpackBuild build, UpdateDefinition updateDefinition) { + await Data.Update(build, updateDefinition); + } + public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep) { await Data.Update(build, buildStep); } diff --git a/UKSF.Api.Services/Utility/ScheduledActions/PruneLogsAction.cs b/UKSF.Api.Services/Utility/ScheduledActions/PruneDataAction.cs similarity index 64% rename from UKSF.Api.Services/Utility/ScheduledActions/PruneLogsAction.cs rename to UKSF.Api.Services/Utility/ScheduledActions/PruneDataAction.cs index c8c7b630..d9d01623 100644 --- a/UKSF.Api.Services/Utility/ScheduledActions/PruneLogsAction.cs +++ b/UKSF.Api.Services/Utility/ScheduledActions/PruneDataAction.cs @@ -1,17 +1,20 @@ using System; +using System.Linq; using System.Threading.Tasks; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Utility.ScheduledActions; +using UKSF.Api.Models.Game; using UKSF.Api.Models.Message; using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Models.Modpack; namespace UKSF.Api.Services.Utility.ScheduledActions { - public class PruneLogsAction : IPruneLogsAction { - public const string ACTION_NAME = nameof(PruneLogsAction); + public class PruneDataAction : IPruneLogsAction { + public const string ACTION_NAME = nameof(PruneDataAction); private readonly IDataCollectionFactory dataCollectionFactory; - public PruneLogsAction(IDataCollectionFactory dataCollectionFactory) => this.dataCollectionFactory = dataCollectionFactory; + public PruneDataAction(IDataCollectionFactory dataCollectionFactory) => this.dataCollectionFactory = dataCollectionFactory; public string Name => ACTION_NAME; @@ -22,7 +25,11 @@ public void Run(params object[] parameters) { Task auditLogsTask = dataCollectionFactory.CreateDataCollection("auditLogs").DeleteManyAsync(x => x.timestamp < now.AddMonths(-3)); Task notificationsTask = dataCollectionFactory.CreateDataCollection("notifications").DeleteManyAsync(x => x.timestamp < now.AddMonths(-1)); - Task.WaitAll(logsTask, errorLogsTask, auditLogsTask, notificationsTask); + IDataCollection buildsData = dataCollectionFactory.CreateDataCollection("modpackBuilds"); + int threshold = buildsData.Get(x => x.environment == GameEnvironment.DEV).Select(x => x.buildNumber).OrderByDescending(x => x).First() - 100; + Task modpackBuildsTask = buildsData.DeleteManyAsync(x => x.buildNumber < threshold); + + Task.WaitAll(logsTask, errorLogsTask, auditLogsTask, notificationsTask, modpackBuildsTask); } } } diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index 40a3a855..588b9b99 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -109,8 +109,8 @@ private async Task AddUnique() { await Create(DateTime.Today.AddDays(45), TimeSpan.FromDays(45), InstagramTokenAction.ACTION_NAME); } - if (Data.GetSingle(x => x.action == PruneLogsAction.ACTION_NAME) == null) { - await Create(DateTime.Today.AddDays(1), TimeSpan.FromDays(1), PruneLogsAction.ACTION_NAME); + if (Data.GetSingle(x => x.action == PruneDataAction.ACTION_NAME) == null) { + await Create(DateTime.Today.AddDays(1), TimeSpan.FromDays(1), PruneDataAction.ACTION_NAME); } if (Data.GetSingle(x => x.action == TeamspeakSnapshotAction.ACTION_NAME) == null) { diff --git a/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs b/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs index 62970a3a..295a4023 100644 --- a/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs @@ -8,7 +8,7 @@ public static void RegisterScheduledActionServices(this IServiceCollection servi services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); } } diff --git a/UKSF.Api/Controllers/Integrations/GithubController.cs b/UKSF.Api/Controllers/Integrations/GithubController.cs index 5f384747..bbac5537 100644 --- a/UKSF.Api/Controllers/Integrations/GithubController.cs +++ b/UKSF.Api/Controllers/Integrations/GithubController.cs @@ -15,7 +15,7 @@ namespace UKSF.Api.Controllers.Integrations { [Route("[controller]")] public class GithubController : Controller { private const string PUSH_EVENT = "push"; - private const string REPO_NAME = "BuildTest"; //"modpack"; + private const string REPO_NAME = "modpack"; //"BuildTest"; private const string DEV = "refs/heads/dev"; private const string RELEASE = "refs/heads/release"; diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs index 8b817510..00bbc287 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -32,6 +32,20 @@ public IActionResult GetBuild(string id) { return build == null ? (IActionResult) BadRequest("Build does not exist") : Ok(build); } + [HttpGet("builds/{id}/step/{index}"), Authorize, Roles(RoleDefinitions.MEMBER)] + public IActionResult GetBuild(string id, int index) { + ModpackBuild build = modpackService.GetBuild(id); + if (build == null) { + return BadRequest("Build does not exist"); + } + + if (build.steps.Count > index) { + return Ok(build.steps[index]); + } + + return BadRequest("Build step does not exist"); + } + [HttpGet("builds/{id}/rebuild"), Authorize, Roles(RoleDefinitions.ADMIN)] public async Task Rebuild(string id) { ModpackBuild build = modpackService.GetBuild(id); diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneLogsActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneLogsActionTests.cs index f9446add..2a348149 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneLogsActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneLogsActionTests.cs @@ -57,7 +57,7 @@ public void ShouldRemoveOldLogsAndNotifications() { mockDataCollectionFactory.Setup(x => x.CreateDataCollection("auditLogs")).Returns(mockAuditLogMessageDataColection.Object); mockDataCollectionFactory.Setup(x => x.CreateDataCollection("notifications")).Returns(mockNotificationDataColection.Object); - pruneLogsAction = new PruneLogsAction(mockDataCollectionFactory.Object); + pruneLogsAction = new PruneDataAction(mockDataCollectionFactory.Object); pruneLogsAction.Run(); @@ -69,7 +69,7 @@ public void ShouldRemoveOldLogsAndNotifications() { [Fact] public void ShouldReturnActionName() { - pruneLogsAction = new PruneLogsAction(mockDataCollectionFactory.Object); + pruneLogsAction = new PruneDataAction(mockDataCollectionFactory.Object); string subject = pruneLogsAction.Name; From 42667aeea675bee5b15627fba20d2511d02d2fa0 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 2 Aug 2020 00:33:20 +0100 Subject: [PATCH 205/369] Large tweaks and fixes - Changed data collections to use IEnumerable where possible. Should reduce memory footprint - Changed data service and cached data service to use a base service to avoid cascading calls and duplicate calls - Changed external build processes to use normal process rather than powershell - Changed build update pusher to use a simple loop for simplicity. Good balance between log update frequency and build speed - Added methods to set interrupted builds (api restart mid-build) as cancelled, and to re-queue builds that didn't start before an api restart - Changed file processor to use task batching again for better logging frequency and simplicity --- UKSF.Api.Data/Admin/VariablesDataService.cs | 9 +- UKSF.Api.Data/CachedDataService.cs | 60 ++++----- UKSF.Api.Data/DataCollection.cs | 4 +- UKSF.Api.Data/DataService.cs | 68 +++------- UKSF.Api.Data/DataServiceBase.cs | 77 +++++++++++ UKSF.Api.Data/Game/GameServersDataService.cs | 7 +- .../Message/CommentThreadDataService.cs | 4 +- UKSF.Api.Data/Modpack/BuildsDataService.cs | 25 ++-- UKSF.Api.Data/Modpack/ReleasesDataService.cs | 31 +++-- .../Operations/OperationOrderDataService.cs | 19 +-- .../Operations/OperationReportDataService.cs | 19 +-- .../Personnel/DischargeDataService.cs | 7 +- UKSF.Api.Data/Personnel/RanksDataService.cs | 7 +- UKSF.Api.Data/Personnel/RolesDataService.cs | 7 +- UKSF.Api.Data/Units/UnitsDataService.cs | 14 +- .../Handlers/BuildsEventHandler.cs | 15 +-- .../Data/Cached/IBuildsDataService.cs | 1 - .../Data/Cached/IRanksDataService.cs | 2 +- .../Data/Cached/IRolesDataService.cs | 2 +- UKSF.Api.Interfaces/Data/IDataCollection.cs | 4 +- UKSF.Api.Interfaces/Data/IDataService.cs | 4 +- UKSF.Api.Interfaces/Hubs/IModpackClient.cs | 1 + .../Integrations/Github/IGithubService.cs | 10 +- .../Modpack/BuildProcess/IStepLogger.cs | 4 +- .../Modpack/BuildProcess/Steps/IBuildStep.cs | 2 +- UKSF.Api.Interfaces/Modpack/IBuildsService.cs | 8 +- .../Modpack/IModpackService.cs | 7 +- ...PruneLogsAction.cs => IPruneDataAction.cs} | 2 +- UKSF.Api.Models/Events/DataEventModel.cs | 3 +- .../Modpack/ModpackBuildStepLogItem.cs | 9 +- UKSF.Api.Services/Admin/MigrationUtility.cs | 2 +- UKSF.Api.Services/Fake/FakeDataService.cs | 4 +- UKSF.Api.Services/Game/GameServersService.cs | 3 +- .../Game/Missions/MissionPatchDataService.cs | 2 +- UKSF.Api.Services/Game/ServerService.cs | 4 +- .../Launcher/LauncherFileService.cs | 6 +- .../BuildProcess/BuildProcessHelper.cs | 122 +++++++++++++----- .../BuildProcess/BuildProcessorService.cs | 4 +- .../Modpack/BuildProcess/BuildQueueService.cs | 31 ++++- .../Modpack/BuildProcess/BuildStepService.cs | 2 +- .../Modpack/BuildProcess/StepLogger.cs | 78 +++-------- .../Modpack/BuildProcess/Steps/BuildStep.cs | 55 ++++++-- .../Steps/BuildSteps/BuildStepExtensions.cs | 35 +---- .../Steps/BuildSteps/BuildStepPrep.cs | 9 +- .../BuildSteps/BuildStepSignDependencies.cs | 18 +-- .../Steps/BuildSteps/BuildStepSources.cs | 38 +++--- .../BuildSteps/Mods/BuildStepBuildAce.cs | 2 +- .../BuildSteps/Mods/BuildStepBuildAcre.cs | 2 +- .../BuildSteps/Mods/BuildStepBuildF35.cs | 2 +- .../BuildSteps/Mods/BuildStepBuildModpack.cs | 6 +- .../Steps/Common/BuildStepBuildRepo.cs | 8 +- .../BuildProcess/Steps/FileBuildStep.cs | 43 ++++-- .../BuildProcess/Steps/ModBuildStep.cs | 6 +- .../Steps/ReleaseSteps/BuildStepBackup.cs | 2 +- .../Steps/ReleaseSteps/BuildStepMerge.cs | 2 +- .../Steps/ReleaseSteps/BuildStepPublish.cs | 2 +- .../ReleaseSteps/BuildStepReleaseKeys.cs | 2 +- .../Steps/ReleaseSteps/BuildStepRestore.cs | 2 +- UKSF.Api.Services/Modpack/BuildsService.cs | 38 +++++- UKSF.Api.Services/Modpack/ModpackService.cs | 20 ++- UKSF.Api.Services/Modpack/ReleaseService.cs | 2 +- .../Personnel/AttendanceService.cs | 2 +- UKSF.Api.Services/Personnel/LoaService.cs | 3 +- UKSF.Api.Services/Personnel/RanksService.cs | 3 +- .../Personnel/RecruitmentService.cs | 21 +-- .../ScheduledActions/PruneDataAction.cs | 2 +- UKSF.Api.Services/Utility/SchedulerService.cs | 3 +- UKSF.Api/AppStart/RegisterScheduledActions.cs | 4 +- .../RegisterScheduledActionServices.cs | 2 +- UKSF.Api/AppStart/StartServices.cs | 7 +- .../Accounts/AccountsController.cs | 6 +- .../CommandRequestsController.cs | 2 +- UKSF.Api/Controllers/RecruitmentController.cs | 2 +- UKSF.Api/Controllers/VariablesController.cs | 5 +- UKSF.Common/JsonUtilities.cs | 4 +- .../Integration/Data/DataCollectionTests.cs | 4 +- .../Data/Admin/VariablesDataServiceTests.cs | 2 +- .../Unit/Data/CachedDataServiceTests.cs | 38 +++--- UKSF.Tests/Unit/Data/DataServiceTests.cs | 54 ++++---- .../Data/Game/GameServersDataServiceTests.cs | 2 +- .../OperationOrderDataServiceTests.cs | 25 ++-- .../OperationReportDataServiceTests.cs | 27 ++-- .../Personnel/DischargeDataServiceTests.cs | 2 +- .../Data/Personnel/RanksDataServiceTests.cs | 2 +- .../Data/Personnel/RolesDataServiceTests.cs | 2 +- .../Unit/Data/Units/UnitsDataServiceTests.cs | 4 +- .../Services/Personnel/RanksServiceTests.cs | 4 +- ...ActionTests.cs => PruneDataActionTests.cs} | 33 +++-- 88 files changed, 704 insertions(+), 545 deletions(-) create mode 100644 UKSF.Api.Data/DataServiceBase.cs rename UKSF.Api.Interfaces/Utility/ScheduledActions/{IPruneLogsAction.cs => IPruneDataAction.cs} (50%) rename UKSF.Tests/Unit/Services/Utility/ScheduledActions/{PruneLogsActionTests.cs => PruneDataActionTests.cs} (71%) diff --git a/UKSF.Api.Data/Admin/VariablesDataService.cs b/UKSF.Api.Data/Admin/VariablesDataService.cs index 27e9a437..d651ff36 100644 --- a/UKSF.Api.Data/Admin/VariablesDataService.cs +++ b/UKSF.Api.Data/Admin/VariablesDataService.cs @@ -11,10 +11,11 @@ namespace UKSF.Api.Data.Admin { public class VariablesDataService : CachedDataService, IVariablesDataService { public VariablesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "variables") { } - public override List Get() { - base.Get(); - Collection = Collection.OrderBy(x => x.key).ToList(); - return Collection; + public override List Collection { + get => base.Collection; + protected set { + lock (LockObject) base.Collection = value?.OrderBy(x => x.key).ToList(); + } } public override VariableItem GetSingle(string key) { diff --git a/UKSF.Api.Data/CachedDataService.cs b/UKSF.Api.Data/CachedDataService.cs index 8baed28b..00878fd9 100644 --- a/UKSF.Api.Data/CachedDataService.cs +++ b/UKSF.Api.Data/CachedDataService.cs @@ -10,16 +10,16 @@ using UKSF.Common; namespace UKSF.Api.Data { - public class CachedDataService : DataService, ICachedDataService { + public class CachedDataService : DataServiceBase, IDataService, ICachedDataService { private List collection; - private readonly object lockObject = new object(); + protected readonly object LockObject = new object(); protected CachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } - public List Collection { + public virtual List Collection { get => collection; protected set { - lock (lockObject) collection = value; + lock (LockObject) collection = value; } } @@ -28,18 +28,18 @@ public void Refresh() { Get(); } - public override List Get() { + public override IEnumerable Get() { if (Collection != null) { return Collection; } - Collection = base.Get(); + Collection = base.Get().ToList(); return Collection; } - public override List Get(Func predicate) { + public override IEnumerable Get(Func predicate) { if (Collection == null) Get(); - return Collection.Where(predicate).ToList(); + return Collection.Where(predicate); } public override T GetSingle(string id) { @@ -54,59 +54,53 @@ public override T GetSingle(Func predicate) { public override async Task Add(T data) { await base.Add(data); - Refresh(); - CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, data.GetIdValue(), data)); + Refresh(); // TODO: intelligent refresh + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, data.GetIdValue(), data)); } public override async Task Update(string id, string fieldName, object value) { await base.Update(id, fieldName, value); - Refresh(); - CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + Refresh(); // TODO: intelligent refresh + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public override async Task Update(string id, UpdateDefinition update) { await base.Update(id, update); - Refresh(); - CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + Refresh(); // TODO: intelligent refresh + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } public override async Task Update(Expression> filterExpression, UpdateDefinition update) { - List items = Get(filterExpression.Compile()); await base.Update(filterExpression, update); - Refresh(); - items.ForEach(x => CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); + Refresh(); // TODO: intelligent refresh + List items = Get(filterExpression.Compile()).ToList(); + items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); } public override async Task UpdateMany(Func predicate, UpdateDefinition update) { - List items = Get(predicate); await base.UpdateMany(predicate, update); - Refresh(); - items.ForEach(x => CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); + Refresh(); // TODO: intelligent refresh + List items = Get(predicate).ToList(); + items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); } public override async Task Replace(T item) { await base.Replace(item); - Refresh(); - CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, item.GetIdValue())); + Refresh(); // TODO: intelligent refresh + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, item.GetIdValue())); } public override async Task Delete(string id) { await base.Delete(id); - Refresh(); - CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); + Refresh(); // TODO: intelligent refresh + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } public override async Task DeleteMany(Func predicate) { - List items = Get(predicate); await base.DeleteMany(predicate); - Refresh(); - items.ForEach(x => CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, x.GetIdValue()))); + Refresh(); // TODO: intelligent refresh + List items = Get(predicate).ToList(); + items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, x.GetIdValue()))); } - - protected virtual void CachedDataEvent(DataEventModel dataEvent) { - base.DataEvent(dataEvent); - } - - protected override void DataEvent(DataEventModel dataEvent) { } } } diff --git a/UKSF.Api.Data/DataCollection.cs b/UKSF.Api.Data/DataCollection.cs index 3216a541..0fb835f8 100644 --- a/UKSF.Api.Data/DataCollection.cs +++ b/UKSF.Api.Data/DataCollection.cs @@ -24,9 +24,9 @@ public async Task AssertCollectionExistsAsync() { } } - public List Get() => GetCollection().AsQueryable().ToList(); + public IEnumerable Get() => GetCollection().AsQueryable(); - public List Get(Func predicate) => GetCollection().AsQueryable().Where(predicate).ToList(); + public IEnumerable Get(Func predicate) => GetCollection().AsQueryable().Where(predicate); public T GetSingle(string id) => GetCollection().FindSync(Builders.Filter.Eq("id", id)).FirstOrDefault(); diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index 15009048..48d39164 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -3,85 +3,57 @@ using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using MongoDB.Bson; using MongoDB.Driver; -using UKSF.Api.Events.Data; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; using UKSF.Common; namespace UKSF.Api.Data { - public abstract class DataService : DataEventBacker, IDataService { - private readonly IDataCollection dataCollection; + public abstract class DataService : DataServiceBase, IDataService { + protected DataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } - protected DataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataEventBus) => dataCollection = dataCollectionFactory.CreateDataCollection(collectionName); - - public virtual List Get() => dataCollection.Get(); - - public virtual List Get(Func predicate) => dataCollection.Get(predicate); - - public virtual T GetSingle(string id) { - ValidateId(id); - return dataCollection.GetSingle(id); - } - - public virtual T GetSingle(Func predicate) => dataCollection.GetSingle(predicate); - - public virtual async Task Add(T data) { - if (data == null) throw new ArgumentNullException(nameof(data)); - await dataCollection.AddAsync(data); + public override async Task Add(T data) { + await base.Add(data); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, data.GetIdValue(), data)); } - public virtual async Task Update(string id, string fieldName, object value) { - ValidateId(id); - UpdateDefinition update = value == null ? Builders.Update.Unset(fieldName) : Builders.Update.Set(fieldName, value); - await dataCollection.UpdateAsync(id, update); + public override async Task Update(string id, string fieldName, object value) { + await base.Update(id, fieldName, value); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } - public virtual async Task Update(string id, UpdateDefinition update) { // TODO: Remove strong typing to UpdateDefinition - ValidateId(id); - await dataCollection.UpdateAsync(id, update); + public override async Task Update(string id, UpdateDefinition update) { + await base.Update(id, update); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); } - public virtual async Task Update(Expression> filterExpression, UpdateDefinition update) { // TODO: Remove strong typing to UpdateDefinition + public override async Task Update(Expression> filterExpression, UpdateDefinition update) { + await base.Update(filterExpression, update); List ids = Get(filterExpression.Compile()).Select(x => x.GetIdValue()).ToList(); - await dataCollection.UpdateAsync(Builders.Filter.Where(filterExpression), update); ids.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x))); } - public virtual async Task UpdateMany(Func predicate, UpdateDefinition update) { - List items = Get(predicate); // TODO: Evaluate performance impact of this presence check - if (items.Count == 0) return; // throw new KeyNotFoundException("Could not find any items to update"); - await dataCollection.UpdateManyAsync(x => predicate(x), update); + public override async Task UpdateMany(Func predicate, UpdateDefinition update) { + await base.UpdateMany(predicate, update); + List items = Get(predicate).ToList(); items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); } - public virtual async Task Replace(T item) { - if (GetSingle(item.GetIdValue()) == null) throw new KeyNotFoundException("Could not find item to replace"); // TODO: Evaluate performance impact of this presence check - await dataCollection.ReplaceAsync(item.GetIdValue(), item); + public override async Task Replace(T item) { + await base.Replace(item); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, item.GetIdValue())); } - public virtual async Task Delete(string id) { - ValidateId(id); - await dataCollection.DeleteAsync(id); + public override async Task Delete(string id) { + await base.Delete(id); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } - public virtual async Task DeleteMany(Func predicate) { - List items = Get(predicate); // TODO: Evaluate performance impact of this presence check - if (items.Count == 0) return; // throw new KeyNotFoundException("Could not find any items to delete"); - await dataCollection.DeleteManyAsync(x => predicate(x)); + public override async Task DeleteMany(Func predicate) { + await base.DeleteMany(predicate); + List items = Get(predicate).ToList(); // TODO: Evaluate performance impact of this presence check items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, x.GetIdValue()))); } - - private static void ValidateId(string id) { - if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); - if (!ObjectId.TryParse(id, out ObjectId _)) throw new KeyNotFoundException("Key must be valid"); - } } } diff --git a/UKSF.Api.Data/DataServiceBase.cs b/UKSF.Api.Data/DataServiceBase.cs new file mode 100644 index 00000000..ef67d1ae --- /dev/null +++ b/UKSF.Api.Data/DataServiceBase.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; +using MongoDB.Bson; +using MongoDB.Driver; +using UKSF.Api.Events.Data; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; +using UKSF.Common; + +namespace UKSF.Api.Data { + public abstract class DataServiceBase : DataEventBacker { + private readonly IDataCollection dataCollection; + + protected DataServiceBase(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataEventBus) => + dataCollection = dataCollectionFactory.CreateDataCollection(collectionName); + + public virtual IEnumerable Get() => dataCollection.Get(); + + public virtual IEnumerable Get(Func predicate) => dataCollection.Get(predicate); + + public virtual T GetSingle(string id) { + ValidateId(id); + return dataCollection.GetSingle(id); + } + + public virtual T GetSingle(Func predicate) => dataCollection.GetSingle(predicate); + + public virtual async Task Add(T data) { + if (data == null) throw new ArgumentNullException(nameof(data)); + await dataCollection.AddAsync(data); + } + + public virtual async Task Update(string id, string fieldName, object value) { + ValidateId(id); + UpdateDefinition update = value == null ? Builders.Update.Unset(fieldName) : Builders.Update.Set(fieldName, value); + await dataCollection.UpdateAsync(id, update); + } + + public virtual async Task Update(string id, UpdateDefinition update) { + ValidateId(id); + await dataCollection.UpdateAsync(id, update); + } + + public virtual async Task Update(Expression> filterExpression, UpdateDefinition update) { + await dataCollection.UpdateAsync(Builders.Filter.Where(filterExpression), update); + } + + public virtual async Task UpdateMany(Func predicate, UpdateDefinition update) { + // List items = Get(predicate); // TODO: Evaluate performance impact of this presence check + // if (items.Count == 0) return; // throw new KeyNotFoundException("Could not find any items to update"); + await dataCollection.UpdateManyAsync(x => predicate(x), update); + } + + public virtual async Task Replace(T item) { + // if (GetSingle(item.GetIdValue()) == null) throw new KeyNotFoundException("Could not find item to replace"); // TODO: Evaluate performance impact of this presence check + await dataCollection.ReplaceAsync(item.GetIdValue(), item); + } + + public virtual async Task Delete(string id) { + ValidateId(id); + await dataCollection.DeleteAsync(id); + } + + public virtual async Task DeleteMany(Func predicate) { + // List items = Get(predicate); // TODO: Evaluate performance impact of this presence check + // if (items.Count == 0) return; // throw new KeyNotFoundException("Could not find any items to delete"); + await dataCollection.DeleteManyAsync(x => predicate(x)); + } + + private static void ValidateId(string id) { + if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); + if (!ObjectId.TryParse(id, out ObjectId _)) throw new KeyNotFoundException("Key must be valid"); + } + } +} diff --git a/UKSF.Api.Data/Game/GameServersDataService.cs b/UKSF.Api.Data/Game/GameServersDataService.cs index 5a828791..9bbf759a 100644 --- a/UKSF.Api.Data/Game/GameServersDataService.cs +++ b/UKSF.Api.Data/Game/GameServersDataService.cs @@ -9,8 +9,11 @@ namespace UKSF.Api.Data.Game { public class GameServersDataService : CachedDataService, IGameServersDataService { public GameServersDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "gameServers") { } - public override List Get() { - return base.Get().OrderBy(x => x.order).ToList(); + public override List Collection { + get => base.Collection; + protected set { + lock (LockObject) base.Collection = value?.OrderBy(x => x.order).ToList(); + } } } } diff --git a/UKSF.Api.Data/Message/CommentThreadDataService.cs b/UKSF.Api.Data/Message/CommentThreadDataService.cs index 06488755..3a3545ca 100644 --- a/UKSF.Api.Data/Message/CommentThreadDataService.cs +++ b/UKSF.Api.Data/Message/CommentThreadDataService.cs @@ -17,9 +17,9 @@ public async Task Update(string id, Comment comment, DataEventType updateType) { } private void CommentThreadDataEvent(DataEventModel dataEvent) { - base.CachedDataEvent(dataEvent); + base.DataEvent(dataEvent); } - protected override void CachedDataEvent(DataEventModel dataEvent) { } + protected override void DataEvent(DataEventModel dataEvent) { } } } diff --git a/UKSF.Api.Data/Modpack/BuildsDataService.cs b/UKSF.Api.Data/Modpack/BuildsDataService.cs index efc4c282..a4cf4284 100644 --- a/UKSF.Api.Data/Modpack/BuildsDataService.cs +++ b/UKSF.Api.Data/Modpack/BuildsDataService.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; @@ -13,30 +14,22 @@ namespace UKSF.Api.Data.Modpack { public class BuildsDataService : CachedDataService, IBuildsDataService { public BuildsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackBuilds") { } - public override List Get() { - base.Get(); - Collection = Collection.OrderByDescending(x => x.buildNumber).ToList(); - return Collection; + public override List Collection { + get => base.Collection; + protected set { + lock (LockObject) base.Collection = value?.OrderByDescending(x => x.buildNumber).ToList(); + } } public async Task Update(ModpackBuild build, ModpackBuildStep buildStep) { UpdateDefinition updateDefinition = Builders.Update.Set(x => x.steps[buildStep.index], buildStep); await base.Update(x => x.id == build.id, updateDefinition); - Refresh(); - CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, buildStep)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, buildStep)); } public async Task Update(ModpackBuild build, UpdateDefinition updateDefinition) { await base.Update(build.id, updateDefinition); - CachedDataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, build)); - } - - public void LogEvent(ModpackBuild build, ModpackBuildStep buildStep) { - CachedDataEvent( - buildStep.logs.Count > 300 - ? EventModelFactory.CreateDataEvent(DataEventType.SPECIAL, build.id, buildStep.index) - : EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, buildStep) - ); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, build)); } } } diff --git a/UKSF.Api.Data/Modpack/ReleasesDataService.cs b/UKSF.Api.Data/Modpack/ReleasesDataService.cs index 443c2848..342ab050 100644 --- a/UKSF.Api.Data/Modpack/ReleasesDataService.cs +++ b/UKSF.Api.Data/Modpack/ReleasesDataService.cs @@ -9,20 +9,23 @@ namespace UKSF.Api.Data.Modpack { public class ReleasesDataService : CachedDataService, IReleasesDataService { public ReleasesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackReleases") { } - public override List Get() { - base.Get(); - Collection = Collection.Select( - x => { - int[] parts = x.version.Split('.').Select(int.Parse).ToArray(); - return new { release = x, major = parts[0], minor = parts[1], patch = parts[2] }; - } - ) - .OrderByDescending(x => x.major) - .ThenByDescending(x => x.minor) - .ThenByDescending(x => x.patch) - .Select(x => x.release) - .ToList(); - return Collection; + public override List Collection { + get => base.Collection; + protected set { + lock (LockObject) { + base.Collection = value?.Select( + x => { + int[] parts = x.version.Split('.').Select(int.Parse).ToArray(); + return new { release = x, major = parts[0], minor = parts[1], patch = parts[2] }; + } + ) + .OrderByDescending(x => x.major) + .ThenByDescending(x => x.minor) + .ThenByDescending(x => x.patch) + .Select(x => x.release) + .ToList(); + } + } } } } diff --git a/UKSF.Api.Data/Operations/OperationOrderDataService.cs b/UKSF.Api.Data/Operations/OperationOrderDataService.cs index 3c35cc39..e6ea9e6a 100644 --- a/UKSF.Api.Data/Operations/OperationOrderDataService.cs +++ b/UKSF.Api.Data/Operations/OperationOrderDataService.cs @@ -1,5 +1,5 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; +using System.Linq; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; @@ -9,16 +9,11 @@ namespace UKSF.Api.Data.Operations { public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { public OperationOrderDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "opord") { } - public override List Get() { - List reversed = new List(base.Get()); - reversed.Reverse(); - return reversed; - } - - public override List Get(Func predicate) { - List reversed = new List(base.Get(predicate)); - reversed.Reverse(); - return reversed; + public override List Collection { + get => base.Collection; + protected set { + lock (LockObject) base.Collection = value?.OrderBy(x => x.start).ToList(); + } } } } diff --git a/UKSF.Api.Data/Operations/OperationReportDataService.cs b/UKSF.Api.Data/Operations/OperationReportDataService.cs index bed26403..bc1b2868 100644 --- a/UKSF.Api.Data/Operations/OperationReportDataService.cs +++ b/UKSF.Api.Data/Operations/OperationReportDataService.cs @@ -1,5 +1,5 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; +using System.Linq; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; @@ -9,16 +9,11 @@ namespace UKSF.Api.Data.Operations { public class OperationReportDataService : CachedDataService, IOperationReportDataService { public OperationReportDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "oprep") { } - public override List Get() { - List reversed = new List(base.Get()); - reversed.Reverse(); - return reversed; - } - - public override List Get(Func predicate) { - List reversed = new List(base.Get(predicate)); - reversed.Reverse(); - return reversed; + public override List Collection { + get => base.Collection; + protected set { + lock (LockObject) base.Collection = value?.OrderBy(x => x.start).ToList(); + } } } } diff --git a/UKSF.Api.Data/Personnel/DischargeDataService.cs b/UKSF.Api.Data/Personnel/DischargeDataService.cs index 5b34abdd..5ed24b0e 100644 --- a/UKSF.Api.Data/Personnel/DischargeDataService.cs +++ b/UKSF.Api.Data/Personnel/DischargeDataService.cs @@ -9,8 +9,11 @@ namespace UKSF.Api.Data.Personnel { public class DischargeDataService : CachedDataService, IDischargeDataService { public DischargeDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "discharges") { } - public override List Get() { - return base.Get().OrderByDescending(x => x.discharges.Last().timestamp).ToList(); + public override List Collection { + get => base.Collection; + protected set { + lock (LockObject) base.Collection = value?.OrderByDescending(x => x.discharges.Last().timestamp).ToList(); + } } } } diff --git a/UKSF.Api.Data/Personnel/RanksDataService.cs b/UKSF.Api.Data/Personnel/RanksDataService.cs index ba95f889..e9409014 100644 --- a/UKSF.Api.Data/Personnel/RanksDataService.cs +++ b/UKSF.Api.Data/Personnel/RanksDataService.cs @@ -9,8 +9,11 @@ namespace UKSF.Api.Data.Personnel { public class RanksDataService : CachedDataService, IRanksDataService { public RanksDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "ranks") { } - public override List Get() { - return base.Get().OrderBy(x => x.order).ToList(); + public override List Collection { + get => base.Collection; + protected set { + lock (LockObject) base.Collection = value?.OrderBy(x => x.order).ToList(); + } } public override Rank GetSingle(string name) => GetSingle(x => x.name == name); diff --git a/UKSF.Api.Data/Personnel/RolesDataService.cs b/UKSF.Api.Data/Personnel/RolesDataService.cs index d1d41cec..c206c6df 100644 --- a/UKSF.Api.Data/Personnel/RolesDataService.cs +++ b/UKSF.Api.Data/Personnel/RolesDataService.cs @@ -9,8 +9,11 @@ namespace UKSF.Api.Data.Personnel { public class RolesDataService : CachedDataService, IRolesDataService { public RolesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "roles") { } - public override List Get() { - return base.Get().OrderBy(x => x.name).ToList(); + public override List Collection { + get => base.Collection; + protected set { + lock (LockObject) base.Collection = value?.OrderBy(x => x.name).ToList(); + } } public override Role GetSingle(string name) => GetSingle(x => x.name == name); diff --git a/UKSF.Api.Data/Units/UnitsDataService.cs b/UKSF.Api.Data/Units/UnitsDataService.cs index ea17a146..f4df5aef 100644 --- a/UKSF.Api.Data/Units/UnitsDataService.cs +++ b/UKSF.Api.Data/Units/UnitsDataService.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; @@ -10,12 +9,11 @@ namespace UKSF.Api.Data.Units { public class UnitsDataService : CachedDataService, IUnitsDataService { public UnitsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "units") { } - public override List Get() { - return base.Get().OrderBy(x => x.order).ToList(); - } - - public override List Get(Func predicate) { - return base.Get(predicate).OrderBy(x => x.order).ToList(); + public override List Collection { + get => base.Collection; + protected set { + lock (LockObject) base.Collection = value?.OrderBy(x => x.order).ToList(); + } } } } diff --git a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs index 88460029..b0f86515 100644 --- a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs +++ b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs @@ -28,6 +28,8 @@ public void Init() { } private async Task HandleBuildEvent(DataEventModel x) { + if (x.data == null) return; + switch (x.type) { case DataEventType.ADD: await AddedEvent(x.data as ModpackBuild); @@ -35,10 +37,7 @@ private async Task HandleBuildEvent(DataEventModel x) { case DataEventType.UPDATE: await UpdatedEvent(x.id, x.data); break; - case DataEventType.DELETE: - await SpecialEvent(x.id, x.data); - break; - case DataEventType.SPECIAL: break; + case DataEventType.DELETE: break; default: throw new ArgumentOutOfRangeException(); } } @@ -66,13 +65,5 @@ private async Task UpdatedEvent(string id, object data) { break; } } - - private async Task SpecialEvent(string id, object data) { - switch (data) { - case int index: - await hub.Clients.Group(id).ReceiveLargeBuildStep(index); - break; - } - } } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs index f3211ac9..ed612c27 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs @@ -6,6 +6,5 @@ namespace UKSF.Api.Interfaces.Data.Cached { public interface IBuildsDataService : IDataService, ICachedDataService { Task Update(ModpackBuild build, ModpackBuildStep buildStep); Task Update(ModpackBuild build, UpdateDefinition updateDefinition); - void LogEvent(ModpackBuild build, ModpackBuildStep buildStep); } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs index 9b0b31e8..91d208d0 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs @@ -3,7 +3,7 @@ namespace UKSF.Api.Interfaces.Data.Cached { public interface IRanksDataService : IDataService, ICachedDataService { - new List Get(); + new IEnumerable Get(); new Rank GetSingle(string name); } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs index e8591ce7..73b2c9f0 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs @@ -3,7 +3,7 @@ namespace UKSF.Api.Interfaces.Data.Cached { public interface IRolesDataService : IDataService, ICachedDataService { - new List Get(); + new IEnumerable Get(); new Role GetSingle(string name); } } diff --git a/UKSF.Api.Interfaces/Data/IDataCollection.cs b/UKSF.Api.Interfaces/Data/IDataCollection.cs index f9ee9ed9..27aa028d 100644 --- a/UKSF.Api.Interfaces/Data/IDataCollection.cs +++ b/UKSF.Api.Interfaces/Data/IDataCollection.cs @@ -6,8 +6,8 @@ namespace UKSF.Api.Interfaces.Data { public interface IDataCollection { - List Get(); - List Get(Func predicate); + IEnumerable Get(); + IEnumerable Get(Func predicate); T GetSingle(string id); T GetSingle(Func predicate); Task AddAsync(T data); diff --git a/UKSF.Api.Interfaces/Data/IDataService.cs b/UKSF.Api.Interfaces/Data/IDataService.cs index 503e6724..f61cd128 100644 --- a/UKSF.Api.Interfaces/Data/IDataService.cs +++ b/UKSF.Api.Interfaces/Data/IDataService.cs @@ -7,8 +7,8 @@ namespace UKSF.Api.Interfaces.Data { public interface IDataService : IDataEventBacker { - List Get(); - List Get(Func predicate); + IEnumerable Get(); + IEnumerable Get(Func predicate); T GetSingle(string id); T GetSingle(Func predicate); Task Add(T data); diff --git a/UKSF.Api.Interfaces/Hubs/IModpackClient.cs b/UKSF.Api.Interfaces/Hubs/IModpackClient.cs index 0c916374..cede268a 100644 --- a/UKSF.Api.Interfaces/Hubs/IModpackClient.cs +++ b/UKSF.Api.Interfaces/Hubs/IModpackClient.cs @@ -6,6 +6,7 @@ public interface IModpackClient { Task ReceiveReleaseCandidateBuild(ModpackBuild build); Task ReceiveBuild(ModpackBuild build); Task ReceiveBuildStep(ModpackBuildStep step); + Task ReceiveBuildStepLog(ModpackBuildStepLogItemUpdate logUpdate); Task ReceiveLargeBuildStep(int index); } } diff --git a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs index 2af9cf59..5240a3b7 100644 --- a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs +++ b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs @@ -6,15 +6,15 @@ namespace UKSF.Api.Interfaces.Integrations.Github { public interface IGithubService { - bool VerifySignature(string signature, string body); + Task> GetBranches(); + Task> GetHistoricReleases(); Task GetReferenceVersion(string reference); - Task IsReferenceValid(string reference); Task GetLatestReferenceCommit(string reference); - Task MergeBranch(string branch, string sourceBranch, string version); Task GetPushEvent(PushWebhookPayload payload, string latestCommit = ""); + bool VerifySignature(string signature, string body); + Task IsReferenceValid(string reference); Task GenerateChangelog(string version); - Task> GetHistoricReleases(); Task PublishRelease(ModpackRelease release); - Task> GetBranches(); + Task MergeBranch(string branch, string sourceBranch, string version); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs index 46711cff..f3e6933e 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs @@ -10,9 +10,7 @@ public interface IStepLogger { void LogError(Exception exception); void LogError(string message); void LogSurround(string log); - void LogInline(string log); void Log(string log, string colour = ""); - void LogInstant(string log, string colour = ""); - void LogInlineInstant(string log); + void LogInline(string log); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs index f8031fb0..c6d207d9 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs @@ -6,7 +6,7 @@ namespace UKSF.Api.Interfaces.Modpack.BuildProcess.Steps { public interface IBuildStep { - void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func, Task> buildUpdateCallback, Func stepUpdateCallback, Action stepLogEvent, CancellationTokenSource cancellationTokenSource); + void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func, Task> buildUpdateCallback, Func stepUpdateCallback, CancellationTokenSource cancellationTokenSource); Task Start(); bool CheckGuards(); Task Setup(); diff --git a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs index 0949e54b..4faa0faa 100644 --- a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs +++ b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs @@ -7,13 +7,12 @@ namespace UKSF.Api.Interfaces.Modpack { public interface IBuildsService : IDataBackedService { - List GetDevBuilds(); - List GetRcBuilds(); + IEnumerable GetDevBuilds(); + IEnumerable GetRcBuilds(); ModpackBuild GetLatestDevBuild(); ModpackBuild GetLatestRcBuild(string version); Task UpdateBuild(ModpackBuild build, UpdateDefinition updateDefinition); Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep); - void BuildStepLogEvent(ModpackBuild build, ModpackBuildStep buildStep); Task CreateDevBuild(string version, GithubCommit commit); Task CreateRcBuild(string version, GithubCommit commit); Task CreateReleaseBuild(string version); @@ -21,6 +20,7 @@ public interface IBuildsService : IDataBackedService { Task SucceedBuild(ModpackBuild build); Task FailBuild(ModpackBuild build); Task CancelBuild(ModpackBuild build); - Task CreateRebuild(ModpackBuild build); + Task CreateRebuild(ModpackBuild build, string newSha = ""); + void CancelInterruptedBuilds(); } } diff --git a/UKSF.Api.Interfaces/Modpack/IModpackService.cs b/UKSF.Api.Interfaces/Modpack/IModpackService.cs index cb7a09f1..a1532f11 100644 --- a/UKSF.Api.Interfaces/Modpack/IModpackService.cs +++ b/UKSF.Api.Interfaces/Modpack/IModpackService.cs @@ -5,9 +5,9 @@ namespace UKSF.Api.Interfaces.Modpack { public interface IModpackService { - List GetReleases(); - List GetRcBuilds(); - List GetDevBuilds(); + IEnumerable GetReleases(); + IEnumerable GetRcBuilds(); + IEnumerable GetDevBuilds(); ModpackRelease GetRelease(string version); ModpackBuild GetBuild(string id); Task NewBuild(string reference); @@ -18,5 +18,6 @@ public interface IModpackService { Task RegnerateReleaseDraftChangelog(string version); Task CreateDevBuildFromPush(PushWebhookPayload payload); Task CreateRcBuildFromPush(PushWebhookPayload payload); + void RunQueuedBuilds(); } } diff --git a/UKSF.Api.Interfaces/Utility/ScheduledActions/IPruneLogsAction.cs b/UKSF.Api.Interfaces/Utility/ScheduledActions/IPruneDataAction.cs similarity index 50% rename from UKSF.Api.Interfaces/Utility/ScheduledActions/IPruneLogsAction.cs rename to UKSF.Api.Interfaces/Utility/ScheduledActions/IPruneDataAction.cs index 92b05327..b08085fd 100644 --- a/UKSF.Api.Interfaces/Utility/ScheduledActions/IPruneLogsAction.cs +++ b/UKSF.Api.Interfaces/Utility/ScheduledActions/IPruneDataAction.cs @@ -1,3 +1,3 @@ namespace UKSF.Api.Interfaces.Utility.ScheduledActions { - public interface IPruneLogsAction : IScheduledAction { } + public interface IPruneDataAction : IScheduledAction { } } diff --git a/UKSF.Api.Models/Events/DataEventModel.cs b/UKSF.Api.Models/Events/DataEventModel.cs index d0f3b41d..c3ea60c8 100644 --- a/UKSF.Api.Models/Events/DataEventModel.cs +++ b/UKSF.Api.Models/Events/DataEventModel.cs @@ -2,8 +2,7 @@ namespace UKSF.Api.Models.Events { public enum DataEventType { ADD, UPDATE, - DELETE, - SPECIAL + DELETE } // ReSharper disable once UnusedTypeParameter diff --git a/UKSF.Api.Models/Modpack/ModpackBuildStepLogItem.cs b/UKSF.Api.Models/Modpack/ModpackBuildStepLogItem.cs index e10a37c3..9a154312 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuildStepLogItem.cs +++ b/UKSF.Api.Models/Modpack/ModpackBuildStepLogItem.cs @@ -1,6 +1,13 @@ -namespace UKSF.Api.Models.Modpack { +using System.Collections.Generic; + +namespace UKSF.Api.Models.Modpack { public class ModpackBuildStepLogItem { public string text; public string colour; } + + public class ModpackBuildStepLogItemUpdate { + public bool inline; + public List logs; + } } diff --git a/UKSF.Api.Services/Admin/MigrationUtility.cs b/UKSF.Api.Services/Admin/MigrationUtility.cs index 92092e6e..59df5500 100644 --- a/UKSF.Api.Services/Admin/MigrationUtility.cs +++ b/UKSF.Api.Services/Admin/MigrationUtility.cs @@ -49,7 +49,7 @@ public void Migrate() { private static void ExecuteMigration() { IDataCollectionFactory dataCollectionFactory = ServiceWrapper.Provider.GetService(); IDataCollection oldDataCollection = dataCollectionFactory.CreateDataCollection("accounts"); - List oldAccounts = oldDataCollection.Get(); + IEnumerable oldAccounts = oldDataCollection.Get(); IAccountDataService accountDataService = ServiceWrapper.Provider.GetService(); diff --git a/UKSF.Api.Services/Fake/FakeDataService.cs b/UKSF.Api.Services/Fake/FakeDataService.cs index fbd2be50..ab25ca2a 100644 --- a/UKSF.Api.Services/Fake/FakeDataService.cs +++ b/UKSF.Api.Services/Fake/FakeDataService.cs @@ -9,9 +9,9 @@ namespace UKSF.Api.Services.Fake { public abstract class FakeDataService : IDataService { - public List Get() => new List(); + public IEnumerable Get() => new List(); - public List Get(Func predicate) => new List(); + public IEnumerable Get(Func predicate) => new List(); public T GetSingle(string id) => default; diff --git a/UKSF.Api.Services/Game/GameServersService.cs b/UKSF.Api.Services/Game/GameServersService.cs index d8d3ecbe..e2ceae63 100644 --- a/UKSF.Api.Services/Game/GameServersService.cs +++ b/UKSF.Api.Services/Game/GameServersService.cs @@ -63,7 +63,7 @@ public async Task GetGameServerStatus(GameServer gameServer) { } public async Task> GetAllGameServerStatuses() { - List gameServers = Data.Get(); + List gameServers = Data.Get().ToList(); await Task.WhenAll(gameServers.Select(GetGameServerStatus)); return gameServers; } @@ -153,6 +153,7 @@ public int KillAllArmaProcesses() { } Data.Get() + .ToList() .ForEach( x => { x.processId = null; diff --git a/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs b/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs index 4818cd74..b24095f9 100644 --- a/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs @@ -22,7 +22,7 @@ public MissionPatchDataService(IRanksService ranksService, IUnitsService unitsSe } public void UpdatePatchData() { - MissionPatchData.instance = new MissionPatchData {units = new List(), ranks = ranksService.Data.Get(), players = new List(), orderedUnits = new List()}; + MissionPatchData.instance = new MissionPatchData {units = new List(), ranks = ranksService.Data.Get().ToList(), players = new List(), orderedUnits = new List()}; foreach (Unit unit in unitsService.Data.Get(x => x.branch == UnitBranch.COMBAT).ToList()) { MissionPatchData.instance.units.Add(new MissionUnit {sourceUnit = unit, depth = unitsService.GetUnitDepth(unit)}); diff --git a/UKSF.Api.Services/Game/ServerService.cs b/UKSF.Api.Services/Game/ServerService.cs index a77d28c2..af318ae2 100644 --- a/UKSF.Api.Services/Game/ServerService.cs +++ b/UKSF.Api.Services/Game/ServerService.cs @@ -36,8 +36,8 @@ public void UpdateSquadXml() { return; Task.Run( () => { - List accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER && x.rank != null); - accounts = accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); + IEnumerable accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER && x.rank != null); + accounts = accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname); StringBuilder stringBuilder = new StringBuilder(); stringBuilder.AppendLine( diff --git a/UKSF.Api.Services/Launcher/LauncherFileService.cs b/UKSF.Api.Services/Launcher/LauncherFileService.cs index b1bc920f..0516154c 100644 --- a/UKSF.Api.Services/Launcher/LauncherFileService.cs +++ b/UKSF.Api.Services/Launcher/LauncherFileService.cs @@ -18,7 +18,7 @@ public class LauncherFileService : DataBackedService, public LauncherFileService(ILauncherFileDataService data) : base(data) { } public async Task UpdateAllVersions() { - List storedVersions = Data.Get(); + List storedVersions = Data.Get().ToList(); string launcherDirectory = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("LAUNCHER_LOCATION").AsString(), "Launcher"); List fileNames = new List(); foreach (string filePath in Directory.EnumerateFiles(launcherDirectory)) { @@ -50,7 +50,7 @@ public FileStreamResult GetLauncherFile(params string[] file) { public async Task GetUpdatedFiles(IEnumerable files) { string launcherDirectory = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("LAUNCHER_LOCATION").AsString(), "Launcher"); - List storedVersions = Data.Get(); + List storedVersions = Data.Get().ToList(); List updatedFiles = new List(); List deletedFiles = new List(); foreach (LauncherFile launcherFile in files) { @@ -70,7 +70,7 @@ public async Task GetUpdatedFiles(IEnumerable files) { Directory.CreateDirectory(updateFolder); string deletedFilesPath = Path.Combine(updateFolder, "deleted"); - File.WriteAllLines(deletedFilesPath, deletedFiles); + await File.WriteAllLinesAsync(deletedFilesPath, deletedFiles); foreach (string file in updatedFiles) { File.Copy(Path.Combine(launcherDirectory, file), Path.Combine(updateFolder, file), true); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index 8ed2afc2..ecd251fd 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -7,12 +7,23 @@ using System.Management.Automation.Runspaces; using System.Threading; using System.Threading.Tasks; +using Newtonsoft.Json.Linq; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Common; namespace UKSF.Api.Services.Modpack.BuildProcess { public static class BuildProcessHelper { - public static string RunProcess(IStepLogger logger, bool raiseErrors, CancellationToken cancellationToken, string executable, string workingDirectory, string args) { + public static string RunProcess( + IStepLogger logger, + CancellationToken cancellationToken, + string workingDirectory, + string executable, + string args, + bool suppressOutput = false, + bool raiseErrors = true, + bool errorSilently = false, + List errorExclusions = null + ) { using Process process = new Process { StartInfo = { FileName = executable, @@ -28,26 +39,59 @@ public static string RunProcess(IStepLogger logger, bool raiseErrors, Cancellati try { process.EnableRaisingEvents = false; string result = ""; + List exceptions = new List(); + process.OutputDataReceived += (sender, receivedEventArgs) => { - result = receivedEventArgs.Data; - logger.Log(result); + if (receivedEventArgs.Data == null) return; + + string message = receivedEventArgs.Data; + if (!string.IsNullOrEmpty(message)) { + result = message; + } + + if (!suppressOutput) { + string json = ""; + try { + if (message.Length > 5 && message.Substring(0, 4) == "JSON") { + json = message.Replace("JSON:", "").Escape().Replace("\\\\n", "\\n"); + JObject jsonObject = JObject.Parse(json); + logger.Log(jsonObject.GetValueFromBody("message"), jsonObject.GetValueFromBody("colour")); + } else { + logger.Log(message); + } + } catch (Exception exception) { + exceptions.Add(new Exception($"Json failed: {json}\n\n{exception}")); + } + } }; + process.ErrorDataReceived += (sender, receivedEventArgs) => { - Exception exception = new Exception(receivedEventArgs.Data); - if (raiseErrors) { - throw exception; - } + if (receivedEventArgs.Data == null) return; - logger.LogError(exception); + string message = receivedEventArgs.Data; + if (string.IsNullOrEmpty(message)) return; + + if (errorExclusions != null && errorExclusions.All(x => !message.ContainsIgnoreCase(x))) return; + + Exception exception = new Exception(message); + exceptions.Add(exception); }; + using CancellationTokenRegistration unused = cancellationToken.Register(process.Kill); process.Start(); process.BeginOutputReadLine(); process.BeginErrorReadLine(); process.WaitForExit(); - if (process.ExitCode != 0) { - throw new Exception($"Process exited with non-zero exit code of: {process.ExitCode}"); + if (exceptions.Any()) { + if (raiseErrors) { + throw exceptions.First(); + } + + if (!errorSilently) { + IEnumerable exceptionStrings = exceptions.Select(x => x.ToString()); + logger.LogError(string.Join("\n\n", exceptionStrings)); + } } return result; @@ -61,7 +105,7 @@ public static async Task> RunPowershell( IStepLogger logger, CancellationToken cancellationToken, string workingDirectory, - List commands, + IEnumerable commands, bool suppressOutput = false, bool raiseErrors = true, bool errorSilently = false, @@ -71,58 +115,70 @@ public static async Task> RunPowershell( runspace.Open(); runspace.SessionStateProxy.Path.SetLocation(workingDirectory); - using PowerShell powerShell = PowerShell.Create(runspace); - foreach (string command in commands) { - powerShell.AddScript(command); - } - void Log(object sender, DataAddedEventArgs eventArgs) { PSDataCollection streamObjectsReceived = sender as PSDataCollection; InformationRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; logger.Log(currentStreamRecord?.MessageData.ToString()); } - List exceptions = new List(); + void Verbose(object sender, DataAddedEventArgs eventArgs) { + PSDataCollection streamObjectsReceived = sender as PSDataCollection; + VerboseRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; + logger.Log(currentStreamRecord?.Message); + } + + void ProgressLog(object sender, DataAddedEventArgs eventArgs) { + PSDataCollection streamObjectsReceived = sender as PSDataCollection; + ProgressRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; + logger.Log(currentStreamRecord?.PercentComplete.ToString()); + } - void Error(object sender, DataAddedEventArgs eventArgs) { - PSDataCollection streamObjectsReceived = sender as PSDataCollection; - ErrorRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; - exceptions.Add(currentStreamRecord?.Exception); + void Warning(object sender, DataAddedEventArgs eventArgs) { + PSDataCollection streamObjectsReceived = sender as PSDataCollection; + WarningRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; + logger.LogWarning(currentStreamRecord?.Message); } + using PowerShell powerShell = PowerShell.Create(runspace); + if (!suppressOutput) { powerShell.Streams.Information.DataAdded += Log; - powerShell.Streams.Warning.DataAdded += Log; + powerShell.Streams.Verbose.DataAdded += Verbose; + powerShell.Streams.Progress.DataAdded += ProgressLog; } - powerShell.Streams.Error.DataAdded += Error; + powerShell.Streams.Warning.DataAdded += Warning; + + foreach (string command in commands) { + powerShell.AddScript(command); + } PSDataCollection result = await powerShell.InvokeAsync(cancellationToken); + List exceptions = powerShell.Streams.Error.Select(x => x.Exception).ToList(); if (errorExclusions != null) { exceptions = exceptions.Where(x => errorExclusions.All(y => !x.Message.ContainsIgnoreCase(y))).ToList(); } - if (exceptions.Count > 0) { + if (!suppressOutput) { + LogPowershellResult(logger, result); + } + + if (exceptions.Any()) { if (raiseErrors) { - LogPowershellResult(logger, result); + if (suppressOutput) { + LogPowershellResult(logger, result); + } + runspace.Close(); throw exceptions.First(); } - if (!suppressOutput) { - LogPowershellResult(logger, result); - } - if (!errorSilently) { IEnumerable exceptionStrings = exceptions.Select(x => x.ToString()); logger.LogError(string.Join("\n\n", exceptionStrings)); } } - if (!suppressOutput) { - LogPowershellResult(logger, result); - } - runspace.Close(); return result; } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs index 218a91c8..b383766d 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs @@ -7,7 +7,7 @@ using UKSF.Api.Models.Game; using UKSF.Api.Models.Modpack; using UKSF.Api.Services.Modpack.BuildProcess.Steps.Common; -using UKSF.Api.Services.Modpack.BuildProcess.Steps.Release; +using UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps; namespace UKSF.Api.Services.Modpack.BuildProcess { public class BuildProcessorService : IBuildProcessorService { @@ -29,7 +29,6 @@ public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cance buildStep, async updateDefinition => await buildsService.UpdateBuild(build, updateDefinition), async () => await buildsService.UpdateBuildStep(build, buildStep), - () => buildsService.BuildStepLogEvent(build, buildStep), cancellationTokenSource ); @@ -78,7 +77,6 @@ private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) { restoreStep, async updateDefinition => await buildsService.UpdateBuild(build, updateDefinition), async () => await buildsService.UpdateBuildStep(build, restoreStep), - () => buildsService.BuildStepLogEvent(build, restoreStep), new CancellationTokenSource() ); build.steps.Add(restoreStep); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs index 1c0cc1f8..874356cc 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs @@ -5,10 +5,12 @@ using UKSF.Api.Interfaces.Game; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Models.Modpack; +using UKSF.Api.Services.Message; namespace UKSF.Api.Services.Modpack.BuildProcess { public class BuildQueueService : IBuildQueueService { private readonly IBuildProcessorService buildProcessorService; + private readonly ConcurrentDictionary buildTasks = new ConcurrentDictionary(); private readonly ConcurrentDictionary cancellationTokenSources = new ConcurrentDictionary(); private readonly IGameServersService gameServersService; private readonly ConcurrentQueue queue = new ConcurrentQueue(); @@ -25,17 +27,30 @@ public void QueueBuild(ModpackBuild build) { cancellationTokenSources.TryAdd(build.id, cancellationTokenSource); if (!processing) { // Processor not running, process as separate task - Task unused = ProcessQueue(); + _ = ProcessQueue(); } } public void Cancel(string id) { - if (processing) { - if (cancellationTokenSources.ContainsKey(id)) { - CancellationTokenSource cancellationTokenSource = cancellationTokenSources[id]; - cancellationTokenSource.Cancel(); - } + if (cancellationTokenSources.ContainsKey(id)) { + CancellationTokenSource cancellationTokenSource = cancellationTokenSources[id]; + cancellationTokenSource.Cancel(); } + + _ = Task.Run( + async () => { + await Task.Delay(TimeSpan.FromMinutes(1)); + if (buildTasks.ContainsKey(id)) { + Task buildTask = buildTasks[id]; + + if (buildTask.IsCompleted) { + buildTasks.TryRemove(id, out Task _); + } else { + LogWrapper.Log($"Build {id} was cancelled but has not completed"); + } + } + } + ); } public void CancelAll() { @@ -58,7 +73,9 @@ private async Task ProcessQueue() { } CancellationTokenSource cancellationTokenSource = cancellationTokenSources[build.id]; - await buildProcessorService.ProcessBuild(build, cancellationTokenSource); + Task buildTask = buildProcessorService.ProcessBuild(build, cancellationTokenSource); + buildTasks.TryAdd(build.id, buildTask); + await buildTask; } processing = false; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index 48f2f48c..dcb7e3ca 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -9,7 +9,7 @@ using UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps; using UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps.Mods; using UKSF.Api.Services.Modpack.BuildProcess.Steps.Common; -using UKSF.Api.Services.Modpack.BuildProcess.Steps.Release; +using UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps; namespace UKSF.Api.Services.Modpack.BuildProcess { public class BuildStepService : IBuildStepService { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs index 89e28bad..ae5c8669 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs @@ -1,27 +1,17 @@ using System; -using System.Threading; -using System.Threading.Tasks; +using System.Collections.Generic; +using System.Linq; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Services.Modpack.BuildProcess { public class StepLogger : IStepLogger { - private const int LOG_COUNT_MAX = 10; private readonly ModpackBuildStep buildStep; - private readonly object lockObject = new object(); - private readonly Action logEvent; - private readonly Func updateCallback; - private int logCount; - public StepLogger(ModpackBuildStep buildStep, Func updateCallback, Action logEvent) { - this.buildStep = buildStep; - this.updateCallback = updateCallback; - this.logEvent = logEvent; - } + public StepLogger(ModpackBuildStep buildStep) => this.buildStep = buildStep; public void LogStart() { - LogLines($"Starting: {buildStep.name}"); - FlushLogsInstantly(); + LogLines($"Starting: {buildStep.name}", string.Empty); } public void LogSuccess() { @@ -29,91 +19,53 @@ public void LogSuccess() { $"\nFinished{(buildStep.buildResult == ModpackBuildResult.WARNING ? " with warning" : "")}: {buildStep.name}", buildStep.buildResult == ModpackBuildResult.WARNING ? "orangered" : "green" ); - FlushLogsInstantly(); } public void LogCancelled() { LogLines("\nBuild cancelled", "goldenrod"); - FlushLogsInstantly(); } public void LogSkipped() { LogLines($"\nSkipped: {buildStep.name}", "gray"); - FlushLogsInstantly(); } public void LogWarning(string message) { LogLines($"Warning\n{message}", "orangered"); - FlushLogsInstantly(); } public void LogError(Exception exception) { LogLines($"Error\n{exception.Message}\n{exception.StackTrace}\n\nFailed: {buildStep.name}", "red"); - FlushLogsInstantly(); } public void LogError(string message) { LogLines($"Error\n{message}\n\nFailed: {buildStep.name}", "red"); - FlushLogsInstantly(); } public void LogSurround(string log) { LogLines(log, "cadetblue"); } - public void LogInline(string log) { - lock (lockObject) { - buildStep.logs[^1] = new ModpackBuildStepLogItem { text = log }; - } - - logEvent(); - IncrementCountAndFlushLogs(); - } - public void Log(string log, string colour = "") { LogLines(log, colour); } - public void LogInstant(string log, string colour = "") { - LogLines(log, colour); - FlushLogsInstantly(); - } - - public void LogInlineInstant(string log) { - LogInline(log); - FlushLogsInstantly(false); - } - - public void FlushLogs(bool force = false, bool synchronous = false) { - lock (lockObject) { - if (force || logCount > LOG_COUNT_MAX) { - logCount = 0; - Task callback = updateCallback(); - if (synchronous) { - callback.Wait(); - } - } - } - } - - private void FlushLogsInstantly(bool synchronous = true) { - FlushLogs(true, synchronous); + public void LogInline(string log) { + PushLogUpdate(new List { new ModpackBuildStepLogItem { text = log } }, true); } private void LogLines(string log, string colour = "") { - lock (lockObject) { - foreach (string line in log.Split("\n")) { - buildStep.logs.Add(new ModpackBuildStepLogItem { text = line, colour = string.IsNullOrEmpty(line) ? "" : colour }); - } - } + List logs = log.Split("\n").Select(x => new ModpackBuildStepLogItem { text = x, colour = string.IsNullOrEmpty(x) ? "" : colour }).ToList(); + if (logs.Count == 0) return; - logEvent(); - IncrementCountAndFlushLogs(); + PushLogUpdate(logs); } - private void IncrementCountAndFlushLogs() { - Interlocked.Increment(ref logCount); - FlushLogs(); + private void PushLogUpdate(IEnumerable logs, bool inline = false) { + if (inline) { + buildStep.logs[^1] = logs.First(); + } else { + buildStep.logs.AddRange(logs); + } } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs index cbc21834..15579dc4 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs @@ -11,31 +11,38 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class BuildStep : IBuildStep { private const string COLOUR_BLUE = "#0c78ff"; - + private readonly CancellationTokenSource updatePusherCancellationTokenSource = new CancellationTokenSource(); + private readonly SemaphoreSlim updateSemaphore = new SemaphoreSlim(1); protected ModpackBuild Build; private ModpackBuildStep buildStep; protected CancellationTokenSource CancellationTokenSource; protected IStepLogger Logger; private Func, Task> updateBuildCallback; private Func updateStepCallback; - private Action logEvent; - - public void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func, Task> buildUpdateCallback, Func stepUpdateCallback, Action stepLogEvent, CancellationTokenSource newCancellationTokenSource) { + protected TimeSpan UpdateInterval = TimeSpan.FromSeconds(1); + + public void Init( + ModpackBuild modpackBuild, + ModpackBuildStep modpackBuildStep, + Func, Task> buildUpdateCallback, + Func stepUpdateCallback, + CancellationTokenSource newCancellationTokenSource + ) { Build = modpackBuild; buildStep = modpackBuildStep; updateBuildCallback = buildUpdateCallback; updateStepCallback = stepUpdateCallback; - logEvent = stepLogEvent; CancellationTokenSource = newCancellationTokenSource; - Logger = new StepLogger(buildStep, async () => await updateStepCallback(), logEvent); + Logger = new StepLogger(buildStep); } public async Task Start() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); + StartUpdatePusher(); buildStep.running = true; buildStep.startTime = DateTime.Now; Logger.LogStart(); - await updateStepCallback(); + await Update(); } public virtual bool CheckGuards() => true; @@ -44,12 +51,14 @@ public async Task Setup() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); Logger.Log("\nSetup", COLOUR_BLUE); await SetupExecute(); + await Update(); } public async Task Process() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); Logger.Log("\nProcess", COLOUR_BLUE); await ProcessExecute(); + await Update(); } public async Task Succeed() { @@ -141,11 +150,41 @@ internal T GetEnvironmentVariable(string key) { return default; } + private void StartUpdatePusher() { + try { + _ = Task.Run( + async () => { + do { + await Task.Delay(UpdateInterval, updatePusherCancellationTokenSource.Token); + await Update(); + } while (!updatePusherCancellationTokenSource.IsCancellationRequested); + }, + updatePusherCancellationTokenSource.Token + ); + } catch (OperationCanceledException) { + // ignored + Console.Out.WriteLine("cancelled"); + } catch (Exception exception) { + Console.Out.WriteLine(exception); + } + } + + private void StopUpdatePusher() { + updatePusherCancellationTokenSource.Cancel(); + } + + private async Task Update() { + await updateSemaphore.WaitAsync(); + await updateStepCallback(); + updateSemaphore.Release(); + } + private async Task Stop() { buildStep.running = false; buildStep.finished = true; buildStep.endTime = DateTime.Now; - await updateStepCallback(); + StopUpdatePusher(); + await Update(); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs index ab856578..b52f46c6 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs @@ -27,40 +27,17 @@ private async Task SignExtensions(IReadOnlyCollection files) { string signTool = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_SIGNTOOL").AsString(); int signed = 0; int total = files.Count; - await ParallelProcessFiles( + await BatchProcessFiles( files, - 10, - async file => { - await BuildProcessHelper.RunPowershell( - Logger, - CancellationTokenSource.Token, - file.DirectoryName, - new List { $".\"{signTool}\" sign /f \"{certPath}\" \"{file.FullName}\"" }, - true - ); + 2, + file => { + BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, file.DirectoryName, signTool, $"sign /f \"{certPath}\" \"{file.FullName}\"", true); Interlocked.Increment(ref signed); + return Task.CompletedTask; }, () => $"Signed {signed} of {total} extensions", - "Failed to sign extension", - true + "Failed to sign extension" ); } - - // private async Task SignExtensions(IReadOnlyCollection files) { - // string thumbprint = VariablesWrapper.VariablesDataService().GetSingle("BUILD_CERTIFICATE_THUMBPRINT").AsString(); - // int signed = 0; - // await ParallelProcessFiles( - // files, - // 10, - // file => { - // CertificateUtilities.SignWithThumbprint(file.FullName, thumbprint); - // Interlocked.Increment(ref signed); - // return Task.CompletedTask; - // }, - // () => $"Signed {signed} of {files.Count} extensions", - // "Failed to sign extension", - // true - // ); - // } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs index d4d9f860..4e31afc9 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.Threading.Tasks; +using System.Threading.Tasks; using UKSF.Api.Services.Admin; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { @@ -7,11 +6,13 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { public class BuildStepPrep : BuildStep { public const string NAME = "Prep"; - protected override async Task ProcessExecute() { + protected override Task ProcessExecute() { Logger.Log("Mounting build environment"); string projectsPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_PROJECTS").AsString(); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, "C:/", new List { $"subst P: \"{projectsPath}\"", "subst" }); + BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, "C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\""); + + return Task.CompletedTask; } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs index dc87096e..30939e94 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs @@ -32,7 +32,7 @@ protected override async Task SetupExecute() { Logger.LogSurround("Cleared keys directories"); Logger.LogSurround("\nCreating key..."); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, keygenPath, new List { $".\"{dsCreateKey}\" {keyName}" }); + BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, keygenPath, dsCreateKey, keyName, true); Logger.Log($"Created {keyName}"); await CopyFiles(keygen, keys, new List { new FileInfo(Path.Join(keygenPath, $"{keyName}.bikey")) }); Logger.LogSurround("Created key"); @@ -40,7 +40,7 @@ protected override async Task SetupExecute() { protected override async Task ProcessExecute() { string addonsPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies", "addons"); - string interceptPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@intercept", "addons"); + string interceptPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@intercept", "addons"); string keygenPath = Path.Join(GetBuildEnvironmentPath(), "PrivateKeys"); DirectoryInfo addons = new DirectoryInfo(addonsPath); DirectoryInfo intercept = new DirectoryInfo(interceptPath); @@ -54,9 +54,9 @@ protected override async Task ProcessExecute() { await SignFiles(keygenPath, addonsPath, repoFiles); Logger.LogSurround("Signed dependencies"); - List interceptIiles = GetDirectoryContents(intercept, "*.pbo"); + List interceptFiles = GetDirectoryContents(intercept, "*.pbo"); Logger.LogSurround("\nSigning intercept..."); - await SignFiles(keygenPath, addonsPath, interceptIiles); + await SignFiles(keygenPath, addonsPath, interceptFiles); Logger.LogSurround("Signed intercept"); } @@ -73,12 +73,14 @@ private async Task SignFiles(string keygenPath, string addonsPath, IReadOnlyColl string privateKey = Path.Join(keygenPath, $"{keyName}.biprivatekey"); int signed = 0; int total = files.Count; - await ParallelProcessFiles( + await BatchProcessFiles( files, - 50, - async file => { - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, addonsPath, new List { $".\"{dsSignFile}\" \"{privateKey}\" \"{file.FullName}\"" }); + 10, + file => { + BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, addonsPath, dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", true); Interlocked.Increment(ref signed); + + return Task.CompletedTask; }, () => $"Signed {signed} of {total} files", "Failed to sign file" diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 66637ceb..87b244f3 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Management.Automation; using System.Threading.Tasks; using UKSF.Api.Services.Admin; @@ -12,17 +9,19 @@ public class BuildStepSources : BuildStep { public const string NAME = "Sources"; private string gitPath; - protected override async Task ProcessExecute() { + protected override Task ProcessExecute() { Logger.Log("Checking out latest sources"); gitPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_GIT").AsString(); - await CheckoutStaticSource("ACE", "ace", "@ace", "uksfcustom"); - await CheckoutStaticSource("ACRE", "acre", "@acre2", "customrelease"); - await CheckoutStaticSource("UKSF F-35", "f35", "@uksf_f35", "master"); - await CheckoutModpack(); + CheckoutStaticSource("ACE", "ace", "@ace", "@uksf_ace", "uksfcustom"); + CheckoutStaticSource("ACRE", "acre", "@acre2", "@acre2", "customrelease"); + CheckoutStaticSource("UKSF F-35", "f35", "@uksf_f35", "@uksf", "master"); + CheckoutModpack(); + + return Task.CompletedTask; } - private async Task CheckoutStaticSource(string displayName, string modName, string releaseName, string branchName) { + private void CheckoutStaticSource(string displayName, string modName, string releaseName, string repoName, string branchName) { Logger.LogSurround($"\nChecking out latest {displayName}..."); string path = Path.Join(GetBuildSourcesPath(), modName); DirectoryInfo directory = new DirectoryInfo(path); @@ -32,23 +31,21 @@ private async Task CheckoutStaticSource(string displayName, string modName, stri bool updated; string releasePath = Path.Join(GetBuildSourcesPath(), modName, "release", releaseName); - string repoPath = Path.Join(GetBuildEnvironmentPath(), "Repo", releaseName); + string repoPath = Path.Join(GetBuildEnvironmentPath(), "Repo", repoName); DirectoryInfo release = new DirectoryInfo(releasePath); DirectoryInfo repo = new DirectoryInfo(repoPath); - PSDataCollection results = await BuildProcessHelper.RunPowershell( + string before = BuildProcessHelper.RunProcess( Logger, CancellationTokenSource.Token, path, - new List { GitCommand("reset --hard HEAD"), GitCommand("git clean -d -f"), GitCommand("fetch"), GitCommand($"checkout {branchName}"), GitCommand("rev-parse HEAD") }, + "cmd.exe", + $"/c \"git reset --hard HEAD && git clean -d -f && git checkout {branchName} && git rev-parse HEAD\"", true, false, true ); - string before = results.First().BaseObject.ToString(); - - results = await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, path, new List { GitCommand("pull"), GitCommand("rev-parse HEAD") }, true, false, true); - string after = results.First().BaseObject.ToString(); + string after = BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, path, "cmd.exe", "/c \"git pull && git rev-parse HEAD\"", true, false, true); if (release.Exists && repo.Exists) { Logger.Log($"{before?.Substring(0, 7)} vs {after?.Substring(0, 7)}"); @@ -62,7 +59,7 @@ private async Task CheckoutStaticSource(string displayName, string modName, stri Logger.LogSurround($"Checked out latest {displayName}{(updated ? "" : " (No Changes)")}"); } - private async Task CheckoutModpack() { + private void CheckoutModpack() { string reference = string.Equals(Build.commit.branch, "None") ? Build.commit.after : Build.commit.branch; string referenceName = string.Equals(Build.commit.branch, "None") ? reference : $"latest {reference}"; Logger.LogSurround("\nChecking out modpack..."); @@ -73,11 +70,12 @@ private async Task CheckoutModpack() { } Logger.Log($"Checking out {referenceName}"); - await BuildProcessHelper.RunPowershell( + BuildProcessHelper.RunProcess( Logger, CancellationTokenSource.Token, modpackPath, - new List { GitCommand("reset --hard HEAD"), GitCommand("git clean -d -f"), GitCommand("fetch"), GitCommand($"checkout {reference}") }, + "cmd.exe", + $"/c \"git reset --hard HEAD && git clean -d -f && git checkout {reference} && git pull\"", true, false, true @@ -85,7 +83,5 @@ await BuildProcessHelper.RunPowershell( Logger.LogSurround("Checked out modpack"); } - - private string GitCommand(string command) => $".\"{gitPath}\" {command}"; } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs index 9a8dab3b..fc4a0f71 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs @@ -19,7 +19,7 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf_ace"); Logger.LogSurround("\nRunning make.py..."); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, toolsPath, new List { MakeCommand() }, true); + BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, toolsPath, PythonPath, MakeCommand()); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving ACE release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index 0ee4a12f..c13b09c4 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -25,7 +25,7 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@acre2"); Logger.LogSurround("\nRunning make.py..."); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, toolsPath, new List { MakeCommand("compile") }, true, errorExclusions: errorExclusions); + BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, toolsPath, PythonPath, MakeCommand("compile"), errorExclusions: errorExclusions); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving ACRE release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs index 70d8cadc..85c91e4a 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs @@ -20,7 +20,7 @@ protected override async Task ProcessExecute() { DirectoryInfo dependencies = new DirectoryInfo(dependenciesPath); Logger.LogSurround("\nRunning make.py..."); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, toolsPath, new List { MakeCommand() }, true); + BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, toolsPath, PythonPath, MakeCommand()); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving F-35 pbos to uksf dependencies..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs index 0bc93dba..2130fc4c 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System; using System.IO; using System.Threading.Tasks; @@ -9,6 +9,8 @@ public class BuildStepBuildModpack : ModBuildStep { private const string MOD_NAME = "modpack"; protected override async Task ProcessExecute() { + UpdateInterval = TimeSpan.FromMilliseconds(250); + Logger.Log("Running build for UKSF"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); @@ -16,7 +18,7 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf"); Logger.LogSurround("\nRunning make.py..."); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, toolsPath, new List { MakeCommand() }, true); + BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, toolsPath, PythonPath, MakeCommand("redirect")); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving UKSF release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs index 2226e665..81f654af 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.IO; using System.Threading.Tasks; using UKSF.Api.Services.Admin; @@ -7,12 +7,14 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { public class BuildStepBuildRepo : BuildStep { public const string NAME = "Build Repo"; - protected override async Task ProcessExecute() { + protected override Task ProcessExecute() { string repoName = GetEnvironmentRepoName(); Logger.Log($"Building {repoName} repo"); string arma3SyncPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_ARMA3SYNC").AsString(); - await BuildProcessHelper.RunPowershell(Logger, CancellationTokenSource.Token, arma3SyncPath, new List { $"Java -jar .\\ArmA3Sync.jar -BUILD {repoName}" }); + BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, arma3SyncPath, "Java", $"-jar .\\ArmA3Sync.jar -BUILD {repoName}"); + + return Task.CompletedTask; } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs index 1334781e..e7f69ca4 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs @@ -5,6 +5,7 @@ using System.Threading; using System.Threading.Tasks; using Humanizer; +using MoreLinq; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class FileBuildStep : BuildStep { @@ -128,7 +129,7 @@ internal async Task DeleteEmptyDirectories(DirectoryInfo directory) { } } - internal async Task ParallelProcessFiles(IEnumerable files, int taskLimit, Func process, Func getLog, string error, bool logInstantly = false) { + internal async Task ParallelProcessFiles(IEnumerable files, int taskLimit, Func process, Func getLog, string error) { SemaphoreSlim taskLimiter = new SemaphoreSlim(taskLimit); IEnumerable tasks = files.Select( file => { @@ -141,15 +142,11 @@ internal async Task ParallelProcessFiles(IEnumerable files, int taskLi CancellationTokenSource.Token.ThrowIfCancellationRequested(); await process(file); - if (logInstantly) { - Logger.LogInlineInstant(getLog()); - } else { - Logger.LogInline(getLog()); - } + Logger.LogInline(getLog()); } catch (OperationCanceledException) { throw; } catch (Exception exception) { - throw new Exception($"{error} '{file}'\n{exception.Message}", exception); + throw new Exception($"{error} '{file}'\n{exception.Message}{(exception.InnerException != null ? $"\n{exception.InnerException.Message}" : "")}", exception); } finally { taskLimiter.Release(); } @@ -159,10 +156,32 @@ internal async Task ParallelProcessFiles(IEnumerable files, int taskLi } ); - Logger.LogInstant(getLog()); + Logger.Log(getLog()); await Task.WhenAll(tasks); } + internal async Task BatchProcessFiles(IEnumerable files, int batchSize, Func process, Func getLog, string error) { + Logger.Log(getLog()); + IEnumerable> fileBatches = files.Batch(batchSize); + foreach (IEnumerable fileBatch in fileBatches) { + List fileList = fileBatch.ToList(); + IEnumerable tasks = fileList.Select( + async file => { + try { + CancellationTokenSource.Token.ThrowIfCancellationRequested(); + await process(file); + } catch (OperationCanceledException) { + throw; + } catch (Exception exception) { + throw new Exception($"{error} '{file}'\n{exception.Message}{(exception.InnerException != null ? $"\n{exception.InnerException.Message}" : "")}", exception); + } + } + ); + await Task.WhenAll(tasks); + Logger.LogInline(getLog()); + } + } + private void SimpleCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, bool flatten = false) { foreach (FileInfo file in files) { CancellationTokenSource.Token.ThrowIfCancellationRequested(); @@ -176,9 +195,9 @@ private void SimpleCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnum private async Task ParallelCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, long totalSize, bool flatten = false) { long copiedSize = 0; string totalSizeString = totalSize.Bytes().ToString("#.#"); - await ParallelProcessFiles( + await BatchProcessFiles( files, - 100, + 10, file => { string targetFile = flatten ? Path.Join(target.FullName, file.Name) : file.FullName.Replace(source.FullName, target.FullName); Directory.CreateDirectory(Path.GetDirectoryName(targetFile)); @@ -202,9 +221,9 @@ private void SimpleDeleteFiles(IEnumerable files) { private async Task ParallelDeleteFiles(IReadOnlyCollection files) { int deleted = 0; int total = files.Count; - await ParallelProcessFiles( + await BatchProcessFiles( files, - 50, + 10, file => { file.Delete(); Interlocked.Increment(ref deleted); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs index 1fa0c592..8b35a061 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs @@ -3,10 +3,10 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class ModBuildStep : FileBuildStep { - private string pythonPath; + protected string PythonPath; protected override Task SetupExecute() { - pythonPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_PYTHON").AsString(); + PythonPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_PYTHON").AsString(); Logger.Log("Retrieved python path"); return Task.CompletedTask; } @@ -20,6 +20,6 @@ internal bool IsBuildNeeded(string key) { return true; } - internal string MakeCommand(string arguments = "") => $".\"{pythonPath}\" make.py {arguments}"; + internal static string MakeCommand(string arguments = "") => $"make.py {arguments}"; } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs index 22c76316..bc63c34e 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs @@ -1,7 +1,7 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Release { +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps { [BuildStep(NAME)] public class BuildStepBackup : FileBuildStep { public const string NAME = "Backup"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs index 023758c5..4667b9f8 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs @@ -4,7 +4,7 @@ using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Services.Common; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Release { +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps { [BuildStep(NAME)] public class BuildStepMerge : BuildStep { public const string NAME = "Merge"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs index 5df7916b..01016a70 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs @@ -3,7 +3,7 @@ using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Services.Common; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Release { +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps { [BuildStep(NAME)] public class BuildStepPublish : BuildStep { public const string NAME = "Publish"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs index da901413..245b02f0 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using UKSF.Api.Models.Game; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Release { +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps { [BuildStep(NAME)] public class BuildStepReleaseKeys : FileBuildStep { public const string NAME = "Copy Keys"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs index 903a94d5..5a3bbb59 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs @@ -1,7 +1,7 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Release { +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps { [BuildStep(NAME)] public class BuildStepRestore : FileBuildStep { public const string NAME = "Restore"; diff --git a/UKSF.Api.Services/Modpack/BuildsService.cs b/UKSF.Api.Services/Modpack/BuildsService.cs index 0c9d562f..ed1d4009 100644 --- a/UKSF.Api.Services/Modpack/BuildsService.cs +++ b/UKSF.Api.Services/Modpack/BuildsService.cs @@ -11,6 +11,7 @@ using UKSF.Api.Models.Game; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; +using UKSF.Api.Services.Message; namespace UKSF.Api.Services.Modpack { public class BuildsService : DataBackedService, IBuildsService { @@ -32,13 +33,9 @@ public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep await Data.Update(build, buildStep); } - public void BuildStepLogEvent(ModpackBuild build, ModpackBuildStep buildStep) { - Data.LogEvent(build, buildStep); - } - - public List GetDevBuilds() => Data.Get(x => x.environment == GameEnvironment.DEV); + public IEnumerable GetDevBuilds() => Data.Get(x => x.environment == GameEnvironment.DEV); - public List GetRcBuilds() => Data.Get(x => x.environment != GameEnvironment.DEV); + public IEnumerable GetRcBuilds() => Data.Get(x => x.environment != GameEnvironment.DEV); public ModpackBuild GetLatestDevBuild() => GetDevBuilds().FirstOrDefault(); @@ -95,7 +92,7 @@ public async Task CreateReleaseBuild(string version) { return build; } - public async Task CreateRebuild(ModpackBuild build) { + public async Task CreateRebuild(ModpackBuild build, string newSha = "") { ModpackBuild latestBuild = build.environment == GameEnvironment.DEV ? GetLatestDevBuild() : GetLatestRcBuild(build.version); ModpackBuild rebuild = new ModpackBuild { version = latestBuild.environment == GameEnvironment.DEV ? null : latestBuild.version, @@ -106,6 +103,10 @@ public async Task CreateRebuild(ModpackBuild build) { commit = latestBuild.commit, builderId = sessionService.GetContextId() }; + if (!string.IsNullOrEmpty(newSha)) { + rebuild.commit.after = newSha; + } + rebuild.commit.message = latestBuild.environment == GameEnvironment.RELEASE ? $"Re-deployment of release {rebuild.version}" : $"Rebuild of #{build.buildNumber}\n\n{rebuild.commit.message}"; @@ -131,6 +132,29 @@ public async Task CancelBuild(ModpackBuild build) { await FinishBuild(build, build.steps.Any(x => x.buildResult == ModpackBuildResult.WARNING) ? ModpackBuildResult.WARNING : ModpackBuildResult.CANCELLED); } + public void CancelInterruptedBuilds() { + List builds = Data.Get(x => x.running || x.steps.Any(y => y.running)).ToList(); + if (!builds.Any()) return; + + IEnumerable tasks = builds.Select( + async build => { + ModpackBuildStep runningStep = build.steps.FirstOrDefault(x => x.running); + if (runningStep != null) { + runningStep.running = false; + runningStep.finished = true; + runningStep.endTime = DateTime.Now; + runningStep.buildResult = ModpackBuildResult.CANCELLED; + runningStep.logs.Add(new ModpackBuildStepLogItem { text = "\nBuild was interrupted", colour = "goldenrod" }); + await Data.Update(build, runningStep); + } + + await FinishBuild(build, ModpackBuildResult.CANCELLED); + } + ); + _ = Task.WhenAll(tasks); + LogWrapper.AuditLog($"Marked {builds.Count} interrupted builds as cancelled", "SERVER"); + } + private async Task FinishBuild(ModpackBuild build, ModpackBuildResult result) { build.running = false; build.finished = true; diff --git a/UKSF.Api.Services/Modpack/ModpackService.cs b/UKSF.Api.Services/Modpack/ModpackService.cs index 4283078a..799bc4af 100644 --- a/UKSF.Api.Services/Modpack/ModpackService.cs +++ b/UKSF.Api.Services/Modpack/ModpackService.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using Octokit; using UKSF.Api.Interfaces.Integrations.Github; @@ -27,11 +28,11 @@ public ModpackService(IReleaseService releaseService, IBuildsService buildsServi this.sessionService = sessionService; } - public List GetReleases() => releaseService.Data.Get(); + public IEnumerable GetReleases() => releaseService.Data.Get(); - public List GetRcBuilds() => buildsService.GetRcBuilds(); + public IEnumerable GetRcBuilds() => buildsService.GetRcBuilds(); - public List GetDevBuilds() => buildsService.GetDevBuilds(); + public IEnumerable GetDevBuilds() => buildsService.GetDevBuilds(); public ModpackRelease GetRelease(string version) => releaseService.GetRelease(version); @@ -51,7 +52,8 @@ public async Task NewBuild(string reference) { public async Task Rebuild(ModpackBuild build) { LogWrapper.AuditLog($"Rebuild triggered for {GetBuildName(build)}."); - ModpackBuild rebuild = await buildsService.CreateRebuild(build); + ModpackBuild rebuild = await buildsService.CreateRebuild(build, build.commit.branch == "None" ? string.Empty : (await githubService.GetLatestReferenceCommit(build.commit.branch)).after); + buildQueueService.QueueBuild(rebuild); } @@ -106,6 +108,16 @@ public async Task CreateRcBuildFromPush(PushWebhookPayload payload) { buildQueueService.QueueBuild(rcBuild); } + public void RunQueuedBuilds() { + List builds = buildsService.GetDevBuilds().Where(x => !x.finished && !x.running).ToList(); + builds = builds.Concat(buildsService.GetRcBuilds().Where(x => !x.finished && !x.running)).ToList(); + if (!builds.Any()) return; + + foreach (ModpackBuild build in builds) { + buildQueueService.QueueBuild(build); + } + } + private static string GetBuildName(ModpackBuild build) => build.environment switch { GameEnvironment.RELEASE => $"release {build.version}", diff --git a/UKSF.Api.Services/Modpack/ReleaseService.cs b/UKSF.Api.Services/Modpack/ReleaseService.cs index 2a6eedc4..72f4c8f2 100644 --- a/UKSF.Api.Services/Modpack/ReleaseService.cs +++ b/UKSF.Api.Services/Modpack/ReleaseService.cs @@ -45,7 +45,7 @@ public async Task PublishRelease(string version) { } public async Task AddHistoricReleases(IEnumerable releases) { - List existingReleases = Data.Get(); + IEnumerable existingReleases = Data.Get(); foreach (ModpackRelease release in releases.Where(x => existingReleases.All(y => y.version != x.version))) { await Data.Add(release); } diff --git a/UKSF.Api.Services/Personnel/AttendanceService.cs b/UKSF.Api.Services/Personnel/AttendanceService.cs index 593dac7e..cac6ff33 100644 --- a/UKSF.Api.Services/Personnel/AttendanceService.cs +++ b/UKSF.Api.Services/Personnel/AttendanceService.cs @@ -15,7 +15,7 @@ public class AttendanceService : IAttendanceService { private readonly IDisplayNameService displayNameService; private readonly ILoaService loaService; private readonly IUnitsService unitsService; - private List accounts; + private IEnumerable accounts; private List records; public AttendanceService(IAccountService accountService, IDisplayNameService displayNameService, ILoaService loaService, IMongoDatabase database, IUnitsService unitsService) { diff --git a/UKSF.Api.Services/Personnel/LoaService.cs b/UKSF.Api.Services/Personnel/LoaService.cs index 8959ef02..05dfb697 100644 --- a/UKSF.Api.Services/Personnel/LoaService.cs +++ b/UKSF.Api.Services/Personnel/LoaService.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.Interfaces.Data.Cached; @@ -34,7 +35,7 @@ public async Task SetLoaState(string id, LoaReviewState state) { } public bool IsLoaCovered(string id, DateTime eventStart) { - return Data.Get(loa => loa.recipient == id && loa.start < eventStart && loa.end > eventStart).Count > 0; + return Data.Get(loa => loa.recipient == id && loa.start < eventStart && loa.end > eventStart).Any(); } } } diff --git a/UKSF.Api.Services/Personnel/RanksService.cs b/UKSF.Api.Services/Personnel/RanksService.cs index 19879692..f14cffa0 100644 --- a/UKSF.Api.Services/Personnel/RanksService.cs +++ b/UKSF.Api.Services/Personnel/RanksService.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Models.Personnel; @@ -9,7 +10,7 @@ public class RanksService : DataBackedService, IRanksService public RanksService(IRanksDataService data) : base(data) { } public int GetRankIndex(string rankName) { - return Data.Get().FindIndex(x => x.name == rankName); + return Data.Get().ToList().FindIndex(x => x.name == rankName); } public int Sort(string nameA, string nameB) { diff --git a/UKSF.Api.Services/Personnel/RecruitmentService.cs b/UKSF.Api.Services/Personnel/RecruitmentService.cs index 20307443..77b39216 100644 --- a/UKSF.Api.Services/Personnel/RecruitmentService.cs +++ b/UKSF.Api.Services/Personnel/RecruitmentService.cs @@ -113,20 +113,21 @@ public async Task SetRecruiter(string id, string newRecruiter) { } public object GetStats(string account, bool monthly) { - List accounts = accountService.Data.Get(x => x.application != null); + IEnumerable accounts = accountService.Data.Get(x => x.application != null); if (account != string.Empty) { - accounts = accounts.Where(x => x.application.recruiter == account).ToList(); + accounts = accounts.Where(x => x.application.recruiter == account); } if (monthly) { - accounts = accounts.Where(x => x.application.dateAccepted < DateTime.Now && x.application.dateAccepted > DateTime.Now.AddMonths(-1)).ToList(); + accounts = accounts.Where(x => x.application.dateAccepted < DateTime.Now && x.application.dateAccepted > DateTime.Now.AddMonths(-1)); } - int acceptedApps = accounts.Count(x => x.application.state == ApplicationState.ACCEPTED); - int rejectedApps = accounts.Count(x => x.application.state == ApplicationState.REJECTED); - int waitingApps = accounts.Count(x => x.application.state == ApplicationState.WAITING); + List accountsList = accounts.ToList(); + int acceptedApps = accountsList.Count(x => x.application.state == ApplicationState.ACCEPTED); + int rejectedApps = accountsList.Count(x => x.application.state == ApplicationState.REJECTED); + int waitingApps = accountsList.Count(x => x.application.state == ApplicationState.WAITING); - List processedApplications = accounts.Where(x => x.application.state != ApplicationState.WAITING).ToList(); + List processedApplications = accountsList.Where(x => x.application.state != ApplicationState.WAITING).ToList(); double totalProcessingTime = processedApplications.Sum(x => (x.application.dateAccepted - x.application.dateCreated).TotalDays); double averageProcessingTime = totalProcessingTime > 0 ? Math.Round(totalProcessingTime / processedApplications.Count, 1) : 0; double enlistmentRate = acceptedApps != 0 || rejectedApps != 0 ? Math.Round((double) acceptedApps / (acceptedApps + rejectedApps) * 100, 1) : 0; @@ -141,9 +142,9 @@ public object GetStats(string account, bool monthly) { } public string GetRecruiter() { - List recruiters = GetRecruiters().Where(x => x.settings.sr1Enabled).ToList(); - List waiting = accountService.Data.Get(x => x.application != null && x.application.state == ApplicationState.WAITING); - List complete = accountService.Data.Get(x => x.application != null && x.application.state != ApplicationState.WAITING); + IEnumerable recruiters = GetRecruiters().Where(x => x.settings.sr1Enabled); + List waiting = accountService.Data.Get(x => x.application != null && x.application.state == ApplicationState.WAITING).ToList(); + List complete = accountService.Data.Get(x => x.application != null && x.application.state != ApplicationState.WAITING).ToList(); var unsorted = recruiters.Select(x => new {x.id, complete = complete.Count(y => y.application.recruiter == x.id), waiting = waiting.Count(y => y.application.recruiter == x.id)}); var sorted = unsorted.OrderBy(x => x.waiting).ThenBy(x => x.complete); return sorted.First().id; diff --git a/UKSF.Api.Services/Utility/ScheduledActions/PruneDataAction.cs b/UKSF.Api.Services/Utility/ScheduledActions/PruneDataAction.cs index d9d01623..08134a3a 100644 --- a/UKSF.Api.Services/Utility/ScheduledActions/PruneDataAction.cs +++ b/UKSF.Api.Services/Utility/ScheduledActions/PruneDataAction.cs @@ -9,7 +9,7 @@ using UKSF.Api.Models.Modpack; namespace UKSF.Api.Services.Utility.ScheduledActions { - public class PruneDataAction : IPruneLogsAction { + public class PruneDataAction : IPruneDataAction { public const string ACTION_NAME = nameof(PruneDataAction); private readonly IDataCollectionFactory dataCollectionFactory; diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index 588b9b99..37d4f0e3 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Concurrent; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Hosting; @@ -25,7 +26,7 @@ public SchedulerService(ISchedulerDataService data, IScheduledActionService sche public async void Load() { await AddUnique(); - Data.Get().ForEach(Schedule); + Data.Get().ToList().ForEach(Schedule); } public async Task CreateAndSchedule(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { diff --git a/UKSF.Api/AppStart/RegisterScheduledActions.cs b/UKSF.Api/AppStart/RegisterScheduledActions.cs index 4c97c0d9..07d31245 100644 --- a/UKSF.Api/AppStart/RegisterScheduledActions.cs +++ b/UKSF.Api/AppStart/RegisterScheduledActions.cs @@ -12,11 +12,11 @@ public static void Register() { IDeleteExpiredConfirmationCodeAction deleteExpiredConfirmationCodeAction = serviceProvider.GetService(); IInstagramImagesAction instagramImagesAction = serviceProvider.GetService(); IInstagramTokenAction instagramTokenAction = serviceProvider.GetService(); - IPruneLogsAction pruneLogsAction = serviceProvider.GetService(); + IPruneDataAction pruneDataAction = serviceProvider.GetService(); ITeamspeakSnapshotAction teamspeakSnapshotAction = serviceProvider.GetService(); IScheduledActionService scheduledActionService = serviceProvider.GetService(); - scheduledActionService.RegisterScheduledActions(new HashSet { deleteExpiredConfirmationCodeAction, instagramImagesAction, instagramTokenAction, pruneLogsAction, teamspeakSnapshotAction }); + scheduledActionService.RegisterScheduledActions(new HashSet { deleteExpiredConfirmationCodeAction, instagramImagesAction, instagramTokenAction, pruneDataAction, teamspeakSnapshotAction }); } } } diff --git a/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs b/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs index 295a4023..f27dace6 100644 --- a/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs @@ -8,7 +8,7 @@ public static void RegisterScheduledActionServices(this IServiceCollection servi services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); } } diff --git a/UKSF.Api/AppStart/StartServices.cs b/UKSF.Api/AppStart/StartServices.cs index 10b761a8..3eca393f 100644 --- a/UKSF.Api/AppStart/StartServices.cs +++ b/UKSF.Api/AppStart/StartServices.cs @@ -4,6 +4,7 @@ using UKSF.Api.Events; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Services.Admin; @@ -27,7 +28,7 @@ public static void Start() { // Register scheduled actions RegisterScheduledActions.Register(); - // Register buidl steps + // Register build steps serviceProvider.GetService().RegisterBuildSteps(); // Add event handlers @@ -41,6 +42,10 @@ public static void Start() { // Start scheduler serviceProvider.GetService().Load(); + + // Mark running builds as cancelled & run queued builds + serviceProvider.GetService().CancelInterruptedBuilds(); + serviceProvider.GetService().RunQueuedBuilds(); } } } diff --git a/UKSF.Api/Controllers/Accounts/AccountsController.cs b/UKSF.Api/Controllers/Accounts/AccountsController.cs index bdb42e8d..6a4b292e 100644 --- a/UKSF.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSF.Api/Controllers/Accounts/AccountsController.cs @@ -147,8 +147,8 @@ public IActionResult GetAccountsUnder([FromQuery] bool reverse = false) { [HttpGet("roster"), Authorize] public IActionResult GetRosterAccounts() { List accountObjects = new List(); - List accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER); - accounts = accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); + IEnumerable accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER); + accounts = accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname); accountObjects.AddRange( accounts.Select( document => new { @@ -167,7 +167,7 @@ public IActionResult GetRosterAccounts() { [HttpGet("online")] public IActionResult GetOnlineAccounts() { HashSet teamnspeakClients = teamspeakService.GetOnlineTeamspeakClients(); - List allAccounts = accountService.Data.Get(); + IEnumerable allAccounts = accountService.Data.Get(); var clients = teamnspeakClients.Where(x => x != null).Select(x => new {account = allAccounts.FirstOrDefault(y => y.teamspeakIdentities != null && y.teamspeakIdentities.Any(z => z.Equals(x.clientDbId))), client = x}).ToList(); var clientAccounts = clients.Where(x => x.account != null && x.account.membershipState == MembershipState.MEMBER).OrderBy(x => x.account.rank, new RankComparer(ranksService)).ThenBy(x => x.account.lastname).ThenBy(x => x.account.firstname); List commandAccounts = unitsService.GetAuxilliaryRoot().members; diff --git a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs index 458ad554..e20f9fe1 100644 --- a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs +++ b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs @@ -51,7 +51,7 @@ IVariablesDataService variablesDataService [HttpGet, Authorize] public IActionResult Get() { - List allRequests = commandRequestService.Data.Get(); + IEnumerable allRequests = commandRequestService.Data.Get(); List myRequests = new List(); List otherRequests = new List(); string contextId = sessionService.GetContextId(); diff --git a/UKSF.Api/Controllers/RecruitmentController.cs b/UKSF.Api/Controllers/RecruitmentController.cs index 93077920..d5065368 100644 --- a/UKSF.Api/Controllers/RecruitmentController.cs +++ b/UKSF.Api/Controllers/RecruitmentController.cs @@ -50,7 +50,7 @@ public IActionResult GetRecruitmentStats() { string account = sessionService.GetContextId(); List activity = new List(); foreach (Account recruiterAccount in recruitmentService.GetRecruiters()) { - List recruiterApplications = accountService.Data.Get(x => x.application != null && x.application.recruiter == recruiterAccount.id); + List recruiterApplications = accountService.Data.Get(x => x.application != null && x.application.recruiter == recruiterAccount.id).ToList(); activity.Add( new { account = new {recruiterAccount.id, recruiterAccount.settings}, diff --git a/UKSF.Api/Controllers/VariablesController.cs b/UKSF.Api/Controllers/VariablesController.cs index 6e0e8d17..cf4ce8bb 100644 --- a/UKSF.Api/Controllers/VariablesController.cs +++ b/UKSF.Api/Controllers/VariablesController.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Admin; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; @@ -13,9 +12,7 @@ namespace UKSF.Api.Controllers { public class VariablesController : Controller { private readonly IVariablesDataService variablesDataService; - public VariablesController(IVariablesDataService variablesDataService) { - this.variablesDataService = variablesDataService; - } + public VariablesController(IVariablesDataService variablesDataService) => this.variablesDataService = variablesDataService; [HttpGet, Authorize] public IActionResult GetAll() => Ok(variablesDataService.Get()); diff --git a/UKSF.Common/JsonUtilities.cs b/UKSF.Common/JsonUtilities.cs index a428728d..f743aeb0 100644 --- a/UKSF.Common/JsonUtilities.cs +++ b/UKSF.Common/JsonUtilities.cs @@ -3,8 +3,10 @@ namespace UKSF.Common { public static class JsonUtilities { public static T Copy(this object source) { - JsonSerializerSettings deserializeSettings = new JsonSerializerSettings {ObjectCreationHandling = ObjectCreationHandling.Replace}; + JsonSerializerSettings deserializeSettings = new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace }; return JsonConvert.DeserializeObject(JsonConvert.SerializeObject(source), deserializeSettings); } + + public static string Escape(this string jsonString) => jsonString.Replace("\\", "\\\\"); // .Replace(@"\b", "\\\\b").Replace(@"\t", "\\\\t").Replace(@"\f", "\\\\f").Replace(@"\r", "\\\\r"); } } diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index ae1cda66..be6a996d 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -129,7 +129,7 @@ await MongoTest( async database => { (DataCollection dataCollection, _) = await SetupTestCollection(database); - List subject = dataCollection.Get(x => x.order == 0); + List subject = dataCollection.Get(x => x.order == 0).ToList(); subject.Should().NotBeNull(); subject.Count.Should().Be(5); @@ -144,7 +144,7 @@ await MongoTest( async database => { (DataCollection dataCollection, _) = await SetupTestCollection(database); - List subject = dataCollection.Get(); + List subject = dataCollection.Get().ToList(); subject.Should().NotBeNull(); subject.Count.Should().Be(7); diff --git a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs index 93045ff2..c8c15901 100644 --- a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs @@ -36,7 +36,7 @@ public void ShouldGetOrderedCollection() { VariableItem item3 = new VariableItem {key = "DISCORD_IDS"}; mockCollection = new List {item1, item2, item3}; - List subject = variablesDataService.Get(); + IEnumerable subject = variablesDataService.Get(); subject.Should().ContainInOrder(item3, item1, item2); } diff --git a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs index bf850535..65db6052 100644 --- a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs @@ -40,7 +40,7 @@ public void ShouldCacheCollectionForGet() { mockCachedDataService.Get(); mockCachedDataService.Collection.Should().NotBeNull(); - mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); } [Fact] @@ -51,7 +51,7 @@ public void ShouldCacheCollectionForGetByPredicate() { mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - List subject = mockCachedDataService.Get(x => x.Name == "1"); + IEnumerable subject = mockCachedDataService.Get(x => x.Name == "1"); mockCachedDataService.Collection.Should().NotBeNull(); subject.Should().BeSubsetOf(mockCachedDataService.Collection); @@ -68,7 +68,7 @@ public void ShouldCacheCollectionForGetSingle() { MockDataModel subject = mockCachedDataService.GetSingle(item2.id); mockCachedDataService.Collection.Should().NotBeNull(); - mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); subject.Should().Be(item2); } @@ -83,7 +83,7 @@ public void ShouldCacheCollectionForGetSingleByPredicate() { MockDataModel subject = mockCachedDataService.GetSingle(x => x.Name == "2"); mockCachedDataService.Collection.Should().NotBeNull(); - mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); subject.Should().Be(item2); } @@ -98,7 +98,7 @@ public void ShouldCacheCollectionForRefreshWhenNull() { mockCachedDataService.Refresh(); mockCachedDataService.Collection.Should().NotBeNull(); - mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); } [Fact] @@ -109,15 +109,15 @@ public void ShouldGetCachedCollection() { mockCachedDataService.Collection.Should().BeNull(); - List subject1 = mockCachedDataService.Get(); + List subject1 = mockCachedDataService.Get().ToList(); subject1.Should().NotBeNull(); - subject1.Should().BeSameAs(mockCollection); + subject1.Should().BeEquivalentTo(mockCollection); - List subject2 = mockCachedDataService.Get(); + List subject2 = mockCachedDataService.Get().ToList(); subject2.Should().NotBeNull(); - subject2.Should().BeSameAs(mockCollection).And.BeSameAs(subject1); + subject2.Should().BeEquivalentTo(mockCollection).And.BeEquivalentTo(subject1); } [Fact] @@ -132,7 +132,7 @@ public async Task ShouldRefreshCollectionForAdd() { await mockCachedDataService.Add(item1); - mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); mockCachedDataService.Collection.Should().Contain(item1); } @@ -147,7 +147,7 @@ public async Task ShouldRefreshCollectionForDelete() { await mockCachedDataService.Delete(item1.id); - mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); mockCachedDataService.Collection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); } @@ -165,7 +165,7 @@ public async Task ShouldRefreshCollectionForDeleteMany() { await mockCachedDataService.DeleteMany(x => x.Name == "1"); - mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); mockCachedDataService.Collection.Should().HaveCount(1); mockCachedDataService.Collection.Should().Contain(item3); } @@ -183,7 +183,7 @@ public async Task ShouldRefreshCollectionForReplace() { await mockCachedDataService.Replace(item2); - mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); mockCachedDataService.Collection.First().Name.Should().Be("2"); } @@ -199,7 +199,7 @@ public async Task ShouldRefreshCollectionForUpdate() { await mockCachedDataService.Update(item1.id, "Name", "2"); - mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); mockCachedDataService.Collection.First().Name.Should().Be("2"); } @@ -215,7 +215,7 @@ public async Task ShouldRefreshCollectionForUpdateByUpdateDefinition() { await mockCachedDataService.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); - mockCachedDataService.Collection.Should().BeSameAs(mockCollection); + mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); mockCachedDataService.Collection.First().Name.Should().Be("2"); } @@ -236,10 +236,10 @@ public async Task ShouldRefreshCollectionForUpdateMany() { await mockCachedDataService.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "3")); - mockCachedDataService.Collection.Should().BeSameAs(mockCollection); - mockCachedDataService.Collection[0].Name.Should().Be("3"); - mockCachedDataService.Collection[1].Name.Should().Be("3"); - mockCachedDataService.Collection[2].Name.Should().Be("3"); + mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); + mockCachedDataService.Collection.ToList()[0].Name.Should().Be("3"); + mockCachedDataService.Collection.ToList()[1].Name.Should().Be("3"); + mockCachedDataService.Collection.ToList()[2].Name.Should().Be("3"); } } } diff --git a/UKSF.Tests/Unit/Data/DataServiceTests.cs b/UKSF.Tests/Unit/Data/DataServiceTests.cs index b153097b..1d8298a2 100644 --- a/UKSF.Tests/Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceTests.cs @@ -37,14 +37,14 @@ public void ShouldThrowForDeleteForInvalidKey(string id) { act.Should().Throw(); } - [Fact] - public async Task ShouldDoNothingForDeleteManyWhenNoMatchingItems() { - mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); - - await mockDataService.DeleteMany(null); - - mockDataCollection.Verify(x => x.DeleteManyAsync(It.IsAny>>()), Times.Never); - } + // [Fact] + // public async Task ShouldDoNothingForDeleteManyWhenNoMatchingItems() { + // mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); + // + // await mockDataService.DeleteMany(null); + // + // mockDataCollection.Verify(x => x.DeleteManyAsync(It.IsAny>>()), Times.Never); + // } [Theory, InlineData(""), InlineData("1"), InlineData(null)] public void ShouldThrowForInvalidKey(string id) { @@ -60,23 +60,23 @@ public void ShouldThrowForUpdateForInvalidKey(string id) { act.Should().Throw(); } - [Fact] - public void ShouldThrowForReplaceWhenItemNotFound() { - MockDataModel item = new MockDataModel { Name = "1" }; - - Func act = async () => await mockDataService.Replace(item); - - act.Should().Throw(); - } - - [Fact] - public async Task ShouldDoNothingForUpdateManyWhenNoMatchingItems() { - mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); - - await mockDataService.UpdateMany(null, null); - - mockDataCollection.Verify(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>()), Times.Never); - } + // [Fact] + // public void ShouldThrowForReplaceWhenItemNotFound() { + // MockDataModel item = new MockDataModel { Name = "1" }; + // + // Func act = async () => await mockDataService.Replace(item); + // + // act.Should().Throw(); + // } + // + // [Fact] + // public async Task ShouldDoNothingForUpdateManyWhenNoMatchingItems() { + // mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); + // + // await mockDataService.UpdateMany(null, null); + // + // mockDataCollection.Verify(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>()), Times.Never); + // } [Theory, InlineData(""), InlineData("1"), InlineData(null)] public void ShouldThrowForUpdateWithUpdateDefinitionForInvalidKey(string id) { @@ -138,7 +138,7 @@ public void ShouldGetItemByPredicate() { public void ShouldGetItems() { mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - List subject = mockDataService.Get(); + IEnumerable subject = mockDataService.Get(); subject.Should().BeSameAs(mockCollection); } @@ -151,7 +151,7 @@ public void ShouldGetItemsByPredicate() { mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockCollection.Where(x).ToList()); - List subject = mockDataService.Get(x => x.id == item1.id); + IEnumerable subject = mockDataService.Get(x => x.id == item1.id); subject.Should().HaveCount(1).And.Contain(item1); } diff --git a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs index b04e383d..b70e662a 100644 --- a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs @@ -31,7 +31,7 @@ public void ShouldGetSortedCollection() { mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); - List subject = gameServersDataService.Get(); + IEnumerable subject = gameServersDataService.Get(); subject.Should().ContainInOrder(rank2, rank3, rank1); } diff --git a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs index 6b7285f9..091a1772 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using FluentAssertions; using Moq; using UKSF.Api.Data.Operations; @@ -24,29 +25,29 @@ public OperationOrderDataServiceTests() { } [Fact] - public void ShouldGetReversedCollection() { - Opord item1 = new Opord(); - Opord item2 = new Opord(); - Opord item3 = new Opord(); + public void ShouldGetOrderedCollection() { + Opord item1 = new Opord { start = DateTime.Now.AddDays(-1) }; + Opord item2 = new Opord { start = DateTime.Now.AddDays(-2) }; + Opord item3 = new Opord { start = DateTime.Now.AddDays(-3) }; mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); - List subject = operationOrderDataService.Get(); + IEnumerable subject = operationOrderDataService.Get(); subject.Should().ContainInOrder(item3, item2, item1); } [Fact] - public void ShouldGetReversedCollectionByPredicate() { - Opord item1 = new Opord { description = "1" }; - Opord item2 = new Opord { description = "2" }; - Opord item3 = new Opord { description = "3" }; + public void ShouldGetOrderedCollectionByPredicate() { + Opord item1 = new Opord { description = "1", start = DateTime.Now.AddDays(-1) }; + Opord item2 = new Opord { description = "2", start = DateTime.Now.AddDays(-2) }; + Opord item3 = new Opord { description = "1", start = DateTime.Now.AddDays(-3) }; mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); - List subject = operationOrderDataService.Get(x => x.description != string.Empty); + IEnumerable subject = operationOrderDataService.Get(x => x.description == "1"); - subject.Should().ContainInOrder(item3, item2, item1); + subject.Should().ContainInOrder(item3, item1); } } } diff --git a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs index 085a4c33..8e934a88 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using FluentAssertions; using Moq; using UKSF.Api.Data.Operations; @@ -24,29 +25,29 @@ public OperationReportDataServiceTests() { } [Fact] - public void ShouldGetReversedCollection() { - Oprep item1 = new Oprep(); - Oprep item2 = new Oprep(); - Oprep item3 = new Oprep(); + public void ShouldGetOrderedCollection() { + Oprep item1 = new Oprep { start = DateTime.Now.AddDays(-1) }; + Oprep item2 = new Oprep { start = DateTime.Now.AddDays(-2) }; + Oprep item3 = new Oprep { start = DateTime.Now.AddDays(-3) }; - mockDataCollection.Setup(x => x.Get()).Returns(new List {item1, item2, item3}); + mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); - List subject = operationReportDataService.Get(); + IEnumerable subject = operationReportDataService.Get(); subject.Should().ContainInOrder(item3, item2, item1); } [Fact] - public void ShouldGetReversedCollectionByPredicate() { - Oprep item1 = new Oprep { description = "1" }; - Oprep item2 = new Oprep { description = "2" }; - Oprep item3 = new Oprep { description = "3" }; + public void ShouldGetOrderedCollectionByPredicate() { + Oprep item1 = new Oprep { description = "1", start = DateTime.Now.AddDays(-1) }; + Oprep item2 = new Oprep { description = "2", start = DateTime.Now.AddDays(-2) }; + Oprep item3 = new Oprep { description = "1", start = DateTime.Now.AddDays(-3) }; mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); - List subject = operationReportDataService.Get(x => x.description != string.Empty); + IEnumerable subject = operationReportDataService.Get(x => x.description == "1"); - subject.Should().ContainInOrder(item3, item2, item1); + subject.Should().ContainInOrder(item3, item1); } } } diff --git a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs index 46278506..a99ba8a9 100644 --- a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -26,7 +26,7 @@ public void ShouldGetOrderedCollection() { DischargeDataService dischargeDataService = new DischargeDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); - List subject = dischargeDataService.Get(); + IEnumerable subject = dischargeDataService.Get(); subject.Should().ContainInOrder(dischargeCollection2, dischargeCollection3, dischargeCollection1); } diff --git a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs index 2ecf4724..b5320a72 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs @@ -53,7 +53,7 @@ public void ShouldGetSortedCollection() { mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); - List subject = ranksDataService.Get(); + IEnumerable subject = ranksDataService.Get(); subject.Should().ContainInOrder(rank2, rank3, rank1); } diff --git a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs index e9bb3801..74a34e6e 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs @@ -31,7 +31,7 @@ public void ShouldGetSortedCollection() { mockDataCollection.Setup(x => x.Get()).Returns(new List {role1, role2, role3}); - List subject = rolesDataService.Get(); + IEnumerable subject = rolesDataService.Get(); subject.Should().ContainInOrder(role3, role1, role2); } diff --git a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index dfc4fd40..7c9ca11c 100644 --- a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -26,7 +26,7 @@ public void ShouldGetOrderedCollection() { UnitsDataService unitsDataService = new UnitsDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); - List subject = unitsDataService.Get(); + IEnumerable subject = unitsDataService.Get(); subject.Should().ContainInOrder(rank2, rank3, rank1); } @@ -47,7 +47,7 @@ public void ShouldGetOrderedCollectionFromPredicate() { UnitsDataService unitsDataService = new UnitsDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); - List subject = unitsDataService.Get(x => x.type == UnitType.SECTION); + IEnumerable subject = unitsDataService.Get(x => x.type == UnitType.SECTION); subject.Should().ContainInOrder(rank2, rank1); } diff --git a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs index 44c81235..dfed7f2c 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs @@ -32,9 +32,7 @@ public void ShouldGetCorrectIndex() { [Fact] public void ShouldReturnInvalidIndexGetIndexWhenRankNotFound() { - List mockCollection = new List(); - - mockRanksDataService.Setup(x => x.Get()).Returns(mockCollection); + mockRanksDataService.Setup(x => x.Get()).Returns(new List()); int subject = ranksService.GetRankIndex("Private"); diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneLogsActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs similarity index 71% rename from UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneLogsActionTests.cs rename to UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs index 2a348149..e1d7bbe9 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneLogsActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs @@ -1,21 +1,24 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Linq.Expressions; using FluentAssertions; using Moq; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Utility.ScheduledActions; +using UKSF.Api.Models.Game; using UKSF.Api.Models.Message; using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Models.Modpack; using UKSF.Api.Services.Utility.ScheduledActions; using Xunit; namespace UKSF.Tests.Unit.Unit.Services.Utility.ScheduledActions { - public class PruneLogsActionTests { + public class PruneDataActionTests { private readonly Mock mockDataCollectionFactory; - private IPruneLogsAction pruneLogsAction; + private IPruneDataAction pruneDataAction; - public PruneLogsActionTests() => mockDataCollectionFactory = new Mock(); + public PruneDataActionTests() => mockDataCollectionFactory = new Mock(); [Fact] public void ShouldRemoveOldLogsAndNotifications() { @@ -37,11 +40,20 @@ public void ShouldRemoveOldLogsAndNotifications() { new Notification { message = "notification2", timestamp = DateTime.Now.AddDays(-40) }, new Notification { message = "notification3", timestamp = DateTime.Now.AddDays(-25) } }; + List mockModpackBuildCollection = new List { + new ModpackBuild { environment = GameEnvironment.DEV, buildNumber = 1, version = "5.0.0" }, + new ModpackBuild { environment = GameEnvironment.RC, buildNumber = 1, version = "5.18.0" }, + new ModpackBuild { environment = GameEnvironment.RELEASE, buildNumber = 2, version = "5.18.0" }, + new ModpackBuild { environment = GameEnvironment.DEV, buildNumber = 150, version = "5.19.0" } + }; Mock> mockBasicLogMessageDataColection = new Mock>(); Mock> mockWebLogMessageDataColection = new Mock>(); Mock> mockAuditLogMessageDataColection = new Mock>(); Mock> mockNotificationDataColection = new Mock>(); + Mock> mockModpackBuildDataColection = new Mock>(); + + mockModpackBuildDataColection.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockModpackBuildCollection.Where(x)); mockBasicLogMessageDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) .Callback>>(x => mockBasicLogMessageCollection.RemoveAll(y => x.Compile()(y))); @@ -51,29 +63,34 @@ public void ShouldRemoveOldLogsAndNotifications() { .Callback>>(x => mockAuditLogMessageCollection.RemoveAll(y => x.Compile()(y))); mockNotificationDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) .Callback>>(x => mockNotificationCollection.RemoveAll(y => x.Compile()(y))); + mockModpackBuildDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) + .Callback>>(x => mockModpackBuildCollection.RemoveAll(y => x.Compile()(y))); mockDataCollectionFactory.Setup(x => x.CreateDataCollection("logs")).Returns(mockBasicLogMessageDataColection.Object); mockDataCollectionFactory.Setup(x => x.CreateDataCollection("errorLogs")).Returns(mockWebLogMessageDataColection.Object); mockDataCollectionFactory.Setup(x => x.CreateDataCollection("auditLogs")).Returns(mockAuditLogMessageDataColection.Object); mockDataCollectionFactory.Setup(x => x.CreateDataCollection("notifications")).Returns(mockNotificationDataColection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("modpackBuilds")).Returns(mockModpackBuildDataColection.Object); - pruneLogsAction = new PruneDataAction(mockDataCollectionFactory.Object); + pruneDataAction = new PruneDataAction(mockDataCollectionFactory.Object); - pruneLogsAction.Run(); + pruneDataAction.Run(); mockBasicLogMessageCollection.Should().NotContain(x => x.message == "test2"); mockWebLogMessageCollection.Should().NotContain(x => x.message == "error2"); mockAuditLogMessageCollection.Should().NotContain(x => x.message == "audit2"); mockNotificationCollection.Should().NotContain(x => x.message == "notification2"); + mockModpackBuildCollection.Should().NotContain(x => x.version == "5.0.0"); + mockModpackBuildCollection.Should().NotContain(x => x.version == "5.18.0"); } [Fact] public void ShouldReturnActionName() { - pruneLogsAction = new PruneDataAction(mockDataCollectionFactory.Object); + pruneDataAction = new PruneDataAction(mockDataCollectionFactory.Object); - string subject = pruneLogsAction.Name; + string subject = pruneDataAction.Name; - subject.Should().Be("PruneLogsAction"); + subject.Should().Be("PruneDataAction"); } } } From 0e25fee7f9071e53d7184e3459b641577c669a9d Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 2 Aug 2020 16:03:51 +0100 Subject: [PATCH 206/369] Added static mod rebuild conditions - Static mod rebuild if forced by new build modal, previous build was cancelled or failed before static mod was built, previous static mod build failed, or is rebuild where static mod was marked for build - Cleanup - Changed build processor helper to use a better method for getting all logs before exit, with timeout then process kill if some uncaught error --- UKSF.Api.Data/Modpack/BuildsDataService.cs | 3 +- UKSF.Api.Interfaces/Hubs/IModpackClient.cs | 2 - .../Modpack/BuildProcess/IStepLogger.cs | 1 - UKSF.Api.Interfaces/Modpack/IBuildsService.cs | 2 +- .../Modpack/IModpackService.cs | 2 +- UKSF.Api.Models/Modpack/NewBuild.cs | 8 + UKSF.Api.Services/Game/GameServerHelpers.cs | 2 +- UKSF.Api.Services/Game/GameServersService.cs | 1 - .../Integrations/Github/GithubService.cs | 5 +- .../BuildProcess/BuildProcessHelper.cs | 206 ++++++------------ .../Modpack/BuildProcess/BuildQueueService.cs | 2 +- .../Modpack/BuildProcess/StepLogger.cs | 4 - .../Modpack/BuildProcess/Steps/BuildStep.cs | 1 - .../Steps/BuildSteps/BuildStepExtensions.cs | 8 +- .../Steps/BuildSteps/BuildStepPrep.cs | 9 +- .../BuildSteps/BuildStepSignDependencies.cs | 8 +- .../Steps/BuildSteps/BuildStepSources.cs | 87 ++++---- .../BuildSteps/Mods/BuildStepBuildAce.cs | 7 +- .../BuildSteps/Mods/BuildStepBuildAcre.cs | 7 +- .../BuildSteps/Mods/BuildStepBuildF35.cs | 7 +- .../BuildSteps/Mods/BuildStepBuildModpack.cs | 4 +- .../Steps/Common/BuildStepBuildRepo.cs | 8 +- UKSF.Api.Services/Modpack/BuildsService.cs | 31 ++- UKSF.Api.Services/Modpack/ModpackService.cs | 8 +- .../Integrations/GithubController.cs | 2 +- .../Controllers/Modpack/ModpackController.cs | 10 +- UKSF.Common/JsonUtilities.cs | 2 +- 27 files changed, 195 insertions(+), 242 deletions(-) create mode 100644 UKSF.Api.Models/Modpack/NewBuild.cs diff --git a/UKSF.Api.Data/Modpack/BuildsDataService.cs b/UKSF.Api.Data/Modpack/BuildsDataService.cs index a4cf4284..ea8bc3df 100644 --- a/UKSF.Api.Data/Modpack/BuildsDataService.cs +++ b/UKSF.Api.Data/Modpack/BuildsDataService.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; diff --git a/UKSF.Api.Interfaces/Hubs/IModpackClient.cs b/UKSF.Api.Interfaces/Hubs/IModpackClient.cs index cede268a..4a869b76 100644 --- a/UKSF.Api.Interfaces/Hubs/IModpackClient.cs +++ b/UKSF.Api.Interfaces/Hubs/IModpackClient.cs @@ -6,7 +6,5 @@ public interface IModpackClient { Task ReceiveReleaseCandidateBuild(ModpackBuild build); Task ReceiveBuild(ModpackBuild build); Task ReceiveBuildStep(ModpackBuildStep step); - Task ReceiveBuildStepLog(ModpackBuildStepLogItemUpdate logUpdate); - Task ReceiveLargeBuildStep(int index); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs index f3e6933e..d0b2c945 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs @@ -8,7 +8,6 @@ public interface IStepLogger { void LogSkipped(); void LogWarning(string message); void LogError(Exception exception); - void LogError(string message); void LogSurround(string log); void Log(string log, string colour = ""); void LogInline(string log); diff --git a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs index 4faa0faa..00178da9 100644 --- a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs +++ b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs @@ -13,7 +13,7 @@ public interface IBuildsService : IDataBackedService { ModpackBuild GetLatestRcBuild(string version); Task UpdateBuild(ModpackBuild build, UpdateDefinition updateDefinition); Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep); - Task CreateDevBuild(string version, GithubCommit commit); + Task CreateDevBuild(string version, GithubCommit commit, NewBuild newBuild = null); Task CreateRcBuild(string version, GithubCommit commit); Task CreateReleaseBuild(string version); Task SetBuildRunning(ModpackBuild build); diff --git a/UKSF.Api.Interfaces/Modpack/IModpackService.cs b/UKSF.Api.Interfaces/Modpack/IModpackService.cs index a1532f11..8853df9c 100644 --- a/UKSF.Api.Interfaces/Modpack/IModpackService.cs +++ b/UKSF.Api.Interfaces/Modpack/IModpackService.cs @@ -10,7 +10,7 @@ public interface IModpackService { IEnumerable GetDevBuilds(); ModpackRelease GetRelease(string version); ModpackBuild GetBuild(string id); - Task NewBuild(string reference); + Task NewBuild(NewBuild newBuild); Task Rebuild(ModpackBuild build); void CancelBuild(ModpackBuild build); Task UpdateReleaseDraft(ModpackRelease release); diff --git a/UKSF.Api.Models/Modpack/NewBuild.cs b/UKSF.Api.Models/Modpack/NewBuild.cs new file mode 100644 index 00000000..bcd65689 --- /dev/null +++ b/UKSF.Api.Models/Modpack/NewBuild.cs @@ -0,0 +1,8 @@ +namespace UKSF.Api.Models.Modpack { + public class NewBuild { + public string reference; + public bool ace; + public bool acre; + public bool f35; + } +} diff --git a/UKSF.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.Services/Game/GameServerHelpers.cs index a86d2a49..84cf4e8e 100644 --- a/UKSF.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.Services/Game/GameServerHelpers.cs @@ -63,7 +63,7 @@ public static string GetGameServerExecutablePath(this GameServer gameServer) { return Path.Join(VariablesWrapper.VariablesDataService().GetSingle(variableKey).AsString(), "arma3server_x64.exe"); } - public static string GetGameServerSettingsPath() => Path.Join(VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_RELEASE").AsString(), "userconfig"); + public static string GetGameServerSettingsPath() => Path.Join(VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_RELEASE").AsString(), "userconfig", "cba_settings.sqf"); public static string GetGameServerMissionsPath() => VariablesWrapper.VariablesDataService().GetSingle("MISSIONS_PATH").AsString(); diff --git a/UKSF.Api.Services/Game/GameServersService.cs b/UKSF.Api.Services/Game/GameServersService.cs index e2ceae63..221b3999 100644 --- a/UKSF.Api.Services/Game/GameServersService.cs +++ b/UKSF.Api.Services/Game/GameServersService.cs @@ -44,7 +44,6 @@ public async Task GetGameServerStatus(GameServer gameServer) { using HttpClient client = new HttpClient(); client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - client.Timeout = TimeSpan.FromMilliseconds(5); // TODO: REMOVE try { HttpResponseMessage response = await client.GetAsync($"http://localhost:{gameServer.apiPort}/server"); if (!response.IsSuccessStatusCode) { diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 5d7968b0..26f3fd4a 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -16,9 +16,8 @@ namespace UKSF.Api.Services.Integrations.Github { public class GithubService : IGithubService { - // TODO: Use variables for some of these private const string REPO_ORG = "uksf"; - private const string REPO_NAME = "modpack"; // "BuildTest"; + private const string REPO_NAME = "modpack"; private const string VERSION_FILE = "addons/main/script_version.hpp"; private const int APP_ID = 53456; private const long APP_INSTALLATION = 6681715; @@ -62,7 +61,7 @@ public async Task IsReferenceValid(string reference) { string version = await GetReferenceVersion(reference); int[] versionParts = version.Split('.').Select(int.Parse).ToArray(); // TODO: Update minor with version with udpated make for this build system - return versionParts[0] >= 5; // && versionParts[1] > 18; + return versionParts[0] >= 5 && versionParts[1] > 18; } public async Task GetLatestReferenceCommit(string reference) { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index ecd251fd..1e091d1b 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; using System.Linq; -using System.Management.Automation; -using System.Management.Automation.Runspaces; using System.Threading; using System.Threading.Tasks; using Newtonsoft.Json.Linq; @@ -13,40 +10,53 @@ namespace UKSF.Api.Services.Modpack.BuildProcess { public static class BuildProcessHelper { - public static string RunProcess( + public static async Task> RunProcess( IStepLogger logger, - CancellationToken cancellationToken, + CancellationTokenSource cancellationTokenSource, string workingDirectory, string executable, string args, + double timeout, bool suppressOutput = false, bool raiseErrors = true, bool errorSilently = false, List errorExclusions = null ) { - using Process process = new Process { - StartInfo = { - FileName = executable, - WorkingDirectory = workingDirectory, - Arguments = args, - UseShellExecute = false, - CreateNoWindow = true, - RedirectStandardOutput = true, - RedirectStandardError = true - } - }; + using Process process = new Process { + StartInfo = { + FileName = executable, + WorkingDirectory = workingDirectory, + Arguments = args, + UseShellExecute = false, + CreateNoWindow = true, + RedirectStandardOutput = true, + RedirectStandardError = true + } + }; - try { - process.EnableRaisingEvents = false; - string result = ""; - List exceptions = new List(); + List processTasks = new List(); + process.EnableRaisingEvents = true; + Exception capturedException = null; + CancellationTokenSource errorCancellationTokenSource = new CancellationTokenSource(); + TaskCompletionSource processExitEvent = new TaskCompletionSource(); + process.Exited += (sender, receivedEventArgs) => { + ((Process)sender)?.WaitForExit(); + processExitEvent.TrySetResult(true); + }; + processTasks.Add(processExitEvent.Task); + + List results = new List(); + TaskCompletionSource outputCloseEvent = new TaskCompletionSource(); process.OutputDataReceived += (sender, receivedEventArgs) => { - if (receivedEventArgs.Data == null) return; + if (receivedEventArgs.Data == null) { + outputCloseEvent.TrySetResult(true); + return; + } string message = receivedEventArgs.Data; if (!string.IsNullOrEmpty(message)) { - result = message; + results.Add(message); } if (!suppressOutput) { @@ -60,149 +70,57 @@ public static string RunProcess( logger.Log(message); } } catch (Exception exception) { - exceptions.Add(new Exception($"Json failed: {json}\n\n{exception}")); + capturedException = new Exception($"Json failed: {json}\n\n{exception}"); + errorCancellationTokenSource.Cancel(); } } }; + processTasks.Add(outputCloseEvent.Task); + TaskCompletionSource errorCloseEvent = new TaskCompletionSource(); process.ErrorDataReceived += (sender, receivedEventArgs) => { - if (receivedEventArgs.Data == null) return; + if (receivedEventArgs.Data == null) { + errorCloseEvent.TrySetResult(true); + return; + } string message = receivedEventArgs.Data; if (string.IsNullOrEmpty(message)) return; if (errorExclusions != null && errorExclusions.All(x => !message.ContainsIgnoreCase(x))) return; - Exception exception = new Exception(message); - exceptions.Add(exception); + capturedException = new Exception(message); + errorCancellationTokenSource.Cancel(); }; + processTasks.Add(errorCloseEvent.Task); + + await using CancellationTokenRegistration unused = cancellationTokenSource.Token.Register(process.Kill); + await using CancellationTokenRegistration _ = errorCancellationTokenSource.Token.Register(process.Kill); - using CancellationTokenRegistration unused = cancellationToken.Register(process.Kill); + Task processCompletionTask = Task.WhenAll(processTasks); + Task awaitingTask = Task.WhenAny(Task.Delay((int) timeout, cancellationTokenSource.Token), processCompletionTask); process.Start(); process.BeginOutputReadLine(); process.BeginErrorReadLine(); - process.WaitForExit(); - - if (exceptions.Any()) { - if (raiseErrors) { - throw exceptions.First(); - } + if (await awaitingTask.ConfigureAwait(false) == processCompletionTask) { + if (capturedException != null) { + if (raiseErrors) { + throw capturedException; + } - if (!errorSilently) { - IEnumerable exceptionStrings = exceptions.Select(x => x.ToString()); - logger.LogError(string.Join("\n\n", exceptionStrings)); + if (!errorSilently) { + logger.LogError(capturedException); + } } - } - - return result; - } finally { - process.Close(); - } - } - - [SuppressMessage("ReSharper", "MethodHasAsyncOverload")] // async runspace.OpenAsync is not as it seems - public static async Task> RunPowershell( - IStepLogger logger, - CancellationToken cancellationToken, - string workingDirectory, - IEnumerable commands, - bool suppressOutput = false, - bool raiseErrors = true, - bool errorSilently = false, - List errorExclusions = null - ) { - using Runspace runspace = RunspaceFactory.CreateRunspace(); - runspace.Open(); - runspace.SessionStateProxy.Path.SetLocation(workingDirectory); - - void Log(object sender, DataAddedEventArgs eventArgs) { - PSDataCollection streamObjectsReceived = sender as PSDataCollection; - InformationRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; - logger.Log(currentStreamRecord?.MessageData.ToString()); - } - - void Verbose(object sender, DataAddedEventArgs eventArgs) { - PSDataCollection streamObjectsReceived = sender as PSDataCollection; - VerboseRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; - logger.Log(currentStreamRecord?.Message); - } - - void ProgressLog(object sender, DataAddedEventArgs eventArgs) { - PSDataCollection streamObjectsReceived = sender as PSDataCollection; - ProgressRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; - logger.Log(currentStreamRecord?.PercentComplete.ToString()); - } - - void Warning(object sender, DataAddedEventArgs eventArgs) { - PSDataCollection streamObjectsReceived = sender as PSDataCollection; - WarningRecord currentStreamRecord = streamObjectsReceived?[eventArgs.Index]; - logger.LogWarning(currentStreamRecord?.Message); - } - - using PowerShell powerShell = PowerShell.Create(runspace); - - if (!suppressOutput) { - powerShell.Streams.Information.DataAdded += Log; - powerShell.Streams.Verbose.DataAdded += Verbose; - powerShell.Streams.Progress.DataAdded += ProgressLog; - } - - powerShell.Streams.Warning.DataAdded += Warning; - - foreach (string command in commands) { - powerShell.AddScript(command); - } - - PSDataCollection result = await powerShell.InvokeAsync(cancellationToken); - List exceptions = powerShell.Streams.Error.Select(x => x.Exception).ToList(); - if (errorExclusions != null) { - exceptions = exceptions.Where(x => errorExclusions.All(y => !x.Message.ContainsIgnoreCase(y))).ToList(); - } - - if (!suppressOutput) { - LogPowershellResult(logger, result); - } - - if (exceptions.Any()) { - if (raiseErrors) { - if (suppressOutput) { - LogPowershellResult(logger, result); + } else { + try { + process.Kill(); + } catch { + logger.LogWarning("Process timed out"); } - - runspace.Close(); - throw exceptions.First(); - } - - if (!errorSilently) { - IEnumerable exceptionStrings = exceptions.Select(x => x.ToString()); - logger.LogError(string.Join("\n\n", exceptionStrings)); } - } - - runspace.Close(); - return result; - } - - private static Task> InvokeAsync(this PowerShell powerShell, CancellationToken cancellationToken) { - return Task.Factory.StartNew( - () => { - IAsyncResult invocation = powerShell.BeginInvoke(); - WaitHandle.WaitAny(new[] { invocation.AsyncWaitHandle, cancellationToken.WaitHandle }); - - if (cancellationToken.IsCancellationRequested) { - powerShell.Stop(); - } - - cancellationToken.ThrowIfCancellationRequested(); - return powerShell.EndInvoke(invocation); - }, - cancellationToken - ); - } - private static void LogPowershellResult(IStepLogger logger, IEnumerable result) { - IEnumerable resultStrings = result.Select(x => x.BaseObject.ToString()); - logger.Log(string.Join("\n", resultStrings)); + return results; } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs index 874356cc..1244049b 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs @@ -68,7 +68,7 @@ private async Task ProcessQueue() { // Will require better game <-> api interaction to communicate with servers and headless clients properly if (gameServersService.GetGameInstanceCount() > 0) { queue.Enqueue(build); - await Task.Delay(TimeSpan.FromSeconds(10)); // TODO: Increase delay + await Task.Delay(TimeSpan.FromMinutes(15)); continue; } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs index ae5c8669..b0105e74 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs @@ -37,10 +37,6 @@ public void LogError(Exception exception) { LogLines($"Error\n{exception.Message}\n{exception.StackTrace}\n\nFailed: {buildStep.name}", "red"); } - public void LogError(string message) { - LogLines($"Error\n{message}\n\nFailed: {buildStep.name}", "red"); - } - public void LogSurround(string log) { LogLines(log, "cadetblue"); } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs index 15579dc4..a65a3142 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs @@ -162,7 +162,6 @@ private void StartUpdatePusher() { updatePusherCancellationTokenSource.Token ); } catch (OperationCanceledException) { - // ignored Console.Out.WriteLine("cancelled"); } catch (Exception exception) { Console.Out.WriteLine(exception); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs index b52f46c6..e004cb42 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading; @@ -30,10 +31,9 @@ private async Task SignExtensions(IReadOnlyCollection files) { await BatchProcessFiles( files, 2, - file => { - BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, file.DirectoryName, signTool, $"sign /f \"{certPath}\" \"{file.FullName}\"", true); + async file => { + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, file.DirectoryName, signTool, $"sign /f \"{certPath}\" \"{file.FullName}\"", TimeSpan.FromSeconds(10).Milliseconds, true); Interlocked.Increment(ref signed); - return Task.CompletedTask; }, () => $"Signed {signed} of {total} extensions", "Failed to sign extension" diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs index 4e31afc9..8789495d 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs @@ -1,4 +1,5 @@ -using System.Threading.Tasks; +using System; +using System.Threading.Tasks; using UKSF.Api.Services.Admin; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { @@ -6,13 +7,11 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { public class BuildStepPrep : BuildStep { public const string NAME = "Prep"; - protected override Task ProcessExecute() { + protected override async Task ProcessExecute() { Logger.Log("Mounting build environment"); string projectsPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_PROJECTS").AsString(); - BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, "C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\""); - - return Task.CompletedTask; + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, "C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\"", TimeSpan.FromSeconds(10).TotalMilliseconds); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs index 30939e94..fd9713c0 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs @@ -32,7 +32,7 @@ protected override async Task SetupExecute() { Logger.LogSurround("Cleared keys directories"); Logger.LogSurround("\nCreating key..."); - BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, keygenPath, dsCreateKey, keyName, true); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, keygenPath, dsCreateKey, keyName, TimeSpan.FromSeconds(10).TotalMilliseconds, true); Logger.Log($"Created {keyName}"); await CopyFiles(keygen, keys, new List { new FileInfo(Path.Join(keygenPath, $"{keyName}.bikey")) }); Logger.LogSurround("Created key"); @@ -76,11 +76,9 @@ private async Task SignFiles(string keygenPath, string addonsPath, IReadOnlyColl await BatchProcessFiles( files, 10, - file => { - BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, addonsPath, dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", true); + async file => { + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, addonsPath, dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", TimeSpan.FromSeconds(10).TotalMilliseconds, true); Interlocked.Increment(ref signed); - - return Task.CompletedTask; }, () => $"Signed {signed} of {total} files", "Failed to sign file" diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 87b244f3..e53cebcb 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -1,65 +1,71 @@ using System; using System.IO; +using System.Linq; using System.Threading.Tasks; -using UKSF.Api.Services.Admin; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] public class BuildStepSources : BuildStep { public const string NAME = "Sources"; - private string gitPath; - protected override Task ProcessExecute() { + protected override async Task ProcessExecute() { Logger.Log("Checking out latest sources"); - gitPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_GIT").AsString(); - CheckoutStaticSource("ACE", "ace", "@ace", "@uksf_ace", "uksfcustom"); - CheckoutStaticSource("ACRE", "acre", "@acre2", "@acre2", "customrelease"); - CheckoutStaticSource("UKSF F-35", "f35", "@uksf_f35", "@uksf", "master"); - CheckoutModpack(); - - return Task.CompletedTask; + await CheckoutStaticSource("ACE", "ace", "@ace", "@uksf_ace", "uksfcustom"); + await CheckoutStaticSource("ACRE", "acre", "@acre2", "@acre2", "customrelease"); + await CheckoutStaticSource("UKSF F-35", "f35", "@uksf_f35", "@uksf", "master"); + await CheckoutModpack(); } - private void CheckoutStaticSource(string displayName, string modName, string releaseName, string repoName, string branchName) { + private async Task CheckoutStaticSource(string displayName, string modName, string releaseName, string repoName, string branchName) { Logger.LogSurround($"\nChecking out latest {displayName}..."); - string path = Path.Join(GetBuildSourcesPath(), modName); - DirectoryInfo directory = new DirectoryInfo(path); - if (!directory.Exists) { - throw new Exception($"{displayName} source directory does not exist. {displayName} should be cloned before running a build."); - } + bool forceBuild = GetEnvironmentVariable($"{modName}_updated"); bool updated; - string releasePath = Path.Join(GetBuildSourcesPath(), modName, "release", releaseName); - string repoPath = Path.Join(GetBuildEnvironmentPath(), "Repo", repoName); - DirectoryInfo release = new DirectoryInfo(releasePath); - DirectoryInfo repo = new DirectoryInfo(repoPath); + if (forceBuild) { + Logger.Log("Force build"); + updated = true; + } else { + string path = Path.Join(GetBuildSourcesPath(), modName); + DirectoryInfo directory = new DirectoryInfo(path); + if (!directory.Exists) { + throw new Exception($"{displayName} source directory does not exist. {displayName} should be cloned before running a build."); + } - string before = BuildProcessHelper.RunProcess( - Logger, - CancellationTokenSource.Token, - path, - "cmd.exe", - $"/c \"git reset --hard HEAD && git clean -d -f && git checkout {branchName} && git rev-parse HEAD\"", - true, - false, - true - ); - string after = BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, path, "cmd.exe", "/c \"git pull && git rev-parse HEAD\"", true, false, true); + string releasePath = Path.Join(GetBuildSourcesPath(), modName, "release", releaseName); + string repoPath = Path.Join(GetBuildEnvironmentPath(), "Repo", repoName); + DirectoryInfo release = new DirectoryInfo(releasePath); + DirectoryInfo repo = new DirectoryInfo(repoPath); - if (release.Exists && repo.Exists) { - Logger.Log($"{before?.Substring(0, 7)} vs {after?.Substring(0, 7)}"); - updated = !string.Equals(before, after); - } else { - Logger.Log("No release or repo directory, will build"); - updated = true; + await BuildProcessHelper.RunProcess( + Logger, + CancellationTokenSource, + path, + "cmd.exe", + $"/c \"git reset --hard HEAD && git clean -d -f && git checkout {branchName}\"", + TimeSpan.FromSeconds(30).TotalMilliseconds, + true, + false, + true + ); + string before = (await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, path, "cmd.exe", "/c \"git rev-parse HEAD\"", TimeSpan.FromSeconds(10).TotalMilliseconds, true, false, true)).Last(); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, path, "cmd.exe", "/c \"git pull\"", TimeSpan.FromSeconds(30).TotalMilliseconds, true, false, true); + string after = (await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, path, "cmd.exe", "/c \"git rev-parse HEAD\"", TimeSpan.FromSeconds(10).TotalMilliseconds, true, false, true)).Last(); + + if (release.Exists && repo.Exists) { + Logger.Log($"{before?.Substring(0, 7)} vs {after?.Substring(0, 7)}"); + updated = !string.Equals(before, after); + } else { + Logger.Log("No release or repo directory, will build"); + updated = true; + } } SetEnvironmentVariable($"{modName}_updated", updated); Logger.LogSurround($"Checked out latest {displayName}{(updated ? "" : " (No Changes)")}"); } - private void CheckoutModpack() { + private async Task CheckoutModpack() { string reference = string.Equals(Build.commit.branch, "None") ? Build.commit.after : Build.commit.branch; string referenceName = string.Equals(Build.commit.branch, "None") ? reference : $"latest {reference}"; Logger.LogSurround("\nChecking out modpack..."); @@ -70,12 +76,13 @@ private void CheckoutModpack() { } Logger.Log($"Checking out {referenceName}"); - BuildProcessHelper.RunProcess( + await BuildProcessHelper.RunProcess( Logger, - CancellationTokenSource.Token, + CancellationTokenSource, modpackPath, "cmd.exe", $"/c \"git reset --hard HEAD && git clean -d -f && git checkout {reference} && git pull\"", + TimeSpan.FromSeconds(30).TotalMilliseconds, true, false, true diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs index fc4a0f71..c60bd8db 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.IO; using System.Threading.Tasks; @@ -12,6 +13,8 @@ public class BuildStepBuildAce : ModBuildStep { public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); protected override async Task ProcessExecute() { + UpdateInterval = TimeSpan.FromMilliseconds(500); + Logger.Log("Running build for ACE"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); @@ -19,7 +22,7 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf_ace"); Logger.LogSurround("\nRunning make.py..."); - BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, toolsPath, PythonPath, MakeCommand()); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect"), TimeSpan.FromMinutes(3).TotalMilliseconds); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving ACE release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index c13b09c4..666beaaf 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.IO; using System.Threading.Tasks; @@ -18,6 +19,8 @@ public class BuildStepBuildAcre : ModBuildStep { public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); protected override async Task ProcessExecute() { + UpdateInterval = TimeSpan.FromMilliseconds(500); + Logger.Log("Running build for ACRE"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); @@ -25,7 +28,7 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@acre2"); Logger.LogSurround("\nRunning make.py..."); - BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, toolsPath, PythonPath, MakeCommand("compile"), errorExclusions: errorExclusions); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect compile"), TimeSpan.FromMinutes(3).TotalMilliseconds, errorExclusions: errorExclusions); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving ACRE release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs index 85c91e4a..77f26090 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.IO; using System.Threading.Tasks; @@ -11,6 +12,8 @@ public class BuildStepBuildF35 : ModBuildStep { public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); protected override async Task ProcessExecute() { + UpdateInterval = TimeSpan.FromMilliseconds(500); + Logger.Log("Running build for F-35"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); @@ -20,7 +23,7 @@ protected override async Task ProcessExecute() { DirectoryInfo dependencies = new DirectoryInfo(dependenciesPath); Logger.LogSurround("\nRunning make.py..."); - BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, toolsPath, PythonPath, MakeCommand()); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect"), TimeSpan.FromMinutes(1).TotalMilliseconds); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving F-35 pbos to uksf dependencies..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs index 2130fc4c..1ae2f1e1 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs @@ -9,7 +9,7 @@ public class BuildStepBuildModpack : ModBuildStep { private const string MOD_NAME = "modpack"; protected override async Task ProcessExecute() { - UpdateInterval = TimeSpan.FromMilliseconds(250); + UpdateInterval = TimeSpan.FromMilliseconds(500); Logger.Log("Running build for UKSF"); @@ -18,7 +18,7 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf"); Logger.LogSurround("\nRunning make.py..."); - BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, toolsPath, PythonPath, MakeCommand("redirect")); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect"), TimeSpan.FromMinutes(3).TotalMilliseconds); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving UKSF release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs index 81f654af..b0a1d8c1 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs @@ -1,4 +1,4 @@ -using System.IO; +using System; using System.Threading.Tasks; using UKSF.Api.Services.Admin; @@ -7,14 +7,12 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { public class BuildStepBuildRepo : BuildStep { public const string NAME = "Build Repo"; - protected override Task ProcessExecute() { + protected override async Task ProcessExecute() { string repoName = GetEnvironmentRepoName(); Logger.Log($"Building {repoName} repo"); string arma3SyncPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_ARMA3SYNC").AsString(); - BuildProcessHelper.RunProcess(Logger, CancellationTokenSource.Token, arma3SyncPath, "Java", $"-jar .\\ArmA3Sync.jar -BUILD {repoName}"); - - return Task.CompletedTask; + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, arma3SyncPath, "Java", $"-jar .\\ArmA3Sync.jar -BUILD {repoName}", TimeSpan.FromMinutes(5).TotalMilliseconds); } } } diff --git a/UKSF.Api.Services/Modpack/BuildsService.cs b/UKSF.Api.Services/Modpack/BuildsService.cs index ed1d4009..ec4f9726 100644 --- a/UKSF.Api.Services/Modpack/BuildsService.cs +++ b/UKSF.Api.Services/Modpack/BuildsService.cs @@ -41,7 +41,7 @@ public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep public ModpackBuild GetLatestRcBuild(string version) => GetRcBuilds().FirstOrDefault(x => x.version == version); - public async Task CreateDevBuild(string version, GithubCommit commit) { + public async Task CreateDevBuild(string version, GithubCommit commit, NewBuild newBuild = null) { ModpackBuild previousBuild = GetLatestDevBuild(); string builderId = accountService.Data.GetSingle(x => x.email == commit.author)?.id; ModpackBuild build = new ModpackBuild { @@ -52,6 +52,8 @@ public async Task CreateDevBuild(string version, GithubCommit comm builderId = builderId, steps = buildStepService.GetSteps(GameEnvironment.DEV) }; + SetEnvironmentVariables(build, previousBuild, newBuild); + await Data.Add(build); return build; } @@ -67,6 +69,7 @@ public async Task CreateRcBuild(string version, GithubCommit commi builderId = builderId, steps = buildStepService.GetSteps(GameEnvironment.RC) }; + SetEnvironmentVariables(build, previousBuild); await Data.Add(build); return build; @@ -101,7 +104,8 @@ public async Task CreateRebuild(ModpackBuild build, string newSha environment = latestBuild.environment, steps = buildStepService.GetSteps(build.environment), commit = latestBuild.commit, - builderId = sessionService.GetContextId() + builderId = sessionService.GetContextId(), + environmentVariables = latestBuild.environmentVariables }; if (!string.IsNullOrEmpty(newSha)) { rebuild.commit.after = newSha; @@ -162,5 +166,28 @@ private async Task FinishBuild(ModpackBuild build, ModpackBuildResult result) { build.endTime = DateTime.Now; await Data.Update(build, Builders.Update.Set(x => x.running, false).Set(x => x.finished, true).Set(x => x.buildResult, result).Set(x => x.endTime, DateTime.Now)); } + + private static void SetEnvironmentVariables(ModpackBuild build, ModpackBuild previousBuild, NewBuild newBuild = null) { + CheckEnvironmentVariable(build, previousBuild, "ace_updated", "Build ACE", newBuild?.ace ?? false); + CheckEnvironmentVariable(build, previousBuild, "acre_updated", "Build ACRE", newBuild?.acre ?? false); + CheckEnvironmentVariable(build, previousBuild, "f35_updated", "Build F-35", newBuild?.f35 ?? false); + } + + private static void CheckEnvironmentVariable(ModpackBuild build, ModpackBuild previousBuild, string key, string stepName, bool force) { + if (force) { + build.environmentVariables[key] = true; + return; + } + + if (previousBuild.environmentVariables.ContainsKey(key)) { + bool updated = (bool) previousBuild.environmentVariables[key]; + if (updated) { + ModpackBuildStep step = previousBuild.steps.FirstOrDefault(x => x.name == stepName); + if (step != null && (!step.finished || step.buildResult == ModpackBuildResult.FAILED || step.buildResult == ModpackBuildResult.CANCELLED)) { + build.environmentVariables[key] = true; + } + } + } + } } } diff --git a/UKSF.Api.Services/Modpack/ModpackService.cs b/UKSF.Api.Services/Modpack/ModpackService.cs index 799bc4af..95ad8cc0 100644 --- a/UKSF.Api.Services/Modpack/ModpackService.cs +++ b/UKSF.Api.Services/Modpack/ModpackService.cs @@ -38,14 +38,14 @@ public ModpackService(IReleaseService releaseService, IBuildsService buildsServi public ModpackBuild GetBuild(string id) => buildsService.Data.GetSingle(x => x.id == id); - public async Task NewBuild(string reference) { - GithubCommit commit = await githubService.GetLatestReferenceCommit(reference); + public async Task NewBuild(NewBuild newBuild) { + GithubCommit commit = await githubService.GetLatestReferenceCommit(newBuild.reference); if (!string.IsNullOrEmpty(sessionService.GetContextId())) { commit.author = sessionService.GetContextEmail(); } - string version = await githubService.GetReferenceVersion(reference); - ModpackBuild build = await buildsService.CreateDevBuild(version, commit); + string version = await githubService.GetReferenceVersion(newBuild.reference); + ModpackBuild build = await buildsService.CreateDevBuild(version, commit, newBuild); LogWrapper.AuditLog($"New build created ({GetBuildName(build)})"); buildQueueService.QueueBuild(build); } diff --git a/UKSF.Api/Controllers/Integrations/GithubController.cs b/UKSF.Api/Controllers/Integrations/GithubController.cs index bbac5537..2f7de1c6 100644 --- a/UKSF.Api/Controllers/Integrations/GithubController.cs +++ b/UKSF.Api/Controllers/Integrations/GithubController.cs @@ -15,7 +15,7 @@ namespace UKSF.Api.Controllers.Integrations { [Route("[controller]")] public class GithubController : Controller { private const string PUSH_EVENT = "push"; - private const string REPO_NAME = "modpack"; //"BuildTest"; + private const string REPO_NAME = "modpack"; private const string DEV = "refs/heads/dev"; private const string RELEASE = "refs/heads/release"; diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs index 00bbc287..936e288c 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -90,13 +90,13 @@ public async Task RegenerateChangelog(string version) { return Ok(modpackService.GetRelease(version)); } - [HttpGet("newbuild/{reference}"), Authorize, Roles(RoleDefinitions.TESTER)] - public async Task NewBuild(string reference) { - if (!await githubService.IsReferenceValid(reference)) { - return BadRequest($"{reference} cannot be built as its version does not have the required make files"); + [HttpPost("newbuild"), Authorize, Roles(RoleDefinitions.TESTER)] + public async Task NewBuild([FromBody] NewBuild newBuild) { + if (!await githubService.IsReferenceValid(newBuild.reference)) { + return BadRequest($"{newBuild.reference} cannot be built as its version does not have the required make files"); } - await modpackService.NewBuild(reference); + await modpackService.NewBuild(newBuild); return Ok(); } } diff --git a/UKSF.Common/JsonUtilities.cs b/UKSF.Common/JsonUtilities.cs index f743aeb0..76b885d4 100644 --- a/UKSF.Common/JsonUtilities.cs +++ b/UKSF.Common/JsonUtilities.cs @@ -7,6 +7,6 @@ public static T Copy(this object source) { return JsonConvert.DeserializeObject(JsonConvert.SerializeObject(source), deserializeSettings); } - public static string Escape(this string jsonString) => jsonString.Replace("\\", "\\\\"); // .Replace(@"\b", "\\\\b").Replace(@"\t", "\\\\t").Replace(@"\f", "\\\\f").Replace(@"\r", "\\\\r"); + public static string Escape(this string jsonString) => jsonString.Replace("\\", "\\\\"); } } From 15fc385c54bdc0de0c40515175d9d3683897d29a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 2 Aug 2020 16:14:45 +0100 Subject: [PATCH 207/369] Temporary channel ids for discord build notifs --- .../Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs index 76240451..e5947f63 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs @@ -26,7 +26,7 @@ protected override async Task ProcessExecute() { ModpackRelease release = releaseService.GetRelease(Build.version); await discordService.SendMessageToEveryone(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_RELEASE").AsUlong(), GetDiscordMessage(release)); } else { - await discordService.SendMessage(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_DEV").AsUlong(), GetDiscordMessage()); + await discordService.SendMessage(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_RELEASE").AsUlong(), GetDiscordMessage()); // TODO: Change back to DID_C_MODPACK_DEV and change DID_C_MODPACK_RELEASE to live channel } Logger.Log("Notifications sent"); From 7bf2d2cfb849f01a622c5b5ab54c023a7e5b368d Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 2 Aug 2020 16:40:20 +0100 Subject: [PATCH 208/369] Check if previous build exists before trying to pull env vars --- UKSF.Api.Services/Modpack/BuildsService.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildsService.cs b/UKSF.Api.Services/Modpack/BuildsService.cs index ec4f9726..274f40a1 100644 --- a/UKSF.Api.Services/Modpack/BuildsService.cs +++ b/UKSF.Api.Services/Modpack/BuildsService.cs @@ -52,7 +52,10 @@ public async Task CreateDevBuild(string version, GithubCommit comm builderId = builderId, steps = buildStepService.GetSteps(GameEnvironment.DEV) }; - SetEnvironmentVariables(build, previousBuild, newBuild); + + if (previousBuild != null) { + SetEnvironmentVariables(build, previousBuild, newBuild); + } await Data.Add(build); return build; @@ -69,7 +72,10 @@ public async Task CreateRcBuild(string version, GithubCommit commi builderId = builderId, steps = buildStepService.GetSteps(GameEnvironment.RC) }; - SetEnvironmentVariables(build, previousBuild); + + if (previousBuild != null) { + SetEnvironmentVariables(build, previousBuild); + } await Data.Add(build); return build; From 49fd8eeeb6e24a140928194d6bdca3b7528016bc Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 2 Aug 2020 16:59:15 +0100 Subject: [PATCH 209/369] Add subst print for prep plus logging --- UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs | 1 + .../Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index 1e091d1b..8286719f 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -113,6 +113,7 @@ public static async Task> RunProcess( } } } else { + logger.LogWarning("Process error"); try { process.Kill(); } catch { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs index 8789495d..5f5cb414 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs @@ -12,6 +12,7 @@ protected override async Task ProcessExecute() { string projectsPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_PROJECTS").AsString(); await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, "C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\"", TimeSpan.FromSeconds(10).TotalMilliseconds); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, "C:/", "cmd.exe", $"/c \"subst", TimeSpan.FromSeconds(10).TotalMilliseconds); } } } From f0d174b973037f72c6c58e84d0f9e1d78724eb6a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 2 Aug 2020 17:19:06 +0100 Subject: [PATCH 210/369] Fix quotes in prep. Fix min version for branch. Add warning if process exists with non-zero code --- .../Integrations/Github/GithubService.cs | 2 +- .../BuildProcess/BuildProcessHelper.cs | 178 +++++++++--------- .../Steps/BuildSteps/BuildStepPrep.cs | 4 +- 3 files changed, 95 insertions(+), 89 deletions(-) diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 26f3fd4a..286e91be 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -61,7 +61,7 @@ public async Task IsReferenceValid(string reference) { string version = await GetReferenceVersion(reference); int[] versionParts = version.Split('.').Select(int.Parse).ToArray(); // TODO: Update minor with version with udpated make for this build system - return versionParts[0] >= 5 && versionParts[1] > 18; + return versionParts[0] >= 5 && versionParts[1] >= 17 && versionParts[2] >= 19; } public async Task GetLatestReferenceCommit(string reference) { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index 8286719f..a25aa75c 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -22,106 +22,112 @@ public static async Task> RunProcess( bool errorSilently = false, List errorExclusions = null ) { - using Process process = new Process { - StartInfo = { - FileName = executable, - WorkingDirectory = workingDirectory, - Arguments = args, - UseShellExecute = false, - CreateNoWindow = true, - RedirectStandardOutput = true, - RedirectStandardError = true - } - }; - - List processTasks = new List(); - process.EnableRaisingEvents = true; - Exception capturedException = null; - CancellationTokenSource errorCancellationTokenSource = new CancellationTokenSource(); - - TaskCompletionSource processExitEvent = new TaskCompletionSource(); - process.Exited += (sender, receivedEventArgs) => { - ((Process)sender)?.WaitForExit(); - processExitEvent.TrySetResult(true); - }; - processTasks.Add(processExitEvent.Task); - - List results = new List(); - TaskCompletionSource outputCloseEvent = new TaskCompletionSource(); - process.OutputDataReceived += (sender, receivedEventArgs) => { - if (receivedEventArgs.Data == null) { - outputCloseEvent.TrySetResult(true); - return; - } + using Process process = new Process { + StartInfo = { + FileName = executable, + WorkingDirectory = workingDirectory, + Arguments = args, + UseShellExecute = false, + CreateNoWindow = true, + RedirectStandardOutput = true, + RedirectStandardError = true + } + }; - string message = receivedEventArgs.Data; - if (!string.IsNullOrEmpty(message)) { - results.Add(message); - } + List processTasks = new List(); + process.EnableRaisingEvents = true; + Exception capturedException = null; + CancellationTokenSource errorCancellationTokenSource = new CancellationTokenSource(); + + TaskCompletionSource processExitEvent = new TaskCompletionSource(); + process.Exited += (sender, receivedEventArgs) => { + ((Process) sender)?.WaitForExit(); + processExitEvent.TrySetResult(true); + }; + processTasks.Add(processExitEvent.Task); - if (!suppressOutput) { - string json = ""; - try { - if (message.Length > 5 && message.Substring(0, 4) == "JSON") { - json = message.Replace("JSON:", "").Escape().Replace("\\\\n", "\\n"); - JObject jsonObject = JObject.Parse(json); - logger.Log(jsonObject.GetValueFromBody("message"), jsonObject.GetValueFromBody("colour")); - } else { - logger.Log(message); - } - } catch (Exception exception) { - capturedException = new Exception($"Json failed: {json}\n\n{exception}"); - errorCancellationTokenSource.Cancel(); + List results = new List(); + TaskCompletionSource outputCloseEvent = new TaskCompletionSource(); + process.OutputDataReceived += (sender, receivedEventArgs) => { + if (receivedEventArgs.Data == null) { + outputCloseEvent.TrySetResult(true); + return; + } + + string message = receivedEventArgs.Data; + if (!string.IsNullOrEmpty(message)) { + results.Add(message); + } + + if (!suppressOutput) { + string json = ""; + try { + if (message.Length > 5 && message.Substring(0, 4) == "JSON") { + json = message.Replace("JSON:", "").Escape().Replace("\\\\n", "\\n"); + JObject jsonObject = JObject.Parse(json); + logger.Log(jsonObject.GetValueFromBody("message"), jsonObject.GetValueFromBody("colour")); + } else { + logger.Log(message); } + } catch (Exception exception) { + capturedException = new Exception($"Json failed: {json}\n\n{exception}"); + errorCancellationTokenSource.Cancel(); } - }; - processTasks.Add(outputCloseEvent.Task); - - TaskCompletionSource errorCloseEvent = new TaskCompletionSource(); - process.ErrorDataReceived += (sender, receivedEventArgs) => { - if (receivedEventArgs.Data == null) { - errorCloseEvent.TrySetResult(true); - return; - } + } + }; + processTasks.Add(outputCloseEvent.Task); - string message = receivedEventArgs.Data; - if (string.IsNullOrEmpty(message)) return; + TaskCompletionSource errorCloseEvent = new TaskCompletionSource(); + process.ErrorDataReceived += (sender, receivedEventArgs) => { + if (receivedEventArgs.Data == null) { + errorCloseEvent.TrySetResult(true); + return; + } - if (errorExclusions != null && errorExclusions.All(x => !message.ContainsIgnoreCase(x))) return; + string message = receivedEventArgs.Data; + if (string.IsNullOrEmpty(message)) return; - capturedException = new Exception(message); - errorCancellationTokenSource.Cancel(); - }; - processTasks.Add(errorCloseEvent.Task); + if (errorExclusions != null && errorExclusions.All(x => !message.ContainsIgnoreCase(x))) return; - await using CancellationTokenRegistration unused = cancellationTokenSource.Token.Register(process.Kill); - await using CancellationTokenRegistration _ = errorCancellationTokenSource.Token.Register(process.Kill); + capturedException = new Exception(message); + errorCancellationTokenSource.Cancel(); + }; + processTasks.Add(errorCloseEvent.Task); - Task processCompletionTask = Task.WhenAll(processTasks); - Task awaitingTask = Task.WhenAny(Task.Delay((int) timeout, cancellationTokenSource.Token), processCompletionTask); - process.Start(); - process.BeginOutputReadLine(); - process.BeginErrorReadLine(); - if (await awaitingTask.ConfigureAwait(false) == processCompletionTask) { - if (capturedException != null) { - if (raiseErrors) { - throw capturedException; - } + await using CancellationTokenRegistration unused = cancellationTokenSource.Token.Register(process.Kill); + await using CancellationTokenRegistration _ = errorCancellationTokenSource.Token.Register(process.Kill); - if (!errorSilently) { - logger.LogError(capturedException); - } + Task processCompletionTask = Task.WhenAll(processTasks); + Task awaitingTask = Task.WhenAny(Task.Delay((int) timeout, cancellationTokenSource.Token), processCompletionTask); + process.Start(); + process.BeginOutputReadLine(); + process.BeginErrorReadLine(); + if (await awaitingTask.ConfigureAwait(false) == processCompletionTask) { + if (capturedException != null) { + if (raiseErrors) { + throw capturedException; } - } else { - logger.LogWarning("Process error"); - try { - process.Kill(); - } catch { - logger.LogWarning("Process timed out"); + + if (!errorSilently) { + logger.LogError(capturedException); + } + } + } else { + process.Kill(); + + if (!cancellationTokenSource.IsCancellationRequested) { + Exception exception = new Exception($"Process exited with non-zero code ({process.ExitCode})"); + if (raiseErrors) { + throw exception; + } + + if (!errorSilently) { + logger.LogError(exception); } } + } - return results; + return results; } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs index 5f5cb414..fa787149 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs @@ -11,8 +11,8 @@ protected override async Task ProcessExecute() { Logger.Log("Mounting build environment"); string projectsPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_PROJECTS").AsString(); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, "C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\"", TimeSpan.FromSeconds(10).TotalMilliseconds); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, "C:/", "cmd.exe", $"/c \"subst", TimeSpan.FromSeconds(10).TotalMilliseconds); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, "C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\"\"", TimeSpan.FromSeconds(10).TotalMilliseconds); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, "C:/", "cmd.exe", "/c \"subst\"", TimeSpan.FromSeconds(10).TotalMilliseconds); } } } From 3d28c9002cbe15a53671caadb648e2dd09c7b272 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 2 Aug 2020 17:32:30 +0100 Subject: [PATCH 211/369] Handle extra data being flushed to output by make in json string --- .../Modpack/BuildProcess/BuildProcessHelper.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index a25aa75c..fb188f02 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -63,9 +63,13 @@ public static async Task> RunProcess( string json = ""; try { if (message.Length > 5 && message.Substring(0, 4) == "JSON") { - json = message.Replace("JSON:", "").Escape().Replace("\\\\n", "\\n"); + string[] parts = message.Split('{', '}'); // covers cases where buffer gets extra data flushed to it after the closing brace + json = $"{{{parts[1].Escape().Replace("\\\\n", "\\n")}}}"; JObject jsonObject = JObject.Parse(json); logger.Log(jsonObject.GetValueFromBody("message"), jsonObject.GetValueFromBody("colour")); + foreach (string extra in parts.Skip(2)) { + logger.Log(extra); + } } else { logger.Log(message); } From 2c91492f57b92c78634034a72591c6bd2081b317 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 2 Aug 2020 20:17:09 +0100 Subject: [PATCH 212/369] Fixes to build process --- .../BuildProcess/BuildProcessHelper.cs | 42 +++++++++++++------ .../Steps/BuildSteps/BuildStepExtensions.cs | 2 +- .../Steps/BuildSteps/BuildStepPrep.cs | 4 +- .../BuildSteps/Mods/BuildStepBuildAce.cs | 22 ++++++++-- .../BuildSteps/Mods/BuildStepBuildAcre.cs | 2 - .../BuildSteps/Mods/BuildStepBuildF35.cs | 2 - .../BuildSteps/Mods/BuildStepBuildModpack.cs | 2 - 7 files changed, 52 insertions(+), 24 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index fb188f02..ce818a9b 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -41,7 +41,7 @@ public static async Task> RunProcess( TaskCompletionSource processExitEvent = new TaskCompletionSource(); process.Exited += (sender, receivedEventArgs) => { - ((Process) sender)?.WaitForExit(); + // ((Process) sender)?.WaitForExit(); processExitEvent.TrySetResult(true); }; processTasks.Add(processExitEvent.Task); @@ -62,16 +62,9 @@ public static async Task> RunProcess( if (!suppressOutput) { string json = ""; try { - if (message.Length > 5 && message.Substring(0, 4) == "JSON") { - string[] parts = message.Split('{', '}'); // covers cases where buffer gets extra data flushed to it after the closing brace - json = $"{{{parts[1].Escape().Replace("\\\\n", "\\n")}}}"; - JObject jsonObject = JObject.Parse(json); - logger.Log(jsonObject.GetValueFromBody("message"), jsonObject.GetValueFromBody("colour")); - foreach (string extra in parts.Skip(2)) { - logger.Log(extra); - } - } else { - logger.Log(message); + List> messages = ExtractMessages(message, ref json); + foreach ((string text, string colour) in messages) { + logger.Log(text, colour); } } catch (Exception exception) { capturedException = new Exception($"Json failed: {json}\n\n{exception}"); @@ -91,7 +84,7 @@ public static async Task> RunProcess( string message = receivedEventArgs.Data; if (string.IsNullOrEmpty(message)) return; - if (errorExclusions != null && errorExclusions.All(x => !message.ContainsIgnoreCase(x))) return; + if (errorExclusions != null && errorExclusions.Any(x => message.ContainsIgnoreCase(x))) return; capturedException = new Exception(message); errorCancellationTokenSource.Cancel(); @@ -116,6 +109,16 @@ public static async Task> RunProcess( logger.LogError(capturedException); } } + + if (raiseErrors && process.ExitCode != 0) { + string json = ""; + List> messages = ExtractMessages(results.Last(), ref json); + if (messages.Any()) { + throw new Exception(messages.First().Item1); + } + + throw new Exception(); + } } else { process.Kill(); @@ -133,5 +136,20 @@ public static async Task> RunProcess( return results; } + + private static List> ExtractMessages(string message, ref string json) { + List> messages = new List>(); + if (message.Length > 5 && message.Substring(0, 4) == "JSON") { + string[] parts = message.Split('{', '}'); // covers cases where buffer gets extra data flushed to it after the closing brace + json = $"{{{parts[1].Escape().Replace("\\\\n", "\\n")}}}"; + JObject jsonObject = JObject.Parse(json); + messages.Add(new Tuple(jsonObject.GetValueFromBody("message"), jsonObject.GetValueFromBody("colour"))); + messages.AddRange(parts.Skip(2).Where(x => !string.IsNullOrEmpty(x)).Select(extra => new Tuple(extra, ""))); + } else { + messages.Add(new Tuple(message, "")); + } + + return messages; + } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs index e004cb42..ea9e0eac 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs @@ -32,7 +32,7 @@ await BatchProcessFiles( files, 2, async file => { - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, file.DirectoryName, signTool, $"sign /f \"{certPath}\" \"{file.FullName}\"", TimeSpan.FromSeconds(10).Milliseconds, true); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, file.DirectoryName, signTool, $"sign /f \"{certPath}\" \"{file.FullName}\"", TimeSpan.FromSeconds(10).Milliseconds, true, false, true); Interlocked.Increment(ref signed); }, () => $"Signed {signed} of {total} extensions", diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs index fa787149..783b2389 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs @@ -11,8 +11,8 @@ protected override async Task ProcessExecute() { Logger.Log("Mounting build environment"); string projectsPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_PROJECTS").AsString(); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, "C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\"\"", TimeSpan.FromSeconds(10).TotalMilliseconds); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, "C:/", "cmd.exe", "/c \"subst\"", TimeSpan.FromSeconds(10).TotalMilliseconds); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, "C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\"\"", TimeSpan.FromSeconds(10).TotalMilliseconds, raiseErrors: false); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, "C:/", "cmd.exe", "/c \"subst\"", TimeSpan.FromSeconds(10).TotalMilliseconds, raiseErrors: false); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs index c60bd8db..0c386334 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs @@ -9,12 +9,28 @@ public class BuildStepBuildAce : ModBuildStep { public const string NAME = "Build ACE"; private const string MOD_NAME = "ace"; private readonly List allowedOptionals = new List { "ace_compat_rksl_pm_ii", "ace_nouniformrestrictions" }; + private readonly List errorExclusions = new List { // stupid mikero returns this output as an error... + "MakePbo Version", + "-args-", + "-P", + "-A", + "-G", + "-N", + "-X", + @"P:\z\ace\addons\fonts", + @"P:\z\ace\release\@ace\addons", + "-------------------", + "configuring with ", + "entries", + "prefix", + "...............", + "Writing", + "written" + }; public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); protected override async Task ProcessExecute() { - UpdateInterval = TimeSpan.FromMilliseconds(500); - Logger.Log("Running build for ACE"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); @@ -22,7 +38,7 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf_ace"); Logger.LogSurround("\nRunning make.py..."); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect"), TimeSpan.FromMinutes(3).TotalMilliseconds); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect"), TimeSpan.FromMinutes(3).TotalMilliseconds, errorExclusions: errorExclusions); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving ACE release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index 666beaaf..4579c4c4 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -19,8 +19,6 @@ public class BuildStepBuildAcre : ModBuildStep { public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); protected override async Task ProcessExecute() { - UpdateInterval = TimeSpan.FromMilliseconds(500); - Logger.Log("Running build for ACRE"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs index 77f26090..77b4a261 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs @@ -12,8 +12,6 @@ public class BuildStepBuildF35 : ModBuildStep { public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); protected override async Task ProcessExecute() { - UpdateInterval = TimeSpan.FromMilliseconds(500); - Logger.Log("Running build for F-35"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs index 1ae2f1e1..594fc55a 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs @@ -9,8 +9,6 @@ public class BuildStepBuildModpack : ModBuildStep { private const string MOD_NAME = "modpack"; protected override async Task ProcessExecute() { - UpdateInterval = TimeSpan.FromMilliseconds(500); - Logger.Log("Running build for UKSF"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); From 42e6ee9bb7aa11290d4b48b3990f85bf262b8025 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 2 Aug 2020 20:33:57 +0100 Subject: [PATCH 213/369] Add error exclusions --- .../BuildSteps/Mods/BuildStepBuildAcre.cs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index 4579c4c4..a8dd84a7 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -13,7 +13,23 @@ public class BuildStepBuildAcre : ModBuildStep { "Linking statically", "Visual Studio 16", "INFO: Building", - "Build Type" + "Build Type", + "MakePbo Version", + "-args-", + "-P", + "-A", + "-G", + "-N", + "-X", + @"P:\z\ace\addons\fonts", + @"P:\z\ace\release\@ace\addons", + "-------------------", + "configuring with ", + "entries", + "prefix", + "...............", + "Writing", + "written" }; public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); From 06cbc47c2bd38879af5a8cfcd3fd6a18ca0d6da7 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 2 Aug 2020 23:14:54 +0100 Subject: [PATCH 214/369] Ignore errors between makepbo calls, increase update delay for mod steps so as not to choke signalr --- .../Modpack/BuildProcess/BuildProcessHelper.cs | 14 ++++++++++++++ .../Steps/BuildSteps/Mods/BuildStepBuildAce.cs | 2 ++ .../Steps/BuildSteps/Mods/BuildStepBuildAcre.cs | 2 ++ .../Steps/BuildSteps/Mods/BuildStepBuildF35.cs | 2 ++ .../Steps/BuildSteps/Mods/BuildStepBuildModpack.cs | 2 ++ 5 files changed, 22 insertions(+) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index ce818a9b..f3a3a2af 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -74,6 +74,7 @@ public static async Task> RunProcess( }; processTasks.Add(outputCloseEvent.Task); + bool ignoreErrors = false; TaskCompletionSource errorCloseEvent = new TaskCompletionSource(); process.ErrorDataReceived += (sender, receivedEventArgs) => { if (receivedEventArgs.Data == null) { @@ -84,6 +85,19 @@ public static async Task> RunProcess( string message = receivedEventArgs.Data; if (string.IsNullOrEmpty(message)) return; + // TODO: Handle this better + if (message.ContainsIgnoreCase("File written to")) { + ignoreErrors = false; + return; + } + + if (ignoreErrors) return; + + if (message.ContainsIgnoreCase("MakePbo Version")) { + ignoreErrors = true; + return; + } + if (errorExclusions != null && errorExclusions.Any(x => message.ContainsIgnoreCase(x))) return; capturedException = new Exception(message); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs index 0c386334..101f8ad5 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs @@ -31,6 +31,8 @@ public class BuildStepBuildAce : ModBuildStep { public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); protected override async Task ProcessExecute() { + UpdateInterval = TimeSpan.FromSeconds(2); + Logger.Log("Running build for ACE"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index a8dd84a7..c92636ab 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -35,6 +35,8 @@ public class BuildStepBuildAcre : ModBuildStep { public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); protected override async Task ProcessExecute() { + UpdateInterval = TimeSpan.FromSeconds(2); + Logger.Log("Running build for ACRE"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs index 77b4a261..238284f3 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs @@ -12,6 +12,8 @@ public class BuildStepBuildF35 : ModBuildStep { public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); protected override async Task ProcessExecute() { + UpdateInterval = TimeSpan.FromSeconds(2); + Logger.Log("Running build for F-35"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs index 594fc55a..ab95dfb2 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs @@ -9,6 +9,8 @@ public class BuildStepBuildModpack : ModBuildStep { private const string MOD_NAME = "modpack"; protected override async Task ProcessExecute() { + UpdateInterval = TimeSpan.FromSeconds(2); + Logger.Log("Running build for UKSF"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); From 667221f5a79bbf55b90de5b0c75bbceac655b7ae Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 2 Aug 2020 23:36:22 +0100 Subject: [PATCH 215/369] Increase build timeouts --- .../BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs | 2 +- .../BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs | 2 +- .../BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs index 101f8ad5..0fd56dd7 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs @@ -40,7 +40,7 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf_ace"); Logger.LogSurround("\nRunning make.py..."); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect"), TimeSpan.FromMinutes(3).TotalMilliseconds, errorExclusions: errorExclusions); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect"), TimeSpan.FromMinutes(10).TotalMilliseconds, errorExclusions: errorExclusions); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving ACE release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index c92636ab..99484c60 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -44,7 +44,7 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@acre2"); Logger.LogSurround("\nRunning make.py..."); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect compile"), TimeSpan.FromMinutes(3).TotalMilliseconds, errorExclusions: errorExclusions); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect compile"), TimeSpan.FromMinutes(10).TotalMilliseconds, errorExclusions: errorExclusions); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving ACRE release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs index ab95dfb2..98073c47 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs @@ -18,7 +18,7 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf"); Logger.LogSurround("\nRunning make.py..."); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect"), TimeSpan.FromMinutes(3).TotalMilliseconds); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect"), TimeSpan.FromMinutes(5).TotalMilliseconds); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving UKSF release to build..."); From 444467cb9c6a876de271fb1b528275ac33b51989 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Aug 2020 00:05:47 +0100 Subject: [PATCH 216/369] Fix build notification message environment --- .../BuildSteps/Mods/BuildStepBuildAce.cs | 20 +------------------ .../BuildSteps/Mods/BuildStepBuildAcre.cs | 18 +---------------- .../Steps/Common/BuildStepNotify.cs | 9 +++++---- 3 files changed, 7 insertions(+), 40 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs index 0fd56dd7..34081fc2 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs @@ -9,24 +9,6 @@ public class BuildStepBuildAce : ModBuildStep { public const string NAME = "Build ACE"; private const string MOD_NAME = "ace"; private readonly List allowedOptionals = new List { "ace_compat_rksl_pm_ii", "ace_nouniformrestrictions" }; - private readonly List errorExclusions = new List { // stupid mikero returns this output as an error... - "MakePbo Version", - "-args-", - "-P", - "-A", - "-G", - "-N", - "-X", - @"P:\z\ace\addons\fonts", - @"P:\z\ace\release\@ace\addons", - "-------------------", - "configuring with ", - "entries", - "prefix", - "...............", - "Writing", - "written" - }; public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); @@ -40,7 +22,7 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf_ace"); Logger.LogSurround("\nRunning make.py..."); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect"), TimeSpan.FromMinutes(10).TotalMilliseconds, errorExclusions: errorExclusions); + await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect"), TimeSpan.FromMinutes(10).TotalMilliseconds); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving ACE release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index 99484c60..8da45818 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -13,23 +13,7 @@ public class BuildStepBuildAcre : ModBuildStep { "Linking statically", "Visual Studio 16", "INFO: Building", - "Build Type", - "MakePbo Version", - "-args-", - "-P", - "-A", - "-G", - "-N", - "-X", - @"P:\z\ace\addons\fonts", - @"P:\z\ace\release\@ace\addons", - "-------------------", - "configuring with ", - "entries", - "prefix", - "...............", - "Writing", - "written" + "Build Type" }; public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs index e5947f63..5e9da9bb 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs @@ -26,16 +26,17 @@ protected override async Task ProcessExecute() { ModpackRelease release = releaseService.GetRelease(Build.version); await discordService.SendMessageToEveryone(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_RELEASE").AsUlong(), GetDiscordMessage(release)); } else { - await discordService.SendMessage(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_RELEASE").AsUlong(), GetDiscordMessage()); // TODO: Change back to DID_C_MODPACK_DEV and change DID_C_MODPACK_RELEASE to live channel + await discordService.SendMessage( + VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_RELEASE").AsUlong(), + GetDiscordMessage() + ); // TODO: Change back to DID_C_MODPACK_DEV and change DID_C_MODPACK_RELEASE to live channel } Logger.Log("Notifications sent"); } private string GetBuildMessage() => - Build.environment == GameEnvironment.RC - ? $"New dev build available ({Build.buildNumber}) on the dev repository" - : $"New release candidate ({Build.buildNumber}) available for {Build.version} on the rc repository"; + Build.environment == GameEnvironment.RC ? $"New release candidate available for {Build.version} on the rc repository" : "New dev build available on the dev repository"; private string GetBuildLink() => Build.environment == GameEnvironment.RC ? $"https://uk-sf.co.uk/modpack/builds-rc?version={Build.version}&build={Build.id}" : $"https://uk-sf.co.uk/modpack/builds-dev?build={Build.id}"; From 1b1ed456affcd70647332b95ee70ab1dee76252b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Aug 2020 00:06:50 +0100 Subject: [PATCH 217/369] Put release notification description in code block --- .../Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs index 5e9da9bb..24940539 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs @@ -44,6 +44,6 @@ private string GetBuildLink() => private string GetDiscordMessage(ModpackRelease release = null) => release == null ? $"Modpack {(Build.environment == GameEnvironment.RC ? "RC" : "Dev")} Build - {(Build.environment == GameEnvironment.RC ? $"{Build.version} RC# {Build.buildNumber}" : $"#{Build.buildNumber}")}\n{GetBuildMessage()}\n<{GetBuildLink()}>" - : $"Modpack Update - {release.version}\nChangelog: \n\n{release.description}"; + : $"Modpack Update - {release.version}\nChangelog: \n\n```{release.description}```"; } } From 029ec8c08d7a3469db830f05d4c4b9cf880b06a0 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Aug 2020 00:26:39 +0100 Subject: [PATCH 218/369] Try synchronous dependencies sign --- .../BuildSteps/BuildStepSignDependencies.cs | 39 ++++++++++++++----- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs index fd9713c0..3caea52c 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs @@ -73,16 +73,35 @@ private async Task SignFiles(string keygenPath, string addonsPath, IReadOnlyColl string privateKey = Path.Join(keygenPath, $"{keyName}.biprivatekey"); int signed = 0; int total = files.Count; - await BatchProcessFiles( - files, - 10, - async file => { - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, addonsPath, dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", TimeSpan.FromSeconds(10).TotalMilliseconds, true); - Interlocked.Increment(ref signed); - }, - () => $"Signed {signed} of {total} files", - "Failed to sign file" - ); + foreach (FileInfo file in files) { + try { + await BuildProcessHelper.RunProcess( + Logger, + CancellationTokenSource, + addonsPath, + dsSignFile, + $"\"{privateKey}\" \"{file.FullName}\"", + TimeSpan.FromSeconds(10).TotalMilliseconds, + true + ); + signed++; + Logger.LogInline($"Signed {signed} of {total} files"); + } catch (OperationCanceledException) { + throw; + } catch (Exception exception) { + throw new Exception($"Failed to sign file '{file}'\n{exception.Message}{(exception.InnerException != null ? $"\n{exception.InnerException.Message}" : "")}", exception); + } + } + // await BatchProcessFiles( + // files, + // 10, + // async file => { + // await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, addonsPath, dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", TimeSpan.FromSeconds(10).TotalMilliseconds, true); + // Interlocked.Increment(ref signed); + // }, + // () => $"Signed {signed} of {total} files", + // "Failed to sign file" + // ); } } } From ac724928554208e9d68a054865302d7534246c11 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Aug 2020 09:51:39 +0100 Subject: [PATCH 219/369] Convert build process helper to more manageable object. Only clean necessary zsyncs --- .../BuildProcess/BuildProcessHelper.cs | 320 +++++++++++++----- .../Modpack/BuildProcess/Steps/BuildStep.cs | 4 +- .../Steps/BuildSteps/BuildStepExtensions.cs | 3 +- .../Steps/BuildSteps/BuildStepPrep.cs | 7 +- .../BuildSteps/BuildStepSignDependencies.cs | 26 +- .../Steps/BuildSteps/BuildStepSources.cs | 37 +- .../BuildSteps/Mods/BuildStepBuildAce.cs | 5 +- .../BuildSteps/Mods/BuildStepBuildAcre.cs | 5 +- .../BuildSteps/Mods/BuildStepBuildF35.cs | 5 +- .../BuildSteps/Mods/BuildStepBuildModpack.cs | 5 +- .../Steps/Common/BuildStepBuildRepo.cs | 3 +- .../Steps/Common/BuildStepClean.cs | 11 +- 12 files changed, 289 insertions(+), 142 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index f3a3a2af..d29af9a8 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -9,20 +9,45 @@ using UKSF.Common; namespace UKSF.Api.Services.Modpack.BuildProcess { - public static class BuildProcessHelper { - public static async Task> RunProcess( + public class BuildProcessHelper { + private readonly CancellationTokenSource cancellationTokenSource; + private readonly CancellationTokenSource errorCancellationTokenSource = new CancellationTokenSource(); + private readonly List errorExclusions; + private readonly bool errorSilently; + private readonly AutoResetEvent errorWaitHandle = new AutoResetEvent(false); + private readonly string ignoreErrorGateClose; + private readonly string ignoreErrorGateOpen; + private readonly IStepLogger logger; + private readonly AutoResetEvent outputWaitHandle = new AutoResetEvent(false); + private readonly bool raiseErrors; + private readonly List results = new List(); + private readonly bool suppressOutput; + private Exception capturedException; + private bool ignoreErrors; + private Process process; + + public BuildProcessHelper( IStepLogger logger, CancellationTokenSource cancellationTokenSource, - string workingDirectory, - string executable, - string args, - double timeout, bool suppressOutput = false, bool raiseErrors = true, bool errorSilently = false, - List errorExclusions = null + List errorExclusions = null, + string ignoreErrorGateClose = "", + string ignoreErrorGateOpen = "" ) { - using Process process = new Process { + this.logger = logger; + this.cancellationTokenSource = cancellationTokenSource; + this.suppressOutput = suppressOutput; + this.raiseErrors = raiseErrors; + this.errorSilently = errorSilently; + this.errorExclusions = errorExclusions; + this.ignoreErrorGateClose = ignoreErrorGateClose; + this.ignoreErrorGateOpen = ignoreErrorGateOpen; + } + + public async Task> Run(string workingDirectory, string executable, string args, int timeout) { + process = new Process { StartInfo = { FileName = executable, WorkingDirectory = workingDirectory, @@ -31,89 +56,21 @@ public static async Task> RunProcess( CreateNoWindow = true, RedirectStandardOutput = true, RedirectStandardError = true - } - }; - - List processTasks = new List(); - process.EnableRaisingEvents = true; - Exception capturedException = null; - CancellationTokenSource errorCancellationTokenSource = new CancellationTokenSource(); - - TaskCompletionSource processExitEvent = new TaskCompletionSource(); - process.Exited += (sender, receivedEventArgs) => { - // ((Process) sender)?.WaitForExit(); - processExitEvent.TrySetResult(true); - }; - processTasks.Add(processExitEvent.Task); - - List results = new List(); - TaskCompletionSource outputCloseEvent = new TaskCompletionSource(); - process.OutputDataReceived += (sender, receivedEventArgs) => { - if (receivedEventArgs.Data == null) { - outputCloseEvent.TrySetResult(true); - return; - } - - string message = receivedEventArgs.Data; - if (!string.IsNullOrEmpty(message)) { - results.Add(message); - } - - if (!suppressOutput) { - string json = ""; - try { - List> messages = ExtractMessages(message, ref json); - foreach ((string text, string colour) in messages) { - logger.Log(text, colour); - } - } catch (Exception exception) { - capturedException = new Exception($"Json failed: {json}\n\n{exception}"); - errorCancellationTokenSource.Cancel(); - } - } + }, + EnableRaisingEvents = false }; - processTasks.Add(outputCloseEvent.Task); - - bool ignoreErrors = false; - TaskCompletionSource errorCloseEvent = new TaskCompletionSource(); - process.ErrorDataReceived += (sender, receivedEventArgs) => { - if (receivedEventArgs.Data == null) { - errorCloseEvent.TrySetResult(true); - return; - } - - string message = receivedEventArgs.Data; - if (string.IsNullOrEmpty(message)) return; - - // TODO: Handle this better - if (message.ContainsIgnoreCase("File written to")) { - ignoreErrors = false; - return; - } - - if (ignoreErrors) return; - - if (message.ContainsIgnoreCase("MakePbo Version")) { - ignoreErrors = true; - return; - } - - if (errorExclusions != null && errorExclusions.Any(x => message.ContainsIgnoreCase(x))) return; - capturedException = new Exception(message); - errorCancellationTokenSource.Cancel(); - }; - processTasks.Add(errorCloseEvent.Task); + process.OutputDataReceived += OnOutputDataReceived; + process.ErrorDataReceived += OnErrorDataReceived; await using CancellationTokenRegistration unused = cancellationTokenSource.Token.Register(process.Kill); await using CancellationTokenRegistration _ = errorCancellationTokenSource.Token.Register(process.Kill); - Task processCompletionTask = Task.WhenAll(processTasks); - Task awaitingTask = Task.WhenAny(Task.Delay((int) timeout, cancellationTokenSource.Token), processCompletionTask); process.Start(); process.BeginOutputReadLine(); process.BeginErrorReadLine(); - if (await awaitingTask.ConfigureAwait(false) == processCompletionTask) { + + if (process.WaitForExit(timeout) && outputWaitHandle.WaitOne(timeout) && errorWaitHandle.WaitOne(timeout)) { if (capturedException != null) { if (raiseErrors) { throw capturedException; @@ -134,6 +91,7 @@ public static async Task> RunProcess( throw new Exception(); } } else { + // Timeout or cancelled process.Kill(); if (!cancellationTokenSource.IsCancellationRequested) { @@ -151,6 +109,62 @@ public static async Task> RunProcess( return results; } + private void OnOutputDataReceived(object sender, DataReceivedEventArgs receivedEventArgs) { + if (receivedEventArgs.Data == null) { + outputWaitHandle.Set(); + return; + } + + string message = receivedEventArgs.Data; + if (!string.IsNullOrEmpty(message)) { + results.Add(message); + } + + if (!suppressOutput) { + string json = ""; + try { + List> messages = ExtractMessages(message, ref json); + foreach ((string text, string colour) in messages) { + logger.Log(text, colour); + } + } catch (Exception exception) { + capturedException = new Exception($"Json failed: {json}\n\n{exception}"); + errorCancellationTokenSource.Cancel(); + } + } + } + + private void OnErrorDataReceived(object sender, DataReceivedEventArgs receivedEventArgs) { + if (receivedEventArgs.Data == null) { + errorWaitHandle.Set(); + return; + } + + string message = receivedEventArgs.Data; + if (string.IsNullOrEmpty(message) || CheckIgnoreErrorGates(message)) return; + + if (errorExclusions != null && errorExclusions.Any(x => message.ContainsIgnoreCase(x))) return; + + capturedException = new Exception(message); + errorCancellationTokenSource.Cancel(); + } + + private bool CheckIgnoreErrorGates(string message) { + if (message.ContainsIgnoreCase(ignoreErrorGateClose)) { + ignoreErrors = false; + return true; + } + + if (ignoreErrors) return true; + + if (message.ContainsIgnoreCase(ignoreErrorGateOpen)) { + ignoreErrors = true; + return true; + } + + return false; + } + private static List> ExtractMessages(string message, ref string json) { List> messages = new List>(); if (message.Length > 5 && message.Substring(0, 4) == "JSON") { @@ -165,5 +179,147 @@ private static List> ExtractMessages(string message, ref s return messages; } + + // public static async Task> RunProcess( + // IStepLogger logger, + // CancellationTokenSource cancellationTokenSource, + // string workingDirectory, + // string executable, + // string args, + // double timeout, + // bool suppressOutput = false, + // bool raiseErrors = true, + // bool errorSilently = false, + // List errorExclusions = null + // ) { + // using Process process = new Process { + // StartInfo = { + // FileName = executable, + // WorkingDirectory = workingDirectory, + // Arguments = args, + // UseShellExecute = false, + // CreateNoWindow = true, + // RedirectStandardOutput = true, + // RedirectStandardError = true + // }, + // EnableRaisingEvents = true + // }; + // + // Exception capturedException = null; + // CancellationTokenSource errorCancellationTokenSource = new CancellationTokenSource(); + // + // // TODO: Try with WaitForExit and ouput counter instead of tasks. Handle timeout? + // + // TaskCompletionSource processExitEvent = new TaskCompletionSource(); + // process.Exited += (sender, receivedEventArgs) => { + // // ((Process) sender)?.WaitForExit(); + // processExitEvent.TrySetResult(true); + // }; + // processTasks.Add(processExitEvent.Task); + // + // List results = new List(); + // TaskCompletionSource outputCloseEvent = new TaskCompletionSource(); + // process.OutputDataReceived += (sender, receivedEventArgs) => { + // if (receivedEventArgs.Data == null) { + // outputCloseEvent.TrySetResult(true); + // return; + // } + // + // string message = receivedEventArgs.Data; + // if (!string.IsNullOrEmpty(message)) { + // results.Add(message); + // } + // + // if (!suppressOutput) { + // string json = ""; + // try { + // List> messages = ExtractMessages(message, ref json); + // foreach ((string text, string colour) in messages) { + // logger.Log(text, colour); + // } + // } catch (Exception exception) { + // capturedException = new Exception($"Json failed: {json}\n\n{exception}"); + // errorCancellationTokenSource.Cancel(); + // } + // } + // }; + // processTasks.Add(outputCloseEvent.Task); + // + // bool ignoreErrors = false; + // TaskCompletionSource errorCloseEvent = new TaskCompletionSource(); + // process.ErrorDataReceived += (sender, receivedEventArgs) => { + // if (receivedEventArgs.Data == null) { + // errorCloseEvent.TrySetResult(true); + // return; + // } + // + // string message = receivedEventArgs.Data; + // if (string.IsNullOrEmpty(message)) return; + // + // // TODO: Handle this better + // if (message.ContainsIgnoreCase("File written to")) { + // ignoreErrors = false; + // return; + // } + // + // if (ignoreErrors) return; + // + // if (message.ContainsIgnoreCase("MakePbo Version")) { + // ignoreErrors = true; + // return; + // } + // + // if (errorExclusions != null && errorExclusions.Any(x => message.ContainsIgnoreCase(x))) return; + // + // capturedException = new Exception(message); + // errorCancellationTokenSource.Cancel(); + // }; + // processTasks.Add(errorCloseEvent.Task); + // + // await using CancellationTokenRegistration unused = cancellationTokenSource.Token.Register(process.Kill); + // await using CancellationTokenRegistration _ = errorCancellationTokenSource.Token.Register(process.Kill); + // + // Task processCompletionTask = Task.WhenAll(processTasks); + // Task awaitingTask = Task.WhenAny(Task.Delay((int) timeout, cancellationTokenSource.Token), processCompletionTask); + // process.Start(); + // process.BeginOutputReadLine(); + // process.BeginErrorReadLine(); + // if (await awaitingTask.ConfigureAwait(false) == processCompletionTask) { + // if (capturedException != null) { + // if (raiseErrors) { + // throw capturedException; + // } + // + // if (!errorSilently) { + // logger.LogError(capturedException); + // } + // } + // + // if (raiseErrors && process.ExitCode != 0) { + // string json = ""; + // List> messages = ExtractMessages(results.Last(), ref json); + // if (messages.Any()) { + // throw new Exception(messages.First().Item1); + // } + // + // throw new Exception(); + // } + // } else { + // process.Kill(); + // + // if (!cancellationTokenSource.IsCancellationRequested) { + // Exception exception = new Exception($"Process exited with non-zero code ({process.ExitCode})"); + // if (raiseErrors) { + // throw exception; + // } + // + // if (!errorSilently) { + // logger.LogError(exception); + // } + // } + // } + // + // return results; + // } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs index a65a3142..a2fb3675 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs @@ -11,6 +11,7 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class BuildStep : IBuildStep { private const string COLOUR_BLUE = "#0c78ff"; + private readonly TimeSpan updateInterval = TimeSpan.FromSeconds(2); private readonly CancellationTokenSource updatePusherCancellationTokenSource = new CancellationTokenSource(); private readonly SemaphoreSlim updateSemaphore = new SemaphoreSlim(1); protected ModpackBuild Build; @@ -19,7 +20,6 @@ public class BuildStep : IBuildStep { protected IStepLogger Logger; private Func, Task> updateBuildCallback; private Func updateStepCallback; - protected TimeSpan UpdateInterval = TimeSpan.FromSeconds(1); public void Init( ModpackBuild modpackBuild, @@ -155,7 +155,7 @@ private void StartUpdatePusher() { _ = Task.Run( async () => { do { - await Task.Delay(UpdateInterval, updatePusherCancellationTokenSource.Token); + await Task.Delay(updateInterval, updatePusherCancellationTokenSource.Token); await Update(); } while (!updatePusherCancellationTokenSource.IsCancellationRequested); }, diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs index ea9e0eac..2e61afeb 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs @@ -32,7 +32,8 @@ await BatchProcessFiles( files, 2, async file => { - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, file.DirectoryName, signTool, $"sign /f \"{certPath}\" \"{file.FullName}\"", TimeSpan.FromSeconds(10).Milliseconds, true, false, true); + BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true); + await processHelper.Run(file.DirectoryName, signTool, $"sign /f \"{certPath}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); Interlocked.Increment(ref signed); }, () => $"Signed {signed} of {total} extensions", diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs index 783b2389..db10fadc 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs @@ -11,8 +11,11 @@ protected override async Task ProcessExecute() { Logger.Log("Mounting build environment"); string projectsPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_PROJECTS").AsString(); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, "C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\"\"", TimeSpan.FromSeconds(10).TotalMilliseconds, raiseErrors: false); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, "C:/", "cmd.exe", "/c \"subst\"", TimeSpan.FromSeconds(10).TotalMilliseconds, raiseErrors: false); + BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, raiseErrors: false); + await processHelper.Run("C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\"\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); + + processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, raiseErrors: false); + await processHelper.Run("C:/", "cmd.exe", "/c \"subst\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs index 3caea52c..21f65fa5 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -using System.Threading; using System.Threading.Tasks; using UKSF.Api.Models.Game; using UKSF.Api.Services.Admin; @@ -32,7 +31,8 @@ protected override async Task SetupExecute() { Logger.LogSurround("Cleared keys directories"); Logger.LogSurround("\nCreating key..."); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, keygenPath, dsCreateKey, keyName, TimeSpan.FromSeconds(10).TotalMilliseconds, true); + BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, true); + await processHelper.Run(keygenPath, dsCreateKey, keyName, (int) TimeSpan.FromSeconds(10).TotalMilliseconds); Logger.Log($"Created {keyName}"); await CopyFiles(keygen, keys, new List { new FileInfo(Path.Join(keygenPath, $"{keyName}.bikey")) }); Logger.LogSurround("Created key"); @@ -73,17 +73,11 @@ private async Task SignFiles(string keygenPath, string addonsPath, IReadOnlyColl string privateKey = Path.Join(keygenPath, $"{keyName}.biprivatekey"); int signed = 0; int total = files.Count; + Logger.Log($"Signed {signed} of {total} files"); foreach (FileInfo file in files) { try { - await BuildProcessHelper.RunProcess( - Logger, - CancellationTokenSource, - addonsPath, - dsSignFile, - $"\"{privateKey}\" \"{file.FullName}\"", - TimeSpan.FromSeconds(10).TotalMilliseconds, - true - ); + BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, true); + await processHelper.Run(addonsPath, dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); signed++; Logger.LogInline($"Signed {signed} of {total} files"); } catch (OperationCanceledException) { @@ -92,16 +86,6 @@ await BuildProcessHelper.RunProcess( throw new Exception($"Failed to sign file '{file}'\n{exception.Message}{(exception.InnerException != null ? $"\n{exception.InnerException.Message}" : "")}", exception); } } - // await BatchProcessFiles( - // files, - // 10, - // async file => { - // await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, addonsPath, dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", TimeSpan.FromSeconds(10).TotalMilliseconds, true); - // Interlocked.Increment(ref signed); - // }, - // () => $"Signed {signed} of {total} files", - // "Failed to sign file" - // ); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index e53cebcb..362db873 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -37,20 +37,28 @@ private async Task CheckoutStaticSource(string displayName, string modName, stri DirectoryInfo release = new DirectoryInfo(releasePath); DirectoryInfo repo = new DirectoryInfo(repoPath); - await BuildProcessHelper.RunProcess( - Logger, - CancellationTokenSource, + await new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( path, "cmd.exe", $"/c \"git reset --hard HEAD && git clean -d -f && git checkout {branchName}\"", - TimeSpan.FromSeconds(30).TotalMilliseconds, - true, - false, - true + (int) TimeSpan.FromSeconds(30).TotalMilliseconds ); - string before = (await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, path, "cmd.exe", "/c \"git rev-parse HEAD\"", TimeSpan.FromSeconds(10).TotalMilliseconds, true, false, true)).Last(); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, path, "cmd.exe", "/c \"git pull\"", TimeSpan.FromSeconds(30).TotalMilliseconds, true, false, true); - string after = (await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, path, "cmd.exe", "/c \"git rev-parse HEAD\"", TimeSpan.FromSeconds(10).TotalMilliseconds, true, false, true)).Last(); + + string before = (await new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( + path, + "cmd.exe", + "/c \"git rev-parse HEAD\"", + (int) TimeSpan.FromSeconds(10).TotalMilliseconds + )).Last(); + + await new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run(path, "cmd.exe", "/c \"git pull\"", (int) TimeSpan.FromSeconds(30).TotalMilliseconds); + + string after = (await new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( + path, + "cmd.exe", + "/c \"git rev-parse HEAD\"", + (int) TimeSpan.FromSeconds(10).TotalMilliseconds + )).Last(); if (release.Exists && repo.Exists) { Logger.Log($"{before?.Substring(0, 7)} vs {after?.Substring(0, 7)}"); @@ -76,16 +84,11 @@ private async Task CheckoutModpack() { } Logger.Log($"Checking out {referenceName}"); - await BuildProcessHelper.RunProcess( - Logger, - CancellationTokenSource, + await new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( modpackPath, "cmd.exe", $"/c \"git reset --hard HEAD && git clean -d -f && git checkout {reference} && git pull\"", - TimeSpan.FromSeconds(30).TotalMilliseconds, - true, - false, - true + (int) TimeSpan.FromSeconds(30).TotalMilliseconds ); Logger.LogSurround("Checked out modpack"); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs index 34081fc2..5635222b 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs @@ -13,8 +13,6 @@ public class BuildStepBuildAce : ModBuildStep { public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); protected override async Task ProcessExecute() { - UpdateInterval = TimeSpan.FromSeconds(2); - Logger.Log("Running build for ACE"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); @@ -22,7 +20,8 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf_ace"); Logger.LogSurround("\nRunning make.py..."); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect"), TimeSpan.FromMinutes(10).TotalMilliseconds); + BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version"); + await processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving ACE release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index 8da45818..19426b2a 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -19,8 +19,6 @@ public class BuildStepBuildAcre : ModBuildStep { public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); protected override async Task ProcessExecute() { - UpdateInterval = TimeSpan.FromSeconds(2); - Logger.Log("Running build for ACRE"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); @@ -28,7 +26,8 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@acre2"); Logger.LogSurround("\nRunning make.py..."); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect compile"), TimeSpan.FromMinutes(10).TotalMilliseconds, errorExclusions: errorExclusions); + BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, errorExclusions: errorExclusions, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version"); + await processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect compile"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving ACRE release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs index 238284f3..cbb2e103 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs @@ -12,8 +12,6 @@ public class BuildStepBuildF35 : ModBuildStep { public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); protected override async Task ProcessExecute() { - UpdateInterval = TimeSpan.FromSeconds(2); - Logger.Log("Running build for F-35"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); @@ -23,7 +21,8 @@ protected override async Task ProcessExecute() { DirectoryInfo dependencies = new DirectoryInfo(dependenciesPath); Logger.LogSurround("\nRunning make.py..."); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect"), TimeSpan.FromMinutes(1).TotalMilliseconds); + BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource); + await processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(1).TotalMilliseconds); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving F-35 pbos to uksf dependencies..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs index 98073c47..63545157 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs @@ -9,8 +9,6 @@ public class BuildStepBuildModpack : ModBuildStep { private const string MOD_NAME = "modpack"; protected override async Task ProcessExecute() { - UpdateInterval = TimeSpan.FromSeconds(2); - Logger.Log("Running build for UKSF"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); @@ -18,7 +16,8 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf"); Logger.LogSurround("\nRunning make.py..."); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, toolsPath, PythonPath, MakeCommand("redirect"), TimeSpan.FromMinutes(5).TotalMilliseconds); + BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource); + await processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(5).TotalMilliseconds); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving UKSF release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs index b0a1d8c1..aaeee3c5 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs @@ -12,7 +12,8 @@ protected override async Task ProcessExecute() { Logger.Log($"Building {repoName} repo"); string arma3SyncPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_ARMA3SYNC").AsString(); - await BuildProcessHelper.RunProcess(Logger, CancellationTokenSource, arma3SyncPath, "Java", $"-jar .\\ArmA3Sync.jar -BUILD {repoName}", TimeSpan.FromMinutes(5).TotalMilliseconds); + BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource); + await processHelper.Run(arma3SyncPath, "Java", $"-jar .\\ArmA3Sync.jar -BUILD {repoName}", (int) TimeSpan.FromMinutes(5).TotalMilliseconds); } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs index d709f0f5..dd8d1154 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.IO; +using System.Linq; using System.Threading.Tasks; using UKSF.Api.Models.Game; @@ -29,10 +30,12 @@ protected override async Task ProcessExecute() { await DeleteDirectoryContents(path); Logger.LogSurround("Cleaned build folder"); - Logger.LogSurround("\nCleaning repo zsync files..."); - List files = GetDirectoryContents(repo, "*.zsync"); - await DeleteFiles(files); - Logger.LogSurround("Cleaned repo zsync files"); + Logger.LogSurround("\nCleaning orphaned zsync files..."); + IEnumerable contentFiles = GetDirectoryContents(repo).Where(x => !x.Name.Contains(".zsync")); + IEnumerable zsyncFiles = GetDirectoryContents(repo, "*.zsync"); + List orphanedFiles = zsyncFiles.Where(x => contentFiles.All(y => !x.FullName.Contains(y.FullName))).ToList(); + await DeleteFiles(orphanedFiles); + Logger.LogSurround("Cleaned orphaned zsync files"); } } } From 2eaf390a8b82c052e776f3f2766c5365a206d263 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Aug 2020 10:59:35 +0100 Subject: [PATCH 220/369] Remove unused async from build process helper --- .../BuildProcess/BuildProcessHelper.cs | 10 ++--- .../Steps/BuildSteps/BuildStepExtensions.cs | 5 ++- .../Steps/BuildSteps/BuildStepPrep.cs | 8 ++-- .../BuildSteps/BuildStepSignDependencies.cs | 9 ++-- .../Steps/BuildSteps/BuildStepSources.cs | 41 +++++++++++-------- .../BuildSteps/Mods/BuildStepBuildAce.cs | 2 +- .../BuildSteps/Mods/BuildStepBuildAcre.cs | 2 +- .../BuildSteps/Mods/BuildStepBuildF35.cs | 2 +- .../BuildSteps/Mods/BuildStepBuildModpack.cs | 2 +- .../Steps/Common/BuildStepBuildRepo.cs | 6 ++- 10 files changed, 48 insertions(+), 39 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index d29af9a8..7b42df7c 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -3,7 +3,6 @@ using System.Diagnostics; using System.Linq; using System.Threading; -using System.Threading.Tasks; using Newtonsoft.Json.Linq; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Common; @@ -46,7 +45,7 @@ public BuildProcessHelper( this.ignoreErrorGateOpen = ignoreErrorGateOpen; } - public async Task> Run(string workingDirectory, string executable, string args, int timeout) { + public List Run(string workingDirectory, string executable, string args, int timeout) { process = new Process { StartInfo = { FileName = executable, @@ -63,8 +62,8 @@ public async Task> Run(string workingDirectory, string executable, process.OutputDataReceived += OnOutputDataReceived; process.ErrorDataReceived += OnErrorDataReceived; - await using CancellationTokenRegistration unused = cancellationTokenSource.Token.Register(process.Kill); - await using CancellationTokenRegistration _ = errorCancellationTokenSource.Token.Register(process.Kill); + using CancellationTokenRegistration unused = cancellationTokenSource.Token.Register(process.Kill); + using CancellationTokenRegistration _ = errorCancellationTokenSource.Token.Register(process.Kill); process.Start(); process.BeginOutputReadLine(); @@ -208,8 +207,6 @@ private static List> ExtractMessages(string message, ref s // Exception capturedException = null; // CancellationTokenSource errorCancellationTokenSource = new CancellationTokenSource(); // - // // TODO: Try with WaitForExit and ouput counter instead of tasks. Handle timeout? - // // TaskCompletionSource processExitEvent = new TaskCompletionSource(); // process.Exited += (sender, receivedEventArgs) => { // // ((Process) sender)?.WaitForExit(); @@ -256,7 +253,6 @@ private static List> ExtractMessages(string message, ref s // string message = receivedEventArgs.Data; // if (string.IsNullOrEmpty(message)) return; // - // // TODO: Handle this better // if (message.ContainsIgnoreCase("File written to")) { // ignoreErrors = false; // return; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs index 2e61afeb..1d78656a 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs @@ -31,10 +31,11 @@ private async Task SignExtensions(IReadOnlyCollection files) { await BatchProcessFiles( files, 2, - async file => { + file => { BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true); - await processHelper.Run(file.DirectoryName, signTool, $"sign /f \"{certPath}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); + processHelper.Run(file.DirectoryName, signTool, $"sign /f \"{certPath}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); Interlocked.Increment(ref signed); + return Task.CompletedTask; }, () => $"Signed {signed} of {total} extensions", "Failed to sign extension" diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs index db10fadc..a127aac8 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs @@ -7,15 +7,17 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { public class BuildStepPrep : BuildStep { public const string NAME = "Prep"; - protected override async Task ProcessExecute() { + protected override Task ProcessExecute() { Logger.Log("Mounting build environment"); string projectsPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_PROJECTS").AsString(); BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, raiseErrors: false); - await processHelper.Run("C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\"\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); + processHelper.Run("C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\"\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, raiseErrors: false); - await processHelper.Run("C:/", "cmd.exe", "/c \"subst\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); + processHelper.Run("C:/", "cmd.exe", "/c \"subst\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); + + return Task.CompletedTask; } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs index 21f65fa5..2958b50f 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs @@ -32,7 +32,7 @@ protected override async Task SetupExecute() { Logger.LogSurround("\nCreating key..."); BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, true); - await processHelper.Run(keygenPath, dsCreateKey, keyName, (int) TimeSpan.FromSeconds(10).TotalMilliseconds); + processHelper.Run(keygenPath, dsCreateKey, keyName, (int) TimeSpan.FromSeconds(10).TotalMilliseconds); Logger.Log($"Created {keyName}"); await CopyFiles(keygen, keys, new List { new FileInfo(Path.Join(keygenPath, $"{keyName}.bikey")) }); Logger.LogSurround("Created key"); @@ -69,15 +69,16 @@ private string GetKeyname() { }; } - private async Task SignFiles(string keygenPath, string addonsPath, IReadOnlyCollection files) { + private Task SignFiles(string keygenPath, string addonsPath, IReadOnlyCollection files) { string privateKey = Path.Join(keygenPath, $"{keyName}.biprivatekey"); int signed = 0; int total = files.Count; Logger.Log($"Signed {signed} of {total} files"); + // TODO: Maybe batch the commands together to do several in one process foreach (FileInfo file in files) { try { BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, true); - await processHelper.Run(addonsPath, dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); + processHelper.Run(addonsPath, dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); signed++; Logger.LogInline($"Signed {signed} of {total} files"); } catch (OperationCanceledException) { @@ -86,6 +87,8 @@ private async Task SignFiles(string keygenPath, string addonsPath, IReadOnlyColl throw new Exception($"Failed to sign file '{file}'\n{exception.Message}{(exception.InnerException != null ? $"\n{exception.InnerException.Message}" : "")}", exception); } } + + return Task.CompletedTask; } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 362db873..b0435541 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -17,7 +17,7 @@ protected override async Task ProcessExecute() { await CheckoutModpack(); } - private async Task CheckoutStaticSource(string displayName, string modName, string releaseName, string repoName, string branchName) { + private Task CheckoutStaticSource(string displayName, string modName, string releaseName, string repoName, string branchName) { Logger.LogSurround($"\nChecking out latest {displayName}..."); bool forceBuild = GetEnvironmentVariable($"{modName}_updated"); @@ -37,28 +37,30 @@ private async Task CheckoutStaticSource(string displayName, string modName, stri DirectoryInfo release = new DirectoryInfo(releasePath); DirectoryInfo repo = new DirectoryInfo(repoPath); - await new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( + new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( path, "cmd.exe", $"/c \"git reset --hard HEAD && git clean -d -f && git checkout {branchName}\"", (int) TimeSpan.FromSeconds(30).TotalMilliseconds ); - string before = (await new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( - path, - "cmd.exe", - "/c \"git rev-parse HEAD\"", - (int) TimeSpan.FromSeconds(10).TotalMilliseconds - )).Last(); + string before = new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( + path, + "cmd.exe", + "/c \"git rev-parse HEAD\"", + (int) TimeSpan.FromSeconds(10).TotalMilliseconds + ) + .Last(); - await new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run(path, "cmd.exe", "/c \"git pull\"", (int) TimeSpan.FromSeconds(30).TotalMilliseconds); + new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run(path, "cmd.exe", "/c \"git pull\"", (int) TimeSpan.FromSeconds(30).TotalMilliseconds); - string after = (await new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( - path, - "cmd.exe", - "/c \"git rev-parse HEAD\"", - (int) TimeSpan.FromSeconds(10).TotalMilliseconds - )).Last(); + string after = new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( + path, + "cmd.exe", + "/c \"git rev-parse HEAD\"", + (int) TimeSpan.FromSeconds(10).TotalMilliseconds + ) + .Last(); if (release.Exists && repo.Exists) { Logger.Log($"{before?.Substring(0, 7)} vs {after?.Substring(0, 7)}"); @@ -71,9 +73,11 @@ private async Task CheckoutStaticSource(string displayName, string modName, stri SetEnvironmentVariable($"{modName}_updated", updated); Logger.LogSurround($"Checked out latest {displayName}{(updated ? "" : " (No Changes)")}"); + + return Task.CompletedTask; } - private async Task CheckoutModpack() { + private Task CheckoutModpack() { string reference = string.Equals(Build.commit.branch, "None") ? Build.commit.after : Build.commit.branch; string referenceName = string.Equals(Build.commit.branch, "None") ? reference : $"latest {reference}"; Logger.LogSurround("\nChecking out modpack..."); @@ -84,14 +88,15 @@ private async Task CheckoutModpack() { } Logger.Log($"Checking out {referenceName}"); - await new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( + new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( modpackPath, "cmd.exe", $"/c \"git reset --hard HEAD && git clean -d -f && git checkout {reference} && git pull\"", (int) TimeSpan.FromSeconds(30).TotalMilliseconds ); - Logger.LogSurround("Checked out modpack"); + + return Task.CompletedTask; } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs index 5635222b..97392b8a 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs @@ -21,7 +21,7 @@ protected override async Task ProcessExecute() { Logger.LogSurround("\nRunning make.py..."); BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version"); - await processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); + processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving ACE release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index 19426b2a..4b12c00e 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -27,7 +27,7 @@ protected override async Task ProcessExecute() { Logger.LogSurround("\nRunning make.py..."); BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, errorExclusions: errorExclusions, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version"); - await processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect compile"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); + processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect compile"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving ACRE release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs index cbb2e103..4f664dac 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs @@ -22,7 +22,7 @@ protected override async Task ProcessExecute() { Logger.LogSurround("\nRunning make.py..."); BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource); - await processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(1).TotalMilliseconds); + processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(1).TotalMilliseconds); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving F-35 pbos to uksf dependencies..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs index 63545157..b06d1269 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs @@ -17,7 +17,7 @@ protected override async Task ProcessExecute() { Logger.LogSurround("\nRunning make.py..."); BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource); - await processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(5).TotalMilliseconds); + processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(5).TotalMilliseconds); Logger.LogSurround("Make.py complete"); Logger.LogSurround("\nMoving UKSF release to build..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs index aaeee3c5..563f2cd8 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs @@ -7,13 +7,15 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { public class BuildStepBuildRepo : BuildStep { public const string NAME = "Build Repo"; - protected override async Task ProcessExecute() { + protected override Task ProcessExecute() { string repoName = GetEnvironmentRepoName(); Logger.Log($"Building {repoName} repo"); string arma3SyncPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_ARMA3SYNC").AsString(); BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource); - await processHelper.Run(arma3SyncPath, "Java", $"-jar .\\ArmA3Sync.jar -BUILD {repoName}", (int) TimeSpan.FromMinutes(5).TotalMilliseconds); + processHelper.Run(arma3SyncPath, "Java", $"-jar .\\ArmA3Sync.jar -BUILD {repoName}", (int) TimeSpan.FromMinutes(5).TotalMilliseconds); + + return Task.CompletedTask; } } } From 4a609712459ff767f971964cf90dc9a2e0db0d1b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Aug 2020 12:03:01 +0100 Subject: [PATCH 221/369] Set build notification channel ids to live channels. Remove TODO for version number --- UKSF.Api.Services/Integrations/Github/GithubService.cs | 2 +- .../Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 286e91be..d428f48e 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -60,7 +60,7 @@ public async Task GetReferenceVersion(string reference) { public async Task IsReferenceValid(string reference) { string version = await GetReferenceVersion(reference); int[] versionParts = version.Split('.').Select(int.Parse).ToArray(); - // TODO: Update minor with version with udpated make for this build system + // Version when make.py was changed to accommodate this system return versionParts[0] >= 5 && versionParts[1] >= 17 && versionParts[2] >= 19; } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs index 24940539..9347ea12 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs @@ -26,10 +26,7 @@ protected override async Task ProcessExecute() { ModpackRelease release = releaseService.GetRelease(Build.version); await discordService.SendMessageToEveryone(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_RELEASE").AsUlong(), GetDiscordMessage(release)); } else { - await discordService.SendMessage( - VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_RELEASE").AsUlong(), - GetDiscordMessage() - ); // TODO: Change back to DID_C_MODPACK_DEV and change DID_C_MODPACK_RELEASE to live channel + await discordService.SendMessage(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_DEV").AsUlong(), GetDiscordMessage()); } Logger.Log("Notifications sent"); From 575e67dd424b5607d72177abf709c3437d40722b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Aug 2020 12:27:14 +0100 Subject: [PATCH 222/369] Change reset server mods to only return the default mods for that server --- UKSF.Api/Controllers/GameServersController.cs | 11 ++--------- UKSF.Common/ChangeUtilities.cs | 4 ++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/UKSF.Api/Controllers/GameServersController.cs b/UKSF.Api/Controllers/GameServersController.cs index e176277e..e069f4d6 100644 --- a/UKSF.Api/Controllers/GameServersController.cs +++ b/UKSF.Api/Controllers/GameServersController.cs @@ -224,16 +224,9 @@ public async Task SetGameServerMods(string id, [FromBody] JObject } [HttpGet("{id}/mods/reset"), Authorize] - public async Task ResetGameServerMods(string id) { + public IActionResult ResetGameServerMods(string id) { GameServer gameServer = gameServersService.Data.GetSingle(id); - LogWrapper.AuditLog($"Game server '{gameServer.name}' mods & serverMods reset"); - await gameServersService.Data.Update(id, Builders.Update.Unset(x => x.mods).Unset(x => x.serverMods)); - await gameServersService.Data.Update( - id, - Builders.Update.Set(x => x.mods, gameServersService.GetEnvironmentMods(gameServer.environment)) - .Set(x => x.serverMods, new List()) - ); - return Ok(gameServersService.GetAvailableMods(id)); + return Ok(new { availableMods = gameServersService.GetAvailableMods(id), mods = gameServersService.GetEnvironmentMods(gameServer.environment), serverMods = new List()}); } [HttpGet("disabled"), Authorize] diff --git a/UKSF.Common/ChangeUtilities.cs b/UKSF.Common/ChangeUtilities.cs index 6c1b5456..928952bb 100644 --- a/UKSF.Common/ChangeUtilities.cs +++ b/UKSF.Common/ChangeUtilities.cs @@ -42,6 +42,10 @@ public static string Changes(this IEnumerable original, IEnumerable Date: Mon, 3 Aug 2020 14:34:28 +0100 Subject: [PATCH 223/369] Remove pointless process kill --- UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index 7b42df7c..c5d7bfcf 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -91,8 +91,6 @@ public List Run(string workingDirectory, string executable, string args, } } else { // Timeout or cancelled - process.Kill(); - if (!cancellationTokenSource.IsCancellationRequested) { Exception exception = new Exception($"Process exited with non-zero code ({process.ExitCode})"); if (raiseErrors) { From 61ff405a51b0b21eee4178319e6bde89abf185fe Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 3 Aug 2020 16:40:16 +0100 Subject: [PATCH 224/369] Make release backup more granular to speed it up --- .../Modpack/BuildProcess/Steps/Common/BuildStepClean.cs | 9 +++++---- .../BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs | 4 +++- .../BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs | 5 +++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs index dd8d1154..e04925f1 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs @@ -15,12 +15,13 @@ protected override async Task ProcessExecute() { string repoPath = Path.Join(environmentPath, "Backup", "Repo"); string keysPath = Path.Join(environmentPath, "Backup", "Keys"); - Logger.LogSurround("\nCleaning backup folder..."); - Logger.Log("Cleaning repo backup"); + Logger.LogSurround("\nCleaning repo backup..."); await DeleteDirectoryContents(repoPath); - Logger.Log("\nCleaning keys backup"); + Logger.LogSurround("Cleaned repo backup"); + + Logger.LogSurround("\nCleaning keys backup..."); await DeleteDirectoryContents(keysPath); - Logger.LogSurround("Cleaned backup folder"); + Logger.LogSurround("Cleaned keys backup"); } else { string path = Path.Join(environmentPath, "Build"); string repoPath = Path.Join(environmentPath, "Repo"); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs index bc63c34e..66d1a66a 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs @@ -16,7 +16,9 @@ protected override async Task ProcessExecute() { string keysBackupPath = Path.Join(environmentPath, "Backup", "Keys"); Logger.LogSurround("\nBacking up repo..."); - await CopyDirectory(repoPath, repoBackupPath); + await AddFiles(repoPath, repoBackupPath); + await UpdateFiles(repoPath, repoBackupPath); + await DeleteFiles(repoPath, repoBackupPath); Logger.LogSurround("Backed up repo"); Logger.LogSurround("\nBacking up keys..."); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs index 5a3bbb59..05a4c2c7 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs @@ -15,8 +15,9 @@ protected override async Task ProcessExecute() { string keysBackupPath = Path.Join(environmentPath, "Backup", "Keys"); Logger.LogSurround("\nRestoring repo..."); - await DeleteDirectoryContents(repoPath); - await CopyDirectory(repoBackupPath, repoPath); + await AddFiles(repoBackupPath, repoPath); + await UpdateFiles(repoBackupPath, repoPath); + await DeleteFiles(repoBackupPath, repoPath); Logger.LogSurround("Restored repo"); Logger.LogSurround("\nRestoring keys..."); From 9c64e1e723fdaccacbd7fe769b7ac3eb763613cf Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 4 Aug 2020 15:07:29 +0100 Subject: [PATCH 225/369] Fix old audit log format usage --- UKSF.Api.Services/Command/CommandRequestService.cs | 2 +- UKSF.Api/Controllers/UnitsController.cs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/UKSF.Api.Services/Command/CommandRequestService.cs b/UKSF.Api.Services/Command/CommandRequestService.cs index be640931..e65e0aa1 100644 --- a/UKSF.Api.Services/Command/CommandRequestService.cs +++ b/UKSF.Api.Services/Command/CommandRequestService.cs @@ -65,7 +65,7 @@ public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfC } await data.Add(request); - LogWrapper.AuditLog(sessionService.GetContextId(), $"{request.type} request created for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); + LogWrapper.AuditLog($"{request.type} request created for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); bool selfRequest = request.displayRequester == request.displayRecipient; string notificationMessage = $"{request.displayRequester} requires your review on {(selfRequest ? "their" : AvsAn.Query(request.type).Article)} {request.type.ToLower()} request{(selfRequest ? "" : $" for {request.displayRecipient}")}"; foreach (Account account in accounts.Where(x => x.id != requesterAccount.id)) { diff --git a/UKSF.Api/Controllers/UnitsController.cs b/UKSF.Api/Controllers/UnitsController.cs index 2179b93d..ee6923d1 100644 --- a/UKSF.Api/Controllers/UnitsController.cs +++ b/UKSF.Api/Controllers/UnitsController.cs @@ -106,7 +106,7 @@ public IActionResult CheckUnit([FromBody] Unit unit) { [HttpPut, Authorize] public async Task AddUnit([FromBody] Unit unit) { await unitsService.Data.Add(unit); - LogWrapper.AuditLog(sessionService.GetContextId(), $"New unit added '{unit.name}, {unit.shortname}, {unit.type}, {unit.branch}, {unit.teamspeakGroup}, {unit.discordRoleId}, {unit.callsign}'"); + LogWrapper.AuditLog($"New unit added '{unit.name}, {unit.shortname}, {unit.type}, {unit.branch}, {unit.teamspeakGroup}, {unit.discordRoleId}, {unit.callsign}'"); return Ok(); } @@ -115,7 +115,6 @@ public async Task EditUnit([FromBody] Unit unit) { Unit localUnit = unit; Unit oldUnit = unitsService.Data.GetSingle(x => x.id == localUnit.id); LogWrapper.AuditLog( - sessionService.GetContextId(), $"Unit updated from '{oldUnit.name}, {oldUnit.shortname}, {oldUnit.type}, {oldUnit.parent}, {oldUnit.branch}, {oldUnit.teamspeakGroup}, {oldUnit.discordRoleId}, {oldUnit.callsign}, {oldUnit.icon}' to '{unit.name}, {unit.shortname}, {unit.type}, {unit.parent}, {unit.branch}, {unit.teamspeakGroup}, {unit.discordRoleId}, {unit.callsign}, {unit.icon}'" ); await unitsService.Data @@ -158,7 +157,7 @@ await unitsService.Data [HttpDelete("{id}"), Authorize] public async Task DeleteUnit(string id) { Unit unit = unitsService.Data.GetSingle(id); - LogWrapper.AuditLog(sessionService.GetContextId(), $"Unit deleted '{unit.name}'"); + LogWrapper.AuditLog($"Unit deleted '{unit.name}'"); foreach (Account account in accountService.Data.Get(x => x.unitAssignment == unit.name)) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, "Reserves", reason: $"{unit.name} was deleted"); notificationsService.Add(notification); From ae39f3c4b50148f48de248c28d1cdbcda3b000b4 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 4 Aug 2020 18:35:14 +0100 Subject: [PATCH 226/369] Only push step update if the step has changed --- .../Modpack/BuildProcess/Steps/BuildStep.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs index a2fb3675..915bd19d 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs @@ -2,6 +2,7 @@ using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; +using Newtonsoft.Json; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; using UKSF.Api.Models.Game; @@ -154,9 +155,16 @@ private void StartUpdatePusher() { try { _ = Task.Run( async () => { + string previousBuildStepState = JsonConvert.SerializeObject(buildStep); + do { await Task.Delay(updateInterval, updatePusherCancellationTokenSource.Token); - await Update(); + + string newBuildStepState = JsonConvert.SerializeObject(buildStep); + if (newBuildStepState != previousBuildStepState) { + await Update(); + previousBuildStepState = newBuildStepState; + } } while (!updatePusherCancellationTokenSource.IsCancellationRequested); }, updatePusherCancellationTokenSource.Token From 27e033f8e4e28a56e649a7cdb881dd1ad47d9f10 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 5 Aug 2020 18:24:05 +0100 Subject: [PATCH 227/369] Filter commit messages --- UKSF.Api.Services/Integrations/Github/GithubService.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index d428f48e..d386f239 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -183,8 +183,13 @@ public async Task> GetHistoricReleases() { return releases.Select(x => new ModpackRelease { version = x.Name.Split(" ")[^1], timestamp = x.CreatedAt.DateTime, changelog = FormatChangelog(x.Body) }).ToList(); } - private static string CombineCommitMessages(IEnumerable commits) { - return commits.Select(x => x.Commit.Message).Reverse().Aggregate((a, b) => $"{a}\n\n{b}"); + private static string CombineCommitMessages(IReadOnlyCollection commits) { + List filteredCommitMessages = commits.Select(x => x.Commit.Message).Reverse().Where(x => !x.Contains("Merge branch")).ToList(); + if (filteredCommitMessages.Count == 0) { + filteredCommitMessages = new List {commits.First().Commit.Message}; + } + + return filteredCommitMessages.Aggregate((a, b) => $"{a}\n\n{b}"); } private async Task GetOpenMilestone(string version) { From bcf7649238abcbdc50a52ac26f6c0acb15921439 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 5 Aug 2020 18:24:49 +0100 Subject: [PATCH 228/369] Skip commit message string steps --- UKSF.Api.Services/Integrations/Github/GithubService.cs | 6 +----- UKSF.Api/Controllers/UnitsController.cs | 3 --- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index d386f239..76992d3e 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -185,11 +185,7 @@ public async Task> GetHistoricReleases() { private static string CombineCommitMessages(IReadOnlyCollection commits) { List filteredCommitMessages = commits.Select(x => x.Commit.Message).Reverse().Where(x => !x.Contains("Merge branch")).ToList(); - if (filteredCommitMessages.Count == 0) { - filteredCommitMessages = new List {commits.First().Commit.Message}; - } - - return filteredCommitMessages.Aggregate((a, b) => $"{a}\n\n{b}"); + return filteredCommitMessages.Count == 0 ? commits.First().Commit.Message : filteredCommitMessages.Aggregate((a, b) => $"{a}\n\n{b}"); } private async Task GetOpenMilestone(string version) { diff --git a/UKSF.Api/Controllers/UnitsController.cs b/UKSF.Api/Controllers/UnitsController.cs index ee6923d1..314d7d38 100644 --- a/UKSF.Api/Controllers/UnitsController.cs +++ b/UKSF.Api/Controllers/UnitsController.cs @@ -29,12 +29,10 @@ public class UnitsController : Controller { private readonly IRanksService ranksService; private readonly IRolesService rolesService; private readonly IServerService serverService; - private readonly ISessionService sessionService; private readonly ITeamspeakService teamspeakService; private readonly IUnitsService unitsService; public UnitsController( - ISessionService sessionService, IAccountService accountService, IDisplayNameService displayNameService, IRanksService ranksService, @@ -46,7 +44,6 @@ public UnitsController( IDiscordService discordService, INotificationsService notificationsService ) { - this.sessionService = sessionService; this.accountService = accountService; this.displayNameService = displayNameService; this.ranksService = ranksService; From fd16a5387e83db9925701031c17962b8a7f948a6 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 5 Aug 2020 18:32:32 +0100 Subject: [PATCH 229/369] Remove ref/heads from branch name when checking out --- UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs | 2 +- .../Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index dcb7e3ca..3d81db08 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -63,7 +63,7 @@ private static List GetStepsForBuild() => new ModpackBuildStep(BuildStepKeys.NAME), new ModpackBuildStep(BuildStepCbaSettings.NAME), new ModpackBuildStep(BuildStepBuildRepo.NAME), - new ModpackBuildStep(BuildStepNotify.NAME) + // new ModpackBuildStep(BuildStepNotify.NAME) }; private static List GetStepsForRc() => diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index b0435541..5adddee4 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -78,7 +78,7 @@ private Task CheckoutStaticSource(string displayName, string modName, string rel } private Task CheckoutModpack() { - string reference = string.Equals(Build.commit.branch, "None") ? Build.commit.after : Build.commit.branch; + string reference = string.Equals(Build.commit.branch, "None") ? Build.commit.after : Build.commit.branch.Replace("refs/heads/", ""); string referenceName = string.Equals(Build.commit.branch, "None") ? reference : $"latest {reference}"; Logger.LogSurround("\nChecking out modpack..."); string modpackPath = Path.Join(GetBuildSourcesPath(), "modpack"); From 151a7fae63f6672375730471b242ce68770a1884 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 5 Aug 2020 22:43:44 +0100 Subject: [PATCH 230/369] Re-enable notify step --- UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index 3d81db08..dcb7e3ca 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -63,7 +63,7 @@ private static List GetStepsForBuild() => new ModpackBuildStep(BuildStepKeys.NAME), new ModpackBuildStep(BuildStepCbaSettings.NAME), new ModpackBuildStep(BuildStepBuildRepo.NAME), - // new ModpackBuildStep(BuildStepNotify.NAME) + new ModpackBuildStep(BuildStepNotify.NAME) }; private static List GetStepsForRc() => From f243b4e6857cd118dd4528c969c3f2f081f96754 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 5 Aug 2020 23:37:18 +0100 Subject: [PATCH 231/369] Replace git fetch in sources commands --- .../Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 5adddee4..75535550 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -52,7 +52,7 @@ private Task CheckoutStaticSource(string displayName, string modName, string rel ) .Last(); - new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run(path, "cmd.exe", "/c \"git pull\"", (int) TimeSpan.FromSeconds(30).TotalMilliseconds); + new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run(path, "cmd.exe", "/c \"git fetch && git pull\"", (int) TimeSpan.FromSeconds(30).TotalMilliseconds); string after = new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( path, @@ -91,7 +91,7 @@ private Task CheckoutModpack() { new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( modpackPath, "cmd.exe", - $"/c \"git reset --hard HEAD && git clean -d -f && git checkout {reference} && git pull\"", + $"/c \"git reset --hard HEAD && git clean -d -f && git fetch && git checkout {reference} && git pull\"", (int) TimeSpan.FromSeconds(30).TotalMilliseconds ); Logger.LogSurround("Checked out modpack"); From cbac5797d6aee8efe100b42617d2b5ed2c44851b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 6 Aug 2020 00:15:19 +0100 Subject: [PATCH 232/369] Append signature and issues link to changelog --- UKSF.Api.Services/Integrations/Github/GithubService.cs | 5 +---- UKSF.Api.Services/Modpack/ReleaseService.cs | 10 ++++++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 76992d3e..78af1c4e 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -119,9 +119,6 @@ public async Task GenerateChangelog(string version) { AddChangelogUpdated(ref changelog, updated, "Updated"); AddChangelogSection(ref changelog, removed, "Removed"); - changelog += "SR3 - Development Team"; - changelog += "\n[Report and track issues here](https://github.com/uksf/modpack/issues)"; - return changelog; } @@ -132,7 +129,7 @@ public async Task PublishRelease(ModpackRelease release) { await client.Repository.Release.Create( REPO_ORG, REPO_NAME, - new NewRelease(release.version) { Name = $"Modpack Version {release.version}", Body = $"{release.description}\n\n{release.changelog.Replace("
", "")}" } + new NewRelease(release.version) { Name = $"Modpack Version {release.version}", Body = $"{release.description}\n\n## Changelog\n{release.changelog.Replace("
", "")}" } ); Milestone milestone = await GetOpenMilestone(release.version); diff --git a/UKSF.Api.Services/Modpack/ReleaseService.cs b/UKSF.Api.Services/Modpack/ReleaseService.cs index 72f4c8f2..fd302198 100644 --- a/UKSF.Api.Services/Modpack/ReleaseService.cs +++ b/UKSF.Api.Services/Modpack/ReleaseService.cs @@ -12,8 +12,8 @@ namespace UKSF.Api.Services.Modpack { public class ReleaseService : DataBackedService, IReleaseService { - private readonly IGithubService githubService; private readonly IAccountService accountService; + private readonly IGithubService githubService; public ReleaseService(IReleasesDataService data, IGithubService githubService, IAccountService accountService) : base(data) { this.githubService = githubService; @@ -40,7 +40,13 @@ public async Task PublishRelease(string version) { throw new NullReferenceException($"Could not find release {version}"); } - await Data.Update(release.id, Builders.Update.Set(x => x.timestamp, DateTime.Now).Set(x => x.isDraft, false)); + if (release.changelog.EndsWith("\n\n")) { + release.changelog += "\n\n"; + } + + release.changelog += "SR3 - Development Team\n[Report and track issues here](https://github.com/uksf/modpack/issues)"; + + await Data.Update(release.id, Builders.Update.Set(x => x.timestamp, DateTime.Now).Set(x => x.isDraft, false).Set(x => x.changelog, release.changelog)); await githubService.PublishRelease(release); } From b7dfbca113c3a7cece9202abe7854faef151bcac Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 10 Aug 2020 19:43:00 +0100 Subject: [PATCH 233/369] Change engineer and medic slots to use a variable of ids --- .../Game/Missions/MissionDataResolver.cs | 62 +++++++++++-------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs index 46a01aeb..f5b2b079 100644 --- a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs +++ b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs @@ -1,31 +1,34 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Models.Mission; +using UKSF.Api.Services.Admin; namespace UKSF.Api.Services.Game.Missions { public static class MissionDataResolver { - private static readonly string[] ENGINEER_IDS = { - "5a1e894463d0f71710089106", // Bridg - "59e38f31594c603b78aa9dc3", // Handi - "59e38f13594c603b78aa9dbf", // Carr - "5bc3bccdffbf7a11b803c3f6", // Delta - "59e3958b594c603b78aa9dcd", // Joho - "5a2439443fccaa15902aaa4e", // Mac - "5a4e7effd68b7e16e46fc614", // Woody - "5a1a16ce630e7413645b73fd", // Penn - "5a1a14b5aacf7b00346dcc37" // Gilbert - }; - - private static readonly string[] MEDIC_IDS = { - "59e3958b594c603b78aa9dcd", // Joho - "5a2439443fccaa15902aaa4e", // Mac - "5acfd72259f89d08ec1c21d8", // Stan - "5e0d3273b91cc00aa001213f", // Baxter - "5eee34c8ddf6642260aa6a4b", // Eliason - "5e0d31c3b91cc00aa001213b", // Gibney - "5a1a14b5aacf7b00346dcc37", // Gilbert - "5e24bbe949ddd04030d72ca5" // Hass - }; + // TODO: Add special display to variables area that resolves IDs as display names, unit names, ranks, roles, etc + // Possibly do a selection list of all items per type? + // private static readonly string[] ENGINEER_IDS = { + // "5a1e894463d0f71710089106", // Bridg + // "59e38f31594c603b78aa9dc3", // Handi + // "59e38f13594c603b78aa9dbf", // Carr + // "5bc3bccdffbf7a11b803c3f6", // Delta + // "59e3958b594c603b78aa9dcd", // Joho + // "5a2439443fccaa15902aaa4e", // Mac + // "5a4e7effd68b7e16e46fc614", // Woody + // "5a1a16ce630e7413645b73fd", // Penn + // "5a1a14b5aacf7b00346dcc37" // Gilbert + // }; + // + // private static readonly string[] MEDIC_IDS = { + // "59e3958b594c603b78aa9dcd", // Joho + // "5a2439443fccaa15902aaa4e", // Mac + // "5acfd72259f89d08ec1c21d8", // Stan + // "5e0d3273b91cc00aa001213f", // Baxter + // "5eee34c8ddf6642260aa6a4b", // Eliason + // "5e0d31c3b91cc00aa001213b", // Gibney + // "5a1a14b5aacf7b00346dcc37", // Gilbert + // "5e24bbe949ddd04030d72ca5" // Hass + // }; public static string ResolveObjectClass(MissionPlayer player) { if (IsMedic(player)) return "UKSF_B_Medic"; // Team Medic @@ -52,9 +55,14 @@ private static int ResolvePlayerUnitRole(MissionPlayer player) { return -1; } - private static bool IsMedic(MissionPlayer player) => MEDIC_IDS.Contains(player.account?.id); + private static bool IsMedic(MissionPlayer player) => IsSpecialist(player, "MISSIONS_MEDIC_IDS"); - public static bool IsEngineer(MissionPlayer player) => ENGINEER_IDS.Contains(player.account?.id); + public static bool IsEngineer(MissionPlayer player) => IsSpecialist(player, "MISSIONS_ENGINEER_IDS"); + + private static bool IsSpecialist(MissionPlayer player, string idsVariableName) { + string[] ids = VariablesWrapper.VariablesDataService().GetSingle(idsVariableName).AsArray(); + return ids.Contains(player.account?.id); + } public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) { return unit.sourceUnit.id switch { @@ -105,7 +113,7 @@ public static List ResolveUnitSlots(MissionUnit unit) { slots.AddRange(unit.members); fillerCount = max - slots.Count; for (int i = 0; i < fillerCount; i++) { - MissionPlayer player = new MissionPlayer {name = "Sniper", unit = unit, rank = MissionPatchData.instance.ranks.Find(x => x.name == "Private")}; + MissionPlayer player = new MissionPlayer { name = "Sniper", unit = unit, rank = MissionPatchData.instance.ranks.Find(x => x.name == "Private") }; player.objectClass = ResolveObjectClass(player); slots.Add(player); } @@ -117,7 +125,7 @@ public static List ResolveUnitSlots(MissionUnit unit) { slots.AddRange(unit.members); fillerCount = max - slots.Count; for (int i = 0; i < fillerCount; i++) { - MissionPlayer player = new MissionPlayer {name = "Reserve", unit = unit, rank = MissionPatchData.instance.ranks.Find(x => x.name == "Recruit")}; + MissionPlayer player = new MissionPlayer { name = "Reserve", unit = unit, rank = MissionPatchData.instance.ranks.Find(x => x.name == "Recruit") }; player.objectClass = ResolveObjectClass(player); slots.Add(player); } @@ -125,7 +133,7 @@ public static List ResolveUnitSlots(MissionUnit unit) { break; case "5ad748e0de5d414f4c4055e0": // "Guardian 1-R" for (int i = 0; i < 6; i++) { - MissionPlayer player = new MissionPlayer {name = "Reserve", unit = unit, rank = MissionPatchData.instance.ranks.Find(x => x.name == "Recruit")}; + MissionPlayer player = new MissionPlayer { name = "Reserve", unit = unit, rank = MissionPatchData.instance.ranks.Find(x => x.name == "Recruit") }; player.objectClass = ResolveObjectClass(player); slots.Add(player); } From d99713679a4409a465ce3d314236d3eef484f7c2 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 10 Aug 2020 19:48:54 +0100 Subject: [PATCH 234/369] Fix teamspeak event test --- .../Unit/Events/Handlers/TeamspeakEventHandlerTests.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs index c57fdb04..03594a38 100644 --- a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -202,12 +202,9 @@ public async Task ShouldRunSingleClientGroupsUpdateForMultipleEventsWithOneClien teamspeakEventHandler.Init(); - void Act1() => Task.Run(() => signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" })); - void Act2() => Task.Run(() => signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" })); - - Act1(); - Act2(); - await Task.Delay(TimeSpan.FromSeconds(1)); + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); + await Task.Delay(TimeSpan.FromSeconds(2)); mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5, 10 }, 1), Times.Once); } From 2c8cfec57228907192427534d0b3c69a23d1d9bd Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 11 Aug 2020 09:11:54 +0100 Subject: [PATCH 235/369] Change grant type for instagram token --- UKSF.Api.Services/Integrations/InstagramService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs index 2fb6196a..99e79076 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -19,7 +19,7 @@ public async Task RefreshAccessToken() { string accessToken = VariablesWrapper.VariablesDataService().GetSingle("INSTAGRAM_ACCESS_TOKEN").AsString(); using HttpClient client = new HttpClient(); - HttpResponseMessage response = await client.GetAsync($"https://graph.instagram.com/refresh_access_token?access_token={accessToken}&grant_type=ig_exchange_token"); + HttpResponseMessage response = await client.GetAsync($"https://graph.instagram.com/refresh_access_token?access_token={accessToken}&grant_type=ig_refresh_token"); if (!response.IsSuccessStatusCode) { LogWrapper.Log($"Failed to get instagram access token, error: {response}"); return; From 85fa361e35a95e9fdd91294bbe1d21d9774aaa3b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 12 Aug 2020 09:41:31 +0100 Subject: [PATCH 236/369] Don't notify for dev builds, only rc --- .../Steps/Common/BuildStepNotify.cs | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs index 9347ea12..0e02b724 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs @@ -1,4 +1,5 @@ -using System.Threading.Tasks; +using System; +using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Modpack; @@ -22,25 +23,29 @@ protected override Task SetupExecute() { } protected override async Task ProcessExecute() { - if (Build.environment == GameEnvironment.RELEASE) { - ModpackRelease release = releaseService.GetRelease(Build.version); - await discordService.SendMessageToEveryone(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_RELEASE").AsUlong(), GetDiscordMessage(release)); - } else { - await discordService.SendMessage(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_DEV").AsUlong(), GetDiscordMessage()); + switch (Build.environment) { + case GameEnvironment.RELEASE: { + ModpackRelease release = releaseService.GetRelease(Build.version); + await discordService.SendMessageToEveryone(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_RELEASE").AsUlong(), GetDiscordMessage(release)); + break; + } + case GameEnvironment.RC: + await discordService.SendMessage(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_DEV").AsUlong(), GetDiscordMessage()); + break; + case GameEnvironment.DEV: break; + default: throw new ArgumentOutOfRangeException(); } Logger.Log("Notifications sent"); } - private string GetBuildMessage() => - Build.environment == GameEnvironment.RC ? $"New release candidate available for {Build.version} on the rc repository" : "New dev build available on the dev repository"; + private string GetBuildMessage() => $"New release candidate available for {Build.version} on the rc repository"; - private string GetBuildLink() => - Build.environment == GameEnvironment.RC ? $"https://uk-sf.co.uk/modpack/builds-rc?version={Build.version}&build={Build.id}" : $"https://uk-sf.co.uk/modpack/builds-dev?build={Build.id}"; + private string GetBuildLink() => $"https://uk-sf.co.uk/modpack/builds-rc?version={Build.version}&build={Build.id}"; private string GetDiscordMessage(ModpackRelease release = null) => release == null - ? $"Modpack {(Build.environment == GameEnvironment.RC ? "RC" : "Dev")} Build - {(Build.environment == GameEnvironment.RC ? $"{Build.version} RC# {Build.buildNumber}" : $"#{Build.buildNumber}")}\n{GetBuildMessage()}\n<{GetBuildLink()}>" + ? $"Modpack RC Build - {Build.version} RC# {Build.buildNumber}\n{GetBuildMessage()}\n<{GetBuildLink()}>" : $"Modpack Update - {release.version}\nChangelog: \n\n```{release.description}```"; } } From 76d5ee315dc8d64997d93faebc87d135391263e6 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 12 Aug 2020 09:46:54 +0100 Subject: [PATCH 237/369] Remove notify step from dev builds --- UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index dcb7e3ca..23fc779b 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -62,8 +62,7 @@ private static List GetStepsForBuild() => new ModpackBuildStep(BuildStepDeploy.NAME), new ModpackBuildStep(BuildStepKeys.NAME), new ModpackBuildStep(BuildStepCbaSettings.NAME), - new ModpackBuildStep(BuildStepBuildRepo.NAME), - new ModpackBuildStep(BuildStepNotify.NAME) + new ModpackBuildStep(BuildStepBuildRepo.NAME) }; private static List GetStepsForRc() => From 98a18e8505500f3eb9f8cc3949bb13d0c24951d0 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 13 Aug 2020 15:46:39 +0100 Subject: [PATCH 238/369] Turn on logging for sources step --- .../Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 75535550..c180bffe 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -87,8 +87,8 @@ private Task CheckoutModpack() { throw new Exception("Modpack source directory does not exist. Modpack should be cloned before running a build."); } - Logger.Log($"Checking out {referenceName}"); - new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( + Logger.Log($"Checking out {referenceName} ({reference})"); + new BuildProcessHelper(Logger, CancellationTokenSource, false, true, false).Run( modpackPath, "cmd.exe", $"/c \"git reset --hard HEAD && git clean -d -f && git fetch && git checkout {reference} && git pull\"", From 8c32670817fea1e098d3abcc2a0b720e7e7ab6ac Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 13 Aug 2020 15:51:23 +0100 Subject: [PATCH 239/369] Don't raise errors for sources --- .../Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index c180bffe..0714d0eb 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -88,7 +88,7 @@ private Task CheckoutModpack() { } Logger.Log($"Checking out {referenceName} ({reference})"); - new BuildProcessHelper(Logger, CancellationTokenSource, false, true, false).Run( + new BuildProcessHelper(Logger, CancellationTokenSource, false, false, false).Run( modpackPath, "cmd.exe", $"/c \"git reset --hard HEAD && git clean -d -f && git fetch && git checkout {reference} && git pull\"", From 6a2a438d70b327dcb758f801ffe3c554c2dec0c6 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 13 Aug 2020 15:57:11 +0100 Subject: [PATCH 240/369] Split git checkout and pull for modpack source --- .../BuildProcess/BuildProcessHelper.cs | 139 ------------------ .../Steps/BuildSteps/BuildStepSources.cs | 10 +- 2 files changed, 8 insertions(+), 141 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index c5d7bfcf..ee79f8d8 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -176,144 +176,5 @@ private static List> ExtractMessages(string message, ref s return messages; } - - // public static async Task> RunProcess( - // IStepLogger logger, - // CancellationTokenSource cancellationTokenSource, - // string workingDirectory, - // string executable, - // string args, - // double timeout, - // bool suppressOutput = false, - // bool raiseErrors = true, - // bool errorSilently = false, - // List errorExclusions = null - // ) { - // using Process process = new Process { - // StartInfo = { - // FileName = executable, - // WorkingDirectory = workingDirectory, - // Arguments = args, - // UseShellExecute = false, - // CreateNoWindow = true, - // RedirectStandardOutput = true, - // RedirectStandardError = true - // }, - // EnableRaisingEvents = true - // }; - // - // Exception capturedException = null; - // CancellationTokenSource errorCancellationTokenSource = new CancellationTokenSource(); - // - // TaskCompletionSource processExitEvent = new TaskCompletionSource(); - // process.Exited += (sender, receivedEventArgs) => { - // // ((Process) sender)?.WaitForExit(); - // processExitEvent.TrySetResult(true); - // }; - // processTasks.Add(processExitEvent.Task); - // - // List results = new List(); - // TaskCompletionSource outputCloseEvent = new TaskCompletionSource(); - // process.OutputDataReceived += (sender, receivedEventArgs) => { - // if (receivedEventArgs.Data == null) { - // outputCloseEvent.TrySetResult(true); - // return; - // } - // - // string message = receivedEventArgs.Data; - // if (!string.IsNullOrEmpty(message)) { - // results.Add(message); - // } - // - // if (!suppressOutput) { - // string json = ""; - // try { - // List> messages = ExtractMessages(message, ref json); - // foreach ((string text, string colour) in messages) { - // logger.Log(text, colour); - // } - // } catch (Exception exception) { - // capturedException = new Exception($"Json failed: {json}\n\n{exception}"); - // errorCancellationTokenSource.Cancel(); - // } - // } - // }; - // processTasks.Add(outputCloseEvent.Task); - // - // bool ignoreErrors = false; - // TaskCompletionSource errorCloseEvent = new TaskCompletionSource(); - // process.ErrorDataReceived += (sender, receivedEventArgs) => { - // if (receivedEventArgs.Data == null) { - // errorCloseEvent.TrySetResult(true); - // return; - // } - // - // string message = receivedEventArgs.Data; - // if (string.IsNullOrEmpty(message)) return; - // - // if (message.ContainsIgnoreCase("File written to")) { - // ignoreErrors = false; - // return; - // } - // - // if (ignoreErrors) return; - // - // if (message.ContainsIgnoreCase("MakePbo Version")) { - // ignoreErrors = true; - // return; - // } - // - // if (errorExclusions != null && errorExclusions.Any(x => message.ContainsIgnoreCase(x))) return; - // - // capturedException = new Exception(message); - // errorCancellationTokenSource.Cancel(); - // }; - // processTasks.Add(errorCloseEvent.Task); - // - // await using CancellationTokenRegistration unused = cancellationTokenSource.Token.Register(process.Kill); - // await using CancellationTokenRegistration _ = errorCancellationTokenSource.Token.Register(process.Kill); - // - // Task processCompletionTask = Task.WhenAll(processTasks); - // Task awaitingTask = Task.WhenAny(Task.Delay((int) timeout, cancellationTokenSource.Token), processCompletionTask); - // process.Start(); - // process.BeginOutputReadLine(); - // process.BeginErrorReadLine(); - // if (await awaitingTask.ConfigureAwait(false) == processCompletionTask) { - // if (capturedException != null) { - // if (raiseErrors) { - // throw capturedException; - // } - // - // if (!errorSilently) { - // logger.LogError(capturedException); - // } - // } - // - // if (raiseErrors && process.ExitCode != 0) { - // string json = ""; - // List> messages = ExtractMessages(results.Last(), ref json); - // if (messages.Any()) { - // throw new Exception(messages.First().Item1); - // } - // - // throw new Exception(); - // } - // } else { - // process.Kill(); - // - // if (!cancellationTokenSource.IsCancellationRequested) { - // Exception exception = new Exception($"Process exited with non-zero code ({process.ExitCode})"); - // if (raiseErrors) { - // throw exception; - // } - // - // if (!errorSilently) { - // logger.LogError(exception); - // } - // } - // } - // - // return results; - // } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 0714d0eb..1a19322e 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -88,10 +88,16 @@ private Task CheckoutModpack() { } Logger.Log($"Checking out {referenceName} ({reference})"); - new BuildProcessHelper(Logger, CancellationTokenSource, false, false, false).Run( + new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( modpackPath, "cmd.exe", - $"/c \"git reset --hard HEAD && git clean -d -f && git fetch && git checkout {reference} && git pull\"", + $"/c \"git reset --hard HEAD && git clean -d -f && git checkout {reference} && git pull\"", + (int) TimeSpan.FromSeconds(30).TotalMilliseconds + ); + new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( + modpackPath, + "cmd.exe", + "/c \"git fetch && git pull\"", (int) TimeSpan.FromSeconds(30).TotalMilliseconds ); Logger.LogSurround("Checked out modpack"); From 38f93ddf841bb0049f3b2748f7acc9dd6ec5a2e8 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 13 Aug 2020 16:16:28 +0100 Subject: [PATCH 241/369] Remove debug reference name, don't error process if cancelled. Split sources steps into smaller commands --- .../BuildProcess/BuildProcessHelper.cs | 4 ++ .../Steps/BuildSteps/BuildStepSources.cs | 56 +++++++------------ 2 files changed, 23 insertions(+), 37 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs index ee79f8d8..1286c886 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs @@ -70,6 +70,10 @@ public List Run(string workingDirectory, string executable, string args, process.BeginErrorReadLine(); if (process.WaitForExit(timeout) && outputWaitHandle.WaitOne(timeout) && errorWaitHandle.WaitOne(timeout)) { + if (cancellationTokenSource.IsCancellationRequested) { + return results; + } + if (capturedException != null) { if (raiseErrors) { throw capturedException; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 1a19322e..2e5afae2 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -37,30 +37,12 @@ private Task CheckoutStaticSource(string displayName, string modName, string rel DirectoryInfo release = new DirectoryInfo(releasePath); DirectoryInfo repo = new DirectoryInfo(repoPath); - new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( - path, - "cmd.exe", - $"/c \"git reset --hard HEAD && git clean -d -f && git checkout {branchName}\"", - (int) TimeSpan.FromSeconds(30).TotalMilliseconds - ); - - string before = new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( - path, - "cmd.exe", - "/c \"git rev-parse HEAD\"", - (int) TimeSpan.FromSeconds(10).TotalMilliseconds - ) - .Last(); - - new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run(path, "cmd.exe", "/c \"git fetch && git pull\"", (int) TimeSpan.FromSeconds(30).TotalMilliseconds); - - string after = new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( - path, - "cmd.exe", - "/c \"git rev-parse HEAD\"", - (int) TimeSpan.FromSeconds(10).TotalMilliseconds - ) - .Last(); + GitCommand(path, "git reset --hard HEAD && git clean -d -f && git fetch"); + GitCommand(path, $"git checkout {branchName}"); + string before = GitCommand(path, "git rev-parse HEAD"); + GitCommand(path, "git fetch"); + GitCommand(path, "git pull"); + string after = GitCommand(path, "git rev-parse HEAD"); if (release.Exists && repo.Exists) { Logger.Log($"{before?.Substring(0, 7)} vs {after?.Substring(0, 7)}"); @@ -87,22 +69,22 @@ private Task CheckoutModpack() { throw new Exception("Modpack source directory does not exist. Modpack should be cloned before running a build."); } - Logger.Log($"Checking out {referenceName} ({reference})"); - new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( - modpackPath, - "cmd.exe", - $"/c \"git reset --hard HEAD && git clean -d -f && git checkout {reference} && git pull\"", - (int) TimeSpan.FromSeconds(30).TotalMilliseconds - ); - new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( - modpackPath, - "cmd.exe", - "/c \"git fetch && git pull\"", - (int) TimeSpan.FromSeconds(30).TotalMilliseconds - ); + Logger.Log($"Checking out {referenceName}"); + GitCommand(modpackPath, "git reset --hard HEAD && git clean -d -f && git fetch"); + GitCommand(modpackPath, $"git checkout {reference}"); + GitCommand(modpackPath, "git fetch"); + GitCommand(modpackPath, "git pull"); Logger.LogSurround("Checked out modpack"); return Task.CompletedTask; } + + private string GitCommand(string workingDirectory, string command) => + new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( + workingDirectory, + "cmd.exe", + $"/c \"{command}\"", + (int) TimeSpan.FromSeconds(10).TotalMilliseconds + ).Last(); } } From b8b0c5ea24041687f99ff37cd81cd9f34ec65c64 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 13 Aug 2020 16:18:57 +0100 Subject: [PATCH 242/369] Fix empty process return --- .../BuildProcess/Steps/BuildSteps/BuildStepSources.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 2e5afae2..197f94bb 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; @@ -79,12 +80,14 @@ private Task CheckoutModpack() { return Task.CompletedTask; } - private string GitCommand(string workingDirectory, string command) => - new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( + private string GitCommand(string workingDirectory, string command) { + List results = new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( workingDirectory, "cmd.exe", $"/c \"{command}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds - ).Last(); + ); + return results.Count > 0 ? results.Last() : string.Empty; + } } } From 03d593e30474403799f6a3a472e4335a2c921eb7 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 13 Aug 2020 17:40:53 +0100 Subject: [PATCH 243/369] Change mod build steps to always move latest release files to build --- .../Steps/BuildSteps/Mods/BuildStepBuildAce.cs | 12 ++++++------ .../BuildSteps/Mods/BuildStepBuildAcre.cs | 18 ++++++++++++------ .../Steps/BuildSteps/Mods/BuildStepBuildF35.cs | 12 ++++++------ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs index 97392b8a..c4dfa324 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs @@ -10,8 +10,6 @@ public class BuildStepBuildAce : ModBuildStep { private const string MOD_NAME = "ace"; private readonly List allowedOptionals = new List { "ace_compat_rksl_pm_ii", "ace_nouniformrestrictions" }; - public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); - protected override async Task ProcessExecute() { Logger.Log("Running build for ACE"); @@ -19,10 +17,12 @@ protected override async Task ProcessExecute() { string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@ace"); string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf_ace"); - Logger.LogSurround("\nRunning make.py..."); - BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version"); - processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); - Logger.LogSurround("Make.py complete"); + if (IsBuildNeeded(MOD_NAME)) { + Logger.LogSurround("\nRunning make.py..."); + BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version"); + processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); + Logger.LogSurround("Make.py complete"); + } Logger.LogSurround("\nMoving ACE release to build..."); await CopyDirectory(releasePath, buildPath); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index 4b12c00e..e5dcf083 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -16,8 +16,6 @@ public class BuildStepBuildAcre : ModBuildStep { "Build Type" }; - public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); - protected override async Task ProcessExecute() { Logger.Log("Running build for ACRE"); @@ -25,10 +23,18 @@ protected override async Task ProcessExecute() { string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@acre2"); string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@acre2"); - Logger.LogSurround("\nRunning make.py..."); - BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, errorExclusions: errorExclusions, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version"); - processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect compile"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); - Logger.LogSurround("Make.py complete"); + if (IsBuildNeeded(MOD_NAME)) { + Logger.LogSurround("\nRunning make.py..."); + BuildProcessHelper processHelper = new BuildProcessHelper( + Logger, + CancellationTokenSource, + errorExclusions: errorExclusions, + ignoreErrorGateClose: "File written to", + ignoreErrorGateOpen: "MakePbo Version" + ); + processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect compile"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); + Logger.LogSurround("Make.py complete"); + } Logger.LogSurround("\nMoving ACRE release to build..."); await CopyDirectory(releasePath, buildPath); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs index 4f664dac..904bc198 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs @@ -9,8 +9,6 @@ public class BuildStepBuildF35 : ModBuildStep { public const string NAME = "Build F-35"; private const string MOD_NAME = "f35"; - public override bool CheckGuards() => IsBuildNeeded(MOD_NAME); - protected override async Task ProcessExecute() { Logger.Log("Running build for F-35"); @@ -20,10 +18,12 @@ protected override async Task ProcessExecute() { DirectoryInfo release = new DirectoryInfo(releasePath); DirectoryInfo dependencies = new DirectoryInfo(dependenciesPath); - Logger.LogSurround("\nRunning make.py..."); - BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource); - processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(1).TotalMilliseconds); - Logger.LogSurround("Make.py complete"); + if (IsBuildNeeded(MOD_NAME)) { + Logger.LogSurround("\nRunning make.py..."); + BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource); + processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(1).TotalMilliseconds); + Logger.LogSurround("Make.py complete"); + } Logger.LogSurround("\nMoving F-35 pbos to uksf dependencies..."); List files = GetDirectoryContents(release, "*.pbo"); From 193b78a1d371f308b25bb02531f117e55d07ecf9 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 13 Aug 2020 17:46:36 +0100 Subject: [PATCH 244/369] Don't only search for closed issues when generating changelog --- UKSF.Api.Services/Integrations/Github/GithubService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 78af1c4e..279f27d5 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -102,7 +102,7 @@ public async Task GenerateChangelog(string version) { IReadOnlyList issues = await client.Issue.GetAllForRepository( REPO_ORG, REPO_NAME, - new RepositoryIssueRequest { Milestone = milestone.Number.ToString(), State = ItemStateFilter.Closed } + new RepositoryIssueRequest { Milestone = milestone.Number.ToString(), State = ItemStateFilter.All } ); string changelog = ""; From 318d051ed530c7ed29b329a5a46e5c436b5a69d2 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 14 Aug 2020 15:49:42 +0100 Subject: [PATCH 245/369] Show output for git commands --- UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs | 2 +- .../Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index 23fc779b..71bcac40 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -81,7 +81,7 @@ private static List GetStepsForRc() => new ModpackBuildStep(BuildStepKeys.NAME), new ModpackBuildStep(BuildStepCbaSettings.NAME), new ModpackBuildStep(BuildStepBuildRepo.NAME), - new ModpackBuildStep(BuildStepNotify.NAME) + // new ModpackBuildStep(BuildStepNotify.NAME) }; private static List GetStepsForRelease() => diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 197f94bb..15eb02d0 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -81,7 +81,7 @@ private Task CheckoutModpack() { } private string GitCommand(string workingDirectory, string command) { - List results = new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true).Run( + List results = new BuildProcessHelper(Logger, CancellationTokenSource, false, false, true).Run( workingDirectory, "cmd.exe", $"/c \"{command}\"", From 879c61745e601b1bcd70d54c90b88234662b9e86 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 14 Aug 2020 15:54:44 +0100 Subject: [PATCH 246/369] Try without fetch --- .../BuildProcess/Steps/BuildSteps/BuildStepSources.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 15eb02d0..bb6eb409 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -41,7 +41,7 @@ private Task CheckoutStaticSource(string displayName, string modName, string rel GitCommand(path, "git reset --hard HEAD && git clean -d -f && git fetch"); GitCommand(path, $"git checkout {branchName}"); string before = GitCommand(path, "git rev-parse HEAD"); - GitCommand(path, "git fetch"); + // GitCommand(path, "git fetch"); GitCommand(path, "git pull"); string after = GitCommand(path, "git rev-parse HEAD"); @@ -70,10 +70,10 @@ private Task CheckoutModpack() { throw new Exception("Modpack source directory does not exist. Modpack should be cloned before running a build."); } - Logger.Log($"Checking out {referenceName}"); - GitCommand(modpackPath, "git reset --hard HEAD && git clean -d -f && git fetch"); + Logger.Log($"Checking out {reference}"); + GitCommand(modpackPath, "git reset --hard HEAD && git clean -d -f"); GitCommand(modpackPath, $"git checkout {reference}"); - GitCommand(modpackPath, "git fetch"); + // GitCommand(modpackPath, "git fetch"); GitCommand(modpackPath, "git pull"); Logger.LogSurround("Checked out modpack"); From aac8256ae52e38cb05c5fec6b4c04e62899b3a1e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 14 Aug 2020 16:59:38 +0100 Subject: [PATCH 247/369] Checkout remote branch then local to ensure branch is local and checked out --- .../BuildProcess/Steps/BuildSteps/BuildStepSources.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index bb6eb409..5ec1b848 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -39,9 +39,9 @@ private Task CheckoutStaticSource(string displayName, string modName, string rel DirectoryInfo repo = new DirectoryInfo(repoPath); GitCommand(path, "git reset --hard HEAD && git clean -d -f && git fetch"); + GitCommand(path, $"git checkout -t origin/{branchName}"); GitCommand(path, $"git checkout {branchName}"); string before = GitCommand(path, "git rev-parse HEAD"); - // GitCommand(path, "git fetch"); GitCommand(path, "git pull"); string after = GitCommand(path, "git rev-parse HEAD"); @@ -70,10 +70,10 @@ private Task CheckoutModpack() { throw new Exception("Modpack source directory does not exist. Modpack should be cloned before running a build."); } - Logger.Log($"Checking out {reference}"); - GitCommand(modpackPath, "git reset --hard HEAD && git clean -d -f"); + Logger.Log($"Checking out {referenceName}"); + GitCommand(modpackPath, "git reset --hard HEAD && git clean -d -f && git fetch"); + GitCommand(modpackPath, $"git checkout -t origin/{reference}"); GitCommand(modpackPath, $"git checkout {reference}"); - // GitCommand(modpackPath, "git fetch"); GitCommand(modpackPath, "git pull"); Logger.LogSurround("Checked out modpack"); From 4a14ace90bd3754b0bbc358c1bf068403aea97ca Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 14 Aug 2020 17:04:03 +0100 Subject: [PATCH 248/369] Re-enable rc notify step --- UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs index 71bcac40..23fc779b 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs @@ -81,7 +81,7 @@ private static List GetStepsForRc() => new ModpackBuildStep(BuildStepKeys.NAME), new ModpackBuildStep(BuildStepCbaSettings.NAME), new ModpackBuildStep(BuildStepBuildRepo.NAME), - // new ModpackBuildStep(BuildStepNotify.NAME) + new ModpackBuildStep(BuildStepNotify.NAME) }; private static List GetStepsForRelease() => From efad7197db9e1ab05e60a341d50cfdc685f052c8 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 14 Aug 2020 21:17:15 +0100 Subject: [PATCH 249/369] Changed build cancel to remove from queue if build has not started. Properly remove build cancellation tokens after use --- .../Modpack/BuildProcess/BuildQueueService.cs | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs index 1244049b..7b43b9a3 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Concurrent; +using System.Linq; using System.Threading; using System.Threading.Tasks; using UKSF.Api.Interfaces.Game; @@ -13,7 +14,7 @@ public class BuildQueueService : IBuildQueueService { private readonly ConcurrentDictionary buildTasks = new ConcurrentDictionary(); private readonly ConcurrentDictionary cancellationTokenSources = new ConcurrentDictionary(); private readonly IGameServersService gameServersService; - private readonly ConcurrentQueue queue = new ConcurrentQueue(); + private ConcurrentQueue queue = new ConcurrentQueue(); private bool processing; public BuildQueueService(IBuildProcessorService buildProcessorService, IGameServersService gameServersService) { @@ -32,25 +33,32 @@ public void QueueBuild(ModpackBuild build) { } public void Cancel(string id) { + if (queue.Any(x => x.id == id)) { + queue = new ConcurrentQueue(queue.Where(x => x.id != id)); + } + if (cancellationTokenSources.ContainsKey(id)) { CancellationTokenSource cancellationTokenSource = cancellationTokenSources[id]; cancellationTokenSource.Cancel(); + cancellationTokenSources.TryRemove(id, out CancellationTokenSource _); } - _ = Task.Run( - async () => { - await Task.Delay(TimeSpan.FromMinutes(1)); - if (buildTasks.ContainsKey(id)) { - Task buildTask = buildTasks[id]; + if (buildTasks.ContainsKey(id)) { + _ = Task.Run( + async () => { + await Task.Delay(TimeSpan.FromMinutes(1)); + if (buildTasks.ContainsKey(id)) { + Task buildTask = buildTasks[id]; - if (buildTask.IsCompleted) { - buildTasks.TryRemove(id, out Task _); - } else { - LogWrapper.Log($"Build {id} was cancelled but has not completed"); + if (buildTask.IsCompleted) { + buildTasks.TryRemove(id, out Task _); + } else { + LogWrapper.Log($"Build {id} was cancelled but has not completed"); + } } } - } - ); + ); + } } public void CancelAll() { @@ -76,6 +84,7 @@ private async Task ProcessQueue() { Task buildTask = buildProcessorService.ProcessBuild(build, cancellationTokenSource); buildTasks.TryAdd(build.id, buildTask); await buildTask; + cancellationTokenSources.TryRemove(build.id, out CancellationTokenSource _); } processing = false; From 16c55238cdb2a9c637171ce8ac8278c21a1b6f5f Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 14 Aug 2020 21:31:56 +0100 Subject: [PATCH 250/369] Mark build cancelled in queue as cancelled --- .../Modpack/BuildProcess/IBuildQueueService.cs | 1 + UKSF.Api.Interfaces/Modpack/IModpackService.cs | 2 +- .../Modpack/BuildProcess/BuildQueueService.cs | 14 ++++++++++---- UKSF.Api.Services/Modpack/ModpackService.cs | 9 +++++++-- UKSF.Api/Controllers/Modpack/ModpackController.cs | 4 ++-- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs index fdbcb484..b5c7789b 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs @@ -3,6 +3,7 @@ namespace UKSF.Api.Interfaces.Modpack.BuildProcess { public interface IBuildQueueService { void QueueBuild(ModpackBuild build); + bool CancelQueued(string id); void Cancel(string id); void CancelAll(); } diff --git a/UKSF.Api.Interfaces/Modpack/IModpackService.cs b/UKSF.Api.Interfaces/Modpack/IModpackService.cs index 8853df9c..f75520cc 100644 --- a/UKSF.Api.Interfaces/Modpack/IModpackService.cs +++ b/UKSF.Api.Interfaces/Modpack/IModpackService.cs @@ -12,7 +12,7 @@ public interface IModpackService { ModpackBuild GetBuild(string id); Task NewBuild(NewBuild newBuild); Task Rebuild(ModpackBuild build); - void CancelBuild(ModpackBuild build); + Task CancelBuild(ModpackBuild build); Task UpdateReleaseDraft(ModpackRelease release); Task Release(string version); Task RegnerateReleaseDraftChangelog(string version); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs index 7b43b9a3..0f204cbd 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs @@ -24,19 +24,22 @@ public BuildQueueService(IBuildProcessorService buildProcessorService, IGameServ public void QueueBuild(ModpackBuild build) { queue.Enqueue(build); - CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(); - cancellationTokenSources.TryAdd(build.id, cancellationTokenSource); if (!processing) { // Processor not running, process as separate task _ = ProcessQueue(); } } - public void Cancel(string id) { + public bool CancelQueued(string id) { if (queue.Any(x => x.id == id)) { queue = new ConcurrentQueue(queue.Where(x => x.id != id)); + return true; } + return false; + } + + public void Cancel(string id) { if (cancellationTokenSources.ContainsKey(id)) { CancellationTokenSource cancellationTokenSource = cancellationTokenSources[id]; cancellationTokenSource.Cancel(); @@ -62,6 +65,8 @@ public void Cancel(string id) { } public void CancelAll() { + queue.Clear(); + foreach ((string _, CancellationTokenSource cancellationTokenSource) in cancellationTokenSources) { cancellationTokenSource.Cancel(); } @@ -80,7 +85,8 @@ private async Task ProcessQueue() { continue; } - CancellationTokenSource cancellationTokenSource = cancellationTokenSources[build.id]; + CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(); + cancellationTokenSources.TryAdd(build.id, cancellationTokenSource); Task buildTask = buildProcessorService.ProcessBuild(build, cancellationTokenSource); buildTasks.TryAdd(build.id, buildTask); await buildTask; diff --git a/UKSF.Api.Services/Modpack/ModpackService.cs b/UKSF.Api.Services/Modpack/ModpackService.cs index 95ad8cc0..d39336a8 100644 --- a/UKSF.Api.Services/Modpack/ModpackService.cs +++ b/UKSF.Api.Services/Modpack/ModpackService.cs @@ -57,9 +57,14 @@ public async Task Rebuild(ModpackBuild build) { buildQueueService.QueueBuild(rebuild); } - public void CancelBuild(ModpackBuild build) { + public async Task CancelBuild(ModpackBuild build) { LogWrapper.AuditLog($"Build {GetBuildName(build)} cancelled"); - buildQueueService.Cancel(build.id); + + if (buildQueueService.CancelQueued(build.id)) { + await buildsService.CancelBuild(build); + } else { + buildQueueService.Cancel(build.id); + } } public async Task UpdateReleaseDraft(ModpackRelease release) { diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs index 936e288c..1d926065 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -58,13 +58,13 @@ public async Task Rebuild(string id) { } [HttpGet("builds/{id}/cancel"), Authorize, Roles(RoleDefinitions.ADMIN)] - public IActionResult CancelBuild(string id) { + public async Task CancelBuild(string id) { ModpackBuild build = modpackService.GetBuild(id); if (build == null) { return BadRequest("Build does not exist"); } - modpackService.CancelBuild(build); + await modpackService.CancelBuild(build); return Ok(); } From b3209b977c7f8ea592cff5d4a48bc6039996ae9e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 15 Aug 2020 00:23:36 +0100 Subject: [PATCH 251/369] Remove repo backup clean step, merge release into master instead of dev into master --- .../Modpack/BuildProcess/Steps/Common/BuildStepClean.cs | 5 ----- .../BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs index e04925f1..7b84224d 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs @@ -12,13 +12,8 @@ public class BuildStepClean : FileBuildStep { protected override async Task ProcessExecute() { string environmentPath = GetBuildEnvironmentPath(); if (Build.environment == GameEnvironment.RELEASE) { - string repoPath = Path.Join(environmentPath, "Backup", "Repo"); string keysPath = Path.Join(environmentPath, "Backup", "Keys"); - Logger.LogSurround("\nCleaning repo backup..."); - await DeleteDirectoryContents(repoPath); - Logger.LogSurround("Cleaned repo backup"); - Logger.LogSurround("\nCleaning keys backup..."); await DeleteDirectoryContents(keysPath); Logger.LogSurround("Cleaned keys backup"); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs index 4667b9f8..e2f78d92 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs @@ -19,7 +19,7 @@ protected override Task SetupExecute() { protected override async Task ProcessExecute() { try { await githubService.MergeBranch("dev", "release", $"Release {Build.version}"); - await githubService.MergeBranch("master", "dev", $"Release {Build.version}"); + await githubService.MergeBranch("master", "release", $"Release {Build.version}"); Logger.Log("Release branch merges complete"); } catch (Exception exception) { Warning($"Release branch merges failed:\n{exception}"); From d85a2b0d0c9b76ce79213d4bd98665a4a8bdfbfe Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 15 Aug 2020 16:27:50 +0100 Subject: [PATCH 252/369] Add newlines when none exist at end of changelog --- UKSF.Api.Services/Modpack/ReleaseService.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UKSF.Api.Services/Modpack/ReleaseService.cs b/UKSF.Api.Services/Modpack/ReleaseService.cs index fd302198..84f6804d 100644 --- a/UKSF.Api.Services/Modpack/ReleaseService.cs +++ b/UKSF.Api.Services/Modpack/ReleaseService.cs @@ -42,6 +42,8 @@ public async Task PublishRelease(string version) { if (release.changelog.EndsWith("\n\n")) { release.changelog += "\n\n"; + } else { + release.changelog += "\n\n\n\n"; } release.changelog += "SR3 - Development Team\n[Report and track issues here](https://github.com/uksf/modpack/issues)"; From 073f8c6c8f5638a3ddb61c4191afb72b4016bf7b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 15 Aug 2020 16:40:18 +0100 Subject: [PATCH 253/369] Better line breaks for changelog end --- UKSF.Api.Services/Modpack/ReleaseService.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/UKSF.Api.Services/Modpack/ReleaseService.cs b/UKSF.Api.Services/Modpack/ReleaseService.cs index 84f6804d..b3a68310 100644 --- a/UKSF.Api.Services/Modpack/ReleaseService.cs +++ b/UKSF.Api.Services/Modpack/ReleaseService.cs @@ -40,13 +40,8 @@ public async Task PublishRelease(string version) { throw new NullReferenceException($"Could not find release {version}"); } - if (release.changelog.EndsWith("\n\n")) { - release.changelog += "\n\n"; - } else { - release.changelog += "\n\n\n\n"; - } - - release.changelog += "SR3 - Development Team\n[Report and track issues here](https://github.com/uksf/modpack/issues)"; + release.changelog += release.changelog.EndsWith("\n\n") ? "
" : "\n\n
"; + release.changelog += "SR3 - Development Team
[Report and track issues here](https://github.com/uksf/modpack/issues)"; await Data.Update(release.id, Builders.Update.Set(x => x.timestamp, DateTime.Now).Set(x => x.isDraft, false).Set(x => x.changelog, release.changelog)); await githubService.PublishRelease(release); From 213f68f65469bf56f5a5cdee0fd1685a30dd3e63 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 15 Aug 2020 16:52:55 +0100 Subject: [PATCH 254/369] Use different method to merge release into master --- .../Integrations/Github/IGithubService.cs | 2 +- .../Integrations/Github/GithubService.cs | 2 +- .../Steps/BuildSteps/BuildStepSources.cs | 14 +------------- .../Modpack/BuildProcess/Steps/GitBuildStep.cs | 17 +++++++++++++++++ .../Steps/ReleaseSteps/BuildStepMerge.cs | 12 +++++++++--- 5 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 UKSF.Api.Services/Modpack/BuildProcess/Steps/GitBuildStep.cs diff --git a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs index 5240a3b7..cd9b1e17 100644 --- a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs +++ b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs @@ -15,6 +15,6 @@ public interface IGithubService { Task IsReferenceValid(string reference); Task GenerateChangelog(string version); Task PublishRelease(ModpackRelease release); - Task MergeBranch(string branch, string sourceBranch, string version); + Task MergeBranch(string sourceBranch, string branch, string version); } } diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 279f27d5..30587476 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -71,7 +71,7 @@ public async Task GetLatestReferenceCommit(string reference) { return new GithubCommit { branch = branch, before = commit.Parents.FirstOrDefault()?.Sha, after = commit.Sha, message = commit.Commit.Message, author = commit.Commit.Author.Email }; } - public async Task MergeBranch(string branch, string sourceBranch, string commitMessage) { + public async Task MergeBranch(string sourceBranch, string branch, string commitMessage) { GitHubClient client = await GetAuthenticatedClient(); Merge result = await client.Repository.Merging.Create(REPO_ORG, REPO_NAME, new NewMerge(branch, sourceBranch) { CommitMessage = commitMessage }); if (result == null || string.IsNullOrEmpty(result.Sha)) { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 5ec1b848..05d5b6d4 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -1,12 +1,10 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; using System.Threading.Tasks; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] - public class BuildStepSources : BuildStep { + public class BuildStepSources : GitBuildStep { public const string NAME = "Sources"; protected override async Task ProcessExecute() { @@ -79,15 +77,5 @@ private Task CheckoutModpack() { return Task.CompletedTask; } - - private string GitCommand(string workingDirectory, string command) { - List results = new BuildProcessHelper(Logger, CancellationTokenSource, false, false, true).Run( - workingDirectory, - "cmd.exe", - $"/c \"{command}\"", - (int) TimeSpan.FromSeconds(10).TotalMilliseconds - ); - return results.Count > 0 ? results.Last() : string.Empty; - } } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/GitBuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/GitBuildStep.cs new file mode 100644 index 00000000..d5b683fa --- /dev/null +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/GitBuildStep.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { + public class GitBuildStep : BuildStep { + internal string GitCommand(string workingDirectory, string command) { + List results = new BuildProcessHelper(Logger, CancellationTokenSource, false, false, true).Run( + workingDirectory, + "cmd.exe", + $"/c \"{command}\"", + (int) TimeSpan.FromSeconds(10).TotalMilliseconds + ); + return results.Count > 0 ? results.Last() : string.Empty; + } + } +} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs index e2f78d92..45c4798f 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Interfaces.Integrations.Github; @@ -6,7 +7,7 @@ namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps { [BuildStep(NAME)] - public class BuildStepMerge : BuildStep { + public class BuildStepMerge : GitBuildStep { public const string NAME = "Merge"; private IGithubService githubService; @@ -18,8 +19,13 @@ protected override Task SetupExecute() { protected override async Task ProcessExecute() { try { - await githubService.MergeBranch("dev", "release", $"Release {Build.version}"); - await githubService.MergeBranch("master", "release", $"Release {Build.version}"); + await githubService.MergeBranch("release", "dev", $"Release {Build.version}"); + + // Necessary to get around branch protection rules for master + string modpackPath = Path.Join(GetBuildSourcesPath(), "modpack"); + GitCommand(modpackPath, "git checkout master"); + GitCommand(modpackPath, "git merge dev"); + GitCommand(modpackPath, "git push -u origin master"); Logger.Log("Release branch merges complete"); } catch (Exception exception) { Warning($"Release branch merges failed:\n{exception}"); From 9afdabd1437bdc56ed4664037c74c52793eb3d6d Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 18 Aug 2020 14:37:14 +0100 Subject: [PATCH 255/369] Fix github reference validation against version --- UKSF.Api.Services/Integrations/Github/GithubService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 30587476..54d9a99f 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -61,7 +61,7 @@ public async Task IsReferenceValid(string reference) { string version = await GetReferenceVersion(reference); int[] versionParts = version.Split('.').Select(int.Parse).ToArray(); // Version when make.py was changed to accommodate this system - return versionParts[0] >= 5 && versionParts[1] >= 17 && versionParts[2] >= 19; + return versionParts[0] == 5 ? versionParts[1] == 17 ? versionParts[2] >= 19 : versionParts[1] > 17 : versionParts[0] > 5; } public async Task GetLatestReferenceCommit(string reference) { From e24f7cd76a899c2070ac66fa819eadb199b648ac Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 20 Aug 2020 13:18:39 +0100 Subject: [PATCH 256/369] Add extra merge commands for release step --- UKSF.Api.Services/Game/Missions/MissionDataResolver.cs | 3 +-- .../BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs index f5b2b079..2d9f3777 100644 --- a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs +++ b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs @@ -26,8 +26,7 @@ public static class MissionDataResolver { // "5e0d3273b91cc00aa001213f", // Baxter // "5eee34c8ddf6642260aa6a4b", // Eliason // "5e0d31c3b91cc00aa001213b", // Gibney - // "5a1a14b5aacf7b00346dcc37", // Gilbert - // "5e24bbe949ddd04030d72ca5" // Hass + // "5a1a14b5aacf7b00346dcc37" // Gilbert // }; public static string ResolveObjectClass(MissionPlayer player) { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs index 45c4798f..780907c1 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs @@ -23,7 +23,13 @@ protected override async Task ProcessExecute() { // Necessary to get around branch protection rules for master string modpackPath = Path.Join(GetBuildSourcesPath(), "modpack"); + GitCommand(modpackPath, "git fetch"); + GitCommand(modpackPath, "git checkout -t origin/dev"); + GitCommand(modpackPath, "git checkout dev"); + GitCommand(modpackPath, "git pull"); + GitCommand(modpackPath, "git checkout -t origin/master"); GitCommand(modpackPath, "git checkout master"); + GitCommand(modpackPath, "git pull"); GitCommand(modpackPath, "git merge dev"); GitCommand(modpackPath, "git push -u origin master"); Logger.Log("Release branch merges complete"); From 4d41eb1203ba4c99430d6beefb2c569562610392 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 20 Aug 2020 13:22:35 +0100 Subject: [PATCH 257/369] Replace
with \n for github release changelog --- UKSF.Api.Services/Integrations/Github/GithubService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 54d9a99f..56c034ca 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -129,7 +129,7 @@ public async Task PublishRelease(ModpackRelease release) { await client.Repository.Release.Create( REPO_ORG, REPO_NAME, - new NewRelease(release.version) { Name = $"Modpack Version {release.version}", Body = $"{release.description}\n\n## Changelog\n{release.changelog.Replace("
", "")}" } + new NewRelease(release.version) { Name = $"Modpack Version {release.version}", Body = $"{release.description}\n\n## Changelog\n{release.changelog.Replace("
", "\n")}" } ); Milestone milestone = await GetOpenMilestone(release.version); From 031dbb7d1446e802b66a556ff091f4403ce4ac3a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 22 Aug 2020 13:04:12 +0100 Subject: [PATCH 258/369] Filter release commit message from previous release merge out of changes for next rc --- UKSF.Api.Services/Integrations/Github/GithubService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 56c034ca..3adb28e9 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -181,7 +181,7 @@ public async Task> GetHistoricReleases() { } private static string CombineCommitMessages(IReadOnlyCollection commits) { - List filteredCommitMessages = commits.Select(x => x.Commit.Message).Reverse().Where(x => !x.Contains("Merge branch")).ToList(); + List filteredCommitMessages = commits.Select(x => x.Commit.Message).Reverse().Where(x => !x.Contains("Merge branch") && !Regex.IsMatch(x, "Release \\d*\\.\\d*\\.\\d*")).ToList(); return filteredCommitMessages.Count == 0 ? commits.First().Commit.Message : filteredCommitMessages.Aggregate((a, b) => $"{a}\n\n{b}"); } From 70682d36dcb0fccd4ec355977e318faf4a990cbf Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 28 Aug 2020 00:00:38 +0100 Subject: [PATCH 259/369] Set account as rifleman when going from recruit to private --- .../Command/CommandRequestCompletionService.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Command/CommandRequestCompletionService.cs b/UKSF.Api.Services/Command/CommandRequestCompletionService.cs index 8befb2e6..41c70d2d 100644 --- a/UKSF.Api.Services/Command/CommandRequestCompletionService.cs +++ b/UKSF.Api.Services/Command/CommandRequestCompletionService.cs @@ -91,7 +91,8 @@ public async Task Resolve(string id) { private async Task Rank(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { - Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, rankString: request.value, reason: request.reason); + string role = HandleRecruitToPrivate(request.recipient, request.value); + Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, rankString: request.value, role: role, reason: request.reason); notificationsService.Add(notification); await commandRequestService.ArchiveRequest(request.id); LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); @@ -227,5 +228,10 @@ private async Task Reinstate(CommandRequest request) { LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); } } + + private string HandleRecruitToPrivate(string id, string targetRank) { + Account account = accountService.Data.GetSingle(id); + return account.rank == "Recruit" && targetRank == "Private" ? "Rifleman" : account.roleAssignment; + } } } From da14d7e13a49e94d7c9029cc62a07915d0c25549 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 28 Aug 2020 11:57:22 +0100 Subject: [PATCH 260/369] Simplify instagram image caching slightly --- UKSF.Api.Services/Integrations/InstagramService.cs | 3 +-- UKSF.Api.Services/Utility/SchedulerService.cs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs index 99e79076..069f6063 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -79,8 +79,7 @@ public async Task CacheInstagramImages() { // } // Insert new images at start of list, and take only 12 - images.InsertRange(0, newImages); - images = images.Take(12).ToList(); + images = newImages.Take(12).ToList(); } catch (Exception exception) { LogWrapper.Log(exception); } diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index 37d4f0e3..d1d9a0da 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -100,7 +100,7 @@ private void Schedule(ScheduledJob job) { private async Task AddUnique() { if (Data.GetSingle(x => x.action == InstagramImagesAction.ACTION_NAME) == null) { - await Create(DateTime.Today, TimeSpan.FromHours(1), InstagramImagesAction.ACTION_NAME); + await Create(DateTime.Today, TimeSpan.FromMinutes(15), InstagramImagesAction.ACTION_NAME); } scheduledActionService.GetScheduledAction(InstagramImagesAction.ACTION_NAME).Run(); From 8dae0ec293e578ddceca78a77896b8bbb0103932 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 28 Aug 2020 11:58:04 +0100 Subject: [PATCH 261/369] Remove predicate condition for new instagram images --- UKSF.Api.Services/Integrations/InstagramService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs index 069f6063..7b28bb73 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -69,7 +69,7 @@ public async Task CacheInstagramImages() { } // Isolate new images - List newImages = allNewImages.Where(x => x.mediaType == "IMAGE" && images.All(y => x.id != y.id)).ToList(); + List newImages = allNewImages.Where(x => x.mediaType == "IMAGE").ToList(); // // Handle carousel images // foreach ((InstagramImage value, int index) instagramImage in newImages.Select((value, index) => ( value, index ))) { From 2fdbe922b903855074b7ee840f64e5d62921a5cd Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 30 Aug 2020 19:35:04 +0100 Subject: [PATCH 262/369] Wrap server mod args in quotes --- UKSF.Api.Services/Game/GameServerHelpers.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UKSF.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.Services/Game/GameServerHelpers.cs index 84cf4e8e..e30a29a4 100644 --- a/UKSF.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.Services/Game/GameServerHelpers.cs @@ -104,8 +104,8 @@ public static string FormatGameServerLaunchArguments(this GameServer gameServer) $" -name={gameServer.name}" + $" -port={gameServer.port}" + $" -apiport=\"{gameServer.apiPort}\"" + - $" {(string.IsNullOrEmpty(gameServer.FormatGameServerServerMods()) ? "" : $"-serverMod={gameServer.FormatGameServerServerMods()}")}" + - $" {(string.IsNullOrEmpty(gameServer.FormatGameServerMods()) ? "" : $"-mod={gameServer.FormatGameServerMods()}")}" + + $" {(string.IsNullOrEmpty(gameServer.FormatGameServerServerMods()) ? "" : $"\"-serverMod={gameServer.FormatGameServerServerMods()}\"")}" + + $" {(string.IsNullOrEmpty(gameServer.FormatGameServerMods()) ? "" : $"\"-mod={gameServer.FormatGameServerMods()}\"")}" + " -bandwidthAlg=2 -hugepages -loadMissionToMemory -filePatching -limitFPS=200"; public static string FormatHeadlessClientLaunchArguments(this GameServer gameServer, int index) => @@ -113,7 +113,7 @@ public static string FormatHeadlessClientLaunchArguments(this GameServer gameSer $" -name={GetHeadlessClientName(index)}" + $" -port={gameServer.port}" + $" -apiport=\"{gameServer.apiPort + index + 1}\"" + - $" {(string.IsNullOrEmpty(gameServer.FormatGameServerMods()) ? "" : $"-mod={gameServer.FormatGameServerMods()}")}" + + $" {(string.IsNullOrEmpty(gameServer.FormatGameServerMods()) ? "" : $"\"-mod={gameServer.FormatGameServerMods()}\"")}" + $" -password={gameServer.password}" + " -localhost=127.0.0.1 -connect=localhost -client -hugepages -filePatching -limitFPS=200"; From 047c2b8aa924fb8af0177b94cd1faabad6f856eb Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 18 Sep 2020 19:19:03 +0100 Subject: [PATCH 263/369] Check for no servers more frequently for build queue --- .../Game/Missions/MissionDataResolver.cs | 20 +++++++++---------- .../Modpack/BuildProcess/BuildQueueService.cs | 2 +- UKSF.Api.sln.DotSettings | 3 +++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs index 2d9f3777..718d9a0c 100644 --- a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs +++ b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs @@ -42,7 +42,7 @@ public static string ResolveObjectClass(MissionPlayer player) { "5a68b28e196530164c9b4fed" => "UKSF_B_Sniper", // "Sniper Platoon" "5b9123ca7a6c1f0e9875601c" => "UKSF_B_Medic", // "3 Medical Regiment" "5a42835b55d6109bf0b081bd" => ResolvePlayerUnitRole(player) == 3 ? "UKSF_B_Officer" : "UKSF_B_Rifleman", // "UKSF" - _ => ResolvePlayerUnitRole(player) != -1 ? "UKSF_B_SectionLeader" : "UKSF_B_Rifleman" + _ => ResolvePlayerUnitRole(player) != -1 ? "UKSF_B_SectionLeader" : "UKSF_B_Rifleman" }; } @@ -71,7 +71,7 @@ public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) { "5a4415d8730e9d1628345007" => "JSFAW", // "617 Squadron" "5a848590eab14d12cc7fa618" => "JSFAW", // "RAF Cranwell" "5c98d7b396dba31f24cdb19c" => "JSFAW", // "51 Squadron" - _ => defaultCallsign + _ => defaultCallsign }; } @@ -154,13 +154,13 @@ public static List ResolveUnitSlots(MissionUnit unit) { int rankA = MissionPatchData.instance.ranks.IndexOf(a.rank); int rankB = MissionPatchData.instance.ranks.IndexOf(b.rank); return unitDepthA < unitDepthB ? -1 : - unitDepthA > unitDepthB ? 1 : - unitOrderA < unitOrderB ? -1 : - unitOrderA > unitOrderB ? 1 : - roleA < roleB ? 1 : - roleA > roleB ? -1 : - rankA < rankB ? -1 : - rankA > rankB ? 1 : string.CompareOrdinal(a.name, b.name); + unitDepthA > unitDepthB ? 1 : + unitOrderA < unitOrderB ? -1 : + unitOrderA > unitOrderB ? 1 : + roleA < roleB ? 1 : + roleA > roleB ? -1 : + rankA < rankB ? -1 : + rankA > rankB ? 1 : string.CompareOrdinal(a.name, b.name); } ); return slots; @@ -172,7 +172,7 @@ public static bool IsUnitPermanent(MissionUnit unit) { "5bbbbdab5eb3a4170c488f2e" => true, // "Guardian 1-2" "5bbbbe365eb3a4170c488f30" => true, // "Guardian 1-3" "5ad748e0de5d414f4c4055e0" => true, // "Guardian 1-R" - _ => false + _ => false }; } } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs index 0f204cbd..6ac11792 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs @@ -81,7 +81,7 @@ private async Task ProcessQueue() { // Will require better game <-> api interaction to communicate with servers and headless clients properly if (gameServersService.GetGameInstanceCount() > 0) { queue.Enqueue(build); - await Task.Delay(TimeSpan.FromMinutes(15)); + await Task.Delay(TimeSpan.FromMinutes(5)); continue; } diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index 9e0efca1..f85360de 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -84,6 +84,9 @@ True True END_OF_LINE + True + True + True END_OF_LINE 1 1 From 50884de115784757fc27dee146aad053af0b609c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 18 Sep 2020 23:24:39 +0100 Subject: [PATCH 264/369] Add some logging to release, use batching for signing --- .../BuildProcess/BuildProcessorService.cs | 12 ++++- .../BuildSteps/BuildStepSignDependencies.cs | 44 ++++++++++++------- UKSF.Api.Services/Modpack/ReleaseService.cs | 5 +++ 3 files changed, 44 insertions(+), 17 deletions(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs index b383766d..2f75b754 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs @@ -6,6 +6,7 @@ using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; using UKSF.Api.Models.Game; using UKSF.Api.Models.Modpack; +using UKSF.Api.Services.Message; using UKSF.Api.Services.Modpack.BuildProcess.Steps.Common; using UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps; @@ -65,10 +66,17 @@ public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cance } private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) { - if (build.environment != GameEnvironment.RELEASE || runningStep is BuildStepClean || runningStep is BuildStepBackup) return; + LogWrapper.Log($"Attempting to restore repo prior to {build.version}"); + if (build.environment != GameEnvironment.RELEASE || runningStep is BuildStepClean || runningStep is BuildStepBackup) { + LogWrapper.Log($"Won't restore. Env: {build.environment}, Step: {runningStep.GetType().Name}"); + return; + } ModpackBuildStep restoreStep = buildStepService.GetRestoreStepForRelease(); - if (restoreStep == null) return; + if (restoreStep == null) { + LogWrapper.Log($"Won't restore. Restore step not found"); + return; + } restoreStep.index = build.steps.Count; IBuildStep step = buildStepService.ResolveBuildStep(restoreStep.name); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs index 2958b50f..7ce7110c 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Threading; using System.Threading.Tasks; using UKSF.Api.Models.Game; using UKSF.Api.Services.Admin; @@ -63,9 +64,9 @@ protected override async Task ProcessExecute() { private string GetKeyname() { return Build.environment switch { GameEnvironment.RELEASE => $"uksf_dependencies_{Build.version}", - GameEnvironment.RC => $"uksf_dependencies_{Build.version}_rc{Build.buildNumber}", - GameEnvironment.DEV => $"uksf_dependencies_dev_{Build.buildNumber}", - _ => throw new ArgumentException("Invalid build environment") + GameEnvironment.RC => $"uksf_dependencies_{Build.version}_rc{Build.buildNumber}", + GameEnvironment.DEV => $"uksf_dependencies_dev_{Build.buildNumber}", + _ => throw new ArgumentException("Invalid build environment") }; } @@ -74,21 +75,34 @@ private Task SignFiles(string keygenPath, string addonsPath, IReadOnlyCollection int signed = 0; int total = files.Count; Logger.Log($"Signed {signed} of {total} files"); - // TODO: Maybe batch the commands together to do several in one process - foreach (FileInfo file in files) { - try { + + return BatchProcessFiles( + files, + 10, + file => { BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, true); processHelper.Run(addonsPath, dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); - signed++; - Logger.LogInline($"Signed {signed} of {total} files"); - } catch (OperationCanceledException) { - throw; - } catch (Exception exception) { - throw new Exception($"Failed to sign file '{file}'\n{exception.Message}{(exception.InnerException != null ? $"\n{exception.InnerException.Message}" : "")}", exception); - } - } + Interlocked.Increment(ref signed); + return Task.CompletedTask; + }, + () => $"Signed {signed} of {total} files", + "Failed to sign file" + ); - return Task.CompletedTask; + // foreach (FileInfo file in files) { + // try { + // BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, true); + // processHelper.Run(addonsPath, dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); + // signed++; + // Logger.LogInline($"Signed {signed} of {total} files"); + // } catch (OperationCanceledException) { + // throw; + // } catch (Exception exception) { + // throw new Exception($"Failed to sign file '{file}'\n{exception.Message}{(exception.InnerException != null ? $"\n{exception.InnerException.Message}" : "")}", exception); + // } + // } + // + // return Task.CompletedTask; } } } diff --git a/UKSF.Api.Services/Modpack/ReleaseService.cs b/UKSF.Api.Services/Modpack/ReleaseService.cs index b3a68310..d1c4c505 100644 --- a/UKSF.Api.Services/Modpack/ReleaseService.cs +++ b/UKSF.Api.Services/Modpack/ReleaseService.cs @@ -9,6 +9,7 @@ using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; +using UKSF.Api.Services.Message; namespace UKSF.Api.Services.Modpack { public class ReleaseService : DataBackedService, IReleaseService { @@ -40,6 +41,10 @@ public async Task PublishRelease(string version) { throw new NullReferenceException($"Could not find release {version}"); } + if (!release.isDraft) { + LogWrapper.Log($"Attempted to release {version} again. Halting publish"); + } + release.changelog += release.changelog.EndsWith("\n\n") ? "
" : "\n\n
"; release.changelog += "SR3 - Development Team
[Report and track issues here](https://github.com/uksf/modpack/issues)"; From 7d772660697be3e390df56db91d7be8a33e385f5 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 22 Sep 2020 21:22:17 +0100 Subject: [PATCH 265/369] Make master branch the normal branch for dev builds --- .../Integrations/Github/IGithubService.cs | 1 - .../Integrations/Github/GithubService.cs | 15 ---------- .../Steps/ReleaseSteps/BuildStepMerge.cs | 28 ++++++------------- .../Integrations/GithubController.cs | 4 +-- 4 files changed, 11 insertions(+), 37 deletions(-) diff --git a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs index cd9b1e17..a03faded 100644 --- a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs +++ b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs @@ -15,6 +15,5 @@ public interface IGithubService { Task IsReferenceValid(string reference); Task GenerateChangelog(string version); Task PublishRelease(ModpackRelease release); - Task MergeBranch(string sourceBranch, string branch, string version); } } diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index 3adb28e9..ecf07ab6 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -71,16 +71,6 @@ public async Task GetLatestReferenceCommit(string reference) { return new GithubCommit { branch = branch, before = commit.Parents.FirstOrDefault()?.Sha, after = commit.Sha, message = commit.Commit.Message, author = commit.Commit.Author.Email }; } - public async Task MergeBranch(string sourceBranch, string branch, string commitMessage) { - GitHubClient client = await GetAuthenticatedClient(); - Merge result = await client.Repository.Merging.Create(REPO_ORG, REPO_NAME, new NewMerge(branch, sourceBranch) { CommitMessage = commitMessage }); - if (result == null || string.IsNullOrEmpty(result.Sha)) { - throw new Exception($"Merge of {sourceBranch} into {branch} failed"); - } - - return result; - } - public async Task GetPushEvent(PushWebhookPayload payload, string latestCommit = "") { if (string.IsNullOrEmpty(latestCommit)) { latestCommit = payload.Before; @@ -165,11 +155,6 @@ public async Task> GetBranches() { validBranches.Insert(0, "master"); } - if (validBranches.Contains("dev")) { - validBranches.Remove("dev"); - validBranches.Insert(0, "dev"); - } - return validBranches; } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs index 780907c1..98b61337 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs @@ -1,41 +1,31 @@ using System; using System.IO; using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Interfaces.Integrations.Github; -using UKSF.Api.Services.Common; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps { [BuildStep(NAME)] public class BuildStepMerge : GitBuildStep { public const string NAME = "Merge"; - private IGithubService githubService; - protected override Task SetupExecute() { - githubService = ServiceWrapper.Provider.GetService(); - Logger.Log("Retrieved services"); - return Task.CompletedTask; - } - - protected override async Task ProcessExecute() { + protected override Task ProcessExecute() { try { - await githubService.MergeBranch("release", "dev", $"Release {Build.version}"); - - // Necessary to get around branch protection rules for master + // Necessary to get around branch protection rules for master. Runs locally on server using user stored login as credentials string modpackPath = Path.Join(GetBuildSourcesPath(), "modpack"); GitCommand(modpackPath, "git fetch"); - GitCommand(modpackPath, "git checkout -t origin/dev"); - GitCommand(modpackPath, "git checkout dev"); + GitCommand(modpackPath, "git checkout -t origin/release"); + GitCommand(modpackPath, "git checkout release"); GitCommand(modpackPath, "git pull"); GitCommand(modpackPath, "git checkout -t origin/master"); GitCommand(modpackPath, "git checkout master"); GitCommand(modpackPath, "git pull"); - GitCommand(modpackPath, "git merge dev"); + GitCommand(modpackPath, "git merge release"); GitCommand(modpackPath, "git push -u origin master"); - Logger.Log("Release branch merges complete"); + Logger.Log("Release branch merge to master complete"); } catch (Exception exception) { - Warning($"Release branch merges failed:\n{exception}"); + Warning($"Release branch merge to master failed:\n{exception}"); } + + return Task.CompletedTask; } } } diff --git a/UKSF.Api/Controllers/Integrations/GithubController.cs b/UKSF.Api/Controllers/Integrations/GithubController.cs index 2f7de1c6..31425c5d 100644 --- a/UKSF.Api/Controllers/Integrations/GithubController.cs +++ b/UKSF.Api/Controllers/Integrations/GithubController.cs @@ -16,7 +16,7 @@ namespace UKSF.Api.Controllers.Integrations { public class GithubController : Controller { private const string PUSH_EVENT = "push"; private const string REPO_NAME = "modpack"; - private const string DEV = "refs/heads/dev"; + private const string MASTER = "refs/heads/master"; private const string RELEASE = "refs/heads/release"; private readonly IGithubService githubService; @@ -45,7 +45,7 @@ [FromBody] JObject body } switch (payload.Ref) { - case DEV when payload.BaseRef != RELEASE: { + case MASTER when payload.BaseRef != RELEASE: { await modpackService.CreateDevBuildFromPush(payload); return Ok(); } From 7b1c15647df517592eb2aff7ae705bf1748bb066 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 22 Sep 2020 23:09:36 +0100 Subject: [PATCH 266/369] Remove unneeded log from dependencies signing step --- .../BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs index 7ce7110c..9d763858 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs @@ -74,7 +74,6 @@ private Task SignFiles(string keygenPath, string addonsPath, IReadOnlyCollection string privateKey = Path.Join(keygenPath, $"{keyName}.biprivatekey"); int signed = 0; int total = files.Count; - Logger.Log($"Signed {signed} of {total} files"); return BatchProcessFiles( files, From 36ec360cdef5e1467f26c5fcc07b70ae92608615 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 26 Sep 2020 17:53:13 +0100 Subject: [PATCH 267/369] Instagram tweaks, login/application flow tweaks - Changed instagram images to store base64 - Added validation to email code resend - Cancel scheduled events when clearing confirmation codes --- .../Integrations/IInstagramService.cs | 2 +- .../Teamspeak/ITeamspeakService.cs | 4 ++-- .../Integrations/InstagramImage.cs | 1 + .../Integrations/InstagramService.cs | 20 ++++++++++--------- .../Teamspeak/TeamspeakService.cs | 8 ++++---- .../Utility/ConfirmationCodeService.cs | 6 ++++++ .../Accounts/AccountsController.cs | 12 ++++++++--- UKSF.Api/Controllers/InstagramController.cs | 10 +++++----- UKSF.Api/Controllers/TeamspeakController.cs | 6 ++---- UKSF.Common/InstagramExtensions.cs | 14 +++++++++++++ 10 files changed, 55 insertions(+), 28 deletions(-) create mode 100644 UKSF.Common/InstagramExtensions.cs diff --git a/UKSF.Api.Interfaces/Integrations/IInstagramService.cs b/UKSF.Api.Interfaces/Integrations/IInstagramService.cs index e18596d5..8c12b4a1 100644 --- a/UKSF.Api.Interfaces/Integrations/IInstagramService.cs +++ b/UKSF.Api.Interfaces/Integrations/IInstagramService.cs @@ -6,6 +6,6 @@ namespace UKSF.Api.Interfaces.Integrations { public interface IInstagramService { Task RefreshAccessToken(); Task CacheInstagramImages(); - List GetImages(); + IEnumerable GetImages(); } } diff --git a/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs index f625e903..a9181b11 100644 --- a/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs +++ b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs @@ -5,9 +5,9 @@ namespace UKSF.Api.Interfaces.Integrations.Teamspeak { public interface ITeamspeakService { - HashSet GetOnlineTeamspeakClients(); + IEnumerable GetOnlineTeamspeakClients(); (bool online, string nickname) GetOnlineUserDetails(Account account); - object GetFormattedClients(); + IEnumerable GetFormattedClients(); Task UpdateClients(HashSet newClients); Task UpdateAccountTeamspeakGroups(Account account); Task SendTeamspeakMessageToClient(Account account, string message); diff --git a/UKSF.Api.Models/Integrations/InstagramImage.cs b/UKSF.Api.Models/Integrations/InstagramImage.cs index 0045ae5c..515b2c31 100644 --- a/UKSF.Api.Models/Integrations/InstagramImage.cs +++ b/UKSF.Api.Models/Integrations/InstagramImage.cs @@ -10,5 +10,6 @@ public class InstagramImage { public string permalink; public DateTime timestamp; + public string base64; } } diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs index 7b28bb73..579f2552 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -9,6 +9,7 @@ using UKSF.Api.Models.Integrations; using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; +using UKSF.Common; namespace UKSF.Api.Services.Integrations { public class InstagramService : IInstagramService { @@ -55,21 +56,19 @@ public async Task CacheInstagramImages() { string contentString = await response.Content.ReadAsStringAsync(); JObject contentObject = JObject.Parse(contentString); - List allNewImages = JsonConvert.DeserializeObject>(contentObject["data"]?.ToString() ?? ""); - allNewImages = allNewImages.OrderByDescending(x => x.timestamp).ToList(); + List allMedia = JsonConvert.DeserializeObject>(contentObject["data"]?.ToString() ?? ""); + allMedia = allMedia.OrderByDescending(x => x.timestamp).ToList(); - if (allNewImages.Count == 0) { + if (allMedia.Count == 0) { LogWrapper.Log($"Instagram response contains no images: {contentObject}"); return; } - if (images.Count > 0 && allNewImages.First().id == images.First().id) { - // Most recent image is the same, therefore all images are already present + if (images.Count > 0 && allMedia.First().id == images.First().id) { return; } - // Isolate new images - List newImages = allNewImages.Where(x => x.mediaType == "IMAGE").ToList(); + List newImages = allMedia.Where(x => x.mediaType == "IMAGE").ToList(); // // Handle carousel images // foreach ((InstagramImage value, int index) instagramImage in newImages.Select((value, index) => ( value, index ))) { @@ -78,13 +77,16 @@ public async Task CacheInstagramImages() { // } // } - // Insert new images at start of list, and take only 12 images = newImages.Take(12).ToList(); + + foreach (InstagramImage instagramImage in images) { + instagramImage.base64 = await instagramImage.AsBase64(); + } } catch (Exception exception) { LogWrapper.Log(exception); } } - public List GetImages() => images; + public IEnumerable GetImages() => images; } } diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs index e0a4c55d..a12b14d0 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs @@ -28,7 +28,7 @@ public TeamspeakService(IMongoDatabase database, IHubContext GetOnlineTeamspeakClients() => clients; + public IEnumerable GetOnlineTeamspeakClients() => clients; public async Task UpdateClients(HashSet newClients) { await clientsSemaphore.WaitAsync(); @@ -71,9 +71,9 @@ public async Task Shutdown() { await teamspeakManagerService.SendProcedure(TeamspeakProcedureType.SHUTDOWN, new {}); } - public object GetFormattedClients() { - if (environment.IsDevelopment()) return new List {new {name = $"SqnLdr.Beswick.T", clientDbId = (double) 2}}; - return clients.Count == 0 ? null : clients.Where(x => x != null).Select(x => new {name = $"{x.clientName}", x.clientDbId}).ToList(); + public IEnumerable GetFormattedClients() { + if (environment.IsDevelopment()) return new List {new {name = "SqnLdr.Beswick.T", clientDbId = (double) 2}}; + return clients.Where(x => x != null).Select(x => new {name = $"{x.clientName}", x.clientDbId}); } public (bool online, string nickname) GetOnlineUserDetails(Account account) { diff --git a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs index 13075d5e..ce56cf74 100644 --- a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs +++ b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Threading.Tasks; using Newtonsoft.Json; using UKSF.Api.Interfaces.Data; @@ -30,6 +31,11 @@ public async Task GetConfirmationCode(string id) { } public async Task ClearConfirmationCodes(Func predicate) { + IEnumerable codes = Data.Get(predicate); + foreach (ConfirmationCode confirmationCode in codes) { + string actionParameters = JsonConvert.SerializeObject(new object[] { confirmationCode.id }); + await schedulerService.Cancel(x => x.actionParameters == actionParameters); + } await Data.DeleteMany(predicate); } } diff --git a/UKSF.Api/Controllers/Accounts/AccountsController.cs b/UKSF.Api/Controllers/Accounts/AccountsController.cs index 6a4b292e..8a0de189 100644 --- a/UKSF.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSF.Api/Controllers/Accounts/AccountsController.cs @@ -15,6 +15,7 @@ using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Integrations; using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Utility; using UKSF.Api.Services.Common; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; @@ -118,12 +119,17 @@ public async Task ApplyConfirmationCode([FromBody] JObject body) await confirmationCodeService.ClearConfirmationCodes(x => x.value == email); await SendConfirmationCode(account); - return BadRequest(new {error = $"The confirmation code has expired. A new code has been sent to '{account.email}'"}); + return BadRequest(new {error = $"The confirmation code was invalid or expired. A new code has been sent to '{account.email}'"}); } - [HttpGet("resend-email-code"), Authorize] + [HttpPost("resend-email-code"), Authorize] public async Task ResendConfirmationCode() { Account account = sessionService.GetContextAccount(); + + if (account.membershipState != MembershipState.UNCONFIRMED) { + return BadRequest(new { error = "Account email has already been confirmed"}); + } + await confirmationCodeService.ClearConfirmationCodes(x => x.value == account.email); await SendConfirmationCode(account); return Ok(PubliciseAccount(account)); @@ -166,7 +172,7 @@ public IActionResult GetRosterAccounts() { [HttpGet("online")] public IActionResult GetOnlineAccounts() { - HashSet teamnspeakClients = teamspeakService.GetOnlineTeamspeakClients(); + IEnumerable teamnspeakClients = teamspeakService.GetOnlineTeamspeakClients(); IEnumerable allAccounts = accountService.Data.Get(); var clients = teamnspeakClients.Where(x => x != null).Select(x => new {account = allAccounts.FirstOrDefault(y => y.teamspeakIdentities != null && y.teamspeakIdentities.Any(z => z.Equals(x.clientDbId))), client = x}).ToList(); var clientAccounts = clients.Where(x => x.account != null && x.account.membershipState == MembershipState.MEMBER).OrderBy(x => x.account.rank, new RankComparer(ranksService)).ThenBy(x => x.account.lastname).ThenBy(x => x.account.firstname); diff --git a/UKSF.Api/Controllers/InstagramController.cs b/UKSF.Api/Controllers/InstagramController.cs index 62daf4dc..37071130 100644 --- a/UKSF.Api/Controllers/InstagramController.cs +++ b/UKSF.Api/Controllers/InstagramController.cs @@ -1,16 +1,16 @@ -using Microsoft.AspNetCore.Authorization; +using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Models.Integrations; namespace UKSF.Api.Controllers { - [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] + [Route("[controller]")] public class InstagramController : Controller { private readonly IInstagramService instagramService; public InstagramController(IInstagramService instagramService) => this.instagramService = instagramService; - [HttpGet, Authorize] - public IActionResult GetImages() => Ok(instagramService.GetImages()); + [HttpGet] + public IEnumerable GetImages() => instagramService.GetImages(); } } diff --git a/UKSF.Api/Controllers/TeamspeakController.cs b/UKSF.Api/Controllers/TeamspeakController.cs index afb2b08d..bc9ecab7 100644 --- a/UKSF.Api/Controllers/TeamspeakController.cs +++ b/UKSF.Api/Controllers/TeamspeakController.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -13,10 +14,7 @@ public class TeamspeakController : Controller { public TeamspeakController(ITeamspeakService teamspeakService) => this.teamspeakService = teamspeakService; [HttpGet("online"), Authorize, Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER, RoleDefinitions.DISCHARGED)] - public IActionResult GetOnlineClients() { - object clients = teamspeakService.GetFormattedClients(); - return clients == null ? Ok(new { }) : Ok(new {clients}); - } + public IEnumerable GetOnlineClients() => teamspeakService.GetFormattedClients(); [HttpGet("shutdown"), Authorize, Roles(RoleDefinitions.ADMIN)] public async Task Shutdown() { diff --git a/UKSF.Common/InstagramExtensions.cs b/UKSF.Common/InstagramExtensions.cs new file mode 100644 index 00000000..8cb99872 --- /dev/null +++ b/UKSF.Common/InstagramExtensions.cs @@ -0,0 +1,14 @@ +using System; +using System.Net.Http; +using System.Threading.Tasks; +using UKSF.Api.Models.Integrations; + +namespace UKSF.Common { + public static class InstagramExtensions { + public static async Task AsBase64(this InstagramImage image) { + using HttpClient client = new HttpClient(); + byte[] bytes = await client.GetByteArrayAsync(image.mediaUrl); + return "data:image/jpeg;base64," + Convert.ToBase64String(bytes); + } + } +} From cde26232880402eaf8b6c413a5fb9e9c880b66db Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 7 Oct 2020 21:43:32 +0100 Subject: [PATCH 268/369] .net 5, cleanup, tests, perf improvments - Upgraded to .net 5 - Moved data events out of data interface for separation of concern - Changed event buses to use data model rather than service - Use enumerable in data services more - Better data cache refresh - Fixed change utility to reliably report changes for all data models in a single format --- UKSF.Api.Data/Admin/VariablesDataService.cs | 15 +- UKSF.Api.Data/CachedDataService.cs | 114 ++++--- .../CommandRequestArchiveDataService.cs | 11 +- .../Command/CommandRequestDataService.cs | 4 +- UKSF.Api.Data/DataCollection.cs | 25 +- UKSF.Api.Data/DataCollectionFactory.cs | 3 +- UKSF.Api.Data/DataService.cs | 64 ++-- UKSF.Api.Data/DataServiceBase.cs | 38 +-- UKSF.Api.Data/EventModelFactory.cs | 8 + .../Fake/FakeNotificationsDataService.cs | 2 +- UKSF.Api.Data/Game/GameServersDataService.cs | 11 +- .../Launcher/LauncherFileDataService.cs | 4 +- .../Message/CommentThreadDataService.cs | 11 +- UKSF.Api.Data/Message/LogDataService.cs | 10 +- .../Message/NotificationsDataService.cs | 4 +- UKSF.Api.Data/Modpack/BuildsDataService.cs | 18 +- UKSF.Api.Data/Modpack/ReleasesDataService.cs | 33 +- .../Operations/OperationOrderDataService.cs | 11 +- .../Operations/OperationReportDataService.cs | 11 +- UKSF.Api.Data/Personnel/AccountDataService.cs | 4 +- .../Personnel/DischargeDataService.cs | 11 +- UKSF.Api.Data/Personnel/LoaDataService.cs | 4 +- UKSF.Api.Data/Personnel/RanksDataService.cs | 11 +- UKSF.Api.Data/Personnel/RolesDataService.cs | 11 +- UKSF.Api.Data/UKSF.Api.Data.csproj | 2 +- UKSF.Api.Data/Units/UnitsDataService.cs | 11 +- .../Utility/ConfirmationCodeDataService.cs | 4 +- UKSF.Api.Data/Utility/SchedulerDataService.cs | 4 +- UKSF.Api.Events/Data/DataEventBacker.cs | 17 - UKSF.Api.Events/Data/DataEventBus.cs | 5 +- .../Handlers/AccountEventHandler.cs | 30 +- .../Handlers/BuildsEventHandler.cs | 21 +- .../Handlers/CommandRequestEventHandler.cs | 17 +- .../Handlers/CommentThreadEventHandler.cs | 20 +- UKSF.Api.Events/Handlers/LogEventHandler.cs | 15 +- .../Handlers/NotificationsEventHandler.cs | 16 +- .../Handlers/TeamspeakEventHandler.cs | 10 +- UKSF.Api.Events/UKSF.Api.Events.csproj | 4 +- .../Data/Cached/IAccountDataService.cs | 2 +- .../Data/Cached/IBuildsDataService.cs | 2 +- .../Data/Cached/ICommandRequestDataService.cs | 2 +- .../Data/Cached/ICommentThreadDataService.cs | 2 +- .../Data/Cached/IDischargeDataService.cs | 2 +- .../Data/Cached/IGameServersDataService.cs | 2 +- .../Data/Cached/ILauncherFileDataService.cs | 2 +- .../Data/Cached/ILoaDataService.cs | 2 +- .../Data/Cached/INotificationsDataService.cs | 2 +- .../Data/Cached/IOperationOrderDataService.cs | 2 +- .../Cached/IOperationReportDataService.cs | 2 +- .../Data/Cached/IRanksDataService.cs | 2 +- .../Data/Cached/IReleasesDataService.cs | 2 +- .../Data/Cached/IRolesDataService.cs | 2 +- .../Data/Cached/IUnitsDataService.cs | 2 +- .../Data/Cached/IVariablesDataService.cs | 2 +- .../Data/ICommandRequestArchiveDataService.cs | 2 +- .../Data/IConfirmationCodeDataService.cs | 2 +- .../Data/IDataCollectionFactory.cs | 6 +- UKSF.Api.Interfaces/Data/IDataService.cs | 10 +- UKSF.Api.Interfaces/Data/ILogDataService.cs | 2 +- .../Data/ISchedulerDataService.cs | 2 +- .../Events/IDataEventBacker.cs | 8 - UKSF.Api.Interfaces/Events/IDataEventBus.cs | 3 +- .../UKSF.Api.Interfaces.csproj | 4 +- UKSF.Api.Models/Events/DataEventModel.cs | 2 +- UKSF.Api.Models/Personnel/Account.cs | 2 +- UKSF.Api.Models/Personnel/ServiceRecord.cs | 18 +- UKSF.Api.Models/UKSF.Api.Models.csproj | 9 +- UKSF.Api.Services/Admin/MigrationUtility.cs | 4 +- .../CommandRequestCompletionService.cs | 2 +- .../Fake/FakeCachedDataService.cs | 4 +- UKSF.Api.Services/Fake/FakeDataService.cs | 15 +- .../Integrations/InstagramService.cs | 8 +- .../Launcher/LauncherFileService.cs | 2 +- UKSF.Api.Services/UKSF.Api.Services.csproj | 25 +- .../Utility/ConfirmationCodeService.cs | 4 +- UKSF.Api.Services/Utility/SchedulerService.cs | 4 +- .../Hubs/Integrations/TeamspeakHub.cs | 4 +- UKSF.Api.Signalr/UKSF.Api.Signalr.csproj | 2 +- UKSF.Api.sln.DotSettings | 5 + .../Services/RegisterEventServices.cs | 52 +-- .../AppStart/Services/ServiceExtensions.cs | 2 + UKSF.Api/Controllers/LoaController.cs | 4 +- UKSF.Api/UKSF.Api.csproj | 22 +- UKSF.Common/CertificateUtilities.cs | 230 ------------- UKSF.Common/ChangeUtilities.cs | 156 +++++---- UKSF.Common/Clock.cs | 15 + UKSF.Common/DataUtilies.cs | 9 +- UKSF.Common/EventModelFactory.cs | 9 - UKSF.Common/InstagramExtensions.cs | 14 - UKSF.Common/UKSF.Common.csproj | 12 +- UKSF.PostMessage/UKSF.PostMessage.csproj | 2 +- UKSF.Tests/Common/IMockCachedDataService.cs | 5 - UKSF.Tests/Common/IMockDataService.cs | 5 - UKSF.Tests/Common/ITestCachedDataService.cs | 5 + UKSF.Tests/Common/ITestDataService.cs | 5 + UKSF.Tests/Common/MockCachedDataService.cs | 9 - UKSF.Tests/Common/MockComplexDataModel.cs | 9 - UKSF.Tests/Common/MockDataModel.cs | 9 - UKSF.Tests/Common/MockDataService.cs | 9 - UKSF.Tests/Common/TestCachedDataService.cs | 9 + UKSF.Tests/Common/TestComplexDataModel.cs | 9 + UKSF.Tests/Common/TestDataModel.cs | 10 + UKSF.Tests/Common/TestDataService.cs | 9 + UKSF.Tests/Common/TestUtilities.cs | 5 +- .../Integration/Data/DataCollectionTests.cs | 51 +-- UKSF.Tests/UKSF.Tests.csproj | 23 +- UKSF.Tests/UKSF.Tests.csproj.DotSettings | 8 + .../Unit/Common/ChangeUtilitiesTests.cs | 166 ++++++++++ UKSF.Tests/Unit/Common/ClockTests.cs | 29 ++ .../Unit/Common/CollectionUtilitiesTests.cs | 6 +- UKSF.Tests/Unit/Common/DataUtilitiesTests.cs | 40 +-- UKSF.Tests/Unit/Common/DateUtilitiesTests.cs | 2 +- .../Unit/Common/EventModelFactoryTests.cs | 24 +- UKSF.Tests/Unit/Common/GuardUtilitesTests.cs | 2 +- UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs | 40 ++- .../Unit/Common/StringUtilitiesTests.cs | 2 +- UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs | 6 +- .../Data/Admin/VariablesDataServiceTests.cs | 101 +++--- .../Unit/Data/CachedDataServiceTests.cs | 272 +++++++++------- .../Unit/Data/CahcedDataServiceEventTests.cs | 141 ++++++++ .../Unit/Data/DataCollectionFactoryTests.cs | 6 +- UKSF.Tests/Unit/Data/DataServiceEventTests.cs | 154 +++++++++ UKSF.Tests/Unit/Data/DataServiceTests.cs | 302 +++++++++--------- .../Data/Game/GameServersDataServiceTests.cs | 17 +- .../Message/CommentThreadDataServiceTests.cs | 15 +- .../Unit/Data/Message/LogDataServiceTests.cs | 73 ++--- .../Data/Modpack/BuildsDataServiceTests.cs | 78 +++++ .../Data/Modpack/ReleasesDataServiceTests.cs | 38 +++ .../OperationOrderDataServiceTests.cs | 7 +- .../OperationReportDataServiceTests.cs | 7 +- .../Personnel/DischargeDataServiceTests.cs | 21 +- .../Data/Personnel/RanksDataServiceTests.cs | 11 +- .../Data/Personnel/RolesDataServiceTests.cs | 41 ++- .../Unit/Data/SimpleDataServiceTests.cs | 66 ++-- .../Unit/Data/Units/UnitsDataServiceTests.cs | 41 ++- .../Unit/Events/DataEventBackerTests.cs | 47 --- UKSF.Tests/Unit/Events/EventBusTests.cs | 11 +- .../Events/EventHandlerInitialiserTests.cs | 2 +- .../Handlers/AccountEventHandlerTests.cs | 49 ++- .../CommandRequestEventHandlerTests.cs | 41 ++- .../CommentThreadEventHandlerTests.cs | 39 ++- .../Events/Handlers/LogEventHandlerTests.cs | 44 ++- .../NotificationsEventHandlerTests.cs | 51 ++- .../Handlers/TeamspeakEventHandlerTests.cs | 2 +- .../Unit/Models/AccountSettingsTests.cs | 2 +- .../Unit/Models/Game/MissionFileTests.cs | 2 +- .../Message/Logging/BasicLogMessageTests.cs | 2 +- .../Logging/LauncherLogMessageTests.cs | 2 +- .../Message/Logging/WebLogMessageTests.cs | 2 +- .../Mission/MissionPatchingReportTests.cs | 2 +- .../Unit/Models/Mission/MissionTests.cs | 2 +- .../Services/Admin/VariablesServiceTests.cs | 2 +- .../Services/Common/AccountUtilitiesTests.cs | 4 +- .../Common/DisplayNameUtilitiesTests.cs | 2 +- .../Personnel/DisplayNameServiceTests.cs | 2 +- .../Services/Personnel/LoaServiceTests.cs | 2 +- .../Services/Personnel/RanksServiceTests.cs | 2 +- .../Services/Personnel/RoleAttributeTests.cs | 2 +- .../Services/Personnel/RolesServiceTests.cs | 2 +- .../Utility/ConfirmationCodeServiceTests.cs | 6 +- .../Services/Utility/DataCacheServiceTests.cs | 2 +- .../Utility/ScheduledActionServiceTests.cs | 2 +- ...eleteExpiredConfirmationCodeActionTests.cs | 2 +- .../ScheduledActions/PruneDataActionTests.cs | 2 +- .../TeamspeakSnapshotActionTests.cs | 2 +- .../Services/Utility/SessionServiceTests.cs | 2 +- UKSF.Tests/testdata/base64.txt | 1 + 167 files changed, 1958 insertions(+), 1589 deletions(-) create mode 100644 UKSF.Api.Data/EventModelFactory.cs delete mode 100644 UKSF.Api.Events/Data/DataEventBacker.cs delete mode 100644 UKSF.Api.Interfaces/Events/IDataEventBacker.cs delete mode 100644 UKSF.Common/CertificateUtilities.cs create mode 100644 UKSF.Common/Clock.cs delete mode 100644 UKSF.Common/EventModelFactory.cs delete mode 100644 UKSF.Common/InstagramExtensions.cs delete mode 100644 UKSF.Tests/Common/IMockCachedDataService.cs delete mode 100644 UKSF.Tests/Common/IMockDataService.cs create mode 100644 UKSF.Tests/Common/ITestCachedDataService.cs create mode 100644 UKSF.Tests/Common/ITestDataService.cs delete mode 100644 UKSF.Tests/Common/MockCachedDataService.cs delete mode 100644 UKSF.Tests/Common/MockComplexDataModel.cs delete mode 100644 UKSF.Tests/Common/MockDataModel.cs delete mode 100644 UKSF.Tests/Common/MockDataService.cs create mode 100644 UKSF.Tests/Common/TestCachedDataService.cs create mode 100644 UKSF.Tests/Common/TestComplexDataModel.cs create mode 100644 UKSF.Tests/Common/TestDataModel.cs create mode 100644 UKSF.Tests/Common/TestDataService.cs create mode 100644 UKSF.Tests/UKSF.Tests.csproj.DotSettings create mode 100644 UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs create mode 100644 UKSF.Tests/Unit/Common/ClockTests.cs create mode 100644 UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs create mode 100644 UKSF.Tests/Unit/Data/DataServiceEventTests.cs create mode 100644 UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs create mode 100644 UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs delete mode 100644 UKSF.Tests/Unit/Events/DataEventBackerTests.cs create mode 100644 UKSF.Tests/testdata/base64.txt diff --git a/UKSF.Api.Data/Admin/VariablesDataService.cs b/UKSF.Api.Data/Admin/VariablesDataService.cs index d651ff36..2e5c7221 100644 --- a/UKSF.Api.Data/Admin/VariablesDataService.cs +++ b/UKSF.Api.Data/Admin/VariablesDataService.cs @@ -8,13 +8,12 @@ using UKSF.Common; namespace UKSF.Api.Data.Admin { - public class VariablesDataService : CachedDataService, IVariablesDataService { - public VariablesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "variables") { } + public class VariablesDataService : CachedDataService, IVariablesDataService { + public VariablesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "variables") { } - public override List Collection { - get => base.Collection; - protected set { - lock (LockObject) base.Collection = value?.OrderBy(x => x.key).ToList(); + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.OrderBy(x => x.key).ToList(); } } @@ -25,13 +24,13 @@ public override VariableItem GetSingle(string key) { public async Task Update(string key, object value) { VariableItem variableItem = GetSingle(key); if (variableItem == null) throw new KeyNotFoundException($"Variable Item with key '{key}' does not exist"); - await base.Update(variableItem.id, "item", value); + await base.Update(variableItem.id, nameof(variableItem.item), value); } public override async Task Delete(string key) { VariableItem variableItem = GetSingle(key); if (variableItem == null) throw new KeyNotFoundException($"Variable Item with key '{key}' does not exist"); - await base.Delete(variableItem.id); + await base.Delete(variableItem); } } } diff --git a/UKSF.Api.Data/CachedDataService.cs b/UKSF.Api.Data/CachedDataService.cs index 00878fd9..71bcb66b 100644 --- a/UKSF.Api.Data/CachedDataService.cs +++ b/UKSF.Api.Data/CachedDataService.cs @@ -4,103 +4,131 @@ using System.Linq.Expressions; using System.Threading.Tasks; using MongoDB.Driver; +using MoreLinq; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models; using UKSF.Api.Models.Events; -using UKSF.Common; namespace UKSF.Api.Data { - public class CachedDataService : DataServiceBase, IDataService, ICachedDataService { - private List collection; + public class CachedDataService : DataServiceBase, IDataService, ICachedDataService where T : DatabaseObject { + private readonly IDataEventBus dataEventBus; protected readonly object LockObject = new object(); - protected CachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } + protected CachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, collectionName) => + this.dataEventBus = dataEventBus; - public virtual List Collection { - get => collection; - protected set { - lock (LockObject) collection = value; - } - } + public List Cache { get; protected set; } public void Refresh() { - Collection = null; + SetCache(null); Get(); } - public override IEnumerable Get() { - if (Collection != null) { - return Collection; + public sealed override IEnumerable Get() { + if (Cache != null) { + return Cache; } - Collection = base.Get().ToList(); - return Collection; + SetCache(base.Get()); + return Cache; } public override IEnumerable Get(Func predicate) { - if (Collection == null) Get(); - return Collection.Where(predicate); + if (Cache == null) Get(); + return Cache.Where(predicate); } public override T GetSingle(string id) { - if (Collection == null) Get(); - return Collection.FirstOrDefault(x => x.GetIdValue() == id); + if (Cache == null) Get(); + return Cache.FirstOrDefault(x => x.id == id); } public override T GetSingle(Func predicate) { - if (Collection == null) Get(); - return Collection.FirstOrDefault(predicate); + if (Cache == null) Get(); + return Cache.FirstOrDefault(predicate); } - public override async Task Add(T data) { - await base.Add(data); - Refresh(); // TODO: intelligent refresh - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, data.GetIdValue(), data)); + public override async Task Add(T item) { + if (Cache == null) Get(); + await base.Add(item); + SetCache(Cache.Concat(new[] { item })); + DataAddEvent(item.id, item); } public override async Task Update(string id, string fieldName, object value) { await base.Update(id, fieldName, value); Refresh(); // TODO: intelligent refresh - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + DataUpdateEvent(id); } public override async Task Update(string id, UpdateDefinition update) { await base.Update(id, update); Refresh(); // TODO: intelligent refresh - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + DataUpdateEvent(id); } public override async Task Update(Expression> filterExpression, UpdateDefinition update) { await base.Update(filterExpression, update); Refresh(); // TODO: intelligent refresh - List items = Get(filterExpression.Compile()).ToList(); - items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); + DataUpdateEvent(GetSingle(filterExpression.Compile()).id); } - public override async Task UpdateMany(Func predicate, UpdateDefinition update) { - await base.UpdateMany(predicate, update); + public override async Task UpdateMany(Expression> filterExpression, UpdateDefinition update) { + await base.UpdateMany(filterExpression, update); Refresh(); // TODO: intelligent refresh - List items = Get(predicate).ToList(); - items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); + Get(filterExpression.Compile()).ForEach(x => DataUpdateEvent(x.id)); } public override async Task Replace(T item) { + string id = item.id; + T cacheItem = GetSingle(id); await base.Replace(item); - Refresh(); // TODO: intelligent refresh - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, item.GetIdValue())); + SetCache(Cache.Except(new[] { cacheItem }).Concat(new[] { item })); + DataUpdateEvent(item.id); } public override async Task Delete(string id) { + T cacheItem = GetSingle(id); await base.Delete(id); - Refresh(); // TODO: intelligent refresh - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); + SetCache(Cache.Except(new[] { cacheItem })); + DataDeleteEvent(id); } - public override async Task DeleteMany(Func predicate) { - await base.DeleteMany(predicate); - Refresh(); // TODO: intelligent refresh - List items = Get(predicate).ToList(); - items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, x.GetIdValue()))); + public override async Task Delete(T item) { + if (Cache == null) Get(); + await base.Delete(item); + SetCache(Cache.Except(new[] { item })); + DataDeleteEvent(item.id); + } + + public override async Task DeleteMany(Expression> filterExpression) { + List ids = Get(filterExpression.Compile()).ToList(); + await base.DeleteMany(filterExpression); + SetCache(Cache.Except(ids)); + ids.ForEach(x => DataDeleteEvent(x.id)); + } + + protected virtual void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.ToList(); + } + } + + private void DataAddEvent(string id, T item) { + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, id, item)); + } + + private void DataUpdateEvent(string id) { + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + } + + private void DataDeleteEvent(string id) { + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); + } + + protected virtual void DataEvent(DataEventModel dataEvent) { + dataEventBus.Send(dataEvent); } } } diff --git a/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs b/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs index 257a1559..6242f34f 100644 --- a/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs +++ b/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs @@ -1,9 +1,16 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Command; +using UKSF.Api.Models.Events; namespace UKSF.Api.Data.Command { - public class CommandRequestArchiveDataService : DataService, ICommandRequestArchiveDataService { - public CommandRequestArchiveDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "commandRequestsArchive") { } + public class CommandRequestArchiveDataService : DataService, ICommandRequestArchiveDataService { + public CommandRequestArchiveDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base( + dataCollectionFactory, + dataEventBus, + "commandRequestsArchive" + ) { } + + protected override void DataEvent(DataEventModel dataEvent) { } } } diff --git a/UKSF.Api.Data/Command/CommandRequestDataService.cs b/UKSF.Api.Data/Command/CommandRequestDataService.cs index d4c082d4..17b0d4b0 100644 --- a/UKSF.Api.Data/Command/CommandRequestDataService.cs +++ b/UKSF.Api.Data/Command/CommandRequestDataService.cs @@ -4,7 +4,7 @@ using UKSF.Api.Models.Command; namespace UKSF.Api.Data.Command { - public class CommandRequestDataService : CachedDataService, ICommandRequestDataService { - public CommandRequestDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "commandRequests") { } + public class CommandRequestDataService : CachedDataService, ICommandRequestDataService { + public CommandRequestDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "commandRequests") { } } } diff --git a/UKSF.Api.Data/DataCollection.cs b/UKSF.Api.Data/DataCollection.cs index 0fb835f8..c7f49f76 100644 --- a/UKSF.Api.Data/DataCollection.cs +++ b/UKSF.Api.Data/DataCollection.cs @@ -6,24 +6,18 @@ using MongoDB.Bson; using MongoDB.Driver; using UKSF.Api.Interfaces.Data; -using UKSF.Common; +using UKSF.Api.Models; namespace UKSF.Api.Data { - public class DataCollection : IDataCollection { - private readonly IMongoDatabase database; + public class DataCollection : IDataCollection where T : DatabaseObject { private readonly string collectionName; + private readonly IMongoDatabase database; public DataCollection(IMongoDatabase database, string collectionName) { this.database = database; this.collectionName = collectionName; } - public async Task AssertCollectionExistsAsync() { - if (!await CollectionExistsAsync()) { - await database.CreateCollectionAsync(collectionName); - } - } - public IEnumerable Get() => GetCollection().AsQueryable(); public IEnumerable Get(Func predicate) => GetCollection().AsQueryable().Where(predicate); @@ -45,7 +39,9 @@ public async Task UpdateAsync(FilterDefinition filter, UpdateDefinition up } public async Task UpdateManyAsync(Expression> predicate, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter - IEnumerable ids = Get(predicate.Compile()).Select(x => x.GetIdValue()); // This is necessary for filtering items by a default model value (e.g Role order default 0, may not be stored in document) + // Getting ids by the filter predicate is necessary to cover filtering items by a default model value + // (e.g Role order default 0, may not be stored in document, and is thus not filterable) + IEnumerable ids = Get(predicate.Compile()).Select(x => x.id); await GetCollection().UpdateManyAsync(Builders.Filter.In("id", ids), update); } @@ -58,10 +54,17 @@ public async Task DeleteAsync(string id) { } public async Task DeleteManyAsync(Expression> predicate) { - IEnumerable ids = Get(predicate.Compile()).Select(x => x.GetIdValue()); // This is necessary for filtering items by a default model value (e.g Role order default 0, may not be stored in document) + IEnumerable ids = Get(predicate.Compile()) + .Select(x => x.id); // This is necessary for filtering items by a default model value (e.g Role order default 0, may not be stored in document) await GetCollection().DeleteManyAsync(Builders.Filter.In("id", ids)); } + public async Task AssertCollectionExistsAsync() { + if (!await CollectionExistsAsync()) { + await database.CreateCollectionAsync(collectionName); + } + } + private IMongoCollection GetCollection() => database.GetCollection(collectionName); private async Task CollectionExistsAsync() => await (await database.ListCollectionsAsync(new ListCollectionsOptions { Filter = new BsonDocument("name", collectionName) })).AnyAsync(); diff --git a/UKSF.Api.Data/DataCollectionFactory.cs b/UKSF.Api.Data/DataCollectionFactory.cs index 0b38ceb8..a87a7f59 100644 --- a/UKSF.Api.Data/DataCollectionFactory.cs +++ b/UKSF.Api.Data/DataCollectionFactory.cs @@ -1,5 +1,6 @@ using MongoDB.Driver; using UKSF.Api.Interfaces.Data; +using UKSF.Api.Models; namespace UKSF.Api.Data { public class DataCollectionFactory : IDataCollectionFactory { @@ -7,7 +8,7 @@ public class DataCollectionFactory : IDataCollectionFactory { public DataCollectionFactory(IMongoDatabase database) => this.database = database; - public IDataCollection CreateDataCollection(string collectionName) { + public IDataCollection CreateDataCollection(string collectionName) where T : DatabaseObject { IDataCollection dataCollection = new DataCollection(database, collectionName); return dataCollection; } diff --git a/UKSF.Api.Data/DataService.cs b/UKSF.Api.Data/DataService.cs index 48d39164..1ebf5a57 100644 --- a/UKSF.Api.Data/DataService.cs +++ b/UKSF.Api.Data/DataService.cs @@ -1,59 +1,79 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; using MongoDB.Driver; +using MoreLinq; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models; using UKSF.Api.Models.Events; -using UKSF.Common; namespace UKSF.Api.Data { - public abstract class DataService : DataServiceBase, IDataService { - protected DataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } + public abstract class DataService : DataServiceBase, IDataService where T : DatabaseObject { + private readonly IDataEventBus dataEventBus; - public override async Task Add(T data) { - await base.Add(data); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, data.GetIdValue(), data)); + protected DataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, collectionName) => + this.dataEventBus = dataEventBus; + + public override async Task Add(T item) { + await base.Add(item); + DataAddEvent(item.id, item); } public override async Task Update(string id, string fieldName, object value) { await base.Update(id, fieldName, value); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + DataUpdateEvent(id); } public override async Task Update(string id, UpdateDefinition update) { await base.Update(id, update); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + DataUpdateEvent(id); } public override async Task Update(Expression> filterExpression, UpdateDefinition update) { await base.Update(filterExpression, update); - List ids = Get(filterExpression.Compile()).Select(x => x.GetIdValue()).ToList(); - ids.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x))); + DataUpdateEvent(GetSingle(filterExpression.Compile()).id); } - public override async Task UpdateMany(Func predicate, UpdateDefinition update) { - await base.UpdateMany(predicate, update); - List items = Get(predicate).ToList(); - items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, x.GetIdValue()))); + public override async Task UpdateMany(Expression> filterExpression, UpdateDefinition update) { + await base.UpdateMany(filterExpression, update); + Get(filterExpression.Compile()).ForEach(x => DataUpdateEvent(x.id)); } public override async Task Replace(T item) { await base.Replace(item); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, item.GetIdValue())); + DataUpdateEvent(item.id); } public override async Task Delete(string id) { await base.Delete(id); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); + DataDeleteEvent(id); + } + + public override async Task Delete(T item) { + await base.Delete(item); + DataDeleteEvent(item.id); + } + + public override async Task DeleteMany(Expression> filterExpression) { + await base.DeleteMany(filterExpression); + Get(filterExpression.Compile()).ForEach(x => DataDeleteEvent(x.id)); + } + + private void DataAddEvent(string id, T item) { + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, id, item)); + } + + private void DataUpdateEvent(string id) { + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + } + + private void DataDeleteEvent(string id) { + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); } - public override async Task DeleteMany(Func predicate) { - await base.DeleteMany(predicate); - List items = Get(predicate).ToList(); // TODO: Evaluate performance impact of this presence check - items.ForEach(x => DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, x.GetIdValue()))); + protected virtual void DataEvent(DataEventModel dataEvent) { + dataEventBus.Send(dataEvent); } } } diff --git a/UKSF.Api.Data/DataServiceBase.cs b/UKSF.Api.Data/DataServiceBase.cs index ef67d1ae..038baf0c 100644 --- a/UKSF.Api.Data/DataServiceBase.cs +++ b/UKSF.Api.Data/DataServiceBase.cs @@ -4,17 +4,14 @@ using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; -using UKSF.Api.Events.Data; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Common; +using UKSF.Api.Models; namespace UKSF.Api.Data { - public abstract class DataServiceBase : DataEventBacker { + public abstract class DataServiceBase where T : DatabaseObject { private readonly IDataCollection dataCollection; - protected DataServiceBase(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataEventBus) => - dataCollection = dataCollectionFactory.CreateDataCollection(collectionName); + protected DataServiceBase(IDataCollectionFactory dataCollectionFactory, string collectionName) => dataCollection = dataCollectionFactory.CreateDataCollection(collectionName); public virtual IEnumerable Get() => dataCollection.Get(); @@ -27,9 +24,9 @@ public virtual T GetSingle(string id) { public virtual T GetSingle(Func predicate) => dataCollection.GetSingle(predicate); - public virtual async Task Add(T data) { - if (data == null) throw new ArgumentNullException(nameof(data)); - await dataCollection.AddAsync(data); + public virtual async Task Add(T item) { + if (item == null) throw new ArgumentNullException(nameof(item)); + await dataCollection.AddAsync(item); } public virtual async Task Update(string id, string fieldName, object value) { @@ -47,15 +44,12 @@ public virtual async Task Update(Expression> filterExpression, Upd await dataCollection.UpdateAsync(Builders.Filter.Where(filterExpression), update); } - public virtual async Task UpdateMany(Func predicate, UpdateDefinition update) { - // List items = Get(predicate); // TODO: Evaluate performance impact of this presence check - // if (items.Count == 0) return; // throw new KeyNotFoundException("Could not find any items to update"); - await dataCollection.UpdateManyAsync(x => predicate(x), update); + public virtual async Task UpdateMany(Expression> filterExpression, UpdateDefinition update) { + await dataCollection.UpdateManyAsync(filterExpression, update); } public virtual async Task Replace(T item) { - // if (GetSingle(item.GetIdValue()) == null) throw new KeyNotFoundException("Could not find item to replace"); // TODO: Evaluate performance impact of this presence check - await dataCollection.ReplaceAsync(item.GetIdValue(), item); + await dataCollection.ReplaceAsync(item.id, item); } public virtual async Task Delete(string id) { @@ -63,15 +57,17 @@ public virtual async Task Delete(string id) { await dataCollection.DeleteAsync(id); } - public virtual async Task DeleteMany(Func predicate) { - // List items = Get(predicate); // TODO: Evaluate performance impact of this presence check - // if (items.Count == 0) return; // throw new KeyNotFoundException("Could not find any items to delete"); - await dataCollection.DeleteManyAsync(x => predicate(x)); + public virtual async Task Delete(T item) { + await dataCollection.DeleteAsync(item.id); + } + + public virtual async Task DeleteMany(Expression> filterExpression) { + await dataCollection.DeleteManyAsync(filterExpression); } private static void ValidateId(string id) { - if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Key cannot be empty"); - if (!ObjectId.TryParse(id, out ObjectId _)) throw new KeyNotFoundException("Key must be valid"); + if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Id cannot be empty"); + if (!ObjectId.TryParse(id, out ObjectId _)) throw new KeyNotFoundException("Id must be valid"); } } } diff --git a/UKSF.Api.Data/EventModelFactory.cs b/UKSF.Api.Data/EventModelFactory.cs new file mode 100644 index 00000000..9e222539 --- /dev/null +++ b/UKSF.Api.Data/EventModelFactory.cs @@ -0,0 +1,8 @@ +using UKSF.Api.Models; +using UKSF.Api.Models.Events; + +namespace UKSF.Api.Data { + public static class EventModelFactory { + public static DataEventModel CreateDataEvent(DataEventType type, string id, object data = null) where T : DatabaseObject => new DataEventModel { type = type, id = id, data = data }; + } +} diff --git a/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs b/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs index 4aebd715..2c755f1f 100644 --- a/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs +++ b/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs @@ -3,5 +3,5 @@ using UKSF.Api.Services.Fake; namespace UKSF.Api.Data.Fake { - public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { } + public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { } } diff --git a/UKSF.Api.Data/Game/GameServersDataService.cs b/UKSF.Api.Data/Game/GameServersDataService.cs index 9bbf759a..a01fbbb0 100644 --- a/UKSF.Api.Data/Game/GameServersDataService.cs +++ b/UKSF.Api.Data/Game/GameServersDataService.cs @@ -6,13 +6,12 @@ using UKSF.Api.Models.Game; namespace UKSF.Api.Data.Game { - public class GameServersDataService : CachedDataService, IGameServersDataService { - public GameServersDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "gameServers") { } + public class GameServersDataService : CachedDataService, IGameServersDataService { + public GameServersDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "gameServers") { } - public override List Collection { - get => base.Collection; - protected set { - lock (LockObject) base.Collection = value?.OrderBy(x => x.order).ToList(); + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.OrderBy(x => x.order).ToList(); } } } diff --git a/UKSF.Api.Data/Launcher/LauncherFileDataService.cs b/UKSF.Api.Data/Launcher/LauncherFileDataService.cs index 2661d2f1..66e63f35 100644 --- a/UKSF.Api.Data/Launcher/LauncherFileDataService.cs +++ b/UKSF.Api.Data/Launcher/LauncherFileDataService.cs @@ -4,7 +4,7 @@ using UKSF.Api.Models.Launcher; namespace UKSF.Api.Data.Launcher { - public class LauncherFileDataService : CachedDataService, ILauncherFileDataService { - public LauncherFileDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "launcherFiles") { } + public class LauncherFileDataService : CachedDataService, ILauncherFileDataService { + public LauncherFileDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "launcherFiles") { } } } diff --git a/UKSF.Api.Data/Message/CommentThreadDataService.cs b/UKSF.Api.Data/Message/CommentThreadDataService.cs index 3a3545ca..3c15d7ba 100644 --- a/UKSF.Api.Data/Message/CommentThreadDataService.cs +++ b/UKSF.Api.Data/Message/CommentThreadDataService.cs @@ -5,21 +5,20 @@ using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; using UKSF.Api.Models.Message; -using UKSF.Common; namespace UKSF.Api.Data.Message { - public class CommentThreadDataService : CachedDataService, ICommentThreadDataService { - public CommentThreadDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "commentThreads") { } + public class CommentThreadDataService : CachedDataService, ICommentThreadDataService { + public CommentThreadDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "commentThreads") { } public async Task Update(string id, Comment comment, DataEventType updateType) { await base.Update(id, updateType == DataEventType.ADD ? Builders.Update.Push(x => x.comments, comment) : Builders.Update.Pull(x => x.comments, comment)); - CommentThreadDataEvent(EventModelFactory.CreateDataEvent(updateType, id, comment)); + CommentThreadDataEvent(EventModelFactory.CreateDataEvent(updateType, id, comment)); } - private void CommentThreadDataEvent(DataEventModel dataEvent) { + private void CommentThreadDataEvent(DataEventModel dataEvent) { base.DataEvent(dataEvent); } - protected override void DataEvent(DataEventModel dataEvent) { } + protected override void DataEvent(DataEventModel dataEvent) { } } } diff --git a/UKSF.Api.Data/Message/LogDataService.cs b/UKSF.Api.Data/Message/LogDataService.cs index b3485b94..84008cdb 100644 --- a/UKSF.Api.Data/Message/LogDataService.cs +++ b/UKSF.Api.Data/Message/LogDataService.cs @@ -6,24 +6,24 @@ using UKSF.Common; namespace UKSF.Api.Data.Message { - public class LogDataService : DataService, ILogDataService { + public class LogDataService : DataService, ILogDataService { private readonly IDataCollectionFactory dataCollectionFactory; - public LogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "logs") => this.dataCollectionFactory = dataCollectionFactory; + public LogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "logs") => this.dataCollectionFactory = dataCollectionFactory; public async Task Add(AuditLogMessage log) { await dataCollectionFactory.CreateDataCollection("auditLogs").AddAsync(log); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); } public async Task Add(LauncherLogMessage log) { await dataCollectionFactory.CreateDataCollection("launcherLogs").AddAsync(log); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); } public async Task Add(WebLogMessage log) { await dataCollectionFactory.CreateDataCollection("errorLogs").AddAsync(log); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); } } } diff --git a/UKSF.Api.Data/Message/NotificationsDataService.cs b/UKSF.Api.Data/Message/NotificationsDataService.cs index a0329b7c..ade97d91 100644 --- a/UKSF.Api.Data/Message/NotificationsDataService.cs +++ b/UKSF.Api.Data/Message/NotificationsDataService.cs @@ -4,7 +4,7 @@ using UKSF.Api.Models.Message; namespace UKSF.Api.Data.Message { - public class NotificationsDataService : CachedDataService, INotificationsDataService { - public NotificationsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "notifications") { } + public class NotificationsDataService : CachedDataService, INotificationsDataService { + public NotificationsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "notifications") { } } } diff --git a/UKSF.Api.Data/Modpack/BuildsDataService.cs b/UKSF.Api.Data/Modpack/BuildsDataService.cs index ea8bc3df..cf3d3a4d 100644 --- a/UKSF.Api.Data/Modpack/BuildsDataService.cs +++ b/UKSF.Api.Data/Modpack/BuildsDataService.cs @@ -7,28 +7,26 @@ using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; using UKSF.Api.Models.Modpack; -using UKSF.Common; namespace UKSF.Api.Data.Modpack { - public class BuildsDataService : CachedDataService, IBuildsDataService { - public BuildsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackBuilds") { } + public class BuildsDataService : CachedDataService, IBuildsDataService { + public BuildsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackBuilds") { } - public override List Collection { - get => base.Collection; - protected set { - lock (LockObject) base.Collection = value?.OrderByDescending(x => x.buildNumber).ToList(); + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.OrderByDescending(x => x.buildNumber).ToList(); } } public async Task Update(ModpackBuild build, ModpackBuildStep buildStep) { UpdateDefinition updateDefinition = Builders.Update.Set(x => x.steps[buildStep.index], buildStep); - await base.Update(x => x.id == build.id, updateDefinition); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, buildStep)); + await base.Update(build.id, updateDefinition); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, buildStep)); } public async Task Update(ModpackBuild build, UpdateDefinition updateDefinition) { await base.Update(build.id, updateDefinition); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, build)); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, build)); } } } diff --git a/UKSF.Api.Data/Modpack/ReleasesDataService.cs b/UKSF.Api.Data/Modpack/ReleasesDataService.cs index 342ab050..8ba2f00d 100644 --- a/UKSF.Api.Data/Modpack/ReleasesDataService.cs +++ b/UKSF.Api.Data/Modpack/ReleasesDataService.cs @@ -6,25 +6,22 @@ using UKSF.Api.Models.Modpack; namespace UKSF.Api.Data.Modpack { - public class ReleasesDataService : CachedDataService, IReleasesDataService { - public ReleasesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackReleases") { } + public class ReleasesDataService : CachedDataService, IReleasesDataService { + public ReleasesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackReleases") { } - public override List Collection { - get => base.Collection; - protected set { - lock (LockObject) { - base.Collection = value?.Select( - x => { - int[] parts = x.version.Split('.').Select(int.Parse).ToArray(); - return new { release = x, major = parts[0], minor = parts[1], patch = parts[2] }; - } - ) - .OrderByDescending(x => x.major) - .ThenByDescending(x => x.minor) - .ThenByDescending(x => x.patch) - .Select(x => x.release) - .ToList(); - } + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.Select( + x => { + int[] parts = x.version.Split('.').Select(int.Parse).ToArray(); + return new { release = x, major = parts[0], minor = parts[1], patch = parts[2] }; + } + ) + .OrderByDescending(x => x.major) + .ThenByDescending(x => x.minor) + .ThenByDescending(x => x.patch) + .Select(x => x.release) + .ToList(); } } } diff --git a/UKSF.Api.Data/Operations/OperationOrderDataService.cs b/UKSF.Api.Data/Operations/OperationOrderDataService.cs index e6ea9e6a..dbe341cc 100644 --- a/UKSF.Api.Data/Operations/OperationOrderDataService.cs +++ b/UKSF.Api.Data/Operations/OperationOrderDataService.cs @@ -6,13 +6,12 @@ using UKSF.Api.Models.Operations; namespace UKSF.Api.Data.Operations { - public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { - public OperationOrderDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "opord") { } + public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { + public OperationOrderDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "opord") { } - public override List Collection { - get => base.Collection; - protected set { - lock (LockObject) base.Collection = value?.OrderBy(x => x.start).ToList(); + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.OrderBy(x => x.start).ToList(); } } } diff --git a/UKSF.Api.Data/Operations/OperationReportDataService.cs b/UKSF.Api.Data/Operations/OperationReportDataService.cs index bc1b2868..49848e26 100644 --- a/UKSF.Api.Data/Operations/OperationReportDataService.cs +++ b/UKSF.Api.Data/Operations/OperationReportDataService.cs @@ -6,13 +6,12 @@ using UKSF.Api.Models.Operations; namespace UKSF.Api.Data.Operations { - public class OperationReportDataService : CachedDataService, IOperationReportDataService { - public OperationReportDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "oprep") { } + public class OperationReportDataService : CachedDataService, IOperationReportDataService { + public OperationReportDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "oprep") { } - public override List Collection { - get => base.Collection; - protected set { - lock (LockObject) base.Collection = value?.OrderBy(x => x.start).ToList(); + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.OrderBy(x => x.start).ToList(); } } } diff --git a/UKSF.Api.Data/Personnel/AccountDataService.cs b/UKSF.Api.Data/Personnel/AccountDataService.cs index 6e277a9c..313f3224 100644 --- a/UKSF.Api.Data/Personnel/AccountDataService.cs +++ b/UKSF.Api.Data/Personnel/AccountDataService.cs @@ -4,7 +4,7 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Data.Personnel { - public class AccountDataService : CachedDataService, IAccountDataService { - public AccountDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "accounts") { } + public class AccountDataService : CachedDataService, IAccountDataService { + public AccountDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "accounts") { } } } diff --git a/UKSF.Api.Data/Personnel/DischargeDataService.cs b/UKSF.Api.Data/Personnel/DischargeDataService.cs index 5ed24b0e..b02b62fe 100644 --- a/UKSF.Api.Data/Personnel/DischargeDataService.cs +++ b/UKSF.Api.Data/Personnel/DischargeDataService.cs @@ -6,13 +6,12 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Data.Personnel { - public class DischargeDataService : CachedDataService, IDischargeDataService { - public DischargeDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "discharges") { } + public class DischargeDataService : CachedDataService, IDischargeDataService { + public DischargeDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "discharges") { } - public override List Collection { - get => base.Collection; - protected set { - lock (LockObject) base.Collection = value?.OrderByDescending(x => x.discharges.Last().timestamp).ToList(); + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.OrderByDescending(x => x.discharges.Last().timestamp).ToList(); } } } diff --git a/UKSF.Api.Data/Personnel/LoaDataService.cs b/UKSF.Api.Data/Personnel/LoaDataService.cs index 79b149c8..29578002 100644 --- a/UKSF.Api.Data/Personnel/LoaDataService.cs +++ b/UKSF.Api.Data/Personnel/LoaDataService.cs @@ -4,7 +4,7 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Data.Personnel { - public class LoaDataService : CachedDataService, ILoaDataService { - public LoaDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "loas") { } + public class LoaDataService : CachedDataService, ILoaDataService { + public LoaDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "loas") { } } } diff --git a/UKSF.Api.Data/Personnel/RanksDataService.cs b/UKSF.Api.Data/Personnel/RanksDataService.cs index e9409014..62c538e6 100644 --- a/UKSF.Api.Data/Personnel/RanksDataService.cs +++ b/UKSF.Api.Data/Personnel/RanksDataService.cs @@ -6,13 +6,12 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Data.Personnel { - public class RanksDataService : CachedDataService, IRanksDataService { - public RanksDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "ranks") { } + public class RanksDataService : CachedDataService, IRanksDataService { + public RanksDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "ranks") { } - public override List Collection { - get => base.Collection; - protected set { - lock (LockObject) base.Collection = value?.OrderBy(x => x.order).ToList(); + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.OrderBy(x => x.order).ToList(); } } diff --git a/UKSF.Api.Data/Personnel/RolesDataService.cs b/UKSF.Api.Data/Personnel/RolesDataService.cs index c206c6df..f44223bb 100644 --- a/UKSF.Api.Data/Personnel/RolesDataService.cs +++ b/UKSF.Api.Data/Personnel/RolesDataService.cs @@ -6,13 +6,12 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Data.Personnel { - public class RolesDataService : CachedDataService, IRolesDataService { - public RolesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "roles") { } + public class RolesDataService : CachedDataService, IRolesDataService { + public RolesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "roles") { } - public override List Collection { - get => base.Collection; - protected set { - lock (LockObject) base.Collection = value?.OrderBy(x => x.name).ToList(); + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.OrderBy(x => x.name).ToList(); } } diff --git a/UKSF.Api.Data/UKSF.Api.Data.csproj b/UKSF.Api.Data/UKSF.Api.Data.csproj index 16a5cfcd..25f6535b 100644 --- a/UKSF.Api.Data/UKSF.Api.Data.csproj +++ b/UKSF.Api.Data/UKSF.Api.Data.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + netcoreapp5.0 disable diff --git a/UKSF.Api.Data/Units/UnitsDataService.cs b/UKSF.Api.Data/Units/UnitsDataService.cs index f4df5aef..b41e861f 100644 --- a/UKSF.Api.Data/Units/UnitsDataService.cs +++ b/UKSF.Api.Data/Units/UnitsDataService.cs @@ -6,13 +6,12 @@ using UKSF.Api.Models.Units; namespace UKSF.Api.Data.Units { - public class UnitsDataService : CachedDataService, IUnitsDataService { - public UnitsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "units") { } + public class UnitsDataService : CachedDataService, IUnitsDataService { + public UnitsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "units") { } - public override List Collection { - get => base.Collection; - protected set { - lock (LockObject) base.Collection = value?.OrderBy(x => x.order).ToList(); + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.OrderBy(x => x.order).ToList(); } } } diff --git a/UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs b/UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs index bf88883f..b023fb1c 100644 --- a/UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs +++ b/UKSF.Api.Data/Utility/ConfirmationCodeDataService.cs @@ -3,7 +3,7 @@ using UKSF.Api.Models.Utility; namespace UKSF.Api.Data.Utility { - public class ConfirmationCodeDataService : DataService, IConfirmationCodeDataService { - public ConfirmationCodeDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "confirmationCodes") { } + public class ConfirmationCodeDataService : DataService, IConfirmationCodeDataService { + public ConfirmationCodeDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "confirmationCodes") { } } } diff --git a/UKSF.Api.Data/Utility/SchedulerDataService.cs b/UKSF.Api.Data/Utility/SchedulerDataService.cs index 8f5768d9..45c76f1b 100644 --- a/UKSF.Api.Data/Utility/SchedulerDataService.cs +++ b/UKSF.Api.Data/Utility/SchedulerDataService.cs @@ -3,7 +3,7 @@ using UKSF.Api.Models.Utility; namespace UKSF.Api.Data.Utility { - public class SchedulerDataService : DataService, ISchedulerDataService { - public SchedulerDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "scheduledJobs") { } + public class SchedulerDataService : DataService, ISchedulerDataService { + public SchedulerDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "scheduledJobs") { } } } diff --git a/UKSF.Api.Events/Data/DataEventBacker.cs b/UKSF.Api.Events/Data/DataEventBacker.cs deleted file mode 100644 index 565a0cee..00000000 --- a/UKSF.Api.Events/Data/DataEventBacker.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Events; - -namespace UKSF.Api.Events.Data { - public abstract class DataEventBacker : IDataEventBacker { - private readonly IDataEventBus dataEventBus; - - protected DataEventBacker(IDataEventBus dataEventBus) => this.dataEventBus = dataEventBus; - - public IObservable> EventBus() => dataEventBus.AsObservable(); - - protected virtual void DataEvent(DataEventModel dataEvent) { - dataEventBus.Send(dataEvent); - } - } -} diff --git a/UKSF.Api.Events/Data/DataEventBus.cs b/UKSF.Api.Events/Data/DataEventBus.cs index f0805fc2..c20750ef 100644 --- a/UKSF.Api.Events/Data/DataEventBus.cs +++ b/UKSF.Api.Events/Data/DataEventBus.cs @@ -1,10 +1,11 @@ using System; using System.Reactive.Linq; using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models; using UKSF.Api.Models.Events; namespace UKSF.Api.Events.Data { - public class DataEventBus : EventBus>, IDataEventBus { - public override IObservable> AsObservable() => Subject.OfType>(); + public class DataEventBus : EventBus>, IDataEventBus where T : DatabaseObject { + public override IObservable> AsObservable() => Subject.OfType>(); } } diff --git a/UKSF.Api.Events/Handlers/AccountEventHandler.cs b/UKSF.Api.Events/Handlers/AccountEventHandler.cs index c93a8071..f02b6d9d 100644 --- a/UKSF.Api.Events/Handlers/AccountEventHandler.cs +++ b/UKSF.Api.Events/Handlers/AccountEventHandler.cs @@ -1,41 +1,43 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; using UKSF.Api.Interfaces.Events.Handlers; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; using UKSF.Api.Models.Events; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; using UKSF.Api.Signalr.Hubs.Personnel; using UKSF.Common; namespace UKSF.Api.Events.Handlers { public class AccountEventHandler : IAccountEventHandler { - private readonly IAccountDataService accountData; + private readonly IDataEventBus accountDataEventBus; private readonly IHubContext hub; private readonly ILoggingService loggingService; - private readonly IUnitsDataService unitsData; + private readonly IDataEventBus unitDataEventBus; - public AccountEventHandler(IAccountDataService accountData, IUnitsDataService unitsData, IHubContext hub, ILoggingService loggingService) { - this.accountData = accountData; - this.unitsData = unitsData; + public AccountEventHandler(IDataEventBus accountDataEventBus, IDataEventBus unitDataEventBus, IHubContext hub, ILoggingService loggingService) { + this.accountDataEventBus = accountDataEventBus; + this.unitDataEventBus = unitDataEventBus; this.hub = hub; this.loggingService = loggingService; } public void Init() { - accountData.EventBus().SubscribeAsync(HandleAccountsEvent, exception => loggingService.Log(exception)); - unitsData.EventBus().SubscribeAsync(HandleUnitsEvent, exception => loggingService.Log(exception)); + accountDataEventBus.AsObservable().SubscribeAsync(HandleAccountsEvent, exception => loggingService.Log(exception)); + unitDataEventBus.AsObservable().SubscribeAsync(HandleUnitsEvent, exception => loggingService.Log(exception)); } - private async Task HandleAccountsEvent(DataEventModel x) { - if (x.type == DataEventType.UPDATE) { - await UpdatedEvent(x.id); + private async Task HandleAccountsEvent(DataEventModel dataEventModel) { + if (dataEventModel.type == DataEventType.UPDATE) { + await UpdatedEvent(dataEventModel.id); } } - private async Task HandleUnitsEvent(DataEventModel x) { - if (x.type == DataEventType.UPDATE) { - await UpdatedEvent(x.id); + private async Task HandleUnitsEvent(DataEventModel dataEventModel) { + if (dataEventModel.type == DataEventType.UPDATE) { + await UpdatedEvent(dataEventModel.id); } } diff --git a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs index b0f86515..06a76535 100644 --- a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs +++ b/UKSF.Api.Events/Handlers/BuildsEventHandler.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; using UKSF.Api.Interfaces.Events.Handlers; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; @@ -13,32 +14,32 @@ namespace UKSF.Api.Events.Handlers { public class BuildsEventHandler : IBuildsEventHandler { - private readonly IBuildsDataService buildsData; + private readonly IDataEventBus modpackBuildEventBus; private readonly IHubContext hub; private readonly ILoggingService loggingService; - public BuildsEventHandler(IBuildsDataService buildsData, IHubContext hub, ILoggingService loggingService) { - this.buildsData = buildsData; + public BuildsEventHandler(IDataEventBus modpackBuildEventBus, IHubContext hub, ILoggingService loggingService) { + this.modpackBuildEventBus = modpackBuildEventBus; this.hub = hub; this.loggingService = loggingService; } public void Init() { - buildsData.EventBus().SubscribeAsync(HandleBuildEvent, exception => loggingService.Log(exception)); + modpackBuildEventBus.AsObservable().SubscribeAsync(HandleBuildEvent, exception => loggingService.Log(exception)); } - private async Task HandleBuildEvent(DataEventModel x) { - if (x.data == null) return; + private async Task HandleBuildEvent(DataEventModel dataEventModel) { + if (dataEventModel.data == null) return; - switch (x.type) { + switch (dataEventModel.type) { case DataEventType.ADD: - await AddedEvent(x.data as ModpackBuild); + await AddedEvent(dataEventModel.data as ModpackBuild); break; case DataEventType.UPDATE: - await UpdatedEvent(x.id, x.data); + await UpdatedEvent(dataEventModel.id, dataEventModel.data); break; case DataEventType.DELETE: break; - default: throw new ArgumentOutOfRangeException(); + default: throw new ArgumentOutOfRangeException(nameof(dataEventModel)); } } diff --git a/UKSF.Api.Events/Handlers/CommandRequestEventHandler.cs b/UKSF.Api.Events/Handlers/CommandRequestEventHandler.cs index 17a09a30..cb05d34c 100644 --- a/UKSF.Api.Events/Handlers/CommandRequestEventHandler.cs +++ b/UKSF.Api.Events/Handlers/CommandRequestEventHandler.cs @@ -1,38 +1,39 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; using UKSF.Api.Interfaces.Events.Handlers; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; +using UKSF.Api.Models.Command; using UKSF.Api.Models.Events; using UKSF.Api.Signalr.Hubs.Command; using UKSF.Common; namespace UKSF.Api.Events.Handlers { public class CommandRequestEventHandler : ICommandRequestEventHandler { - private readonly ICommandRequestDataService data; + private readonly IDataEventBus commandRequestDataEventBus; private readonly IHubContext hub; private readonly ILoggingService loggingService; - public CommandRequestEventHandler(ICommandRequestDataService data, IHubContext hub, ILoggingService loggingService) { - this.data = data; + public CommandRequestEventHandler(IDataEventBus commandRequestDataEventBus, IHubContext hub, ILoggingService loggingService) { + this.commandRequestDataEventBus = commandRequestDataEventBus; this.hub = hub; this.loggingService = loggingService; } public void Init() { - data.EventBus().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + commandRequestDataEventBus.AsObservable().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); } - private async Task HandleEvent(DataEventModel x) { - switch (x.type) { + private async Task HandleEvent(DataEventModel dataEventModel) { + switch (dataEventModel.type) { case DataEventType.ADD: case DataEventType.UPDATE: await UpdatedEvent(); break; case DataEventType.DELETE: break; - default: throw new ArgumentOutOfRangeException(); + default: throw new ArgumentOutOfRangeException(nameof(dataEventModel)); } } diff --git a/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs b/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs index 4185d7c7..df578aaa 100644 --- a/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs +++ b/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; using UKSF.Api.Interfaces.Events.Handlers; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; @@ -13,37 +13,37 @@ namespace UKSF.Api.Events.Handlers { public class CommentThreadEventHandler : ICommentThreadEventHandler { + private readonly IDataEventBus commentThreadDataEventBus; private readonly ICommentThreadService commentThreadService; - private readonly ICommentThreadDataService data; private readonly IHubContext hub; private readonly ILoggingService loggingService; public CommentThreadEventHandler( - ICommentThreadDataService data, + IDataEventBus commentThreadDataEventBus, IHubContext hub, ICommentThreadService commentThreadService, ILoggingService loggingService ) { - this.data = data; + this.commentThreadDataEventBus = commentThreadDataEventBus; this.hub = hub; this.commentThreadService = commentThreadService; this.loggingService = loggingService; } public void Init() { - data.EventBus().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + commentThreadDataEventBus.AsObservable().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); } - private async Task HandleEvent(DataEventModel x) { - switch (x.type) { + private async Task HandleEvent(DataEventModel dataEventModel) { + switch (dataEventModel.type) { case DataEventType.ADD: - await AddedEvent(x.id, x.data as Comment); + await AddedEvent(dataEventModel.id, dataEventModel.data as Comment); break; case DataEventType.DELETE: - await DeletedEvent(x.id, x.data as Comment); + await DeletedEvent(dataEventModel.id, dataEventModel.data as Comment); break; case DataEventType.UPDATE: break; - default: throw new ArgumentOutOfRangeException(); + default: throw new ArgumentOutOfRangeException(nameof(dataEventModel)); } } diff --git a/UKSF.Api.Events/Handlers/LogEventHandler.cs b/UKSF.Api.Events/Handlers/LogEventHandler.cs index c04d7467..8354dfd6 100644 --- a/UKSF.Api.Events/Handlers/LogEventHandler.cs +++ b/UKSF.Api.Events/Handlers/LogEventHandler.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; using UKSF.Api.Interfaces.Events.Handlers; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; @@ -12,23 +13,23 @@ namespace UKSF.Api.Events.Handlers { public class LogEventHandler : ILogEventHandler { - private readonly ILogDataService data; + private readonly IDataEventBus logDataEventBus; private readonly IHubContext hub; private readonly ILoggingService loggingService; - public LogEventHandler(ILogDataService data, IHubContext hub, ILoggingService loggingService) { - this.data = data; + public LogEventHandler(IDataEventBus logDataEventBus, IHubContext hub, ILoggingService loggingService) { + this.logDataEventBus = logDataEventBus; this.hub = hub; this.loggingService = loggingService; } public void Init() { - data.EventBus().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + logDataEventBus.AsObservable().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); } - private async Task HandleEvent(DataEventModel x) { - if (x.type == DataEventType.ADD) { - await AddedEvent(x.data); + private async Task HandleEvent(DataEventModel dataEventModel) { + if (dataEventModel.type == DataEventType.ADD) { + await AddedEvent(dataEventModel.data); } } diff --git a/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs b/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs index a8fb26b2..02ab0a1d 100644 --- a/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs +++ b/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Events; using UKSF.Api.Interfaces.Events.Handlers; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; @@ -11,23 +11,23 @@ namespace UKSF.Api.Events.Handlers { public class NotificationsEventHandler : INotificationsEventHandler { - private readonly INotificationsDataService data; private readonly IHubContext hub; private readonly ILoggingService loggingService; + private readonly IDataEventBus notificationDataEventBus; - public NotificationsEventHandler(INotificationsDataService data, IHubContext hub, ILoggingService loggingService) { - this.data = data; + public NotificationsEventHandler(IDataEventBus notificationDataEventBus, IHubContext hub, ILoggingService loggingService) { + this.notificationDataEventBus = notificationDataEventBus; this.hub = hub; this.loggingService = loggingService; } public void Init() { - data.EventBus().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + notificationDataEventBus.AsObservable().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); } - private async Task HandleEvent(DataEventModel x) { - if (x.type == DataEventType.ADD) { - await AddedEvent(x.data as Notification); + private async Task HandleEvent(DataEventModel dataEventModel) { + if (dataEventModel.type == DataEventType.ADD) { + await AddedEvent(dataEventModel.data as Notification); } } diff --git a/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs b/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs index 09dc0c88..0a110520 100644 --- a/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs +++ b/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs @@ -43,16 +43,16 @@ public void Init() { eventBus.AsObservable().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); } - private async Task HandleEvent(SignalrEventModel x) { - switch (x.procedure) { + private async Task HandleEvent(SignalrEventModel signalrEventModel) { + switch (signalrEventModel.procedure) { case TeamspeakEventType.CLIENTS: - await UpdateClients(x.args.ToString()); + await UpdateClients(signalrEventModel.args.ToString()); break; case TeamspeakEventType.CLIENT_SERVER_GROUPS: - await UpdateClientServerGroups(x.args.ToString()); + await UpdateClientServerGroups(signalrEventModel.args.ToString()); break; case TeamspeakEventType.EMPTY: break; - default: throw new ArgumentOutOfRangeException(); + default: throw new ArgumentOutOfRangeException(nameof(signalrEventModel)); } } diff --git a/UKSF.Api.Events/UKSF.Api.Events.csproj b/UKSF.Api.Events/UKSF.Api.Events.csproj index 682b3943..c57dcdf3 100644 --- a/UKSF.Api.Events/UKSF.Api.Events.csproj +++ b/UKSF.Api.Events/UKSF.Api.Events.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + netcoreapp5.0 full @@ -14,7 +14,7 @@ - + diff --git a/UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs index aa8761bb..281736b0 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IAccountDataService : IDataService, ICachedDataService { } + public interface IAccountDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs index ed612c27..b9c9c94e 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs @@ -3,7 +3,7 @@ using UKSF.Api.Models.Modpack; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IBuildsDataService : IDataService, ICachedDataService { + public interface IBuildsDataService : IDataService, ICachedDataService { Task Update(ModpackBuild build, ModpackBuildStep buildStep); Task Update(ModpackBuild build, UpdateDefinition updateDefinition); } diff --git a/UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs index 3c08403e..260efa1c 100644 --- a/UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Command; namespace UKSF.Api.Interfaces.Data.Cached { - public interface ICommandRequestDataService : IDataService, ICachedDataService { } + public interface ICommandRequestDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs index c12f2173..92d08d53 100644 --- a/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs @@ -3,7 +3,7 @@ using UKSF.Api.Models.Message; namespace UKSF.Api.Interfaces.Data.Cached { - public interface ICommentThreadDataService : IDataService, ICachedDataService { + public interface ICommentThreadDataService : IDataService, ICachedDataService { Task Update(string id, Comment comment, DataEventType updateType); } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs index 77005326..6d491b63 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IDischargeDataService : IDataService, ICachedDataService { } + public interface IDischargeDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs index 916a0ce9..6826869b 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Game; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IGameServersDataService : IDataService, ICachedDataService { } + public interface IGameServersDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs index 795c246a..d0640468 100644 --- a/UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Launcher; namespace UKSF.Api.Interfaces.Data.Cached { - public interface ILauncherFileDataService : IDataService, ICachedDataService { } + public interface ILauncherFileDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs index ea9fc9f9..ae105f6b 100644 --- a/UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Interfaces.Data.Cached { - public interface ILoaDataService : IDataService, ICachedDataService { } + public interface ILoaDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs index 9be7d286..8c7e0bb5 100644 --- a/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Message; namespace UKSF.Api.Interfaces.Data.Cached { - public interface INotificationsDataService : IDataService, ICachedDataService { } + public interface INotificationsDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs index d4474ac1..e8f0edd1 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Operations; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IOperationOrderDataService : IDataService, ICachedDataService { } + public interface IOperationOrderDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs index a025a785..81c447a9 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Operations; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IOperationReportDataService : IDataService, ICachedDataService { } + public interface IOperationReportDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs index 91d208d0..3f769195 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs @@ -2,7 +2,7 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IRanksDataService : IDataService, ICachedDataService { + public interface IRanksDataService : IDataService, ICachedDataService { new IEnumerable Get(); new Rank GetSingle(string name); } diff --git a/UKSF.Api.Interfaces/Data/Cached/IReleasesDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IReleasesDataService.cs index a8a729c5..6084c8f3 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IReleasesDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IReleasesDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Modpack; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IReleasesDataService : IDataService, ICachedDataService { } + public interface IReleasesDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs index 73b2c9f0..5b532d90 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs @@ -2,7 +2,7 @@ using UKSF.Api.Models.Personnel; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IRolesDataService : IDataService, ICachedDataService { + public interface IRolesDataService : IDataService, ICachedDataService { new IEnumerable Get(); new Role GetSingle(string name); } diff --git a/UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs index 3052772f..4677845e 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Units; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IUnitsDataService : IDataService, ICachedDataService { } + public interface IUnitsDataService : IDataService, ICachedDataService { } } diff --git a/UKSF.Api.Interfaces/Data/Cached/IVariablesDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IVariablesDataService.cs index 3ae04a93..d83a4f37 100644 --- a/UKSF.Api.Interfaces/Data/Cached/IVariablesDataService.cs +++ b/UKSF.Api.Interfaces/Data/Cached/IVariablesDataService.cs @@ -2,7 +2,7 @@ using UKSF.Api.Models.Admin; namespace UKSF.Api.Interfaces.Data.Cached { - public interface IVariablesDataService : IDataService, ICachedDataService { + public interface IVariablesDataService : IDataService, ICachedDataService { Task Update(string key, object value); } } diff --git a/UKSF.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs b/UKSF.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs index cf55d8d4..7929ba11 100644 --- a/UKSF.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs +++ b/UKSF.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Command; namespace UKSF.Api.Interfaces.Data { - public interface ICommandRequestArchiveDataService : IDataService { } + public interface ICommandRequestArchiveDataService : IDataService { } } diff --git a/UKSF.Api.Interfaces/Data/IConfirmationCodeDataService.cs b/UKSF.Api.Interfaces/Data/IConfirmationCodeDataService.cs index fa598cca..097a1f98 100644 --- a/UKSF.Api.Interfaces/Data/IConfirmationCodeDataService.cs +++ b/UKSF.Api.Interfaces/Data/IConfirmationCodeDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Utility; namespace UKSF.Api.Interfaces.Data { - public interface IConfirmationCodeDataService : IDataService { } + public interface IConfirmationCodeDataService : IDataService { } } diff --git a/UKSF.Api.Interfaces/Data/IDataCollectionFactory.cs b/UKSF.Api.Interfaces/Data/IDataCollectionFactory.cs index 0a405a83..e3f2b5e0 100644 --- a/UKSF.Api.Interfaces/Data/IDataCollectionFactory.cs +++ b/UKSF.Api.Interfaces/Data/IDataCollectionFactory.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.Interfaces.Data { +using UKSF.Api.Models; + +namespace UKSF.Api.Interfaces.Data { public interface IDataCollectionFactory { - IDataCollection CreateDataCollection(string collectionName); + IDataCollection CreateDataCollection(string collectionName) where T : DatabaseObject; } } diff --git a/UKSF.Api.Interfaces/Data/IDataService.cs b/UKSF.Api.Interfaces/Data/IDataService.cs index f61cd128..b812cf44 100644 --- a/UKSF.Api.Interfaces/Data/IDataService.cs +++ b/UKSF.Api.Interfaces/Data/IDataService.cs @@ -3,21 +3,21 @@ using System.Linq.Expressions; using System.Threading.Tasks; using MongoDB.Driver; -using UKSF.Api.Interfaces.Events; namespace UKSF.Api.Interfaces.Data { - public interface IDataService : IDataEventBacker { + public interface IDataService { IEnumerable Get(); IEnumerable Get(Func predicate); T GetSingle(string id); T GetSingle(Func predicate); - Task Add(T data); + Task Add(T item); Task Update(string id, string fieldName, object value); Task Update(string id, UpdateDefinition update); Task Update(Expression> filterExpression, UpdateDefinition update); - Task UpdateMany(Func predicate, UpdateDefinition update); + Task UpdateMany(Expression> filterExpression, UpdateDefinition update); Task Replace(T item); Task Delete(string id); - Task DeleteMany(Func predicate); + Task Delete(T item); + Task DeleteMany(Expression> filterExpression); } } diff --git a/UKSF.Api.Interfaces/Data/ILogDataService.cs b/UKSF.Api.Interfaces/Data/ILogDataService.cs index 61383ec6..40e7d570 100644 --- a/UKSF.Api.Interfaces/Data/ILogDataService.cs +++ b/UKSF.Api.Interfaces/Data/ILogDataService.cs @@ -2,7 +2,7 @@ using UKSF.Api.Models.Message.Logging; namespace UKSF.Api.Interfaces.Data { - public interface ILogDataService : IDataService { + public interface ILogDataService : IDataService { Task Add(AuditLogMessage log); Task Add(LauncherLogMessage log); Task Add(WebLogMessage log); diff --git a/UKSF.Api.Interfaces/Data/ISchedulerDataService.cs b/UKSF.Api.Interfaces/Data/ISchedulerDataService.cs index 539bd3ee..98022728 100644 --- a/UKSF.Api.Interfaces/Data/ISchedulerDataService.cs +++ b/UKSF.Api.Interfaces/Data/ISchedulerDataService.cs @@ -1,5 +1,5 @@ using UKSF.Api.Models.Utility; namespace UKSF.Api.Interfaces.Data { - public interface ISchedulerDataService : IDataService { } + public interface ISchedulerDataService : IDataService { } } diff --git a/UKSF.Api.Interfaces/Events/IDataEventBacker.cs b/UKSF.Api.Interfaces/Events/IDataEventBacker.cs deleted file mode 100644 index e760f455..00000000 --- a/UKSF.Api.Interfaces/Events/IDataEventBacker.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using UKSF.Api.Models.Events; - -namespace UKSF.Api.Interfaces.Events { - public interface IDataEventBacker { - IObservable> EventBus(); - } -} diff --git a/UKSF.Api.Interfaces/Events/IDataEventBus.cs b/UKSF.Api.Interfaces/Events/IDataEventBus.cs index fe112db8..7e997ce8 100644 --- a/UKSF.Api.Interfaces/Events/IDataEventBus.cs +++ b/UKSF.Api.Interfaces/Events/IDataEventBus.cs @@ -1,5 +1,6 @@ +using UKSF.Api.Models; using UKSF.Api.Models.Events; namespace UKSF.Api.Interfaces.Events { - public interface IDataEventBus : IEventBus> { } + public interface IDataEventBus : IEventBus> where T : DatabaseObject { } } diff --git a/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj b/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj index caba391f..f8c80c69 100644 --- a/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj +++ b/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + netcoreapp5.0 full @@ -10,7 +10,7 @@ - + diff --git a/UKSF.Api.Models/Events/DataEventModel.cs b/UKSF.Api.Models/Events/DataEventModel.cs index c3ea60c8..54a8b81d 100644 --- a/UKSF.Api.Models/Events/DataEventModel.cs +++ b/UKSF.Api.Models/Events/DataEventModel.cs @@ -6,7 +6,7 @@ public enum DataEventType { } // ReSharper disable once UnusedTypeParameter - public class DataEventModel { + public class DataEventModel where T : DatabaseObject { public object data; public string id; public DataEventType type; diff --git a/UKSF.Api.Models/Personnel/Account.cs b/UKSF.Api.Models/Personnel/Account.cs index b70c1505..b4dc4730 100644 --- a/UKSF.Api.Models/Personnel/Account.cs +++ b/UKSF.Api.Models/Personnel/Account.cs @@ -19,7 +19,7 @@ public class Account : DatabaseObject { public string reference; public string roleAssignment; public List rolePreferences = new List(); - public ServiceRecordEntry[] serviceRecord = new ServiceRecordEntry[0]; + public List serviceRecord = new List(); public AccountSettings settings = new AccountSettings(); public string steamname; public HashSet teamspeakIdentities; diff --git a/UKSF.Api.Models/Personnel/ServiceRecord.cs b/UKSF.Api.Models/Personnel/ServiceRecord.cs index 5bd54ed8..5f4d892f 100644 --- a/UKSF.Api.Models/Personnel/ServiceRecord.cs +++ b/UKSF.Api.Models/Personnel/ServiceRecord.cs @@ -1,9 +1,25 @@ using System; namespace UKSF.Api.Models.Personnel { - public class ServiceRecordEntry { + public class ServiceRecordEntry : IEquatable { public string notes; public string occurence; public DateTime timestamp; + + public bool Equals(ServiceRecordEntry other) { + if (ReferenceEquals(null, other)) return false; + if (ReferenceEquals(this, other)) return true; + return notes == other.notes && occurence == other.occurence && timestamp.Equals(other.timestamp); + } + + public override string ToString() => $"{timestamp:dd/MM/yyyy}: {occurence}{(string.IsNullOrEmpty(notes) ? "" : $"({notes})")}"; + + public override bool Equals(object obj) { + if (ReferenceEquals(null, obj)) return false; + if (ReferenceEquals(this, obj)) return true; + return obj.GetType() == GetType() && Equals((ServiceRecordEntry) obj); + } + + public override int GetHashCode() => HashCode.Combine(notes, occurence, timestamp); } } diff --git a/UKSF.Api.Models/UKSF.Api.Models.csproj b/UKSF.Api.Models/UKSF.Api.Models.csproj index c4a0c91a..2f5ec9c9 100644 --- a/UKSF.Api.Models/UKSF.Api.Models.csproj +++ b/UKSF.Api.Models/UKSF.Api.Models.csproj @@ -1,6 +1,6 @@  - netcoreapp3.1 + netcoreapp5.0 UKSF.Api.Models UKSF.Api.Models disable @@ -10,9 +10,12 @@ true - + - + + + + diff --git a/UKSF.Api.Services/Admin/MigrationUtility.cs b/UKSF.Api.Services/Admin/MigrationUtility.cs index 59df5500..87b79684 100644 --- a/UKSF.Api.Services/Admin/MigrationUtility.cs +++ b/UKSF.Api.Services/Admin/MigrationUtility.cs @@ -89,7 +89,7 @@ private static void ExecuteMigration() { } foreach (Account accountnewAccount in newAccounts) { - accountDataService.Delete(accountnewAccount.id).Wait(); + accountDataService.Delete(accountnewAccount).Wait(); accountDataService.Add(accountnewAccount).Wait(); } } @@ -111,7 +111,7 @@ public class OldAccount : DatabaseObject { public string rank; public string reference; public string roleAssignment; - public ServiceRecordEntry[] serviceRecord = new ServiceRecordEntry[0]; + public List serviceRecord = new List(); public readonly AccountSettings settings = new AccountSettings(); public string steamname; public HashSet teamspeakIdentities; diff --git a/UKSF.Api.Services/Command/CommandRequestCompletionService.cs b/UKSF.Api.Services/Command/CommandRequestCompletionService.cs index 41c70d2d..7991583a 100644 --- a/UKSF.Api.Services/Command/CommandRequestCompletionService.cs +++ b/UKSF.Api.Services/Command/CommandRequestCompletionService.cs @@ -136,7 +136,7 @@ private async Task Discharge(CommandRequest request) { await dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.discharges, dischargeCollection.discharges)); } - await accountService.Data.Update(account.id, "membershipState", MembershipState.DISCHARGED); + await accountService.Data.Update(account.id, nameof(account.membershipState), MembershipState.DISCHARGED); Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, request.reason, "", AssignmentService.REMOVE_FLAG); notificationsService.Add(notification); diff --git a/UKSF.Api.Services/Fake/FakeCachedDataService.cs b/UKSF.Api.Services/Fake/FakeCachedDataService.cs index 5eaba547..e4055c46 100644 --- a/UKSF.Api.Services/Fake/FakeCachedDataService.cs +++ b/UKSF.Api.Services/Fake/FakeCachedDataService.cs @@ -1,5 +1,7 @@ +using UKSF.Api.Models; + namespace UKSF.Api.Services.Fake { - public class FakeCachedDataService : FakeDataService { + public class FakeCachedDataService : FakeDataService where T : DatabaseObject { public void Refresh() { } } } diff --git a/UKSF.Api.Services/Fake/FakeDataService.cs b/UKSF.Api.Services/Fake/FakeDataService.cs index ab25ca2a..57a28085 100644 --- a/UKSF.Api.Services/Fake/FakeDataService.cs +++ b/UKSF.Api.Services/Fake/FakeDataService.cs @@ -1,14 +1,13 @@ using System; using System.Collections.Generic; using System.Linq.Expressions; -using System.Reactive.Subjects; using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Models.Events; +using UKSF.Api.Models; namespace UKSF.Api.Services.Fake { - public abstract class FakeDataService : IDataService { + public abstract class FakeDataService : IDataService where T : DatabaseObject { public IEnumerable Get() => new List(); public IEnumerable Get(Func predicate) => new List(); @@ -17,7 +16,7 @@ public abstract class FakeDataService : IDataService { public T GetSingle(Func predicate) => default; - public Task Add(T data) => Task.CompletedTask; + public Task Add(T item) => Task.CompletedTask; public Task Update(string id, string fieldName, object value) => Task.CompletedTask; @@ -25,16 +24,14 @@ public abstract class FakeDataService : IDataService { public Task Update(Expression> filterExpression, UpdateDefinition update) => Task.CompletedTask; - public Task UpdateMany(Func predicate, UpdateDefinition update) => Task.CompletedTask; + public Task UpdateMany(Expression> filterExpression, UpdateDefinition update) => Task.CompletedTask; public Task Replace(T item) => Task.CompletedTask; public Task Delete(string id) => Task.CompletedTask; - public Task DeleteMany(Func predicate) => Task.CompletedTask; + public Task Delete(T item) => Task.CompletedTask; - public Task SetCollectionNameAsync(string collectionName) => Task.CompletedTask; - - public IObservable> EventBus() => new Subject>(); + public Task DeleteMany(Expression> filterExpression) => Task.CompletedTask; } } diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs index 579f2552..9f11e524 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -80,7 +80,7 @@ public async Task CacheInstagramImages() { images = newImages.Take(12).ToList(); foreach (InstagramImage instagramImage in images) { - instagramImage.base64 = await instagramImage.AsBase64(); + instagramImage.base64 = await GetBase64(instagramImage); } } catch (Exception exception) { LogWrapper.Log(exception); @@ -88,5 +88,11 @@ public async Task CacheInstagramImages() { } public IEnumerable GetImages() => images; + + private static async Task GetBase64(InstagramImage image) { + using HttpClient client = new HttpClient(); + byte[] bytes = await client.GetByteArrayAsync(image.mediaUrl); + return "data:image/jpeg;base64," + Convert.ToBase64String(bytes); + } } } diff --git a/UKSF.Api.Services/Launcher/LauncherFileService.cs b/UKSF.Api.Services/Launcher/LauncherFileService.cs index 0516154c..14520102 100644 --- a/UKSF.Api.Services/Launcher/LauncherFileService.cs +++ b/UKSF.Api.Services/Launcher/LauncherFileService.cs @@ -37,7 +37,7 @@ public async Task UpdateAllVersions() { } foreach (LauncherFile storedVersion in storedVersions.Where(storedVersion => fileNames.All(x => x != storedVersion.fileName))) { - await Data.Delete(storedVersion.id); + await Data.Delete(storedVersion); } } diff --git a/UKSF.Api.Services/UKSF.Api.Services.csproj b/UKSF.Api.Services/UKSF.Api.Services.csproj index 470af3b5..e0f9b021 100644 --- a/UKSF.Api.Services/UKSF.Api.Services.csproj +++ b/UKSF.Api.Services/UKSF.Api.Services.csproj @@ -1,6 +1,6 @@  - netcoreapp3.1 + netcoreapp5.0 UKSF.Api.Services UKSF.Api.Services disable @@ -10,24 +10,23 @@ true - - - + + + - - - - + + + - - - - + + + + - + diff --git a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs index ce56cf74..33685356 100644 --- a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs +++ b/UKSF.Api.Services/Utility/ConfirmationCodeService.cs @@ -24,7 +24,7 @@ public async Task CreateConfirmationCode(string value) { public async Task GetConfirmationCode(string id) { ConfirmationCode confirmationCode = Data.GetSingle(id); if (confirmationCode == null) return string.Empty; - await Data.Delete(confirmationCode.id); + await Data.Delete(confirmationCode); string actionParameters = JsonConvert.SerializeObject(new object[] { confirmationCode.id }); await schedulerService.Cancel(x => x.actionParameters == actionParameters); return confirmationCode.value; @@ -36,7 +36,7 @@ public async Task ClearConfirmationCodes(Func predicate) string actionParameters = JsonConvert.SerializeObject(new object[] { confirmationCode.id }); await schedulerService.Cancel(x => x.actionParameters == actionParameters); } - await Data.DeleteMany(predicate); + await Data.DeleteMany(x => predicate(x)); } } } diff --git a/UKSF.Api.Services/Utility/SchedulerService.cs b/UKSF.Api.Services/Utility/SchedulerService.cs index d1d9a0da..3c5c9540 100644 --- a/UKSF.Api.Services/Utility/SchedulerService.cs +++ b/UKSF.Api.Services/Utility/SchedulerService.cs @@ -42,7 +42,7 @@ public async Task Cancel(Func predicate) { ACTIVE_TASKS.TryRemove(job.id, out CancellationTokenSource _); } - await Data.Delete(job.id); + await Data.Delete(job); } private async Task Create(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { @@ -89,7 +89,7 @@ private void Schedule(ScheduledJob job) { await SetNext(job); Schedule(job); } else { - await Data.Delete(job.id); + await Data.Delete(job); ACTIVE_TASKS.TryRemove(job.id, out CancellationTokenSource _); } }, diff --git a/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs b/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs index c90b48fe..a6634167 100644 --- a/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs +++ b/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs @@ -3,8 +3,8 @@ using Microsoft.AspNetCore.SignalR; using UKSF.Api.Interfaces.Events; using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Models.Events; using UKSF.Api.Models.Events.Types; -using UKSF.Common; namespace UKSF.Api.Signalr.Hubs.Integrations { public static class TeamspeakHubState { @@ -19,7 +19,7 @@ public class TeamspeakHub : Hub { // ReSharper disable once UnusedMember.Global public void Invoke(int procedure, object args) { - eventBus.Send(EventModelFactory.CreateSignalrEvent((TeamspeakEventType) procedure, args)); + eventBus.Send(new SignalrEventModel {procedure = (TeamspeakEventType) procedure, args = args}); } public override Task OnConnectedAsync() { diff --git a/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj b/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj index e7500e83..11c480ec 100644 --- a/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj +++ b/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + netcoreapp5.0 diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index f85360de..4fa687b2 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -417,12 +417,17 @@ True C:\Storage\UKSF\Website\UKSF.Api.Backend\UKSF.Api.Models\UKSF.Api.Models.csproj.DotSettings ..\UKSF.Api.Models\UKSF.Api.Models.csproj.DotSettings + True + E:\Workspace\UKSF\api\UKSF.Tests\UKSF.Tests.csproj.DotSettings + ..\UKSF.Tests\UKSF.Tests.csproj.DotSettings True 0.5 + True + 1.5 diff --git a/UKSF.Api/AppStart/Services/RegisterEventServices.cs b/UKSF.Api/AppStart/Services/RegisterEventServices.cs index e045ff7c..7bf4bc36 100644 --- a/UKSF.Api/AppStart/Services/RegisterEventServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterEventServices.cs @@ -3,35 +3,43 @@ using UKSF.Api.Events.Data; using UKSF.Api.Events.Handlers; using UKSF.Api.Events.SignalrServer; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Interfaces.Events.Handlers; +using UKSF.Api.Models.Admin; +using UKSF.Api.Models.Command; +using UKSF.Api.Models.Game; +using UKSF.Api.Models.Launcher; +using UKSF.Api.Models.Message; +using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Models.Modpack; +using UKSF.Api.Models.Operations; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; +using UKSF.Api.Models.Utility; namespace UKSF.Api.AppStart.Services { public static class EventServiceExtensions { public static void RegisterEventServices(this IServiceCollection services) { // Event Buses - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); services.AddSingleton(); // Event Handlers diff --git a/UKSF.Api/AppStart/Services/ServiceExtensions.cs b/UKSF.Api/AppStart/Services/ServiceExtensions.cs index 33ba7f9a..cbe09571 100644 --- a/UKSF.Api/AppStart/Services/ServiceExtensions.cs +++ b/UKSF.Api/AppStart/Services/ServiceExtensions.cs @@ -30,6 +30,7 @@ using UKSF.Api.Services.Modpack.BuildProcess; using UKSF.Api.Services.Personnel; using UKSF.Api.Services.Utility; +using UKSF.Common; namespace UKSF.Api.AppStart.Services { public static class ServiceExtensions { @@ -39,6 +40,7 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddSingleton(currentEnvironment); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); // Data common services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); diff --git a/UKSF.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs index e28a4f90..d94068ea 100644 --- a/UKSF.Api/Controllers/LoaController.cs +++ b/UKSF.Api/Controllers/LoaController.cs @@ -97,7 +97,7 @@ public async Task DeleteLoa(string id) { Loa loa = loaService.Data.GetSingle(id); CommandRequest request = commandRequestService.Data.GetSingle(x => x.value == id); if (request != null) { - await commandRequestService.Data.Delete(request.id); + await commandRequestService.Data.Delete(request); foreach (string reviewerId in request.reviews.Keys.Where(x => x != request.requester)) { notificationsService.Add(new Notification {owner = reviewerId, icon = NotificationIcons.REQUEST, message = $"Your review for {request.displayRequester}'s LOA is no longer required as they deleted their LOA", link = "/command/requests"}); } @@ -106,7 +106,7 @@ public async Task DeleteLoa(string id) { } LogWrapper.AuditLog($"Loa deleted for '{displayNameService.GetDisplayName(accountService.Data.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); - await loaService.Data.Delete(loa.id); + await loaService.Data.Delete(loa); return Ok(); } diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index a67f59e7..9a3721b5 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -1,6 +1,6 @@  - netcoreapp3.1 + netcoreapp5.0 win7-x64 UKSF.Api Exe @@ -21,18 +21,18 @@ - + - - - - - - - + + + + + + + - - + + diff --git a/UKSF.Common/CertificateUtilities.cs b/UKSF.Common/CertificateUtilities.cs deleted file mode 100644 index 10c5ae49..00000000 --- a/UKSF.Common/CertificateUtilities.cs +++ /dev/null @@ -1,230 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using System.Security.Cryptography; -using System.Security.Cryptography.X509Certificates; - -namespace UKSF.Common { - // Credit: https://stackoverflow.com/a/26372061/2516910 - public static class CertificateUtilities { - [DllImport("Mssign32.dll", CharSet = CharSet.Unicode, SetLastError = true)] - private static extern int SignerSign( - IntPtr pSubjectInfo, // SIGNER_SUBJECT_INFO - IntPtr pSignerCert, // SIGNER_CERT - IntPtr pSignatureInfo, // SIGNER_SIGNATURE_INFO - IntPtr pProviderInfo, // SIGNER_PROVIDER_INFO - string pwszHttpTimeStamp, // LPCWSTR - IntPtr psRequest, // PCRYPT_ATTRIBUTES - IntPtr pSipData // LPVOID - ); - - [DllImport("Mssign32.dll", CharSet = CharSet.Unicode, SetLastError = true)] - private static extern int SignerTimeStamp( - IntPtr pSubjectInfo, // SIGNER_SUBJECT_INFO - string pwszHttpTimeStamp, // LPCWSTR - IntPtr psRequest, // PCRYPT_ATTRIBUTES - IntPtr pSipData // LPVOID - ); - - [DllImport("Crypt32.dll", EntryPoint = "CertCreateCertificateContext", SetLastError = true, CharSet = CharSet.Unicode, ExactSpelling = false, CallingConvention = CallingConvention.StdCall)] - private static extern IntPtr CertCreateCertificateContext(int dwCertEncodingType, byte[] pbCertEncoded, int cbCertEncoded); - - public static void SignWithThumbprint(string appPath, string thumbprint, string timestampUrl = "") { - IntPtr pSignerCert = IntPtr.Zero; - IntPtr pSubjectInfo = IntPtr.Zero; - IntPtr pSignatureInfo = IntPtr.Zero; - IntPtr pProviderInfo = IntPtr.Zero; - - try { - pSignerCert = CreateSignerCert(thumbprint); - pSubjectInfo = CreateSignerSubjectInfo(appPath); - pSignatureInfo = CreateSignerSignatureInfo(); - - SignCode(pSubjectInfo, pSignerCert, pSignatureInfo, pProviderInfo); - - if (!string.IsNullOrEmpty(timestampUrl)) { - TimeStampSignedCode(pSubjectInfo, timestampUrl); - } - } catch (CryptographicException ce) { - throw new Exception($"An error occurred while attempting to load the signing certificate. {ce.Message}"); - } finally { - if (pSignerCert != IntPtr.Zero) { - Marshal.DestroyStructure(pSignerCert, typeof(SignerCert)); - } - - if (pSubjectInfo != IntPtr.Zero) { - Marshal.DestroyStructure(pSubjectInfo, typeof(SignerSubjectInfo)); - } - - if (pSignatureInfo != IntPtr.Zero) { - Marshal.DestroyStructure(pSignatureInfo, typeof(SignerSignatureInfo)); - } - } - } - - private static IntPtr CreateSignerSubjectInfo(string pathToAssembly) { - SignerSubjectInfo info = new SignerSubjectInfo { cbSize = (uint) Marshal.SizeOf(typeof(SignerSubjectInfo)), pdwIndex = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(uint))) }; - int index = 0; - Marshal.StructureToPtr(index, info.pdwIndex, false); - - info.dwSubjectChoice = 0x1; //SIGNER_SUBJECT_FILE - IntPtr assemblyFilePtr = Marshal.StringToHGlobalUni(pathToAssembly); - - SignerFileInfo fileInfo = new SignerFileInfo { cbSize = (uint) Marshal.SizeOf(typeof(SignerFileInfo)), pwszFileName = assemblyFilePtr, hFile = IntPtr.Zero }; - - info.Union1 = new SignerSubjectInfo.SubjectChoiceUnion { pSignerFileInfo = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(SignerFileInfo))) }; - - Marshal.StructureToPtr(fileInfo, info.Union1.pSignerFileInfo, false); - - IntPtr pSubjectInfo = Marshal.AllocHGlobal(Marshal.SizeOf(info)); - Marshal.StructureToPtr(info, pSubjectInfo, false); - - return pSubjectInfo; - } - - private static X509Certificate2 FindCertByThumbprint(string thumbprint) { - try { - string thumbprintFixed = thumbprint.Replace(" ", string.Empty).ToUpperInvariant(); - - X509Store[] stores = { - new X509Store(StoreName.My, StoreLocation.CurrentUser), - new X509Store(StoreName.My, StoreLocation.LocalMachine), - new X509Store(StoreName.TrustedPublisher, StoreLocation.CurrentUser), - new X509Store(StoreName.TrustedPublisher, StoreLocation.LocalMachine) - }; - - foreach (X509Store store in stores) { - store.Open(OpenFlags.ReadOnly); - X509Certificate2Collection certs = store.Certificates.Find(X509FindType.FindByThumbprint, thumbprintFixed, false); - store.Close(); - - if (certs.Count < 1) { - continue; - } - - return certs[0]; - } - - throw new Exception($"A certificate matching the thumbprint: {thumbprint} could not be found. Make sure that a valid certificate matching the provided thumbprint is installed."); - } catch (Exception e) { - throw new Exception($"{e.Message}"); - } - } - - private static IntPtr CreateSignerCert(string thumbprint) { - SignerCert signerCert = new SignerCert { - cbSize = (uint) Marshal.SizeOf(typeof(SignerCert)), - dwCertChoice = 0x2, - Union1 = new SignerCert.SignerCertUnion { pCertStoreInfo = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(SignerCertStoreInfo))) }, - hwnd = IntPtr.Zero - }; - - const int X509_ASN_ENCODING = 0x00000001; - const int PKCS_7_ASN_ENCODING = 0x00010000; - - X509Certificate2 cert = FindCertByThumbprint(thumbprint); - - IntPtr pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, cert.GetRawCertData(), cert.GetRawCertData().Length); - - SignerCertStoreInfo certStoreInfo = new SignerCertStoreInfo { - cbSize = (uint) Marshal.SizeOf(typeof(SignerCertStoreInfo)), - pSigningCert = pCertContext, - dwCertPolicy = 0x2, // SIGNER_CERT_POLICY_CHAIN - hCertStore = IntPtr.Zero - }; - - Marshal.StructureToPtr(certStoreInfo, signerCert.Union1.pCertStoreInfo, false); - - IntPtr pSignerCert = Marshal.AllocHGlobal(Marshal.SizeOf(signerCert)); - Marshal.StructureToPtr(signerCert, pSignerCert, false); - - return pSignerCert; - } - - private static IntPtr CreateSignerSignatureInfo() { - SignerSignatureInfo signatureInfo = new SignerSignatureInfo { - cbSize = (uint) Marshal.SizeOf(typeof(SignerSignatureInfo)), - algidHash = 0x00008004, // CALG_SHA1 - dwAttrChoice = 0x0, // SIGNER_NO_ATTR - pAttrAuthCode = IntPtr.Zero, - psAuthenticated = IntPtr.Zero, - psUnauthenticated = IntPtr.Zero - }; - - IntPtr pSignatureInfo = Marshal.AllocHGlobal(Marshal.SizeOf(signatureInfo)); - Marshal.StructureToPtr(signatureInfo, pSignatureInfo, false); - - return pSignatureInfo; - } - - private static void SignCode(IntPtr pSubjectInfo, IntPtr pSignerCert, IntPtr pSignatureInfo, IntPtr pProviderInfo) { - int hResult = SignerSign(pSubjectInfo, pSignerCert, pSignatureInfo, pProviderInfo, null, IntPtr.Zero, IntPtr.Zero); - - if (hResult != 0) { - Marshal.ThrowExceptionForHR(Marshal.GetHRForLastWin32Error()); - } - } - - private static void TimeStampSignedCode(IntPtr pSubjectInfo, string timestampUrl) { - int hResult = SignerTimeStamp(pSubjectInfo, timestampUrl, IntPtr.Zero, IntPtr.Zero); - - if (hResult != 0) { - throw new Exception($"{timestampUrl} could not be used at this time. If necessary, check the timestampUrl, internet connection, and try again."); - } - } - - [StructLayout(LayoutKind.Sequential)] - private struct SignerSubjectInfo { - public uint cbSize; - public IntPtr pdwIndex; - public uint dwSubjectChoice; - public SubjectChoiceUnion Union1; - - [StructLayoutAttribute(LayoutKind.Explicit)] - internal struct SubjectChoiceUnion { - [FieldOffsetAttribute(0)] public IntPtr pSignerFileInfo; - [FieldOffsetAttribute(0)] public readonly IntPtr pSignerBlobInfo; - } - } - - [StructLayoutAttribute(LayoutKind.Sequential)] - private struct SignerCert { - public uint cbSize; - public uint dwCertChoice; - public SignerCertUnion Union1; - - [StructLayoutAttribute(LayoutKind.Explicit)] - internal struct SignerCertUnion { - [FieldOffsetAttribute(0)] public readonly IntPtr pwszSpcFile; - [FieldOffsetAttribute(0)] public IntPtr pCertStoreInfo; - [FieldOffsetAttribute(0)] public readonly IntPtr pSpcChainInfo; - } - - public IntPtr hwnd; - } - - [StructLayoutAttribute(LayoutKind.Sequential)] - private struct SignerSignatureInfo { - public uint cbSize; - public uint algidHash; // ALG_ID - public uint dwAttrChoice; - public IntPtr pAttrAuthCode; - public IntPtr psAuthenticated; // PCRYPT_ATTRIBUTES - public IntPtr psUnauthenticated; // PCRYPT_ATTRIBUTES - } - - [StructLayoutAttribute(LayoutKind.Sequential)] - private struct SignerFileInfo { - public uint cbSize; - public IntPtr pwszFileName; - public IntPtr hFile; - } - - [StructLayoutAttribute(LayoutKind.Sequential)] - private struct SignerCertStoreInfo { - public uint cbSize; - public IntPtr pSigningCert; // CERT_CONTEXT - public uint dwCertPolicy; - public IntPtr hCertStore; - } - } -} diff --git a/UKSF.Common/ChangeUtilities.cs b/UKSF.Common/ChangeUtilities.cs index 928952bb..cced9a4a 100644 --- a/UKSF.Common/ChangeUtilities.cs +++ b/UKSF.Common/ChangeUtilities.cs @@ -1,109 +1,107 @@ +using System; +using System.Collections; using System.Collections.Generic; using System.Linq; using System.Reflection; -using System.Text; -using MongoDB.Bson.Serialization.Attributes; using Newtonsoft.Json.Linq; namespace UKSF.Common { public static class ChangeUtilities { - public static string Changes(this T original, T updated) { - List fields = typeof(T).GetFields(BindingFlags.Public | BindingFlags.Instance).Where(x => !x.IsDefined(typeof(BsonIgnoreAttribute))).ToList(); - IEnumerable changes = FindChanges(JToken.FromObject(original), JToken.FromObject(updated), fields); - return changes.Aggregate( - string.Empty, - (a, b) => { - if (b.Original == null && b.Updated != null) { - return $"{a}\n\t{b.Name} added: '{b.Updated}'"; - } + public static string Changes(this T original, T updated) => DeepEquals(original, updated) ? "" : FormatChanges(GetChanges(original, updated)); - if (b.Original != null && b.Updated == null) { - return $"{a}\n\t{b.Name} removed: '{b.Original}'"; + private static List GetChanges(this T original, T updated) { + List changes = new List(); + Type type = original.GetType(); + foreach (FieldInfo fieldInfo in type.GetFields()) { + string name = fieldInfo.Name; + object originalValue = fieldInfo.GetValue(original); + object updatedValue = fieldInfo.GetValue(updated); + if (originalValue == null && updatedValue == null) continue; + if (DeepEquals(originalValue, updatedValue)) continue; + + if (fieldInfo.FieldType.IsClass && !fieldInfo.FieldType.IsSerializable) { + // Class, recurse + changes.Add(new Change { Type = ChangeType.CLASS, Name = name, InnerChanges = GetChanges(originalValue, updatedValue) }); + } else if (fieldInfo.FieldType != typeof(string) && updatedValue is IEnumerable originalListValue && originalValue is IEnumerable updatedListValue) { + // List, get list changes + changes.Add(new Change { Type = ChangeType.LIST, Name = name, InnerChanges = GetListChanges(originalListValue, updatedListValue) }); + } else { + // Assume otherwise normal field + if (originalValue == null) { + changes.Add(new Change { Type = ChangeType.ADDITION, Name = name, Updated = updatedValue.ToString() }); + } else if (updatedValue == null) { + changes.Add(new Change { Type = ChangeType.REMOVAL, Name = name, Original = originalValue.ToString() }); + } else { + changes.Add(new Change { Type = ChangeType.CHANGE, Name = name, Original = originalValue.ToString(), Updated = updatedValue.ToString() }); } - -// if (b.Original is IEnumerable && b.Updated is IEnumerable) { -// string listChanges = ((IEnumerable) b.Original).Select(x => x.ToString()).Changes(((IEnumerable) b.Updated).Select(x => x.ToString())); -// return string.IsNullOrEmpty(listChanges) ? string.Empty : $"{a}\n\t{b.Name} changed:\n{listChanges}"; -// } - - return !Equals(b.Original, b.Updated) ? $"{a}\n\t'{b.Name}' changed: '{b.Original}' to '{b.Updated}'" : ""; } - ); - } - - public static string Changes(this IEnumerable original, IEnumerable updated) { - StringBuilder changes = new StringBuilder(); - List updatedList = updated.ToList(); - foreach (string addition in updatedList.Where(x => !original.Contains(x))) { - changes.Append($"\n\tAdded: '{addition}'"); - } - - foreach (string removal in original.Where(x => !updatedList.Contains(x))) { - changes.Append($"\n\tRemoved: '{removal}'"); - } - - if (changes.Length == 0) { - changes.Append("\tNo changes"); } - return changes.ToString(); + return changes; } -// private static IEnumerable FindChanges(this T original, T updated) { -// IEnumerable fields = typeof(T).GetFields(BindingFlags.Public | BindingFlags.Instance).Where(x => !x.IsDefined(typeof(BsonIgnoreAttribute))); -// return fields.Select(fieldInfo => new {fieldInfo, originalValue = fieldInfo.GetValue(original), updatedValue = fieldInfo.GetValue(updated)}) -// .Where(x => !Equals(x.originalValue, x.updatedValue)) -// .Select(x => new Change {Name = x.fieldInfo.Name, Original = x.originalValue, Updated = x.updatedValue}) -// .ToList(); -// } - - private static IEnumerable FindChanges(this JToken original, JToken updated, IReadOnlyCollection allowedFields) { - List changes = new List(); - if (JToken.DeepEquals(original, updated)) return changes; + private static List GetListChanges(this IEnumerable original, IEnumerable updated) { + List originalObjects = original == null ? new List() : original.Cast().ToList(); + List updatedObjects = updated == null ? new List() : updated.Cast().ToList(); + List changes = originalObjects.Where(x => !updatedObjects.Contains(x)).Select(x => new Change { Type = ChangeType.ADDITION, Updated = x.ToString() }).ToList(); + changes.AddRange(updatedObjects.Where(x => !originalObjects.Contains(x)).Select(x => new Change { Type = ChangeType.REMOVAL, Original = x.ToString() })); + return changes; + } - // ReSharper disable once ConvertIfStatementToSwitchStatement - if (original.Type == JTokenType.Object) { - JObject originalObject = original as JObject; - JObject updatedObject = updated as JObject; - originalObject ??= new JObject(); - updatedObject ??= new JObject(); + private static bool DeepEquals(object original, object updated) { + if (original == null && updated == null) return true; + if (original == null || updated == null) return false; - List added = updatedObject.Properties().Select(c => c.Name).Except(originalObject.Properties().Select(c => c.Name)).ToList(); - List removed = originalObject.Properties().Select(c => c.Name).Except(updatedObject.Properties().Select(c => c.Name)).ToList(); - List unchanged = originalObject.Properties().Where(c => JToken.DeepEquals(c.Value, updated[c.Name])).Select(c => c.Name).ToList(); - List changed = originalObject.Properties().Select(c => c.Name).Except(added).Except(unchanged).ToList(); + JToken originalObject = JToken.FromObject(original); + JToken updatedObject = JToken.FromObject(updated); + return JToken.DeepEquals(originalObject, updatedObject); + } - changes.AddRange( - added.Where(x => allowedFields.Any(y => y.Name == x)) - .Select(key => updatedObject.Properties().First(x => x.Name == key)) - .Select(addedObject => new Change { Name = addedObject.Name, Original = null, Updated = addedObject.Value.Value() }) - ); - changes.AddRange( - removed.Where(x => allowedFields.Any(y => y.Name == x)) - .Select(key => originalObject.Properties().First(x => x.Name == key)) - .Select(removedObject => new Change { Name = removedObject.Name, Original = removedObject.Value.Value(), Updated = null }) - ); + private static string FormatChanges(IEnumerable changes, string indentation = "") { + return changes.OrderBy(x => x.Type) + .ThenBy(x => x.Name) + .Aggregate( + "", + (current, change) => current + + $"\n\t{indentation}'{change.Name}'" + + " " + + change.Type switch { + ChangeType.ADDITION => $"added as '{change.Updated}'", + ChangeType.REMOVAL => $"as '{change.Original}' removed", + ChangeType.CLASS => $"changed:{FormatChanges(change.InnerChanges, indentation + "\t")}", + ChangeType.LIST => $"changed:{FormatListChanges(change.InnerChanges, indentation + "\t")}", + _ => $"changed from '{change.Original}' to '{change.Updated}'" + } + ); + } - foreach (string key in changed.Where(x => allowedFields.Any(y => y.Name == x))) { - JToken originalChangedObject = originalObject[key]; - JToken updatedChangedObject = updatedObject[key]; - changes.AddRange(FindChanges(originalChangedObject, updatedChangedObject, allowedFields)); + private static string FormatListChanges(IEnumerable changes, string indentation = "") { + string changesString = ""; + foreach (Change change in changes.OrderBy(x => x.Type).ThenBy(x => x.Name)) { + if (change.Type == ChangeType.ADDITION) { + changesString += $"\n\t{indentation}added: '{change.Updated}'"; + } else if (change.Type == ChangeType.REMOVAL) { + changesString += $"\n\t{indentation}removed: '{change.Original}'"; } - } else if (original.Type == JTokenType.Array) { - string originalString = original.ToObject>().Aggregate(string.Empty, (a, b) => $"{a}, {b}"); - string updatedString = updated.ToObject>().Aggregate(string.Empty, (a, b) => $"{a}, {b}"); - changes.Add(new Change {Name = ((JProperty) updated.Parent).Name, Original = originalString, Updated = updatedString}); - } else { - changes.Add(new Change {Name = ((JProperty) updated.Parent).Name, Original = original.Value(), Updated = updated.Value()}); } - return changes; + return changesString; } } public class Change { + public List InnerChanges = new List(); public string Name; public string Original; + public ChangeType Type; public string Updated; } + + public enum ChangeType { + ADDITION, + CHANGE, + LIST, + REMOVAL, + CLASS + } } diff --git a/UKSF.Common/Clock.cs b/UKSF.Common/Clock.cs new file mode 100644 index 00000000..66ed492a --- /dev/null +++ b/UKSF.Common/Clock.cs @@ -0,0 +1,15 @@ +using System; + +namespace UKSF.Common { + public interface IClock { + public DateTime Now(); + public DateTime Today(); + public DateTime UtcNow(); + } + + public class Clock : IClock { + public DateTime Now() => DateTime.Now; + public DateTime Today() => DateTime.Today; + public DateTime UtcNow() => DateTime.UtcNow; + } +} diff --git a/UKSF.Common/DataUtilies.cs b/UKSF.Common/DataUtilies.cs index dba3f488..437f2f15 100644 --- a/UKSF.Common/DataUtilies.cs +++ b/UKSF.Common/DataUtilies.cs @@ -1,14 +1,7 @@ -using System.Reflection; -using Newtonsoft.Json.Linq; +using Newtonsoft.Json.Linq; namespace UKSF.Common { public static class DataUtilies { - public static string GetIdValue(this T data) { - FieldInfo id = data.GetType().GetField("id"); - if (id == null) return ""; - return id.GetValue(data) as string; - } - public static string GetValueFromBody(this JObject body, string key) => body[key] != null ? body[key].ToString() : string.Empty; } } diff --git a/UKSF.Common/EventModelFactory.cs b/UKSF.Common/EventModelFactory.cs deleted file mode 100644 index d612eef8..00000000 --- a/UKSF.Common/EventModelFactory.cs +++ /dev/null @@ -1,9 +0,0 @@ -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Events.Types; - -namespace UKSF.Common { - public static class EventModelFactory { - public static DataEventModel CreateDataEvent(DataEventType type, string id, object data = null) => new DataEventModel {type = type, id = id, data = data}; - public static SignalrEventModel CreateSignalrEvent(TeamspeakEventType procedure, object args) => new SignalrEventModel {procedure = procedure, args = args}; - } -} diff --git a/UKSF.Common/InstagramExtensions.cs b/UKSF.Common/InstagramExtensions.cs deleted file mode 100644 index 8cb99872..00000000 --- a/UKSF.Common/InstagramExtensions.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Net.Http; -using System.Threading.Tasks; -using UKSF.Api.Models.Integrations; - -namespace UKSF.Common { - public static class InstagramExtensions { - public static async Task AsBase64(this InstagramImage image) { - using HttpClient client = new HttpClient(); - byte[] bytes = await client.GetByteArrayAsync(image.mediaUrl); - return "data:image/jpeg;base64," + Convert.ToBase64String(bytes); - } - } -} diff --git a/UKSF.Common/UKSF.Common.csproj b/UKSF.Common/UKSF.Common.csproj index d726ecb8..7c02612d 100644 --- a/UKSF.Common/UKSF.Common.csproj +++ b/UKSF.Common/UKSF.Common.csproj @@ -1,14 +1,14 @@  - netcoreapp3.1 + netcoreapp5.0 - + - - + + @@ -17,8 +17,4 @@ - - - - diff --git a/UKSF.PostMessage/UKSF.PostMessage.csproj b/UKSF.PostMessage/UKSF.PostMessage.csproj index f517aabf..887a7885 100644 --- a/UKSF.PostMessage/UKSF.PostMessage.csproj +++ b/UKSF.PostMessage/UKSF.PostMessage.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + netcoreapp5.0 UKSF.PostMessage diff --git a/UKSF.Tests/Common/IMockCachedDataService.cs b/UKSF.Tests/Common/IMockCachedDataService.cs deleted file mode 100644 index b68d5b64..00000000 --- a/UKSF.Tests/Common/IMockCachedDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Interfaces.Data; - -namespace UKSF.Tests.Unit.Common { - public interface IMockCachedDataService : IDataService { } -} diff --git a/UKSF.Tests/Common/IMockDataService.cs b/UKSF.Tests/Common/IMockDataService.cs deleted file mode 100644 index 8c87beba..00000000 --- a/UKSF.Tests/Common/IMockDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Interfaces.Data; - -namespace UKSF.Tests.Unit.Common { - public interface IMockDataService : IDataService { } -} diff --git a/UKSF.Tests/Common/ITestCachedDataService.cs b/UKSF.Tests/Common/ITestCachedDataService.cs new file mode 100644 index 00000000..b8749408 --- /dev/null +++ b/UKSF.Tests/Common/ITestCachedDataService.cs @@ -0,0 +1,5 @@ +using UKSF.Api.Interfaces.Data; + +namespace UKSF.Tests.Common { + public interface ITestCachedDataService : IDataService { } +} diff --git a/UKSF.Tests/Common/ITestDataService.cs b/UKSF.Tests/Common/ITestDataService.cs new file mode 100644 index 00000000..f3acc3b4 --- /dev/null +++ b/UKSF.Tests/Common/ITestDataService.cs @@ -0,0 +1,5 @@ +using UKSF.Api.Interfaces.Data; + +namespace UKSF.Tests.Common { + public interface ITestDataService : IDataService { } +} diff --git a/UKSF.Tests/Common/MockCachedDataService.cs b/UKSF.Tests/Common/MockCachedDataService.cs deleted file mode 100644 index 5416ac21..00000000 --- a/UKSF.Tests/Common/MockCachedDataService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using UKSF.Api.Data; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; - -namespace UKSF.Tests.Unit.Common { - public class MockCachedDataService : CachedDataService, IMockCachedDataService { - public MockCachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } - } -} diff --git a/UKSF.Tests/Common/MockComplexDataModel.cs b/UKSF.Tests/Common/MockComplexDataModel.cs deleted file mode 100644 index efd2df2e..00000000 --- a/UKSF.Tests/Common/MockComplexDataModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections.Generic; - -namespace UKSF.Tests.Unit.Common { - public class MockComplexDataModel : MockDataModel { - public MockDataModel Data; - public List List; - public List DataList; - } -} diff --git a/UKSF.Tests/Common/MockDataModel.cs b/UKSF.Tests/Common/MockDataModel.cs deleted file mode 100644 index ab2117de..00000000 --- a/UKSF.Tests/Common/MockDataModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections.Generic; -using UKSF.Api.Models; - -namespace UKSF.Tests.Unit.Common { - public class MockDataModel : DatabaseObject { - public string Name; - public List Stuff; - } -} diff --git a/UKSF.Tests/Common/MockDataService.cs b/UKSF.Tests/Common/MockDataService.cs deleted file mode 100644 index 04c218d7..00000000 --- a/UKSF.Tests/Common/MockDataService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using UKSF.Api.Data; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; - -namespace UKSF.Tests.Unit.Common { - public class MockDataService : DataService, IMockDataService { - public MockDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } - } -} diff --git a/UKSF.Tests/Common/TestCachedDataService.cs b/UKSF.Tests/Common/TestCachedDataService.cs new file mode 100644 index 00000000..5c5c90a9 --- /dev/null +++ b/UKSF.Tests/Common/TestCachedDataService.cs @@ -0,0 +1,9 @@ +using UKSF.Api.Data; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; + +namespace UKSF.Tests.Common { + public class TestCachedDataService : CachedDataService, ITestCachedDataService { + public TestCachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } + } +} diff --git a/UKSF.Tests/Common/TestComplexDataModel.cs b/UKSF.Tests/Common/TestComplexDataModel.cs new file mode 100644 index 00000000..a2db41b7 --- /dev/null +++ b/UKSF.Tests/Common/TestComplexDataModel.cs @@ -0,0 +1,9 @@ +using System.Collections.Generic; + +namespace UKSF.Tests.Common { + public class TestComplexDataModel : TestDataModel { + public TestDataModel Data; + public List List; + public List DataList; + } +} diff --git a/UKSF.Tests/Common/TestDataModel.cs b/UKSF.Tests/Common/TestDataModel.cs new file mode 100644 index 00000000..6af7a1ae --- /dev/null +++ b/UKSF.Tests/Common/TestDataModel.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; +using UKSF.Api.Models; + +namespace UKSF.Tests.Common { + public class TestDataModel : DatabaseObject { + public string Name; + public List Stuff; + public Dictionary Dictionary = new Dictionary(); + } +} diff --git a/UKSF.Tests/Common/TestDataService.cs b/UKSF.Tests/Common/TestDataService.cs new file mode 100644 index 00000000..9cbb623a --- /dev/null +++ b/UKSF.Tests/Common/TestDataService.cs @@ -0,0 +1,9 @@ +using UKSF.Api.Data; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; + +namespace UKSF.Tests.Common { + public class TestDataService : DataService, ITestDataService { + public TestDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } + } +} diff --git a/UKSF.Tests/Common/TestUtilities.cs b/UKSF.Tests/Common/TestUtilities.cs index eb71c157..312ef5b7 100644 --- a/UKSF.Tests/Common/TestUtilities.cs +++ b/UKSF.Tests/Common/TestUtilities.cs @@ -2,8 +2,9 @@ using MongoDB.Bson.Serialization; using MongoDB.Driver; -namespace UKSF.Tests.Unit.Common { +namespace UKSF.Tests.Common { public static class TestUtilities { - public static BsonValue Render(UpdateDefinition updateDefinition) => updateDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); + public static BsonValue RenderUpdate(UpdateDefinition updateDefinition) => updateDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); + public static BsonValue RenderFilter(FilterDefinition filterDefinition) => filterDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); } } diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index be6a996d..bd649b99 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -9,7 +9,7 @@ using UKSF.Api.Data; using UKSF.Api.Models.Personnel; using UKSF.Api.Services.Utility; -using UKSF.Tests.Unit.Common; +using UKSF.Tests.Common; using Xunit; // Available test collections as json: @@ -24,7 +24,7 @@ // units // variables -namespace UKSF.Tests.Unit.Integration.Data { +namespace UKSF.Tests.Integration.Data { public class DataCollectionTests : IDisposable { private const string TEST_COLLECTION_NAME = "roles"; private MongoDbRunner mongoDbRunner; @@ -63,7 +63,7 @@ private async Task MongoTest(Func testFunction) { } [Fact] - public async Task ShouldAddItem() { + public async Task Should_add_item() { await MongoTest( async database => { (DataCollection dataCollection, _) = await SetupTestCollection(database); @@ -79,14 +79,14 @@ await MongoTest( } [Fact] - public async Task ShouldCreateCollection() { + public async Task Should_create_collection() { await MongoTest( async database => { - DataCollection dataCollection = new DataCollection(database, "test"); + DataCollection dataCollection = new DataCollection(database, "test"); await dataCollection.AssertCollectionExistsAsync(); - IMongoCollection subject = database.GetCollection("test"); + IMongoCollection subject = database.GetCollection("test"); subject.Should().NotBeNull(); } @@ -94,7 +94,7 @@ await MongoTest( } [Fact] - public async Task ShouldDelete() { + public async Task Should_delete_item_by_id() { await MongoTest( async database => { (DataCollection dataCollection, string testId) = await SetupTestCollection(database); @@ -109,7 +109,7 @@ await MongoTest( } [Fact] - public async Task ShouldDeleteMany() { + public async Task Should_delete_many_by_predicate() { await MongoTest( async database => { (DataCollection dataCollection, _) = await SetupTestCollection(database); @@ -124,7 +124,7 @@ await MongoTest( } [Fact] - public async Task ShouldGetByPredicate() { + public async Task Should_get_many_by_predicate() { await MongoTest( async database => { (DataCollection dataCollection, _) = await SetupTestCollection(database); @@ -139,7 +139,7 @@ await MongoTest( } [Fact] - public async Task ShouldGetCollection() { + public async Task Should_get_collection() { await MongoTest( async database => { (DataCollection dataCollection, _) = await SetupTestCollection(database); @@ -154,7 +154,7 @@ await MongoTest( } [Fact] - public async Task ShouldGetSingleById() { + public async Task Should_get_item_by_id() { await MongoTest( async database => { (DataCollection dataCollection, string testId) = await SetupTestCollection(database); @@ -168,7 +168,7 @@ await MongoTest( } [Fact] - public async Task ShouldGetSingleByPredicate() { + public async Task Should_get_item_by_predicate() { await MongoTest( async database => { (DataCollection dataCollection, _) = await SetupTestCollection(database); @@ -182,21 +182,21 @@ await MongoTest( } [Fact] - public async Task ShouldNotThrowWhenCollectionExists() { + public async Task Should_not_throw_when_collection_exists() { await MongoTest( async database => { await database.CreateCollectionAsync("test"); - DataCollection dataCollection = new DataCollection(database, "test"); + DataCollection dataCollection = new DataCollection(database, "test"); Func act = async () => await dataCollection.AssertCollectionExistsAsync(); - act.Should().NotThrow(); + await act.Should().NotThrowAsync(); } ); } [Fact] - public async Task ShouldReplace() { + public async Task Should_replace_item() { await MongoTest( async database => { (DataCollection dataCollection, string testId) = await SetupTestCollection(database); @@ -214,7 +214,7 @@ await MongoTest( } [Fact] - public async Task ShouldUpdate() { + public async Task Should_update_item_by_id() { await MongoTest( async database => { (DataCollection dataCollection, string testId) = await SetupTestCollection(database); @@ -229,7 +229,22 @@ await MongoTest( } [Fact] - public async Task ShouldUpdateMany() { + public async Task Should_update_item_by_filter() { + await MongoTest( + async database => { + (DataCollection dataCollection, string testId) = await SetupTestCollection(database); + + await dataCollection.UpdateAsync(Builders.Filter.Where(x => x.id == testId), Builders.Update.Set(x => x.order, 10)); + + Rank subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.id == testId); + + subject.order.Should().Be(10); + } + ); + } + + [Fact] + public async Task Should_update_many_by_predicate() { await MongoTest( async database => { (DataCollection dataCollection, _) = await SetupTestCollection(database); diff --git a/UKSF.Tests/UKSF.Tests.csproj b/UKSF.Tests/UKSF.Tests.csproj index 1e20b4aa..5671c577 100644 --- a/UKSF.Tests/UKSF.Tests.csproj +++ b/UKSF.Tests/UKSF.Tests.csproj @@ -1,31 +1,36 @@  - netcoreapp3.1 + netcoreapp5.0 false - - UKSF.Tests.Unit - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + - + - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/UKSF.Tests/UKSF.Tests.csproj.DotSettings b/UKSF.Tests/UKSF.Tests.csproj.DotSettings new file mode 100644 index 00000000..c7c08b5b --- /dev/null +++ b/UKSF.Tests/UKSF.Tests.csproj.DotSettings @@ -0,0 +1,8 @@ + + IF_OWNER_IS_SINGLE_LINE + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_aaBb" /> + + True + True + True + True \ No newline at end of file diff --git a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs new file mode 100644 index 00000000..34103e93 --- /dev/null +++ b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs @@ -0,0 +1,166 @@ +using System; +using System.Collections.Generic; +using FluentAssertions; +using MongoDB.Bson; +using UKSF.Api.Models; +using UKSF.Api.Models.Personnel; +using UKSF.Common; +using UKSF.Tests.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Common { + public class ChangeUtilitiesTests { + [Fact] + public void Should_detect_changes_for_complex_object() { + string id = ObjectId.GenerateNewId().ToString(); + Account original = new Account { + id = id, + firstname = "Tim", + background = "I like trains", + dob = DateTime.Parse("2018-08-09T05:00:00.307"), + rank = "Private", + application = new Application { state = ApplicationState.WAITING, recruiter = "Bob", applicationCommentThread = "thread1", dateCreated = DateTime.Parse("2020-05-02T10:34:39.786") }, + rolePreferences = new List { "Aviatin", "NCO" } + }; + Account updated = new Account { + id = id, + firstname = "Timmy", + lastname = "Bob", + background = "I like planes", + dob = DateTime.Parse("2020-10-03T05:00:34.307"), + application = new Application { + state = ApplicationState.ACCEPTED, recruiter = "Bob", dateCreated = DateTime.Parse("2020-05-02T10:34:39.786"), dateAccepted = DateTime.Parse("2020-07-02T10:34:39.786") + }, + rolePreferences = new List { "Aviation", "Officer" } + }; + + string subject = original.Changes(updated); + + subject.Should() + .Be( + "\n\t'lastname' added as 'Bob'" + + "\n\t'background' changed from 'I like trains' to 'I like planes'" + + "\n\t'dob' changed from '09/08/2018 05:00:00' to '03/10/2020 05:00:34'" + + "\n\t'firstname' changed from 'Tim' to 'Timmy'" + + "\n\t'rolePreferences' changed:" + + "\n\t\tadded: 'Aviation'" + + "\n\t\tadded: 'Officer'" + + "\n\t\tremoved: 'Aviatin'" + + "\n\t\tremoved: 'NCO'" + + "\n\t'rank' as 'Private' removed" + + "\n\t'application' changed:" + + "\n\t\t'dateAccepted' changed from '01/01/0001 00:00:00' to '02/07/2020 10:34:39'" + + "\n\t\t'state' changed from 'WAITING' to 'ACCEPTED'" + + "\n\t\t'applicationCommentThread' as 'thread1' removed" + ); + } + + [Fact] + public void Should_detect_changes_for_date() { + string id = ObjectId.GenerateNewId().ToString(); + Account original = new Account { id = id, dob = DateTime.Parse("2020-10-03T05:00:34.307") }; + Account updated = new Account { id = id, dob = DateTime.Parse("2020-11-03T00:00:00.000") }; + + string subject = original.Changes(updated); + + subject.Should().Be("\n\t'dob' changed from '03/10/2020 05:00:34' to '03/11/2020 00:00:00'"); + } + + [Fact] + public void Should_detect_changes_for_dictionary() { + string id = ObjectId.GenerateNewId().ToString(); + TestDataModel original = new TestDataModel { id = id, Dictionary = new Dictionary { { "0", "variable0" }, { "1", "variable0" } } }; + TestDataModel updated = new TestDataModel { id = id, Dictionary = new Dictionary { { "0", "variable0" }, { "1", "variable1" }, { "2", "variable2" } } }; + + string subject = original.Changes(updated); + + subject.Should().Be("\n\t'Dictionary' changed:" + "\n\t\tadded: '[1, variable1]'" + "\n\t\tadded: '[2, variable2]'" + "\n\t\tremoved: '[1, variable0]'"); + } + + [Fact] + public void Should_detect_changes_for_enum() { + string id = ObjectId.GenerateNewId().ToString(); + Account original = new Account { id = id, membershipState = MembershipState.UNCONFIRMED }; + Account updated = new Account { id = id, membershipState = MembershipState.MEMBER }; + + string subject = original.Changes(updated); + + subject.Should().Be("\n\t'membershipState' changed from 'UNCONFIRMED' to 'MEMBER'"); + } + + [Fact] + public void Should_detect_changes_for_hashset() { + string id = ObjectId.GenerateNewId().ToString(); + Account original = new Account { id = id, teamspeakIdentities = new HashSet { 0 } }; + Account updated = new Account { id = id, teamspeakIdentities = new HashSet { 0, 1, 2, 2 } }; + + string subject = original.Changes(updated); + + subject.Should().Be("\n\t'teamspeakIdentities' changed:" + "\n\t\tadded: '1'" + "\n\t\tadded: '2'"); + } + + [Fact] + public void Should_detect_changes_for_object_list() { + string id = ObjectId.GenerateNewId().ToString(); + Account original = new Account { id = id, serviceRecord = new List { new ServiceRecordEntry { occurence = "Event" } } }; + Account updated = new Account { + id = id, serviceRecord = new List { new ServiceRecordEntry { occurence = "Event" }, new ServiceRecordEntry { occurence = "Another Event" } } + }; + + string subject = original.Changes(updated); + + subject.Should().Be("\n\t'serviceRecord' changed:" + "\n\t\tadded: '01/01/0001: Another Event'"); + } + + [Fact] + public void Should_detect_changes_for_simple_list() { + string id = ObjectId.GenerateNewId().ToString(); + Account original = new Account { id = id, rolePreferences = new List { "Aviatin", "NCO" } }; + Account updated = new Account { id = id, rolePreferences = new List { "Aviation", "NCO", "Officer" } }; + + string subject = original.Changes(updated); + + subject.Should().Be("\n\t'rolePreferences' changed:" + "\n\t\tadded: 'Aviation'" + "\n\t\tadded: 'Officer'" + "\n\t\tremoved: 'Aviatin'"); + } + + [Fact] + public void Should_detect_changes_for_simple_object() { + string id = ObjectId.GenerateNewId().ToString(); + Rank original = new Rank { id = id, abbreviation = "Pte", name = "Privte", order = 1 }; + Rank updated = new Rank { id = id, name = "Private", order = 5, teamspeakGroup = "4" }; + + string subject = original.Changes(updated); + + subject.Should().Be("\n\t'teamspeakGroup' added as '4'" + "\n\t'name' changed from 'Privte' to 'Private'" + "\n\t'order' changed from '1' to '5'" + "\n\t'abbreviation' as 'Pte' removed"); + } + + [Fact] + public void Should_do_nothing_when_null() { + string subject = ((Rank) null).Changes(null); + + subject.Should().Be(""); + } + + [Fact] + public void Should_do_nothing_when_field_is_null() { + string id = ObjectId.GenerateNewId().ToString(); + Rank original = new Rank { id = id, abbreviation = null }; + Rank updated = new Rank { id = id, abbreviation = null }; + + string subject = original.Changes(updated); + + subject.Should().Be(""); + } + + [Fact] + public void Should_do_nothing_when_objects_are_equal() { + string id = ObjectId.GenerateNewId().ToString(); + Rank original = new Rank { id = id, abbreviation = "Pte" }; + Rank updated = new Rank { id = id, abbreviation = "Pte" }; + + string subject = original.Changes(updated); + + subject.Should().Be(""); + } + } +} diff --git a/UKSF.Tests/Unit/Common/ClockTests.cs b/UKSF.Tests/Unit/Common/ClockTests.cs new file mode 100644 index 00000000..22a193e5 --- /dev/null +++ b/UKSF.Tests/Unit/Common/ClockTests.cs @@ -0,0 +1,29 @@ +using System; +using FluentAssertions; +using UKSF.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Common { + public class ClockTests { + [Fact] + public void Should_return_current_date_and_time() { + DateTime subject = new Clock().Now(); + + subject.Should().BeCloseTo(DateTime.Now, TimeSpan.FromMilliseconds(10)); + } + + [Fact] + public void Should_return_current_date() { + DateTime subject = new Clock().Today(); + + subject.Should().BeCloseTo(DateTime.Today, TimeSpan.FromMilliseconds(0)); + } + + [Fact] + public void Should_return_current_utc_date_and_time() { + DateTime subject = new Clock().UtcNow(); + + subject.Should().BeCloseTo(DateTime.UtcNow, TimeSpan.FromMilliseconds(10)); + } + } +} diff --git a/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs b/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs index 5397f7e6..9cd030ec 100644 --- a/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs @@ -3,11 +3,11 @@ using UKSF.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Common { +namespace UKSF.Tests.Unit.Common { public class CollectionUtilitiesTests { [Fact] - public void ShouldCleanHashset() { - HashSet subject = new HashSet {"1", "", "3"}; + public void Should_remove_empty_strings_from_hashset() { + HashSet subject = new HashSet {"1", "", null, "3"}; subject.CleanHashset(); diff --git a/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs b/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs index e74786b8..2a3258e4 100644 --- a/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs @@ -3,43 +3,13 @@ using FluentAssertions; using Newtonsoft.Json.Linq; using UKSF.Common; -using UKSF.Tests.Unit.Common; +using UKSF.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Common { +namespace UKSF.Tests.Unit.Common { public class DataUtilitiesTests { [Fact] - public void ShouldReturnIdValueForValidObject() { - MockDataModel mockDataModel = new MockDataModel(); - - string subject = mockDataModel.GetIdValue(); - - subject.Should().Be(mockDataModel.id); - } - - [Fact] - public void ShouldReturnEmptyStringForInvalidObject() { - DateTime dateTime = new DateTime(); - - string subject = dateTime.GetIdValue(); - - subject.Should().Be(string.Empty); - } - - [Fact] - public void ShouldReturnIdWithinOneSecond() { - MockDataModel mockDataModel = new MockDataModel { Stuff = new List() }; - for (int i = 0; i < 10000; i++) { - mockDataModel.Stuff.Add(new {index = i, data = Guid.NewGuid(), number = i * 756 * 458 * 5478}); - } - - Action act = () => mockDataModel.GetIdValue(); - - act.ExecutionTime().Should().BeLessThan(TimeSpan.FromSeconds(1)); - } - - [Fact] - public void ShouldGetCorrectValueFromBody() { + public void Should_return_correct_value_from_body() { JObject jObject = JObject.Parse("{\"key1\":\"item1\", \"key2\":\"item2\"}"); string subject = jObject.GetValueFromBody("key2"); @@ -48,7 +18,7 @@ public void ShouldGetCorrectValueFromBody() { } [Fact] - public void ShouldGetValueAsStringFromBody() { + public void Should_return_value_as_string_from_body_when_data_is_not_string() { JObject jObject = JObject.Parse("{\"key\":2}"); string subject = jObject.GetValueFromBody("key"); @@ -57,7 +27,7 @@ public void ShouldGetValueAsStringFromBody() { } [Fact] - public void ShouldReturnEmptyStringFromBodyForInvalidKey() { + public void Should_return_nothing_from_body_for_invalid_key() { JObject jObject = JObject.Parse("{\"key\":\"value\"}"); string subject = jObject.GetValueFromBody("notthekey"); diff --git a/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs b/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs index b11da544..f13f6a60 100644 --- a/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs @@ -3,7 +3,7 @@ using UKSF.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Common { +namespace UKSF.Tests.Unit.Common { public class DateUtilitiesTests { [Theory, InlineData(25, 4, 25, 4), InlineData(25, 13, 26, 1)] public void ShouldGiveCorrectAge(int years, int months, int expectedYears, int expectedMonths) { diff --git a/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs b/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs index 8d6d2416..a2a2eb90 100644 --- a/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs +++ b/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs @@ -1,35 +1,23 @@ using FluentAssertions; using MongoDB.Bson; +using UKSF.Api.Data; using UKSF.Api.Models.Events; -using UKSF.Api.Models.Events.Types; -using UKSF.Common; -using UKSF.Tests.Unit.Common; +using UKSF.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Common { +namespace UKSF.Tests.Unit.Common { public class EventModelFactoryTests { [Fact] - public void ShouldReturnDataEvent() { + public void Should_create_data_event_correctly() { string id = ObjectId.GenerateNewId().ToString(); - object data = new[] {"test", "item"}; + object data = new[] { "test", "item" }; - DataEventModel subject = EventModelFactory.CreateDataEvent(DataEventType.ADD, id, data); + DataEventModel subject = EventModelFactory.CreateDataEvent(DataEventType.ADD, id, data); subject.Should().NotBeNull(); subject.type.Should().Be(DataEventType.ADD); subject.id.Should().Be(id); subject.data.Should().Be(data); } - - [Fact] - public void ShouldReturnSignalrEvent() { - object args = new[] {"test", "item"}; - - SignalrEventModel subject = EventModelFactory.CreateSignalrEvent(TeamspeakEventType.CLIENTS, args); - - subject.Should().NotBeNull(); - subject.procedure.Should().Be(TeamspeakEventType.CLIENTS); - subject.args.Should().Be(args); - } } } diff --git a/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs b/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs index fb7bbbb8..8eaf8143 100644 --- a/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs +++ b/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs @@ -2,7 +2,7 @@ using UKSF.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Common { +namespace UKSF.Tests.Unit.Common { public class GuardUtilitesTests { [Theory, InlineData("", false), InlineData(null, false), InlineData("1", false), InlineData("5ed43018bea2f1945440f37d", true)] public void ShouldValidateIdCorrectly(string id, bool valid) { diff --git a/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs b/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs index 6117fd25..80026a60 100644 --- a/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs @@ -1,35 +1,45 @@ using System.Collections.Generic; using FluentAssertions; using UKSF.Common; -using UKSF.Tests.Unit.Common; +using UKSF.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Common { +namespace UKSF.Tests.Unit.Common { public class JsonUtilitiesTests { [Fact] public void ShouldCopyComplexObject() { - MockDataModel mockDataModel1 = new MockDataModel {Name = "1"}; - MockDataModel mockDataModel2 = new MockDataModel {Name = "2"}; - MockDataModel mockDataModel3 = new MockDataModel {Name = "3"}; - MockComplexDataModel mockComplexDataModel = new MockComplexDataModel {Name = "Test", Data = mockDataModel1, List = new List {"a", "b", "c"}, DataList = new List {mockDataModel1, mockDataModel2, mockDataModel3}}; + TestDataModel testDataModel1 = new TestDataModel {Name = "1"}; + TestDataModel testDataModel2 = new TestDataModel {Name = "2"}; + TestDataModel testDataModel3 = new TestDataModel {Name = "3"}; + TestComplexDataModel testComplexDataModel = new TestComplexDataModel {Name = "Test", Data = testDataModel1, List = new List {"a", "b", "c"}, DataList = new List {testDataModel1, testDataModel2, testDataModel3}}; - MockComplexDataModel subject = mockComplexDataModel.Copy(); + TestComplexDataModel subject = testComplexDataModel.Copy(); - subject.id.Should().Be(mockComplexDataModel.id); - subject.Name.Should().Be(mockComplexDataModel.Name); - subject.Data.Should().NotBe(mockDataModel1); + subject.id.Should().Be(testComplexDataModel.id); + subject.Name.Should().Be(testComplexDataModel.Name); + subject.Data.Should().NotBe(testDataModel1); subject.List.Should().HaveCount(3).And.Contain(new List {"a", "b", "c"}); - subject.DataList.Should().HaveCount(3).And.NotContain(new List {mockDataModel1, mockDataModel2, mockDataModel3}); + subject.DataList.Should().HaveCount(3).And.NotContain(new List {testDataModel1, testDataModel2, testDataModel3}); } [Fact] public void ShouldCopyObject() { - MockDataModel mockDataModel = new MockDataModel {Name = "Test"}; + TestDataModel testDataModel = new TestDataModel {Name = "Test"}; - MockDataModel subject = mockDataModel.Copy(); + TestDataModel subject = testDataModel.Copy(); - subject.id.Should().Be(mockDataModel.id); - subject.Name.Should().Be(mockDataModel.Name); + subject.id.Should().Be(testDataModel.id); + subject.Name.Should().Be(testDataModel.Name); + } + + + [Fact] + public void ShouldEscapeJsonString() { + const string UNESCAPED_JSON = "JSON:{\"message\": \"\\nMaking zeus \\ at 'C:\\test\\path'\", \"colour\": \"#20d18b\"}"; + + string subject = UNESCAPED_JSON.Escape(); + + subject.Should().Be("JSON:{\"message\": \"\\\\nMaking zeus \\\\ at 'C:\\\\test\\\\path'\", \"colour\": \"#20d18b\"}"); } } } diff --git a/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs b/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs index d01e711b..42961c4c 100644 --- a/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs @@ -5,7 +5,7 @@ using UKSF.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Common { +namespace UKSF.Tests.Unit.Common { public class StringUtilitiesTests { [Theory, InlineData("", "", false), InlineData("", "hello", false), InlineData("hello world hello world", "hello", true), InlineData("hello", "HELLO", true), InlineData("hello world", "HELLOWORLD", false)] public void ShouldIgnoreCase(string text, string searchElement, bool expected) { diff --git a/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs index 694c4777..836a1049 100644 --- a/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs @@ -5,7 +5,7 @@ using UKSF.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Common { +namespace UKSF.Tests.Unit.Common { public class TaskUtilitiesTests { [Fact] public void ShouldDelay() { @@ -27,7 +27,7 @@ public void ShouldNotThrowExceptionForDelay() { } [Fact] - public void ShouldCallbackAfterDelay() { + public async Task ShouldCallbackAfterDelay() { bool subject = false; Func act = async () => { CancellationTokenSource token = new CancellationTokenSource(); @@ -41,7 +41,7 @@ await TaskUtilities.DelayWithCallback( ); }; - act.Should().NotThrow(); + await act.Should().NotThrowAsync(); act.ExecutionTime().Should().BeGreaterThan(TimeSpan.FromMilliseconds(10)); subject.Should().BeTrue(); } diff --git a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs index c8c15901..0dd0c5c8 100644 --- a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs @@ -7,20 +7,19 @@ using Moq; using UKSF.Api.Data.Admin; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Admin; using Xunit; -namespace UKSF.Tests.Unit.Unit.Data.Admin { +namespace UKSF.Tests.Unit.Data.Admin { public class VariablesDataServiceTests { - private readonly VariablesDataService variablesDataService; private readonly Mock> mockDataCollection; + private readonly VariablesDataService variablesDataService; private List mockCollection; public VariablesDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); + Mock> mockDataEventBus = new Mock>(); mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); @@ -29,67 +28,40 @@ public VariablesDataServiceTests() { variablesDataService = new VariablesDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } - [Fact] - public void ShouldGetOrderedCollection() { - VariableItem item1 = new VariableItem {key = "MISSIONS_PATH"}; - VariableItem item2 = new VariableItem {key = "SERVER_PATH"}; - VariableItem item3 = new VariableItem {key = "DISCORD_IDS"}; - mockCollection = new List {item1, item2, item3}; - - IEnumerable subject = variablesDataService.Get(); - - subject.Should().ContainInOrder(item3, item1, item2); - } - - [Fact] - public void ShouldGetItemByKey() { - VariableItem item1 = new VariableItem {key = "MISSIONS_PATH"}; - VariableItem item2 = new VariableItem {key = "SERVER_PATH"}; - VariableItem item3 = new VariableItem {key = "DISCORD_IDS"}; - mockCollection = new List {item1, item2, item3}; - - VariableItem subject = variablesDataService.GetSingle("server path"); - - subject.Should().Be(item2); - } - [Theory, InlineData(""), InlineData("game path")] public void ShouldGetNothingWhenNoKeyOrNotFound(string key) { - VariableItem item1 = new VariableItem {key = "MISSIONS_PATH"}; - VariableItem item2 = new VariableItem {key = "SERVER_PATH"}; - VariableItem item3 = new VariableItem {key = "DISCORD_IDS"}; - mockCollection = new List {item1, item2, item3}; + VariableItem item1 = new VariableItem { key = "MISSIONS_PATH" }; + VariableItem item2 = new VariableItem { key = "SERVER_PATH" }; + VariableItem item3 = new VariableItem { key = "DISCORD_IDS" }; + mockCollection = new List { item1, item2, item3 }; VariableItem subject = variablesDataService.GetSingle(key); subject.Should().Be(null); } - [Fact] - public async Task ShouldUpdateItemValue() { - VariableItem subject = new VariableItem {key = "DISCORD_ID", item = "50"}; - mockCollection = new List {subject}; - - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask).Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).item = "75"); + [Theory, InlineData(""), InlineData(null)] + public async Task ShouldThrowForUpdateWhenNoKeyOrNull(string key) { + mockCollection = new List(); - await variablesDataService.Update("discord id", "75"); + Func act = async () => await variablesDataService.Update(key, "75"); - subject.item.Should().Be("75"); + await act.Should().ThrowAsync(); } [Theory, InlineData(""), InlineData(null)] - public void ShouldThrowForUpdateWhenNoKeyOrNull(string key) { + public async Task ShouldThrowForDeleteWhenNoKeyOrNull(string key) { mockCollection = new List(); - Func act = async () => await variablesDataService.Update(key, "75"); + Func act = async () => await variablesDataService.Delete(key); - act.Should().Throw(); + await act.Should().ThrowAsync(); } [Fact] public async Task ShouldDeleteItem() { - VariableItem item1 = new VariableItem {key = "DISCORD_ID", item = "50"}; - mockCollection = new List {item1}; + VariableItem item1 = new VariableItem { key = "DISCORD_ID", item = "50" }; + mockCollection = new List { item1 }; mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); @@ -98,13 +70,42 @@ public async Task ShouldDeleteItem() { mockCollection.Should().HaveCount(0); } - [Theory, InlineData(""), InlineData(null)] - public void ShouldThrowForDeleteWhenNoKeyOrNull(string key) { - mockCollection = new List(); + [Fact] + public void ShouldGetItemByKey() { + VariableItem item1 = new VariableItem { key = "MISSIONS_PATH" }; + VariableItem item2 = new VariableItem { key = "SERVER_PATH" }; + VariableItem item3 = new VariableItem { key = "DISCORD_IDS" }; + mockCollection = new List { item1, item2, item3 }; - Func act = async () => await variablesDataService.Delete(key); + VariableItem subject = variablesDataService.GetSingle("server path"); + + subject.Should().Be(item2); + } + + [Fact] + public void Should_get_collection_in_order() { + VariableItem item1 = new VariableItem { key = "MISSIONS_PATH" }; + VariableItem item2 = new VariableItem { key = "SERVER_PATH" }; + VariableItem item3 = new VariableItem { key = "DISCORD_IDS" }; + mockCollection = new List { item1, item2, item3 }; - act.Should().Throw(); + IEnumerable subject = variablesDataService.Get(); + + subject.Should().ContainInOrder(item3, item1, item2); + } + + [Fact] + public async Task ShouldUpdateItemValue() { + VariableItem subject = new VariableItem { key = "DISCORD_ID", item = "50" }; + mockCollection = new List { subject }; + + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).item = "75"); + + await variablesDataService.Update("discord id", "75"); + + subject.item.Should().Be("75"); } } } diff --git a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs index 65db6052..c7db45f5 100644 --- a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs @@ -9,237 +9,261 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; -using UKSF.Tests.Unit.Common; +using UKSF.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Data { +namespace UKSF.Tests.Unit.Data { public class CachedDataServiceTests { - private readonly MockCachedDataService mockCachedDataService; - private readonly Mock> mockDataCollection; - private List mockCollection; + private readonly Mock> mockDataCollection; + private readonly Mock mockDataCollectionFactory; + private readonly Mock> mockDataEventBus; + private List mockCollection; + private TestCachedDataService testCachedDataService; public CachedDataServiceTests() { - Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); + mockDataCollectionFactory = new Mock(); + mockDataEventBus = new Mock>(); + mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())); - - mockCachedDataService = new MockCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(() => new List(mockCollection)); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())); } [Fact] - public void ShouldCacheCollectionForGet() { - mockCollection = new List(); + public void Should_cache_collection_when_null_for_get() { + mockCollection = new List(); - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); - mockCachedDataService.Collection.Should().BeNull(); + testCachedDataService.Cache.Should().BeNull(); - mockCachedDataService.Get(); + testCachedDataService.Get(); - mockCachedDataService.Collection.Should().NotBeNull(); - mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); + testCachedDataService.Cache.Should().NotBeNull(); + testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); } [Fact] - public void ShouldCacheCollectionForGetByPredicate() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - MockDataModel item2 = new MockDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + public void Should_cache_collection_when_null_for_get_single_by_id() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); - IEnumerable subject = mockCachedDataService.Get(x => x.Name == "1"); + TestDataModel subject = testCachedDataService.GetSingle(item2.id); - mockCachedDataService.Collection.Should().NotBeNull(); - subject.Should().BeSubsetOf(mockCachedDataService.Collection); + testCachedDataService.Cache.Should().NotBeNull(); + testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); + subject.Should().Be(item2); } [Fact] - public void ShouldCacheCollectionForGetSingle() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - MockDataModel item2 = new MockDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + public void Should_cache_collection_when_null_for_get_single_by_predicate() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); - MockDataModel subject = mockCachedDataService.GetSingle(item2.id); + TestDataModel subject = testCachedDataService.GetSingle(x => x.Name == "2"); - mockCachedDataService.Collection.Should().NotBeNull(); - mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); + testCachedDataService.Cache.Should().NotBeNull(); + testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); subject.Should().Be(item2); } [Fact] - public void ShouldCacheCollectionForGetSingleByPredicate() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - MockDataModel item2 = new MockDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + public void Should_cache_collection_when_null_for_get_with_predicate() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); - MockDataModel subject = mockCachedDataService.GetSingle(x => x.Name == "2"); + IEnumerable subject = testCachedDataService.Get(x => x.Name == "1"); - mockCachedDataService.Collection.Should().NotBeNull(); - mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); - subject.Should().Be(item2); + testCachedDataService.Cache.Should().NotBeNull(); + subject.Should().BeSubsetOf(testCachedDataService.Cache); } [Fact] - public void ShouldCacheCollectionForRefreshWhenNull() { - mockCollection = new List(); + public void Should_cache_collection_when_null_for_refresh() { + mockCollection = new List(); - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); - mockCachedDataService.Collection.Should().BeNull(); + testCachedDataService.Cache.Should().BeNull(); - mockCachedDataService.Refresh(); + testCachedDataService.Refresh(); - mockCachedDataService.Collection.Should().NotBeNull(); - mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); + testCachedDataService.Cache.Should().NotBeNull(); + testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); } [Fact] - public void ShouldGetCachedCollection() { - mockCollection = new List(); + public void Should_return_cached_collection_for_get() { + mockCollection = new List(); - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); - mockCachedDataService.Collection.Should().BeNull(); + testCachedDataService.Cache.Should().BeNull(); - List subject1 = mockCachedDataService.Get().ToList(); + List subject1 = testCachedDataService.Get().ToList(); subject1.Should().NotBeNull(); subject1.Should().BeEquivalentTo(mockCollection); - List subject2 = mockCachedDataService.Get().ToList(); + List subject2 = testCachedDataService.Get().ToList(); subject2.Should().NotBeNull(); subject2.Should().BeEquivalentTo(mockCollection).And.BeEquivalentTo(subject1); } [Fact] - public async Task ShouldRefreshCollectionForAdd() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - mockCollection = new List(); + public async Task Should_update_cache_for_add() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + mockCollection = new List(); - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Callback(x => mockCollection.Add(x)); + mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Callback(x => mockCollection.Add(x)); - mockCachedDataService.Collection.Should().BeNull(); + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); - await mockCachedDataService.Add(item1); + testCachedDataService.Cache.Should().BeNull(); - mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); - mockCachedDataService.Collection.Should().Contain(item1); + await testCachedDataService.Add(item1); + + testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); + testCachedDataService.Cache.Should().Contain(item1); } [Fact] - public async Task ShouldRefreshCollectionForDelete() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - MockDataModel item2 = new MockDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + public async Task Should_update_cache_for_delete_by_id() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); - await mockCachedDataService.Delete(item1.id); + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + + await testCachedDataService.Delete(item1.id); - mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); - mockCachedDataService.Collection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); + testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); + testCachedDataService.Cache.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); } [Fact] - public async Task ShouldRefreshCollectionForDeleteMany() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - MockDataModel item2 = new MockDataModel { Name = "1" }; - MockDataModel item3 = new MockDataModel { Name = "3" }; - mockCollection = new List { item1, item2, item3 }; - - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) + public async Task Should_update_cache_for_delete() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; + + mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + + await testCachedDataService.Delete(item1); + + testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); + testCachedDataService.Cache.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); + } + + [Fact] + public async Task Should_update_cache_for_delete_many() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { Name = "1" }; + TestDataModel item3 = new TestDataModel { Name = "3" }; + mockCollection = new List { item1, item2, item3 }; + + mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) .Returns(Task.CompletedTask) - .Callback((Expression> expression) => mockCollection.RemoveAll(x => mockCollection.Where(expression.Compile()).Contains(x))); + .Callback((Expression> expression) => mockCollection.RemoveAll(x => mockCollection.Where(expression.Compile()).Contains(x))); + + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); - await mockCachedDataService.DeleteMany(x => x.Name == "1"); + await testCachedDataService.DeleteMany(x => x.Name == "1"); - mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); - mockCachedDataService.Collection.Should().HaveCount(1); - mockCachedDataService.Collection.Should().Contain(item3); + testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); + testCachedDataService.Cache.Should().HaveCount(1); + testCachedDataService.Cache.Should().Contain(item3); } [Fact] public async Task ShouldRefreshCollectionForReplace() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - MockDataModel item2 = new MockDataModel { id = item1.id, Name = "2" }; - mockCollection = new List { item1 }; + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { id = item1.id, Name = "2" }; + mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())) + mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())) .Returns(Task.CompletedTask) - .Callback((string id, MockDataModel value) => mockCollection[mockCollection.FindIndex(x => x.id == id)] = value); + .Callback((string id, TestDataModel value) => mockCollection[mockCollection.FindIndex(x => x.id == id)] = value); - await mockCachedDataService.Replace(item2); + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); - mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); - mockCachedDataService.Collection.First().Name.Should().Be("2"); + await testCachedDataService.Replace(item2); + + testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); + testCachedDataService.Cache.First().Name.Should().Be("2"); } [Fact] public async Task ShouldRefreshCollectionForUpdate() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - mockCollection = new List { item1 }; + TestDataModel item1 = new TestDataModel { Name = "1" }; + mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) - .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); - await mockCachedDataService.Update(item1.id, "Name", "2"); + await testCachedDataService.Update(item1.id, "Name", "2"); - mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); - mockCachedDataService.Collection.First().Name.Should().Be("2"); + testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); + testCachedDataService.Cache.First().Name.Should().Be("2"); } [Fact] public async Task ShouldRefreshCollectionForUpdateByUpdateDefinition() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - mockCollection = new List { item1 }; + TestDataModel item1 = new TestDataModel { Name = "1" }; + mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) - .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); - await mockCachedDataService.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); - mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); - mockCachedDataService.Collection.First().Name.Should().Be("2"); + await testCachedDataService.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); + + testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); + testCachedDataService.Cache.First().Name.Should().Be("2"); } [Fact] public async Task ShouldRefreshCollectionForUpdateMany() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - MockDataModel item2 = new MockDataModel { Name = "1" }; - MockDataModel item3 = new MockDataModel { Name = "3" }; - mockCollection = new List { item1, item2, item3 }; + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { Name = "1" }; + TestDataModel item3 = new TestDataModel { Name = "3" }; + mockCollection = new List { item1, item2, item3 }; - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback( - (Expression> expression, UpdateDefinition _) => + (Expression> expression, UpdateDefinition _) => mockCollection.Where(expression.Compile()).ToList().ForEach(x => x.Name = "3") ); - await mockCachedDataService.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "3")); + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + + await testCachedDataService.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "3")); - mockCachedDataService.Collection.Should().BeEquivalentTo(mockCollection); - mockCachedDataService.Collection.ToList()[0].Name.Should().Be("3"); - mockCachedDataService.Collection.ToList()[1].Name.Should().Be("3"); - mockCachedDataService.Collection.ToList()[2].Name.Should().Be("3"); + testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); + testCachedDataService.Cache.ToList()[0].Name.Should().Be("3"); + testCachedDataService.Cache.ToList()[1].Name.Should().Be("3"); + testCachedDataService.Cache.ToList()[2].Name.Should().Be("3"); } } } diff --git a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs new file mode 100644 index 00000000..a1c24dc0 --- /dev/null +++ b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs @@ -0,0 +1,141 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Threading.Tasks; +using FluentAssertions; +using MongoDB.Bson; +using MongoDB.Driver; +using Moq; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; +using UKSF.Tests.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Data { + public class CachedDataServiceEventTests { + private readonly string id1; + private readonly string id2; + private readonly string id3; + private readonly TestDataModel item1; + private readonly Mock> mockDataCollection; + private readonly Mock> mockDataEventBus; + private readonly TestCachedDataService testCachedDataService; + + public CachedDataServiceEventTests() { + Mock mockDataCollectionFactory = new Mock(); + mockDataEventBus = new Mock>(); + mockDataCollection = new Mock>(); + id1 = ObjectId.GenerateNewId().ToString(); + id2 = ObjectId.GenerateNewId().ToString(); + id3 = ObjectId.GenerateNewId().ToString(); + item1 = new TestDataModel { id = id1, Name = "1" }; + TestDataModel item2 = new TestDataModel { id = id2, Name = "1" }; + TestDataModel item3 = new TestDataModel { id = id3, Name = "3" }; + List mockCollection = new List { item1, item2, item3 }; + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => mockCollection.Where(predicate)); + mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => mockCollection.FirstOrDefault(predicate)); + mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(id => mockCollection.FirstOrDefault(x => x.id == id)); + + testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + } + + [Fact] + public async Task Should_create_correct_add_event_for_add() { + DataEventModel subject = null; + + mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + + await testCachedDataService.Add(item1); + + mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); + subject.Should().BeEquivalentTo(new DataEventModel { id = id1, type = DataEventType.ADD, data = item1 }); + } + + [Fact] + public async Task Should_create_correct_delete_event_for_delete() { + DataEventModel subject = null; + + mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + + await testCachedDataService.Delete(id1); + + mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); + subject.Should().BeEquivalentTo(new DataEventModel { id = id1, type = DataEventType.DELETE, data = null }); + } + + [Fact] + public async Task Should_create_correct_delete_events_for_delete_many() { + List> subjects = new List>(); + + mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())).Returns(Task.CompletedTask); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + + await testCachedDataService.DeleteMany(x => x.Name == "1"); + + mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); + subjects.Should() + .BeEquivalentTo( + new DataEventModel { id = id1, type = DataEventType.DELETE, data = null }, + new DataEventModel { id = id2, type = DataEventType.DELETE, data = null } + ); + } + + [Fact] + public async Task Should_create_correct_update_event_for_replace() { + DataEventModel subject = null; + + mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + + await testCachedDataService.Replace(item1); + + mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); + subject.Should().BeEquivalentTo(new DataEventModel { id = id1, type = DataEventType.UPDATE, data = null }); + } + + [Fact] + public async Task Should_create_correct_update_events_for_update_many() { + List> subjects = new List>(); + + mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())).Returns(Task.CompletedTask); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + + await testCachedDataService.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); + + mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); + subjects.Should() + .BeEquivalentTo( + new DataEventModel { id = id1, type = DataEventType.UPDATE, data = null }, + new DataEventModel { id = id2, type = DataEventType.UPDATE, data = null } + ); + } + + [Fact] + public async Task Should_create_correct_update_events_for_updates() { + List> subjects = new List>(); + + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask); + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())).Returns(Task.CompletedTask); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + + await testCachedDataService.Update(id1, "Name", "1"); + await testCachedDataService.Update(id2, Builders.Update.Set(x => x.Name, "2")); + await testCachedDataService.Update(x => x.id == id3, Builders.Update.Set(x => x.Name, "3")); + + mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(3)); + subjects.Should() + .BeEquivalentTo( + new DataEventModel { id = id1, type = DataEventType.UPDATE, data = null }, + new DataEventModel { id = id2, type = DataEventType.UPDATE, data = null }, + new DataEventModel { id = id3, type = DataEventType.UPDATE, data = null } + ); + } + } +} diff --git a/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs b/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs index d372b9a3..18597bf7 100644 --- a/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs +++ b/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs @@ -3,10 +3,10 @@ using Moq; using UKSF.Api.Data; using UKSF.Api.Interfaces.Data; -using UKSF.Tests.Unit.Common; +using UKSF.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Data { +namespace UKSF.Tests.Unit.Data { public class DataCollectionFactoryTests { [Fact] public void ShouldCreateDataCollection() { @@ -14,7 +14,7 @@ public void ShouldCreateDataCollection() { DataCollectionFactory dataCollectionFactory = new DataCollectionFactory(mockMongoDatabase.Object); - IDataCollection subject = dataCollectionFactory.CreateDataCollection("test"); + IDataCollection subject = dataCollectionFactory.CreateDataCollection("test"); subject.Should().NotBeNull(); } diff --git a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs new file mode 100644 index 00000000..bea4f281 --- /dev/null +++ b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs @@ -0,0 +1,154 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Threading.Tasks; +using FluentAssertions; +using MongoDB.Bson; +using MongoDB.Driver; +using Moq; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; +using UKSF.Tests.Common; +using Xunit; + +namespace UKSF.Tests.Unit.Data { + public class DataServiceEventTests { + private readonly string id1; + private readonly string id2; + private readonly string id3; + private readonly TestDataModel item1; + private readonly Mock> mockDataCollection; + private readonly Mock> mockDataEventBus; + private readonly TestDataService testDataService; + + public DataServiceEventTests() { + Mock mockDataCollectionFactory = new Mock(); + mockDataEventBus = new Mock>(); + mockDataCollection = new Mock>(); + id1 = ObjectId.GenerateNewId().ToString(); + id2 = ObjectId.GenerateNewId().ToString(); + id3 = ObjectId.GenerateNewId().ToString(); + item1 = new TestDataModel { id = id1, Name = "1" }; + TestDataModel item2 = new TestDataModel { id = id2, Name = "1" }; + TestDataModel item3 = new TestDataModel { id = id3, Name = "3" }; + List mockCollection = new List { item1, item2, item3 }; + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => mockCollection.Where(predicate)); + mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => mockCollection.FirstOrDefault(predicate)); + mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(id => mockCollection.FirstOrDefault(x => x.id == id)); + + testDataService = new TestDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + } + + [Fact] + public async Task Should_create_correct_add_event_for_add() { + DataEventModel subject = null; + + mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + + await testDataService.Add(item1); + + mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); + subject.Should().BeEquivalentTo(new DataEventModel { id = id1, type = DataEventType.ADD, data = item1 }); + } + + [Fact] + public async Task Should_create_correct_delete_event_for_delete() { + DataEventModel subject = null; + + mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + + await testDataService.Delete(new TestDataModel { id = id1 }); + + mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); + subject.Should().BeEquivalentTo(new DataEventModel { id = id1, type = DataEventType.DELETE, data = null }); + } + + [Fact] + public async Task Should_create_correct_delete_event_for_delete_by_id() { + DataEventModel subject = null; + + mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + + await testDataService.Delete(id1); + + mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); + subject.Should().BeEquivalentTo(new DataEventModel { id = id1, type = DataEventType.DELETE, data = null }); + } + + [Fact] + public async Task Should_create_correct_delete_events_for_delete_many() { + List> subjects = new List>(); + + mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())).Returns(Task.CompletedTask); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + + await testDataService.DeleteMany(x => x.Name == "1"); + + mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); + subjects.Should() + .BeEquivalentTo( + new DataEventModel { id = id1, type = DataEventType.DELETE, data = null }, + new DataEventModel { id = id2, type = DataEventType.DELETE, data = null } + ); + } + + [Fact] + public async Task Should_create_correct_update_event_for_replace() { + DataEventModel subject = null; + + mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + + await testDataService.Replace(item1); + + mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); + subject.Should().BeEquivalentTo(new DataEventModel { id = id1, type = DataEventType.UPDATE, data = null }); + } + + [Fact] + public async Task Should_create_correct_update_events_for_update_many() { + List> subjects = new List>(); + + mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())).Returns(Task.CompletedTask); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + + await testDataService.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); + + mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); + subjects.Should() + .BeEquivalentTo( + new DataEventModel { id = id1, type = DataEventType.UPDATE, data = null }, + new DataEventModel { id = id2, type = DataEventType.UPDATE, data = null } + ); + } + + [Fact] + public async Task Should_create_correct_update_events_for_updates() { + List> subjects = new List>(); + + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask); + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())).Returns(Task.CompletedTask); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + + await testDataService.Update(id1, "Name", "1"); + await testDataService.Update(id2, Builders.Update.Set(x => x.Name, "2")); + await testDataService.Update(x => x.id == id3, Builders.Update.Set(x => x.Name, "3")); + + mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(3)); + subjects.Should() + .BeEquivalentTo( + new DataEventModel { id = id1, type = DataEventType.UPDATE, data = null }, + new DataEventModel { id = id2, type = DataEventType.UPDATE, data = null }, + new DataEventModel { id = id3, type = DataEventType.UPDATE, data = null } + ); + } + } +} diff --git a/UKSF.Tests/Unit/Data/DataServiceTests.cs b/UKSF.Tests/Unit/Data/DataServiceTests.cs index 1d8298a2..e13e5ea3 100644 --- a/UKSF.Tests/Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceTests.cs @@ -10,267 +10,281 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; -using UKSF.Tests.Unit.Common; +using UKSF.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Data { +namespace UKSF.Tests.Unit.Data { public class DataServiceTests { - private readonly Mock> mockDataCollection; - private readonly MockDataService mockDataService; - private List mockCollection; + private readonly Mock> mockDataCollection; + private readonly TestDataService testDataService; + private List mockCollection; public DataServiceTests() { Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); + Mock> mockDataEventBus = new Mock>(); + mockDataCollection = new Mock>(); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataService = new MockDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + testDataService = new TestDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); } [Theory, InlineData(""), InlineData("1"), InlineData(null)] - public void ShouldThrowForDeleteForInvalidKey(string id) { - Func act = async () => await mockDataService.Delete(id); + public async Task Should_throw_for_delete_single_item_when_key_is_invalid(string id) { + Func act = async () => await testDataService.Delete(id); - act.Should().Throw(); + await act.Should().ThrowAsync(); } - // [Fact] - // public async Task ShouldDoNothingForDeleteManyWhenNoMatchingItems() { - // mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); - // - // await mockDataService.DeleteMany(null); - // - // mockDataCollection.Verify(x => x.DeleteManyAsync(It.IsAny>>()), Times.Never); - // } - [Theory, InlineData(""), InlineData("1"), InlineData(null)] - public void ShouldThrowForInvalidKey(string id) { - Action act = () => mockDataService.GetSingle(id); + public void Should_throw_for_get_single_item_when_key_is_invalid(string id) { + Action act = () => testDataService.GetSingle(id); act.Should().Throw(); } [Theory, InlineData(""), InlineData("1"), InlineData(null)] - public void ShouldThrowForUpdateForInvalidKey(string id) { - Func act = async () => await mockDataService.Update(id, "Name", null); + public async Task Should_throw_for_update_by_id_when_key_is_invalid(string id) { + Func act = async () => await testDataService.Update(id, "Name", null); - act.Should().Throw(); + await act.Should().ThrowAsync(); } - // [Fact] - // public void ShouldThrowForReplaceWhenItemNotFound() { - // MockDataModel item = new MockDataModel { Name = "1" }; - // - // Func act = async () => await mockDataService.Replace(item); - // - // act.Should().Throw(); - // } - // - // [Fact] - // public async Task ShouldDoNothingForUpdateManyWhenNoMatchingItems() { - // mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(new List()); - // - // await mockDataService.UpdateMany(null, null); - // - // mockDataCollection.Verify(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>()), Times.Never); - // } - [Theory, InlineData(""), InlineData("1"), InlineData(null)] - public void ShouldThrowForUpdateWithUpdateDefinitionForInvalidKey(string id) { - Func act = async () => await mockDataService.Update(id, Builders.Update.Set(x => x.Name, "2")); + public async Task Should_throw_for_update_by_update_definition_when_key_is_invalid(string id) { + Func act = async () => await testDataService.Update(id, Builders.Update.Set(x => x.Name, "2")); - act.Should().Throw(); + await act.Should().ThrowAsync(); } [Fact] - public async Task ShouldAddItem() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - mockCollection = new List(); + public async Task Should_add_single_item() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + mockCollection = new List(); - mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Callback(x => mockCollection.Add(x)); + mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Callback(x => mockCollection.Add(x)); - await mockDataService.Add(item1); + await testDataService.Add(item1); mockCollection.Should().Contain(item1); } [Fact] - public async Task ShouldDeleteItem() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - MockDataModel item2 = new MockDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + public async Task Should_delete_many_items() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { Name = "1" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) + .Returns(Task.CompletedTask) + .Callback((Expression> expression) => mockCollection.RemoveAll(x => mockCollection.Where(expression.Compile()).Contains(x))); - await mockDataService.Delete(item1.id); + await testDataService.DeleteMany(x => x.Name == "1"); - mockCollection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); + mockCollection.Should().BeEmpty(); } [Fact] - public void ShouldGetItem() { - MockDataModel item1 = new MockDataModel { Name = "1" }; + public async Task Should_delete_single_item_by_id() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); + mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); - MockDataModel subject = mockDataService.GetSingle(item1.id); + await testDataService.Delete(item1.id); - subject.Should().Be(item1); + mockCollection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); } [Fact] - public void ShouldGetItemByPredicate() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - MockDataModel item2 = new MockDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + public async Task Should_delete_single_item() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.First(x)); + mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); - MockDataModel subject = mockDataService.GetSingle(x => x.id == item1.id); + await testDataService.Delete(item1); - subject.Should().Be(item1); + mockCollection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); } [Fact] - public void ShouldGetItems() { + public void Should_get_all_items() { mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - IEnumerable subject = mockDataService.Get(); + IEnumerable subject = testDataService.Get(); subject.Should().BeSameAs(mockCollection); } [Fact] - public void ShouldGetItemsByPredicate() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - MockDataModel item2 = new MockDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + public void Should_get_items_matching_predicate() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockCollection.Where(x).ToList()); + mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockCollection.Where(x).ToList()); - IEnumerable subject = mockDataService.Get(x => x.id == item1.id); + IEnumerable subject = testDataService.Get(x => x.id == item1.id); subject.Should().HaveCount(1).And.Contain(item1); } [Fact] - public async Task ShouldMakeSetUpdate() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - mockCollection = new List { item1 }; - BsonValue expected = TestUtilities.Render(Builders.Update.Set(x => x.Name, "2")); - UpdateDefinition subject = null; + public void Should_get_single_item_by_id() { + TestDataModel item1 = new TestDataModel { Name = "1" }; - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) - .Returns(Task.CompletedTask) - .Callback((string x, UpdateDefinition y) => subject = y); + mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); - await mockDataService.Update(item1.id, "Name", "2"); + TestDataModel subject = testDataService.GetSingle(item1.id); - TestUtilities.Render(subject).Should().BeEquivalentTo(expected); + subject.Should().Be(item1); } [Fact] - public async Task ShouldMakeUnsetUpdate() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - mockCollection = new List { item1 }; - BsonValue expected = TestUtilities.Render(Builders.Update.Unset(x => x.Name)); - UpdateDefinition subject = null; + public void Should_get_single_item_matching_predicate() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { Name = "2" }; + mockCollection = new List { item1, item2 }; + + mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.First(x)); + + TestDataModel subject = testDataService.GetSingle(x => x.id == item1.id); - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + subject.Should().Be(item1); + } + + [Fact] + public async Task Should_replace_item() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { id = item1.id, Name = "2" }; + mockCollection = new List { item1 }; + + mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); + mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())) .Returns(Task.CompletedTask) - .Callback((string x, UpdateDefinition y) => subject = y); + .Callback((string id, TestDataModel item) => mockCollection[mockCollection.FindIndex(x => x.id == id)] = item); - await mockDataService.Update(item1.id, "Name", null); + await testDataService.Replace(item2); - TestUtilities.Render(subject).Should().BeEquivalentTo(expected); + mockCollection.Should().ContainSingle(); + mockCollection.First().Should().Be(item2); } [Fact] - public void ShouldThrowForAddWhenItemIsNull() { - Func act = async () => await mockDataService.Add(null); + public async Task Should_throw_for_add_when_item_is_null() { + Func act = async () => await testDataService.Add(null); + + await act.Should().ThrowAsync(); + } + + [Fact] + public async Task Should_update_item_by_filter_and_update_definition() { + TestDataModel item1 = new TestDataModel { id = "1", Name = "1" }; + mockCollection = new List { item1 }; + BsonValue expectedFilter = TestUtilities.RenderFilter(Builders.Filter.Where(x => x.Name == "1")); + BsonValue expectedUpdate = TestUtilities.RenderUpdate(Builders.Update.Set(x => x.Name, "2")); + FilterDefinition subjectFilter = null; + UpdateDefinition subjectUpdate = null; + + mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns(item1); + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback( + (FilterDefinition filter, UpdateDefinition update) => { + subjectFilter = filter; + subjectUpdate = update; + } + ); - act.Should().Throw(); + await testDataService.Update(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); + + TestUtilities.RenderFilter(subjectFilter).Should().BeEquivalentTo(expectedFilter); + TestUtilities.RenderUpdate(subjectUpdate).Should().BeEquivalentTo(expectedUpdate); } [Fact] - public async Task ShouldUpdateItemValue() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - mockCollection = new List { item1 }; + public async Task Should_update_item_by_id() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) - .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); - await mockDataService.Update(item1.id, "Name", "2"); + await testDataService.Update(item1.id, "Name", "2"); item1.Name.Should().Be("2"); } [Fact] - public async Task ShouldReplaceItem() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - MockDataModel item2 = new MockDataModel { id = item1.id, Name = "2" }; - mockCollection = new List { item1 }; + public async Task Should_update_item_by_update_definition() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); - mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())) + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) - .Callback((string id, MockDataModel item) => mockCollection[mockCollection.FindIndex(x => x.id == id)] = item); + .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); - await mockDataService.Replace(item2); + await testDataService.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); - mockCollection.Should().ContainSingle(); - mockCollection.First().Should().Be(item2); + item1.Name.Should().Be("2"); } [Fact] - public async Task ShouldUpdateItemValueByUpdateDefinition() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - mockCollection = new List { item1 }; + public async Task Should_update_item_with_set() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + mockCollection = new List { item1 }; + BsonValue expected = TestUtilities.RenderUpdate(Builders.Update.Set(x => x.Name, "2")); + UpdateDefinition subject = null; - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) - .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + .Callback((string x, UpdateDefinition y) => subject = y); - await mockDataService.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); + await testDataService.Update(item1.id, "Name", "2"); - item1.Name.Should().Be("2"); + TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); } [Fact] - public async Task ShouldUpdateMany() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - MockDataModel item2 = new MockDataModel { Name = "1" }; - mockCollection = new List { item1, item2 }; + public async Task Should_update_item_with_unset() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + mockCollection = new List { item1 }; + BsonValue expected = TestUtilities.RenderUpdate(Builders.Update.Unset(x => x.Name)); + UpdateDefinition subject = null; - mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())) + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) - .Callback((Expression> expression, UpdateDefinition _) => mockCollection.Where(expression.Compile()).ToList().ForEach(y => y.Name = "2")); + .Callback((string x, UpdateDefinition y) => subject = y); - await mockDataService.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); + await testDataService.Update(item1.id, "Name", null); - item1.Name.Should().Be("2"); - item2.Name.Should().Be("2"); + TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); } [Fact] - public async Task ShouldDeleteMany() { - MockDataModel item1 = new MockDataModel { Name = "1" }; - MockDataModel item2 = new MockDataModel { Name = "1" }; - mockCollection = new List { item1, item2 }; + public async Task Should_update_many_items() { + TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item2 = new TestDataModel { Name = "1" }; + mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) + mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(() => mockCollection); + mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())) .Returns(Task.CompletedTask) - .Callback((Expression> expression) => mockCollection.RemoveAll(x => mockCollection.Where(expression.Compile()).Contains(x))); + .Callback( + (Expression> expression, UpdateDefinition _) => + mockCollection.Where(expression.Compile()).ToList().ForEach(y => y.Name = "2") + ); - await mockDataService.DeleteMany(x => x.Name == "1"); + await testDataService.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); - mockCollection.Should().BeEmpty(); + item1.Name.Should().Be("2"); + item2.Name.Should().Be("2"); } } } diff --git a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs index b70e662a..ff1424d7 100644 --- a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs @@ -3,19 +3,18 @@ using Moq; using UKSF.Api.Data.Game; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Game; using Xunit; -namespace UKSF.Tests.Unit.Unit.Data.Game { +namespace UKSF.Tests.Unit.Data.Game { public class GameServersDataServiceTests { - private readonly Mock> mockDataCollection; private readonly GameServersDataService gameServersDataService; + private readonly Mock> mockDataCollection; public GameServersDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); + Mock> mockDataEventBus = new Mock>(); mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); @@ -24,12 +23,12 @@ public GameServersDataServiceTests() { } [Fact] - public void ShouldGetSortedCollection() { - GameServer rank1 = new GameServer {order = 2}; - GameServer rank2 = new GameServer {order = 0}; - GameServer rank3 = new GameServer {order = 1}; + public void Should_get_collection_in_order() { + GameServer rank1 = new GameServer { order = 2 }; + GameServer rank2 = new GameServer { order = 0 }; + GameServer rank3 = new GameServer { order = 1 }; - mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); + mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); IEnumerable subject = gameServersDataService.Get(); diff --git a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs index 8d7f8bc4..6fd0ada1 100644 --- a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs @@ -6,14 +6,13 @@ using Moq; using UKSF.Api.Data.Message; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; using UKSF.Api.Models.Message; -using UKSF.Tests.Unit.Common; +using UKSF.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Data.Message { +namespace UKSF.Tests.Unit.Data.Message { public class CommentThreadDataServiceTests { private readonly CommentThreadDataService commentThreadDataService; private readonly Mock> mockDataCollection; @@ -21,7 +20,7 @@ public class CommentThreadDataServiceTests { public CommentThreadDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); + Mock> mockDataEventBus = new Mock>(); mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); @@ -36,7 +35,7 @@ public async Task ShouldCreateCorrectUdpateDefinitionForAdd() { mockCollection = new List { commentThread }; Comment comment = new Comment { author = ObjectId.GenerateNewId().ToString(), content = "Hello there" }; - BsonValue expected = TestUtilities.Render(Builders.Update.Push(x => x.comments, comment)); + BsonValue expected = TestUtilities.RenderUpdate(Builders.Update.Push(x => x.comments, comment)); UpdateDefinition subject = null; mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) @@ -45,7 +44,7 @@ public async Task ShouldCreateCorrectUdpateDefinitionForAdd() { await commentThreadDataService.Update(commentThread.id, comment, DataEventType.ADD); - TestUtilities.Render(subject).Should().BeEquivalentTo(expected); + TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); } [Fact] @@ -54,7 +53,7 @@ public async Task ShouldCreateCorrectUdpateDefinitionForDelete() { mockCollection = new List { commentThread }; Comment comment = new Comment { author = ObjectId.GenerateNewId().ToString(), content = "Hello there" }; - BsonValue expected = TestUtilities.Render(Builders.Update.Pull(x => x.comments, comment)); + BsonValue expected = TestUtilities.RenderUpdate(Builders.Update.Pull(x => x.comments, comment)); UpdateDefinition subject = null; mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) @@ -63,7 +62,7 @@ public async Task ShouldCreateCorrectUdpateDefinitionForDelete() { await commentThreadDataService.Update(commentThread.id, comment, DataEventType.DELETE); - TestUtilities.Render(subject).Should().BeEquivalentTo(expected); + TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); } } } diff --git a/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs index 8be2971b..2a339f47 100644 --- a/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs @@ -8,16 +8,16 @@ using UKSF.Api.Models.Message.Logging; using Xunit; -namespace UKSF.Tests.Unit.Unit.Data.Message { +namespace UKSF.Tests.Unit.Data.Message { public class LogDataServiceTests { - private readonly List mockBasicCollection; + private readonly LogDataService logDataService; private readonly List mockAuditCollection; - private readonly List mockLauncherCollection; + private readonly List mockBasicCollection; private readonly List mockErrorCollection; - private readonly LogDataService logDataService; + private readonly List mockLauncherCollection; public LogDataServiceTests() { - Mock> mockDataEventBus = new Mock>(); + Mock> mockDataEventBus = new Mock>(); Mock mockDataCollectionFactory = new Mock(); Mock> mockBasicDataCollection = new Mock>(); @@ -31,11 +31,8 @@ public LogDataServiceTests() { mockErrorCollection = new List(); mockBasicDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockBasicCollection.Add(x)); - mockAuditDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockAuditCollection.Add(x)); - mockLauncherDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockLauncherCollection.Add(x)); - mockErrorDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockErrorCollection.Add(x)); mockDataCollectionFactory.Setup(x => x.CreateDataCollection("logs")).Returns(mockBasicDataCollection.Object); @@ -47,27 +44,45 @@ public LogDataServiceTests() { } [Fact] - public async Task ShouldUseLogCollection() { - BasicLogMessage logMessage = new BasicLogMessage("test"); + public async Task ShouldUseAuditLogCollection() { + AuditLogMessage logMessage = new AuditLogMessage(); await logDataService.Add(logMessage); - mockBasicCollection.Should().ContainSingle().And.Contain(logMessage); - mockAuditCollection.Should().BeEmpty(); + mockBasicCollection.Should().BeEmpty(); + mockAuditCollection.Should().ContainSingle().And.Contain(logMessage); mockLauncherCollection.Should().BeEmpty(); mockErrorCollection.Should().BeEmpty(); } [Fact] - public async Task ShouldUseAuditLogCollection() { - AuditLogMessage logMessage = new AuditLogMessage(); + public async Task ShouldUseCorrectCollection() { + BasicLogMessage basicLogMessage = new BasicLogMessage("test"); + AuditLogMessage auditLogMessage = new AuditLogMessage(); + LauncherLogMessage launcherLogMessage = new LauncherLogMessage("1", "test"); + WebLogMessage webLogMessage = new WebLogMessage(); + + await logDataService.Add(basicLogMessage); + await logDataService.Add(auditLogMessage); + await logDataService.Add(launcherLogMessage); + await logDataService.Add(webLogMessage); + + mockBasicCollection.Should().ContainSingle().And.Contain(basicLogMessage); + mockAuditCollection.Should().ContainSingle().And.Contain(auditLogMessage); + mockLauncherCollection.Should().ContainSingle().And.Contain(launcherLogMessage); + mockErrorCollection.Should().ContainSingle().And.Contain(webLogMessage); + } + + [Fact] + public async Task ShouldUseErrorLogCollection() { + WebLogMessage logMessage = new WebLogMessage(); await logDataService.Add(logMessage); mockBasicCollection.Should().BeEmpty(); - mockAuditCollection.Should().ContainSingle().And.Contain(logMessage); + mockAuditCollection.Should().BeEmpty(); mockLauncherCollection.Should().BeEmpty(); - mockErrorCollection.Should().BeEmpty(); + mockErrorCollection.Should().ContainSingle().And.Contain(logMessage); } [Fact] @@ -83,33 +98,15 @@ public async Task ShouldUseLauncherLogCollection() { } [Fact] - public async Task ShouldUseErrorLogCollection() { - WebLogMessage logMessage = new WebLogMessage(); + public async Task ShouldUseLogCollection() { + BasicLogMessage logMessage = new BasicLogMessage("test"); await logDataService.Add(logMessage); - mockBasicCollection.Should().BeEmpty(); + mockBasicCollection.Should().ContainSingle().And.Contain(logMessage); mockAuditCollection.Should().BeEmpty(); mockLauncherCollection.Should().BeEmpty(); - mockErrorCollection.Should().ContainSingle().And.Contain(logMessage); - } - - [Fact] - public async Task ShouldUseCorrectCollection() { - BasicLogMessage basicLogMessage = new BasicLogMessage("test"); - AuditLogMessage auditLogMessage = new AuditLogMessage(); - LauncherLogMessage launcherLogMessage = new LauncherLogMessage("1", "test"); - WebLogMessage webLogMessage = new WebLogMessage(); - - await logDataService.Add(basicLogMessage); - await logDataService.Add(auditLogMessage); - await logDataService.Add(launcherLogMessage); - await logDataService.Add(webLogMessage); - - mockBasicCollection.Should().ContainSingle().And.Contain(basicLogMessage); - mockAuditCollection.Should().ContainSingle().And.Contain(auditLogMessage); - mockLauncherCollection.Should().ContainSingle().And.Contain(launcherLogMessage); - mockErrorCollection.Should().ContainSingle().And.Contain(webLogMessage); + mockErrorCollection.Should().BeEmpty(); } } } diff --git a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs new file mode 100644 index 00000000..af6611d5 --- /dev/null +++ b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs @@ -0,0 +1,78 @@ +using System.Collections.Generic; +using System.Linq; +using FluentAssertions; +using MongoDB.Bson; +using MongoDB.Driver; +using Moq; +using UKSF.Api.Data.Modpack; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Events; +using UKSF.Api.Models.Modpack; +using Xunit; + +namespace UKSF.Tests.Unit.Data.Modpack { + public class BuildsDataServiceTests { + private readonly BuildsDataService buildsDataService; + private readonly Mock> mockDataCollection; + private readonly Mock> mockDataEventBus; + + public BuildsDataServiceTests() { + Mock mockDataCollectionFactory = new Mock(); + mockDataEventBus = new Mock>(); + mockDataCollection = new Mock>(); + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + + buildsDataService = new BuildsDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + } + + [Fact] + public void Should_get_collection_in_order() { + ModpackBuild item1 = new ModpackBuild { buildNumber = 4 }; + ModpackBuild item2 = new ModpackBuild { buildNumber = 10 }; + ModpackBuild item3 = new ModpackBuild { buildNumber = 9 }; + + mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); + + IEnumerable subject = buildsDataService.Get(); + + subject.Should().ContainInOrder(item2, item3, item1); + } + + [Fact] + public void Should_update_build_step_with_event() { + string id = ObjectId.GenerateNewId().ToString(); + ModpackBuildStep modpackBuildStep = new ModpackBuildStep("step") { index = 0, running = false }; + ModpackBuild modpackBuild = new ModpackBuild { id = id, buildNumber = 1, steps = new List { modpackBuildStep } }; + DataEventModel subject = null; + + mockDataCollection.Setup(x => x.Get()).Returns(new List()); + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + .Callback(() => { modpackBuild.steps.First().running = true; }); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(x => subject = x); + + buildsDataService.Update(modpackBuild, modpackBuildStep); + + modpackBuildStep.running.Should().BeTrue(); + subject.data.Should().NotBeNull(); + subject.data.Should().Be(modpackBuildStep); + } + + [Fact] + public void Should_update_build_with_event_data() { + string id = ObjectId.GenerateNewId().ToString(); + DataEventModel subject = null; + + mockDataCollection.Setup(x => x.Get()).Returns(new List()); + mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())); + mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(x => subject = x); + + ModpackBuild modpackBuild = new ModpackBuild { id = id, buildNumber = 1 }; + buildsDataService.Update(modpackBuild, Builders.Update.Set(x => x.running, true)); + + subject.data.Should().NotBeNull(); + subject.data.Should().Be(modpackBuild); + } + } +} diff --git a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs new file mode 100644 index 00000000..962b3e7d --- /dev/null +++ b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs @@ -0,0 +1,38 @@ +using System.Collections.Generic; +using FluentAssertions; +using Moq; +using UKSF.Api.Data.Modpack; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Events; +using UKSF.Api.Models.Modpack; +using Xunit; + +namespace UKSF.Tests.Unit.Data.Modpack { + public class ReleasesDataServiceTests { + private readonly ReleasesDataService releasesDataService; + private readonly Mock> mockDataCollection; + + public ReleasesDataServiceTests() { + Mock mockDataCollectionFactory = new Mock(); + Mock> mockDataEventBus = new Mock>(); + mockDataCollection = new Mock>(); + + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + + releasesDataService = new ReleasesDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + } + + [Fact] + public void Should_get_collection_in_order() { + ModpackRelease item1 = new ModpackRelease { version = "4.19.11" }; + ModpackRelease item2 = new ModpackRelease { version = "5.19.6" }; + ModpackRelease item3 = new ModpackRelease { version = "5.18.8" }; + + mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); + + IEnumerable subject = releasesDataService.Get(); + + subject.Should().ContainInOrder(item2, item3, item1); + } + } +} diff --git a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs index 091a1772..c958f71b 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs @@ -4,19 +4,18 @@ using Moq; using UKSF.Api.Data.Operations; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Operations; using Xunit; -namespace UKSF.Tests.Unit.Unit.Data.Operations { +namespace UKSF.Tests.Unit.Data.Operations { public class OperationOrderDataServiceTests { private readonly Mock> mockDataCollection; private readonly OperationOrderDataService operationOrderDataService; public OperationOrderDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); + Mock> mockDataEventBus = new Mock>(); mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); @@ -25,7 +24,7 @@ public OperationOrderDataServiceTests() { } [Fact] - public void ShouldGetOrderedCollection() { + public void Should_get_collection_in_order() { Opord item1 = new Opord { start = DateTime.Now.AddDays(-1) }; Opord item2 = new Opord { start = DateTime.Now.AddDays(-2) }; Opord item3 = new Opord { start = DateTime.Now.AddDays(-3) }; diff --git a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs index 8e934a88..1106e6dd 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs @@ -4,19 +4,18 @@ using Moq; using UKSF.Api.Data.Operations; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Operations; using Xunit; -namespace UKSF.Tests.Unit.Unit.Data.Operations { +namespace UKSF.Tests.Unit.Data.Operations { public class OperationReportDataServiceTests { private readonly Mock> mockDataCollection; private readonly OperationReportDataService operationReportDataService; public OperationReportDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); + Mock> mockDataEventBus = new Mock>(); mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); @@ -25,7 +24,7 @@ public OperationReportDataServiceTests() { } [Fact] - public void ShouldGetOrderedCollection() { + public void Should_get_collection_in_order() { Oprep item1 = new Oprep { start = DateTime.Now.AddDays(-1) }; Oprep item2 = new Oprep { start = DateTime.Now.AddDays(-2) }; Oprep item3 = new Oprep { start = DateTime.Now.AddDays(-3) }; diff --git a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs index a99ba8a9..9f70ce07 100644 --- a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -4,31 +4,34 @@ using Moq; using UKSF.Api.Data.Personnel; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Unit.Data.Personnel { +namespace UKSF.Tests.Unit.Data.Personnel { public class DischargeDataServiceTests { [Fact] - public void ShouldGetOrderedCollection() { + public void Should_get_collection_in_order() { Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); + Mock> mockDataEventBus = new Mock>(); Mock> mockDataCollection = new Mock>(); - DischargeCollection dischargeCollection1 = new DischargeCollection {discharges = new List {new Discharge {timestamp = DateTime.Now.AddDays(-3)}}}; - DischargeCollection dischargeCollection2 = new DischargeCollection {discharges = new List {new Discharge {timestamp = DateTime.Now.AddDays(-10)}, new Discharge {timestamp = DateTime.Now.AddDays(-1)}}}; - DischargeCollection dischargeCollection3 = new DischargeCollection {discharges = new List {new Discharge {timestamp = DateTime.Now.AddDays(-5)}, new Discharge {timestamp = DateTime.Now.AddDays(-2)}}}; + DischargeCollection item1 = new DischargeCollection { discharges = new List { new Discharge { timestamp = DateTime.Now.AddDays(-3) } } }; + DischargeCollection item2 = new DischargeCollection { + discharges = new List { new Discharge { timestamp = DateTime.Now.AddDays(-10) }, new Discharge { timestamp = DateTime.Now.AddDays(-1) } } + }; + DischargeCollection item3 = new DischargeCollection { + discharges = new List { new Discharge { timestamp = DateTime.Now.AddDays(-5) }, new Discharge { timestamp = DateTime.Now.AddDays(-2) } } + }; mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(new List {dischargeCollection1, dischargeCollection2, dischargeCollection3}); + mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); DischargeDataService dischargeDataService = new DischargeDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); IEnumerable subject = dischargeDataService.Get(); - subject.Should().ContainInOrder(dischargeCollection2, dischargeCollection3, dischargeCollection1); + subject.Should().ContainInOrder(item2, item3, item1); } } } diff --git a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs index b5320a72..b4857eae 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs @@ -3,19 +3,18 @@ using Moq; using UKSF.Api.Data.Personnel; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Unit.Data.Personnel { +namespace UKSF.Tests.Unit.Data.Personnel { public class RanksDataServiceTests { private readonly Mock> mockDataCollection; private readonly RanksDataService ranksDataService; public RanksDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); + Mock> mockDataEventBus = new Mock>(); mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); @@ -24,7 +23,7 @@ public RanksDataServiceTests() { } [Theory, InlineData(""), InlineData(null)] - public void ShouldGetNothingWhenNoNameOrNull(string name) { + public void Should_return_nothing_for_empty_or_null_name(string name) { mockDataCollection.Setup(x => x.Get()).Returns(new List()); Rank subject = ranksDataService.GetSingle(name); @@ -33,7 +32,7 @@ public void ShouldGetNothingWhenNoNameOrNull(string name) { } [Fact] - public void ShouldGetSingleByName() { + public void Should_return_item_by_name() { Rank rank1 = new Rank { name = "Private", order = 2 }; Rank rank2 = new Rank { name = "Recruit", order = 1 }; Rank rank3 = new Rank { name = "Candidate", order = 0 }; @@ -46,7 +45,7 @@ public void ShouldGetSingleByName() { } [Fact] - public void ShouldGetSortedCollection() { + public void Should_return_collection_in_order() { Rank rank1 = new Rank { order = 2 }; Rank rank2 = new Rank { order = 0 }; Rank rank3 = new Rank { order = 1 }; diff --git a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs index 74a34e6e..154dd2d3 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs @@ -3,19 +3,18 @@ using Moq; using UKSF.Api.Data.Personnel; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Unit.Data.Personnel { +namespace UKSF.Tests.Unit.Data.Personnel { public class RolesDataServiceTests { private readonly Mock> mockDataCollection; private readonly RolesDataService rolesDataService; public RolesDataServiceTests() { Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); + Mock> mockDataEventBus = new Mock>(); mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); @@ -23,39 +22,39 @@ public RolesDataServiceTests() { rolesDataService = new RolesDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } - [Fact] - public void ShouldGetSortedCollection() { - Role role1 = new Role {name = "Rifleman"}; - Role role2 = new Role {name = "Trainee"}; - Role role3 = new Role {name = "Marksman"}; - - mockDataCollection.Setup(x => x.Get()).Returns(new List {role1, role2, role3}); + [Theory, InlineData(""), InlineData(null)] + public void ShouldGetNothingWhenNoName(string name) { + mockDataCollection.Setup(x => x.Get()).Returns(new List()); - IEnumerable subject = rolesDataService.Get(); + Role subject = rolesDataService.GetSingle(name); - subject.Should().ContainInOrder(role3, role1, role2); + subject.Should().Be(null); } [Fact] public void ShouldGetSingleByName() { - Role role1 = new Role {name = "Rifleman"}; - Role role2 = new Role {name = "Trainee"}; - Role role3 = new Role {name = "Marksman"}; + Role role1 = new Role { name = "Rifleman" }; + Role role2 = new Role { name = "Trainee" }; + Role role3 = new Role { name = "Marksman" }; - mockDataCollection.Setup(x => x.Get()).Returns(new List {role1, role2, role3}); + mockDataCollection.Setup(x => x.Get()).Returns(new List { role1, role2, role3 }); Role subject = rolesDataService.GetSingle("Trainee"); subject.Should().Be(role2); } - [Theory, InlineData(""), InlineData(null)] - public void ShouldGetNothingWhenNoName(string name) { - mockDataCollection.Setup(x => x.Get()).Returns(new List()); + [Fact] + public void Should_get_collection_in_order() { + Role role1 = new Role { name = "Rifleman" }; + Role role2 = new Role { name = "Trainee" }; + Role role3 = new Role { name = "Marksman" }; - Role subject = rolesDataService.GetSingle(name); + mockDataCollection.Setup(x => x.Get()).Returns(new List { role1, role2, role3 }); - subject.Should().Be(null); + IEnumerable subject = rolesDataService.Get(); + + subject.Should().ContainInOrder(role3, role1, role2); } } } diff --git a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs index 52d87f6c..0ca265ef 100644 --- a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs @@ -1,66 +1,40 @@ using Moq; using UKSF.Api.Data.Command; using UKSF.Api.Data.Launcher; +using UKSF.Api.Data.Message; using UKSF.Api.Data.Personnel; using UKSF.Api.Data.Utility; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Command; using UKSF.Api.Models.Launcher; +using UKSF.Api.Models.Message; using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Utility; using Xunit; -namespace UKSF.Tests.Unit.Unit.Data { +namespace UKSF.Tests.Unit.Data { public class SimpleDataServiceTests { - private readonly Mock mockDataCollectionFactory; - - public SimpleDataServiceTests() => mockDataCollectionFactory = new Mock(); - [Fact] - public void ShouldCreateConfirmationCodeDataCollection() { - Mock> mockDataEventBus = new Mock>(); - - ConfirmationCodeDataService unused = new ConfirmationCodeDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); - + public void Should_create_collections() { + Mock mockDataCollectionFactory = new Mock(); + + AccountDataService unused1 = new AccountDataService(mockDataCollectionFactory.Object, new Mock>().Object); + CommandRequestDataService unused2 = new CommandRequestDataService(mockDataCollectionFactory.Object, new Mock>().Object); + CommandRequestArchiveDataService unused3 = new CommandRequestArchiveDataService(mockDataCollectionFactory.Object, new Mock>().Object); + ConfirmationCodeDataService unused4 = new ConfirmationCodeDataService(mockDataCollectionFactory.Object, new Mock>().Object); + LauncherFileDataService unused5 = new LauncherFileDataService(mockDataCollectionFactory.Object, new Mock>().Object); + LoaDataService unused6 = new LoaDataService(mockDataCollectionFactory.Object, new Mock>().Object); + NotificationsDataService unused7 = new NotificationsDataService(mockDataCollectionFactory.Object, new Mock>().Object); + SchedulerDataService unused8 = new SchedulerDataService(mockDataCollectionFactory.Object, new Mock>().Object); + + mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); + mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Exactly(2)); mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); - } - - [Fact] - public void ShouldCreateSchedulerDataCollection() { - Mock> mockDataEventBus = new Mock>(); - - SchedulerDataService unused = new SchedulerDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); - - mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); - } - - [Fact] - public void ShouldCreateCommandRequestArchiveDataCollection() { - Mock> mockDataEventBus = new Mock>(); - - CommandRequestArchiveDataService unused = new CommandRequestArchiveDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); - - mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); - } - - [Fact] - public void ShouldCreateLoaDataCollection() { - Mock> mockDataEventBus = new Mock>(); - - LoaDataService unused = new LoaDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); - - mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); - } - - [Fact] - public void ShouldCreateLauncherFileDataCollection() { - Mock> mockDataEventBus = new Mock>(); - - LauncherFileDataService unused = new LauncherFileDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); - mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); + mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); + mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); + mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); } } } diff --git a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index 7c9ca11c..5ab57a12 100644 --- a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -3,30 +3,29 @@ using Moq; using UKSF.Api.Data.Units; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Units; using Xunit; -using UksfUnit = UKSF.Api.Models.Units.Unit; +using UUnit = UKSF.Api.Models.Units.Unit; -namespace UKSF.Tests.Unit.Unit.Data.Units { +namespace UKSF.Tests.Unit.Data.Units { public class UnitsDataServiceTests { [Fact] - public void ShouldGetOrderedCollection() { + public void Should_get_collection_in_order() { Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - Mock> mockDataCollection = new Mock>(); + Mock> mockDataEventBus = new Mock>(); + Mock> mockDataCollection = new Mock>(); - UksfUnit rank1 = new UksfUnit {name = "Air Troop", order = 2}; - UksfUnit rank2 = new UksfUnit {name = "UKSF", order = 0}; - UksfUnit rank3 = new UksfUnit {name = "SAS", order = 1}; + UUnit rank1 = new UUnit { name = "Air Troop", order = 2 }; + UUnit rank2 = new UUnit { name = "UKSF", order = 0 }; + UUnit rank3 = new UUnit { name = "SAS", order = 1 }; - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3}); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); UnitsDataService unitsDataService = new UnitsDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); - IEnumerable subject = unitsDataService.Get(); + IEnumerable subject = unitsDataService.Get(); subject.Should().ContainInOrder(rank2, rank3, rank1); } @@ -34,20 +33,20 @@ public void ShouldGetOrderedCollection() { [Fact] public void ShouldGetOrderedCollectionFromPredicate() { Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - Mock> mockDataCollection = new Mock>(); + Mock> mockDataEventBus = new Mock>(); + Mock> mockDataCollection = new Mock>(); - UksfUnit rank1 = new UksfUnit {name = "Air Troop", order = 3, type = UnitType.SECTION}; - UksfUnit rank2 = new UksfUnit {name = "Boat Troop", order = 2, type = UnitType.SECTION}; - UksfUnit rank3 = new UksfUnit {name = "UKSF", order = 0, type = UnitType.TASKFORCE}; - UksfUnit rank4 = new UksfUnit {name = "SAS", order = 1, type = UnitType.REGIMENT}; + UUnit rank1 = new UUnit { name = "Air Troop", order = 3, type = UnitType.SECTION }; + UUnit rank2 = new UUnit { name = "Boat Troop", order = 2, type = UnitType.SECTION }; + UUnit rank3 = new UUnit { name = "UKSF", order = 0, type = UnitType.TASKFORCE }; + UUnit rank4 = new UUnit { name = "SAS", order = 1, type = UnitType.REGIMENT }; - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(new List {rank1, rank2, rank3, rank4}); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3, rank4 }); UnitsDataService unitsDataService = new UnitsDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); - IEnumerable subject = unitsDataService.Get(x => x.type == UnitType.SECTION); + IEnumerable subject = unitsDataService.Get(x => x.type == UnitType.SECTION); subject.Should().ContainInOrder(rank2, rank1); } diff --git a/UKSF.Tests/Unit/Events/DataEventBackerTests.cs b/UKSF.Tests/Unit/Events/DataEventBackerTests.cs deleted file mode 100644 index a4cb05de..00000000 --- a/UKSF.Tests/Unit/Events/DataEventBackerTests.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using FluentAssertions; -using Moq; -using UKSF.Api.Events.Data; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Events; -using UKSF.Tests.Unit.Common; -using Xunit; - -namespace UKSF.Tests.Unit.Unit.Events { - public class DataEventBackerTests { - private readonly MockDataService mockDataService; - - public DataEventBackerTests() { - Mock mockDataCollectionFactory = new Mock(); - IDataEventBus dataEventBus = new DataEventBus(); - Mock> mockDataCollection = new Mock>(); - - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - - mockDataService = new MockDataService(mockDataCollectionFactory.Object, dataEventBus, "test"); - } - - [Fact] - public void ShouldReturnEventBus() { - IObservable> subject = mockDataService.EventBus(); - - subject.Should().NotBeNull(); - } - - [Fact] - public void ShouldSendEvent() { - MockDataModel item1 = new MockDataModel {Name = "1"}; - string id = item1.id; - - DataEventModel subject = null; - mockDataService.EventBus().Subscribe(x => { subject = x; }); - mockDataService.Add(item1); - - subject.Should().NotBeNull(); - subject.id.Should().Be(id); - subject.type.Should().Be(DataEventType.ADD); - subject.data.Should().Be(item1); - } - } -} diff --git a/UKSF.Tests/Unit/Events/EventBusTests.cs b/UKSF.Tests/Unit/Events/EventBusTests.cs index 318c0373..812f1257 100644 --- a/UKSF.Tests/Unit/Events/EventBusTests.cs +++ b/UKSF.Tests/Unit/Events/EventBusTests.cs @@ -2,18 +2,19 @@ using FluentAssertions; using UKSF.Api.Events; using UKSF.Api.Models.Events; -using UKSF.Tests.Unit.Common; +using UKSF.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Events { +namespace UKSF.Tests.Unit.Events { public class EventBusTests { [Fact] - public void ShouldReturnObservable() { - EventBus> eventBus = new EventBus>(); + public void Should_return_observable() { + EventBus> eventBus = new EventBus>(); - IObservable> subject = eventBus.AsObservable(); + IObservable> subject = eventBus.AsObservable(); subject.Should().NotBeNull(); + subject.Should().BeAssignableTo>>(); } } } diff --git a/UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs b/UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs index 40f31ee1..cab195b2 100644 --- a/UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs +++ b/UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs @@ -3,7 +3,7 @@ using UKSF.Api.Interfaces.Events.Handlers; using Xunit; -namespace UKSF.Tests.Unit.Unit.Events { +namespace UKSF.Tests.Unit.Events { public class EventHandlerInitialiserTests { [Fact] public void ShouldInitEventHandlers() { diff --git a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs index 248c3d2e..899fff45 100644 --- a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs @@ -1,12 +1,9 @@ using System; using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Data.Personnel; -using UKSF.Api.Data.Units; using UKSF.Api.Events.Data; using UKSF.Api.Events.Handlers; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; using UKSF.Api.Models.Events; @@ -14,49 +11,48 @@ using UKSF.Api.Signalr.Hubs.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Unit.Events.Handlers { +namespace UKSF.Tests.Unit.Events.Handlers { public class AccountEventHandlerTests { - private readonly DataEventBus accountDataEventBus; + private readonly DataEventBus accountDataEventBus; private readonly AccountEventHandler accountEventHandler; private readonly Mock> mockAccountHub; - private readonly DataEventBus unitsDataEventBus; - private Mock mockLoggingService; + private readonly Mock mockLoggingService; + private readonly DataEventBus unitsDataEventBus; public AccountEventHandlerTests() { Mock mockDataCollectionFactory = new Mock(); mockLoggingService = new Mock(); mockAccountHub = new Mock>(); - accountDataEventBus = new DataEventBus(); - unitsDataEventBus = new DataEventBus(); - IAccountDataService accountDataService = new AccountDataService(mockDataCollectionFactory.Object, accountDataEventBus); - IUnitsDataService unitsDataService = new UnitsDataService(mockDataCollectionFactory.Object, unitsDataEventBus); + accountDataEventBus = new DataEventBus(); + unitsDataEventBus = new DataEventBus(); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); - accountEventHandler = new AccountEventHandler(accountDataService, unitsDataService, mockAccountHub.Object, mockLoggingService.Object); + accountEventHandler = new AccountEventHandler(accountDataEventBus, unitsDataEventBus, mockAccountHub.Object, mockLoggingService.Object); } [Fact] - public void ShouldNotRunEvent() { + public void ShouldLogOnException() { Mock> mockHubClients = new Mock>(); Mock mockAccountClient = new Mock(); mockAccountHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockAccountClient.Object); - mockAccountClient.Setup(x => x.ReceiveAccountUpdate()); + mockAccountClient.Setup(x => x.ReceiveAccountUpdate()).Throws(new Exception()); + mockLoggingService.Setup(x => x.Log(It.IsAny())); accountEventHandler.Init(); - accountDataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); - unitsDataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); + accountDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); - mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Never); + mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Exactly(2)); } [Fact] - public void ShouldRunEventOnUpdate() { + public void ShouldNotRunEvent() { Mock> mockHubClients = new Mock>(); Mock mockAccountClient = new Mock(); @@ -66,28 +62,27 @@ public void ShouldRunEventOnUpdate() { accountEventHandler.Init(); - accountDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); - unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + accountDataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); + unitsDataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); - mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Exactly(2)); + mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Never); } [Fact] - public void ShouldLogOnException() { + public void ShouldRunEventOnUpdate() { Mock> mockHubClients = new Mock>(); Mock mockAccountClient = new Mock(); mockAccountHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockAccountClient.Object); - mockAccountClient.Setup(x => x.ReceiveAccountUpdate()).Throws(new Exception()); - mockLoggingService.Setup(x => x.Log(It.IsAny())); + mockAccountClient.Setup(x => x.ReceiveAccountUpdate()); accountEventHandler.Init(); - accountDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); - unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + accountDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); - mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Exactly(2)); + mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Exactly(2)); } } } diff --git a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs index 0a65f8ec..23d9d532 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs @@ -1,11 +1,9 @@ using System; using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Data.Command; using UKSF.Api.Events.Data; using UKSF.Api.Events.Handlers; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; using UKSF.Api.Models.Command; @@ -13,24 +11,34 @@ using UKSF.Api.Signalr.Hubs.Command; using Xunit; -namespace UKSF.Tests.Unit.Unit.Events.Handlers { +namespace UKSF.Tests.Unit.Events.Handlers { public class CommandRequestEventHandlerTests { private readonly CommandRequestEventHandler commandRequestEventHandler; - private readonly DataEventBus dataEventBus; + private readonly DataEventBus dataEventBus; private readonly Mock> mockHub; - private Mock mockLoggingService; + private readonly Mock mockLoggingService; public CommandRequestEventHandlerTests() { Mock mockDataCollectionFactory = new Mock(); mockLoggingService = new Mock(); mockHub = new Mock>(); - dataEventBus = new DataEventBus(); - ICommandRequestDataService dataService = new CommandRequestDataService(mockDataCollectionFactory.Object, dataEventBus); + dataEventBus = new DataEventBus(); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); - commandRequestEventHandler = new CommandRequestEventHandler(dataService, mockHub.Object, mockLoggingService.Object); + commandRequestEventHandler = new CommandRequestEventHandler(dataEventBus, mockHub.Object, mockLoggingService.Object); + } + + [Fact] + public void ShouldLogOnException() { + mockLoggingService.Setup(x => x.Log(It.IsAny())); + + commandRequestEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = (DataEventType) 5 }); + + mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); } [Fact] @@ -44,7 +52,7 @@ public void ShouldNotRunEventOnDelete() { commandRequestEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); + dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); mockClient.Verify(x => x.ReceiveRequestUpdate(), Times.Never); } @@ -60,21 +68,10 @@ public void ShouldRunEventOnUpdateAndAdd() { commandRequestEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); - dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); + dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); mockClient.Verify(x => x.ReceiveRequestUpdate(), Times.Exactly(2)); } - - [Fact] - public void ShouldLogOnException() { - mockLoggingService.Setup(x => x.Log(It.IsAny())); - - commandRequestEventHandler.Init(); - - dataEventBus.Send(new DataEventModel { type = (DataEventType) 5 }); - - mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); - } } } diff --git a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs index b5751f5c..50624f52 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs @@ -1,11 +1,9 @@ using System; using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Data.Message; using UKSF.Api.Events.Data; using UKSF.Api.Events.Handlers; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; using UKSF.Api.Models.Events; @@ -13,10 +11,10 @@ using UKSF.Api.Signalr.Hubs.Message; using Xunit; -namespace UKSF.Tests.Unit.Unit.Events.Handlers { +namespace UKSF.Tests.Unit.Events.Handlers { public class CommentThreadEventHandlerTests { private readonly CommentThreadEventHandler commentThreadEventHandler; - private readonly DataEventBus dataEventBus; + private readonly DataEventBus dataEventBus; private readonly Mock> mockHub; private readonly Mock mockLoggingService; @@ -26,13 +24,23 @@ public CommentThreadEventHandlerTests() { mockLoggingService = new Mock(); mockHub = new Mock>(); - dataEventBus = new DataEventBus(); - ICommentThreadDataService dataService = new CommentThreadDataService(mockDataCollectionFactory.Object, dataEventBus); + dataEventBus = new DataEventBus(); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); mockCommentThreadService.Setup(x => x.FormatComment(It.IsAny())).Returns(null); - commentThreadEventHandler = new CommentThreadEventHandler(dataService, mockHub.Object, mockCommentThreadService.Object, mockLoggingService.Object); + commentThreadEventHandler = new CommentThreadEventHandler(dataEventBus, mockHub.Object, mockCommentThreadService.Object, mockLoggingService.Object); + } + + [Fact] + public void ShouldLogOnException() { + mockLoggingService.Setup(x => x.Log(It.IsAny())); + + commentThreadEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = (DataEventType) 5 }); + + mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); } [Fact] @@ -47,7 +55,7 @@ public void ShouldNotRunEventOnUpdate() { commentThreadEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE, data = new Comment() }); + dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE, data = new Comment() }); mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Never); mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Never); @@ -65,7 +73,7 @@ public void ShouldRunAddedOnAdd() { commentThreadEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new Comment() }); + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new Comment() }); mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Once); mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Never); @@ -83,21 +91,10 @@ public void ShouldRunDeletedOnDelete() { commentThreadEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE, data = new Comment() }); + dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE, data = new Comment() }); mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Never); mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Once); } - - [Fact] - public void ShouldLogOnException() { - mockLoggingService.Setup(x => x.Log(It.IsAny())); - - commentThreadEventHandler.Init(); - - dataEventBus.Send(new DataEventModel { type = (DataEventType) 5 }); - - mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); - } } } diff --git a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs index 92d9c14d..856360a8 100644 --- a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs @@ -1,7 +1,6 @@ using System; using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Data.Message; using UKSF.Api.Events.Data; using UKSF.Api.Events.Handlers; using UKSF.Api.Interfaces.Data; @@ -12,9 +11,9 @@ using UKSF.Api.Signalr.Hubs.Utility; using Xunit; -namespace UKSF.Tests.Unit.Unit.Events.Handlers { +namespace UKSF.Tests.Unit.Events.Handlers { public class LogEventHandlerTests { - private readonly DataEventBus dataEventBus; + private readonly DataEventBus dataEventBus; private readonly LogEventHandler logEventHandler; private readonly Mock> mockHub; private readonly Mock mockLoggingService; @@ -24,12 +23,22 @@ public LogEventHandlerTests() { mockHub = new Mock>(); mockLoggingService = new Mock(); - dataEventBus = new DataEventBus(); - ILogDataService dataService = new LogDataService(mockDataCollectionFactory.Object, dataEventBus); + dataEventBus = new DataEventBus(); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); - logEventHandler = new LogEventHandler(dataService, mockHub.Object, mockLoggingService.Object); + logEventHandler = new LogEventHandler(dataEventBus, mockHub.Object, mockLoggingService.Object); + } + + [Fact] + public void ShouldLogOnException() { + mockLoggingService.Setup(x => x.Log(It.IsAny())); + + logEventHandler.Init(); + + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new object() }); + + mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); } [Fact] @@ -46,8 +55,8 @@ public void ShouldNotRunEventOnUpdateOrDelete() { logEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE, data = new BasicLogMessage("test") }); - dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); + dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE, data = new BasicLogMessage("test") }); + dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); mockClient.Verify(x => x.ReceiveAuditLog(It.IsAny()), Times.Never); mockClient.Verify(x => x.ReceiveLauncherLog(It.IsAny()), Times.Never); @@ -69,26 +78,15 @@ public void ShouldRunAddedOnAddWithCorrectType() { logEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new AuditLogMessage() }); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new LauncherLogMessage("1.0.0", "test") }); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new WebLogMessage(new Exception("test")) }); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new BasicLogMessage("test") }); + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new AuditLogMessage() }); + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new LauncherLogMessage("1.0.0", "test") }); + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new WebLogMessage(new Exception("test")) }); + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new BasicLogMessage("test") }); mockClient.Verify(x => x.ReceiveAuditLog(It.IsAny()), Times.Once); mockClient.Verify(x => x.ReceiveLauncherLog(It.IsAny()), Times.Once); mockClient.Verify(x => x.ReceiveErrorLog(It.IsAny()), Times.Once); mockClient.Verify(x => x.ReceiveLog(It.IsAny()), Times.Once); } - - [Fact] - public void ShouldLogOnException() { - mockLoggingService.Setup(x => x.Log(It.IsAny())); - - logEventHandler.Init(); - - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new object() }); - - mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); - } } } diff --git a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs index a452d817..218d7efa 100644 --- a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs @@ -2,11 +2,9 @@ using FluentAssertions; using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Data.Message; using UKSF.Api.Events.Data; using UKSF.Api.Events.Handlers; using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; using UKSF.Api.Models.Events; @@ -14,45 +12,44 @@ using UKSF.Api.Signalr.Hubs.Message; using Xunit; -namespace UKSF.Tests.Unit.Unit.Events.Handlers { +namespace UKSF.Tests.Unit.Events.Handlers { public class NotificationsEventHandlerTests { - private readonly DataEventBus dataEventBus; + private readonly DataEventBus dataEventBus; private readonly Mock> mockHub; + private readonly Mock mockLoggingService; private readonly NotificationsEventHandler notificationsEventHandler; - private Mock mockLoggingService; public NotificationsEventHandlerTests() { Mock mockDataCollectionFactory = new Mock(); mockLoggingService = new Mock(); mockHub = new Mock>(); - dataEventBus = new DataEventBus(); - INotificationsDataService dataService = new NotificationsDataService(mockDataCollectionFactory.Object, dataEventBus); + dataEventBus = new DataEventBus(); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); - notificationsEventHandler = new NotificationsEventHandler(dataService, mockHub.Object, mockLoggingService.Object); + notificationsEventHandler = new NotificationsEventHandler(dataEventBus, mockHub.Object, mockLoggingService.Object); } [Fact] - public void ShouldNotRunEventOnUpdateOrDelete() { + public void ShouldLogOnException() { Mock> mockHubClients = new Mock>(); Mock mockClient = new Mock(); mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); - mockClient.Setup(x => x.ReceiveNotification(It.IsAny())); + mockClient.Setup(x => x.ReceiveNotification(It.IsAny())).Throws(new Exception()); + mockLoggingService.Setup(x => x.Log(It.IsAny())); notificationsEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); - dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); - mockClient.Verify(x => x.ReceiveNotification(It.IsAny()), Times.Never); + mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); } [Fact] - public void ShouldRunAddedOnAdd() { + public void ShouldNotRunEventOnUpdateOrDelete() { Mock> mockHubClients = new Mock>(); Mock mockClient = new Mock(); @@ -62,43 +59,43 @@ public void ShouldRunAddedOnAdd() { notificationsEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new Notification() }); + dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); - mockClient.Verify(x => x.ReceiveNotification(It.IsAny()), Times.Once); + mockClient.Verify(x => x.ReceiveNotification(It.IsAny()), Times.Never); } [Fact] - public void ShouldUseOwnerAsIdInAdded() { + public void ShouldRunAddedOnAdd() { Mock> mockHubClients = new Mock>(); Mock mockClient = new Mock(); - string subject = ""; mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); - mockHubClients.Setup(x => x.Group("1")).Returns(mockClient.Object).Callback((string x) => subject = x); + mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); mockClient.Setup(x => x.ReceiveNotification(It.IsAny())); notificationsEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new Notification { owner = "1" } }); + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new Notification() }); - subject.Should().Be("1"); + mockClient.Verify(x => x.ReceiveNotification(It.IsAny()), Times.Once); } [Fact] - public void ShouldLogOnException() { + public void ShouldUseOwnerAsIdInAdded() { Mock> mockHubClients = new Mock>(); Mock mockClient = new Mock(); + string subject = ""; mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); - mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); - mockClient.Setup(x => x.ReceiveNotification(It.IsAny())).Throws(new Exception()); - mockLoggingService.Setup(x => x.Log(It.IsAny())); + mockHubClients.Setup(x => x.Group("1")).Returns(mockClient.Object).Callback((string x) => subject = x); + mockClient.Setup(x => x.ReceiveNotification(It.IsAny())); notificationsEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); + dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new Notification { owner = "1" } }); - mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); + subject.Should().Be("1"); } } } diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs index 03594a38..31bf5dfa 100644 --- a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -17,7 +17,7 @@ using UKSF.Api.Models.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Unit.Events.Handlers { +namespace UKSF.Tests.Unit.Events.Handlers { public class TeamspeakEventHandlerTests { private readonly Mock mockAccountService; private readonly Mock mockLoggingService; diff --git a/UKSF.Tests/Unit/Models/AccountSettingsTests.cs b/UKSF.Tests/Unit/Models/AccountSettingsTests.cs index 60198e8b..3988d0dd 100644 --- a/UKSF.Tests/Unit/Models/AccountSettingsTests.cs +++ b/UKSF.Tests/Unit/Models/AccountSettingsTests.cs @@ -3,7 +3,7 @@ using UKSF.Api.Models.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Unit.Models { +namespace UKSF.Tests.Unit.Models { public class AccountSettingsTests { [Fact] public void ShouldReturnBool() { diff --git a/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs b/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs index 5c6e16fc..d868e0b3 100644 --- a/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs +++ b/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs @@ -3,7 +3,7 @@ using UKSF.Api.Models.Game; using Xunit; -namespace UKSF.Tests.Unit.Unit.Models.Game { +namespace UKSF.Tests.Unit.Models.Game { public class MissionFileTests { [Fact] public void ShouldSetFields() { diff --git a/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs index 2765d5c0..8a50df55 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs @@ -3,7 +3,7 @@ using UKSF.Api.Models.Message.Logging; using Xunit; -namespace UKSF.Tests.Unit.Unit.Models.Message.Logging { +namespace UKSF.Tests.Unit.Models.Message.Logging { public class BasicLogMessageTests { [Fact] public void ShouldSetText() { diff --git a/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs index 40e6012c..baefd71f 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs @@ -2,7 +2,7 @@ using UKSF.Api.Models.Message.Logging; using Xunit; -namespace UKSF.Tests.Unit.Unit.Models.Message.Logging { +namespace UKSF.Tests.Unit.Models.Message.Logging { public class LauncherLogMessageTests { [Fact] public void ShouldSetVersionAndMessage() { diff --git a/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs index 9fcc2dfa..1d15e487 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs @@ -3,7 +3,7 @@ using UKSF.Api.Models.Message.Logging; using Xunit; -namespace UKSF.Tests.Unit.Unit.Models.Message.Logging { +namespace UKSF.Tests.Unit.Models.Message.Logging { public class WebLogMessageTests { [Fact] public void ShouldCreateFromException() { diff --git a/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs b/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs index 4c93c027..2974a65f 100644 --- a/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs +++ b/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs @@ -3,7 +3,7 @@ using UKSF.Api.Models.Mission; using Xunit; -namespace UKSF.Tests.Unit.Unit.Models.Mission { +namespace UKSF.Tests.Unit.Models.Mission { public class MissionPatchingReportTests { [Fact] public void ShouldSetFieldsAsError() { diff --git a/UKSF.Tests/Unit/Models/Mission/MissionTests.cs b/UKSF.Tests/Unit/Models/Mission/MissionTests.cs index 3beffcba..aec41b4f 100644 --- a/UKSF.Tests/Unit/Models/Mission/MissionTests.cs +++ b/UKSF.Tests/Unit/Models/Mission/MissionTests.cs @@ -1,7 +1,7 @@ using FluentAssertions; using Xunit; -namespace UKSF.Tests.Unit.Unit.Models.Mission { +namespace UKSF.Tests.Unit.Models.Mission { public class MissionTests { [Fact] public void ShouldSetFields() { diff --git a/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs index 88572707..3c0fafbf 100644 --- a/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs @@ -7,7 +7,7 @@ using UKSF.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Admin { +namespace UKSF.Tests.Unit.Services.Admin { public class VariablesServiceTests { [Fact] public void ShouldGetVariableAsString() { diff --git a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs index 81c1a2ed..029b7c29 100644 --- a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs @@ -6,7 +6,7 @@ using UKSF.Api.Services.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Common { +namespace UKSF.Tests.Unit.Services.Common { public class AccountUtilitiesTests { [Fact] public void ShouldCopyAccountCorrectly() { @@ -18,7 +18,7 @@ public void ShouldCopyAccountCorrectly() { lastname = "McTest", membershipState = MembershipState.MEMBER, teamspeakIdentities = new HashSet {4, 4}, - serviceRecord = new[] {new ServiceRecordEntry {occurence = "Test", timestamp = timestamp}}, + serviceRecord = new List {new ServiceRecordEntry {occurence = "Test", timestamp = timestamp}}, rolePreferences = new List {"Aviation"}, militaryExperience = false }; diff --git a/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs b/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs index 6b421ea4..f1463efa 100644 --- a/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs @@ -10,7 +10,7 @@ using UKSF.Api.Services.Common; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Common { +namespace UKSF.Tests.Unit.Services.Common { public class DisplayNameUtilitiesTests { private readonly Mock mockDisplayNameService; private readonly Mock mockUnitsDataService; diff --git a/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs index db322717..7a7d3f6a 100644 --- a/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs @@ -6,7 +6,7 @@ using UKSF.Api.Services.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Personnel { +namespace UKSF.Tests.Unit.Services.Personnel { public class DisplayNameServiceTests { private readonly Mock mockRanksDataService; private readonly Mock mockAccountDataService; diff --git a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs index 7c5ea80f..b96adbe8 100644 --- a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs @@ -9,7 +9,7 @@ using UKSF.Api.Services.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Personnel { +namespace UKSF.Tests.Unit.Services.Personnel { public class LoaServiceTests { private readonly ILoaService loaService; private readonly Mock mockLoaDataService; diff --git a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs index dfed7f2c..a0e04961 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs @@ -7,7 +7,7 @@ using UKSF.Api.Services.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Personnel { +namespace UKSF.Tests.Unit.Services.Personnel { public class RanksServiceTests { private readonly Mock mockRanksDataService; private readonly RanksService ranksService; diff --git a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs index 66d380ec..bcfc71d2 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs @@ -2,7 +2,7 @@ using UKSF.Api.Services.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Personnel { +namespace UKSF.Tests.Unit.Services.Personnel { public class RoleAttributeTests { [Theory, InlineData("ADMIN,PERSONNEL", RoleDefinitions.ADMIN, RoleDefinitions.PERSONNEL), InlineData("ADMIN", RoleDefinitions.ADMIN), InlineData("ADMIN", RoleDefinitions.ADMIN, RoleDefinitions.ADMIN)] public void ShouldCombineRoles(string expected, params string[] roles) { diff --git a/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs index 36660c74..0a7bb283 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs @@ -8,7 +8,7 @@ using UKSF.Api.Services.Personnel; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Personnel { +namespace UKSF.Tests.Unit.Services.Personnel { public class RolesServiceTests { private readonly Mock mockRolesDataService; private readonly RolesService rolesService; diff --git a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs index 95a3a1ef..613bf0b2 100644 --- a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs @@ -12,7 +12,7 @@ using UKSF.Api.Services.Utility; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Utility { +namespace UKSF.Tests.Unit.Services.Utility { public class ConfirmationCodeServiceTests { private readonly ConfirmationCodeService confirmationCodeService; private readonly Mock mockConfirmationCodeDataService; @@ -47,13 +47,13 @@ public async Task ShouldSetConfirmationCodeValue() { } [Theory, InlineData(null), InlineData("")] - public void ShouldThrowForCreateWhenValueNullOrEmpty(string value) { + public async Task ShouldThrowForCreateWhenValueNullOrEmpty(string value) { mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); mockSchedulerService.Setup(x => x.CreateAndSchedule(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); Func act = async () => await confirmationCodeService.CreateConfirmationCode(value); - act.Should().Throw(); + await act.Should().ThrowAsync(); } [Fact] diff --git a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs index ba5bd985..958680be 100644 --- a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs @@ -5,7 +5,7 @@ using UKSF.Api.Services.Utility; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Utility { +namespace UKSF.Tests.Unit.Services.Utility { public class DataCacheServiceTests { [Fact] public void ShouldCallDataServiceRefresh() { diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs index 9ab40448..b289cc1e 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs @@ -7,7 +7,7 @@ using UKSF.Api.Services.Utility; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Utility { +namespace UKSF.Tests.Unit.Services.Utility { public class ScheduledActionServiceTests { [Fact] public void ShouldRegisterActions() { diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs index 993fa413..bf34d570 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs @@ -8,7 +8,7 @@ using UKSF.Api.Services.Utility.ScheduledActions; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Utility.ScheduledActions { +namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { public class DeleteExpiredConfirmationCodeActionTests { private readonly Mock mockConfirmationCodeDataService; private readonly Mock mockConfirmationCodeService; diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs index e1d7bbe9..922817da 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs @@ -13,7 +13,7 @@ using UKSF.Api.Services.Utility.ScheduledActions; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Utility.ScheduledActions { +namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { public class PruneDataActionTests { private readonly Mock mockDataCollectionFactory; private IPruneDataAction pruneDataAction; diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs index c3b3e799..6e1d70b0 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs @@ -5,7 +5,7 @@ using UKSF.Api.Services.Utility.ScheduledActions; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Utility.ScheduledActions { +namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { public class TeamspeakSnapshotActionTests { private readonly Mock mockTeamspeakService; private ITeamspeakSnapshotAction teamspeakSnapshotAction; diff --git a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs index 7c8ab503..7fc2013b 100644 --- a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs @@ -11,7 +11,7 @@ using UKSF.Api.Services.Utility; using Xunit; -namespace UKSF.Tests.Unit.Unit.Services.Utility { +namespace UKSF.Tests.Unit.Services.Utility { public class SessionServiceTests { private readonly Mock mockHttpContextAccessor; private readonly Mock mockAccountDataService; diff --git a/UKSF.Tests/testdata/base64.txt b/UKSF.Tests/testdata/base64.txt new file mode 100644 index 00000000..60c3bc52 --- /dev/null +++ b/UKSF.Tests/testdata/base64.txt @@ -0,0 +1 @@ +data:image/jpeg;base64,iVBORw0KGgoAAAANSUhEUgAAAuAAAALeCAYAAADrrqTUAAAACXBIWXMAABcSAAAXEgFnn9JSAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAEc4aVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/Pgo8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjYtYzExMSA3OS4xNTgzMjUsIDIwMTUvMDkvMTAtMDE6MTA6MjAgICAgICAgICI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIKICAgICAgICAgICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICAgICAgICAgICB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIgogICAgICAgICAgICB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIgogICAgICAgICAgICB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vZXhpZi8xLjAvIj4KICAgICAgICAgPHhtcDpDcmVhdG9yVG9vbD5BZG9iZSBQaG90b3Nob3AgQ0MgMjAxNSAoV2luZG93cyk8L3htcDpDcmVhdG9yVG9vbD4KICAgICAgICAgPHhtcDpDcmVhdGVEYXRlPjIwMTYtMDMtMjBUMDM6MjY6MjNaPC94bXA6Q3JlYXRlRGF0ZT4KICAgICAgICAgPHhtcDpNb2RpZnlEYXRlPjIwMTYtMDMtMjBUMTY6NTg6MzNaPC94bXA6TW9kaWZ5RGF0ZT4KICAgICAgICAgPHhtcDpNZXRhZGF0YURhdGU+MjAxNi0wMy0yMFQxNjo1ODozM1o8L3htcDpNZXRhZGF0YURhdGU+CiAgICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2UvcG5nPC9kYzpmb3JtYXQ+CiAgICAgICAgIDxwaG90b3Nob3A6Q29sb3JNb2RlPjM8L3Bob3Rvc2hvcDpDb2xvck1vZGU+CiAgICAgICAgIDxwaG90b3Nob3A6SUNDUHJvZmlsZT5zUkdCIElFQzYxOTY2LTIuMTwvcGhvdG9zaG9wOklDQ1Byb2ZpbGU+CiAgICAgICAgIDxwaG90b3Nob3A6RG9jdW1lbnRBbmNlc3RvcnM+CiAgICAgICAgICAgIDxyZGY6QmFnPgogICAgICAgICAgICAgICA8cmRmOmxpPnV1aWQ6MjEyRTg3OEQ3NEZGREQxMThCOTc4REEyREI4MkJEOTc8L3JkZjpsaT4KICAgICAgICAgICAgPC9yZGY6QmFnPgogICAgICAgICA8L3Bob3Rvc2hvcDpEb2N1bWVudEFuY2VzdG9ycz4KICAgICAgICAgPHhtcE1NOkluc3RhbmNlSUQ+eG1wLmlpZDo3Y2ZlOGI4OC03ZTBjLWFlNGQtYTI4My0xOWE3NjhmZTZkYWU8L3htcE1NOkluc3RhbmNlSUQ+CiAgICAgICAgIDx4bXBNTTpEb2N1bWVudElEPmFkb2JlOmRvY2lkOnBob3Rvc2hvcDplOWU1MmYzMy1lZWJjLTExZTUtODA0YS1hNmNhNDIwNGE3ZTk8L3htcE1NOkRvY3VtZW50SUQ+CiAgICAgICAgIDx4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ+eG1wLmRpZDphNzlkZDFhYy0wMDQyLTM3NGMtYmExOC0yZmJhYTk2ZTdkZWY8L3htcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD4KICAgICAgICAgPHhtcE1NOkhpc3Rvcnk+CiAgICAgICAgICAgIDxyZGY6U2VxPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5jcmVhdGVkPC9zdEV2dDphY3Rpb24+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDppbnN0YW5jZUlEPnhtcC5paWQ6YTc5ZGQxYWMtMDA0Mi0zNzRjLWJhMTgtMmZiYWE5NmU3ZGVmPC9zdEV2dDppbnN0YW5jZUlEPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6d2hlbj4yMDE2LTAzLTIwVDAzOjI2OjIzWjwvc3RFdnQ6d2hlbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnNvZnR3YXJlQWdlbnQ+QWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKFdpbmRvd3MpPC9zdEV2dDpzb2Z0d2FyZUFnZW50PgogICAgICAgICAgICAgICA8L3JkZjpsaT4KICAgICAgICAgICAgICAgPHJkZjpsaSByZGY6cGFyc2VUeXBlPSJSZXNvdXJjZSI+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDphY3Rpb24+c2F2ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0Omluc3RhbmNlSUQ+eG1wLmlpZDo5OTYzN2M2My02NTk1LTFhNDUtOGM5Ni1hYTBlYTc3OGViN2Q8L3N0RXZ0Omluc3RhbmNlSUQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDp3aGVuPjIwMTYtMDMtMjBUMDM6MzM6NTlaPC9zdEV2dDp3aGVuPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6c29mdHdhcmVBZ2VudD5BZG9iZSBQaG90b3Nob3AgQ0MgMjAxNSAoV2luZG93cyk8L3N0RXZ0OnNvZnR3YXJlQWdlbnQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpjaGFuZ2VkPi88L3N0RXZ0OmNoYW5nZWQ+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5zYXZlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6aW5zdGFuY2VJRD54bXAuaWlkOmUwZDU1ZmY1LTk0MzUtMzk0OS04OTY3LTJiZmZlYTI5Njg0Njwvc3RFdnQ6aW5zdGFuY2VJRD4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OndoZW4+MjAxNi0wMy0yMFQxNjo1Nzo0NFo8L3N0RXZ0OndoZW4+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpzb2Z0d2FyZUFnZW50PkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE1IChXaW5kb3dzKTwvc3RFdnQ6c29mdHdhcmVBZ2VudD4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmNoYW5nZWQ+Lzwvc3RFdnQ6Y2hhbmdlZD4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPmNvbnZlcnRlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6cGFyYW1ldGVycz5mcm9tIGltYWdlL3BuZyB0byBhcHBsaWNhdGlvbi92bmQuYWRvYmUucGhvdG9zaG9wPC9zdEV2dDpwYXJhbWV0ZXJzPgogICAgICAgICAgICAgICA8L3JkZjpsaT4KICAgICAgICAgICAgICAgPHJkZjpsaSByZGY6cGFyc2VUeXBlPSJSZXNvdXJjZSI+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDphY3Rpb24+ZGVyaXZlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6cGFyYW1ldGVycz5jb252ZXJ0ZWQgZnJvbSBpbWFnZS9wbmcgdG8gYXBwbGljYXRpb24vdm5kLmFkb2JlLnBob3Rvc2hvcDwvc3RFdnQ6cGFyYW1ldGVycz4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPnNhdmVkPC9zdEV2dDphY3Rpb24+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDppbnN0YW5jZUlEPnhtcC5paWQ6ODRiM2QyNDItYmNhOC0yMzRmLThhYWYtZWJhN2U1ZjFmMzI1PC9zdEV2dDppbnN0YW5jZUlEPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6d2hlbj4yMDE2LTAzLTIwVDE2OjU3OjQ0Wjwvc3RFdnQ6d2hlbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnNvZnR3YXJlQWdlbnQ+QWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKFdpbmRvd3MpPC9zdEV2dDpzb2Z0d2FyZUFnZW50PgogICAgICAgICAgICAgICAgICA8c3RFdnQ6Y2hhbmdlZD4vPC9zdEV2dDpjaGFuZ2VkPgogICAgICAgICAgICAgICA8L3JkZjpsaT4KICAgICAgICAgICAgICAgPHJkZjpsaSByZGY6cGFyc2VUeXBlPSJSZXNvdXJjZSI+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDphY3Rpb24+c2F2ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0Omluc3RhbmNlSUQ+eG1wLmlpZDo1ZDVkOTIxNC1hZDczLWE5NGQtYmE5Yy00MzA5MThkNmM3OTc8L3N0RXZ0Omluc3RhbmNlSUQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDp3aGVuPjIwMTYtMDMtMjBUMTY6NTg6MzNaPC9zdEV2dDp3aGVuPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6c29mdHdhcmVBZ2VudD5BZG9iZSBQaG90b3Nob3AgQ0MgMjAxNSAoV2luZG93cyk8L3N0RXZ0OnNvZnR3YXJlQWdlbnQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpjaGFuZ2VkPi88L3N0RXZ0OmNoYW5nZWQ+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5jb252ZXJ0ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnBhcmFtZXRlcnM+ZnJvbSBhcHBsaWNhdGlvbi92bmQuYWRvYmUucGhvdG9zaG9wIHRvIGltYWdlL3BuZzwvc3RFdnQ6cGFyYW1ldGVycz4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPmRlcml2ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnBhcmFtZXRlcnM+Y29udmVydGVkIGZyb20gYXBwbGljYXRpb24vdm5kLmFkb2JlLnBob3Rvc2hvcCB0byBpbWFnZS9wbmc8L3N0RXZ0OnBhcmFtZXRlcnM+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5zYXZlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6aW5zdGFuY2VJRD54bXAuaWlkOjdjZmU4Yjg4LTdlMGMtYWU0ZC1hMjgzLTE5YTc2OGZlNmRhZTwvc3RFdnQ6aW5zdGFuY2VJRD4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OndoZW4+MjAxNi0wMy0yMFQxNjo1ODozM1o8L3N0RXZ0OndoZW4+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpzb2Z0d2FyZUFnZW50PkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE1IChXaW5kb3dzKTwvc3RFdnQ6c29mdHdhcmVBZ2VudD4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmNoYW5nZWQ+Lzwvc3RFdnQ6Y2hhbmdlZD4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgIDwvcmRmOlNlcT4KICAgICAgICAgPC94bXBNTTpIaXN0b3J5PgogICAgICAgICA8eG1wTU06RGVyaXZlZEZyb20gcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICA8c3RSZWY6aW5zdGFuY2VJRD54bXAuaWlkOjVkNWQ5MjE0LWFkNzMtYTk0ZC1iYTljLTQzMDkxOGQ2Yzc5Nzwvc3RSZWY6aW5zdGFuY2VJRD4KICAgICAgICAgICAgPHN0UmVmOmRvY3VtZW50SUQ+eG1wLmRpZDo4NGIzZDI0Mi1iY2E4LTIzNGYtOGFhZi1lYmE3ZTVmMWYzMjU8L3N0UmVmOmRvY3VtZW50SUQ+CiAgICAgICAgICAgIDxzdFJlZjpvcmlnaW5hbERvY3VtZW50SUQ+eG1wLmRpZDphNzlkZDFhYy0wMDQyLTM3NGMtYmExOC0yZmJhYTk2ZTdkZWY8L3N0UmVmOm9yaWdpbmFsRG9jdW1lbnRJRD4KICAgICAgICAgPC94bXBNTTpEZXJpdmVkRnJvbT4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPHRpZmY6WFJlc29sdXRpb24+MTUwMDAwMC8xMDAwMDwvdGlmZjpYUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6WVJlc29sdXRpb24+MTUwMDAwMC8xMDAwMDwvdGlmZjpZUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6UmVzb2x1dGlvblVuaXQ+MjwvdGlmZjpSZXNvbHV0aW9uVW5pdD4KICAgICAgICAgPGV4aWY6Q29sb3JTcGFjZT4xPC9leGlmOkNvbG9yU3BhY2U+CiAgICAgICAgIDxleGlmOlBpeGVsWERpbWVuc2lvbj43MzY8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogICAgICAgICA8ZXhpZjpQaXhlbFlEaW1lbnNpb24+NzM0PC9leGlmOlBpeGVsWURpbWVuc2lvbj4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz7v2Jm2AAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAnfkSURBVHja7J11nFzV+f/fV+aO7u6sexJCAiEkIQR312KlQCkFSql86+2vSr3UqDv14hQp7g7BAyQhCXFdd5nd8bny++POYpnZbMhu2Eme9+tFKZnNzr3nPvecz3nOI4rjOAiCsG0Wvbxov+uuu/65n1/18+rS0nBCRkQQhN2ZeDyhf/Mb3+j/0IfOO+W44499SUZEEMaOKkMgCGMjFAol/v6PvxXN2nufdddec+3FMiKCIOyu3PLfW86bvc++q6/+69VFXp83IyMiCCLABWFC0HXdDBdX0N3T2XD5Jy7/z0knnvzgkiVL5sjICIKwu7By5coZZ55x1p0XffSim5uaN88wND+GYaRlZARBBLggTAiO4+A4NuHiCqor640nnnz89IMOOGTxV//f1345PBw1ZIQEQdiV+c53vnvlgvkHLnvgwfvPraqoMypKa0Bx50ZBEESAC8IEC3EbVVVoqJtKMBgyfv+H331zzpy5K2+68aYLZHQEQdjVuON/d5y118y9V1511c+v8HiMQEPdVDRNxXZsGRxBEAEuCDsXy7IoKiqioXYqzc3NMy659JIbzzzjrDvXrFk7XUZHEIRCZ8vmLXXnn3fBzedfcP7/1m9YN7u+dopRUlKCZVkyOIIgAlwQ3j8cx8GyLeprG6iqqDUeePD+c+fvt/+yX/7il1+V0REEoVD50x//9Jl58+avuOPO/11UWVZj1NdOwbZtCTcRBBHggrBzURQl72e2baNpGg1101AULXTFt6+46rBDD1+46OVXFsjICYJQKCxbtmzWccce/+iXv/LlP6aS6bKGumnoHh3btt/T3CgIgghwQdghxuL5sSyTstJSaqsbjZcXvXT0oYcd8tJ3vvPdK2X0BEGY7Pz0Jz/95oL9D1z6zMKnT66pajAqKyuxLHMbE6MkYQqCCHBBmEBS6bRhZkxUVR2DUHdoqJtKUTBsXHXVz6/Yf/4Bi5577vmDZRQFQZhsvPbqa/MOPeTw577/g+//xOcN+BrqpqIojOr1BlBVhYyVIZNJSxUoQRABLggTQzKZ9CVTSVRVG9PPjyRp1tdMMV5ftuTgo48+6rlvX/Ed8YYLgjBp+PGPf3LFQQcf8uqiV146sq660QiHx55kqSgqDiaxaCwkIykIIsAFYUKIRqMhy0mjqmOPd3QcB9uxaaibSnGo1PjFL6+6YsH+Byx6+eVFEhsuCML7xrLXl80+/LAjFv7whz+4MugPGQ1103BwtiucZCT2e2houFhGVBBEgAvChBAZjITfvuhsD5ZlEQqFqKuZYix9fcnBhx126EtXXvnjK2RUBUHY2fz6V7/+yoL9D1z60ssvHl1X3ZgtLWhuv4DIOiMikSER4IIgAlwQJobBwcGwu+ioeRYjiCZUkmmFXD8y0kmzoW4aoUCJ8aMf/fDKo448+slVq1bPkNEVBGGi2bRpc8NJJ5784De/9c1fer2+Ub3eqgqpjMJwXCVf2suIM2JkbhQEQQS4IEyYAM/nATdNqCkzSUQUOvs0dC33Ua5lmRQXF1Nb3Wg8/8Jzx8/fb/9lf736r5+UERYEYaK49trrLtpv3vxlTzz5+Ok1VQ1GWVlZXq+3pjl0D6gMDyjUlFlsKyR8aEg84IIgAlwQJohIxA1ByUd3r4dvfmSIh27qJuyzaWn3Ytnk9YaDQ2PdNFRFC3z+C5+/+oMfPPe23t5eWcgEQRg3osNR46KLLr728ss/fm0ymSprrJuWt8KJqoDjQGu7gRe45989/PzTA3T36owWGj40NFQiIy0IIsAFYYIEeP5FxnbchSvkdzjuI0mW3d3OWcdE6e7x0NWf3xtuWiYVFRVUVdQZ99xz9wVz58xbcf99D5wqoy0Iwo7y5BNPHj1n37krb7nl5ssqy2uM6qpqzDxeb11z6I2odHYbnHxonGV3t3P65QnCIRvbdue4vHPj4OjOCUEQRIALwg4I8Ehe77TrHXLw+2zYDPV7WNx7Uzd//2EPftWhpd3AwfUwbSXebRtdV2mom0ZnV+eUs84+896vfvVrV8mIC4LwXvne977/gxNPOvHxppYtMxrqpuLxePJ6vQFa2g0UE37/rV4evaWL6fuYsBEM3QHNGV2AjzI3CoIgAlwQdojBgcGyfJ/ZtoKiO1QUuwuc0wJ0wv99Mcrye9o58ZA4nV0G/UNqTm+447ix4Q11UwgXlxu///3vvnrwQYe8sG7tumky8oIgjJWW5paaY4857vGf/eyn3y0OlRoNdVOxLCtnoqWmwWBMpaPL4Ij9Eiy9s4OvfHMI+sFpAhwIFzkE/A6Wlb/6U0RiwAVBBLggTBT9/f1lkCcB04Kg36Yk6IAFaOAkgVUwbW+Tx2/p4ldf6yWdUGhpN1BVyJXLaVkWgUCAupopxquvvXL4/P0WLLvu2usuktEXBGFb3H7b7efMnbPfioXPPnNibXWjEQqFcjbVURQ3N6W1XSc2rHLl5/t4/o5OZs3PwEpw4u4cRgaKAzYhn42ZV4BrDEWGwjL6giACXBAmhL7+/jJNNfIIcIWQ36E4aEFmZJUDR816kgbhG98Z4rXbO1iwd5K2DoN4UkHL0VRzpFxhY900Mhmz+OOXf/zaT3/q/66WJyAIQj6+8pX/98sPX/jh24aGhysa66ZBnvKCmgrJlEJbh8HsaWlevKmDH1wZgTg4m905600/gwnhkE3Q72DmqYRiaAaRSKQ4kUiInhAEEeCCML709PYWD0WGir1GPgEOQb9DOOjAu3OcNHBiwCqYf1iaxXd38NVLBhgc1Gnt1EdN0KyurqG8tMr417//+cn5++3/qtQMFwTh7WzevKXusMMOX/jHP/7hK6UlFUZ9Xf2oiZZtPRr9AzqfOX+QFfe0c9jxKVgDzpA7V70DC4r9NsUBm7SZ2wPuMTwMDQ3N6e8fKJOnIQgiwAVhXIkMDIZjsfh0XdNzfp7OKBQHbYoCthuC8m4UcBRwNgI2/PZ3AzxwdSe1YZOWdi+2k7tcoW1beL1e6munGMuWv37g/vMXLL3xxpsukCciCMJdd959xry581a8/PJLR9fVNBp+vz9nyImqgIObaBn22dz+2y7+dnU/qgHOOveznNF1Fmh+KAnZWJnc12AYBpHBCP19fRXyRARBBLggjK8Aj0TCw8ND6B5Pzs9tU6E0ZKP42doD/nY0cPqB9fCB8xOsuK+ds48ZpqvbYGBIRcuZoOlg2zaN9dNwbCd06aWX3PjFL37pt/JUBGH35VvfuuInHzrv3DvjsURZY/20bOha7kTLSEyls8vglENjvHFfO+dfEodN4PQC+ihfYgJZAY6d2wOu6zrxVJS+vj7xgAuCCHBBGF8GBgfDGSuJrmu5f8BxYyXxk9sD/q63zrHAWQ3ltTb33NzDr7/WSzym0truQdOcnAmapumGpJSFK42//OXPXzji8COf7mjvEK+TIOxGDA4OBk468eQHf/WrX34zXFxu1NXVY5pb7/oV3I6Wre060WGVKz/XxyO3dlO3hwWrwcmMQQHYgJdsdafcAlxRVMBBQlAEQQS4IIw7/X39Ze5ik68SgEJFiQXe7KK1LRRcb3gr0AVf//YQL9/Swd6NGVrbvWTM3CEplmXh8/moq2k0XnzphWPnzt1vxeOPPX6sPCFB2PV58YUXD5w7Z78VTzz5+Om11Q1GIBDIHXKiguVAa7uXKVUZnr6mkx/8OAKD4DSDo+XV01s5FjCgqjT/pKZmC4kPDIgAFwQR4IIw3gK8f1sCHKpLbfBkF62xomVLfq2BQ45NsfzeNj5yyhA9vQZ9kXw1w92j5sa6afT199acfMrJj/7ut7/7gjwlQdh1+fvf/3H5EUce8UJrW/P0hrppb84F70bXYHBYpavb4Oxjhnnj/naOPT0Ja/MkWo6mvx1Ah8pw/mO9kTlRQlAEQQS4IIw7vb1ugtFoArwybIE+0hVzO8gmSDlrwQjCf6/t5c/f7iEZV2hp96BpuZ1VpmXSUDeVUKDE+NrXv/bbSy/92L/kSQnCrsdnP/O5P372s5/5m98bMhrrpmFZ+UNOWtp1YlGVX3yll3tu7KGo3MFZk52X3suK70B5sQ2M3g2zq7u7Wp6UIIgAF4RxpaurK+/iYmfb0JcVW9uO/x4NHZxOoB2+8PVhXrmlg+m1GVrbDSwnX0iKSUlJCZXlNcaNN95w6UEHHvKCxIULwq7BQP9A6Jijj3387//422fKS6uMsrLynCUGVcWNfGttN6gtM3nm2g6+9f0h6AWnjdETLbeFDeXF7sQ2mnOhu7O7Rp6YIIgAF4Rxpbsr/+LivCnAnbHFf4+GBk4CWAUHHZtm+X3tfPBYt0rKUCx34x7btvF4PNTXTDFeW/zK4XPn7rfiueeeP1iemiAULksWL5kzb95+y559buGJddWNhtfrxba33uFrKkSTCp1dBqceEuON+9s55rSUm2gZY7tCTnJiQVmxjeJxsO38J4ASgiIIIsAFYdwZLcPfshQ8PsdNwrTG4ctGaoavhWDY4a6bevjx5/oYHtJp7dLyxoXb2e6Zff09NUcffdRz115z7cXy5ASh8Lj9tv+dc8CBBy1ubWuZ3lA3DSdPV0tdc+jo04gM6lzx8X4evrWbslobZ+0otb23FxNKi9weBxkrv5QYGBgUAS4IIsAFYZwF+MBAWMlzjpsyoazIdisFpMbxS3Vw2oEe+P6VER68upOw16Gl3UBVyV2q0DJprJ+Gzwgal3/i8v98+4rvXClPTxAKh5/+5Gff/PCFF9zm0TxGY32eeG/F9Xy3tBt4HIfbf9PFVb8ahGFwWthxr/fbybge8KKATSZfN0zNx8DAQDiRlHb0giACXBDGiaGhId/gwECZ1+PNLcAzCuGQTVWxBZlx/nINnGFgPZx+QYLX72lj/5lJ2jqMvKUKTdOkoqKC0pIK4xe/vOqK88//8M3yFAVh8vPxyy7/x/d/8L2fFIdKjerqmpz1vVUFLBtaOwz2mZJi6V3tnH9ZHDaCMzjO4jsrwMuLLEpDNqm83TCz7eiz5VoFQRABLgg7TF9fX9nQ8NBeHiN3F8xMWqGs2MYfdEbvgrkDb6ljgbMKps6yWHJPBxef6pYqHIqpOePCLcsiEAhQXVln3HHH7ecdeuhhC/v7+kPyNAVh8hGLxfXjjz/h4euuv/ayyvIao6ioKGd9b02FaEKhq9vgg8cM8/q97cxaYMKqMTbWeY8C3BNya4Fb6dxfYHg8RCJD0oxHEESAC8L4MdA/UDYUGcKTpw09lkJpkQ1BJkaAw1uNeza5/77xml6u+mIfw0Ma7T2548Jt20bTNOprphiLFr189H77zV+2Zs3a6fJEBWHy0NzcUrNg/wVLn376qVNrqxsNj8eDbW+dza1rDl0DGpGIznc/0c9dN/VghMBZD47K+MR758IEgtkyq3mqoOgenXhymL6+PqnAJAgiwAVhfOju6alKmwl0PX8tr4oSC3yMTxLmaOjgdAGdcMUPI9zzx04Mx40F1TRnqzV4JDmzoW4arW0t0w9YcMDip5965kh5qoLw/vPKolfmz99v/rJ169fOaaibiqKQN9mypd1DJgk3XdXNT38xCH3ZHBF9gi8y2w2zssTKq/JV1W1H39nRKaUIBUEEuCCMDx3tHXVvLTK5UKgIv4cumO8VDZwosA7O/miCJXe2s0e128IeJXdyppVNzown4uHjTzjuydtvu/0cebKC8P7x4AMPnXzooYctGhjsr3KTLa2txLeiuHkeLe0GNWGLV27p4KOfisGm7e9quUMC3APlJaO1o3fnxo4Od64UBEEEuCDsMJ2dXTXuYjhKF8wSa+cJ8Oyb61jAKtjnoAyv39vOMfNjtHeOnpzZWD8Vw+M3Pnzhh2/70x//9Bl5uoKw87nmP9defMaZH7hfVTSjsX5a/mRLC9o6DA6elWTZfW0cdFzare+d3nmr90gHzepS+63/zkNPd0+lPF1BEAEuCONCT09v5aiLE1BT7sZHOjvzwhQ39tNZB8XVNs/c0cXHTo/Q02sQjedu2mOaJlWV1QQDxcaXv/LlP/7wBz/6njxhQdh5/ObXv/3SJz55+X/83qBRW1ufU3xrKiRSCl09Bh86bphFd3VQNS1b31th4uK982FBXYXJttrR9/T0VskTFgQR4IIwLvT29ORNLLJsQLGpL7cmPv47Hzo4TUAGrvtXHz/6dD+RiE7vYL4KKSal4VLCxeXGj39y5fe/+Pkv/V6esiBMPN+54rtXfuObX/91cajUKC+vyFnjW9NgYFilf8DDNy4e4I7re96RgP2+YEFNmY1mOFijdMPs7e2VJExBGPvSLQjCaHR1deVNLDItBV/AoTJsj38N8O0V4d2gpOCHPx+ksdbkE1dW0JZWaKgyMS3lXSLcIhgMouu68Ze//vlzQ8NDoetvuO5T8rQFYWL4wue/+Pur//qXz5WWVBiBQDBnmUFdc+js1cmkVf74jR6+9I1h6ARn4H1erdNQXmxRErLJmGDkvBaF3l6pgiIIY0U84IKwDTo6O2s0xcj5WcaEcNCmvMR6fwU4uF6yIWATXP7FKI/+rROP41ZPyFem0Ov1UlVRa9xw4/WXfujc826Rpy0I489ll172r6v/+pfPVZRVG4FAANvOIb51h5YOD5k03PnbLr50xTA0Z8W39j7fQBoqSmxKgjbpTG4PuK766OvrkzrggiACXBB2nO6u7nB/X3+Z1+vL+flIF8zKYhvSk+ONdlLAOjj5giSLbumgLGS9WaYwlwjXdZ2aynrjrrvvPPcDp59xtzx1QRg/PnzBhTdef+P1l1ZV1BperzdnjW9Nc2hpMwgaNs9f38m5H4vDOnDik0B8A5gQDtmUF9uk8ghwn8+gt7evorm5RUoRCoIIcEHYMXp6eqsGByPTjFG6YJaX2PhCzsQ14dlelLcqpMw/OsPSu9vZszZNa7sXVd26TKHjOKiaSm1Vg/HQww+eftIJJz8sT14QdpwPnnPubbf/77YLqivrDF3XtxLfSlZ8t7Yb1JZmeO1/7RxxWgrWgGNOohU6AwShvMTCySPAvV4v/QN9dZ0dHSLABUEEuCDsGL29PRWxxChdMG3FbcIzkV0w36sIB5y1MGVfi8V3tbP/nknaOtz7yCXCFVWhtrrBeOKpx48//rgTHpWnLwjvnbPOPPvOe+69+5yaqnpD07ScNb4VFVrbDfauT7P07nZmHWS64tth51c6GQ0LCLjt6PNdmK7rWHaarq5uEeCCIAJcEHaMrq7uKnBGbcJTV26BH7An2cWPtK9fByV1Dq/c1c6x+8Vp7zSwnTwiXFGorW40nn7mqWOPO1ZEuCC8N/F9zp33P3DfGTVV9YaqqjnFN7g1vg/cK8lrd7VTPcPGWTfBbeXfKw7gg8bK/F6GkT4J3d3dUopQEESAC8IOC/AaGK0LJjRUWWBMQgE+gg7OZtCL4Onbujj9kCidXQaWnU+EQ211o/HMwqeOPemkUx4UKxCEsXPuOR+67f4H7h1VfDsOtHcaHD0vxst3dBCqcXA2MDnivXPpb8edR+oqrG0K8M5OaUcvCCLABWEHaW9vrx11UQJqyqw3Qz4mLTo4ze4C/+DN3Zx3zDBd3Qam5XbcyyfCn3jisRM/cPqZkpgpCGPgIxdedP3d9951zmji23ago8vglINiLLy1Cy3kbpAnfVFgC6pKLcDBHsXZ0NLc2iiWIAgiwAVhh2hpaZmS7zO3I5xNden72IRne0V4m7uQ/u+6Hi46cYjuHoOMld8TXlPVYDz08AOnX3D+h28WaxCE/Hzy8k/97dbbbrmwurIuv/i2obPL4MzDozzy3y4wshvjQujIYUFNqQWag+3kj5Hp6OioE2sQBBHggrBDdHWO3oTH8DtuG/pMgdyQDk4HkIKb/9PLpacM0d3jzesJV1WF6so643933H7eJy7/1N/EIgRha776la/98j/X/vvyyvLavAmXtg2d3QbnHBnlvhu63XeslcJph5eGyrBNcZFN2swvKbq7eyQGXBBEgAvCjtHT01uhKrkroCTTCpVhm4YKE1IFdFM6OJ1AHK7/Zy+XnByhu8cNR8nlCdc1ncryGuOaa/99+be+ccXPxCoE4S1+9pOff/P3f/zdV8pLqwzD8OQNO3HF9zB339ANdvY0qpB6UaehOmxRGspfC9yr++nt7a2IxWLSZVsQRIALwnuju7sn3NfXV+HL04THFeAWVWG7sAT4iAjvckX4Df/q5aITh+jqyZ2YaTs2hmFQVlpp/Oo3v/z6r3/92y+JdQgC/PMf/7rsez/47k/CxeWGz+fbus53NuGys8vgzMOi3H1dD5jgtBeY+M4K8NJSm5pSi1QqjwD3GfT398/q6uqSRExBEAEuCO9VgHdX9ff3TzMMb87P7bRCVdhCCTG5aoBvrwhPwM3/6uVDR7uJmU6OEoW2bRPwBSgOlRrf/ObXf33Lf289TyxE2J158IGHTv6/z3z6H0F/sREKhXI22QE34fLkA7JhJ06Bim9ww+yKob7SwjFzC3DDMBgcHKC7S0oRCoIIcEF4j3R0dNTEk8MY+ZrwoLgJmJOtCc/2ivBOd3G945oeTjs4SkeX8Q4BMYJlWxQXF+P3Bo2LPvqRm59d+NyhYiXC7siSxUvmnHHmB+736D6jtLQMy9o6C1tRHdo7DY6cE+fRG7pBLcCwk3dMAIAPasst8hUq1zQNG5OWltYpYiWCIAJcEN4TzU3N0wBULf9rUluerQHuFPCN6lmvHPDQdd0cvq/brEfJcduWZVFRUYmCZpx44klPbtm8RSoeCLsV3d094RNOOPFJwKiprsGyzBxC1KGtw2De9CRP39QJAXBaClh8k53jjGzZ1XyCItsvobm5WQS4IIgAF4T3RmtrawO81WAiF3UVlitgnQK/WT1bkcEPT9/Yyb5T3bb1mrb1jZmmSUNdIxkzFTj++BOfTiSSMo8Iuw0nHH/ik4ORgaqGummY5tbiW9ccWtsNplZlePamDvQycJoKXHy/zcfQWOXe82hzXnt7R61YiiCIABeE90RHe2feRcQN93SYWmMWRg3wsYrwJjCqYOENnVSXZmht96DnEuGWSUPtVDZv2bjXWWecLd0yhd2C8849/5Y3Vi6fU187NafnW9ccWto9FActnr+xg5JpDs6mwhffb734MLXaAtXGskebO6UWuCCIABeE90hbW1tDvs8yloLHZ9NYWUA1wMcqwjdC+V42z13biddwaOvOLcJtx6amqoEnnnrs+K9/7ZtXicUIuzI/+fHPrrjz7jvOra6sMxxna/WpaQ6dvTrg8My/OmjY38JZvwuJb4C0G3bn1gLPfzIo7egFQQS4ILxnmltaGlTFyPlZKqNQXmy78ZCpXezGNXDWw8wjTR77cye2qdAX0Xh3KLzjOGiqQlm40vjt73791Vv+e5tURhF2SR568OETf/DD710ZLi43dF3fqta3pkJkWCOTVrn/t93sf0oGZ+0uuMKmoLbUpKLEJpnOLcB11YeUIRQEEeCC8J7oaO+o6OrsrvH7/Dk/T6ahImxTHbYgvQsOgAKshaPPS3H997qJx3RiSWWrbpm24xAIBPAaAeOij15485o1a6eL9Qi7Em2tbVXnnvuhuz2aN3e5QcWdD4aHdf70lV7OuCwB6972Hu1KZKC4xKEqnL8WeMDvp6Ojs2bTps0NYj2CIAJcELaL9o72mv7+vgavN7cH3Eqp1JSa6MXsWiEobxPgjg1shEu/EuOKj/YzMODJ2ajHsiyqKqoAjLPOPPt+sR5hV+LMM866P5VOhGqqa3OWG3SA3j6Dz549yBevGIYt4GR2QfGdFeAUZ6s/Wfma8XgZiPRVtTRJJRRBEAEuCNsrwNs76jJWEs8oNcDrqywoonBrgI9FhCeBdrjqZ4OccViUzm4DRcmdlFlfM4X1G9bOuOxjl/9LLEjYFfjKl7/666XLlsyvq2nEzFNusKPTwzH7xfjrb/uhD5zoLryyWkAQN/l8lFrg4NDa3iaJmIIgAlwQto/WlrYpMHoJwj3rTPAB9q49Qzj97sJ711+6mVaboq3DyJmU6eBQUVZjXH/DtZfeeuvt54oVCYXMIw8/evwf//T7L5WFK3Meg+maQ2uHh4qwyX1/6XYTmHsAbdcdE8cBPLBHbX6vw8ic2dIszXgEQQS4IGwnW7ZsnppPgLv5Vw5Tq03XS7yrD4buNhHx1MGDf+gGHHoHcydl+nxevIbfuOxjl13f0dFRJpYkFCIDA4OBCy+88DZd8xiBQGCrpEtVhYEhDRx46HddFO/l7BK1vseEBY1VFuBgj+J82LRx055iSYIgAlwQtlOAN03L99nIolNdau264Se5RPgGmH1ihhu/10MirpPM5IsHryaVToQuuvDi28SShELk8ss+cX1kaLCiprpuq7hvBTAtiEZ1/vzlXg46Jw3rd6PV1ISqUgtFd7Ds/CeEI43MBEEQAS4IY6avt68i7/pjKxh+m4oSe/cR4CNsgou/EOOy0yL09hrkitAxLZPqynqeefapo//+t39eLtYkFBK33nL7uffcd9dZVeW5ky5VzaGr2+Cco4b5wtejbtKlw66ZdJlHgJcEbYJ+GzNvEzKN/v4BOQETBBHggrB9RCJDYSXPeXLGhGK/TUloNxPgCjhxIAL//mkf0+pStHXo6DliXnVdw+8LGl/60pf+3NHeUSEWJRQCAwMDgU996lP/Mjw+w2NsnYCtadDWpVNVlubmX/ZCGpzh3Uh8A1gQ9Dr4vU7ebpgezSASiYSTyaRoDEEQAS4IYyOZTKrRaDSka7kroNi2gteAgNfZddrQjxUNnA7Q6uHOn/YAMBRTtvKE27ZNeVklGTMV+MTln/qPWJVQCHzhc1/6WzQ2VFZVWZ2z3ncsoeBYKrf+sJfADAenlV066TL3BAhew8HwuHNhLnRdJx6Pz4lGoyGxKkEQAS4IYxXgvlQ6Ncctp5Vj/XFA1x0Mj7NrV0DJhw5shAVnpfn+xwaIRDzkSkW1LJPK8loefvTBU++79/5TxbKEycyzC5899L+33nRheWnVVuJ7RIAPDHj4wrmDHHdhEjbupiuoDV6Pg0dzsPNkoKuqSjqdJplM+sSyBEEEuCCMiUwmo1umharm9u442cVYUXbfMXIsoBN+/PUIs/dM0t7pIdd+xTA8qIpufOkLX75aLEuYzHz605/9F2D4/f6crebbu3Sm1af443cHoH8XbrYzBgFueBw8+mgCXME0TTLpjCGWJQgiwAVhbOuLbav2KPW1VMWtgpAxld33DVLB6QMq4MZv9wIKsUTuUJSa6jqaWjc3/OTKn10h1iVMRv7y56s/vXbdqr1qqxtzJl4m0gqOrXDNN3pRG8Hp3r1XT0114+GdUWqwOo6DbduiMQRBBLggjA1FUUZtwKOpDomUKzh3u/jPdwwEsBkWnJnm8x8aZGDAk7NLJjgE/UXGVb+46tvd3d1hsTBhMhGLxfQf/vDKK31GwMj12muaQ1+fh4+cPMRx56dgE7v3e49bitWyRj8FzM6jtliYIIgAF4QxoeseU9O0rY6hRzA8MBRT6R9WwbN7j5VjAhH45RcHKSvN0Dug8+7IHcdxKA2XkUjGin/4gx9fKRYmTCZ++pOrvt8/0FNTXl651TuvKNA/qBEKmvz5qwOQBCctqiFlKmQshTxRejiOg6Zp6B7dFAsTBBHggjAmvF4jaRjGKjtPjS1NdcgkVXoGtN3eE4bqVkUJ7uvwq08PkEpqWDn2LZZtUVJUxr/++Y9Pb9q0SRp0CJOCjo7Ost///ndfDQVLcJzc73s8rvPDywYpP9CGNlk1USGRVEilFdQ8Y2HbDh6PB6/XmxQrEwQR4IIwJoLBoOn3++OZPF0mXK+PQteAtnu0nh7LLNIGn7g4yty9EnR26zkX5qKiIizH9H3v2z+4SgZNmAz89Mc/+2EqnQiFS8Jbt5tXoKtXY1pDiq9dNgSd4CgyZugwFFeJJRV0LfcpoW1ZeL3eNYFAIC4DJggiwAVhzISKQlGbTM7PRuIem7o0cHbPQgjvHBBwIkAVXHX5IDgKmRwHz5ZlES6u4Jbbb75g1cpVM8TKhPeTlpbWqn/+65+fLA6W5ky8NG2wTI2ffXwQZWo26VgEOHhgIKoyHFfx5DkBzJgZQqFQtKioKC0DJggiwAVhzBQXFw1tq8j3+lYPxJEwFLJj0AIf+GCCI/aP093jQcsxu4RCQQDjyh/9VGLBhfeVH//op1eaVjpQXFy89cKoQlePzn77JLjowpiEnrzrXe8dVHEyCqqa2wNuORmKS4qHZLAEQQS4IGwX5eXlvaMvQjabO3QYZLdPxBzBiQHF8IvLBwFI5vB9WZZFaXEFt99x63mrVq0WL7jwvtDU1FRz7XXXXFYcKsOyt/Z+ZyzAUfjJpYNQAc4Q4v0eQYeOfg3IHwMODqXh8KAMliCIABeE7aK+vq59tM/9fofmbp2+XhWk11t2UwI0w5Gnpzjx0Bi9fZ6cC3QwFAQc4ydX/uyHMmjC+8Evf/Gbb1t2xldcVLT1oqhCd7fOQXMSnHl2AlqQU64sCoAJWzr0t/47DzU11Z0yYoIgAlwQtouGhoaW0T4Peh06ejTWtXkgIOM1gpMC/PDDj0YASOUIo7csi5Kicm67/dYLNqzfMEVGTdiZdHZ2lV177bWXhQIlub3fpistr7wkAmXZkx3hrU12DDa2e3B7AuenccqUJhkwQRABLgjbRV2d6wHP1xHTozvYpsqyDR7wyni9Y0ZpgSNPTXH8ITF6ez15KqKEcLCMX//qd9+SQRN2Jr//7R++lkzFiktKwlubrwLdPTqHzEtw2lkJaEW832/HAAahqVNH0XML8JFqMg0NDa0yYIIgAlwQtouGhvpWTfFg5ilFOMLyjQZkRu8IN14oBfK2OikguG0veChQwk0333RRV2dnmVicsDMYHBwM/POf//x0wF+Us+63aQMofPvDESgFp0CK6Ck7Kz7d55ZmbO7RCPjzlCDMOi0aG+tFgAuCCHBB2D6mTp3aXFFe2Z5MJkZZ9RxWNXmgnwlNxFQA24JkSnFFuFMAs0orHH1yiiMXxOnt1XN2zAuXhIknhsN/+MOfvywWJ+wM/vmPf396cKi/ojRcmrPrZXevzty9k5x9RgLaC2CFdNyNeSqjbLM1/LgQgPXtOl29GgFv7tPBRCJJaXFF74wZMzaIxQmCCHBB2C6qa6r7p06buiWeyB8AGgxZrNjsobNZhaIJXWNRDRgcVt8S4ZNdFySBMHzjPLd8hJljrbYdC58R4D//vuaT8XhcWhoJE87f/vr3z3t071biG8BxwLFV12ZrwIlO/vtRVEinFfqHVFTdvYcJxYDlGwywVPQ8oTmxWJSp06ZsmTptartYnCCIABeE7Wavvfda45A/BCXkd+jv03l1nXdCBTiAYkDahIHhAqm6ogLtcNZpCebslaSnT9vKO+c4UFZWTk9fZ91111x3uVicMJH89+Zbz9vSvHFKRVllTu93z4DGnlOSXHxWDDoLZHX0unNCKgPqBM8LigJk4I0tox/32WSYNm3aFrE4QRABLgjvib33nrl21JdHBVBYtNrNwlQm0vtkgaFl6+8qTP4wFLIexHr4fx8axra0vN45VdH4+9//9X9iccJEcvVf/vZFwFByxEMpCphpjc+eHUXZA4gUwA05gAc6B1Q3T9Se4O8zgJ5s3otm5xHp7tjOmLnnOrE4QRABLgjviXnz5i2H/JVQcFzV/dJKL/RlF6iJIg1VFRbRuEK8X0EphMoMKtAFl5wepb42RV9E3apusOM4VJZXs2Ll63MefviR48XqhIng5ZcWLXjx5WcPrSiryRl+MjCkUlqa4VNnRKEPnAJouqMokBmE/iGVqnIbJrrpexG0NGu8sdlDUSj3nDgytnPnzl0hVicIIsAF4T2x337zlhcFS/sT8WTenwmELJZt9NC7M+LAS8GyYF2rB0IFMoiD4JkJnzw9Rjqp54xf1z06gHH1n//6RbE6YSL485+v/iJgeL1b75JVFeIxnYtPjlE813Y304XQ9bIIVm/xkEyreKsdnIn2gAdh+WaDyKBGwMh9nJVKpfHovvj++89/XaxOEESAC8J7Yuq0qe0z9py+aTg2lH8N9Dv09em8sMoLxUxsaIgNhgc2dejgpzDCUACi8KnTh/H6TYZjWysb27YJF5Xz8CMPnyqNeYTxpquzq+zuu+8+NxQI5zzNiiUUNI/Fl84agtROSGQcrxcrAK29OiGf7YafTOCmQcn+z6trDEZrQT80PMS0qdO2zJ03d41YniCIABeE98y8+fNedzDzfq6p7mv07DKfWxJsIj1nUZgzLUNfRCXTSWGEoShAF9QfaHHecXGGhvS87eltx/T965//llhwYVy55j/XXp5IRotLSoq3XgAVGBzU+cARcWYcZkIHBeH9VhRgALoHNGY1ZGCiK7Z4gH54caV31J2/aSXZd9/Zq8TqBEEEuCDsEIcccsgid8HLvSo7DqBabiJmDxPbFTMDJXvYpDIKy9YaBROG4liABp87YxhwcjbmsW0bw+Pj1ltuv1CsThhPrr32+o/rmpEz9nukPOanT4uCDxyzQG4qAGvWeRiMqlTuYUNmgr8vBAMtKss2GvhDoydgHnzIwYvE6gRBBLgg7BAHHrjgNVDT6VT+DKeSYpvFaw02rNUhPIFCVgE8EA7ZrNhiTHzIy3jOMh1w+JEpDp6XpK9fz3lSUF5aQXPb5oZb/nvreWJ5wnjw0EMPn7h+45oZ5aU5Sg8CvQMas/ZM8YHjEtBVQCtiGJZuNCgK2BDaCdNAMby02kt3t05xILcAN01393LIoQe/LJYnCCLABWGHOOjgg16fOX2vTZGhwbw/E/Q5JOM6T77ucxMxJ3I1jMKshgyb2nWI78QW1Du6eUgA1XDZKVEcO/e0ky0PZ1x3zfUfF8sTxoPrrrnh44ChebQc9gZWRuPSk6IwlYkP4xgnFAewYX2bzh41GUjshO9TYeFyL6Bmw+62JhKJMKV+j02HHnKICHBBEAEuCDvOoYcd8mLGSuUNQ3EFt8OTS3wwNMGx2THYf3aaaEKhfY1WGE15RmaafvjwcXFKS9MMDm899TiOQ7ionCeffur49ZKMKewgnZ2dZQ899ODpoUAJTo7ky0hUIVSU4bJTYjBUGIdJAPhgYL1KV7/GIbPTMDzx30cHPL/cC5qVN0k1lYlzwIELXgsEA6ZYnyCIABeEHeaoo498brTPHcAbsHjhDS/xJmViyxGaoDWCoTs8vtQH5QU0kH1QNtfmQ8ckiMc0cvRDIRgKYtlp34033HSpWJ6wI/z35lsuiiWGwyXFJVsvfApEh3VOPyxB7f4WdFMYpQcBSuGJ13yoKgT3dCY+/jsM69fpvLbGS0nx6PHfhx526EtieYIgAlwQxoUTTjj+CZ8RjMZi8fxrVMimvcPDM8t8UMrEudOyXTAbqywWr/WCZ4I7cI7n5iF7nZedFAUc0jn8ZLZto6ke7vzfXeeL5Qk7JsBv/aiqaDjkT7685IQYGEx8De1xe4mAALy2zqCh0gTPBHvuHSAEz77hI53UR6n/nUJBT5940glPiOUJgghwQRgXpu85vXW//fZ7PTI8kPdnRsoRPvrqTihHOARHz0myuUODVtwSYYVAtiThEYemmL9Pir5BLafTsby0klVrV8x68smnjhTrE94Lr77y6vzFS19ZUBauzFn9pG9QY8+pKT5wVKKgvN+KDnTD5g6do+akIDLB36cBMXj8NR/g5B2mwcEB9tl7nzULFuz/hlifIIgAF4Rx4/gTjnsK7FHLEaq6xcJlPmjDbZQzUURh3n4ZbEfhxaVeKCmggUwA9fDh42LYppZzo+Ix3M6YN9/430vE8oT3wi233PYRwPD6tt6dqiqYaY3zjomjTGPiY6jHkxCsXu4hllI5bL/UxCeOFkF8k8Jzy714A1ZOb7uiKFhOhmOOO/oZsTxBEAEuCOPKyaec9CiQNk0r78+UhS2WrTN4dbnhxmZP1NmwCVRDaZHNg4v8rgAvlDAUgBhccHQcj9ckmszdGdNnBHnwgYfOiMViulifsL3cc/e953h0L7a99YsRT7mb5YuPj0G6gJIvHaAUHnjFj1d3UBqY2Pjv7Pc9vcxHe6dBOE/975ExPvXUUx4WyxMEEeCCMK4ce+wxL06ftteWgcH+vD9j6ICt8cAiPxgTd6rtKIANB+ydYvE6A5JuSbWCQAF6YPr+JicelCQymNsLXlpaSndfR929995/jlifsD088vAjx29u2jCtrHTrDGVFgYEBnSPnJ5lzYMat/V0o4SfZ/I8XVniZs0cGtIndPIx838Ov+AElb/nBgcF+6munbDnhxOMl/lsQRIALwvhz8iknPpIxk6N3xdQsHnnV77a0nsgSgUNwyoIkXQMaic1K4ZQjBJw0UAIXHBsDlLzH2gB333XPB8XyhO3h9tvv+DBg6HqeeqCOyjlHxKECSBfQjRlAK7T2apx0QGLiw09CYG6Gx1714fHmLj+oKAqpdJxjjz3mmWAwKOUHBUEEuCCMPx/60Ll3AlijhKGUFtssWWOwaqVnYksExmD2PhmSKYVHXvFDWYHNOv1wzuEJysoyRIaVHJsZh4C/mCefePLEvt7eYrE+YSwMDw8bDz748Ok+I5gz/GQ4rhAImpx/VNyt/a0U0M2F4bklXoZiKofNmeD4bwcohxeWeVm/xaC0OPec52TH+Oxzzr5XrE8Qtg+JrxSEt9He1l7xf//32X9MmdLYPGXKlJapU6dumTlzxoZZ++y95sSTTnj2kIMO59VXX6G6uibn3w94HQYGPNz7UoDZJ0VQnAla5NPAVGisMnngJT8fvCzuLpqFIigGITzL5uSDktz6aBHhosxWHrZwcQntXS1V99xz3zmf+OTlN4h1CtvisUcfP7W7p72htqphq88UBYaHNE47MkbDHAv6C+jGHKAI7n3RT1mRjd6Ie8o2QSiKu1F+cFEAUNE1cnrAe/t6mD1rDudf8KF7EomEumbNmlnr163fq6mpaVpLS2vjpk2bpv/pz3/84vTp01vFOgVBBLgg5OWG62+87IEH7zv37X9m6D6mTpvKsccei9/vIxAM5P37tgMoNo++6uPbvRH32HgCEqUcx437Pnq/FDc9HoQBt0SZYxWInrBA8cO5R8W59dGi3N31spuJe++572wR4MJYuOeee88GUFQlZ/lBUPngkQkIg9NTOBtWRQXi8MxSH0ftlwJftnb5RF1/AGiGBxf50Tz5u196vV5Kw6V89v8+5zzzzEI2b95CKvPOfgn7zp6z6pe/vuq7Yp2C8K732nEcGQVByLL3jNkrN23eMLuqqgbHcXAch0w6w3A0StqMU1JURnFxCaaZX1Un0gqxuMIb17Sz16EmzgR5qpRqeOEJL6d8o5rmW1spm2rjRApnrJVSiLSozLykjmhMJVy0dZWFoaFhNE3t37Bp3R6VlRVDYqFCPuLxhL7ntJmbByKDDWWlpVvbUlzBo8Ha69uo2tvG6S2gdyUEqX6Fqg82cON3eznr/ARO20TtjkGZCi8+6OWIz9VSUW7iyRNOr+s60WiUgUgvHs1HUVERhsdAURUUFPr6eykvr2hu62ieKhYqCO92BwiCAMD99z1w6rqNq2eUl73VvENRFAyvQXl5GbXVDQQCgVHFN0DQ65BJ6dz1QgACE9ipMgoH7ZMC4OHX/IVVDxxgEEr2tjn1oASJeO5qKMXFRQxFB8ruv+/+s8RChdF49JFHT+3saWsoDYe3FrAKxIZ1jt0/SdVsu7DCTwBKYOEyL8mUwpGzJzb+WwHQ4a7nA+CoeEc5JzdNE5/PR211AxUVFXi9XhRVyep4h7LScto7W2puuP7GC8VCBUEEuCDk5N///M+nAEP37FhkluMAqs39LwbcLnveCbrgBBj1sEetyb3P+0ErnBBwyB6he+GswxNvjdtWwsm9o0cefvQ0sVBhGxvoMwFUNceylrWt0w9JQKhwQrXevHYf3PtCgJoyi7I9bIhN4PcVgbUJ7nvRj25Y2DvgQMiKceP66278uFioIIgAF4StaGpqrnn0sUdPLg6VYtv2Dq+XpSUWr6wyWL3M45Y7mwgvuA0E4Ii5SZ5/wwcDFE5benB3CwNwyoEJqiozDETVHJsZB783xDMLnz12cDASEEsVchGPx/XHH3/iZK8nkDP2eyihUFRscsYhCRiioHaqig5E4NFXfRwyO+WedE1UwT8HqIRnXvOxfrNBWXjHdiqO4xAurmDhs88cvWbNmuliqYIgAlwQ3sG999x7TiqTCIVCRePy+wJeBzOtc+cLAfBPzHrv4C7EpxyUpKNTp2uDCkUFNvARKJrhcOz8FMlY7jCUcDhMT29H3WOPPXayWKqQi+eeff7o1vamaeFwac59XnRI44i5KWr3ttyNaiERgshmhY1NBicfnHzr3Z8IsZ9t8nXncwFAQR8HhRAMBrDsjO/2W/8nYSiCIAJcEN7Jgw88dCZ5ljZFAdsG0xy7jLazYSgPvOyHTiauUU4MDpudAhSeeN0PBVYx27GAIJx+qFs5YbQwlIcfekTCUIScPPLIo6cAaLnaNSruUnfaIQkoBSdTYDdXDM+v9AEKR81NTmz4SQmk1ivc/6Ifw5e/+sm7sWx3jsw1Q7oniioPSxiZIIgAF4S3093dHV606JWDg/6SnMfXiuKQyij09Kl0dHkYjKpoY4i3Lis1WfSGl6VLPFDFxLit4lBTZxEsMt2GPBRWHDgKMAQnzk8SLDKJJnI35fHoPp55euHxYq1CLp58/MmTVUXP+f4mUgqaYXLy/gmIF9YLojiAB55c4kPRbfZqMCdOgNtABTz0sp/WDoOyktFD8VTVdTR0dOl09+gkUgqKmnuSKykqZenSpfM3btzYINYqCCLABQGAp59eeGxkuL+iqKgopz7s6XWrJzx1exff+OQgIY9Da7sH03YXoXz4PYClcdvCIHgmaN1PAeVw5NwUD7/sgx7c2uOFxADUz7I4cm6K4SEt5ziVhkvZ0rxxytNPP3O4WKzwdpYufX32ylUrZ5eW5G4HOzikccjsNLP2NQuv+okHGIT7X/Sz/95plMrsOz8RYl93N/S3PB10xcEoE5auOXT3a3R1ezjtqDh3X9vN2UfF6en15AwjCwYDpDLx0JNPPHWiWKwgiAAXBABeeuHFIwDUHCuOA6QzGmccluC485P86ucDvPa/dj58cpTuHg/9ERVdy+31sR3QPBb3vhCAJiA0/tfu2IAPTliQpK/fQ3eLOiHfM6FkgDI46cCkOyXlWMB1XQcwHn3kMTnGFt7Bo488dqqNaXh9W5cbUhRwLJUTDkhADZAssJsLQqxVYcMWgxMPSLg5HhNVwaUcOldoPPSSj1CxmSccDDQNWto9GDj858c9PHRDN+dcFueDRyVIZ5RRq6a89NLLh4nFCoIIcEEAYMmSpQsgd+e8VEbB8JkcvHcKNgJrYMqeFrde18PfvtdDIq7S0unJK8LLwxZrNho8/YoPKhn/MBQFSMMBe6cBjRdW+gouEdNRgAScckAC3WuSSOcOQwGFF55/8UixWOHtPPXk0ye8ZSPv2tuZgGpx8gFJyGRtrZAoglfXeQGNQ2enwZ6gBEwbKIE7ng0Qi3ooDuTOhQFobfcwZ1qapXe3c/nno9Dnzov775miqNgknsr9/iporFq5ao5YrCCIABcEurq6wqtXr5kd9OXOXhyKKUyvM5k1JQNRcFRwWoB2+MzXojx7XQchw6alPbcIdzvIKdz+bOAdi9i4Eod9p2QAm6eW+kApsDhwgAGYMyvD3OkZBodyT0slRWW89tprB0ocqTBCe1t7xUsvvXR4KBDObVbDGjOmZDh031TBVT9RHMCAp5f6AIcDZqQmLP5b8QE92fAT1c4pvm0H2jsNjt0vzpK725k534SV4CTcOWhavcVejSbD0dzvb1GwmDVr1s1qamqqEcsVBBHgwm7OmjVrZ/X2d9cEgv6cn5splRn1GTwVvHV8rWUXnZVw1AdSLLmzndoyi5Z2A+1dItx2wOuzeOAlP8l1ysRUKYlBdb1FTXWKJ5d4YRDQC+xBJIA6OGa/JI6p5o0jTaZjoScef1LKEQoAPPfc80dH45FwUVEop2g0UypHzk2hNzKx1UMmAh0Yhkdf81JcnGFKgzUxHTAdoBqWveLhxeVeysLvrH4yIr47uwzOOjzK0//rwlMCzjrXIYHCm7koezdmcMzcssIf8DMU7S9bsfyNeWK5giACXNjN2bxp83Rw0DQtz08o7D3FdIWz9Y4/dhep1TDzQJPXbm+nvjxDaw4RXlpi09pucN8LfjcMxR7nm0i7i9+x+6VYvcHLUItScHHgbvdQOG5BEnAYrRfS008vPE4sVwB4+qlnjnNFopLbpoDjFyTBn82XKCQCkGhWWLTcx2FzUlCWfdfHGQXAA9c/GQJLw2847xDfTlZ8n3FolHtv6AYVnOZ3bfJtIAj7TM1f43GkQ+mmTZulIY8giAAXdne2bNkyLe8Cnv33jLoM6DlqVCvZkJQ1ULevxau3d1BblqH1XeEoI7mdtz4VhFi22sB4i1cDDp6dAjy8ss5bcPXAUYAIHD4rRXm5yVA8dxypoftZ9PKiQ8VyBYAXXnjxSFXx5Iz/Hk4oFBebHDc3WXDdLwEoguWbPeAYHDwrDYEJ2LwDhCGxRuH2pwN4/eY7kigVBTq6DE5aEOP+G7rBAaeVrU7YRv7KtBrT3UCPEqi+cePGPcVyBUEEuLC7C/DNW/bI95nrhXWoKbdGrzygucextftavHhzJ8UB6x0x4Y4DRcUmj73qp2OF5ramH28ysP9M1z22aLXXXSCdAnsYEaiYYXPY7DTxaO4TiZKSMFuaN055/rnnDxbr3b1ZseKNvVavWT0rXBLO+Xl0WOPAWWkaZlpuWFYh4QA+WLzeABQO2Dvlit/x/h4bqIT7nvPT1mFQVvyWwtc0h7YODwtmJnjs+i7XCdFG/vC2DNSWW6CMfoLV3Nw8RaxXEESAC7s5XV3deROCHFtB0R0qSuxtl/7SwFkL0xaYvHB9Jx7doa1bf1OEFwUcYlGdW58JQHE2wWo8icOsBhMweeZ1L0TG39M+4ZhAGI6a55YjzBUH7vG45QiffvoZacqzm/PM088cb9lpn8+3dZtZRQEclUP2SUG5Kw4LCUUDEvDsMh9gMntqxm0iNN7fYwBDcP3jIcB5853TNbfXwbSaNM/c0AnFOcJO3o0FZcU2voCDZeU7blDo7emrEusVBBHgwm7O4GAknO81SFsQCtiUFtljW8BVYB3MOT7DY3/pxDYVegc13gwvV2zuWBh0m+V4x1+A11RZNNaleXGFl3SnAv7CehZOtqTi0fNSoFmkzXzlCOGVRa8eIta7e/PC8279/pxa0AawOWb+BHmOJxov0AULl7kJmNNqzPEX4A5QBRte03n8FT/hbPKlrjm0dHrwe22e+U8nRdMcnM1sO7E7AyVBmyK/TSaPw0JTDAYHB8NivYIgAlzYzRkeHgrpau7WkZalEPQ5FAVs1zu7LZTsQr8Gjj0/xc0/6iYR14nGFRQFystMXlzuY8nLhtsUZDxVQRoog0P2SROPGaxu1guvIQ/AICzYK8WMxgyR4dzTk88IsXjxkgWRSMQnFrx7Eo/H9ZdffuVQQ/fnjP+OxFRqqk0OnZWCSAHeYBA2t+p0dhkcOCuNp5xx74CpAPjhmkdDmGmNoN9BU6F3UAMbnvhrF1MPsnDWM7aqShYEvDZew8Gyc3vADY+HaDQaGhgYCIgVCyLABWE3ZXBwMBBPJALZLotbYTtgeBx8BmNPflKy1RY2wkVfjPPjT/QxOOghY4LfAGyFG54MgjbONcGzVQgO2DsFaLy21ltwHnBXWYHRAAfulSaTylMPvKSYjq7WKS+9+LK0pd9NWbpk6YKmlo0zSkpKcn6ejKnsPyNNSaM9MaX7JpoQLN5gAB4O3DsNJYzNCbA9lEBqncJNjwcxfO4vjycVEnGdG3/Qw+EfTMF6xp686oDXAEMnbwy4pmmkUqkZsVgsJFYsiAAXhN2UVCplmJnMXiPlsbZaTxxQVfdIdru81Qo4SaAFvn9lhItPHKK7x8DGrQl+58IA6fWMa6USJ/s/e09xY2VeW2tAZoIa/0wgjuVuJI6clxoZypyLOMCLL74kAnw3ZdGiVw8GyLV5dm1e5Yi5SSidAOE6wYzY/OK17sncvntk3ByT8fwSG6iCu58O0NJuUB62MW3oH/BwxUf7ufgLMdiQdSZshwDXNFDV/FeqagrpdIZUKm2IFQsiwAVhN8WyLN2y7NFF6nuNH1XBiQAxuPHPvSzYK0F7h4fKMovWDoN7nguMf2v6JOxZZwIZlq433M5/ngJ7KNmmHgftnQLNHjUO/OWXXj5MrHj35MUXRon/tlyFeejsNFgFGP+tAwO4p1hYzKjPjH/4iReIwH8eCQIOuubQ1WVw+qHDXPXzQejMOhG2cwPvODnKtb5rYrRtC8s0dbFiQQS4IOymOI6TM370zZdDhbQJyZTy3t4UDZwOIAgP/62LkiKL9m63PuDNTwYhnq12MF4kYM8ak9LSDEvXGfS2qhAswAczBPP2zLhx4LE8XfW8RaxYsXKexIHvnrz++vL5Hi33ox+MqTTWZzhk78KN/460Krz0hkEwlGZ2Y2Z8u3g6QA288ZKHJ171U1lp0tLmYWpNmrv+3AMZcPrfgzpQIZ0B01RGdWpk513RHoIIcBkCYbc1flW1VVXJ6yLzaA7DCdUVge/VX6ODsxmq5to8/LtObFNF9Tg8tshP82Idqhg/F10CgtUOB85Kk056WLrRgKICfDAx8DU6HLh3mkwy9xRVVBSis7u14dVXX5N64LsZr722eN7mzRunFxfnjv9OxVXm75km1OAUXvt5gBCsajaIRT3M3TNDuMqG5Pj9ekUBPPD3B0NgqcRiKijwyJ878TbkbrQzVodDNKGSSCvkbSyMg6KoqKpqiyULIsAFYTfF4/GYmqZj51HAugbDUZXeiAbGDr5l6+Gwc9P85f/1Ymc0kgmd6x4PQmgcG/SZQAnsMyUDaKzYbIBWeM9lJA78oL2zfbdzDNBI7K90xdz9ePmllw+1MQ2v18gtLlGZPzMzMYmLOwMDVjV5AJ1Zjdn7GK865g5QDoPLVf77RAjdaxGP69z6o25mHW/ibOC9Oxs8EIkqDMVVPFruOdWxHXRdw+PxpMWSBRHggrCb4vV6k4ZhrLGt3M4YTXPAUugeUHdMyCpZUbkFPv/1YS4+KQJo3PxEAJoYt3KBjuMugjPqXdWxZJ3hhrkU2luerQd+yGw3Dtw0c92ru8AvXrz0ALHk3YvFry05yNWSW4u8kfrfh+xTmPW/FcUV20vXu5uLPetNt5rRePmLswL8xkeDDAx4MFM6Xzx3gA9/Jg4bd/B369Ab0UjGlTcbkL0b27YxDA8+vy8pliyIABeE3ZSioqJ0IBCIm5ncbjJVcdVgW6+2455kFZwoEIUbf9PH3lNjrNsc4okXfVDN+CmFDOwzNQOYLN/kgW7Gv+nPzmAY9tsjzZQak6F47mnK0P0sXfL6gng8LglduxFLlixdoCmenO9MNKFQXm5y4Mw0DBfgzRlAHyzb4NY+nTU1M64bCSUEtMA/HwwBGofMTvCnqwag970lXb5bgLf3aeCoaHmUhWVZ+Hz+NYFAIC6WLIgAF4TdWYQXFw1ZjH4auq7FA6lxKOk3kpRZCff9thuAX95WDNY4eqmTML3ORDcs1mzx0NyhFWYiZhxCtQ77TM2QyiPAi4uKaWrePOONN1bOEUvePVi9Zs30NWvX7FVUlDv+OxZTmdVoUl1vFWb8tx8GOlXe2KIDJjMbMuMX/20DtfDEQh9vrAvi96e4+3fd4AenZ8fUwMjUuLnD3QvnmyvTmQyholC0uLhYPOCCCHAZAmF3pqSkZHB0/5LDulYPDPHeYyPfjg7ORtjrWJM/f6WDJ14upnnROCZjJmFKpcmeDRkyKZ03mgwoxJ5zGaBsJA5cyemY8xgeHCyWL18+Tyx592DF8jfmpTOJkM/nzS0CbZX9Z6ahAijEKOMgrGrRGRzwUFNtskeVOW4CXDGAGPz0vyWAym0/6qb2AAtnyzjMbRoQhbXNnlEnMps04XB4UCxZEESAC7s5VVWV3aN9bvhtNnfoJHqU8e0suRm+8J0o+8+M8ZWrS6F0nJIxU6CXwvRaE9BYtsHjdt0ssOcysoTvv1cKcLBzrOkjXrbFry2ROPDdhCWL3Wedq3nWiIkcsFcajG3Vo56kGLBsgxfQmFFvUlzujI8Ad4A6WPOih4WvlfCZs3o48/KkG/c9HpODBxiEje0eFG30gS8vK+sXSxYEEeDCbk5jY2PLaJ+H/A7NnRpr2vTxC+VQwIkDA/DwX7vZ3KHT9JzmVjvYUUygeCQRU2F1swfiBfqmx2HfqRn8QZtkJldDHncwly1bPl8sefdg6dKl891nv7XIS2UUdMNi3p5pSBTevY0kYLoVUFSm145fBRRFccX9Z/9URkkwxd9+NQDd4KTHSYAHoLNLY3OnRiAwugCvr69vFUsWBBHgwm4vwBta8y3oAF6PQyalsWSdF8az5Us2Hrx6jsX3L41wz9OBcfGwO4670O7VmAFsNrR63I6Yhdj4OQozG032asgwFM09VQV9RWxYv3FGT09PsVjzrk08FtPXrd0wy9Bzx1QNxRRmNJrMnV6gCZgeoH9EgDvs3Wi64WM7WgEl23hn7ZM6z7wW4Jl/tENox+O+3/kiwsomDz29GkHv6Bc8ddrUJrFmQRABLuz2AryxGdzyWLkYcQ69ttaAzDgkYr4dHdgE554S56B90ww1KePTGdOEPWpNwGJ1s4eOdq0w48CToNbA3Olp7EweAR4K0tPXUbd8+QqJA9/FWbV6zeyWlqYZRUW563aaKZVZUzJ4qihIDzgB6G9XWbXFA1jsUZd5Uz/vCEpWIH/rn6V87cODzD89g7OJ8clpARTH/V2L1xngaOh55jA7G0fW2NjQLNYsCCLAhd2cKVOnNPu9RaTTuc95HQDNZtlGA3oZd0+yYwMWHL5fCkPN/veOkoYpVSYer8XggM6KLUZhVkKxXVGy7x4Z8iViapqrIpYueX2BWPOuzetLX59vORkMw8izUXYFOEXuO1WIAnxtu4euHg0Ui2k15o4nkjpAJbz2oIHXcPjNDwZgE+ObFKIBsZHa5XbeDYNpZtBUgz2m77FJrFkQRIALuznTp++xqaGhflUslr9mWUmRzbINHjZu0McnTvtdysFJuWLT53PGp+FGEqZUWtRVWoDK+hZ93LxdOxMHV0jNn+mG0+Tul+Qu96tWrdpXrHnX5o0VK+cCKDmOoVznqsP8GWn3nSrEG/TC+lYdHI2aaouZdaabv7GDK7yVgVdWe/nupRHwghMbZwEehFSrwuK1Bh5f/gksGo3R2NC4YdasvdeINQuCCHBhN8fn89l77b3XuoyV/8w64HWIR3Wee8PretfGe3VXXM+3Y4/TwpiEkkrb9aCh8MaWcapj/n4Qg32npikts4inlLwDuH7d+r3EmndtVq1aNRvyJ2D6AhZz98gUZgJmdrO5OpuAOa3KpKLC3uEKKIoHujdoHD0/ybz9Mzht7HhTsXdTDMs3etjQ4qEkmF+ApzIx9pi+x6aioiJpQy8IIsAFAfbZZ9YqyO1Zc//c/fczr/sgUQCt3TNACexR657Dr2n2wCBuklehEYfGaos9akyieRryBHxFrF+3Ya+e7p6wWPOuSSQS8a1ZvXa2z8gd/z2cUJhabbJnbWbHvcbvBzowBCs3uy9pfaUFxexwBRTHhNKwzZyZGTcxdbzFtwN4YdEaL46lYWzjpG3mzBnrxJoFQQS4IACw337zlkH+SiiOA7rX5vkVXswWIDTJb8gGfG4cODg0d+lEe5TxreKys0gD5TCzIYNj5t4ghUJBunrb61asWCEdMXdR1q5dN6utvW1aKJQ7mcFMqkyvM/FWUpgJmF6w+mBzpyvAG6vGqQKKBT6vG9rmmON/2YoODMPCZT5Gi/8ecW7MnTt3hVizIIgAFwQADjzogNe8nkA0kch/3ltaZLGxxeClN7xQOrnvJ1seO1sJxaG1W2Njlz6+jYR2Fpa74Zk73U3EzIWmaW+KNLHmXZMN6zfMsMmg6/lcrIqbrBvGrYVfaPihuVunpUsDbKbWWOAZh2ZC4x3e9m6CkGhRWLTag+HPv1tIp9MoaBx08IGviDULgghwQQBg1qxZm2bMmLFhaDiS92c8OmCrPPKq3+0sOdmzvDKwZ30GVIt0UnNbRBegAB8Z5llT0uTriDnCypWSiLmrMhL/rYySyDB7Wsatr1+IN+iH9W06kYgrwGfUZyZ/JRcHCMOLq7y0tBmEQ/kF+NDQEFOnTNswb97c5WLNgiACXBDeZMGC/ZfYTibvAu84gGbx1FIfdDH5wzlS0FBpURp2XV9rmtyj7ULMwyQJe9ZZGD6bjJn/DtasXiMe8F2UlW+smpvvM9MENJuZ9RlIFegN6mTrf6v4AjZTq8xJfy9K9rqfWOwDlLz1vwHSZoJ5+8193e/322LNgiACXBDe5MijjnjOFdr5/WelJRavrvLyxnIPVDC5XW0pqCu1qC61AIWN7YXdkn7Pmgz1lRaxZG4B7tH8NDU1T0skEjKn7YJs3rx5mqrkziKOJlXqq0xmTynMBExFAdKwoU0HFKpKLerKrR2ugDLh+IF2eGqJD0Wz84bLjDg1jjjiiBfEkgVBBLggvIPDjzj8RU3xJJPJ/G4nvwFWRuOelwLgm+Te5DR4ww61Ze45dlOnBkMUZiWUBBTVOMyoz5DKUwklFAzS1tY2a/PmzdPFmnctWlpaq1pa2qYE/bkTMBMJhT1qLcqq7MkvWnORrYCysc19OatLLcpL7R1vwjPRlMEbKz0sXmMQLhkl/juVBtT0Mccc/axYsyCIABeEdzBnzr7r5s2bvzwyNJD3Z9wwFJv7X/JDJ5M7DMUEQtlyZkBTt85Qb4FWQjGBEpjZ4NY1z4XhNUikoqxft0Hqge9ibNy4cUb/YE+Vz5/HeG3VrXlfwuQXrbnwQaJHYWO7DjjUlo9PCcIJxQH88PhSP1ZGx2/kPw4ciAywz977rjnk0IOXiDULgghwQdiK444/+inbMUdN9CorsXhttZflr0/yMJRsG/c9ajOMVEJZ1+ZxS5sVGI4DeGB6Xf7yFqrqTmWrJQ58l8ON7XdGqYCSrfjjZ3w6ye5s/LClS6e9zw2inlpjQZBJnYSpGEAfPPyyDxQ77zyoKAqWnebwIw59USxZEESAC0JOTj31lEeBtGnmX/n8hoOd0fjfc8FJHYbiOIACU6oswMFMqWzu8IBRoA/HhllT3M2ENYrI2rxp055iybsWGzZsnDmqnQN7N2YKugV9U5dGbNgV4HvUZMAYhxKEE0kptK7ReOENL8XFVt5xt7Nli04++aRHxZIFQQS4IOTkpJNPemZKwx6tg4P9+XWgA6pucf+LfmhlcnuULaircAU4KGzu0Au0DAqQdD3ggSKbdCb/TTQ1NU8RS9612Lx5y7R8n2UsBc2wmdlQ2BVQtnS6CZhgU1dhT+4ShDZQDPcv8hOPegj58+8UIpFBykurOk859eRHxJIFQQS4IOQX4Sed8FjaTI4ahlJearFsjZfnF3mhmsnrdstAbbmFN1v5a12rDklQCvGtT0JjhUltmUU8lachj+qlpaVVBPguxsaNG2eoSu7wk2RKobLUck96CjABU1EAEza0elwBrjnUVZiTP/xkAO59YfRWnYqikEhFOfbYY54pKSlJiiULgghwQcjL2eecfS+APUqcg6EBKNz0VBCc7CI6GUlBTZlFWbF7L5s7dLcSil6ADyYFoVJXnKTzCPBQMEhLS2vD+vXrRYTvIrS2tla1tbY1BPyhnJ8nUgp15RY1ZVZhesA1YBg2tLsvZXnYorFykm8myqFpuc4zS30Uh628oTIjf37OB8++WyxZEESAC8KonHjSCY/V107dMjCYvxqK7YDXb3Hv8wESaxW3/fVkJA1VYYuqUted1t6rkRpQCjMOPAMUZ2Pa7dwC3Ov1MhwbKNu0cfMMseRdg5bmlil9/b01Pp8397uYUaivLOAKKAYQgdZutwJKdant1gCfrJsJByiC+xb5SSV0Qr78x3+DgwNUlte0n3XWmfeJJQuCCHBBGBW/32+fc86Z96Qy8Tcra+SirNims9vgzmcDUM7kDENJgxZ2O2ICdA1otPVrhVmKMFvVZWZ9hnyB7CPPq6WlpUEseRcR4C2tDQ4WmpavzaLC9FoLipj8rdvzCPDufo3OAff+qkotjCJn0pYgVAygF+56LjBq9RNVVUmkopx66imPFJcUS/iJIORAlyEQdid+8YtffbWpecvUA/Y/YPGee07f1DilsXnGjBnNb/+ZSy+79Pqr//aXr6RSaTye3K+IG3Zic/NTQS6+JIaigzPZBIDlitbacvfCBiIqLd0a071mwT03JzvmU2vce3FyhP6MxO1v2bxFKqHsIjQ1NU97++YqF3vWZcAzyauG5MMHrb0aPQPu/VWXZksQDk7Sl7AC1r+s88JyL+Fw/uonZsadYz568UU3v/uzTZs2NbQ0t0zZuHHT9CVLl+xfUV7Z96Mrf/BzsXZBBLgg7ML86Q9//nJH10iinkppSWl3Q0N96/4LFiw55tijFx5//HFPHXzwQa9/8OzzuPveO6itzu1MdRwoCVs8+aqf9a/ozDzMhDYmV5URBzCgOtsNE1tlY7uHYzwFWi7ChIZKExQb24Z8TtGNGzdJN8xdhI0b85eVdCvcOa5NWAV6gwZs6dRIJ10BXlNmgZdJWc9cAQjCbc8GyaR0gqXp7DPYmq7eTo475kROOfXkp9pa26qefOqp4595euFxS5YsWdDS3Dqlf7C/auShBf0lgyLABRHggrAL09bWVpFKpX2hQJhQKIhlWaRS6apVq9ZUrVi5fMENN173ybJwBZdceglFRSECgdCovy/kd4gMavzn0RC/OH4QhckVieI4oGi4MaVZtnToYLve44LzGKbdsorBkE3aVPBrTk6Z0NbWVifWvmvQ0py/rKRpKuhe2w2xyhToDaqwqd3z5s69psxy48In47sZAFrgfwsDqLo16vzh9/morKrgG1//lnP9ddfT09eVvV0PoVCIyvJKNE0jlUyRTCXV1avXTN9nn1mbxOIFEeCCsAuyZs3aWf2D3VWV5TUoioKu6+i6TjAYQFEUHMchOhzlj3/6PUF/MeVllZhm/pXdtsHwmdzyZJCfbhhEL8GtMjKZMKGxymSkFnhrr+YmeE223cJYSEFdmUVFiU3XgIbfu/UNeDQfXV3dNYlEQvX7/bZYfWHT0dFZo+ZZphJpheoym6nVJiQK794UBchAS/fI/TnUV1jgTMJX0wGq4fl7vSxf46Wy0hz1GivKq3nk4UcZig4Q9BdTW93w5hz7drw+LwNDvcWrV62eLQJc2N2QJExht+GN5W/MA3K2tB5ZGEJFIWqrGygqKhpVfI9QVmLT3GZw51MBqGLyHR2brlfN43MvrL1Xgxhu+bNCIwXhbJWIZDJ3rI/f56O3t292R0eneMELnJ6enuKenp4qn9efW4CnFKpLLapK7cKsgKIBCTcG3F2NHeorrUkZTjOSb3HLM0FAyZZiHWXaMTMEAgFqqxsoLi5+xxz7DgGSje1fscKdmwVBBLgg7IKsW79+5tgXnLEFc6vZH7vmkRAMZasETCbSUFliEw7ZgENnv4Y9ROGWIiyBhioTrNzPx/AaDAz20dXZWSMWX9h0dnTW9fX1TfPmKUHoZFwBThGFGYLiAQahuVMDHIJBxy0ZOhk3EyWQXKdw97N+vH4rb+z39s6hI6J844YNkjgtiAAXhF2VLZu3jHtynuNAaZnJ46/4WfmiB2qZXOfHaagssbICHDr7NTr6NTfRq9CwAS/Ullnky3bVNA0Hi+aWVilFWOC0d3TUJFJRPB5PPonnxkwHKMwkTC/09qt09mugQGnIpqJkEnrzbaAS7nk2QEeX8WZjr/GkuVk62Aq7HxIDLuw2NDU1TdHV8VeeAa/DgKVx9QNF/PWkfjfBcbLctAnBoEN5sc16oGdAo7lLp35eASqWbFWXmrL81/5mLfBRkvcKjf7+/tDmzVumtbe1NfT09FYMDQ0Vp1IpH4DP50sWFRcNVVVWdtfV17XvMX2PTaXh0viucN/NYyhBWFM+iZMWxyDA2/s1+obdeI5wyKa8aPIllCrZZkHXPx50/3ucE7g9mp+Ojo66ZDKp+nw+ydsQRIALwq5EW2tbVW9vX4XPm7sLjaJAxgTHUTA8znYtMLYN/qDJrU8G+cWKQYqn2tDL5ChJaAIhN1Yd3M6B7X1aQb75DqA4I42FnJy1wEfo6OisLWR7feaZhYc//dTTx7/66uKDVq1cNbuzo2NGyhw909DrCVBbV7tu331nrzrooANfPe74Y586+uijXy7Yd7atvc59N/O/SDVlFmgFWgPc455IJaLu/ZWXWHgC2Xd2Mr10VbD+JZ3HXvETDpvbNdaKAqm0gqKA1+PkDF3x+/30dPfMbm1ta5gxY89mWa0EEeCCsAvR29tbMRQZavD5fXnXGcMDbR0q6NBQZWHbY1/YS4ts2jsNrnk4yFe+M4zSA85kEOAW4HNb0o/sCDr6tMJMwszeT32lBaqDZYOe5z66u7oLLgZ88eIlc26/7fYPP/DAQ2esWv3GbHAMAL8RIhgKEfaUoijKVoLUcRxs28E0M3R2dO21pWnjXg8+dP85P7pSTc/dd+4bZ5z5gQcu+PD5t82fP39VIY1Hd3d39WibXnBorLQmZc3ssa6+HX0abiSoe0pFkElVSUkB8MNNTwWxMxpBv5Ud+20Lb0WBtg4dDZvaWhsrz98zDA+9/b10dnbWiAAXdickBlzYLRgYHAwn0rGcFVAAuns1Dt0nxX1/62bv2gyt7QamBep2vCGqbvGvB0PQgpsYNhlwAO87a4G39mhg5vceT2rS7mYiGLTJmPlvoLunp6JQbunJJ5888oPnnHvbwQcd+uqvfv3L761evXp+ZXm1UVfTSG11A+HSMF6vF1VVc3qDFUVB01S8Xi+lpWFqqxuoq2mksqzKWLHyjQVX/eLnPzjowENfPe9D59+ycOHCQwtlXLq6uqryfWbaCqrHdru8Fl5j1zcPx9r79Df/pLrMAh+TK5ymCJwtcPMTQXRjbOJbU12vd1uHwUH7pHj8v90cOz9Bd2/u3bIbYmQx0N9fJiuVIAJcEHYxhiJDxeDkPc62TAWPx+HMTydYck8HHzlliO4eg0hUzdtx8R0614HKMotVG3zc+5jfTcacBJ45xwF0qC6131Tkzd26Wze5EN/+NJSX2ISDTl4BrqDT19s36QX4q6++Ou+sM8+588QTT3zynnvvvqCkuMRXXzuFmuoadF3PWbZt7M/dQffo1FbXUl87hVAwFLjzrjsuPPbYYxee+8EP3bZ06dLZk318Ojs66/IZacaEkiKH8hKrMEsQqkAKWrremlxqR+LZJ4tH3waq4YGFfjY2eSkPbztvRNNgYFilr1/nsx+K8MqdHRz3kSRBv4Nl5X6WI3Py0NBwsaxUgghwQdjFiMViobdP9rnw6A6shUCpw3+v7eU3X+0lOqzR1q2ha9sWQ7rqCtw/3lMMEVAmS6URy40vHXGtdfcXcC1wE8qLbEpCNqk8nk+f4aO/r69icHAwMFlv48tf/sqvDz744Ffvf+DecytKq4362in4fD5se/zVl23b+P1+6munUB6uMu6+564LDlhw0NKvf/0bP5vE76ve3d1dZei+PAJcoThgu2EbhViCUAUS0NarvfleVoYtmEQJ3IoHiMG/Hw69bX4bZf7THLr6NGJRjb98q5e//r3Pvc/14PWM8j3ZOTkWiwUQBBHggrBrkUoljdEFuILPg1ubtw3ogK99d4gH/tKJAbS0e7Ypwm0HyspNnn7Fz2vPGFDH5PBm2VCRFeCK7tATUbGi2XstQAFuBBzKii3MdP5a4H19/TM6O7smXRz4I488evyMPWeu/tOf/vil4lCp0VA3FY/hmRDhnUuIG16DhrqphIJFxm9/+5uvz9p79oqnnnzqyMk2Tr09vVWRyNAsr5G7YH0qo1BaZBMOFqgA14Eo9EQ0N7MYh4oie/KUU8x2vtz4qs5DL/kpCZuj1v7WNYe2bp1MSuGu33Xx+W8OQxPQ496r4XG2KcCTyZRPVipBBLgg7GJkMua2W8+M6DkNnBiwFj5wYYLXbm+nJmzS0m6gac6oxU0CrsznD/e4p6nKZPAyW1BW5KD7HDQN+odV+obVghXgBKCsyAY7jwA3DIZig3R3d1dNpkv/7ne+d+Vpp5368MZNG2bV1041QqEQlrXzFZdlWRQVFVFfO9VYu271nBNOPOHJH/3oyu9MprHq7+8vGxoawmPkNlI7o1BWZKMWag1wD8SjCn0RFdUDKI5bqWiSuL9Hki+vfSyEmdYJ+fNfmK47tHTq2KbCk//s5IOXxWEdOPG3FMZY0k3GNEcLgghwQSgsxhJPm85kz38V981wLGAVzDk8w5K7O9inMUVru4Gi5k9gtGwoLjG54+kgTS/rk6MxTwbCRRbFAQdFcRiMaq7nrRCXOxvw4TYsybOsu0ldzqSJAx8ejhonn3zq/T+/6mdXlBSVGQ11U7Fta4divMfjfbBti4a6qRQFw8aVV/7oh2d84My7E/HEpKiM1dffX5bKxNHyJWA4UFpUwE14PK73ezCqoqkQyNbqnzTe/BIwN8CNjwfxePMnX+qaQ2unjuLAs9d0cPy5SVgNjplVF4r7rDLWWGxSSoALIsAFYZdj222RHaIJxfWwjvyoAo4KzlqonWmx+J4ODt47SVuH4er0PL+yOOCQSmr8/s4i8E+CaiMZt8teyO8ucNGoQu+gVpgecMcVL1Wl9jafdf8kqKqwfv2GKfPm7rfi8ccfPaO2qsEIBt8fr3c+LMuiuLiYmsp648GHHjhn/vwFS5uamt/30J3+PvfZ5W/Co1ARtidX0uL2YEBvRGUwqoLjNuGpDE+ShNJs8uWdTwVobs2ffKlrDm09Oo6l8My/Ojnq7BSsAefde2MbovFtSw2lIMsyCYIIcEEYFV3Xt1msbCim5q4OooGzAfzlDi/d0cEJ+8fo6DSw8zSCsWwIBE2uezjEwOsqVPL+esFNCAdtSoI2pq2ArRRsLXAnK8ArS6xtLuR9fe+vAH/1lVfnL9j/gKVbmjbt1VA3NdtBcPKpRdu2UTWVhrqprFu/Zs78/eYve/31Ze9rlZT+/oGybYmyqnABd8HUoWdQJZ1QsRwoCdpuWNUk8IArXqAP/nZ/EWCj5ngEmubQ1adjZxQe+2snR5+TFd/Ou8S34joABqPKNh+Ux6MXYj0bQRABLgij4fV5k66Ay70IKIZD35Dqxi3quRdMZwuoAXji1i5OOzhKZ1d+EV5abBOJePjrPUVQms2zeh8FuB50y/c5GQXICvBCffvtbPgBo3cs7enpqXy/LvH55144+JBDDl0UjQ2VNdZPw7KscdOJbviIjW3b4xbG4jgOlmXRWD+NwchA1cEHH7LolVdenf/+CfC+bQrwimK7cLtgam/VALctKAnZ+HzO+x9O4wB1sOQFg4Wv+Skv37rzpaZB/6BGOqVy96+7OOnCJKzN4fnOzpskoH9YyxsIPmLDXq9XBLggAlwQdjUCgUB8NAHu8zj0RlT6hkZJTtTBaXEXz4du6ubsI4ZdEW5vLcIdBwyfxd/uC5Fao0AZ75+nzgSC2cTF7DX0DKqF24zHhpKQeyOjVWbo7e19X2LAX35p0YKjjj7qOQeMxvppmOZ77xTjClCFeCxOR1cbHV2tdHa30dXTTldPO53d7p91dLUSi8bYlmjdpqmYJo3108hkUqHDDzv8pcWvLZn3foxhT09v3s2T+8wd1wYKMP5byf5P14Dm/h9LoSRog5/3/X6UrCL4+4MhQMX3rjwRVYWhqEI8rnPt97s55/JEfvGdnTOtqBtuo3nsUQX4yBwtCLsL0ope2C0IFYWi7myf+3Of4dA9qNHRr1Gxlw2RUUR4Kyh1cM8NPZx1Mdz/UhG11elsiMFbArwibNHW4eVfd4f4wreHoZ+xlQMYb7JhG6VFb62SvUOqe9y97ZPhyUc2ZhZ1dA/4QDaMYWey8o1Vex155JEvAEZj/ZT3LL5VVcUyLTp6WgGoKKviuGOPZ86cOUyZOpWiUAgUhWg0SktzCytXvsGK5Svo6HJ/vqqiDo9Hf0/lDUdEeEvbFt8RRxzxwvLly+futffMLTtzHEdLoB155uGgVZjhJ9mwjL7IW/6vkqDtdsFMvr/vFZXQv0zltqeCBEPmO5IvVQUSKYWhIQ+/+UIPl30lBhvByZDflZdNNu2NaFuJ+XcL8FBRaEhWKkEEuCDsYpQUlwx6NB+WbaHlCH42dIeBAY1N7TpzvZltvjVOOyj1cN91PZx+icLDr4SorXmnCAfQDYvf31nE5y8cRikBZ/j9e9PDobe6YfaPCHCVwktis6AoYOMxHGxbgTz12YeGd25nvZ7unvAxxxy70LJN33v1fI94r9s6mgE47NDDOfdDH+LEE09g5l57EQz4c/69eCLJhg0bePqpp7nrzrt49rlnAKitbkBR1O2OPX+bCA8dc8wxC1etWrlvaVlpdGeNZWQwEs4vwBVQHYpDTmEmYI4I8CH1zT8Ih2x3NX4fNxSKA4TdxjtDQx7qa9NvCnBFcSuZ9Pd7+PqFA3zte8OwBZwko5+j+6C9T6NnUKUo4IwqwEtKSkSAC7sVEoIi7BaEwyWDRUVFZDK5xbVbbEFhdZMH1DE4qnVw2nDDUW7sfjMxc2SxchcWtz39pmYfN9wbdEsSvh9HzLZ7vSVB+82VdmBYgzgF2w2zyO8Q9DmYVj6NozO8k1tbn3DCSU/29ffUNNa9N/GtazqDg4O0d7aw37z9ueGGm3jq6af4+te/ypy584jF4rS2deT8Z3g4xqxZ+/DlL3+RJ556gttuu52DDzqUjq5W+vv70LTt97WYpklD3TQ6uzqmnHLKaY/uzLEcig6H8u6/bPD6HNeeC7EEoQokoS/yVhfMkkkgwCkBaxP84/4QumG96UgYOSTr7vHy0ROH+PVvBqAbnOgYFIQPNrbpZJIqhu7ktTO/N0RFeXmvrFSCCHBB2MWorKzsLSoq2pBOj+7dXtvicY+Bx/JmZMNR0OGJm7o4Zl6c9hERzluLl6pZ/Pp/xdAGSvHOv3cneyHhIleAKzoMRlXsRIEKcAtCARu/13GruuTAo3mIRqOhZDK5U+a4iz5y8fUr3lg2p75mCqa1feJbURRUVaOlfQvpTIofX/kTXnr5RS655KPE4gmaW9ro7Owknc6fo5bJpOnu7qa5pY3ByBAXXHA+z7/4PL/61W9QFGht34KqqNsdH25ZJnU1U3j1tUUHXn7ZJ/+xsx5xdDharOQ5oDVNhSK/TXGhdsHMtnjviahvnt6UBJ33V4DbQA3c+ViATc0+KkrfJsA1h45OD8fsF+Wmv/ZCFJyBbc8dI5a2utkDqHnzTdKpNGVlZVtqams6ZaUSRIALwi5GOByOV1VVdqfSiVHeBpt1LR4YYOxNakYSM/3wzC2dHD7bFeGK6nbMdByoqrBYud7PbfcEoZ7359jcziZh4uDRHAajKsNxtTCD0EwI+hx8hoOVZyw1XScej8+JRqOhib6cv/31H5+85dabL6yqqDWc7VRQI7HebR1NzNp7Ni+8+Dzf/8H3MC2bpuZWEonEKLWwc/++VDJJU3MrsVicb3zjayx69WX2n38AbZ3NZDKZ7fp9I1u4yrIa49rr/3PZdddcf/FEj2cymVSj0WjIo+XOhs7YEPA5lARsN8G40NDdLpj9Qyoew7WXcMh2+w68T5ek+IB+uPo+t/SglhXLuubQ1m4woz7No//pBg84nWPcuKtAHNa3ekbdWSRSCSoqKnqrqqoGZaUSRIALwi5IQ2NjqzPKmXVRyGZVk4fWZg2C27egOs1AABb+t5ODZyVo6/C6HTMBTQFFtfnZrcXQAUrofbh5eyQJ00HXYSimjF7xZTJjQ8hnE/TbmGZut5qmaSSTSaLR2ISO9sqVq2Z87vOfuToYKDY8Hs92lQVUVZVEIkFXbzvnnHMui5cs5uCDD6KltZ3BwcH8XSDHgKZpDA8P09zSxty5c1j0yiI++tFL6OnrJBaLbdfvdhwHw2vg9wWNj3/i4//ZuGHjlIkc02g0GkokEnM0Pffu0LIg4HUI+gs0BtwDAzF3A6yr7gantMh+/+7FBurglYUGzy52Sw/ajiu+Wzo9hAIWT1/TibfWwWli7Jt2Hzg9sHKzB1XPf3O2k6G6uqpbVihBBLgg7KoCvL6+dbTPgz6HwQGNxRsMKNrOX66D0wR6GJ6/tYP990zS1uFByVbqqKowWbHWz133BVwv+M6OXbXdZjyKBzQVInHVTcQsxHb0Fni8bhx4vhhwXdNIJpLEY7HARF7KRRd+9DbAKA2XbVfFEU3TiMVj9A/28PnPfZG7774Tw+tlS1MLiqKMS1dAN7RFZUtTC7Zjc9NNN/Ctb32HwaE+hoaGtkuE27ZNRVkl4Bgf/vBFt03kmMZisUAymUTTci9PpqUQyJ6AFGQMuA6RmEIsqaC9KcCt902AK5r7Tv3urmJAwWe4tb67BzSw4cm/ddKwv4Wzge07MQvCphaddS06RaHRb66urq5dVihBBLgg7KJMnTaladSXIVug99U1Xndheg8Lq7MFPKWuCJ+3h9u2XlUddA1QbH52SzH0vA9e8GzcdMDrAA6ZpOomYhZiDLgNGLge0FE84Ilkklg8PmEC/Kqf/eLry994fU5tdSPWdsR9q6pKLBZjMNLHt775Hf5y9Z8YjsZpbWtD18c/JkjXdTo7uxiMDPOLX/yMn/30KoaiAwwPD21XOIppmdRWNbB4ySsLfv+7P35hosY1EU9kBXhu47Qt8Hsd1NEjGya5ANeIJVQ01UE1sjHg74cAzzbe2fySzp1PBykJu3Y8HFNIJXRu+2k3B5+RhnXvQS0E4Y0mD7Goht8Y/UFNmdLYJCuUIAJcEHZR9p619xogr6fSTVZ0eGmlF/p4b+EZOjibIVDt8OJtnezTmKK1w0BRHKorTZas8nPPPX5oYOcuuNm4ab/Xdkv3OTAYU96fuuTjsJnA64ah5J3YNJWMlSI+QQK8qamp5jvf++7PQsESY3uc1YqikE6nGYj08v++8nV+8cufMRgZpr+/H12buN2QpmlEIkP09Q/yne9ewQ9/cCWR4QGSyeT2xZhrKgFfyLjiiiuu6uzsnJA66/F4PJBMpvJ76G0Fv9dx389CDEFRYSimYqUVbAf8hkPI//548xUAH/zlviLMjEZxwCFjQiTi4Sef7OOC/4vDhhwt5sfye4HF67yAkjcBcyRka+beM9fJCiWIABeEXZS99pq5LugvHkwlU3l/JhiyWLbRQ2+Tuv1hKG8X4ZsgWOuK8Jn1aVrbDbweB1SHH90Uhu6d7AW3XI+xzzvSSVBhKKYW5gzguGPs9zqjCl2wiQ1HJ6TuzNf+3zd/D7YRLglvV9y340BPXyeXXPwxfvf7XxMZihKJRHYo3nvsItz1vPcPRPjRlT/gc5/9In0D3ZimNeaQF9u2KSsrJ51Jhr72/77x+4m4zkQiGUhnUvk3Bg74DbtwBbiS3fwCtqPg99oEfO9DScVs452h5SrXPhwkEDSxbOjuMbj05AjfuzICreCk2P6Nugfoh0WrDEY7pshkMmiqwaxZs9bICiWIABeEXVaA77WlsbGxNRrL30+kyO/Q16fz3EovlPDej7h1cDZCeIrNots72KM6TXObQV11hmVr/Nx5z06OBbch6LPxG86bzTWGCtUD7rgzl8+b3y03IiijExADvnjxkjl33n37uWXhKixr7A9Q03Q6ulo47NAjueHG60gkUzucbLndE76qMjw8zHAsztV//ROnnHwaXT1tqMrYlwLLsigtqeC/t9504YrlK2aN9zXG47GAgzmqZ95rZMv2FbAHHBRsG3yGezq1swW44gBl8I/7QgwMGFSUWrR3ejhoVpzr/9gHw+AMvUeVEIRIq8ryTQb+YP6HFIvFqKut2zRz5gzxgAsiwAVhV2bGnntuMO3UKALFfS2eed0HFuxQLpwOzgYonWbz0m2dNFZmaO8w0HWbH99UAl07sS645R51B3z2m7WzB4a1Hb/H93Hm8nlG2x0pWTE3/iEoP/7RT68EjECerpS5xbdGR0crVZXV3H6Hm8PY1dW9U8X326+lr7cf23G4+b83M6VxGq0dzdt1LcFgEMD4+c9++d3xvr6xxO37PBRm/kLWNF0B7p5G+QznfRHghCGzTuHP9xThD5g0t3moKjV59F/d4N+OcoO5KIGX1xp0dukUjSLAk+k4e+wxbUtJSUlSVidBBLgg7MLsN3/eciDvkbvjgKJZvLjSC52Abwe/MCvCq/eyeOW2DurKMpimwvK1Pm69Yyd6wW3QDbd824jTdiCabUdfoALca4wWgkJWgCfGVYCvW7tu2n0P3HtGuLhizN5vRVGIx+NYjsnf/v5PGurraGpunZCEyzGbpa7R3NxGeXkp11x7LeAwHB0ecyiKZVkUBUu56+67zmlubqkZz2tLZJ9Z/mtR3Gc/0qKxkLS34r7vg1E1O45uCIrf2MkhKNnGOzc/GKClzXDD0hx47OpOSveycbbwnnsEKNkTqueW+4CRUou53wtwmDt3znJZmQQR4IKwizN/wfzFwKgl40pLbJauNVi20gPl4/ClGjjroWYfi5du7aCmNANo/OjGEmgFJbwThIQNeNwGJliusBmMqu6iX2gCPBt5YnhGF70AyWTCN55fffPN/70YbCMYHLuuVxSV/sEeLvvYJzj33LPo7Op5D81wJkaEt3d0ccIJx/KlL32VyFD/dhlDcXER6UwidOMNN146rgI84T6z0TYDhscpzNVLATIQyQpw03LfSc9OjmdXQkA7/P6uYsAhldC47Sfd7HdyBmcdO9agywt0w/PLvaDa5EuRGMmd2P+A/RfLyiSIABeEXZz95s1b7jWC0WQifxiKz3CwMjqPvOYHf9ajMx4ifB1MmWfx8i2dVIVTrN1cxHX/C0DdTlh8s6X7/F4nK/YdogmloD3ghr7tB5NOpcdVgD/0wCMfUNDGXPNbURT6+nuoqarjJz/7MWnTJJ1Oj0ud7/HANE0SyRTf+8F3mTplOj29XWO+NidbGuPBBx7+wHheUzKZ2uYzM/QCtdusBzySTcIkW1IRg53nzbeAenjgET/L1/oAje9f2s8Fn43DxnH4/WHYsk7nlTUGxcX53fqpVBpN9SQPOOCAJbIyCSLABWEXZ+ZeM7fM2Xf2G0PDg6MIC0CxefQVP3Qzfs1qNHDWwtT5Js/f2EHAyPCFP1VCMyhlE7wAO4CHd9TjjScUSFOYsbQKeMYiwNOZcWs1tG7dumnLVyyfV1Jcun2CMhXn81/4Ag31dXR2dE0K7/ebC4Cq0t3dQ2V5GV/92lfJmCkce2yG6DgOxaFSXn/99flbtmypG69rSqVS2/SAe/TCDEFBAUwYTqjuxTuK+07uRA+4EgD64Oe3FgMezj5yiB//JALt77HiybvnmSJ49g0viZhOcJRKRZHIALP2nr1m/vz9VsnKJIgAF4TdgAMPOvA1G3PUBb642OLlVV6a1mhQOo5fnvWEzzzY5NVbW4jFPHz5qjK3LvhEignb/e6g33ZXWM0hllJdAV5os0A2BEUfw8Yhk0mPW6D1woXPHp02EwG/f+xO9UhkiKqKWs7/8PmkMuak8Xy/W4THEknOPe9DTG2czsDgwJj/bjAYIJGKFj+78Lmjx+t6xvLMNNUp2JMbUhBPvnXxvp0pwG2gAZ5/0stLr5cwoyHGnX/ugQw4/Ts+FygqEIfHF7vvSD5zVxQFy8mw3/y5r8uKJIgAF4TdhCOOOPwFYNT6zSG/QyKmc9/LASgeZ3GsuJ7w2UeaPPGPFv50RxErH/Gg1E6wCFez5c4AVYN4SsFOU3BCJlvGHG0Ms1fGND3j9b1LFy89YEQ8jJVYIsKRRx7B3nvNoK+vf1IKcEVRGBgYpKGuhuOOP45kOjZmmxi5n9deW3zQeF2PaZrbFOC6VqCrlwpksgJcdd/FgM9xT6F2gjdfMdwNwFf/XgbYPHp1F1oVOK3sWNz3CEWQ3KKwcJkPw2+xrRL5hx56yCJZkQQR4IKwm3DMscc8E/AXD8Zi8W38pM3Di/wwCMp4FqxQ3hLhJ5yX4r8/6eGPtxSRSirj+z3vVq0aBLx2VsA4JFIKyYxSsLOApm1bsYxFzI2VVavWzAZluxrvABx0sKtNLdOctGPpZGPaDzzowBHTH9vfy47F+vXrZ+xMAa4V6sqlgpOBRFpF0dzJIOizd44At4Ep8Pz9Xl5dWcRtP21j+hEmzsZxEt/ZuuILl/loafNQWjRK+cFEEk01kscdd+xTsiIJIsAFYTdhypTGzv3mzVs+FB0cRVhAUYnFwmVemldoUDHOFzHiYVwNH7k4ziWnxdiyTHMrCEzg2x7IxmRqKqTSWQFeoPWUxyLCbNselzkuEon4Nm/ePN1nBMf8d9wyhRozZs50H/kkLrg+cm3Tp0/H0P2kM+kx/11d9dLc1DJtvK7FsqxtykG1gENQ0hmFREp5M4TK7905K7HiAVLw0asquPikfi74XALWM27jOGLeDy7yAcqo7+fg0ACz95m9as7cOdKARxABLgi7E8cdf8wzYI8eB+53iEc93Pl8wG1LP94xmko24bMDjjokxR4NFk5iYu7XyXrA/SMhKIorBJIpZZeeBWzbGpe7a2pqntbd3TN9e+K/U8kkFWWVTJkyhYw5+Vs2JtMmtXW1VFRUkEqlxvz3goEgbW3tdRs3bmwYn2fmbPOZFWTzqOyKm8ooJNOKu4kA/F7bfQcnOgdkKtz4ryBBr8ONf++FFtcbP24bmSCYm+HRV/zoRv7yg4qiYDsmRx115POyEgkiwAVhN+PEE098HMA0rdFFq2Jz93MB6AbFNwEXooBjAwkwDGfCE7F82ZogqgppE5LpwhXg6hiEw1jE3Fjo6uqqSqajeDxjDylPJlNUVlZQWVVJIpGY9OOZTCQoLyunoqKcVHLsAtzwGkSG+ytamlunjI8At7d5JlPIAjyZhoypoGXvwW84E34KpXhhqEnhyWU+7vl1jzu/DY6jAnCACnjhdS/rNhuUlVijPV8ATj7lxEdlJRJEgAvCbsZhhx/64rTGPTcMjlLxwQFKwxYvrvCx+nUPVDJhXirHyQrxiRQWTraBCaAoDumMQmoXF+DbG6+dj56enip33Mb+gNJmhpKSEoLBAOYkjv8ewTRNQsUhysrLydhjF+BuWUWHnt6eCplZxiLAVdIZdxMM4PO6TYWcifSA++HVl7x8/ANR9joog9PCuIp+JZvXcv/LAUAdtULR4OAgtdUNzSeceMITYhCCCHBB2M3w+Xz2iSef8FjaTIwqqgJeByujcevCAPgKM+z07YwIcFUB01JImYUrwHdmCejB/sGy7RXgDiaBYACv1zfmtvXvtwAP+AOEQqHtGt2RMRkccMdIGH3FTWdcD7iS7fDl9eyEZxuBfWdmOObAFIxXxZO3EwSa4YGX/GiGNWr4STId4+hjjno2FAqlxSAEEeCCsBty5pln3A9gW/njPmwHVN3irucC0JJdaAoVZ6R7pIOiQMZ0xYDMAttmaHgotL0CHBx8Ph+BQABN09B1fdL/4zV0/H7/do3NyJgMDw+HxFLGIMBNhYz11gnOWBpK7SgaUFNtgZU9aRvvnXAFLFzsZe2m0cNPRk6kTjvt1IfFGITdHV2GQNhdOfmUkx6rq5nS3NfXO6WsLL/zrrzU4o11Pp560cfx5ydhE4XpCnfeat/uCnCFdEYpfLf+TiAajb0ncen1Gnh0lXC4hHQmM7kXA82NG9ieRNO3E4vFRIBvc7fibnotU8GTPY0yPM7EH+co4KTf+v/j+quz4Sd3PBsEFAzNdVzkIhKJEC4u7z3zrDPuE2MQRIALwm6Kz+ezTz3t5Ieuufbfn1GU8rzxwka2Xu8NTwQ5/oNJlImO15xAPG974x3HrcggHvBtE4/Ht/vso6y0kpVvrOTcD56PZZrYk9xoFAUMj8GqVaspK63c/jGKxYNiKdtgxANug6G4u2LPTmrCM2EUQ3K9wr0v+DF8Vl7xrSgK8eQwp512/hNlZWVRMQZBBLgg7Macd96H7rzm2n9fblm2oebJ6rMdCIRM7nshwODKAcJ72NBXoC/825vX2G4pQmHbDEWGigE0TcO27TEldwYDQXp6+rj7njsK6l7DReUUFReNKXFUUZRsEiZEhtwxEkYbMMhYCqb1Vgy4rhWw+naASnj0IT8t7QY1VflPeZysMj/v/A/9TwxBEESAC7s5p51+6hPTpuzZ3N7eNqO8PH8Rh3DIpr3Tw61PB/jMgij0UHieYyfbwnsk6sRRSJsSgjIWLrv8Y9fec+/d57S2N9UE/cWUlZZhWqMLVNM08fm81PoaCu5+xyK+dU2nf6CfWGKI6qqa1ss+fum1YinbFuCmqWBbb712uuYUrAdcUYEk3P5MAHAru+Tbm/YP9lNb3dB81tlnSviJICCHz4LAh8479460mXzTk5d/tXG46Ykg9E5QTfCdsePW3PsYIWPK8x8LRx55xCur16ze+0tf/PJvQqFgazwR3+3HJJ6IUVxc1PyVL/+/X61avWqfgw8++HWxlG0L8IzJOwS3rhXw/ZRB/yqVh172EwiZecW3qqqk0nHOOPMDDwQCAZl1BAHxgAsCl1x68fW//d1vvpqIJw3vSKead+E4UF5m8sJSP4tfNDjgtDRsoeC8x5r6zhXStMQDPlYqKyuG/vinP3zj5JNPfvyMMz/waGV5Dbq+7SlU1z10dXWSNt9qxlMcKqWkpATTNNE1nXgiTt9A93u6rtrqBlRVxbZtdF2np7uHZCa2/YuB6qW2tg7T3HayqGVZ9A30cMf/7vzih847Vzya20HGUsBR3vZOFuiN2K4Av+O6AIODOnU1mbwCPJ3OAKQvvviiG8UCBEEEuCAAsN9+89YccdhRL77w0nPH1vkb8sb3utpc5Z8PF/GP0/pQlAI7OXZw21+rb20cCqBD+qQjVBQaAlDGuHOJRoc46KCDmLXP3qRTaTweDw8++BC9fT2Ul1UQGY4wfY/pXPbxy+js7Bxz86BgIEBLayuPPfoYFRWVaJpKZGiQU08/lWnTptLR0Ymmjc296vf72LBhI8uWvY7P699mucWRe/d6vUmxiO0gW3//7ROHphZmCIriA3rg5ieD7zhV2+rnFIW+/h7m7jv/jaOPOfplMQJBEAEuCG9yyccuvv6Fl549drSfsW3wB03+90yAX60coGRq4SVjvtvbVgD9YSYd69aumwWgjsF1ads2A5E+PvV/n+JjH7sYJ7v3ufHG/3LppR8lFvOhAG0drXzy059k1t4zyZg22hh+90jO8AdOP4uHHr6f+tqpRKPDqJrK7//wW3eDZTmoY2gZqipw330PcPbZZ1JVUbtN4T5y7xs2bJgBPCZWMXbst296FceNoy40HKAKVjzt4dklPspKzVGb79iOyUcvvuhmefqC8LZ5VIZAEODCD19we1m4snu01vQApUU2AwMebngsCGW4x7CF9MK/S4tZtsSfbC/9/f1j7orperNVfD43aaCjo4vunn4uueQivvylrzEQ6aMoVExPTw8nHn8C3T29eHSVtrYOurq6R/2nta0D24EbbrqeqY170NbRRH1tI3fd9T++9MX/B8DAwACdnV3b/F3ghsp4NB+2PXajHhgYkO6X28m7+36pBfgKKgAG3PRUCGwNv5H/ZyORCEXBkv6Pf/xj18jTFwQR4ILwDkrCJfELL/zwrfFkdJueTUW1ue6REHSCEiigm3TcWs+qQvbIW3G9VqLBt4vIYKRkzGLLsvB6fBQVFwGuRzyZTDAcjfOHP/6Gww49ktaOJqY27EFbewuXfPRSAIqKgmQyGSzLyvsPQHNzK+VlpVx/w/UADEYGqCir4s9/+QM33XQrlRVlmKY56u+xLAvLgUAwQDAYHFMFlBGGhoaKxCK28zV8l6dYKcT3rxisjXDb0wE8XjNv7W9VVYnGI5x99tn3VVVXDcrTFwQR4IKwFZ/9/GeuBiUdjyVGXTwryk2WrPLx1FM+qKPgvODCDgrw7ah3bVkWgYArbEc8n6qq0tfXD8BNN99ISXEpre3N1NVM4bHHH+b737uScEkxuq5vMx5c1zVa2zs55tij+OUvfstwLIJHNzB0L//36U+xevVapjTWb1NUmxmTUCiE3+9/U9yPbTMyFBaL2DEBXnDYQBXc92yAplaDsnD+CTCVSgOkP/PZT/9NnrwgiAAXhJzMmbPvupNPPPWJgUjPqCUJjWx47F/uL4IUKJJJsVsxPDy8XQLc5/MRDAbJvK3mo65rNDW3MX36NK677josO0MiEaekuIyf/uxHPPTgo9TVVo8pHMS2LPr6B/nmt77K2WedS0d3K7U1DcQTUS756CVYtkNlZcWowjqTyRAMBvH5fNslwLdnLITs8xoR4AV68qR4gCj85xG38ame5z4URaG3v5NDDjr8lSOOPOIVefKC8E5EOgi7PPfde/+p99x799nhkrKhEY9iIBBIlpWX9dRUV3XXN9S3Tps2bcu0adPaf//H3355/vwnTk8mkxiGkXcBLQmbPPC8n80v6+xxiAltSCjHbsLQdnrAfX5XgJvWO8v7qapCe2c353zwLL75jW/zq19fRX3tVIaGIlx22cdY8voSpkxpoKmpZdRyh6qqEo1GKS4u4j/X/pvX919KU/NGGuumsXjpq3z+s1/g7/+4mqjPRzqdzhm7blkWfr+fQDCAlRm7AI9GoyGxiN0IB6iG9S/pPPJygHBp/vCTTCaDqqr88U+//zJAU1NTTVNT07TW1raGrs6umr6+vrJYLB4cEeuDkf7iU0859dELPnzBPTLQgghwQdgF+O9/b/nobbffcnH+n1ApL63o3Hff2asOOHDBa4110xiMDI76O0N+h8igh789FOJXxw3yZlh1oa2njtjH9gvw7fCAmxYBfwC/z4/9ruw7RVEwMxmGhqP88lc/Z9GiRSx89immNuxJU+tGPvqRS1j47JOUlpYSiURGPZXRNI22tg6mTW3gpptv5qijDmcgMkBFWTX/+OdfOfyII7j00otobmnLKcBt28br9RIMBMlYmTHenUI0FguIReyAmFVAVQrnJVQA/HD9EyGsjEbQZ/H/2TvP8Diqsw3fZ2a2F/UuV2yKKQbTe28BAkkIBGxTTa8JECD5kpBCCS2EZnqzMSVACMWU0HuxjQGDsQEXWb1rtX2nfD9mJdtYK63ADtr1ua9L4Yq1knZmz8x5zjvPed5MD2lM02RU9Rgef+zxY393+e+v/uzzz7dq72ivhswLvMb65lopwCVSgEskeYJpmArYDUvWmQNNC8M0iMcTlW+982blW++8sV9VRS0ej2fQx/+mCW6PzkMv+bni5B68FRZ0MuKr4EKs/R5NKcCHTW9vr19keetM6Sm8Xi8ut2tAa4eiKHR2dhEM+Jk9ZxZTtp1CXf0KaqrG8Nbbr3Hpb3/H36+9ikg0iqHrgyavaJpKfUMTe+yxK9ddeyOX/PY3+H0BnA43Z515BjvsMIVJkzZnxQAV9T6rjNfrxSS7CriCRjQSkRXw9SFqc4Ug6N/C7P/6cAwivgHcbjcpXefGm274LUDAV0hZcRmKqg4YjdnUUo+iKHJHjWSjQXrAJXlPU1NzdaZpTigCTdPw+31UVdT0i/RsvLfFBSYtrU7ue84PZeRECVwIcq+B0AgiFosp4d7eoEN1ZLf4w8Dj9eByOTN6qzVNY2VdPbU11dz/wANYGEQivRQVlHLtdVfz738/Q3VlOWYWqyXLsujo7ObiS37Nz446mubWeqoqaojGwkw9biqplD6gH9wwDFxuFx6vm2x3FWuqRiQS9cZiMTmPbBSVDKASnnrN3nxZUjD4Qs00TSzLoqqilqqKWvx+P5pDy5hLL9Boa28vlSdaIgW4RJIHRKNRraWlpdypeTbMBaQZzHzGD6tAyFrgxjCevLFYfCtVU7P8CROP24PLNfjmRlVVaWxq4bDDDuEP/3cF3aFOPB4vqnBwysknsWzZCsaMrkEfYoOkEIJwOExKN7jvgXsZP3YCK+u/ZVTNOBZ+toBzzz4Pn9eD2+1eK2HFNE2cTideb/aOElXTiMViW0VkFXyjQLiATrjjuQBgrff8cpfDTUd7e2lPT49bnm2JFOASSY7Tbt/QJzmdjvX+uy0LyooNvvzGzTMveWQk4UYiwBOJRNYt3gECwQBu99ANbnRdp7snxF/++icOPOAQGpvrqK0ZTXdPF9On2fngJcVFQ/6ePj94YUGQh2Y/BEBXVwdlJZXcdc8dPPDALCrKS9cS4JZloSkCny97La2pKrFYnHCv3IiZvYoF0xLfWTTlwPu2gCpY+J6D1z/yUFKir/f9I06Xk66unk1bWloq5UCRSAEukeQ4vb29/lgshqZumO0OmmLPTjc9HYRQuko0gidR5Tubvgy5YBgWsWjMm0gkBt0Q+V38/gCqMrStSVEUenpCdnfLWQ9QWVHNyvpl1FaN5b333+aC8y8i4PfhdDqzywdvaGL33Xflxhv+STgaQlVVXA4PZ55xBos+/3LAfHC/P3straoq8XgMWQH/HmI2xwS4ELZauHNuAFBwO9f/33A4NCLhMN3dPYVykEikAJdIcl0wxeLeZDKZsbulpkJKFzS1aDS1qMSTYliPVk0LSkp0Xv/Iw0evOaEGWQXP5/EUj7sTiQSqkl0FPOgvYu7c55g//xNqqivRdWNIUVtXV09lZQWzZs8GLEK9PZQUlXHzLTfy6KNPUFlRlr0fvKOLX//mfH7x82Npbm2goqKKRDLGtGnTSOkG5eVlGIbRL+h9w7Kg2BXwSDQqk1C+r/4WOSDALaAUej5XePRVH16fjpnlPU4RkEgJmlpUmlo0EilBJveWoiikzATRiBxPEinAJZKcJ5VKabquo4iBh3o4Jij0m0z7aS/77hYnFhM0NDvojSqoWV4ddjVIcO2/gqCP7MY8irDWmvAtS8j88mEQj8fdyUQSJUsLSkGwgNa2Zk6YfgLReJzKivIhG91omkpDYzMHHLAvf/3L1YTCXTidbhyai9NPm8HSpd/YfnA9Cz94JEIypXPPfXcxftwE6uqXMapmHJ9+9glnnn42Xo8bt2e1Pcbjy177KIqCbiaISgE+LL4rXsUIzzAVFlAM973go7vbQWFgaPWtKhBL2PfScFiwz65xpv8sTHmhQTgqBlX7yVTKKUeJRApwiSTHsSxLsSwLkUFldoUUygoNZt3QwWuzWnj7/mbOndaDpUN9kwPdYEghbpp2Y55/v+nj63c12ws+QidU8R29LXPAh0csFvPqVjJjksN30Q2dmsrRfLl4EWfMOBO324nX6xnSQmIYBl3dPfzfHy7j8J8cSVPLKqora+kN93D8cVMxDJOyspJ1ssXXEUKqSmOj7Qd/eM4cQKGzs52ykkruu/8u7rvvQSrKSvvHgdvt7rtushhLtnKMxWJy09yw7klrnkQQIz0HPAjWcpj5bADNaQyxwLf/W9/kINSjcOrRId66v4XXH2zhodvaGVet09WtDHF+5CNEiRTgEknuD3BFMRWhYGbwhWiaXQU3m4AE7LBrkltu6GTeY00ce3Avbe0OGtpUNHXwSTLgsTB1lX88FQTnCH2sbK0RQ5g+HJkDPjzisbgbrGF9vhYWJcUVzH74Qe6YeTdlpSXZjFtCoV50w+SBWfczetRYO82kehzzF3zEuedcgM/rweV2ZeEH11jV0MQuu+zIP/5xE5FYL6qi4nJ6OOfss/js8y8YPap6LQE+vEVJXFbAh8F3W9ErI3kWTkcPPv1fL18vd1FSZGRctGuqRXdYoanFyX47Rnl/ThP33NLBznsmIA40QSI59BM3mQUukQJcIskDHA5HUnNoGUWKqlpEEwq9cQV0sFYBS2HzrVM8+kA7c65tpcRjsqrRfiqaqfBpmOAP6Dz0ko/WeQpUMCKr4OI7nlNTTnXDE+DxuHst9ZQFvb1hnA4HHpeP8847hwWffMqo2uqs/OD19Y2UFBfx0KxZAHT1dFJaXMEdd97KQw89vE6aSeZVgEV7RxcXXngex/zyOJrbGqgoryKeiDH1uONJJJJ910v65dlWwNc8J5LsBLjoXxCP9ElYuIAeuPVZO3pQE5nF96pGB5Gw4OoL2nn1sRZ22jMJy8BaASQBHZK6GOKAFZwOpy5HiUQKcIkkx/G43XGn04mR4VG9pkIkLghFBKi2rrJEWojXwXEnR/j82UYO3ClKU4uTaEJktKQU+A0iYQc3/CsIgRForU6noIi1xIAcI99HgIssSuCWZaFpGsXFRYR6eigrrUA3Ukw97ngi0SiVldn5wesbm9l77z249tobCUd60DQNp8PNGaefxqJFA6eZDCSWI5EIyVSKe+67m4kTNuv3gy/64jPOOvMcewwXFAxjMWefg4QU4MMT4OZq/S1EelE/Eq9DE6iGBW85ee1DD8Ul+jr3i74F/apGJ7WlOu/MauayP4agB6xv00/aFPvLSkE8ARm242CaJg7VidfrjcpRIpECXCLJcXx+X9jtdmNmEDoOzSIUUegOK+Bc+8qwksCXUDnW4OXHWrh4ehddXRpt3cqAlhTLFHh8Onc/GyD0mRh53TEtUBS7gYbVP+nJHZgbUoB3dLRzxV+u4MBDDqauYRmja8bz1ZIvOev0c3C77MY3Q1WbTcOgo7ObSy75NT//2S9pbm2gsqKaeCLGtKlrp5kMhu0HbyHg96Ur6qLfD37/A/fwxptvs+122/a/9+GeE0k2q5Y++5c9fhTFyihIf/S3qtr3jH/8OwAIPN/ZGqkooOvQ2Oxkr21ifPZsI7sflIDFYIWxCxpr3E/jSUE4ruDQBh5buq7j9XoJBAMhOVAkUoBLJDlOQUFByOvxfpPKUCF0qBbRiKC1SwHHAJOlmn6E2gvX3djF/X9pJRFTWNXsQPvORGIBxUGTrm4Htz4VhOJ0gsBIuuAFCMXqV+CyAj48EolE1mLTsiyi8TATJk5g5h23oyoO2jpaKC+tYtbDDzBz5t2UlRYP/ZkpCuFwmGRK597771knzeSM087E63Hj8XiyygdfVW/7wW+++TYisV4URcXt9HLGaWfy8ksvUVUxapgWlIQU4MOg/2GcZU/A6hrX40harFMJdR+pPP6qj2DB2tGDigKxuKC13cn0g0O8+UQzRVUm1uL0oXx3fapBKKoQiWWOIUylUgQCgRXFxUWdcpRIpACXSHKcwsLCaFFxUWcimRjw+6oCWAormjXIFB+ogdUNLIOTzonw1v1N+J0mqxqcqN+phFsWuNw6t/47QOIrASWMqMlVUaQH/AcKcOea4jObW+zyZcuprCjj1ltvIxaPAML2g597NvPnL8zaD96XZjLnkTkIFDrWqF7ffff9lJeVZJlqY9He0cl5553FscdOpaWtgfLySupXreKaq67B7XYNq9NnIhGXsXHDYM2nTkJJb8IcYQJcAPjgtv8ESSY0Al5rjbEIvRFBZ5eDS6Z18dD97WCkCxWZ7qEO6OpVCEUzV8ATiSSFhQXd5eXl3XKUSKQAl0jygIrKimaL1MATTXouXNHsAHMQ33afJWUx7Hl4gvlPNFJbkqK+0RbhYg0BXlJo0tTiZOa//FA2gqrg/Z0wV1e+Tcv+d2lEyVqAD6vaK1Bwu+32qGeedRrTpp5Ia3sjZWUVGKbO9GnTiMbiWfrBNVbVN7Hzzjty0003E431oigKbpeXc88+i08++ZTRo6qzygePRKIkkinuvvsOJk7YnLr6ZZQUl2AYFtFodBgLDJmCMlxl23ftWekFsTrSZmELKIHwIsF9c314vKur36oK3SGFUMjBNee0c+0NXdAOVusg4hvACe3dCj1hBUeG1xlWkuKSknY5SCRSgEskeUJVVWXzUK+pa9HsqCxl8MnTsmwRvun2Op883cgWoxLUNzoRytrRdA6nwY1PBtG/AYoYMRUuRVk79qy/GicVeFYMx+9sWiaqouJ02gI8nkhy510z2XyzSdTVL2N07XgWf/UFp884I+0H92Rh/bDTTM6/4ByOO3YaLW2NlJdVktQTHP+r47MW86qq0tTUTCDgZ84jD6MIjfaONrxeD8owc/ESibhLjozs6bOgWBaoAlQxsiwoIt358p5n/LR3OCkKmv3iu6tHIRzWuOWSNi79SwgawOpibb/3gKtHWNWqgi7QFCvj2C4vK5MCXCIFuESSL1RXVzUMfhWYtgUlxLo+8IFEuALWUigda/LxU03ssGmchiZbg/RlbJcWG6xqdHHPU/6RE0lopjd9rZEDbpiM6C58I41EPOHJ9rWWaeFwOHA6bYdGc3MLXq+HOY/MwaE6aWtvoby0mofnPMTMmXdllQ/el2aSSKa4+7672HyzLfvF/FdLv1xDzHuzywevb2SHHaZw8823EEtESCQSw6p+24sS6QEflgA3xBoLYgtVHWHXYCHo38A/nwricBmrxXdIIRJRufPyVs79bS8sH2Cz5cC3TBDY91jEoBn6VdVVjXKESKQAl0jyhDFjxtQN9n2P1+LbRo2uFgWylVeqHbPlK7f44IkmdpsUpbHZ2S/CBaA5DK57vABWgCgcGZOsqtjt6Ps1uRTgwxPgyYSW9XrHNHFotgA31xC82203mX/eckvaD26l88HPZcGC7PPBm5pa8Hk9zH54ForQaGtroSIt5m+99Y705s7shHRbeyfnnHsmxx83nfbOloxdYzOek7QvXpKlAF8jhvC7T6RGwiKdSpjzvI8V9S5KiwwUxbadRMIad13exumXhGEFWNEsFYQAElDXOvSlM2rUqFVyhEikAJdI8oSJEycuBZExK9nvNmloUfl8pQP8w/jFmt2iWQ3A2481s/c2q0U4QFmJwbI6F3f/yw+VI0Dopj3gqgJWuhmIIWMIhyc248nsU1BMC82h4XA6MA1rLcF71lmnM33aSbS2N1FWWoFhpDj+uOMJR7LPB19V38j222/HzJl3EEtEMC0Lr9vP+eedy4cffsyo2qqs/ODRaJR4Iskdd81km623pamlYVg2lGQyKQX49xDg9FlQRlAFXPiAJvjHU0GEYqIpFqGwbTu57ZI2TrsoDN+CFRuGetCAXvi2Uct4oGbaZL7pphOXyhEikQJcIskTxm8ybllRQWlrPD5wEoqmAqbClyscdhb4cCZDDayVoPjhjUeb2XOr1SJcEaA6DK55LF0FL/jxJ1pVtdZq/CEr4MMU4Mnsq71muhGPw+HAtMx1BO+dd9/BFptt2Z8PvmTpl5x5+llZW0gAWts6OP2MUznxhFNo62iitKQcC4NpU6fRG45QXVWRlR+8ubmVgN/HLbfeisfjIRrNvhfKcDembtRY0PdxmJZd/dYUy648/+grA6AG5r7oYeFiN5XlOr1RhVBI4/rz2jn7sl678j0c8Q3ggd4WwTf1DlxeM9MiDrfTz4QJm3wjB4lECnCJJE8YPXp086hRNfXRaHjQ181f6oI4w2+MkRbhuOGNR5rXsKNYlKer4Pc+6YeqH1nsWmkLirL6behSgA+L4VR7LctEVVWcDmd/hW9Nwetxu5g1Zzaa2pcPbltIbr/tzqzywYUQxGIxYvEEM++8na23nGyL+drxfPPtUk4+8VScTgd+vz+rfPBILMHoMaOpKK8mHo9nf04SsgKeDSK98F0dQyhWe8BHwvvzAl1w1WMFICx0Hbq7HfzplA4u+kNoeLaTNfHCN00O6ttUfO6Bx2EkEqGmpvqrcePHLZMjRSIFuESSR4zfZJNvDCuVefJRTT79xgmtwPfJdNDAqgMlAG890syUCTEampxoqoXmMLj6kSCs/JG94H0CfI1OmIYhpAAflgBPZS/ATbsCrjk0rO90POq3kEzZlltvu30NP7if8847d1j54C0ttpif8+gcXE4PLa1NVJbX8ORTj3HjDf+kpLgQstlYadkRhJZlDmsjpq7rmhwZ2aOn12KmBdpIqYCbQC28+bKbdxd4KC7WaWt3csHRXVxxdQ80pjdcfh/F4IGvVzlIxRWcGTLAk3qMsWPHrPB6vbocIRIpwCWSPGKbbbb+HDI3UAn4Tb5apVFXrw7PB/5dEb4C1EJ4+5FmthidYFWDk8pynW/r3Nz12I/sBbfSFhTVWiMFRcYQDofUMAS4aVmomoqmaWtVwNektb2TM86YsYYfvBzT0pk+dRrRaCzrfPC6VY1stdUkZt5xJ4lkDN3Q8XmDXHTxr3n7nfcYVTO0H9xKW2ZUVR1WK3rDMKQAH8Y1uGYMoaKCqvGjL4KFE4jANY8HAejscHL8/iFuurELWsHqYeiowYF+b1rcL/zWQaYElL578pZbbblIDhCJFOASSd4J8K0+AzIKIa/bordH44OvXBD4ARNiemOmt8rivUeaGV2Wor7BgdtjcOUjBZjLQPxYueDpCri6ZgyhgayADwPdSGUtNi3LRFNVHJpjQEErhCC2xgbILTbfst9CsnjJF5w2jEhBIaCltZ2TT57O6aedRXtHC8WFdhvWacdNpbOzm9ra6kHFvGlZqKq9YPhuxX7QRUkqJQX4cAR4OobQsuw29NqP3QkzXf1e8JqTF9/1AgoHTInw8J3tEAWr4/uJb8COde2CBUszb67pG9uTt93mUzlAJFKASyR5xpZbbbnI5fCGM23EVNKVmfcWucDI7on9oCL8GygcZ/LO7CaKAwbxmKCuwcnMx+xccPEjCXBNtatufXpOlwJ8WBi6MQwBbqGqGoqqZBTQth+8Ba/HzcNz5uDQXP2RgnMemTUsP3g8HicSjXPbzFvZfrsdWdW4nDG1m1BXv4KTTzoVTVUIBPwZF6F9nnVN0/o3jWa3KJEV8OFcg/paAhwc6o/biEc4AB3+/HAB4GTyJlFevK/F7nnQzOAdLofCC+EmweKVg2zATCRRhCM+efI2C+UAkUgBLpHkGZtvvvmyzTbbdGmotyeD+AAUk3lLXNDO9/OBf1eEfw2jtjV498FmXE4LULjmsQK7O2bxjyB80xU3h2r1t8PWTekBHw7D8Ttb6YqyoiiDVrA1TaOuvpHtttuGm2++lVgigoWFx+3n/PPPZf78T7L2g7e1taGpCrPnzMbj9tHU3EBVRS3PPPsUV115LcVFhagZdv1ZZl8FXB1WBVx6wIcrwFffczQlncL0Y12D6er3l286eObNAiqKYrx6XwtqCVirfqD4BgjAwmVO6po0ghkEeE+oh4kTJn6z/fbbSwuKRApwiSQf2W7KdgtMK5XRB14QNPlkqZNlSzUoWA9/UAVrCWy+Z4pXZzYDBvWNXm56OADlP0IV3AJNtQV4Xw54fwVcesCzwjCMrO+ZlmmhakpWnmoBtLV1cOZZMzhh+sm2H7ykHMPUmXrc1GHkg2vUrWpg88035d577yOpx0kmkwT8hfz+/y7l1VffoKa6csDfYy8YFNuCkrUHXAzrnGzUpFNQdHONCnh6T8aP9pY0WwWcc4v9lOW1u5oo2czEWvbDxbewACe894ULTBVHht+nmwm2kv5viRTgEkn+suOOO3w82Pd9LotoROP1z9w/zAf+3Ul3Cex+VIKnr2sBLP76UDGJxQLK+N9WvtKPvDWtrwJuSQvKMBmO3cIwDDxuLx6vd0jhLIQgGoul88FnMmmLrfr94Eu+XsyZp501DD+4oLmljeOOP4Zzz7mQjq5WCoOFAJw4/QTa2jqora1Zp6JuWRaKoqKqw7GgCLkJc5jX4OoccIGmWqg/lgfcBEbDh8+4eGNekH9d08CkfXWsr/n+nu+1VoNACD74wgWYDDRs+4oh203Z7hM5OCRSgEskecoee+z+jioc8Uw+8L4Z8vUFboiAWB+TUN+Gx6Vw5CkxbruomVCvhz/dXQBl/+PCczp1waGlG/AAui4tKMPSLKaZ9T1T1VR6e3vRVBWv15vRe93/+nQ+uNvlYtbs2Wiq0/aDl1Xz8CMPcdsw/ODJZJJwJMo/b/kHu+y8G6saVzCmdhMamlYxfeoJqIqgoCC41nuyLAtFTVfskRXwDXUNpta0oKjpGMIf4RoUDiAB0/9ewnm/6ODoM2KwPvtQBqB7mcL7X7pw+wYe+3rKTh3cfY/d3pGDQyIFuESSp0zedvKXEydM/KYn1J1pbsTpMXh7kYvESvH94wgHEuEpYDmcfVmYs49q5e+zS+n4WLGb8/yvMoAtQAXHGp5TXeaADwtbbGZ32ywuLmbxkkVcfeXVuF0OHA5HVg1x6uobmTJlMrfddrvtB7fSfvBzz2HevOz84Iqi0N7egSLg4TkPUxAopL6xjuqK0bz037lc8ae/UVQYRFXXtpsoioKiKVkLcIGCaZiyAp7lfQArveglnQP+Y1XATWAUPHSPjwlVOjff1Gm3mNdZP1UBCyiED5c4aW7RKPBl9n/XVo9dseOOO3wkB4hECnCJJI/ZcZedPjDMZEYfeJHfpK7ewVufu2B9xgUqYEWARrjt9k4mj49y1OXlEPwenTd/qADXVjf+0I30ZCw94NkK8KzFpqIoFBWUcv0Nf+exx56kqrIcMwtvtQBa2+0W8ydMW+0HNzGYPnUakWHkg6+sa2D8+LHce//9GGaKWCJKQaCYP//lD7zwwsvUVFf0V8Ety0JVVFQl+12BAmQFfJjXoL12svor4PwImzCFG9q/VljW5mD239qhN31/Wk+fZN/t9c2FbkDYi4wBSKSibL/9dvN8Pp9swCORAlwiyWf22XuvN/vExkDYAREKL37kAeUHxhGu88vB6gZ64eMnG1nRpDL3AQ+M4X9TBV9TgKc3YaYMwJACPFtM01CyPVmWZeHz+dAUJ6fNOJVvvlnGmFE16Lo+hHgRxKKxdD747Wyx+Wo/+FdLv+S0U0/P2g+uKIKm5lZ+8YujuOiiS+nqbifgDwAKJ06fTkNjE6NH16LrBpZlIRSBqmRfkhWIYdlypACHVDqGENO2g/FjVMBVaFulcuphvRTXmlitrB/fdx9uoBle+8QN6uD+773T92SJRApwiSSP2XPPPd5xau5oLBrPIJpA0QxeX+iCBsCz/ic+qwkcJfDcja089qaXcKNAuP4HB98vwFf/k2EIWQEfjgA3LGU4J8swDCorq+kN93Dcr47HME1KS0uy9IO34PG4mfPoHJwOF61tzVSUVfPIo7OH5QdPpVKEesNcf/017LXnvtQ3rWRM7TjaOlo5YdqJCKCoqADTNFGEgqIMQ4kJKcCHLcDTFhTSmzDXq/DN9m1EYbPxKUbVGrb4Xt8mokJYukRj4ddOCoMDj/V4PIEitPi+++/zmhwYEinAJZI8Z+KmE1dMmbL9gp7ezoyvKSo0+OQrF/MWOqGU9V+dSnfLnLxHilMPC/PeWy4sz//g4NMC3KmlD0ikq3GyAp69ALdMRWR5slRVtZvjRMLUVo9l3vwPueC8X+P3eXE6nVn4we0W89tO3pqbb7mNeCLa7we/4PxzmdefDz54RV1RFDo7uwCY9fBDFBeWsKp+BTVVo3nt9f9y2WX/R0EwgKZpKIpAGU4FXCAF+HBmWx1S+urr0dEnwM3/8XsRoChAcgNc+xbghxfmeUjENLyugcdSd08n22w9edG22277pRwcEinAJZKNgP322+c1CzOjD9ytAabK0+97wbGBtKkK1MNeOyXYerMUqa71bHfJNDEqaQsKgLDQdaQAH44AN00l21OVSCQoKytDAOFwLyVF5dx2+83MnvUIlRVlWWVtCwGtbR2cccapnDj9lO/kgx9PbzhCVWVlln7wekaPquXBWbMxMYhEIxQVlPD3v1/Jf/7zHCXFhQhFQVGznxaErIAPS/RiQFJfPYIcDn4cCwpgmWBtgL8rHEAnvPCRx15ZZLCfmJbO7rvvKtNPJFKASyQbCwcfctALQFJPDVw5NC0QmsHcDz0bxoayxgRIEqoqDRzKhpkMB7rinY50552+Cri0oAzjM7OyroC3dbSy+x67c8Vf/0x3qAOn04lTc3PaaTNYvHgJo7P1g6fzwe+4eyaTtti63w++9OuvOPO0s3C5HFn6wRUam1o4/PBD+N3lf6S7pwOv14ciNE456SQaGpvwedxDivm1NaXAsiwlFovJuSRLAZ5aI2mk34KST0lExbDqC5W3FroIFhgDHlqfBevAgw98SQ4MiRTgEslGwl577/XBJmM3XdHVndmGUlxgsnCJk/kbyoaSnpAtE6wN8Rh4QPVo/x1n2u8plLQYkBXwrBletdektbWV8847m18dO5WmlnqqKmuIJ6JMPX4aKd2grKx0SMG7Oh/cyeyHZ+FQnbSm88HnPDqLW2+ZmfaDiyHFvK7rdPf0cuVVf+aA/Q+moamOUTVj6OzuYNpx0wEoLy8f1iA2TWMby7LkXJKNANchmRL9bXCdWp4JcAsIwtx5HmIRB35PBvtJdzeVZTX1+++/n/R/S6QAl0g2JvY7YN9XUkYisw3FYWEZKk++4wVnHunTNSwoIl0BN6QAz15fWNYwvEKCcDgMwF333MmYUeNYWf8to2rG8cnCeZx95rn4vB7cbnd2+eCrGtluu8ncdvtM4mvmg59/Hh9/vIBRtVVZ5YN3d3djAbNmP0RFeRUr65dRWzWWN956lWuvvYHi4uLsT4hgGG3rpQDvt6CkZ16nll/XnnAA3fDMu2n7SYaFYDwZYa+993zL7/cn5cCQSAEukWxEHHbYT54HMM2BxYOZTkN57gMP1APe/BEBLkf64heQSqWb8UgBnq0AV4bj1XdoDrp7wgT8PuY8MgcQdHZ1UFZcyT333sH99z1ERXlpVvajPj/4aaefwoknrPaDWxhMnzaNSDSadT54XV09lZXlPDjrIcCiN9xDaXEF11x1DS++8AKlxZXZDSdhX0PSB57dtWcYkEyRzsUWOBxWfs3CxdDwhcqbC90EgsbA4zr9b4cd/pNn5aCQSAEukWxk7Lf/vq9UlFXXd3d3Z3xNSZHB50tcvP2RC8rJ/cfE6U2YfSkoimKR0oXdGEQK8GwF+PBvsoqgrb2L3XbfhRuu/weRaAhVU3E5PZx11hl8/vmXjB5VnbUfPBZPMPPO29fygy9ZupgZp5yRdT64qqo0NDZz8EEH8Jc/X0lPbxcOhwMhBO1tHbjdLvlhb4DZNqULkikFRemzoNDfITPnMYECeOpdL5Gwg4A3U/pJD0UFpa2HHf6T5+SgkEgBLpFsZAQCgeTBBx/0cjwZzmhDcaab8jzyui8tgPLgwEXfJkw7hiypC/uRuBTg2QrwYdwz7cY2dlKIQXtHF7+56AJ+efSvaG5toKK8ikQyznG/Oo5YPEFFRXlWfvCWllY8bhdzHnkYp8Pdnw/+6GOz1/CDD41hGHR1h/jDH3/HTw49gqaWerweL+5hbMQUQmBZlrShZHntpXRBQhf0Rem48qgCLtxAK/zrTS+IzPaTaDzEvvvu80ZJSUlYDgqJFOASyUbIz35+1JNAxqYopgVOj85/3vOQ+BooyI8r3tUnwIVtP0mkhLwTZC/AMy7YhhKqkUiEZErn3vvvYcL4TamrX8bomvF88eVnnHXGOXjcLjweT9b54JMnb80tt67OB/e6/VxwQZ8fvDorP3goFMIwLR546H5qqkZR37QSTdWGfU7kJszsrr1kOgdc6fOA9wnwfHi6Vg6L5jt4e6GH4qLB7SeHH3GYtJ9I5C1BngLJxsohhx78YnXlqLqurq6MrykOmjQ2OfnPO94Nl4byPxOPrBFDmPaA65BISgH+v0BVVRobmwn4fcyaMxuBQntnK+UlVTz40L3ceec9lJeVZCnobT/46aefwkknnkprexOlJeWYlsHU49P54FUVWVXUV61qoKy0hIcfmQNAZ3dnuhmPZH3PtildYOii/2may2HlxdMnAeCCR9/0gaHgcWa2nxQGS9qPPOqnT8sBIZG3BIlkI8Xtdps/+ckhcxOpaMaqZt+j4kff8EEUhJr7x+1y9h2bRTIlSKTknWCDCRMh1hpbmqayqr6JXXbekZtvuY1oLIxQBG6Xl3POPpsFCz7Nqnq92g+e5I67ZrLlpG36/eBff7OEM047E5czu3xwTVOpb2hm77334JqrryMSDQ3pR5d8P5WaTAlSBvlnQfEDK+DxN7xoTgMzQ/OdaDzEAQfs/0pxcbG0n0ikAJenQLIxc/QxRz8GJI0MgseyIBDUeekjD/WfqFBGbj8utuivTgkBSQNpQfkfCvC+D6Gto5Nzzz2T4381nZa2RsrLKjHMFNOmTiUai2eVZmL7wVtwOR3MengWDs3Z7wd/5NHZ3HLL7Vnlg9vj3KSrO8Sll13M/vsdRFt7i/zwNsBsm9Tt6E/RlwOe7oSZ0xZ6E6iAF9/18PVyFyWFA4/bvsSpY449+jE5GCQSOe1KNnIOPvigNzYZO3FFZ3dHxtcEfRbRsMasV30QyPEnxha4nSZg2TngKSEtKD+CKI9GosSTKe669w42m7iF7QevHc/ir75gximnZ51m0ucH327bbbj99jtsP7iZ9oOffx4ffTQ/q3xwIQTRaBSAyqoqTMuQH9R6/+DtCriur66Ae5xm7h+WBiTg/pfszepahntJV1cnNVWjVxzx0yOekYNBIpHTrkTCL47++RMpPZHR92qZdib4nFd9sArw5bYA97jWTkGJywr4Bj3f1gCPTFRVpbmpGZ/Xy5zHHsGhOmlLd7d85NFZ3HrrHVmnmfT5wWecdjInnngqrR1NlJaUYWEyfdo0wuEoVZXZ+cFThkksLcQl63+2Tab6KuD2P7ldVs4/UaMMGhaoPPuul0CBPqD9RFEUEqkohx9x2HNut9uUg0EikdOuRMLU6VNngZKMRWMZ55iSIoNFS928+o4bKsjpSdPjXOPYjNzdhJkLj+1Ny8TK0OxJ0zTq6huZst1kbrn1NmLp7pZet58Lzjs3Xb0ejh88wR133MaWk7amrmE5o2vHs/Trr5hx6mm4XNn5we3zKiMFN9Rsm0gJUnpfpKllL4Zz+HSLdOv5Wa/4iEU1ghlazycTKYDk1KnHPSwHgkQiBbhEAsA222z91e677vFeZ0/7EJng8MB//WCAyNUrxwSPy4R0IxAsiCdz01Rj5oFOFNjV6zPOnMGJJ/SlmZRhYjD1uOMIhXqprqrMOh/c7XYx55E5uJxuWlttP/hjj8/hlmzzwa3cEOBmLtZQlfQmzDVSUHJdgBMAVsKDL/tRHQNHDwoh6OhqY+tJ23655157fiBnHIlECnCJpJ/jp/7qYXsmFBnFnj+g85+3PbR+ouTuZkzLfuwt1PT7t4QtwPO0EY9ljex73JrV6zvvnslWk7bpr15/s+xrZpx6Bk6nhs/ny9oPvs02W3HLrbcTT0YxTQuvx8+F55/Hxx9nV1GXbLjVVjwp7E2L6f/vdeawADeBSpj7hoevvnVRWmQMeChCCExL59jjfvmIHAQSiRTgEslaHHPsLx8P+gs7e3q6M76mwG/R2+vgvhf9UJCjmtUEt8PCqVn9FeREjgrwbKqgqirWa56eoihm9hXi1V0iB2ve01e9djkdPJzubtnS2kRFWQ3/euIR/nHjzZSWFGXVAKjPD37aaSdz0kkzaOtoorTYrqgff9xUQr3hrPLBs1/gWH1JL+utJi2y+uxF7glXgb3fwkwfoWLhceeuABcOIAy3Peu3F4AZ1EQo1IvH5QudeNIJD8iZRiKRAlwiWYvS0tLQUT/72VORWCjzZkwLVIfBAy/5YSV29m0OCnCX08Kp9Vk40psw87QCrijiRzQrWLgcLlwuV8Zuq32sWb2+4847SSRjmKaBzxPgNxddwLvvfkBtTdXw/OB33s5WW65RUf92CWfMGDwf3LKsId/rQH/z+3QHzfj7FCVvS/TxhFh9L9HSKSg5+iSNKvjqfQdz3/VSVJR582VvpItDDj30xdra2lY500gkUoBLJOtw3fXXXOJ0uvrj2AYS4KVFBkuWuXjuNQ9Usvpxcg4JcLfDwuEwsSxbDMQS0oIyHLGZbQFcESpdPd1omobb7R5S2AoBLa3tnHzyCcw49UzaOpopLi4FYPq0aXR3h6iprsraD+5yOpg1ezYOzZX2g9fw6OMPc/M/b8s6Hzy7c8J6rYDnLQJi6f0WpmV3pHU5gRxcbggBOGHm8wEwVbzugS+KeDyOEApXX/O3S+UAkEi+U3iRp0CS77S3twcPPeTwF7q7uooDgWDIsixFURTT5/eGi4uLOysqKprHjh2zcrvttluw9aTJfPHlF7jd7oEvmLScu3Oun8OPiSEcdpJILglwlxOcmh2JBmkLSi7qmR/hbSuKkrXQLCut4L333+KG62/gt7+9iN5weNDoFiEE8XicaCzO7TNvYd7HH7HwswWMqd2E5Su+5aQTT+Hp/zyBP+AnGokOWnXuq6hvu+3WzJx5BzNOO5mAGbQTVi48n1123ZmddtqBFSvr0bTV7V1NyxxWBdyy1n8FPKvPXsnBFu59HnDsRZxTtXA7rNxbxFtAKYQ+V5j1sg+PT89oB4vH42y+6ZZ8/fU3mz799DNHrVi+fFxLc2tlR2dHcTgc8ZuGqQkhzEg04nU6nPpzc/9z6JgxY5rlrCWRAlwiyQcB3tZeOm/+h7sBqDhB2MLBJMXaz39VRteOpqi4KONjYdOCwkKdF973suQ9B5vtkbKzwXNFDJjgdlo4HRZmxP6nSNzeGCbIrafha+jG/6HoF2a2JXBN0/B7C7j00ovZcacd2XefvdYRvN9FVVVaW9sYO2YUcx6bww5TdqCppYGqilr+88yTXPv3G/jtpRcRi8aH/LT6/OCnzjiJd999l/sfuIfRNeOoa1jO9KnTmffJPKqqKmhubkFV1X5xNawUFMtCCOV/XgFXc/HZrVidOGRZApfTxOXMPQEuLKAE7r7dT1eXg+qqJFaGYwgGg0SjEX56xM9eskitdTIUHPYi2gKDJACtrW3lUoBLNhakBUWS94R6e4Oa4qKkqJzyinLKy8upqCinqqKGqora/q/y0nISiSRiCDXt81gYKZVbnwmA88epxP4gAe6yPeCGtYYAN8itiqIFTs3s04AZMQxz/VtQslymmKZJYWERACdOP4HOzm5qa6uHtJDY1esGtth8M+68806SqTipVAq/r4BLL7uYN958m9qayuz94LEEt99x21p+8KXffMWMU07H5XTg83n7N1OapjlsD7iiKJ+tzwq4YRhDLq0cGjnZwj0WT1tQTPsplDsHBTgFYHwLtz7tx+E0Bl0HCiFIJBKUlZauda+tqqihIn0vLq8op6yk0r5X9/QUyhlLIgW4RJIndHV2FutmYnWVLwOqqqIoYsgKoGmCx6fz8H+99HyuQAm5Uzo2waVZuJ2mnSQBRNMV8FwT4HZHz8HlsK7r6/Upn6Iqw0pVMQydmqoxrKpfyYnTT0JTFQKBwJBjTAhBS2s706Yfz9lnnUd7ZwtFBbaYn378NNraO7IS86qq0tLaitvl5OE5c3A5Pf1+8Mf/NYeb/3kbpSW2H9xeXAzTgoKFoijm+uxuqOupIT8zd461cBcCMNKLXezFr9ORbsSTS4eSjh58dK6PFavcdvTgIEO5b2E31L23b+N7W1t7qZyxJFKASyR5Qt9NfX1W6YoCJl1dTu573gcl6ceyOTKBOh0Wbhfo6Yk/EldybyOYRf/Gr8EEQCKRcK/XG6aiZC1PFUVBT+kkkwkqy2t4bu5/uPqqaykuKkAM0cmpzw8ejsS45bab2XGHXVjVuIIxtZtQ31jHySee0i/ms09Y2ZJbb7stnQ9u4PUEuPDCC/jwo3mMqq3CME0sw8rYuTOTwBqOLz4bksmkM/Pfs//ry7UGNv0C3P7cTcOufrscVk5de8ILtMI/ngqAYq63p399Ary9XQpwiRTgEkne0NnZVbzmTX59oToM7nwuYEcSBnJHgAuHHX9mbx61COdoBTzgsYZc+cRj8fUrwEX2TnnDMHC5XUQidov5oL+Q3/3+Ul577c2sLCSqqtLe3o4iYPbDs/D7gjQ21VNVMYrn5z7DX/9yNcVFBXZ1cYi31OcHnzHjZE4++TTaOpopLS7FwmDa8VMJ9fZSXlZKytAxzez9SOlNmOtVgMcG+cxsAW4R8OZgfrYB4Zh9D9JNsVqA59DinVp4+SUP87/wUF6ir3cLUHdXdzESiRTgEkl+EA6Hh0zstiwwhiEjLAvKig2WLHPzxAteqCY3HiVbgCNt3zD6YggVSOXY3cCEAp+JotFvpRmIaDTqXa83TFXVs/2g2zs62GXXXTjt9NNoaWukIFgI2JGCbe0d1I7Kzg++clUDm246gXvvvY+UkSCZjBP0F/LHP/2OV155nZrqSnRzOPngt7H1ltuukQ++lNNnnImqCFxOFyl9GC4by0RV1PU68iORiH9wAQ6FfjO3rBvCHrPhuL2AM037GlQd5MxxCDfQA1c9GgAs24c/jPtlNmI9Eo165IwlkQJcIskT4vHBq6CqatEbVWht02hqcdDUohGOiXS+8SA/J2wleNO/A9ABIhemDsMW4G7n6tkwnhCQJLcq4DoEfCY+j8lgheTeLBZfw7phDsNuoRspekO93PTPG9hv3wP7LSSNTfWcfMLJaEp2FhJFCJqa2zjm2F9wwfm/oaOrjWCwEBCcOH06LS1tjBpVg55lPrjT4WDWw7NwOtz9fvDHHp/DPffcj9fT1zQou8FgAoq6fi0ooZ5QMOPwtQSqy6QwYOaWbUoAqfR+CwBD4HFakCsCPF39fudlF2/O81Faqg/aibbvvtkdVmhq0WhuddDVq6BpQz2xinmRSKQAl0jyg1Qq5Rjs++2dGsfsF+HJ+1q5/uIOjjwggkOFxmYHje1qRiFuWlBaqvPuJx7eftWVG1XwdAW8v3GGatnNQVKAmksfKhT5Tfwei5QhMmgeBz3rOVVBVdWsWxeqQqWlpQWABx68H583QGNTPdUVo3j+hWf521/XsJAMpt2EIJVK0huOctM/b2DXXfagvnEFY2rH09jcwPRpJ6AKQUEwmLUffPLkrbh95h1r+cHPPfsc5s//hLFjxpDtMVpYqKqqr89z3NnZWZxpatJ1CHgtuwKu59B4Vewx29cJE8tOI8oVAS6cQByueqwAAJcj0wLVfpLY2GwXM0oKTI47PMwd17ZxymFhOjq1QUdWMpWS0cgSKcAlknzBNIxBb+rxuMpOWyT5+clRLrooxNO3t/HxrCau+nUnW4xJ9QtxRVlXiNsTkeDGp4KQAjHSpw/LFtp+jwUIhGpHo5m5ZkHRoSRgUugz+xsKfRenw0l3V3dhqDe03nzgttjMTpz2NaipW9XAqFE13JO2kCSScYL+Iv7wx9/xyiuvUVNdOaQVRVEUOjo6AHj4kdkUFZRQ31hHdeVo/vvKi/zxj3+hqDCIqmlZJKyk88FPPZGTT1rtB0+mUsw4ZQYrVqwk6CvMekCtzwp4PB5T2trbS53qwB9ZUhcEvSalQYN0dHROCfBYQoBifz5elwXOHBDg6er3/FecvPCOl+Li1DrV7z7h3dCk0dqmsfdOMe66oo35DzUx55/tnHFJmL0mx4nG1EGfrZiGKQW4RApwiSRfGHqTmEV7t2I31PkW6IDxE3Uuv7yHTx9t5ObftTO+SqehyUlnSGHNgqVpQlGRztNv+lj8lgNqcmBCVSHgsd+kplhEE4JEKsfa0afAHbAoKTRIZejk6Xa7aGtr37y5qblyPQpwcxjjzk4WsSzCkRi/+tXRnHfuhXR0tVEQLAAEJ55wEm1tHdTW1gy5KVPTNFbWNTBu7BjuufdeDDNFPB6lIFjMX//6J1544WVqqiqyaHm/Oh985h23stWWk6lrWM6Y0WNYsmQpn332GcGCYNYCfH1WwFtb28u7O7u3croGDkJJJAXFQZOSoAmpHJtpkxBN2IteEPi9pv3UaYRvwhRO+3q7YnYhIPC61l7MCbFaeO+3S4xnbmnhjYdaOO2sMOWVBjQD9VDfqjF08yiRa6noEokU4BLJIMJlyJt6MiXsuUHYreWtVuArcDjhvF/38vkTjVxxTgdOAfWNDlKGoC9Uxee2wFT4++NBUElPsCOUdAU84DXTgtLuzhdLipyzoBCAqmITMmzCdDqdhMKd1Nc31q63saQMT4Cbpo5lWaT0FOFIlJtuvpFddtot7QcfT2PTKqZPOxFVERQUZOEHVwRNza38/BdHcskll9PZ3U7AF0CgcML06dTXNzJmdG1WCSstra24XE7mPDIHt9NDU1MjxcXFeL3eISvy3xHg6000tbS0lHd2deLKIMDNlKCyyEAEyTkBnkjZG577FvABjzXyrzkTGAXzXnby3FteSop1jHTXXFWF1i6VxmYnO2yZ4F83tvLq7BaOODoGIbCWgNWdvudYq7uADjouNTWXjEUSiRTgEslgOJzOxFCviSXF2pVrAZYCVgj4Erw+iz/9uYdPnmjklweFaW/XaGjWUFUL04JAMMWc//pZ9b4KVYzYqpbVL8DtN6gKu6oYjYvcuhsYgA82qdbJVLrv81Y31NevNwE+HIEghMDQ7cY2qqLS3t6BIgSz58wm4C+goWkV1RWjeOnl5/nLn6+iqND2gw9mIbH94ClCvWGuvfYq9tpjX+qbVjJ61DjaO1o5YfqJABQVFWTpB29g660ncevtM0mkYsTj8WHm5Vto67EC3tDQUKubCTQtkxNBMKZSt2M/c8wDHk8qxBICLW1BCXhN0BjRFfC+6vefH7af2HhcFqoC8ZSgvtFJkcfkxkvb+fjxJo4+PgqdYH0NVnINdZHOQA/Hhh5XLqczl4xFEokU4BLJYHi9nuhQrwnHMrRjF2CpYHXZQnz8ZjqP39/Gv25sYVxlivpGF/GkoChgkkqoXP9EAXhGvpvD9oCDoljEU8JukZ1DFXALeyGxSU1qULEK8O23347/0QS4oWMaJkKIfgvJJpuM4+577kE3kiQScYKBIv50xe95+eVXqamuzKIKrtDZ2QXArIcfoqSolFX1K6mpGs3rb7zCZZf+HwXBAJrDkVXHzT4/+Kknn05HVyvDHb2apq03Kbxi2YrxfceYiU1H6eDKsTb0qt0FM54SqOlDC/psC8qIPQ4DGAUfv+jkubf8lJSmsID6Jo3OTpWTj+rh86ca+fXFIUimK97JAVRFWoD3hIeWGx6PNyZnLIkU4BJJnhAMBkPAIGLEoiei2BW1TNqjryJeD9TD0dOiLHqmkVN/3kNnp0Zdk0awIMV9c/20L1CgkpFb2TLB5zYBC0XYj4ajCSW3LCgASZhQkwIxeBThF18s3nJ9/UlN1YYhwBUMw8AwjP7FgKIImlraOPbYo+1Iwe42ggG7unjC9Ok0t7QyalTtkJGCtpivZ/ToWh546CFMSycSjVBYUMLfr72S/zzzPNWV5cPyg9868xa2325HGpvrh9W0an0K8C+++CLjZ2Wmm/BMqEnlVgZ4eqaNJgTxJP3WNb97ZK8ghAeIweX3FwIWpiFoaHKyxdgkL8xs4b47OqgYZcBisMJkvn+kIxg7QsqQN0V/wBeWM5ZECnCJJE8oLi7uHFyAQ1evAvEsrggFrBRYi8EbsLjn9g6e+mcLNUUGoR6NcK/GdY8EITCCq+AW+Por4LYAj+RYBRyAKGw9JkVVhUE4PvAHpwgHXy9duul6E+DDEJuKIjAMg5SeQiiiX/Cmkkl6w5F0pODu/ZGCLa1NnDT9ZBRBVpGCiqLQ2NTC4Ycfyu8u/wPdPR34PD4UoXHqSSexsm5V2g8++Fvu84O7XU5um3k7BcEgkUgk63OyPj3gX3751aRMV04sKQgUGGw1JgWRHBurmp0BHk8qCGGbon2eEdxMKF39fv1ZF69+6AMEXV0qF53UxaKnGznkqBgsB6vJLkwMerNzAL3Q1Kn2J8Csc0tK35uLioo65YwlkQJcIskTysrKWkFkFDRCs+gMKRC1J8rsVEd6o+YK+NnxUT57ppGf7xcGFG54rJDw5wLKGZlVcCtdfRN2BdxMpS04uXY3iEBJjclmo1LEIgMrgIA/yDdff7vpsm+XrRcfuHMYHlUhBLpuoOs6ilDWEs4dHbbOmDX7odV+8MpRvPTfufzpT3+1IwVVLYvfr9MT6uXKq/7C/vseRENzHaNqxtDR1c7U46b1LUCz8oP3RmLU1NZQUV5FPB7fIIuSwWhrbStcunTppj7PwAksvWGFzWp1xo/Wc0+AK2kBnlhtQfF7Rm4beuEHwnDRXcWAk63GJ3jj/mauv64LxQHWUnuzelb3DCf0dgma2lWc7sEFeHl5eaucsSRSgEskeUJJaUm71x1ATw2sE1xOi9Yule6QYufyDuPqsXSwvoTiCpMnH2rjtt+3YKQcnHZdCZSO0Cq4CT6viXCk539L2BYckWMfbAoogUljU2ApAzZL8njcROKh4AcffLjLjyPAdVKp1DqWjtV+8PHce9/96EaSeDxOQaCIv/zlj7z44n+pqa7IKh+8q6sHC9sPXllezcr65dRWjeHd997i4osuJRjw4cjCD66pKh0dHcRisUE2Qa6Lw+lYLxvnPv543g7tnS2Vfr9v3XMJWLrCFmOTUAYkcmysqtAbVTBS6V4CwrKfQo1EAW4A4+DWWwN8sjjIece1sfCpRvY+JA5LwepgeE/LXNDQqdHSreJ1DnzAhmGgoFFeIQW4RApwiSRvKC8vay0qKliRSA6sE7wui+ZOlZUtKnyfli0qWA1AM5z9m15evWcV/53v5q1HXXYVfAROsH63hcdppRtqpAV4jt0NLAvQYJdJidX/fwCBCvDuu+/tvj7+5nDEppL2gA8kwO33ZkcK/vKXP+PCCy6ms7uNQKAAUDj5xBNpbk77wYfMB1epq6unqqqC+x98ADDpDfdSXFjKDTdeyxNPPE1VZTmmOcSGTMVeMKzpWV/fi5LBeOedd/YEBu0MuuPmSfCClWsecIF9jVkCy7IbdgVGqAVFlMAXrzn465wC7vxjIzff3InqTG+ytL6HanDDqlaVcK+KM0Mr+mQySUGwkPKyMinAJVKASyT5QkVFRXdJaWl7PDHwY3WHZhGPKqxs0cD1Pf+IClYM+BL2OzzOBzObaetSMaKMvMqyYW/C9Lis/o52PeEcrIADhGGvreL4/DrhuBhApFsoQuO9d9/fY338OZfLlX0FPC1o9ZSOGECA90UK9oaj3HjTdey2y55pP/g4mlubmD51OoqAwsKh/eCqqtLQ2MIhhxzIFX/6Gz29nbhdHjTFwamnnMw33yxnzOjBm/0oQkFPpYYtwNdXdNwbr7+1j0AZsFIfTwk0p8E+W8chF3MylLQAR2CmN0EHvaZdbR5hmAbULdN49upWTj+vF74Bq53s7XnrrBBhWaMGlkDJsLZKxBMUlxR/VVVd1ShnLIkU4BJJHlFVWdlsWgPrBFsbCVY0az9sI6IAS9iVoglb6vzi0Ch0M/IeMxv2Jky308RIN7Hpjdo56CLXRHgIxmxisO3EFL29A394RYUlLPzsk23mzZu/zQ8X4M6szdF9FpRkKtnv+1137Nkt5gUw+5FZFASL+lvMv/Lay/zxD3+msCC7FvOGodPVHeJPV/yeQw4+jMaWVdTUjCbU2830adMBKC0pxjQy7IVQFFLfowLucrniP/S8fvXVkvEfffThToUFxQN+vzukMGlciq03TUFPDt6A+irggGEKfG6LoM8amc2EuuDQfWPstFvSTjjRv79SEOkElC+WO/pOw8ACXI9RWVnR7PP5ZCMeiRTgEkk+MX78uGVDvebLFQ5IrAcR2pcbHgfFMQJPhgF+j10B19NaLBwbIoZxpBIHKuGA7eNgDuwDd7ucgOl86sl//+KHC3BX1u5jRVHQUzrJZHLQ0zpoi/m/XcHcuS9l1WJeURRCoRCGafHAQ/dTXVXLylXLqK0eywcfvst55/0av9+L0+UcUMwrikBPpexNo8OIIXQO46lAJp595tmfGlbK7fF41n1fAkxdZd/t4jAKe7N0LmlvAZjQm94obJjgdVt2DvgIlJtCw8717swi4WQoHEAnLFruhEG7zFuMHj26Ts5UEinAJZI8Y/PNN18y+KxjsnilA7oY3kbMwaaUkRrzq9se8KDXIqmvUQE3cu9ztQBScPhOURAmyQEqiqZloSlOnnziqaN/uAB3D8sDnkqlSCWH/pE+P/jRR/+M3/z6kv4W86Bw4gkn0tDYzOgsW8yvWtVARXkZs2bPBixCoW5Kisq59dabeOSRf1FZUTagH1wRkErp6Lo+rAq42/3DK+CPP/bEsSLD46ekAWDy012j9lMmK8cGqbCvud6YPd2mdIHPY+F3j9wYwvV2jr3Q3aywZJWGxzv4L91si80Wy5lKIgW4RJJnTJg4YSmAkeHxu8dn8U2Dg65mBTx5fjIMEG4o8JlYKVvGhqLKwJ1Ac0HctMEOU5JM2SJBZ486YBW8pLiUpd8snvDC3BcO+CF/blhiUwgMy8jypX0t5iPccOO17L7bXtQ3rWRM7TjaO1o4cfqJCKCwMJsW8yoNjc3st9/eXPm3awiFu3E6XTg0F2ecNoMlS75J+8H1dU5lKl0BH54Ad/8gV/YH738wZd6CD6eUFJcNWJnv7FbZYkKSfXdKQCu5uVfBgFC6Aq6nn0A5nOTkondYBODT5Q4aWzV70+kgYn+zTSculTOVRApwiSTP2HSzTZf6PMHuRGJgB4HfbdLYqvHZCgf481+A44ECv2mb1rEj0kjm6B0hBoyCY/eNYOrqgPpMc2gAzttvu/OcH/Kn+vzOVhYlQiEEFjqplK2yhqpe2y3mV+eDFwRsP3hN1Whefe1lfv+7P1FYEEDLyg9u0NnVw+9+fylHHH4UTS2rqK6spTcS4vjjjkc3TMrKStdZkKZSSfTU8Cwobrf7B1XAb/7nbRcATpfLOcA5ASOlcuTuUcRYci//u29lY2AvcrFAFwQ8lr3h28zf24ywAAd88IULTJVMyZbJZBKH5o5uMWmLL+VMJZECXCLJMyZM2KRuwoQJ3/SGQwN+36ECpsJHi13gTE8e+YoJOKHAa9rqQLHsRjxxcq8bJuk1RA9MPyCC15eiZ4CmPKZpUlRQynNzn/nJ558v+t6dMYeTgqKqCk6Hm+uvvZZQOEJFRdmQud79fvBxY7j/wQcwzBTRaJTCYAlXXf0XnnvuBaqz9IP39vaiGyYPPHg/Y0aPY2X9t4yqHseCTz7mvHPOx+f14Ha71hLzyWQKwxruJkz39/aAL1u2vPbxxx89piAwcLOgSEygOAxOPjAMsRHbt2aIgQDEIRRZPd0GPKYdeZrPFXDNvi7f/9JeaWRaM/aEepgwfsKyyZMnfyVnKokU4BJJHrLN5K0/M62BYwestDKdv9QJ4dwUosO98gO+dDt6za6AW4kcPu42qJpi8LO9YoR7NQYq4Pp8PsBy/vH/rrjyBwjwrCvgAGUl5Xz48fucd/b5eNwuPB7PkD/b5wf/2c9+ykW/+S1dPe34fX4EKqecdBINDU1Z+8Hr6xspLi7koVmzAOjq6aS0uII77ryNhx58mIry0rXeTyKRwMqyLNv3c8NJhvkuf/vLlX8wLN0d8AcGOA/Q3a1x6C5RNt1FhxZy036iAjHoDiugWoAg4DPtDYr5vNAPQvcyhfe/cOHxZR5Thplg8y02k9VviRTgEkm+st12234CZKzuOdwm85Y4SdQL8OXxiUg/Gg6mJ0WHahGOCiJxkbN3hL622BceFQIs4gPUZA3DoKSwnKefefKnH3740bbfS4AP025hYVFSVM5Ds+7jjpn3UF5WMuTPrPaDh7n+hr+z5+57U9+0ktGjxtLW0crU46chgKKi7Pzg9Y3N7LXX7lx37Y2EIz1omobT4eaMM05j0aLFjB612g+eTCYYri/i+1pQvvrqq/H3P3jvSYXBEgxz3cVEIr1WvujnvXbznVSOXm8qxGOC7rCCI90JMuizbGFu5fE9pgDeW+yitU3rv9cMNNYBtt5m68/lDCWRAlwiyVN23XXX90BJJpMDz+RFfpNvVzr54EsXFOXv5GhZtigoSFfAHZqd0NATUb5/s42RcCdrgB32T3LwblE6OhwDZm97vB4A5zlnnTfz+/yZvk2Y2VbALcvC4/Hgcno595yzmD9/IaNqq7P0g3cBMOvhWRQVllBfv5KaqjG8+dZrXH75HygIZucHNw2Djs5uLr7k1/z8Z7+kubWByopq4okY06ZOI6UblJeXARBPr1yysaD0/d3vK8DPPP3sOwGn37/upgtVgfZ2B7tvF2Pfn8ShPodnK832f4djwra6kbZ/afl7jxHCPrZXFrgBJWMOfp8la9ddd35PzlASKcAlkjxll113XjBuzCYrQqGBO3nYm4QUXl3gBjU3n3Znr8KhKGBPfqpq0RsVdPYq9mPxXD2kJOCGK0/qBiCaEANO+JXltcz/5KMp/7jhn+cOW4B/D7+zruuUlZZhWDrTp00jGotRWVmepR+8njFjRnHvffdhWDrRaITCghKuueZvPPPM81n7wcPhMMmUzr333cP4sROoq1/GqJpxfPrZAs48/Sy8HndagMf+JwL8/vsemPbm26/vVVFWM+B5iKfXyH+e1g0BsOI5fK2pEIoKYgkFVbHPWYHftPsF5GsF3GsviF+Z70ZxGBmPszfUS3lJVePOu+z8gZyhJFKASyR5zA47TJmX1GMDCgzLAhTTrtq02GIubzGhNGgCFqpiN+LpznEBjgKsgu0PTXL0/r10djpQ1XVnflVV8HsLnL+5+MIblixZOnY4f8Lj9UTJ0C59QBGtavT29tLd3c3o2vEs/uoLTjvlDNwuJ16vNws/uNLvB7/k4svo6mnH57X94CefeCJ1qxoYk6UfvLGxicLCIA8/MgeBQmdnO2Ulldx3/93ce88DAMRiw08U9HiGJ8AbGxpLzzjjzDs9bp9T09QB3qtd/T5g5wj7/yzHq98ADnuPRTgu0pVgi+Kgkd/2kxL4+HMnn3/jpCiYeWxGE71su93khUVFRVEkEinAJZL8ZZ999359sO8XFhjMX+Jk6WLNtqHksQAvDprpTWGALuiOKDl/R7BSgA43nNuNohl0h9bNBTdNk6LCIgDnEYf/9Pnh/H632x13KM4hq859dPd0s/8B+1NdU017RxsVZdXMeXQWt916B2WlxUP+/Jp+8Guvu5q99tiXhqaVjBk1ls7uDk6YdgIARUWFWfjBNVbVN7HLLjvyj3/8k0isF0VRcLu8nHP2WXR1dTN69Oj+vzvkubZXrLjdnmEJ8MMOO+L5lJ7wlhaXrfOehYBQ2PYv3HJ+F2g5Xv0GuwIeUYjHRf/m4JKgmbcRhALACf95zwuGituReWwD7LX3Xm/KmUkiBbhEkufsvc/ebyhCi8diA8/qXpdFMqbxzAde8OdxHKFhb8J0uy36oqB7wkru+24UoB5G765z9aldhMOOAQuNuqFTUzWGr79ZMuHIn/7sX9n+eo/bHXe6nJhGduqpN9LNgQcewI033Ug01pv+HX7OP/9cPv54/rD94A/NfpCigmLq1vCDX/rb31EQ9KM5HFlU5i3aO7q44MJzOfaY42lpa6S8rJJEKs5pM85g8Zdf4tCyawVrGiYOxYnX68m6ennCtBPvXfjpgm2rK0ejG/qA6i0UcnDZtG42PzAFdXkwSynQHRZgCLs6rFkUB638zQD3gbUSnn7Hg+owMDMMyWQiBYjkAQfu/7KcmSRSgEskec6WW076Zsp22y/sCXVm0icgTOZ+6IEO1ltb+hGHbgvwgMfENAVgpzTkwx3BAmiC314YYsrmUZqaB7aiWJZJZVmN85lnn/7pOWef+49sfrfb7Y47nc4BUzsy8emnn3HYTw5h2tSTaGlrpKy0HNMyOP644+ntDVNVVZF1PviYMaO4/8EHMS2daDRMUUEp1153NU8//SzVleVDVsGFEEQiERLJFPfcdzebbboFdfXLGF07nrnPz+WuO++mrKQiuzWcYeDxevD5fOFsXn/5Zb/786yHH5pWXlrlHMh/oaoWjU0aE0YnuPKibmgDKx9EqpKOIAQME3xuiwKfAXoe3lcsoBze/tjFF1+7KCnMPK67ejrYcottvtx5550WyplJIgW4RLIRcNBBB7xsWgaKIgacPwoLDd5Z6GbJJw4oIz+9miko9Jl43RZ9BdiOkAJmHmw+FWB1AwF45K9tgEVHt7pOEoNlWaiaSmlxpfP2mbed/esLf/P3oX61x+uJulyuesPIXhm2trYCcOfdM9l04ub9gvebb5dy2owzcDkd+HzerPLBG5taOPLIw/ntJZfT1dOB1+tDERqnnnIydXX1aT/44MpOVVWamlrw+7zMmj0bgUpbeyuFhYX2yctyABiGgdvtbvT6vENWwP/4hyv+75q/X31ZSVGZ0zFApV5RoDukAoLH/9qGUgFWW57MUAp0hRVAYJgCv8e0E4jyUID3pZ88+oYPEGhq5oWgYabYe58935AzkkQKcIlkI+GII4/4D4hkIjFwHKHPbZFKqsx53QvePE1DMSDoNQl4TdKd0mnvUSGVJ3cFFazlsOneOg/+vo1YVCOWYEA/uMvlpKS4wnnTP/9x4YxTZwwaT1hbW9vq8Xiiup59KHUymSQaS+D1uJk1exYKKu3trVSUVfPY43O46aZbKS0pXvfNDSBadF2npzfM36+9ir333I+GppWMqhlDZ1cHxx83FYDi4qKs8sFX1Tey445TuO3224nFw6SSKVwuZ9YbTJOpJD6fNzx27NjGwV53wfkXXvfXv/35D0UFpU632zOg7zuZgnDYwc0XtLPdT5KwjNyNxPyuINWho8dWoroBPo9lp6Ck8vC+UgjRJYKn3vbi9mZOP0k/8UkefsRhz8oZSSIFuESykbDLLjsv2HKLrb/s7OoY8PumCarD4PE3fLCS/GzKo4PDDYV+Cz1pl63auxVIkl8rjpVwwnkRzv15Nx2dLkxrYBHudrkoK6ly3nvfvaccftiR/1648NNJXy/9euzSJUtXfy39euxnn32+uebQdEXJ9tYpiMfiJBIJ2jq62GmnHbj5lluJxm3XhtcT4Ne/Pp/33/+IUTVVWfnBu9J+8NlzHqKkqJS6+pXUVo3h3ffe4pKLLyMY8OPIyg8Obe2dnHXW6UybeiLtXS2IYXz4iqKgaQ79s88+33zpd87V10u/Hvv554s2PfaY42bdfMs/zy8pKnd6vd51xTf2A6a2difTD+rmvEt6oS5PrCd9B5iCtm57vCQNYS98PWb+taE3gTL41xteWlqdFAUyf4hdXZ2Mrh1Xf+ihh7wmZyTJxoomT4FkY+SInx72zBeLP9tWUQTmALuESgoNvvrWxUtvuzn4uLhdkcsnYWoA3nQ3TNM+sK5eBeLYHfryQRwIsKIgOuCWaztZ1qAx90M/1ZXJfuG3pgh3ODSqKkY5n5/7zFFvvP7GUS6Xax0RK4TA7Xan7RrZvAWNWCxGIpHA4XDQ1t7JOeeeybvvvssjj85mdO146up7mT5tGvM/mU91dSVNTc2oqpr5pt2XDz66lvvuv58jjzqCcNoPfv0Nf2fXXXfl5784kpV1Dahq5kErhCAajRKP+7njrpl8+ulCPl/0KbXVY4b0pAMUFhYSiUQm7bv3/ovXOU8IUnqK3kg3leW1qIoyYFVeKBaNTS723DrCQzd3QC9Y4fQYzJcSVzL9dAkLMwmFfhPVTd4JcOEG2uCeuX4QJkIMnHOuKApJPc6hPzlkrpyJJBszsgIu2Sg5+pdH/wtIxuMD91Xp61h330t+0EHk25ViAi4oSTfjQbPsGMJYni3L1bSXGHj+3lZ22jxGY7MToaxbCbdFpEVVRS0OhwNd1zEMc40vA8MwME0zq5g+exxpRNMCXNM0otEoiWSKu+65k4kTbD/4mNpN+HbZ15xy0qk4HRp+vy+rfPDGplZ+euThXHbp7+lO+8FV4eCUU05m+Yo6xoyuySofvLmlBZ/XwwMPPkhZaTk9PaHsBJcQmObq87LmudINHVVVqaqoRVEE5gAlbVW1aGhyMWlMnJfvbwUXWC15JL7T448Ydsa+ACxh20+85JcH3ASq4eN3nbyzwENJiZ7RfpLuRJz81a+OfUTORBIpwCWSjYztt5+yaMftd5nX2dU+oJgyLQgGdZ5910v9xypUkl+bMU3ACeVFJiBwOiy6wwrRqMgvAYS9oLDqAR+8+XAzO24Wo6HJaQfeZNDRHo8Hn8+Hz+dd48uH1+tFCJG1T1rVVGLRCIlEAlVV0xsgm/H7vDz8yMOoikZbewuVZTU89e9/ccP1N1FSXDSkwLf94Cl6QmGuvuZv7LP3/jQ0raS2ZjQ9oS6mT50OQElWfnCNzq4eNt1sUzYZP5FwJKtQEyzLQgiB1+sd8Fx5PJ41FjZrvnd702V9o5NJY+K892gz7jILayX590xWBStmp6AomgUIOwPcRV7FEAq7wM/tzwUAkTH7GwGdXe1sNWmbL/fZd2/Zfl4iBbhEsjFy/NRfPWxhkMlbEvBZxKIatz8bAF9+OVAsC3BAWTomzKFBb0Sxq+D5aEzT7Gxid4nF+483sffkCE3NTgwTlA34waqqSjyeIBqN9ttK7IY4jey4wxT+cdPNRONhLCx83iAXX/Jr3nnnfWqz9YN3pfPBZz1IcVEpq+pX9PvBf/PrSwgEfFn5wR0OB01NTXR0dOBybrjsTUXYUXwNTU522DTOR/9qoqDWxFpO3o673qjd5MrpsD+DiiLD7jibLwt6C6iA5vkqj73qwx/UybTmU4SCYab4+S9+/qScgSRSgEskGylTpx4/x+8t6A6Fegb8vmmC26Nz3wt+YosFFJN3kYQlBfZMqSkWoZiwfeCOPP3ANbBWgOqHNx5pYdohIbpDKvoGrETaAjxOJBJBc6x9YtvaOznvvLM47lfTaWlrpKS4FIBpx0+ls7ObmpqqLPPB6xk1qoYHH3oIE4NwJExRYSn/uOl6nnji31RlkQ+uaRqRSIRYLIambTglbFrQ0urgqN3DfPRkE75yC+tb8nc3kgadvQq90dWRfGVFhj0W8+ReIgACcMvTfmJRzY5YzEA4HEZTXdETT5z+gJyBJFKASyQbKWXlZd0/PfKnT4ejPWRKtSguMGlpdXLfs34ozzMBbkBJ0AAsVBXCUYXOfBbgfSJ8FeCHWVe0U1ZoEIpsuNugqqrEYjFbgK+xIbJvA2QimeLue+5k04lb9PvBV65azqknz8ChqQT8/iHFs+0Hb+Hwww/l8sv+j+5QB16PF1VxMOPUU1m+fOWQ+eAOh4NIJEI8Hht0A+gPpbVd44TDevn3Y60Il70gyusoAAd09aqEogqaau8xyKs29BZQCr2fK9zxnwAer54xwUZRFHp6OznowANfGb/J+Ho5A0mkAJdINmJOO/3Uu4FkemPQwJrNYXDzvwOwAkRBHh28CaVBE/q6ROqC1i41/zzgA4hwuiEUEjid1gatRPYJ8HA4vI6Fqa8hjs/n6c8Hb2tvobK8hqefeZJrrrme4uJClCEEcX8+eKiXq67+K/vucwANTXX9fvDjj5uKZUFJSXFGMa+pgkg4QjS6YQW4YSgcvHMM/GA1kv85XA67wVU8Kug7rSVBM28W8sICSmDmU346u5wUF5gZDy1tqUqecebpM+XMI5FIAS7ZyNlnn73f227yDgvbO1oG3PhmWVBWbLB0uZuHnvZBFflTvUpBUcDE7zPTnk1BU4e6cdwVBKR0gWkO2f/mh91gFQWTFMmEnbZTXFK81ld5eRmRWIKddtqeOY8+SjQexjRNfN4gl19+Ca+99ia11ZUUFRWt87NrfpWWlSIUW+HNfXEuW2y+JY1N9VRXjOKDD9/lwvN/Q8Dvo7KqiuLidX8ewDBNovHIBhXgYNHWpUKYjSMEV4WWDhUse6ypLovSgjxpQ58W36klgpueDOJ0Z268I4SgvaOVzSZOWvrTI494Uc48EonMAZdIOPe8s285dcYp91oWzoEnD1A0g6seKeCEX0QQwXRWcR4I8OKgSdBj0RO1VXdbt2q3oxf541H9UXW+ECiKwpIlS2hvb6epqWWd15iWhcfj5rDDDuWYXx7Hk0/+i6rKGiLREDNOPY1/P/0EgWCQSDgypB4yDINJW2zOZZdfzhmnn4Zu6BQGS7j51n+w1TZb8dOfHk5ra9s6P1tVVcFXixenE0pkXWZ9LvSaulRAoBtQHDDt5KFkHhyaBZTDrXf6aWpxUF2ZyizAsVvPp584SiQSQFhylpVIqKkavbK9o310aUnpgIkRFtDc4uTB37dwwoURrC/JeauG8EOyE7Y7rZqlDRp6XOWso3u4/e+d0JJH3QgHOvYC6FilsMPpVbR0qRT6N9zB9sX1OZ2OQVtz+/0+XC43LS3NKIodWdje3o7H46G4uIhUKpuyqR11V1xcTGdnJ/F4HKfTSTjcSyKRpLKyAsMwB1xkplIpTNPKOuP8+9DU4uCmX3dwwUUh2/+d14svoAYu/WMh1z5UhNNjMLZS55O7m/CWWVi9OXxwFohSiLUKxv6ihp6wQkmhmXF89/T04HA62lfWLRtVUFAQlzOORCIr4BIJAGeedcbMP/7p/67OlPGsCrs9/V9mFXLCURFEMVjd5HY2YQqcQagoNvhymZP+dvQJ8itz8UdGVVVi0Rjd3T0og2QednZ24Xa76GvZbpomxcXFhMNhmhqbEVnmJVqWRVdXF36/H03TMAwDn8+PqsZpbm4d8D2YpoXb5cLr8w656VOSrQK3r7GObnulnkwKioMmXp+V8xYUkd58eeM/ArS2O6mpSmaMHlQVlWi8lwvPuOg+Kb4lEinAJZK1OPucM2+99u/XXtrd3V1YUFCwjgg3LagoMfi2zsXNswOc/3+90JXjQlUHiqC8yOgrnNIRUiGavjMYclysKWoHUlhrFoszPU00DAOny4nTlV2+dl/0YN/v83q93/s99/0OwzBwOBwUFDiy+tvf91g3ZPU891ZeQBxau9Ndaox0Ex4fdsfZXMUEKiG0UOG6xwrs5JNBHqT3hHpwOT3hiy/5zXVyUEgkUoBLJGtRUlISPvOsM2+//oZrf1dYWIRlDSxE3B6dv8wq5JSjwvirLazWHBbh6WY85YV2N0zVYdDeo2BEQA1iV8I3dg2lqiSTSVrbm9b5ns8TpLi4BNO0W7E3tzbk7XnwewsoKioe9Fg9Lj+lpWXoekoOHOxrix5o6lARDgsrpdgbMN3Ym1BzFKEAQfjTPQX09DgGr36rKr2Rbk479cyHamqq2+WgkEikAJdshIRCIfc3X38zYcr2UxYN9P3fXnrx32+79bZze3q6gsHgulVwy4KSQpOGJid/uaeAa2/qRrTmcKJYuh19XzdMt9OOTGvvUakokeVvgN5QL6VlpVxy6SX4fD7i8TgCKCgI8sQTT/Hmm6/jdLjx+Xz87W9XU1ZaSjgSwTLN3FyYWSAUpb+SLYSgIBjg8cef4O2337SP1e/jyr9dTUlpKdFoFIDCgiDPPT+Xl158gWCgUA6ctADvDCm09Si4nBbxVHqxm8tdME1gDCx/S+OmJ4IEC1KD7hXp7e1FoCYv+91vr870mk8++WTS6NGj60pKSsJy0EikAJdI8hBVVfVjjzn+X26vM3rMMcc+tv/++7622267zev7fllZWejss8++/YZ/XPebgoIi50BVcMuCYDDFDY8VcOaRYcbvrMMKcnJDpoW9UawyLbadDov2HpXGDpWKSVKAA0QiEcaMHc3FF/96ne8tX76SuS88i+myBfkFF16A3+fJy/PwzTfLePGl5+1jLSzggl9fiM/rXus13T0hnnrqX1KA9+GEth6VnrCCS7OIk7Z7OXI3YUg4AQG/mVkIhkLQZ5DJtaSqKj29ncmTT5rxwPjx49ZqvPPRRx9t+9qrr+/3+L8e/2VLU2v1oi8/20IOGIkU4BJJnuLz+fRDDj147q233fybRYs+n/LHP6rJHaZMWbD/Afu/cuihh7yw9z57v3f9jdde/vzc53+yYvmKbYqKigcW4H6TUEjj3JuKmftIK8IDVq7GihlQW2YAJooCiahCU5fKdg45XvpEhGEYLF9RR0lJCaFQCCEENdWV9PT0AHZsn2VZLF++nE022YTOzs68OX5FUaiuqhjwWMePH99/rLU1VXl13OtNgHcr9IQVioMmYFFTZuRu9dsAJsBbj7t4+vUApSWpjOIboKOzg7Fjxq+47/67zwB45513d3rxhRcPeeWVVw+c9/H8HQwr6QaYevz0B4qKiqJywEg2NmTgq2Sj4oAD9n8VoKqiltLiUue8BfN3+fu11/zfPvvu+/o2W287/x83/vPc7bbdbqE1SLcdwxCUlaZ44T0/z83xwDhyd8NiCqqKdVxeCyPdjGej6IYpkWzw1Ru0dKlYurA1t2pRW6rnZgKKBaIIaIWz/lkCwsI9xJ5i09TZbtspC2+9+bYzt99uxw/32nPvt6+86m9//vCjD/YoLCx0V1eOAuCggw98SQ4WycaIrIBLNip23mWnDwoCxe29od7SQDBAVUU1QghSyZRz0aIvp/zmogunlBSVU15aiW5knimdDlBUg7NvLuHQ/etRy8Fqy8ElbRJKC02K/CbhmP3mmzvs/wrypmO2RPKjCfC+JjzBgElZYW424REWUA3/uCLAl9+6qapMYgyRVllWWsnbb799zL//88QxoFJaXIrT6ezfWxMJR/B6At177bnnW3KwSDZGZAVcslFRWVnZueNOO34UjvX0/5tlWWgOjcqKCirLa3A4HIOKbwDThKpyg1VNTi65vhBKQOTicjYJ5QUmxUGTeMreeLeyxSGzwCWSHyJYBaBDfVs6A1wXFPtN2wOeawLcAEZDy4cqv7unGK9Pz+rWYBg6mqZRWV5DVUUVDodjrY3tPeEupmy33cKx48Y2yhEjkQJcItkI2G23Xd+3J0kxwMQpss4ytiwoLEzxj8eLWPCs07ai5Nrj5RQ4/RZlhQZ6AsCioU2xs8ClDUUi+f4zaxzqWuxVeSIpKCkwKQ6YkEspjRYIj30vOOPaYuJxleICI+tNpJnup/a/WWy/w/bz5GCRSAEukWwk7LWX/chT13+YWrYs8HstwGL6laXQDqIMyKVGgjrgh4oiEywBmmV7wHux49LyGCFA9o2RbBA0IGxngIOFlRJ29TtAbglwExgHTz/o4T9vBigrTWIYP/yi6eu2uudee7wpB4tECnCJZCNhl113fq+mcnRdT0/oB/8uw4DqqhRfLnNz+TWFUJ5jVhQT8MKYihQgcLssWrtVekJK/gpwy77zFRebKIqF7Lz+v6UoYIIrxxaq30OA6732hmbVZTe6qik17C6YubJh2wBRDbGlgtP/UYrmMHCup3tCb2+YooLS1j333OMdeUVIpACXSDYSfD6fvv0OU+YlUpH1JOgEhYUprnm4iA+ecsEmuTPJWpYtFkZX2G/YpVl0hBSau1RbJOWh+BYKUA5PvOqlvtmRfooh+V99AJ996wAFhJv83eXrhOZuuwmPJ50WMrYylTsLDyv9+fjgrL8V09bhoKJUX2+L1Uish223nbywvLy8W14TEinAJZKNiL322et1IGu/91Ai1u+1QFgce0UZ+ioQVeRUpau61AAsNA1CvQqNHQo481OAMxHe+beLX/6uHM1h4XFKAf6/orRE54aHC5h9kw82SS+G8vH0u6GlU6UzpODU7AOsKbO7o+bE4ZrAeJg728ODLxRQWpLEstaPX6vvnrvHnru/La8IiRTgEslGhv3oUySTyaEjCXQDzCFmTcOAmkqduiYnJ19eCn4Q3hwRFzpUlxioTst+v6bC8iZH/llQdBDjYeXHKgeeVwEqFAeNIePUJOtRlzrB4zWZ/tdy3n7SBRPITyuKA+paVFJxBUWxFW1NiZEbm7QNELUQXiw48WrbeuJ2Dt2907JAz8IfrusGQHKfffd5Q14REinAJZKNjJ122nHh5ptOWtrd3TXo6zTVAgQtrRpNLRrRhLA372WYgMpKk8z+b5BZt/lgfI6cjARUlegUBU2SaYGwslkDM482Kab9rHobHHBGJfGEyqiKVFaCQbIePwYTSgsNUCwOPb+C5s8URC6mB2Uxsy5rctCXAR4ImoyuSNnxniMZC4QfcMGJfyilvctBZZmecZEqBMSTgqYWjeZWB4YJmja4Uu/u7mLc6Al1++23r/R/S6QAl0g2Rvbee883dDOZ0YZiWdDWoXHhL0PcfX07++8awzAFjc0OGls0wjHRPwn1vd7lAI9X54Sry1jymgOxSQ6IizhUFxtUFBrEErYnoL5NzZ8s8D5R4YVpF5XyTb2Lmiopvn8sdEMwqjJFJK7y0/MqIAqilLyphPdlgK9qtXM8IwlBVYnB6DID4jlwAGPhvlv8PPVmgPKyJOYa10nfvS4St0V3Y7ODeFKw904xbrumnf+b3kNHp5bxiaEQgqQeY9fddnlPXgkSKcAlko2U/dNt6a0Ms4UQEE8oNHUozLgozCsPtPDhvU3c9Nt2Dt07iqZBU4uDxmYHPWH7UjKtdIXPhJ9cWI7RDKKGke0HT4KjGMZUptAT9gzb0K5ChPzolWsBo+Gem3089lqQ8rJk1jnGkg0nwqsrU3z8lZeL/lRopwfli+VJAaKwqk0DLFJxQXWJgafQGtlNeNIWrWVvapx6XSker45DW70ID0UUGpsdNLU4EAIO3D3G9b/p4IN7m3jj/hbOvrSX7rBCNKaiDLG23WffvV+XV4FkY0e2opdsxAJ8v1eKC8tbe0Kh8oKC4ICv8fh0Hn3Vx9/m9lAw0WTS5BST9kxxQXcvy5dqvPKxm5c/9vD+py4ammwF4fYYVFXqLGtwcsyFZTz5cBuiEKyeEbrkTWeB20koAtVl0NiuYvSAGiQnW2f3Y4AYB9++pXHa9aV4fbaokNGDI4OioiQ3PlbEEXvE2OeXCVhC7jeAcoHVCSuaNITDzgCvLk1ngHeO4Ouk0n5/P724HEwoLjDp7FGIRe0PpKI8xUG7xjhgxzgH7hhj4mY6FGP3DEhB8nXBAy/6cLozP/ILhyN43YHQIYcc/KIc/ZKNHVkBl2y0FBcXh3fbbZf3ovFQRhtKod+ivcPB3Hke8IPVAtbXQDeMm6hz2llh/nV7G/MfaGL2Va1M+2kvFaUGTc322vaptwr5v98VQi0IFyNzU6Zli4ZRZXaZ3ue2qG/TqGvVwJ3DH7AFImAvIE76awmYCsUFhhTfI+XjscDnsdODTryq1E4PyrVGVhkEeFO7SkO7itdt7yEZVW7Y15I5Qq8TH1AMJ19SwhfLfICgoUmjtMjkV4f18sBfWpn/QBNPzWzj7PN6mbiFDiH7Xmg1A0F47RM3dQ0OioKZDzIU7mKHHXaYN2r0qGZ5BUg2dmQFXLJRc8ihB7/w3Nxnjsr0/T5d/vwHbo47IYJQbOFg6UAHdvdLFSpqDKZuHWHqcRG6Vii8+Ymblz5y8/L7Hq6cVY6lwJV/7Ea0gjXC7CgWICzYpEYHLFwatHUqfNukMW7HHN4dZwG1cN/1Pt5Z6KOifP108ZOsP1anB7m47IYirv9nF6Izx5MJ3bCqTaW9W6HQbxEBxlXpoDEyrU+aLb5/fU4RD7xYwvixEfbbIc5BO8XYd0qc0vEmeLCr9333r77LqG9DugX/ec8DKKjKwMepKPb+koMOOuAlOfIlEinAJRs5Bx184Iua6opGIzGvx7tuudeywO01eHWBh96lgkCNBd1rKnSwTOx/67JzjYtKTI46JspRv4yiN8B/3vbx2Ite5r3jZPspSegZgSciCZtUp9BcJoYFWAp1LWruRhGa9iP1ns8Fv76jGJdbR1Ol9WRErpMsCBakuOHRAmYcEWbzPVOwgtx9PuuEulYNI6kghAGKycTa1IhtQS8CsOBtJyvbNP51bQNH7BHFVWvZVqBOoHld0b0WQYh/I5j7oQenW8+4yIjF4gjU5OFHHPacHPUSibSgSDZyJk6cWLfbrrt+0N3bkTFyryhg0tzi4LkPvFBC5vKcSFfHQ2AtB1aC5oJfHBfh8VvamFBuP7YdkcRhdJlOeZFJPGmfiG/qHbY3NAc/V6HYwuCKuwoJhRyUFptSfI9kAe6zrRoXzSy0F0+53ARKwPIme/diUoeCoMmYCn3EJqBYPbBJhc5Tt7dx9NQILo8FdWAts79nmWS+CVhACbw2301dvXNQ+0lXdwc7TNlhweRtJ38pR71EIgW4RMJPDjv0ebAQYuDLoU+YP/W2ByK25SSbSdgCrEhajPdAYZE5cv2tcSgvMakqMYjFBWCxtN4BYXJvU5wJVMOqd1Vu/XeQQFAfcbYfydoYBpSUpJj7jp93nnXBaHLSCy4U+1paUmc/OorF7QjC2tIRHEFoQkGhCT1p0R1J1xhElserw7/f9gKgZlAUiqJgYbD/gfu/LEe7RCIFuEQCwFFHHfm0pjqj0Uh0wO9bFvj8Ov/92EPHYsXe+T+sWdl+hGvpjNxycgoogjEVOpYuEJplN+PpJuda0gsVcMHfZhegJ1UK/CYydXDk40mPsz88VADh9KblXEOzF9vfNmogTFIJhVFlBq7iERxBKOx701o2k2wpgNjXguc/8OD2GBntJ4l4AhDJo3525L/lSJdIpACXSADYbPPNlu20487zukIdGdNQCvwWPT0OnnjHC4WQd4ouHUW42agUIPB6LOrbVVra1dxKQrGAcmj4UOWBF/wEgikMWf3OCQzTroK/8bGXD15xQk0OXmduCHcI6ltVnB7bVjOhJgVBRqwH/HtjAqXw7PsemlocFA5iP+ns7mCrSZO/3HnnnRbKkS6RSAEukfRz5FFH/Hvo2d7kybe80J1HTUPW0K2osOkoWyW4nRatHSrLmjU7ASFHENgLiTueDZCMa2lvsSRn9KvT/hRv/k/Q3n+QazOUB1a0ajR0aPhc9tjbfEzKzgbPs6EoNCAMj7zms8VEhuq5oiiYls4RPz3sGTnCJZLVyBQUiQT42c+Peup3l//+6mg05vZ4Bk5DKSwyeGOBh6/na0zcVYcG8qNVex9JGF9tpzYIAaausHiFg11didw5hiDo38Csl304XIa9gewHYBgGqqoybuxo+9cHfP3fKygosJdlpokQgnHjx+H1uPDWVOXd9ZHNsRYXF//gv2OaEAjq/OdtL43zVaq3NqA5h64zNyytcxCPKAS8BmAxvlof2Z1wv++KvQzqF6q89KHH3mcxSPoJKMljjv3lY3KmkUikAJdI1mLixIl1e++191uvvfnKQV7vKKwBZhOf26K7S+WhV/38db9uBHnmRInBJpUpSouM/iSUxSs1uxIpcqCClxYFzzznZWWDk4qK1A/+fHw+H5FIhGuuuQ6f10c8EUcgKCgI8PHHH+Pz+nE63Oi6wY3X3UBJaSnRaDRvhoQQgoJggPnz5q9xrDo3XHcDJSUl/cdaWBDkrbfewuf1//A1lM+iocnBg//1cfluIURzblxnIv0/X6xwAIJkCgIFBpuPSkEsD2+aAXj8LR+xqEZ1ZXLA+4MQgs7udnbZcdePtpXpJxKJFOASyUD88thfPvbam68clOn7pgma0+Cx1738dUW33Vo6nEcnIAo1VQbjqg3mLXYCFt82OuxW0yq2T3wkCyAViMOjb9iJDJoA8wcqt0AwQG9vmMsv/+264twTpLi4DNM00HWdP13xh7y9NtY61pTOn/70f+u8xu30UVZWjq7/MLOzZYJQTZ5628vlDSF7D0IuPIRR7EXs1/W2P603orD1Jkk2qdYhkl/jQXiAJpjzqhehGhlXSPaeGpMjf3aE3HwpkUgBLpFkEOC//MUTl/72sut6enqKg8HggK8pKTT4ermLuW97+Mm0mC1O88WGkgTKYIvRST7+3I3qNPi20YHZAYp/5AtwCqH9C4VX5nnw+vUfLL5htQWlsrxmQHHRJzaFEAO+Jm8EVxbHuuZrfpAAB4oKDBZ85eKzTx1ss08KGnPgJLmANli80oHQTMyUYHyVjijGvk/kCxZQCe8/42L+F25KS/WMTyh6e8O4HJ7wccf96lE5w0gk667ZJRIJUFJaEjr0J4fMjcRCGdNQtPQV88B/fZDMwU1ig2ECHti01hZRQZ/FNw0aS1c5wD/C37tlC/DXP3XT1aVRsJ43Xwoh1vnK5jXr60tRFFKpFIl4AkVRUBT73+PxOIZhoCjKBv373+d8/BDcTgtTV3nuIw+4c2SN64WVjSrfNGgEfHb3mgm1uv2kTM+f20TfR33Pi35AweXIfM2Ewp3su+++b4wZO6YRiUQiBbhEkolp06bOApKGMfDuPdOyN4k9/56X+vkqlJM3RnArLcK3mZACLBwaRMMqX6x0gHeEiwIFSMJrn7jXEgm5K3IEhmHQ09NDU0s9jc2r6OnpwZ/eBGpZoKoqXq+Xto5WGptX0dTSQDgc6d8omdNjMT0Y313ktrPoc+FZrReW1Dvo7lbTaS6w9bgkqHm0V8QCSqFjocITb3rx+fWMHWb7POFTpx0/S84sEsm6SAuKRLIGhx9x2MvjxkxYUd9Qv2lpSemAr+nbJHbPC36u2KMnZzaJZUUUthyTIhA0SKQABIuWO/gFjOxNp26gCT5a7EKoZs5FvgkEuqHTG+ollgyn/01lzOgxbL7FnkzZfgqHHnoIH334MZde9luC/iKSyQQz75pJWWkJL774EgvmL2DpkqU0tzauMVaL8Pq8difCHDspbp/JJ9846V6uUDjGtIX4CJ9NF6+0N2DqBjjcBluPT+bXBkwLKILZr/gI9TioqUpmFOCdXR1UV46qO/roXzwhZxaJRApwiWRIjp963MNXXvXXPyuKgjnA7GKZ4HAZPPSSjz+e0oMSJH88nlEYW6Uzrkpn0TInYLLwayf0YG/EHKlxan5Y/qnG0nqNgH/k9zAXCFJ6inA4TCzRt5NXZcL4Tdhi0hZss802bL/D9kzachJjx47F5bSf83/zzTJ0PYVlQSwaYVTtKPbeew8OPvggesMRvv32Wz779DPmfTyPRYsW8eUXi2lubUj/foUCfyEerycnBHmB16SpWeOjpU4O2io+ogW4SG/A/ORru/QdjglGVxhsWpNfGzCFD2iAe1/wo2iZO18qikIiGeXnv5jxhNvjNpFIJFKASyRDcfIpJ913zTXXXB4OR9xe77pdaCzszZjLV7l44r9ejjkjagvUfDB0JUAph81Hp/hsiQvNZfJVnYNUKziKGLmpL15YuMxBOKRSUT4SDbf2BsVQqJdEylZkqnAwZuwYtthiC7bfYXu23XZbtt5ma8aOHYem2haSSDROV3cPeipFbU0VkYj9s0KAqmr09PQAUN/QhNPlYvMtJrHt5G044YRpRKIxli5dyqcLP2XB/PksmP8JS5d+vYYgFxQEivB4RqYgVxT7PS5a7uQgLT6yr5v0BswvljsRmkkypjCxJo63woJ8SaU0gWr47xwPny9xU16eyijA47E4QPKUU066X84oEokU4BJJVmyyyfj6Qw4+5MXnX3j2KJ9v4ExwWx9Z3P5cgGOOjSJcYOVBq2nLAOGHKZsmefy/gqDPYnmjxpJ6B1uNSo1IAd7ndl603AmIjB35/tfvKpVKEQ73Ek/aolnBwcSJE+wK92S7wr3FFpMYO3YMDk0FoDcSo62tHcMY/iIimUjQ3tbW//+dTieTJm3JdttO5qSTTqA71Mu333zLpwsXMm/efL74fBFfLl6zQq5SECjE43GPKEG+aLkDYnaV2RqptVQf1C1X+Tq9ATPU42DbiUkoAkL5cV8UDiAC/3za3pHtUAaO+RRC0NHdyu677v3edlO2WyRnFIlECnCJJGtmnHbK3c+/8OxPTMN0igEUnWlBSYnOmx97+PhNJzseloRl5EcV3IDJmyQBC4cKibjK/KVOttpvhK4wFCABK5pGxu1MVTXa2lpJpBJM3GQCk7acxPbbb8/kbSez9TbbMGbM6P5FQjgSo6Ojk1RKX+8bR5PJJG1tbViWhRACl8vF1ltvzfZTtuWUU06iNxxhyVdLWLhwIfPnL+CTBZ/wVVqQl5dV4dAcA1qw/reqz2J5k2bbTxyM3DxwPyz41kVPt0pFmUEIi+0mJEHJk/0hFlANX77h4Pl3fRQVZ475TK/bkjNOO/luOZNIJFKASyTD4qifHTV3k3ETl9XV1W1eVlY+YDXQTjoQ3PBkkEcPaUdoI7hCNxwisPXYFEVFBtG04Jm3xMWJemRkbsTUgDDUt6kj4t21d7Ry4EEHcvElv2HUqNGMGTsGNa24Q70RWlpaMYy1zfQbMrSkLxElkUjQ2tra/+8ul4tttp3MDjtMYcaMU+js6qaxsZHnn5vL9ddeRyyl43K5ftyP1mXS3KWS6BG4SqwRKcD7OmDO+8p+AhNPgc+vs/3EZN74v4Wwr7NbngmAqeB1ZU4/6exsp6ZqdONJJ584R84kEklmZAyhRJKBGafNuDtlJDJGupkmFBToPPmGj+UfaFBJfpS7wlAzxmDrcUl6wwoIi8+XOaATcI7A9+sAvQeaOlRU1/BXQLquk0qlBv3S9ewtIfFElL323ou9996LsvJyWlvbWFXfSH1DE6FQaB3x/WORSCRobWlNv7dmTNNiqy0nMeO0GbhcbhKJodWuEALTNIc8f8M9h/2LXAd09yq0hZSROfb6FoCdMH+p3T021KswaZzOJuP0/LCfWEA5tC9QmfWSf9DoQVVRSaRiTJs+dbacQSQSKcAlku8pwE+9x+8r6Ozu6c74Gr/XQk+q3PRUADx50hQzAZTBlM2SYCoEggaffuukYZkKwZEpwLvDCt1hBecwnun1NZDp6emhs7Nz0K/u7u7+n8mGzs5OAHp6ejAMY0TnctvvzSIejxNPplixYgWWZaEoShY/qxCPx4c8f31f2f7efm2rWkRigq6wMnKf1wagY4XC/KVOvH4Ty1Ds/O8yRq5lZjjjwwIK4OZ/+4mENQoDmRe5od5eHKoreuZZp8+UM4hEMvTaXSKRDEBpaUnoV7869tF77r3r7KLCogErl6ZpP25+YK6fP57QQ8lEE1rIaSVuWSBU2HkLWz34XNDcqvH+Vy6O3iUKbSPs+FTojSnEk4L0XsassDdJhrnt9luunLTlpHczRjoIQUtLy5izzzx3ZjQaxev1yosjTVtHM9OnTr/jlBmn3Dto+LoQdLR3lJ55xtl39vb2jvb5fNl9tOnPNhwbwQI8CAu+ddLWplFRbhANw46bJ8CdtqTl8qrcshfj4UWCmU8H8Hj1QaMHQ+FOjv75Mc+MHTtWdr6USKQAl0i+PxdccN4/77n3rhnRSNTpcg/shy0KmNQ3Obnx8SBXXtuNaMlxJ4oAemG3LRIEgnq/D/y9L1wcbUQRYoQdnwKJlCClC4TI/p0lEglUVeOYY4+5OhgMDOnWPeuMc2amUil5UaxBMplg8803X7LbbrvOy+b1F/3mt+G21jayFeCKAEOHeFKMSCErLHv8ffClC1BI6QYOl8HuWybs+MFc78hqASVwx60B2judgzbeiccTAMmLLv71dfLKkEiymrokEkkmttp6q6WHHnz4i509bRkfnZsmeLw6M/8TIPSpsB8957oXvBdGjzWYNDZFKKyAavLeIpdd3XeNsPcqwDDsZJrhRBCapoXP66a7q71qqNfW1dWNB4Zln9hY6OnpydqY5HZr8eFdGhZYoI/UBlBOoBPe/swNmPSEBZuOTrHl+FTu+78toBhSS+GmJwM4XYM33unoamHP3fd5Z5ddd1kgrwqJRApwieQHc+nll1wNJJOJZOZ5qsCkq9vBTf8KQnG6cpTLJIBK2G2rBBgKhQGTz751snyZBgX58bkKoWEZEUy9t1SO8g1PMtbttYyYWwh1+J/VSD2oALQvV5j/tQN/wMBIquy8RRKlhpxvQS8soALueCJAQ7OL0qLMAly3V0jJ31x84Q1ypEskUoBLJOuFvffe64Nddtr9o7bO5owVUMuyq+A3Pxkk/LmAcnK6Cm6lH63vvY3dgdDjsohFVF5d6IbACDs2ExyahaaSMZt4wJufqpGI9RKPdJXLUf4/EOCJnmAiHp6kqI7hSW8FnI6ReJEABfDGIjedHQ4CXnvw7TU5Dp4cjyRNW0+SSwTXPFqA02UMspAVtLY3M2nzrb866qgj58qRLpFIAS6RrDcuvcyugusZnoVbll0F7+h0cO3sAijKcfunAHpsH3hxcYpQ1D6aNxa6IWp3JRxJAtzrsnA5LEwz+7OuaQrhOPR0tYyXI3zDEw61l8bCnaha9nmChgkuh4XXZdqt0EfSJSIAA16d7wYgEhcEAjr7TY7b9pMcvgGIdPTgbY/6aWx2Dlr9tkwLyzKSv7304r/LUS6RSAEukaxXjvrZkXO3mjT5y9a2pkGr4F6fzk1PBOlaoEAFue0F74GyzUx22ypBpFfF5TF4+zMXsRXCroKPFHQo8Fp4XRapYXiFVVXBANpbV20mR/iGp6ttxdjuniROR/blbN0Ar9uyq8v6CDsgP6RWwKsL3DhcJqGQyo6TkozazLA7d+YqFlAKicWCvz9WgMs9VPW7hU3GbbrsxJNOkI13JBIpwCWS9c8f/vj7P1uYSWOQKnhR0KS3V+PKWUEoyPEEMh0ogAN3iAMKxUGTugYnry5wQ8kIWlykIBAwKS00SCSyP+N9GzYb6xbtJUf3hqex7outwilwOLL/jFK6wO8xKQ0akBxhIrUEPvjcxdfLnRQXGGAptmWrhJH1XoeJwBbg180K0tLmpGSw6rcFhplKXvLbi2TyiUQiBbhEsmE45thfPj1p862/amkbxAtugj+gc8uTBTS8r0INI+7R+bBm4gj8ZIcYTrdOLGkLp+fe94CxYdunD1eAUwA1pQYY2b8p+/2rLP1q0SQ5ujc8S776YktgWFntiaSgtMCkOGjan/NIEqkKPP+hB1AwTEA1OGznGCTBytWVtwlUQucChb8/UoDXp2dcaAshaGtvZVTN2Pozzjz9PjnCJRIpwCWSDYZdBTeShj6wqraAwoBBMqFy2Z2F4AKRy2n7nTBhS52dJyXo7lFxuQ1e+NBDahkjpyumAfigtlxn+M8cCln0xRJg5QQ5ujckMW3xoo92As/w9GBKUFNqIAoZWVVlH7DKXoyqDoPObpXJE5Nsv3USOnL3UxIKEIAr7i0gHNYoCg5e/daNRPJ3v7/sSjm+JRIpwCWSDcqvjjv2qS033/qr5rbGjFVwwxAUFaWY/UKAz15ywOi0SMxFEkA5HL5rDEyF4gLbhvLihx4oZUTYUCwLcMDEmuGbhF0eL18u7iW66o1j5ejegKTm7bDgkxWbohRlLwbT/7vp6JS92Bsp11C6O+Q781188bWLkiIDU1c5dOcYjMJuwJOLGMAoWPGWxq1PBQkWpLAybGpWFIXWtmbGjZmw4syzzpDVb4lECnCJZMNz1TVXXgpmMpXKLPh8bgsQ/PqOIkiCyNHu5ZawBcVRu0ZRnTrxtA3gsTd9kBpBaShJmLxJEhRzWE1bCnxQ1w0fvfvSKXJkbziWz3tlv4VfQUEw+8dBfWu7rcalQGPQTvf/S4SwVwdzXvcBit0ZUjE4Zs+obT/J0c9IpBtsXXh7EZahEPRZGY/FNEwMM5X80xV/+LMc3RKJFOASyf+Enx55xIs77bDrvNb2QargJpSXpXjtIx/PPOqBMeRuFbwdNp2is892Cbo6NfxBneff89DxuTJiquBEYOuxKarLdXpj2d/WNM0C/LzyyivjIeKWo3vD8PYbT/0iaql2nGCWJFIC1Wmw3SbJkdXUphjCXyo8+YYXr0+nvVNjl60TbLdjElrJzZ3XBjAW3nzaxX/eCFBamsLIcL9SFIWm1kY233TLpTL5RCKRAlwi+Z9yzd+vupRBumMCODRQVJMLby/GqgMxkpJDhoGVsEXHtAPCgEKBz6K728EDL/mhcIR0/YxA4SiTrcamiEeyv61ZFgi1hJdfa4PIo/8nR/aG4L0dnp27aCuoGNbG3Z5ewaSxKSZPTI6ctu4mUAKPv+6htd1JUdAAU+GYvaN27GgiBz8eC0SBvdA+/7ZiwMQ9SFKk/eTPTP7dvgdKJBIpwCWS/x377rfPOwcf8JNX2jqbUdWBYx1MEyrLDJbXu7j6riBU5miLesWenH+5b5Sy0iSdPQqqw+CeuX5YxcjIBE/ZwmjPyQlAGZbQKy6y+Hg5fPzMXb+XI3v90z7v1nNe/gCnL+DM2kYiBBgplSmbJhEjqK278AJtcOfzAVBMQhEFfyBlL057cjP9RFhALcy8189nSz1UVeh2qssAqKrK/7N31nFSlW0f/97nTO/sbMds0C0GoYCCWNiFGNjdnYCKhV3YjYoY2NiBiYJICEp3bPfO7sTOzIn3j3MWeRXYAZTd9Tnfz2dfnxdmh4k7fvd1X9fvqqwuZd/Bw2Yfe/yxVtdLCwtLgFtY7HomPv7w1UAsGAxu83Fer8Kdk9Monim334LMekjqo3PaISEiYRvZGSrL1zj58Es35NHqVou6KcIP3qsJUIlvRz2my6YBebw0ZQ4w82hrZP+TFGe/PvmdkxuUdFKSEv9SmoX6wf2bwNlG2rqrQD788K2LOX+4yclSaGywccL+YbL20qC6HX49mvGeauZL3PRCOm6Psskff0tEwhGA2CMTH7rWGtsWFpYAt7BoFXr36b36gvMufrm+oWarUXBdh1SfSiwqcelD6SCBcLe/96rrQBQuO7oRJI1oTAA6D7yTAnUgktrAi6yBffaM0rtbjNpA4mbTmg5JXidTp0Pd3NunWSP7H6T8nluee1v12Byp2/VrgZAgNTXOkXtHjK6SbSCyLNxACCa8mQLoZo60zjXHN4JoI4eE7X1PdsAN105MIxiykZGqom3llkKWbdTUVzJq5MkfDB486DdrcFtYWALcwqLVuO/+u8d4XN6G2toaxFbyHlRVkJUZ59Ofk/nkDTd0pv1FwQVQBj2GKpx4UJDaWhv+XIVf//Dw8Qduw36ttd9TCOROcNx+EdS4jLQdq1tqcpwGxc8Tj38rw89WFPwfoTTz7aefu2RFVRqZabHtSj8JB20cPCBKRm+tbbR1V4EO8MOnTr771UNOtkJ1tZ3D9gvT76AYlND+ii9VoAvMeN/JlC99ZKTHUbfSyEoIQX2gDpvsCJs3fxYWFpYAt7BoPTKzMhsm3D3hlnBTMLYtgeG0g2RTuXhiBrE1IHJodx0ydQWQ4bbTA4BOLA5CVrnxhTQoBZFOqxaZ6gBROP3AEMgq4e1oS6/r4Pa4eOI9aJx78SfWyP4HKLv02bsn4ZBs6cjbIU6bI7CnHxSEJNBb+2DXXKRYDze+mAbomw4Tt44OgAv09tZ6XgORBZTCeQ9mgtBxO/VtnL8FwVAgNnbsuAcKCwsrrcFtYWEJcAuLVue66695qmf3PivLKoq3moqiauDPUimrdHDNA+mGe4i9Ha4WRbD7IXFGHxqkpsZBfo7CyvUu7n/WB/5WDgIKoBL6Dopz4IAIdbXyNvNZ/yrA01Pi1EY7MP6OpcDTE62RvTN8s/+k+z4+dnGZn+yM6FbTGv72FQqorpPp1jHKcQdGoJxWjywLHSiE51/0Mm+Jh3x/nMoqO4cNCTH0qCgUt7+dVMhAFtzyaCpripzk5W698FKSJMory8j3F5ZOuPuOu6yxbWFhCXALizbD0888cTnosaam6LZFXlqcZz9MYeYHTuhCu0tF0RVAgfsvqUfIKoGgjM+nMO7FdFZ9Z2v19Bo9CqTBpUcZlonqdkTkdR1SUgSPf+5lxZtXXAOV2dbI3jEaZ532xo0vyA6X27Vd0W8hQInJnHNYCKkr0NjKb0QFOkLJLJkrn8wgKUkhFJEAnYmX1xkNgtqb9aACdIbFX9i5d0oqKSnxbd5cxeNxVC0ee+LJx6+0RraFhSXALSzaFAcfcvCME084+YPq2nJk2bZVgedx6yB0zrovE70ERDbtKxVFAoqh434K95xXR2ODnZRkFTTBaXdkQhBEKq2XiiIBZTDqiDDdOzVRVbN9UfDkJBXI4dzbgPKjKv78W81aKxMldvorV4ytyq6LdiQzLZ549Buoa5BITo5zyXGNUN/Ktn46iGRjfp59VwbxmERGmkp9vZ2bTqun94g4bGxnu6gGIhOohdPuygQgOUnfan6+YTtYxqGHHPHNCaNGfmoNbgsLS4BbWLQ5nnnuqYtdDnewtrZ66x0yVcjPVVhb5OTqe9Igo/2lougAFTDu2gb27BGmqMROQV6MeUuTePAxHxS0btaA3gBSJxg3OoCqyAkLwObvJzcnyi9rOvDgDfOAsZ8Y79mhtd8m47tkRJi8csan97x52ms/5TkyMxS07bgNkWSdcMjGxcc0ktFfa/2ukjrQAV582su3c5PJ98fZWGync0GU+26oh+r253wiZCAXbn8ohUWrPeTlbr3jpRCCQKAeELHnXnj6QmucW1hYAtzCok2SlZXV8PAjj1wfbgrGVHXrO7OuQ1panCffT+WHqU7oSvtKRRGg1wEp8Ppt1YCgMSTh88UY83w6y6fbWzcVRQZK4dyTQvTo3ER59fY5osgCfD6JMW9kMfeZB46Gn47VPHmSocgsEf73Aa2YhQ8L+lZ8dt6k0fcmOxxOFy6HlvCnJQTU1Mv4fHHGnd0Aja38SasgOkLRTJnLHs8gKSlOpEkAgjfHVyP5Qa9uZzuoAnSB3z62c9fkNFJSYts84eg6NIYCsbvvumd8586dS62BbmFhCXALizbL5Vdc+sLeAwbPK68s3mYqSpJLR0g6p03IIrpWIPLamQiXgXXQ97A4d19QQyBgJyVZA11wehtIRdEDQAHce24duiqjbMdnq+mQ4o2D7OPomzyw4sCPOrveXxWXu1gDfAvEXf2M/7FyyMyjL8cRUnLIyYiibmd0OBK2M3Z0gPT+WusWX26eejIhEyVupJ7U1tm54dQ6Bp8QhXXmHGgvaCByQS+Hk24zSht8Sdo2U0/KKoro06vv8lvGj3vQGuUWFpYAt7Bo80x5Y/LpQCzQUL91b3AN8nMUyqocnH1zBnjMZjbtKMCqa0AZ3HJ9A/17RSgqcVCQF+O35W4emOiDfLarJfw/fkAoglGnRti/f4iKSjvydggmRRUU5DRRGcrjxHN06maeiD+1Bk34rAH+/0gi1zHHBsOnn3le1DVvQ1fycptQ1MS/eFmC0kobHfObuOnCBqho3dxvYaaePP+Ul+/nJW1KPenWIcqDN9VDlVmM3G4mKggnRnHy7emsLXaS71e2+h0JITC7+8Zefe2VM60xbmFhCXALi3ZBz5491t915923Nwbrt+kNrumQlRXj7e98vPa0x0jbaE8ZDpKZiuKDKbdVA7qZihJn7PPpLP+6dVNR9BDgghdvrAV0GoLSdh0IVFWQ52/i/V87cvQNXux6DW6nbA3w/4cfT80jN786bsYhr8/s4sjO2j5DbAE0xQBN4tlrapE7gF5D60W/VaATbJxpM1NPFCLR5tSTKoQf9EraXeElXeGjl908/3EqGenxbTZFEgjqG2pi1159w2N77z3wD2uMW1hYAtzCot0w/rZb7t+j716LyyqKtpmK4rCB26Nw7gNZrPnRhuiCkavZXjBTUfqMiHPvRbUEAnZ8XiP34JQ7MqHebNCjtdJr2wA9Do5z53l1NDTYt/98o4M/O86cVRkUV7txOVVrcG9GVmaUR9/L4fInCshIj2OX9YQ7XoJReFld4+C0Qxs44rQIrKf1UjuaG+7E4YzbM9AUM/Wk1s5Np9Wx93ExWAPY2tEXpIDoDGVzZUbfmY3DqeJ2btv1pKR8I1279Fj76GMPjbFGuIWFJcAtLNodU99+6xQgFgjUb9UVRdMgM1VFUwXHXp9tCNYc2lU+eHMqyrjrGxjQO0JxqYPC/Dh/rHRzx0MpRoMeuRVfWwXcdkOAvXqEKSu3Y5MTV4jNQiUrVcVu09E0a1xvjtOuU1rrxOkUuJz6djnOyDKUlNvISI3z/PgaCLeup7YQQAFMnJjMTwuTyM+LsbHYTvcOUR4YU2+knrSn81ez5WAURt2QRVOTRE7G1hvuGKknjQCxN9+ccqo1ui0sLAFuYdEu6d2n1+oH7n9oTGOofpuuKIoqyPMrLF3n4qKx6ZAGwkP7SUdpTkVJgjdurwJ06htk0lLj3PlqOnOmOQynF6WVXlsNkAzvP1CFJGtU1dmQrZXvH0HVwOvWcDm273AiCWgMCXRN4t0JlXi76+ilrbgjmQ4hS7+2c91TGfh8CuGwBAjeuqMKstqZ60lz3ncW3HhrKr8s8eDPjW87N1+H+oba2Lgxt9y/z6B9Flqj28LCEuAWFu2Wm8bc8Nh+Q4bN2pYrSvPml5kR48VPU3n1iSSjS2Z7wkxF6XmIwsQramhstOHxaIDOSeOzUEtA+GmdyL4N9HXQZZjC67dW0RSRCUdFwg16LP5ZhABFg0DAwZ3n1XLg6CisbcXdSDMbYtXBKeOzAEhJVqmrd3Db2bUMODbW/lxPdKAbfPCSm4ffTic9Lb7NtHqbbKO0oog9d+/3x7333327NUotLCwBbmHR7vnm268P7ty56/Lauuqt75c6uBzg8Sice28Wv39hR3SnfaWiABTDNdc2Mrx/iJJSBx0K4mwsc3LhrRnga8XIvgDWwqmXhrn+lFpqa+2oeiu6tPxPC3CdikoHx+7XwG23BaDUdBURrTNohQPIgGvvSGPxGhcdCuIUlTjYq2eYO8cEoKydpZ4oILrBmhk2Tr49G6dLxePadm5+XaAOf27exm++nX6wNUItLCwBbmHxn8Dldmnnn3f+K+FIEH0bu6CqQUaqsdMfcXUOwbUC0YH2U5QpTP9tG7x5dzV2h0ZljY2crBivfJHCW896jMh+KwlwPQJUwcP313PU4CDlFQ5LgO9iZFmnpMxB305NfPhMFcTN9KVWjH7TDT6b7OKxd9PIzIhTUy+D0Hn3nirwmSlM7WWnVEAUQLwMDr0iB1URZKcr2/Rk13WdYCjAmWec9XpmVkaDNUotLCwBbmHRblmwYGGfJx5/4pKTTjz5jV49d1v08suvnJubnd/y/qkKCvLilNXYOeqSbGNDzab9RMJl0DdA3t4qr99ipHvoGE4vZ9xjOr20Vj64bIopBT5+vpIB3SOUlDmQZau75a7AJusUlzrISVX47tUKpDTQS2g9VxHTIaRivsQpd2RjdxiFtqGgjReur6bbAYqRetJeXE80EBmAHU64Ipu1JU7y/fEWPdmFEORm5/Pe+++f0KtHn0UnjDzx7ccmPn7Z/Pnz+1qj1sLiX1wTrY/AwuKfoaamxvvmm2+d9v57H5z0y6xf9o0pTR4Au+zGl5yMy+1CS6BSTVUF/tw4M/5I4rIb0nnmhVpEE+jBdnJkFsA6OPmiMF/+GuCVz1PoUBBlY7GDY6/LZsknpYafcjm7Pq/WZog+qTP8+Ho5/U/IY6XZQEhVrXD4vym+i0odJLtVZr5eRlZPFX1lK+5AqnmwjcAx1+QQCst0LIyxocjJyGGNXHh1EDa0I1t+HYQbyIFx16Ty6S9ecrNj6Al2NJJlmUB9Q6/GxgZWrFrW98Np758sS46mIUMGzxo1auT7p51++pvZ2Vn11ki2sPjnsCLgFhY7SVlZWfqYm8ZO2L3vnkuuuurK53+c8f0hXm+yJy+3EH9OAZmZGTicjoTE9+YaNjMjzrMfpfL4PcnQAYSd9qEImtM9AvDSPTV0LzTEd4eCGEvXuzjj2kzwgvDROv7gZlFmUp7OrKlldMuLUVzqQJJ0LAn+b4lvO16Xyuw3yug6UEFfResVNWpm19kMuPymdOYuc1OYH2NDsZ387BhvPFQNUfPA2x4GhA5CArrAK48lcf+b6aSnx5ElEvZk1zQNh8NORkYG/pwC8nILSfGlun6eOeOga6+79uk9+u656Lrrrr+vqKgo2xrRFhaWALewaHUeeODBa/rutseSBx964Naa6toOebmF5OUW4nQ6t5nv3eKeqoPLoZOcrHDNE5l8+qobeph6oD2IcNmIcEs58OmjFSB0qmpkcnNivPFNCo/cmwwdW/FQYQN9DWR01pj3Xhm7dYhSUuYEYRVm/qPDwIx8ZySrzH27lD77xY3Id2t9xjoIG9AZJj3q5ZmPUsnOilHXIIMu+OjBStyddPRi2o/riQ70hB/fdXLevdl4khQ82+nJ/vf1R8fpdGCsZx2orw8UTJz46Njd++655O4Jd99kjWwLC0uAW1i0Cr/N/63v3gP3mTl27JgHGhuCuQX+jmRmZqLr+k4J781RNUhJ1rA7NY65IZv5X9ihB60TNd4JkdvjQIU3bqskErGhKJCaEuOGpzP57GU3dG/l17caUgo05nxQxrA9wpSWO1BULIvCnUSYB5niUidd/TF++6CUXoMU9BWm+G5FAU4P+PEdFxc8kEVysoIQEGy08cz1VQw4OgaraT/JmSqIHrB8hp0RV+Qi2TUyUtRtFl1urxDXdY2M9AwK8jrSFIlmjr9t/IR+e/X/dfbsX/tbI93CwhLgFha7jOeff+GcAQMHzp83f+6+eTmFjqysLFRN/ceE9//bX1XIzVBACA640E/RAtmwJ2xP7erXwmmXhbnu5Dqqaxx4k4xDxdE35LDoGzuiJ61XZGoDfS140nVmvFvO6EMbqKxy0BAWyLI11ncEWYJoXFBa7mD/PcMs/KiUDr1VQ3xLrSi+VRDdYd0vModdnYNk00j1qVRUOjj/yACX3mDmfbeXA64CoivUrJQ44Pxc4oogP0tpsehyx84tOqqqkpGRQV5uB8fC3xfsM2TI4F+efOKpS6wRb2FhCXALi3+d66+74b5LLrn4eafD7SjM64SO/q8I7/+3z6qCQn+cYERm2Nl+AuslRJd2IsI3s/975P46RgwMUlzqJC/bePEHXJhLyUIZ0a0V348N9I2ADm9Nquauy2pobLBRXC5vV9t6CyPfu6peoqbGzkUn1PPjO+V4M3X01bRuSocCogvUrpIYeo6faEzQwa9QVOJgUJ8wLz1SA/XtqNBZAdERmioEw87IpaLORkFe/F8R3/9PiJsR8YK8TrhdXsdVV1/5+BWXXznRGvkWFpYAt7D417jwgouefnTiI9elp2Y5MjOyUNRdpxgNe8IYGyoc7H96LkqtsQG3CxEum228gU+eq6JrXpQNRQ46dYhT2yiz35m5BDZIrWdP2CzCK4BqGH9XgI+fLCfVrVFU6kDXrZSUFs9ZAiQJikodRCOC58dX8fwztaCYh5vWTOlQQHSCeBXsf1YupTUOOhXGWV9kx58e56sXKsBtfv/t4dbD9PqmCQ45K4dlG13k72IXH1VVSE9LJyMt2/H0M09dduYZZ02yZoGFhSXALSz+ca668ppHXpr04gVZGbkOt9uNpu36nAlVFeT7Y/yxzsXBZ+ZCxNyI24MIN6PMzlydH14px5eksn6jnU6FcTZUOBh6Wi7hctG6kX0Z9EZgJRxzcoQln5Ry2JAQ5ZUOqgOS5Re+tY9NhsawoKTMQf+eTSx4v5SLrmqEIvPg1driuyNojTD89FyWrHfSsTDKhlI7Nlnn+0nlpHTR0dfTPvK+FRB+QIejzs5m5hIPebkx9Faw0NQ0DZfTRXam3/H6G1POuOD8i561ZoOFhSXALSz+MR6f+ORlTz71+BUZadkOh2P77AS3vHEZObKNYYnaBonqgERNg0QgKBGJim13rdMgLzfGjEUeDj8r23B1yG9HInwNFOyl8sOL5YDOxjIbHQtjLF7vYt9TcolUitaNhEtm2/HlkNdZ5cs3K3n4hmpQoLjUgaoZkV6LP28FikvtNDbI3HBuHfM/LGOvQXFYDnoTrZ920slIK9l/dC6/LPPQIT9GWaUNXRV893w5PYcqRnpMexHfuYALTr4gi8/nePHnxIx1YWuHdg2aYoJA8M+1prZBojEkEY0JdnIpQ9M17DY7WRm5jkkvv3jeffc+cIM1MywsLAFuYbHTzJr1y8BrrrtqYnJSisPlcm23+BYCNB3qGiTKKmyUVdipqLIRahJ4kzQKcxW6Fyp09itkpGkoGlRWGY8rq7BTVScTV8Qma7zmjdafE+OreV6OPzvLsM7Lo92ko7AS+o2I8d3z5WiKoKTCRseCKL+vdTHoRD91RRKiB61XmClAl83UiTq4fkwDv79fytHDQ1RW2Skps21y+fhfpDndpLxWpqzCwZA9I8ycUsZDD9SBajjL6K3pdIIxdkQ3iNQIhpzkZ+YSD4X5USprZWJRiY8eKWfY8VFYSfvw+lZA5AAeOOvCDN79MZmc7BhC/On1LQTEVUF1vbRp/aisshFTBOmpGp38xlpTmKuQ7NUIxwQVm9YaG7UNEqq2/eNa0zUcDge+5DTHzbeMvee7b78fau0cFhYJxaQsLCy2xqmnnPY24EhJSUPdjpxvSYJQRFBfbwN0OneM079XhIG9ovQoUOiQpZCdppKapGOXdTQNgk0SFfUSRVU2VpfY+W2lg9+WO1iyxo6uSCBr5GSo2Exxk5sd46NZyZxwDnwwuQqRB3pp25/VOiBWwoEnRvkkUsEx1+RSWmVEwhetdzJgpJ8fXy+ncE8VVpiHjtYQSTLoIRDLoOfuCp9MqeTNt5K489lUVq53IjtUcjNUdD3xhiftHVmCmgaJSMhGbmaMcRfUctW5jZBkHKx0rZXHnw7C9MWuXiVxwBm5LNngpEOBIb6bIjJv3lPBsWdHYJX5etu6AG8W314458IMpnydQnZWDJsZPtOAiloZPW6sEb26xBnQM0z/njG6F8TpkKWQk6bhdWnIkiHSA2FBZZ1MUZWNVSU25q9wMn+Zg9Xr7IDAl6Lg8+gJ2xlqmoYv2UdDY8AxevSpb6/fsLajx+NRsLCwsAS4hcX2cuMNY+/ZWLy+ID+3Q8LiW5IgpkBVhR2HXeWUI4OcfEiIA/s1kZavgRcjshs1f5RmRQpJskpOd5U9nHGwR6AJomWCuSscfP6Lmy9mulm41AXoZGSoeJw6udkxPvw5mRPOhg9erULkG63W2/TMFobwESvh6NMjfKSXc9y1ORSX2+hUGGNdkYN+J+Tx+fMV7HNoDLEa9Bitc18nzGjuRqPV92lnhzj5kBAPvZ7C068nU1LmIDMjjsuh/2Pey21SeMs69Y0ywUYbKV6FK86rY+zZAdJ7a1BsNF1CpnXvVDWzsVN3WDzDzuEX5lBSY6djQYzyaplok8wbd1dy6sVhWA16nLZ/B7xZ2slZ52cy5Wsf2VkxnHadppigqtqY6H17xjh8vwhHDYmwT+8onlwdPOb60rzWqMZa4xY6PhsUOlUGOGLGWhGChlKJH3538u43SXzwtYfigI3MDCXhsa2qKgX+QorLNuTdeP3YR55+9omrrV3EwmIb24uuW4VFFhZ/Zc3qNR26de+2yudNc3i93oSsBm02nfJqG/GoxKhDgtx8UYD+Q2KGMKkGgmZ+cSIRt+b20m4gHXAa0e0Pf/Qw6SMvn//oBiSys+LYZCgtd3DU4CCfTq4EextwniDB92gDesAXb7k48opcENC5MM66jUaLzKkPVHHKBWFD5NW1gfekgkgD/FC3QuKRST6e+TAZSQKH3RgjZRXFjB17C/fddzfFJWX/2D9dkO/n6aef44orLiU9NZtgYwPvfvAexx571D/272RmZbJk8RKOPepYGhsb8Xq9AMTiArusc9LBYa47u4FO/RWoBaraQLpJ8/fiAzrAp2+6OfHabKKKoFOHOBtLbWiKxNv3V3DyBWFYA3q0nYjvfGPMn3p+JlO/85Fr5nyXVxjz45D9Ipx/XJATDwhhKwRiGN9LZDvXGhnjFiPT+KPFc+zc92IKb37uRbLrCfuLCyEIhUIEGmtjS5Ys3a1Pn96rrd3EwmIrATvrI7Cw+Dt33HHX7YDD5/MlLL6LSuzY0Xnt3krem1xF/8Ex2GgUHuoN23ndbeZ26mHQi4DVRm7mCaeG+eyVSr6fVMExBxo5yaXlNvJyY3w228sho3PQQkbxWZvPCRegK8AKOOKUJn6aXIbHrrFuo2ET53DB6DE53HJTKqSYtotmFK/VkEEPAMsgrYPG3ePqyctSqQ/+dxPCNR1qamXuOr+eJ16vpVM3xUg3qQa9NRvr/FWoZsG9t6dwzJW5KAI6d4izfqMdocIXz5Qb4nt1OxLfHQANjj8ji6nf+fDnxiivtFFeYeew/cJ8+VwF01+tYPRZIWx2Y43QNxppU9u91miGA5C+FlgPffvFeWNSNe8+WonPoVFUak/IBUjXdZKTkwEct44bf5+1k1hYWALcwiJhNmzYmPvWW1NP83nTUNWWKwFtsiG+s1JU5kwt48zLQlAC+jozN3hnBYqZBqGHQV8FVMIBhzXx8auVTHuigj16RCktd5CUrPDtgiSGnOgnXC2M5jZqG/+whRmpWwFDj4wy/71SCjPjrC9ykJOhkJaqcO+kdI4YnU1NiYTobUbNtVZ+zRJQC00lxpf7v+CMkuHToNJIN2kTUW/NuCUSfaCxVjDqjCxueSoDX4pCfo7Cuo0OsnzGnDz8pIhxaGgvaSddQAvBwaNz+GhmMl5fnLJyBz07xJn6UCVfvl7BYcdGoBb0laboFv/QWqObN2gb4MRzwvz2fikds+MUlzoSakylqiqpvkw+/PjDY5ctW97F2lEsLCwBbmGREM8/98KlqhZz+ZJ9LT5WlqGsyoY3SWP266XsNjQOf5hRNvnfmbG6YkaqyuG4k8P8/kEZt19WS6RRABpzVrjY+wQ/ZatkRA8QGq0bNU5w02cZ9Bqo8MfHpQzbM0xRiRPZppPvj/Hl7CT6HpPHR1M90AVEVts4XPwvFWCGmoRxq9IWgv0qiAygG0yf5mKPY/L44Acv/twYbofOxmInA3o08ftHpfQfHjNsEVXadsGlbr6vHlBXLDFolJ/vFiQBGsEGiZvOq2PxtBJOOTtkpP78m3nskvnci6FzP5Vf3iwnI1WhuMKWkAj3JiUBmuP5Z1+41NpRLCwsAW5hkRDvvP3uyXbZidpCsx0hIBwRKHGJT+6roMt+KvqyXXQtb26Q+gpAgzsm1DPn7TL27BYDBEs3uhgwys/SX+3Qx8wnb+siXDKieal+jRnvVnDxqHqqqx1U1cl0KoxRHpA5/qocLr0ynaaQMKLhdtp+lN/in0Mz8pVFT9AUuP76NA69KJf1FXY6Fcaob5CoqHJwxhENzJtWhr+Lir6ijUTsWxDfQoDoDesX2Rg4ys+8lW5Ap2dhnJ8ml/PAQ3XYHBhrzK4oSm6ek8vBv5fK14+Wo6sSDSGpRatCVVOx25xMm/bR8dagtbCwBLiFRYt89933Q9esW9klLS295f1JQG2dnctG1XPAqVFY0QqbfHNO8lIYMCzGwg9LufD4AKBTVutg0Gg/0993QU8QTlo3dSMRbKBvAOLw3FO1vHRnJXoc1hc5KPQrZKQrPPdOKrsfn8f7b3ggz8gNF3obP2BY7LxA1cxc747w2ftudj8+j0enpJGWptIh30hbagoLHh9bxZSXqg0BuY62316+2b2lN8z6ysnAE/2sLXMCOqcf3sgfH5Uw9NAoLAO9phXejwysgP7Hxbnl7FoCAXtC61x6WiYbitZ2+Pyzzw+xBrCFhSXALSy2yddfTx8BOGy2lu026hok0tPiPHBpPQTMK9vtEOBCMkSxSDJ/nGZ0b3tfdHOO+EpDwL7wQg1Pjq0GNIJNNg69OJdXnvIaqRsptP2Isc1sYV4E518WZOEHpQzs3URRiZOYAh0LoqwusXPitTmceF4Wy/+wQy8jLaXNp9tYbL/wbk436QPrV9k486JMjr48h6XrHHTIj6LrsLHESd8uUea+XcZVNzZCGeiVtH0nIBWEF+gO70zysP9ZudQ02gGN+6+q5fVXqnF4jZsufQd2bLG1dWY7n0dXgSq4/YIA/uwYtfUtR8FlWQJwfPHFV0dYA9nCwhLgFhbbZNbPs4aCaNH5RBIQDtm44JhGvLvrUJbAbNLNDTEDRGcgx/ideINAaTAfkw50MhwQhM/sSpeooLSZomMjXHFjI188WU6qLw7AeXdkcfONqZAGwk/bd0iRzTz6ZdCnf5y5H5Rx84W1NDZIbCh2UJCrkJ0V5/3pXgac5Gfs2DSqKyTobdgEWkL8PyC8NfPA2Aca6iRuH5/KXqPyeP3TZDIzVQrz4mwssVNfL3PtWXUsmlbKgP1isBT0CG0/8t3cYCcX7r0thVNuykHVBUlJCu89UMmYOwLGQaJsOw4SzaksySAKjbWETEOJK40QbzBVebZR6CkyzTWmpZsxCagEey+4clQDTRFbi4ECXdcRyMye/etga0BbWGxxy7awsACorq72rVyxqpfH5W3xsZGYwOZQOfuQkOG528KmiGY21EiCDQtsfPqzm7lLHWwot1HfaCh3n1cjL1Ole4HCoN2iDOobJbObhnAA5UDIzC9vSbiGQayAw89uYppUyRE35oCA+17JYNV6O+88UWU4pKxt47mxzU1w1oBIh3vureeYAyJcc38avy7yYHOqdCyIUR2QeWBSGpM/SuLqMxq57KQGfL10RA1Q3YqdNC12THg3H0SzILJO8NzDyTz2WjIby5y4kxSjsU6NTHW1k716Rpg4po4Djm4yChPXtAPh3bwedAYicPYFmbz2uQ93kkIsLnjrjiqOuSQCi81btUTejwbCY4h5VKhfIzH7Rye/LnGwcqOd0mqZ+qAEOqR4NQpzVAb0inHM0DBdByqIJqB02/UrugARgDMPDnH3a6k0RgRJrm2fcr0eH6tWru5RXFycXVBQUGkNcAsLS4BbWPyNpUuX9amoLs/Lyshu8bF1AYm9+0Tp0yduNNkR2xAUEtAVqldK3Pp0GlO/9hAI2FpQhRoF+QrD+zUx6qAwI4eHjTzucjPne1vCWTKujEUF9O4Ux2bXkQX4sqO8930yex1n54OnK42Nd5Xpxd2W78JsoNeDaIDBw6PMHljOo5N83P9iChuKnfhS4nQoiFJWZWPcYxk8966XC0YFOf/YIP6+KiIEVLSD9/m/LrxlIBtIhuplEq+87OXF95JZtcGJZFfpkB+lISyxodhJqjfObVfXcPOFAUOsrzLTJNpDvrcM9ITSxTKjLs9i9jIPWZkxBFAdlemWp0B9guNVM6Ld5AFl8OkHbt7/Lonv5zvZUGTf5hO8/pnO+BdSGXVwmHsuqyN/DxWxdhv/rgBqoKCnypDdo3z7q5sk17av0tweF5XVZZmLFy/pW1BQ8J010C0sLAFuYfE3VqxY2QM0Esn/1lWJ/fpGDcGwcRuiwgZ0gW8+cnHaTVlU1Rsd7ACSfXE65Klk+FQEEAhJlNfIlFfIoEsUl9h5o8TBG58ms2fvKOcfH+TikY04eulGZ8jGFgSHCxatcdAYkMnOUpAlyPfH+GOtk72Oz+PNh6s45tQIosQQuG1avEjmp7bGSM257sYGTj88xJ0vpPDiu8k0BGykpSt4MxVKqmyMfyKDJ97wcebRQc4+OsQeA2IItyHEabSi4m1GdAN4MdKxYrBsgZ3JnyXx+qdeSsrtCLtGYV6UcFRiY4kD0DhnZIC7LqmnsL9qRG1XmWO3rR+uNuvW+e0HLk65NouaoI08fwxMO0tNkfhhoYveB8Vbfq4koBAohRee9vLih8nMW+Q0Pwh9k0LPzlHwZ6ikeo08k9pGiY1lNgL1NoKNMpOn+Zj2jZvJ91Zz3MkRxIZtNCuKAQUwbPcmvp3tafEty7KxqCxfvqLX4YcfZglwCwtLgFtY/J2iDRs7JaQbzL1tz25Gm/ltNtvpBB+87mbU9TmbVEfvTlHOPSnIEYMidMtRcLmNJ1SiUFZnY/E6OzN+d/LDfBezFzpBl/h9mZOrljl5amoy157RwCWnNhopLevMyN9fNkuhG7P7pz+cgECW/vSsLsyLUVxp49grcxm/qI67bq5HJJsdN9t6BFEGPQhiGeTkqzzzWC0XnxDkgck+3vo8ibpaG6lpCslZCtV1Mo9OTuXpqckcsX+E0SNCHLtfBHc3HRHFuLmIWGJ8VyN043BIJuCG2HrBp1PdTJ2exOcz3IRCMg63keMdahIUlRrC+4RDg4w5q4F9DopCCMMVRLSDMdssmPMBJzxwl4+xj6eD0CnMi/2lxbvOZ7NdXNrYiLCb0ejN0f68USMMr7zg5ZHXfCxZ5fx/Dxq4R5QDBjQxfK8m+naOk5+uYHcZfxttgjUVdr6e5+KV97z8scpFIChz/FW5TK6v5KyLQog1W/a314Xx/e3RNQ7oaLpRD9MSxUXFhdbIt7CwBLiFxRapqq7OSGgv1QBJo2OOakSExFY23M6w4FvHZuJbcMVJAR4aV4ergw71QCObCiJtbihMVSjcQ+GIURGohG/nupj8qZcPpnsIhWVWrnNw6YRMXp3m5b5r6zjwyCZEHegVm81mHUgDiuHNb5OwO/5/hZWiCvKzVRpCGhNeSGfuH07eeKSK9N6a0c66radqNOeGV4Cogj33jvHmvtVc/WMDj73p4/2vk6ivs+FOUinIixGKSEyb7mXadC89ukQ5ev8IJwwPs9+eUegKIg7UGILmH+lcavEX1WYW+rmBDEOEUgG//uTkwxkePvnRzVJTQKakKhTmxahtkCkqtSNkjZGHBrn21AaGHRw1xvZWDp1tks1STsJFgjNvyuSD75PxJiukJmt/Ed+Qmqby5WwPa+bb6DpUgXWbvU/FKJokG3752snYianMmP9nFNrpUBk5IszZR4U4fHBkUz44jUATm9yPnB7os0ecPsPjXHlqIzc/nMqDr6UCOmfflk2XnFKGHhWFtVv5jKNQmK1ic2rEFYHT3nK1c3VVdaY1ESwsLAFuYbFFGgINqYk8Lq4Ikr0aOWkqbOWmWCQB9XD+3RmmotO5/+IaxtzXAJXAkq0UPIWBuj+jhAcf3sTBRzQxdo6dJ9728coHScTiMr8ucnHQeblcNrqBR2+sw9lTN4oqVTNC1gGevjOZVetc+HNifz8fqJDs1vG4Ynw528Pux+Qx6d5qDh/VhCgDvY62H1lsTkspMlJ9Bg2N8dawahb+0sCL07y8N91DcakThEpOdhxZgjXFdh591cnEKT4G7Bbj8MERDt67iX13i+LoqBtCscEULXHLSGUnzkhgx0gvSTG1aAnM/NbJd/NdfPmLm7mLnahxCcmu4c+JowPl1TKBejvpaXFGn9TAxccF2XtY1HjC4s0Oh+1BfKumi0sB/PiJi3PHZrCuwkFOdgybZMzBv+J16dTXSdz8cipvH1iNcJtF1RLQ3Tgo3nhTGg+/6tv0IUhC46zjg1x9aiN7DTZu5SgD1mzjdicMlIKcBQ88WU/HTJXLHzXiD2ffncGK/qXYko0W938jBpk+lbRkjaaolJAADzQ0+KxZYWFhCXALiy0SCoc8iTwurghSvSopXm2rApwc+PxNFwuWG/e+ow8LMubuBtgAekPL4lYXRqSJdUYErc9ecZ7br4aLRzVy2+Op/PC7C0nWeWZqKl//7GbS3TXsf0QTohIohN8/sXPVE+l4vQpCbPk6WTNzcAvyYhSX2TniEj/j5tZx75h6RBfj327zHQSbhbgGbDCE+F57x3h6/1puXRRgyhdepn7tYcESIxXH5VHJSY8TVwTzFjuY94eLu1/U6NsjxrB+UQ7s18Sg3WJ06KBAgWlnGDR/Yv87bee3W3ALwGEKbq+pDeugZIPMr0ud/LDAxYwFTn5f4QBVAqGRma7hdKjUNkiUVRi1Ebv3inLyIWHOOjJEh70UYw6UtDPhrZsH6E6GCL/79hTGP50GQEFeHE0z5t4WNbsGmZlx3pmezAnPhjnlhjBiPZAN8753cN4tmSxa48Lri4OmM6R3lLuurmfwwVEjyr35IaWleSsbfvsiApfd2sjv6+y88GEKa4ucvPNxEqddEjIi8H9FAa9bw+PSCUYS+0iaIhGPNUssLCwBbmGx5c1PUROaDxpgswnsdrbon9vsq/vZXI8h+twKt50dgGhi4vtv4lI3RIgQ0G9gjE+mV3LPdSnc+lwa+f4Yq4vtDD8nl4evr+X6qxr49l0XJ16Xja5Dmk/92zX33963KijwKzSGBPdNSueHOS5euruGPvvFjYKsIO0jz7ZZiJcY2sNfoHLT2AA3nRXgy5lu3v3ew/TZbopK7AB4klRSvHFUDZatdbB4hYtnp/rIzlbo2zXO4N2iDOwdo2+nGN07KpBvdiyMYUQQZbBJ/3tRciFjRLddgAcjpUQBqmHtcqOGYd4KJ7MXO1m0xk55ueH4I2waWWkqNptKQ1CiusaYbnm5cU48JMyJB4Y4ZmjE8K+uw7jRaU4Jai/uNappB9gJ1s63ceGtGXw3L2lTyomaQBMslx08HpXRE7JwJVdy3OkRnnvSy6V3G4beebkxSstt3HhGgAefrTPSp9ZulpYjbeecCYFohNvPCTD12yQaGux8Md/NaU0hRPOc+gt2G9jkrR8k/r7GqJb/kIWFJcAtLLZMbq6/PCEBglnQqG0lyiQDQSipNoRHt0KF3h3jULUTQlYY/54IAxvgp9+d2Ow6mgYFeQp1DRI3PJLGu996WLTcQVQTFOQqKEpi4WtVhSS3TpI7xi+L3PQb5eehG+q46tJGowvhxnYSDW/+rABqQFQbIvHw4yIcflyEmpUSn//i5pOf3fy80EVZuSHGZbtGVmYcWYZQWOK7X9x894sH0ElLV+nVMU7frjH6do6zR9cY3QoUCrqo2DN0HDbdqAv4b8tu8jJUw3WjCaiH0g0yq0tsLFrrYPFaO4vWOFi23k5tjdw8S/Ama+RmK2g61AZkqqqNzzs7O86hQyIcvV+Eo/aNkNNLNYRjBbBys9SJ9pKPbzYOosA4kLz0tJdr708n2CTjz4khCRIS32BEwTNSVfR6mdG3ZNH/rRizfnPi9mhkpKqoqsDh1Jm12AlrjH9vp3LiJaAK8vJU+nSOM/t3B6U1MgRMhRDbQhDCLOhO9OvJzs6xPMAtLCwBbmHxd4qKirO//+G7A5I8LacqSgKiMYhEt7Hp6aCZoswu65v+bKckkB3IguuuSOOrX7zk+WPomrGxp3o1ktwwZ5GTFJ9GmktLWHxvesnm6yvMi1FZJ3P1/Vl8+ZObJ2+tNTzDN7ajaHizEBemYFxv3CBkZGuceX6IM08NUb5G5of5Lr6Z52LOEieLVttBMSzcXB6NZI+GJEFTVPDL705+WeA2V02N3EyVLvkKHbMVQhGJVO9/Nw4ugKQklY9melhQ6eC33xysLbNRVGGjrFpGj5uTQGj4fBo52QqaBsGIRLBRItgog6TRu1ucfXaLcsiAJg4c0ER+dxWSjIMSGzeLdre3ItjmqHdnKFkoc+W96Xz4nRe7U9vkcqJt5/BQVEF6ikakSTBrgZOsDA2HXUc1b7OyMlRmLvRw3i3pvPxSLSJgNu3Z0c/OfH32zQu5t1aQLCAaE8TiICUg+r0eHzNn/bTv2jVrC7p07VJs7TYWFpYAt7AAoLKiMnXwoCG/lpYVdyrM64Sibru5hN2mEwhL1AdlOtq3ENbSADdkpaqATlGlTHmtTG431Uhd2MFNnu7w8/tOJr6bSlra/68Q1HSQJcjNNF6PthMRWUUVZKZqKMkxvpiZxJ7Hu7j/+jquuKARkYWRx047E0rNUfEAUG+kUeTmqYzeLcTo00PEi2H2Uiez/nAxc5GROrG+1GYKckDWSElRcDl0NF0QDEnMWuBkluYiK1PF4/zvRsGFgPRUlaenJaPFTI9pWSfJrZPh05BllaaYoCEo0RCw0WB+Xh38Kn0HNrHv7lH22z3K4N2iuAp1Y9epByrNyK3YTOm3JzbP9QYmPe3lxofTqGu0k50Vw26jxfSvbaFp4HTo+LP+Pqd1DTIyYrzyWSonTQlzxLlNsHQnDsduCJYLNlQYT5DhMw9HdVtWDY0RQTgqYZNbPlmkpaWzfsO6HvvsM2juggW/9SvsUFiOhYWFJcAt/repqqxK3XufQXNLy4o7FSQgvsGIaNeFZSrrZCMX9q/7sgbCBf17xHgZqK6x8+NCJ6fsHTbSULb3qlgDkQNqEZxxTyYInSTXvyv4NM2I9Bfmxaiolbny3iymfePh0TF17LF/zOjIWUv7iYb/VYxrpgisMxwm7G4YdnCUYUdGIQC1JRKL1jqYu8zB76sdrNhoY02RnYqqzTqYCg13koZN1rc7wtneUFVBVopKLK7RFBdEIoJQUCYUNJRoappK/94xenaIs0e3GPv0irF71ziZBSqkYqQx1GEUCWrtWHRvdiAWqUAerJht5/qH0vhsRhKyQ6MgL4qqip06BLeo/XVwO0C2q5x1XxbrhhTjzdPRS3dgTmpABsya7mRjiVEMu2e3OCRjeOX/FQfUBGTqg4K05JYHvqIoFOZ1oqh0fe6gQUN+nTtvzoD8/Lxqa/exsAS4hcX/KIH6gGfI4H1/2bhxfbeCvE6oCYhvMK9ddUFpjbT1GRSE4waHud6tEI3YeOULL6ecFkY4zavihHdaEA4gFa4al8aGEif5/tgui7YqqiArTUNVY3w7x0P/k1zcfFGAOy+tR/TCcEqJ0X5bvDc7xISNn+YGRunZGsO7NjH8qCYjhaUGVhfZWLLezoqNdpaut7Om2E5xhUw4ajQ6+i8jBNQFJWQNsrNV8rNUuuYp9Okco2cHhd06xeleGDfqBTwY7kAN5k+NmQpEOxfdzYdhO0YjnDq47+4U7nomhaa4TE52HJvMpjSRf/0MoIE/S6G41MnFEzJ4Y3I1wmXOx+14Cc2FxS9+5jW8UWWVE4aEoWkrWXM2KK2R0WISNklJcB3ZJMI7DNpn0NzfFvzWLzs7q97ahSwsAW5h8T9GQ6DBNWjQkF/XrFvdqyCvY8Liu1mMAKwrs23SE3/bqGqgYIDK8UPDvD3dx1ezPPz0uZNhJ0dhOYlHqTSgM3z7lotnPkwlPT2+y63wNM14zwV5MeoaZCY8l86H0z1MuKqe408IIxSMyGZ7F1eYQlHdTDxiejA7oFsfhW57KyBHIGKIltJVMgdcncPGShvpyf/NHBRdh6oamWtOCXDq6DAFskJmhmZEtj3mGA2ZP1VbcM34LzQ2ak43yQfc8OVHbm55PJXflrlxexQKsuKoKv9q1HuLc1MVZGbGePNrHye9HOL4CyOwbDvWF9U4TCz83MF733kBOGxQhN77mkXjW/gcsMHGCuMmSNqOg6eiKhTkdaK4dH2nwYMG/zp37py9MzIzGqzdyOJ/FcsayOJ/jqZIk7TvfkNnrli5rG+BvyNqgvYEQkBcFUTjhuRetNZhNGzZwmbX7MV7y+kBU6EILnsiHaoxooSJbNQqCD/E1wvOvjcTIel4nHqreVGrqiDFq5Hvj7F4jYORV+dw0nlZrFhkh55Glz6h8p/z5dM10JtArwF9I+jrMJopSZCXr+JygKL+d+eLDsRiEgf3b2KvI2Jk5puDt8r4LPQNhp+0HtmyZV27RwWRBvSBdSttnHFRJkdcksNvy5zk5cZI82kJO5z8G9+Nyw42h8o5D2TRsFQgCtjU9bKlw71IBcJw+ZPpoBnr2u1nBMBtRtL/ugZKQAT+WGPk3sXigrgiEmpHb6whhghft35tj0GDhvwaCDS4rB3JwhLgFhb/C+K7qUkaMmTfX5YsWdQ/398RVUtcfCsq1AUkVA2cbo25KxxESoTReGRLM6sYdh8R5/ITGgDB4lVubr0/Ffzmta++7Z1VuIBkuHRCOiWVDvJylFYv9NNNd5d8v0JWpsJ70730OzGPcTenEqgT0AeEN0EB0M5FOU0QaRCoZr78f/wdU1EnGzcdAdCj/1Gx/Vfh7QbRByJhwR23pbLXiXm88WkyGRkqBX7FsCNt5QOnqkFupkKgQeb8OzPAabqytLS+yEABPPywj1kL3YDgjMMaGHJsFIq2og48oJfBL0sd2Bwqqg61AYmYwvaJcH9H1qxd1WvIkH1/CTYGHdbOZGEJcAuL/zjDhg7/aeHvC/bJ93dET1BBCGFscpVVTh64sI7bzw4QjcgUldj5bqEL0re82ekq0AiP3FRHfk4M0LlnShpfTXZBjxY2SA3oAl++4WLSpylkZMTbVBdGTQObrFOQF0dy6Nz/Ujq7n5DPM48ngx1ELxDO/74Qt/iPCm8HiJ6G4Jz0rJc9RuVx5zPpxHSjm2Vb837XVEFWZpz3vvfxzksew5lFa2F96Qmz3nNy47NGC/pUX5wnx9ZBZCt1KjqQCb8scrJ8nQMlJnPdSQ08cVUtVdUOYtsTCddUCvwdWbZsyV5Dhuz3S1OkydIiFpYAt7D4r7LvvkO/nzd/zsC83A7ouoaegKIVwrD4q6h0cMqBAa5/rIHRB4RA0gGJd3/wGFe50pZnl14Bzo4670z4M6HyuLE5rJxhMzZ4dSsCIA8iKwVn35+JbFNxO/Q22QZdVdmUllJcLXP53ZkMONnP1MlJkAKiuxnt16zxZ9HG0UDYQHQD0mHaVA/7nprLBbdlsbrURr4/RnorpptsCx1w2MHhVDn/oUxqFkpGR9EtvVbFmJel82WOuiFn0x9PvbOK1N6a4aQibXktRIKp3yeBJgM6I/cNc/kjjVxwdICqageK+meNTCIiPN/fkcVL/ug/dOiwmdYAtLAEuIXFf5Dh+x8w/ZdfZu6bl9vBAXrC4lsHyiscHD0kyNSXqqEE/B1VBu/eBOhM+8lDze8SZLPliLYErIV9R0Z5/OpqQBCNSRxwgZ/q5ZKx2Sv/fycVLiAJLrorncpqB/4spU17TDenpfgzVfw5cX5b6uTUm7IZfnoOn33ohixD1FhC3KJNC+8uQA5887mLQ8/OYeQ1Ofyy0EVuTpz8LBVNo00egje9DQ2yMxSCIZnz7swwbqKS/rIuKcb7DBYJ9j83l/pGo2vphPNrOOyMJli3FVWgAxkQXCp461sjv6V3tyi9esRhPbz4dA2nHhygosqxqWg7sbVDI9/fgfm/zes/aJ/BP1mD0cIS4BYW/yEOOXjEFzN++nH/vJzCxMW3ueuUlTs4qF+IT16pBM0swMuDcw4NAoJAwM7jH/iMaK++5SfSVWAjXDWmkcuOrwcEZTU29j3NT2CDQHTfTISbqScfv+rm9a9SyMyMoentI8G4+WPN9yvkZMeZMdfN0ZfncPhZOXw5zQ2ZphB3WELcoo0IbzuIrobw/u5LF8eel82IC3OZPtNDdlacfL+CgHbj866qguysOB//nMyU55KMVBT9/4vvaDXsf1oua0odgOD0EQ3censDlGy9m6Yw009e+tRLdY0dEJw1IoStC7AeiMCbL1Zz3H6NlFc6jDb1IpE1w1iP83I7OObM/XWfYUP3/9YamBaWALew+A9wxGFHfvLtd98c5M8pdBiez4mJbyHplJY7GdI7zLdTKsAOegngAKrhzCNDZGcZed1Pf5hM8A8BuWw1Cq4HgTp4emItJwxrBASrShwMPsVP7XoJ0QOIgciH4DLBuQ9mYrOruOxtO+q2RV1jFiUahZoqX/3s4YjLcjjs7GwjIp4KoodR4GYJcYtWEd4uIw2DDPjmMxfHnJfNwRfk8sn3SWRmqOT748jSrrcV/Cew28DpUrjokUwq50mIDkDUOGiEKwX7nuxnwRqj6PLQgUFef6YaQkZx7Vaj35mgroJH3vEBkJIS55Ljg1APug30ckCFaa9UMWJAiLIKo64yUREOOnm5hY6fZ/409IDhB023BqmFJcAtLNoxxxx97Ptffv3Fof7sAodIUHwDSLJOSZmDPbs08cObFZAEehF/uubXgqePzo0nGe4mtXV27nwlFdK2seHIoFcZIvv9SVUcOciIoC8vcrL3KD8bF8uI/obAP+/2DGrr7eS28dSTRIS4TdbJ98fJylT4+uckjr48hwPPzOGdKUlgMwrdhM+MsOnWmLX4l9BBaIZDj+gJuODDtz0cdm42Iy7K5dPNhLfdprdL4b35vMtKV2lqkjjrjkzjwDEAqtdJDDrRz2+rDee/YbuH+OqVSuOWroKteocLgGx4YLKP4jIjan758Y2k7qUZXuHCWBv1EkNRfD2lgqF9w5SWOxBCT8gGvnltzsspdPw44/v9Dx1x2GfWoLWwBLiFRTshEolI33zzzf4T7rp77PBhB3776WefHJ2bne8QkkhYfMuyTnGpgx4FMWa+VYYjXUffwP9rWaULoAquPrOBvFwjCv7o2z5Wf2czrny3VqRlMyy8EPDZ5MpNInxtuYN9Ts6jaLHMt+85eff7ZLIyY2jqf8PbzhDiGEI8S+GHX92ccmM2A0/38/zTyYSCAnqAyDEPMJYQt/gnhTcgsoCeEIsJXnnBy75n5nLCNTl8/VMSmZn/DeG9OaoqyMmO89VsLx+84aF8lczAk/wsXu8EBMP3CPFjc3ChmK235FOBDlA2S+auyamATmpKnDFnBaDuL1PVZj6XG75/vZx+3SKUlDkQcmITWteNL8ufU+iY/s3Xh+w3ZNiPd95x181ff/X1AaFQyGoaaPGfwxrUFu2eRYsW9XjpxUkXfvbZ50evWbuqV/OfF/g7oiXodrK5+O6QFWPWW2Uk5evoq7cwS4TRlMXeGx6+sI7TJuSgKRLn3JvBz+9XIFJAb2TLHQDNSJHIh89er+SUi3Xe+S6ZinqZA0blotogxafgsPOfEQP/T4hLkJ9rRPbnL3Yyf7GLhyb7OP3IEGceEaRbPyPnljKj+Y0VIrDYscFm2mDmGnNuw+823vgyidc+S2LFGiegG63jJSO/W/sPpkLZZEhNiXP1s2m4noYNFUbznCMHB/lsUiW4jMZSW1UBuunpL+CC+zOINhkFm/edX41vdx19+Rbmp81ozGTrDD+/Vc7eo/ws3eikIC+GmkBAQdd1hBAU5HV0zJo9a/9Zs3/eH6BLp24rDz/isM8vuPD8F/v167fUGuAW/wWs7c2iXXPllVc9stee/X9/4snHb1i/bmOv7Aw/ebmF+HMKUDU1YfFtk3WKS+3kpCrMfquMjK4a+pptbE4SUASnnhPioIEhAGb+nsQjjyZDhxYiuc3XtSq8/XIVl46qByTWVtmpC0oke/X/pCDYpI3MAq28XAV/bpz1ZTbuejad/qf7OefKDL770gVJZnpKunmOsaLiFi2qNzPanWrUGOCDn79zceE1GfQ73c8tT6SzcoMdf06cvFwFSbSf4sodPfB6k3QawxKrq2yAxFlHNPLZG5Xg+Eta3dboDJOeSuLzWUa3sb13C3PJxUEo2UqAoXl9Wwcev87Pb5bTKSdOcakDeTsi4aqq4s/JIy+3kOxMP0Ubi3s88+zT1/TvP3DBJRdf8mQkErG0i4UlwC0sWoOFC37v06N7zyVPPfXkFUkeryvf35Hs7Cxkm5yw6N5cfBeV2knxqMx6oxR/Xw19FVvNiQRj89GDxmbz2u3VOJ0aoHHDMxnMneaA7my7wLC5cCkIzzxVy71X1IAmCEckxP+I2jRrr8hJU8n3x0DA5Gk+Dr4wl2Fn5/L048mUFcvQCURHs3DOyhW3+OtU1I1ot+hgCMaqCokXnvFy4Lk5DDsvh5fe9RGLC/Jz4/gz1T/H3v/CZ4NOU1SAKnHzebVMfqEaYmYAYFvi2/QKXzbdxgUPZxqLmdB5bXy10Q2zYRsCvHl9Ww1pnTVmTy3Dn26IcJusb+caoSPLMplZmeT7O+Lzpjief+H5K/r07rtszq9z97JGv4UlwC0sdiHffvP9/gMGDJi/avXKPvn+jo7k5GQ0bce6YzSLb5dDZ9br5XQZqKKvaEF8NyMb1635g1Veuql603Q66vocAislRGf+v8f3ljapGqAMxt0e4O2HKtBiUFRqR5YTK176TwhxzGidWyc/N05mpsLP81xccW8m/c7wc+E1GXzzucv4eLsbTYqEzRLi/9OYrdRFjjEmcMCP011cfkM6e52Rx8V3ZfHDbDcZ6Rr5/ji+JA1N/98R3puvbdGIxMt3VnHPA/VQA3plAuK7I8SK4ahrckAzOvA8dU0NvQ5WDNvBRNZHU4Tn9FKZ9UYZqUkKRaX27RbhzWiaitfrpSCvI+s3rO0xaPA+v37+2ReHWJPBwhLgFha7gJ9m/Dz4kBEHTdd0XIX5ndC2I81kixtUhQ1J0vn51TL6DI3Diu2cFQJYD2dcEuKiY+oBiao6G4demA1BEAUtiHDZjKSvgZPPDTP33VI658YpLnWi6STc2rlNLCaShKqqlFUU09DQiCzJ2/0cmg522UhPycuN0xCSeOk9HyMuyWXA2X4m3J3CwjmOP7tsZhpCzBLj/0OiO8O0EEyHxQvt3H9/CoPPyeWAC3N45q0UagMS/lwjzcSxg4WVQkiEw2FisRiS1L62yeY1o6jUgT9d4ecpZZx7WRDWmZHrbU1LFUSusWYdcWEO68ocgMTogxq4/LpG2LidU00GfSV06qcy+40yklzaTonw5vSUwvxOSMLuOOroIz/75utvD7Amh4UlwC0s/kVKS0szDz30sK9AOArzC1EUZaeiQ6VVNlAFP75UzoARMVhhOpxsj+gVoIeBADz/cC377hYGYM5yN8eelw0yCH8LIlwyG2Asg/5D4yz6pJSj9gtSXukgEJKQ5fbx/cTjceLxeOXxx57wns/n3VhctoFgMLRDQlw3o5WpXo38XMPG8LfFDm57KoNB5+Zy6AU5PPl4MmtW2CDdFONZZkdDS4z/90R3pim6M2HDGhvPPZ3MkRdls885fsY9ls6vC1xkZmjk5cZJS9ZgB6PdkiQTDkcoLd/4pyZti73nt6Z3ZQhGBGUVDg7sH2bRR6Xsd2jUWNuiLez4iukW44UzLsnkuwVJAOzWqYk3J1ZDxAwWbG9QwBThPfdV+PnVcmRJp6jctsMiHEBRFPLz8hHIjsMOP+yLtWvWFViTxcIS4BYW/xLHHzfqo6Zo2FeY13GnxXd5jQ01Lvj66XKGHmtuUOzA5tK8wVQCTvj8xQo65sQB+GR2EqeenwnOBES4MMS/vgKS0nQ+faOSuy6vIdgoUVxqQ5Zp0ykpsixRWV3GHnvs/seHH71/0s+zZux33rnnPxePR4PFZRtobGw0I4nb/y403XB08Ger5OXGSHLrTJ/p5qr7Mhl4tp+jLs7mmSeTWb7YDikYaSq5Zl6wKeIs2g9CN7qlihyjcyrpsHq5jRee8XL8pVkMONvPpRMy+eJHD067Tl5unLwcBbus73CKiSTJhEIhSso2EAo1Np191jkv/TxrRs+TTz7pifLKkh06RO76OahTXC4TCNgYe14t371bQUa+hr4sgbVNMdN5kuGiSzJ441sfoJOdqvDtyxWINNBLSSz1ZCvrGytgr4Ni/PRyOWhQUrnzIrwgrxBNV10jR57woTVzLCwBbmHxL/DYxCcumztv9kB/TiGKuuPiW5Z1qupk4lGJaQ9XMGJ0E6w0o2U7o3BtoK+HlI46P08pIyNZAXSmfpfMyedkGU1nOrQgwpufpwSoh/F3BvjmxXIKshSKSx3ENWirt+FNTTGA2O13jL8ToEuXLsWTXn7p0rnz5wy48MKLnkLotSVlG6mtrUGSJITYsQ9b18Hl0Dc5qGgafP6Dh8vvyWTvc/0cfmE2Dz3oM9JUJKAziE4gUkBIlhhvk+jGdyN85hzpCthh8W92Hpvo4+iLsxl4jp+L78rio2+SiMbY5GTidhqie0e+ViEEkiRRX19PSdkGYrFo8Oyzznnp17m/7P3q5Fcu7Nt3t5U33HjdQwIp1hBsaLubuGmlWFzqJCtZ4+OnyrnvgXqju+W2bAY3F9/5QBKcd3EGL35qiG+3Q2XGK2Xk9FHR17FzpsXC/I5WwpCjo3zzbAWaIiiv3kkRrirk5RTyx6KFe9wz4b6brMlkYQlwC4t/kLraOu/48bdNcDuTHGInRLIQEApLNEVk3ryrkuPOjRjiW+WfCS+bRUcFuxtFR2le4+r63R+SOfyUbOKNRjto1BaEoGzmaq6Ag49pYsnHJZx8aANVVXYqa+Wd2rD+DWRZprq2nIMOGPHDgQcd+PPmf9e3724rX3jh+SsXLJjf7/rrbrg/LT11Y0nZRsrKyzaJoB0V4uiQ5DbFeE4cWeh89bOHmx7NYMgFuQw6z8+YW9P49AM3VWUSZBkRVeEH4bEEeasKbmF+B7lmlDsbaislvvzYzS23p7Lv+bkMOt/PtQ9m8NkPHnT9T9Gd7NH/HAM7KLwBKioqKCnbSFKSp/zKK658dP6Cuf1enfzKhf3791/c/NguXbsUX3Lxpc81NNa1ySi4LOtU10tUVDo4ZliQJR+XcMzJEVgFen2C4rszEIdRZ2TxyudGq3mPU2XmlDJ67qugr2THI99/FeG6ua6d1MQnj1YQjwkCQXnnal0EJLl9jrsmTBhfVlaWbk0wC0uAW1j8Qzzy8MQbg6FAenp6ZkIFl8KMCjWGJcoqbJRV2GkMS+i6Tl29zOPXVXPqlSFYbeZe/5O5HTLoq6DHPgpz3y4jN9WIhH81L4kBx+dRukpG9E6g46Nk5kGvAF+mztuvVPPC7VU4hE5RqQNdbzvR8EgkAhC7974J47b2mG7du218+JGHxv3+x8I977nn3ht79Oi+uKyiOFZaXkQ8Ht+pQrfmIeFx6fhzjOJNt1NnziIHD76SyjFX5zDgvDxOvCKLiY/6mDvTQTQsIMc4EIk8s0W5xP+M88yuRGB+tl7z8NMV8EO8CX6b7eDJx5IZfWUmA87zc8QVOdz7Yhq/LHD+v/SSJNfOiW4wioQVRaG0vIiyimI6duqw/Pbbbr9l4R+/7f7Ek09c36dPn9Vb+r3b7rj1TqfdHQw0BHb4wPiPb9zmyygudaDFBI+NqeLjNyrJKjBTTtQWdnfdTPXpBbUlEkNG5fLBDMPr2+dR+eWNMvodGDfEt/hnB4OuAavg6PMivDq+ioaghKJBuElQVmGnrMJGQ0hCksx1ssX5r5OWmkYsHvE++MDDY6wZZ9FesDphWrRpgsGg44UXXrzA5fCg6y3bGcgSROOCqgob2elxDj40gj9X5bcFDhatdpKRoXLekUHDjquloqSd2WRWQNf+CvM+KGXEOTks2+hk0Tonex2fx4dPVbLfkVHE2gS6PcpG7qXwwIVXBDl4cBOX3ZXOV78kYXep5KRrtGaNmCzL1NRVctQRx34+aPCg31p6fHZ2Vv3NN497+Oabxz08+dXJp7322pQzv/v+24MAR5LLR0pqyqZNdWcEucuh489SEUJFVaG6TuL9r7y8/5UXu0ule0eF/j1iDOkbZa/uMXbvFCO5QDcaAClACAhjeCZr1jzcruEvAAfgAbyA3fg8Q6WCxQvtLFztYPZiJ/NXOFm5wUY0bIRXXR6V7CwFm/yn0N5Z20BDMAsaGhoIhusBYsOG7v/zmWeeMeX0M05/3ePxtJjPlpubW3vZZZc9M/HxR27y+VLQ9dYtypRlqK6XaArbGD4gxDO31dJn37jhUBKk5Wi1ZuTY0w1++87BcZdlU1xtdMnslBNn+ivldOuvGJ0ut7coPdH1UQFRDqePCHHzi2lU18v06Rxj8LEhKqtkZs93UlJmJyNdwe3SW1zjVE3F7UzitclTzrnjzttuT0lJabJmooUlwC0sdoKPpn18fFVNeZ4/p7BFUSZLhgNAfb2Ni0cGGHNpA527KZALl52ZzpxFSeTnRAxbshD/3v2PYFPlf353lQXTyjj6omy+mZdEVYPM0LNyefnOGs69LIgoN73AbS2I8CYQy6BLb4Uv36rkieeTuXliKsWldrKz4thtrdNOOxwOA8Qm3H3H+O393bPPOfvNs885+80ff/xx8KuvvHbuJx9/cmxpeVEuQFZGLg6HA20n31TzTUGqVyPVazxXLC5Yuc7O0hVOXv8kGcmh0bUgzp7d4+zZLcaAnjH6dIrTMVcxouQujNz9iCnKoxhpRP/rQtscmzgBt/ljNz+fWiheJ7N0vZ35K538vsrOwlUO1hTbUJoMhSjbNVKSNdKT43/7znYWSZKIxxUqq0sBSElOqz7t1NM/Pefcs18ZMWLEjO19vnG3jLnnueeeu6Q+UOdL8aXs1AFxx98TqCoUl9px2FTuv7aGMZcHjMPOcvNCrSXxrRr1EBTAO694OGNMFnHNKI4esluYL16qJKWjZvRC2LGa6cQHT5MxF30ejdJyJ707hHj2yVoIQPFqG4+8lMxjb6Xg82n4kjTUFpaCtLR0SsuLsqdOfWf0xRdf+Ko1Qy0sAW5hsRN8+OG0kc1RtZb2vJgC9fU27r+ohjEPNEAdUA3EoDpgqG2bZPhM75LcXxn0NeAs1Jk+tYJLb8rguQ+MHMvzbs9i8So7j9xVh0hKoFjKdElhg3GVf9V1jRyzf4RrHkzn4++TQNYoyFHRtF3XbESWZWrrqzj+2FEf9+vfb/GOPs/w4cNnDx8+fHZxUdH4qVPfHv3eex+c9OucX/YBHC6Hl7S0VIQQ/5jocdh1stLUTSo6rgg2lNpYtdbBe195AY3sbJXOeQq9O8XZo2ucXoVxuuYrdPbHsWdiRHdTwe3UEYIWxcF/AbdDh0zzhsBhzqEwKNWwfp2NNaV2Vmy08ccaB0vX21lbYqOiUgbdSLa3OzVSknQcKfF/R9MJga5DIFBPuKkRIDag/96/jTzh+PdPPXX01C5duhTv6HNnZWU1XHPtNY/dd/89t6WmpO3SKLgAJFmnrNqGGpMYMTjM4+Nq6b1vHIoT8PZuprnY0gW3jUtlwotp5pcoOOuIBiZPrAanETjYJcrAdDey24z/pz4owQYgDgUdFSY+X0f3XIXLJ2bicGg45MSW7Y8+/GikJcAtLAFuYbEThEIh2y+zZu/rtHsSin6XVdg54aAgY+5ugA3GxiTsxkLfnGKsaoK4Cm6x62aYXmT46z77bA09u8S59uF0QOfR19NYusrOO09UkdxThzUJuLHIhu+4WAadeyl8NLmS16Z4GfdYKsWlDlJS4yR79F2SlhIMBgFi99x317h/4vkKCgsrb7jxhiduuPGGJ6ZPn77/21PfOfWLL748vLSsuBOAz5uO12t4E/+TEUi7TScjRYcUzRwjEIkIfl3k5NeF7k1qITVNpUOuQvdCha55Cr27x+iYZnzQTvt/u5pTkiAUFZQvl1k118aqEjsri2ysLbOzaqONDeU26upk85QISBreJJ2sDA2b/O8ORiEkwqEQ9Y01AGRn5RafeNIJX55yyslvH3nUkd/8U//O2HE33ffM089cVldXk5mamrZLouCyBKEmQV2dg8zUOBPG1HLJeY1GdDrRqLeZ700PiFXA6Auz+PAH76YoxITLarj1lgA0GJ19d5kqkEBRIa42f4/mn6tm2l0ALru1kbmrHLz6qY8Cf3ybB11d1/G4kpnz69zBtTW1SekZ6SFrF7WwBLiFxQ4wZ87c2tLyouSsDH+Lj22MCBxOjUcvqYUo6AFzY9KN/ya7DduMYETQEJbw2dRdOsv0ahARuGZsA727xRh9fRb1IcGXvyaxxzEO3n6skn0Oixl54eEWNtXmaPhGEG4468Igxw4Pc/NTqTw7NZlAvURuThxZGPZk/4owkGXqG2o4bfQZU7dWvLYzjBgxYsaIESNmVFVV+T7++JNjP5r20cgff5hxQGl5UTpAWkombrf7XxFBsgRej47X82eUXNUgGhMsWePgj2VO85SkIzt1ctJU0pL1/2ybc0lAdqbCPVNSuHVSKiXVNvSYtEndyXadJI9Gdoayy5pGCSFoamqitr4KAI87uf7ww46Ycdzxx3503HHHTfP7/bX/9L/p8/marr3u2ol33HnbPWmko/+L12jCtO0rLjO26PNGBrjv6jqyd9OM4EKIxKLemuGHT1dYNMPOKddksWyjC9Bx2zVef7CaE84MQ5EZSd+VikA2DhfhJkN5e5yakcIUNsS5HgLRAI9cWsf7PyRRHxSbHHC2RnJyMhVVpdmzfvml7Oijj/JZu6hFm15brY/Aoq0yb+48AOz2be8KAgjUyxy5b5iOA1Qo3mxz0gEnZKUaQqomIFFZJxt5q7sSM3LNSjhsVBMLPihjr25NgGB9pZ3Bp/l5bqIXCsyGGEqCzxkFfRmkZmo880QtP00uZ7/+EcorHJRUywk7CWwvjY1BQIrdedft4//Njy0rK6vh/PPPe/3jTz4aNXf+rwMeevDhq4cPO/CbSCQcbHaziEQiCCH+VYcKWTJcVrLTVPw5hu1hbrZCmldrldz7XY0sQ1mtjdp6mYxkjdzsOP6cOP4chex0lSSX/q+L72bRXVZRTGl5EY2NjeF9hwz94d577rtxztxf9v7iy8+Pu+SSS17+N8R3M9ffcO3D6amZlTV1Nf/KeBPC+KwramXKyh3s3TfK9BfLmfRMDdn5GiwFPULiKScZQGeY8nwSA0/ys2yjsfD1Kowx//1STjgjbFgWNvLPWA1uD3aobZCN1BMgK1Uz1mV9M3VSCum7a4w6MESw0dbiWiabg3D+vN+wsLAEuIXFDrJy5SpDQ7cQWtRNGX70kAgkmdaCzX+nG1GdgmzDfDvWJFFc2QoC3Jxtugr6UujUW2HBtDLOOqrBfA8Sl96dxbkXZaDFzdbqOi0nPTYXfFYCq2DowVF+nlrOc7dX0SFToaTMQSAoIf+DM12WZQKNNZx91jmvdevebeOu+vh69Oix/oYbr3/ihxnfjfh17i9733vvfdcffOAhX8bj8frS8qJmUYau67vELk4II30lkfqE9o6mQbLbKJpsfs///udrhIGDwdAm0R2JRIL7Dzvgm7vunDBu9q8zB82c9dOB424e+/Buu+22eld8Dl6vNzZ27Nj7mqKh2D9doShL0BgWFJc6yPKpPDa2mjnvlnHIUU2wDvQy0GVa/md1EJpp9yjBFVekc9Yt2cRUYxE48aBGfv+ohN4DFFhmOJK0ihJwQmmNTEOD8Y93yFGNHPTNDrS6Zgj1o4ZENo3Dbb51cyKuMvcOC4u2jJWCYtFmKS8rT+hxsbjA7lQZ0DO6ZXcTBbr446aalVhRbAcp0lx/tGtpFsxrjSYkk1+spv9jUa55MAMQvPpJCvMWO3njkSr2GB5HrEvwutn0DWeNUaR58RWNnHZ4kLteSOXJN5IpLrOTnq7gceo7XTBYV1dLxw6dVz/y6IPXttbY2GOPPZbvsccey8eNG/vo0qVLu3391fRDp0+fPmLunHn7lFeW5AHIOEhLT8PhcLSKa4XFjonueDxOXV0dihYFIC01s/LQEYfPOWTEwdMPPXTE13vuuefy1nyNN465/rEnnnjy6urqqk7p6Rk7PbZkCSIxQU2NDZusccVp9dxxST0ZvTWjyLLSnP+JiGTVSEujC6yeY+P067OYs8wNGJP+nitruXlMAMJGv4JWUwA64IDVxbZNRbpd/PG/BxwE0Ah7dInh8So0xQRup97iYlheXm5NJgtLgFtY7Ci1tXXYpJZD1Y0RQec8hR4FCgS38IAI9C6I40tRaQhIzFvugCAIm9mwopVmnl4BIghXj2lkwO4xzrwxk/XlDhavc7L3yX4mjq3jsksaERGjKCmhK+LmIs2lkJyl89D9dZx/fJC7X0zhjU+91CJ22rYwHAnTsUPHjRkZGcG2ME769Omzuk+fPquvufbqZ4qKirJn/DjjgO+/+/7AX+fM22fJksV9dVQHgMeVjNfrxWazWYK8DQluVVEJhoKEIg2bVFfvXn3+2HvvgXMOPOjA74cP3/+Hzp07l7al1/34ExOvHHXiCZ+oauoON5GSzCLEsjKjUnzUoUHGXxhgz/1jhoPTUlObJpoaohiHelLg1eeSuGJCBqGoUQjjT1eYfH81I0Y2/emc0oq7v5CAKMxdYdRTuDxx9ugcN6w+/0oIOucqdPYrrNhob1GAu+xuAg0N1uSysAS4hcWOUllZic/Xch1NLCbISdPwJOuwJYezRujYRaVv5xizFtqZu8JBvFRgT9ehsRXfoGzkc4plMHRElEUfl3LmTVlM+yGJmCJx+d2ZzJjj4qUJ1Xh7mS4piVwXC/OqugZEDfTaPc7rz1dz0ddB7nkpha9negCjhTtsf/pEbo6fGT//MPSsM8+Z9NqUV89vS2OmsLCw8vQzTn/n9DNOfwfgp59+3mfmzzOH/vTTz8N+//33vUpKizo1P9bt8JKcnIxsk63JtgtRVZVgY5Bw9M/J58/J37jf0H3/GDZs6E/7Dd3v5333HTzb6XS12ez6WbN+2U8S8g6lOjX/SkmZDRAM3zvCLRfUM+LIJqPmd5WZepHosNRAyEAviJXBJTdl8MrHPpqv+A4dFOKNh6vI7KHBSjPo0NpD3g2Uw+ylDuMQ3SlOr27xLa/HcbCnQH6mypJVTpqj+VsjyZtEXW2tNdEsLAFuYbGjBAIB3G53y81YNMPbGYkt50xHgc6w3+5RZi1MYl2Rg58WOTloZBM00Lr9x023A5aDN1/nw9cqefQJHzc8nIaO4O2vvcz+3cFzd9Zw+AlNiErDUSWhmdv83MVGtH//EU3sP7yJDz/xcM/zKcxf6sLlUclM3b5umkIIsjP9jimvTz4jPz+/+L7777m9rY6hYcOGzhk2bOicsePGPFpZWZk6f/5v/WfNnDX0t98W9Fu6ZGnf9RvXdtu0GEpOvF4vLperzbQcb+/ouk40GiUYDBJX/2xOWJDfce2w3YYu7ddvr9/222/fmQMGDpj3bxZP/pPcNv6OWx959KHrcrLyt3ucyLJObUAmHLKxe7cmbr44wOiRIUOQbjTrVyQSz8lWQaQBfvjxMycX35bBio1/VjLedXkN428IgI7R2VKm9Su/dCAdFnznYMlaQ4AP7BkDv7FWbfHxMjgdiT29y+Uyi8QtLCwBbmGxQzidTuLxeMtXvBJEosJwDrFtSQSAUOHIvSM8NEUFXebjmW4OOrHJNJNrGzNRLwWRDNeNa2Bo/ybOuTmTZeudbKhwcMQluVw7M8CjY+oQPYC1ZpQskc1UMh+71rAkGzk6zMhDwjw4ycddzxjdNLfHtlDXdex2O2kpmY77H7h37O59+y457YxT32nr4yk7O7v+iCMO/+6IIw7/DqC2ttY7f/5v/RcsWNB//rz5A5YuWdZ3/foNncorS1I3CSbhxOdLxuPx7HRXzv86mqYRjcYIBoMo2p9i2+NKplu3rn/07tN76cCBA+b367fXb/0H9v8tOyu7vr29x3ffee/4CXffOT41JcNhs8kJjwlJGHHb4lIHdlnjzstruO3iAORi2AqWbqfw1s24QVcgBLfenMo9L6bS3Du+a16MSfdUM/yYqJFy0mzL2gYQOuCCD2d60OISoHH43k3GGqhtISAiAXEIRQRILS9QiqJit9utCWlhCXALix0lMzOTFStWkJqauu2Ih1OnrFaisVGQnKND019XfKAGhu8dpWeXOCvWSnz4s4cHV9XhSAcCbeQNy6b37VLYZ3iMxdNKuezudJ5/LwUQTJySxvezXTx1Wy37HRZFVIBeux0bq2RG2JYb7ahvuqWBkQeHuXJCOl/N9uJNVkhNVlHVlqN6mqaRlJREJBJ2nH7maVMG7jNwTo8e3de3p/GVnp4eHDHikBkjRhyyqTX5kiVLuy1etGiPhQv/2HPFihW91qxe062kpDRPVZVcISzTqC1uIjYbNbW1hCMNeD0p9T179ljftVuX1T179ly55157LNhj990Xd+/RfaXL5WrXJ5gN6zfkjR596ltOu9vhTfKiJnhtJMvQGBIEAnb27xfm6dtq6DssDmWGheh2R6VVEKlAPsz/zsHld6Xz62L3plDCmUc38PztNbgLdVjRRlJONscH2jp4+zsPAPn+OEcMjkANW76NdEBTtaCkWsbuaFmAh4IhOnbuYE1MC0uAW1jsKB06FLLwj/mksm0B7nXrbCizs3yjnb27xYy0kr8SBNENTj4gzIS1LjaWOHjz6yTOuTpkFDy1FW3VnDayGqRseO7pWkbs28QVE9Ipr7OzcJWLoWf6ufmCeu65tv7PaLi6He9BNnx/xRLo3lfhy3cqufehKLc8mUYwLFGYE0dJQISrqkpWZjZFpesdp5x86tsLFs4b1N7H3G679Vm92259Vp8y+pQPmv/s3XfeO/7U0ad/mJ6ejs1mLZl/paa2in32HvTNFVde/mSv3j2X7ipLwF3NySed8q6mK67srAIUVUnod2yyTkmVDS0ucfMFtdwzrh4cGPZ/bKcw1szixW7Genb3HSnc8XQqqm5M/DSvyuM313LmuSGjq+Vyc4dvS+dGDfDDJ5PcrFxnFGCOHBrB1VOHdVv5HQ+sLTe6rXrdLQvwYCRAnt9vTUyLNo8V0rFos3Ts1NHQpC3kWTpsOlpcYu4yJxhN3v6GDhCCC44IYncam+fE93xQZtj2tTlk0KuAdTDqjDCLPirl5EMbN6n0e19Ko99IPz984YRuRqt7tsfRRRgOC/p6oBZuviPA1y+Uk+JUKSq1I8uJJeYoqoI/p5CFv8/f6/77HrzuvzgO99hzj4WqrlopKFshHAmx98AB80adeMLH/1Xx/fhjT142Z96vA/3Z2yG+bTpFpXbsus60xyu454F6CBkWpLqRKZI4Koh0oCfM+dHJkBNzGf9U+ibxfezwEIs+KuXMC0JGLnkFbTK8JtxAHTzynlFcL2wqlx/bCLGtFIPrgBcWrHLQFJZxORJZl/RNe4eFhSXALSx2gN69ehnLqd7Scmv83y/nuqDBKDjckuCkHDoMUTj90BAg+GOFi3eneaBwO8XrLpydety4ps7M03j7lWpevaeSzBRDACxc6eLA8/xcdV06kaBA9Abh2M73IpuWZMthxAlNzH+vlA5ZCsWljoRFuBCQ5E52jB8/fkJJSUnmf20cVldXZ0pIVmHmNgg0NPxn237XVNf4bh53831uZ5JDSImNAVnWKSqxk52iMu+dMo47I2w4kNSz/VFvG4heoCkwdmwqg0/LZfYiNwApSQrPjK/moymV5HdWjch6rI3u7CrQEb75zMVPv3kAwcj9Q/Ta30jH2dKBREhAE3w5x71prWlpLQLo2bOHNSktLAFuYbGj7DN4n8EStlgsFm3xsck+le/muyhdIkMmW46Ca0AcbjsjgGQzVOq4SWmwEUQmLblbtQ7NjXtKgBI4+8IQi6eVcsrhQZptxp58I4XdR+bx9mQP5ILomGAXzc2FvgYsga79VH77oJSuebGERbiu66SlpaOoMc/4W2+/xxq5Fv8lbht/x4RwU9CXkZ6ZkH+8TdYpLrXjT1eY924pfYfGYcl2dpxs7maZDxTCR2976DsyjwcmpaGbT3LcgUF+/6CMS69qhErQixLslNka6KZbSwVc+1yauThpjD89YNzGbe1SIR0aVgi+/NWN26u2GIyJx40nGjRoH2vgWlgC3MJiRxkwoP/Srl27rQ4EWq6S9CXphIJ2Xp3uhVRTgG5ptJdA5/0VLj++ERCs2ejkjqdSIMeMtrRVZNCjwDLIKVSZOqmKqQ9V0iE3bryPYgejb8zhhHOzWLnYBr3MDS/RaLjpHa6vhIyuGr+8UUZ2mkJxqR1bAiJcVVV8yelMnjz5rLVr1xZYo9fiv0BRUVH2Cy+8cFFyUhqa3vIJ3SbrFJXb8SVpzH6jjMI9VPRlZkOdRIWxCsIH9IENq2VOvSCT46/KZtk6oylZTnqcV+6uYtprVXTsbraTj9C2Ci23RAE8/mIyi1e5AcHphzey12Fxw3pQ2vLnQCa88a2X6ho7ad6WP/9AIEBhfqe1A/cemGqNXgtLgFtY7AT77z90hqJFW7z+1zVwOFVe+MSLusqInGw1Ct4Id19eR3qq0Z7+zslpLP3Kblh6KW34w2gWyaVAMZxyVpglH5Zy+an1NIfvP/zWS/8T87jjthTiMePqWjhIPLovGy2qs/po/Ph8GULWqa6XSaTZny85GU1XXBMfeex6a+Ra/Bd45ulnL1e0mMvn87UY/ZYkqGuQQYNvniynw94q+gq2r6GO3ZizCLj/7hT2GpXH1C+STfWuc97IBhZ/WMo5FwUNF5Wi7RT3rYECohMU/SQz5vl0QCMpSeXRq+sguvXot0gFNsAT7ydjs7ccSRBCEFMi7LffvrPcbrdVsGFhCXALi53hmOOO+QhAU7e9nupAZprKhmInz7yTbPjralse8XoZ+HbTee4a0/dKE5x8WxbUmq2c1bY/a/W44XLgTdV46vFaZrxazuA9jD7OoSaZO59NZ/cT8nh7ShJkGxugIEEhbkbCe41QmHJzFZGwjXgCBxNVVXE5PLz99rsnh0Nhyy7Eot3z5utTz7DbnOh6y4uCokIwaOPpa6vZe2QMlie4w+rGjZ3oCPjho3c87HliHuMeS6c+aEyjfr2a+PqFciY9W0OmXzOi3lHaftRbNQvEm+Ckm7OIRg2z80cvrSV7bw1K2Hr0Ox9en5bE8rUuMtNbTj9pPiAda+4ZFhaWALew2AkOPfTQrwvyOq6vq0+sSZ7TpTJhSgqRxcIQ01sR4WyAk84Pc9KBhmfhkjUuLrgpw0hf8dI288G3JJSrgFUwbESUX94t57Gx1eSkG2kpK9Y7GX1DFkeckc3cnx3QHUS2ubklkh++Bk6/OMzIAxqprErMGSUtNZ2qmvK8adM+Ot4avRbtmU8+/vTwjSXrCjLSMlsUf7IMFZV2DhkU5LJrgrDOLB5vKTKtgsgAesIf8xyMPDeL46/M5o+VRrpJuk/h/utq+e39MkYc02RYjpa34Vzvvx4sPEA23HBrKr8uMXy/R+wT5KLLgoZbi9jK72UabjHjX03FZleRE3ivdXW1+HPyNx573DHTrNFrYQlwC4udxO12aaeeesqb0XgEWZJbiIAYUfCqGge3PJcK6SC29CsC9LARlXn13hryMo1UlEmfpfDU/cnQ2Uzb0NvHDNZ10FcDIbj6+kb++KCMC08KmKcIwZc/JzH4dD9XX59OQ61A9DA/l20dMoTRFAgVnr2uFqdLIxBsOdzW7BLx+WdfHGWNXov2zKeffnYU4JBtLY/7xrAASeOZq2s3+exvUyBrhmOH6AZNIcGYsWkMPMXPtG+95i9qnHlsI7+/V8aYmwMQN26lEu5+2xbEtwR0hSmPJ/HI22mARppP4e0Hqo31ZSufkQDIgQnPp7C+2El2htpih15ZlmmKhTnhhJEfJCUlKdbotbAEuIXFP8All13yrCTZmxqDjS2v+zqkpsSZODWFhZ/aoQtbTikxnUU8nXQ+e7yS5qr8Kx/LYNpLbsNbW2onIrz5/YSApZCdp/LCEzXMnFLOiCFhY7/XJZ54PYVex+bz0Ttu6JTAIUMGNkLOIJXLTmigscHWYi64ruvYJAfz5s0faI1ci/bMrJmzhsrC3qL/uyRBoN7GOUc10v0ABTaw7dQQ3bRK7QLTP3PR65h8Hnw5jbhiTK79B0T4dlIFrz1XTUEXBZaaYlVuJx+cboronvDtWy7OujuLZsemjx6qJK2Phr5xK+9HBTrDqm9t3P5KGsm+eEL/ZCgUAkTs0ssvedoauRaWALew+Ifo0qVz8YmjTnwv0FiLLLccBfcmGarytAlZUGPmIG5pD7UZkeO9Dovx1oTKTdNh5E05zPzIaTiJ0I5EeHORZjmwFvY9MMrXb1Qw+d5KuuTHACirtnP81bm89aoHEuhVoQNE4PKjG7E5VEJNLd8Fp6SksXLVyh5z587bwxq9Fu2RxYuX9FixfEUvny+1xcdGYiBknWtGNoJqdqVtaVJ1gs/ecXPoRX42lNsBnYKsOM/fXs2Pb5dz0OFNsN4ouG7zRZZben894fdv7Bx+Vc4mqfH8mCqGnRCF1VtRHprp3BSBsyZkgiZI8WoJpP/I1AWqOeqIYz7/rzaCsrAEuIVFq3HrrePuAWKhULjFx6oq5PnjLFvr4rq70iALhHMbQnoNjL44zEOXV2+aEgddksNvXzugZzsT4eas1nXQ1wA1cNYFIRZNK+X60+vNN6Jz2s3ZLPnBjiigxVQUyqHrXgoHD4xQX99yGM7hsKOjOJYsXtLXGrkW7ZHly5b3imtRl9PpaPGxtXUyQ/eMsOcAs6GMtG1xKvJh7Rwbx12XvekPLxsVYPHHpVx0eSMEjMBAu0k3+X+LL4iesOIXG8PO9aOoRtHl+HNquei6oHGoULdwoGi+FciDO+9NYfZiD7k5cVS15ZNHOBwBiN1+x613WiPXwhLgFhb/MLvvsfvy0Sed9k5doKrFKLixoAvS0+JMfCeVjycZKSVbFNHCdBMohhtua+DGU+sAiVhcZtg5uSz5yd7+IuHNyKA3GZ00PV6dh1+o44mrajZN/TFPpUHcTEXZFnEgDQ4e0GSG4xJj3br1XayRa9EeWb9+fSegRftTw1lIYv89o0YDsBZ6hgnZ2HVveyYVVZUBnQnn1/H0y7WkZJjuJmHaT7rJ5miG+F7/m439zvTTGDEqRS8+tp677qmHctOvfCvRb3rA9285ueOVdFJT4wkVXsqyTG19Jccdc8LHe++z90Jr5FpYAtzC4l/gwYfvv1GW7E31gfqWfcF18Lh1HE6NUbdms/YnG6IbW/b5lswcywp48KE6LjmuHhCEoxL7nunnjx93rQgXwsg/F/JffiTz77bryfjTLWUlXDmmkVMONbpo/viHk6LfZUhp8SwDMRjQIwaSipKgTWNxUVGhNWot2iMlxSUJjV1VNxaFgT1joG/F1WNzfFC7RGL6by5A5+hhYW4dHzAiwzvgbiISWC/+dZq7dvaE1fNs7DPaT02D8UZOP6SB556shXrQ67eiOBQQXaBigcRxY3OQbBpej95i4aUQgsaGRoDYgw/dd6M1ai0sAW5h8S9R2KGw/OZxN98XDAViiexSqgo5GQqKIhhxWQ7RUmF47W5JhMug1wEBePapWs4+PABINIRlhpzmZ950B/T5hwszTacAkQzCD6IDiM5AAZANZGA0FEo3/3c2kAd0NB4nOoIoNK60Ra5hZyZSDOsv4TSbetiMCLfwAknG7/fvEQMEwbBESa0MzgReaxN0yFZI8WlE44nt6nV19anWqLVoj1TX1KQn8rhYXOBwa3T2x6EpgV9wQEWtTCBkJHbv0TVm1GJ4jDkqHOactZtz2GN0xRQZIHLMuV5ozv1OxlpA3jbWiwJzrehgrjG+f2ENE0BvWPaLnUGn+qkK2ACJE4Y18vrz1RAxAwDyVsR3gSHOD7kol8aQTF62gprAIV8IiUCwNnbtNdc/1qNnj/XWqLVob1jNMizaFXfdfcddr02ZcuaGjeu6FeR1QG1hpVZUQX5enLWlDg49L4cf3y1H+I1mPH8b/WakWAh49bkaxKXw6hcphGNGJPzTpyo49KQmxBozbWVHjq9m0w185gbZBA3rJJbNt7O+TKas2kZVvUQgKBFuEsRVgRBGi2uXQyfJpZPs0fAlGf9N9WqkJWukeI3/3fwjuwGXGSJTIBaCtcV2vnjOxVPv+wCN1GSN7h0VCCXwuuOQnKTj8+jUNCS2g8diMYc1Yi3aI5FIxJPI4xQVfB6dZI9upGq1RBg6dlTITNEoiei8+oUX35UaRx8SoVumgjNJB7s5veKghaE+JFHfKFEflAiEJOoajfWhISzREBI0hgWhiERTTBBXQdcFNlnH49RJ8WpkpmrkZap0zFXo1TFOWmfN8OeuxohMC3asyNPs3EkPmPmpk8MuyiEUNQ4WJw5v5N1JVaCYReFbUhqq2ZfABsdemM3idS7y/bGE8r5lWaa0rJg8f0HpoxMfHmONWAtLgFtY7AJee+3VM4cfsP+P4XDI4XK5W2wRrauCvNw4M/7wMPriTKZOqUZkbyUqYwO90tgYXnmhBscV8MJHKcRVjcMuzeW16irOvCyEKAI9wPblaipGhBo/NK0VvDvJw+ez3MxZ5mRjuQ2lSWxB1Yv/r97/qubRQdZxuXS8bg2vWyctWSPdp+FxaggJIjFBRZ3MhlIbgU1FlDK3nFlLRm8NihJ7+ZIwo126NQYt/uNsxxjfNC8SIQiezjq3nVPPxffnUFphY+xTGdz7mkLHfIWcNGPe6jpEooK6BpnaRolgWBCMSESaBKjNinlL/6jY6lohOzUKcxQG9opx+JAIJx8SJrmHhqgwb/+2Rw2oxs0dHeHDV92Muj4bHWP9Om1EA288X214l5dtQ3ynA6lw4YXpfDrbS25OrEXHEzBSTyKRJjRdjU2a9NL51mC1sAS4hcUuYv/hw2ZfefnVTz359ONX5Od2cOgt7JbNDelysmO8/YOP5Et0Xny+BqGDXr0NEa7B80/XkJai8sBr6YDGWeOzWb2xjjtvr0d4DJuwFmeRbkaLOgJNMPERH0+9k8zaDY6/C2xZJclj5EA67TqyGWxWNYgpgmhMEIkKmqKbbcSqRFMImkJGUGv934T7/9+Qk5MVbrmglhsub4CqBDv2SdAUg2icFr3Am3E4HDFrtFq0R1wuVyIJJciSYUMYjYuEDuO6DqIcLrowSFQI7nguldo6Gw0NdhY12Fm0jXn794O3htNpRLqdDh2HzVgvhDDWi2hcEIwIgiEJVAk1KrN+o8z6jU7e+9rLXS/FueTERsZdEEB0Bn29ef5vaS1QjJQ3UuHBu3yMeTzDfE0Sl4+q56mJtRACvWIb4jsNyILrrkrjpc9SycqMIQkSFOASNXUVsXPPueDVw4847DtrtFpYAtzCYhfyxFOPXf/V118dunLV8r6FeZ1QVKXFjc8mQVZmjJc+S8F+hc4zz9QihCG2/zYTbKDXgFDh/ofrycrQuGGisdHc9WI6y9faeePRKmw9gDXmNim2LsBFNyhdLnPSdVnM+t2zaWP1JCn07xNjUJ8ofTrHKcxUyE5VSU3S8Tg0bLLxSEUxNtRw1IiEGdfPEoGQoD4oUdMgU1UvUVUvU29GzJriAl0Hh824Ii/MURjYO8bIA8Lk76lCmdm8J5EovhOqAjK1AQlfUmLhwaSkpLA1Ui3aI95kbzCRx9ltUF8rUVEr08uZQA6KMJxARC1ceWUjow8M8f73Scxd6mBDuY3GkCCqGGlnTruO162TmqyRmaqSnaqR4VNJ9WqkeHV8Hg2fR8Pr0fA4dVx2HZtsCHBFMyLogZBERUCmuFpm2XoHvy5z8NsSB42NNjaW2Ln58Qze+dLDexOr6NpPQV/15+vc4jqmA92BAJx7QQavfurbFOK44+Iabr8jADVmYGNbke8sGHt9KhPfSSMjPY7DDi30OzKWZdlGUel6OnXsvP7lV1682BqpFpYAt7BoBT7+5KNjevXquaKqpsqRmZHZYj64poPDZojwZ6elElcELz5ds+2c8HoQClx/cwMdCxROuymLuKrzzrdeFh9rZ8pD1fQ/OIbYsJVudYohvlf9ZmO/0/1UNdgAnTSvwvmnBDnjsBB79owZhVMSRh5p84+2WQCsOTtFMl+nvFm0SjY2NuJADIgATYZo13WMTdmD4XbiBuqBteZTJyK+dcADC1Y6iEdlHKmJdafz5/lLrVFq0R7x+3PLEtpAZR00iXkrHAwf2WTcqrUUQTbtQcVqyMrTuOTKRi5pMkQtYYgrmHUfGHUcbsBh/jTPdfNWDXWzn+b1Qt9sXbCp7G6PG3nlhKAWlqy28+bXSbw41UtVvZ2FK1z0OyGPGa+Vs9d+MfTVW1gXVBBJQCdYOsvOWTdkMn+la9MC8eqEKs6+OAQloDdsRVkoZs53Klx3dRoT304jPT2Oy6knJL5lSaamrgYgNm3atJHWKLVo71guKBbtlp49e6yfMuWNM5uioVgkEkZKIDdicxH+0qepnHZeJtgMZ4GtuqOEgNVw4tlh5kwtpXOukVmxdIOTfU7x8+h9Pkgz3Qb0zUSzargWNG6QOODcXFN8w4H9wsx5t4yHHqhjz4Exwzt4A+jrQC82rm71WkP86wHzp978s2rTrqwE9CLQNxq/RxFQYYprFXCCLRnsPlN8K8bf62vN59mOwishG6J++nzXVoNjW6JL1y5rrFFq0R7p3KXzWqDF+pJmAfrDQic0bkdISxiW+nq9MScpNw/QbmPO2pJN4a2ZwrzSmOP6OnPOF5lrQLlRy/L/1osG87+1xu2eXmKml6w35vFue8a55+565r9fxlFDjArsxiaZA8/LpWKZZKyF6p+Hb9GcPpcDzz3uZcAo/ybxnZceZ+br5Zx9aQjWbSUI0Sy+84EkuOjiDCa+bUS+3QmKbyEETdEmwpHG2AvPv3TxnnvtsdQapRaWALewaEXOOOO0d66/7sZHa+qqYqqitugPvrkIz8mO8ta3Pg49JYdYozB8wlX+nnYpga4Ay2Cv/eIs+riUkQcaN9SqLrj+4UwOOzWHxfNNv/B0I3VFuIwN+axx6ZRW2wE4aXiQ7z6ooFtfxWi6UQJ6bOfrGnXd6Jynq4ZDix4xDg56yGjsocfMznrb/cRANlQukvlslodkn9Lia43HFUDEdt+97x/WCLVoj/Tp02epQI4ZY3nbpKSqfDPXw/qFNvCz7c6yW5tmmjlHw3+Zt1FzTmuJ5Ue3NJX1uFm3shQKu6l8+k4l5x3RAEB9UOa0MZlG4MBjBhBSgT6waomdY8/I5tIJWTTFjau3wwaH+ePjUvY9JArLjde/VZ/vzsYBY+QZWbz4SQpZmbGEI99CCHRdp7q2InbZpVc8c+FF579qjVALS4BbWLQBHn7kwXFHHXnM5+VVJTGRoB2BphsFVP6cGNPnJTHweD8lK2VE7604fQgjaqyvhKQ0nQ8mV/HIDTXYJCPk/fVsDwNP9jP+1lRCQQG9gd3gs7fdTJth5Enu1bOJd16oAtVoE7/D9l+7EAGQCo9PSybYaEso/zsQqKdrp+7r99tv33nW6LRojwwcOOCPbl17rG5oqG/xsclunaaIxIPv+gw/77bexbI5+r4OCMGk52rYv18Y0Pluvpc3JydBbxC9IR4T3HNXCv1P9PPJj0mbpPyEK2r4cmoFGXka+oqt1MCYOeOiN9QUSQw6wc+0n5LJzY5htyWW820IcImyiuLYgQcc/MPTzzx5rTU6LSwBbmHRhvj0s49H7rlHvz9KyjYiy4ndA+tmE4l8f5RF653seWweMz5zGpuPmz+vYTfHZkaQquC6MQ3Me6eUYf2NWsNoXOLu59PY88Q8XnjGS90aiSc/TgZAtum8eWs1pBhpJu2i+kIBOkPpTJmH30whOVlpMYouhCCuNjFoyD6zrFFp0Z7Zf/jQGXE12uKtmqpBSorCsx/4WD7dDl3ZcjpbW8P2p1PJlFtqcLqMYMJTnyRTt0zi9ZeT2PMkP7c+kU4wYkS999ktwuw3y7n1tgDUGakwW0w50YxGQvSGed872Ou4POYsN3y+JSnxaL4s2ygp20DvXn2Wf/f9N4dZo9LCEuAWFm2QH2f8MKywoOPa4tL12LZDhGuaoDAvRk1IZvi5fp55OBnyjc5zW80LDwPLYc994sx4u4JHb6omK81Q7GuKHFx8RyaDj87ljzUOQOekQ0L0PjAOa9uJ+FZNq7EonDQ+i1hUkJKstph+opv9o4899phPrBFp0Z4Z+X/snXd8FNX+/t8zs3032fRkk9CboCBNQEQEwYLYQEEQEQv2gopdr/3aGzZUVKQpNsBeQAWlSFV6U2p6z2azfWZ+f5xJCAgkoN/v736987xeXK+S7M7unDPnOZ/zfJ5n2HlzgaiqNl6qTXDroMFFD6VBpaF3/r9AwhVgJzQ/Kc64s2oA2FVkoc8FWYy9O53NO0RMrjdB5fEJ5Sz/uIjep0RgWyN671SgJbw72c0Jo3zklVtolh1FOwIpjUWxkFewi4z0zLxFixaeYo5IEyYBN2HiPxReb2J46dLFJ6alphfsPQISDiIxs5kvhtOtccMT6Vx+dSpqFKT2BzRW1qFOkrITqIFbb69h/ScF3Dy2mgSPCshsy7cSjQPojD61VhD3/wuLcp3PrxeuvCGVpetc+LLijSbUSZJERWU5vszcPeedf+48c0Sa+L+MoWcP/a5Vi7a7KirKGq+Cq5CdFWPddgcjrkkHm4hY/79AwnXDTWXM4FokWScSg20FVkDG5VS55qJq1n9UwD33VUME9N+Nx+GB7KGuYbOt+Lsbbkzh8n9lYHPoNMuOEVebrrezWITdoDcxqWzpsqUnpmekV5kj0oRJwE2Y+A9GbrPckhUrlvdOSUotORoSnpKokZYW493PvRx/Xja/LrFBJ5A8HFySUueSsgUys1UmPVPBr+8XcNulleRmqASDCmlpcXp1jAiHkv/kGacZ+Xrtxb+OuyyVd77xkpEebZJUXZZkIrEQl44bO93hcGjmaDTxfx2XXzFualNkKHW78qyMGB//lMCFl6SjR9jXU/KfPBtkoBJ6tI/SPDtGIKiQnapy46gqVr1XyOsvVtCsjSoaLQ9V9a5r3OwEW9ZYOWGYj9c+TCIlJU5GsnZk5FuxsDd/F25XQtWyZctObNOmdZ45Ek2YBNyEif8DaNW6Vd7yFctPqKuEK0dAwjVNBNfk+KJs3Gmj5wgfzzyeCEkgtRQVnoNWw2Uj2n47tDkuznMvVXJCxwihkIVmGSqZyZrw524qdNHMJXmEE4GUBFKi8OKV7Mbf/V0NnHXvlQu0g5U/2elzfhbTvxXk26o0fmwsSRKVVRU4HR7/rbfd8pw5Ck38E3DDDde/4nF7KyorKxol4bouUmKzMqN88nMCXc/x8fM3dmgDUnOjOVP/e65Lkow5azeeCYkNnhMJIFmO8L3C4PbqtMhUiYYtHNsqyssvVtCxZ0wEjRWJZ9xBGy018flIh1dfSKDrcB+rDL23w6ajHsHmoy5ox5uYVLZ8xS8ndOx0zO/mKDRhEnATJv4PoW27NntWr1ndIzen2Y68gl0oskJTHVKELhyaZcewu3XufC6N00dlsn2D5fDVcEOWQhnwB1TXiumV6NSQbDS9ChYDySsWtFCFRMkuhZJdCv4imXiNsQgmAdmG93hzkLIN+0O3WHwlI5JaOtjCLRk/4xY6d6kdkAEbf7Nywy0p9BmVxfLNYgG1KMIxpnFCIFMbquGWWya8mJmZUWWOQBP/BKSkpgTuvvvOp4LhQLQplkW6DrIEOb4o63bY6T8ui/E3pPLrChukibkmZRkba8u++XjAY0T8d9n4GZcxt33GXG8F5BjPAAniNVBTLFGyS6Zkl0ywTIJUI+491sQPqgE2SHCJh1RtWBa+4SWHSfltUPXe+7vCuWPTufHf6WDliPXeIBou9xbsIj0to2DlqpU9jj22k0m+TfyjYSZhmvjHonnzZkWrV6/qMWjQ4O83bFx/nC+zma3OU7YpiKsSKQkaqifK/OUuug6388hNVUy8yi8S3XYJj95DbWPrFtaYKokFron2ZFIyFBcr3PZ8MsvW24mpErKkY7OCx6Xh9WikeTVyM+I0y1TJTY+Tm66Sk6aSkxbHmoxI0FPEH6mucqWzLzUvDOEyic2brazcYuOrpU7mL3ESDCl4vXES3DqNBIs2WDgVCgrzyUz35f3rgfseNkeeiX8S7rv/3qenvPnWVbv37mqbm9280cRdXRd/crPj1IYk3v4kkZmfuxnUN8zQk0L07hjhmGYx3Ol6/TyVlAZzVEdox415qlZB/h4LeWUK+aUK+aUW9hQr5JVYKKuWqaqRCYQkIjEJTQOrAj2OifLCxApyc1SRTNnoQ0e8X0zd9xkOWUHXjGdKG3F9r76QwL8mJVEZsJCZITbtRyI5EYURibyCXbRv22HTDz9+PzAnN6fEHHkmTAJuwsT/YWRkZlSt37Cux6kDB33748IfBqSnZtlsNhtaE01oNV2sTbnZMcoqZW5/No1PvnPx9O2V9DsjguQHCg/w9I6L6lRKgniPMr9MqFbCmdbEclA2vPx8Au99nYrNGcKiiKPtUFhCjSoN3kivXxFlu05qokZ2WpzcTJWsZJXkBI0Ep4bTpiPLYnGtDctU1Mjklyn8nmdlR56FUK04G09KUklOiqFpNJl8S5JEKBRC0+PRt96ecqXT6TS13yb+cXjrnSlXnnba4Pm1wVqb0+Fs0iZeVcFh08nxxQiGJb5a6OKrhW5sLpXWOXHaNYuRm6aSkqDhcWj13tjhmERNUKIyoFBcqZBXrFBQrlBWpaBGpAN2/IK1S1YVt1ME22gafLwghTSPyuQ3KqApBNwChKCsSlQJkjwauATB3rezMBrSM4FkYS9457PJ/LjSjdWuGo2WTff3BpBlmVgsRklZYfTEPn1/+W7+d6d5PO6oOeJMmATchIl/CH748fszrrj8yjemvvvOZQnuJJvX6220knXgYpri1dC9UZatc3LypQ6uHlHDA9dUkXO8ilQM1EW8a4ALmmfGAZ09RRZ2Flno1CIm4qobQwD6do/A9BjxuERmskowLJGdHefk7gFUGTZssbIj30qFXwZVRovIlJYqlJZaWbu5SdS5nsArNpVmmXEiUemIFs+6Rbm8siR6/XU3vnb2OUO/M0eaiX8iBg8e9NPE2+54/rnnn7nNkZFrQ6bJGmtNE0S8ZbMYBaUK0aCFLdstbNnu5MhF4TrIKsmJGq1y4hzXIYZD0fh5jYOSSgWnQ6e4QgFiDDghDLVNfFkX5O1W2FEgxOO56SokimdRPfFOBrKgbJPMo48m8fLMBHRksjKjKBLE1SP7JIqiUFNTQ3VNRfTi0Re/N+u9WZebI82EScBNmPgH4p2pb1/Ttm3b7ffdf++/A7UBW25OLvF4033C6opeub4YgZDEmx95+eQ7FxMv93PDiBoSO2iiIl4MyNCzQwTQCQcVFq+z02lwDApotPNCL4CzzgvxfrSIMXels7fAijcpTjgqEYvC+aeFeGFCJUkeje07LazZZGd7noXf8y3sKbFQWilTFVAIhiUiUYmYKq5dkcFu03E5dJITNHLSVHqeEKGDN8Z9byYTjko4bE0nBIqikFewm94nnLjCTKgz8U/Hs889fc/q1au7L1z0w4BcXwubqjedcUbjoMYlXppQQUFcYfkyO/llFir8MrXGPFU1IVuzKGKeuh06Xo9GepJKs4w4bXPEn+4doxzTJkZNWGLRrw7mLXARjojNc16BFdB56+FiLhoThPym7BCAJFi60U5VlaAE3dtHwGqQ7wzx96FdEq8/k8DTbydSVG4j0Rsj0a2iqk3rE9mPeFgsFBQUoOrR6L/+9cCjjzzy8GPmCDNhEnATJv7BuPe+e5497rhjN1wyZuysvfm7UnKymqOjN1kXDiL5zmnX8WRHKamQuffFFN74yMOYobWMGxqgfY84JMKQE0IkJMap8Vv5+CcXV18ZQLKD3lhjlAYUwahLgxzfvoDbn0/mq59cVFdZmF5gZdbXHvp2jXDJWQHGnFFLu7NrxWJZDuyFSJVEVa1Mda1EKCwTiQG6hKLoOO1iUU/1ajiSdDgeZj3sJr/YSmZG7Ii+y9KyEk7q22/hd/O/O80cWSb+G/Djwu/POHXgoG+XLll2ekpKapN/z6pAUYmVmCrx8LPVsB4ilRLl1TLVAZlgRCIel5CMXg+nXcPr0UlyazgSdWgGpItnQ2ylxLufe5j+lZvFa+zEYvvsSQafGOTpWyvpdnIU9hy+R6UOkhUIwezv3YCE1R7n7F4h0eTZCnattTDtSzczvnDzx247FrtGri+Kpjddqlb/XpKEJEnszd+Fw+YMvD/jw7EjRo6YZ44sEyYBN2HivwDnnnfuN7+t/e34kSNHfrR6zaruyd40m9vtPiJJCojFJy1JAzTyyyw8/mYKL72XwIjTg1w1LMCJIyPcMcrPA2+mMn+Zm5ULbZxwXhS2cPiGTFkE9kjboOPxMb6cXsLnnzt5YVYiP/7iRFVlfl7t4OfVTm5+NoVTe4W58NQg5/YLktZJw95aJ7NKJTNkLL5171XXhBkHIkASVH0rc+2zqbjcKsoRRESHQiGsVguvvPrKDS6XM26OKhP/LZj8+uRr+vTus7O2tha3291E4gkJiSq3v5LCBScF8fVUscd1stNUsi2qmKN1rR2qsQl3ijlKGKo2yXy+xMUnP7hYsNxBbaDO01BIyfr1DDFhlJ8LhwXFqn6osJw/PcSA1rDleytzF4rPcuMFNeQOUVnzpY03P0ngg29cVFVbkK0a2Vmx+iLEkUJRFEKhEOWVJdEunY9f9+GHH1zU4ZgOO8wRZcIk4CZM/BehdZtWeatWrzzxxhtueuHV1165vrK60tYsuxlx9ci4ZB1hzUhSkWQVf63E1DmJTJ3jYfzXAdqnxEhNjlFeqXDdpFRWDSxEygC9pBESXmdpuBckG5wzPMQ5Z4SY/4ODdz738NXPLvx+hUhI5utFbr5e5MaXFWNw7zDn9AtyWs8wSe2MVbIMCBjXaizykg7kwDPvJxIIWMjxRY9I/22323HKTi4eNeb9Xn16/TJ69EXvn3HGGQvNkWXin4oFCxb0n/3+B6OXLl3W1+lwo2lHtmH3ulXy/HYemeFlcu8KCIIe3Lc5liTADaSJeRrYIbFgjpPPFzuZ/4uTvfnWBjtpcLk0hpwc4vKzAwwdbFSs94IeommOS6qwNyQON7ycArpEUmKclESNm25MYfK0BFRNxu1RyfHF0I/QVnA/oqFYyC/IRyMWHT/+qremTHnzBnNEmTAJuAkT/8V45dWXbz1lwCk/Xnft9W/sLdiVlZGWjdVqabJLCg2WRF0Dj1Mn0R0jFJF4670EHC6NrFQVq01n9UYnN9+ZwktvVSA5gLzDeOzWwaiG84cI3ThtaJjTzgqzfY2V9+eLiti6zXZAorDIwoxPE5jxqYeWzWOc1jvM2SeFGNg9REJLXVidVQDVQAZU/Srz6txEXO64iKM+AiiK8FXfvXtvl81bN3aZNm3qZb1O6L3i4jEXzxo9etTsjAzTC9zE/32UlZUlfjD7g1GzZr0/ZtkvS/oANqc9gZTkZCRFOkLpmkRCYox3vkzgvjHV5B6vIhUCXiBFPERCeyQWznPwxVIn3/3i5PedVho2TINOp/ZRhg0IMvqMWo7tGRNku8AIApObQL4NZydyxfv+6+YkfljhIjMjhsOm88RML8GATHKyisuh1jurHA1kWSYej7O3eBeJCUllr7326g1jLrn4Q3NkmTBhEnATJhgx4sLPTu7Xb/G11103+dNP552vSDabz5eNqh6dskLTwG7V8WXG0TThiRsMSdgcKi/P9RKISDx8ezXNOsaRIoiwizCHPy6WDe34LuHB265TjAf6VPOvy6v5drmTOQtdfL/CwY7dYsHetcfKlD02pnyUQJuWMU7tGeb0PiH6d4mQcYwKzeCJRxOp9h959RtA14Vu3utNJDkpiVg8Zluxcnm/FSuX93vy8afuG37BsI8vuWTMrBP7nrjKHGEm/q9hxYoVXWfOnDVmzsdzLswvzGsJkJ7qw2a1oukamn50jNTr1snzKzw6w8sb51eAAyq2yvz0vYPvljv4YaWTrX80JN1id94iN86pvUIM6x9kyIkhLM0RDif5hs5bonG5iSY28WQATijepvDonV5e/SQRi10jGJaxWoR1qdet1T/LjhaKYqG4uIiYGo6eddbQr15/ffI1zZo1M/29TZgwCbgJE/uQ5cuqmDdv7kVvvjHlsrvuuvupvIJdGWkpmdjtjiM+at5/ERL+3RnJGrFajd1hK1O/SuSLpS5GnFXLmDNq6dsjgtQCqALKGyyoB4NkHAMXg1QskujOPDfEmeeF8P8h881yB58vdrFotd04spb4Y5eNP3bZmPJxIrk5MYb0C9K9bZT3f3DjSYgf9bFy/bquayiKQnZWMwAqKipzX5v86i2vTZ58/ZlnnPHNZZeNm3bRqIvmmKPMxH86Pvn4k3OnTn338q+/+uYsjbjNbnXVj2td14+aeNdB1SDRG+ezpS563B9l3V4bXyxysnuv9YBJr5Pti9O/uzjFOqtPiOR2mviREvZpvCUOf4KmGyE/KQgbwQpYudTGe9+5mf2lm6IyIWvxeWI4EnTKqhWcdv0vPRNkWSYajVJYnEeCx1vx/OPP3nPjTTe8aY4uEyZMAm7CxCFx9TVXvXv22UO/uO22iS988OHskYAtx9e8vuJ7pJAkKK+w8sjlpZxxXoghl2ayfZed0ioLr73n5fUPE+jbLcLwAUGGnhSk/XFxJLcg4lQLWctBF1jJWIBDiKq4BIlJGiMvCTJyZJDyP2R+XO3gm+VOlqy1s+V3GyCRl29lygdeQCc1VSU5QT2i1LrDoe77SU5OQpZTCIfDtm++/frcb779+sx/P/b4hkvGjpkx9tKx030+X4U50kz8p6CkpCRp5oyZl0yfPnPc2nW/dgFsKUnpOJ1ONE07qnl/OHjdKqGozDVPpP2JdLdrFaXv8RHO6B3m1J5hMtuoIi2zDNjdoI+jMdItI3y808QzYscGC18tEydli1fbiUWV+gdJc1+Eb2eU8OvPVi5+OAtn1tHl4NQ5nOQX7gGIDjt/+LznX3j+1pYtWxSYo8yECZOAmzDRKLJzsstmf/D+2JEXjfjg3nvue2Lrti3tHTa3LS0t7YicUiQJKv0yHk+MkYNqSeupsemjfF54P5EZX3lYv8WGFldYvNLF4pVOHnrTy6knhDm3v6h4ZbZTxZFxHRnXGyHjNYBfLL6p6RoXXhzkwlFBoSv9zcH3Kx0s+tXO+u02IiGF8nKFoFsi0a0dkQNKU6BpGjabjRxfc1RVta3fuKH7XXff1f3ZZ5+/Y/Toi94bP3782527dN5ijjYT/7+wadOmtm+99faV782afUlxSUEuSGSm52CxKGiadsR9IE15HmgalFcrBGuFdaDVoXJsmxindAsz6IQwA7uG8bTUxcpcCRQdcCImHYZ0SwbpTgXiUPa7zDefO/l0kZCnVVZaGryAxjFto1wypJbbxvhxHqfTwhIn47Uo5VUKqUnqET0PFEWhoqKCYLiG1q3abnn88cfuM0+9TJgwCbgJE0eF4cOHfzF8+PAvHnzgofsnTXppQmVlRVpSUnKTF2ZJgmCthfvHlZPWXYMVYEmBO+7yc8cYP/N+cvHR98JWrKTUir/ayrwFVuYt8JCdFWNAzzDnnBxicI8Qae01UdUqF0T7sGRcF0ScanENTrfOkHNDDBkWgkL4dauNH9c4+HmtnTVbbOzJM46/JY3kJA2nXQf9yDP6DkXEJUkiOysHCYnyiorsl15+6fY3Xp9y7bnnnfPZ+KuunHL66acvNEebif8tfP/99/3efnvqlfPmzBseitQm2q1usrOag5EH8HcSb0mCUESisloGTcRn5vjiDOodpl+XMAN7hDmhQxSyBYmmHNGcrR0B6W7gnFK1XWbBdw6+WOzi+5UO8vIt0CC2MzU1xqm9wow4NciwU2qxtABKgZXg7KRz50g/t7+ahvAnbBpkWaaquhJZpuqeu+996cEHH3jY7rBr5kgzYcIk4CZM/CU8/MhDj02YcPOLAwcMqtm6dStNCeCQJCirlElLiXL3ZX6oAl0xSHGVWDTPHxHk/OFB8jYpfPqzi08XuViy1k4woFBQZOO9L2y890UCzXJiDO4d4px+IQb3DJPQShML70HsBf9ExkE0awWMxdoB3XpH6TYwym21ULpTZukGO4vXOViy3s7arTajUqaTnKz+ZT1oPVfQdXT0enlKIFDr+ejjDy/+6OMPLzzllIELr7nm6jdGjx5lVsxM/I/h448/PveN19+8ZsH38wcDtkRPCikpqYbM5O/ji7IEoahERYUw93a4VHp1iXJS5zAndYlwUucIWa2MqPcgotK964B5fDjSDeBBBPMAwd0SP8xx8NlisZnfucdKw45MhytOny4Rzusf4vyTg7TsHBfBXSXAVsPu1AJSGdw0pobnP0mgpNxCZqrapITLsvJS2rRuw4+Lvm9luh+ZMGEScBMm/lZEIhFHUXEhdru96b8TtvD01aW4j9Nh8741UZcQ2u2dQi6S20Llhm413DC2hg3rrXy+xMU3yxz8stZBNCKzN9/K1Dk2ps4RjiaDeoUZ2jfIqd3DeNroSBqiihVsAhkPA0XUN2el+zTO6xjivJEhKIX126x8s9zJt8udLF5tp7LSCopKRoqKVTnyyOmDQdM0XC4nHk9zotGYbdGiH09ftOjHAU89+fS68VddOeWyy8a96/F4ouaoM/FXEQqF5WnTpl329ltvX7lq9cqegC09JQub3fa3ykwkSTRYllQo6HEZq03jlN4hzugT5szeIbp1iEKm8cNVCDvQEuNZQBNJtwtR6bZCeKfED/McfLXEyfwVDrb9YWNfpVtCsan07hzhzD4hzjk5RNfOUSFNqUQ4p9RV2Bs4p+hlYOuo88QVVYx7PBNVV2lKd4jd7qC4pIhQMOQyPp0JEyZMAm7CxN+D884d9mlJaTG52S0a1YHLMhSUKLRuHuHmS2uEjvNwcpEKoFxEQh/XLcZx/au5p6yaVb/Z+Hyxi6+WOfl1kw01pvDHLjt/7LLz5ocJtG0d5YzeYc7pF2Jg9zC2VjqSiqiM1zbiMS4Zi3C1WDIlCbBB5+4xOp8S445KP7+ttTFnoajMr9ssmjjdHhWvR5CWv+yeomlYLEq9Tnztul973nTTjT2fe/b5ieOvunLK1Vdf9WZ6errfHH0mjhQVFRWeKVPeGv/WlLev+v2PbZ0AMtOzsVgsfxvxlgziXV0rE6gRyZSd2kc5t3+I4QOCnNAtItxHajmyKvchSLe6FxZ97eCzJcIjfPN22/4MWlHp1jFaT7pP7BYRVfJa8XzRKxp5bxnIg0svruX5OSHWbrGT64s3mnqZmJBIXsFuhp51zpcbNq3rZo4+EyZMAm7CxN+CN9+YctnK1ct7ZmXkNKkJMxYHXVV47uoSaAZ6Y9HzdYQ4jrAXLBJkuGffKD0HRXm4qIqlv9n5fImLBSscrNpoA1Xh9x12ft/h4NX3E+nULsrpfUKc1TfMqd1DKG0RHuNlQKgJZBwg2uD9rdD1hChdB0R5OK+Kr5Y5+fB7N18vdlJQZANJJSPt76mK79OJC7u3Pbvz2t9//33PvPzSKxPGXXbpu9dcc/UbrVu3zjNHoonGsGfPnqw335hy9btTp12eX7i3pYRlfxvBv4F4yxLENSguU0BTSE6KMfrsGkYOCjK0bxBrczHnKBWb6yZVuev+Wke4nqQhouj3wo/fOvh6mZNvljlZv80KWoMYekmlW6cog04QG/H+XcOQgzjpKkXYFUpNe28k0GtA6gDPX1PJoFt9hGNgbeTZpaoqvsxmbNy8vtMLz0268daJE14xR6IJEyYBN2HiL6G8vNxz6y23TnLa3TZFURpdwBUFCoutDOhZy/mjQ7CHpsVCN4AuATEg31gzHdB3QIS+Z0Z4ogAW/ergi8VOvv3FyfqtVtAVNm13sGm7gxdnaHQ+JsKZfcOc2y9Ev+PD0BakugU5cohq/IHvHwcKjCqfC4YOCzH0/BB7Nyh8sMDNB9+5WbVeJHAmJMZJdOsiqvovfNd1dm9ZWZlIkkRZWVnu008/df/rr71x/bhxY9+94aYbXu7QocMuc1SaOBB//PFH7quvvHbTu1OnXVZZXZ5hVZzkZDVHR//bbARlGQJBiepq0SNxfMcII08PMvq0Wlp1iYt5XkzTPbrrBz5INoN0u8Rr/PKT2HB/vdTBrxttRgNJ/ZaVju2jnN4rxNlGXwjZxga67Cjef78HGLAbTh0e5py5AT7/yUNudhS1EatSWQaXM8F29z13PzH64ovey/JlmVajJkyYBNyEiaPHjddPmBwM1yY2RXoiIRZo0Jl0QyXYQQ8eOQFv+II6gjSTZ6ylTjjltDCnnBXmyb2VLPzVwedLnPyw0sH6LYIQr9/iYP0WB89NT6R7pyhn9Q0xpG+IPl0j0BykGsSRdKyRBbqh1/hOcdzerKXK7Xf6uX2sn68WO5n5jZsvF7nIL7Si2FQyklUk6a/JU+o811NTUpHkdKqqKlNefvXl295+e+r4iy8ZPfPGG2549fiux28yR6eJDRs2tn/t1ddumDlz1iU1geoUpz2BOt9+7W9orJSM+VFaKROLWHC54lx4ZoBLzgxwXv+QqDZXAXsb6KqbSrotCImKVxDnVb/Y+GaZky+WOFm90U48egDpbhfl1J4imOfUHmFszXVhVlIK/PEXSPeBlxYWL/HSTZV8scSFP6DgcWmHndOappOSnEpewS7P1VddO+WzL+ZdYI5OEyZMAm7CxFHhhx9+7Df7w1kjU5MzmyQ9kRWdqiobV59XRZchUfjjL5DvQ5HhMLBHLJCKCwYNCTPo3DDxvbBglZPPf3Yyf4WT7TusaHGFVescrFrn5N9vq/TpEuGck0Occ1KQTsfFkJKpbwg7bPpmw/cvB6kUcMFZ54c469wQ2361Mv1LN7O/dfPHbhugk56mYrPqfynKWkdH11QSExNJSkrG769OfOutKde/+860Ky4ZO2b6hFtuntS1a1eTiP9XEu8N7Se9+NKEGTNmXhqJhjxup5ccX4u/Td8ty0JKVlIqvLNb5EYZeVoN484OcGzPmFg5i9jnItIU4lsXkJNsEG8/bN1g5YulYt4u/c1BLCLT0Ku7dYuYkJecHOT0E8LYWxiku0xsipsUzHOkUMSGouUpce4cXc1TM1NIcEfQGzk6U9U46alZfP7lp2d//tkXZ55z7tnfmCPVhAmTgJswccS44rIrp0rINqfT0XjjpQRlFQpJ3hhP31wlvLpV9uuROihiIKUCCUAx6NEm/E7DyrRBxi3ufZH0wV0SC1Y6+WyJkx9XOdixy4oaU1iy2sWS1U4efcvLSV0jnNs/yJA+IVofF0eqS9vzH8ZJpY5HyMZGwHBxad8pxmO9q7j3smren+9mxpduFq1wAhLepDge518j4gCapuLxeEhM9BII1DjenTb16pkzZ10yevSo2TdPuGlSz54915kj9p+PtWvXHvPSpJcnzJr53iWRWMiT6EkmLTUDTVPRNPUvv74sQzAs1VtxntQ9zJizarn4jFq87TQIsL9Pd2Nztc6rOwHREBmFPRstfPO+g09/drF4jR2/f/9luEVuhAE9I5zTL8hpJ4RJbG1E0JceQLr5m4l3w8vWQCqHh66rZtq3HorrbAkbmcc2mx1Fttiuvfb6yeece3Yrc8SaMGEScBMmjgj33H3fw7v37myek9W8SdVvVYdw2MqLNxTjPV6DTU1YnAEpCbZutFJcqdB/YFhUpUsRvuFNWWDryHiQ+kh6l0fn3BFBzr0wiH+HzFfLHXz2k4uFKx0UFlupDVj4brGF7xa7SE6OM6hXmGEDggw5MURyG8NjvFi8ZqPNmzpQJBo3XYk6V14T4MqLAsxf5OCteR4++9FFdZUFu1MlLUkcY/8VeYqmqbhcLjyeBAKBgGvGzOlXzJz53iVjx46ZPnHibc91Ob6Lma75D8SmTZvaPv/cCxOnT5txaUyNuBI9yaSnZaD+DcRbksSfCr9MqFbBYtUYdlqAK88LMHRgSGizS4DtTZd5SDqiiTJTPAdq/pD5+jsH8xa6mL/cSVlZw1RKnYz0OKf0CNWn4Ka01UQl+sAI+v9B0r3/TgT0EnB00nnx+gpGPZxFXFWRpcbnZ1ZmDvmFu7NvvvGW51565cWJ5ug1YcIk4CZMNAmbN21u++RTj9/tTUix6U1oK1RkyCu0cHyHINdcERAVsqYukj74YLKLB99MZ/BJNYw6vZYRp9aSmKqLxfdIFts6Mh4AagSpSEzSGHVJkFEjghRtV/hqmZPPFzv5abWDigoLlZUWPv42gY+/ddMiN8YZfcOcf0qQM04IIbcDKSBIwGH14nXvW4MIGrLDaUPDnDYkzIYVVt7+zMMH37jJL7QhWVSyUv+6TlwQcScJnhYEagO26TOmjX//vdkXj730kum33nbrC8cdd+w2cyT/38fWrVtbvvD8CxOnTZtxaTgSTEz0pJCZkIWqqah/A/EGKK5QUKMKaSkxLj+vmivPCdC9TxRsQAHoW43NdGNzURNWoqQhKt75MP9LB5/+5OLrJU527K4LyBED3+uNcXKPCGefFGRo3zC5HeKCtJcBe46QdNfJW9yIkB6ruB5qxZzcL1nzCEg4e+CisUFe+6KWn1a7yM2O0Vg9Qtc1kryptpdfnXTjuMsvndqjR/cN5kg2YcIk4CZMNIpLx142A7AlJCQ0qfEyGBElsddvLYcU0LfRJO23ZATyFFcogMaCJU4WLHFx94spPDmhgivHBNCLj5ZdNCDFfrE4Z+WoXHFVgCvGBtixwcJni1189pOTpWvtREIWdufZefND4THepWOEc08JceGAIMd3jSIlIWKyKxuRqMgGWd8hgn6O6xbjhX6V3HNZNW9/lsC0zzxs3SF04pkZcSwKf0meomoqTqcTj7sF/poa1ztT37525sxZl4wff+Vbt98x8ZlWrVoVmCP6/x727t2b8dyzz9/x5ptTrg6FaxMT3EmkpaT/LcRbNkJzCotFFbp18yiXnlPF+PMC5HRWhbSr0LAFlTn8SVadxCTJIN5+2LjWypyFLuYtcrFmvZ2GATlWe5zeXaKcd3KQc04O0aFzTJDmSkRegMqRVbo1w0HFJ34++IfE1l+tlFUrWC06HVvGyOysIgURzxLLET5DAiBlwasTKuh8qZNAUMLlOHw6rq7reNweqqrLbZdfduW0det/7WGOaBMmTAJuwsRh8fJLr167as2K7lkZuU1rvJR1KipsXDa0mj7nRWEnTW+8tAlSu2GnFWSV7AwVXYfCYgfFBYqoZBUfsNhbxKzVI0e4kOrGIl8hiHHr9nFu6eXnlnF+fl1nY94iF18tdbJqnQ1QWLfZwbrNTp6dlsjJPSJcOLCWc04O4eukiuTNEoRERT4MEdeptzLMyNK4595qbrvYz4yv3Lwzz8Oy35wApKXFsFv/OhF3u10kJiRQ7a/2vDb51VtmzJh56TXXXP36xNtvey4ry7RF+7+AsrKyxOefe2Hi66+/cW1lVXmGx+mtD7/6y8TbaKwsNBorexwX5orzAowbGsDdRhfzo6GFn9wI8XUgJCYWKN0i8/kcF5/84GLRSge1tfs7mHQ9NsKZfUMM7x/khG5RQdargVLQCzlyeYluyFxyxb/++J2DWV+7WfSrg71FCpGwDJJOWrLGuf2DvHB7BYmtdPSdR7jqK8AuOO70GLeMrObFD5Nx+6KNnl7VeYOv3/DbcU898fRtd91z5/Pm6DZhwiTgJkwcFEVFRSkTJ058zuX02BRFbtRNQZagrErB44nz3IRKkT4Zp0nabwBcUPqHwta9VlwuUVUKRyXszijDTgkKKcnBZqwdpGyEg0ll402TfyLjGuKYu1RUz7r1itJtYJSHC6tYsMLBJz+4+Hqpk917rYRDFuYvtjB/sYsHM2MM7Rdi1Gm1DO4Thg4gVYnXOuQRd0P3lDKwJ+qMvy7A+BEB5nznYvJHCSxYKho2k5PjuBz6XybiHk8C3kQvFZUVKc8+98y977477bJbbrl50m0Tb3vW6XRq5kj/z8TTTz1zywsvvHhrUXFBc4fNQ66vBZquNWkj3BjxDkclystFY2X/XmGuu6CGUUNqBYEuZn83k8ORXgkR6Z4iNqGL5juYvcDF5z+5yC+w0lDXnZsd44wTQ1xwapAhvQ3LwpAx97YfQUDOwci/BWgN21dauO25FL5Y6AJkLHbhye/1xAHw18q8MzeJH39xsHRWEVmtVPTdR7by6ypI1fDkzZW894ObkjKFjLTGGzIlCTwur+3ue+9+YuSoEbPN0ygTJv5UpzJhwgTAZZdeOS0Wj7hSklObZGWm6hAOWXjmmgpSumnoBUc4o1ywNd9CcbmC2yFKSv6ATNvcOB2axfYn4CpILWHpGjt9RmXz6qQEyotlyDF0p0dDKyUhF9ELBCFAhcFDwkx+voLfZhYy49+lDDutBq83JjYoxVbe/sTLaddm0mucj2eeSmTHNgs0A6mV0H4f8jokUS3XA4amNgjDRwWZP62Y+W8WMfz0ANXVMvmFVoIRCfkvPZl0VE0lKSmJXF8L/NU12ff/6/6njju2y8bJr00eb470/yy8NeXtS4/p0Gn9XXff+VRZaXnzXF8LUlKSUTX1L4Xo1BHv/EIr5eUyZw+s5ctXi1k0o4hRl9ZCTIxF3W+c5EiHIbw2kFoALWHvLoUXn0uk77gsBlydyeuzkwzyDR5PnHNODfDOI6X8OrOAt14sZ8h5IfHav4OeL5yO9L/SSKkALWDebCfHnp/DFws9pKaq5PqipHo11DioqoRFgZQEjVxfmJ2FdoZcnQEBkFI4ssQsGfQisHeASddXEIspxJuwJ9J1naSkZEC3XT7uymnmSDdhwiTgJkz8Ce/Nmn3ht/O/Oj0jLbtJFTdFEYS057Ehrr1KNF4ecSXLBlv3WkCVsShiRVRjMl1aR5GzENUywSeREsW/3z45meWbXNz4dBptL8jhjkeTUQHJ+Rc+vCQIgR5GVMd2QlKyxiVX1DLnjVJWTCvisZsr6NE5bDBshZVrHdz5fCo9xvoYe2Ma337mBJuIsZZSjONx/TALegT07UCFIP2fTCll6fRCLjmnhmCtIE01QfkvEXFdF0Q8LS2NnKzm7Ni585jrb7j+1R7dey6bN3feWeao//+LL7/8cnCf3n1/vurq8VO2bttyXHZWc1tGRsZfJt6KDLVhMYb8fpkRQwIsmlrE5++UcNb5IdGUuB300GFWQEPiISWJMY0LfvjGwRU3p9L9kmxufTqVZWtcRiy8xvGdwjx0fQW/vFvIZ1NKuPyqAGnpmnAw2SneS/87/Lo1kJrDT1/aGXZLFjGgWU4El10jv0yhuMSCZIOqKpmCUgVF0dF0CV9WlN9+d/H0q4mQZczPI2UKe2DUuCADegYoLrGiKI2/iKrGyUzPYdHPP/Z/a8o7l5qj3oQJk4CbMFGP6upqx/XXXzfZbnXarNbGz2YlqS7xEt64tRwSRRXtSBZXyYh7X7/D9qe/69UxAh6jIYt9Ws8pUzws+81FVmaY7KwYVZVWPvzaJUjqQWaypOxzejgiMo5RFfwdKBI+3/fdW82q6YV8+1oxV1xQjS9TVMWrqizM/CyRM6/PpNelPl58LoHCfAXagpQrruGQVXGjYVPfCeRD75OjzJhcxqpZRVw10o+uQn6hDf/fQMQ1XSM7KxtfZjPbml9X9xk2fNjcoWedPXfF8hVdzRnwv4tff/2107Dzh39w9tlnf7l8xbJ+vsxcW3ZWM3Rd+8vEOxCSyCu0EQ1LjBtWwy/TC/nwjVL6D46IJsc/GvHa10TDspQNtIOyEpnXXkqg37gsBl2dxdQ5XsrKxTMiPTXG2PP8fPFyMb9OL+TBB6o59viY8PP/HfTqJlqJ/nkKItkNV5MDvg7JA7FCuPKxVEAnNzOOrsPeIivts2K883gZy2YVMX9qMV1bR9lbYEWWdSTA6Yrx0PQkdi+2CE/yI30uBETRYMrtFSDp+ANyk54vFouC0+623XTTTS+XFJckmTPAhAmTgJswAcD4K69+u9pflZaeltEk6Ykk6VRVWbluWDXdz47CLo488dICVMLGXbb6VTauAZJG93ZRiBorsQbkQMWvMre+loLDGUept/DTGdo3hJSOCMapLzsZGtFkhDwk1eAAR8ptDL24Xky9ROX0c0K8/VI5q2cU8uJdZfTpHhJ/gczKtQ5ufTqNbhf7uOn2FFb/YoNMkNoaDWuHI+KaUX3fDV16RnlzUjmr3y/kutFVyJog4tUBGeUvEnHQyfE1Jz3VZ/vq6y/P792nz/Lrr7t+UkmJSQz+p1FZWem6ZcItz/TsfsKv8z6dOzItJcuW42tu3Jujl+YrMtQEZfIKbcSjEldeUM2KWYW8+2oZPU+KClvQnY0EY9XJTNoA2bB+jZWJdyXTdUw2N/w7jSWrncYva/TsEuaZieWsmlnA9FfKGDosJIjodiHVOBrLP0k33t8HtETYCEoHmbNp8M33Tn7fYycjI46qSpRVKBzbOsryGYVcfkOAY1rGGHh+mB9fLyY1WaW8SiEQkggFFUJBG1/+4hQ2iUf8RYv52XZQnHsvqcLvtzbpc2qaRmpqGuFIMPGKK8ZPNWeCCRMmATdhgpcmvXztx598eGF6ShZaE0iALENJuYWM1BjP3lYpjrPjR/HGTqgtkdhZaMFm9AX6AzItcuL0aBcFv7Ew2wAH3Px8CrW1FtKSVbQGi3LHljGw7e+pLTnF6197XwoPPJjE3l0KtBQackkx+PKREvE6icouYCf4clUm3FbDsmlFLHijmMuGV5OWKr6I4lIrr8xK4sRxPs67KoNPP3KJxtEOooInHY6I60Inyx/Q4dgYrz1fwa+zC7h5bBVWWSev0Ia/9q9VxDVNw2JRyM1ugTch2Tb59ck3dz72+I3PP//CjeaM+J/BK6+8evWxnTpvnvTSpNvd7kRbbnYLrFbLX4qN31fxtqKrcM1F1ax+r5C3Xi6nc/cY7AB9r0GID0e8XSC1Bzzw9TwnI65Np/elPp6flkR+oWDCyUlxxpzr5+tXi1k5o5Db7/TTvKX61yUmurExzRXvv/oXG4886qX3GB9bd1mRMv48R1b/YQMkLMZnCoctjD0zgLeHDr+JAB39N0jqqfHY1ZWEgk7icYmLz6lh/ht5XHJOLfreo9zEakApPHxzFc2zIxSVKE3aFKuqSnqqjy+/+vysp5965hZzRpgwYbqgmPgvxtVXXfPqlLfeHJ/sTbXZHfYmab9jKsSiCi/dWIqro46+kSOvfgO44PdCK3uLFTwuwZ4jIZnOrcK4c3Th360C7eDnD+3M+iaB1JQYmipW+LgKyBpdWkch1nClA1rA/NkO3vgkBdB47dMEhg8SvsMndw7j9Whg2BhKFvE7TT75r3M1qQDKBNkfNCTMoKFh9qyvZsbXbt7/xs3GbTZiUZnPvnfz2fcueneNcNXwGsadFcByDEjFCAeXg5GWuvcoFBKaNsfEmfRMBbeM9vP8e4lMm+Mhv9CGOyFOskdDPUoOp6oqbrebhIQEioqKsidOvO2599+bPfqJJx+/Z/DgQT/Vkw5dNwsVR4mffvqpz9133fPUsl+W9pGx2v4OZxNFhupaiRq/FacjztUj/dw2xk+H3jERPLOjAemWDk56JR3wAllAAcyc6ubNTxL4eZWDfVGXOh3aRBh1RpCxQwK06WrstOtcU+R94/VoIRmuRi+/mcDMrzz8usVGLKIACt+tDNDh1JhIxpX2vY2mHVga19m21yqeGVbqDqRgN4w4JUhhWTEjB9dybD/jQVEgNtNH9dySQS8FS0d489YKzrzDRzimYm3Ca9lsVlKS02133X3nUxs3bTx22rR3rzJniIn/ZpgLi4n/Spw6cPC3U956c3xqcobN5fI0sfFSp6TEyqkn1HLRuKCQnhztDHLA+h1WomEFm1U3tJQynVtHBTGICekIhXDlc6kg6Tjsen31OxiRyEhV6ZAbFzH0dcTCKwjCba8kgxwjxxchGpOY8lES596cQVVARnI3WL9dCJlKjiDTRyRVqWum3A3sguat4tx3XzVr3yvgvadKOf3kWqPcLbP8NwfjH0jn+NHZPP9MIgG/BMcYTW7aId6zTo9eBGyHVu3ivPxsBb9+WMANY6pAhbxCK7Uh6ailKbquo6oqGRkZZGc2s61avaLvaacNnn/lFeMn18lS3G53QCNuTpojQGVFpee6a6+fdMoppyxa9svS/r7MXJvP5/tLDZaKDKGIqHhHwxJXjahm9fuFvDGpnA7HxYTLSIExlORDEG/NaGg+BiIRiVcnJdB1dDZj70nn51XOeuJ96om1vPtYKWtnFfLQg1W06RAX6ZS7jJOgIxlvujG3vAeZXzqQBguXOlixNoFEj0Z2VhSkGPOWOOutQhv+WrvcmDF2xb97k+LM/MbDmq9t0N2YU1axwU1N03j44SqO7RHbd/2xoyTf9TcC2AlnjApxwcAaysqa1pCpaRpOh5O0lCzb9OnTLj2pb78fQ6GwyUFMmATchIn/Fpzcr//3Py78foAvs5nNbrejNSHgQ5KgukZBUnTeuqtchOHUHl31q24R3rDTWv/v4iReEw2YurHYZsHjr3jZvstBTlaM2pCEbngRB4MyLbLiZGWo+wi4oRefMsPDhu1OsjJUNE3C7RIM99nrK2jZNS7CeCwgueHWJ5K58dZUli60izdtaei140f2gXREZYytwiFm9KW1fDu1hEVvFzHmHD8up4j427TdzsRnUul8UTbPPJVIbcAg4l4OLY2pk8AUAb9Dmw5xXnmugjWzC7hqhJ+wIUMIRf4aEdfRyc1uQbI33fbO1LevPe7YLhu//fa7AYmJCX6n3f2XGgT/6VBVtf6bnzlz5sjjjuuy/vU3Jt+clJhqy81uUU/AjpZ4R2LiHvv9MmPPq2HV+4W8+VI5HbvE4I8GxPtQ81EFKUEQ71gUJj2XQOeR2dz4eBprt9gBCZtNY8SZAea/WcT37xYzbnwAu0MX1e7iI/Pbl4zQLCkTpHZiPlUVSqIvo8Ewqmu0vmN0NRBFkkQeQKJXZek6B7s2WoTneB0CMPD4ME63So3RCJ5gZAiceUcm77/kptovC413S/E8IC429FiPoin7UPMlLF73ldsrsNk1KqoV5CbqwW02K9lZzWxLly0Z0P/kU342Z4+J/1aYEhQT/1UYM3rstMVLfu6XndnMJhIim06qamosPDq+nFYD4rD5L1SRLIAftu6x1q/GgYiEN0mlp6H/lprDnp8UHng3Ca83TmmVQpfWUawW2LTbiq7Kwis8FRHsoYvI6MBGiXveTsbuUFEQmu+8Aiu9jwsycYJfhOYY9moVe2Re/DARVCuTP/XQuX2M/t1D3DfWT2amKlwPjnBnoUsIGcB2UbnrPzhC/9MibFxh5fW5Cbz/hZvyKgu78mzc+Vwqr3+YwA2jarhxpB9bR0TDXM0hvts6aUoRSEXQ/tg4b75Uzk0X+Xl6upeZn7mpqpJJS41jtx1doI+qqjidDtzuFhQUFmSffdZ5P/bq1ZP09HQikYg5gQ6BZs2b762u9juuvOLKqZ/M+Xg4KLbc7BZo2tHLTWQZojEoLBbzZOSQGu4Y66fnKUaT8h8NSPHhiLcbaA4UwKsvJvDy+wls3WmvH1SJnhijhwa5ZlgN3U6MirGXbzQfNxZFfzDEEaTZLpo5v1vh5MNvXWzfa2Xl24W06RtH32Y8BySgFPp0i9LlmAgb/7CRkaLicegUVFmZu9TFrf39SEXG3KqA3G4qQ3qFmPNjAkkJEVRVIis9TlG5wsV3ptOmVYx2zWJ0yI3TvnmM9s1itM+N07x5HLKNr6pcPIOOxqVF7IqAvZDVS+W568q56cUMEj3RJr2UrutIkkR2VnNWrV7Rc9h5F3w099NPRpizyMR/G8wKuIn/GkyfNnPUe7NnjkpP9R0R+VZkKCiy0LZFmPtvrBZ2Zn/lQpwQKZLYtNuK1SFYYiAgCHVurmqUk+GaZ1JR4zIOh4bHqXN+vxA1Iam+0tSldQzcQu8qASTDo1O8lFdYSUuOowM1teJI/a07y4W1odHcSRJ8s8wJqowvM0yKV2PtJjsvz0zEoup/3pob6XtSsqFb1Rt/suhxo2lzDxzbNcbLz1WwZnYht19RRVqyKLHv2Gtj4jOpdBmZzZuveYSX+DFGqE9jFXGjWbNzjxgzXi/jl1mFnDuolrJyhfxCK5rOUTVr1slSfFk+EhMTWL58JbFYDEVRzEl0ECR7U/nhhx//ffJJp4Q+mfPxqIxUny3Hl4OqHp3cRJbF8MovtFBaZuXMk2tZNLWID6YYria7jOZKGiHeVqO50g3T3/LQxah415Fvb0Kcmy+pYvXsQl5/sZxuvaOCeO8wZBpHuTpKPli62k7vkT56X+Hj9udSWbHRQWW1hUE3ZxLcK4lQn7pTpqDYIJxzYgg1ZlSSdTHpvlrugEqEthuj4VuCR6+pAjRKyhUUBeJxifQkjcz0OHlFCt/85GLSe15ueDKN027KpOf4LE65OpNb7krmk/dd1FRJwirUC0errtIlsVG58doA3TuGKCq20NQpUudIlJmWbZv32ZxzX5/8xhXmTDJhEnATJv6BqKqsct14402v2qwOm81mPSJiEIqIVf7t28shC/Ry/lqghgu2FVjYXWQhwSk8elFlurWLiop2FsyZ7uKbZR6yMmMUF1u5cmgN7ZvF2LDNgd0qFq8OzWNCdqICzUTF/PkPvSQkxtF1Schmqq3ccXEVx50Zg52iciXJQAhhR4Y4lrZZxfdxzfAaUo/TRMz9ARUvNQaluxTwGtaCqY34fNcRcd1I29wGzVvHeeaJSn77oIDbr6gi2StW/6077VzzUDo9L/Ixe5obkoz3aMxHHEHG2Cl8xD99p4RvXi9iYK8gxSVW8gstSNLRHb1rmobdbicjI70BaTBxIDyeRFYuX8mWLVvIzW6JYlGOSm5Sd5/yixSKiq307Rbm05eK+Hp6Cf1PCwsN826j6t2Yj3cbIB3mfuCi7+gsxt2bzvptgnh7XCo3j63m19mFTHq2grYd4qKanteIYwqCGEuyMfZ9h+iZsIES0lmx1klcg+ysGNkZcXKzo+wusHHm+EzR45Ep5q4OEIFhJwVBUQnHxH/zJqksXutgxzoLpDUY83nQqX+MmY+VEI1YyCuw1I9vWYaURA1fZhxfZgxfZoz0FJVwWOanlQ4mzUriwjsyOPbiHP71YFJ9sM9RkXBJeJ2TCG/dXg5AbajpE03XdSxWC3abyzZx4h3PlZWWJZqzyYRJwE2Y+Idh0qSXbqkJVKWkp2UeMTkor7AwYXQ1/S+MwA7+WgMTgAO251mJhGSsVr1+/e7RPgrNIbYNbnwlBYtVRZze61x9doCVW4RneCgqkZCocmyLGASNarECt01OJh5T8Ho0ZAnyiy20yInw5G1VQnpS97G94N8q8/1qB063iq5T7yQytHcIlD+7okgZsHmXlTYX5XDuNRlMec3Dnp0K2Jv4fdRVrYsFEc9pofLMk5X8+kEh14+uxmkX5e7VGx2MvjOdU8dksuBrB+QKgiDRCBHXjWp7IZxxbpgf3itm1lMlHNcuSkGRjeIKYZf2d2lgTexDPB4jKTmJtLQ0VPXImZyE6Bsoq5IpKLLRvnmcdx4tZcnsIs4dEYISoyp9OHJcl1yZC7SExd/bOfPSDIbfksmy38RG02pRufICP6s/EMS7Vfv4Pu9uOHwUPSCliU0hGbBrk4Ul8+37ZCQNUQy9T40y5KQAsZBSd3loqoQvK8bP611cOSFVbDITjb8sgx5do3RrH6WyWvyOx6ETDlmYu9QFngOI/h4Yc0WQT54vIitdpaDIRkGRhYDRJ9IQFgU8Lg1fpkp2VoysjDgFpQqPvZlK94t8VBXK4ns7GqWQImwYuw2N8q8rK6msVI7odFDTNNJT0wmGapKefuqZu8zZZMIk4CZM/MMwY/qssYpsa3LghyJDhV+mJiSmiC9FFUQz9teuQzL+Z9Mu4S8sS6LBzGJT6XdMBKxw54vJFJbYyM6MU1pm45YLq2nbNs6733hwJ6jU1Mq0zYnTJjcu/MJbwJJP7XzyfQKpqVE0DcJRCTSJKbeVIzczGiTrkvVS4Ie1dopLrXjd4vuoCshkZ0UZ1D0sLAYbkApJBxLg+9UOagJWPv/JzdWPptP6vFyueSJFeHtbmv4F6JLwKmYrtGgT59UXKlj1fiGXnleDLIsUkx9XuDhtfBYjr0pn7SqbOC7PPIxjSh0RjxsR95Vw8WW1rP+ogGfvKCMjUSWv0EZNUMJUkvznQJGhNiKRV2AjwaHz7wnlbJhTwOVXByAA+rZG5CA6SKogx3SALeutjL02jZPH+fh2sbueQY8cUsMvs4p465Vy2neKwTaDeDfFu9sKYV1i43orb73u4cLr0+k0NofTJmYQDEqCRDe8pBiQBOf1C+734nVy9fS0KO987eWJBxPFBtMOehDIgfP7BdHiQoYi9O0any91Qsk+NxQkI81zFwwfGWT73Dyev72MQX1D2KxQVGKhsNhKYbGFonIRwqNqYvNZ18SdmaKSnRXh160uhl6TAdEGm4Ej3oEBFshJE3O3NiRR7hde/U3Z72q6hs3i4L33Zl8cDpuuKCZMAm7CxD8GP/+8uNcfO7e1TklKaVRGUHcMnldooYU3TlZKHFnRePcbN/whFta/xjiAAKzbsa8Bs6pGpl3zGB0Hx9g7R+HFD70kJcWorpFBUnnqjko2bbFSWmYlwamjxSTa5MRFo5cNqIbbXk8GwGkDWdYpK7cycnANp40K75fUKcliE/HVclEVlI2qcCSoMLBbBFdrw4P8AAJCGXzxixMkUUXLyYqhxqxEag1nh6MN9ykEfodOXWNMe72MJdOLGDqgtp6ufPSNhxNGZTHh9mRKi2ToaBAFtZGqXAT0LeJ9Jt7pZ92cAm66pJJgQCavwEpc4y+F+Zj4iwuPDJoubCSrqxSuHlHFuk8KuPf+aqw2HX2LCLc57OmKKoKd6ATVFTJ33ZNMj4t8zPwsgTo7wdP6Bln4TjEfTCmje++o8AjPP7LQHCkBAgGJ/tdmcdXDmXzynRsNnVCthUW/OcQ81A/YZVfDuX1CeBJi+A23ElmCaEy8cXJSjHvfTOOTN53Q1vidEIw4OYhkUQlGJCFD8aos22Dnj40WIU9ruNlUgR3g8ercOtHPgreKWfl2IR8/VcIj11Uw8sxauneM4rBDSamFgiIrpVX7gnN0HbIyIyzd4GbKOx7wHR0BlxLEZuCNzzxIsk5Gkkbr5Dj5hVZ043MfDrquk5yUQn7hnpYLf1w0wJwdJkwCbsLEPwRLlyzrB9isNmuTfr6gyMrg7kGWLSri8jNr0VSFLX84+HiBSyxS2l+4GDvoZUKCIhv+31pM5uTOEUiD659PQTgzaFRXW7n9ompsveDdbzz1xAUk2ufGwAlkw/vvuVixwUVmRkycZlcoJCTEmXxXBYQFGa2HB2K7YMFqB1a7kJ/U7UmG9gmBa581Wj1SYddGC4vXOUj0it8JxwAlxg3n14B2BEE+B3kC6QhdKzugT/8IX0wr4bNXiunbNQRALK7w0sxkulyQzXNPJYpQkg6G17HWCBH3A5shLUPjpecqWTm7kLMH1FJaKvThsilL+V+FJImqd36JQnGJldP71rJsZiFvvFxBdjMVNoNe1Qjx1kRvgNRezKdXXkigywU+nn47iWBY/GLPY8N89HwJ380s5pTTDf34nj/rx6W6TenhEIC0lhp9OkYAjZysOKmJYuB99YtDVOEPHEOV4Ouo0r9rmIBfEZvcmERmsordqqEDTlecC+/LZNWXNvFZiqBjjxgDe4SorBS/43boRMMW5ixxgds4jWq4iZUNHfbvgB9atY9zwcVB/nV/NR+8VMqqKYWseLuQT18o5o6rqmidHiOv0LrvXkggySovzEtE22M4xhwJNPEMmv+Tg18329E1mWH9gyxbWMR5JwUoLLbul9x7yKlqEfftl2W/9DVniQmTgJsw8Q/B7t27W9RVWhpDcanCaX1qmT+7hJS2GsP6isYogCdnJ4r0Rw9Hb4PihL1FCruKFDwuzXgZiavODlD8ncIXSxLIyIhRUGIhPS3K47dWQR4s32QDaV8QT6eWMciA2O9wx5tCL25RREJmOGxh0vXlpHTTIK/BLDfkJz/95mDnHhvJiXXyE4m0tBhn9gz9SX6CIT/5bo2DcNCCxyEuoNKvcFybKCd0iQpLs6aQL9kgTvIhiHidjrsIzrkgxJIPipjyUCltmkUBnaIyK7c/m8rxF/qY94HYDEktGgkPqiMpJcB26NY7yufTS5j9bAntmsfIL7RRXSubspT/BSgKBIISeYU2WmTEefffJXw7q4Q+p0REE2SREXBzqA1Rnc67GdAMvvnUSa+RPm56PI09RUKf0Twrxsv3lrHyw0IuvDgoeh/+OIh+vC4NMxPIOHyPQZ2kZOTAWsE5jU2rbNVY+JtDzDHXwX/nvL6h+jeOq2C16JzZK0Q4KpHiFeLyQddlUbxeFnH0STB2cHDfxRpuKF+vcIh5ZjvENUqG/KocceLlpz7ttmXbOOdeGOLpJypZObeIoSfWUlAkGjc1HdJS42z+3cbCJY59zZ5N3VA5xQblyQ8SjRunMfLkWpLaaMybVcrwUwMUlTY+ueqezXv27G1mzhQTJgE3YeIfgtraWldTfi4ak0CGV2+tELKKJdDxlBgXDRKJO6s3Opn9gUt4Ch9tFdwFm/bYqKq04LDp1IYkMtKiHNMixk2TREqHLEE8qvDqjRVYu0H1WpkdhRYcLo1wVMLuVOnVJgJOePJtL/lFdjLSVCRJp7jEyklda7l8fK2o+sn7Vx+RDCkJMhZF/LdQrYVTjg+T3EGD6gMWWAtQXSdZ0eqrfVpM4fSeYUEaQocmTBjJg1Irg+wkIYhzKyOx70DyLAvyom8TC/v46wNs+KSAB66vJMkjGvzWbXMwbEIG51+WwdqVVmhnpIaqh3/S6RipnYVw0dhaNs7N5+6rKgnXSuQVNO243MSRo27c5RWIIJ1bLq1k49wCxl1VKwjyjkacTRD3VkoGOsDWDVYuGp/OkGszWbnBAYDbqXLn+CrWf1LAjbfWQBT0rYZWWjnIa3mAjvDtFw4efsoLCYbjziE2cVTDmT1CeL1x/IbTR4pXZcN2G8vW2gVxPVCG4oehJ4RweWLUBCVcDp3fttg5rnWM8WcHyC+00TI3hr9WYdD4LOIVgB0u7FdLelqUCr+MDiQlqSxZ52D7WsuhCXKd+0sO0Ab2bLZQvldGtwlSru8CNkFitsYXk0pomROjrFJ8YBEjL7N4k124JDX1xqpAS/h2roMflovS+ZB+tZxwWhSWic/y6q3lOJ16vZNUE57VHnPGmDAJuAkT/xAkJSVVNY0oCEvACr8MQYMU6PDo5VUgi+6/W19LIbJNQsrm6FwDLLBuh62eAPurFUYNqmXZBjsffe8h2xelqNjKoF4BRowTFbwthVYKShXcDp2agEyr7DjtTowTWCjx+Cwvbk9MrPcBGSSdqXeXg8MItGm47rlB2w3frnRisQopSZ0hzLCTQ8JT/MDP5IWK7TI/rbXj8qjoRiUPNM7pEzSqV4cgBIqwgwv6JV6blMBlE1IZPSGN629P4Z3XPRQXKNBaOKz8qblSMRrTNoPDpfPww1X8+nEhY8+tMXY/Ep/+4OaEi3zceXcyoYCE1LER//CGBH8LWB3wxOOVrPqwkAEnBCkqtlFaJWNRTLvBvwsWBSr9MoVFNvp0CbFsVhEvPFeJ26ujbzYSFRvTeRve8GoMHnwwie4X+vjwGw91Ou8RZwRY/UEhTz1RSWKyBpsQIVLKIV6vuRjXzz6eyJm3+nhoSiqFexTI4NAnKVWQ2V7jxOMi1PoVJMBuAXSFL5c7wXIQ4loBOZ1VTu0epsYvupRtdp0PfnBz95hqWvoi5BdbaJ4bZeMuB8Ouy4AAeE7SGX5yiHDQgtxQhrJUyFD+dI0xkFKAbFi70satd6fQ6sJmPDErESl7X+O3LiP6WFrB9cNriBj9jmL+6uwpsUC4iaxAE03R+h649sXU+ot6dFw1WI3nSAjKqhW0I+i3SEpOqjBnjQmTgJsw8Q9BdnZ2YVN+zmqBeEzms6UuYS8mA3nQbmCc20ZWAzJFpTaufCgVPIZe8gi4miQDYdiye/8km3bN4syYLypIwZAg0ZNvrRAEIg7rd1jRYgo2i44ak+l7bARawYRnUwiHLCQnCjLt99t48LJK2g2Kw+4DCIgOpMLydXY2/24j2StYam1YwpsYZ0jvEKQIGzfJ2eBIPhm+XuWkstKK1y2uuaJaoUPrKCd3j0Apf2YemhFn3wo+/dhJ+wtzuOHpdKZ9kcjs7zxM/sTLlY+m0/nibG65M4WiPAXaH4Q8S6AroFcKIt6yXZzpr5fxw9vF9O9h6MNVhWemJnPc8GymTfFAqlFdp5F7o4BeAWyBrr2i/Di7mBfvKcUG7C2wmdXwv4i6qvfeAitqFJ68tZxlHxcJuclWw5VHoXG5SQsgCz6Y7uK44dk8MjmZYEQM7F6dQ3w9uZgP3y6lQ+cYbDGqvYd6XUk0DC7/xc7pF2dwx/NpeBJUQGfy3ARRBT/EmNFjYi6c2cuQlBjyDUlRmb/KAYWA4yC/44XzTgrVT8G0ZJVla13klSh892oxsahCICjjy4zyxTIP998vqvHXnS02mpF43emAxhfLnFBszJOGHysTVq21cfqYTPqMy+LF6V40DT5Z5Bbe/w2aRA1FC93bRcVU1fZ9VRZFbxoj0I1rSIWb/p3CrnxRULhiqJ8eZ0Vhr/HsdMLXvzgJhxQju6Bx+HxZhebsMWEScBMm/iHIzc3Ja/KEsBi2XwWCYOsaUAlPTqykWZZowpr1XSJTX3JDG4NoNJWE24BSYUEoKRqhiESXDhE277Ly6c8ufFlxqqps3D2mSpDoPeK1N+7a1zQFElefE6D2Z4l3vkwkJTmGhERBsYU2zcM8dHM1FB/Ex9sgnV+tdAAyVsM20GHTcdp1LvxXOv+6MYklP9pF9aqVEWYCfLZkX2CPZMhjBnYLozRHxM4fuDhbgRbw1msezp/gI7/IQnZWlOysGL7MuPhnVoyaWolJM5PoNCybt9/wiJjsVP4cClKn484HdsHAM8Msml3E6w+U0iwzBujsyLNx2X3pnDk2g99W2AShb0yWUufEshOohgm31/DbnAIG9xLV8IoaGcWshh8xFAWqa0XVu1/XEGs+LuSu+6rFqdIfxnRpTG6SBBwDm9daOe/SdEbdkcGWnXZAIj05xot3l7H8oyLOPD8Ee41kzEacTSQJSINnXk9k/i9J5PiieD0aNofK1K89RLcJkn2osUIQTu8eRrGp9ZKKpESNNdtsbN5kFUT3wN+pgnN7h0hMjOOvNS5O0rh9cjLtzorz4CXlVFTYkBWd5OQY/56ZyvwXHRw/NkqvzmHKykVpPcmrsnyjnW3rD3BDQRDdcJnE/CUeNAlyfGJ+7cqz8cqHHjGXLYZdYwKQCD+tEyxelkGShePQMc1i4uSsKfK6djDnTSevzvECOmkpMSbdXQG1QosuOYAy+HSJE+Smz6Hs7OwCcwaZMAm4CRP/EHTv0X2V3eoKhELhRn82NVll/VY7i5Y5IMvglMVgzYWP/22UeyWVK55IZ+kndjjm0FWzP8ENeQUK2/OtuN2iAdNq0Vn4mwNNlygtV2ieHeaxm6ugzKgQVsHm3cKyMBCSSE6O0atjhLteSgLA5dSpDQsm+c7tZeA7RFKnEyiEb1Y4kRS1nqDbLCAr8OOvDh6bkkz/q7Podlk2t9+bzJKf7OQtU1i20Y5rv8AenbN6h+obJw8k4LSGz2c4uerRDJyuOLnZ8fqfC0UkSstlArUyKV6NZtlRqkMy4x/M4NoJKeA4DHGWBTnQDceHa24MsH5OARPGVhn+4fDtkgaylFpJxNo3xS2lFtgIbTrFmf9BMU/fVkY0KPypjzZJ878NkiQIXV6BhdoamYeur+Dnj4o4tkdMuJvU0Li7icWQm8ThgQeS6DHSx2cL6+QmGteMrGbD3EImTKyBkOETrjZtJdM1IAoPX1GFYo0QCEpoGqQlaeQV2pj2pUfIUA41Viqg47ExeneKUOkXH8Rp14lHLHy5wgmugzwLKiGjo8qAbmFqa8SuNy01zuI1LtZ/YuWhKdX06VhLfoGNRI+G1a4y9PZM2AnP3VBZ38ThsuvEIvtkKPu9TyH0OzfChYOriYaEPEYCEjwqt09O4cd3HdAe6AR44O1HPDw100tychxZgiq/gsWuMrx/SDRv0sjm6BhY+62VC/+VYVyIxPsPluJprwtbUYAsWLvSypK1TlKSGw9nikSiyJI13KNnj1XmTDJhEnATJv4h6NjxmB2dOnXaVO2vbPRnbRZRupr0aQLEDfJmAXZAr3OjvHBzmXHGDYOuz2TzTxbo1EhATAMCvnqbjYoKoed22XX2llgoqlBwOzXiMYVXbqpAaWUc0XvAXyizeY8Vu0vDX60w5rQAG3dZeXWOl9RUUf2tqLBy2VA//UdE6uPm/4QU2LDRyq/bbCR5NaNSqeMPypRVyvjSVHJ8MVK8Gmu3WnluWhIDLs2k301ZhKMSSQmGY0pNg8CeygOIfhyklpC3SmH43RkoVpXUJBXdCAEpKLKgRiXaHRPHadMoKLISDEvkZsZJTY3xxifJ3Hhnioi6tzdCmA19uDdF48XnKvllViGn9hKa9Lgq88w7SXQels1HM92ist6skXtUV2XfLTY9d9zrZ/VHhZzQMUxBUV2Aj1kNP+QtUYScKb/QxnGtoyybWciDj1SJqveORqrTurg3Ug7QDD7/yEWXC7J5dHIyIUNuclK3ED9NK+L1l8rJyDbsCg+l866Liz+Y62gxHDs4xqVnBqiuttZ7YkuyyqufJkDRYaz4woAPTj8hBKrc4PRL4/s1DqhCeOY3vJQ44IVzDRkKOtitYsA9PSMR7PDV5BKSEuLszrOSkxEnpsoMuzydfn0jHNsuRFmV8SFljc+XuqCI/eQuuhGEc/dFgj3Xhuuq8yq6LnHWrRlcf2MK9z+WxKCxmYx/Ig2bFRJcGqoOtbU27r6omuYnxsXG/xD3CE2Q7z2rFQZenYWuiUnz0BXlDB4dFinBhtMRMrwwNxE0Caet8fFTXV1Jh/YdtvXo0X2DOZtMmATchIl/EAafduoCHRW5EWGvpkFycpy537tZu8AqHE9Uo8q2B265q4brzqsCZMJRmb6X+tiwyCpIuNwICZegtFYBhAdydUBGkcFl1ygusTLkpADnjA7tI9Eu2JpvIb/YQoJTVJqObxPj3a9FRdDt0Ckpt5DsjTFpYqVIDjxIUqeki9f6YrkTNWrBaRMXGY7IZCSrtMmJU1hsIb/QSiAokZkqyLg3Qd8vuEOSIBIS8pM/BfbohmwgDCPvTicel8lOj6NpEqouvNWH9gny08wiVk8r5Jf3ipg4uorySplgSMZh00lJifLqnCQ+n+UU7iqNfJe6IjzV2QYn9Ivy/fvFTHm4lNwM8SX8kWdj5MQMhl+ezu+bLCLEJ4HGQ3wCgtwf3yfKijmF3HtVBTV+hbwCq+kbfuBtaFD1rq5SuHVsJevnFdBnYERosv003mTpBjrC3h0KF1+dxrk3ZrBph5CbZKbEeOneMhZ/UMTJg5tgV6gZxDsNSDTud4MCrK4CMbjv4mokRaXGiG5PT1VZu8XBd/Mdh/T61yUgAkN7hZAUlUjMcOlMVFmy3k7+JuXPEhZDhnJWzxAJCXH8RtXd5Ynx+S8uKr+QSe6n8c1LxaBDUZlCbnaUeUsTmP6xmztH+4mGZSQgOUnllw12Nvxm3d91RQb2Qo8hUS4/y09lpTi1iasSGalxHC6dye97+fekZH5Y7iAzI05SokogJFNUbOesvn4evbtKONLoh9jQAFJH+GOVhd6js6msESx7zGA/Dz7khwLj2aMBzeGPnyzM+MpDUlK8vtH7kCREllH1GAMHnrLQnFEmTAJuwsQ/DMOHD/sEiEYijWfJux2C7E54LQUixiIuGcSsCl6bVMGIAX5Apiqg0Hu0j0Wf2gUJdxya4Ol5cPGQWr6fks+4YTU47TqFxVbyCu1YrBqv31Eh3qfO1s8O2/KsqDEZTYf2rSLklyrM/M5NWlqMcEwiGlF4+aYKEjtr6AWHmNF2Ufn7eoVTuLkYVoJl5VbGn1XDim8LmflEKZecW0NmmkpxiSDjkZhEqletj7DeF9gTBuf+jikSQC5MejmBZevdZGXGiKsSkgRFxVbO6VvLFx+U0LVPFIem06ptnGenVHLvuGrKyoVTgssubGee+tALlY1UwRsScUSVlUphW7h+XgHXjPTXs6i5Czx0uzCbpx4XFUepnUGitcO8piT0ysTg309UsXh6IZ3bRMk34+z37VUaVL3bN48xf0oRzz9XKTYxvxv88FCbFaP5T2oDJMBLzydw/PBs3v9yX4rluPOqRYLpbTVic/l7I3aFcdGQSEt4420PZ4zLIlJlWGDGG6x4+dDm5DiXDglQXSWq4HU9ES9/lgDhQ1TPAcqh53FRjm0TrZehJDh1avxWvl7lhIPFuVeC7ziVU3uECdQI/+0kj051lZX3FrqhHHoPjTL70RLCIQuBoExycoxbX0nBXyvTuX2YQEjCadPR4gqfr3AKqVbDZ0scCMDkRyro2DxEfqFdzFlN/J4vM4YvM0ZOpkpcldibb6OiwsL44VV8+XbJvqbkgzVU24BjYeUCG70u8lFUKcj3mb0CzHytTJxyVIvflZzinxPfSEZTZTzOxk+NYtEYQPTCkRd+YM4qEyYBN2HiH4Y+J/ZZ07VLj3XlFaVIjZQwVQ0yM2IsWuVmxttuaGksqoohDQnDh1PKuOjUGkAmGJUZcGUWbzzngWYGCTgYCY+CS9E5dUiYdyeV8eusAp67vZz2zWPcd1kVzXsbjZfKPheSDTsEE4jFIStF5cffHJT5Fdx2nZISK4N7BRhzZa1wPTnUbE6B7RssLNtgJ8krrATDMQlJURlyQhhPqs6YcbXMmFTGmmmFzH2uhGtGV9MmO0ZtaN+LVgVk0g8W2KMK8p2/VOHON1NwuWMoRmW0sNRCblaMuZNKxEnCNmE9p+cDpTBxlJ+UZJXakISqgcsTZ8seK0W/K3AkjsCKsXHZBEmpGq+/VM6id4s5sYvYzQRCCne/kErvET4WfesQDbQZNF4NrwK2wEmDIqybV8Adl1ca1XDLf602/MCq940XV7FhXj6DzwnD70YPQmNV71SgPSxfZKP/RVlMeCKNSkMj3a1DmG/fKObd18vJyNFgo6HRb2zTkwiFBQrjr0vl2qfS+W6Fh37X+giXSfuRcF0V//+BS6qRLSo1RlU6OTnOV0tdbP7ZCtkc/AQmJMb6aT3CaDGl3u0FdL5Z4YAawzv/QHKcCOf1Cxr/oe6L1Hh/oRuKxabgouuCPHFNGVVVVuxWnQq/zMz5bppnqMRUydh8qAeVoSCLkwF7qs6SWUX071lLUYmN/CIrRRUKRRWKOOUqslFeKTOgd4jPXy5iykvlwt6/ECG1O3BDkwa0hhmT3Zw4xkdFQJDvoScG+HpaidisFhn3RqO+/+PThQmkpcWMnpHDjSWJsopSju3YZdPAgQOWmiuVCZOAmzDxD8RVV10xRW+iebdFAYcjztXPpVH4i4LU2ljALcaCo8Lsd0q5dniVMY0krn0snfHXphIPG1HpygFVVsXwoN4J7IXcFiq3TfSz9cO9PHRltXBzqL8AoFpYEIKO26Gzo8DCxl02MpNUyqsVJFljyp0V+5oID0YGdcAD365xEgtbjCozVFbJdO0Q5fjOUdhhVHsLICVN4/yRQV6fVcE5J4WoqLTUk65QrcIpXf8c2CPZxfXe9Hwy0YhCildF0yEaAy0uMWVimdC1722wyMtAjQgB8SZoROPi4m0WEdldXiv/mRA0ygwNWUox8Af0Pz3M0o+KeHpiOYkucd9XbHAw4PIsbrw1hdpqwzvcdhgiXhfg87t4/aefrmTx9EK6dYhQUGSjqua/K0VTUcBfK5NfaKNTqygLphTx8osVWB1G8I12mFWlQZNlLAJ33JnMiWN8/LxGuOw4bCoP31jBmjmFnH5uCHYJYqgfzq6w7tY7hT/96eMzeHtuEmlpcXKzQ6za7OTEEVmEy9g3h40qeOuT44xtoAV3O0SF+cV5CcLX+yDvqYvDMcOOUEPVxH9zulV+WuvA/4ckquAHjEsq4ZzeIbxJcaprBZlOSY6zZK2D31ZaRUDVHrj7IT9XnV1NUYmN7PQ42/da+e13G0lu8SBJ9mqs2GRn03rrn91QLKKHIdmnsWh6EVMfKuH8AQG6t4vSvX2UIScFue/KCn6eUsSP04s4e7jhIFN+APk2ejakDuL5cfNNKVx6XwaqJgEyl5zp54vpJeL98o3fNfo/qtbLjH08DatNxWFtypSV0PQ4Yy8dM8NcoUyYBNyEiX8oLrvisnfSU7MKKirKG62Caxqkp6iEwzJn35ohKls+g6jVkfAATH65gmdvK6tnu2/PS6Tzedl8+6lT2H9lH6T5r07SUQ78jrAnVIxQkrrLSoCqPTJfLnYBQvIQUyVkSXj1BgIW/n1lJS1POYjnd8O3sgIV8NUv+ydZ6qrCGSeERKUv1OCa/Ahv7xXw5TInilXbr2h3+gnh/QN7jDS8RXPszF2YQFpqFFUV11taJnTtZ44wGrQO9CVPgN1FCgWlSv3GIBqXcNs1Uj0axI7+qabroG8HgnDHPX5++6SAC08LGG8s8er7Xo47P5v3p7pFMmdjTZp1R/RbRTV8zZxCHry+gnhEpGhq+v5hI8nJQgysquo/Yu7IhtQnr8BKoEbirisr2DCvgEFnG1XvskOPwfomy2xRPZ73vovOw7J59t0kdGMJOrt/LWs+KuSBB6v3nZQ00d1EDBywJsMJnaKAhsOqo6kSOb4ov+1w0PtCH4EiqZ6E11XB7xtdDYpKICSq4G5PnPcXeCj7VYb0g4wHScynfp0jNM+JUVUjLtDr0Sgts/LdGqcg0wf+XhWkddA4tVuY2oA4PXHaAVVmxvce8QzwC6L+5qRyTutZS0GhHYddJ6buey647DpqVGHOEhc4D+K6UkeKg3DZVQHmvlHKqimFrHyjkK9eL+GxR6rod2oEqgxLyIbfcd19ygLawqJvHXQ738fLs731H+jh68qZMaVMfId15FsFKV38c9ht6VTXWMhMizep+l1ZVUGiJ7ni6muuet1coUyYBNyEiX8oXC5X/Oabb3w5HA0iNSFwOa5KZGfFWLPVydibU0VTV0oDEl4OFMHEe/18/1YRuenijHvLbjtnXpPJldelkrdTEc1/aQcneLokHD30yAGzMQK6G669qIaM9Dj5hVaKS0SZqqDIQqe2Ye6Z4IfCRsxXkqB4m8KSDXY8iUJ+EouLMtc5vUOC7BxAlkiDpb/a+XWznRQjsCcQlPAkxBl6gmFVZjhASIlAOUIvj47DJgh+Ta34gReurxSE+AAHyLrG0G9WOImELNiNxtBQUKJFZpysbPXQEfdNLtcauv1N0KpDnI/eLWX2MyW09IkQkl2FNi6+K4Phl6Wza5vhZuOhadVwFR56pIrVHxZw2olBikus5JcoyDJYFAtr1qxG1TRaNM/F6XSiqtp//PxQVQ2HzUqzZs1QFAVN05AkUfUuLFcoKrbRv0eQlbMLefKJKiTFIMqHq3qrILmAjlC4R2HM1ekMuyWDrbuFwD8nPcbUx0r5fEYJHY83wnSqaVRucuD+WY+LMfnIZVXY7Cr+WkncK034Yq/b6eTEkVnUFhskXEOEbJ0iquBVVaLBNilBo6bGwpQvEiD5EBajNeBqqzOoe5hISMhQ6nq7v1nhFNVg+SDXlwjnnhSkrnFB08BiV5m3xIW2U8xVvUT8/JdvltAhN0xBkRWbVa/vv9CMUJ5vVjihBNHfcbBxH97XF4HTuAdBYKcgznrsIMQ7RdynkgKZGyakMOCyLH7b7gAkMpJUPn+lmAcerhbNmiUNyLdXPDNuuC2Fhb+68WXGUNXGn6+SJBMMB7j2umteS05ODporlAmTgJsw8Q/GrRNveTY1JaOotLwEuYn5yBnpUWbO9zLxlmRIBynZIGl10o+tcOrQMBs/y+eSs2vqq6zvzE2k64XZPPhAEmXFsvAMTzcW9UZ6k/QaSHZrTH66go0f5PPKvWUM6B2ipNQKuoW37y6DVCMl8jD2bnjhq5VO/NV1TioiyfK49hH6dosI2zFp/wIfCny90kldYI8E1PgVTuocIbuDKhZ1DBKTC2+962HtVidZmaLqJUk61dVWbh5RTYfB8X3JeA2vKxnYBW987sFqV5EQFWRdUxjQLSwq8+G/4YbX2QvmCcJ10aVBNs4r4KYx1dQ3aX7voesFPp59IlGQlbaNNGkqBkncDMf1iPHde8W881gJLTLi5BfasLuymTfnE7p26ca0aTPwehNp0TwHh8OBpv3nEXFN07DZ7bRongPAhx98QE2NH5fLTiAkvNCzvCqv/auURbOL6XlSFLYZY+9wVW8M2YcXXnkxgS7DfLz31b4I+asu9LN+bgGXXROAEiGfOKxdYV3jZjbCWrLhPJLEZji3l8ro02vx+y0oxoZJ0yDHF2HDLgcnjvARKBQkXI+IKviDl+zviGK1qUz5yoP6h7j2P300DbAh0mMNUqzrYLWrLFprJ7ZLEpHxB4xDqmDICSG83hjVQfEhUxJVduy2sWCFQzibKEKqZc3QWfhuEUkelbwCq0ipNJCSHGfJbw6WL7OJKv3hxn7c2OAHDfnbgfdIN/T4x0B1lczjj3k5/oJsXpudVH8jLjythg2f5nP2iJA47ajzc1eNDXgOPHyvl9fmJZGWFmtSX4QkS5SXl5KUmFJ27313/9tcmUyYBNyEiX843G53/Omnn7ojGgtHmyIP0HXhkJCaEuP5D5K55/YkyGyQ2Fgnd9gGiSk6M94sY+6kEjq2iQBQXm3hkcnJHD8ymwceTCJ/jwJtheexJDdC8sLAHkjL1Ljh5hp+fLeYz58uYvJdRfTpHYVdh68USgpQC18t3z/JUo0JK0GaGVWxhqgP7HHUB/aIBVUWutdUo3qmi2bT2o0Sd7+dhN0RF42XEpRVWkhJjvH4DVVQvb9bSj0B98FrH3j4fZeDtGRRmQ+GJVBUxp5aC7FDWKL9hSedHgV9C7gSdV56oYKfpxfR6zjB8qtrLdzxXCp9R2ax5Ae7uEd1TZr6IciNBPouoAwuv7qWjXMLmHhZJfGITCSWy4aN67jssksZeMpAZn/wIYmJiTRvlkNiYiKapqHr//98xXVdR9M0PB4PzZvlkJqSzNy58xhwyqncdNMNqLqF0vJEavwy14+uYv3cAq67uQb8hq83hyHKqlFN7QCrl9kYOCqTm/6dRlm1EAV3aRdm/ptFvPlqOcnpGmwyxnpjjZtJQHuY+4GL6VPdQuKl7Ls/unGvJg73g6QTjAgXHk2DcFQmNzvK+l12eo/wUVMoIbUDdgtHlEvOEI4osiTi4nfusfP+V24RxqUdhExXilTMtLQY1QGxjCZ7NX7fZeOn3+z72wTWoQIyj9UY1CNEreGGYlHEC85d4qqXh2ER8pCsLhoLJhcBUFopKu0VfpmKcivoVr5c7RK+40faCFyn8c4G2kFpkcK/H/PSZUQ2901Koahc9J20aRbl/adL+GhqKek5GvqWBpIV1ShE5MLj93t56O1UkpNi2BtU6w87/jQIR4PRRx55+F9erzdsrkwmTAJuwsR/Aa648rKZfXr1XVFUko+iNN7pp2ngsOukJMd4cmYK11+bAh6Qctlnb1bX/LcHzr8oyIaPC3ji1gpyMmOAREGJlUcnJ9NtdDYT7khh7Sob5IgKoWQ/BBGvs9irNPTMfjh7ZIhrrw8IItSYRjoJyrfI/LDGjssTb5BkqTHUqN79abGsD+yx1wf2BMISdmecs3uFICCuSzJe/8mpiZRX2EhL1tB0UHWIhBWeuLIS97FGMp58wOKfBf61Mve/k4zDGa+vfldWWjizT4jjTo4Jl4e/22FEYp+TzXboNyjC8o8KefLWchKMJs1l65z0G5vFhNtS8FcaTZqHsZas3yhtBneizrNPVbLmg3xGD/UDrYGWLF7yE6NHXcSggQOZMuVtwuEwzZvlkJOTjWKx/K8ScV3XURQFn89H82Y5qKrKtGnTOX3QaQwfPoxFP/0ItKCmxsOw0/yser+QV1+oICXDIMrBwxBlVfQcSB0hEpK4665k+ozysXCVCwCHVeXB6ytZO6dQOKb8IebMYZss6+QRrQG7SMccfk8m4x7J4otPnNC+gf++DBRA55NjDDkpSEWFBV2HBLeO06ZTXq3QolmUTXvs9BnhozpPFg5HEbj/4mqQNQIhSchJJI1XPk2AUkO+cSD84G2r0b9zhFCtIMcWWSypXzbY8O73UVTADef32zf3ROU8zvxVDmI7pX3OP4a8p8eQKPOeKyYcslJQZMOXpnLp+TV89Ew+11xQI3TYTR0+hqWg1ApoDpvWWrnjnmSOH+Xj/pdS2FMgNkgZKXEeuqGCjXMKGHVpLeQbeu+6+xQ3dOKpcOetydz3RipJSTHcTp2mHPAoioXC4r10Prbrhpsm3Ghqv02YBNyEif8mTJ32zjggWlVV0SQpiqaB06GTlhpj8twkzrskg3gtSO0baLtl48h3q4h3v/veatZ9WMAD11WQa+iOS8stvDTTS++xWVx0bTrffu4UsocOoqJ0SHmKZBwh5yGcC/RGZq8uCPJ3q51UVFjxug33E79Mi9wYA7uG4YDI+v0DexRchi67ulrhxOMitO0cF7+jAxlQvkbmxTleXG5B7hUZiootHNcuxNXjApD/52uUFMAL97/upbLKSlqSqLJHjc3EnRf6wdWEzcVfrYbrhpY7Anfd52fNRwWcO7C2/gdemiWSNGe87RGyo1b7rCEPem8UoydgO3TqGuO9N8pYNLWAoacEDSLegsVLfubqq8czoP8pPPjAQ6xZvZrMjHSa5WaTlZWFzWbjf4KL67qO1WolMzOTZrnZ+LIyWL9+HY8++m9OHTCQyy4bxw8LvxesjNYM7hvmuzcKmPN2Kd1PjArZweGIcp2UoSXgg49muug8PJun30kirokBcHrfIKs+LOShh6tAb4J2vA4WiDth/rcOThqZxaOvp5CcFMfhjHHOhEwWz7NBh3onQPSoILm3DhOpkDFVorJaZsSAWlplx9lTaKFFriDhvUf4qC6QwAnt+8W55IwaqqqsSJKIi1++zslPP9gPGsxTp+k+s3eo/kvRdZCtKgtWOyAPcZp0kMr52b1DJCfHqK41ZChejT922/l+hX3/xk8d+B3OGx5i6r+KePV2YRM6bVIZF44JkpOhNi7Tqrs3XsPVJAF++NbB2BvSOOESH89OTaKwRBDvrPQYd42vYu1HBTz4YDV2py6cbWIG+a7bDLUVm62Lx6XxzMxkUlIE+W5Km4Msy1T7qwCiM2ZOG2uuRCZMAm7CxH8Zjjmmw46XJ70yIRD0R2OxeKOuKHUk3GbVycqI8tliD8efm82G5VY49oAqaQONcEq6xsMPVbFudiFPTyzn2PZCmhKJKHz4dQJnXpfJSZdm8dpLCZQWy8KfupnhXqIdmls3Wuy1AkF4/VMPYKWsSkHVIBpWGNQ9jK0VoprdEAcE9mh1R+K6zOAeYWF7FjXohhde/iSBQI2F5EQNXYdwVLCMl2+ogLR94RwNK6Q0h20LrLz8sRevN4amSyiycEzp3zPIwKFhQV7+N55MiqFn3QRtO8X5dFoJs54qoXV2FNDZU2Tj0nvSOXNMBquW2qCdkN0c0i2l7sRiL7AH+g8O88W7JSx4s4DzTwuhWFoCrdi85Q8eefRhBp86mPPOOY+XXnqFNWtW4/G4aZbrIzfHR0ZGBh6PB6vViiQ3/cuQJAmL1Yrb7SY9I53cHB/NcrPxehNZt24tr732OsPOv4DBAwfxwAP3s279JqAVyK0YOiDMl68WMn96MacNDYvK527jo8qHqU6nAR1g/Wor51+WwcjbMtm+R+SP52bEeOuRUr6dVcyx3ZveZNlwHMfsErc/msLStYnkZkdwOXTSk1UkRWfANT5+nW+F9g2q4Plw2uAw3TuFKK9UqKyR2V1s4elrKwUH9ss0z4myNc9G7xHZVO6QoQU8MGpfFdxuWOi9/FkixP7s7Y0kquCDu4VwuOIEjPj35ESVDX/YWL3B9mebQIAqSO6gMah7mGBgfxnKW195INjgvSRjQ5EPl11Ry/W3+ElO0yDPcDA53GlEneVjDtAOKitk3nrNw4BxmQwan8nMzxIIBsUvt28V5bGbK1g7u5An/11JVo4q7lNDjX9dIE8n+GO9hRPO9/H+gkQy0qMiIEhrytgENa5SE6iKPvn40/cc37XLJnMlMvHfDOn/pw7RhIn/3xg+7MIP5s775PwcXwubpjXNMq7O9SCv0IJN0Xn5/nKuvioAUaM63TAm26hAkSKqxuoemPG1h3c+8/DzSvt+zCYnK8bwQUEuPiNAnxOi4nfKRNWszn/4SMilJMOny5x8/rOLxWvtbP3dBlj55PF8hl8RFLKWhhXwLNi+3MKxV2Tjdolj+0hcoqpaZs2UAo4/JYZeIJxCwlUSHS7JprDUQnqyanwfVs4fGGDu9FJB3uIHfG92IA1OH53B/F/c5GbHUFWIxiTKKywsfa2AE8+LCE/y/+3SgGqk+LWE4C6Je19K5qWZCfU2eYqscd3oGu4fX03mcapwoChvQtOgDcgRr79isZ23PvXw6UIXJaU2YwdULIibN5Vu3bvRo0cPunbrSvv27fFl+0hJScXpsNW/5IcffsJFF11Isjcdf3UVy1b+wgk9u+/3tuFIjIqKcgoLi9i+bTu//fYba1av5tc1ayirKDV+KgNIICUlxjn9g4w/v4Z+/SNiE5Z3EFeeA+eAaozpLKjcKvPE214mzUwkGpPrP/zVIwI8NaGSpA6a8PQONp1470fyk2FvkYWzxmewYZedHF8UTZOwWHT25ltx2TXWfVxAmxPi6FuN6+sIs152c8mjmfh8EQoLbSx4uRBVgzMm5JCeFsVh19ibb6N9TpRVcwtIOEFn1OA0Pvg+kVxflJqQRG1QZuv0fFr3jovTJ+mATa4LBo3P4IcVLrIz4iBBQZGNh68q54FHqsXpgXTA52kLM193M/bhDBxulXCtCLfp0CbEr+8U4vTqwr3nAL6vN+W7khA2iGlANaxebeO979x8ssDF7jzbfj/cp1uYy8+pZdxZAeytdHG6VX6Avl83xnG2qJ7PnOrm2odSqY0o5Phi+yXkNvpIkhXyCndzxmlDvvjmu6/OMVcfEyYBNwm4if9ydGjfcf227VuOa5bdkrgab/LvWRSdkkoLkZDMBYMDTLq3gpzOKuwx7O8O8L2WDO9rfIJUL1jkYNpXHr74yUlV1b6yl2KNc0rPCCMHBznv5CBZnQyvwBJR1T5sA1zDMrkuqunYILRL4scVDn5Y6eDOi6vJyNX2X+QNYvDyswnc/Fw62VlRdB2KyhS6dYiw+t2iejtBqQV8+b6Ts+/MJDMjjixBOAbVfoX1bxfQ6dSYCBuSDyC4x8CXU52cfXcW6ekxLDIoik5egZ0LB/n56N0yQf7+f1pnq0bzZQqs+MHGfS8ls2CZq/7eZKbGuHGMnwmj/CS01YUNZFUjxNKoRpINWKBwo8JHP7j47GcXy9Y6CNYa3bKU1NOsjNQsfDnZ5GRnk50jJCotWrZgxfKVzJo1E7fLQzgc5pZbb+HYYzuSl1dAdXUVRUVFFBQUUJBfQEFBAcWlRQ2oWwbgwe5U6dMlwjn9gow4NUjzLnFx2lJwgD3dob4fw/kiskvi5Q8SmDQzkbzifakrJ3cP8e+bKjl5SEQENhUdsCk9UsRFZH1NgUSfET427bGTa5BwRdHZW2AlMynOr58U4uugov8uSLsWhLYjs8kvsSJJOr40lZ0/5fPwY14eeicVX2YUi6Kzt8BOt9Yh1qwqpGC1Qs5pzUlKiuNx6uQV2phwURUvvlAhNOsHSrbawTOPJXLnK2n1c6awxMKAHiF+fKcYQn+WU0mpULJDJnNoMxISdIb2D3JOvxCndA2T6VXFUGqqWY7hNoMDyBTjsGyLzGeLXXywwM3CFXaiEQt1zkwJCXHOOjnIuLNqGTIgJCQvRYKs/2kzWWch2VK85q1PpjDzywQsNg1fWpy4Kh3Bs9LC3oJdtGje6vdNmzd2dLmccXPlMWEScJOAm/gvR0F+QdoxHTttrqmpTmuW05J4vOlrgywLX+2SUhspCTH+fUsV146rEfrP3UYVWD4IIXMYRBzY8ZuFGd+4+Wi+m43bbDQ06PVlxjjr5BAjB9Vyei/Dni8IlBrH041ViuuqYm6jYmk0qukh9ku/q0uz7Hd5Jkt+c5KdJb6DgiIbd4+r4InHq2CnsUA3g3v+lcST01L2Ix1DTgry1VslIuQjfsA1eMWC3mFYNtv3WMnOFNrvmlqZYFhixwd5NO+uou/h/78wTjMa+1oAMZj2vpvH3kji9z37KogtcmJMGOPn5ov8KM0QFX9/I0S87l6kIGwYq2D9WivfrnDy42oHa7fbyC+0GCXFsFEhD+5X+7QoLjIzMlG1OLIsU1xUjKofTAjsNv44AQlfVpzObWOc2iPMab1CdO8aFRKJSqDC0GNLjRBvD5ArCNtrHyfw4vREtu/e950098W496pqrhnbYPyrf9P9rCPh+RK9R/rYvEdUwnVdQpF19hbYaJkZY+28fBJzddgOHAdPP5TIXa+l0Swnwt58B5NuK+Hm52o4v3c6n65IINsXFac3BTbOPaGGT5eXcue4JJ6ZkUJudoTyagWHTWfX7DwSm+sicKghCc+GjYutdB3vI8Gj47AK95VIRGLDOwW06RkXzdkNF12jGXjBCgftcuK06BEXQTzlYkw0dYMtWRGVbg9QCD+ucvDh9y6++MlFXkFDexSNDm2iXDgoyCVDajmmR0zck0LjOXCw55NijP8ovPueh3tfSKKw3EZaWhSHFY7E1t5isbA3fxc2myOwedPGjq3btM4zVx0TJkwCbsIEAL/9urZTz549V6ta3HGkJBxEJbeo3EI8ItO/R4iHrq9i4Blh4ZKSd4iGM90gemmAF9S9MO8nF7Pnu1mwzEFVtbW+cgUaXY+NcP4polrWvVtUkLhK8UdXm1ZhrJO6HzjtpRQo/EOhwyXZ1FQLAbrdqREJyyx5rZC+QyPou41KbhJceGM6n3zvxpcpvqfCYisvTSzjpttrhLSlwWeVNKATPP9gAhNfTceXFQUjOTK/0MZ94yp47Jkq2HrAcf3/b9RVAFuIau/TMxJ59b0Eisv3VXs7tYkwYYyfqy8MiArkniZKLeoIVKpBoKqgeLfC2t9trN5qZctuK7uLLBSWKZRVKVQFZLRo3ViQ9mdL4ltGsoogmTSvii9VpXlWnGNaxOnePkrXdlF8LVRB/msNshdtwvetGZuzFoKoT5vj4fmZCazb4qj/kRRvnGtH1XD3uGpxKrD3ICdAfwcMEh4olDhxpI8Nu4xKuC4hyzp5BTa6tA6z8pNCbF6xd6ncK9N6VA4xVQj0daBs8V6cOTonD8xi8UYXOb4Imi5RWGTn39eWce8N1aT1b0YoKpGcqJFfaOP5m8u49T6/GKPyARtXCU64LIvVm+340lVj42rnrrHlPPlklbCq1A9CcOu87puyAaobM4qYf6QA1bBurY0vFjuZu8jFqnU2o1NWvJnHE2fwiWEuGhxkWP+gkJnUIDzXD/Z+dRvEbMABS7+389BkL/OXupGsGjnpKpradNOVOvKdl78XHTX6y7LlJ/bu02uNudqYMGEScBMm9sMvy5Z379v3pGU6qu1oSLgsi8pQUbEoLV88NMDdV1TTuW9MLLQFh6gI1h0juxEkLgbb11r46Hs3c350sXq9rQGb0bE5VPp3j3DegCDn9A3RomMcXGIhp6qJi/mfdhAQ1ST+KLSwcI2Dr5c5+WKRC196nILP84Q3cXCfi8n516fz6UJBwHUdikqsfPx4MReMD6JvafAZVeEgUrpRptmwZiiKTlKCSFgsKlPITFHZNS8Pq9dwEZH+wwZFnQbW0DsXr1d4dmYib33socpvrSc73TqGufNyP6POrxUyoz2N66j/RMbdQCLiZCIkCFZNlURRuUJJpSDhtSGJSFSqr0AqMthtOm6njtetkZGskpWqkZisiRAZpyCu1CAK6rEmbnI045qaAxGY+5mLp6Z6Wb52H/F2u1SuGB7gjkuradZVhVJESqL8P3gfG5DwPiN8bNy9rxIuSTr5hXZOOjbI4o+KhEe2E267I5kX3k+meU6EPfl27r+knEdnVKOtg5NGZfHLZhe52VEiUSgts7Hg5QIq/TIj7ssi1xelsFShXYsYm2cXiHlQ23ABBdrAv+5P4rF3UhtsiHSuvcjP5AcrDu6FfwTjT5LEnCNNjIv8bQpfLHEyb5GLRaschIIN7Wk0ju8Y4fwBQUYODtKpW0zIU0rEGDhodb3uPXxiDG5bYeXJqYlMnesBZDIzYlgUONIMKVH53gNo0R9/WDhwwMBTlpqrjAkTJgE3YeKQJHzgwIE/hiOhxCPVhNdzWRmCEYmKCgt2q8rY82u5aWQNXU6MCieQw2ltG1bFk8TPLlju4OMf3Xy3zMHOPTYatmSlpsY5pUeYc/sHOb1nGN8xqjjOLjMW3KaS8TrZRbqx2FfDltVWqgIyfbpHhJbVCPKhOdxxdzLPzko2GuJEBfymi6p46Y1K2G4cbeuGnjoBzhieyXcrBNFRVQlVh5ISGx88VMTI64Pom/8HKqZ/MxGXDPtFUmDnKgvPzRQkJRjad+EDegW5fZyfoUNCoqFxbxOlQgc+mGUEgbQhXqfhHuwgBKpus0NUEGaigmyjHVnFsp5454r/v+A7B89O8/Lt4n1m2DaryqXn1XLHpX7a94qBH6Hzlv6XNlBx4QteWyTRx6iE1zUEgpBNndU7wJczSyATdn+p0HZcLm6nRiQqkejW2PVePs7eOvGdcPJoH79sdtIsJ0KVXyESgzmPlfLqvAS++cVJVqpKYbGVjx8t5oKrgujb2D/GvQX88KmDs2/PZPCJIU7vE+LMPiHaZMfFfTha0p1gPAdUKN2q8N0qB5//7GThKgfFJQ0lJjrNc2IM7hNixMAgZ/YJiftXg5CqHep0rO5e+8T42rLCyisfJjB1jodgWCEpOY7HoR+R3GR/8r0Li2INLliw4LRTBvQ3ybcJEyYBN2Hi8Ni0cXPbUwcN+r64uLB5TlZzdPSjCktRZPDXSvj9Vmy2OKOGBLn2ghpOPCkiKtZFBkmWDlGVQlTwyBDkq3q7zGdLnMxd6GLhKgeVlZb9FuGszBiDe4U5u1+Q004Ik9JGEySuHBHc01QyrhtSkxTxvnoB+ykfpBxY8Z2N3tfkkJwcx2nXCUUk/AGZ2f8q5cIbgoJ4WIAg3DQhhVfmJZGVGRVZOIqQCwzsGeSHD4vFEXyI/7zq96G+GxAJiYmwaZmVp6Z6mfm5G03bx8rO6h9k4qV+Th0U3ucsEuY/1/i1TmpiOLYsXmjnuRmJzFvgpmF19aIhtdx9hZ+u/aJCnl7QRM3y/wQJbwOBAkHCG1bCNR2Kim1cdGoNs6eVQjJcPCyN9+cnGlpwOy/fWsqNd9RACNQA9B3pY8VWJ81zI+wpsHB8+yhn9Qkx5bMEFEWnuNRC/x4hFs0qFhXtho2V/4+9+w6Xojz7OP6dme3l9H4OXaqAiooFxN67WLCXmESjsSUxJsaoicbk1Rg19tgTFRWxKyh2QARUmoD0cnpv23dm3j+e3cOhqAseisn9uS5C1K0zs7O/efZ+7keHeEyjpVOnZKCpLmA7UMd1phdf6dCdhSpLMqF9tc60uR7emO5l2ufeTeq6bbKykxw8So12nzw2TP5gK6PJ2pqF+rWlVF2sfTHLxcOTgzz7pp9IxEEgmCQnYG1T8NY0DU3TqapZS25OXv2096cdPmrUXovkW0UICeBCZKSuti7vhBNOfGPuF3P2KcwvcblcLizL2qbH0nXoDGu0tTlAszju4AgXHt/JaQeHcfRR4ZjG1MRF7Xu+nAvVl+uqrx28McPHWzO8zPjKneqkkf7GtejdK8Gh+0Q5/sAIh+4VpWCgpQJx81aG8S2dNAz15X3pFfk8/lYOpSUxnIZaaTDUqXHpaZ0cf1iERBKefCHAO5/5KSxI4HKo99HYqpNIaKx8uYo+eySx17Jrj35/VxAvBzzw+Qcu/vZUNq9sFFhtTjg0zOWnd3DcYRF1QVOb2v47I7R+23sIpMJYO0z7yMNDk4JMfs/XrdjZ5viDw1x/UTvjjoiqkfbKDBfS2d4hvD+E6jQOPLOEBas9lJcmwIakCXUNLi47sZWHXm9m5WsOdjulgtxck45Onf69EnzzQrXaAPmQaFUj4Z8vVSG8tsmgf2kShwG1zQaaZtPQ6OS122s56dyIakmYlm5hGWDDCrWZXujqqJHuPPXPrSt0PvzKw9szvXwwx8Oqtc7URlb1/25vkgP3iHH8mAgnjo0waHhC3b8BdWFgf8c5xEiF+xy1/1791MfTb/p58yMfyaROMCtJlt9mG09z6LpOIpGgvrEmPnLEHgvefPPNE3v1rqiVbxMhJIALsdXOP++Cx//z7L/P87j8rsKCwm0qSekexCMxjeZmVbO5+6AYZx0V4szDwwwekVBf4I2pL1Lre75I81JfpK2wcIGLNz718tZML3O/dhGPblwT2qsiwWH7RDnuwAiHjYpSMMBSo7Kt6k+mEzi7pBZfsU04+LwSPp3vp6Agjs9tEYroNDVvnKbLSpJdDx+JazQ3u3jqxlouvDakljffGSEumerqUcKG2vltKaFIT6jrpf7xvSke7nw6m/dmeLsFJ5uDR0e5+OROzjg0hK+frcpEGoDojp94qtmo/V+oLh7i6zVe/sjHE68FmDbDu9EFxLh9I/zmwnZOOD6iLuDWf0tnn50cwsN1qiZ8YapPOGjE4tDY5OZPFzdy0xNtXDY+j0cm51BeFqOq2s3zN9cy4Rdh7K/VY5htG0bCK8pihCI6ToeNx2XT0GoQCbm5/oIG/nZb64bVaLflokdHjZLnAXFoXa3z4Zce3kqF7tXrnHSvcTFcFnsPi3PcgakJ2HvGuyZh0pzBhXu3+vGVixy89KGfF6b6mLdYzSDNzU3i82x78AbVZrCpuYlwtCN+xulnTnrxpRfOlW8PISSAC/GD/POf9//smquvvdeyk56ykt6wjSUpXR86TU1oqm0ywNQJBEwO3z/KqQeHOWa/CMWDzQ2j1R3fEZC7d9IIAvUwd4GLN2f4eG+2h9mL3CRjxkZpsVd5goP2inHM/hEO2StKr8Gm+jm6LRVCMx29S4JWAYTh3BsKeO7tLNAtylOTMpOmepj0Io4bLj5cXH1mM/fc3aLaoEXZ8SPBNmhBaK7VmTgtwHnHdpI1wlJr4rT8gCCenrQYhbfe8XL/i0GmfOKlax1vYGC/OKceFubkcWEO3COmJt3GUhdDEWAru0xk/H4NVDlTTurvepi9wM3rn3qZ/IGPJctdG10wHHZAhCvP7ODU48PqwnDdttWy7+gQfsBZJSxYpUbCNSAU0WhpdfLmfdUcf3AU9+g+eD0Wbe0G+w6PMvv5WnUR1AlaX0i0aBx0dgmfL/VSXhbDsjRqap14nCZ3Xt/Cpad14knYmy0y9b3bP9U9iBy1n6uXGXw8z8PUWV4+/tLNmo1CN+gOk32Hxzl8dIQTx0TYf2RMXSyGUxfp39bBZguj6k3LdKbOVqVr783y0NbmBN2kuMDE0LfxQqLrXKahaRpVNesA4nfdeddvfvXrX90n3xpCSAAXokd89dW8YZdcfMmT8+Z/tWfAl+PKycnGNH/YijFa6n9CkVR5ClBWuqGO+9BRUQr6WSowpQLyt3Wx6BrVzEfVl9fD5/PdvD3Ty9RZXr5a6iQedWyUGAsLkxy0V4yj94twxD5R+g9KqoAQSoX/2PeMzibV0uwE4Zmn/fzxwRzWVrkBi7w8E5dDnVssG+obHIDB5We08OCdzerCopmdU3piqZUS77sjyNV3l9K7LMTV53Zw+fgOvP3tHx7E3ahJcDH4YJqHhycHefMT70bdKnSHyX4jYxwxOsrhe0cYNTBOsNRWYddMhfIoG02mTAesbz+YUhnOmfrjSf1xAJ0QrtX4aoWL97/0MO1zD7Pme0jEN7QscbmTHDs2ys/Hd3DskRF1Ybar165vIYR3HwnXNI2Wdp1Qp0HT1LW89qmXS24rpqQ4Tm2dk/furuGICVHsFal91zc1En52KbMX+wCbg/YK8+itTQwZk1ArembQYlGzURNn81D7tA3WrnDw/hcqdH/6lZuaWsdGG9ZwJdlzcIKj9otw/JgIY/ZMhe5oKnRHt1y6pNmp/Z2d+hOHltU6H33l4c0ZXt6b5WF9lerXHsxKEvSpg+iHfvUbhkF7ezvtnS3x3YeNWPz444/9RNoMCiEBXIjt4oYbfnfr3/721xsAV2lRBbqhb3Nt+MYjSeoLsbVTJxJSI6a9KhKM3SPGkaOjjBkRY9CgRNfP1rSp0bAt/fzcFcYLUOG9FuYscvHOZ14++MLD7IVuImHHRsNmuXlJRu8e46j9ohyyV5RRw+Lqyz+GmsQZ+Zb60nT9a2+12uYDLwZ5cZqfecucJKLpcGczZECCX5/fxk8u7lR1sjsrfKeWNo+3aux2Zhk1jQ4sG6yEwYDeMS4/s4PLxnfgH2Creu3WHxDE08vQW7BotpP/TPXzxsc+Fi93bRS8NIfJbr0TjNgtwT6D4wzpE6dfiUl5QZLCHEsFuPRdttTiL7XqKVbq2OiApjadqkYHa+oMlqx18uU3bhascLJ8nRMzvvGvIgP7q+Xozzs6xF77xTNejn5XDuEHnlXC/FVeykvj6JrN+joHu5UleevOOs6/rZAFK51EIwbHjAnxzjP1qltIMvUYfSFeDQf/rJQDRkS5+88tavuv+Y5jIV3u4UX15/cCDTD/axcfz3Pz7udePl/kprFx44nTbq/JPrvHOWzvKMceEOGAEbEN/cG/LXSnf9HwpQK3R10wrlruYMZCN+/NUQFfjapreHwmOUELXfvhoVudq3Rs26KmrhIgfu01191z9z/+/lv5dhBCArgQ29Xsz2fved11v/rHjJnTD9RwuMrLyrEsi576LKVLVNo69dSoKWTnJNl39zhj94hy8B4x9hoUJ7s8Fc5SoYtONith0OzUF3R+KhQ0wfyFTqZ+7mPq5x7mLnbR3rZxKHB5TfYZFuewfaIcPTrC/rvHcJSn/nMDENokFKRb9OXQtbT1l/NdLF3jJJ7UqChMcsR+UVWeUZnqeLKzJl2mRr//eXuQq+4ppKxkQ5+4mkYDO2nQryLGled08IvxHXj6qRFxu/lbwm8mz+cgvQo8iTUab8zw8vqnPj75ys3qtc5NUq5K076gRUGOSWmeSVGuSW7QJuCx8LhsHLrdtY81wLQ1onGNzojqxNHQYlDTbNDQahBqT7/ojRfv6VORYOyeMU4aF+bEMRE18h9GLdLyfcvR/whCeKRe44AzS5i/yqNCuA7rq1ycfkQnB42Mcv0DeXh9Fq0tBl89Xs2eR8WxV6fed1ItF4+V+uyEv2WV0/Rx708d9wbYVTBrsZt3Z3v4YK6HOV+7UxfUGz4s/qDJPsPUhfUx+0XYe0Rc3b/7xW63z5dmo37F8KNKS9zqM9hZrfHVcjcfz3czfZ6b2V+7aWlWF9ZurwrdP7TEZOPzkoau69TU1GDa8fi++4yee/c/7r527Ngxs+VbQQgJ4ELsMA888MCld9zxt99VVa3v7/NkkZeX+4PLUrYUxm0bwlGNtrbUF7lhMaB3kj0HxjlwRIy9BsYZ0S9OQe/U4isJ1Ah5aOMR8q6fxfNTX+bN8M03Tt6b42HaHA+fL3RTW+fcKKzpDpNhuyU4ZFSUY/aPcPToCI6+qM4t9ZuPincF/pzU36iLAprVBcIO6xW9JTZoOZBsh35nlFPX5KAw18S21fvQNFWrXt1oYCcMdusd4/KzOrjijA7c5bZaWn1bJyB27zhSpPZR22qdmQvdfDzPw5ffuFi61sH6GgeYmyb9blc63320bOF2tqrNLzEZ3CfBqEFxxu0ZZczIGHn9U5Nxv2uRlkyOUX3DxcYu8W2SVIs/RRtVCJ+30kt5aQzQqGowOOGAME0dBkvXOmlpcXD2MR0892jjhs4u6f3lSV3QbjovIj3aXYAa7V4HU2d7mTrLwwdfevh6uZNkfONfmAoLk+w3PMbh+0Q5cnSE3Yck1P3DqdDdvdwrPcLtR32eXerz1rxeZ9EaJ18tczFzkYevlrlYsdaBnVS1+1lZJj6v3WMj3d0ZhkFrayud4TaKi0orb7jh+juuufaaB+VbQAgJ4ELsFK2trb7b/nz7TQ8/9MhloUhHTtCfQ3Z2do8H8e6BPJHUaA9pxCJ6VyDvXZpk5MAEew+OM2ZElFGD4+T3ttSIWQi1ZH23jhtdYTwH1d4wpFbYe/8LD+/O9jJj/uYTw8Bi2KA4px8e5oJjOhmwd1Ktsli9i3XG+LZtZwFD4f6/BPnlP9Tot22rvuQNrQaxsI7ba1GYa2HbUN2gRsR7l8W5/3dNnDg+siGE/5CLiPREuUAqwBlq/zRU6ixa5WJZpZOVlQ5WVzuob9Vp6dDpDOvEEhqJpPp1xE69AA0bXQenkV4R0yI3aFOYY9K3LMlu5UkGViQY3j9BSUVqKXoLNZ+gYxvaUaZHfQOox3Ko4wpQv7BEUL8YmOwSLQo3jISrzibxhEbS1Mj2W4SjGnFTo6XZ4JP7ajjo+Bh2zXc8Zvcl5F2wbr7BM1MCTHrPx/wl7s0+K70qkhw4MsZRoyMcsXeU3oOT6vPYkfo8xjf5PLpTx0NAXay2rtf58hsXMxe5mbvUxfzlLtZUOyCpnsflMcny27icNtvra9zQDdo72mnvbMHt8nb+/Oc/e/imP/7hzwUFBe1y9hdCArgQO93y5St633XnXb/59zP/uSASC2UFfNlkZ2djWekC3e2YNUzoDOtEwqlArtn0qUgyanCMQ0ap0c69h8VVr+com//MbW9YYp5cIAYta3Smz/cwdbaHGfPdzFvs6tYvUCMrmOC0I1SP69Hj4rtOb+jvCo65EGvVGHB6GQ0tDgpyTXQNquocnHZoiIMOjvJ/D2RTXefC509SkGNiWhpVNWqy3At/q+XMc8PYq3r2PWqgJtH52FDvnUSNjnZCLKwRjmgqMCbUMvR2txoUQweX08bnsfF7bNy+1GROfyogx1MXYSHUJN5t3H5YoOUBRWCuhvfnePnqGyerqhyYpkbf0iTHjomw9yFxVTvfnHr+nRnCUyPhB55VwlcrVAhPJDRswO1E/eJg6zz2x3p+8pNO7PXfcuxoqeDthnkzXDw8KcCL7/ppaXV024sWw4fEGTMyytGjoxy0Z2oStS8VuNu6XbylfxHpXh5WB/MWu5ix0M1HX3r4YqmL1esdYKkRbo/PIuCzcRrb+ztbQ9c12tvb6Qi14nS4w+eff94zv/7Nr+8cOnTIKjnbCyEBXIhdzuLFi3e75557r37+uRfO6Qy15TkND4WFRfzQ1oUZf6A1FcjbQzrRVCB3ekz2HhrnsH2jHLd/hDEjUxO9Ur2oN+py0b2NWa4KC1Y1fDjPw6sf+Xj9Yx/rqpxdz6frFhOOC3H9hW3sMTahRvdqd3KpyZakO5/cFuTqezeMfscSqi/7109VMuzCJPUfGdw7Mcg/nwkSSuiUFyWx0aiuN9CANa9UUjHIxK7fvu9P09jQ0cTo9ue7JmGaqT+pyYSYPVSKkG6x2AfCazXumZjFs2/7U5NJNy2VsfjlOe3c98dmVZLSwM5dZCkVwmNNGmPOKuGL5SqEh6M6zc1OdquI8citjRx2QExdMGwavC1Uq8gcWDrLyf89ncV/3gyQSGxoLVlWkuDEcRFOPTTMYXtGcFakNkULm7cRTXfJKaRrgvTnC9y8M8vL+3M8zFnsIpaa9+H2mmT5LZwO2BFf05qmPrSNjY3Ek2F8nkD7hLPPeu7qq6+6d+QeI5fK2V0ICeBC7PJWrFjR+9FH/vXziRNfmLC+cm1/gKKCUpxOZ490TdkasYRGc4sOto7msNhrSJxjD4xwwpgI++8dU2GgSQWGjUoSund2SE0ya16h8/x7fp56LcDchZ6u53A5TS4+LcRNl7ZSvqcJVWC3sWuscNm99vv0cuqbN4x+V9Y4OfmQTl59sgFqUhcdZfD1FCdHX1VMa0gny29h6DaVNW5+dXYLd93ZojpifNeJtVs2/lGzUl1uyuC1SV5++dd81te4QDcpyjdxGBvCoa5DR0ijvd3FOUe38uxDTeqYCu/ki7GuEA5jzi3liyV+wORnp7dz3++acJcDqzYpozJVr3gqoGGJwe2PZfHoS0Ei0Q0H9B5DYlx0cifnHBWiaHBq9nMDatKmvYXPUS5qtLsZ5n7p4q2ZXt6a4ePLxS7MhBrlzs018bh27FGjazqJZJL6xmoASksq1k04+8znfv7znz0yePDgNXI2F0ICuBA/Oq2tLb6nn/73Bc/++9nz53wxex/A5fMEycnJUd/NO/Dzp2kQT2g0tuhg6WiGxUGjYpx2eJjxB4eoGJ6qW6/ZQu/n9E/muahJhLXw7Ft+7nkuq1sQ18jPTvDbS9v4zSXt6rZrdn59uGYCwzav/Y4mVP3v/CeqGHlUQpWWaKmwNAoe/VOAn/+1kJKiBJoGNQ0O9hseZdbjtaClttG3Bb7C1LYKoybERr5jmfBd6Qsh9frSh6WmAX3hoQcC/OIvRYBFeWkSTYOOsEZbqwqkubkmfq9aTTFhQkODmwevq+Py6zth2U5a7XQLITyyWuO0G4o5+8gOLrgypFaSrO92oWilfgHqq/bd/U8Fue2RHOqanF2XUyMHx7j63HYuObFTtZlsSF28brp/06Pdper4r1tiMPljH5Pe9/HJFx6ScR00i/w8C/d2rOPe8n5WL7StrY1QpB0gvteee88777xz/n3BhRc8IzXeQkgAF+K/xpQpUw97/rnnz5465d1j6hpqKgBysgrw+bzs6M+hpqmR8aYm1VmlID/J8ePCnHN0iKPGRrvaCdK2hXISCzQ/arGZRnhsUoC7nszimzXurpvsMyzKX69r4fAToiqcdA85O5Kt6pZjLRoDTi+nocXYaPT7tMM7ePnJRjVib3a7T194/xUPR1xVQlFhEkOHxnadPkVJFjxWg7fIxu7YwvOZaoXQ2R+6eG+2j6PGhNlnSBytLLUN29hQC7yTQ6kGqkbbjapT9qVeU92GXy+0PvDp227GXV6O15ekIEdNUK2scZDlMzn8oCi6Bm996AUdCnNNLEujoVXH7bJZ93IVORUWduMucPGRVPMAcKWOxaZNWi6aoBUAhTBjqpvf/j2XGfO8XXfvXx7nuovbueKMDtUjvxpVYrLphaqNmthcooL5hzM8PD/Vzxsfe6mtV0E+L0+NdO/or19N04hEorS0NQBQmF9UfdTRR7179jkTnj3++OOnyVlaCAngQvzXqq6uLpg8+ZXTXpn86qkzZ8wcG42HAwC52QV4vd4dPioOagGgcKeqaz1w7ygXnRji3KM78fW3VS1rwxba1KV/pu8F8bXwlyey+fuT2XRGjK40csWEdv7+mxbVxm/VTgieqdrve/8c5Jr7Nq/9nvd4FXscldjQAzodogbAY/8M8NM7NoyA17fqDO6VZN6/qnHmplZE3HR7elX42uukUuYtCeDwxBm5W5wDR8YYt2eUg/aIUZJrqmXdd0bY9qImZ6Z/tGhXkxRX1zpYvNrJzHkezjq8k9Fj4upiIRsOPb+Yj+b6qCiLY1saNY0GY0ZEeeCWZkaMTIAX3n3Bwwm/KcbjtsnyW+iGzfoqL5cc18LjDzdt3OJvZ3/pOVUY7/qYpbub9FcXitffnctdT2d3Hewep8XVF7Rz089a8fe31cVaO5v/QmSjWgvmQ2KtxnPv+XnqdT8ffe4FNLw+k5wsS83B3MGj3dFIlOZU6HY5vOEDxxww/ZRTT35l/GmnTq7o1atezspCSAAX4n/KwoULB73x+psnvfvue0d/Pmv2/tF4KAAQ9OcS8PvRdG2HBXJdg7gJDQ1qYZ4BfeJccGInl57cSdkIU/X+rvuWIJ4HlMKKWQ5+d28uk97zd0W/3Sri3HdjM8eeFoHG1MS8HdEdI9X5JNGq+n43bFL7fcqhnbzyVINqo2huclFSChf8Mp9/v5VFaXECgJo6B0cfGGbKw/WqpCSxyfOZKuy/9JCPM28uoagwTtLUaG7TU729bdwem//c2sDpZ4axq7awDb2oPu7plS27/939T3KTELmlC4+guhjAk3qMdmit0VlR5WB5pZPFa5wsWOlkZaWT9fUG7a0G4OaWn9Zy821t0AzrFhqM+GkZlgVBn01rp05e0GLVC1W4RtqwBDWaPAL++YcgV91diO4yseLq/f7szHYe+X2z6nOd2AU/gGZqVLwEPnrTw5W35fH1Kg/pcpMTD+7kjmta2X1MQq1M2ZAa8e5e3w3qF6NcaPja4Ik3Ajz1hp+lK9yATWGBicthY+2gr1pNU+eMUChEe2eLCt1Ob+d+o/edfeRRR7534kknvL7nnnsulrOvEBLAhRDA/PkLhrw79d1j3ntv2pFfzP1in+bWxiIAQ3ORm5uLy+XaYZ1UbBvqmg2shEF+XoJLTu7kyrM66L1ncstBPB1EygE3vPCcj9/cmcv6elfXDa4+t517ft+s2h2u3vaFXzJ+H6na7007n2yx9rvbaKZWAK2rdXY7t4xIXCPbrxY3qap1cePFzdx2W+uG19897OeAFYEBp5WzvtZBWVGScFRH08DjsokloKHRxb9+W8+lV3WqUfc0B6yvNmgPGXg9Fi6njcsBToeNy2HjMMBhqL/pvgy5kQqF3VdqTJUMNXborKl18PUqFwtXO/lmrZOla1XYjqdbVmLjcFsEvDZul01dvVMtTHNfI7jhk7c8HPzLYgpzLRyGTU2jwYEjY8z4T62abBjbcKFDGPKP6YVDg5+O7+DCEzoZOCCJ3cquNxs1PWLdF4jC7/+Wwx2P53QdkCV5Ce64rpWLLuhUr33dt6z+WqSCd80CgwcmBXn8lQC19S4wTEoLzK7P0o4I3fF4gtaWFpJ2DICcrLzGvffZe+4RRxz+3tFHH/XuXqP2WiRnWSEkgAshvsPq1avLPvn400M++uijg+fO/WKfr79ePNwm6QJwO/0EgwGcTud2D+KaBk1tOtGwg5ysBBef2sk1Z7fTey9TdU5p3KRGPD3xrB90rNS45m95PPFqMPUfdfYaFOHJvzSxx8FxNUEzzPapDU/Xfjdr9D+9nMbWTWq/D+vg5ac2qf1Ov/4h8NCdAX5xZyFlJQlVspLUaG4x+OKRakYdEd949JoNi/z849Yg192vwn4oqlFRmMTvsVm6zonHZVPf4ODVv9Vx8lkR7MrUfQ2gAM65soDnp2ZRWBBXgdsBDt3uCuHOVCB3OiDbb7FbRYIDR8Y5/YgQRilqkSA7VWKRDWdfV8DEd7K6pV8bj9fC51WPp+tgWhCLa4QiGomYDjjIyY5S/2YVzt1sFr7rZL/LS/G4bTwum2hcIxLRmP9UNYOOSGJ/ndp/qXkBixY7KSswydvLUi0pGzZpw7crSB+j/eGbWQ4u/n0Bny30praTxtnHdnLv75ooHGptfoymWxPmq/Bdu1C1rXzs5QCNzS5cnmTXQk7b+6s1kUjS2dlBNB5K/RsjvvvQYYv33mfU3EMOOfjjcQeP+2jAgAGVcjYVQgK4EGIbzZg+Y/Rnn322/8wZn42Zv2DByDWr1wyxSKqvXVzk5Obgcrm2z0kC1RmipV0nHHKQHUxw5dkd/Pr8dnIGW6prSuvGIQULtBIVBF9+zseVf86jtsUF2Bi6xf2/b+ayKzrUhMRaer4k5Vtqv9Oj31us/QY0n3rDI84qZfEqFyUFKp1X1znYb0SUWf+pVeUUsU2eqwQ61mv0Hl9BNKZRkGNRWWNw/nEhQlGNN2d6yQlY1DcbTL27jqNOiW4cwPPgjCsKmTQtSDArgW1rWKkQZ1lg2Vrq71QttbnhqmdAnzgP/b6JI4+PYq9Njcz2gWt/k8s9E/MoLVYvVtfU/etaDKx4+v42gSyLXsVJBpQnGdo3wZ4D44wfG8ZdYJNohJEXl7G80klRromuQ1WtgwP3iPL+E3V4+tqqVrwT1fElD7XYU+v2/4Vjm6Q71OTDvx/3c9mt+YTjqU4ugST33tjM+ReF1Pup3qTcxAQtC6iA0EqNu5/N4p/PZtHQ7MTtS1KQvT2Dt0Y8HqO1tQ2z6+Az6Nen77IRI0csGDPmwBn7H7D/rHHjDpolZ0shfhwcsgmE2PWNGTtm9pixY2bzG+5rb2vzLFy4aOTnn88e/eWXX+29aOGi4YsXLxmWMKM+AK87QFZWFoZh9EjJio0KfTkBi7ysOI1tOrc/msdTrwW47sJ2rju3HW0wagQ2lgq0Bth1oLXA+PPDjNsnyk9vKuC1j/2YlsbltxXw2Tw3T/6lEX031ATNnlq8JzX6nVimcedLWbjcKkQbOrQ0Ozjl0E72OCIBlRuHb0ygHF59zMuiZV6Ki+IbWsvZOj87rgOKwF62SWjXgSy4+V85tLY6KS+NE01AQb7JfsNiPPF2AJ/HxkJDM8DntlVNNps8t63SfMCrCr11HdpDGglTw+lQZTCGrkpFHKmLHduGlWudHPXzUqY9VM3hx8ewV6tfLsaOjHHPRFONimuQSILTAfsOjtGnzGRw7wQjB8QZ2jdBv5IkvkIbclKvZT3QBM5+MGZ4jKWrPBi6iWlBWUmSmfM87HtaCZdMCLHv4BgDipOUlpqqw4gP8ILWjqqVt9j5QTx9UdhPvabLr8zj4UnZpEe9j96/k8dua6JiD1OVF0XZuDWhExgANMOD9wa566ksVle6cXmSVJTG1cVRD04y1TQN0zRpb+8gElPtdhy6Ozps2JDFw0cMXzRq1F5f7Lff6NkjRo5YkJOTE5YzpBA/PjICLsR/gTmz5+w587PP9v/0408Pnj1n7uj1lWv6A+g4KSgowOFw9Fj9eLo0pbbJwIwbjBgY4dYr2jj1tPCGJemha8ltLNWaDzfc9Y8sfvP3XNJLOo4cEGXy/fUM2DsJK3qmS0q6HOSftwe56p5uo99xjZYWgwVPVjHiiC2MfnsBF+x1ZinzlropL06qtVWaDUoLk6x8sQpHMFVvTbdw1hvWzHHQf0I5Qb9F0GdTVe/gvKM7+cUpHYz7ZQn52SbxpEY0pjH9gVpGjY1j16We16kC60lXFvHGJz5Ki5Nd4drjstEMSCQ0kpZ6D63NBprTpqIoSTKp4TBgfbWTvuUxlk2uwemywQ9L5zrY+6dluFw2XpdNa4dOYa7JgidqyB5pbQj94dSfGGpiZ/cLmQqY/5GLPS8uJysrSdBnY6NG06saDeyEjua0KC00GViRUCPou8XZZ2icEf0SuHrZapinNtU1Zme1otSAgVD1tcH4K4v4fPGGiZa3/qKFP17fpm67ttuod7rOu0IdF++84eWPD+Qwd5EXHCblhWaPjnhrmkYymaSpqQkz1Sanoqz3mn323Wf2uIPHfXzgAfvP2m///b6Us50QEsCFELugxqamrJnTZxw4deq7R3/6yfRxC7+ePxxwOXUPefn5GIbeI2E83cKwulZ1TTn5sBB3XN3C0AMTqiylpVvgSrcs7A2fTXFz7q8LWF2rSmYCbpPn/97ACRMiKgD9kKDWrfa73+nlNG1S+z3+8A4mPdm4eVu8VO33K4/4OO2mYoqLEuipC43qWhd3XdnIr25qh2827vusGSqgnXVJAS++l0VFWRzTgppaF3MeqiTp0Djgp2WUFCcIRzUMHWY+WMuQUQnVDQbQXIATjr6iiHdnqgCeNKGxxeDVO+o56OgY0XUaCRMits6idU5uuT+HZeucFOWpUWnThvp6J2//Xy3HTohAM8RbNPa8tJTllU4Kc0ziCY22To0vHqth5CGJDRMLv28f94Ebf5/NX54pID8/hse18WhvIqkRiWmEQnrqZwxweU0G9EpywPAYxx8Y4bQjw6o8ZW1qu++oVpTplTz7wUevezj96kKaOtQPv2V5CZ75WyOHnxaF9Zus3GqClg2Uw+q5Dn53Xy4vvKM6+5SWJHuslaCmaViWRVNTMwkzAhDffeiIxQeNG/vJUUcd+d7Yg8Z+UlhYKIviCPFfSEpQhPgvU5Cf337SySdNOenkk6YATJ367iFvvP7GyVOmvHvMylXLhgAE/TlkZWVhWzb2NraoSAeQ8tIk8QS89oGfKZ96uPHnbdx0eRvaQNTP+aYKNnYItKVwwBEx5r9ezYRrCnl7pp/OmM6JV5bw99VNXPebdrRG1MIt23J2SnWmeOjhADV1rq7R71BMDWn+8dw2tYpl95F2O3VxUAe3/CcbdBuHrh6qqVWnqDCuFl9p7MqXXSGN/vDFmy5efC9IXl4C24KGJoN+vWLsc0qc++5UE1A1wLI0/B4Lvyc1+pymAwmIxzXQ0/tCw7ahV6FJbh9rw7ZwmAw+IcHIojgjLi6jM6rhdanXC/DFShfH6hGIgqvQZkBZgiUr1YWOy2mTjDuYvdTNyMMTGe112wStCW7/Yxt17Q4efzUbsCguUosT2XZ6Yqjq/50WS2gsW+NkyTI3T0zOYs+hUe69vplxR8XQ1qW2//YuS0mmWjuWwL/uDfCzPxd0bdtDR4V48b4GCgZasHTDMdq1EuYAIAR3/jWLPz2YQ2fEQX5+Ao9Lrfb5Q7K3hoama3R0dHS1Cezfd7dlRx195JQTTzrxjeOOO1YWxBHif4Aum0CI/25HH33UR/c/8M9r5y/4csSLL7508llnTviP4TDqq2rWUV1XjW3baNq2nwosCxwGVJTF0V3wx/vzGXVaKR9N9cBuoOWnwqqWqidfCsF8m7eer+eGi1pI/97/q78XcOUv88CPWjkyufXhW8uDxDep2m9Pt9rvFgenHhZi5OFbqP22gAp49kUfC77xUlKY7OrZHIs6+M0Z7XiG2qrrS7fQqPmBTrjm4VxA1XZbQDJh8Puz26AEvl69oVONaYHHaeP32BsHcE1tn3hC63pdlg0Op+q+QpP6NcFuSfVQnwcDhyfZf3iM1jZ9o4uhUFRXj20CWTBiQGKzpLtwpRMSG37B2Cwg6qmR/dQ3hN0CROGxfzTx6M317D4oTl29g+paJzWNBuGotln9s9tpU5RrUlaSoKQowbwlHg6+uIxXJvqgD9u/LWEyNQk4B37761x+9ufCro39y7Na+eDFOgrKLeylqW2nq22m5QCDYdbHbg44vYTr/15AAnVsuxz2D6rzTvfnrqmroapmHWA3nz7+jOeef37i+HkLvhzx0MMPXi3hW4j/HTICLsT/CL/fnzzjjNNfP+OM019fuXJlxfPPTzxn4vMvnP314oXDAFdBbjFujxtrG1OGaWrkBi1yg3G++sbNoReXcN0Fbfz91y1qNHxVqvzAAXal6h19x12tDNstwQV/KABsHngph8oaB6/+qx6tP6pOO8NyFM0GiuHBfwWornVvNvp96/mtKlB2X37cAq0YzJXw23/l4XCZGKlgWt9sUFYc5+pzO6B+C6PfveH1x7xM/9JHUVECy1aj330qYlx6ZidUQWOb0ZU2TVPVdHtc9mYj4FZSdWjR9Q0XNU5DjSxvFlZTo7X52RZYWleGV8HXUu8tFSqH90t0BXRNUxvp6zUutbqpA7Qk4GTDUvRu1EJArag2gqlvCbsJtDD89LJOfnpSJ69+7GPqLA9zFrtZVe2gLrV4E9g4XDY5WRYuh931vBVlCarqDU77dSGrB1TRd2RSdYHZHkNASdD6qH173qUFPPtuFulZrw/+vpHLr0ntz/SvLOke9rsBbfCHG3O4/dEcQKO0JK6uj8wfMMql68RiMRqb6wDiQwYPWzphwpkvnH3O2c8NGjRojZyZhJAALoT4HzFgwIDKP/zhxv/7wx9u/L+JEyee9tSTT1889d0pRwGunKwC/H7fNgXx9EhsRVmSjpDG3c/kMnW6l4dvaWLssTG06g0tC+1W0CJw/uUh+vVKcuIvimkNGbw23c+Bp5XwyiMNFA8xYTkbupF86xMD+RBdovG3idm4U6PfNmr0+4YLWxhxUkKt3Ni99MQJFMFvb82lqtZFWaqjBRok4gY3n9+Ec6CNvYSNe0HnANXw28dz0XQLp6FGrZMJgxsmNMFA4Bto7dS7XnfS0vC4bdzOTUK1puqoYwk1Wp/ejg4DXI4tdEzRgRi0duipq44ND1eab3b90qDFYFBFAsNlkkhqanEfj8Wy9Q71mCOBOqAFqtcarKh08k2lg09me9mtV5ybr2mD9tRFkwF2HLTlgB9OOTPMKaeHoQaWVzpYssbJ/JUuvl7tZNEqF18vc4Ktk5+XxOuxMU0oL0pSWe3mhvtzmPh4I5qjh5enTwfpIdC6Rmf85YV88JUPsPA6LSbfV88xZ0bVhWAk9e2XnpvQC774wMVlt+Qzd4mXYDBJdtDCNLd9sF7XdcLhCC1qCfj44YcfOe3iiy58+tzzzn1RzkBCCAngQvyPmzBhwuQJEyZM/vijjw988MGHLn950uTTW9sbPdnBPIKBIKa19cN/pgl+r03AF+frVS4OuqCUWy5v4eZft6nJbaluE3YctCUw9rgYX75czWEXFLOm3sVnS7zscVIpL97TwLgTY2hrwe7g20fDdSAIf70ri5o6F+WpIG3boOs2OX4LIsAA0BpQo7teFdamPuLh78/nkJubABsMAyqrHQzpH+VnF3RCNZuXrJTBI38NsHSlh9LUSHu69vvnZ3ZCI1hRaO7Q0Z0qwlkWeN02hpONQ7UG8STEEzp6OlDb4EgturNRAjSBYuj8RuOrZS4CQfVA8SSgWYzqH4d46rZhGFyeoKLIpLbZIM9pk+Wz6QjrPDnZjz1NY/ZcF0vXOlm+3kl1owEJtRjPoH4hbr6iTbUVjHbLuDpqO65O1Uq7YeDuSQaOTnKSHoEwROs1Pl/u5vk3/TwyKUh2lkXQb2GaGsGsBJOn+1g326D3SBMaeuggNlMlQf1g7nsuTr+qiLX1qvynOMdk2hO1DB+XUPXe6UmgZqo7jwPuvCOL6+9W3XnKSuJdx/C2MHSDzlCI1vZGNIz4aaeOn/yLK37xwOGHHzZdzjZCiO5fW0IIwcGHHDzzhRcnnv/5nM/2veD8Cx8LhTvDlTVriUVj6PrWtyVJLyJTUZYkELS45aF8DjuzmPUrDBgKWipc2jawGPqNTDJ3cg37DlaJr67VwcEXlXDn7VlQCFo5G5dudM+wPohUaTz2dgAw6AipjiOGBkWFSf7weC6jjyzl6ScCtLXpUAZkwcR/+jnxhmLcHhO/VyXdUEQ1JH/0uiYoTHXH6L4EeTGEvtb4w5M5uD1mV7dFNfrdhtZXBfy2sE5bp65GvFMh0eOyVcmHtfFZOGFqJE26SlASpmovOKRvAvqqVodaL9CGqQuH6x/JpaXVQZbPxtChqcnBkH4J9t47rspLUgE8WGYztE+CWFg9sNtp4/PYXHpnAT/5bSGPvJTNx3O8tHXoFGRZlBYnCGTFqGsxWL/SAP937OBUORGB1AXNMqABPD6bg4+I8vATTTx2fSNt7TpRVQlD0GeTiBq8MtOn7tcTkqCVqouiB/8eZL8JpaytV2NLu/eJ8cXkaoYfmIDFqfCdKovRhkB9lcHx5xRx/d0F+Pw2FWXxbW4tqOsG8Vicypq1tHe0Rs85+9ynPps1Y7+XJ086W8K3EEICuBDiO+29996Lnn7mqZ/Onj1rvwlnnf1Mc1tDvKpmLaZpoutbf8owTbV0emlxnA+/8DHipDJee96nJmhmq2BqG2qBm/xeFrMn13D6YZ3q9KTD9XfnM/6CQtobNbQhqZHXTUoX7Ag4NJs3/9nAL85uIhnXqKxx0R7WcTpsCnJM5ixxc9GNhYy+qITxVxZy2PnFnH1DIYbDpijf7BrxbGlxceVprRx0egzWsNGouwaQB395IovGZhcFuaoXdG2DwaGjQ/zs150QAjzQ1K7TEdZwGKk0Z2t43akAvmkJSkIjaWpdEyM9LhtDt7n96Wz+9bcA/37Mz6SJPv79pJ+zzy7goZezKC5Uqbay3gAM/vLzVvQS1W1GpXggB4b2VhMxNehaXTM/y6SkKEFpcYLCfDXbtbFZp6bOSWe7QVuriy9WuTcPyVYqvJYBAyEa0XjwH1lMmeKFctXdxA6BvQpYAT+5tpNTDwvR2Ljxj63zV7ggktqX28raEKSjHRrn/aSAK/5SgGWor7ZjDwjx5avVlA80sb9J1fBbqZKTwfDeax5GnlTG2zMClBTFyc1So/RbH7x1TNOiqmYtTa318fGnnT7xs1kzDnj2uf9cvN9++82TM4oQYosDR9IHXAjxXaZ/On30HX+548a3p7x9DOAqK+kN2NvUS9xh2FTWO7CTOr+7pIW/3NQKFtjrUaOp6dFML9z2t2xueiC3K6X2KkzwyJ+aOHZ8BBpSk+i612XbqJFtPyyd5eTeF4L8+7UAoYhBMCtJTsAiYWq0tOvEIqp+uqjAxOlQI/WGYVNZ7WbUwAhfTK5REzab2HjCZgXULDTod1YFTqdqvWfb0NRicMLYMNf9tJ3hhQmyD7ZoeNeg+JQKcgMWbpdNTZ2D8YeHmPTPBmhLtb5DdW5Z/42D/S4roSOsE/RZ6Lp6TTV1GyY3dldSlERLrYyZG7S56qx2Lr24E+o2PC6olR8ffyDApX8ppLQ4kQqMmzy2blFWbNK/PKkW0+mTYPe+CfYZGqcw31QL9KQZELM1llU6eel9Hy+95+ebVX72G9nOrFdr1eTGZLftNQjeeMbLSdcXU1yYRNfV8552WIiX729QNebJbTgozQ0tBj96w8PPbspneZVLHQS2xg0Xt3DHH1vVwkJV3Y6tstSx9dfUsaVBr9IEyW0I3pqa1Up17TqA+JFHHDXtd7+/4fZDDz10ppw1hBDf+30om0AI8V3GHjR29lvvvHXypEkvn/SnW/9088JFC4a7nT5XYWERprl16SlpapQXmXSELO54Io95S1y8dF8D/kG2WgnTALsWtCz4w61t7D08zoU3FNDQ5mB9g4PjLi/mmhlt/OO3LWiDUBPqTBWSbQ2oUaOiQ0YmeOiAZq45u4O7n83i36/7WV/tJhBMUJhjYWZ1G0JPjQpXVrvpVxLnvSfqIAj2mo3PkJoDcMPvHskhFjUozI1hprqQFBckmfK5l8kf+OnfJ8Fxh0bwJG2CXgunc0N49rrtzevYU8vEJ5KgaRvqxQFKi5OqJIINnUx0Tf3/UESnf2mCf/y6hUN+EoVFqSXUnd0eOwoj+scxnBbxhJqIGY2pv392agcjhsQZUpFgWN8EZSWmWoreowIudanR9O7boAi+fN/FmJ+VAjq60yQrO8KcxW6Wf+Zg4KFJWJ66MEpNnC0rUFcElk2qw4yGx21t/ktAJtJ9uncDOuD3v8vljseyu/5zttfk8duaGH9eeKPFoDRT3SfRCGf/vJCXPwwSDCbIDlrbFL4Nw0FTUyORWGd8yOBhS2+++aZbJ5w9YbKcLYQQGZ9HbrnlFtkKQojvNWzYsG8u/8Xlj7pdnujns2aNamiq9Xk9vq1e5t62weUEv99k3lIvz7/h4/A9ohTtbaG1qpBFHLQWGDgmyYVHdrJ4uZPl693gsJg1z8fkd70MLUvQd3+1KiGpipWuWu0Odf+CARYnnhThtP3DJID5S100tTjpjKkwG43rNDUbdIYcHDo6xLTH6sjrY6n2h92HJ0w1mjz/XSeX31VAbq5aiEbTVL22aWr4vTZer0VDi8Fnc73MXOCmON/selGdIYMDRkQ54aiIKlNJbTItAHWVBv96K4gGOB3ql4J4UqeuwUlnyCAUMgiFdcJRDZdTbT+nw6alw2DiVD/RtRqHjIupoNnt2kIzIIDNs+/7aQ3peF020YRGNKbx3t11jP1JjP7Faol5EqgR6RagLRXC9c2uFcj12zz3no/OqEZJvonHBW3tDlbVOzhnQgjNpTqwaOWAD275v2y+/MZNdlCN7Hd0OrjgmE4OPCyG3bwVB2B61LsvzPrAxWm/KOKFd4PgsMDSOXTvMFMfq+OAo+OwEuywev2aDgyGVfMcHHxeCZ/M81NcFMfrVosjbQ1d10kmk9TUVeJ2uVr/8Ic/3PbSpBfOGz5i+BI5QwghJIALIbabgw4aO3PChAnPVq6vKp/75exBHZ3tRk527lY/jg5kZ5usq3Hy2EsB9qiIM/iQJFqIDZ08GiDQy+bcM0IEDJMPP/Ni2Rr1LQZPvxagvVbj0H1jOPqD1o5avEfbPIgX7mZx4okRxo8O43JZdIZ0onEdn9tm1JAYf7i0lXtvacGbZWOvZbPfBjUP4IYLbixgVaWq/dZQk/raQzrtbTodnQ7CcY3soE1utknAb2F1ax7eGTI4aM8oxxwe3SyA16w3+NcbAQxdBfBQVCcnYHHF+HYO3CfKnoPi9OudwOe3WbPeSTShEfRbGAZ0hHWmzQoyvDjGsIMSqod36mk1GzxZNq995GPlOidBv43TgJYWJ6MGxxi2WwJ7HarTicn3jkhrUXANtaEB3vksQFYwqVb49Ft8tcRNaL3GmNExXAFYs8bBTTfl8PCrWRQVJnEa0NBioDssnvx9EwG/rTqqfB9L/fqg7QaE4ca/5HDRjQVUN6Zm8VrwpytaeOIfTWQXpH5Jsbvtt4HwwWseDrmghKomJ+WlCTRt6yZaapqGYTioqqkkFG6Pn3TSKa9MfmXSqaeddupbckYQQmwLqQEXQmyzFyZOPO3662/427r1a3fLzy3G6/FsddtCh2FT1eDASujc85tGrv51hyp/SJUPdPVq7g3zP3ZxxZ/ymDHfC4YFps6g3nH+9qsWThkfVsG9MlWO0n1wM70QTTHgBWsNrKtz4HHZlPQxIR9VshBi8xIRE7TBMO1ZD0f+qpTCggSO1G1q6hz8/Yomhu6X5JU3vMxd4mbhchfJmI7Pb5KfY5JMaqnbOvn9RS3cfksrVHULiSXwxScuxl5ZgtetFuqpaTLYZ3CMOW/UQjZqRDoJxODjzzyc98cCWjt1svwWmg5VNU6O2C/Ee0/Wb1RXrWlAGVzxmzwenJTdVQdeU+fkjz9p4dZbW2HNVlSCpFYb7WzU6HtqOa3tBqWFJjYQT0BDo4Pd+8fJKzNZtsRJXZOTwoIEXrdqf9jS4uKf19Zx5a87VfnQ9/R276rr98GU17389q5cFqxwd+37fYZGuf+mJvY7Mq62aVu3YyZb3ffxBwJcemsB6Da9SpNd+yPjC0XdSC2kU0tZacWav/71L787/4LzJ8qnXwjxQ0gXFCHENjtrwoTJi75euPuFF1z0WFNLXbyyphKHsXVTS5KmRlmhiT9gcs2dhfz6ulzITU3GTKpAZYeAJbDH6DjTJ9Vy+9XNuFL10svWOTn16iImXFrAmmUOGLahu8qGoYZUHXUtsAZ0H/QdlqSknwlR1bXDjm4hfNupx2qA6x7JBc3G5VTBtr7JoH+vBNf9vINjT43w6F3NfPF4DdMfreWu65sY0jtBW8fGD9hVA25vfBZOJNV2SDeZURMsgVpgnbo4oBGIw8EXR7nxglY6Ow2sVKtH3WVR3ezArEetZpl++TbgghED4pu9sQWrnNDO1s0E0tTk18Bgm4eubcZMOuiMqEDrdKia9WXVDj6d7iEU1ykvSeBxqQuslhYX153bzJXXdKqLne96HlPNA2Ao1KwzuOjyfI69rJgFK1xqk1lw489bmPNyDfsdHIdvwG5P7b+kqlWnGG65MZtLby3C67PoVWJudfh2GA5qaqppbK6Nnz3hnGcWLpo/QsK3EEICuBBipwsGg/Gnnn7ypy9MfOGsosLCyvXVa7Bte6taFpom5AYt8nIT/P3ZXM64oFAt0tN/Q5C2tVR7uxD8/g9tzJtUw3EHhUgPdb8wJcie40u5/dZsTBO0oaC5vyWIh1WHE7tVLQb0ratsWkA5PPWsn4XLvJQUJbsW+DGTBjee2wYlYH8JrFelEvsdHONXf23n0FFR2ts3DuA+j931Grq/pnhSV33AU6/DtsDpTJ2hU89nW6m65moYNSiBZmyYQKirjo0kbW3z95KAIb0SoFskU9vCcNmsqHRiNmwc2DfL29oWWgXqwFo446IwN1zURGuri9omo+v2BdkWZSUmXrdFTZPB+mo3WR6LB/9Qz9/vaIHW1AWVtuXtrTnVLw7ocNffshh5ahlPv5bVtbEO3TfM3BdquO22VtXlZEVqe6YX1+mn/v9FP8nn1n/lk5OTID97w3vP6ItR17FtWF+9huycrPp/P/Pv8597/tkL8/LyOuUTL4SQAC6E2GWcedaZry5cOH/Eccce/2ptfVW8tbV1q0bDzdRKkcVFcSZ9GGTvU0qpXGagDVOTCUkvid4BLIWheyZ46z/1PHV7AxXFquaiLWTwh3/mMfL0MiY+7Yc8VTvcdf+tpOVDywKdGx7PxeU2MbTU6HezQf/eUS45rVONUuupYB9BjVZ/A+vrNwx1p8tN/F5r86FfTZVvqNdndwVRp5EaLd9k1UwSagKmy21jpW9ugcdtb3np+jAMLk+Sn2cSjqlTfsBnsabWYHWtA3wbHloz1IqSWhFofYC+QE7q9dvdLmKiQBPccWsr91xfT5bforrWSXWtk5o69XdDk8FuvRJcf0kLi1+u5vIrU6VFrWz+S0Oqu4nWDyiGV17wsdfpZfzmrgIa29SNi/OSPHRTIx9MrGOv/eNqVct0yUm3nuCN63XGnl7C029nU1gQx++1Mbdi3xuGg/b2dmrrK+NHHnHU2wsXzh9x3vnnyfLxQogeJW0IhRA9pqi4qPWtt9889a9//dt1v/vdDXeEIu2uXmV9SWbYrtCyVelFeWmcr1Z4GHlyGc/e1cixp0fQutX42gBr1QqYF/60k1MPDXPLI9nc/2wWiaTG4pUuzv5NEY+/EuZ3l7Rx2FFRVU9cuaFt4fenbxU+774ri7oGH5CguhGygyZmwuD3ZzdBX7CXbvJ4hgq9zR1G1yhvKobj99hbrL2IJTWwNyzEg626neBQgXvzixVtowFkywKXw+5aXXTTAF5abjK4IsnMhW6yfGqhn7p6B8urnOx2WlIt4w7QCeE6jRWLnSyvcvDZVx4CfpNbLmuDRLce44baF1oSrr66g3OOCPH6xz6WrXNiWVCSb7LX4Dhj9ojhHmCrGvZlqZpvY/PgTS/ABTPed/OXx7N5+2Mf6f7nmmZz+YR2br2slYKhFqwHu7Pb46TnCPSBj193M+G6QmpbnF1LyltbEb4dhoP11WsA4rfe8qeb/3jzTX+VT7UQQgK4EOJH4YYbfnv3gQccMPPss895fn31mr6lxRVompZRu8L0UuC9yuKsr3Vw3OUl/GlhMzf9tg0tK7Voj54KgVFgCWQVWdx9ZwsXnhjijw9m8/oHKlFOm+lj2kwvZx4T4vqL2tj7oDhaAjVhL4MgblfBuSeE2H1IFTPmu5mx0M1XizyUFsf5yVmqlnmzUgqHKrFoadfRHBuPgAe3FMA1iCe0zf6905EaAY9vfvtkqmZc6zZiruvf8n5iQCkM65tg5jwvYKJroGsa0xe42e3zBHM/drNglZNv1jpZstbJuloH4Q4dcJKTE+UPF7XhCKiA3v1Cw46AtgoKyyx+8otOVe5joXp8x1EdWbqXiGwavCsALyyc6eT/ns7mP6/7N7rhMWND3PqLNkYfHlOPtQRsfZPwXQ544O6/ZPGrv+cB6tjZmv7eWurKZ331Ggryi6qfe/7Zs4888ohP5JMshJAALoT4URl38LhZCxYuGHHWWRNeeP/9947IzylyebxerAy7pCRNjYoSk7ZOiz8+mM/Mr9w8dUcjxbtbqs9zvFsQbwStEfbYJ85rTzbw5hud/PWJbGZ86QXgxSkBJr/n49wTQlx1TjujxsTRkkB1qmPIloKrDURhyMAEQw5MMCEZghr4eI6HgM8C9yYrZXY7q7aHNVo7dVzOdADXQLcJbKkEhVQJyiZZviuAb3p7HRKmqpvvKrPXNikT2eSCRnPDkD4bD6UXFyV48p0AD78SpLnNID3i7HRbBHw2waIksbhJNK6xbI2TYaMTGwfw9POSCtqtdI3gb3SdpW0SvA3UiLcbFs1yct/zaqGkaGzDm913RJTfXtzG+FPC6ltquaqB7wreqdaEDIS2VRqX/L6AyR8G8QeS5GWZWxW+dV1PdTmpi4876OBPXnjxhbNKSoqb5RMshNiepAZcCLHd5OfndU6b9u7xv7zyqvubWuvjLS3NW1cXbkKWz6akKM6UzwKMOLmcyc/6oF+q04XZLQhqqJ7WNXDCaRGmP1/LU7c3MGJQLBXodZ5+Lch+55Zy4RUFzJnpgnI10VNzsuUa8VTNub0S1Y3EAQcfH2XvsXHsRrY8kdCtasRXVjqwUrXJtg26IzUJ09o8xMbT3Tm6PZ7b+S0BPHVxokKu+o+aDvFkants6TUlYY/+cdAskqnn1zWIxjWStlravqwkQUlREr/XpiOkU1fvoLXVQTTsZtY3bvB///5K/3qxmXQv736odpJzXfz0qnxGn1PKv17KSoVvGNI/ziM3NzB7Yg3jzwlDo1qRdKMR9CRoBSp8v/OKh+EnljP5wyDFhXFytnJlS8Nw0NbWRmNzXfynl/7ssY8/+ehICd9CiB1BRsCFENvdff+891dDhw5d8osrLn8gUh1xVZRXkExmXheuadCrLMb6OgfjrynmZ9PbuOeGFrxDbNVPOpEKaHpqRHu5mkx44U86ufCETh6eFOSBiUEWLXeTTOo881qQ597yc8oRYX52agdHHhxFy1HhnY4t9BFPj/RGgKoN4XyLkmB4YfeBcb7+xkV1bXpteFu1IfzWAN69rlvD47K/tTuLrqX/mxq1dhg2oYhOLK7h9m8hAYdhWO8E+XkmkZhG0GuTMFV9dCiq096udT1WIMti6IA4A8qTDO6VZGjvBOP2iqoWjlsj3cc7AJQCnfDRux7+9WqAl9/1EYtt2ICD+8e5/Mx2rji9A0cvtY3tb1LbWN84xDMYrHq47po87n02CzSoKIthmdrW1Xs7HFTXVGNa8fjdd//j2muvveZB+aQKISSACyH+q1z+i8se69e/36qTTjz5jfVVa3wVZX0xM5ycCamSlCKTcMzi0Uk5vP+Zl3tvbOb40yJqFcyaVH1waqKfHQWWqQl6l/2yg8tO6+DhyUEeeinIgqUukkmdSVMCTJri57D9I1xySidnHR7GMdhGawMaUmUPW9c6GrsZ+pclWfBMDbO+dvPJfA/vzfLw1Tcu9VibhkQdwhEVgBPJdC9w7dtLUCxwu9QCRlaqLMPjsqlv0WkLaRSV2puXioShrNwkJ2Czcq2Hzna17GVunsnuAxIMrEgwYrc4Q3snGNY3waBeCVz5qfBssKF7iTPD4K0DhUCOCtMvPefj8VcDTP3US/c3NXS3GD8f38EvTu/E2cdW+/AbukqLupigFQO58OFbHq78cx6LV3vIyUkQ8NmY5tb3915ftQZdM6KvvvLa+JNPOelt+YQKIXYkWQlTCLFDLVy4aNAxRx8ztbqmqm95SW9sbLbmPKRpqnyissYBaFxyajt3/qqFvMEWrP2W1Syt1MIupSqoP/2Wn8deCTJ9rmejhD1sYIwJR4c464gwg/ZKqCGKOiCUioyZ5Lz04LQPyAM8QBNUrzQI+iwCAXuj3uRaf/i/v2Tx2/sL0V1JLBMwXZx/XDPPPNSkRoO7hXatANYsctDv9Ao27lPo4M5f1vHr37Zjr904uGs6EITr/y+XRctdjN0nyoj+cYb0SdC3OImzQP13bBXW6URN3jQzXCWz+3suVi9p9QIHL07z8dxUPwuWuLttPJv994xxySkdXHJCJ0YvVCvHti388mCC5gX6Qmi1xg335HL/86oneHlp8ttLXr712NHQNJ2qmrXk5xXWTpnyztH77Lv3AvlUCiEkgAsh/us1NDRmHXfcce/MnTtnn6L8UpfT5cSytq5Rt6FDOKbR3OyktCDO7Ve3cvG5nWqUdt23dDmxQAugljdvgbfe9/KvVwK8M91LPLahh19WVpLjDoow4cgwxx0Qxtk7FUgbUCtnbsWAq5ZajZIgqrxl0xU33VBXa7CmxoFpq44obR06/csTjNg9ocpeuj+eU5XZ/OPFIKtqnDgNm0RSY321g72Gxrjlqjbo3Di0Y6tgq3mALFQ9t5kK2+GtDNubvjc3UAB4VdeYd2Z5mfienzc/8dLSkv6RVcNwmBw9JsKlp3Ry6pFhNUJeA7SnfrnYNNBrqMmawPMv+Pnd3TmsrXWrUe+t7O0NarJlMpmkrqE6vseIPRa8/c7bx5aVlzXKp1EIIQFcCPE/5bxzz3/y2ef+c07Al+3KycndqpIUFetAN6Cq3sBO6hx5YJjbrmxl9GExtcx67RZGVdNB3AOUA3H4apaLp94J8OoHPtZVOrs9usWwQXFOGhfhxLFhDtwzBiVACGhOhXHY6jKVjSRTy93nbAjKOFEjwg1sXihopiaNlqUuMJLq/aClwmw731qfrjlTz5Hc+rC9WejOQ5WoNMDs+W7enO7l9U+8zF/sTr0w9QxlJQlOPjTMhceF2O+AmBolr06t6rml4G2jwnk+zPvExU3/zOHNj/2gW1QUm1hbOeoNYBgG7e3ttHe2xMefdvrkSS+/dLZ8+oQQEsCFEP+z/nrH36773e9vuAPYqkV7utN1SJpQV6/amVxxdgc3/ayN4uGmCuHN3xJKU0ufUwz4oGWpzgvTfLwwLcCnX7gxExvupDtM9h8Z49gxEY7bP8KoYXF1v2QqjIe2rWZ8m0/eWrfrhPTf9iYj3z0hXdPtA3JT4bse5i9x8c4sL+/M8DBzgYdkTO96MZphcsBeMSYcEWLCkWEKh5pqlL2224RZtnBhkaMuLFqW6tz2WDb3/jsL09IpKkzgdGzdojppDoeD9VXrACt+8x9vufWWW2/+i3zqhBASwIUQ//OmTpl62PnnX/Dvhsb6stKiCnRdx9qGJGno0BHWaGtzUpib4NoL27n23HY8fWxVS/1to8PpGuYc1OhrM3w+181LH/iYMtPL18tc3VKjjdtrsteQOEfsG2XcqCgHDIkR6GurUpNOoAM1Or4DA3mPB243qmwmCCQgsk5j1hI3n3zl5r05Xr5a4iIcMrq9QYvBA+IcfUCEMw4LM3Z0TJWmNKnt+a2/FFiqYw29wKqEeyZmcfdTWVTVuwhkJckJWJjm1r8NtfAT1NStJzsrt/Hpp5+6UCZbCiEkgAshRDf19fU5555z7rPT3p92xLaWpKjgpSZp1rfoxKMOBvaJ8auL2vj5+E5VPlKpent/axtBSy1cQ5EKocl18PbnPl7/xMsHczysXudkoyFczWRQvwT7j4gxdmSMA4bHGNYngV6cCrFRVMlKGFX6sYudcjVQJS9eVG24F7WKZR0sWedk1tduPl3g5rOFbpaucoK58VryvSsSHLJ3jJPGhTl+/wiefra6f32q3v3bVpswU/X4FUAjPPVqgLuezOLrFR4Ml0lp/raVm8DGJScHjR03/dnnnj27V6+KevmUCSEkgAshxBb86U9/vuHmm/94K+AqL+2DbVtsy3lK09SfqjoDLJ09hsS46px2LjmpU9VPV6NqprdUIw4bRsX9qTBuQesqnQ+/8DDlcy8z57tZtNwJlrHRnQJZJgN7JdhrcJx9hsQZ3i/OkF5JCstMyEbVdCdQkytjqf+fquPeXqdjLf0eHahRejeqO4tLBWHaoKlG55v1ThatdjJ3qZsvv3GxfL2D9lYHmy5nOWRgnANHxDhm/wiH7RMlf4ClHrseNQEUvn3kPz0RthxogGff9HPfc1nMXuABzaKsWA13b8u20DQNXdOprFkLEP/97/9w++23//lP8qkSQkgAF0KI7zF9+vTRP730Z/9a+s2SITlZ+a5AIIC5LXUIbFiJsqZOBck9h0a5YkIHF6db4DXw3SUS6TCuoyYd5qt/TqyHTxZ4+OhLD5/Oc7NwpYvmpk3Dqo3msuhVlGRwnwRDeicZ1CvB0D4J+hQnKc038WfZ6nE9qYBsqpCKlfr/6X+2u/3Z6A12+5Pun51ewCb9z8lU2O+EcLtGTbPB2joH36x1snS9k2XrHCxd62R9nQOzWy13+j3k5iUZ1j/BuD2iHDwqxrg9onh72+rxm1HdXazv2X42qoa8GKiCZ97x88DEILMXeAGbkuIkhqYWXtoWhmEQCoVpaWtgQP+BSx999JGfHnb4odPl0ySEkAAuhBBb4ZdXXvX3+x/455WAq7y0N7Zts63nrE2D+LCBMX5ySicXHt9J/lBL1W3Xp1bS1L/jgdIt8nypMO5UIX7Vageff+1m5iI3C1Y6WbLaSUODgy22+jAs8nIsinJNSvJUuUVFkfq7IMskL2iR5bcIeG18bguPy8blUIvv6Js8nGVpJC1IJCCa0AhFdUJRjfaQTnOHTlO7Tk2TQWWDg5pGg5pmg4YWg8ZWHZI6W2oRk59vMqRfgpED4hywe4z9h8cY2C+pfgkwUXXdodQotfY92yq9KE82tC3T+fc7fh57JcD8JZ4eCd7de3sD8Z/99OeP3nvfvVd7PG5LPkFCCAngQgixDd59971Drr7q6nuXfrNkSNCf48rOzt7m0fCNgnijAaZOWUmC808IceHxnQzdK6ECdW0qYOqZnETZeMKiBTTD2rUOvlruYuFKJ/NWqHKOqgYHzc3GJnUvGxao2fC3jeZUS9e7XTYuh1pu3qGnAm33jGuDaUEiqVbSjMY1IjENO9F9aHxLz6PCdk6uSXmRycCKBHvsFmfEgAR7DYzTv09STaI0UBcn7UA8s/aFmpW6QClR22PFPAfPvB3gmTf9rK10g2ZSUmT+oOANG9d6D+i326p77vvH1SeccMK78qkRQkgAF0KIHnD9b357+113/f3XNqarpKgcwzC2evGeTYM4QGOrmqzp8yU58ZAw5x4T4sQxETU5sA1oTC3qk2E3Ew1UbXUgFch1FWATjbC2zsHKKidL1zlYXe1kfb1BbZNBfYtOY5tBa6cOmwXnLT5D9wj+LbdL1as4bLIDFgXZqRH31Gh7v9Ikg3snGFCepG9xEnehrRbpsdjQySWxFbXYNmgGqj94LlAD78z08vwUP6996KO9w4HDbVKUu+013mm6rmOZFjX1lQDxa66+9p5/3HP3b+VTIoSQAC6EED1s7py5I3/969/8/eNPPhoHhquitAJrGydpdo+zWqp9YXubWg1zr91jnHFEmPGHhhg0PKkmYjapQL61rQU1UKPIblSHES9qlD09EbMd2tp1apsN6pp1GtsNWjp02kM67SGNjrBOJKoRiasRbqv789uqB7rTYeNx2ng9NkGfRbbfJstvkRO0KMgyKcqzKM0zycm21EWBL/UakqnXEEF1a9na1TDT5TjZqNHyCKz+2sHLH/t48T0fc+Z7AI1gVpIsv41tbfsCQOqiSUPXdaqrq7FIxMccOHbm/935f7858MAD5sqnQwghAVwIIbajRx/910W3/fn2m9ZXru3v92aTm5vzg8pSNgQ8Vc5R16g6p2RlJTlsdIxTDglz9OgIJYNNFVybUBMPt2JkfEvPhZ4Kws5UQE8vIpkuzbbYsNJl94mYm11BdLtfuuzc7na/OGoSZjz1eOYPGIFO13UHUTXwFjQu03l3tpdXP/YxbZaHllZ1IVNUmMRp/LAykzTDMGhra6Mj1EpZacWa3//+hjuuuPKKR+XTIISQAC6EEDtIR0eH65abb731gfsfvDKWiATycgrxeX2YVg8E8dT/dEbSo+JQWpLgiP2iHD8mwmGjIhT2s9RIcjvQqsKt3cOL7my02uX3PXa3cN7Tp3XNTl0k5KBGu6PQskbnwy89vDXDy3ufe1hf5QIgmJUk6LN77HUYukEkEqGptR6H4QpffvllD9/6p1tuys3NDcunQAghAVwIIXaCxYsX7/bnP91208QXnp8AuArzS3G5nD+oPnzTEGzb0Napp1Z+tKkoTzJ2jxhHjI4wZniMIYMSqgQjkQrkIdSiOz/WLwZQZTN+VF24C2iGFcsdzFjkYdps1Xpx7XonoOHxmeQGra5t1RN0XSeRSFDfWAMQP/30MyfddNONfx45cuRSOeqFEBLAhRBiF/DxRx8f+Je/3PG7d9+behTgKioow+l09FgQT4dxy1JhPBJWC/AEs5LsMyzOgSNjjBsZZdTgOAXllhoptlJhvBOI7XqrYHZ/X10TR/2p8N0OzVU681a4+GS+mxkLPMxd7KK1Rf0i4PGaZActDL1n35cK3knqG6sB4ocfesQHv7vxd7cffvhh0tNbCCEBXAghdkVvvP7GMXf/455rP/rog0NUEC/F6XT2aBAHNUpsA+GYRlurof6NZtO7PMHwAQlGD4uz18AYQ/skGNgr1dLPjeqjnZ74mK7Jtrb/aLkGG2rEXaiFf7ypf44BTbCq0sHitU7mLXcxe7GbhSudrKl0gKWKyrOyTfweu0dHujcO3htGvMeNO+STa6+95h+nnHLy23JUCyEkgAshxI/Aq6+8etw999x7reqYgis/txiPx93jQbzrZKpBIgnhqEGoM5GKvE5y89TS9MP6JRjSO8Hu/VTrv4qCJMEcW01m9KRunl75Mr08fWrC5GaTMO1uqXrTSZhGKlQ7UHXb6ZUxbVSnk04ItWpUNjpYVe1g0WonS9ephYOWrXfS1Jh+IBuPzyLos3A6tt/ova7rRKNRmlrqAeIHjR03/Zprrv7HaeNPe1OOYiGEBHAhhPgRevPNN4966MGHL3/7nbeOA1xZgTyCwQCWtaWWIj0XKuvr60mY0dS/8bFhvXmd7FyT4jyT8gKTiqIk/UpNyguSFOeaFGRb5AYtsv0WQZ+N321huFNh2tEtaJN6+WYqqCfAjEM4qtMR1mgL6bR06jS26dS1GFQ3GqyucbC+3kF1o0Fts0Fri5Hqq5hap54QAKXFFarXtrW9FpPU0HWNjo4O2jtbAOLHHnPclMt/cdkDJ554oiykI4SQAC6EEP8NPvnkk/0ffviRn7/6ymunRaKhLIfupqiwCDToyfNgfWMtV111DWecfhrT3v+AhQsWsmL5CqqqqqhvbEglZroFcx+qNkXVVusuCPos/F4bv8ci6LXxp5akdzttnA7QdfV6LUsjYUIsrhGOa4QiKnyHU8vRd4R1zFj6uUzUEHgECHe7+NApzCukrLyMkXuMpKysjInPv0BHRwdut7tnv3A0DWyob6gnacXweQLtJ59y0quXXf7zh8aNGzdLjlIhhARwIYT4L7RkyZL+Tzzx5E8mvTTp9DVrVw8CKMgtxt1D5Sk1dZXceutt/PGPN0Iq5tbW1lFZWcWa1atZtmw5a9asobqyitraWurrG2hqaiQSC23pFJ0K5uk6ElCzO72oEet0J750jUq6bmXz87rH5SM/v4DCokJKSoopLy+nT9++DBo0kH79+lFeUUF5WQktre2MGDaC1tZWsrKyemSbqzKTGE0tdQD06zNg2elnjJ908SUXPT506NBVclQKISSACyHE/4COjg7Xs88+d95zzz537qfTp48Fy+U0vBQU5KNp2jaPitfUVXLDDTdyxx23UVlVg2EYeDwe/H4/LqfRdbtINE5LSwsNDQ3UVFdTX1dPY1MTzU1NNDU10dzcQnt7O5FIhGg0SjwWxzSTtLa2EovF8Hp9+Pw+dE3D4XTidrnweLx4fV6CwSB5ebnk5+eTl59PfkE+RUVFlJWVUVhYSG5eLj7PhtHteNIi1NlJMCvI/HnzOen4k+jo6CAQCGz7l4umYVs2jY2NJKwooMcPPmjcJ+ece/azZ59z9nPBYDAuR6EQ4n+VQzaBEOJ/UTAYjF922c+fuOyynz/x6afTR098fuLZ77wz5bjVa1YOAgj6cwkGAj+4RMU0TUKhEKFQaKNw6nA48Hq9DBo0iD1GDt/8fjbEYjFi0RixWAzLsigsyONnP72Mp595kr/+9U6uuuoKamvrMRwOnE4nLrcLj9uD2+3G0Dd/LZFYnGg0Rkd7By3NLZu9L6/P+4O2qbpwgY6ODjrDrQD07zdw6XHHH/P2hAlnPT9mzBhZMl4IISSACyEEHHTQ2NkHHTR2dnt7++9effW1U155+ZXxH3388bjquvVFAL3K+2KaZo/Vitu2TSKRIJFIbBTM03RdR9M0dF3HMAxcLheOVMgOBIPYtk1BQQEej4fc/Hxsy8KyLSzToqOjg7a2Nmzb3o6TKDcO3aBCd0dIhe683ILa044e/9Fp4097+eSTT3o9EAjIaLcQQkgAF0KIzWVlZUUvuOD8iRdccP7EVatWV7z11lvHvfLKq6d+OffLY7xeX1fY3N7Swdk0TRKJRFfQzQr6u8q7TVNN5uxob9+p20zTNJpbmvF6vbUnHnryzGOPPfqd444/7s0+ffrUyhElhBASwIUQImP9+/er/OUvr3z0yCOPnDZ06NCVTqcLp9O501+X06Veg8vl2iW2U0NjHYcdetibDz3y4M/79u1bLUeOEEJ8P102gRBCfLu2trYsfRcYq0iXvzgdu1YAjydijBgxYoGEbyGEkAAuhBA9IplM7lK/FKZH4V0u5y7zmtra2nLkSBFCCAngQgjxXyldgrIrlMMIIYSQAC6EEP/9ATxVguLcRUpQhBBCSAAXQoge1dX5ZGs6EG7H9c0cTlUR43K5MHeRddQ0XbfkSBFCCAngQgjRMydJXbd0TcfeilSdbhG4PdoWbqgBd2GZPZt7NTRM09zq/uG6BHAhhJAALoQQPcUwjKRu6Fu1CE86gG8PKoBrKoD38EI7mq5hpQL41lw8GIaRlCNFCCEkgAshRI9wGIZl6MYuFcAdukuVoPTw82iajmlaWx3AHQ6HBHAhhJAALoQQPRZ444Zj6wJ499Ure/yCwOHA7XZvlxFwXdNIJpOYyeRWvXan0ykBXAghJIALIURPBXBX0uFwYltbH8C3B4fDgdfrxWEYPR/AdfXak6aJrmf+9eB2uWJypAghhARwIYToES63M+p0OrDszMNuLBbbbo1QDMPA6/Wi61tXl54JDYjH4yQSia0aAXe53XE5UoQQQgK4EEL0CLfbE3e5nFs12hyLRrHsni9BsQFd11UANwwsu+djfiweI5FIbNUIuMfjjsqRIoQQEsCFEKJHeD2eqNO5dfXW0WgU0zR7PIBbFhgONQJuGAa21fPd/yLhMKadWQ14egTe5/d3ypEihBASwIUQokd4vJ6wx+NZZCYzD7uRaJR4LL5Vo8gZBXDb6ipBMbZDCQpAqDMEWFsVwIOBgARwIYSQAC6EED3D6/VaPp83nDQzbfRhEIlEiMVi6EYPB3DLwtANvF6PKkHZDiPgHZ0qS29VAA9KABdCCAngQgjRg3x+f6dFZp1NDAwi4TCxWAxDN3r0ddiWvWEE3DC2ywh4R0dHxgGc1PNnZWe3ylEihBASwIUQoscE/P4wGfY1cTidhEJhorEYhtGzAdyyLAxDx5MK4D05Ap4O3J0dmQ9mm5aFQ3cTDAZlBFwIISSACyFEz9maGmeHw0EoFCLU2YnD4ejxAO5wOPB5vT0+wTP9eOkR8EwkkyY+n49AQCZhCiGEBHAhhOhBuXm5zZne1ulwEOoM0dbahsvt6tHXYds2huHA5/d3/XOPPv5WBnDTTOLz+cjKymqXo0QIISSACyFEj8krKGjM9LYOp4OOjg5aW1tx6D3dhlB1QfH5fWrVnJ78MtB1YvEkbW1tGd8nmUji9/uXZksNuBBCSAAXQoieVFiQ37A1QTZuRmlt7flMats2uq7j3w4j4E6nk472dlpaWoDMatfjiThZWVntwWBQVsIUQggJ4EII0XPyUiUotvX9gVfVUtvbLYAbDgO/z9/jj+10Ouno6KC5uRm3w53RfSwS5OTmtMoRIoQQEsCFEKKHA3h+M6iFcL73pJpafEeNJPesdAmK3+9Do2dHwF0uF61trbS3tW9V7XpujgRwIYSQAC6EED0svyC/UcOxVW3/GupV1UpPdiuxbRtDN1KTMHu2CNzlctLa0kpnx9Z1bykqLqqVI0QIISSACyFEzwbw/LzmYCCLRCKR8X1qa2uxbHp0OXrbttENHb/f1/XPPfZloEFLcwsdoQ4cDmfG9ysrK62RI0QIISSACyFEjyosLKzPzs5aFY9nGsA1Ghsb6ewM9WgvcMuycDqc+P3+7bIKZmNjIzZJdD3zZeiLS0pkBFwIISSACyFEz8rPz+8sLCxsjMUiGd3eobtpbmqira0Np9PZY6/DsixcbheBQKBHV8FMa2hQZTOZjNqnA3hRUWG9HCFCCCEBXAghelx5eVmlRTKj23rcLpqbW2hpacHldvfYa7BtG6fTSTAYxDTNHnvcdJ16TXV1xvdJJpMYmpNSGQEXQggJ4EIIsT2UlpVmnE6dLhctzS00Njbi9fTcapi2beNwOMjOzu7REXBd10kkLaoqqzK+Tywao6CgsLKiV691cnQIIYQEcCGE6PkAXlqS8WRDp9NJZ6Sd2praHu1Vkg7g/kCg51sQtrZSV1ePluEiPJFohKLiovry8rJGOTqEEEICuBBC9LjevXuvS4fg72MYBmCzbu3aH8V7c7s9NDc309DQgMflzeg+ph2X8hMhhJAALoQQ20+//v1WgbZVtdeVqZKOnuwFnulFwNbwet3U19fT2NiE25N5zXpZWVm1HBlCCCEBXAghtotevSoqswO5xOPxjO9TXV1N0rJ7tBf49mDoGlVVVbR1tOByZV6zXlFRsV6ODCGEkAAuhBDbRUV5RWVRcdHicDizVoQaDmqqa2htacXpcu3y72/1qtWAlSqf+W7pEXj1q4AQQggJ4EIIsR14vB6rrLysOmFmFsB9Hh/VVdXU1tbi8/l22feVLo9ZtzbzZibJZBLQGThot2VyZAghhARwIYTYbvr165vxiK/X56Wmppo1q9fg8+y6I+CGw0EskWT9uswDeCwaIy+noL5Pnz7SglAIISSACyHE9jNkyOBvMr2tw+EgYcVYt27X7oTi9Xqprqph1arVOA1PRvcJR8KUl5dV9u7dS7qgCCGEBHAhhNh+Buw2YAWAbX1/F5J0aceqlbt2mXTA76Oqcj3VVdX4/f6M7mPacXr3lgV4hBBCArgQQmxn/fv1X+XQ3SSSiYzvs+ybZSSSJg6HY5d8T4ausW7deto6m3G7Mm9BOGTI4KVyRAghhARwIYTYrgbsNmBFWWnZqlAolNHtHbqbNWvWUldXj8fj2WXf18rUKL1uZP6VMHTY0CVyRAghhARwIYTYrrKzs6IDBw9cFo1nFsD9/gCV6yuprKwkEPDvcu8n3Z986ZLMs7TqgKIxcOBA6YAihBASwIUQYvvbmtILj8dNS3sjK5avwGHseqdbt9tNQ1MLy5cvRyOzEpnOzhBlxRXrho/YfZEcDUIIIQFcCCG2u2HDhn6d8Qk2NcL89aJdM6sGggEq169n3dp1BHyBjO4TiXWy28DdVuTl5XXK0SCEEBLAhRBiu9tjj5ELQE+VYmRm2bLlWDYZrTK5I7mdDlYsX05dQy1enzfDe9myAI8QQkgAF0KIHWfY7sMWlRaXr+vsyKwO3NBdrFi+gtq6erxe7y7zPtLLyS9cuAiwtqpLy/Dhuy+UI0EIISSACyHEDpGbmxvebeCAFZF4ZhUY2cFsVqxYwbKl35CVFdxl3odhGNjAkq8XbxTIv0t6AuaoUXt9KUeCEEJIABdCiB1mjz1GzgO7a7Gd7+L2uAlHO1i8+Gt0LbOguyMEAgHWravk60Vf43JkNjLf2RmitKi8csSIETIBUwghJIALIcSOs8/ee38BWxem589bAJBRaN8RsoJ+ln2zjJWrVhEMZjYyH4l1MmjwwKW5ebkyAVMIISSACyHEjjNij+ELdJzxeDye0e01DBbMn09rW8cusSBP+sJhyZIlxJMRXC5XRu8CbCk/EUIICeBCCLHjjRo1atGAAQNWtLe3Z3T7oD+L5ctWsHLlSrKzs3b+iT/VHvHLuV+oaJ3RqLwK7fvsu88cOQKEEEICuBBC7PgQvvdeXybMaEa39fl9NLXWM3/efJwOY6fXgft8Puobmpg/fwGG5szo9UTCEbyeQPvo0fvOlr0vhBASwIUQYofbdx81EpzJ6HF6xHnuHDV4vLPrwLOygnzzzTcsX76crGB2Rvdp62hl+O7DF+02cLd1sveFEEICuBBC7HAHjjlwJujE44nvva0aYdZZuGARnaHwTq0Dt20bQ9f4Ys4XhCLteLzf/1o0TcPGZI89RiyQPS+EEBLAhRBip9hr1F5f9u3df0V7e1tGt88O5LBw4UIWLfyanJzsnfa606Pxs2fP7grXmV1AwP4H7P+Z7HkhhJAALoQQO4XH47ZG7b3n3HgyktHtfX4fbR3NzJ0zB4eh77Q68KysLNatr2LunC9wObwZ1n9Hcbt8nQeNO+gT2fNCCCEBXAghdppx4w76FDIbRU7f5rPP1CByeiR6RwsGfMz7ah4rVi4jOzvT+u8Whg0ZunTQoIFrZK8LIYQEcCGE2GkOPPCAmaBl1A/ctm1cDi9zZn/B+qoaglk7vh1herR79uzZ2Jg4HM6MLhxsTA4Yc8B02eNCCCEBXAghdqp9R+87b/DAoctaW1szun12djYrVy7nqy++JCvg2+Gv1+V2E4nGmTF9BumFdTIN7QcfPO5j2eNCCCEBXAghdrqDDho7PWnFMipDcTqdWCT59JNPNwq3O0pebg6LFy9m3lfzCPpzMrpPe3sHuTmF9YccevBHsreFEEICuBBC7HSHHnbI+5mG6XQ7ws9nfU44Etuh7Qht28bpMJg5Yyat7U0EAv6M7heKtLHf6H1nFxUVtcreFkIICeBCCLHTHXHE4dOyg3mNHe0dGd0+JyuPL774gi+/+IK8vNwd9joNwwDg449UJcnWTBw96KCxn8qeFkIICeBCCLFLKCouat13333ndkYy6wfu83kJRzv4+KNPMHRth5Wh5OXlsmTpMmZMn4HPE8zoeWOxOBp6/Ohjj35b9rQQQkgAF0KIXcZRRx8xFTJc1CY18fHDDz4gFk/gcru3++uzbRuP28VnMz6jtr6KrAw7sLS2NjNs6PDFe+89apHsZSGEkAAuhBC7TgA/6sh3QY/HorEM0jBkBfKYPXsOC+YvJC93+5ehpHuOv//++xv983fRNA3TTnD4EYdNkz0shBASwIUQYpeyx557LB61x97zWtqaM7p9IOCnI9TK+++/j9OhY1nWdn19ubm5rFy9lk8++gSPy59R+YlpmgAce+wx78geFkIICeBCCLHLOfrYo6ZYdhJd1zK+zwfTPiBp2tu1DMW2LHxeN5989BGVNWvJycnJ6H6tra2Ul/ZZM+5gWX5eCCEkgAshxC7opJNPfA20eCyW+P5QbNtkB/OY+dlM5s6ZS0F+3nabjGk4HAC88/YUddLPsPwklghz9NFHvuvz+ZKyd4UQQgK4EELscvbff78vdx8yYmlzS1NGtw8EAoTC7UyZMgWHoW+3AJ6fn8fXi5fywfsf4vdmZ/Q8lqlKYk465cRXZM8KIYQEcCGE2GUdf+Kxr1t2IqNuKJZtoWHwzlvv0BkK4/f7e/z1WJaF2+Vk2nvTaGqpIzvD7ictrS2UlfRad/TRR70re1UIISSACyHELuvUU099BYgn4t9fhoINebkFfPHFXKZ/OoP8vJweHwV3uz0kTIu33nhL/YsMytP1VPnJMcccPcXj8ViyV4UQQgK4EELssvY/YL8vR+6+16Lm1szKUDweN6ad4M033ujx12LbNoUFecz5fA7Tp08nJys/o4CfTJoA8TPOPP0F2aNCCCEBXAghdnmnjj/lZdNKZDTZ0bIsXE4v77w9heqauow7lGQawHVd443XXycS68y4xKWppYnd+g1edcyxR38ge1MIISSACyHELm/ChDMn6pozGg6HM7p9Xm4+q9Ys56033yIY8PVYT/Ds7GzqG5p49ZXXcBrujB5X13WSZowTTjr+ddmTQgghAVwIIX4UhgwdsmrsmLEzW9oaM5qMme4b/vKkl7FseqQnuGVZZGcFeHfquyxd9jV5eQUZ3S+1kmf8nHMmPC97UgghJIALIcSPxoSzz8o4wNq2TU5WAR99+CEzZ35GUWHBD56M6XQ6u0I9gGFk1vu7qaWRvfccPW/f0fvOk70ohBASwIUQ4kfj9DNOezHoz2lua2vP6PZ+v49YIsKklyaxFQtpfmugLyoqZM7cL3l36lSyA5kt8qNpGjYmE84581nZg0IIIQFcCCF+VAoLC9tPPvmk10ORtownY7pdPl6d/CqVVTXk5ub+gAAOhq7x4sQXCUc7CQQDGd2vra2NgC+r9bzzz/2P7EEhhJAALoQQPzqXXHrxv4B4PJOe4KjJmGvXr+Lll14m4Pdu82TMvLxcKqtqePGFF3G7vBmNfuu6Tme4jeOOP/7NkpKSZtl7QgghAVwIIX50Dj30kJnDh+25uKm5IaPJmOomOs/+51nCkSh+f2Crn9OyLAJ+L5MnTWZd5WrycjOrJ08mkgDxiy++8EnZc0IIIQFcCCF+tC686LwnLTuZUQC3bZvC/GLmfDGLt998m/y87K0eBff7/USiMf7zn2cBjQyeFk3TaGxuYMig3ZdJ728hhJAALoQQP2rnX3D+M35vVmtbW1tGt3e5VPeSp59+JvXProyfyzQt8vNyePONN5kz9zMK80synnxpWgkuuugCGf0WQggJ4EII8eNWXFzUesYZp0/qDGc+GTM3u5B33nmbjz7+lJLiwoxHwT1eDwCPPfr4RmH++7S2thIM5DT/5KeXPCZ7TAghJIALIcSP3pVX/eJeIB6JRDO6vd/vw7QSPPrwowA4HI6MgntxYT5Tpk7j3WlTyMspynjly1CknTPOOOPFgoKCdtlbQgghAVwIIX709t5770Xjxh46vbm1vmvVy+9imibZgTwmT57M7DlfUlpS/L1hOr3wzmOP/guw8aZGw79P6qIgfuWVlz8ge0oIISSACyHEf41fXnXFvUDcTGa2wmUgGCQWD/Ovhx9F00A3jG+9rWVZlJYU8en0mbz26ivkZhdkPPrd3FrPYYcc8dFeo/ZaJHtJCCEkgAshxH+N088Y//qAfoNXNTbVZ9QRxbJMgv4cJk58jvkLFlH2HaPg6dHvB+67n6SVwO/3Z/Sa0q0Hr73u6r/LHhJCCAngQgjxX+eaa3/5j6QVz/j22dnZdIY7uO+e+9B1DWMLo+Dp0e9PPp3JS5NeIje7ANM0v/exNU2jvrGOEcP3XHTCiSe8K3tHCCEkgAshxH+dS3/6k8eKCkqrm5qbMhoFN02TrEAuzz77H+Z+8RVlZSWbjYI7napN4X333ItlJzMe/bZtsDHj11571T9kzwghhARwIYT4r+TxeKxfXHH5A7F4GE3L7NSblZVFLB7h3rvvRWPjjiimaVJaUsj773/Ey5NfIje7MOPR78amenpX9Ku8+JKL/yN7RgghJIALIcR/rV9edcV9AX92c2trc8aj4DlZ+Tz3/LN8+ulMykqLu0K21+cD4G93/A2w8ft9Gb4KjUQyFr9Gar+FEEICuBBC/LfLy8vrvOKKXzwYinRkFMABAoEAlp3k9j//RQVvrxfTNCkqyOPFFyfz3vtTKMwvyXj0u6mpgbKSitprr736QdkjQgghAVwIIf7r/eb6X/3N5w22tra2ZjwKXpBXwtT33mLSpFcoKswnGAwSi8f561/uALZmyXqNWCLCtddeI7XfQgghAVwIIf435Ofnd155xRUPhiLt6BnWgns8bgBu+9NthMIR8nKzefD+h/lq/lxKiioy6vudHv0uLiytvPKqK+6TPSGEEBLAhRDif8b1N/z6Dr832NrS2pLxKHhpUQXzF37JxOdfwAZu+/NtuF1eDCPT07hGLBGJ//aG6//m8Xgs2QtCCLHzGLfccotsBSGE2IF8Pl88Hks433t/6mFZgRxsvn+FTN3QMU2L1atWM/Xd9/hq3peUFJVmvOplfUMtFeW91r7w0sTzZA8IIcTOpdm2LVtBCCF2sEgkoveu6FvV0dlRkp9XQCbnYofDQXNzC6FIJxVlqvQko3O4DTX1lfHHH3viJ5f8RFoPCiHEziYlKEIIsRN4vV7rjzffdGssHomT4ThIMpkkKytISZHqepJJ+NZ1nZr6KoYO2n2ZhG8hhNg1yAi4EELsRAP6DfxmzdrVg0pLyjMqJ9layaRJQ1NN/K033z7+uOOPnSZbXAghdj4ZARdCiJ3onnvvvtqyzXginujxxzYMg4amGg4/9MgPJHwLIcSuQ0bAhRBiJzv0kCOmfvTx+0dVlPXJaEGdjE7umkY4HKa1vSm+aOGiEbsP332ZbGkhhNg1yAi4EELsZPc/cN8VQLyzszPjFTK/P4DrtLY3ccXlv3xQwrcQQuxapA2hEELsZEVFhc0dbaHghx+/v29WMMf4ob9M6rpOXUMtuTn5te9MeetYp9Mpfb+FEGIXIiUoQgixiygv6726tramb1lp+Q8qRTFNi/rG6vjE5184+6wJZ06WLSuEELsWKUERQohdxL/+9chPLTsZj0aj21yKYhgO6hurOfrI496V8C2EELsmGQEXQohdyMUXXfrIU08/flF5aR+XZW3dKLhhGNQ31OFwOFpXrV7Zr7i4qFW2qBBCSAAXQgjxPfr07rd83fo1u1WU9cU0k5mdzDWNeDxOY3Nd/KUXJ51x+hnjX5ctKYQQuyYpQRFCiF3MS5NePAOId3S0oeuZnaY1TaexuS5+wXkX/UfCtxBC7NqkC4oQQuxiysvLax2GK/7O1LcODviCBt9TDm4YDqpq1tKrvPfaT6Z/dLhsQSGE2LVJCYoQQuyixh447sMZn316yHeVomiaRigUoq2jOT7rs88P2G//0V/KlhNCiF2blKAIIcQu6oUXnz/LYTjDjY31GIaxxdvYFrR1NMf/+Idb/izhWwghJIALIYT4Acoryuv//e9/nx+Nh+OxWGyz1oSG4aCmfj2j9z1g9q1/vvk22WJCCPHjICUoQgixizvvnAuefPb5f19UUdoHM9WaUNd1mpubiMai8dVrVvXp06d3rWwpIYT4cZARcCGE2MU99uSjPykvrVhTWbMOw3CkWg4miMRC8Scef/wnEr6FEEICuBBCiB7kcXusSZMnjQc73tnZjq7pNDTVMP7UMyZfdMmF/5EtJIQQPy7ShlAIIX4EKioqamxLY+p774yNxmJGbm5u9Ucff3CIy+UyZesIIcSPi9SACyHEj8geI/eas2DhvJHTpr1/+OGHHzZdtogQQvz4OGQTCCHEj8c//3nfL1555ZUTJXwLIcSP1/8PAAEqQ/2ChVFSAAAAAElFTkSuQmCC From 25f80c27e8c361f86d7992abf7b9e2f6b663f5f8 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 7 Oct 2020 21:48:58 +0100 Subject: [PATCH 269/369] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3f3a1a5e..522d1484 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1.4.0 with: - dotnet-version: 3.1.101 + dotnet-version: 5.0.100-rc.1.20452.10 - name: Build with dotnet run: dotnet build -c Release - name: Run tests with coverage From 05a5491a5921b9afd19fb4149b3861f2a0bb625e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 17 Oct 2020 15:56:27 +0100 Subject: [PATCH 270/369] .net 5, cleanup, tests, perf improvments - Upgraded to .net 5 - Moved data events out of data interface for separation of concern - Changed event buses to use data model rather than service - Use enumerable in data services more - Better data cache refresh - Fixed change utility to reliably report changes for all data models in a single format --- .../Personnel/IRanksService.cs | 2 +- UKSF.Api.Models/Personnel/Account.cs | 8 + UKSF.Api.Models/Units/Unit.cs | 60 +++- .../Personnel/AssignmentService.cs | 2 +- UKSF.Api.Services/Personnel/RanksService.cs | 4 +- UKSF.Api.Services/Units/UnitsService.cs | 5 +- UKSF.Api.sln.DotSettings | 2 + .../AutoMapperConfigurationProfile.cs | 10 + UKSF.Api/AppStart/RegisterScheduledActions.cs | 6 +- UKSF.Api/AppStart/StartServices.cs | 18 +- .../Accounts/AccountsController.cs | 70 ++--- .../Controllers/Modpack/ModpackController.cs | 11 +- UKSF.Api/Controllers/UnitsController.cs | 286 ++++++++---------- UKSF.Api/Startup.cs | 5 +- UKSF.Api/UKSF.Api.csproj | 2 + UKSF.Common/GuardUtilites.cs | 5 + .../Unit/Data/Units/UnitsDataServiceTests.cs | 36 +-- .../Services/Personnel/RanksServiceTests.cs | 4 +- 18 files changed, 273 insertions(+), 263 deletions(-) create mode 100644 UKSF.Api/AppStart/AutoMapperConfigurationProfile.cs diff --git a/UKSF.Api.Interfaces/Personnel/IRanksService.cs b/UKSF.Api.Interfaces/Personnel/IRanksService.cs index 34f0bab6..6d527f8e 100644 --- a/UKSF.Api.Interfaces/Personnel/IRanksService.cs +++ b/UKSF.Api.Interfaces/Personnel/IRanksService.cs @@ -2,7 +2,7 @@ namespace UKSF.Api.Interfaces.Personnel { public interface IRanksService : IDataBackedService { - int GetRankIndex(string rankName); + int GetRankOrder(string rankName); int Sort(string nameA, string nameB); bool IsEqual(string nameA, string nameB); bool IsSuperior(string nameA, string nameB); diff --git a/UKSF.Api.Models/Personnel/Account.cs b/UKSF.Api.Models/Personnel/Account.cs index b4dc4730..be4a5d28 100644 --- a/UKSF.Api.Models/Personnel/Account.cs +++ b/UKSF.Api.Models/Personnel/Account.cs @@ -26,4 +26,12 @@ public class Account : DatabaseObject { public string unitAssignment; public string unitsExperience; } + + public class RosterAccount : DatabaseObject { + public string name; + public string rank; + public string roleAssignment; + public string unitAssignment; + public string nation; + } } diff --git a/UKSF.Api.Models/Units/Unit.cs b/UKSF.Api.Models/Units/Unit.cs index 884e91b5..80f02114 100644 --- a/UKSF.Api.Models/Units/Unit.cs +++ b/UKSF.Api.Models/Units/Unit.cs @@ -10,31 +10,59 @@ public class Unit : DatabaseObject { public string icon; [BsonRepresentation(BsonType.ObjectId)] public List members = new List(); public string name; - public int order = 0; + public int order; [BsonRepresentation(BsonType.ObjectId)] public string parent; [BsonRepresentation(BsonType.ObjectId)] public Dictionary roles = new Dictionary(); public string shortname; public string teamspeakGroup; - public UnitType type; - } + public bool preferShortname; - public enum UnitType { - SRTEAM, - SECTION, - PLATOON, - COMPANY, - BATTALION, - REGIMENT, - TASKFORCE, - CREW, - FLIGHT, - SQUADRON, - WING, - GROUP + public override string ToString() => $"{name}, {shortname}, {callsign}, {branch}, {teamspeakGroup}, {discordRoleId}"; } public enum UnitBranch { COMBAT, AUXILIARY } + + public class ResponseUnit : Unit { + public string code; + public string parentId; + public string parentName; + public IEnumerable unitMembers; + } + + public class ResponseUnitMember { + public string name; + public string role; + public string unitRole; + } + + public class ResponseUnitTree { + public IEnumerable children; + public string id; + public string name; + } + + public class ResponseUnitTreeDataSet { + public IEnumerable auxiliaryNodes; + public IEnumerable combatNodes; + } + + public class ResponseUnitChartNode { + public IEnumerable children; + public string id; + public IEnumerable members; + public string name; + public bool preferShortname; + } + + public class RequestUnitUpdateParent { + public int index; + public string parentId; + } + + public class RequestUnitUpdateOrder { + public int index; + } } diff --git a/UKSF.Api.Services/Personnel/AssignmentService.cs b/UKSF.Api.Services/Personnel/AssignmentService.cs index 46c61021..0c9a5bc2 100644 --- a/UKSF.Api.Services/Personnel/AssignmentService.cs +++ b/UKSF.Api.Services/Personnel/AssignmentService.cs @@ -122,7 +122,7 @@ private async Task UpdateGroupsAndRoles(string id) { Account account = accountService.Data.GetSingle(id); await teamspeakService.UpdateAccountTeamspeakGroups(account); await discordService.UpdateAccount(account); - serverService.UpdateSquadXml(); + // serverService.UpdateSquadXml(); await accountHub.Clients.Group(id).ReceiveAccountUpdate(); } diff --git a/UKSF.Api.Services/Personnel/RanksService.cs b/UKSF.Api.Services/Personnel/RanksService.cs index f14cffa0..f0d60d82 100644 --- a/UKSF.Api.Services/Personnel/RanksService.cs +++ b/UKSF.Api.Services/Personnel/RanksService.cs @@ -9,9 +9,7 @@ public class RanksService : DataBackedService, IRanksService public RanksService(IRanksDataService data) : base(data) { } - public int GetRankIndex(string rankName) { - return Data.Get().ToList().FindIndex(x => x.name == rankName); - } + public int GetRankOrder(string rankName) => Data.GetSingle(rankName).order; public int Sort(string nameA, string nameB) { Rank rankA = Data.GetSingle(nameA); diff --git a/UKSF.Api.Services/Units/UnitsService.cs b/UKSF.Api.Services/Units/UnitsService.cs index 9a621176..d407cf03 100644 --- a/UKSF.Api.Services/Units/UnitsService.cs +++ b/UKSF.Api.Services/Units/UnitsService.cs @@ -25,7 +25,7 @@ public IEnumerable GetSortedUnits(Func predicate = null) { sortedUnits.Add(auxiliaryRoot); sortedUnits.AddRange(GetAllChildren(auxiliaryRoot)); - return predicate != null ? sortedUnits.Where(predicate).ToList() : sortedUnits; + return predicate != null ? sortedUnits.Where(predicate) : sortedUnits; } public async Task AddMember(string id, string unitId) { @@ -100,7 +100,7 @@ public bool MemberHasRole(string id, string unitId, string role) { public bool MemberHasAnyRole(string id) => Data.Get().Any(x => RolesHasMember(x, id)); public int GetMemberRoleOrder(Account account, Unit unit) { - if (RolesHasMember(unit.id, account.id)) { + if (RolesHasMember(unit, account.id)) { return int.MaxValue - rolesService.Data.GetSingle(x => x.name == unit.roles.FirstOrDefault(y => y.Value == account.id).Key).order; } @@ -122,6 +122,7 @@ public IEnumerable GetParents(Unit unit) { parentUnits.Add(unit); Unit child = unit; unit = !string.IsNullOrEmpty(unit.parent) ? Data.GetSingle(x => x.id == child.parent) : null; + if (unit == child) break; } while (unit != null); return parentUnits; diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index 4fa687b2..d37bdb99 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -35,6 +35,7 @@ WARNING WARNING WARNING + ShowAndRun Built-in: Full Cleanup RequiredForMultilineStatement RequiredForMultilineStatement @@ -448,6 +449,7 @@ LIVE_MONITOR DO_NOTHING LIVE_MONITOR + True True True True diff --git a/UKSF.Api/AppStart/AutoMapperConfigurationProfile.cs b/UKSF.Api/AppStart/AutoMapperConfigurationProfile.cs new file mode 100644 index 00000000..4b39af8f --- /dev/null +++ b/UKSF.Api/AppStart/AutoMapperConfigurationProfile.cs @@ -0,0 +1,10 @@ +using AutoMapper; +using UKSF.Api.Models.Units; + +namespace UKSF.Api.AppStart { + public class AutoMapperConfigurationProfile : Profile { + public AutoMapperConfigurationProfile() { + CreateMap(); + } + } +} diff --git a/UKSF.Api/AppStart/RegisterScheduledActions.cs b/UKSF.Api/AppStart/RegisterScheduledActions.cs index 07d31245..d3e3d8d2 100644 --- a/UKSF.Api/AppStart/RegisterScheduledActions.cs +++ b/UKSF.Api/AppStart/RegisterScheduledActions.cs @@ -6,9 +6,7 @@ namespace UKSF.Api.AppStart { public static class RegisterScheduledActions { - public static void Register() { - IServiceProvider serviceProvider = Global.ServiceProvider; - + public static void Register(IServiceProvider serviceProvider) { IDeleteExpiredConfirmationCodeAction deleteExpiredConfirmationCodeAction = serviceProvider.GetService(); IInstagramImagesAction instagramImagesAction = serviceProvider.GetService(); IInstagramTokenAction instagramTokenAction = serviceProvider.GetService(); @@ -16,7 +14,7 @@ public static void Register() { ITeamspeakSnapshotAction teamspeakSnapshotAction = serviceProvider.GetService(); IScheduledActionService scheduledActionService = serviceProvider.GetService(); - scheduledActionService.RegisterScheduledActions(new HashSet { deleteExpiredConfirmationCodeAction, instagramImagesAction, instagramTokenAction, pruneDataAction, teamspeakSnapshotAction }); + scheduledActionService?.RegisterScheduledActions(new HashSet { deleteExpiredConfirmationCodeAction, instagramImagesAction, instagramTokenAction, pruneDataAction, teamspeakSnapshotAction }); } } } diff --git a/UKSF.Api/AppStart/StartServices.cs b/UKSF.Api/AppStart/StartServices.cs index 3eca393f..c5427983 100644 --- a/UKSF.Api/AppStart/StartServices.cs +++ b/UKSF.Api/AppStart/StartServices.cs @@ -20,32 +20,32 @@ public static void Start() { } // Execute any DB migration - serviceProvider.GetService().Migrate(); + serviceProvider.GetService()?.Migrate(); // Warm cached data services RegisterAndWarmCachedData.Warm(); // Register scheduled actions - RegisterScheduledActions.Register(); + RegisterScheduledActions.Register(serviceProvider); // Register build steps - serviceProvider.GetService().RegisterBuildSteps(); + serviceProvider.GetService()?.RegisterBuildSteps(); // Add event handlers - serviceProvider.GetService().InitEventHandlers(); + serviceProvider.GetService()?.InitEventHandlers(); // Start teamspeak manager - serviceProvider.GetService().Start(); + serviceProvider.GetService()?.Start(); // Connect discord bot - serviceProvider.GetService().ConnectDiscord(); + serviceProvider.GetService()?.ConnectDiscord(); // Start scheduler - serviceProvider.GetService().Load(); + serviceProvider.GetService()?.Load(); // Mark running builds as cancelled & run queued builds - serviceProvider.GetService().CancelInterruptedBuilds(); - serviceProvider.GetService().RunQueuedBuilds(); + serviceProvider.GetService()?.CancelInterruptedBuilds(); + serviceProvider.GetService()?.RunQueuedBuilds(); } } } diff --git a/UKSF.Api/Controllers/Accounts/AccountsController.cs b/UKSF.Api/Controllers/Accounts/AccountsController.cs index 8a0de189..785f03f4 100644 --- a/UKSF.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSF.Api/Controllers/Accounts/AccountsController.cs @@ -15,7 +15,6 @@ using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Integrations; using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Utility; using UKSF.Api.Services.Common; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; @@ -75,7 +74,7 @@ public IActionResult GetById(string id) { public async Task Put([FromBody] JObject body) { string email = body["email"].ToString(); if (accountService.Data.Get(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)).Any()) { - return BadRequest(new {error = "an account with this email or username exists"}); + return BadRequest(new { error = "an account with this email or username exists" }); } Account account = new Account { @@ -90,7 +89,7 @@ public async Task Put([FromBody] JObject body) { await accountService.Data.Add(account); await SendConfirmationCode(account); LogWrapper.AuditLog($"New account created: '{account.firstname} {account.lastname}, {account.email}'", accountService.Data.GetSingle(x => x.email == account.email).id); - return Ok(new {account.email}); + return Ok(new { account.email }); } [HttpPost, Authorize] @@ -107,7 +106,7 @@ public async Task ApplyConfirmationCode([FromBody] JObject body) Account account = accountService.Data.GetSingle(x => x.email == email); if (account == null) { - return BadRequest(new {error = $"An account with the email '{email}' doesn't exist. This should be impossible so please contact an admin for help"}); + return BadRequest(new { error = $"An account with the email '{email}' doesn't exist. This should be impossible so please contact an admin for help" }); } string value = await confirmationCodeService.GetConfirmationCode(code); @@ -119,7 +118,7 @@ public async Task ApplyConfirmationCode([FromBody] JObject body) await confirmationCodeService.ClearConfirmationCodes(x => x.value == email); await SendConfirmationCode(account); - return BadRequest(new {error = $"The confirmation code was invalid or expired. A new code has been sent to '{account.email}'"}); + return BadRequest(new { error = $"The confirmation code was invalid or expired. A new code has been sent to '{account.email}'" }); } [HttpPost("resend-email-code"), Authorize] @@ -127,7 +126,7 @@ public async Task ResendConfirmationCode() { Account account = sessionService.GetContextAccount(); if (account.membershipState != MembershipState.UNCONFIRMED) { - return BadRequest(new { error = "Account email has already been confirmed"}); + return BadRequest(new { error = "Account email has already been confirmed" }); } await confirmationCodeService.ClearConfirmationCodes(x => x.value == account.email); @@ -145,37 +144,36 @@ public IActionResult GetAccountsUnder([FromQuery] bool reverse = false) { memberAccounts.Reverse(); } - accounts.AddRange(memberAccounts.Select(x => new {value = x.id, displayValue = displayNameService.GetDisplayName(x)})); + accounts.AddRange(memberAccounts.Select(x => new { value = x.id, displayValue = displayNameService.GetDisplayName(x) })); return Ok(accounts); } [HttpGet("roster"), Authorize] - public IActionResult GetRosterAccounts() { - List accountObjects = new List(); + public IEnumerable GetRosterAccounts() { IEnumerable accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER); - accounts = accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname); - accountObjects.AddRange( - accounts.Select( - document => new { - document.id, - document.nation, - document.rank, - document.roleAssignment, - document.unitAssignment, - name = $"{document.lastname}, {document.firstname}" - } - ) - ); - return Ok(accountObjects); + IEnumerable accountObjects = accounts.OrderBy(x => x.rank, new RankComparer(ranksService)) + .ThenBy(x => x.lastname) + .ThenBy(x => x.firstname) + .Select(x => new RosterAccount { id = x.id, nation = x.nation, rank = x.rank, roleAssignment = x.roleAssignment, unitAssignment = x.unitAssignment, name = $"{x.lastname}, {x.firstname}" }); + return accountObjects; } [HttpGet("online")] public IActionResult GetOnlineAccounts() { IEnumerable teamnspeakClients = teamspeakService.GetOnlineTeamspeakClients(); IEnumerable allAccounts = accountService.Data.Get(); - var clients = teamnspeakClients.Where(x => x != null).Select(x => new {account = allAccounts.FirstOrDefault(y => y.teamspeakIdentities != null && y.teamspeakIdentities.Any(z => z.Equals(x.clientDbId))), client = x}).ToList(); - var clientAccounts = clients.Where(x => x.account != null && x.account.membershipState == MembershipState.MEMBER).OrderBy(x => x.account.rank, new RankComparer(ranksService)).ThenBy(x => x.account.lastname).ThenBy(x => x.account.firstname); + var clients = teamnspeakClients.Where(x => x != null) + .Select( + x => new { + account = allAccounts.FirstOrDefault(y => y.teamspeakIdentities != null && y.teamspeakIdentities.Any(z => z.Equals(x.clientDbId))), client = x + } + ) + .ToList(); + var clientAccounts = clients.Where(x => x.account != null && x.account.membershipState == MembershipState.MEMBER) + .OrderBy(x => x.account.rank, new RankComparer(ranksService)) + .ThenBy(x => x.account.lastname) + .ThenBy(x => x.account.firstname); List commandAccounts = unitsService.GetAuxilliaryRoot().members; List commanders = new List(); @@ -184,30 +182,33 @@ public IActionResult GetOnlineAccounts() { List guests = new List(); foreach (var onlineClient in clientAccounts) { if (commandAccounts.Contains(onlineClient.account.id)) { - commanders.Add(new {displayName = displayNameService.GetDisplayName(onlineClient.account)}); + commanders.Add(new { displayName = displayNameService.GetDisplayName(onlineClient.account) }); } else if (recruitmentService.IsRecruiter(onlineClient.account)) { - recruiters.Add(new {displayName = displayNameService.GetDisplayName(onlineClient.account)}); + recruiters.Add(new { displayName = displayNameService.GetDisplayName(onlineClient.account) }); } else { - members.Add(new {displayName = displayNameService.GetDisplayName(onlineClient.account)}); + members.Add(new { displayName = displayNameService.GetDisplayName(onlineClient.account) }); } } foreach (var client in clients.Where(x => x.account == null || x.account.membershipState != MembershipState.MEMBER)) { - guests.Add(new {displayName = client.client.clientName}); + guests.Add(new { displayName = client.client.clientName }); } - return Ok(new {commanders, recruiters, members, guests}); + return Ok(new { commanders, recruiters, members, guests }); } [HttpGet("exists")] public IActionResult CheckUsernameOrEmailExists([FromQuery] string check) { - return Ok(accountService.Data.Get().Any(x => string.Equals(x.email, check, StringComparison.InvariantCultureIgnoreCase)) ? new {exists = true} : new {exists = false}); + return Ok(accountService.Data.Get().Any(x => string.Equals(x.email, check, StringComparison.InvariantCultureIgnoreCase)) ? new { exists = true } : new { exists = false }); } [HttpPut("name"), Authorize] public async Task ChangeName([FromBody] JObject changeNameRequest) { Account account = sessionService.GetContextAccount(); - await accountService.Data.Update(account.id, Builders.Update.Set(x => x.firstname, changeNameRequest["firstname"].ToString()).Set(x => x.lastname, changeNameRequest["lastname"].ToString())); + await accountService.Data.Update( + account.id, + Builders.Update.Set(x => x.firstname, changeNameRequest["firstname"].ToString()).Set(x => x.lastname, changeNameRequest["lastname"].ToString()) + ); LogWrapper.AuditLog($"{account.lastname}, {account.firstname} changed their name to {changeNameRequest["lastname"]}, {changeNameRequest["firstname"]}"); await discordService.UpdateAccount(accountService.Data.GetSingle(account.id)); return Ok(); @@ -232,7 +233,7 @@ public async Task UpdateSetting(string id, [FromBody] JObject bod [HttpGet("test")] public IActionResult Test() { LogWrapper.Log("This is a test"); - return Ok(new {value = DateTime.Now.ToLongTimeString()}); + return Ok(new { value = DateTime.Now.ToLongTimeString() }); } private PublicAccount PubliciseAccount(Account account) { @@ -253,7 +254,8 @@ private PublicAccount PubliciseAccount(Account account) { private async Task SendConfirmationCode(Account account) { string code = await confirmationCodeService.CreateConfirmationCode(account.email); - string htmlContent = $"Your email was given for an application to join UKSF
Copy this code to your clipboard and return to the UKSF website application page to enter the code:

{code}


If this request was not made by you, please contact an admin

"; + string htmlContent = + $"Your email was given for an application to join UKSF
Copy this code to your clipboard and return to the UKSF website application page to enter the code:

{code}


If this request was not made by you, please contact an admin

"; emailService.SendEmail(account.email, "UKSF Email Confirmation", htmlContent); } } diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs index 1d926065..406071a6 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -1,4 +1,5 @@ -using System.Threading.Tasks; +using System.Collections.Generic; +using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using UKSF.Api.Interfaces.Integrations.Github; @@ -18,13 +19,13 @@ public ModpackController(IModpackService modpackService, IGithubService githubSe } [HttpGet("releases"), Authorize, Roles(RoleDefinitions.MEMBER)] - public IActionResult GetReleases() => Ok(modpackService.GetReleases()); + public IEnumerable GetReleases() => modpackService.GetReleases(); [HttpGet("rcs"), Authorize, Roles(RoleDefinitions.MEMBER)] - public IActionResult GetReleaseCandidates() => Ok(modpackService.GetRcBuilds()); + public IEnumerable GetReleaseCandidates() => modpackService.GetRcBuilds(); [HttpGet("builds"), Authorize, Roles(RoleDefinitions.MEMBER)] - public IActionResult GetBuilds() => Ok(modpackService.GetDevBuilds()); + public IEnumerable GetBuilds() => modpackService.GetDevBuilds(); [HttpGet("builds/{id}"), Authorize, Roles(RoleDefinitions.MEMBER)] public IActionResult GetBuild(string id) { @@ -33,7 +34,7 @@ public IActionResult GetBuild(string id) { } [HttpGet("builds/{id}/step/{index}"), Authorize, Roles(RoleDefinitions.MEMBER)] - public IActionResult GetBuild(string id, int index) { + public IActionResult GetBuildStep(string id, int index) { ModpackBuild build = modpackService.GetBuild(id); if (build == null) { return BadRequest("Build does not exist"); diff --git a/UKSF.Api/Controllers/UnitsController.cs b/UKSF.Api/Controllers/UnitsController.cs index 314d7d38..8eb0a8e3 100644 --- a/UKSF.Api/Controllers/UnitsController.cs +++ b/UKSF.Api/Controllers/UnitsController.cs @@ -1,22 +1,22 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using AutoMapper; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Bson; -using MongoDB.Driver; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Integrations.Teamspeak; using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Models; using UKSF.Api.Models.Message; using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Units; using UKSF.Api.Services.Message; +using UKSF.Common; namespace UKSF.Api.Controllers { [Route("[controller]")] @@ -25,10 +25,10 @@ public class UnitsController : Controller { private readonly IAssignmentService assignmentService; private readonly IDiscordService discordService; private readonly IDisplayNameService displayNameService; + private readonly IMapper mapper; private readonly INotificationsService notificationsService; private readonly IRanksService ranksService; private readonly IRolesService rolesService; - private readonly IServerService serverService; private readonly ITeamspeakService teamspeakService; private readonly IUnitsService unitsService; @@ -40,9 +40,9 @@ public UnitsController( IRolesService rolesService, ITeamspeakService teamspeakService, IAssignmentService assignmentService, - IServerService serverService, IDiscordService discordService, - INotificationsService notificationsService + INotificationsService notificationsService, + IMapper mapper ) { this.accountService = accountService; this.displayNameService = displayNameService; @@ -51,82 +51,84 @@ INotificationsService notificationsService this.rolesService = rolesService; this.teamspeakService = teamspeakService; this.assignmentService = assignmentService; - this.serverService = serverService; this.discordService = discordService; this.notificationsService = notificationsService; + this.mapper = mapper; } [HttpGet, Authorize] - public IActionResult Get() => Ok(unitsService.GetSortedUnits()); + public IActionResult Get([FromQuery] string filter = "", [FromQuery] string accountId = "") { + if (!string.IsNullOrEmpty(accountId)) { + IEnumerable response = filter switch { + "auxiliary" => unitsService.GetSortedUnits(x => x.branch == UnitBranch.AUXILIARY && x.members.Contains(accountId)), + "available" => unitsService.GetSortedUnits(x => !x.members.Contains(accountId)), + _ => unitsService.GetSortedUnits(x => x.members.Contains(accountId)) + }; + return Ok(response); + } + + return Ok(unitsService.GetSortedUnits()); + } [HttpGet("{id}"), Authorize] - public IActionResult GetAccountUnits(string id, [FromQuery] string filter = "") { - return filter switch { - "auxiliary" => Ok(unitsService.GetSortedUnits(x => x.branch == UnitBranch.AUXILIARY && x.members.Contains(id))), - "available" => Ok(unitsService.GetSortedUnits(x => !x.members.Contains(id))), - _ => Ok(unitsService.GetSortedUnits(x => x.members.Contains(id))) - }; + public IActionResult GetSingle([FromRoute] string id) { + Unit unit = unitsService.Data.GetSingle(id); + Unit parent = unitsService.GetParent(unit); + // TODO: Use a factory or mapper + ResponseUnit response = mapper.Map(unit); + response.code = unitsService.GetChainString(unit); + response.parentId = parent?.id; + response.parentName = parent?.name; + response.unitMembers = MapUnitMembers(unit); + return Ok(response); + } + + [HttpGet("exists/{check}"), Authorize] + public IActionResult GetUnitExists([FromRoute] string check, [FromQuery] string id = "") { + if (string.IsNullOrEmpty(check)) Ok(false); + + bool exists = unitsService.Data.GetSingle( + x => (string.IsNullOrEmpty(id) || x.id != id) && + (string.Equals(x.name, check, StringComparison.InvariantCultureIgnoreCase) || + string.Equals(x.shortname, check, StringComparison.InvariantCultureIgnoreCase) || + string.Equals(x.teamspeakGroup, check, StringComparison.InvariantCultureIgnoreCase) || + string.Equals(x.discordRoleId, check, StringComparison.InvariantCultureIgnoreCase) || + string.Equals(x.callsign, check, StringComparison.InvariantCultureIgnoreCase)) + ) != + null; + return Ok(exists); } [HttpGet("tree"), Authorize] public IActionResult GetTree() { Unit combatRoot = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); Unit auxiliaryRoot = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); - return Ok(new {combatUnits = new[] {new {combatRoot.id, combatRoot.name, children = GetTreeChildren(combatRoot), unit = combatRoot}}, auxiliaryUnits = new[] {new {auxiliaryRoot.id, auxiliaryRoot.name, children = GetTreeChildren(auxiliaryRoot), unit = auxiliaryRoot}}}); - } - - private List GetTreeChildren(Unit parent) { - List children = new List(); - foreach (Unit unit in unitsService.Data.Get(x => x.parent == parent.id).OrderBy(x => x.order)) { - children.Add(new {unit.id, unit.name, children = GetTreeChildren(unit), unit}); - } - - return children; + ResponseUnitTreeDataSet dataSet = new ResponseUnitTreeDataSet { + combatNodes = new List { new ResponseUnitTree { id = combatRoot.id, name = combatRoot.name, children = GetUnitTreeChildren(combatRoot) } }, + auxiliaryNodes = new List { new ResponseUnitTree { id = auxiliaryRoot.id, name = auxiliaryRoot.name, children = GetUnitTreeChildren(auxiliaryRoot) } } + }; + return Ok(dataSet); } - [HttpPost("{check}"), Authorize] - public IActionResult CheckUnit(string check, [FromBody] Unit unit = null) { - if (string.IsNullOrEmpty(check)) return Ok(); - if (unit != null) { - Unit safeUnit = unit; - return Ok(unitsService.Data.GetSingle(x => x.id != safeUnit.id && (x.name == check || x.shortname == check || x.teamspeakGroup == check || x.discordRoleId == check || x.callsign == check))); - } - - return Ok(unitsService.Data.GetSingle(x => x.name == check || x.shortname == check || x.teamspeakGroup == check || x.discordRoleId == check || x.callsign == check)); + // TODO: Use a mapper + private IEnumerable GetUnitTreeChildren(DatabaseObject parentUnit) { + return unitsService.Data.Get(x => x.parent == parentUnit.id).Select(unit => new ResponseUnitTree { id = unit.id, name = unit.name, children = GetUnitTreeChildren(unit) }); } [HttpPost, Authorize] - public IActionResult CheckUnit([FromBody] Unit unit) { - return unit != null ? (IActionResult) Ok(unitsService.Data.GetSingle(x => x.id != unit.id && (x.name == unit.name || x.shortname == unit.shortname || x.teamspeakGroup == unit.teamspeakGroup || x.discordRoleId == unit.discordRoleId || x.callsign == unit.callsign))) : Ok(); - } - - [HttpPut, Authorize] public async Task AddUnit([FromBody] Unit unit) { await unitsService.Data.Add(unit); - LogWrapper.AuditLog($"New unit added '{unit.name}, {unit.shortname}, {unit.type}, {unit.branch}, {unit.teamspeakGroup}, {unit.discordRoleId}, {unit.callsign}'"); + LogWrapper.AuditLog($"New unit added: '{unit}'"); return Ok(); } - [HttpPatch, Authorize] - public async Task EditUnit([FromBody] Unit unit) { - Unit localUnit = unit; - Unit oldUnit = unitsService.Data.GetSingle(x => x.id == localUnit.id); - LogWrapper.AuditLog( - $"Unit updated from '{oldUnit.name}, {oldUnit.shortname}, {oldUnit.type}, {oldUnit.parent}, {oldUnit.branch}, {oldUnit.teamspeakGroup}, {oldUnit.discordRoleId}, {oldUnit.callsign}, {oldUnit.icon}' to '{unit.name}, {unit.shortname}, {unit.type}, {unit.parent}, {unit.branch}, {unit.teamspeakGroup}, {unit.discordRoleId}, {unit.callsign}, {unit.icon}'" - ); - await unitsService.Data - .Update( - unit.id, - Builders.Update.Set("name", unit.name) - .Set("shortname", unit.shortname) - .Set("type", unit.type) - .Set("parent", unit.parent) - .Set("branch", unit.branch) - .Set("teamspeakGroup", unit.teamspeakGroup) - .Set("discordRoleId", unit.discordRoleId) - .Set("callsign", unit.callsign) - .Set("icon", unit.icon) - ); + [HttpPut("{id}"), Authorize] + public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit) { + Unit oldUnit = unitsService.Data.GetSingle(x => x.id == id); + await unitsService.Data.Replace(unit); + LogWrapper.AuditLog($"Unit '{unit.shortname}' updated: {oldUnit.Changes(unit)}"); + + // TODO: Move this elsewhere unit = unitsService.Data.GetSingle(unit.id); if (unit.name != oldUnit.name) { foreach (Account account in accountService.Data.Get(x => x.unitAssignment == oldUnit.name)) { @@ -147,12 +149,11 @@ await unitsService.Data } } - serverService.UpdateSquadXml(); return Ok(); } [HttpDelete("{id}"), Authorize] - public async Task DeleteUnit(string id) { + public async Task DeleteUnit([FromRoute] string id) { Unit unit = unitsService.Data.GetSingle(id); LogWrapper.AuditLog($"Unit deleted '{unit.name}'"); foreach (Account account in accountService.Data.Get(x => x.unitAssignment == unit.name)) { @@ -161,33 +162,32 @@ public async Task DeleteUnit(string id) { } await unitsService.Data.Delete(id); - serverService.UpdateSquadXml(); return Ok(); } - [HttpPost("parent"), Authorize] - public async Task UpdateParent([FromBody] JObject data) { - Unit unit = JsonConvert.DeserializeObject(data["unit"].ToString()); - Unit parentUnit = JsonConvert.DeserializeObject(data["parentUnit"].ToString()); - int index = JsonConvert.DeserializeObject(data["index"].ToString()); + [HttpPatch("{id}/parent"), Authorize] + public async Task UpdateParent([FromRoute] string id, [FromBody] RequestUnitUpdateParent unitUpdate) { + Unit unit = unitsService.Data.GetSingle(id); + Unit parentUnit = unitsService.Data.GetSingle(unitUpdate.parentId); if (unit.parent == parentUnit.id) return Ok(); - await unitsService.Data.Update(unit.id, "parent", parentUnit.id); + await unitsService.Data.Update(id, "parent", parentUnit.id); if (unit.branch != parentUnit.branch) { - await unitsService.Data.Update(unit.id, "branch", parentUnit.branch); + await unitsService.Data.Update(id, "branch", parentUnit.branch); } List parentChildren = unitsService.Data.Get(x => x.parent == parentUnit.id).ToList(); parentChildren.Remove(parentChildren.FirstOrDefault(x => x.id == unit.id)); - parentChildren.Insert(index, unit); + parentChildren.Insert(unitUpdate.index, unit); foreach (Unit child in parentChildren) { await unitsService.Data.Update(child.id, "order", parentChildren.IndexOf(child)); } + // TODO: Move elsewhere unit = unitsService.Data.GetSingle(unit.id); foreach (Unit child in unitsService.GetAllChildren(unit, true)) { foreach (Account account in child.members.Select(x => accountService.Data.GetSingle(x))) { - Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, unit.name, reason: $"the hierarchy chain for {unit.name} was updated"); + Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, child.name, reason: $"the hierarchy chain for {unit.name} was updated"); notificationsService.Add(notification); } } @@ -195,14 +195,13 @@ public async Task UpdateParent([FromBody] JObject data) { return Ok(); } - [HttpPost("order"), Authorize] - public IActionResult UpdateSortOrder([FromBody] JObject data) { - Unit unit = JsonConvert.DeserializeObject(data["unit"].ToString()); - int index = JsonConvert.DeserializeObject(data["index"].ToString()); + [HttpPatch("{id}/order"), Authorize] + public IActionResult UpdateSortOrder([FromRoute] string id, [FromBody] RequestUnitUpdateOrder unitUpdate) { + Unit unit = unitsService.Data.GetSingle(id); Unit parentUnit = unitsService.Data.GetSingle(x => x.id == unit.parent); List parentChildren = unitsService.Data.Get(x => x.parent == parentUnit.id).ToList(); parentChildren.Remove(parentChildren.FirstOrDefault(x => x.id == unit.id)); - parentChildren.Insert(index, unit); + parentChildren.Insert(unitUpdate.index, unit); foreach (Unit child in parentChildren) { unitsService.Data.Update(child.id, "order", parentChildren.IndexOf(child)); } @@ -210,98 +209,63 @@ public IActionResult UpdateSortOrder([FromBody] JObject data) { return Ok(); } - [HttpGet("filter"), Authorize] - public IActionResult Get([FromQuery] string typeFilter) { - switch (typeFilter) { - case "regiments": - string combatRootId = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT).id; - return Ok(unitsService.Data.Get(x => x.parent == combatRootId || x.id == combatRootId).ToList().Select(x => new {x.name, x.shortname, id = x.id.ToString(), x.icon})); - case "orgchart": + // TODO: Use mappers/factories + [HttpGet("chart/{type}"), Authorize] + public IActionResult GetUnitsChart([FromRoute] string type) { + switch (type) { + case "combat": Unit combatRoot = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); return Ok( - new[] { - new { - combatRoot.id, - label = combatRoot.shortname, - type = "person", - styleClass = "ui-person", - expanded = true, - data = new {name = combatRoot.members != null ? SortMembers(combatRoot.members, combatRoot).Select(y => new {role = GetRole(combatRoot, y), name = displayNameService.GetDisplayName(y)}) : null}, - children = GetChartChildren(combatRoot.id) - } + new ResponseUnitChartNode { + id = combatRoot.id, + name = combatRoot.preferShortname ? combatRoot.shortname : combatRoot.name, + members = MapUnitMembers(combatRoot), + children = GetUnitChartChildren(combatRoot.id) } ); - case "orgchartaux": - Unit auziliaryRoot = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); + case "auxiliary": + Unit auxiliaryRoot = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); return Ok( - new[] { - new { - auziliaryRoot.id, - label = auziliaryRoot.name, - type = "person", - styleClass = "ui-person", - expanded = true, - data = new {name = auziliaryRoot.members != null ? SortMembers(auziliaryRoot.members, auziliaryRoot).Select(y => new {role = GetRole(auziliaryRoot, y), name = displayNameService.GetDisplayName(y)}) : null}, - children = GetChartChildren(auziliaryRoot.id) - } + new ResponseUnitChartNode { + id = auxiliaryRoot.id, + name = auxiliaryRoot.preferShortname ? auxiliaryRoot.shortname : auxiliaryRoot.name, + members = MapUnitMembers(auxiliaryRoot), + children = GetUnitChartChildren(auxiliaryRoot.id) } ); - default: return Ok(unitsService.Data.Get().Select(x => new {viewValue = x.name, value = x.id.ToString()})); + default: return Ok(); } } - [HttpGet("info/{id}"), Authorize] - public IActionResult GetInfo(string id) { - Unit unit = unitsService.Data.GetSingle(id); - IEnumerable parents = unitsService.GetParents(unit).ToList(); - Unit regiment = parents.Skip(1).FirstOrDefault(x => x.type == UnitType.REGIMENT); - return Ok( - new { - unitData = unit, - unit.parent, - type = unit.type.ToString(), - displayName = unit.name, -// oic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(0).name) ? "" : displayNameService.GetDisplayName(accountService.Data.GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(0).name])), -// xic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(1).name) ? "" : displayNameService.GetDisplayName(accountService.Data.GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(1).name])), -// ncoic = unit.roles == null || !unitsService.UnitHasRole(unit, rolesService.GetUnitRoleByOrder(2).name) ? "" : displayNameService.GetDisplayName(accountService.Data.GetSingle(unit.roles[rolesService.GetUnitRoleByOrder(2).name])), - code = unitsService.GetChainString(unit), - parentDisplay = parents.Skip(1).FirstOrDefault()?.name, - regimentDisplay = regiment?.name, - parentURL = parents.Skip(1).FirstOrDefault()?.id, - regimentURL = regiment?.id, -// attendance = "10 instances (70% rate)", -// absences = "10 instances (70% rate)", -// coverageLOA = "80%", -// casualtyRate = "10010 instances (70% rate)", -// fatalityRate = "200 instances (20% rate)", - memberCollection = unit.members.Select(x => accountService.Data.GetSingle(x)).Select(x => new {name = displayNameService.GetDisplayName(x), role = x.roleAssignment}) - } - ); + private IEnumerable GetUnitChartChildren(string parent) { + return unitsService.Data.Get(x => x.parent == parent) + .Select( + unit => new ResponseUnitChartNode { + id = unit.id, name = unit.preferShortname ? unit.shortname : unit.name, members = MapUnitMembers(unit), children = GetUnitChartChildren(unit.id) + } + ); } - [HttpGet("members/{id}"), Authorize] - public IActionResult GetMembers(string id) { - Unit unit = unitsService.Data.GetSingle(id); - return Ok(unit.members.Select(x => accountService.Data.GetSingle(x)).Select(x => new {name = displayNameService.GetDisplayName(x), role = x.roleAssignment})); + private IEnumerable MapUnitMembers(Unit unit) { + return SortMembers(unit.members, unit).Select(x => MapUnitMember(x, unit)); } - private object[] GetChartChildren(string parent) { - List units = new List(); - foreach (Unit unit in unitsService.Data.Get(x => x.parent == parent)) { - units.Add( - new { - unit.id, - label = unit.type == UnitType.PLATOON || unit.type == UnitType.SECTION || unit.type == UnitType.SRTEAM ? unit.name : unit.shortname, - type = "person", - styleClass = "ui-person", - expanded = true, - data = new {name = unit.members != null ? SortMembers(unit.members, unit).Select(y => new {role = GetRole(unit, y), name = displayNameService.GetDisplayName(y)}) : null}, - children = GetChartChildren(unit.id) - } - ); - } + private ResponseUnitMember MapUnitMember(Account member, Unit unit) => + new ResponseUnitMember { name = displayNameService.GetDisplayName(member), role = member.roleAssignment, unitRole = GetRole(unit, member.id) }; - return units.ToArray(); + // TODO: Move somewhere else + private IEnumerable SortMembers(IEnumerable members, Unit unit) { + return members.Select( + x => { + Account account = accountService.Data.GetSingle(x); + return new { account, rankIndex = ranksService.GetRankOrder(account.rank), roleIndex = unitsService.GetMemberRoleOrder(account, unit) }; + } + ) + .OrderByDescending(x => x.roleIndex) + .ThenBy(x => x.rankIndex) + .ThenBy(x => x.account.lastname) + .ThenBy(x => x.account.firstname) + .Select(x => x.account); } private string GetRole(Unit unit, string accountId) => @@ -309,17 +273,5 @@ private string GetRole(Unit unit, string accountId) => unitsService.MemberHasRole(accountId, unit, rolesService.GetUnitRoleByOrder(1).name) ? "2" : unitsService.MemberHasRole(accountId, unit, rolesService.GetUnitRoleByOrder(2).name) ? "3" : unitsService.MemberHasRole(accountId, unit, rolesService.GetUnitRoleByOrder(3).name) ? "N" : ""; - - private IEnumerable SortMembers(IEnumerable members, Unit unit) { - var accounts = members.Select( - x => { - Account account = accountService.Data.GetSingle(x); - return new {account, rankIndex = ranksService.GetRankIndex(account.rank), roleIndex = unitsService.GetMemberRoleOrder(account, unit)}; - } - ) - .ToList(); - accounts.Sort((a, b) => a.roleIndex < b.roleIndex ? 1 : a.roleIndex > b.roleIndex ? -1 : a.rankIndex < b.rankIndex ? -1 : a.rankIndex > b.rankIndex ? 1 : string.CompareOrdinal(a.account.lastname, b.account.lastname)); - return accounts.Select(x => x.account.id); - } } } diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 968a11cf..e4642af5 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -3,6 +3,7 @@ using System.Text; using System.Threading.Tasks; using AspNet.Security.OpenId; +using AutoMapper; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; @@ -14,6 +15,7 @@ using Microsoft.Extensions.Primitives; using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; +using Swashbuckle.AspNetCore.SwaggerUI; using UKSF.Api.AppStart; using UKSF.Api.AppStart.Services; using UKSF.Api.Interfaces.Integrations.Teamspeak; @@ -114,6 +116,7 @@ public void ConfigureServices(IServiceCollection services) { } ); + services.AddAutoMapper(typeof(AutoMapperConfigurationProfile)); services.AddControllers(); services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo { Title = "UKSF API", Version = "v1" }); }); services.AddMvc(options => { options.Filters.Add(); }).AddNewtonsoftJson(); @@ -125,7 +128,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl app.UseStaticFiles(); app.UseCookiePolicy(new CookiePolicyOptions { MinimumSameSitePolicy = SameSiteMode.Lax }); app.UseSwagger(); - app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF API v1"); }); + app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF API v1"); options.DocExpansion(DocExpansion.None); }); app.UseRouting(); app.UseCors("CorsPolicy"); app.UseCorsMiddleware(); diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index 9a3721b5..7b588e61 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -21,6 +21,8 @@ + + diff --git a/UKSF.Common/GuardUtilites.cs b/UKSF.Common/GuardUtilites.cs index 4d85efed..1b6b0a9f 100644 --- a/UKSF.Common/GuardUtilites.cs +++ b/UKSF.Common/GuardUtilites.cs @@ -22,5 +22,10 @@ public static void ValidateIdArray(string[] array, Func validate if (!validate(array)) onInvalid(); Array.ForEach(array, x => ValidateId(x, onIdInvalid)); } + + public static void ValidateTwoStrings(string first, string second, Action onInvalid) { + if (string.IsNullOrEmpty(first)) onInvalid(first); + if (string.IsNullOrEmpty(second)) onInvalid(second); + } } } diff --git a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index 5ab57a12..377e359e 100644 --- a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -6,26 +6,26 @@ using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Units; using Xunit; -using UUnit = UKSF.Api.Models.Units.Unit; +using UksfUnit = UKSF.Api.Models.Units.Unit; namespace UKSF.Tests.Unit.Data.Units { public class UnitsDataServiceTests { [Fact] public void Should_get_collection_in_order() { Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - Mock> mockDataCollection = new Mock>(); + Mock> mockDataEventBus = new Mock>(); + Mock> mockDataCollection = new Mock>(); - UUnit rank1 = new UUnit { name = "Air Troop", order = 2 }; - UUnit rank2 = new UUnit { name = "UKSF", order = 0 }; - UUnit rank3 = new UUnit { name = "SAS", order = 1 }; + UksfUnit rank1 = new UksfUnit { name = "Air Troop", order = 2 }; + UksfUnit rank2 = new UksfUnit { name = "UKSF", order = 0 }; + UksfUnit rank3 = new UksfUnit { name = "SAS", order = 1 }; - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); UnitsDataService unitsDataService = new UnitsDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); - IEnumerable subject = unitsDataService.Get(); + IEnumerable subject = unitsDataService.Get(); subject.Should().ContainInOrder(rank2, rank3, rank1); } @@ -33,20 +33,20 @@ public void Should_get_collection_in_order() { [Fact] public void ShouldGetOrderedCollectionFromPredicate() { Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - Mock> mockDataCollection = new Mock>(); + Mock> mockDataEventBus = new Mock>(); + Mock> mockDataCollection = new Mock>(); - UUnit rank1 = new UUnit { name = "Air Troop", order = 3, type = UnitType.SECTION }; - UUnit rank2 = new UUnit { name = "Boat Troop", order = 2, type = UnitType.SECTION }; - UUnit rank3 = new UUnit { name = "UKSF", order = 0, type = UnitType.TASKFORCE }; - UUnit rank4 = new UUnit { name = "SAS", order = 1, type = UnitType.REGIMENT }; + UksfUnit rank1 = new UksfUnit { name = "Air Troop", order = 3, branch = UnitBranch.COMBAT }; + UksfUnit rank2 = new UksfUnit { name = "Boat Troop", order = 2, branch = UnitBranch.COMBAT }; + UksfUnit rank3 = new UksfUnit { name = "UKSF", order = 0, branch = UnitBranch.AUXILIARY }; + UksfUnit rank4 = new UksfUnit { name = "SAS", order = 1, branch = UnitBranch.AUXILIARY }; - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3, rank4 }); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3, rank4 }); UnitsDataService unitsDataService = new UnitsDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); - IEnumerable subject = unitsDataService.Get(x => x.type == UnitType.SECTION); + IEnumerable subject = unitsDataService.Get(x => x.branch == UnitBranch.COMBAT); subject.Should().ContainInOrder(rank2, rank1); } diff --git a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs index a0e04961..1f89a042 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs @@ -25,7 +25,7 @@ public void ShouldGetCorrectIndex() { mockRanksDataService.Setup(x => x.Get()).Returns(mockCollection); - int subject = ranksService.GetRankIndex("Private"); + int subject = ranksService.GetRankOrder("Private"); subject.Should().Be(0); } @@ -34,7 +34,7 @@ public void ShouldGetCorrectIndex() { public void ShouldReturnInvalidIndexGetIndexWhenRankNotFound() { mockRanksDataService.Setup(x => x.Get()).Returns(new List()); - int subject = ranksService.GetRankIndex("Private"); + int subject = ranksService.GetRankOrder("Private"); subject.Should().Be(-1); } From bd075ef49eb35976aa7cab004b18ca334926ed7c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 17 Oct 2020 16:13:33 +0100 Subject: [PATCH 271/369] Fix tests and rank order null --- UKSF.Api.Models/Personnel/Rank.cs | 2 +- UKSF.Api.Services/Personnel/RanksService.cs | 2 +- UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/UKSF.Api.Models/Personnel/Rank.cs b/UKSF.Api.Models/Personnel/Rank.cs index ea68f500..2cc65605 100644 --- a/UKSF.Api.Models/Personnel/Rank.cs +++ b/UKSF.Api.Models/Personnel/Rank.cs @@ -3,7 +3,7 @@ public class Rank : DatabaseObject { public string abbreviation; public string discordRoleId; public string name; - public int order = 0; + public int order; public string teamspeakGroup; } } diff --git a/UKSF.Api.Services/Personnel/RanksService.cs b/UKSF.Api.Services/Personnel/RanksService.cs index f0d60d82..44631969 100644 --- a/UKSF.Api.Services/Personnel/RanksService.cs +++ b/UKSF.Api.Services/Personnel/RanksService.cs @@ -9,7 +9,7 @@ public class RanksService : DataBackedService, IRanksService public RanksService(IRanksDataService data) : base(data) { } - public int GetRankOrder(string rankName) => Data.GetSingle(rankName).order; + public int GetRankOrder(string rankName) => Data.GetSingle(rankName)?.order ?? -1; public int Sort(string nameA, string nameB) { Rank rankA = Data.GetSingle(nameA); diff --git a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs index 1f89a042..8df1dc52 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs @@ -24,6 +24,7 @@ public void ShouldGetCorrectIndex() { List mockCollection = new List {rank1, rank2}; mockRanksDataService.Setup(x => x.Get()).Returns(mockCollection); + mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(rank1); int subject = ranksService.GetRankOrder("Private"); @@ -35,6 +36,7 @@ public void ShouldReturnInvalidIndexGetIndexWhenRankNotFound() { mockRanksDataService.Setup(x => x.Get()).Returns(new List()); int subject = ranksService.GetRankOrder("Private"); + mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(null); subject.Should().Be(-1); } From d756465e14546e9b354a6e7f9f6192402fdbb663 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 19 Oct 2020 19:18:04 +0100 Subject: [PATCH 272/369] Fix issues in teamspeak group service - Add tests for teamspeak group service - Add variables service as interface to replace all static usages --- .../Admin/IVariablesService.cs | 8 + .../Game/IGameServerHelpers.cs | 23 ++ .../Teamspeak/ITeamspeakManagerService.cs | 1 + .../Modpack/BuildProcess/Steps/IBuildStep.cs | 11 +- .../UKSF.Api.Interfaces.csproj | 4 - .../Integrations/TeamspeakGroupProcedure.cs | 6 + UKSF.Api.Models/Mission/MissionPatchData.cs | 2 + UKSF.Api.Models/UKSF.Api.Models.csproj | 3 - UKSF.Api.Models/Units/Unit.cs | 1 - UKSF.Api.Services/Admin/MigrationUtility.cs | 12 +- UKSF.Api.Services/Admin/VariablesService.cs | 60 +---- UKSF.Api.Services/Admin/VariablesWrapper.cs | 11 - .../Command/ChainOfCommandService.cs | 12 +- UKSF.Api.Services/Fake/FakeDiscordService.cs | 16 +- .../Fake/FakeTeamspeakManagerService.cs | 2 + UKSF.Api.Services/Game/GameServerHelpers.cs | 89 +++---- UKSF.Api.Services/Game/GameServersService.cs | 38 +-- .../Game/Missions/MissionDataResolver.cs | 10 +- .../Game/Missions/MissionPatchDataService.cs | 16 +- .../Game/Missions/MissionPatchingService.cs | 11 +- .../Game/Missions/MissionService.cs | 11 +- .../Integrations/DiscordService.cs | 14 +- .../Integrations/InstagramService.cs | 13 +- .../Teamspeak/TeamspeakGroupService.cs | 87 ++++--- .../Teamspeak/TeamspeakManagerService.cs | 17 +- .../Launcher/LauncherFileService.cs | 17 +- .../BuildProcess/BuildProcessorService.cs | 13 +- .../Modpack/BuildProcess/Steps/BuildStep.cs | 25 +- .../Steps/BuildSteps/BuildStepExtensions.cs | 6 +- .../Steps/BuildSteps/BuildStepPrep.cs | 4 +- .../BuildSteps/BuildStepSignDependencies.cs | 6 +- .../Steps/Common/BuildStepBuildRepo.cs | 4 +- .../Steps/Common/BuildStepNotify.cs | 5 +- .../BuildProcess/Steps/ModBuildStep.cs | 4 +- UKSF.Api.Services/Personnel/LoginService.cs | 12 +- .../Personnel/RecruitmentService.cs | 8 +- UKSF.Api.Services/Units/UnitsService.cs | 1 + .../Services/RegisterDataBackedServices.cs | 3 + .../AppStart/Services/ServiceExtensions.cs | 1 + .../CommandRequestsController.cs | 7 +- UKSF.Api/Controllers/DischargesController.cs | 7 +- .../DiscordConnectionController.cs | 8 +- UKSF.Api/Controllers/GameServersController.cs | 14 +- UKSF.Api/Controllers/LauncherController.cs | 17 +- UKSF.Api/Controllers/UnitsController.cs | 15 +- UKSF.Api/Controllers/VersionController.cs | 6 +- UKSF.Common/ChangeUtilities.cs | 6 +- UKSF.Common/UKSF.Common.csproj | 4 + UKSF.Common/VariablesExtensions.cs | 67 ++++++ .../Unit/Common/ChangeUtilitiesTests.cs | 6 +- .../Services/Admin/VariablesServiceTests.cs | 13 ++ .../Teamspeak/TeamspeakGroupServiceTests.cs | 217 ++++++++++++++++++ 52 files changed, 690 insertions(+), 284 deletions(-) create mode 100644 UKSF.Api.Interfaces/Admin/IVariablesService.cs create mode 100644 UKSF.Api.Interfaces/Game/IGameServerHelpers.cs create mode 100644 UKSF.Api.Models/Integrations/TeamspeakGroupProcedure.cs delete mode 100644 UKSF.Api.Services/Admin/VariablesWrapper.cs create mode 100644 UKSF.Common/VariablesExtensions.cs create mode 100644 UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs diff --git a/UKSF.Api.Interfaces/Admin/IVariablesService.cs b/UKSF.Api.Interfaces/Admin/IVariablesService.cs new file mode 100644 index 00000000..a198508d --- /dev/null +++ b/UKSF.Api.Interfaces/Admin/IVariablesService.cs @@ -0,0 +1,8 @@ +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Models.Admin; + +namespace UKSF.Api.Interfaces.Admin { + public interface IVariablesService : IDataBackedService { + VariableItem GetVariable(string key); + } +} diff --git a/UKSF.Api.Interfaces/Game/IGameServerHelpers.cs b/UKSF.Api.Interfaces/Game/IGameServerHelpers.cs new file mode 100644 index 00000000..3e5548e4 --- /dev/null +++ b/UKSF.Api.Interfaces/Game/IGameServerHelpers.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using UKSF.Api.Models.Game; + +namespace UKSF.Api.Interfaces.Game { + public interface IGameServerHelpers { + string GetGameServerExecutablePath(GameServer gameServer); + string GetGameServerSettingsPath(); + string GetGameServerMissionsPath(); + string GetGameServerConfigPath(GameServer gameServer); + string GetGameServerModsPaths(GameEnvironment environment); + IEnumerable GetGameServerExtraModsPaths(); + string FormatGameServerConfig(GameServer gameServer, int playerCount, string missionSelection); + string FormatGameServerLaunchArguments(GameServer gameServer); + string FormatHeadlessClientLaunchArguments(GameServer gameServer, int index); + string GetMaxPlayerCountFromConfig(GameServer gameServer); + int GetMaxCuratorCountFromSettings(); + TimeSpan StripMilliseconds(TimeSpan time); + IEnumerable GetArmaProcesses(); + bool IsMainOpTime(); + } +} diff --git a/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs index 77f0e62b..8d0e29e6 100644 --- a/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs +++ b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs @@ -5,6 +5,7 @@ namespace UKSF.Api.Interfaces.Integrations.Teamspeak { public interface ITeamspeakManagerService { void Start(); void Stop(); + Task SendGroupProcedure(TeamspeakProcedureType procedure, TeamspeakGroupProcedure groupProcedure); Task SendProcedure(TeamspeakProcedureType procedure, object args); } } diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs index c6d207d9..2b51b76f 100644 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs +++ b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs @@ -2,11 +2,20 @@ using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Models.Modpack; namespace UKSF.Api.Interfaces.Modpack.BuildProcess.Steps { public interface IBuildStep { - void Init(ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func, Task> buildUpdateCallback, Func stepUpdateCallback, CancellationTokenSource cancellationTokenSource); + void Init( + ModpackBuild modpackBuild, + ModpackBuildStep modpackBuildStep, + Func, Task> buildUpdateCallback, + Func stepUpdateCallback, + CancellationTokenSource cancellationTokenSource, + IVariablesService variablesService + ); + Task Start(); bool CheckGuards(); Task Setup(); diff --git a/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj b/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj index f8c80c69..31acc653 100644 --- a/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj +++ b/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj @@ -18,8 +18,4 @@ - - - - diff --git a/UKSF.Api.Models/Integrations/TeamspeakGroupProcedure.cs b/UKSF.Api.Models/Integrations/TeamspeakGroupProcedure.cs new file mode 100644 index 00000000..79cdc0bb --- /dev/null +++ b/UKSF.Api.Models/Integrations/TeamspeakGroupProcedure.cs @@ -0,0 +1,6 @@ +namespace UKSF.Api.Models.Integrations { + public class TeamspeakGroupProcedure { + public double clientDbId; + public double serverGroup; + } +} diff --git a/UKSF.Api.Models/Mission/MissionPatchData.cs b/UKSF.Api.Models/Mission/MissionPatchData.cs index 67cdcc98..d8695f95 100644 --- a/UKSF.Api.Models/Mission/MissionPatchData.cs +++ b/UKSF.Api.Models/Mission/MissionPatchData.cs @@ -8,5 +8,7 @@ public class MissionPatchData { public List players; public List ranks; public List units; + public IEnumerable medicIds; + public IEnumerable engineerIds; } } diff --git a/UKSF.Api.Models/UKSF.Api.Models.csproj b/UKSF.Api.Models/UKSF.Api.Models.csproj index 2f5ec9c9..f5be9d9a 100644 --- a/UKSF.Api.Models/UKSF.Api.Models.csproj +++ b/UKSF.Api.Models/UKSF.Api.Models.csproj @@ -15,7 +15,4 @@ - - - diff --git a/UKSF.Api.Models/Units/Unit.cs b/UKSF.Api.Models/Units/Unit.cs index 80f02114..24bf51b4 100644 --- a/UKSF.Api.Models/Units/Unit.cs +++ b/UKSF.Api.Models/Units/Unit.cs @@ -27,7 +27,6 @@ public enum UnitBranch { public class ResponseUnit : Unit { public string code; - public string parentId; public string parentName; public IEnumerable unitMembers; } diff --git a/UKSF.Api.Services/Admin/MigrationUtility.cs b/UKSF.Api.Services/Admin/MigrationUtility.cs index 87b79684..215a82fc 100644 --- a/UKSF.Api.Services/Admin/MigrationUtility.cs +++ b/UKSF.Api.Services/Admin/MigrationUtility.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using MongoDB.Driver; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Events; @@ -17,18 +18,23 @@ using UKSF.Api.Models.Utility; using UKSF.Api.Services.Common; using UKSF.Api.Services.Message; +using UKSF.Common; namespace UKSF.Api.Services.Admin { public class MigrationUtility { private const string KEY = "MIGRATED"; private readonly IHostEnvironment currentEnvironment; + private readonly IVariablesService variablesService; - public MigrationUtility(IHostEnvironment currentEnvironment) => this.currentEnvironment = currentEnvironment; + public MigrationUtility(IHostEnvironment currentEnvironment, IVariablesService variablesService) { + this.currentEnvironment = currentEnvironment; + this.variablesService = variablesService; + } public void Migrate() { bool migrated = true; if (!currentEnvironment.IsDevelopment()) { - string migratedString = VariablesWrapper.VariablesDataService().GetSingle(KEY).AsString(); + string migratedString = variablesService.GetVariable(KEY).AsString(); migrated = bool.Parse(migratedString); } @@ -40,7 +46,7 @@ public void Migrate() { } catch (Exception e) { LogWrapper.Log(e); } finally { - VariablesWrapper.VariablesDataService().Update(KEY, "true"); + variablesService.Data.Update(KEY, "true"); } } } diff --git a/UKSF.Api.Services/Admin/VariablesService.cs b/UKSF.Api.Services/Admin/VariablesService.cs index eb3f89fc..448415b5 100644 --- a/UKSF.Api.Services/Admin/VariablesService.cs +++ b/UKSF.Api.Services/Admin/VariablesService.cs @@ -1,61 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.RegularExpressions; +using UKSF.Api.Interfaces.Admin; +using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Models.Admin; -using UKSF.Common; namespace UKSF.Api.Services.Admin { - public static class VariablesService { - public static VariableItem AssertHasItem(this VariableItem variableItem) { - if (variableItem.item == null) { - throw new Exception($"Variable {variableItem.key} has no item"); - } + public class VariablesService : DataBackedService, IVariablesService { + public VariablesService(IVariablesDataService data) : base(data) { } - return variableItem; - } - - public static string AsString(this VariableItem variable) => variable.AssertHasItem().item.ToString(); - - public static double AsDouble(this VariableItem variable) { - string item = variable.AsString(); - if (!double.TryParse(item, out double output)) { - throw new InvalidCastException($"Variable item {item} cannot be converted to a double"); - } - - return output; - } - - public static bool AsBool(this VariableItem variable) { - string item = variable.AsString(); - if (!bool.TryParse(item, out bool output)) { - throw new InvalidCastException($"Variable item {item} cannot be converted to a bool"); - } - - return output; - } - - public static ulong AsUlong(this VariableItem variable) { - string item = variable.AsString(); - if (!ulong.TryParse(item, out ulong output)) { - throw new InvalidCastException($"Variable item {item} cannot be converted to a ulong"); - } - - return output; - } - - public static string[] AsArray(this VariableItem variable, Func predicate = null) { - string itemString = variable.AsString(); - itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); - string[] items = itemString.Split(","); - return predicate != null ? items.Select(predicate).ToArray() : items; - } - - public static IEnumerable AsDoublesArray(this VariableItem variable) { - string itemString = variable.AsString(); - itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); - IEnumerable items = itemString.Split(",").Select(x => x.ToDouble()); - return items; - } + public VariableItem GetVariable(string key) => Data.GetSingle(key); } } diff --git a/UKSF.Api.Services/Admin/VariablesWrapper.cs b/UKSF.Api.Services/Admin/VariablesWrapper.cs deleted file mode 100644 index f47a0c12..00000000 --- a/UKSF.Api.Services/Admin/VariablesWrapper.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Diagnostics.CodeAnalysis; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Services.Common; - -namespace UKSF.Api.Services.Admin { - [ExcludeFromCodeCoverage] - public static class VariablesWrapper { - public static IVariablesDataService VariablesDataService() => ServiceWrapper.Provider.GetService(); - } -} diff --git a/UKSF.Api.Services/Command/ChainOfCommandService.cs b/UKSF.Api.Services/Command/ChainOfCommandService.cs index b1ed8a51..02552415 100644 --- a/UKSF.Api.Services/Command/ChainOfCommandService.cs +++ b/UKSF.Api.Services/Command/ChainOfCommandService.cs @@ -32,17 +32,17 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U chain.CleanHashset(); } - // If no chain, get root unit child commanders + // If no chain, get root unit commander if (chain.Count == 0) { - foreach (Unit unit in unitsService.Data.Get(x => x.parent == unitsService.GetRoot().id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) { - chain.Add(GetCommander(unit)); - } + chain.Add(GetCommander(unitsService.GetRoot())); chain.CleanHashset(); } - // If no chain, get root unit commander + // If no chain, get root unit child commanders if (chain.Count == 0) { - chain.Add(GetCommander(unitsService.GetRoot())); + foreach (Unit unit in unitsService.Data.Get(x => x.parent == unitsService.GetRoot().id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) { + chain.Add(GetCommander(unit)); + } chain.CleanHashset(); } diff --git a/UKSF.Api.Services/Fake/FakeDiscordService.cs b/UKSF.Api.Services/Fake/FakeDiscordService.cs index d3e84079..d1857b13 100644 --- a/UKSF.Api.Services/Fake/FakeDiscordService.cs +++ b/UKSF.Api.Services/Fake/FakeDiscordService.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Microsoft.Extensions.Configuration; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; using UKSF.Api.Models.Personnel; @@ -7,13 +8,14 @@ namespace UKSF.Api.Services.Fake { public class FakeDiscordService : DiscordService { - public FakeDiscordService(IConfiguration configuration, IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService) : base( - configuration, - ranksService, - unitsService, - accountService, - displayNameService - ) { } + public FakeDiscordService( + IConfiguration configuration, + IRanksService ranksService, + IUnitsService unitsService, + IAccountService accountService, + IDisplayNameService displayNameService, + IVariablesService variablesService + ) : base(configuration, ranksService, unitsService, accountService, displayNameService, variablesService) { } public override Task SendMessageToEveryone(ulong channelId, string message) => Task.CompletedTask; diff --git a/UKSF.Api.Services/Fake/FakeTeamspeakManagerService.cs b/UKSF.Api.Services/Fake/FakeTeamspeakManagerService.cs index f92228f9..7213e887 100644 --- a/UKSF.Api.Services/Fake/FakeTeamspeakManagerService.cs +++ b/UKSF.Api.Services/Fake/FakeTeamspeakManagerService.cs @@ -8,6 +8,8 @@ public void Start() { } public void Stop() { } + public Task SendGroupProcedure(TeamspeakProcedureType procedure, TeamspeakGroupProcedure groupProcedure) => Task.CompletedTask; + public Task SendProcedure(TeamspeakProcedureType procedure, object args) => Task.CompletedTask; } } diff --git a/UKSF.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.Services/Game/GameServerHelpers.cs index e30a29a4..ccf1580c 100644 --- a/UKSF.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.Services/Game/GameServerHelpers.cs @@ -3,13 +3,14 @@ using System.Diagnostics; using System.IO; using System.Linq; +using UKSF.Api.Interfaces.Admin; +using UKSF.Api.Interfaces.Game; using UKSF.Api.Models.Game; -using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; using UKSF.Common; namespace UKSF.Api.Services.Game { - public static class GameServerHelpers { + public class GameServerHelpers : IGameServerHelpers { private static readonly string[] BASE_CONFIG = { "hostname = \"{0}\";", "password = \"{1}\";", @@ -53,77 +54,68 @@ public static class GameServerHelpers { "}};" }; - public static string GetGameServerExecutablePath(this GameServer gameServer) { + private readonly IVariablesService variablesService; + + public GameServerHelpers(IVariablesService variablesService) => this.variablesService = variablesService; + + public string GetGameServerExecutablePath(GameServer gameServer) { string variableKey = gameServer.environment switch { GameEnvironment.RELEASE => "SERVER_PATH_RELEASE", - GameEnvironment.RC => "SERVER_PATH_RC", - GameEnvironment.DEV => "SERVER_PATH_DEV", - _ => throw new ArgumentException("Server environment is invalid") + GameEnvironment.RC => "SERVER_PATH_RC", + GameEnvironment.DEV => "SERVER_PATH_DEV", + _ => throw new ArgumentException("Server environment is invalid") }; - return Path.Join(VariablesWrapper.VariablesDataService().GetSingle(variableKey).AsString(), "arma3server_x64.exe"); + return Path.Join(variablesService.GetVariable(variableKey).AsString(), "arma3server_x64.exe"); } - public static string GetGameServerSettingsPath() => Path.Join(VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_RELEASE").AsString(), "userconfig", "cba_settings.sqf"); - - public static string GetGameServerMissionsPath() => VariablesWrapper.VariablesDataService().GetSingle("MISSIONS_PATH").AsString(); - - public static string GetGameServerConfigPath(this GameServer gameServer) => - Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_CONFIGS").AsString(), $"{gameServer.profileName}.cfg"); + public string GetGameServerSettingsPath() => Path.Join(variablesService.GetVariable("SERVER_PATH_RELEASE").AsString(), "userconfig", "cba_settings.sqf"); - private static string GetGameServerProfilesPath() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_PROFILES").AsString(); - - private static string GetGameServerPerfConfigPath() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_PERF").AsString(); - - private static string GetHeadlessClientName(int index) => VariablesWrapper.VariablesDataService().GetSingle("SERVER_HEADLESS_NAMES").AsArray()[index]; - - private static string FormatGameServerMods(this GameServer gameServer) => - gameServer.mods.Count > 0 ? $"{string.Join(";", gameServer.mods.Select(x => x.pathRelativeToServerExecutable ?? x.path))};" : string.Empty; + public string GetGameServerMissionsPath() => variablesService.GetVariable("MISSIONS_PATH").AsString(); - private static string FormatGameServerServerMods(this GameServer gameServer) => - gameServer.serverMods.Count > 0 ? $"{string.Join(";", gameServer.serverMods.Select(x => x.name))};" : string.Empty; + public string GetGameServerConfigPath(GameServer gameServer) => Path.Combine(variablesService.GetVariable("SERVER_PATH_CONFIGS").AsString(), $"{gameServer.profileName}.cfg"); - public static string GetGameServerModsPaths(GameEnvironment environment) { + public string GetGameServerModsPaths(GameEnvironment environment) { string variableKey = environment switch { GameEnvironment.RELEASE => "MODPACK_PATH_RELEASE", - GameEnvironment.RC => "MODPACK_PATH_RC", - GameEnvironment.DEV => "MODPACK_PATH_DEV", - _ => throw new ArgumentException("Server environment is invalid") + GameEnvironment.RC => "MODPACK_PATH_RC", + GameEnvironment.DEV => "MODPACK_PATH_DEV", + _ => throw new ArgumentException("Server environment is invalid") }; - return Path.Join(VariablesWrapper.VariablesDataService().GetSingle(variableKey).AsString(), "Repo"); + return Path.Join(variablesService.GetVariable(variableKey).AsString(), "Repo"); } - public static IEnumerable GetGameServerExtraModsPaths() => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_MODS").AsArray(x => x.RemoveQuotes()); + public IEnumerable GetGameServerExtraModsPaths() => variablesService.GetVariable("SERVER_PATH_MODS").AsArray(x => x.RemoveQuotes()); - public static string FormatGameServerConfig(this GameServer gameServer, int playerCount, string missionSelection) => + public string FormatGameServerConfig(GameServer gameServer, int playerCount, string missionSelection) => string.Format(string.Join("\n", BASE_CONFIG), gameServer.hostName, gameServer.password, gameServer.adminPassword, playerCount, missionSelection.Replace(".pbo", "")); - public static string FormatGameServerLaunchArguments(this GameServer gameServer) => - $"-config={gameServer.GetGameServerConfigPath()}" + + public string FormatGameServerLaunchArguments(GameServer gameServer) => + $"-config={GetGameServerConfigPath(gameServer)}" + $" -profiles={GetGameServerProfilesPath()}" + $" -cfg={GetGameServerPerfConfigPath()}" + $" -name={gameServer.name}" + $" -port={gameServer.port}" + $" -apiport=\"{gameServer.apiPort}\"" + - $" {(string.IsNullOrEmpty(gameServer.FormatGameServerServerMods()) ? "" : $"\"-serverMod={gameServer.FormatGameServerServerMods()}\"")}" + - $" {(string.IsNullOrEmpty(gameServer.FormatGameServerMods()) ? "" : $"\"-mod={gameServer.FormatGameServerMods()}\"")}" + + $" {(string.IsNullOrEmpty(FormatGameServerServerMods(gameServer)) ? "" : $"\"-serverMod={FormatGameServerServerMods(gameServer)}\"")}" + + $" {(string.IsNullOrEmpty(FormatGameServerMods(gameServer)) ? "" : $"\"-mod={FormatGameServerMods(gameServer)}\"")}" + " -bandwidthAlg=2 -hugepages -loadMissionToMemory -filePatching -limitFPS=200"; - public static string FormatHeadlessClientLaunchArguments(this GameServer gameServer, int index) => + public string FormatHeadlessClientLaunchArguments(GameServer gameServer, int index) => $"-profiles={GetGameServerProfilesPath()}" + $" -name={GetHeadlessClientName(index)}" + $" -port={gameServer.port}" + $" -apiport=\"{gameServer.apiPort + index + 1}\"" + - $" {(string.IsNullOrEmpty(gameServer.FormatGameServerMods()) ? "" : $"\"-mod={gameServer.FormatGameServerMods()}\"")}" + + $" {(string.IsNullOrEmpty(FormatGameServerMods(gameServer)) ? "" : $"\"-mod={FormatGameServerMods(gameServer)}\"")}" + $" -password={gameServer.password}" + " -localhost=127.0.0.1 -connect=localhost -client -hugepages -filePatching -limitFPS=200"; - public static string GetMaxPlayerCountFromConfig(this GameServer gameServer) { - string maxPlayers = File.ReadAllLines(gameServer.GetGameServerConfigPath()).First(x => x.Contains("maxPlayers")); + public string GetMaxPlayerCountFromConfig(GameServer gameServer) { + string maxPlayers = File.ReadAllLines(GetGameServerConfigPath(gameServer)).First(x => x.Contains("maxPlayers")); maxPlayers = maxPlayers.RemoveSpaces().Replace(";", ""); return maxPlayers.Split("=")[1]; } - public static int GetMaxCuratorCountFromSettings() { + public int GetMaxCuratorCountFromSettings() { string[] lines = File.ReadAllLines(GetGameServerSettingsPath()); string curatorsMaxString = lines.FirstOrDefault(x => x.Contains("uksf_curator_curatorsMax")); if (string.IsNullOrEmpty(curatorsMaxString)) { @@ -135,15 +127,24 @@ public static int GetMaxCuratorCountFromSettings() { return int.Parse(curatorsMaxString); } - public static TimeSpan StripMilliseconds(this TimeSpan time) => new TimeSpan(time.Hours, time.Minutes, time.Seconds); + public TimeSpan StripMilliseconds(TimeSpan time) => new TimeSpan(time.Hours, time.Minutes, time.Seconds); - public static IEnumerable GetArmaProcesses() => Process.GetProcesses().Where(x => x.ProcessName.StartsWith("arma3")); + public IEnumerable GetArmaProcesses() => Process.GetProcesses().Where(x => x.ProcessName.StartsWith("arma3")); - public static bool IsMainOpTime() { + public bool IsMainOpTime() { DateTime now = DateTime.UtcNow; return now.DayOfWeek == DayOfWeek.Saturday && now.Hour >= 19 && now.Minute >= 30; } + + private string FormatGameServerMods(GameServer gameServer) => + gameServer.mods.Count > 0 ? $"{string.Join(";", gameServer.mods.Select(x => x.pathRelativeToServerExecutable ?? x.path))};" : string.Empty; + + private string FormatGameServerServerMods(GameServer gameServer) => gameServer.serverMods.Count > 0 ? $"{string.Join(";", gameServer.serverMods.Select(x => x.name))};" : string.Empty; + + private string GetGameServerProfilesPath() => variablesService.GetVariable("SERVER_PATH_PROFILES").AsString(); + + private string GetGameServerPerfConfigPath() => variablesService.GetVariable("SERVER_PATH_PERF").AsString(); + + private string GetHeadlessClientName(int index) => variablesService.GetVariable("SERVER_HEADLESS_NAMES").AsArray()[index]; } } - -// $" {(GetGameServerExecutablePath().Contains("server") ? "" : "-server")}" + diff --git a/UKSF.Api.Services/Game/GameServersService.cs b/UKSF.Api.Services/Game/GameServersService.cs index 221b3999..e56e4f8f 100644 --- a/UKSF.Api.Services/Game/GameServersService.cs +++ b/UKSF.Api.Services/Game/GameServersService.cs @@ -16,21 +16,25 @@ namespace UKSF.Api.Services.Game { public class GameServersService : DataBackedService, IGameServersService { + private readonly IGameServerHelpers gameServerHelpers; private readonly IMissionPatchingService missionPatchingService; - public GameServersService(IGameServersDataService data, IMissionPatchingService missionPatchingService) : base(data) => this.missionPatchingService = missionPatchingService; + public GameServersService(IGameServersDataService data, IMissionPatchingService missionPatchingService, IGameServerHelpers gameServerHelpers) : base(data) { + this.missionPatchingService = missionPatchingService; + this.gameServerHelpers = gameServerHelpers; + } - public int GetGameInstanceCount() => GameServerHelpers.GetArmaProcesses().Count(); + public int GetGameInstanceCount() => gameServerHelpers.GetArmaProcesses().Count(); public async Task UploadMissionFile(IFormFile file) { string fileName = ContentDispositionHeaderValue.Parse(file.ContentDisposition).FileName.Trim('"'); - string filePath = Path.Combine(GameServerHelpers.GetGameServerMissionsPath(), fileName); + string filePath = Path.Combine(gameServerHelpers.GetGameServerMissionsPath(), fileName); await using FileStream stream = new FileStream(filePath, FileMode.Create); await file.CopyToAsync(stream); } public List GetMissionFiles() { - IEnumerable files = new DirectoryInfo(GameServerHelpers.GetGameServerMissionsPath()).EnumerateFiles("*.pbo", SearchOption.TopDirectoryOnly); + IEnumerable files = new DirectoryInfo(gameServerHelpers.GetGameServerMissionsPath()).EnumerateFiles("*.pbo", SearchOption.TopDirectoryOnly); return files.Select(fileInfo => new MissionFile(fileInfo)).OrderBy(x => x.map).ThenBy(x => x.name).ToList(); } @@ -52,8 +56,8 @@ public async Task GetGameServerStatus(GameServer gameServer) { string content = await response.Content.ReadAsStringAsync(); gameServer.status = JsonConvert.DeserializeObject(content); - gameServer.status.parsedUptime = TimeSpan.FromSeconds(gameServer.status.uptime).StripMilliseconds().ToString(); - gameServer.status.maxPlayers = gameServer.GetMaxPlayerCountFromConfig(); + gameServer.status.parsedUptime = gameServerHelpers.StripMilliseconds(TimeSpan.FromSeconds(gameServer.status.uptime)).ToString(); + gameServer.status.maxPlayers = gameServerHelpers.GetMaxPlayerCountFromConfig(gameServer); gameServer.status.running = true; gameServer.status.started = false; } catch (Exception) { @@ -75,25 +79,25 @@ public async Task PatchMissionFile(string missionName) { // }; // } - string missionPath = Path.Combine(GameServerHelpers.GetGameServerMissionsPath(), missionName); + string missionPath = Path.Combine(gameServerHelpers.GetGameServerMissionsPath(), missionName); MissionPatchingResult result = await missionPatchingService.PatchMission(missionPath); return result; } public void WriteServerConfig(GameServer gameServer, int playerCount, string missionSelection) => - File.WriteAllText(gameServer.GetGameServerConfigPath(), gameServer.FormatGameServerConfig(playerCount, missionSelection)); + File.WriteAllText(gameServerHelpers.GetGameServerConfigPath(gameServer), gameServerHelpers.FormatGameServerConfig(gameServer, playerCount, missionSelection)); public async Task LaunchGameServer(GameServer gameServer) { - string launchArguments = gameServer.FormatGameServerLaunchArguments(); - gameServer.processId = ProcessUtilities.LaunchManagedProcess(gameServer.GetGameServerExecutablePath(), launchArguments); + string launchArguments = gameServerHelpers.FormatGameServerLaunchArguments(gameServer); + gameServer.processId = ProcessUtilities.LaunchManagedProcess(gameServerHelpers.GetGameServerExecutablePath(gameServer), launchArguments); await Task.Delay(TimeSpan.FromSeconds(1)); // launch headless clients if (gameServer.numberHeadlessClients > 0) { for (int index = 0; index < gameServer.numberHeadlessClients; index++) { - launchArguments = gameServer.FormatHeadlessClientLaunchArguments(index); - gameServer.headlessClientProcessIds.Add(ProcessUtilities.LaunchManagedProcess(gameServer.GetGameServerExecutablePath(), launchArguments)); + launchArguments = gameServerHelpers.FormatHeadlessClientLaunchArguments(gameServer, index); + gameServer.headlessClientProcessIds.Add(ProcessUtilities.LaunchManagedProcess(gameServerHelpers.GetGameServerExecutablePath(gameServer), launchArguments)); await Task.Delay(TimeSpan.FromSeconds(1)); } @@ -146,7 +150,7 @@ public void KillGameServer(GameServer gameServer) { } public int KillAllArmaProcesses() { - List processes = GameServerHelpers.GetArmaProcesses().ToList(); + List processes = gameServerHelpers.GetArmaProcesses().ToList(); foreach (Process process in processes) { process.Kill(); } @@ -164,10 +168,10 @@ public int KillAllArmaProcesses() { public List GetAvailableMods(string id) { GameServer gameServer = Data.GetSingle(id); - Uri serverExecutable = new Uri(gameServer.GetGameServerExecutablePath()); + Uri serverExecutable = new Uri(gameServerHelpers.GetGameServerExecutablePath(gameServer)); List mods = new List(); - IEnumerable availableModsFolders = new[] { GameServerHelpers.GetGameServerModsPaths(gameServer.environment) }; - IEnumerable extraModsFolders = GameServerHelpers.GetGameServerExtraModsPaths(); + IEnumerable availableModsFolders = new[] { gameServerHelpers.GetGameServerModsPaths(gameServer.environment) }; + IEnumerable extraModsFolders = gameServerHelpers.GetGameServerExtraModsPaths(); availableModsFolders = availableModsFolders.Concat(extraModsFolders); foreach (string modsPath in availableModsFolders) { IEnumerable modFolders = new DirectoryInfo(modsPath).EnumerateDirectories("@*", SearchOption.TopDirectoryOnly); @@ -201,7 +205,7 @@ public List GetAvailableMods(string id) { } public List GetEnvironmentMods(GameEnvironment environment) { - string repoModsFolder = GameServerHelpers.GetGameServerModsPaths(environment); + string repoModsFolder = gameServerHelpers.GetGameServerModsPaths(environment); IEnumerable modFolders = new DirectoryInfo(repoModsFolder).EnumerateDirectories("@*", SearchOption.TopDirectoryOnly); return modFolders.Select(modFolder => new { modFolder, modFiles = new DirectoryInfo(modFolder.FullName).EnumerateFiles("*.pbo", SearchOption.AllDirectories) }) .Where(x => x.modFiles.Any()) diff --git a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs index 718d9a0c..c1d6dd7a 100644 --- a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs +++ b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Models.Mission; -using UKSF.Api.Services.Admin; namespace UKSF.Api.Services.Game.Missions { public static class MissionDataResolver { @@ -54,14 +53,9 @@ private static int ResolvePlayerUnitRole(MissionPlayer player) { return -1; } - private static bool IsMedic(MissionPlayer player) => IsSpecialist(player, "MISSIONS_MEDIC_IDS"); + private static bool IsMedic(MissionPlayer player) => MissionPatchData.instance.medicIds.Contains(player.account?.id); - public static bool IsEngineer(MissionPlayer player) => IsSpecialist(player, "MISSIONS_ENGINEER_IDS"); - - private static bool IsSpecialist(MissionPlayer player, string idsVariableName) { - string[] ids = VariablesWrapper.VariablesDataService().GetSingle(idsVariableName).AsArray(); - return ids.Contains(player.account?.id); - } + public static bool IsEngineer(MissionPlayer player) => MissionPatchData.instance.engineerIds.Contains(player.account?.id); public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) { return unit.sourceUnit.id switch { diff --git a/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs b/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs index b24095f9..d1023189 100644 --- a/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs @@ -1,35 +1,43 @@ using System.Collections.Generic; using System.Linq; using MongoDB.Bson; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; using UKSF.Api.Models.Mission; using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Units; +using UKSF.Common; namespace UKSF.Api.Services.Game.Missions { public class MissionPatchDataService { private readonly IAccountService accountService; private readonly IDisplayNameService displayNameService; + private readonly IVariablesService variablesService; private readonly IRanksService ranksService; private readonly IUnitsService unitsService; - public MissionPatchDataService(IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService) { + public MissionPatchDataService(IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService, IVariablesService variablesService) { this.ranksService = ranksService; this.unitsService = unitsService; this.accountService = accountService; this.displayNameService = displayNameService; + this.variablesService = variablesService; } public void UpdatePatchData() { - MissionPatchData.instance = new MissionPatchData {units = new List(), ranks = ranksService.Data.Get().ToList(), players = new List(), orderedUnits = new List()}; + MissionPatchData.instance = new MissionPatchData { + units = new List(), ranks = ranksService.Data.Get().ToList(), players = new List(), orderedUnits = new List(), + medicIds = variablesService.GetVariable("MISSIONS_MEDIC_IDS").AsEnumerable(), + engineerIds = variablesService.GetVariable("MISSIONS_ENGINEER_IDS").AsEnumerable() + }; foreach (Unit unit in unitsService.Data.Get(x => x.branch == UnitBranch.COMBAT).ToList()) { - MissionPatchData.instance.units.Add(new MissionUnit {sourceUnit = unit, depth = unitsService.GetUnitDepth(unit)}); + MissionPatchData.instance.units.Add(new MissionUnit { sourceUnit = unit, depth = unitsService.GetUnitDepth(unit) }); } foreach (Account account in accountService.Data.Get().Where(x => !string.IsNullOrEmpty(x.rank) && ranksService.IsSuperiorOrEqual(x.rank, "Recruit"))) { - MissionPatchData.instance.players.Add(new MissionPlayer {account = account, rank = ranksService.Data.GetSingle(account.rank), name = displayNameService.GetDisplayName(account)}); + MissionPatchData.instance.players.Add(new MissionPlayer { account = account, rank = ranksService.Data.GetSingle(account.rank), name = displayNameService.GetDisplayName(account) }); } foreach (MissionUnit missionUnit in MissionPatchData.instance.units) { diff --git a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs index ec0092c1..f351b0f1 100644 --- a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Game; using UKSF.Api.Models.Mission; using UKSF.Api.Services.Admin; @@ -17,12 +18,16 @@ public class MissionPatchingService : IMissionPatchingService { private const string MAKE_PBO = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\MakePbo.exe"; private readonly MissionService missionService; + private readonly IVariablesService variablesService; private string filePath; private string folderPath; private string parentFolderPath; - public MissionPatchingService(MissionService missionService) => this.missionService = missionService; + public MissionPatchingService(MissionService missionService, IVariablesService variablesService) { + this.missionService = missionService; + this.variablesService = variablesService; + } public Task PatchMission(string path) { return Task.Run( @@ -53,7 +58,7 @@ public Task PatchMission(string path) { } private void CreateBackup() { - string backupPath = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("MISSIONS_BACKUPS").AsString(), Path.GetFileName(filePath) ?? throw new FileNotFoundException()); + string backupPath = Path.Combine(variablesService.GetVariable("MISSIONS_BACKUPS").AsString(), Path.GetFileName(filePath) ?? throw new FileNotFoundException()); Directory.CreateDirectory(Path.GetDirectoryName(backupPath) ?? throw new DirectoryNotFoundException()); File.Copy(filePath, backupPath, true); @@ -89,7 +94,7 @@ private async Task PackPbo() { Process process = new Process { StartInfo = { FileName = MAKE_PBO, - WorkingDirectory = VariablesWrapper.VariablesDataService().GetSingle("MISSIONS_WORKING_DIR").AsString(), + WorkingDirectory = variablesService.GetVariable("MISSIONS_WORKING_DIR").AsString(), Arguments = $"-Z -BD -P -X=\"thumbs.db,*.txt,*.h,*.dep,*.cpp,*.bak,*.png,*.log,*.pew\" \"{folderPath}\"", UseShellExecute = false, CreateNoWindow = true, diff --git a/UKSF.Api.Services/Game/Missions/MissionService.cs b/UKSF.Api.Services/Game/Missions/MissionService.cs index f440b720..afa50434 100644 --- a/UKSF.Api.Services/Game/Missions/MissionService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionService.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.IO; using System.Linq; +using UKSF.Api.Interfaces.Game; using UKSF.Api.Models.Game; using UKSF.Api.Models.Mission; using UKSF.Common; @@ -12,11 +13,15 @@ public class MissionService { private const string UNBIN = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\DeRapDos.exe"; private readonly MissionPatchDataService missionPatchDataService; + private readonly IGameServerHelpers gameServerHelpers; private Mission mission; private List reports; - public MissionService(MissionPatchDataService missionPatchDataService) => this.missionPatchDataService = missionPatchDataService; + public MissionService(MissionPatchDataService missionPatchDataService, IGameServerHelpers gameServerHelpers) { + this.missionPatchDataService = missionPatchDataService; + this.gameServerHelpers = gameServerHelpers; + } public List ProcessMission(Mission tempMission) { mission = tempMission; @@ -136,7 +141,7 @@ private void ReadSettings() { mission.maxCurators = 5; string curatorsMaxLine = File.ReadAllLines(Path.Combine(mission.path, "cba_settings.sqf")).FirstOrDefault(x => x.Contains("uksf_curator_curatorsMax")); if (string.IsNullOrEmpty(curatorsMaxLine)) { - mission.maxCurators = GameServerHelpers.GetMaxCuratorCountFromSettings(); + mission.maxCurators = gameServerHelpers.GetMaxCuratorCountFromSettings(); reports.Add( new MissionPatchingReport( "Using server setting 'uksf_curator_curatorsMax'", @@ -166,7 +171,7 @@ private void Patch() { if (!CheckIgnoreKey("missionImageIgnore")) { string imagePath = Path.Combine(mission.path, "uksf.paa"); - string modpackImagePath = Path.Combine(GameServerHelpers.GetGameServerModsPaths(GameEnvironment.RELEASE), "@uksf", "UKSFTemplate.VR", "uksf.paa"); + string modpackImagePath = Path.Combine(gameServerHelpers.GetGameServerModsPaths(GameEnvironment.RELEASE), "@uksf", "UKSFTemplate.VR", "uksf.paa"); if (File.Exists(modpackImagePath)) { if (File.Exists(imagePath) && new FileInfo(imagePath).Length != new FileInfo(modpackImagePath).Length) { reports.Add( diff --git a/UKSF.Api.Services/Integrations/DiscordService.cs b/UKSF.Api.Services/Integrations/DiscordService.cs index ced4435c..894208f5 100644 --- a/UKSF.Api.Services/Integrations/DiscordService.cs +++ b/UKSF.Api.Services/Integrations/DiscordService.cs @@ -5,6 +5,7 @@ using Discord; using Discord.WebSocket; using Microsoft.Extensions.Configuration; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; @@ -12,6 +13,7 @@ using UKSF.Api.Models.Units; using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; +using UKSF.Common; namespace UKSF.Api.Services.Integrations { public class DiscordService : IDiscordService, IDisposable { @@ -21,6 +23,7 @@ public class DiscordService : IDiscordService, IDisposable { private readonly IAccountService accountService; private readonly IConfiguration configuration; private readonly IDisplayNameService displayNameService; + private readonly IVariablesService variablesService; private readonly IRanksService ranksService; private readonly ulong specialUser; private readonly IUnitsService unitsService; @@ -29,13 +32,14 @@ public class DiscordService : IDiscordService, IDisposable { private SocketGuild guild; private IReadOnlyCollection roles; - public DiscordService(IConfiguration configuration, IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService) { + public DiscordService(IConfiguration configuration, IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService, IVariablesService variablesService) { this.configuration = configuration; this.ranksService = ranksService; this.unitsService = unitsService; this.accountService = accountService; this.displayNameService = displayNameService; - specialUser = VariablesWrapper.VariablesDataService().GetSingle("DID_U_OWNER").AsUlong(); + this.variablesService = variablesService; + specialUser = variablesService.GetVariable("DID_U_OWNER").AsUlong(); } public async Task ConnectDiscord() { @@ -92,7 +96,7 @@ public virtual async Task UpdateAccount(Account account, ulong discordId = 0) { } if (discordId == 0) return; - if (VariablesWrapper.VariablesDataService().GetSingle("DID_U_BLACKLIST").AsArray().Contains(discordId.ToString())) return; + if (variablesService.GetVariable("DID_U_BLACKLIST").AsArray().Contains(discordId.ToString())) return; SocketGuildUser user = guild.GetUser(discordId); if (user == null) return; @@ -129,7 +133,7 @@ private async Task UpdateAccountRoles(SocketGuildUser user, Account account) { UpdateAccountUnits(account, allowedRoles); } - string[] rolesBlacklist = VariablesWrapper.VariablesDataService().GetSingle("DID_R_BLACKLIST").AsArray(); + string[] rolesBlacklist = variablesService.GetVariable("DID_R_BLACKLIST").AsArray(); foreach (SocketRole role in userRoles) { if (!allowedRoles.Contains(role.Id.ToString()) && !rolesBlacklist.Contains(role.Id.ToString())) { await user.RemoveRoleAsync(role); @@ -203,7 +207,7 @@ private async Task ClientOnMessageReceived(SocketMessage incomingMessage) { } private Task OnClientOnReady() { - guild = client.GetGuild(VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()); + guild = client.GetGuild(variablesService.GetVariable("DID_SERVER").AsUlong()); roles = guild.Roles; connected = true; return null; diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs index 9f11e524..78737aa5 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -5,19 +5,22 @@ using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Models.Integrations; -using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; using UKSF.Common; namespace UKSF.Api.Services.Integrations { public class InstagramService : IInstagramService { + private readonly IVariablesService variablesService; private List images = new List(); + public InstagramService(IVariablesService variablesService) => this.variablesService = variablesService; + public async Task RefreshAccessToken() { try { - string accessToken = VariablesWrapper.VariablesDataService().GetSingle("INSTAGRAM_ACCESS_TOKEN").AsString(); + string accessToken = variablesService.GetVariable("INSTAGRAM_ACCESS_TOKEN").AsString(); using HttpClient client = new HttpClient(); HttpResponseMessage response = await client.GetAsync($"https://graph.instagram.com/refresh_access_token?access_token={accessToken}&grant_type=ig_refresh_token"); @@ -35,7 +38,7 @@ public async Task RefreshAccessToken() { return; } - await VariablesWrapper.VariablesDataService().Update("INSTAGRAM_ACCESS_TOKEN", newAccessToken); + await variablesService.Data.Update("INSTAGRAM_ACCESS_TOKEN", newAccessToken); LogWrapper.Log("Updated Instagram access token"); } catch (Exception exception) { LogWrapper.Log(exception); @@ -44,8 +47,8 @@ public async Task RefreshAccessToken() { public async Task CacheInstagramImages() { try { - string userId = VariablesWrapper.VariablesDataService().GetSingle("INSTAGRAM_USER_ID").AsString(); - string accessToken = VariablesWrapper.VariablesDataService().GetSingle("INSTAGRAM_ACCESS_TOKEN").AsString(); + string userId = variablesService.GetVariable("INSTAGRAM_USER_ID").AsString(); + string accessToken = variablesService.GetVariable("INSTAGRAM_ACCESS_TOKEN").AsString(); using HttpClient client = new HttpClient(); HttpResponseMessage response = await client.GetAsync($"https://graph.instagram.com/{userId}/media?access_token={accessToken}&fields=id,timestamp,media_type,media_url,permalink"); diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs index 2ae12aa7..bba3e476 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs @@ -1,84 +1,103 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using MongoDB.Bson; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Integrations.Teamspeak; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; +using UKSF.Api.Models; using UKSF.Api.Models.Integrations; using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Units; -using UKSF.Api.Services.Admin; using UKSF.Common; namespace UKSF.Api.Services.Integrations.Teamspeak { public class TeamspeakGroupService : ITeamspeakGroupService { private readonly IRanksService ranksService; - private readonly IUnitsService unitsService; private readonly ITeamspeakManagerService teamspeakManagerService; + private readonly IUnitsService unitsService; + private readonly IVariablesService variablesService; - public TeamspeakGroupService(IRanksService ranksService, IUnitsService unitsService, ITeamspeakManagerService teamspeakManagerService) { + public TeamspeakGroupService(IRanksService ranksService, IUnitsService unitsService, ITeamspeakManagerService teamspeakManagerService, IVariablesService variablesService) { this.ranksService = ranksService; this.unitsService = unitsService; this.teamspeakManagerService = teamspeakManagerService; + this.variablesService = variablesService; } public async Task UpdateAccountGroups(Account account, ICollection serverGroups, double clientDbId) { - HashSet allowedGroups = new HashSet(); - - if (account == null || account.membershipState == MembershipState.UNCONFIRMED) { - allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_UNVERIFIED").AsDouble()); - } + HashSet memberGroups = new HashSet(); - if (account?.membershipState == MembershipState.DISCHARGED) { - allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_DISCHARGED").AsDouble()); - } - - if (account != null) { - UpdateRank(account, allowedGroups); - UpdateUnits(account, allowedGroups); + if (account == null) { + memberGroups.Add(variablesService.GetVariable("TEAMSPEAK_GID_UNVERIFIED").AsDouble()); + } else { + switch (account.membershipState) { + case MembershipState.UNCONFIRMED: + memberGroups.Add(variablesService.GetVariable("TEAMSPEAK_GID_UNVERIFIED").AsDouble()); + break; + case MembershipState.DISCHARGED: + memberGroups.Add(variablesService.GetVariable("TEAMSPEAK_GID_DISCHARGED").AsDouble()); + break; + case MembershipState.MEMBER: + ResolveRankGroup(account, memberGroups); + ResolveParentUnitGroup(account, memberGroups); + ResolveUnitGroup(account, memberGroups); + ResolveAuxiliaryUnitGroups(account, memberGroups); + memberGroups.Add(variablesService.GetVariable("TEAMSPEAK_GID_ROOT").AsDouble()); + break; + } } - List groupsBlacklist = VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_BLACKLIST").AsDoublesArray().ToList(); + List groupsBlacklist = variablesService.GetVariable("TEAMSPEAK_GID_BLACKLIST").AsDoublesArray().ToList(); foreach (double serverGroup in serverGroups) { - if (!allowedGroups.Contains(serverGroup) && !groupsBlacklist.Contains(serverGroup)) { + if (!memberGroups.Contains(serverGroup) && !groupsBlacklist.Contains(serverGroup)) { await RemoveServerGroup(clientDbId, serverGroup); } } - foreach (double serverGroup in allowedGroups.Where(serverGroup => !serverGroups.Contains(serverGroup))) { + foreach (double serverGroup in memberGroups.Where(serverGroup => !serverGroups.Contains(serverGroup))) { await AddServerGroup(clientDbId, serverGroup); } } - private void UpdateRank(Account account, ISet allowedGroups) { - string rank = account.rank; - foreach (Rank x in ranksService.Data.Get().Where(x => rank == x.name)) { - allowedGroups.Add(x.teamspeakGroup.ToDouble()); - } + private void ResolveRankGroup(Account account, ISet memberGroups) { + memberGroups.Add(ranksService.Data.GetSingle(account.rank).teamspeakGroup.ToDouble()); } - private void UpdateUnits(Account account, ISet allowedGroups) { + private void ResolveParentUnitGroup(Account account, ISet memberGroups) { Unit accountUnit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); - List accountUnits = unitsService.Data.Get(x => x.members.Contains(account.id)).Where(x => !string.IsNullOrEmpty(x.teamspeakGroup)).ToList(); - List accountUnitParents = unitsService.GetParents(accountUnit).Where(x => !string.IsNullOrEmpty(x.teamspeakGroup)).ToList(); + Unit parentUnit = unitsService.GetParents(accountUnit).Skip(1).FirstOrDefault(x => !string.IsNullOrEmpty(x.teamspeakGroup)); + if (parentUnit != null) { + memberGroups.Add(parentUnit.teamspeakGroup.ToDouble()); + } + } + private void ResolveUnitGroup(Account account, ISet memberGroups) { + Unit accountUnit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); Unit elcom = unitsService.GetAuxilliaryRoot(); - if (elcom.members.Contains(account.id)) { - accountUnits.Remove(accountUnits.Find(x => x.branch == UnitBranch.COMBAT)); - accountUnitParents = accountUnitParents.TakeLast(2).ToList(); - allowedGroups.Add(VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_GID_ELCOM").AsDouble()); + + if (accountUnit.parent == ObjectId.Empty.ToString()) { + memberGroups.Add(accountUnit.teamspeakGroup.ToDouble()); } - accountUnits.ForEach(x => allowedGroups.Add(x.teamspeakGroup.ToDouble())); - accountUnitParents.ForEach(x => allowedGroups.Add(x.teamspeakGroup.ToDouble())); + memberGroups.Add(elcom.members.Contains(account.id) ? variablesService.GetVariable("TEAMSPEAK_GID_ELCOM").AsDouble() : accountUnit.teamspeakGroup.ToDouble()); + } + + private void ResolveAuxiliaryUnitGroups(DatabaseObject account, ISet memberGroups) { + IEnumerable accountUnits = unitsService.Data.Get(x => x.parent != ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY && x.members.Contains(account.id)) + .Where(x => !string.IsNullOrEmpty(x.teamspeakGroup)); + foreach (Unit unit in accountUnits) { + memberGroups.Add(unit.teamspeakGroup.ToDouble()); + } } private async Task AddServerGroup(double clientDbId, double serverGroup) { - await teamspeakManagerService.SendProcedure(TeamspeakProcedureType.ASSIGN, new {clientDbId, serverGroup}); + await teamspeakManagerService.SendGroupProcedure(TeamspeakProcedureType.ASSIGN, new TeamspeakGroupProcedure { clientDbId = clientDbId, serverGroup = serverGroup }); } private async Task RemoveServerGroup(double clientDbId, double serverGroup) { - await teamspeakManagerService.SendProcedure(TeamspeakProcedureType.UNASSIGN, new {clientDbId, serverGroup}); + await teamspeakManagerService.SendGroupProcedure(TeamspeakProcedureType.UNASSIGN, new TeamspeakGroupProcedure { clientDbId = clientDbId, serverGroup = serverGroup }); } } } diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs index d718d157..98516152 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs @@ -4,6 +4,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Integrations.Teamspeak; using UKSF.Api.Models.Integrations; @@ -14,10 +15,14 @@ namespace UKSF.Api.Services.Integrations.Teamspeak { public class TeamspeakManagerService : ITeamspeakManagerService { private readonly IHubContext hub; + private readonly IVariablesService variablesService; private bool runTeamspeak; private CancellationTokenSource token; - public TeamspeakManagerService(IHubContext hub) => this.hub = hub; + public TeamspeakManagerService(IHubContext hub, IVariablesService variablesService) { + this.hub = hub; + this.variablesService = variablesService; + } public void Start() { runTeamspeak = true; @@ -32,6 +37,10 @@ public void Stop() { ShutTeamspeak().Wait(); } + public async Task SendGroupProcedure(TeamspeakProcedureType procedure, TeamspeakGroupProcedure groupProcedure) { + await hub.Clients.All.Receive(procedure, groupProcedure); + } + public async Task SendProcedure(TeamspeakProcedureType procedure, object args) { await hub.Clients.All.Receive(procedure, args); } @@ -39,7 +48,7 @@ public async Task SendProcedure(TeamspeakProcedureType procedure, object args) { private async void KeepOnline() { await TaskUtilities.Delay(TimeSpan.FromSeconds(5), token.Token); while (runTeamspeak) { - if (VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_RUN").AsBool()) { + if (variablesService.GetVariable("TEAMSPEAK_RUN").AsBool()) { if (!TeamspeakHubState.Connected) { if (Process.GetProcessesByName("ts3client_win64").Length == 0) { await LaunchTeamspeak(); @@ -54,8 +63,8 @@ private async void KeepOnline() { } } - private static async Task LaunchTeamspeak() { - await ProcessUtilities.LaunchExternalProcess("Teamspeak", $"start \"\" \"{VariablesWrapper.VariablesDataService().GetSingle("TEAMSPEAK_PATH").AsString()}\""); + private async Task LaunchTeamspeak() { + await ProcessUtilities.LaunchExternalProcess("Teamspeak", $"start \"\" \"{variablesService.GetVariable("TEAMSPEAK_PATH").AsString()}\""); } private async Task ShutTeamspeak() { diff --git a/UKSF.Api.Services/Launcher/LauncherFileService.cs b/UKSF.Api.Services/Launcher/LauncherFileService.cs index 14520102..d122e54d 100644 --- a/UKSF.Api.Services/Launcher/LauncherFileService.cs +++ b/UKSF.Api.Services/Launcher/LauncherFileService.cs @@ -8,18 +8,23 @@ using Microsoft.AspNetCore.Mvc; using MimeMapping; using MongoDB.Driver; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Launcher; using UKSF.Api.Models.Launcher; using UKSF.Api.Services.Admin; +using UKSF.Common; namespace UKSF.Api.Services.Launcher { public class LauncherFileService : DataBackedService, ILauncherFileService { - public LauncherFileService(ILauncherFileDataService data) : base(data) { } + private readonly IVariablesService variablesService; + public LauncherFileService(ILauncherFileDataService data, IVariablesService variablesService) : base(data) { + this.variablesService = variablesService; + } public async Task UpdateAllVersions() { List storedVersions = Data.Get().ToList(); - string launcherDirectory = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("LAUNCHER_LOCATION").AsString(), "Launcher"); + string launcherDirectory = Path.Combine(variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), "Launcher"); List fileNames = new List(); foreach (string filePath in Directory.EnumerateFiles(launcherDirectory)) { string fileName = Path.GetFileName(filePath); @@ -42,14 +47,14 @@ public async Task UpdateAllVersions() { } public FileStreamResult GetLauncherFile(params string[] file) { - string[] paths = file.Prepend(VariablesWrapper.VariablesDataService().GetSingle("LAUNCHER_LOCATION").AsString()).ToArray(); + string[] paths = file.Prepend(variablesService.GetVariable("LAUNCHER_LOCATION").AsString()).ToArray(); string path = Path.Combine(paths); FileStreamResult fileStreamResult = new FileStreamResult(new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read), MimeUtility.GetMimeMapping(path)); return fileStreamResult; } public async Task GetUpdatedFiles(IEnumerable files) { - string launcherDirectory = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("LAUNCHER_LOCATION").AsString(), "Launcher"); + string launcherDirectory = Path.Combine(variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), "Launcher"); List storedVersions = Data.Get().ToList(); List updatedFiles = new List(); List deletedFiles = new List(); @@ -66,7 +71,7 @@ public async Task GetUpdatedFiles(IEnumerable files) { } string updateFolderName = Guid.NewGuid().ToString("N"); - string updateFolder = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("LAUNCHER_LOCATION").AsString(), updateFolderName); + string updateFolder = Path.Combine(variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), updateFolderName); Directory.CreateDirectory(updateFolder); string deletedFilesPath = Path.Combine(updateFolder, "deleted"); @@ -76,7 +81,7 @@ public async Task GetUpdatedFiles(IEnumerable files) { File.Copy(Path.Combine(launcherDirectory, file), Path.Combine(updateFolder, file), true); } - string updateZipPath = Path.Combine(VariablesWrapper.VariablesDataService().GetSingle("LAUNCHER_LOCATION").AsString(), $"{updateFolderName}.zip"); + string updateZipPath = Path.Combine(variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), $"{updateFolderName}.zip"); ZipFile.CreateFromDirectory(updateFolder, updateZipPath); MemoryStream stream = new MemoryStream(); await using (FileStream fileStream = new FileStream(updateZipPath, FileMode.Open, FileAccess.Read, FileShare.None)) { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs index 2f75b754..b5ab2c10 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs @@ -1,6 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; @@ -14,10 +15,12 @@ namespace UKSF.Api.Services.Modpack.BuildProcess { public class BuildProcessorService : IBuildProcessorService { private readonly IBuildsService buildsService; private readonly IBuildStepService buildStepService; + private readonly IVariablesService variablesService; - public BuildProcessorService(IBuildStepService buildStepService, IBuildsService buildsService) { + public BuildProcessorService(IBuildStepService buildStepService, IBuildsService buildsService, IVariablesService variablesService) { this.buildStepService = buildStepService; this.buildsService = buildsService; + this.variablesService = variablesService; } public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cancellationTokenSource) { @@ -30,7 +33,8 @@ public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cance buildStep, async updateDefinition => await buildsService.UpdateBuild(build, updateDefinition), async () => await buildsService.UpdateBuildStep(build, buildStep), - cancellationTokenSource + cancellationTokenSource, + variablesService ); if (cancellationTokenSource.IsCancellationRequested) { @@ -74,7 +78,7 @@ private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) { ModpackBuildStep restoreStep = buildStepService.GetRestoreStepForRelease(); if (restoreStep == null) { - LogWrapper.Log($"Won't restore. Restore step not found"); + LogWrapper.Log("Won't restore. Restore step not found"); return; } @@ -85,7 +89,8 @@ private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) { restoreStep, async updateDefinition => await buildsService.UpdateBuild(build, updateDefinition), async () => await buildsService.UpdateBuildStep(build, restoreStep), - new CancellationTokenSource() + new CancellationTokenSource(), + variablesService ); build.steps.Add(restoreStep); await buildsService.UpdateBuildStep(build, restoreStep); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs index 915bd19d..e1b31832 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs @@ -3,11 +3,13 @@ using System.Threading.Tasks; using MongoDB.Driver; using Newtonsoft.Json; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; using UKSF.Api.Models.Game; using UKSF.Api.Models.Modpack; using UKSF.Api.Services.Admin; +using UKSF.Common; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class BuildStep : IBuildStep { @@ -21,14 +23,17 @@ public class BuildStep : IBuildStep { protected IStepLogger Logger; private Func, Task> updateBuildCallback; private Func updateStepCallback; + protected IVariablesService VariablesService; public void Init( ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func, Task> buildUpdateCallback, Func stepUpdateCallback, - CancellationTokenSource newCancellationTokenSource + CancellationTokenSource newCancellationTokenSource, + IVariablesService newVariablesService ) { + VariablesService = newVariablesService; Build = modpackBuild; buildStep = modpackBuildStep; updateBuildCallback = buildUpdateCallback; @@ -106,19 +111,19 @@ protected virtual Task ProcessExecute() { internal string GetBuildEnvironmentPath() => GetEnvironmentPath(Build.environment); - internal static string GetEnvironmentPath(GameEnvironment environment) => + internal string GetEnvironmentPath(GameEnvironment environment) => environment switch { - GameEnvironment.RELEASE => VariablesWrapper.VariablesDataService().GetSingle("MODPACK_PATH_RELEASE").AsString(), - GameEnvironment.RC => VariablesWrapper.VariablesDataService().GetSingle("MODPACK_PATH_RC").AsString(), - GameEnvironment.DEV => VariablesWrapper.VariablesDataService().GetSingle("MODPACK_PATH_DEV").AsString(), + GameEnvironment.RELEASE => VariablesService.GetVariable("MODPACK_PATH_RELEASE").AsString(), + GameEnvironment.RC => VariablesService.GetVariable("MODPACK_PATH_RC").AsString(), + GameEnvironment.DEV => VariablesService.GetVariable("MODPACK_PATH_DEV").AsString(), _ => throw new ArgumentException("Invalid build environment") }; - internal static string GetServerEnvironmentPath(GameEnvironment environment) => + internal string GetServerEnvironmentPath(GameEnvironment environment) => environment switch { - GameEnvironment.RELEASE => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_RELEASE").AsString(), - GameEnvironment.RC => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_RC").AsString(), - GameEnvironment.DEV => VariablesWrapper.VariablesDataService().GetSingle("SERVER_PATH_DEV").AsString(), + GameEnvironment.RELEASE => VariablesService.GetVariable("SERVER_PATH_RELEASE").AsString(), + GameEnvironment.RC => VariablesService.GetVariable("SERVER_PATH_RC").AsString(), + GameEnvironment.DEV => VariablesService.GetVariable("SERVER_PATH_DEV").AsString(), _ => throw new ArgumentException("Invalid build environment") }; @@ -130,7 +135,7 @@ internal string GetEnvironmentRepoName() => _ => throw new ArgumentException("Invalid build environment") }; - internal static string GetBuildSourcesPath() => VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_SOURCES").AsString(); + internal string GetBuildSourcesPath() => VariablesService.GetVariable("BUILD_PATH_SOURCES").AsString(); internal void SetEnvironmentVariable(string key, object value) { if (Build.environmentVariables.ContainsKey(key)) { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs index 1d78656a..79d8f430 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using UKSF.Api.Services.Admin; +using UKSF.Common; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] @@ -24,8 +24,8 @@ protected override async Task ProcessExecute() { } private async Task SignExtensions(IReadOnlyCollection files) { - string certPath = Path.Join(VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_CERTS").AsString(), "UKSFCert.pfx"); - string signTool = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_SIGNTOOL").AsString(); + string certPath = Path.Join(VariablesService.GetVariable("BUILD_PATH_CERTS").AsString(), "UKSFCert.pfx"); + string signTool = VariablesService.GetVariable("BUILD_PATH_SIGNTOOL").AsString(); int signed = 0; int total = files.Count; await BatchProcessFiles( diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs index a127aac8..8cbf0876 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using UKSF.Api.Services.Admin; +using UKSF.Common; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] @@ -10,7 +10,7 @@ public class BuildStepPrep : BuildStep { protected override Task ProcessExecute() { Logger.Log("Mounting build environment"); - string projectsPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_PROJECTS").AsString(); + string projectsPath = VariablesService.GetVariable("BUILD_PATH_PROJECTS").AsString(); BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, raiseErrors: false); processHelper.Run("C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\"\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs index 9d763858..f3146275 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs @@ -4,7 +4,7 @@ using System.Threading; using System.Threading.Tasks; using UKSF.Api.Models.Game; -using UKSF.Api.Services.Admin; +using UKSF.Common; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] @@ -15,8 +15,8 @@ public class BuildStepSignDependencies : FileBuildStep { private string keyName; protected override async Task SetupExecute() { - dsSignFile = Path.Join(VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_DSSIGN").AsString(), "DSSignFile.exe"); - dsCreateKey = Path.Join(VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_DSSIGN").AsString(), "DSCreateKey.exe"); + dsSignFile = Path.Join(VariablesService.GetVariable("BUILD_PATH_DSSIGN").AsString(), "DSSignFile.exe"); + dsCreateKey = Path.Join(VariablesService.GetVariable("BUILD_PATH_DSSIGN").AsString(), "DSCreateKey.exe"); keyName = GetKeyname(); string keygenPath = Path.Join(GetBuildEnvironmentPath(), "PrivateKeys"); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs index 563f2cd8..e80fe9ef 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using UKSF.Api.Services.Admin; +using UKSF.Common; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { [BuildStep(NAME)] @@ -11,7 +11,7 @@ protected override Task ProcessExecute() { string repoName = GetEnvironmentRepoName(); Logger.Log($"Building {repoName} repo"); - string arma3SyncPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_ARMA3SYNC").AsString(); + string arma3SyncPath = VariablesService.GetVariable("BUILD_PATH_ARMA3SYNC").AsString(); BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource); processHelper.Run(arma3SyncPath, "Java", $"-jar .\\ArmA3Sync.jar -BUILD {repoName}", (int) TimeSpan.FromMinutes(5).TotalMilliseconds); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs index 0e02b724..0d50226f 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs @@ -7,6 +7,7 @@ using UKSF.Api.Models.Modpack; using UKSF.Api.Services.Admin; using UKSF.Api.Services.Common; +using UKSF.Common; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { [BuildStep(NAME)] @@ -26,11 +27,11 @@ protected override async Task ProcessExecute() { switch (Build.environment) { case GameEnvironment.RELEASE: { ModpackRelease release = releaseService.GetRelease(Build.version); - await discordService.SendMessageToEveryone(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_RELEASE").AsUlong(), GetDiscordMessage(release)); + await discordService.SendMessageToEveryone(VariablesService.GetVariable("DID_C_MODPACK_RELEASE").AsUlong(), GetDiscordMessage(release)); break; } case GameEnvironment.RC: - await discordService.SendMessage(VariablesWrapper.VariablesDataService().GetSingle("DID_C_MODPACK_DEV").AsUlong(), GetDiscordMessage()); + await discordService.SendMessage(VariablesService.GetVariable("DID_C_MODPACK_DEV").AsUlong(), GetDiscordMessage()); break; case GameEnvironment.DEV: break; default: throw new ArgumentOutOfRangeException(); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs index 8b35a061..c5c110dd 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs @@ -1,12 +1,12 @@ using System.Threading.Tasks; -using UKSF.Api.Services.Admin; +using UKSF.Common; namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { public class ModBuildStep : FileBuildStep { protected string PythonPath; protected override Task SetupExecute() { - PythonPath = VariablesWrapper.VariablesDataService().GetSingle("BUILD_PATH_PYTHON").AsString(); + PythonPath = VariablesService.GetVariable("BUILD_PATH_PYTHON").AsString(); Logger.Log("Retrieved python path"); return Task.CompletedTask; } diff --git a/UKSF.Api.Services/Personnel/LoginService.cs b/UKSF.Api.Services/Personnel/LoginService.cs index 98a45c6a..836fd244 100644 --- a/UKSF.Api.Services/Personnel/LoginService.cs +++ b/UKSF.Api.Services/Personnel/LoginService.cs @@ -5,11 +5,13 @@ using System.Security.Claims; using Microsoft.IdentityModel.Tokens; using Newtonsoft.Json; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Personnel; using UKSF.Api.Services.Admin; +using UKSF.Common; namespace UKSF.Api.Services.Personnel { public class LoginService : ILoginService { @@ -18,14 +20,16 @@ public class LoginService : ILoginService { private readonly string[] admins = {"59e38f10594c603b78aa9dbd", "5a1e894463d0f71710089106", "5a1ae0f0b9bcb113a44edada"}; private readonly IRanksService ranksService; private readonly IRecruitmentService recruitmentService; + private readonly IVariablesService variablesService; private readonly IUnitsService unitsService; private bool isPasswordReset; - public LoginService(IAccountService accountService, IRanksService ranksService, IUnitsService unitsService, IRecruitmentService recruitmentService) { + public LoginService(IAccountService accountService, IRanksService ranksService, IUnitsService unitsService, IRecruitmentService recruitmentService, IVariablesService variablesService) { this.accountService = accountService; this.ranksService = ranksService; this.unitsService = unitsService; this.recruitmentService = recruitmentService; + this.variablesService = variablesService; isPasswordReset = false; } @@ -92,17 +96,17 @@ private void ResolveRoles(ICollection claims, Account account) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.RECRUITER)); } - string personnelId = VariablesWrapper.VariablesDataService().GetSingle("UNIT_ID_PERSONNEL").AsString(); + string personnelId = variablesService.GetVariable("UNIT_ID_PERSONNEL").AsString(); if (admin || unitsService.Data.GetSingle(personnelId).members.Contains(account.id)) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.PERSONNEL)); } - string[] missionsId = VariablesWrapper.VariablesDataService().GetSingle("UNIT_ID_MISSIONS").AsArray(); + string[] missionsId = variablesService.GetVariable("UNIT_ID_MISSIONS").AsArray(); if (admin || unitsService.Data.GetSingle(x => missionsId.Contains(x.id)).members.Contains(account.id)) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SERVERS)); } - string testersId = VariablesWrapper.VariablesDataService().GetSingle("UNIT_ID_TESTERS").AsString(); + string testersId = variablesService.GetVariable("UNIT_ID_TESTERS").AsString(); if (admin || unitsService.Data.GetSingle(testersId).members.Contains(account.id)) { claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.TESTER)); } diff --git a/UKSF.Api.Services/Personnel/RecruitmentService.cs b/UKSF.Api.Services/Personnel/RecruitmentService.cs index 77b39216..1353e201 100644 --- a/UKSF.Api.Services/Personnel/RecruitmentService.cs +++ b/UKSF.Api.Services/Personnel/RecruitmentService.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using MongoDB.Driver; using Newtonsoft.Json.Linq; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Integrations.Teamspeak; using UKSF.Api.Interfaces.Personnel; @@ -24,6 +25,7 @@ public class RecruitmentService : IRecruitmentService { private readonly ISessionService sessionService; private readonly ITeamspeakService teamspeakService; private readonly IUnitsService unitsService; + private readonly IVariablesService variablesService; public RecruitmentService( ITeamspeakMetricsService metricsService, @@ -33,7 +35,8 @@ public RecruitmentService( IDiscordService discordService, IRanksService ranksService, ITeamspeakService teamspeakService, - IUnitsService unitsService + IUnitsService unitsService, + IVariablesService variablesService ) { this.accountService = accountService; this.sessionService = sessionService; @@ -42,6 +45,7 @@ IUnitsService unitsService this.ranksService = ranksService; this.teamspeakService = teamspeakService; this.unitsService = unitsService; + this.variablesService = variablesService; this.discordService = discordService; } @@ -151,7 +155,7 @@ public string GetRecruiter() { } private Unit GetRecruiterUnit() { - string id = VariablesWrapper.VariablesDataService().GetSingle("UNIT_ID_RECRUITMENT").AsString(); + string id = variablesService.GetVariable("UNIT_ID_RECRUITMENT").AsString(); return unitsService.Data.GetSingle(id); } diff --git a/UKSF.Api.Services/Units/UnitsService.cs b/UKSF.Api.Services/Units/UnitsService.cs index d407cf03..d881620f 100644 --- a/UKSF.Api.Services/Units/UnitsService.cs +++ b/UKSF.Api.Services/Units/UnitsService.cs @@ -115,6 +115,7 @@ public Unit GetParent(Unit unit) { return unit.parent != string.Empty ? Data.GetSingle(x => x.id == unit.parent) : null; } + // TODO: Change this to not add the child unit to the return public IEnumerable GetParents(Unit unit) { if (unit == null) return new List(); List parentUnits = new List(); diff --git a/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs b/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs index 300b92ba..261deecf 100644 --- a/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Command; using UKSF.Api.Interfaces.Game; using UKSF.Api.Interfaces.Launcher; @@ -9,6 +10,7 @@ using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Services.Admin; using UKSF.Api.Services.Command; using UKSF.Api.Services.Fake; using UKSF.Api.Services.Game; @@ -43,6 +45,7 @@ public static void RegisterDataBackedServices(this IServiceCollection services, services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); if (currentEnvironment.IsDevelopment()) { services.AddTransient(); diff --git a/UKSF.Api/AppStart/Services/ServiceExtensions.cs b/UKSF.Api/AppStart/Services/ServiceExtensions.cs index cbe09571..6f616667 100644 --- a/UKSF.Api/AppStart/Services/ServiceExtensions.cs +++ b/UKSF.Api/AppStart/Services/ServiceExtensions.cs @@ -81,6 +81,7 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs index e20f9fe1..3c26d557 100644 --- a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs +++ b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Command; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Message; @@ -19,6 +20,7 @@ using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; +using UKSF.Common; namespace UKSF.Api.Controllers.CommandRequests { [Route("[controller]"), Roles(RoleDefinitions.COMMAND)] @@ -30,6 +32,7 @@ public class CommandRequestsController : Controller { private readonly ISessionService sessionService; private readonly IUnitsService unitsService; private readonly IVariablesDataService variablesDataService; + private readonly IVariablesService variablesService; public CommandRequestsController( ICommandRequestService commandRequestService, @@ -38,7 +41,8 @@ public CommandRequestsController( IUnitsService unitsService, IDisplayNameService displayNameService, INotificationsService notificationsService, - IVariablesDataService variablesDataService + IVariablesDataService variablesDataService, + IVariablesService variablesService ) { this.commandRequestService = commandRequestService; this.commandRequestCompletionService = commandRequestCompletionService; @@ -47,6 +51,7 @@ IVariablesDataService variablesDataService this.displayNameService = displayNameService; this.notificationsService = notificationsService; this.variablesDataService = variablesDataService; + this.variablesService = variablesService; } [HttpGet, Authorize] diff --git a/UKSF.Api/Controllers/DischargesController.cs b/UKSF.Api/Controllers/DischargesController.cs index 57b24e7f..0c7c5a33 100644 --- a/UKSF.Api/Controllers/DischargesController.cs +++ b/UKSF.Api/Controllers/DischargesController.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Command; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Message; @@ -15,6 +16,7 @@ using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; +using UKSF.Common; namespace UKSF.Api.Controllers { [Route("[controller]"), Roles(RoleDefinitions.PERSONNEL, RoleDefinitions.NCO, RoleDefinitions.RECRUITER)] @@ -27,6 +29,7 @@ public class DischargesController : Controller { private readonly ISessionService sessionService; private readonly IUnitsService unitsService; private readonly IVariablesDataService variablesDataService; + private readonly IVariablesService variablesService; public DischargesController( IAccountService accountService, @@ -36,7 +39,8 @@ public DischargesController( INotificationsService notificationsService, ISessionService sessionService, IUnitsService unitsService, - IVariablesDataService variablesDataService + IVariablesDataService variablesDataService, + IVariablesService variablesService ) { this.accountService = accountService; this.assignmentService = assignmentService; @@ -46,6 +50,7 @@ IVariablesDataService variablesDataService this.sessionService = sessionService; this.unitsService = unitsService; this.variablesDataService = variablesDataService; + this.variablesService = variablesService; } [HttpGet] diff --git a/UKSF.Api/Controllers/DiscordConnectionController.cs b/UKSF.Api/Controllers/DiscordConnectionController.cs index ed59d454..83bf5e9b 100644 --- a/UKSF.Api/Controllers/DiscordConnectionController.cs +++ b/UKSF.Api/Controllers/DiscordConnectionController.cs @@ -8,9 +8,11 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Newtonsoft.Json.Linq; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; +using UKSF.Common; namespace UKSF.Api.Controllers { [Route("[controller]")] @@ -20,11 +22,13 @@ public class DiscordConnectionController : Controller { private readonly string clientSecret; private readonly IConfirmationCodeService confirmationCodeService; + private readonly IVariablesService variablesService; private readonly string url; private readonly string urlReturn; - public DiscordConnectionController(IConfirmationCodeService confirmationCodeService, IConfiguration configuration, IHostEnvironment currentEnvironment) { + public DiscordConnectionController(IConfirmationCodeService confirmationCodeService, IConfiguration configuration, IHostEnvironment currentEnvironment, IVariablesService variablesService) { this.confirmationCodeService = confirmationCodeService; + this.variablesService = variablesService; clientId = configuration.GetSection("Discord")["clientId"]; clientSecret = configuration.GetSection("Discord")["clientSecret"]; botToken = configuration.GetSection("Discord")["botToken"]; @@ -91,7 +95,7 @@ private async Task GetUrlParameters(string code, string redirectUrl) { client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bot", botToken); response = await client.PutAsync( - $"https://discord.com/api/guilds/{VariablesWrapper.VariablesDataService().GetSingle("DID_SERVER").AsUlong()}/members/{id}", + $"https://discord.com/api/guilds/{variablesService.GetVariable("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json") ); string added = "true"; diff --git a/UKSF.Api/Controllers/GameServersController.cs b/UKSF.Api/Controllers/GameServersController.cs index e069f4d6..987af5ca 100644 --- a/UKSF.Api/Controllers/GameServersController.cs +++ b/UKSF.Api/Controllers/GameServersController.cs @@ -9,12 +9,12 @@ using MongoDB.Driver; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Game; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Models.Game; using UKSF.Api.Models.Mission; using UKSF.Api.Services.Admin; -using UKSF.Api.Services.Game; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; using UKSF.Api.Signalr.Hubs.Game; @@ -25,10 +25,14 @@ namespace UKSF.Api.Controllers { public class GameServersController : Controller { private readonly IGameServersService gameServersService; private readonly IHubContext serversHub; + private readonly IVariablesService variablesService; + private readonly IGameServerHelpers gameServerHelpers; - public GameServersController(IGameServersService gameServersService, IHubContext serversHub) { + public GameServersController(IGameServersService gameServersService, IHubContext serversHub, IVariablesService variablesService, IGameServerHelpers gameServerHelpers) { this.gameServersService = gameServersService; this.serversHub = serversHub; + this.variablesService = variablesService; + this.gameServerHelpers = gameServerHelpers; } [HttpGet, Authorize] @@ -133,7 +137,7 @@ public async Task LaunchServer(string id, [FromBody] JObject data Task.WaitAll(gameServersService.Data.Get().Select(x => gameServersService.GetGameServerStatus(x)).ToArray()); GameServer gameServer = gameServersService.Data.GetSingle(id); if (gameServer.status.running) return BadRequest("Server is already running. This shouldn't happen so please contact an admin"); - if (GameServerHelpers.IsMainOpTime()) { + if (gameServerHelpers.IsMainOpTime()) { if (gameServer.serverOption == GameServerOption.SINGLETON) { if (gameServersService.Data.Get(x => x.serverOption != GameServerOption.SINGLETON).Any(x => x.status.started || x.status.running)) { return BadRequest("Server must be launched on its own. Stop the other running servers first"); @@ -230,12 +234,12 @@ public IActionResult ResetGameServerMods(string id) { } [HttpGet("disabled"), Authorize] - public IActionResult GetDisabledState() => Ok(new { state = VariablesWrapper.VariablesDataService().GetSingle("SERVER_CONTROL_DISABLED").AsBool() }); + public IActionResult GetDisabledState() => Ok(new { state = variablesService.GetVariable("SERVER_CONTROL_DISABLED").AsBool() }); [HttpPost("disabled"), Authorize] public async Task SetDisabledState([FromBody] JObject body) { bool state = bool.Parse(body["state"].ToString()); - await VariablesWrapper.VariablesDataService().Update("SERVER_CONTROL_DISABLED", state); + await variablesService.Data.Update("SERVER_CONTROL_DISABLED", state); await serversHub.Clients.All.ReceiveDisabledState(state); return Ok(); } diff --git a/UKSF.Api/Controllers/LauncherController.cs b/UKSF.Api/Controllers/LauncherController.cs index b718c90e..82c2dce5 100644 --- a/UKSF.Api/Controllers/LauncherController.cs +++ b/UKSF.Api/Controllers/LauncherController.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.SignalR; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Launcher; @@ -13,10 +14,10 @@ using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Launcher; using UKSF.Api.Models.Message.Logging; -using UKSF.Api.Services.Admin; using UKSF.Api.Services.Message; using UKSF.Api.Services.Personnel; using UKSF.Api.Signalr.Hubs.Integrations; +using UKSF.Common; namespace UKSF.Api.Controllers { [Route("[controller]"), Authorize, Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER)] @@ -27,14 +28,24 @@ public class LauncherController : Controller { private readonly ILauncherService launcherService; private readonly ISessionService sessionService; private readonly IVariablesDataService variablesDataService; + private readonly IVariablesService variablesService; - public LauncherController(IVariablesDataService variablesDataService, IHubContext launcherHub, ILauncherService launcherService, ILauncherFileService launcherFileService, ISessionService sessionService, IDisplayNameService displayNameService) { + public LauncherController( + IVariablesDataService variablesDataService, + IHubContext launcherHub, + ILauncherService launcherService, + ILauncherFileService launcherFileService, + ISessionService sessionService, + IDisplayNameService displayNameService, + IVariablesService variablesService + ) { this.variablesDataService = variablesDataService; this.launcherHub = launcherHub; this.launcherService = launcherService; this.launcherFileService = launcherFileService; this.sessionService = sessionService; this.displayNameService = displayNameService; + this.variablesService = variablesService; } [HttpGet("update/{platform}/{version}")] @@ -70,7 +81,7 @@ public async Task GetUpdatedFiles([FromBody] JObject body) { public IActionResult ReportError([FromBody] JObject body) { string version = body["version"].ToString(); string message = body["message"].ToString(); - LogWrapper.Log(new LauncherLogMessage(version, message) {userId = sessionService.GetContextId(), name = displayNameService.GetDisplayName(sessionService.GetContextAccount())}); + LogWrapper.Log(new LauncherLogMessage(version, message) { userId = sessionService.GetContextId(), name = displayNameService.GetDisplayName(sessionService.GetContextAccount()) }); return Ok(); } diff --git a/UKSF.Api/Controllers/UnitsController.cs b/UKSF.Api/Controllers/UnitsController.cs index 8eb0a8e3..c45e1502 100644 --- a/UKSF.Api/Controllers/UnitsController.cs +++ b/UKSF.Api/Controllers/UnitsController.cs @@ -77,7 +77,6 @@ public IActionResult GetSingle([FromRoute] string id) { // TODO: Use a factory or mapper ResponseUnit response = mapper.Map(unit); response.code = unitsService.GetChainString(unit); - response.parentId = parent?.id; response.parentName = parent?.name; response.unitMembers = MapUnitMembers(unit); return Ok(response); @@ -184,13 +183,13 @@ public async Task UpdateParent([FromRoute] string id, [FromBody] } // TODO: Move elsewhere - unit = unitsService.Data.GetSingle(unit.id); - foreach (Unit child in unitsService.GetAllChildren(unit, true)) { - foreach (Account account in child.members.Select(x => accountService.Data.GetSingle(x))) { - Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, child.name, reason: $"the hierarchy chain for {unit.name} was updated"); - notificationsService.Add(notification); - } - } + // unit = unitsService.Data.GetSingle(unit.id); + // foreach (Unit child in unitsService.GetAllChildren(unit, true)) { + // foreach (Account account in child.members.Select(x => accountService.Data.GetSingle(x))) { + // Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, child.name, reason: $"the hierarchy chain for {unit.name} was updated"); + // notificationsService.Add(notification); + // } + // } return Ok(); } diff --git a/UKSF.Api/Controllers/VersionController.cs b/UKSF.Api/Controllers/VersionController.cs index 935913c4..cf959703 100644 --- a/UKSF.Api/Controllers/VersionController.cs +++ b/UKSF.Api/Controllers/VersionController.cs @@ -3,20 +3,24 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; using Newtonsoft.Json.Linq; +using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Services.Admin; using UKSF.Api.Signalr.Hubs.Utility; +using UKSF.Common; namespace UKSF.Api.Controllers { [Route("[controller]")] public class VersionController : Controller { private readonly IHubContext utilityHub; + private readonly IVariablesService variablesService; private readonly IVariablesDataService variablesDataService; - public VersionController(IVariablesDataService variablesDataService, IHubContext utilityHub) { + public VersionController(IVariablesDataService variablesDataService, IHubContext utilityHub, IVariablesService variablesService) { this.variablesDataService = variablesDataService; this.utilityHub = utilityHub; + this.variablesService = variablesService; } [HttpGet] diff --git a/UKSF.Common/ChangeUtilities.cs b/UKSF.Common/ChangeUtilities.cs index cced9a4a..c00ab529 100644 --- a/UKSF.Common/ChangeUtilities.cs +++ b/UKSF.Common/ChangeUtilities.cs @@ -7,7 +7,7 @@ namespace UKSF.Common { public static class ChangeUtilities { - public static string Changes(this T original, T updated) => DeepEquals(original, updated) ? "" : FormatChanges(GetChanges(original, updated)); + public static string Changes(this T original, T updated) => DeepEquals(original, updated) ? "No changes" : FormatChanges(GetChanges(original, updated)); private static List GetChanges(this T original, T updated) { List changes = new List(); @@ -57,7 +57,9 @@ private static bool DeepEquals(object original, object updated) { return JToken.DeepEquals(originalObject, updatedObject); } - private static string FormatChanges(IEnumerable changes, string indentation = "") { + private static string FormatChanges(IReadOnlyCollection changes, string indentation = "") { + if (!changes.Any()) return "No changes"; + return changes.OrderBy(x => x.Type) .ThenBy(x => x.Name) .Aggregate( diff --git a/UKSF.Common/UKSF.Common.csproj b/UKSF.Common/UKSF.Common.csproj index 7c02612d..88fc37b7 100644 --- a/UKSF.Common/UKSF.Common.csproj +++ b/UKSF.Common/UKSF.Common.csproj @@ -17,4 +17,8 @@ + + + + diff --git a/UKSF.Common/VariablesExtensions.cs b/UKSF.Common/VariablesExtensions.cs new file mode 100644 index 00000000..7d0286e7 --- /dev/null +++ b/UKSF.Common/VariablesExtensions.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.RegularExpressions; +using UKSF.Api.Models.Admin; + +namespace UKSF.Common { + public static class VariablesExtensions { + public static VariableItem AssertHasItem(this VariableItem variableItem) { + if (variableItem.item == null) { + throw new Exception($"Variable {variableItem.key} has no item"); + } + + return variableItem; + } + + public static string AsString(this VariableItem variable) => variable.AssertHasItem().item.ToString(); + + public static double AsDouble(this VariableItem variable) { + string item = variable.AsString(); + if (!double.TryParse(item, out double output)) { + throw new InvalidCastException($"Variable item {item} cannot be converted to a double"); + } + + return output; + } + + public static bool AsBool(this VariableItem variable) { + string item = variable.AsString(); + if (!bool.TryParse(item, out bool output)) { + throw new InvalidCastException($"Variable item {item} cannot be converted to a bool"); + } + + return output; + } + + public static ulong AsUlong(this VariableItem variable) { + string item = variable.AsString(); + if (!ulong.TryParse(item, out ulong output)) { + throw new InvalidCastException($"Variable item {item} cannot be converted to a ulong"); + } + + return output; + } + + public static string[] AsArray(this VariableItem variable, Func predicate = null) { + string itemString = variable.AsString(); + itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); + string[] items = itemString.Split(","); + return predicate != null ? items.Select(predicate).ToArray() : items; + } + + public static IEnumerable AsEnumerable(this VariableItem variable, Func predicate = null) { + string itemString = variable.AsString(); + itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); + IEnumerable items = itemString.Split(",").AsEnumerable(); + return predicate != null ? items.Select(predicate) : items; + } + + public static IEnumerable AsDoublesArray(this VariableItem variable) { + string itemString = variable.AsString(); + itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); + IEnumerable items = itemString.Split(",").Select(x => x.ToDouble()); + return items; + } + } +} diff --git a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs index 34103e93..c1450bae 100644 --- a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs @@ -138,7 +138,7 @@ public void Should_detect_changes_for_simple_object() { public void Should_do_nothing_when_null() { string subject = ((Rank) null).Changes(null); - subject.Should().Be(""); + subject.Should().Be("No changes"); } [Fact] @@ -149,7 +149,7 @@ public void Should_do_nothing_when_field_is_null() { string subject = original.Changes(updated); - subject.Should().Be(""); + subject.Should().Be("No changes"); } [Fact] @@ -160,7 +160,7 @@ public void Should_do_nothing_when_objects_are_equal() { string subject = original.Changes(updated); - subject.Should().Be(""); + subject.Should().Be("No changes"); } } } diff --git a/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs index 3c0fafbf..cfbcafdd 100644 --- a/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs @@ -59,6 +59,19 @@ public void ShouldGetVariableAsArray() { subject.Should().Contain(new[] {"item1", "item2", "item3"}); } + // ReSharper disable PossibleMultipleEnumeration + [Fact] + public void ShouldGetVariableAsEnumerable() { + VariableItem variableItem = new VariableItem {key = "Test", item = "item1,item2, item3"}; + + IEnumerable subject = variableItem.AsEnumerable(); + + subject.Should().BeAssignableTo>(); + subject.Should().HaveCount(3); + subject.Should().Contain(new[] {"item1", "item2", "item3"}); + } + // ReSharper restore PossibleMultipleEnumeration + [Fact] public void ShouldGetVariableAsArrayWithPredicate() { VariableItem variableItem = new VariableItem {key = "Test", item = "\"item1\",item2"}; diff --git a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs new file mode 100644 index 00000000..7d612adf --- /dev/null +++ b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs @@ -0,0 +1,217 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using FluentAssertions; +using MongoDB.Bson; +using Moq; +using UKSF.Api.Interfaces.Admin; +using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Interfaces.Integrations.Teamspeak; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Models.Admin; +using UKSF.Api.Models.Integrations; +using UKSF.Api.Models.Personnel; +using UKSF.Api.Models.Units; +using UKSF.Api.Services.Integrations.Teamspeak; +using UKSF.Api.Services.Units; +using Xunit; +using UksfUnit = UKSF.Api.Models.Units.Unit; + +namespace UKSF.Tests.Unit.Services.Integrations.Teamspeak { + public class TeamspeakGroupServiceTests { + private static readonly VariableItem TEAMSPEAK_GID_UNVERIFIED = new VariableItem { key = "TEAMSPEAK_GID_UNVERIFIED", item = "1" }; + private static readonly VariableItem TEAMSPEAK_GID_DISCHARGED = new VariableItem { key = "TEAMSPEAK_GID_DISCHARGED", item = "2" }; + private static readonly VariableItem TEAMSPEAK_GID_ROOT = new VariableItem { key = "TEAMSPEAK_GID_ROOT", item = "3" }; + private static readonly VariableItem TEAMSPEAK_GID_ELCOM = new VariableItem { key = "TEAMSPEAK_GID_ELCOM", item = "4" }; + private static readonly VariableItem TEAMSPEAK_GID_BLACKLIST = new VariableItem { key = "TEAMSPEAK_GID_BLACKLIST", item = "99,100" }; + + private readonly List addedGroups = new List(); + private readonly UksfUnit elcomUnit = new UksfUnit { id = ObjectId.GenerateNewId().ToString(), name = "ELCOM", branch = UnitBranch.AUXILIARY, parent = ObjectId.Empty.ToString() }; + private readonly Mock mockRanksDataService = new Mock(); + private readonly Mock mockRanksService = new Mock(); + private readonly Mock mockRolesService = new Mock(); + private readonly Mock mockTeampeakManagerService = new Mock(); + private readonly Mock mockUnitsDataService = new Mock(); + private readonly Mock mockVariablesService = new Mock(); + private readonly List removedGroups = new List(); + private readonly TeamspeakGroupService teamspeakGroupService; + + public TeamspeakGroupServiceTests() { + mockRanksService.Setup(x => x.Data).Returns(mockRanksDataService.Object); + + mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_UNVERIFIED")).Returns(TEAMSPEAK_GID_UNVERIFIED); + mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_DISCHARGED")).Returns(TEAMSPEAK_GID_DISCHARGED); + mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_ROOT")).Returns(TEAMSPEAK_GID_ROOT); + mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_ELCOM")).Returns(TEAMSPEAK_GID_ELCOM); + mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_BLACKLIST")).Returns(TEAMSPEAK_GID_BLACKLIST); + + mockTeampeakManagerService.Setup(x => x.SendGroupProcedure(TeamspeakProcedureType.ASSIGN, It.IsAny())) + .Returns(Task.CompletedTask) + .Callback((TeamspeakProcedureType _, TeamspeakGroupProcedure groupProcedure) => addedGroups.Add(groupProcedure.serverGroup)); + mockTeampeakManagerService.Setup(x => x.SendGroupProcedure(TeamspeakProcedureType.UNASSIGN, It.IsAny())) + .Returns(Task.CompletedTask) + .Callback((TeamspeakProcedureType _, TeamspeakGroupProcedure groupProcedure) => removedGroups.Add(groupProcedure.serverGroup)); + + IUnitsService unitsService = new UnitsService(mockUnitsDataService.Object, mockRolesService.Object); + teamspeakGroupService = new TeamspeakGroupService(mockRanksService.Object, unitsService, mockTeampeakManagerService.Object, mockVariablesService.Object); + } + + [Fact] + public async Task Should_add_correct_groups_for_discharged() { + await teamspeakGroupService.UpdateAccountGroups(new Account { membershipState = MembershipState.DISCHARGED }, new List(), 2); + + addedGroups.Should().BeEquivalentTo(2); + removedGroups.Should().BeEmpty(); + } + + [Fact] + public async Task Should_add_correct_groups_for_elcom() { + string id = ObjectId.GenerateNewId().ToString(); + string parentId = ObjectId.GenerateNewId().ToString(); + string parentParentId = ObjectId.GenerateNewId().ToString(); + UksfUnit unit = new UksfUnit { name = "1 Section", teamspeakGroup = "6", members = new List { id }, parent = parentId }; + UksfUnit unitParent = new UksfUnit { id = parentId, name = "SFSG", teamspeakGroup = "7", parent = parentParentId }; + UksfUnit unitParentParent = new UksfUnit { id = parentParentId, name = "UKSF", teamspeakGroup = "8" }; + UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; + List units = new List { unit, unitParent, unitParentParent, elcomUnit, auxiliaryUnit }; + elcomUnit.members.Add(id); + + mockUnitsDataService.Setup(x => x.Get()).Returns(units); + mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); + + await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "1 Section" }, new List(), 2); + + addedGroups.Should().BeEquivalentTo(3, 4, 5, 7, 9); + removedGroups.Should().BeEmpty(); + } + + [Fact] + public async Task Should_add_correct_groups_for_member() { + string id = ObjectId.GenerateNewId().ToString(); + string parentId = ObjectId.GenerateNewId().ToString(); + string parentParentId = ObjectId.GenerateNewId().ToString(); + UksfUnit unit = new UksfUnit { name = "1 Section", teamspeakGroup = "6", members = new List { id }, parent = parentId }; + UksfUnit unitParent = new UksfUnit { id = parentId, name = "SFSG", teamspeakGroup = "7", parent = parentParentId }; + UksfUnit unitParentParent = new UksfUnit { id = parentParentId, name = "UKSF", teamspeakGroup = "8" }; + UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; + List units = new List { unit, unitParent, unitParentParent, elcomUnit, auxiliaryUnit }; + + mockUnitsDataService.Setup(x => x.Get()).Returns(units); + mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); + + await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "1 Section" }, new List(), 2); + + addedGroups.Should().BeEquivalentTo(3, 5, 6, 7, 9); + removedGroups.Should().BeEmpty(); + } + + [Fact] + public async Task Should_add_correct_groups_for_non_member_with_no_account() { + await teamspeakGroupService.UpdateAccountGroups(null, new List(), 2); + + addedGroups.Should().BeEquivalentTo(1); + removedGroups.Should().BeEmpty(); + } + + [Fact] + public async Task Should_add_correct_groups_for_non_member() { + await teamspeakGroupService.UpdateAccountGroups(new Account { membershipState = MembershipState.UNCONFIRMED }, new List(), 2); + + addedGroups.Should().BeEquivalentTo(1); + removedGroups.Should().BeEmpty(); + } + + [Fact] + public async Task Should_add_correct_groups_for_stratcom() { + string id = ObjectId.GenerateNewId().ToString(); + UksfUnit rootUnit = new UksfUnit { name = "UKSF", teamspeakGroup = "10", members = new List { id }, parent = ObjectId.Empty.ToString() }; + UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; + List units = new List { rootUnit, elcomUnit, auxiliaryUnit }; + elcomUnit.members.Add(id); + + mockUnitsDataService.Setup(x => x.Get()).Returns(units); + mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); + + await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "UKSF" }, new List(), 2); + + addedGroups.Should().BeEquivalentTo(3, 4, 5, 10, 9); + removedGroups.Should().BeEmpty(); + } + + [Fact] + public async Task Should_only_add_groups_if_not_set() { + string id = ObjectId.GenerateNewId().ToString(); + string parentId = ObjectId.GenerateNewId().ToString(); + string parentParentId = ObjectId.GenerateNewId().ToString(); + UksfUnit unit = new UksfUnit { name = "1 Section", teamspeakGroup = "6", members = new List { id }, parent = parentId }; + UksfUnit unitParent = new UksfUnit { id = parentId, name = "SFSG", teamspeakGroup = "7", parent = parentParentId }; + UksfUnit unitParentParent = new UksfUnit { id = parentParentId, name = "UKSF", teamspeakGroup = "8" }; + UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; + List units = new List { unit, unitParent, unitParentParent, elcomUnit, auxiliaryUnit }; + + mockUnitsDataService.Setup(x => x.Get()).Returns(units); + mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); + + await teamspeakGroupService.UpdateAccountGroups( + new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "1 Section" }, + new List { 3, 5 }, + 2 + ); + + addedGroups.Should().BeEquivalentTo(6, 7, 9); + removedGroups.Should().BeEmpty(); + } + + [Fact] + public async Task Should_remove_correct_groups() { + string id = ObjectId.GenerateNewId().ToString(); + string parentId = ObjectId.GenerateNewId().ToString(); + string parentParentId = ObjectId.GenerateNewId().ToString(); + UksfUnit unit = new UksfUnit { name = "1 Section", teamspeakGroup = "6", members = new List { id }, parent = parentId }; + UksfUnit unitParent = new UksfUnit { id = parentId, name = "SFSG", teamspeakGroup = "7", parent = parentParentId }; + UksfUnit unitParentParent = new UksfUnit { id = parentParentId, name = "UKSF", teamspeakGroup = "8" }; + UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; + List units = new List { unit, unitParent, unitParentParent, elcomUnit, auxiliaryUnit }; + + mockUnitsDataService.Setup(x => x.Get()).Returns(units); + mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); + + await teamspeakGroupService.UpdateAccountGroups( + new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "1 Section" }, + new List { 1, 10 }, + 2 + ); + + addedGroups.Should().BeEquivalentTo(3, 5, 6, 7, 9); + removedGroups.Should().BeEquivalentTo(1, 10); + } + + [Fact] + public async Task Should_remove_groups() { + await teamspeakGroupService.UpdateAccountGroups(null, new List { 1, 3, 4 }, 2); + + addedGroups.Should().BeEmpty(); + removedGroups.Should().BeEquivalentTo(3, 4); + } + + [Fact] + public async Task Should_remove_groups_except_blacklisted() { + await teamspeakGroupService.UpdateAccountGroups(null, new List { 1, 3, 4, 99, 100 }, 2); + + addedGroups.Should().BeEmpty(); + removedGroups.Should().BeEquivalentTo(3, 4); + } + } +} From 7eb9f75ff274de364b4c5810ea6fabe17724439e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 19 Oct 2020 19:29:01 +0100 Subject: [PATCH 273/369] Fix unit root first child tags being removed when also in elcom --- .../Teamspeak/TeamspeakGroupService.cs | 4 +- .../Teamspeak/TeamspeakGroupServiceTests.cs | 41 +++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs index bba3e476..9334f386 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs @@ -68,8 +68,10 @@ private void ResolveRankGroup(Account account, ISet memberGroups) { private void ResolveParentUnitGroup(Account account, ISet memberGroups) { Unit accountUnit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); Unit parentUnit = unitsService.GetParents(accountUnit).Skip(1).FirstOrDefault(x => !string.IsNullOrEmpty(x.teamspeakGroup)); - if (parentUnit != null) { + if (parentUnit != null && parentUnit.parent != ObjectId.Empty.ToString()) { memberGroups.Add(parentUnit.teamspeakGroup.ToDouble()); + } else { + memberGroups.Add(accountUnit.teamspeakGroup.ToDouble()); } } diff --git a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs index 7d612adf..4976b064 100644 --- a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs @@ -146,6 +146,47 @@ public async Task Should_add_correct_groups_for_stratcom() { removedGroups.Should().BeEmpty(); } + [Fact] + public async Task Should_add_correct_groups_for_first_root_child() { + string id = ObjectId.GenerateNewId().ToString(); + string rootId = ObjectId.GenerateNewId().ToString(); + UksfUnit rootUnit = new UksfUnit { id = rootId, name = "UKSF", teamspeakGroup = "10", parent = ObjectId.Empty.ToString() }; + UksfUnit unit = new UksfUnit { name = "1 Section", teamspeakGroup = "6", members = new List { id }, parent = rootId }; + UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; + List units = new List { rootUnit, unit, elcomUnit, auxiliaryUnit }; + + mockUnitsDataService.Setup(x => x.Get()).Returns(units); + mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); + + await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "1 Section" }, new List(), 2); + + addedGroups.Should().BeEquivalentTo(3, 5, 6, 9); + removedGroups.Should().BeEmpty(); + } + + [Fact] + public async Task Should_add_correct_groups_for_first_root_child_in_elcom() { + string id = ObjectId.GenerateNewId().ToString(); + string rootId = ObjectId.GenerateNewId().ToString(); + UksfUnit rootUnit = new UksfUnit { id = rootId, name = "UKSF", teamspeakGroup = "10", parent = ObjectId.Empty.ToString() }; + UksfUnit unit = new UksfUnit { name = "1 Section", teamspeakGroup = "6", members = new List { id }, parent = rootId }; + UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; + List units = new List { rootUnit, unit, elcomUnit, auxiliaryUnit }; + elcomUnit.members.Add(id); + + mockUnitsDataService.Setup(x => x.Get()).Returns(units); + mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); + + await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "1 Section" }, new List(), 2); + + addedGroups.Should().BeEquivalentTo(3, 5, 4, 6, 9); + removedGroups.Should().BeEmpty(); + } + [Fact] public async Task Should_only_add_groups_if_not_set() { string id = ObjectId.GenerateNewId().ToString(); From 46f41636de25e80c4e984432c898041aeba153ec Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 19 Oct 2020 19:40:25 +0100 Subject: [PATCH 274/369] Fix bug in teamspeak groups - Units with no group, with multiple parents had their main parent group removed --- .../Teamspeak/TeamspeakGroupService.cs | 29 +++++++++++-------- .../Teamspeak/TeamspeakGroupServiceTests.cs | 23 +++++++++++++++ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs index 9334f386..cc142229 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs @@ -41,8 +41,8 @@ public async Task UpdateAccountGroups(Account account, ICollection serve break; case MembershipState.MEMBER: ResolveRankGroup(account, memberGroups); - ResolveParentUnitGroup(account, memberGroups); ResolveUnitGroup(account, memberGroups); + ResolveParentUnitGroup(account, memberGroups); ResolveAuxiliaryUnitGroups(account, memberGroups); memberGroups.Add(variablesService.GetVariable("TEAMSPEAK_GID_ROOT").AsDouble()); break; @@ -65,16 +65,6 @@ private void ResolveRankGroup(Account account, ISet memberGroups) { memberGroups.Add(ranksService.Data.GetSingle(account.rank).teamspeakGroup.ToDouble()); } - private void ResolveParentUnitGroup(Account account, ISet memberGroups) { - Unit accountUnit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); - Unit parentUnit = unitsService.GetParents(accountUnit).Skip(1).FirstOrDefault(x => !string.IsNullOrEmpty(x.teamspeakGroup)); - if (parentUnit != null && parentUnit.parent != ObjectId.Empty.ToString()) { - memberGroups.Add(parentUnit.teamspeakGroup.ToDouble()); - } else { - memberGroups.Add(accountUnit.teamspeakGroup.ToDouble()); - } - } - private void ResolveUnitGroup(Account account, ISet memberGroups) { Unit accountUnit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); Unit elcom = unitsService.GetAuxilliaryRoot(); @@ -83,7 +73,22 @@ private void ResolveUnitGroup(Account account, ISet memberGroups) { memberGroups.Add(accountUnit.teamspeakGroup.ToDouble()); } - memberGroups.Add(elcom.members.Contains(account.id) ? variablesService.GetVariable("TEAMSPEAK_GID_ELCOM").AsDouble() : accountUnit.teamspeakGroup.ToDouble()); + double group = elcom.members.Contains(account.id) ? variablesService.GetVariable("TEAMSPEAK_GID_ELCOM").AsDouble() : accountUnit.teamspeakGroup.ToDouble(); + if (group == 0) { + ResolveParentUnitGroup(account, memberGroups); + } else { + memberGroups.Add(@group); + } + } + + private void ResolveParentUnitGroup(Account account, ISet memberGroups) { + Unit accountUnit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); + Unit parentUnit = unitsService.GetParents(accountUnit).Skip(1).FirstOrDefault(x => !string.IsNullOrEmpty(x.teamspeakGroup) && !memberGroups.Contains(x.teamspeakGroup.ToDouble())); + if (parentUnit != null && parentUnit.parent != ObjectId.Empty.ToString()) { + memberGroups.Add(parentUnit.teamspeakGroup.ToDouble()); + } else { + memberGroups.Add(accountUnit.teamspeakGroup.ToDouble()); + } } private void ResolveAuxiliaryUnitGroups(DatabaseObject account, ISet memberGroups) { diff --git a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs index 4976b064..ee9af83f 100644 --- a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs @@ -111,6 +111,29 @@ public async Task Should_add_correct_groups_for_member() { removedGroups.Should().BeEmpty(); } + [Fact] + public async Task Should_add_correct_groups_for_member_with_gaps_in_parents() { + string id = ObjectId.GenerateNewId().ToString(); + string parentId = ObjectId.GenerateNewId().ToString(); + string parentParentId = ObjectId.GenerateNewId().ToString(); + string parentParentParentId = ObjectId.GenerateNewId().ToString(); + UksfUnit unit = new UksfUnit { name = "1 Section", members = new List { id }, parent = parentId }; + UksfUnit unitParent = new UksfUnit { id = parentId, name = "1 Platoon", teamspeakGroup = "7", parent = parentParentId }; + UksfUnit unitParentParent = new UksfUnit { id = parentParentId, name = "A Company", parent = parentParentParentId }; + UksfUnit unitParentParentParent = new UksfUnit { id = parentParentParentId, name = "SFSG", teamspeakGroup = "8" }; + List units = new List { unit, unitParent, unitParentParent, unitParentParentParent, elcomUnit }; + + mockUnitsDataService.Setup(x => x.Get()).Returns(units); + mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); + + await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "1 Section" }, new List(), 2); + + addedGroups.Should().BeEquivalentTo(3, 5, 7, 8); + removedGroups.Should().BeEmpty(); + } + [Fact] public async Task Should_add_correct_groups_for_non_member_with_no_account() { await teamspeakGroupService.UpdateAccountGroups(null, new List(), 2); From 329dc94e384746a56d49c0f4c5d8e04cdd603ad4 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 19 Oct 2020 19:51:20 +0100 Subject: [PATCH 275/369] Update group assignments on unit parent change --- .../Personnel/IAssignmentService.cs | 1 + UKSF.Api.Services/Personnel/AssignmentService.cs | 2 +- UKSF.Api/Controllers/UnitsController.cs | 14 ++++++-------- .../Teamspeak/TeamspeakGroupServiceTests.cs | 8 ++++---- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/UKSF.Api.Interfaces/Personnel/IAssignmentService.cs b/UKSF.Api.Interfaces/Personnel/IAssignmentService.cs index 0e2d037b..737691df 100644 --- a/UKSF.Api.Interfaces/Personnel/IAssignmentService.cs +++ b/UKSF.Api.Interfaces/Personnel/IAssignmentService.cs @@ -9,5 +9,6 @@ public interface IAssignmentService { Task UpdateUnitRankAndRole(string id, string unitString = "", string role = "", string rankString = "", string notes = "", string message = "", string reason = ""); Task UnassignUnitRole(string id, string unitId); Task UnassignUnit(string id, string unitId); + Task UpdateGroupsAndRoles(string id); } } diff --git a/UKSF.Api.Services/Personnel/AssignmentService.cs b/UKSF.Api.Services/Personnel/AssignmentService.cs index 0c9a5bc2..a2b9c744 100644 --- a/UKSF.Api.Services/Personnel/AssignmentService.cs +++ b/UKSF.Api.Services/Personnel/AssignmentService.cs @@ -118,7 +118,7 @@ public async Task UnassignUnit(string id, string unitId) { await UpdateGroupsAndRoles(unitId); } - private async Task UpdateGroupsAndRoles(string id) { + public async Task UpdateGroupsAndRoles(string id) { Account account = accountService.Data.GetSingle(id); await teamspeakService.UpdateAccountTeamspeakGroups(account); await discordService.UpdateAccount(account); diff --git a/UKSF.Api/Controllers/UnitsController.cs b/UKSF.Api/Controllers/UnitsController.cs index c45e1502..facc7061 100644 --- a/UKSF.Api/Controllers/UnitsController.cs +++ b/UKSF.Api/Controllers/UnitsController.cs @@ -182,14 +182,12 @@ public async Task UpdateParent([FromRoute] string id, [FromBody] await unitsService.Data.Update(child.id, "order", parentChildren.IndexOf(child)); } - // TODO: Move elsewhere - // unit = unitsService.Data.GetSingle(unit.id); - // foreach (Unit child in unitsService.GetAllChildren(unit, true)) { - // foreach (Account account in child.members.Select(x => accountService.Data.GetSingle(x))) { - // Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, child.name, reason: $"the hierarchy chain for {unit.name} was updated"); - // notificationsService.Add(notification); - // } - // } + unit = unitsService.Data.GetSingle(unit.id); + foreach (Unit child in unitsService.GetAllChildren(unit, true)) { + foreach (string accountId in child.members) { + await assignmentService.UpdateGroupsAndRoles(accountId); + } + } return Ok(); } diff --git a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs index ee9af83f..5a4102f6 100644 --- a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs @@ -174,7 +174,7 @@ public async Task Should_add_correct_groups_for_first_root_child() { string id = ObjectId.GenerateNewId().ToString(); string rootId = ObjectId.GenerateNewId().ToString(); UksfUnit rootUnit = new UksfUnit { id = rootId, name = "UKSF", teamspeakGroup = "10", parent = ObjectId.Empty.ToString() }; - UksfUnit unit = new UksfUnit { name = "1 Section", teamspeakGroup = "6", members = new List { id }, parent = rootId }; + UksfUnit unit = new UksfUnit { name = "JSFAW", teamspeakGroup = "6", members = new List { id }, parent = rootId }; UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; List units = new List { rootUnit, unit, elcomUnit, auxiliaryUnit }; @@ -183,7 +183,7 @@ public async Task Should_add_correct_groups_for_first_root_child() { mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); - await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "1 Section" }, new List(), 2); + await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "JSFAW" }, new List(), 2); addedGroups.Should().BeEquivalentTo(3, 5, 6, 9); removedGroups.Should().BeEmpty(); @@ -194,7 +194,7 @@ public async Task Should_add_correct_groups_for_first_root_child_in_elcom() { string id = ObjectId.GenerateNewId().ToString(); string rootId = ObjectId.GenerateNewId().ToString(); UksfUnit rootUnit = new UksfUnit { id = rootId, name = "UKSF", teamspeakGroup = "10", parent = ObjectId.Empty.ToString() }; - UksfUnit unit = new UksfUnit { name = "1 Section", teamspeakGroup = "6", members = new List { id }, parent = rootId }; + UksfUnit unit = new UksfUnit { name = "JSFAW", teamspeakGroup = "6", members = new List { id }, parent = rootId }; UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; List units = new List { rootUnit, unit, elcomUnit, auxiliaryUnit }; elcomUnit.members.Add(id); @@ -204,7 +204,7 @@ public async Task Should_add_correct_groups_for_first_root_child_in_elcom() { mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); - await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "1 Section" }, new List(), 2); + await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "JSFAW" }, new List(), 2); addedGroups.Should().BeEquivalentTo(3, 5, 4, 6, 9); removedGroups.Should().BeEmpty(); From 9436518eced45e51c2ce5c8f49cd35e5f3ef46e0 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 20 Oct 2020 18:48:40 +0100 Subject: [PATCH 276/369] Fix groups for candidate --- .../Integrations/Teamspeak/TeamspeakGroupService.cs | 5 ++++- .../Teamspeak/TeamspeakGroupServiceTests.cs | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs index cc142229..046cc03a 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs +++ b/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs @@ -39,6 +39,9 @@ public async Task UpdateAccountGroups(Account account, ICollection serve case MembershipState.DISCHARGED: memberGroups.Add(variablesService.GetVariable("TEAMSPEAK_GID_DISCHARGED").AsDouble()); break; + case MembershipState.CONFIRMED: + ResolveRankGroup(account, memberGroups); + break; case MembershipState.MEMBER: ResolveRankGroup(account, memberGroups); ResolveUnitGroup(account, memberGroups); @@ -77,7 +80,7 @@ private void ResolveUnitGroup(Account account, ISet memberGroups) { if (group == 0) { ResolveParentUnitGroup(account, memberGroups); } else { - memberGroups.Add(@group); + memberGroups.Add(group); } } diff --git a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs index 5a4102f6..15c99853 100644 --- a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs @@ -111,6 +111,18 @@ public async Task Should_add_correct_groups_for_member() { removedGroups.Should().BeEmpty(); } + [Fact] + public async Task Should_add_correct_groups_for_candidate() { + string id = ObjectId.GenerateNewId().ToString(); + + mockRanksDataService.Setup(x => x.GetSingle("Candidate")).Returns(new Rank { name = "Candidate", teamspeakGroup = "5" }); + + await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.CONFIRMED, rank = "Candidate" }, new List(), 2); + + addedGroups.Should().BeEquivalentTo(5); + removedGroups.Should().BeEmpty(); + } + [Fact] public async Task Should_add_correct_groups_for_member_with_gaps_in_parents() { string id = ObjectId.GenerateNewId().ToString(); From 214babce1575542684131a2b799f4e63b6bb1e7a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 21 Oct 2020 12:40:55 +0100 Subject: [PATCH 277/369] Stashing --- UKSF.Api.Accounts/ApiAccountsExtensions.cs | 23 +++ UKSF.Api.Accounts/ApiAuthExtensions.cs | 84 +++++++++++ .../Controllers/LoginController.cs | 48 ++++++ .../Services/Auth/LoginService.cs | 68 +++++++++ .../Services/Auth/Permissions.cs | 21 ++- .../Services/Auth/PermissionsService.cs | 92 ++++++++++++ .../Services/Auth/SessionService.cs | 33 +++++ .../Services}/ConfirmationCodeService.cs | 3 +- UKSF.Api.Accounts/UKSF.Api.Accounts.csproj | 27 ++++ UKSF.Api.Interfaces/Utility/ILoginService.cs | 7 - .../Utility/ISessionService.cs | 10 -- UKSF.Api.Services/Personnel/LoginService.cs | 138 ------------------ UKSF.Api.Services/Utility/SessionService.cs | 32 ---- UKSF.Api.sln | 10 ++ .../AppStart/RegisterAndWarmCachedData.cs | 1 + .../Services/RegisterDataBackedServices.cs | 1 - .../AppStart/Services/RegisterDataServices.cs | 1 - .../RegisterScheduledActionServices.cs | 1 - .../AppStart/Services/ServiceExtensions.cs | 3 - .../Accounts/AccountsController.cs | 18 +-- .../Accounts/OperationOrderController.cs | 2 +- .../Accounts/OperationReportController.cs | 2 +- .../Accounts/OperationsController.cs | 2 +- .../Controllers/ApplicationsController.cs | 4 +- .../CommandRequestsController.cs | 2 +- .../CommandRequestsCreationController.cs | 16 +- .../Controllers/CommentThreadController.cs | 4 +- UKSF.Api/Controllers/DataController.cs | 2 +- UKSF.Api/Controllers/DischargesController.cs | 2 +- UKSF.Api/Controllers/DiscordController.cs | 4 +- UKSF.Api/Controllers/GameServersController.cs | 2 +- .../Integrations/GithubController.cs | 4 +- UKSF.Api/Controllers/IssueController.cs | 2 +- UKSF.Api/Controllers/LauncherController.cs | 4 +- UKSF.Api/Controllers/LoaController.cs | 2 +- UKSF.Api/Controllers/LoggingController.cs | 2 +- UKSF.Api/Controllers/LoginController.cs | 57 -------- .../Controllers/Modpack/ModpackController.cs | 22 +-- UKSF.Api/Controllers/RecruitmentController.cs | 16 +- UKSF.Api/Controllers/TeamspeakController.cs | 4 +- UKSF.Api/Controllers/VariablesController.cs | 2 +- UKSF.Api/ModsController.cs | 2 +- UKSF.Api/Startup.cs | 58 +------- .../Services/Personnel/RoleAttributeTests.cs | 6 +- .../Services/Utility/SessionServiceTests.cs | 8 +- 45 files changed, 473 insertions(+), 379 deletions(-) create mode 100644 UKSF.Api.Accounts/ApiAccountsExtensions.cs create mode 100644 UKSF.Api.Accounts/ApiAuthExtensions.cs create mode 100644 UKSF.Api.Accounts/Controllers/LoginController.cs create mode 100644 UKSF.Api.Accounts/Services/Auth/LoginService.cs rename UKSF.Api.Services/Personnel/RoleDefinitions.cs => UKSF.Api.Accounts/Services/Auth/Permissions.cs (58%) create mode 100644 UKSF.Api.Accounts/Services/Auth/PermissionsService.cs create mode 100644 UKSF.Api.Accounts/Services/Auth/SessionService.cs rename {UKSF.Api.Services/Utility => UKSF.Api.Accounts/Services}/ConfirmationCodeService.cs (97%) create mode 100644 UKSF.Api.Accounts/UKSF.Api.Accounts.csproj delete mode 100644 UKSF.Api.Interfaces/Utility/ILoginService.cs delete mode 100644 UKSF.Api.Interfaces/Utility/ISessionService.cs delete mode 100644 UKSF.Api.Services/Personnel/LoginService.cs delete mode 100644 UKSF.Api.Services/Utility/SessionService.cs delete mode 100644 UKSF.Api/Controllers/LoginController.cs diff --git a/UKSF.Api.Accounts/ApiAccountsExtensions.cs b/UKSF.Api.Accounts/ApiAccountsExtensions.cs new file mode 100644 index 00000000..7b8d28ed --- /dev/null +++ b/UKSF.Api.Accounts/ApiAccountsExtensions.cs @@ -0,0 +1,23 @@ +using AngleSharp; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Services.Personnel; +using UKSF.Api.Accounts.Services; +using UKSF.Api.Data.Utility; +using UKSF.Api.Interfaces.Data; +using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Interfaces.Utility.ScheduledActions; +using UKSF.Api.Services.Utility.ScheduledActions; + +namespace UKSF.Api.Accounts { + public static class ApiAccountsExtensions { + public static IServiceCollection AddUksfAccounts(this IServiceCollection services, IConfiguration configuration) { + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + + return services; + } + } +} diff --git a/UKSF.Api.Accounts/ApiAuthExtensions.cs b/UKSF.Api.Accounts/ApiAuthExtensions.cs new file mode 100644 index 00000000..2c56a651 --- /dev/null +++ b/UKSF.Api.Accounts/ApiAuthExtensions.cs @@ -0,0 +1,84 @@ +using System; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using AspNet.Security.OpenId; +using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Primitives; +using Microsoft.IdentityModel.Tokens; +using UKSF.Api.Accounts.Services.Auth; + +namespace UKSF.Api.Accounts { + public static class ApiAuthExtensions { + public static string TokenAudience => "uksf-audience"; + public static string TokenIssuer => "uksf-issuer"; + public static SymmetricSecurityKey SecurityKey { get; private set; } + + public static IServiceCollection AddUksfAuth(this IServiceCollection services, IConfiguration configuration) { + SecurityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetSection("Secrets")["tokenKey"])); + + services.AddTransient(); + services.AddSingleton(); + + services.AddAuthentication( + options => { + options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; + options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; + options.DefaultSignInScheme = CookieAuthenticationDefaults.AuthenticationScheme; + } + ) + .AddJwtBearer( + options => { + options.TokenValidationParameters = new TokenValidationParameters { + RequireExpirationTime = true, + RequireSignedTokens = true, + ValidateIssuerSigningKey = true, + IssuerSigningKey = SecurityKey, + ValidateIssuer = true, + ValidIssuer = TokenIssuer, + ValidateAudience = true, + ValidAudience = TokenAudience, + ValidateLifetime = true, + ClockSkew = TimeSpan.Zero + }; + options.Audience = TokenAudience; + options.ClaimsIssuer = TokenIssuer; + options.SaveToken = true; + options.Events = new JwtBearerEvents { + OnMessageReceived = context => { + StringValues accessToken = context.Request.Query["access_token"]; + if (!string.IsNullOrEmpty(accessToken) && context.Request.Path.StartsWithSegments("/hub")) { + context.Token = accessToken; + } + + return Task.CompletedTask; + } + }; + } + ) + .AddCookie() + .AddSteam( + options => { + options.ForwardAuthenticate = JwtBearerDefaults.AuthenticationScheme; + options.Events = new OpenIdAuthenticationEvents { + OnAccessDenied = context => { + context.Response.StatusCode = 401; + return Task.CompletedTask; + }, + OnTicketReceived = context => { + string[] idParts = context.Principal?.Claims.First(claim => claim.Type == "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier").Value.Split('/'); + string id = idParts?[^1]; + context.ReturnUri = $"{context.ReturnUri}?id={id}"; + return Task.CompletedTask; + } + }; + } + ); + + return services; + } + } +} diff --git a/UKSF.Api.Accounts/Controllers/LoginController.cs b/UKSF.Api.Accounts/Controllers/LoginController.cs new file mode 100644 index 00000000..1172f2a8 --- /dev/null +++ b/UKSF.Api.Accounts/Controllers/LoginController.cs @@ -0,0 +1,48 @@ +using System; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json.Linq; +using UKSF.Api.Accounts.Services; +using UKSF.Api.Accounts.Services.Auth; +using UKSF.Common; + +namespace UKSF.Api.Accounts.Controllers { + [Route("[controller]")] + public class LoginController : Controller { + private readonly ILoginService loginService; + private readonly ISessionService sessionService; + + public LoginController(ILoginService loginService, ISessionService sessionService) { + this.loginService = loginService; + this.sessionService = sessionService; + } + + [HttpGet] + public bool IsUserAuthenticated() => HttpContext.User.Identity != null && HttpContext.User.Identity.IsAuthenticated; + + [HttpGet("refresh"), Authorize] + public IActionResult RefreshToken() { + string loginToken = loginService.RegenerateBearerToken(sessionService.GetUserId()); + return loginToken != null ? (IActionResult) Ok(loginToken) : BadRequest(); + } + + [HttpPost] + public IActionResult Login([FromBody] JObject body) { + string email = body.GetValueFromBody("email"); + string password = body.GetValueFromBody("password"); + + try { + GuardUtilites.ValidateString(email, _ => throw new ArgumentException("Email is invalid. Please try again")); + GuardUtilites.ValidateString(password, _ => throw new ArgumentException("Password is invalid. Please try again")); + } catch (ArgumentException exception) { + return BadRequest(new { error = exception.Message }); + } + + try { + return Ok(loginService.Login(email, password)); + } catch (LoginFailedException e) { + return BadRequest(new { message = e.Message }); + } + } + } +} diff --git a/UKSF.Api.Accounts/Services/Auth/LoginService.cs b/UKSF.Api.Accounts/Services/Auth/LoginService.cs new file mode 100644 index 00000000..a091602b --- /dev/null +++ b/UKSF.Api.Accounts/Services/Auth/LoginService.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using System.IdentityModel.Tokens.Jwt; +using System.Linq; +using System.Security.Claims; +using Microsoft.IdentityModel.Tokens; +using Newtonsoft.Json; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Models.Personnel; + +namespace UKSF.Api.Accounts.Services.Auth { + public interface ILoginService { + string Login(string email, string password); + string LoginForPasswordReset(string email); + string RegenerateBearerToken(string accountId); + } + + public class LoginService : ILoginService { + private readonly IAccountService accountService; + private readonly IPermissionsService permissionsService; + + public LoginService(IAccountService accountService, IPermissionsService permissionsService) { + this.accountService = accountService; + this.permissionsService = permissionsService; + } + + public string Login(string email, string password) { + Account account = AuthenticateAccount(email, password); + return GenerateBearerToken(account); + } + + public string LoginForPasswordReset(string email) { + Account account = AuthenticateAccount(email, "", true); + return GenerateBearerToken(account); + } + + public string RegenerateBearerToken(string accountId) => GenerateBearerToken(accountService.Data.GetSingle(accountId)); + + private Account AuthenticateAccount(string email, string password, bool passwordReset = false) { + Account account = accountService.Data.GetSingle(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)); + if (account != null && (passwordReset || BCrypt.Net.BCrypt.Verify(password, account.password))) { + return account; + } + + throw new LoginFailedException(); + } + + private string GenerateBearerToken(Account account) { + List claims = new List { new Claim(ClaimTypes.Email, account.email, ClaimValueTypes.String), new Claim(ClaimTypes.Sid, account.id, ClaimValueTypes.String) }; + claims.AddRange(permissionsService.GrantPermissions(account).Select(x => new Claim(ClaimTypes.Role, x))); + + return JsonConvert.ToString( + new JwtSecurityTokenHandler().WriteToken( + new JwtSecurityToken( + ApiAuthExtensions.TokenIssuer, + ApiAuthExtensions.TokenAudience, + claims, + DateTime.UtcNow, + DateTime.UtcNow.AddDays(15), + new SigningCredentials(ApiAuthExtensions.SecurityKey, SecurityAlgorithms.HmacSha256) + ) + ) + ); + } + } + + public class LoginFailedException : Exception { } +} diff --git a/UKSF.Api.Services/Personnel/RoleDefinitions.cs b/UKSF.Api.Accounts/Services/Auth/Permissions.cs similarity index 58% rename from UKSF.Api.Services/Personnel/RoleDefinitions.cs rename to UKSF.Api.Accounts/Services/Auth/Permissions.cs index cf7631f3..3504e65d 100644 --- a/UKSF.Api.Services/Personnel/RoleDefinitions.cs +++ b/UKSF.Api.Accounts/Services/Auth/Permissions.cs @@ -1,8 +1,9 @@ +using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Authorization; -namespace UKSF.Api.Services.Personnel { - public static class RoleDefinitions { +namespace UKSF.Api.Accounts.Services.Auth { + public static class Permissions { #region MemberStates public const string CONFIRMED = "CONFIRMED"; @@ -24,9 +25,21 @@ public static class RoleDefinitions { public const string TESTER = "TESTER"; #endregion + + public static readonly HashSet ALL = new HashSet { + MEMBER, + ADMIN, + COMMAND, + NCO, + RECRUITER, + RECRUITER_LEAD, + PERSONNEL, + SERVERS, + TESTER + }; } - public class RolesAttribute : AuthorizeAttribute { - public RolesAttribute(params string[] roles) => Roles = string.Join(",", roles.Distinct()); + public class PermissionsAttribute : AuthorizeAttribute { + public PermissionsAttribute(params string[] roles) => Roles = string.Join(",", roles.Distinct()); } } diff --git a/UKSF.Api.Accounts/Services/Auth/PermissionsService.cs b/UKSF.Api.Accounts/Services/Auth/PermissionsService.cs new file mode 100644 index 00000000..2cbfb9ba --- /dev/null +++ b/UKSF.Api.Accounts/Services/Auth/PermissionsService.cs @@ -0,0 +1,92 @@ +using System.Collections.Generic; +using System.Linq; +using UKSF.Api.Interfaces.Admin; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Interfaces.Units; +using UKSF.Api.Models.Personnel; +using UKSF.Common; + +namespace UKSF.Api.Accounts.Services.Auth { + public interface IPermissionsService { + IEnumerable GrantPermissions(Account account); + } + + public class PermissionsService : IPermissionsService { + private readonly string[] admins = { "59e38f10594c603b78aa9dbd", "5a1e894463d0f71710089106", "5a1ae0f0b9bcb113a44edada" }; // TODO: Make this an account flag + private readonly IRanksService ranksService; + private readonly IRecruitmentService recruitmentService; + private readonly IUnitsService unitsService; + private readonly IVariablesService variablesService; + + public PermissionsService(IRanksService ranksService, IUnitsService unitsService, IRecruitmentService recruitmentService, IVariablesService variablesService) { + this.ranksService = ranksService; + this.unitsService = unitsService; + this.recruitmentService = recruitmentService; + this.variablesService = variablesService; + } + + public IEnumerable GrantPermissions(Account account) { + HashSet permissions = new HashSet(); + + switch (account.membershipState) { + case MembershipState.MEMBER: { + permissions.Add(Permissions.MEMBER); + bool admin = admins.Contains(account.id); + if (admin) { + permissions.UnionWith(Permissions.ALL); + break; + } + + if (unitsService.MemberHasAnyRole(account.id)) { + permissions.Add(Permissions.COMMAND); + } + + // TODO: Remove hardcoded value + if (account.rank != null && ranksService.IsSuperiorOrEqual(account.rank, "Senior Aircraftman")) { + permissions.Add(Permissions.NCO); + } + + if (recruitmentService.IsRecruiterLead(account)) { + permissions.Add(Permissions.RECRUITER_LEAD); + } + + if (recruitmentService.IsRecruiter(account)) { + permissions.Add(Permissions.RECRUITER); + } + + string personnelId = variablesService.GetVariable("UNIT_ID_PERSONNEL").AsString(); + if (unitsService.Data.GetSingle(personnelId).members.Contains(account.id)) { + permissions.Add(Permissions.PERSONNEL); + } + + string[] missionsId = variablesService.GetVariable("UNIT_ID_MISSIONS").AsArray(); + if (unitsService.Data.GetSingle(x => missionsId.Contains(x.id)).members.Contains(account.id)) { + permissions.Add(Permissions.SERVERS); + } + + string testersId = variablesService.GetVariable("UNIT_ID_TESTERS").AsString(); + if (unitsService.Data.GetSingle(testersId).members.Contains(account.id)) { + permissions.Add(Permissions.TESTER); + } + + break; + } + + case MembershipState.SERVER: + permissions.Add(Permissions.ADMIN); + break; + case MembershipState.CONFIRMED: + permissions.Add(Permissions.CONFIRMED); + break; + case MembershipState.DISCHARGED: + permissions.Add(Permissions.DISCHARGED); + break; + default: + permissions.Add(Permissions.UNCONFIRMED); + break; + } + + return permissions; + } + } +} diff --git a/UKSF.Api.Accounts/Services/Auth/SessionService.cs b/UKSF.Api.Accounts/Services/Auth/SessionService.cs new file mode 100644 index 00000000..cde9d416 --- /dev/null +++ b/UKSF.Api.Accounts/Services/Auth/SessionService.cs @@ -0,0 +1,33 @@ +using System.Linq; +using System.Security.Claims; +using Microsoft.AspNetCore.Http; +using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Models.Personnel; + +namespace UKSF.Api.Accounts.Services.Auth { + public interface ISessionService { + Account GetUserAccount(); + string GetUserEmail(); + string GetUserId(); + bool UserHasPermission(string permission); + } + + public class SessionService : ISessionService { + private readonly IAccountService accountService; + private readonly IHttpContextAccessor httpContextAccessor; + + public SessionService(IHttpContextAccessor httpContextAccessor, IAccountService accountService) { + this.httpContextAccessor = httpContextAccessor; + this.accountService = accountService; + } + + public Account GetUserAccount() => accountService.Data.GetSingle(GetUserId()); + + public string GetUserId() => httpContextAccessor.HttpContext?.User.Claims.Single(x => x.Type == ClaimTypes.Sid).Value; + + public string GetUserEmail() => httpContextAccessor.HttpContext?.User.Claims.Single(x => x.Type == ClaimTypes.Email).Value; + + public bool UserHasPermission(string permission) => + httpContextAccessor.HttpContext != null && httpContextAccessor.HttpContext.User.Claims.Any(x => x.Type == ClaimTypes.Role && x.Value == permission); + } +} diff --git a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs b/UKSF.Api.Accounts/Services/ConfirmationCodeService.cs similarity index 97% rename from UKSF.Api.Services/Utility/ConfirmationCodeService.cs rename to UKSF.Api.Accounts/Services/ConfirmationCodeService.cs index 33685356..5f356d7c 100644 --- a/UKSF.Api.Services/Utility/ConfirmationCodeService.cs +++ b/UKSF.Api.Accounts/Services/ConfirmationCodeService.cs @@ -5,9 +5,10 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Utility; +using UKSF.Api.Services; using UKSF.Api.Services.Utility.ScheduledActions; -namespace UKSF.Api.Services.Utility { +namespace UKSF.Api.Accounts.Services { public class ConfirmationCodeService : DataBackedService, IConfirmationCodeService { private readonly ISchedulerService schedulerService; diff --git a/UKSF.Api.Accounts/UKSF.Api.Accounts.csproj b/UKSF.Api.Accounts/UKSF.Api.Accounts.csproj new file mode 100644 index 00000000..c2362435 --- /dev/null +++ b/UKSF.Api.Accounts/UKSF.Api.Accounts.csproj @@ -0,0 +1,27 @@ + + + + net5.0 + UKSF.Api.Accounts + UKSF.Api.Accounts + default + + + + + C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + + + + + + + + + + + + + + diff --git a/UKSF.Api.Interfaces/Utility/ILoginService.cs b/UKSF.Api.Interfaces/Utility/ILoginService.cs deleted file mode 100644 index 07ee232c..00000000 --- a/UKSF.Api.Interfaces/Utility/ILoginService.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace UKSF.Api.Interfaces.Utility { - public interface ILoginService { - string Login(string email, string password); - string LoginWithoutPassword(string email); - string RegenerateToken(string accountId); - } -} diff --git a/UKSF.Api.Interfaces/Utility/ISessionService.cs b/UKSF.Api.Interfaces/Utility/ISessionService.cs deleted file mode 100644 index a51edcfc..00000000 --- a/UKSF.Api.Interfaces/Utility/ISessionService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Utility { - public interface ISessionService { - Account GetContextAccount(); - string GetContextEmail(); - string GetContextId(); - bool ContextHasRole(string role); - } -} diff --git a/UKSF.Api.Services/Personnel/LoginService.cs b/UKSF.Api.Services/Personnel/LoginService.cs deleted file mode 100644 index 836fd244..00000000 --- a/UKSF.Api.Services/Personnel/LoginService.cs +++ /dev/null @@ -1,138 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IdentityModel.Tokens.Jwt; -using System.Linq; -using System.Security.Claims; -using Microsoft.IdentityModel.Tokens; -using Newtonsoft.Json; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Admin; -using UKSF.Common; - -namespace UKSF.Api.Services.Personnel { - public class LoginService : ILoginService { - private readonly IAccountService accountService; - - private readonly string[] admins = {"59e38f10594c603b78aa9dbd", "5a1e894463d0f71710089106", "5a1ae0f0b9bcb113a44edada"}; - private readonly IRanksService ranksService; - private readonly IRecruitmentService recruitmentService; - private readonly IVariablesService variablesService; - private readonly IUnitsService unitsService; - private bool isPasswordReset; - - public LoginService(IAccountService accountService, IRanksService ranksService, IUnitsService unitsService, IRecruitmentService recruitmentService, IVariablesService variablesService) { - this.accountService = accountService; - this.ranksService = ranksService; - this.unitsService = unitsService; - this.recruitmentService = recruitmentService; - this.variablesService = variablesService; - isPasswordReset = false; - } - - public static SymmetricSecurityKey SecurityKey { get; set; } - public static string TokenAudience { private get; set; } - public static string TokenIssuer { private get; set; } - - public string Login(string email, string password) { - Account account = FindAccount(email, password); - return GenerateToken(account); - } - - public string LoginWithoutPassword(string email) { - isPasswordReset = true; - Account account = FindAccount(email, ""); - return GenerateToken(account); - } - - public string RegenerateToken(string accountId) => GenerateToken(accountService.Data.GetSingle(accountId)); - - private Account FindAccount(string email, string password) { - Account account = accountService.Data.GetSingle(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)); - if (account != null) { - if (!isPasswordReset) { - if (!BCrypt.Net.BCrypt.Verify(password, account.password)) { - throw new LoginFailedException("Password incorrect"); - } - } - - return account; - } - - throw new LoginFailedException($"No account found with email '{email}'"); - } - - private string GenerateToken(Account account) { - List claims = new List {new Claim(ClaimTypes.Email, account.email, ClaimValueTypes.String), new Claim(ClaimTypes.Sid, account.id, ClaimValueTypes.String)}; - ResolveRoles(claims, account); - return JsonConvert.ToString(new JwtSecurityTokenHandler().WriteToken(new JwtSecurityToken(TokenIssuer, TokenAudience, claims, DateTime.UtcNow, DateTime.UtcNow.AddDays(15), new SigningCredentials(SecurityKey, SecurityAlgorithms.HmacSha256)))); - } - - private void ResolveRoles(ICollection claims, Account account) { - switch (account.membershipState) { - case MembershipState.MEMBER: { - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.MEMBER)); - bool admin = admins.Contains(account.id); - if (admin) { - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.ADMIN)); - } - - if (admin || unitsService.MemberHasAnyRole(account.id)) { - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.COMMAND)); - } - - if (admin || account.rank != null && ranksService.IsSuperiorOrEqual(account.rank, "Senior Aircraftman")) { - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.NCO)); - } - - if (admin || recruitmentService.IsRecruiterLead(account)) { - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.RECRUITER_LEAD)); - } - - if (admin || recruitmentService.IsRecruiter(account)) { - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.RECRUITER)); - } - - string personnelId = variablesService.GetVariable("UNIT_ID_PERSONNEL").AsString(); - if (admin || unitsService.Data.GetSingle(personnelId).members.Contains(account.id)) { - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.PERSONNEL)); - } - - string[] missionsId = variablesService.GetVariable("UNIT_ID_MISSIONS").AsArray(); - if (admin || unitsService.Data.GetSingle(x => missionsId.Contains(x.id)).members.Contains(account.id)) { - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.SERVERS)); - } - - string testersId = variablesService.GetVariable("UNIT_ID_TESTERS").AsString(); - if (admin || unitsService.Data.GetSingle(testersId).members.Contains(account.id)) { - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.TESTER)); - } - - break; - } - - case MembershipState.SERVER: - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.ADMIN)); - break; - case MembershipState.CONFIRMED: - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.CONFIRMED)); - break; - case MembershipState.DISCHARGED: - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.DISCHARGED)); - break; - case MembershipState.UNCONFIRMED: break; - case MembershipState.EMPTY: break; - default: - claims.Add(new Claim(ClaimTypes.Role, RoleDefinitions.UNCONFIRMED)); - break; - } - } - } - - public class LoginFailedException : Exception { - public LoginFailedException(string message) : base(message) { } - } -} diff --git a/UKSF.Api.Services/Utility/SessionService.cs b/UKSF.Api.Services/Utility/SessionService.cs deleted file mode 100644 index b8fc40a7..00000000 --- a/UKSF.Api.Services/Utility/SessionService.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Linq; -using System.Security.Claims; -using Microsoft.AspNetCore.Http; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Services.Utility { - public class SessionService : ISessionService { - private readonly IAccountService accountService; - private readonly IHttpContextAccessor httpContextAccessor; - - public SessionService(IHttpContextAccessor httpContextAccessor, IAccountService accountService) { - this.httpContextAccessor = httpContextAccessor; - this.accountService = accountService; - } - - public Account GetContextAccount() => accountService.Data.GetSingle(GetContextId()); - - public string GetContextId() { - return httpContextAccessor.HttpContext.User.Claims.Single(x => x.Type == ClaimTypes.Sid).Value; - } - - public string GetContextEmail() { - return httpContextAccessor.HttpContext.User.Claims.Single(x => x.Type == ClaimTypes.Email).Value; - } - - public bool ContextHasRole(string role) { - return httpContextAccessor.HttpContext.User.Claims.Any(x => x.Type == ClaimTypes.Role && x.Value == role); - } - } -} diff --git a/UKSF.Api.sln b/UKSF.Api.sln index 79630841..b6aae8ca 100644 --- a/UKSF.Api.sln +++ b/UKSF.Api.sln @@ -28,6 +28,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Tests", "UKSF.Tests\UK EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Common", "UKSF.Common\UKSF.Common.csproj", "{9FB41E01-8AD4-4110-8AEE-97800CF565E8}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Accounts", "UKSF.Api.Accounts\UKSF.Api.Accounts.csproj", "{5177E103-406D-4B40-956B-FEE8756A1EE7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -116,6 +118,14 @@ Global {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x64.Build.0 = Release|Any CPU {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x86.ActiveCfg = Release|Any CPU {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x86.Build.0 = Release|Any CPU + {5177E103-406D-4B40-956B-FEE8756A1EE7}.Debug|x64.ActiveCfg = Debug|Any CPU + {5177E103-406D-4B40-956B-FEE8756A1EE7}.Debug|x64.Build.0 = Debug|Any CPU + {5177E103-406D-4B40-956B-FEE8756A1EE7}.Debug|x86.ActiveCfg = Debug|Any CPU + {5177E103-406D-4B40-956B-FEE8756A1EE7}.Debug|x86.Build.0 = Debug|Any CPU + {5177E103-406D-4B40-956B-FEE8756A1EE7}.Release|x64.ActiveCfg = Release|Any CPU + {5177E103-406D-4B40-956B-FEE8756A1EE7}.Release|x64.Build.0 = Release|Any CPU + {5177E103-406D-4B40-956B-FEE8756A1EE7}.Release|x86.ActiveCfg = Release|Any CPU + {5177E103-406D-4B40-956B-FEE8756A1EE7}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UKSF.Api/AppStart/RegisterAndWarmCachedData.cs b/UKSF.Api/AppStart/RegisterAndWarmCachedData.cs index e59e2d88..76658577 100644 --- a/UKSF.Api/AppStart/RegisterAndWarmCachedData.cs +++ b/UKSF.Api/AppStart/RegisterAndWarmCachedData.cs @@ -7,6 +7,7 @@ namespace UKSF.Api.AppStart { public static class RegisterAndWarmCachedData { + // TODO: Nah public static void Warm() { IServiceProvider serviceProvider = Global.ServiceProvider; diff --git a/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs b/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs index 261deecf..c63b5865 100644 --- a/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs @@ -26,7 +26,6 @@ namespace UKSF.Api.AppStart.Services { public static class DataBackedServiceExtensions { public static void RegisterDataBackedServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { // Non-Cached - services.AddTransient(); services.AddSingleton(); services.AddTransient(); diff --git a/UKSF.Api/AppStart/Services/RegisterDataServices.cs b/UKSF.Api/AppStart/Services/RegisterDataServices.cs index fb1a4db7..805474a4 100644 --- a/UKSF.Api/AppStart/Services/RegisterDataServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterDataServices.cs @@ -19,7 +19,6 @@ public static class DataServiceExtensions { public static void RegisterDataServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { // Non-Cached services.AddSingleton(); - services.AddTransient(); services.AddSingleton(); services.AddTransient(); diff --git a/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs b/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs index f27dace6..58fef414 100644 --- a/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterScheduledActionServices.cs @@ -5,7 +5,6 @@ namespace UKSF.Api.AppStart.Services { public static class ScheduledActionServiceExtensions { public static void RegisterScheduledActionServices(this IServiceCollection services) { - services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/UKSF.Api/AppStart/Services/ServiceExtensions.cs b/UKSF.Api/AppStart/Services/ServiceExtensions.cs index 6f616667..9fedccaa 100644 --- a/UKSF.Api/AppStart/Services/ServiceExtensions.cs +++ b/UKSF.Api/AppStart/Services/ServiceExtensions.cs @@ -62,10 +62,8 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -83,7 +81,6 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); if (currentEnvironment.IsDevelopment()) { diff --git a/UKSF.Api/Controllers/Accounts/AccountsController.cs b/UKSF.Api/Controllers/Accounts/AccountsController.cs index 785f03f4..cd1258fd 100644 --- a/UKSF.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSF.Api/Controllers/Accounts/AccountsController.cs @@ -134,7 +134,7 @@ public async Task ResendConfirmationCode() { return Ok(PubliciseAccount(account)); } - [HttpGet("under"), Authorize(Roles = RoleDefinitions.COMMAND)] + [HttpGet("under"), Authorize(Roles = Permissions.COMMAND)] public IActionResult GetAccountsUnder([FromQuery] bool reverse = false) { List accounts = new List(); @@ -240,14 +240,14 @@ private PublicAccount PubliciseAccount(Account account) { PublicAccount publicAccount = account.ToPublicAccount(); publicAccount.displayName = displayNameService.GetDisplayName(account); publicAccount.permissions = new AccountPermissions { - admin = sessionService.ContextHasRole(RoleDefinitions.ADMIN), - command = sessionService.ContextHasRole(RoleDefinitions.COMMAND), - nco = sessionService.ContextHasRole(RoleDefinitions.NCO), - personnel = sessionService.ContextHasRole(RoleDefinitions.PERSONNEL), - recruiter = sessionService.ContextHasRole(RoleDefinitions.RECRUITER), - recruiterLead = sessionService.ContextHasRole(RoleDefinitions.RECRUITER_LEAD), - servers = sessionService.ContextHasRole(RoleDefinitions.SERVERS), - tester = sessionService.ContextHasRole(RoleDefinitions.TESTER) + admin = sessionService.ContextHasRole(Permissions.ADMIN), + command = sessionService.ContextHasRole(Permissions.COMMAND), + nco = sessionService.ContextHasRole(Permissions.NCO), + personnel = sessionService.ContextHasRole(Permissions.PERSONNEL), + recruiter = sessionService.ContextHasRole(Permissions.RECRUITER), + recruiterLead = sessionService.ContextHasRole(Permissions.RECRUITER_LEAD), + servers = sessionService.ContextHasRole(Permissions.SERVERS), + tester = sessionService.ContextHasRole(Permissions.TESTER) }; return publicAccount; } diff --git a/UKSF.Api/Controllers/Accounts/OperationOrderController.cs b/UKSF.Api/Controllers/Accounts/OperationOrderController.cs index 5c8ab8df..a682112b 100644 --- a/UKSF.Api/Controllers/Accounts/OperationOrderController.cs +++ b/UKSF.Api/Controllers/Accounts/OperationOrderController.cs @@ -6,7 +6,7 @@ using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers.Accounts { - [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] + [Route("[controller]"), Permissions(Permissions.MEMBER)] public class OperationOrderController : Controller { private readonly IOperationOrderService operationOrderService; diff --git a/UKSF.Api/Controllers/Accounts/OperationReportController.cs b/UKSF.Api/Controllers/Accounts/OperationReportController.cs index b3e28046..46c8782c 100644 --- a/UKSF.Api/Controllers/Accounts/OperationReportController.cs +++ b/UKSF.Api/Controllers/Accounts/OperationReportController.cs @@ -7,7 +7,7 @@ using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers.Accounts { - [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] + [Route("[controller]"), Permissions(Permissions.MEMBER)] public class OperationReportController : Controller { private readonly IOperationReportService operationReportService; diff --git a/UKSF.Api/Controllers/Accounts/OperationsController.cs b/UKSF.Api/Controllers/Accounts/OperationsController.cs index 8ab4d85e..a3c9d597 100644 --- a/UKSF.Api/Controllers/Accounts/OperationsController.cs +++ b/UKSF.Api/Controllers/Accounts/OperationsController.cs @@ -8,7 +8,7 @@ using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers.Accounts { - [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] + [Route("[controller]"), Permissions(Permissions.MEMBER)] public class OperationsController : Controller { private readonly IMongoDatabase database; diff --git a/UKSF.Api/Controllers/ApplicationsController.cs b/UKSF.Api/Controllers/ApplicationsController.cs index 4c7f59c2..50d8dc9c 100644 --- a/UKSF.Api/Controllers/ApplicationsController.cs +++ b/UKSF.Api/Controllers/ApplicationsController.cs @@ -44,7 +44,7 @@ IDisplayNameService displayNameService this.displayNameService = displayNameService; } - [HttpPost, Authorize, Roles(RoleDefinitions.CONFIRMED)] + [HttpPost, Authorize, Permissions(Permissions.CONFIRMED)] public async Task Post([FromBody] JObject body) { Account account = sessionService.GetContextAccount(); await Update(body, account); @@ -74,7 +74,7 @@ public async Task Post([FromBody] JObject body) { return Ok(); } - [HttpPost("update"), Authorize, Roles(RoleDefinitions.CONFIRMED)] + [HttpPost("update"), Authorize, Permissions(Permissions.CONFIRMED)] public async Task PostUpdate([FromBody] JObject body) { Account account = sessionService.GetContextAccount(); await Update(body, account); diff --git a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs index 3c26d557..11059d8b 100644 --- a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs +++ b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs @@ -23,7 +23,7 @@ using UKSF.Common; namespace UKSF.Api.Controllers.CommandRequests { - [Route("[controller]"), Roles(RoleDefinitions.COMMAND)] + [Route("[controller]"), Permissions(Permissions.COMMAND)] public class CommandRequestsController : Controller { private readonly ICommandRequestCompletionService commandRequestCompletionService; private readonly ICommandRequestService commandRequestService; diff --git a/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs b/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs index 5f228814..d03b5129 100644 --- a/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs +++ b/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs @@ -34,7 +34,7 @@ public CommandRequestsCreationController(ISessionService sessionService, IAccoun sessionId = sessionService.GetContextId(); } - [HttpPut("rank"), Authorize, Roles(RoleDefinitions.COMMAND)] + [HttpPut("rank"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestRank([FromBody] CommandRequest request) { request.requester = sessionId; request.displayValue = request.value; @@ -47,7 +47,7 @@ public async Task CreateRequestRank([FromBody] CommandRequest req return Ok(); } - [HttpPut("loa"), Authorize, Roles(RoleDefinitions.MEMBER)] + [HttpPut("loa"), Authorize, Permissions(Permissions.MEMBER)] public async Task CreateRequestLoa([FromBody] CommandRequestLoa request) { DateTime now = DateTime.UtcNow; if (request.start <= now.AddDays(-1)) { @@ -73,7 +73,7 @@ public async Task CreateRequestLoa([FromBody] CommandRequestLoa r return Ok(); } - [HttpPut("discharge"), Authorize, Roles(RoleDefinitions.COMMAND)] + [HttpPut("discharge"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestDischarge([FromBody] CommandRequest request) { request.requester = sessionId; request.displayValue = "Discharged"; @@ -84,7 +84,7 @@ public async Task CreateRequestDischarge([FromBody] CommandReques return Ok(); } - [HttpPut("role"), Authorize, Roles(RoleDefinitions.COMMAND)] + [HttpPut("role"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestIndividualRole([FromBody] CommandRequest request) { request.requester = sessionId; request.displayValue = request.value; @@ -95,7 +95,7 @@ public async Task CreateRequestIndividualRole([FromBody] CommandR return Ok(); } - [HttpPut("unitrole"), Authorize, Roles(RoleDefinitions.COMMAND)] + [HttpPut("unitrole"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestUnitRole([FromBody] CommandRequest request) { Unit unit = unitsService.Data.GetSingle(request.value); bool recipientHasUnitRole = unitsService.RolesHasMember(unit, request.recipient); @@ -118,7 +118,7 @@ public async Task CreateRequestUnitRole([FromBody] CommandRequest return Ok(); } - [HttpPut("unitremoval"), Authorize, Roles(RoleDefinitions.COMMAND)] + [HttpPut("unitremoval"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestUnitRemoval([FromBody] CommandRequest request) { Unit removeUnit = unitsService.Data.GetSingle(request.value); if (removeUnit.branch == UnitBranch.COMBAT) { @@ -134,7 +134,7 @@ public async Task CreateRequestUnitRemoval([FromBody] CommandRequ return Ok(); } - [HttpPut("transfer"), Authorize, Roles(RoleDefinitions.COMMAND)] + [HttpPut("transfer"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestTransfer([FromBody] CommandRequest request) { Unit toUnit = unitsService.Data.GetSingle(request.value); request.requester = sessionId; @@ -154,7 +154,7 @@ public async Task CreateRequestTransfer([FromBody] CommandRequest return Ok(); } - [HttpPut("reinstate"), Authorize, Roles(RoleDefinitions.COMMAND, RoleDefinitions.RECRUITER, RoleDefinitions.NCO)] + [HttpPut("reinstate"), Authorize, Permissions(Permissions.COMMAND, Permissions.RECRUITER, Permissions.NCO)] public async Task CreateRequestReinstateMember([FromBody] CommandRequest request) { request.requester = sessionId; request.displayValue = "Member"; diff --git a/UKSF.Api/Controllers/CommentThreadController.cs b/UKSF.Api/Controllers/CommentThreadController.cs index b1c98d83..74658d22 100644 --- a/UKSF.Api/Controllers/CommentThreadController.cs +++ b/UKSF.Api/Controllers/CommentThreadController.cs @@ -13,7 +13,7 @@ using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers { - [Route("commentthread"), Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER, RoleDefinitions.DISCHARGED)] + [Route("commentthread"), Permissions(Permissions.CONFIRMED, Permissions.MEMBER, Permissions.DISCHARGED)] public class CommentThreadController : Controller { private readonly IAccountService accountService; private readonly ICommentThreadService commentThreadService; @@ -55,7 +55,7 @@ public IActionResult Get(string id) { public IActionResult GetCanPostComment(string id) { CommentThread commentThread = commentThreadService.Data.GetSingle(id); Account account = sessionService.GetContextAccount(); - bool admin = sessionService.ContextHasRole(RoleDefinitions.ADMIN); + bool admin = sessionService.ContextHasRole(Permissions.ADMIN); bool canPost = commentThread.mode switch { ThreadMode.RECRUITER => commentThread.authors.Any(x => x == sessionService.GetContextId()) || admin || recruitmentService.IsRecruiter(sessionService.GetContextAccount()), ThreadMode.RANKSUPERIOR => commentThread.authors.Any(x => admin || ranksService.IsSuperior(account.rank, accountService.Data.GetSingle(x).rank)), diff --git a/UKSF.Api/Controllers/DataController.cs b/UKSF.Api/Controllers/DataController.cs index 5054bc7b..14be7bc6 100644 --- a/UKSF.Api/Controllers/DataController.cs +++ b/UKSF.Api/Controllers/DataController.cs @@ -4,7 +4,7 @@ using UKSF.Api.Services.Utility; namespace UKSF.Api.Controllers { - [Route("[controller]"), Roles(RoleDefinitions.ADMIN)] + [Route("[controller]"), Permissions(Permissions.ADMIN)] public class DataController : Controller { private readonly DataCacheService dataCacheService; diff --git a/UKSF.Api/Controllers/DischargesController.cs b/UKSF.Api/Controllers/DischargesController.cs index 0c7c5a33..e971e56b 100644 --- a/UKSF.Api/Controllers/DischargesController.cs +++ b/UKSF.Api/Controllers/DischargesController.cs @@ -19,7 +19,7 @@ using UKSF.Common; namespace UKSF.Api.Controllers { - [Route("[controller]"), Roles(RoleDefinitions.PERSONNEL, RoleDefinitions.NCO, RoleDefinitions.RECRUITER)] + [Route("[controller]"), Permissions(Permissions.PERSONNEL, Permissions.NCO, Permissions.RECRUITER)] public class DischargesController : Controller { private readonly IAccountService accountService; private readonly IAssignmentService assignmentService; diff --git a/UKSF.Api/Controllers/DiscordController.cs b/UKSF.Api/Controllers/DiscordController.cs index c31a2395..70522b93 100644 --- a/UKSF.Api/Controllers/DiscordController.cs +++ b/UKSF.Api/Controllers/DiscordController.cs @@ -14,13 +14,13 @@ public class DiscordController : Controller { public DiscordController(IDiscordService discordService) => this.discordService = discordService; - [HttpGet("roles"), Authorize, Roles(RoleDefinitions.ADMIN)] + [HttpGet("roles"), Authorize, Permissions(Permissions.ADMIN)] public async Task GetRoles() { IReadOnlyCollection roles = await discordService.GetRoles(); return Ok(roles.OrderBy(x => x.Name).Select(x => $"{x.Name}: {x.Id}").Aggregate((x, y) => $"{x}\n{y}")); } - [HttpGet("updateuserroles"), Authorize, Roles(RoleDefinitions.ADMIN)] + [HttpGet("updateuserroles"), Authorize, Permissions(Permissions.ADMIN)] public async Task UpdateUserRoles() { await discordService.UpdateAllUsers(); return Ok(); diff --git a/UKSF.Api/Controllers/GameServersController.cs b/UKSF.Api/Controllers/GameServersController.cs index 987af5ca..3d26dea5 100644 --- a/UKSF.Api/Controllers/GameServersController.cs +++ b/UKSF.Api/Controllers/GameServersController.cs @@ -21,7 +21,7 @@ using UKSF.Common; namespace UKSF.Api.Controllers { - [Route("[controller]"), Roles(RoleDefinitions.NCO, RoleDefinitions.SERVERS, RoleDefinitions.COMMAND)] + [Route("[controller]"), Permissions(Permissions.NCO, Permissions.SERVERS, Permissions.COMMAND)] public class GameServersController : Controller { private readonly IGameServersService gameServersService; private readonly IHubContext serversHub; diff --git a/UKSF.Api/Controllers/Integrations/GithubController.cs b/UKSF.Api/Controllers/Integrations/GithubController.cs index 31425c5d..c2ff0fe7 100644 --- a/UKSF.Api/Controllers/Integrations/GithubController.cs +++ b/UKSF.Api/Controllers/Integrations/GithubController.cs @@ -56,10 +56,10 @@ [FromBody] JObject body } } - [HttpGet("branches"), Authorize, Roles(RoleDefinitions.TESTER)] + [HttpGet("branches"), Authorize, Permissions(Permissions.TESTER)] public async Task GetBranches() => Ok(await githubService.GetBranches()); - [HttpGet("populatereleases"), Authorize, Roles(RoleDefinitions.ADMIN)] + [HttpGet("populatereleases"), Authorize, Permissions(Permissions.ADMIN)] public async Task Release() { List releases = await githubService.GetHistoricReleases(); await releaseService.AddHistoricReleases(releases); diff --git a/UKSF.Api/Controllers/IssueController.cs b/UKSF.Api/Controllers/IssueController.cs index 32e6b9f3..8e16f10c 100644 --- a/UKSF.Api/Controllers/IssueController.cs +++ b/UKSF.Api/Controllers/IssueController.cs @@ -14,7 +14,7 @@ using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers { - [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] + [Route("[controller]"), Permissions(Permissions.MEMBER)] public class IssueController : Controller { private readonly IDisplayNameService displayNameService; private readonly IEmailService emailService; diff --git a/UKSF.Api/Controllers/LauncherController.cs b/UKSF.Api/Controllers/LauncherController.cs index 82c2dce5..79524888 100644 --- a/UKSF.Api/Controllers/LauncherController.cs +++ b/UKSF.Api/Controllers/LauncherController.cs @@ -20,7 +20,7 @@ using UKSF.Common; namespace UKSF.Api.Controllers { - [Route("[controller]"), Authorize, Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER)] + [Route("[controller]"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER)] public class LauncherController : Controller { private readonly IDisplayNameService displayNameService; private readonly ILauncherFileService launcherFileService; @@ -54,7 +54,7 @@ IVariablesService variablesService [HttpGet("version")] public IActionResult GetVersion() => Ok(variablesDataService.GetSingle("LAUNCHER_VERSION").AsString()); - [HttpPost("version"), Roles(RoleDefinitions.ADMIN)] + [HttpPost("version"), Permissions(Permissions.ADMIN)] public async Task UpdateVersion([FromBody] JObject body) { string version = body["version"].ToString(); await variablesDataService.Update("LAUNCHER_VERSION", version); diff --git a/UKSF.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs index d94068ea..1ffcc8e2 100644 --- a/UKSF.Api/Controllers/LoaController.cs +++ b/UKSF.Api/Controllers/LoaController.cs @@ -17,7 +17,7 @@ using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers { - [Route("[controller]"), Roles(RoleDefinitions.MEMBER)] + [Route("[controller]"), Permissions(Permissions.MEMBER)] public class LoaController : Controller { private readonly IAccountService accountService; private readonly IChainOfCommandService chainOfCommandService; diff --git a/UKSF.Api/Controllers/LoggingController.cs b/UKSF.Api/Controllers/LoggingController.cs index 9bd02058..654cf908 100644 --- a/UKSF.Api/Controllers/LoggingController.cs +++ b/UKSF.Api/Controllers/LoggingController.cs @@ -6,7 +6,7 @@ using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers { - [Route("[controller]"), Roles(RoleDefinitions.ADMIN)] + [Route("[controller]"), Permissions(Permissions.ADMIN)] public class LoggingController : Controller { private readonly IMongoDatabase database; diff --git a/UKSF.Api/Controllers/LoginController.cs b/UKSF.Api/Controllers/LoginController.cs deleted file mode 100644 index 1cf9a19d..00000000 --- a/UKSF.Api/Controllers/LoginController.cs +++ /dev/null @@ -1,57 +0,0 @@ -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Newtonsoft.Json.Linq; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Services.Personnel; - -namespace UKSF.Api.Controllers { - [Route("[controller]")] - public class LoginController : Controller { - private readonly ILoginService loginService; - private readonly ISessionService sessionService; - - public LoginController(ILoginService loginService, ISessionService sessionService) { - this.loginService = loginService; - this.sessionService = sessionService; - } - - [HttpGet] - public IActionResult Get() => Ok(new {isAuthenticated = HttpContext.User.Identity.IsAuthenticated}); - - [HttpPost] - public IActionResult Post([FromBody] JObject loginForm) { - try { - string loginToken = loginService.Login(loginForm["email"].ToString(), loginForm["password"].ToString()); - - if (loginToken != null) { - return Ok(loginToken); - } - - return BadRequest(new {message = "unsuccessful"}); - } catch (LoginFailedException e) { - return BadRequest(new {message = e.Message}); - } - } - - [HttpPost("server")] - public IActionResult AuthorizeAsServer([FromBody] JObject login) { - try { - string loginToken = loginService.Login(login["email"].ToString(), login["password"].ToString()); - - if (loginToken != null) { - return Ok(loginToken); - } - - return BadRequest(); - } catch (LoginFailedException) { - return BadRequest(); - } - } - - [HttpGet("refresh"), Authorize] - public IActionResult RefreshToken() { - string loginToken = loginService.RegenerateToken(sessionService.GetContextId()); - return loginToken != null ? (IActionResult) Ok(loginToken) : BadRequest(); - } - } -} diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs index 406071a6..37392863 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -18,22 +18,22 @@ public ModpackController(IModpackService modpackService, IGithubService githubSe this.githubService = githubService; } - [HttpGet("releases"), Authorize, Roles(RoleDefinitions.MEMBER)] + [HttpGet("releases"), Authorize, Permissions(Permissions.MEMBER)] public IEnumerable GetReleases() => modpackService.GetReleases(); - [HttpGet("rcs"), Authorize, Roles(RoleDefinitions.MEMBER)] + [HttpGet("rcs"), Authorize, Permissions(Permissions.MEMBER)] public IEnumerable GetReleaseCandidates() => modpackService.GetRcBuilds(); - [HttpGet("builds"), Authorize, Roles(RoleDefinitions.MEMBER)] + [HttpGet("builds"), Authorize, Permissions(Permissions.MEMBER)] public IEnumerable GetBuilds() => modpackService.GetDevBuilds(); - [HttpGet("builds/{id}"), Authorize, Roles(RoleDefinitions.MEMBER)] + [HttpGet("builds/{id}"), Authorize, Permissions(Permissions.MEMBER)] public IActionResult GetBuild(string id) { ModpackBuild build = modpackService.GetBuild(id); return build == null ? (IActionResult) BadRequest("Build does not exist") : Ok(build); } - [HttpGet("builds/{id}/step/{index}"), Authorize, Roles(RoleDefinitions.MEMBER)] + [HttpGet("builds/{id}/step/{index}"), Authorize, Permissions(Permissions.MEMBER)] public IActionResult GetBuildStep(string id, int index) { ModpackBuild build = modpackService.GetBuild(id); if (build == null) { @@ -47,7 +47,7 @@ public IActionResult GetBuildStep(string id, int index) { return BadRequest("Build step does not exist"); } - [HttpGet("builds/{id}/rebuild"), Authorize, Roles(RoleDefinitions.ADMIN)] + [HttpGet("builds/{id}/rebuild"), Authorize, Permissions(Permissions.ADMIN)] public async Task Rebuild(string id) { ModpackBuild build = modpackService.GetBuild(id); if (build == null) { @@ -58,7 +58,7 @@ public async Task Rebuild(string id) { return Ok(); } - [HttpGet("builds/{id}/cancel"), Authorize, Roles(RoleDefinitions.ADMIN)] + [HttpGet("builds/{id}/cancel"), Authorize, Permissions(Permissions.ADMIN)] public async Task CancelBuild(string id) { ModpackBuild build = modpackService.GetBuild(id); if (build == null) { @@ -69,7 +69,7 @@ public async Task CancelBuild(string id) { return Ok(); } - [HttpPatch("release/{version}"), Authorize, Roles(RoleDefinitions.ADMIN)] + [HttpPatch("release/{version}"), Authorize, Permissions(Permissions.ADMIN)] public async Task UpdateRelease(string version, [FromBody] ModpackRelease release) { if (!release.isDraft) { return BadRequest($"Release {version} is not a draft"); @@ -79,19 +79,19 @@ public async Task UpdateRelease(string version, [FromBody] Modpac return Ok(); } - [HttpGet("release/{version}"), Authorize, Roles(RoleDefinitions.ADMIN)] + [HttpGet("release/{version}"), Authorize, Permissions(Permissions.ADMIN)] public async Task Release(string version) { await modpackService.Release(version); return Ok(); } - [HttpGet("release/{version}/changelog"), Authorize, Roles(RoleDefinitions.ADMIN)] + [HttpGet("release/{version}/changelog"), Authorize, Permissions(Permissions.ADMIN)] public async Task RegenerateChangelog(string version) { await modpackService.RegnerateReleaseDraftChangelog(version); return Ok(modpackService.GetRelease(version)); } - [HttpPost("newbuild"), Authorize, Roles(RoleDefinitions.TESTER)] + [HttpPost("newbuild"), Authorize, Permissions(Permissions.TESTER)] public async Task NewBuild([FromBody] NewBuild newBuild) { if (!await githubService.IsReferenceValid(newBuild.reference)) { return BadRequest($"{newBuild.reference} cannot be built as its version does not have the required make files"); diff --git a/UKSF.Api/Controllers/RecruitmentController.cs b/UKSF.Api/Controllers/RecruitmentController.cs index d5065368..0490f344 100644 --- a/UKSF.Api/Controllers/RecruitmentController.cs +++ b/UKSF.Api/Controllers/RecruitmentController.cs @@ -33,7 +33,7 @@ public RecruitmentController(IAccountService accountService, IRecruitmentService this.notificationsService = notificationsService; } - [HttpGet, Authorize, Roles(RoleDefinitions.RECRUITER)] + [HttpGet, Authorize, Permissions(Permissions.RECRUITER)] public IActionResult GetAll() => Ok(recruitmentService.GetAllApplications()); [HttpGet("{id}"), Authorize] @@ -42,10 +42,10 @@ public IActionResult GetSingle(string id) { return Ok(recruitmentService.GetApplication(account)); } - [HttpGet("isrecruiter"), Authorize, Roles(RoleDefinitions.RECRUITER)] + [HttpGet("isrecruiter"), Authorize, Permissions(Permissions.RECRUITER)] public IActionResult GetIsRecruiter() => Ok(new {recruiter = recruitmentService.IsRecruiter(sessionService.GetContextAccount())}); - [HttpGet("stats"), Authorize, Roles(RoleDefinitions.RECRUITER)] + [HttpGet("stats"), Authorize, Permissions(Permissions.RECRUITER)] public IActionResult GetRecruitmentStats() { string account = sessionService.GetContextId(); List activity = new List(); @@ -65,7 +65,7 @@ public IActionResult GetRecruitmentStats() { return Ok(new {activity, yourStats = new {lastMonth = recruitmentService.GetStats(account, true), overall = recruitmentService.GetStats(account, false)}, sr1Stats = new {lastMonth = recruitmentService.GetStats("", true), overall = recruitmentService.GetStats("", false)}}); } - [HttpPost("{id}"), Authorize, Roles(RoleDefinitions.RECRUITER)] + [HttpPost("{id}"), Authorize, Permissions(Permissions.RECRUITER)] public async Task UpdateState([FromBody] dynamic body, string id) { ApplicationState updatedState = body.updatedState; Account account = accountService.Data.GetSingle(id); @@ -124,9 +124,9 @@ public async Task UpdateState([FromBody] dynamic body, string id) return Ok(); } - [HttpPost("recruiter/{id}"), Authorize, Roles(RoleDefinitions.RECRUITER_LEAD)] + [HttpPost("recruiter/{id}"), Authorize, Permissions(Permissions.RECRUITER_LEAD)] public async Task PostReassignment([FromBody] JObject newRecruiter, string id) { - if (!sessionService.ContextHasRole(RoleDefinitions.ADMIN) && !recruitmentService.IsRecruiterLead()) throw new Exception($"attempted to assign recruiter to {newRecruiter}. Context is not recruitment lead."); + if (!sessionService.ContextHasRole(Permissions.ADMIN) && !recruitmentService.IsRecruiterLead()) throw new Exception($"attempted to assign recruiter to {newRecruiter}. Context is not recruitment lead."); string recruiter = newRecruiter["newRecruiter"].ToString(); await recruitmentService.SetRecruiter(id, recruiter); Account account = accountService.Data.GetSingle(id); @@ -138,7 +138,7 @@ public async Task PostReassignment([FromBody] JObject newRecruite return Ok(); } - [HttpPost("ratings/{id}"), Authorize, Roles(RoleDefinitions.RECRUITER)] + [HttpPost("ratings/{id}"), Authorize, Permissions(Permissions.RECRUITER)] public async Task> Ratings([FromBody] KeyValuePair value, string id) { Dictionary ratings = accountService.Data.GetSingle(id).application.ratings; @@ -153,7 +153,7 @@ public async Task> Ratings([FromBody] KeyValuePair Ok(recruitmentService.GetActiveRecruiters()); } } diff --git a/UKSF.Api/Controllers/TeamspeakController.cs b/UKSF.Api/Controllers/TeamspeakController.cs index bc9ecab7..2b529093 100644 --- a/UKSF.Api/Controllers/TeamspeakController.cs +++ b/UKSF.Api/Controllers/TeamspeakController.cs @@ -13,10 +13,10 @@ public class TeamspeakController : Controller { public TeamspeakController(ITeamspeakService teamspeakService) => this.teamspeakService = teamspeakService; - [HttpGet("online"), Authorize, Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER, RoleDefinitions.DISCHARGED)] + [HttpGet("online"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER, Permissions.DISCHARGED)] public IEnumerable GetOnlineClients() => teamspeakService.GetFormattedClients(); - [HttpGet("shutdown"), Authorize, Roles(RoleDefinitions.ADMIN)] + [HttpGet("shutdown"), Authorize, Permissions(Permissions.ADMIN)] public async Task Shutdown() { await teamspeakService.Shutdown(); await Task.Delay(TimeSpan.FromSeconds(3)); diff --git a/UKSF.Api/Controllers/VariablesController.cs b/UKSF.Api/Controllers/VariablesController.cs index cf4ce8bb..ec5f2cbd 100644 --- a/UKSF.Api/Controllers/VariablesController.cs +++ b/UKSF.Api/Controllers/VariablesController.cs @@ -8,7 +8,7 @@ using UKSF.Common; namespace UKSF.Api.Controllers { - [Route("[controller]"), Roles(RoleDefinitions.ADMIN)] + [Route("[controller]"), Permissions(Permissions.ADMIN)] public class VariablesController : Controller { private readonly IVariablesDataService variablesDataService; diff --git a/UKSF.Api/ModsController.cs b/UKSF.Api/ModsController.cs index fbe71031..4a5d6258 100644 --- a/UKSF.Api/ModsController.cs +++ b/UKSF.Api/ModsController.cs @@ -3,7 +3,7 @@ using UKSF.Api.Services.Personnel; namespace UKSF.Api { - [Route("[controller]"), Authorize, Roles(RoleDefinitions.CONFIRMED, RoleDefinitions.MEMBER)] + [Route("[controller]"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER)] public class ModsController : Controller { // TODO: Return size of modpack folder [HttpGet("size")] diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index e4642af5..31e45372 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -41,9 +41,6 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration this.currentEnvironment = currentEnvironment; IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); builder.Build(); - LoginService.SecurityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetSection("Secrets")["tokenKey"])); - LoginService.TokenIssuer = Global.TOKEN_ISSUER; - LoginService.TokenAudience = Global.TOKEN_AUDIENCE; } public void ConfigureServices(IServiceCollection services) { @@ -61,60 +58,7 @@ public void ConfigureServices(IServiceCollection services) { ) ); services.AddSignalR().AddNewtonsoftJsonProtocol(); - services.AddAuthentication( - options => { - options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; - options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; - options.DefaultSignInScheme = CookieAuthenticationDefaults.AuthenticationScheme; - } - ) - .AddJwtBearer( - options => { - options.TokenValidationParameters = new TokenValidationParameters { - RequireExpirationTime = true, - RequireSignedTokens = true, - ValidateIssuerSigningKey = true, - IssuerSigningKey = LoginService.SecurityKey, - ValidateIssuer = true, - ValidIssuer = Global.TOKEN_ISSUER, - ValidateAudience = true, - ValidAudience = Global.TOKEN_AUDIENCE, - ValidateLifetime = true, - ClockSkew = TimeSpan.Zero - }; - options.Audience = Global.TOKEN_AUDIENCE; - options.ClaimsIssuer = Global.TOKEN_ISSUER; - options.SaveToken = true; - options.Events = new JwtBearerEvents { - OnMessageReceived = context => { - StringValues accessToken = context.Request.Query["access_token"]; - if (!string.IsNullOrEmpty(accessToken) && context.Request.Path.StartsWithSegments("/hub")) { - context.Token = accessToken; - } - - return Task.CompletedTask; - } - }; - } - ) - .AddCookie() - .AddSteam( - options => { - options.ForwardAuthenticate = JwtBearerDefaults.AuthenticationScheme; - options.Events = new OpenIdAuthenticationEvents { - OnAccessDenied = context => { - context.Response.StatusCode = 401; - return Task.CompletedTask; - }, - OnTicketReceived = context => { - string[] idParts = context.Principal.Claims.First(claim => claim.Type == "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier").Value.Split('/'); - string id = idParts[^1]; - context.ReturnUri = $"{context.ReturnUri}?id={id}"; - return Task.CompletedTask; - } - }; - } - ); + services.AddAutoMapper(typeof(AutoMapperConfigurationProfile)); services.AddControllers(); diff --git a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs index bcfc71d2..62f79ecb 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs @@ -4,11 +4,11 @@ namespace UKSF.Tests.Unit.Services.Personnel { public class RoleAttributeTests { - [Theory, InlineData("ADMIN,PERSONNEL", RoleDefinitions.ADMIN, RoleDefinitions.PERSONNEL), InlineData("ADMIN", RoleDefinitions.ADMIN), InlineData("ADMIN", RoleDefinitions.ADMIN, RoleDefinitions.ADMIN)] + [Theory, InlineData("ADMIN,PERSONNEL", Permissions.ADMIN, Permissions.PERSONNEL), InlineData("ADMIN", Permissions.ADMIN), InlineData("ADMIN", Permissions.ADMIN, Permissions.ADMIN)] public void ShouldCombineRoles(string expected, params string[] roles) { - RolesAttribute rolesAttribute = new RolesAttribute(roles); + PermissionsAttribute permissionsAttribute = new PermissionsAttribute(roles); - string subject = rolesAttribute.Roles; + string subject = permissionsAttribute.Roles; subject.Should().Be(expected); } diff --git a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs index 7fc2013b..560e7cf8 100644 --- a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs @@ -76,26 +76,26 @@ public void ShouldGetCorrectAccount() { [Fact] public void ShouldReturnTrueForValidRole() { - List claims = new List {new Claim(ClaimTypes.Role, RoleDefinitions.ADMIN)}; + List claims = new List {new Claim(ClaimTypes.Role, Permissions.ADMIN)}; ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); httpContext = new DefaultHttpContext {User = contextUser}; sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); - bool subject = sessionService.ContextHasRole(RoleDefinitions.ADMIN); + bool subject = sessionService.ContextHasRole(Permissions.ADMIN); subject.Should().BeTrue(); } [Fact] public void ShouldReturnFalseForInvalidRole() { - List claims = new List {new Claim(ClaimTypes.Role, RoleDefinitions.ADMIN)}; + List claims = new List {new Claim(ClaimTypes.Role, Permissions.ADMIN)}; ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); httpContext = new DefaultHttpContext {User = contextUser}; sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); - bool subject = sessionService.ContextHasRole(RoleDefinitions.COMMAND); + bool subject = sessionService.ContextHasRole(Permissions.COMMAND); subject.Should().BeFalse(); } From bfebe90bbe8c4e21f05056160f96b48aacbad1b1 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 21 Oct 2020 12:45:24 +0100 Subject: [PATCH 278/369] Fix contextId null during password reset --- UKSF.Api.Services/Utility/SessionService.cs | 6 +++--- UKSF.Api/Controllers/Accounts/PasswordResetController.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/UKSF.Api.Services/Utility/SessionService.cs b/UKSF.Api.Services/Utility/SessionService.cs index b8fc40a7..e902fcc6 100644 --- a/UKSF.Api.Services/Utility/SessionService.cs +++ b/UKSF.Api.Services/Utility/SessionService.cs @@ -18,15 +18,15 @@ public SessionService(IHttpContextAccessor httpContextAccessor, IAccountService public Account GetContextAccount() => accountService.Data.GetSingle(GetContextId()); public string GetContextId() { - return httpContextAccessor.HttpContext.User.Claims.Single(x => x.Type == ClaimTypes.Sid).Value; + return httpContextAccessor.HttpContext?.User.Claims.Single(x => x.Type == ClaimTypes.Sid).Value; } public string GetContextEmail() { - return httpContextAccessor.HttpContext.User.Claims.Single(x => x.Type == ClaimTypes.Email).Value; + return httpContextAccessor.HttpContext?.User.Claims.Single(x => x.Type == ClaimTypes.Email).Value; } public bool ContextHasRole(string role) { - return httpContextAccessor.HttpContext.User.Claims.Any(x => x.Type == ClaimTypes.Role && x.Value == role); + return httpContextAccessor.HttpContext != null && httpContextAccessor.HttpContext.User.Claims.Any(x => x.Type == ClaimTypes.Role && x.Value == role); } } } diff --git a/UKSF.Api/Controllers/Accounts/PasswordResetController.cs b/UKSF.Api/Controllers/Accounts/PasswordResetController.cs index 474cc812..27c75a8a 100644 --- a/UKSF.Api/Controllers/Accounts/PasswordResetController.cs +++ b/UKSF.Api/Controllers/Accounts/PasswordResetController.cs @@ -23,7 +23,7 @@ public PasswordResetController(IConfirmationCodeService confirmationCodeService, protected override async Task ApplyValidatedPayload(string codePayload, Account account) { await AccountService.Data.Update(account.id, "password", BCrypt.Net.BCrypt.HashPassword(codePayload)); - LogWrapper.AuditLog($"Password changed for {account.id}"); + LogWrapper.AuditLog($"Password changed for {account.id}", account.id); return Ok(LoginService.RegenerateToken(account.id)); } From cff795616ef0c912036830e952f8a2c5470aa064 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 24 Oct 2020 11:49:42 +0100 Subject: [PATCH 279/369] Resolve UKSF into JSFAW --- UKSF.Api.Models/Mission/MissionUnit.cs | 1 - .../Game/Missions/MissionDataResolver.cs | 41 +++---------------- .../Game/Missions/MissionPatchDataService.cs | 2 +- 3 files changed, 7 insertions(+), 37 deletions(-) diff --git a/UKSF.Api.Models/Mission/MissionUnit.cs b/UKSF.Api.Models/Mission/MissionUnit.cs index f4e4c8a6..f25f1c9f 100644 --- a/UKSF.Api.Models/Mission/MissionUnit.cs +++ b/UKSF.Api.Models/Mission/MissionUnit.cs @@ -4,7 +4,6 @@ namespace UKSF.Api.Models.Mission { public class MissionUnit { public string callsign; - public int depth; public List members = new List(); public Dictionary roles = new Dictionary(); public Unit sourceUnit; diff --git a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs index c1d6dd7a..93280793 100644 --- a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs +++ b/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs @@ -5,28 +5,6 @@ namespace UKSF.Api.Services.Game.Missions { public static class MissionDataResolver { // TODO: Add special display to variables area that resolves IDs as display names, unit names, ranks, roles, etc - // Possibly do a selection list of all items per type? - // private static readonly string[] ENGINEER_IDS = { - // "5a1e894463d0f71710089106", // Bridg - // "59e38f31594c603b78aa9dc3", // Handi - // "59e38f13594c603b78aa9dbf", // Carr - // "5bc3bccdffbf7a11b803c3f6", // Delta - // "59e3958b594c603b78aa9dcd", // Joho - // "5a2439443fccaa15902aaa4e", // Mac - // "5a4e7effd68b7e16e46fc614", // Woody - // "5a1a16ce630e7413645b73fd", // Penn - // "5a1a14b5aacf7b00346dcc37" // Gilbert - // }; - // - // private static readonly string[] MEDIC_IDS = { - // "59e3958b594c603b78aa9dcd", // Joho - // "5a2439443fccaa15902aaa4e", // Mac - // "5acfd72259f89d08ec1c21d8", // Stan - // "5e0d3273b91cc00aa001213f", // Baxter - // "5eee34c8ddf6642260aa6a4b", // Eliason - // "5e0d31c3b91cc00aa001213b", // Gibney - // "5a1a14b5aacf7b00346dcc37" // Gilbert - // }; public static string ResolveObjectClass(MissionPlayer player) { if (IsMedic(player)) return "UKSF_B_Medic"; // Team Medic @@ -40,7 +18,8 @@ public static string ResolveObjectClass(MissionPlayer player) { "5a4415d8730e9d1628345007" => "UKSF_B_Pilot_617", // "617 Squadron" "5a68b28e196530164c9b4fed" => "UKSF_B_Sniper", // "Sniper Platoon" "5b9123ca7a6c1f0e9875601c" => "UKSF_B_Medic", // "3 Medical Regiment" - "5a42835b55d6109bf0b081bd" => ResolvePlayerUnitRole(player) == 3 ? "UKSF_B_Officer" : "UKSF_B_Rifleman", // "UKSF" + // "5a42835b55d6109bf0b081bd" => ResolvePlayerUnitRole(player) == 3 ? "UKSF_B_Officer" : "UKSF_B_Rifleman", // "UKSF" + "5a42835b55d6109bf0b081bd" => "UKSF_B_Pilot", // "UKSF" _ => ResolvePlayerUnitRole(player) != -1 ? "UKSF_B_SectionLeader" : "UKSF_B_Rifleman" }; } @@ -59,6 +38,7 @@ private static int ResolvePlayerUnitRole(MissionPlayer player) { public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) { return unit.sourceUnit.id switch { + "5a42835b55d6109bf0b081bd" => "JSFAW", // "UKSF" "5a435eea905d47336442c75a" => "JSFAW", // "Joint Special Forces Aviation Wing" "5a441619730e9d162834500b" => "JSFAW", // "7 Squadron" "5a441602730e9d162834500a" => "JSFAW", // "656 Squadron" @@ -73,6 +53,7 @@ public static void ResolveSpecialUnits(ref List orderedUnits) { List newOrderedUnits = new List(); foreach (MissionUnit unit in orderedUnits) { switch (unit.sourceUnit.id) { + case "5a42835b55d6109bf0b081bd": // "UKSF" case "5a441619730e9d162834500b": // "7 Squadron" case "5a441602730e9d162834500a": // "656 Squadron" case "5a4415d8730e9d1628345007": // "617 Squadron" @@ -94,6 +75,7 @@ public static List ResolveUnitSlots(MissionUnit unit) { int fillerCount; switch (unit.sourceUnit.id) { case "5a435eea905d47336442c75a": // "Joint Special Forces Aviation Wing" + slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a42835b55d6109bf0b081bd")?.members ?? new List()); slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a435eea905d47336442c75a")?.members ?? new List()); slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a441619730e9d162834500b")?.members ?? new List()); slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a441602730e9d162834500a")?.members ?? new List()); @@ -141,20 +123,9 @@ public static List ResolveUnitSlots(MissionUnit unit) { (a, b) => { int roleA = ResolvePlayerUnitRole(a); int roleB = ResolvePlayerUnitRole(b); - int unitDepthA = a.unit.depth; - int unitDepthB = b.unit.depth; - int unitOrderA = a.unit.sourceUnit.order; - int unitOrderB = b.unit.sourceUnit.order; int rankA = MissionPatchData.instance.ranks.IndexOf(a.rank); int rankB = MissionPatchData.instance.ranks.IndexOf(b.rank); - return unitDepthA < unitDepthB ? -1 : - unitDepthA > unitDepthB ? 1 : - unitOrderA < unitOrderB ? -1 : - unitOrderA > unitOrderB ? 1 : - roleA < roleB ? 1 : - roleA > roleB ? -1 : - rankA < rankB ? -1 : - rankA > rankB ? 1 : string.CompareOrdinal(a.name, b.name); + return roleA < roleB ? 1 : roleA > roleB ? -1 : rankA < rankB ? -1 : rankA > rankB ? 1 : string.CompareOrdinal(a.name, b.name); } ); return slots; diff --git a/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs b/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs index d1023189..cf486dc4 100644 --- a/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs @@ -33,7 +33,7 @@ public void UpdatePatchData() { }; foreach (Unit unit in unitsService.Data.Get(x => x.branch == UnitBranch.COMBAT).ToList()) { - MissionPatchData.instance.units.Add(new MissionUnit { sourceUnit = unit, depth = unitsService.GetUnitDepth(unit) }); + MissionPatchData.instance.units.Add(new MissionUnit { sourceUnit = unit }); } foreach (Account account in accountService.Data.Get().Where(x => !string.IsNullOrEmpty(x.rank) && ranksService.IsSuperiorOrEqual(x.rank, "Recruit"))) { From 33a3ea7683f2c55bc0f0a863015eb4e956ca66a9 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 29 Oct 2020 13:04:58 +0000 Subject: [PATCH 280/369] Edit discord release notification --- .../Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs index 0d50226f..cc68cd74 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs @@ -47,6 +47,6 @@ protected override async Task ProcessExecute() { private string GetDiscordMessage(ModpackRelease release = null) => release == null ? $"Modpack RC Build - {Build.version} RC# {Build.buildNumber}\n{GetBuildMessage()}\n<{GetBuildLink()}>" - : $"Modpack Update - {release.version}\nChangelog: \n\n```{release.description}```"; + : $"Modpack Update - {release.version}\nFull Changelog: \n\nSummary:\n```{release.description}```"; } } From ccb10bc86e27c09b2913e3bf4b20dbc39ddc588d Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 1 Nov 2020 23:59:01 +0000 Subject: [PATCH 281/369] Progress on refactor --- UKSF.Api.Admin/ApiAdminExtensions.cs | 17 ++- .../Controllers/VariablesController.cs | 13 +- .../Controllers/VersionController.cs | 2 - .../EventHandlers/LogEventHandler.cs | 44 +++--- UKSF.Api.Admin/Services/DataCacheService.cs | 17 ++- .../SignalrHubs/Clients/IAdminClient.cs | 11 +- UKSF.Api.Admin/UKSF.Api.Admin.csproj | 16 +-- UKSF.Api.Auth/ApiAuthExtensions.cs | 1 - UKSF.Api.Auth/Controllers/LoginController.cs | 1 + UKSF.Api.Auth/Services/LoginService.cs | 2 + UKSF.Api.Auth/Services/PermissionsService.cs | 5 + UKSF.Api.Auth/Services/SessionService.cs | 20 --- UKSF.Api.Auth/UKSF.Api.Auth.csproj | 16 +-- UKSF.Api.Base/ApiBaseExtensions.cs | 5 +- UKSF.Api.Base/Events/LogEventBus.cs | 54 ++++++++ .../Extensions}/ChangeUtilities.cs | 2 +- .../Extensions/CollectionExtensions.cs | 4 +- .../Extensions/DateExtensions.cs | 4 +- .../Extensions}/GuardUtilites.cs | 2 +- .../Extensions/JsonExtensions.cs | 7 +- .../Extensions/ObservableExtensions.cs | 12 ++ .../Extensions}/ProcessUtilities.cs | 2 +- UKSF.Api.Base/Extensions/StringExtensions.cs | 4 +- .../Extensions}/TaskUtilities.cs | 8 +- UKSF.Api.Base/Models/Logging/AuditLog.cs | 10 ++ UKSF.Api.Base/Models/Logging/BasicLog.cs | 30 ++++ UKSF.Api.Base/Models/Logging/HttpErrorLog.cs | 19 +++ UKSF.Api.Base/Models/Logging/LauncherLog.cs | 9 ++ .../Services}/Clock.cs | 2 +- .../Services/Data/CachedDataService.cs | 3 +- UKSF.Api.Base/Services/Data/DataService.cs | 3 +- UKSF.Api.Base/UKSF.Api.Base.csproj | 24 +--- UKSF.Api.Data/Personnel/LoaDataService.cs | 10 -- UKSF.Api.Data/UKSF.Api.Data.csproj | 5 + .../Data/Cached/IAccountDataService.cs | 5 - .../Data/Cached/ICommentThreadDataService.cs | 9 -- .../Data/Cached/IDischargeDataService.cs | 5 - .../Data/Cached/ILoaDataService.cs | 5 - .../Data/Cached/INotificationsDataService.cs | 5 - .../Data/Cached/IRanksDataService.cs | 9 -- .../Data/Cached/IRolesDataService.cs | 9 -- .../Data/Cached/IUnitsDataService.cs | 5 - .../Data/IConfirmationCodeDataService.cs | 5 - UKSF.Api.Interfaces/Data/ILogDataService.cs | 10 -- .../Events/Handlers/IAccountEventHandler.cs | 3 - .../Handlers/ICommentThreadEventHandler.cs | 3 - .../Handlers/INotificationsEventHandler.cs | 3 - .../Message/ICommentThreadService.cs | 14 -- UKSF.Api.Interfaces/Message/IEmailService.cs | 5 - .../Message/INotificationsService.cs | 16 --- .../Personnel/IAccountService.cs | 5 - .../Personnel/IAssignmentService.cs | 14 -- .../Personnel/IAttendanceService.cs | 9 -- .../Personnel/IDischargeService.cs | 5 - .../Personnel/IDisplayNameService.cs | 9 -- UKSF.Api.Interfaces/Personnel/ILoaService.cs | 15 -- .../Personnel/IRanksService.cs | 11 -- .../Personnel/IRecruitmentService.cs | 19 --- .../Personnel/IRolesService.cs | 9 -- .../Personnel/IServiceRecordService.cs | 5 - UKSF.Api.Interfaces/Units/IUnitsService.cs | 38 ----- .../Utility/IConfirmationCodeService.cs | 12 -- UKSF.Api.Logging/ApiLoggingExtensions.cs | 21 --- UKSF.Api.Logging/Models/AuditLogMessage.cs | 5 - UKSF.Api.Logging/Models/BasicLogMessage.cs | 32 ----- UKSF.Api.Logging/Models/LauncherLogMessage.cs | 9 -- UKSF.Api.Logging/Models/WebLogMessage.cs | 19 --- .../Services/Data/LogDataService.cs | 35 ----- UKSF.Api.Logging/Services/LoggingService.cs | 73 ---------- UKSF.Api.Logging/UKSF.Api.Logging.csproj | 24 ---- .../Personnel/AccountPermissions.cs | 12 -- UKSF.Api.Models/Personnel/PublicAccount.cs | 8 -- UKSF.Api.Models/UKSF.Api.Models.csproj | 6 +- UKSF.Api.Personnel/ApiPersonnelExtensions.cs | 54 ++++++++ .../Controllers}/AccountsController.cs | 67 ++++----- .../Controllers/ApplicationsController.cs | 33 +++-- .../Controllers}/CommunicationsController.cs | 27 ++-- .../Controllers}/ConfirmationCodeReceiver.cs | 8 +- .../Controllers/DischargesController.cs | 42 +++--- .../Controllers}/DiscordCodeController.cs | 23 +-- .../Controllers}/DisplayNameController.cs | 4 +- .../Controllers}/PasswordResetController.cs | 21 +-- .../Controllers/RanksController.cs | 22 +-- .../Controllers/RecruitmentController.cs | 44 +++--- .../Controllers/RolesController.cs | 25 ++-- .../Controllers}/ServiceRecordsController.cs | 2 +- .../Controllers}/SteamCodeController.cs | 24 ++-- .../Controllers/UnitsController.cs | 29 ++-- .../EventHandlers}/AccountEventHandler.cs | 29 ++-- .../CommentThreadEventHandler.cs | 36 +++-- .../NotificationsEventHandler.cs | 26 ++-- .../Extensions/AccountExtensions.cs | 9 +- .../Models}/Account.cs | 7 +- .../Models}/AccountAttendanceStatus.cs | 2 +- .../Models}/AccountSettings.cs | 2 +- .../Models}/Application.cs | 2 +- .../Models}/AttendanceReport.cs | 2 +- .../Models}/Comment.cs | 3 +- .../Models}/CommentThread.cs | 3 +- .../Models}/ConfirmationCode.cs | 4 +- .../Models}/Discharge.cs | 3 +- .../Models}/Loa.cs | 3 +- .../Models}/MembershipState.cs | 2 +- .../Models}/Notification.cs | 5 +- .../Models}/NotificationIcons.cs | 2 +- .../Models}/Rank.cs | 4 +- .../Models}/Role.cs | 4 +- .../Models}/ServiceRecord.cs | 2 +- .../Models}/Unit.cs | 6 +- .../DeleteExpiredConfirmationCodeAction.cs | 5 +- UKSF.Api.Personnel/Services/AccountService.cs | 18 +++ .../Services}/AssignmentService.cs | 30 ++-- .../Services/AttendanceService.cs | 62 +++++++++ .../Services}/CommentThreadService.cs | 19 ++- .../Services/ConfirmationCodeService.cs | 18 ++- .../Services/Data}/AccountDataService.cs | 12 +- .../Data}/CommentThreadDataService.cs | 16 ++- .../{ => Data}/ConfirmationCodeDataService.cs | 11 +- .../Services/Data}/DischargeDataService.cs | 12 +- .../Services/Data/LoaDataService.cs | 12 ++ .../Data}/NotificationsDataService.cs | 12 +- .../Services/Data}/RanksDataService.cs | 15 +- .../Services/Data}/RolesDataService.cs | 15 +- .../Services/Data}/UnitsDataService.cs | 12 +- .../Services/DischargeService.cs | 10 ++ .../Services/DisplayNameService.cs | 11 +- .../Services}/EmailService.cs | 7 +- .../Services}/LoaService.cs | 16 ++- .../Services}/NotificationsService.cs | 45 +++--- .../Services/ObjectIdConversionService.cs | 35 +++++ .../Services}/RanksService.cs | 17 ++- .../Services}/RecruitmentService.cs | 43 +++--- .../Services}/RolesService.cs | 13 +- .../Services}/ServiceRecordService.cs | 9 +- .../Services}/UnitsService.cs | 40 +++++- .../SignalrHubs/Clients}/IAccountClient.cs | 2 +- .../Clients}/ICommentThreadClient.cs | 2 +- .../Clients}/INotificationsClient.cs | 2 +- .../SignalrHubs/Hubs}/AccountHub.cs | 4 +- .../SignalrHubs/Hubs}/CommentThreadHub.cs | 4 +- .../SignalrHubs/Hubs}/NotificationsHub.cs | 4 +- UKSF.Api.Personnel/UKSF.Api.Personnel.csproj | 15 +- UKSF.Api.Services/Admin/MigrationUtility.cs | 131 ------------------ .../Command/ChainOfCommandService.cs | 13 +- .../CommandRequestCompletionService.cs | 47 ++++--- .../Command/CommandRequestService.cs | 11 +- .../Common/DisplayNameUtilities.cs | 33 ----- UKSF.Api.Services/Common/ServiceWrapper.cs | 7 - UKSF.Api.Services/ExceptionHandler.cs | 23 +-- UKSF.Api.Services/Game/GameServerHelpers.cs | 11 +- .../Game/Missions/MissionPatchingService.cs | 12 +- UKSF.Api.Services/Game/ServerService.cs | 1 - .../Integrations/DiscordService.cs | 19 ++- .../Integrations/Github/GithubService.cs | 12 +- .../Integrations/InstagramService.cs | 28 ++-- UKSF.Api.Services/Message/LogWrapper.cs | 17 --- .../BuildProcess/BuildProcessorService.cs | 5 +- .../Modpack/BuildProcess/BuildQueueService.cs | 2 +- UKSF.Api.Services/Modpack/BuildsService.cs | 15 +- UKSF.Api.Services/Modpack/ModpackService.cs | 30 ++-- UKSF.Api.Services/Modpack/ReleaseService.cs | 11 +- UKSF.Api.Services/Personnel/AccountService.cs | 8 -- .../Personnel/AttendanceService.cs | 61 -------- .../Personnel/DischargeService.cs | 8 -- UKSF.Api.Services/UKSF.Api.Services.csproj | 7 + UKSF.Api.Signalr/UKSF.Api.Signalr.csproj | 4 - .../Services/ScheduledActionService.cs | 4 +- UKSF.Api.Utility/Services/SchedulerService.cs | 2 +- UKSF.Api.Utility/UKSF.Api.Utility.csproj | 17 +-- UKSF.Api.sln | 20 --- .../AutoMapperConfigurationProfile.cs | 2 +- UKSF.Api/AppStart/EventHandlerInitialiser.cs | 42 ------ .../AppStart/RegisterAndWarmCachedData.cs | 55 -------- UKSF.Api/AppStart/RegisterScheduledActions.cs | 20 --- .../Services/RegisterDataBackedServices.cs | 30 ++-- .../AppStart/Services/RegisterDataServices.cs | 26 ++-- .../Services/RegisterEventServices.cs | 30 +--- .../AppStart/Services/ServiceExtensions.cs | 13 +- UKSF.Api/AppStart/StartServices.cs | 19 +-- .../Accounts/OperationOrderController.cs | 1 - .../Accounts/OperationReportController.cs | 1 - .../Accounts/OperationsController.cs | 1 - .../CommandRequestsController.cs | 28 ++-- .../CommandRequestsCreationController.cs | 12 +- .../Controllers/CommentThreadController.cs | 23 +-- .../DiscordConnectionController.cs | 15 +- UKSF.Api/Controllers/DiscordController.cs | 1 - UKSF.Api/Controllers/GameServersController.cs | 33 +++-- .../Integrations/GithubController.cs | 1 - UKSF.Api/Controllers/IssueController.cs | 14 +- UKSF.Api/Controllers/LauncherController.cs | 18 ++- UKSF.Api/Controllers/LoaController.cs | 25 ++-- UKSF.Api/Controllers/LoggingController.cs | 1 - .../Controllers/Modpack/ModpackController.cs | 1 - UKSF.Api/Controllers/TeamspeakController.cs | 2 - UKSF.Api/EventHandlers/LoggerEventHandler.cs | 50 +++++++ UKSF.Api/Global.cs | 2 - UKSF.Api/ModsController.cs | 1 - UKSF.Api/Services/Data/LogDataService.cs | 30 ++++ UKSF.Api/Services/MigrationUtility.cs | 43 ++++++ UKSF.Api/Startup.cs | 26 ++-- UKSF.Api/UKSF.Api.csproj | 7 +- UKSF.Common/DataUtilies.cs | 7 - UKSF.Common/UKSF.Common.csproj | 2 +- .../Integration/Data/DataCollectionTests.cs | 2 +- .../Unit/Common/ChangeUtilitiesTests.cs | 2 +- .../Message/CommentThreadDataServiceTests.cs | 4 +- .../Unit/Data/Message/LogDataServiceTests.cs | 1 - .../Personnel/DischargeDataServiceTests.cs | 4 +- .../Data/Personnel/RanksDataServiceTests.cs | 4 +- .../Data/Personnel/RolesDataServiceTests.cs | 4 +- .../Unit/Data/SimpleDataServiceTests.cs | 8 +- .../Unit/Data/Units/UnitsDataServiceTests.cs | 6 +- .../Handlers/AccountEventHandlerTests.cs | 19 +-- .../CommentThreadEventHandlerTests.cs | 6 +- .../NotificationsEventHandlerTests.cs | 6 +- .../Handlers/TeamspeakEventHandlerTests.cs | 2 +- .../Unit/Models/AccountSettingsTests.cs | 2 +- .../Services/Admin/VariablesServiceTests.cs | 1 - .../Services/Common/AccountUtilitiesTests.cs | 3 +- .../Common/DisplayNameUtilitiesTests.cs | 17 ++- .../Teamspeak/TeamspeakGroupServiceTests.cs | 7 +- .../Personnel/DisplayNameServiceTests.cs | 3 +- .../Services/Personnel/LoaServiceTests.cs | 4 +- .../Services/Personnel/RanksServiceTests.cs | 4 +- .../Services/Personnel/RoleAttributeTests.cs | 1 - .../Services/Personnel/RolesServiceTests.cs | 4 +- .../Utility/ConfirmationCodeServiceTests.cs | 1 + .../ScheduledActions/PruneDataActionTests.cs | 2 +- .../Services/Utility/SessionServiceTests.cs | 10 +- 230 files changed, 1448 insertions(+), 1839 deletions(-) delete mode 100644 UKSF.Api.Auth/Services/SessionService.cs create mode 100644 UKSF.Api.Base/Events/LogEventBus.cs rename {UKSF.Common => UKSF.Api.Base/Extensions}/ChangeUtilities.cs (99%) rename UKSF.Common/CollectionUtilities.cs => UKSF.Api.Base/Extensions/CollectionExtensions.cs (69%) rename UKSF.Common/DateUtilities.cs => UKSF.Api.Base/Extensions/DateExtensions.cs (86%) rename {UKSF.Common => UKSF.Api.Base/Extensions}/GuardUtilites.cs (97%) rename UKSF.Common/JsonUtilities.cs => UKSF.Api.Base/Extensions/JsonExtensions.cs (64%) create mode 100644 UKSF.Api.Base/Extensions/ObservableExtensions.cs rename {UKSF.Common => UKSF.Api.Base/Extensions}/ProcessUtilities.cs (98%) rename {UKSF.Common => UKSF.Api.Base/Extensions}/TaskUtilities.cs (65%) create mode 100644 UKSF.Api.Base/Models/Logging/AuditLog.cs create mode 100644 UKSF.Api.Base/Models/Logging/BasicLog.cs create mode 100644 UKSF.Api.Base/Models/Logging/HttpErrorLog.cs create mode 100644 UKSF.Api.Base/Models/Logging/LauncherLog.cs rename {UKSF.Common => UKSF.Api.Base/Services}/Clock.cs (90%) delete mode 100644 UKSF.Api.Data/Personnel/LoaDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/IConfirmationCodeDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/ILogDataService.cs delete mode 100644 UKSF.Api.Interfaces/Events/Handlers/IAccountEventHandler.cs delete mode 100644 UKSF.Api.Interfaces/Events/Handlers/ICommentThreadEventHandler.cs delete mode 100644 UKSF.Api.Interfaces/Events/Handlers/INotificationsEventHandler.cs delete mode 100644 UKSF.Api.Interfaces/Message/ICommentThreadService.cs delete mode 100644 UKSF.Api.Interfaces/Message/IEmailService.cs delete mode 100644 UKSF.Api.Interfaces/Message/INotificationsService.cs delete mode 100644 UKSF.Api.Interfaces/Personnel/IAccountService.cs delete mode 100644 UKSF.Api.Interfaces/Personnel/IAssignmentService.cs delete mode 100644 UKSF.Api.Interfaces/Personnel/IAttendanceService.cs delete mode 100644 UKSF.Api.Interfaces/Personnel/IDischargeService.cs delete mode 100644 UKSF.Api.Interfaces/Personnel/IDisplayNameService.cs delete mode 100644 UKSF.Api.Interfaces/Personnel/ILoaService.cs delete mode 100644 UKSF.Api.Interfaces/Personnel/IRanksService.cs delete mode 100644 UKSF.Api.Interfaces/Personnel/IRecruitmentService.cs delete mode 100644 UKSF.Api.Interfaces/Personnel/IRolesService.cs delete mode 100644 UKSF.Api.Interfaces/Personnel/IServiceRecordService.cs delete mode 100644 UKSF.Api.Interfaces/Units/IUnitsService.cs delete mode 100644 UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs delete mode 100644 UKSF.Api.Logging/ApiLoggingExtensions.cs delete mode 100644 UKSF.Api.Logging/Models/AuditLogMessage.cs delete mode 100644 UKSF.Api.Logging/Models/BasicLogMessage.cs delete mode 100644 UKSF.Api.Logging/Models/LauncherLogMessage.cs delete mode 100644 UKSF.Api.Logging/Models/WebLogMessage.cs delete mode 100644 UKSF.Api.Logging/Services/Data/LogDataService.cs delete mode 100644 UKSF.Api.Logging/Services/LoggingService.cs delete mode 100644 UKSF.Api.Logging/UKSF.Api.Logging.csproj delete mode 100644 UKSF.Api.Models/Personnel/AccountPermissions.cs delete mode 100644 UKSF.Api.Models/Personnel/PublicAccount.cs create mode 100644 UKSF.Api.Personnel/ApiPersonnelExtensions.cs rename {UKSF.Api/Controllers/Accounts => UKSF.Api.Personnel/Controllers}/AccountsController.cs (82%) rename {UKSF.Api => UKSF.Api.Personnel}/Controllers/ApplicationsController.cs (85%) rename {UKSF.Api/Controllers/Accounts => UKSF.Api.Personnel/Controllers}/CommunicationsController.cs (88%) rename {UKSF.Api/Controllers/Accounts => UKSF.Api.Personnel/Controllers}/ConfirmationCodeReceiver.cs (93%) rename {UKSF.Api => UKSF.Api.Personnel}/Controllers/DischargesController.cs (77%) rename {UKSF.Api/Controllers/Accounts => UKSF.Api.Personnel/Controllers}/DiscordCodeController.cs (64%) rename {UKSF.Api/Controllers/Personnel => UKSF.Api.Personnel/Controllers}/DisplayNameController.cs (84%) rename {UKSF.Api/Controllers/Accounts => UKSF.Api.Personnel/Controllers}/PasswordResetController.cs (80%) rename {UKSF.Api => UKSF.Api.Personnel}/Controllers/RanksController.cs (85%) rename {UKSF.Api => UKSF.Api.Personnel}/Controllers/RecruitmentController.cs (84%) rename {UKSF.Api => UKSF.Api.Personnel}/Controllers/RolesController.cs (90%) rename {UKSF.Api/Controllers/Accounts => UKSF.Api.Personnel/Controllers}/ServiceRecordsController.cs (76%) rename {UKSF.Api/Controllers/Accounts => UKSF.Api.Personnel/Controllers}/SteamCodeController.cs (61%) rename {UKSF.Api => UKSF.Api.Personnel}/Controllers/UnitsController.cs (95%) rename {UKSF.Api.Events/Handlers => UKSF.Api.Personnel/EventHandlers}/AccountEventHandler.cs (62%) rename {UKSF.Api.Events/Handlers => UKSF.Api.Personnel/EventHandlers}/CommentThreadEventHandler.cs (61%) rename {UKSF.Api.Events/Handlers => UKSF.Api.Personnel/EventHandlers}/NotificationsEventHandler.cs (62%) rename UKSF.Api.Services/Common/AccountUtilities.cs => UKSF.Api.Personnel/Extensions/AccountExtensions.cs (57%) rename {UKSF.Api.Models/Personnel => UKSF.Api.Personnel/Models}/Account.cs (89%) rename {UKSF.Api.Models/Personnel => UKSF.Api.Personnel/Models}/AccountAttendanceStatus.cs (93%) rename {UKSF.Api.Models/Personnel => UKSF.Api.Personnel/Models}/AccountSettings.cs (93%) rename {UKSF.Api.Models/Personnel => UKSF.Api.Personnel/Models}/Application.cs (94%) rename {UKSF.Api.Models/Personnel => UKSF.Api.Personnel/Models}/AttendanceReport.cs (69%) rename {UKSF.Api.Models/Message => UKSF.Api.Personnel/Models}/Comment.cs (80%) rename {UKSF.Api.Models/Message => UKSF.Api.Personnel/Models}/CommentThread.cs (86%) rename {UKSF.Api.Models/Utility => UKSF.Api.Personnel/Models}/ConfirmationCode.cs (56%) rename {UKSF.Api.Models/Personnel => UKSF.Api.Personnel/Models}/Discharge.cs (91%) rename {UKSF.Api.Models/Personnel => UKSF.Api.Personnel/Models}/Loa.cs (88%) rename {UKSF.Api.Models/Personnel => UKSF.Api.Personnel/Models}/MembershipState.cs (78%) rename {UKSF.Api.Models/Message => UKSF.Api.Personnel/Models}/Notification.cs (78%) rename {UKSF.Api.Models/Message => UKSF.Api.Personnel/Models}/NotificationIcons.cs (90%) rename {UKSF.Api.Models/Personnel => UKSF.Api.Personnel/Models}/Rank.cs (75%) rename {UKSF.Api.Models/Personnel => UKSF.Api.Personnel/Models}/Role.cs (76%) rename {UKSF.Api.Models/Personnel => UKSF.Api.Personnel/Models}/ServiceRecord.cs (96%) rename {UKSF.Api.Models/Units => UKSF.Api.Personnel/Models}/Unit.cs (94%) rename {UKSF.Api.Utility => UKSF.Api.Personnel}/ScheduledActions/DeleteExpiredConfirmationCodeAction.cs (87%) create mode 100644 UKSF.Api.Personnel/Services/AccountService.cs rename {UKSF.Api.Services/Personnel => UKSF.Api.Personnel/Services}/AssignmentService.cs (92%) create mode 100644 UKSF.Api.Personnel/Services/AttendanceService.cs rename {UKSF.Api.Services/Message => UKSF.Api.Personnel/Services}/CommentThreadService.cs (72%) rename {UKSF.Api.Data/Personnel => UKSF.Api.Personnel/Services/Data}/AccountDataService.cs (50%) rename {UKSF.Api.Data/Message => UKSF.Api.Personnel/Services/Data}/CommentThreadDataService.cs (72%) rename UKSF.Api.Personnel/Services/{ => Data}/ConfirmationCodeDataService.cs (55%) rename {UKSF.Api.Data/Personnel => UKSF.Api.Personnel/Services/Data}/DischargeDataService.cs (68%) create mode 100644 UKSF.Api.Personnel/Services/Data/LoaDataService.cs rename {UKSF.Api.Data/Message => UKSF.Api.Personnel/Services/Data}/NotificationsDataService.cs (52%) rename {UKSF.Api.Data/Personnel => UKSF.Api.Personnel/Services/Data}/RanksDataService.cs (64%) rename {UKSF.Api.Data/Personnel => UKSF.Api.Personnel/Services/Data}/RolesDataService.cs (64%) rename {UKSF.Api.Data/Units => UKSF.Api.Personnel/Services/Data}/UnitsDataService.cs (66%) create mode 100644 UKSF.Api.Personnel/Services/DischargeService.cs rename {UKSF.Api.Services/Message => UKSF.Api.Personnel/Services}/EmailService.cs (86%) rename {UKSF.Api.Services/Personnel => UKSF.Api.Personnel/Services}/LoaService.cs (75%) rename {UKSF.Api.Services/Message => UKSF.Api.Personnel/Services}/NotificationsService.cs (69%) create mode 100644 UKSF.Api.Personnel/Services/ObjectIdConversionService.cs rename {UKSF.Api.Services/Personnel => UKSF.Api.Personnel/Services}/RanksService.cs (78%) rename {UKSF.Api.Services/Personnel => UKSF.Api.Personnel/Services}/RecruitmentService.cs (91%) rename {UKSF.Api.Services/Personnel => UKSF.Api.Personnel/Services}/RolesService.cs (65%) rename {UKSF.Api.Services/Personnel => UKSF.Api.Personnel/Services}/ServiceRecordService.cs (73%) rename {UKSF.Api.Services/Units => UKSF.Api.Personnel/Services}/UnitsService.cs (82%) rename {UKSF.Api.Interfaces/Hubs => UKSF.Api.Personnel/SignalrHubs/Clients}/IAccountClient.cs (69%) rename {UKSF.Api.Interfaces/Hubs => UKSF.Api.Personnel/SignalrHubs/Clients}/ICommentThreadClient.cs (76%) rename {UKSF.Api.Interfaces/Hubs => UKSF.Api.Personnel/SignalrHubs/Clients}/INotificationsClient.cs (84%) rename {UKSF.Api.Signalr/Hubs/Personnel => UKSF.Api.Personnel/SignalrHubs/Hubs}/AccountHub.cs (90%) rename {UKSF.Api.Signalr/Hubs/Message => UKSF.Api.Personnel/SignalrHubs/Hubs}/CommentThreadHub.cs (90%) rename {UKSF.Api.Signalr/Hubs/Message => UKSF.Api.Personnel/SignalrHubs/Hubs}/NotificationsHub.cs (90%) delete mode 100644 UKSF.Api.Services/Admin/MigrationUtility.cs delete mode 100644 UKSF.Api.Services/Common/DisplayNameUtilities.cs delete mode 100644 UKSF.Api.Services/Common/ServiceWrapper.cs delete mode 100644 UKSF.Api.Services/Message/LogWrapper.cs delete mode 100644 UKSF.Api.Services/Personnel/AccountService.cs delete mode 100644 UKSF.Api.Services/Personnel/AttendanceService.cs delete mode 100644 UKSF.Api.Services/Personnel/DischargeService.cs delete mode 100644 UKSF.Api/AppStart/EventHandlerInitialiser.cs delete mode 100644 UKSF.Api/AppStart/RegisterAndWarmCachedData.cs delete mode 100644 UKSF.Api/AppStart/RegisterScheduledActions.cs create mode 100644 UKSF.Api/EventHandlers/LoggerEventHandler.cs create mode 100644 UKSF.Api/Services/Data/LogDataService.cs create mode 100644 UKSF.Api/Services/MigrationUtility.cs delete mode 100644 UKSF.Common/DataUtilies.cs diff --git a/UKSF.Api.Admin/ApiAdminExtensions.cs b/UKSF.Api.Admin/ApiAdminExtensions.cs index e9aed121..84917f59 100644 --- a/UKSF.Api.Admin/ApiAdminExtensions.cs +++ b/UKSF.Api.Admin/ApiAdminExtensions.cs @@ -1,25 +1,30 @@ -using Microsoft.Extensions.Configuration; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Admin.EventHandlers; using UKSF.Api.Admin.Models; using UKSF.Api.Admin.Services; using UKSF.Api.Admin.Services.Data; +using UKSF.Api.Admin.SignalrHubs.Hubs; using UKSF.Api.Base.Events; namespace UKSF.Api.Admin { public static class ApiAdminExtensions { - - public static IServiceCollection AddUksfAdmin(this IServiceCollection services, IConfiguration configuration) { - - services.AddSingleton(); + public static IServiceCollection AddUksfAdmin(this IServiceCollection services) { + services.AddSingleton(); services.AddSingleton(); services.AddTransient(); services.AddSingleton, DataEventBus>(); - services.AddSingleton(); + services.AddSingleton(); return services; } + + public static void AddUksfAdminSignalr(this IEndpointRouteBuilder builder) { + builder.MapHub($"/hub/{AdminHub.END_POINT}"); + builder.MapHub($"/hub/{UtilityHub.END_POINT}"); + } } } diff --git a/UKSF.Api.Admin/Controllers/VariablesController.cs b/UKSF.Api.Admin/Controllers/VariablesController.cs index 51cd00dd..2292fa64 100644 --- a/UKSF.Api.Admin/Controllers/VariablesController.cs +++ b/UKSF.Api.Admin/Controllers/VariablesController.cs @@ -4,14 +4,19 @@ using UKSF.Api.Admin.Models; using UKSF.Api.Admin.Services.Data; using UKSF.Api.Base; +using UKSF.Api.Base.Events; using UKSF.Api.Base.Extensions; namespace UKSF.Api.Admin.Controllers { [Route("[controller]"), Permissions(Permissions.ADMIN)] public class VariablesController : Controller { private readonly IVariablesDataService variablesDataService; + private readonly ILogger logger; - public VariablesController(IVariablesDataService variablesDataService) => this.variablesDataService = variablesDataService; + public VariablesController(IVariablesDataService variablesDataService, ILogger logger) { + this.variablesDataService = variablesDataService; + this.logger = logger; + } [HttpGet, Authorize] public IActionResult GetAll() => Ok(variablesDataService.Get()); @@ -34,14 +39,14 @@ public IActionResult CheckVariableItem(string key, [FromBody] VariableItem varia public async Task AddVariableItem([FromBody] VariableItem variableItem) { variableItem.key = variableItem.key.Keyify(); await variablesDataService.Add(variableItem); - LogWrapper.AuditLog($"VariableItem added '{variableItem.key}, {variableItem.item}'"); + logger.LogAudit($"VariableItem added '{variableItem.key}, {variableItem.item}'"); return Ok(); } [HttpPatch, Authorize] public async Task EditVariableItem([FromBody] VariableItem variableItem) { VariableItem oldVariableItem = variablesDataService.GetSingle(variableItem.key); - LogWrapper.AuditLog($"VariableItem '{oldVariableItem.key}' updated from '{oldVariableItem.item}' to '{variableItem.item}'"); + logger.LogAudit($"VariableItem '{oldVariableItem.key}' updated from '{oldVariableItem.item}' to '{variableItem.item}'"); await variablesDataService.Update(variableItem.key, variableItem.item); return Ok(variablesDataService.Get()); } @@ -49,7 +54,7 @@ public async Task EditVariableItem([FromBody] VariableItem variab [HttpDelete("{key}"), Authorize] public async Task DeleteVariableItem(string key) { VariableItem variableItem = variablesDataService.GetSingle(key); - LogWrapper.AuditLog($"VariableItem deleted '{variableItem.key}, {variableItem.item}'"); + logger.LogAudit($"VariableItem deleted '{variableItem.key}, {variableItem.item}'"); await variablesDataService.Delete(key); return Ok(variablesDataService.Get()); } diff --git a/UKSF.Api.Admin/Controllers/VersionController.cs b/UKSF.Api.Admin/Controllers/VersionController.cs index 811921cd..3807a9c4 100644 --- a/UKSF.Api.Admin/Controllers/VersionController.cs +++ b/UKSF.Api.Admin/Controllers/VersionController.cs @@ -5,10 +5,8 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services.Data; -using UKSF.Api.Admin.SignalrHubs; using UKSF.Api.Admin.SignalrHubs.Clients; using UKSF.Api.Admin.SignalrHubs.Hubs; -using UKSF.Api.Interfaces.Hubs; namespace UKSF.Api.Admin.Controllers { [Route("[controller]")] diff --git a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs b/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs index 38e035b9..12fea456 100644 --- a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs +++ b/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs @@ -4,50 +4,42 @@ using UKSF.Api.Admin.SignalrHubs.Clients; using UKSF.Api.Admin.SignalrHubs.Hubs; using UKSF.Api.Base.Events; +using UKSF.Api.Base.Extensions; using UKSF.Api.Base.Models; -using UKSF.Api.Logging.Models; -using UKSF.Api.Logging.Services; +using UKSF.Api.Base.Models.Logging; namespace UKSF.Api.Admin.EventHandlers { - public interface ILogEventHandler : IEventHandler { } + public interface ILogDataEventHandler : IEventHandler { } - public class LogEventHandler : ILogEventHandler { - private readonly IDataEventBus logDataEventBus; + public class LogDataEventHandler : ILogDataEventHandler { + private readonly IDataEventBus logDataEventBus; private readonly IHubContext hub; - private readonly ILoggingService loggingService; + private readonly ILogger logger; - public LogEventHandler(IDataEventBus logDataEventBus, IHubContext hub, ILoggingService loggingService) { + public LogDataEventHandler(IDataEventBus logDataEventBus, IHubContext hub, ILogger logger) { this.logDataEventBus = logDataEventBus; this.hub = hub; - this.loggingService = loggingService; + this.logger = logger; } public void Init() { - logDataEventBus.AsObservable().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + logDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => logger.LogError(exception)); } - private async Task HandleEvent(DataEventModel dataEventModel) { + private async Task HandleEvent(DataEventModel dataEventModel) { if (dataEventModel.type == DataEventType.ADD) { await AddedEvent(dataEventModel.data); } } - private async Task AddedEvent(object log) { - switch (log) { - case AuditLogMessage message: - await hub.Clients.All.ReceiveAuditLog(message); - break; - case LauncherLogMessage message: - await hub.Clients.All.ReceiveLauncherLog(message); - break; - case WebLogMessage message: - await hub.Clients.All.ReceiveErrorLog(message); - break; - case BasicLogMessage message: - await hub.Clients.All.ReceiveLog(message); - break; - default: throw new ArgumentOutOfRangeException(nameof(log), "Log type is not valid"); - } + private Task AddedEvent(object log) { + return log switch { + AuditLog message => hub.Clients.All.ReceiveAuditLog(message), + LauncherLog message => hub.Clients.All.ReceiveLauncherLog(message), + HttpErrorLog message => hub.Clients.All.ReceiveErrorLog(message), + BasicLog message => hub.Clients.All.ReceiveLog(message), + _ => throw new ArgumentOutOfRangeException(nameof(log), "Log type is not valid") + }; } } } diff --git a/UKSF.Api.Admin/Services/DataCacheService.cs b/UKSF.Api.Admin/Services/DataCacheService.cs index 96ee8da2..d841f1c7 100644 --- a/UKSF.Api.Admin/Services/DataCacheService.cs +++ b/UKSF.Api.Admin/Services/DataCacheService.cs @@ -1,16 +1,19 @@ -using System.Collections.Generic; +using System; +using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Base.Services.Data; namespace UKSF.Api.Admin.Services { - public class DataCacheService { - private HashSet cachedDataServices; + public interface IDataCacheService { + void InvalidateCachedData(); + } - public void RegisterCachedDataServices(HashSet newCachedDataServices) { - cachedDataServices = newCachedDataServices; - } + public class DataCacheService : IDataCacheService { + private readonly IServiceProvider serviceProvider; + + public DataCacheService(IServiceProvider serviceProvider) => this.serviceProvider = serviceProvider; public void InvalidateCachedData() { - foreach (ICachedDataService cachedDataService in cachedDataServices) { + foreach (ICachedDataService cachedDataService in serviceProvider.GetServices()) { cachedDataService.Refresh(); } } diff --git a/UKSF.Api.Admin/SignalrHubs/Clients/IAdminClient.cs b/UKSF.Api.Admin/SignalrHubs/Clients/IAdminClient.cs index 0782bddc..d1844817 100644 --- a/UKSF.Api.Admin/SignalrHubs/Clients/IAdminClient.cs +++ b/UKSF.Api.Admin/SignalrHubs/Clients/IAdminClient.cs @@ -1,11 +1,12 @@ using System.Threading.Tasks; -using UKSF.Api.Logging.Models; +using UKSF.Api.Base.Models; +using UKSF.Api.Base.Models.Logging; namespace UKSF.Api.Admin.SignalrHubs.Clients { public interface IAdminClient { - Task ReceiveAuditLog(AuditLogMessage log); - Task ReceiveErrorLog(WebLogMessage log); - Task ReceiveLauncherLog(LauncherLogMessage log); - Task ReceiveLog(BasicLogMessage log); + Task ReceiveAuditLog(AuditLog log); + Task ReceiveErrorLog(HttpErrorLog log); + Task ReceiveLauncherLog(LauncherLog log); + Task ReceiveLog(BasicLog log); } } diff --git a/UKSF.Api.Admin/UKSF.Api.Admin.csproj b/UKSF.Api.Admin/UKSF.Api.Admin.csproj index 017e27eb..ded27b7c 100644 --- a/UKSF.Api.Admin/UKSF.Api.Admin.csproj +++ b/UKSF.Api.Admin/UKSF.Api.Admin.csproj @@ -1,22 +1,16 @@ - + - net5.0 + netcoreapp5.0 + Library - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.Extensions.Configuration.Abstractions.dll - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - + - - - + diff --git a/UKSF.Api.Auth/ApiAuthExtensions.cs b/UKSF.Api.Auth/ApiAuthExtensions.cs index 8b5eb784..ce04c995 100644 --- a/UKSF.Api.Auth/ApiAuthExtensions.cs +++ b/UKSF.Api.Auth/ApiAuthExtensions.cs @@ -22,7 +22,6 @@ public static IServiceCollection AddUksfAuth(this IServiceCollection services, I services.AddTransient(); services.AddTransient(); - services.AddSingleton(); services.AddAuthentication( options => { diff --git a/UKSF.Api.Auth/Controllers/LoginController.cs b/UKSF.Api.Auth/Controllers/LoginController.cs index 969813e2..f0e86ef4 100644 --- a/UKSF.Api.Auth/Controllers/LoginController.cs +++ b/UKSF.Api.Auth/Controllers/LoginController.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; using UKSF.Api.Auth.Services; +using UKSF.Api.Base.Extensions; using UKSF.Api.Base.Services; namespace UKSF.Api.Auth.Controllers { diff --git a/UKSF.Api.Auth/Services/LoginService.cs b/UKSF.Api.Auth/Services/LoginService.cs index 2e49e179..866ceacd 100644 --- a/UKSF.Api.Auth/Services/LoginService.cs +++ b/UKSF.Api.Auth/Services/LoginService.cs @@ -5,6 +5,8 @@ using System.Security.Claims; using Microsoft.IdentityModel.Tokens; using Newtonsoft.Json; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; namespace UKSF.Api.Auth.Services { public interface ILoginService { diff --git a/UKSF.Api.Auth/Services/PermissionsService.cs b/UKSF.Api.Auth/Services/PermissionsService.cs index 31fa56d9..c7479bde 100644 --- a/UKSF.Api.Auth/Services/PermissionsService.cs +++ b/UKSF.Api.Auth/Services/PermissionsService.cs @@ -1,5 +1,10 @@ using System.Collections.Generic; using System.Linq; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.Base; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; namespace UKSF.Api.Auth.Services { public interface IPermissionsService { diff --git a/UKSF.Api.Auth/Services/SessionService.cs b/UKSF.Api.Auth/Services/SessionService.cs deleted file mode 100644 index b2bdcb02..00000000 --- a/UKSF.Api.Auth/Services/SessionService.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Security.Claims; -using UKSF.Api.Base.Services; - -namespace UKSF.Api.Auth.Services { - public interface ISessionService { - Account GetUserAccount(); - } - - public class SessionService : ISessionService { - private readonly IHttpContextService httpContextService; - private readonly IAccountService accountService; - - public SessionService(IHttpContextService httpContextService, IAccountService accountService) { - this.httpContextService = httpContextService; - this.accountService = accountService; - } - - public Account GetUserAccount() => accountService.Data.GetSingle(httpContextService.GetUserId()); - } -} diff --git a/UKSF.Api.Auth/UKSF.Api.Auth.csproj b/UKSF.Api.Auth/UKSF.Api.Auth.csproj index ad8b4d0c..a007bd32 100644 --- a/UKSF.Api.Auth/UKSF.Api.Auth.csproj +++ b/UKSF.Api.Auth/UKSF.Api.Auth.csproj @@ -1,7 +1,8 @@ - + - net5.0 + netcoreapp5.0 + Library @@ -9,19 +10,12 @@ - - - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.Extensions.Configuration.Abstractions.dll - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - + + diff --git a/UKSF.Api.Base/ApiBaseExtensions.cs b/UKSF.Api.Base/ApiBaseExtensions.cs index d423a28f..01f8e83e 100644 --- a/UKSF.Api.Base/ApiBaseExtensions.cs +++ b/UKSF.Api.Base/ApiBaseExtensions.cs @@ -1,16 +1,17 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; using UKSF.Api.Base.Services; namespace UKSF.Api.Base { public static class ApiBaseExtensions { - public static IServiceCollection AddUksfBase(this IServiceCollection services, IConfiguration configuration) { - services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); services.AddTransient(); services.AddTransient(); + services.AddSingleton(); + services.AddSingleton(); return services; } diff --git a/UKSF.Api.Base/Events/LogEventBus.cs b/UKSF.Api.Base/Events/LogEventBus.cs new file mode 100644 index 00000000..f669b9cf --- /dev/null +++ b/UKSF.Api.Base/Events/LogEventBus.cs @@ -0,0 +1,54 @@ +using System; +using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Base.Services; + +namespace UKSF.Api.Base.Events { + public interface ILogger : IEventBus { + void LogInfo(string message); + void LogWarning(string message); + void LogError(string message); + void LogError(Exception exception); + void LogHttpError(Exception exception); + void LogHttpError(HttpErrorLog log); + void LogAudit(string message, string userId = ""); + } + + public class Logger : EventBus, ILogger { + private readonly IHttpContextService httpContextService; + + public Logger(IHttpContextService httpContextService) => this.httpContextService = httpContextService; + + public void LogInfo(string message) { + Log(new BasicLog(message, LogLevel.INFO)); + } + + public void LogWarning(string message) { + Log(new BasicLog(message, LogLevel.WARNING)); + } + + public void LogError(string message) { + Log(new BasicLog(message, LogLevel.ERROR)); + } + + public void LogError(Exception exception) { + Log(new BasicLog(exception)); + } + + public void LogHttpError(Exception exception) { + Log(new HttpErrorLog(exception)); + } + + public void LogHttpError(HttpErrorLog log) { + Log(log); + } + + public void LogAudit(string message, string userId = "") { + userId = string.IsNullOrEmpty(userId) ? httpContextService.GetUserId() ?? "Server" : userId; + Log(new AuditLog(userId, message)); + } + + private void Log(BasicLog log) { + Send(log); + } + } +} diff --git a/UKSF.Common/ChangeUtilities.cs b/UKSF.Api.Base/Extensions/ChangeUtilities.cs similarity index 99% rename from UKSF.Common/ChangeUtilities.cs rename to UKSF.Api.Base/Extensions/ChangeUtilities.cs index c00ab529..7b5010cc 100644 --- a/UKSF.Common/ChangeUtilities.cs +++ b/UKSF.Api.Base/Extensions/ChangeUtilities.cs @@ -5,7 +5,7 @@ using System.Reflection; using Newtonsoft.Json.Linq; -namespace UKSF.Common { +namespace UKSF.Api.Base.Extensions { public static class ChangeUtilities { public static string Changes(this T original, T updated) => DeepEquals(original, updated) ? "No changes" : FormatChanges(GetChanges(original, updated)); diff --git a/UKSF.Common/CollectionUtilities.cs b/UKSF.Api.Base/Extensions/CollectionExtensions.cs similarity index 69% rename from UKSF.Common/CollectionUtilities.cs rename to UKSF.Api.Base/Extensions/CollectionExtensions.cs index c34f227d..31a3068d 100644 --- a/UKSF.Common/CollectionUtilities.cs +++ b/UKSF.Api.Base/Extensions/CollectionExtensions.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -namespace UKSF.Common { - public static class CollectionUtilities { +namespace UKSF.Api.Base.Extensions { + public static class CollectionExtensions { public static void CleanHashset(this HashSet collection) { collection.RemoveWhere(string.IsNullOrEmpty); } diff --git a/UKSF.Common/DateUtilities.cs b/UKSF.Api.Base/Extensions/DateExtensions.cs similarity index 86% rename from UKSF.Common/DateUtilities.cs rename to UKSF.Api.Base/Extensions/DateExtensions.cs index d516ebb1..62dfd64c 100644 --- a/UKSF.Common/DateUtilities.cs +++ b/UKSF.Api.Base/Extensions/DateExtensions.cs @@ -1,7 +1,7 @@ using System; -namespace UKSF.Common { - public static class DateUtilities { +namespace UKSF.Api.Base.Extensions { + public static class DateExtensions { public static (int years, int months) ToAge(this DateTime dob, DateTime? date = null) { DateTime today = date ?? DateTime.Today; int months = today.Month - dob.Month; diff --git a/UKSF.Common/GuardUtilites.cs b/UKSF.Api.Base/Extensions/GuardUtilites.cs similarity index 97% rename from UKSF.Common/GuardUtilites.cs rename to UKSF.Api.Base/Extensions/GuardUtilites.cs index 1b6b0a9f..05478273 100644 --- a/UKSF.Common/GuardUtilites.cs +++ b/UKSF.Api.Base/Extensions/GuardUtilites.cs @@ -2,7 +2,7 @@ using System.Linq; using MongoDB.Bson; -namespace UKSF.Common { +namespace UKSF.Api.Base.Extensions { public static class GuardUtilites { public static void ValidateString(string text, Action onInvalid) { if (string.IsNullOrEmpty(text)) onInvalid(text); diff --git a/UKSF.Common/JsonUtilities.cs b/UKSF.Api.Base/Extensions/JsonExtensions.cs similarity index 64% rename from UKSF.Common/JsonUtilities.cs rename to UKSF.Api.Base/Extensions/JsonExtensions.cs index 76b885d4..54bec179 100644 --- a/UKSF.Common/JsonUtilities.cs +++ b/UKSF.Api.Base/Extensions/JsonExtensions.cs @@ -1,12 +1,15 @@ using Newtonsoft.Json; +using Newtonsoft.Json.Linq; -namespace UKSF.Common { - public static class JsonUtilities { +namespace UKSF.Api.Base.Extensions { + public static class JsonExtensions { public static T Copy(this object source) { JsonSerializerSettings deserializeSettings = new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace }; return JsonConvert.DeserializeObject(JsonConvert.SerializeObject(source), deserializeSettings); } public static string Escape(this string jsonString) => jsonString.Replace("\\", "\\\\"); + + public static string GetValueFromBody(this JObject body, string key) => body[key] != null ? body[key].ToString() : string.Empty; } } diff --git a/UKSF.Api.Base/Extensions/ObservableExtensions.cs b/UKSF.Api.Base/Extensions/ObservableExtensions.cs new file mode 100644 index 00000000..cb3e8e04 --- /dev/null +++ b/UKSF.Api.Base/Extensions/ObservableExtensions.cs @@ -0,0 +1,12 @@ +using System; +using System.Reactive.Linq; +using System.Reactive.Threading.Tasks; +using System.Threading.Tasks; + +namespace UKSF.Api.Base.Extensions { + public static class ObservableExtensions { + public static void SubscribeWithAsyncNext(this IObservable source, Func onNext, Action onError) { + source.Select(x => Observable.Defer(() => onNext(x).ToObservable())).Concat().Subscribe(x => { }, onError); + } + } +} diff --git a/UKSF.Common/ProcessUtilities.cs b/UKSF.Api.Base/Extensions/ProcessUtilities.cs similarity index 98% rename from UKSF.Common/ProcessUtilities.cs rename to UKSF.Api.Base/Extensions/ProcessUtilities.cs index 952bdc7a..0db4e841 100644 --- a/UKSF.Common/ProcessUtilities.cs +++ b/UKSF.Api.Base/Extensions/ProcessUtilities.cs @@ -5,7 +5,7 @@ using Microsoft.Win32.TaskScheduler; using Task = System.Threading.Tasks.Task; -namespace UKSF.Common { +namespace UKSF.Api.Base.Extensions { [ExcludeFromCodeCoverage] public static class ProcessUtilities { private const int SC_CLOSE = 0xF060; diff --git a/UKSF.Api.Base/Extensions/StringExtensions.cs b/UKSF.Api.Base/Extensions/StringExtensions.cs index 87a60e78..cbe51e35 100644 --- a/UKSF.Api.Base/Extensions/StringExtensions.cs +++ b/UKSF.Api.Base/Extensions/StringExtensions.cs @@ -28,7 +28,9 @@ public static string RemoveEmbeddedQuotes(this string item) { } public static IEnumerable ExtractObjectIds(this string text) { - return Regex.Matches(text, @"[{(]?[0-9a-fA-F]{24}[)}]?").Select(x => ObjectId.TryParse(x.Value, out ObjectId unused) ? x.Value : string.Empty); + return Regex.Matches(text, @"[{(]?[0-9a-fA-F]{24}[)}]?").Where(x => IsObjectId(x.Value)).Select(x => x.Value); } + + public static bool IsObjectId(this string text) => ObjectId.TryParse(text, out ObjectId unused); } } diff --git a/UKSF.Common/TaskUtilities.cs b/UKSF.Api.Base/Extensions/TaskUtilities.cs similarity index 65% rename from UKSF.Common/TaskUtilities.cs rename to UKSF.Api.Base/Extensions/TaskUtilities.cs index d8043d2d..f490401b 100644 --- a/UKSF.Common/TaskUtilities.cs +++ b/UKSF.Api.Base/Extensions/TaskUtilities.cs @@ -1,10 +1,8 @@ using System; -using System.Reactive.Linq; -using System.Reactive.Threading.Tasks; using System.Threading; using System.Threading.Tasks; -namespace UKSF.Common { +namespace UKSF.Api.Base.Extensions { public static class TaskUtilities { public static async Task Delay(TimeSpan timeSpan, CancellationToken token) { try { @@ -22,9 +20,5 @@ public static async Task DelayWithCallback(TimeSpan timeSpan, CancellationToken // Ignored } } - - public static void SubscribeAsync(this IObservable source, Func onNext, Action onError) { - source.Select(x => Observable.Defer(() => onNext(x).ToObservable())).Concat().Subscribe(x => { }, onError); - } } } diff --git a/UKSF.Api.Base/Models/Logging/AuditLog.cs b/UKSF.Api.Base/Models/Logging/AuditLog.cs new file mode 100644 index 00000000..34f710af --- /dev/null +++ b/UKSF.Api.Base/Models/Logging/AuditLog.cs @@ -0,0 +1,10 @@ +namespace UKSF.Api.Base.Models.Logging { + public class AuditLog : BasicLog { + public string who; + + public AuditLog(string who, string message) : base(message) { + this.who = who; + level = LogLevel.INFO; + } + } +} diff --git a/UKSF.Api.Base/Models/Logging/BasicLog.cs b/UKSF.Api.Base/Models/Logging/BasicLog.cs new file mode 100644 index 00000000..e4cca978 --- /dev/null +++ b/UKSF.Api.Base/Models/Logging/BasicLog.cs @@ -0,0 +1,30 @@ +using System; + +namespace UKSF.Api.Base.Models.Logging { + public enum LogLevel { + DEBUG, + INFO, + ERROR, + WARNING + } + + public class BasicLog : DatabaseObject { + public LogLevel level = LogLevel.INFO; + public string message; + public DateTime timestamp = DateTime.UtcNow; + + protected BasicLog() { } + + public BasicLog(string text) : this() => message = text; + + public BasicLog(string text, LogLevel logLevel) : this() { + message = text; + level = logLevel; + } + + public BasicLog(Exception exception) : this() { + message = exception.GetBaseException().ToString(); + level = LogLevel.ERROR; + } + } +} diff --git a/UKSF.Api.Base/Models/Logging/HttpErrorLog.cs b/UKSF.Api.Base/Models/Logging/HttpErrorLog.cs new file mode 100644 index 00000000..3953e488 --- /dev/null +++ b/UKSF.Api.Base/Models/Logging/HttpErrorLog.cs @@ -0,0 +1,19 @@ +using System; + +namespace UKSF.Api.Base.Models.Logging { + public class HttpErrorLog : BasicLog { + public string exception; + public string httpMethod; + public string name; + public string url; + public string userId; + + public HttpErrorLog() { } + + public HttpErrorLog(Exception exception) { + message = exception.GetBaseException().Message; + this.exception = exception.ToString(); + level = LogLevel.ERROR; + } + } +} diff --git a/UKSF.Api.Base/Models/Logging/LauncherLog.cs b/UKSF.Api.Base/Models/Logging/LauncherLog.cs new file mode 100644 index 00000000..826d52b8 --- /dev/null +++ b/UKSF.Api.Base/Models/Logging/LauncherLog.cs @@ -0,0 +1,9 @@ +namespace UKSF.Api.Base.Models.Logging { + public class LauncherLog : BasicLog { + public string name; + public string userId; + public string version; + + public LauncherLog(string version, string message) : base(message) => this.version = version; + } +} diff --git a/UKSF.Common/Clock.cs b/UKSF.Api.Base/Services/Clock.cs similarity index 90% rename from UKSF.Common/Clock.cs rename to UKSF.Api.Base/Services/Clock.cs index 66ed492a..5ca65f00 100644 --- a/UKSF.Common/Clock.cs +++ b/UKSF.Api.Base/Services/Clock.cs @@ -1,6 +1,6 @@ using System; -namespace UKSF.Common { +namespace UKSF.Api.Base.Services { public interface IClock { public DateTime Now(); public DateTime Today(); diff --git a/UKSF.Api.Base/Services/Data/CachedDataService.cs b/UKSF.Api.Base/Services/Data/CachedDataService.cs index bb98ae4a..2f9f7725 100644 --- a/UKSF.Api.Base/Services/Data/CachedDataService.cs +++ b/UKSF.Api.Base/Services/Data/CachedDataService.cs @@ -18,8 +18,7 @@ public class CachedDataService : DataServiceBase, IDataService, ICached private readonly IDataEventBus dataEventBus; protected readonly object LockObject = new object(); - protected CachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, collectionName) => - this.dataEventBus = dataEventBus; + protected CachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, collectionName) => this.dataEventBus = dataEventBus; public List Cache { get; protected set; } diff --git a/UKSF.Api.Base/Services/Data/DataService.cs b/UKSF.Api.Base/Services/Data/DataService.cs index e80a716c..d5fece16 100644 --- a/UKSF.Api.Base/Services/Data/DataService.cs +++ b/UKSF.Api.Base/Services/Data/DataService.cs @@ -25,7 +25,8 @@ public interface IDataService { Task DeleteMany(Expression> filterExpression); } - public abstract class DataService : DataServiceBase, IDataService where T : DatabaseObject { + public abstract class + DataService : DataServiceBase, IDataService where T : DatabaseObject { private readonly IDataEventBus dataEventBus; protected DataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, collectionName) => diff --git a/UKSF.Api.Base/UKSF.Api.Base.csproj b/UKSF.Api.Base/UKSF.Api.Base.csproj index b26e09ac..acba56cb 100644 --- a/UKSF.Api.Base/UKSF.Api.Base.csproj +++ b/UKSF.Api.Base/UKSF.Api.Base.csproj @@ -1,30 +1,18 @@ - + - net5.0 - UKSF.Api.Base + netcoreapp5.0 + Library - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.AspNetCore.Authorization.dll - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.AspNetCore.Http.Abstractions.dll - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.Extensions.Configuration.Abstractions.dll - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - - + + + diff --git a/UKSF.Api.Data/Personnel/LoaDataService.cs b/UKSF.Api.Data/Personnel/LoaDataService.cs deleted file mode 100644 index 29578002..00000000 --- a/UKSF.Api.Data/Personnel/LoaDataService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Data.Personnel { - public class LoaDataService : CachedDataService, ILoaDataService { - public LoaDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "loas") { } - } -} diff --git a/UKSF.Api.Data/UKSF.Api.Data.csproj b/UKSF.Api.Data/UKSF.Api.Data.csproj index 25f6535b..8d2623bf 100644 --- a/UKSF.Api.Data/UKSF.Api.Data.csproj +++ b/UKSF.Api.Data/UKSF.Api.Data.csproj @@ -14,4 +14,9 @@ + + + + + diff --git a/UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs deleted file mode 100644 index 281736b0..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/IAccountDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface IAccountDataService : IDataService, ICachedDataService { } -} diff --git a/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs deleted file mode 100644 index 92d08d53..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/ICommentThreadDataService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading.Tasks; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Message; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface ICommentThreadDataService : IDataService, ICachedDataService { - Task Update(string id, Comment comment, DataEventType updateType); - } -} diff --git a/UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs deleted file mode 100644 index 6d491b63..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/IDischargeDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface IDischargeDataService : IDataService, ICachedDataService { } -} diff --git a/UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs deleted file mode 100644 index ae105f6b..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/ILoaDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface ILoaDataService : IDataService, ICachedDataService { } -} diff --git a/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs deleted file mode 100644 index 8c7e0bb5..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/INotificationsDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Models.Message; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface INotificationsDataService : IDataService, ICachedDataService { } -} diff --git a/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs deleted file mode 100644 index 3f769195..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/IRanksDataService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections.Generic; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface IRanksDataService : IDataService, ICachedDataService { - new IEnumerable Get(); - new Rank GetSingle(string name); - } -} diff --git a/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs deleted file mode 100644 index 5b532d90..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/IRolesDataService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections.Generic; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface IRolesDataService : IDataService, ICachedDataService { - new IEnumerable Get(); - new Role GetSingle(string name); - } -} diff --git a/UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs deleted file mode 100644 index 4677845e..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/IUnitsDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Models.Units; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface IUnitsDataService : IDataService, ICachedDataService { } -} diff --git a/UKSF.Api.Interfaces/Data/IConfirmationCodeDataService.cs b/UKSF.Api.Interfaces/Data/IConfirmationCodeDataService.cs deleted file mode 100644 index 097a1f98..00000000 --- a/UKSF.Api.Interfaces/Data/IConfirmationCodeDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Models.Utility; - -namespace UKSF.Api.Interfaces.Data { - public interface IConfirmationCodeDataService : IDataService { } -} diff --git a/UKSF.Api.Interfaces/Data/ILogDataService.cs b/UKSF.Api.Interfaces/Data/ILogDataService.cs deleted file mode 100644 index 40e7d570..00000000 --- a/UKSF.Api.Interfaces/Data/ILogDataService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Threading.Tasks; -using UKSF.Api.Models.Message.Logging; - -namespace UKSF.Api.Interfaces.Data { - public interface ILogDataService : IDataService { - Task Add(AuditLogMessage log); - Task Add(LauncherLogMessage log); - Task Add(WebLogMessage log); - } -} diff --git a/UKSF.Api.Interfaces/Events/Handlers/IAccountEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/IAccountEventHandler.cs deleted file mode 100644 index fe94344e..00000000 --- a/UKSF.Api.Interfaces/Events/Handlers/IAccountEventHandler.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace UKSF.Api.Interfaces.Events.Handlers { - public interface IAccountEventHandler : IEventHandler { } -} diff --git a/UKSF.Api.Interfaces/Events/Handlers/ICommentThreadEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/ICommentThreadEventHandler.cs deleted file mode 100644 index 5e005697..00000000 --- a/UKSF.Api.Interfaces/Events/Handlers/ICommentThreadEventHandler.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace UKSF.Api.Interfaces.Events.Handlers { - public interface ICommentThreadEventHandler : IEventHandler { } -} diff --git a/UKSF.Api.Interfaces/Events/Handlers/INotificationsEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/INotificationsEventHandler.cs deleted file mode 100644 index ae298ced..00000000 --- a/UKSF.Api.Interfaces/Events/Handlers/INotificationsEventHandler.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace UKSF.Api.Interfaces.Events.Handlers { - public interface INotificationsEventHandler : IEventHandler { } -} diff --git a/UKSF.Api.Interfaces/Message/ICommentThreadService.cs b/UKSF.Api.Interfaces/Message/ICommentThreadService.cs deleted file mode 100644 index 8aa47a55..00000000 --- a/UKSF.Api.Interfaces/Message/ICommentThreadService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Message; - -namespace UKSF.Api.Interfaces.Message { - public interface ICommentThreadService : IDataBackedService { - IEnumerable GetCommentThreadComments(string id); - Task InsertComment(string id, Comment comment); - Task RemoveComment(string id, Comment comment); - IEnumerable GetCommentThreadParticipants(string id); - object FormatComment(Comment comment); - } -} diff --git a/UKSF.Api.Interfaces/Message/IEmailService.cs b/UKSF.Api.Interfaces/Message/IEmailService.cs deleted file mode 100644 index f3fa1dbd..00000000 --- a/UKSF.Api.Interfaces/Message/IEmailService.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace UKSF.Api.Interfaces.Message { - public interface IEmailService { - void SendEmail(string targetEmail, string subject, string htmlEmail); - } -} diff --git a/UKSF.Api.Interfaces/Message/INotificationsService.cs b/UKSF.Api.Interfaces/Message/INotificationsService.cs deleted file mode 100644 index 72067d3e..00000000 --- a/UKSF.Api.Interfaces/Message/INotificationsService.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Message { - public interface INotificationsService : IDataBackedService { - void Add(Notification notification); - Task SendTeamspeakNotification(Account account, string rawMessage); - Task SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage); - IEnumerable GetNotificationsForContext(); - Task MarkNotificationsAsRead(List ids); - Task Delete(List ids); - } -} diff --git a/UKSF.Api.Interfaces/Personnel/IAccountService.cs b/UKSF.Api.Interfaces/Personnel/IAccountService.cs deleted file mode 100644 index ea775a25..00000000 --- a/UKSF.Api.Interfaces/Personnel/IAccountService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Interfaces.Data.Cached; - -namespace UKSF.Api.Interfaces.Personnel { - public interface IAccountService : IDataBackedService { } -} diff --git a/UKSF.Api.Interfaces/Personnel/IAssignmentService.cs b/UKSF.Api.Interfaces/Personnel/IAssignmentService.cs deleted file mode 100644 index 737691df..00000000 --- a/UKSF.Api.Interfaces/Personnel/IAssignmentService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Threading.Tasks; -using UKSF.Api.Models.Message; - -namespace UKSF.Api.Interfaces.Personnel { - public interface IAssignmentService { - Task AssignUnitRole(string id, string unitId, string role); - Task UnassignAllUnits(string id); - Task UnassignAllUnitRoles(string id); - Task UpdateUnitRankAndRole(string id, string unitString = "", string role = "", string rankString = "", string notes = "", string message = "", string reason = ""); - Task UnassignUnitRole(string id, string unitId); - Task UnassignUnit(string id, string unitId); - Task UpdateGroupsAndRoles(string id); - } -} diff --git a/UKSF.Api.Interfaces/Personnel/IAttendanceService.cs b/UKSF.Api.Interfaces/Personnel/IAttendanceService.cs deleted file mode 100644 index 18023e0f..00000000 --- a/UKSF.Api.Interfaces/Personnel/IAttendanceService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using System.Threading.Tasks; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Personnel { - public interface IAttendanceService { - Task GenerateAttendanceReport(DateTime start, DateTime end); - } -} diff --git a/UKSF.Api.Interfaces/Personnel/IDischargeService.cs b/UKSF.Api.Interfaces/Personnel/IDischargeService.cs deleted file mode 100644 index 6f1535d5..00000000 --- a/UKSF.Api.Interfaces/Personnel/IDischargeService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Interfaces.Data.Cached; - -namespace UKSF.Api.Interfaces.Personnel { - public interface IDischargeService : IDataBackedService { } -} diff --git a/UKSF.Api.Interfaces/Personnel/IDisplayNameService.cs b/UKSF.Api.Interfaces/Personnel/IDisplayNameService.cs deleted file mode 100644 index ecb77f61..00000000 --- a/UKSF.Api.Interfaces/Personnel/IDisplayNameService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Personnel { - public interface IDisplayNameService { - string GetDisplayName(Account account); - string GetDisplayName(string id); - string GetDisplayNameWithoutRank(Account account); - } -} diff --git a/UKSF.Api.Interfaces/Personnel/ILoaService.cs b/UKSF.Api.Interfaces/Personnel/ILoaService.cs deleted file mode 100644 index 3f3082d1..00000000 --- a/UKSF.Api.Interfaces/Personnel/ILoaService.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Command; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Personnel { - public interface ILoaService : IDataBackedService { - IEnumerable Get(List ids); - Task Add(CommandRequestLoa requestBase); - Task SetLoaState(string id, LoaReviewState state); - bool IsLoaCovered(string id, DateTime eventStart); - } -} diff --git a/UKSF.Api.Interfaces/Personnel/IRanksService.cs b/UKSF.Api.Interfaces/Personnel/IRanksService.cs deleted file mode 100644 index 6d527f8e..00000000 --- a/UKSF.Api.Interfaces/Personnel/IRanksService.cs +++ /dev/null @@ -1,11 +0,0 @@ -using UKSF.Api.Interfaces.Data.Cached; - -namespace UKSF.Api.Interfaces.Personnel { - public interface IRanksService : IDataBackedService { - int GetRankOrder(string rankName); - int Sort(string nameA, string nameB); - bool IsEqual(string nameA, string nameB); - bool IsSuperior(string nameA, string nameB); - bool IsSuperiorOrEqual(string nameA, string nameB); - } -} diff --git a/UKSF.Api.Interfaces/Personnel/IRecruitmentService.cs b/UKSF.Api.Interfaces/Personnel/IRecruitmentService.cs deleted file mode 100644 index 1f3825fd..00000000 --- a/UKSF.Api.Interfaces/Personnel/IRecruitmentService.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Newtonsoft.Json.Linq; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Personnel { - public interface IRecruitmentService { - object GetAllApplications(); - JObject GetApplication(Account account); - object GetActiveRecruiters(); - IEnumerable GetRecruiters(bool skipSort = false); - Dictionary GetRecruiterLeads(); - object GetStats(string account, bool monthly); - string GetRecruiter(); - bool IsRecruiterLead(Account account = null); - bool IsRecruiter(Account account); - Task SetRecruiter(string id, string newRecruiter); - } -} diff --git a/UKSF.Api.Interfaces/Personnel/IRolesService.cs b/UKSF.Api.Interfaces/Personnel/IRolesService.cs deleted file mode 100644 index a9dc6fa9..00000000 --- a/UKSF.Api.Interfaces/Personnel/IRolesService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Personnel { - public interface IRolesService : IDataBackedService { - int Sort(string nameA, string nameB); - Role GetUnitRoleByOrder(int order); - } -} diff --git a/UKSF.Api.Interfaces/Personnel/IServiceRecordService.cs b/UKSF.Api.Interfaces/Personnel/IServiceRecordService.cs deleted file mode 100644 index b9cc64ca..00000000 --- a/UKSF.Api.Interfaces/Personnel/IServiceRecordService.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace UKSF.Api.Interfaces.Personnel { - public interface IServiceRecordService { - void AddServiceRecord(string id, string occurence, string notes); - } -} diff --git a/UKSF.Api.Interfaces/Units/IUnitsService.cs b/UKSF.Api.Interfaces/Units/IUnitsService.cs deleted file mode 100644 index 25dc81f2..00000000 --- a/UKSF.Api.Interfaces/Units/IUnitsService.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; - -namespace UKSF.Api.Interfaces.Units { - public interface IUnitsService : IDataBackedService { - IEnumerable GetSortedUnits(Func predicate = null); - Task AddMember(string id, string unitId); - Task RemoveMember(string id, string unitName); - Task RemoveMember(string id, Unit unit); - Task SetMemberRole(string id, string unitId, string role = ""); - Task SetMemberRole(string id, Unit unit, string role = ""); - Task RenameRole(string oldName, string newName); - Task DeleteRole(string role); - - bool HasRole(string unitId, string role); - bool HasRole(Unit unit, string role); - bool RolesHasMember(string unitId, string id); - bool RolesHasMember(Unit unit, string id); - bool MemberHasRole(string id, string unitId, string role); - bool MemberHasRole(string id, Unit unit, string role); - bool MemberHasAnyRole(string id); - int GetMemberRoleOrder(Account account, Unit unit); - - Unit GetRoot(); - Unit GetAuxilliaryRoot(); - Unit GetParent(Unit unit); - IEnumerable GetParents(Unit unit); - IEnumerable GetChildren(Unit parent); - IEnumerable GetAllChildren(Unit parent, bool includeParent = false); - - int GetUnitDepth(Unit unit); - string GetChainString(Unit unit); - } -} diff --git a/UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs b/UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs deleted file mode 100644 index 8e5277f9..00000000 --- a/UKSF.Api.Interfaces/Utility/IConfirmationCodeService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Threading.Tasks; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Models.Utility; - -namespace UKSF.Api.Interfaces.Utility { - public interface IConfirmationCodeService : IDataBackedService { - Task CreateConfirmationCode(string value); - Task GetConfirmationCode(string id); - Task ClearConfirmationCodes(Func predicate); - } -} diff --git a/UKSF.Api.Logging/ApiLoggingExtensions.cs b/UKSF.Api.Logging/ApiLoggingExtensions.cs deleted file mode 100644 index 30617b03..00000000 --- a/UKSF.Api.Logging/ApiLoggingExtensions.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Base.Events; -using UKSF.Api.Logging.Models; -using UKSF.Api.Logging.Services; -using UKSF.Api.Logging.Services.Data; - -namespace UKSF.Api.Logging { - public static class ApiLoggingExtensions { - - public static IServiceCollection AddUksfLogging(this IServiceCollection services, IConfiguration configuration) { - - services.AddSingleton(); - services.AddSingleton(); - - services.AddSingleton, DataEventBus>(); - - return services; - } - } -} diff --git a/UKSF.Api.Logging/Models/AuditLogMessage.cs b/UKSF.Api.Logging/Models/AuditLogMessage.cs deleted file mode 100644 index 531180ef..00000000 --- a/UKSF.Api.Logging/Models/AuditLogMessage.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace UKSF.Api.Logging.Models { - public class AuditLogMessage : BasicLogMessage { - public string who; - } -} diff --git a/UKSF.Api.Logging/Models/BasicLogMessage.cs b/UKSF.Api.Logging/Models/BasicLogMessage.cs deleted file mode 100644 index 24e2cb1b..00000000 --- a/UKSF.Api.Logging/Models/BasicLogMessage.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using UKSF.Api.Base.Models; - -namespace UKSF.Api.Logging.Models { - public enum LogLevel { - DEBUG, - INFO, - ERROR - } - - public class BasicLogMessage : DatabaseObject { - public LogLevel level = LogLevel.INFO; - public string message; - public DateTime timestamp = DateTime.UtcNow; - - protected BasicLogMessage() { } - - public BasicLogMessage(string text) : this() => message = text; - - public BasicLogMessage(LogLevel logLevel) : this() => level = logLevel; - - public BasicLogMessage(string text, LogLevel logLevel) : this() { - message = text; - level = logLevel; - } - - public BasicLogMessage(Exception logException) : this() { - message = logException.GetBaseException().ToString(); - level = LogLevel.ERROR; - } - } -} diff --git a/UKSF.Api.Logging/Models/LauncherLogMessage.cs b/UKSF.Api.Logging/Models/LauncherLogMessage.cs deleted file mode 100644 index 3616638d..00000000 --- a/UKSF.Api.Logging/Models/LauncherLogMessage.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace UKSF.Api.Logging.Models { - public class LauncherLogMessage : BasicLogMessage { - public string name; - public string userId; - public string version; - - public LauncherLogMessage(string version, string message) : base(message) => this.version = version; - } -} diff --git a/UKSF.Api.Logging/Models/WebLogMessage.cs b/UKSF.Api.Logging/Models/WebLogMessage.cs deleted file mode 100644 index a51ea273..00000000 --- a/UKSF.Api.Logging/Models/WebLogMessage.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; - -namespace UKSF.Api.Logging.Models { - public class WebLogMessage : BasicLogMessage { - public string exception; - public string httpMethod; - public string name; - public string url; - public string userId; - - public WebLogMessage() { } - - public WebLogMessage(Exception logException) { - message = logException.GetBaseException().Message; - exception = logException.ToString(); - level = LogLevel.ERROR; - } - } -} diff --git a/UKSF.Api.Logging/Services/Data/LogDataService.cs b/UKSF.Api.Logging/Services/Data/LogDataService.cs deleted file mode 100644 index 11955c85..00000000 --- a/UKSF.Api.Logging/Services/Data/LogDataService.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Threading.Tasks; -using UKSF.Api.Base.Database; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; -using UKSF.Api.Base.Services.Data; -using UKSF.Api.Logging.Models; - -namespace UKSF.Api.Logging.Services.Data { - public interface ILogDataService : IDataService { - Task Add(AuditLogMessage log); - Task Add(LauncherLogMessage log); - Task Add(WebLogMessage log); - } - - public class LogDataService : DataService, ILogDataService { - private readonly IDataCollectionFactory dataCollectionFactory; - - public LogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "logs") => this.dataCollectionFactory = dataCollectionFactory; - - public async Task Add(AuditLogMessage log) { - await dataCollectionFactory.CreateDataCollection("auditLogs").AddAsync(log); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); - } - - public async Task Add(LauncherLogMessage log) { - await dataCollectionFactory.CreateDataCollection("launcherLogs").AddAsync(log); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); - } - - public async Task Add(WebLogMessage log) { - await dataCollectionFactory.CreateDataCollection("errorLogs").AddAsync(log); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, log.id, log)); - } - } -} diff --git a/UKSF.Api.Logging/Services/LoggingService.cs b/UKSF.Api.Logging/Services/LoggingService.cs deleted file mode 100644 index cafdf5fa..00000000 --- a/UKSF.Api.Logging/Services/LoggingService.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System; -using System.Threading.Tasks; -using UKSF.Api.Base.Services; -using UKSF.Api.Base.Services.Data; -using UKSF.Api.Logging.Models; -using UKSF.Api.Logging.Services.Data; - -namespace UKSF.Api.Logging.Services { - public interface ILoggingService : IDataBackedService { - void Log(string message); - void Log(BasicLogMessage log); - void Log(Exception exception); - void AuditLog(string message, string userId = ""); - } - - public class LoggingService : DataBackedService, ILoggingService { - private readonly IDisplayNameService displayNameService; - private readonly IHttpContextService httpContextService; - - public LoggingService(ILogDataService data, IDisplayNameService displayNameService, IHttpContextService httpContextService) : base(data) { - this.displayNameService = displayNameService; - this.httpContextService = httpContextService; - } - - public void Log(string message) { - Task unused = LogAsync(new BasicLogMessage(message)); - } - - public void Log(BasicLogMessage log) { - if (log is AuditLogMessage auditLog) { - auditLog.who = displayNameService.GetDisplayName(auditLog.who); - log = auditLog; - } - - log.message = log.message.ConvertObjectIds(); - Task unused = LogAsync(log); - } - - public void Log(Exception exception) { - Task unused = LogAsync(exception); - } - - public void AuditLog(string message, string userId = "") { - if (string.IsNullOrEmpty(userId)) { - userId = httpContextService.GetUserId(); - } - - AuditLogMessage log = new AuditLogMessage { who = userId, level = LogLevel.INFO, message = message }; - Log(log); - } - - private async Task LogAsync(BasicLogMessage log) => await LogToStorage(log); - - private async Task LogAsync(Exception exception) => await LogToStorage(new BasicLogMessage(exception)); - - private async Task LogToStorage(BasicLogMessage log) { - switch (log) { - case AuditLogMessage message: - await Data.Add(message); - break; - case LauncherLogMessage message: - await Data.Add(message); - break; - case WebLogMessage message: - await Data.Add(message); - break; - default: - await Data.Add(log); - break; - } - } - } -} diff --git a/UKSF.Api.Logging/UKSF.Api.Logging.csproj b/UKSF.Api.Logging/UKSF.Api.Logging.csproj deleted file mode 100644 index b32faaf6..00000000 --- a/UKSF.Api.Logging/UKSF.Api.Logging.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - net5.0 - - - - - - - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.Extensions.Configuration.Abstractions.dll - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - - - - - - - diff --git a/UKSF.Api.Models/Personnel/AccountPermissions.cs b/UKSF.Api.Models/Personnel/AccountPermissions.cs deleted file mode 100644 index 3b5815d8..00000000 --- a/UKSF.Api.Models/Personnel/AccountPermissions.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace UKSF.Api.Models.Personnel { - public class AccountPermissions { - public bool admin; - public bool command; - public bool nco; - public bool personnel; - public bool recruiter; - public bool recruiterLead; - public bool servers; - public bool tester; - } -} diff --git a/UKSF.Api.Models/Personnel/PublicAccount.cs b/UKSF.Api.Models/Personnel/PublicAccount.cs deleted file mode 100644 index 28db11ba..00000000 --- a/UKSF.Api.Models/Personnel/PublicAccount.cs +++ /dev/null @@ -1,8 +0,0 @@ -// ReSharper disable ClassNeverInstantiated.Global - -namespace UKSF.Api.Models.Personnel { - public class PublicAccount : Account { - public string displayName; - public AccountPermissions permissions = new AccountPermissions(); - } -} diff --git a/UKSF.Api.Models/UKSF.Api.Models.csproj b/UKSF.Api.Models/UKSF.Api.Models.csproj index 9bdff51a..55f673de 100644 --- a/UKSF.Api.Models/UKSF.Api.Models.csproj +++ b/UKSF.Api.Models/UKSF.Api.Models.csproj @@ -11,12 +11,8 @@ - + - - - - diff --git a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs new file mode 100644 index 00000000..4ef7e1a3 --- /dev/null +++ b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs @@ -0,0 +1,54 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.EventHandlers; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.ScheduledActions; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.Services.Data; + +namespace UKSF.Api.Personnel { + public static class ApiPersonnelExtensions { + public static IServiceCollection AddUksfPersonnel(this IServiceCollection services) { + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + + services.AddSingleton(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>(); + + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + + // services.AddTransient(); + services.AddTransient(); + + services.AddTransient(); + + return services; + } + } +} diff --git a/UKSF.Api/Controllers/Accounts/AccountsController.cs b/UKSF.Api.Personnel/Controllers/AccountsController.cs similarity index 82% rename from UKSF.Api/Controllers/Accounts/AccountsController.cs rename to UKSF.Api.Personnel/Controllers/AccountsController.cs index cd1258fd..f04d4e60 100644 --- a/UKSF.Api/Controllers/Accounts/AccountsController.cs +++ b/UKSF.Api.Personnel/Controllers/AccountsController.cs @@ -7,60 +7,59 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Integrations; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Common; -using UKSF.Api.Services.Message; -using UKSF.Api.Services.Personnel; -using UKSF.Common; - -namespace UKSF.Api.Controllers.Accounts { +using UKSF.Api.Base; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Extensions; +using UKSF.Api.Base.Services; +using UKSF.Api.Personnel.Extensions; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; + +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class AccountsController : Controller { private readonly IAccountService accountService; private readonly IConfirmationCodeService confirmationCodeService; private readonly IDiscordService discordService; private readonly IDisplayNameService displayNameService; + private readonly IHttpContextService httpContextService; private readonly IEmailService emailService; private readonly IRanksService ranksService; private readonly IRecruitmentService recruitmentService; - private readonly ISessionService sessionService; + private readonly ITeamspeakService teamspeakService; private readonly IUnitsService unitsService; + private readonly ILogger logger; public AccountsController( IConfirmationCodeService confirmationCodeService, IRanksService ranksService, IAccountService accountService, IDisplayNameService displayNameService, - ISessionService sessionService, + IHttpContextService httpContextService, IRecruitmentService recruitmentService, ITeamspeakService teamspeakService, IEmailService emailService, IDiscordService discordService, - IUnitsService unitsService + IUnitsService unitsService, + ILogger logger ) { this.confirmationCodeService = confirmationCodeService; this.ranksService = ranksService; this.accountService = accountService; this.displayNameService = displayNameService; - this.sessionService = sessionService; + this.httpContextService = httpContextService; this.recruitmentService = recruitmentService; this.teamspeakService = teamspeakService; this.emailService = emailService; this.discordService = discordService; this.unitsService = unitsService; + this.logger = logger; } [HttpGet, Authorize] public IActionResult Get() { - Account account = sessionService.GetContextAccount(); + Account account = accountService.GetUserAccount(); return Ok(PubliciseAccount(account)); } @@ -88,7 +87,7 @@ public async Task Put([FromBody] JObject body) { }; await accountService.Data.Add(account); await SendConfirmationCode(account); - LogWrapper.AuditLog($"New account created: '{account.firstname} {account.lastname}, {account.email}'", accountService.Data.GetSingle(x => x.email == account.email).id); + logger.LogAudit($"New account created: '{account.firstname} {account.lastname}, {account.email}'", accountService.Data.GetSingle(x => x.email == account.email).id); return Ok(new { account.email }); } @@ -112,7 +111,7 @@ public async Task ApplyConfirmationCode([FromBody] JObject body) string value = await confirmationCodeService.GetConfirmationCode(code); if (value == email) { await accountService.Data.Update(account.id, "membershipState", MembershipState.CONFIRMED); - LogWrapper.AuditLog($"Email address confirmed for {account.id}"); + logger.LogAudit($"Email address confirmed for {account.id}"); return Ok(); } @@ -123,7 +122,7 @@ public async Task ApplyConfirmationCode([FromBody] JObject body) [HttpPost("resend-email-code"), Authorize] public async Task ResendConfirmationCode() { - Account account = sessionService.GetContextAccount(); + Account account = accountService.GetUserAccount(); if (account.membershipState != MembershipState.UNCONFIRMED) { return BadRequest(new { error = "Account email has already been confirmed" }); @@ -204,51 +203,41 @@ public IActionResult CheckUsernameOrEmailExists([FromQuery] string check) { [HttpPut("name"), Authorize] public async Task ChangeName([FromBody] JObject changeNameRequest) { - Account account = sessionService.GetContextAccount(); + Account account = accountService.GetUserAccount(); await accountService.Data.Update( account.id, Builders.Update.Set(x => x.firstname, changeNameRequest["firstname"].ToString()).Set(x => x.lastname, changeNameRequest["lastname"].ToString()) ); - LogWrapper.AuditLog($"{account.lastname}, {account.firstname} changed their name to {changeNameRequest["lastname"]}, {changeNameRequest["firstname"]}"); + logger.LogAudit($"{account.lastname}, {account.firstname} changed their name to {changeNameRequest["lastname"]}, {changeNameRequest["firstname"]}"); await discordService.UpdateAccount(accountService.Data.GetSingle(account.id)); return Ok(); } [HttpPut("password"), Authorize] public async Task ChangePassword([FromBody] JObject changePasswordRequest) { - string contextId = sessionService.GetContextId(); + string contextId = httpContextService.GetUserId(); await accountService.Data.Update(contextId, "password", BCrypt.Net.BCrypt.HashPassword(changePasswordRequest["password"].ToString())); - LogWrapper.AuditLog($"Password changed for {contextId}"); + logger.LogAudit($"Password changed for {contextId}"); return Ok(); } [HttpPost("updatesetting/{id}"), Authorize] public async Task UpdateSetting(string id, [FromBody] JObject body) { - Account account = string.IsNullOrEmpty(id) ? sessionService.GetContextAccount() : accountService.Data.GetSingle(id); + Account account = string.IsNullOrEmpty(id) ? accountService.GetUserAccount() : accountService.Data.GetSingle(id); await accountService.Data.Update(account.id, $"settings.{body["name"]}", body["value"]); - LogWrapper.AuditLog($"Setting {body["name"]} updated for {account.id} from {account.settings.GetAttribute(body["name"].ToString())} to {body["value"]}"); + logger.LogAudit($"Setting {body["name"]} updated for {account.id} from {account.settings.GetAttribute(body["name"].ToString())} to {body["value"]}"); return Ok(); } [HttpGet("test")] public IActionResult Test() { - LogWrapper.Log("This is a test"); + logger.LogInfo("This is a test"); return Ok(new { value = DateTime.Now.ToLongTimeString() }); } private PublicAccount PubliciseAccount(Account account) { PublicAccount publicAccount = account.ToPublicAccount(); publicAccount.displayName = displayNameService.GetDisplayName(account); - publicAccount.permissions = new AccountPermissions { - admin = sessionService.ContextHasRole(Permissions.ADMIN), - command = sessionService.ContextHasRole(Permissions.COMMAND), - nco = sessionService.ContextHasRole(Permissions.NCO), - personnel = sessionService.ContextHasRole(Permissions.PERSONNEL), - recruiter = sessionService.ContextHasRole(Permissions.RECRUITER), - recruiterLead = sessionService.ContextHasRole(Permissions.RECRUITER_LEAD), - servers = sessionService.ContextHasRole(Permissions.SERVERS), - tester = sessionService.ContextHasRole(Permissions.TESTER) - }; return publicAccount; } diff --git a/UKSF.Api/Controllers/ApplicationsController.cs b/UKSF.Api.Personnel/Controllers/ApplicationsController.cs similarity index 85% rename from UKSF.Api/Controllers/ApplicationsController.cs rename to UKSF.Api.Personnel/Controllers/ApplicationsController.cs index 50d8dc9c..6de99218 100644 --- a/UKSF.Api/Controllers/ApplicationsController.cs +++ b/UKSF.Api.Personnel/Controllers/ApplicationsController.cs @@ -1,52 +1,51 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Reactive; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Message; -using UKSF.Api.Services.Personnel; -using UKSF.Common; +using UKSF.Api.Base; +using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class ApplicationsController : Controller { private readonly IAccountService accountService; private readonly IAssignmentService assignmentService; private readonly ICommentThreadService commentThreadService; private readonly IDisplayNameService displayNameService; + private readonly ILogger logger; private readonly INotificationsService notificationsService; private readonly IRecruitmentService recruitmentService; - private readonly ISessionService sessionService; + public ApplicationsController( IRecruitmentService recruitmentService, IAssignmentService assignmentService, - ISessionService sessionService, IAccountService accountService, ICommentThreadService commentThreadService, INotificationsService notificationsService, - IDisplayNameService displayNameService + IDisplayNameService displayNameService, + ILogger logger ) { this.assignmentService = assignmentService; this.recruitmentService = recruitmentService; - this.sessionService = sessionService; + this.accountService = accountService; this.commentThreadService = commentThreadService; this.notificationsService = notificationsService; this.displayNameService = displayNameService; + this.logger = logger; } [HttpPost, Authorize, Permissions(Permissions.CONFIRMED)] public async Task Post([FromBody] JObject body) { - Account account = sessionService.GetContextAccount(); + Account account = accountService.GetUserAccount(); await Update(body, account); CommentThread recruiterCommentThread = new CommentThread {authors = recruitmentService.GetRecruiterLeads().Values.ToArray(), mode = ThreadMode.RECRUITER}; CommentThread applicationCommentThread = new CommentThread {authors = new[] {account.id}, mode = ThreadMode.RECRUITER}; @@ -70,17 +69,17 @@ public async Task Post([FromBody] JObject body) { ); } - LogWrapper.AuditLog($"Application submitted for {account.id}. Assigned to {displayNameService.GetDisplayName(account.application.recruiter)}"); + logger.LogAudit($"Application submitted for {account.id}. Assigned to {displayNameService.GetDisplayName(account.application.recruiter)}"); return Ok(); } [HttpPost("update"), Authorize, Permissions(Permissions.CONFIRMED)] public async Task PostUpdate([FromBody] JObject body) { - Account account = sessionService.GetContextAccount(); + Account account = accountService.GetUserAccount(); await Update(body, account); notificationsService.Add(new Notification {owner = account.application.recruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname} updated their application", link = $"/recruitment/{account.id}"}); string difference = account.Changes(accountService.Data.GetSingle(account.id)); - LogWrapper.AuditLog($"Application updated for {account.id}: {difference}"); + logger.LogAudit($"Application updated for {account.id}: {difference}"); return Ok(); } diff --git a/UKSF.Api/Controllers/Accounts/CommunicationsController.cs b/UKSF.Api.Personnel/Controllers/CommunicationsController.cs similarity index 88% rename from UKSF.Api/Controllers/Accounts/CommunicationsController.cs rename to UKSF.Api.Personnel/Controllers/CommunicationsController.cs index 4882c8db..ba961a73 100644 --- a/UKSF.Api/Controllers/Accounts/CommunicationsController.cs +++ b/UKSF.Api.Personnel/Controllers/CommunicationsController.cs @@ -5,39 +5,38 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Message; -using UKSF.Common; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Extensions; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Controllers.Accounts { +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class CommunicationsController : Controller { private readonly IAccountService accountService; private readonly IConfirmationCodeService confirmationCodeService; private readonly INotificationsService notificationsService; - private readonly ISessionService sessionService; + private readonly ILogger logger; + private readonly ITeamspeakService teamspeakService; public CommunicationsController( IConfirmationCodeService confirmationCodeService, IAccountService accountService, - ISessionService sessionService, ITeamspeakService teamspeakService, - INotificationsService notificationsService + INotificationsService notificationsService, + ILogger logger ) { this.confirmationCodeService = confirmationCodeService; this.accountService = accountService; - this.sessionService = sessionService; + this.teamspeakService = teamspeakService; this.notificationsService = notificationsService; + this.logger = logger; } [HttpGet, Authorize] - public IActionResult GetTeamspeakStatus() => Ok(new { isConnected = sessionService.GetContextAccount().teamspeakIdentities?.Count > 0 }); + public IActionResult GetTeamspeakStatus() => Ok(new { isConnected = accountService.GetUserAccount().teamspeakIdentities?.Count > 0 }); [HttpPost("send"), Authorize] public async Task SendCode([FromBody] JObject body) { @@ -106,7 +105,7 @@ await notificationsService.SendTeamspeakNotification( new HashSet { teamspeakId.ToDouble() }, $"This teamspeak identity has been linked to the account with email '{account.email}'\nIf this was not done by you, please contact an admin" ); - LogWrapper.AuditLog($"Teamspeak ID {teamspeakId} added for {account.id}"); + logger.LogAudit($"Teamspeak ID {teamspeakId} added for {account.id}"); return Ok(); } } diff --git a/UKSF.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs b/UKSF.Api.Personnel/Controllers/ConfirmationCodeReceiver.cs similarity index 93% rename from UKSF.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs rename to UKSF.Api.Personnel/Controllers/ConfirmationCodeReceiver.cs index 99b341e5..014257ef 100644 --- a/UKSF.Api/Controllers/Accounts/ConfirmationCodeReceiver.cs +++ b/UKSF.Api.Personnel/Controllers/ConfirmationCodeReceiver.cs @@ -2,12 +2,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Controllers.Accounts { +namespace UKSF.Api.Personnel.Controllers { public abstract class ConfirmationCodeReceiver : Controller { protected readonly IAccountService AccountService; protected readonly IConfirmationCodeService ConfirmationCodeService; diff --git a/UKSF.Api/Controllers/DischargesController.cs b/UKSF.Api.Personnel/Controllers/DischargesController.cs similarity index 77% rename from UKSF.Api/Controllers/DischargesController.cs rename to UKSF.Api.Personnel/Controllers/DischargesController.cs index e971e56b..1a78856d 100644 --- a/UKSF.Api/Controllers/DischargesController.cs +++ b/UKSF.Api.Personnel/Controllers/DischargesController.cs @@ -3,22 +3,16 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Command; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Command; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Admin; -using UKSF.Api.Services.Message; -using UKSF.Api.Services.Personnel; -using UKSF.Common; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.Admin.Services.Data; +using UKSF.Api.Base; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]"), Permissions(Permissions.PERSONNEL, Permissions.NCO, Permissions.RECRUITER)] public class DischargesController : Controller { private readonly IAccountService accountService; @@ -26,10 +20,12 @@ public class DischargesController : Controller { private readonly ICommandRequestService commandRequestService; private readonly IDischargeService dischargeService; private readonly INotificationsService notificationsService; - private readonly ISessionService sessionService; + private readonly IHttpContextService httpContextService; + private readonly IUnitsService unitsService; private readonly IVariablesDataService variablesDataService; private readonly IVariablesService variablesService; + private readonly ILogger logger; public DischargesController( IAccountService accountService, @@ -37,20 +33,22 @@ public DischargesController( ICommandRequestService commandRequestService, IDischargeService dischargeService, INotificationsService notificationsService, - ISessionService sessionService, + IHttpContextService httpContextService, IUnitsService unitsService, IVariablesDataService variablesDataService, - IVariablesService variablesService + IVariablesService variablesService, + ILogger logger ) { this.accountService = accountService; this.assignmentService = assignmentService; this.commandRequestService = commandRequestService; this.dischargeService = dischargeService; this.notificationsService = notificationsService; - this.sessionService = sessionService; + this.httpContextService = httpContextService; this.unitsService = unitsService; this.variablesDataService = variablesDataService; this.variablesService = variablesService; + this.logger = logger; } [HttpGet] @@ -81,11 +79,11 @@ public async Task Reinstate(string id) { ); notificationsService.Add(notification); - LogWrapper.AuditLog($"{sessionService.GetContextId()} reinstated {dischargeCollection.name}'s membership", sessionService.GetContextId()); + logger.LogAudit($"{httpContextService.GetUserId()} reinstated {dischargeCollection.name}'s membership", httpContextService.GetUserId()); string personnelId = variablesDataService.GetSingle("UNIT_ID_PERSONNEL").AsString(); - foreach (string member in unitsService.Data.GetSingle(personnelId).members.Where(x => x != sessionService.GetContextId())) { + foreach (string member in unitsService.Data.GetSingle(personnelId).members.Where(x => x != httpContextService.GetUserId())) { notificationsService.Add( - new Notification { owner = member, icon = NotificationIcons.PROMOTION, message = $"{dischargeCollection.name}'s membership was reinstated by {sessionService.GetContextId()}" } + new Notification { owner = member, icon = NotificationIcons.PROMOTION, message = $"{dischargeCollection.name}'s membership was reinstated by {httpContextService.GetUserId()}" } ); } diff --git a/UKSF.Api/Controllers/Accounts/DiscordCodeController.cs b/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs similarity index 64% rename from UKSF.Api/Controllers/Accounts/DiscordCodeController.cs rename to UKSF.Api.Personnel/Controllers/DiscordCodeController.cs index ff882e8e..5d194b4b 100644 --- a/UKSF.Api/Controllers/Accounts/DiscordCodeController.cs +++ b/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs @@ -3,25 +3,26 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Message; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Controllers.Accounts { +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class DiscordCodeController : Controller { private readonly IAccountService accountService; + private readonly IHttpContextService httpContextService; private readonly IConfirmationCodeService confirmationCodeService; private readonly IDiscordService discordService; - private readonly ISessionService sessionService; + private readonly ILogger logger; - public DiscordCodeController(ISessionService sessionService, IConfirmationCodeService confirmationCodeService, IAccountService accountService, IDiscordService discordService) { - this.sessionService = sessionService; + public DiscordCodeController(IConfirmationCodeService confirmationCodeService, IAccountService accountService, IHttpContextService httpContextService, IDiscordService discordService, ILogger logger) { this.confirmationCodeService = confirmationCodeService; this.accountService = accountService; + this.httpContextService = httpContextService; this.discordService = discordService; + this.logger = logger; } [HttpPost("{discordId}"), Authorize] @@ -31,11 +32,11 @@ public async Task DiscordConnect(string discordId, [FromBody] JOb return BadRequest(new {error = "Code was invalid or expired. Please try again"}); } - string id = sessionService.GetContextId(); + string id = httpContextService.GetUserId(); await accountService.Data.Update(id, Builders.Update.Set(x => x.discordId, discordId)); Account account = accountService.Data.GetSingle(id); await discordService.UpdateAccount(account); - LogWrapper.AuditLog($"DiscordID updated for {account.id} to {discordId}"); + logger.LogAudit($"DiscordID updated for {account.id} to {discordId}"); return Ok(); } } diff --git a/UKSF.Api/Controllers/Personnel/DisplayNameController.cs b/UKSF.Api.Personnel/Controllers/DisplayNameController.cs similarity index 84% rename from UKSF.Api/Controllers/Personnel/DisplayNameController.cs rename to UKSF.Api.Personnel/Controllers/DisplayNameController.cs index 990bfb0b..6974a763 100644 --- a/UKSF.Api/Controllers/Personnel/DisplayNameController.cs +++ b/UKSF.Api.Personnel/Controllers/DisplayNameController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Interfaces.Personnel; +using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Controllers.Personnel { +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class DisplayNameController : Controller { private readonly IDisplayNameService displayNameService; diff --git a/UKSF.Api/Controllers/Accounts/PasswordResetController.cs b/UKSF.Api.Personnel/Controllers/PasswordResetController.cs similarity index 80% rename from UKSF.Api/Controllers/Accounts/PasswordResetController.cs rename to UKSF.Api.Personnel/Controllers/PasswordResetController.cs index 27c75a8a..a6886c01 100644 --- a/UKSF.Api/Controllers/Accounts/PasswordResetController.cs +++ b/UKSF.Api.Personnel/Controllers/PasswordResetController.cs @@ -3,27 +3,28 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Message; +using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Controllers.Accounts { +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class PasswordResetController : ConfirmationCodeReceiver { private readonly IEmailService emailService; + private readonly ILogger logger; - public PasswordResetController(IConfirmationCodeService confirmationCodeService, ILoginService loginService, IEmailService emailService, IAccountService accountService) : base( + public PasswordResetController(IConfirmationCodeService confirmationCodeService, ILoginService loginService, IEmailService emailService, IAccountService accountService, ILogger logger) : base( confirmationCodeService, loginService, accountService - ) => + ) { this.emailService = emailService; + this.logger = logger; + } protected override async Task ApplyValidatedPayload(string codePayload, Account account) { await AccountService.Data.Update(account.id, "password", BCrypt.Net.BCrypt.HashPassword(codePayload)); - LogWrapper.AuditLog($"Password changed for {account.id}", account.id); + logger.LogAudit($"Password changed for {account.id}", account.id); return Ok(LoginService.RegenerateToken(account.id)); } @@ -42,7 +43,7 @@ public async Task ResetPassword([FromBody] JObject body) { string html = $"

UKSF Password Reset


Please reset your password by clicking here." + "

If this request was not made by you seek assistance from UKSF staff.

"; emailService.SendEmail(account.email, "UKSF Password Reset", html); - LogWrapper.AuditLog($"Password reset request made for {account.id}", account.id); + logger.LogAudit($"Password reset request made for {account.id}", account.id); return Ok(LoginToken); } } diff --git a/UKSF.Api/Controllers/RanksController.cs b/UKSF.Api.Personnel/Controllers/RanksController.cs similarity index 85% rename from UKSF.Api/Controllers/RanksController.cs rename to UKSF.Api.Personnel/Controllers/RanksController.cs index 4ae29930..192e0224 100644 --- a/UKSF.Api/Controllers/RanksController.cs +++ b/UKSF.Api.Personnel/Controllers/RanksController.cs @@ -1,28 +1,28 @@ using System.Collections.Generic; +using System.Reactive; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Message; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class RanksController : Controller { private readonly IAccountService accountService; private readonly IAssignmentService assignmentService; private readonly INotificationsService notificationsService; + private readonly ILogger logger; private readonly IRanksService ranksService; - public RanksController(IRanksService ranksService, IAccountService accountService, IAssignmentService assignmentService, INotificationsService notificationsService) { + public RanksController(IRanksService ranksService, IAccountService accountService, IAssignmentService assignmentService, INotificationsService notificationsService, ILogger logger) { this.ranksService = ranksService; this.accountService = accountService; this.assignmentService = assignmentService; this.notificationsService = notificationsService; + this.logger = logger; } [HttpGet, Authorize] @@ -53,14 +53,14 @@ public IActionResult CheckRank([FromBody] Rank rank) { [HttpPut, Authorize] public async Task AddRank([FromBody] Rank rank) { await ranksService.Data.Add(rank); - LogWrapper.AuditLog($"Rank added '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}'"); + logger.LogAudit($"Rank added '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}'"); return Ok(); } [HttpPatch, Authorize] public async Task EditRank([FromBody] Rank rank) { Rank oldRank = ranksService.Data.GetSingle(x => x.id == rank.id); - LogWrapper.AuditLog($"Rank updated from '{oldRank.name}, {oldRank.abbreviation}, {oldRank.teamspeakGroup}, {oldRank.discordRoleId}' to '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}, {rank.discordRoleId}'"); + logger.LogAudit($"Rank updated from '{oldRank.name}, {oldRank.abbreviation}, {oldRank.teamspeakGroup}, {oldRank.discordRoleId}' to '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}, {rank.discordRoleId}'"); await ranksService.Data.Update(rank.id, Builders.Update.Set("name", rank.name).Set("abbreviation", rank.abbreviation).Set("teamspeakGroup", rank.teamspeakGroup).Set("discordRoleId", rank.discordRoleId)); foreach (Account account in accountService.Data.Get(x => x.rank == oldRank.name)) { // TODO: Notify user to update name in TS if rank abbreviate changed @@ -73,7 +73,7 @@ public async Task EditRank([FromBody] Rank rank) { [HttpDelete("{id}"), Authorize] public async Task DeleteRank(string id) { Rank rank = ranksService.Data.GetSingle(x => x.id == id); - LogWrapper.AuditLog($"Rank deleted '{rank.name}'"); + logger.LogAudit($"Rank deleted '{rank.name}'"); await ranksService.Data.Delete(id); foreach (Account account in accountService.Data.Get(x => x.rank == rank.name)) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, rankString: AssignmentService.REMOVE_FLAG, reason: $"the '{rank.name}' rank was deleted"); diff --git a/UKSF.Api/Controllers/RecruitmentController.cs b/UKSF.Api.Personnel/Controllers/RecruitmentController.cs similarity index 84% rename from UKSF.Api/Controllers/RecruitmentController.cs rename to UKSF.Api.Personnel/Controllers/RecruitmentController.cs index 0490f344..d70874de 100644 --- a/UKSF.Api/Controllers/RecruitmentController.cs +++ b/UKSF.Api.Personnel/Controllers/RecruitmentController.cs @@ -6,31 +6,33 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Message; -using UKSF.Api.Services.Personnel; - -namespace UKSF.Api.Controllers { +using UKSF.Api.Base; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; + +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class RecruitmentController : Controller { private readonly IAccountService accountService; private readonly IAssignmentService assignmentService; private readonly IDisplayNameService displayNameService; private readonly INotificationsService notificationsService; + private readonly IHttpContextService httpContextService; + private readonly ILogger logger; private readonly IRecruitmentService recruitmentService; - private readonly ISessionService sessionService; - public RecruitmentController(IAccountService accountService, IRecruitmentService recruitmentService, IAssignmentService assignmentService, ISessionService sessionService, IDisplayNameService displayNameService, INotificationsService notificationsService) { + + public RecruitmentController(IAccountService accountService, IRecruitmentService recruitmentService, IAssignmentService assignmentService, IDisplayNameService displayNameService, INotificationsService notificationsService, IHttpContextService httpContextService, ILogger logger) { this.accountService = accountService; this.recruitmentService = recruitmentService; this.assignmentService = assignmentService; - this.sessionService = sessionService; + this.displayNameService = displayNameService; this.notificationsService = notificationsService; + this.httpContextService = httpContextService; + this.logger = logger; } [HttpGet, Authorize, Permissions(Permissions.RECRUITER)] @@ -43,11 +45,11 @@ public IActionResult GetSingle(string id) { } [HttpGet("isrecruiter"), Authorize, Permissions(Permissions.RECRUITER)] - public IActionResult GetIsRecruiter() => Ok(new {recruiter = recruitmentService.IsRecruiter(sessionService.GetContextAccount())}); + public IActionResult GetIsRecruiter() => Ok(new {recruiter = recruitmentService.IsRecruiter(accountService.GetUserAccount())}); [HttpGet("stats"), Authorize, Permissions(Permissions.RECRUITER)] public IActionResult GetRecruitmentStats() { - string account = sessionService.GetContextId(); + string account = httpContextService.GetUserId(); List activity = new List(); foreach (Account recruiterAccount in recruitmentService.GetRecruiters()) { List recruiterApplications = accountService.Data.Get(x => x.application != null && x.application.recruiter == recruiterAccount.id).ToList(); @@ -70,9 +72,9 @@ public async Task UpdateState([FromBody] dynamic body, string id) ApplicationState updatedState = body.updatedState; Account account = accountService.Data.GetSingle(id); if (updatedState == account.application.state) return Ok(); - string sessionId = sessionService.GetContextId(); + string sessionId = httpContextService.GetUserId(); await accountService.Data.Update(id, Builders.Update.Set(x => x.application.state, updatedState)); - LogWrapper.AuditLog($"Application state changed for {id} from {account.application.state} to {updatedState}"); + logger.LogAudit($"Application state changed for {id} from {account.application.state} to {updatedState}"); switch (updatedState) { case ApplicationState.ACCEPTED: { @@ -100,7 +102,7 @@ public async Task UpdateState([FromBody] dynamic body, string id) notificationsService.Add(notification); if (recruitmentService.GetRecruiters().All(x => x.id != account.application.recruiter)) { string newRecruiterId = recruitmentService.GetRecruiter(); - LogWrapper.AuditLog($"Application recruiter for {id} is no longer SR1, reassigning from {account.application.recruiter} to {newRecruiterId}"); + logger.LogAudit($"Application recruiter for {id} is no longer SR1, reassigning from {account.application.recruiter} to {newRecruiterId}"); await accountService.Data.Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiterId)); } @@ -113,12 +115,12 @@ public async Task UpdateState([FromBody] dynamic body, string id) string message = updatedState == ApplicationState.WAITING ? "was reactivated" : $"was {updatedState}"; if (sessionId != account.application.recruiter) { notificationsService.Add( - new Notification {owner = account.application.recruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application {message} by {displayNameService.GetDisplayName(sessionService.GetContextAccount())}", link = $"/recruitment/{id}"} + new Notification {owner = account.application.recruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application {message} by {displayNameService.GetDisplayName(accountService.GetUserAccount())}", link = $"/recruitment/{id}"} ); } foreach (string value in recruitmentService.GetRecruiterLeads().Values.Where(value => sessionId != value && account.application.recruiter != value)) { - notificationsService.Add(new Notification {owner = value, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application {message} by {displayNameService.GetDisplayName(sessionService.GetContextAccount())}", link = $"/recruitment/{id}"}); + notificationsService.Add(new Notification {owner = value, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application {message} by {displayNameService.GetDisplayName(accountService.GetUserAccount())}", link = $"/recruitment/{id}"}); } return Ok(); @@ -126,7 +128,7 @@ public async Task UpdateState([FromBody] dynamic body, string id) [HttpPost("recruiter/{id}"), Authorize, Permissions(Permissions.RECRUITER_LEAD)] public async Task PostReassignment([FromBody] JObject newRecruiter, string id) { - if (!sessionService.ContextHasRole(Permissions.ADMIN) && !recruitmentService.IsRecruiterLead()) throw new Exception($"attempted to assign recruiter to {newRecruiter}. Context is not recruitment lead."); + if (!httpContextService.UserHasPermission(Permissions.ADMIN) && !recruitmentService.IsRecruiterLead()) throw new Exception($"attempted to assign recruiter to {newRecruiter}. Context is not recruitment lead."); string recruiter = newRecruiter["newRecruiter"].ToString(); await recruitmentService.SetRecruiter(id, recruiter); Account account = accountService.Data.GetSingle(id); @@ -134,7 +136,7 @@ public async Task PostReassignment([FromBody] JObject newRecruite notificationsService.Add(new Notification {owner = recruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application has been transferred to you", link = $"/recruitment/{account.id}"}); } - LogWrapper.AuditLog($"Application recruiter changed for {id} to {newRecruiter["newRecruiter"]}"); + logger.LogAudit($"Application recruiter changed for {id} to {newRecruiter["newRecruiter"]}"); return Ok(); } diff --git a/UKSF.Api/Controllers/RolesController.cs b/UKSF.Api.Personnel/Controllers/RolesController.cs similarity index 90% rename from UKSF.Api/Controllers/RolesController.cs rename to UKSF.Api.Personnel/Controllers/RolesController.cs index bbde17a1..7c492f2f 100644 --- a/UKSF.Api/Controllers/RolesController.cs +++ b/UKSF.Api.Personnel/Controllers/RolesController.cs @@ -1,32 +1,31 @@ using System.Collections.Generic; using System.Linq; +using System.Reactive; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; -using UKSF.Api.Services.Message; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using Unit = UKSF.Api.Personnel.Models.Unit; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class RolesController : Controller { private readonly IAccountService accountService; private readonly IAssignmentService assignmentService; private readonly INotificationsService notificationsService; + private readonly ILogger logger; private readonly IRolesService rolesService; private readonly IUnitsService unitsService; - public RolesController(IRolesService rolesService, IAccountService accountService, IAssignmentService assignmentService, IUnitsService unitsService, INotificationsService notificationsService) { + public RolesController(IRolesService rolesService, IAccountService accountService, IAssignmentService assignmentService, IUnitsService unitsService, INotificationsService notificationsService, ILogger logger) { this.rolesService = rolesService; this.accountService = accountService; this.assignmentService = assignmentService; this.unitsService = unitsService; this.notificationsService = notificationsService; + this.logger = logger; } [HttpGet, Authorize] @@ -61,14 +60,14 @@ public IActionResult CheckRole(RoleType roleType, string check, [FromBody] Role [HttpPut, Authorize] public async Task AddRole([FromBody] Role role) { await rolesService.Data.Add(role); - LogWrapper.AuditLog($"Role added '{role.name}'"); + logger.LogAudit($"Role added '{role.name}'"); return Ok(new {individualRoles = rolesService.Data.Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); } [HttpPatch, Authorize] public async Task EditRole([FromBody] Role role) { Role oldRole = rolesService.Data.GetSingle(x => x.id == role.id); - LogWrapper.AuditLog($"Role updated from '{oldRole.name}' to '{role.name}'"); + logger.LogAudit($"Role updated from '{oldRole.name}' to '{role.name}'"); await rolesService.Data.Update(role.id, "name", role.name); foreach (Account account in accountService.Data.Get(x => x.roleAssignment == oldRole.name)) { await accountService.Data.Update(account.id, "roleAssignment", role.name); @@ -81,7 +80,7 @@ public async Task EditRole([FromBody] Role role) { [HttpDelete("{id}"), Authorize] public async Task DeleteRole(string id) { Role role = rolesService.Data.GetSingle(x => x.id == id); - LogWrapper.AuditLog($"Role deleted '{role.name}'"); + logger.LogAudit($"Role deleted '{role.name}'"); await rolesService.Data.Delete(id); foreach (Account account in accountService.Data.Get(x => x.roleAssignment == role.name)) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, role: AssignmentService.REMOVE_FLAG, reason: $"the '{role.name}' role was deleted"); diff --git a/UKSF.Api/Controllers/Accounts/ServiceRecordsController.cs b/UKSF.Api.Personnel/Controllers/ServiceRecordsController.cs similarity index 76% rename from UKSF.Api/Controllers/Accounts/ServiceRecordsController.cs rename to UKSF.Api.Personnel/Controllers/ServiceRecordsController.cs index d4a927ee..1f99ad59 100644 --- a/UKSF.Api/Controllers/Accounts/ServiceRecordsController.cs +++ b/UKSF.Api.Personnel/Controllers/ServiceRecordsController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace UKSF.Api.Controllers.Accounts { +namespace UKSF.Api.Personnel.Controllers { [Route("users/{userid}/[controller]")] public class ServiceRecordsController : Controller { } } diff --git a/UKSF.Api/Controllers/Accounts/SteamCodeController.cs b/UKSF.Api.Personnel/Controllers/SteamCodeController.cs similarity index 61% rename from UKSF.Api/Controllers/Accounts/SteamCodeController.cs rename to UKSF.Api.Personnel/Controllers/SteamCodeController.cs index f5e3a1b4..af1891dc 100644 --- a/UKSF.Api/Controllers/Accounts/SteamCodeController.cs +++ b/UKSF.Api.Personnel/Controllers/SteamCodeController.cs @@ -2,22 +2,26 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Message; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Controllers.Accounts { +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class SteamCodeController : Controller { private readonly IAccountService accountService; + private readonly IHttpContextService httpContextService; + private readonly ILogger logger; private readonly IConfirmationCodeService confirmationCodeService; - private readonly ISessionService sessionService; - public SteamCodeController(ISessionService sessionService, IConfirmationCodeService confirmationCodeService, IAccountService accountService) { - this.sessionService = sessionService; + + public SteamCodeController(IConfirmationCodeService confirmationCodeService, IAccountService accountService, IHttpContextService httpContextService, ILogger logger) { + this.confirmationCodeService = confirmationCodeService; this.accountService = accountService; + this.httpContextService = httpContextService; + this.logger = logger; } [HttpPost("{steamId}"), Authorize] @@ -27,10 +31,10 @@ public async Task SteamConnect(string steamId, [FromBody] JObject return BadRequest(new {error = "Code was invalid or expired. Please try again"}); } - string id = sessionService.GetContextId(); + string id = httpContextService.GetUserId(); await accountService.Data.Update(id, "steamname", steamId); Account account = accountService.Data.GetSingle(id); - LogWrapper.AuditLog($"SteamID updated for {account.id} to {steamId}"); + logger.LogAudit($"SteamID updated for {account.id} to {steamId}"); return Ok(); } } diff --git a/UKSF.Api/Controllers/UnitsController.cs b/UKSF.Api.Personnel/Controllers/UnitsController.cs similarity index 95% rename from UKSF.Api/Controllers/UnitsController.cs rename to UKSF.Api.Personnel/Controllers/UnitsController.cs index facc7061..e723147f 100644 --- a/UKSF.Api/Controllers/UnitsController.cs +++ b/UKSF.Api.Personnel/Controllers/UnitsController.cs @@ -6,19 +6,13 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Bson; -using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Models; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; -using UKSF.Api.Services.Message; -using UKSF.Common; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Extensions; +using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class UnitsController : Controller { private readonly IAccountService accountService; @@ -26,6 +20,7 @@ public class UnitsController : Controller { private readonly IDiscordService discordService; private readonly IDisplayNameService displayNameService; private readonly IMapper mapper; + private readonly ILogger logger; private readonly INotificationsService notificationsService; private readonly IRanksService ranksService; private readonly IRolesService rolesService; @@ -42,7 +37,8 @@ public UnitsController( IAssignmentService assignmentService, IDiscordService discordService, INotificationsService notificationsService, - IMapper mapper + IMapper mapper, + ILogger logger ) { this.accountService = accountService; this.displayNameService = displayNameService; @@ -54,6 +50,7 @@ IMapper mapper this.discordService = discordService; this.notificationsService = notificationsService; this.mapper = mapper; + this.logger = logger; } [HttpGet, Authorize] @@ -117,7 +114,7 @@ private IEnumerable GetUnitTreeChildren(DatabaseObject parentU [HttpPost, Authorize] public async Task AddUnit([FromBody] Unit unit) { await unitsService.Data.Add(unit); - LogWrapper.AuditLog($"New unit added: '{unit}'"); + logger.LogAudit($"New unit added: '{unit}'"); return Ok(); } @@ -125,7 +122,7 @@ public async Task AddUnit([FromBody] Unit unit) { public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit) { Unit oldUnit = unitsService.Data.GetSingle(x => x.id == id); await unitsService.Data.Replace(unit); - LogWrapper.AuditLog($"Unit '{unit.shortname}' updated: {oldUnit.Changes(unit)}"); + logger.LogAudit($"Unit '{unit.shortname}' updated: {oldUnit.Changes(unit)}"); // TODO: Move this elsewhere unit = unitsService.Data.GetSingle(unit.id); @@ -154,7 +151,7 @@ public async Task EditUnit([FromRoute] string id, [FromBody] Unit [HttpDelete("{id}"), Authorize] public async Task DeleteUnit([FromRoute] string id) { Unit unit = unitsService.Data.GetSingle(id); - LogWrapper.AuditLog($"Unit deleted '{unit.name}'"); + logger.LogAudit($"Unit deleted '{unit.name}'"); foreach (Account account in accountService.Data.Get(x => x.unitAssignment == unit.name)) { Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, "Reserves", reason: $"{unit.name} was deleted"); notificationsService.Add(notification); diff --git a/UKSF.Api.Events/Handlers/AccountEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/AccountEventHandler.cs similarity index 62% rename from UKSF.Api.Events/Handlers/AccountEventHandler.cs rename to UKSF.Api.Personnel/EventHandlers/AccountEventHandler.cs index f02b6d9d..04d1a7c9 100644 --- a/UKSF.Api.Events/Handlers/AccountEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/AccountEventHandler.cs @@ -1,32 +1,31 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Interfaces.Events.Handlers; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; -using UKSF.Api.Signalr.Hubs.Personnel; -using UKSF.Common; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Extensions; +using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.SignalrHubs.Clients; +using UKSF.Api.Personnel.SignalrHubs.Hubs; + +namespace UKSF.Api.Personnel.EventHandlers { + public interface IAccountEventHandler : IEventHandler { } -namespace UKSF.Api.Events.Handlers { public class AccountEventHandler : IAccountEventHandler { private readonly IDataEventBus accountDataEventBus; private readonly IHubContext hub; - private readonly ILoggingService loggingService; + private readonly ILogger logger; private readonly IDataEventBus unitDataEventBus; - public AccountEventHandler(IDataEventBus accountDataEventBus, IDataEventBus unitDataEventBus, IHubContext hub, ILoggingService loggingService) { + public AccountEventHandler(IDataEventBus accountDataEventBus, IDataEventBus unitDataEventBus, IHubContext hub, ILogger logger) { this.accountDataEventBus = accountDataEventBus; this.unitDataEventBus = unitDataEventBus; this.hub = hub; - this.loggingService = loggingService; + this.logger = logger; } public void Init() { - accountDataEventBus.AsObservable().SubscribeAsync(HandleAccountsEvent, exception => loggingService.Log(exception)); - unitDataEventBus.AsObservable().SubscribeAsync(HandleUnitsEvent, exception => loggingService.Log(exception)); + accountDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleAccountsEvent, exception => logger.LogError(exception)); + unitDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleUnitsEvent, exception => logger.LogError(exception)); } private async Task HandleAccountsEvent(DataEventModel dataEventModel) { diff --git a/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs similarity index 61% rename from UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs rename to UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs index df578aaa..fa6f2591 100644 --- a/UKSF.Api.Events/Handlers/CommentThreadEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs @@ -1,37 +1,37 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Interfaces.Events.Handlers; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Models; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Message; -using UKSF.Api.Signalr.Hubs.Message; -using UKSF.Common; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Extensions; +using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.SignalrHubs.Clients; +using UKSF.Api.Personnel.SignalrHubs.Hubs; + +namespace UKSF.Api.Personnel.EventHandlers { + public interface ICommentThreadEventHandler : IEventHandler { } -namespace UKSF.Api.Events.Handlers { public class CommentThreadEventHandler : ICommentThreadEventHandler { private readonly IDataEventBus commentThreadDataEventBus; private readonly ICommentThreadService commentThreadService; private readonly IHubContext hub; - private readonly ILoggingService loggingService; + private readonly ILogger logger; public CommentThreadEventHandler( IDataEventBus commentThreadDataEventBus, IHubContext hub, ICommentThreadService commentThreadService, - ILoggingService loggingService + ILogger logger ) { this.commentThreadDataEventBus = commentThreadDataEventBus; this.hub = hub; this.commentThreadService = commentThreadService; - this.loggingService = loggingService; + this.logger = logger; } public void Init() { - commentThreadDataEventBus.AsObservable().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + commentThreadDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => logger.LogError(exception)); } private async Task HandleEvent(DataEventModel dataEventModel) { @@ -47,12 +47,8 @@ private async Task HandleEvent(DataEventModel dataEventModel) { } } - private async Task AddedEvent(string id, Comment comment) { - await hub.Clients.Group(id).ReceiveComment(commentThreadService.FormatComment(comment)); - } + private Task AddedEvent(string id, Comment comment) => hub.Clients.Group(id).ReceiveComment(commentThreadService.FormatComment(comment)); - private async Task DeletedEvent(string id, DatabaseObject comment) { - await hub.Clients.Group(id).DeleteComment(comment.id); - } + private Task DeletedEvent(string id, DatabaseObject comment) => hub.Clients.Group(id).DeleteComment(comment.id); } } diff --git a/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs similarity index 62% rename from UKSF.Api.Events/Handlers/NotificationsEventHandler.cs rename to UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs index 02ab0a1d..11b472af 100644 --- a/UKSF.Api.Events/Handlers/NotificationsEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs @@ -1,28 +1,28 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Interfaces.Events.Handlers; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Message; -using UKSF.Api.Signalr.Hubs.Message; -using UKSF.Common; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Extensions; +using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.SignalrHubs.Clients; +using UKSF.Api.Personnel.SignalrHubs.Hubs; + +namespace UKSF.Api.Personnel.EventHandlers { + public interface INotificationsEventHandler : IEventHandler { } -namespace UKSF.Api.Events.Handlers { public class NotificationsEventHandler : INotificationsEventHandler { private readonly IHubContext hub; - private readonly ILoggingService loggingService; + private readonly ILogger logger; private readonly IDataEventBus notificationDataEventBus; - public NotificationsEventHandler(IDataEventBus notificationDataEventBus, IHubContext hub, ILoggingService loggingService) { + public NotificationsEventHandler(IDataEventBus notificationDataEventBus, IHubContext hub, ILogger logger) { this.notificationDataEventBus = notificationDataEventBus; this.hub = hub; - this.loggingService = loggingService; + this.logger = logger; } public void Init() { - notificationDataEventBus.AsObservable().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + notificationDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => logger.LogError(exception)); } private async Task HandleEvent(DataEventModel dataEventModel) { diff --git a/UKSF.Api.Services/Common/AccountUtilities.cs b/UKSF.Api.Personnel/Extensions/AccountExtensions.cs similarity index 57% rename from UKSF.Api.Services/Common/AccountUtilities.cs rename to UKSF.Api.Personnel/Extensions/AccountExtensions.cs index 2ee19114..20d13bff 100644 --- a/UKSF.Api.Services/Common/AccountUtilities.cs +++ b/UKSF.Api.Personnel/Extensions/AccountExtensions.cs @@ -1,8 +1,9 @@ -using UKSF.Api.Models.Personnel; -using UKSF.Common; +using UKSF.Api.Base.Extensions; +using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Services.Common { - public static class AccountUtilities { +namespace UKSF.Api.Personnel.Extensions { + public static class AccountExtensions { + // TODO: Use automapper public static PublicAccount ToPublicAccount(this Account account) { PublicAccount publicAccount = account.Copy(); publicAccount.password = null; diff --git a/UKSF.Api.Models/Personnel/Account.cs b/UKSF.Api.Personnel/Models/Account.cs similarity index 89% rename from UKSF.Api.Models/Personnel/Account.cs rename to UKSF.Api.Personnel/Models/Account.cs index be4a5d28..d608ea91 100644 --- a/UKSF.Api.Models/Personnel/Account.cs +++ b/UKSF.Api.Personnel/Models/Account.cs @@ -1,7 +1,8 @@ using System; using System.Collections.Generic; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Models.Personnel { +namespace UKSF.Api.Personnel.Models { public class Account : DatabaseObject { public Application application; public string armaExperience; @@ -34,4 +35,8 @@ public class RosterAccount : DatabaseObject { public string unitAssignment; public string nation; } + + public class PublicAccount : Account { + public string displayName; + } } diff --git a/UKSF.Api.Models/Personnel/AccountAttendanceStatus.cs b/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs similarity index 93% rename from UKSF.Api.Models/Personnel/AccountAttendanceStatus.cs rename to UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs index 625e374e..80c92eff 100644 --- a/UKSF.Api.Models/Personnel/AccountAttendanceStatus.cs +++ b/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs @@ -1,7 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSF.Api.Models.Personnel { +namespace UKSF.Api.Personnel.Models { public class AccountAttendanceStatus { [BsonRepresentation(BsonType.ObjectId)] public string accountId; public float attendancePercent; diff --git a/UKSF.Api.Models/Personnel/AccountSettings.cs b/UKSF.Api.Personnel/Models/AccountSettings.cs similarity index 93% rename from UKSF.Api.Models/Personnel/AccountSettings.cs rename to UKSF.Api.Personnel/Models/AccountSettings.cs index 04debf9a..3e030600 100644 --- a/UKSF.Api.Models/Personnel/AccountSettings.cs +++ b/UKSF.Api.Personnel/Models/AccountSettings.cs @@ -1,7 +1,7 @@ using System; using System.Reflection; -namespace UKSF.Api.Models.Personnel { +namespace UKSF.Api.Personnel.Models { public class AccountSettings { public bool errorEmails = false; public bool notificationsEmail = true; diff --git a/UKSF.Api.Models/Personnel/Application.cs b/UKSF.Api.Personnel/Models/Application.cs similarity index 94% rename from UKSF.Api.Models/Personnel/Application.cs rename to UKSF.Api.Personnel/Models/Application.cs index 83fa74d8..bf547532 100644 --- a/UKSF.Api.Models/Personnel/Application.cs +++ b/UKSF.Api.Personnel/Models/Application.cs @@ -3,7 +3,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSF.Api.Models.Personnel { +namespace UKSF.Api.Personnel.Models { public enum ApplicationState { ACCEPTED, REJECTED, diff --git a/UKSF.Api.Models/Personnel/AttendanceReport.cs b/UKSF.Api.Personnel/Models/AttendanceReport.cs similarity index 69% rename from UKSF.Api.Models/Personnel/AttendanceReport.cs rename to UKSF.Api.Personnel/Models/AttendanceReport.cs index 69efe35c..c52040b5 100644 --- a/UKSF.Api.Models/Personnel/AttendanceReport.cs +++ b/UKSF.Api.Personnel/Models/AttendanceReport.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Models.Personnel { +namespace UKSF.Api.Personnel.Models { public class AttendanceReport { public AccountAttendanceStatus[] users; } diff --git a/UKSF.Api.Models/Message/Comment.cs b/UKSF.Api.Personnel/Models/Comment.cs similarity index 80% rename from UKSF.Api.Models/Message/Comment.cs rename to UKSF.Api.Personnel/Models/Comment.cs index c4f871fd..cd629b08 100644 --- a/UKSF.Api.Models/Message/Comment.cs +++ b/UKSF.Api.Personnel/Models/Comment.cs @@ -1,8 +1,9 @@ using System; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Models.Message { +namespace UKSF.Api.Personnel.Models { public class Comment : DatabaseObject { [BsonRepresentation(BsonType.ObjectId)] public string author; public string content; diff --git a/UKSF.Api.Models/Message/CommentThread.cs b/UKSF.Api.Personnel/Models/CommentThread.cs similarity index 86% rename from UKSF.Api.Models/Message/CommentThread.cs rename to UKSF.Api.Personnel/Models/CommentThread.cs index bdff8301..5365b1d8 100644 --- a/UKSF.Api.Models/Message/CommentThread.cs +++ b/UKSF.Api.Personnel/Models/CommentThread.cs @@ -1,7 +1,8 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Models.Message { +namespace UKSF.Api.Personnel.Models { public enum ThreadMode { ALL, RECRUITER, diff --git a/UKSF.Api.Models/Utility/ConfirmationCode.cs b/UKSF.Api.Personnel/Models/ConfirmationCode.cs similarity index 56% rename from UKSF.Api.Models/Utility/ConfirmationCode.cs rename to UKSF.Api.Personnel/Models/ConfirmationCode.cs index 74f11787..98e05d94 100644 --- a/UKSF.Api.Models/Utility/ConfirmationCode.cs +++ b/UKSF.Api.Personnel/Models/ConfirmationCode.cs @@ -1,4 +1,6 @@ -namespace UKSF.Api.Models.Utility { +using UKSF.Api.Base.Models; + +namespace UKSF.Api.Personnel.Models { public class ConfirmationCode : DatabaseObject { public string value; } diff --git a/UKSF.Api.Models/Personnel/Discharge.cs b/UKSF.Api.Personnel/Models/Discharge.cs similarity index 91% rename from UKSF.Api.Models/Personnel/Discharge.cs rename to UKSF.Api.Personnel/Models/Discharge.cs index 39c007e1..425a8bb7 100644 --- a/UKSF.Api.Models/Personnel/Discharge.cs +++ b/UKSF.Api.Personnel/Models/Discharge.cs @@ -2,8 +2,9 @@ using System.Collections.Generic; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Models.Personnel { +namespace UKSF.Api.Personnel.Models { public class DischargeCollection : DatabaseObject { [BsonRepresentation(BsonType.ObjectId)] public string accountId; public List discharges = new List(); diff --git a/UKSF.Api.Models/Personnel/Loa.cs b/UKSF.Api.Personnel/Models/Loa.cs similarity index 88% rename from UKSF.Api.Models/Personnel/Loa.cs rename to UKSF.Api.Personnel/Models/Loa.cs index 12583aae..2b5d9fe3 100644 --- a/UKSF.Api.Models/Personnel/Loa.cs +++ b/UKSF.Api.Personnel/Models/Loa.cs @@ -1,8 +1,9 @@ using System; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Models.Personnel { +namespace UKSF.Api.Personnel.Models { public enum LoaReviewState { PENDING, APPROVED, diff --git a/UKSF.Api.Models/Personnel/MembershipState.cs b/UKSF.Api.Personnel/Models/MembershipState.cs similarity index 78% rename from UKSF.Api.Models/Personnel/MembershipState.cs rename to UKSF.Api.Personnel/Models/MembershipState.cs index 063e244c..6f4b8afd 100644 --- a/UKSF.Api.Models/Personnel/MembershipState.cs +++ b/UKSF.Api.Personnel/Models/MembershipState.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Models.Personnel { +namespace UKSF.Api.Personnel.Models { public enum MembershipState { UNCONFIRMED, CONFIRMED, diff --git a/UKSF.Api.Models/Message/Notification.cs b/UKSF.Api.Personnel/Models/Notification.cs similarity index 78% rename from UKSF.Api.Models/Message/Notification.cs rename to UKSF.Api.Personnel/Models/Notification.cs index 909424ad..a2d83142 100644 --- a/UKSF.Api.Models/Message/Notification.cs +++ b/UKSF.Api.Personnel/Models/Notification.cs @@ -1,14 +1,15 @@ using System; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Models.Message { +namespace UKSF.Api.Personnel.Models { public class Notification : DatabaseObject { public string icon; public string link; public string message; [BsonRepresentation(BsonType.ObjectId)] public string owner; - public bool read = false; + public bool read; public DateTime timestamp = DateTime.Now; } } diff --git a/UKSF.Api.Models/Message/NotificationIcons.cs b/UKSF.Api.Personnel/Models/NotificationIcons.cs similarity index 90% rename from UKSF.Api.Models/Message/NotificationIcons.cs rename to UKSF.Api.Personnel/Models/NotificationIcons.cs index 2f5f9d0d..0b8478f3 100644 --- a/UKSF.Api.Models/Message/NotificationIcons.cs +++ b/UKSF.Api.Personnel/Models/NotificationIcons.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Models.Message { +namespace UKSF.Api.Personnel.Models { public static class NotificationIcons { public const string APPLICATION = "group_add"; public const string BUILD = "build"; diff --git a/UKSF.Api.Models/Personnel/Rank.cs b/UKSF.Api.Personnel/Models/Rank.cs similarity index 75% rename from UKSF.Api.Models/Personnel/Rank.cs rename to UKSF.Api.Personnel/Models/Rank.cs index 2cc65605..3100207e 100644 --- a/UKSF.Api.Models/Personnel/Rank.cs +++ b/UKSF.Api.Personnel/Models/Rank.cs @@ -1,4 +1,6 @@ -namespace UKSF.Api.Models.Personnel { +using UKSF.Api.Base.Models; + +namespace UKSF.Api.Personnel.Models { public class Rank : DatabaseObject { public string abbreviation; public string discordRoleId; diff --git a/UKSF.Api.Models/Personnel/Role.cs b/UKSF.Api.Personnel/Models/Role.cs similarity index 76% rename from UKSF.Api.Models/Personnel/Role.cs rename to UKSF.Api.Personnel/Models/Role.cs index e16484b9..4d054847 100644 --- a/UKSF.Api.Models/Personnel/Role.cs +++ b/UKSF.Api.Personnel/Models/Role.cs @@ -1,4 +1,6 @@ -namespace UKSF.Api.Models.Personnel { +using UKSF.Api.Base.Models; + +namespace UKSF.Api.Personnel.Models { public enum RoleType { INDIVIDUAL, UNIT diff --git a/UKSF.Api.Models/Personnel/ServiceRecord.cs b/UKSF.Api.Personnel/Models/ServiceRecord.cs similarity index 96% rename from UKSF.Api.Models/Personnel/ServiceRecord.cs rename to UKSF.Api.Personnel/Models/ServiceRecord.cs index 5f4d892f..33d598c5 100644 --- a/UKSF.Api.Models/Personnel/ServiceRecord.cs +++ b/UKSF.Api.Personnel/Models/ServiceRecord.cs @@ -1,6 +1,6 @@ using System; -namespace UKSF.Api.Models.Personnel { +namespace UKSF.Api.Personnel.Models { public class ServiceRecordEntry : IEquatable { public string notes; public string occurence; diff --git a/UKSF.Api.Models/Units/Unit.cs b/UKSF.Api.Personnel/Models/Unit.cs similarity index 94% rename from UKSF.Api.Models/Units/Unit.cs rename to UKSF.Api.Personnel/Models/Unit.cs index 24bf51b4..62ccf922 100644 --- a/UKSF.Api.Models/Units/Unit.cs +++ b/UKSF.Api.Personnel/Models/Unit.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Models.Units { +namespace UKSF.Api.Personnel.Models { public class Unit : DatabaseObject { public UnitBranch branch = UnitBranch.COMBAT; public string callsign; @@ -12,10 +13,10 @@ public class Unit : DatabaseObject { public string name; public int order; [BsonRepresentation(BsonType.ObjectId)] public string parent; + public bool preferShortname; [BsonRepresentation(BsonType.ObjectId)] public Dictionary roles = new Dictionary(); public string shortname; public string teamspeakGroup; - public bool preferShortname; public override string ToString() => $"{name}, {shortname}, {callsign}, {branch}, {teamspeakGroup}, {discordRoleId}"; } @@ -25,6 +26,7 @@ public enum UnitBranch { AUXILIARY } + // TODO: Cleaner way of doing this? Inside controllers? public class ResponseUnit : Unit { public string code; public string parentName; diff --git a/UKSF.Api.Utility/ScheduledActions/DeleteExpiredConfirmationCodeAction.cs b/UKSF.Api.Personnel/ScheduledActions/DeleteExpiredConfirmationCodeAction.cs similarity index 87% rename from UKSF.Api.Utility/ScheduledActions/DeleteExpiredConfirmationCodeAction.cs rename to UKSF.Api.Personnel/ScheduledActions/DeleteExpiredConfirmationCodeAction.cs index 0004d654..1fa66356 100644 --- a/UKSF.Api.Utility/ScheduledActions/DeleteExpiredConfirmationCodeAction.cs +++ b/UKSF.Api.Personnel/ScheduledActions/DeleteExpiredConfirmationCodeAction.cs @@ -1,9 +1,10 @@ using System; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Utility.ScheduledActions; -namespace UKSF.Api.Utility.ScheduledActions { +namespace UKSF.Api.Personnel.ScheduledActions { public interface IDeleteExpiredConfirmationCodeAction : IScheduledAction { } - // TODO: Move these to their respective component/ScheduledActions public class DeleteExpiredConfirmationCodeAction : IDeleteExpiredConfirmationCodeAction { public const string ACTION_NAME = nameof(DeleteExpiredConfirmationCodeAction); diff --git a/UKSF.Api.Personnel/Services/AccountService.cs b/UKSF.Api.Personnel/Services/AccountService.cs new file mode 100644 index 00000000..2692ef42 --- /dev/null +++ b/UKSF.Api.Personnel/Services/AccountService.cs @@ -0,0 +1,18 @@ +using UKSF.Api.Base.Services; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services.Data; + +namespace UKSF.Api.Personnel.Services { + public interface IAccountService : IDataBackedService { + Account GetUserAccount(); + } + + public class AccountService : DataBackedService, IAccountService { + private readonly IHttpContextService httpContextService; + + public AccountService(IAccountDataService data, IHttpContextService httpContextService) : base(data) => this.httpContextService = httpContextService; + + public Account GetUserAccount() => Data.GetSingle(httpContextService.GetUserId()); + } +} diff --git a/UKSF.Api.Services/Personnel/AssignmentService.cs b/UKSF.Api.Personnel/Services/AssignmentService.cs similarity index 92% rename from UKSF.Api.Services/Personnel/AssignmentService.cs rename to UKSF.Api.Personnel/Services/AssignmentService.cs index a2b9c744..d720acc9 100644 --- a/UKSF.Api.Services/Personnel/AssignmentService.cs +++ b/UKSF.Api.Personnel/Services/AssignmentService.cs @@ -4,18 +4,21 @@ using System.Threading.Tasks; using AvsAnLib; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; -using UKSF.Api.Signalr.Hubs.Personnel; - -namespace UKSF.Api.Services.Personnel { +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.SignalrHubs.Clients; +using UKSF.Api.Personnel.SignalrHubs.Hubs; + +namespace UKSF.Api.Personnel.Services { + public interface IAssignmentService { + Task AssignUnitRole(string id, string unitId, string role); + Task UnassignAllUnits(string id); + Task UnassignAllUnitRoles(string id); + Task UpdateUnitRankAndRole(string id, string unitString = "", string role = "", string rankString = "", string notes = "", string message = "", string reason = ""); + Task UnassignUnitRole(string id, string unitId); + Task UnassignUnit(string id, string unitId); + Task UpdateGroupsAndRoles(string id); + } + public class AssignmentService : IAssignmentService { public const string REMOVE_FLAG = "REMOVE"; private readonly IHubContext accountHub; @@ -23,7 +26,6 @@ public class AssignmentService : IAssignmentService { private readonly IDiscordService discordService; private readonly IDisplayNameService displayNameService; private readonly IRanksService ranksService; - private readonly IServerService serverService; private readonly IServiceRecordService serviceRecordService; private readonly ITeamspeakService teamspeakService; private readonly IUnitsService unitsService; @@ -34,7 +36,6 @@ public AssignmentService( IRanksService ranksService, IUnitsService unitsService, ITeamspeakService teamspeakService, - IServerService serverService, IDisplayNameService displayNameService, IDiscordService discordService, IHubContext accountHub @@ -44,7 +45,6 @@ IHubContext accountHub this.ranksService = ranksService; this.unitsService = unitsService; this.teamspeakService = teamspeakService; - this.serverService = serverService; this.displayNameService = displayNameService; this.discordService = discordService; this.accountHub = accountHub; diff --git a/UKSF.Api.Personnel/Services/AttendanceService.cs b/UKSF.Api.Personnel/Services/AttendanceService.cs new file mode 100644 index 00000000..b8982c3d --- /dev/null +++ b/UKSF.Api.Personnel/Services/AttendanceService.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using MongoDB.Driver; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Services { + public interface IAttendanceService { + Task GenerateAttendanceReport(DateTime start, DateTime end); + } + + // public class AttendanceService : IAttendanceService { + // private readonly IAccountService accountService; + // private readonly IMongoDatabase database; + // private readonly IDisplayNameService displayNameService; + // private readonly ILoaService loaService; + // private readonly IUnitsService unitsService; + // private IEnumerable accounts; + // private List records; + // + // public AttendanceService(IAccountService accountService, IDisplayNameService displayNameService, ILoaService loaService, IMongoDatabase database, IUnitsService unitsService) { + // this.accountService = accountService; + // this.displayNameService = displayNameService; + // this.loaService = loaService; + // this.database = database; + // this.unitsService = unitsService; + // } + // + // public async Task GenerateAttendanceReport(DateTime start, DateTime end) { + // await GetRecords(start, end); + // GetAccounts(); + // AccountAttendanceStatus[] reports = accounts.Select( + // x => new AccountAttendanceStatus { + // accountId = x.id, + // displayName = displayNameService.GetDisplayName(x), + // attendancePercent = GetAttendancePercent(x.teamspeakIdentities), + // attendanceState = loaService.IsLoaCovered(x.id, start) ? AttendanceState.LOA : GetAttendanceState(GetAttendancePercent(x.teamspeakIdentities)), + // groupId = unitsService.Data.GetSingle(y => y.name == x.unitAssignment).id, + // groupName = x.unitAssignment + // } + // ) + // .ToArray(); + // return new AttendanceReport {users = reports}; + // } + // + // private void GetAccounts() { + // accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER); + // } + // + // private async Task GetRecords(DateTime start, DateTime end) { + // records = (await database.GetCollection("teamspeakSnapshots").FindAsync(x => x.timestamp > start && x.timestamp < end)).ToList(); + // } + // + // private float GetAttendancePercent(ICollection userTsId) { + // IEnumerable presentRecords = records.Where(record => record.users.Any(x => userTsId.Contains(x.clientDbId) && x.channelName == "ACRE")); + // return presentRecords.Count() / (float) records.Count; + // } + // + // private static AttendanceState GetAttendanceState(float attendancePercent) => attendancePercent > 0.6 ? AttendanceState.FULL : attendancePercent > 0.3 ? AttendanceState.PARTIAL : AttendanceState.MIA; + // } +} diff --git a/UKSF.Api.Services/Message/CommentThreadService.cs b/UKSF.Api.Personnel/Services/CommentThreadService.cs similarity index 72% rename from UKSF.Api.Services/Message/CommentThreadService.cs rename to UKSF.Api.Personnel/Services/CommentThreadService.cs index 841127de..5b3df9a2 100644 --- a/UKSF.Api.Services/Message/CommentThreadService.cs +++ b/UKSF.Api.Personnel/Services/CommentThreadService.cs @@ -1,13 +1,20 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Message; +using UKSF.Api.Base.Models; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services.Data; + +namespace UKSF.Api.Personnel.Services { + public interface ICommentThreadService : IDataBackedService { + IEnumerable GetCommentThreadComments(string id); + Task InsertComment(string id, Comment comment); + Task RemoveComment(string id, Comment comment); + IEnumerable GetCommentThreadParticipants(string id); + object FormatComment(Comment comment); + } -namespace UKSF.Api.Services.Message { public class CommentThreadService : DataBackedService, ICommentThreadService { private readonly IDisplayNameService displayNameService; diff --git a/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs b/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs index 5f356d7c..bd706d5a 100644 --- a/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs +++ b/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs @@ -2,13 +2,19 @@ using System.Collections.Generic; using System.Threading.Tasks; using Newtonsoft.Json; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Utility; -using UKSF.Api.Services; -using UKSF.Api.Services.Utility.ScheduledActions; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.ScheduledActions; +using UKSF.Api.Personnel.Services.Data; +using UKSF.Api.Utility.Services; + +namespace UKSF.Api.Personnel.Services { + public interface IConfirmationCodeService : IDataBackedService { + Task CreateConfirmationCode(string value); + Task GetConfirmationCode(string id); + Task ClearConfirmationCodes(Func predicate); + } -namespace UKSF.Api.Accounts.Services { public class ConfirmationCodeService : DataBackedService, IConfirmationCodeService { private readonly ISchedulerService schedulerService; diff --git a/UKSF.Api.Data/Personnel/AccountDataService.cs b/UKSF.Api.Personnel/Services/Data/AccountDataService.cs similarity index 50% rename from UKSF.Api.Data/Personnel/AccountDataService.cs rename to UKSF.Api.Personnel/Services/Data/AccountDataService.cs index 313f3224..3c760369 100644 --- a/UKSF.Api.Data/Personnel/AccountDataService.cs +++ b/UKSF.Api.Personnel/Services/Data/AccountDataService.cs @@ -1,9 +1,11 @@ -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Services.Data { + public interface IAccountDataService : IDataService, ICachedDataService { } -namespace UKSF.Api.Data.Personnel { public class AccountDataService : CachedDataService, IAccountDataService { public AccountDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "accounts") { } } diff --git a/UKSF.Api.Data/Message/CommentThreadDataService.cs b/UKSF.Api.Personnel/Services/Data/CommentThreadDataService.cs similarity index 72% rename from UKSF.Api.Data/Message/CommentThreadDataService.cs rename to UKSF.Api.Personnel/Services/Data/CommentThreadDataService.cs index 3c15d7ba..2ed56141 100644 --- a/UKSF.Api.Data/Message/CommentThreadDataService.cs +++ b/UKSF.Api.Personnel/Services/Data/CommentThreadDataService.cs @@ -1,12 +1,16 @@ using System.Threading.Tasks; using MongoDB.Driver; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Message; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Services.Data { + public interface ICommentThreadDataService : IDataService, ICachedDataService { + Task Update(string id, Comment comment, DataEventType updateType); + } -namespace UKSF.Api.Data.Message { public class CommentThreadDataService : CachedDataService, ICommentThreadDataService { public CommentThreadDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "commentThreads") { } diff --git a/UKSF.Api.Personnel/Services/ConfirmationCodeDataService.cs b/UKSF.Api.Personnel/Services/Data/ConfirmationCodeDataService.cs similarity index 55% rename from UKSF.Api.Personnel/Services/ConfirmationCodeDataService.cs rename to UKSF.Api.Personnel/Services/Data/ConfirmationCodeDataService.cs index b023fb1c..4ecff51f 100644 --- a/UKSF.Api.Personnel/Services/ConfirmationCodeDataService.cs +++ b/UKSF.Api.Personnel/Services/Data/ConfirmationCodeDataService.cs @@ -1,8 +1,11 @@ -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Utility; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Services.Data { + public interface IConfirmationCodeDataService : IDataService { } -namespace UKSF.Api.Data.Utility { public class ConfirmationCodeDataService : DataService, IConfirmationCodeDataService { public ConfirmationCodeDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "confirmationCodes") { } } diff --git a/UKSF.Api.Data/Personnel/DischargeDataService.cs b/UKSF.Api.Personnel/Services/Data/DischargeDataService.cs similarity index 68% rename from UKSF.Api.Data/Personnel/DischargeDataService.cs rename to UKSF.Api.Personnel/Services/Data/DischargeDataService.cs index b02b62fe..b004932b 100644 --- a/UKSF.Api.Data/Personnel/DischargeDataService.cs +++ b/UKSF.Api.Personnel/Services/Data/DischargeDataService.cs @@ -1,11 +1,13 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Services.Data { + public interface IDischargeDataService : IDataService, ICachedDataService { } -namespace UKSF.Api.Data.Personnel { public class DischargeDataService : CachedDataService, IDischargeDataService { public DischargeDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "discharges") { } diff --git a/UKSF.Api.Personnel/Services/Data/LoaDataService.cs b/UKSF.Api.Personnel/Services/Data/LoaDataService.cs new file mode 100644 index 00000000..4dc521fe --- /dev/null +++ b/UKSF.Api.Personnel/Services/Data/LoaDataService.cs @@ -0,0 +1,12 @@ +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Services.Data { + public interface ILoaDataService : IDataService, ICachedDataService { } + + public class LoaDataService : CachedDataService, ILoaDataService { + public LoaDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "loas") { } + } +} diff --git a/UKSF.Api.Data/Message/NotificationsDataService.cs b/UKSF.Api.Personnel/Services/Data/NotificationsDataService.cs similarity index 52% rename from UKSF.Api.Data/Message/NotificationsDataService.cs rename to UKSF.Api.Personnel/Services/Data/NotificationsDataService.cs index ade97d91..07069aec 100644 --- a/UKSF.Api.Data/Message/NotificationsDataService.cs +++ b/UKSF.Api.Personnel/Services/Data/NotificationsDataService.cs @@ -1,9 +1,11 @@ -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Message; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Services.Data { + public interface INotificationsDataService : IDataService, ICachedDataService { } -namespace UKSF.Api.Data.Message { public class NotificationsDataService : CachedDataService, INotificationsDataService { public NotificationsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "notifications") { } } diff --git a/UKSF.Api.Data/Personnel/RanksDataService.cs b/UKSF.Api.Personnel/Services/Data/RanksDataService.cs similarity index 64% rename from UKSF.Api.Data/Personnel/RanksDataService.cs rename to UKSF.Api.Personnel/Services/Data/RanksDataService.cs index 62c538e6..4cef34b0 100644 --- a/UKSF.Api.Data/Personnel/RanksDataService.cs +++ b/UKSF.Api.Personnel/Services/Data/RanksDataService.cs @@ -1,11 +1,16 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Services.Data { + public interface IRanksDataService : IDataService, ICachedDataService { + new IEnumerable Get(); + new Rank GetSingle(string name); + } -namespace UKSF.Api.Data.Personnel { public class RanksDataService : CachedDataService, IRanksDataService { public RanksDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "ranks") { } diff --git a/UKSF.Api.Data/Personnel/RolesDataService.cs b/UKSF.Api.Personnel/Services/Data/RolesDataService.cs similarity index 64% rename from UKSF.Api.Data/Personnel/RolesDataService.cs rename to UKSF.Api.Personnel/Services/Data/RolesDataService.cs index f44223bb..419159c7 100644 --- a/UKSF.Api.Data/Personnel/RolesDataService.cs +++ b/UKSF.Api.Personnel/Services/Data/RolesDataService.cs @@ -1,11 +1,16 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Services.Data { + public interface IRolesDataService : IDataService, ICachedDataService { + new IEnumerable Get(); + new Role GetSingle(string name); + } -namespace UKSF.Api.Data.Personnel { public class RolesDataService : CachedDataService, IRolesDataService { public RolesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "roles") { } diff --git a/UKSF.Api.Data/Units/UnitsDataService.cs b/UKSF.Api.Personnel/Services/Data/UnitsDataService.cs similarity index 66% rename from UKSF.Api.Data/Units/UnitsDataService.cs rename to UKSF.Api.Personnel/Services/Data/UnitsDataService.cs index b41e861f..dcba6c10 100644 --- a/UKSF.Api.Data/Units/UnitsDataService.cs +++ b/UKSF.Api.Personnel/Services/Data/UnitsDataService.cs @@ -1,11 +1,13 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Units; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Services.Data { + public interface IUnitsDataService : IDataService, ICachedDataService { } -namespace UKSF.Api.Data.Units { public class UnitsDataService : CachedDataService, IUnitsDataService { public UnitsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "units") { } diff --git a/UKSF.Api.Personnel/Services/DischargeService.cs b/UKSF.Api.Personnel/Services/DischargeService.cs new file mode 100644 index 00000000..dfb1cd41 --- /dev/null +++ b/UKSF.Api.Personnel/Services/DischargeService.cs @@ -0,0 +1,10 @@ +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Services.Data; + +namespace UKSF.Api.Personnel.Services { + public interface IDischargeService : IDataBackedService { } + + public class DischargeService : DataBackedService, IDischargeService { + public DischargeService(IDischargeDataService data) : base(data) { } + } +} diff --git a/UKSF.Api.Personnel/Services/DisplayNameService.cs b/UKSF.Api.Personnel/Services/DisplayNameService.cs index d9917e2b..a47bdd2d 100644 --- a/UKSF.Api.Personnel/Services/DisplayNameService.cs +++ b/UKSF.Api.Personnel/Services/DisplayNameService.cs @@ -1,7 +1,12 @@ -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Services { + public interface IDisplayNameService { + string GetDisplayName(Account account); + string GetDisplayName(string id); + string GetDisplayNameWithoutRank(Account account); + } -namespace UKSF.Api.Services.Personnel { public class DisplayNameService : IDisplayNameService { private readonly IAccountService accountService; private readonly IRanksService ranksService; diff --git a/UKSF.Api.Services/Message/EmailService.cs b/UKSF.Api.Personnel/Services/EmailService.cs similarity index 86% rename from UKSF.Api.Services/Message/EmailService.cs rename to UKSF.Api.Personnel/Services/EmailService.cs index b411372d..9ce40695 100644 --- a/UKSF.Api.Services/Message/EmailService.cs +++ b/UKSF.Api.Personnel/Services/EmailService.cs @@ -1,9 +1,12 @@ using System.Net; using System.Net.Mail; using Microsoft.Extensions.Configuration; -using UKSF.Api.Interfaces.Message; -namespace UKSF.Api.Services.Message { +namespace UKSF.Api.Personnel.Services { + public interface IEmailService { + void SendEmail(string targetEmail, string subject, string htmlEmail); + } + public class EmailService : IEmailService { private readonly string password; private readonly string username; diff --git a/UKSF.Api.Services/Personnel/LoaService.cs b/UKSF.Api.Personnel/Services/LoaService.cs similarity index 75% rename from UKSF.Api.Services/Personnel/LoaService.cs rename to UKSF.Api.Personnel/Services/LoaService.cs index 05dfb697..e934e09c 100644 --- a/UKSF.Api.Services/Personnel/LoaService.cs +++ b/UKSF.Api.Personnel/Services/LoaService.cs @@ -3,12 +3,18 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Models.Command; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services.Data; + +namespace UKSF.Api.Personnel.Services { + public interface ILoaService : IDataBackedService { + IEnumerable Get(List ids); + Task Add(CommandRequestLoa requestBase); + Task SetLoaState(string id, LoaReviewState state); + bool IsLoaCovered(string id, DateTime eventStart); + } -namespace UKSF.Api.Services.Personnel { public class LoaService : DataBackedService, ILoaService { public LoaService(ILoaDataService data) : base(data) { } diff --git a/UKSF.Api.Services/Message/NotificationsService.cs b/UKSF.Api.Personnel/Services/NotificationsService.cs similarity index 69% rename from UKSF.Api.Services/Message/NotificationsService.cs rename to UKSF.Api.Personnel/Services/NotificationsService.cs index 1ad9579c..58febc97 100644 --- a/UKSF.Api.Services/Message/NotificationsService.cs +++ b/UKSF.Api.Personnel/Services/NotificationsService.cs @@ -3,31 +3,40 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Common; -using UKSF.Api.Signalr.Hubs.Message; +using UKSF.Api.Base.Services; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services.Data; +using UKSF.Api.Personnel.SignalrHubs.Clients; +using UKSF.Api.Personnel.SignalrHubs.Hubs; + +namespace UKSF.Api.Personnel.Services { + public interface INotificationsService : IDataBackedService { + void Add(Notification notification); + Task SendTeamspeakNotification(Account account, string rawMessage); + Task SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage); + IEnumerable GetNotificationsForContext(); + Task MarkNotificationsAsRead(List ids); + Task Delete(List ids); + } -namespace UKSF.Api.Services.Message { public class NotificationsService : DataBackedService, INotificationsService { private readonly IAccountService accountService; private readonly IEmailService emailService; private readonly IHubContext notificationsHub; - private readonly ISessionService sessionService; + private readonly IHttpContextService httpContextService; + private readonly IObjectIdConversionService objectIdConversionService; + private readonly ITeamspeakService teamspeakService; - public NotificationsService(INotificationsDataService data, ITeamspeakService teamspeakService, IAccountService accountService, ISessionService sessionService, IEmailService emailService, IHubContext notificationsHub) : base(data) { + public NotificationsService(INotificationsDataService data, ITeamspeakService teamspeakService, IAccountService accountService, IEmailService emailService, IHubContext notificationsHub, IHttpContextService httpContextService, IObjectIdConversionService objectIdConversionService) : base(data) { this.teamspeakService = teamspeakService; this.accountService = accountService; - this.sessionService = sessionService; + this.emailService = emailService; this.notificationsHub = notificationsHub; + this.httpContextService = httpContextService; + this.objectIdConversionService = objectIdConversionService; } public async Task SendTeamspeakNotification(Account account, string rawMessage) { @@ -41,7 +50,7 @@ public async Task SendTeamspeakNotification(IEnumerable clientDbIds, str } public IEnumerable GetNotificationsForContext() { - string contextId = sessionService.GetContextId(); + string contextId = httpContextService.GetUserId(); return Data.Get(x => x.owner == contextId); } @@ -51,20 +60,20 @@ public void Add(Notification notification) { } public async Task MarkNotificationsAsRead(List ids) { - string contextId = sessionService.GetContextId(); + string contextId = httpContextService.GetUserId(); await Data.UpdateMany(x => x.owner == contextId && ids.Contains(x.id), Builders.Update.Set(x => x.read, true)); await notificationsHub.Clients.Group(contextId).ReceiveRead(ids); } public async Task Delete(List ids) { ids = ids.ToList(); - string contextId = sessionService.GetContextId(); + string contextId = httpContextService.GetUserId(); await Data.DeleteMany(x => x.owner == contextId && ids.Contains(x.id)); await notificationsHub.Clients.Group(contextId).ReceiveClear(ids); } private async Task AddNotificationAsync(Notification notification) { - notification.message = notification.message.ConvertObjectIds(); + notification.message = objectIdConversionService.ConvertObjectIds(notification.message); await Data.Add(notification); Account account = accountService.Data.GetSingle(notification.owner); if (account.settings.notificationsEmail) { diff --git a/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs b/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs new file mode 100644 index 00000000..be9a996a --- /dev/null +++ b/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs @@ -0,0 +1,35 @@ +using UKSF.Api.Base.Extensions; + +namespace UKSF.Api.Personnel.Services { + public interface IObjectIdConversionService { + string ConvertObjectIds(string text); + string ConvertObjectId(string id); + } + + public class ObjectIdConversionService : IObjectIdConversionService { + private readonly IDisplayNameService displayNameService; + private readonly IUnitsService unitsService; + + public ObjectIdConversionService(IDisplayNameService displayNameService, IUnitsService unitsService) { + this.displayNameService = displayNameService; + this.unitsService = unitsService; + } + + public string ConvertObjectIds(string text) { + if (string.IsNullOrEmpty(text)) return text; + + foreach (string objectId in text.ExtractObjectIds()) { + string displayString = displayNameService.GetDisplayName(objectId); + if (displayString == objectId) { + displayString = unitsService.Data.GetSingle(x => x.id == objectId)?.name; + } + + text = text.Replace(objectId, displayString); + } + + return text; + } + + public string ConvertObjectId(string id) => string.IsNullOrEmpty(id) ? id : displayNameService.GetDisplayName(id); + } +} diff --git a/UKSF.Api.Services/Personnel/RanksService.cs b/UKSF.Api.Personnel/Services/RanksService.cs similarity index 78% rename from UKSF.Api.Services/Personnel/RanksService.cs rename to UKSF.Api.Personnel/Services/RanksService.cs index 44631969..59900524 100644 --- a/UKSF.Api.Services/Personnel/RanksService.cs +++ b/UKSF.Api.Personnel/Services/RanksService.cs @@ -1,10 +1,17 @@ using System.Collections.Generic; -using System.Linq; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services.Data; + +namespace UKSF.Api.Personnel.Services { + public interface IRanksService : IDataBackedService { + int GetRankOrder(string rankName); + int Sort(string nameA, string nameB); + bool IsEqual(string nameA, string nameB); + bool IsSuperior(string nameA, string nameB); + bool IsSuperiorOrEqual(string nameA, string nameB); + } -namespace UKSF.Api.Services.Personnel { public class RanksService : DataBackedService, IRanksService { public RanksService(IRanksDataService data) : base(data) { } diff --git a/UKSF.Api.Services/Personnel/RecruitmentService.cs b/UKSF.Api.Personnel/Services/RecruitmentService.cs similarity index 91% rename from UKSF.Api.Services/Personnel/RecruitmentService.cs rename to UKSF.Api.Personnel/Services/RecruitmentService.cs index 1353e201..cf557eeb 100644 --- a/UKSF.Api.Services/Personnel/RecruitmentService.cs +++ b/UKSF.Api.Personnel/Services/RecruitmentService.cs @@ -4,25 +4,33 @@ using System.Threading.Tasks; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; -using UKSF.Api.Services.Admin; -using UKSF.Common; - -namespace UKSF.Api.Services.Personnel { +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.Base.Extensions; +using UKSF.Api.Base.Services; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Services { + public interface IRecruitmentService { + object GetAllApplications(); + JObject GetApplication(Account account); + object GetActiveRecruiters(); + IEnumerable GetRecruiters(bool skipSort = false); + Dictionary GetRecruiterLeads(); + object GetStats(string account, bool monthly); + string GetRecruiter(); + bool IsRecruiterLead(Account account = null); + bool IsRecruiter(Account account); + Task SetRecruiter(string id, string newRecruiter); + } + public class RecruitmentService : IRecruitmentService { private readonly IAccountService accountService; + private readonly IHttpContextService httpContextService; private readonly IDiscordService discordService; private readonly IDisplayNameService displayNameService; private readonly ITeamspeakMetricsService metricsService; private readonly IRanksService ranksService; - private readonly ISessionService sessionService; private readonly ITeamspeakService teamspeakService; private readonly IUnitsService unitsService; private readonly IVariablesService variablesService; @@ -30,7 +38,7 @@ public class RecruitmentService : IRecruitmentService { public RecruitmentService( ITeamspeakMetricsService metricsService, IAccountService accountService, - ISessionService sessionService, + IHttpContextService httpContextService, IDisplayNameService displayNameService, IDiscordService discordService, IRanksService ranksService, @@ -39,7 +47,8 @@ public RecruitmentService( IVariablesService variablesService ) { this.accountService = accountService; - this.sessionService = sessionService; + this.httpContextService = httpContextService; + this.metricsService = metricsService; this.displayNameService = displayNameService; this.ranksService = ranksService; @@ -65,7 +74,7 @@ public object GetAllApplications() { JArray allWaiting = new JArray(); JArray complete = new JArray(); JArray recruiters = new JArray(); - string me = sessionService.GetContextId(); + string me = httpContextService.GetUserId(); IEnumerable accounts = accountService.Data.Get(x => x.application != null); foreach (Account account in accounts) { if (account.application.state == ApplicationState.WAITING) { @@ -110,7 +119,7 @@ public JObject GetApplication(Account account) { public object GetActiveRecruiters() => GetRecruiters().Where(x => x.settings.sr1Enabled).Select(x => JObject.FromObject(new {value = x.id, viewValue = displayNameService.GetDisplayName(x)})); - public bool IsRecruiterLead(Account account = null) => account != null ? GetRecruiterUnit().roles.ContainsValue(account.id) : GetRecruiterUnit().roles.ContainsValue(sessionService.GetContextId()); + public bool IsRecruiterLead(Account account = null) => account != null ? GetRecruiterUnit().roles.ContainsValue(account.id) : GetRecruiterUnit().roles.ContainsValue(httpContextService.GetUserId()); public async Task SetRecruiter(string id, string newRecruiter) { await accountService.Data.Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiter)); diff --git a/UKSF.Api.Services/Personnel/RolesService.cs b/UKSF.Api.Personnel/Services/RolesService.cs similarity index 65% rename from UKSF.Api.Services/Personnel/RolesService.cs rename to UKSF.Api.Personnel/Services/RolesService.cs index 6fff94b9..ec9a27d0 100644 --- a/UKSF.Api.Services/Personnel/RolesService.cs +++ b/UKSF.Api.Personnel/Services/RolesService.cs @@ -1,8 +1,13 @@ -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services.Data; + +namespace UKSF.Api.Personnel.Services { + public interface IRolesService : IDataBackedService { + int Sort(string nameA, string nameB); + Role GetUnitRoleByOrder(int order); + } -namespace UKSF.Api.Services.Personnel { public class RolesService : DataBackedService, IRolesService { public RolesService(IRolesDataService data) : base(data) { } diff --git a/UKSF.Api.Services/Personnel/ServiceRecordService.cs b/UKSF.Api.Personnel/Services/ServiceRecordService.cs similarity index 73% rename from UKSF.Api.Services/Personnel/ServiceRecordService.cs rename to UKSF.Api.Personnel/Services/ServiceRecordService.cs index 5b5dec52..27ecd01b 100644 --- a/UKSF.Api.Services/Personnel/ServiceRecordService.cs +++ b/UKSF.Api.Personnel/Services/ServiceRecordService.cs @@ -1,9 +1,12 @@ using System; using MongoDB.Driver; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Services { + public interface IServiceRecordService { + void AddServiceRecord(string id, string occurence, string notes); + } -namespace UKSF.Api.Services.Personnel { public class ServiceRecordService : IServiceRecordService { private readonly IAccountService accountService; diff --git a/UKSF.Api.Services/Units/UnitsService.cs b/UKSF.Api.Personnel/Services/UnitsService.cs similarity index 82% rename from UKSF.Api.Services/Units/UnitsService.cs rename to UKSF.Api.Personnel/Services/UnitsService.cs index d881620f..fd65eed4 100644 --- a/UKSF.Api.Services/Units/UnitsService.cs +++ b/UKSF.Api.Personnel/Services/UnitsService.cs @@ -4,13 +4,41 @@ using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services.Data; + +namespace UKSF.Api.Personnel.Services { + public interface IUnitsService : IDataBackedService { + IEnumerable GetSortedUnits(Func predicate = null); + Task AddMember(string id, string unitId); + Task RemoveMember(string id, string unitName); + Task RemoveMember(string id, Unit unit); + Task SetMemberRole(string id, string unitId, string role = ""); + Task SetMemberRole(string id, Unit unit, string role = ""); + Task RenameRole(string oldName, string newName); + Task DeleteRole(string role); + + bool HasRole(string unitId, string role); + bool HasRole(Unit unit, string role); + bool RolesHasMember(string unitId, string id); + bool RolesHasMember(Unit unit, string id); + bool MemberHasRole(string id, string unitId, string role); + bool MemberHasRole(string id, Unit unit, string role); + bool MemberHasAnyRole(string id); + int GetMemberRoleOrder(Account account, Unit unit); + + Unit GetRoot(); + Unit GetAuxilliaryRoot(); + Unit GetParent(Unit unit); + IEnumerable GetParents(Unit unit); + IEnumerable GetChildren(Unit parent); + IEnumerable GetAllChildren(Unit parent, bool includeParent = false); + + int GetUnitDepth(Unit unit); + string GetChainString(Unit unit); + } -namespace UKSF.Api.Services.Units { public class UnitsService : DataBackedService, IUnitsService { private readonly IRolesService rolesService; diff --git a/UKSF.Api.Interfaces/Hubs/IAccountClient.cs b/UKSF.Api.Personnel/SignalrHubs/Clients/IAccountClient.cs similarity index 69% rename from UKSF.Api.Interfaces/Hubs/IAccountClient.cs rename to UKSF.Api.Personnel/SignalrHubs/Clients/IAccountClient.cs index 8fe5a0c1..cb6f10a5 100644 --- a/UKSF.Api.Interfaces/Hubs/IAccountClient.cs +++ b/UKSF.Api.Personnel/SignalrHubs/Clients/IAccountClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSF.Api.Interfaces.Hubs { +namespace UKSF.Api.Personnel.SignalrHubs.Clients { public interface IAccountClient { Task ReceiveAccountUpdate(); } diff --git a/UKSF.Api.Interfaces/Hubs/ICommentThreadClient.cs b/UKSF.Api.Personnel/SignalrHubs/Clients/ICommentThreadClient.cs similarity index 76% rename from UKSF.Api.Interfaces/Hubs/ICommentThreadClient.cs rename to UKSF.Api.Personnel/SignalrHubs/Clients/ICommentThreadClient.cs index 8049fb7a..1c1a56d8 100644 --- a/UKSF.Api.Interfaces/Hubs/ICommentThreadClient.cs +++ b/UKSF.Api.Personnel/SignalrHubs/Clients/ICommentThreadClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSF.Api.Interfaces.Hubs { +namespace UKSF.Api.Personnel.SignalrHubs.Clients { public interface ICommentThreadClient { Task ReceiveComment(object comment); Task DeleteComment(string id); diff --git a/UKSF.Api.Interfaces/Hubs/INotificationsClient.cs b/UKSF.Api.Personnel/SignalrHubs/Clients/INotificationsClient.cs similarity index 84% rename from UKSF.Api.Interfaces/Hubs/INotificationsClient.cs rename to UKSF.Api.Personnel/SignalrHubs/Clients/INotificationsClient.cs index 4a7839eb..fd3554f7 100644 --- a/UKSF.Api.Interfaces/Hubs/INotificationsClient.cs +++ b/UKSF.Api.Personnel/SignalrHubs/Clients/INotificationsClient.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace UKSF.Api.Interfaces.Hubs { +namespace UKSF.Api.Personnel.SignalrHubs.Clients { public interface INotificationsClient { Task ReceiveNotification(object notification); Task ReceiveRead(IEnumerable ids); diff --git a/UKSF.Api.Signalr/Hubs/Personnel/AccountHub.cs b/UKSF.Api.Personnel/SignalrHubs/Hubs/AccountHub.cs similarity index 90% rename from UKSF.Api.Signalr/Hubs/Personnel/AccountHub.cs rename to UKSF.Api.Personnel/SignalrHubs/Hubs/AccountHub.cs index 9e5dca79..5991ce03 100644 --- a/UKSF.Api.Signalr/Hubs/Personnel/AccountHub.cs +++ b/UKSF.Api.Personnel/SignalrHubs/Hubs/AccountHub.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; -using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Personnel.SignalrHubs.Clients; -namespace UKSF.Api.Signalr.Hubs.Personnel { +namespace UKSF.Api.Personnel.SignalrHubs.Hubs { [Authorize] public class AccountHub : Hub { public const string END_POINT = "account"; diff --git a/UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs b/UKSF.Api.Personnel/SignalrHubs/Hubs/CommentThreadHub.cs similarity index 90% rename from UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs rename to UKSF.Api.Personnel/SignalrHubs/Hubs/CommentThreadHub.cs index 78a86de2..ca9cf2ae 100644 --- a/UKSF.Api.Signalr/Hubs/Message/CommentThreadHub.cs +++ b/UKSF.Api.Personnel/SignalrHubs/Hubs/CommentThreadHub.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; -using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Personnel.SignalrHubs.Clients; -namespace UKSF.Api.Signalr.Hubs.Message { +namespace UKSF.Api.Personnel.SignalrHubs.Hubs { [Authorize] public class CommentThreadHub : Hub { public const string END_POINT = "commentThread"; diff --git a/UKSF.Api.Signalr/Hubs/Message/NotificationsHub.cs b/UKSF.Api.Personnel/SignalrHubs/Hubs/NotificationsHub.cs similarity index 90% rename from UKSF.Api.Signalr/Hubs/Message/NotificationsHub.cs rename to UKSF.Api.Personnel/SignalrHubs/Hubs/NotificationsHub.cs index db500462..54f80796 100644 --- a/UKSF.Api.Signalr/Hubs/Message/NotificationsHub.cs +++ b/UKSF.Api.Personnel/SignalrHubs/Hubs/NotificationsHub.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; -using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Personnel.SignalrHubs.Clients; -namespace UKSF.Api.Signalr.Hubs.Message { +namespace UKSF.Api.Personnel.SignalrHubs.Hubs { [Authorize] public class NotificationHub : Hub { public const string END_POINT = "notifications"; diff --git a/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj b/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj index 8de80d8d..1dad725e 100644 --- a/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj +++ b/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj @@ -1,11 +1,20 @@ - + - net5.0 + netcoreapp5.0 + Library - + + + + + + + + + diff --git a/UKSF.Api.Services/Admin/MigrationUtility.cs b/UKSF.Api.Services/Admin/MigrationUtility.cs deleted file mode 100644 index 215a82fc..00000000 --- a/UKSF.Api.Services/Admin/MigrationUtility.cs +++ /dev/null @@ -1,131 +0,0 @@ -// ReSharper disable RedundantUsingDirective - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using MongoDB.Driver; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Models; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; -using UKSF.Api.Models.Utility; -using UKSF.Api.Services.Common; -using UKSF.Api.Services.Message; -using UKSF.Common; - -namespace UKSF.Api.Services.Admin { - public class MigrationUtility { - private const string KEY = "MIGRATED"; - private readonly IHostEnvironment currentEnvironment; - private readonly IVariablesService variablesService; - - public MigrationUtility(IHostEnvironment currentEnvironment, IVariablesService variablesService) { - this.currentEnvironment = currentEnvironment; - this.variablesService = variablesService; - } - - public void Migrate() { - bool migrated = true; - if (!currentEnvironment.IsDevelopment()) { - string migratedString = variablesService.GetVariable(KEY).AsString(); - migrated = bool.Parse(migratedString); - } - - // ReSharper disable once ConditionIsAlwaysTrueOrFalse - if (!migrated) { - try { - ExecuteMigration(); - LogWrapper.AuditLog("Migration utility successfully ran", "SERVER"); - } catch (Exception e) { - LogWrapper.Log(e); - } finally { - variablesService.Data.Update(KEY, "true"); - } - } - } - - // TODO: CHECK BEFORE RELEASE - private static void ExecuteMigration() { - IDataCollectionFactory dataCollectionFactory = ServiceWrapper.Provider.GetService(); - IDataCollection oldDataCollection = dataCollectionFactory.CreateDataCollection("accounts"); - IEnumerable oldAccounts = oldDataCollection.Get(); - - IAccountDataService accountDataService = ServiceWrapper.Provider.GetService(); - - List newAccounts = new List(); - foreach (OldAccount oldAccount in oldAccounts) { - Account newAccount = new Account { - id = oldAccount.id, - application = oldAccount.application, - armaExperience = oldAccount.armaExperience, - background = oldAccount.background, - discordId = oldAccount.discordId, - dob = oldAccount.dob, - email = oldAccount.email, - firstname = oldAccount.firstname, - lastname = oldAccount.lastname, - membershipState = oldAccount.membershipState, - militaryExperience = oldAccount.militaryExperience, - nation = oldAccount.nation, - password = oldAccount.password, - rank = oldAccount.rank, - reference = oldAccount.reference, - roleAssignment = oldAccount.roleAssignment, - serviceRecord = oldAccount.serviceRecord, - settings = oldAccount.settings, - steamname = oldAccount.steamname, - teamspeakIdentities = oldAccount.teamspeakIdentities, - unitAssignment = oldAccount.unitAssignment, - unitsExperience = oldAccount.unitsExperience - }; - List rolePreferences = new List(); - if (oldAccount.nco) rolePreferences.Add("NCO"); - if (oldAccount.officer) rolePreferences.Add("Officer"); - if (oldAccount.aviation) rolePreferences.Add("Aviation"); - newAccount.rolePreferences = rolePreferences; - - newAccounts.Add(newAccount); - } - - foreach (Account accountnewAccount in newAccounts) { - accountDataService.Delete(accountnewAccount).Wait(); - accountDataService.Add(accountnewAccount).Wait(); - } - } - } - - public class OldAccount : DatabaseObject { - public Application application; - public string armaExperience; - public string background; - public string discordId; - public DateTime dob; - public string email; - public string firstname; - public string lastname; - public MembershipState membershipState = MembershipState.UNCONFIRMED; - public bool militaryExperience; - public string nation; - public string password; - public string rank; - public string reference; - public string roleAssignment; - public List serviceRecord = new List(); - public readonly AccountSettings settings = new AccountSettings(); - public string steamname; - public HashSet teamspeakIdentities; - public string unitAssignment; - public string unitsExperience; - - public bool aviation; - public bool nco; - public bool officer; - } -} diff --git a/UKSF.Api.Services/Command/ChainOfCommandService.cs b/UKSF.Api.Services/Command/ChainOfCommandService.cs index 02552415..fc1505a9 100644 --- a/UKSF.Api.Services/Command/ChainOfCommandService.cs +++ b/UKSF.Api.Services/Command/ChainOfCommandService.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using UKSF.Api.Base.Services; using UKSF.Api.Interfaces.Command; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; @@ -13,12 +14,14 @@ namespace UKSF.Api.Services.Command { public class ChainOfCommandService : IChainOfCommandService { private readonly string commanderRoleName; - private readonly ISessionService sessionService; + private readonly IUnitsService unitsService; + private readonly IHttpContextService httpContextService; - public ChainOfCommandService(IUnitsService unitsService, IRolesService rolesService, ISessionService sessionService) { + public ChainOfCommandService(IUnitsService unitsService, IRolesService rolesService, IHttpContextService httpContextService) { this.unitsService = unitsService; - this.sessionService = sessionService; + this.httpContextService = httpContextService; + commanderRoleName = rolesService.GetUnitRoleByOrder(0).name; } @@ -56,7 +59,7 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U } public bool InContextChainOfCommand(string id) { - Account contextAccount = sessionService.GetContextAccount(); + Account contextAccount = accountService.GetUserAccount(); if (id == contextAccount.id) return true; Unit unit = unitsService.Data.GetSingle(x => x.name == contextAccount.unitAssignment); return unitsService.RolesHasMember(unit, contextAccount.id) && (unit.members.Contains(id) || unitsService.GetAllChildren(unit, true).Any(unitChild => unitChild.members.Contains(id))); @@ -139,7 +142,7 @@ private string GetNextUnitCommanderExcludeSelf(Unit unit) { while (unit != null) { if (UnitHasCommander(unit)) { string commander = GetCommander(unit); - if (commander != sessionService.GetContextId()) return commander; + if (commander != httpContextService.GetUserId()) return commander; } unit = unitsService.GetParent(unit); diff --git a/UKSF.Api.Services/Command/CommandRequestCompletionService.cs b/UKSF.Api.Services/Command/CommandRequestCompletionService.cs index 7991583a..a8556c4c 100644 --- a/UKSF.Api.Services/Command/CommandRequestCompletionService.cs +++ b/UKSF.Api.Services/Command/CommandRequestCompletionService.cs @@ -1,8 +1,11 @@ using System; +using System.Reactive; using System.Threading.Tasks; using AvsAnLib; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; +using Octokit; +using UKSF.Api.Base.Services; using UKSF.Api.Interfaces.Command; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; @@ -13,12 +16,14 @@ using UKSF.Api.Models.Message; using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Units; +using UKSF.Api.Personnel.Services; using UKSF.Api.Services.Message; -using UKSF.Api.Services.Personnel; using UKSF.Api.Signalr.Hubs.Command; +using Notification = Octokit.Notification; namespace UKSF.Api.Services.Command { public class CommandRequestCompletionService : ICommandRequestCompletionService { + private readonly IHttpContextService httpContextService; private readonly IAccountService accountService; private readonly IAssignmentService assignmentService; private readonly ICommandRequestService commandRequestService; @@ -26,11 +31,11 @@ public class CommandRequestCompletionService : ICommandRequestCompletionService private readonly IDischargeService dischargeService; private readonly ILoaService loaService; private readonly INotificationsService notificationsService; - private readonly ISessionService sessionService; + private readonly IUnitsService unitsService; public CommandRequestCompletionService( - ISessionService sessionService, + IHttpContextService httpContextService, IAccountService accountService, ICommandRequestService commandRequestService, IDischargeService dischargeService, @@ -40,7 +45,7 @@ public CommandRequestCompletionService( IHubContext commandRequestsHub, INotificationsService notificationsService ) { - this.sessionService = sessionService; + this.httpContextService = httpContextService; this.accountService = accountService; this.commandRequestService = commandRequestService; this.dischargeService = dischargeService; @@ -95,10 +100,10 @@ private async Task Rank(CommandRequest request) { Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, rankString: request.value, role: role, reason: request.reason); notificationsService.Add(notification); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); + logger.LogAudit($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); } } @@ -106,11 +111,11 @@ private async Task Loa(CommandRequest request) { if (commandRequestService.IsRequestApproved(request.id)) { await loaService.SetLoaState(request.value, LoaReviewState.APPROVED); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); + logger.LogAudit($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await loaService.SetLoaState(request.value, LoaReviewState.REJECTED); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); } } @@ -142,10 +147,10 @@ private async Task Discharge(CommandRequest request) { notificationsService.Add(notification); await assignmentService.UnassignAllUnits(account.id); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); + logger.LogAudit($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); } } @@ -154,10 +159,10 @@ private async Task IndividualRole(CommandRequest request) { Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, role: request.value == "None" ? AssignmentService.REMOVE_FLAG : request.value, reason: request.reason); notificationsService.Add(notification); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); + logger.LogAudit($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); } } @@ -179,10 +184,10 @@ private async Task UnitRole(CommandRequest request) { } await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} as {request.displayValue} in {request.value} because '{request.reason}'"); + logger.LogAudit($"{request.type} request approved for {request.displayRecipient} as {request.displayValue} in {request.value} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} as {request.displayValue} in {request.value}"); + logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} as {request.displayValue} in {request.value}"); } } @@ -192,10 +197,10 @@ private async Task UnitRemoval(CommandRequest request) { await assignmentService.UnassignUnit(request.recipient, unit.id); notificationsService.Add(new Notification {owner = request.recipient, message = $"You have been removed from {unitsService.GetChainString(unit)}", icon = NotificationIcons.DEMOTION}); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} because '{request.reason}'"); + logger.LogAudit($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom}"); + logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom}"); } } @@ -205,10 +210,10 @@ private async Task Transfer(CommandRequest request) { Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, unit.name, reason: request.reason); notificationsService.Add(notification); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); + logger.LogAudit($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); } } @@ -220,12 +225,12 @@ private async Task Reinstate(CommandRequest request) { Notification notification = await assignmentService.UpdateUnitRankAndRole(dischargeCollection.accountId, "Basic Training Unit", "Trainee", "Recruit", "", "", "your membership was reinstated"); notificationsService.Add(notification); - LogWrapper.AuditLog($"{sessionService.GetContextId()} reinstated {dischargeCollection.name}'s membership"); + logger.LogAudit($"{httpContextService.GetUserId()} reinstated {dischargeCollection.name}'s membership"); await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); + logger.LogAudit($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); } else if (commandRequestService.IsRequestRejected(request.id)) { await commandRequestService.ArchiveRequest(request.id); - LogWrapper.AuditLog($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); } } diff --git a/UKSF.Api.Services/Command/CommandRequestService.cs b/UKSF.Api.Services/Command/CommandRequestService.cs index e65e0aa1..e5be5518 100644 --- a/UKSF.Api.Services/Command/CommandRequestService.cs +++ b/UKSF.Api.Services/Command/CommandRequestService.cs @@ -15,7 +15,6 @@ using UKSF.Api.Models.Message; using UKSF.Api.Models.Personnel; using UKSF.Api.Services.Message; -using UKSF.Api.Services.Personnel; namespace UKSF.Api.Services.Command { public class CommandRequestService : DataBackedService, ICommandRequestService { @@ -26,14 +25,14 @@ public class CommandRequestService : DataBackedService x.id != requesterAccount.id)) { diff --git a/UKSF.Api.Services/Common/DisplayNameUtilities.cs b/UKSF.Api.Services/Common/DisplayNameUtilities.cs deleted file mode 100644 index 46387ede..00000000 --- a/UKSF.Api.Services/Common/DisplayNameUtilities.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Models.Units; -using UKSF.Common; - -namespace UKSF.Api.Services.Common { - public static class DisplayNameUtilities { - public static string ConvertObjectIds(this string message) { - string newMessage = message; - if (string.IsNullOrEmpty(message)) return newMessage; - - IDisplayNameService displayNameService = ServiceWrapper.Provider.GetService(); - IUnitsService unitsService = ServiceWrapper.Provider.GetService(); - List objectIds = message.ExtractObjectIds().Where(s => s != string.Empty).ToList(); - foreach (string objectId in objectIds) { - string displayString = displayNameService.GetDisplayName(objectId); - if (displayString == objectId) { - Unit unit = unitsService.Data.GetSingle(x => x.id == objectId); - if (unit != null) { - displayString = unit.name; - } - } - - newMessage = newMessage.Replace(objectId, displayString); - } - - return newMessage; - } - } -} diff --git a/UKSF.Api.Services/Common/ServiceWrapper.cs b/UKSF.Api.Services/Common/ServiceWrapper.cs deleted file mode 100644 index 908977c2..00000000 --- a/UKSF.Api.Services/Common/ServiceWrapper.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System; - -namespace UKSF.Api.Services.Common { - public static class ServiceWrapper { - public static IServiceProvider Provider; - } -} diff --git a/UKSF.Api.Services/ExceptionHandler.cs b/UKSF.Api.Services/ExceptionHandler.cs index dce6dc54..2fecf896 100644 --- a/UKSF.Api.Services/ExceptionHandler.cs +++ b/UKSF.Api.Services/ExceptionHandler.cs @@ -4,19 +4,21 @@ using Microsoft.AspNetCore.Http.Extensions; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Message.Logging; -using UKSF.Api.Services.Message; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Base.Services; +using UKSF.Api.Personnel.Services; namespace UKSF.Api.Services { public class ExceptionHandler : IExceptionFilter { private readonly IDisplayNameService displayNameService; - private readonly ISessionService sessionService; + private readonly IHttpContextService httpContextService; + private readonly ILogger logger; - public ExceptionHandler(ISessionService sessionService, IDisplayNameService displayNameService) { - this.sessionService = sessionService; + public ExceptionHandler(IDisplayNameService displayNameService, IHttpContextService httpContextService, ILogger logger) { this.displayNameService = displayNameService; + this.httpContextService = httpContextService; + this.logger = logger; } public void OnException(ExceptionContext filterContext) { @@ -37,10 +39,11 @@ public void OnException(ExceptionContext filterContext) { private void Log(HttpContext context, Exception exception) { bool authenticated = context != null && context.User.Identity.IsAuthenticated; - WebLogMessage logMessage = new WebLogMessage(exception) { - httpMethod = context?.Request.Method ?? string.Empty, url = context?.Request.GetDisplayUrl(), userId = authenticated ? sessionService.GetContextId() : "GUEST", name = authenticated ? displayNameService.GetDisplayName(sessionService.GetContextAccount()) : "GUEST" + string userId = httpContextService.GetUserId(); + HttpErrorLog log = new HttpErrorLog(exception) { + httpMethod = context?.Request.Method ?? string.Empty, url = context?.Request.GetDisplayUrl(), userId = authenticated ? userId : "GUEST", name = authenticated ? displayNameService.GetDisplayName(userId) : "GUEST" }; - LogWrapper.Log(logMessage); + logger.LogHttpError(log); } } } diff --git a/UKSF.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.Services/Game/GameServerHelpers.cs index ccf1580c..d81b4362 100644 --- a/UKSF.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.Services/Game/GameServerHelpers.cs @@ -3,6 +3,9 @@ using System.Diagnostics; using System.IO; using System.Linq; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.Base.Events; using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Game; using UKSF.Api.Models.Game; @@ -55,8 +58,12 @@ public class GameServerHelpers : IGameServerHelpers { }; private readonly IVariablesService variablesService; + private readonly ILogger logger; - public GameServerHelpers(IVariablesService variablesService) => this.variablesService = variablesService; + public GameServerHelpers(IVariablesService variablesService, ILogger logger) { + this.variablesService = variablesService; + this.logger = logger; + } public string GetGameServerExecutablePath(GameServer gameServer) { string variableKey = gameServer.environment switch { @@ -119,7 +126,7 @@ public int GetMaxCuratorCountFromSettings() { string[] lines = File.ReadAllLines(GetGameServerSettingsPath()); string curatorsMaxString = lines.FirstOrDefault(x => x.Contains("uksf_curator_curatorsMax")); if (string.IsNullOrEmpty(curatorsMaxString)) { - LogWrapper.Log("Could not find max curators in server settings file. Loading hardcoded deault '5'"); + logger.LogWarning("Could not find max curators in server settings file. Loading hardcoded deault '5'"); return 5; } diff --git a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs index f351b0f1..ebf74f5c 100644 --- a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs +++ b/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs @@ -5,11 +5,11 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -using UKSF.Api.Interfaces.Admin; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.Base.Events; using UKSF.Api.Interfaces.Game; using UKSF.Api.Models.Mission; -using UKSF.Api.Services.Admin; -using UKSF.Api.Services.Message; using UKSF.Common; namespace UKSF.Api.Services.Game.Missions { @@ -19,14 +19,16 @@ public class MissionPatchingService : IMissionPatchingService { private readonly MissionService missionService; private readonly IVariablesService variablesService; + private readonly ILogger logger; private string filePath; private string folderPath; private string parentFolderPath; - public MissionPatchingService(MissionService missionService, IVariablesService variablesService) { + public MissionPatchingService(MissionService missionService, IVariablesService variablesService, ILogger logger) { this.missionService = missionService; this.variablesService = variablesService; + this.logger = logger; } public Task PatchMission(string path) { @@ -45,7 +47,7 @@ public Task PatchMission(string path) { result.playerCount = mission.playerCount; result.success = result.reports.All(x => !x.error); } catch (Exception exception) { - LogWrapper.Log(exception); + logger.LogError(exception); result.reports = new List { new MissionPatchingReport(exception) }; result.success = false; } finally { diff --git a/UKSF.Api.Services/Game/ServerService.cs b/UKSF.Api.Services/Game/ServerService.cs index af318ae2..eee24ea9 100644 --- a/UKSF.Api.Services/Game/ServerService.cs +++ b/UKSF.Api.Services/Game/ServerService.cs @@ -9,7 +9,6 @@ using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Units; -using UKSF.Api.Services.Personnel; // ReSharper disable HeuristicUnreachableCode #pragma warning disable 162 diff --git a/UKSF.Api.Services/Integrations/DiscordService.cs b/UKSF.Api.Services/Integrations/DiscordService.cs index 894208f5..b8894a93 100644 --- a/UKSF.Api.Services/Integrations/DiscordService.cs +++ b/UKSF.Api.Services/Integrations/DiscordService.cs @@ -5,15 +5,12 @@ using Discord; using Discord.WebSocket; using Microsoft.Extensions.Configuration; -using UKSF.Api.Interfaces.Admin; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.Base.Events; using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; -using UKSF.Api.Services.Admin; -using UKSF.Api.Services.Message; -using UKSF.Common; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; namespace UKSF.Api.Services.Integrations { public class DiscordService : IDiscordService, IDisposable { @@ -24,6 +21,7 @@ public class DiscordService : IDiscordService, IDisposable { private readonly IConfiguration configuration; private readonly IDisplayNameService displayNameService; private readonly IVariablesService variablesService; + private readonly ILogger logger; private readonly IRanksService ranksService; private readonly ulong specialUser; private readonly IUnitsService unitsService; @@ -32,13 +30,14 @@ public class DiscordService : IDiscordService, IDisposable { private SocketGuild guild; private IReadOnlyCollection roles; - public DiscordService(IConfiguration configuration, IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService, IVariablesService variablesService) { + public DiscordService(IConfiguration configuration, IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService, IVariablesService variablesService, ILogger logger) { this.configuration = configuration; this.ranksService = ranksService; this.unitsService = unitsService; this.accountService = accountService; this.displayNameService = displayNameService; this.variablesService = variablesService; + this.logger = logger; specialUser = variablesService.GetVariable("DID_U_OWNER").AsUlong(); } @@ -153,7 +152,7 @@ private async Task UpdateAccountNickname(IGuildUser user, Account account) { try { await user.ModifyAsync(x => x.Nickname = name); } catch (Exception) { - LogWrapper.Log($"Failed to update nickname for {(string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname)}. Must manually be changed to: {name}"); + logger.LogError($"Failed to update nickname for {(string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname)}. Must manually be changed to: {name}"); } } } diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Services/Integrations/Github/GithubService.cs index ecf07ab6..43eb6437 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Services/Integrations/Github/GithubService.cs @@ -9,10 +9,10 @@ using GitHubJwt; using Microsoft.Extensions.Configuration; using Octokit; +using UKSF.Api.Base.Events; using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; -using UKSF.Api.Services.Message; namespace UKSF.Api.Services.Integrations.Github { public class GithubService : IGithubService { @@ -30,8 +30,12 @@ public class GithubService : IGithubService { private static readonly string[] LABELS_EXCLUDE = { "type/cleanup", "type/by design", "fault/bi", "fault/other mod" }; private readonly IConfiguration configuration; + private readonly ILogger logger; - public GithubService(IConfiguration configuration) => this.configuration = configuration; + public GithubService(IConfiguration configuration, ILogger logger) { + this.configuration = configuration; + this.logger = logger; + } public bool VerifySignature(string signature, string body) { string secret = configuration.GetSection("Github")["webhookSecret"]; @@ -127,7 +131,7 @@ await client.Repository.Release.Create( await client.Issue.Milestone.Update(REPO_ORG, REPO_NAME, milestone.Number, new MilestoneUpdate { State = ItemState.Closed }); } } catch (Exception exception) { - LogWrapper.Log(exception); + logger.LogError(exception); } } @@ -175,7 +179,7 @@ private async Task GetOpenMilestone(string version) { IReadOnlyList milestones = await client.Issue.Milestone.GetAllForRepository(REPO_ORG, REPO_NAME, new MilestoneRequest { State = ItemStateFilter.Open }); Milestone milestone = milestones.FirstOrDefault(x => x.Title == version); if (milestone == null) { - LogWrapper.Log($"Could not find open milestone for version {version}"); + logger.LogWarning($"Could not find open milestone for version {version}"); } return milestone; diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Services/Integrations/InstagramService.cs index 78737aa5..e24737b3 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Services/Integrations/InstagramService.cs @@ -5,18 +5,22 @@ using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using UKSF.Api.Interfaces.Admin; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.Base.Events; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Models.Integrations; -using UKSF.Api.Services.Message; -using UKSF.Common; namespace UKSF.Api.Services.Integrations { public class InstagramService : IInstagramService { private readonly IVariablesService variablesService; + private readonly ILogger logger; private List images = new List(); - public InstagramService(IVariablesService variablesService) => this.variablesService = variablesService; + public InstagramService(IVariablesService variablesService, ILogger logger) { + this.variablesService = variablesService; + this.logger = logger; + } public async Task RefreshAccessToken() { try { @@ -25,23 +29,23 @@ public async Task RefreshAccessToken() { using HttpClient client = new HttpClient(); HttpResponseMessage response = await client.GetAsync($"https://graph.instagram.com/refresh_access_token?access_token={accessToken}&grant_type=ig_refresh_token"); if (!response.IsSuccessStatusCode) { - LogWrapper.Log($"Failed to get instagram access token, error: {response}"); + logger.LogError($"Failed to get instagram access token, error: {response}"); return; } string contentString = await response.Content.ReadAsStringAsync(); - LogWrapper.Log($"Instagram response: {contentString}"); + logger.LogInfo($"Instagram response: {contentString}"); string newAccessToken = JObject.Parse(contentString)["access_token"]?.ToString(); if (string.IsNullOrEmpty(newAccessToken)) { - LogWrapper.Log($"Failed to get instagram access token from response: {contentString}"); + logger.LogError($"Failed to get instagram access token from response: {contentString}"); return; } await variablesService.Data.Update("INSTAGRAM_ACCESS_TOKEN", newAccessToken); - LogWrapper.Log("Updated Instagram access token"); + logger.LogInfo("Updated Instagram access token"); } catch (Exception exception) { - LogWrapper.Log(exception); + logger.LogError(exception); } } @@ -53,7 +57,7 @@ public async Task CacheInstagramImages() { using HttpClient client = new HttpClient(); HttpResponseMessage response = await client.GetAsync($"https://graph.instagram.com/{userId}/media?access_token={accessToken}&fields=id,timestamp,media_type,media_url,permalink"); if (!response.IsSuccessStatusCode) { - LogWrapper.Log($"Failed to get instagram images, error: {response}"); + logger.LogError($"Failed to get instagram images, error: {response}"); return; } @@ -63,7 +67,7 @@ public async Task CacheInstagramImages() { allMedia = allMedia.OrderByDescending(x => x.timestamp).ToList(); if (allMedia.Count == 0) { - LogWrapper.Log($"Instagram response contains no images: {contentObject}"); + logger.LogWarning($"Instagram response contains no images: {contentObject}"); return; } @@ -86,7 +90,7 @@ public async Task CacheInstagramImages() { instagramImage.base64 = await GetBase64(instagramImage); } } catch (Exception exception) { - LogWrapper.Log(exception); + logger.LogError(exception); } } diff --git a/UKSF.Api.Services/Message/LogWrapper.cs b/UKSF.Api.Services/Message/LogWrapper.cs deleted file mode 100644 index 31b06eb7..00000000 --- a/UKSF.Api.Services/Message/LogWrapper.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Models.Message.Logging; -using UKSF.Api.Services.Common; - -namespace UKSF.Api.Services.Message { - public static class LogWrapper { - public static void Log(string message) => ServiceWrapper.Provider.GetService().Log(message); - - public static void Log(BasicLogMessage log) => ServiceWrapper.Provider.GetService().Log(log); - - public static void Log(Exception exception) => ServiceWrapper.Provider.GetService().Log(exception); - - public static void AuditLog(string message, string userId = "") => ServiceWrapper.Provider.GetService().AuditLog(message, userId); - } -} diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs index b5ab2c10..98b9faeb 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs @@ -70,15 +70,14 @@ public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cance } private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) { - LogWrapper.Log($"Attempting to restore repo prior to {build.version}"); + logger.LogInfo($"Attempting to restore repo prior to {build.version}"); if (build.environment != GameEnvironment.RELEASE || runningStep is BuildStepClean || runningStep is BuildStepBackup) { - LogWrapper.Log($"Won't restore. Env: {build.environment}, Step: {runningStep.GetType().Name}"); return; } ModpackBuildStep restoreStep = buildStepService.GetRestoreStepForRelease(); if (restoreStep == null) { - LogWrapper.Log("Won't restore. Restore step not found"); + logger.LogError("Restore step expected but not found. Won't restore"); return; } diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs index 6ac11792..3937e89c 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs @@ -56,7 +56,7 @@ public void Cancel(string id) { if (buildTask.IsCompleted) { buildTasks.TryRemove(id, out Task _); } else { - LogWrapper.Log($"Build {id} was cancelled but has not completed"); + logger.LogWarning($"Build {id} was cancelled but has not completed within 1 minute of cancelling"); } } } diff --git a/UKSF.Api.Services/Modpack/BuildsService.cs b/UKSF.Api.Services/Modpack/BuildsService.cs index 274f40a1..07c4125c 100644 --- a/UKSF.Api.Services/Modpack/BuildsService.cs +++ b/UKSF.Api.Services/Modpack/BuildsService.cs @@ -3,6 +3,8 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; +using UKSF.Api.Base.Services; +using UKSF.Api.Base.Services.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Modpack.BuildProcess; @@ -16,13 +18,14 @@ namespace UKSF.Api.Services.Modpack { public class BuildsService : DataBackedService, IBuildsService { private readonly IAccountService accountService; + private readonly IHttpContextService httpContextService; private readonly IBuildStepService buildStepService; - private readonly ISessionService sessionService; - public BuildsService(IBuildsDataService data, IBuildStepService buildStepService, IAccountService accountService, ISessionService sessionService) : base(data) { + + public BuildsService(IBuildsDataService data, IBuildStepService buildStepService, IAccountService accountService, IHttpContextService httpContextService) : base(data) { this.buildStepService = buildStepService; this.accountService = accountService; - this.sessionService = sessionService; + this.httpContextService = httpContextService; } public async Task UpdateBuild(ModpackBuild build, UpdateDefinition updateDefinition) { @@ -93,7 +96,7 @@ public async Task CreateReleaseBuild(string version) { buildNumber = previousBuild.buildNumber + 1, environment = GameEnvironment.RELEASE, commit = previousBuild.commit, - builderId = sessionService.GetContextId(), + builderId = httpContextService.GetUserId(), steps = buildStepService.GetSteps(GameEnvironment.RELEASE) }; build.commit.message = "Release deployment (no content changes)"; @@ -110,7 +113,7 @@ public async Task CreateRebuild(ModpackBuild build, string newSha environment = latestBuild.environment, steps = buildStepService.GetSteps(build.environment), commit = latestBuild.commit, - builderId = sessionService.GetContextId(), + builderId = httpContextService.GetUserId(), environmentVariables = latestBuild.environmentVariables }; if (!string.IsNullOrEmpty(newSha)) { @@ -162,7 +165,7 @@ public void CancelInterruptedBuilds() { } ); _ = Task.WhenAll(tasks); - LogWrapper.AuditLog($"Marked {builds.Count} interrupted builds as cancelled", "SERVER"); + logger.LogAudit($"Marked {builds.Count} interrupted builds as cancelled", "SERVER"); } private async Task FinishBuild(ModpackBuild build, ModpackBuildResult result) { diff --git a/UKSF.Api.Services/Modpack/ModpackService.cs b/UKSF.Api.Services/Modpack/ModpackService.cs index d39336a8..932c7487 100644 --- a/UKSF.Api.Services/Modpack/ModpackService.cs +++ b/UKSF.Api.Services/Modpack/ModpackService.cs @@ -3,6 +3,8 @@ using System.Linq; using System.Threading.Tasks; using Octokit; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services; using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Modpack.BuildProcess; @@ -10,22 +12,24 @@ using UKSF.Api.Models.Game; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; -using UKSF.Api.Services.Message; namespace UKSF.Api.Services.Modpack { public class ModpackService : IModpackService { private readonly IBuildQueueService buildQueueService; private readonly IBuildsService buildsService; private readonly IGithubService githubService; + private readonly IHttpContextService httpContextService; + private readonly ILogger logger; private readonly IReleaseService releaseService; - private readonly ISessionService sessionService; - public ModpackService(IReleaseService releaseService, IBuildsService buildsService, IBuildQueueService buildQueueService, IGithubService githubService, ISessionService sessionService) { + + public ModpackService(IReleaseService releaseService, IBuildsService buildsService, IBuildQueueService buildQueueService, IGithubService githubService, IHttpContextService httpContextService, ILogger logger) { this.releaseService = releaseService; this.buildsService = buildsService; this.buildQueueService = buildQueueService; this.githubService = githubService; - this.sessionService = sessionService; + this.httpContextService = httpContextService; + this.logger = logger; } public IEnumerable GetReleases() => releaseService.Data.Get(); @@ -40,25 +44,25 @@ public ModpackService(IReleaseService releaseService, IBuildsService buildsServi public async Task NewBuild(NewBuild newBuild) { GithubCommit commit = await githubService.GetLatestReferenceCommit(newBuild.reference); - if (!string.IsNullOrEmpty(sessionService.GetContextId())) { - commit.author = sessionService.GetContextEmail(); + if (!string.IsNullOrEmpty(httpContextService.GetUserId())) { + commit.author = httpContextService.GetUserEmail(); } string version = await githubService.GetReferenceVersion(newBuild.reference); ModpackBuild build = await buildsService.CreateDevBuild(version, commit, newBuild); - LogWrapper.AuditLog($"New build created ({GetBuildName(build)})"); + logger.LogAudit($"New build created ({GetBuildName(build)})"); buildQueueService.QueueBuild(build); } public async Task Rebuild(ModpackBuild build) { - LogWrapper.AuditLog($"Rebuild triggered for {GetBuildName(build)}."); + logger.LogAudit($"Rebuild triggered for {GetBuildName(build)}."); ModpackBuild rebuild = await buildsService.CreateRebuild(build, build.commit.branch == "None" ? string.Empty : (await githubService.GetLatestReferenceCommit(build.commit.branch)).after); buildQueueService.QueueBuild(rebuild); } public async Task CancelBuild(ModpackBuild build) { - LogWrapper.AuditLog($"Build {GetBuildName(build)} cancelled"); + logger.LogAudit($"Build {GetBuildName(build)} cancelled"); if (buildQueueService.CancelQueued(build.id)) { await buildsService.CancelBuild(build); @@ -68,7 +72,7 @@ public async Task CancelBuild(ModpackBuild build) { } public async Task UpdateReleaseDraft(ModpackRelease release) { - LogWrapper.AuditLog($"Release {release.version} draft updated"); + logger.LogAudit($"Release {release.version} draft updated"); await releaseService.UpdateDraft(release); } @@ -76,7 +80,7 @@ public async Task Release(string version) { ModpackBuild releaseBuild = await buildsService.CreateReleaseBuild(version); buildQueueService.QueueBuild(releaseBuild); - LogWrapper.AuditLog($"{version} released"); + logger.LogAudit($"{version} released"); } public async Task RegnerateReleaseDraftChangelog(string version) { @@ -84,7 +88,7 @@ public async Task RegnerateReleaseDraftChangelog(string version) { string newChangelog = await githubService.GenerateChangelog(version); release.changelog = newChangelog; - LogWrapper.AuditLog($"Release {version} draft changelog regenerated from github"); + logger.LogAudit($"Release {version} draft changelog regenerated from github"); await releaseService.UpdateDraft(release); } @@ -99,7 +103,7 @@ public async Task CreateRcBuildFromPush(PushWebhookPayload payload) { string rcVersion = await githubService.GetReferenceVersion(payload.Ref); ModpackRelease release = releaseService.GetRelease(rcVersion); if (release != null && !release.isDraft) { - LogWrapper.Log($"An attempt to build a release candidate for version {rcVersion} failed because the version has already been released."); + logger.LogWarning($"An attempt to build a release candidate for version {rcVersion} failed because the version has already been released."); return; } diff --git a/UKSF.Api.Services/Modpack/ReleaseService.cs b/UKSF.Api.Services/Modpack/ReleaseService.cs index d1c4c505..4f74629a 100644 --- a/UKSF.Api.Services/Modpack/ReleaseService.cs +++ b/UKSF.Api.Services/Modpack/ReleaseService.cs @@ -3,22 +3,25 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Models.Integrations.Github; using UKSF.Api.Models.Modpack; -using UKSF.Api.Services.Message; +using UKSF.Api.Personnel.Services; namespace UKSF.Api.Services.Modpack { public class ReleaseService : DataBackedService, IReleaseService { private readonly IAccountService accountService; + private readonly ILogger logger; private readonly IGithubService githubService; - public ReleaseService(IReleasesDataService data, IGithubService githubService, IAccountService accountService) : base(data) { + public ReleaseService(IReleasesDataService data, IGithubService githubService, IAccountService accountService, ILogger logger) : base(data) { this.githubService = githubService; this.accountService = accountService; + this.logger = logger; } public ModpackRelease GetRelease(string version) { @@ -42,7 +45,7 @@ public async Task PublishRelease(string version) { } if (!release.isDraft) { - LogWrapper.Log($"Attempted to release {version} again. Halting publish"); + logger.LogWarning($"Attempted to release {version} again. Halting publish"); } release.changelog += release.changelog.EndsWith("\n\n") ? "
" : "\n\n
"; diff --git a/UKSF.Api.Services/Personnel/AccountService.cs b/UKSF.Api.Services/Personnel/AccountService.cs deleted file mode 100644 index 71d453c8..00000000 --- a/UKSF.Api.Services/Personnel/AccountService.cs +++ /dev/null @@ -1,8 +0,0 @@ -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Personnel; - -namespace UKSF.Api.Services.Personnel { - public class AccountService : DataBackedService, IAccountService { - public AccountService(IAccountDataService data) : base(data) { } - } -} diff --git a/UKSF.Api.Services/Personnel/AttendanceService.cs b/UKSF.Api.Services/Personnel/AttendanceService.cs deleted file mode 100644 index cac6ff33..00000000 --- a/UKSF.Api.Services/Personnel/AttendanceService.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using MongoDB.Driver; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Models.Integrations; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Services.Personnel { - public class AttendanceService : IAttendanceService { - private readonly IAccountService accountService; - private readonly IMongoDatabase database; - private readonly IDisplayNameService displayNameService; - private readonly ILoaService loaService; - private readonly IUnitsService unitsService; - private IEnumerable accounts; - private List records; - - public AttendanceService(IAccountService accountService, IDisplayNameService displayNameService, ILoaService loaService, IMongoDatabase database, IUnitsService unitsService) { - this.accountService = accountService; - this.displayNameService = displayNameService; - this.loaService = loaService; - this.database = database; - this.unitsService = unitsService; - } - - public async Task GenerateAttendanceReport(DateTime start, DateTime end) { - await GetRecords(start, end); - GetAccounts(); - AccountAttendanceStatus[] reports = accounts.Select( - x => new AccountAttendanceStatus { - accountId = x.id, - displayName = displayNameService.GetDisplayName(x), - attendancePercent = GetAttendancePercent(x.teamspeakIdentities), - attendanceState = loaService.IsLoaCovered(x.id, start) ? AttendanceState.LOA : GetAttendanceState(GetAttendancePercent(x.teamspeakIdentities)), - groupId = unitsService.Data.GetSingle(y => y.name == x.unitAssignment).id, - groupName = x.unitAssignment - } - ) - .ToArray(); - return new AttendanceReport {users = reports}; - } - - private void GetAccounts() { - accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER); - } - - private async Task GetRecords(DateTime start, DateTime end) { - records = (await database.GetCollection("teamspeakSnapshots").FindAsync(x => x.timestamp > start && x.timestamp < end)).ToList(); - } - - private float GetAttendancePercent(ICollection userTsId) { - IEnumerable presentRecords = records.Where(record => record.users.Any(x => userTsId.Contains(x.clientDbId) && x.channelName == "ACRE")); - return presentRecords.Count() / (float) records.Count; - } - - private static AttendanceState GetAttendanceState(float attendancePercent) => attendancePercent > 0.6 ? AttendanceState.FULL : attendancePercent > 0.3 ? AttendanceState.PARTIAL : AttendanceState.MIA; - } -} diff --git a/UKSF.Api.Services/Personnel/DischargeService.cs b/UKSF.Api.Services/Personnel/DischargeService.cs deleted file mode 100644 index 2b4e4197..00000000 --- a/UKSF.Api.Services/Personnel/DischargeService.cs +++ /dev/null @@ -1,8 +0,0 @@ -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Personnel; - -namespace UKSF.Api.Services.Personnel { - public class DischargeService : DataBackedService, IDischargeService { - public DischargeService(IDischargeDataService data) : base(data) { } - } -} diff --git a/UKSF.Api.Services/UKSF.Api.Services.csproj b/UKSF.Api.Services/UKSF.Api.Services.csproj index e0f9b021..588558e2 100644 --- a/UKSF.Api.Services/UKSF.Api.Services.csproj +++ b/UKSF.Api.Services/UKSF.Api.Services.csproj @@ -29,9 +29,16 @@ + + + + + + + diff --git a/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj b/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj index 9747aad1..11c480ec 100644 --- a/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj +++ b/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj @@ -9,8 +9,4 @@ - - - - diff --git a/UKSF.Api.Utility/Services/ScheduledActionService.cs b/UKSF.Api.Utility/Services/ScheduledActionService.cs index eebf598c..07321f36 100644 --- a/UKSF.Api.Utility/Services/ScheduledActionService.cs +++ b/UKSF.Api.Utility/Services/ScheduledActionService.cs @@ -4,14 +4,14 @@ namespace UKSF.Api.Utility.Services { public interface IScheduledActionService { - void RegisterScheduledActions(HashSet newScheduledActions); + void RegisterScheduledActions(IEnumerable newScheduledActions); IScheduledAction GetScheduledAction(string actionName); } public class ScheduledActionService : IScheduledActionService { private readonly Dictionary scheduledActions = new Dictionary(); - public void RegisterScheduledActions(HashSet newScheduledActions) { + public void RegisterScheduledActions(IEnumerable newScheduledActions) { foreach (IScheduledAction scheduledAction in newScheduledActions) { scheduledActions[scheduledAction.Name] = scheduledAction; } diff --git a/UKSF.Api.Utility/Services/SchedulerService.cs b/UKSF.Api.Utility/Services/SchedulerService.cs index 64b80f24..4c4c1403 100644 --- a/UKSF.Api.Utility/Services/SchedulerService.cs +++ b/UKSF.Api.Utility/Services/SchedulerService.cs @@ -85,7 +85,7 @@ private void Schedule(ScheduledJob job) { try { ExecuteAction(job); } catch (Exception exception) { - LogWrapper.Log(exception); + logger.LogError(exception); } if (job.repeat) { diff --git a/UKSF.Api.Utility/UKSF.Api.Utility.csproj b/UKSF.Api.Utility/UKSF.Api.Utility.csproj index c5995007..ded27b7c 100644 --- a/UKSF.Api.Utility/UKSF.Api.Utility.csproj +++ b/UKSF.Api.Utility/UKSF.Api.Utility.csproj @@ -1,25 +1,14 @@ - + - net5.0 + netcoreapp5.0 + Library - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.Extensions.Configuration.Abstractions.dll - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.Extensions.Hosting.Abstractions.dll - - - diff --git a/UKSF.Api.sln b/UKSF.Api.sln index 9aae6832..992c4b64 100644 --- a/UKSF.Api.sln +++ b/UKSF.Api.sln @@ -26,8 +26,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.PostMessage", "UKSF.Po EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Tests", "UKSF.Tests\UKSF.Tests.csproj", "{09946FE7-A65D-483E-8B5A-ADE729760375}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Common", "UKSF.Common\UKSF.Common.csproj", "{9FB41E01-8AD4-4110-8AEE-97800CF565E8}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Base", "UKSF.Api.Base\UKSF.Api.Base.csproj", "{05267EF4-BA94-4AB1-9222-507B9615E58A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Auth", "UKSF.Api.Auth\UKSF.Api.Auth.csproj", "{4274130C-CA14-4BD3-8C5C-295183DAE0AD}" @@ -38,8 +36,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Utility", "UKSF.Ap EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Personnel", "UKSF.Api.Personnel\UKSF.Api.Personnel.csproj", "{213E4782-D069-4C1E-AA2C-025CF6573C40}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Logging", "UKSF.Api.Logging\UKSF.Api.Logging.csproj", "{293D120E-801F-4C07-A57E-29905F924DC9}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -120,14 +116,6 @@ Global {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|x64.Build.0 = Release|Any CPU {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|x86.ActiveCfg = Release|Any CPU {09946FE7-A65D-483E-8B5A-ADE729760375}.Release|x86.Build.0 = Release|Any CPU - {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|x64.ActiveCfg = Debug|Any CPU - {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|x64.Build.0 = Debug|Any CPU - {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|x86.ActiveCfg = Debug|Any CPU - {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Debug|x86.Build.0 = Debug|Any CPU - {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x64.ActiveCfg = Release|Any CPU - {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x64.Build.0 = Release|Any CPU - {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x86.ActiveCfg = Release|Any CPU - {9FB41E01-8AD4-4110-8AEE-97800CF565E8}.Release|x86.Build.0 = Release|Any CPU {05267EF4-BA94-4AB1-9222-507B9615E58A}.Debug|x64.ActiveCfg = Debug|Any CPU {05267EF4-BA94-4AB1-9222-507B9615E58A}.Debug|x64.Build.0 = Debug|Any CPU {05267EF4-BA94-4AB1-9222-507B9615E58A}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -168,14 +156,6 @@ Global {213E4782-D069-4C1E-AA2C-025CF6573C40}.Release|x64.Build.0 = Release|Any CPU {213E4782-D069-4C1E-AA2C-025CF6573C40}.Release|x86.ActiveCfg = Release|Any CPU {213E4782-D069-4C1E-AA2C-025CF6573C40}.Release|x86.Build.0 = Release|Any CPU - {293D120E-801F-4C07-A57E-29905F924DC9}.Debug|x64.ActiveCfg = Debug|Any CPU - {293D120E-801F-4C07-A57E-29905F924DC9}.Debug|x64.Build.0 = Debug|Any CPU - {293D120E-801F-4C07-A57E-29905F924DC9}.Debug|x86.ActiveCfg = Debug|Any CPU - {293D120E-801F-4C07-A57E-29905F924DC9}.Debug|x86.Build.0 = Debug|Any CPU - {293D120E-801F-4C07-A57E-29905F924DC9}.Release|x64.ActiveCfg = Release|Any CPU - {293D120E-801F-4C07-A57E-29905F924DC9}.Release|x64.Build.0 = Release|Any CPU - {293D120E-801F-4C07-A57E-29905F924DC9}.Release|x86.ActiveCfg = Release|Any CPU - {293D120E-801F-4C07-A57E-29905F924DC9}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UKSF.Api/AppStart/AutoMapperConfigurationProfile.cs b/UKSF.Api/AppStart/AutoMapperConfigurationProfile.cs index 4b39af8f..9f41feaf 100644 --- a/UKSF.Api/AppStart/AutoMapperConfigurationProfile.cs +++ b/UKSF.Api/AppStart/AutoMapperConfigurationProfile.cs @@ -1,5 +1,5 @@ using AutoMapper; -using UKSF.Api.Models.Units; +using UKSF.Api.Personnel.Models; namespace UKSF.Api.AppStart { public class AutoMapperConfigurationProfile : Profile { diff --git a/UKSF.Api/AppStart/EventHandlerInitialiser.cs b/UKSF.Api/AppStart/EventHandlerInitialiser.cs deleted file mode 100644 index 0006dcc8..00000000 --- a/UKSF.Api/AppStart/EventHandlerInitialiser.cs +++ /dev/null @@ -1,42 +0,0 @@ -using UKSF.Api.Admin.EventHandlers; -using UKSF.Api.Interfaces.Events.Handlers; - -namespace UKSF.Api.AppStart { - public class EventHandlerInitialiser { - private readonly IAccountEventHandler accountEventHandler; - private readonly IBuildsEventHandler buildsEventHandler; - private readonly ICommandRequestEventHandler commandRequestEventHandler; - private readonly ICommentThreadEventHandler commentThreadEventHandler; - private readonly ILogEventHandler logEventHandler; - private readonly INotificationsEventHandler notificationsEventHandler; - private readonly ITeamspeakEventHandler teamspeakEventHandler; - - public EventHandlerInitialiser( - IAccountEventHandler accountEventHandler, - IBuildsEventHandler buildsEventHandler, - ICommandRequestEventHandler commandRequestEventHandler, - ICommentThreadEventHandler commentThreadEventHandler, - ILogEventHandler logEventHandler, - INotificationsEventHandler notificationsEventHandler, - ITeamspeakEventHandler teamspeakEventHandler - ) { - this.accountEventHandler = accountEventHandler; - this.buildsEventHandler = buildsEventHandler; - this.commandRequestEventHandler = commandRequestEventHandler; - this.commentThreadEventHandler = commentThreadEventHandler; - this.logEventHandler = logEventHandler; - this.notificationsEventHandler = notificationsEventHandler; - this.teamspeakEventHandler = teamspeakEventHandler; - } - - public void InitEventHandlers() { - accountEventHandler.Init(); - buildsEventHandler.Init(); - commandRequestEventHandler.Init(); - commentThreadEventHandler.Init(); - logEventHandler.Init(); - notificationsEventHandler.Init(); - teamspeakEventHandler.Init(); - } - } -} diff --git a/UKSF.Api/AppStart/RegisterAndWarmCachedData.cs b/UKSF.Api/AppStart/RegisterAndWarmCachedData.cs deleted file mode 100644 index 76658577..00000000 --- a/UKSF.Api/AppStart/RegisterAndWarmCachedData.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using System.Collections.Generic; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Services.Utility; - -namespace UKSF.Api.AppStart { - public static class RegisterAndWarmCachedData { - // TODO: Nah - public static void Warm() { - IServiceProvider serviceProvider = Global.ServiceProvider; - - IAccountDataService accountDataService = serviceProvider.GetService(); - IBuildsDataService buildsDataService = serviceProvider.GetService(); - ICommandRequestDataService commandRequestDataService = serviceProvider.GetService(); - ICommentThreadDataService commentThreadDataService = serviceProvider.GetService(); - IDischargeDataService dischargeDataService = serviceProvider.GetService(); - IGameServersDataService gameServersDataService = serviceProvider.GetService(); - ILauncherFileDataService launcherFileDataService = serviceProvider.GetService(); - ILoaDataService loaDataService = serviceProvider.GetService(); - INotificationsDataService notificationsDataService = serviceProvider.GetService(); - IOperationOrderDataService operationOrderDataService = serviceProvider.GetService(); - IOperationReportDataService operationReportDataService = serviceProvider.GetService(); - IRanksDataService ranksDataService = serviceProvider.GetService(); - IReleasesDataService releasesDataService = serviceProvider.GetService(); - IRolesDataService rolesDataService = serviceProvider.GetService(); - IUnitsDataService unitsDataService = serviceProvider.GetService(); - IVariablesDataService variablesDataService = serviceProvider.GetService(); - - DataCacheService dataCacheService = serviceProvider.GetService(); - dataCacheService.RegisterCachedDataServices( - new HashSet { - accountDataService, - buildsDataService, - commandRequestDataService, - commentThreadDataService, - dischargeDataService, - gameServersDataService, - launcherFileDataService, - loaDataService, - notificationsDataService, - operationOrderDataService, - operationReportDataService, - ranksDataService, - releasesDataService, - rolesDataService, - unitsDataService, - variablesDataService - } - ); - dataCacheService.InvalidateCachedData(); - } - } -} diff --git a/UKSF.Api/AppStart/RegisterScheduledActions.cs b/UKSF.Api/AppStart/RegisterScheduledActions.cs deleted file mode 100644 index d3e3d8d2..00000000 --- a/UKSF.Api/AppStart/RegisterScheduledActions.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Interfaces.Utility.ScheduledActions; - -namespace UKSF.Api.AppStart { - public static class RegisterScheduledActions { - public static void Register(IServiceProvider serviceProvider) { - IDeleteExpiredConfirmationCodeAction deleteExpiredConfirmationCodeAction = serviceProvider.GetService(); - IInstagramImagesAction instagramImagesAction = serviceProvider.GetService(); - IInstagramTokenAction instagramTokenAction = serviceProvider.GetService(); - IPruneDataAction pruneDataAction = serviceProvider.GetService(); - ITeamspeakSnapshotAction teamspeakSnapshotAction = serviceProvider.GetService(); - - IScheduledActionService scheduledActionService = serviceProvider.GetService(); - scheduledActionService?.RegisterScheduledActions(new HashSet { deleteExpiredConfirmationCodeAction, instagramImagesAction, instagramTokenAction, pruneDataAction, teamspeakSnapshotAction }); - } - } -} diff --git a/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs b/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs index a327940d..f2f5c8c9 100644 --- a/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs @@ -1,26 +1,18 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using UKSF.Api.Interfaces.Admin; +using UKSF.Api.EventHandlers; using UKSF.Api.Interfaces.Command; using UKSF.Api.Interfaces.Game; using UKSF.Api.Interfaces.Launcher; -using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Operations; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Services.Admin; +using UKSF.Api.Personnel.Services; using UKSF.Api.Services.Command; using UKSF.Api.Services.Fake; using UKSF.Api.Services.Game; using UKSF.Api.Services.Launcher; -using UKSF.Api.Services.Message; using UKSF.Api.Services.Modpack; using UKSF.Api.Services.Operations; -using UKSF.Api.Services.Personnel; -using UKSF.Api.Services.Units; -using UKSF.Api.Services.Utility; namespace UKSF.Api.AppStart.Services { public static class DataBackedServiceExtensions { @@ -28,26 +20,20 @@ public static void RegisterDataBackedServices(this IServiceCollection services, // Non-Cached // Cached - services.AddSingleton(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - if (currentEnvironment.IsDevelopment()) { - services.AddTransient(); - } else { - services.AddTransient(); - } + services.AddSingleton(); + + // if (currentEnvironment.IsDevelopment()) { + // services.AddTransient(); + // } else { + // } } } } diff --git a/UKSF.Api/AppStart/Services/RegisterDataServices.cs b/UKSF.Api/AppStart/Services/RegisterDataServices.cs index 1f1923b8..83fec53d 100644 --- a/UKSF.Api/AppStart/Services/RegisterDataServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterDataServices.cs @@ -4,13 +4,12 @@ using UKSF.Api.Data.Fake; using UKSF.Api.Data.Game; using UKSF.Api.Data.Launcher; -using UKSF.Api.Data.Message; using UKSF.Api.Data.Modpack; using UKSF.Api.Data.Operations; -using UKSF.Api.Data.Personnel; -using UKSF.Api.Data.Units; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Data.Cached; +using UKSF.Api.Personnel.Services.Data; +using UKSF.Api.Services.Data; namespace UKSF.Api.AppStart.Services { public static class DataServiceExtensions { @@ -19,26 +18,23 @@ public static void RegisterDataServices(this IServiceCollection services, IHostE services.AddSingleton(); // Cached - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - if (currentEnvironment.IsDevelopment()) { - services.AddSingleton(); - } else { - services.AddSingleton(); - } + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + + // if (currentEnvironment.IsDevelopment()) { + // services.AddSingleton(); + // } else { + // } } } } diff --git a/UKSF.Api/AppStart/Services/RegisterEventServices.cs b/UKSF.Api/AppStart/Services/RegisterEventServices.cs index 349c2e6c..bb99ff6c 100644 --- a/UKSF.Api/AppStart/Services/RegisterEventServices.cs +++ b/UKSF.Api/AppStart/Services/RegisterEventServices.cs @@ -1,51 +1,35 @@ using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Events; -using UKSF.Api.Events.Data; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models.Logging; using UKSF.Api.Events.Handlers; -using UKSF.Api.Events.SignalrServer; -using UKSF.Api.Interfaces.Events; using UKSF.Api.Interfaces.Events.Handlers; -using UKSF.Api.Models.Admin; using UKSF.Api.Models.Command; using UKSF.Api.Models.Game; using UKSF.Api.Models.Launcher; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Message.Logging; using UKSF.Api.Models.Modpack; using UKSF.Api.Models.Operations; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; -using UKSF.Api.Models.Utility; +using UKSF.Api.Personnel.EventHandlers; +using UKSF.Api.Personnel.Models; +using ISignalrEventBus = UKSF.Api.Interfaces.Events.ISignalrEventBus; namespace UKSF.Api.AppStart.Services { public static class EventServiceExtensions { public static void RegisterEventServices(this IServiceCollection services) { // Event Buses - services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); services.AddSingleton(); + services.AddSingleton, DataEventBus>(); + // Event Handlers - services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); } } diff --git a/UKSF.Api/AppStart/Services/ServiceExtensions.cs b/UKSF.Api/AppStart/Services/ServiceExtensions.cs index ba310909..a07ac9a7 100644 --- a/UKSF.Api/AppStart/Services/ServiceExtensions.cs +++ b/UKSF.Api/AppStart/Services/ServiceExtensions.cs @@ -2,21 +2,18 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using UKSF.Api.Data; using UKSF.Api.Interfaces.Command; -using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Game; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Integrations.Teamspeak; using UKSF.Api.Interfaces.Launcher; -using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Modpack.BuildProcess; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Personnel.Services; using UKSF.Api.Services; -using UKSF.Api.Services.Admin; using UKSF.Api.Services.Command; using UKSF.Api.Services.Fake; using UKSF.Api.Services.Game; @@ -25,12 +22,8 @@ using UKSF.Api.Services.Integrations.Github; using UKSF.Api.Services.Integrations.Teamspeak; using UKSF.Api.Services.Launcher; -using UKSF.Api.Services.Message; using UKSF.Api.Services.Modpack; using UKSF.Api.Services.Modpack.BuildProcess; -using UKSF.Api.Services.Personnel; -using UKSF.Api.Services.Utility; -using UKSF.Common; namespace UKSF.Api.AppStart.Services { public static class ServiceExtensions { @@ -40,7 +33,6 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddSingleton(currentEnvironment); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); // Data common @@ -53,7 +45,6 @@ public static void RegisterServices(this IServiceCollection services, IConfigura // Services services.AddTransient(); - services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -61,7 +52,6 @@ public static void RegisterServices(this IServiceCollection services, IConfigura services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -88,4 +78,3 @@ public static void RegisterServices(this IServiceCollection services, IConfigura } } } - diff --git a/UKSF.Api/AppStart/StartServices.cs b/UKSF.Api/AppStart/StartServices.cs index c5427983..5c3e82d2 100644 --- a/UKSF.Api/AppStart/StartServices.cs +++ b/UKSF.Api/AppStart/StartServices.cs @@ -1,19 +1,20 @@ using System; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using UKSF.Api.Events; +using MoreLinq; +using UKSF.Api.Admin.Services; +using UKSF.Api.Base.Events; using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Interfaces.Integrations.Teamspeak; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Services.Admin; +using UKSF.Api.Services; +using UKSF.Api.Utility.ScheduledActions; +using UKSF.Api.Utility.Services; namespace UKSF.Api.AppStart { public static class StartServices { - public static void Start() { - IServiceProvider serviceProvider = Global.ServiceProvider; - + public static void StartUksfServices(this IServiceProvider serviceProvider) { if (serviceProvider.GetService().IsDevelopment()) { // Do any test data setup // TestDataSetup.Run(serviceProvider); @@ -23,16 +24,16 @@ public static void Start() { serviceProvider.GetService()?.Migrate(); // Warm cached data services - RegisterAndWarmCachedData.Warm(); + serviceProvider.GetService()?.InvalidateCachedData(); // Register scheduled actions - RegisterScheduledActions.Register(serviceProvider); + serviceProvider.GetService()?.RegisterScheduledActions(serviceProvider.GetServices()); // Register build steps serviceProvider.GetService()?.RegisterBuildSteps(); // Add event handlers - serviceProvider.GetService()?.InitEventHandlers(); + serviceProvider.GetServices().ForEach(x => x.Init()); // Start teamspeak manager serviceProvider.GetService()?.Start(); diff --git a/UKSF.Api/Controllers/Accounts/OperationOrderController.cs b/UKSF.Api/Controllers/Accounts/OperationOrderController.cs index a682112b..f82fe8f2 100644 --- a/UKSF.Api/Controllers/Accounts/OperationOrderController.cs +++ b/UKSF.Api/Controllers/Accounts/OperationOrderController.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc; using UKSF.Api.Interfaces.Operations; using UKSF.Api.Models.Operations; -using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers.Accounts { [Route("[controller]"), Permissions(Permissions.MEMBER)] diff --git a/UKSF.Api/Controllers/Accounts/OperationReportController.cs b/UKSF.Api/Controllers/Accounts/OperationReportController.cs index 46c8782c..a9cc6edf 100644 --- a/UKSF.Api/Controllers/Accounts/OperationReportController.cs +++ b/UKSF.Api/Controllers/Accounts/OperationReportController.cs @@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Mvc; using UKSF.Api.Interfaces.Operations; using UKSF.Api.Models.Operations; -using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers.Accounts { [Route("[controller]"), Permissions(Permissions.MEMBER)] diff --git a/UKSF.Api/Controllers/Accounts/OperationsController.cs b/UKSF.Api/Controllers/Accounts/OperationsController.cs index a3c9d597..ac2e7762 100644 --- a/UKSF.Api/Controllers/Accounts/OperationsController.cs +++ b/UKSF.Api/Controllers/Accounts/OperationsController.cs @@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using UKSF.Api.Models.Integrations; -using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers.Accounts { [Route("[controller]"), Permissions(Permissions.MEMBER)] diff --git a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs index 11059d8b..0b4cf889 100644 --- a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs +++ b/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs @@ -7,6 +7,11 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.Admin.Services.Data; +using UKSF.Api.Base; +using UKSF.Api.Base.Services; using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Command; using UKSF.Api.Interfaces.Data.Cached; @@ -15,21 +20,19 @@ using UKSF.Api.Interfaces.Units; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Command; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Admin; -using UKSF.Api.Services.Message; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; using UKSF.Common; namespace UKSF.Api.Controllers.CommandRequests { [Route("[controller]"), Permissions(Permissions.COMMAND)] public class CommandRequestsController : Controller { private readonly ICommandRequestCompletionService commandRequestCompletionService; + private readonly IHttpContextService httpContextService; private readonly ICommandRequestService commandRequestService; private readonly IDisplayNameService displayNameService; private readonly INotificationsService notificationsService; - private readonly ISessionService sessionService; + private readonly IUnitsService unitsService; private readonly IVariablesDataService variablesDataService; private readonly IVariablesService variablesService; @@ -37,7 +40,7 @@ public class CommandRequestsController : Controller { public CommandRequestsController( ICommandRequestService commandRequestService, ICommandRequestCompletionService commandRequestCompletionService, - ISessionService sessionService, + IHttpContextService httpContextService, IUnitsService unitsService, IDisplayNameService displayNameService, INotificationsService notificationsService, @@ -46,7 +49,8 @@ IVariablesService variablesService ) { this.commandRequestService = commandRequestService; this.commandRequestCompletionService = commandRequestCompletionService; - this.sessionService = sessionService; + this.httpContextService = httpContextService; + this.unitsService = unitsService; this.displayNameService = displayNameService; this.notificationsService = notificationsService; @@ -59,7 +63,7 @@ public IActionResult Get() { IEnumerable allRequests = commandRequestService.Data.Get(); List myRequests = new List(); List otherRequests = new List(); - string contextId = sessionService.GetContextId(); + string contextId = httpContextService.GetUserId(); string id = variablesDataService.GetSingle("UNIT_ID_PERSONNEL").AsString(); bool canOverride = unitsService.Data.GetSingle(id).members.Any(x => x == contextId); bool superAdmin = contextId == Global.SUPER_ADMIN; @@ -108,14 +112,14 @@ private object GetOtherRequests(IEnumerable otherRequests, bool public async Task UpdateRequestReview(string id, [FromBody] JObject body) { bool overriden = bool.Parse(body["overriden"].ToString()); ReviewState state = Enum.Parse(body["reviewState"].ToString()); - Account sessionAccount = sessionService.GetContextAccount(); + Account sessionAccount = accountService.GetUserAccount(); CommandRequest request = commandRequestService.Data.GetSingle(id); if (request == null) { throw new NullReferenceException($"Failed to get request with id {id}, does not exist"); } if (overriden) { - LogWrapper.AuditLog($"Review state of {request.type.ToLower()} request for {request.displayRecipient} overriden to {state}"); + logger.LogAudit($"Review state of {request.type.ToLower()} request for {request.displayRecipient} overriden to {state}"); await commandRequestService.SetRequestAllReviewStates(request, state); foreach (string reviewerId in request.reviews.Select(x => x.Key).Where(x => x != sessionAccount.id)) { @@ -136,7 +140,7 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje } if (currentState == state) return Ok(); - LogWrapper.AuditLog($"Review state of {displayNameService.GetDisplayName(sessionAccount)} for {request.type.ToLower()} request for {request.displayRecipient} updated to {state}"); + logger.LogAudit($"Review state of {displayNameService.GetDisplayName(sessionAccount)} for {request.type.ToLower()} request for {request.displayRecipient} updated to {state}"); await commandRequestService.SetRequestReviewState(request, sessionAccount.id, state); } diff --git a/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs b/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs index d03b5129..112d715b 100644 --- a/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs +++ b/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs @@ -4,13 +4,15 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Base; +using UKSF.Api.Base.Services; using UKSF.Api.Interfaces.Command; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Command; -using UKSF.Api.Models.Units; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; namespace UKSF.Api.Controllers.CommandRequests { [Route("CommandRequests/Create")] @@ -18,20 +20,22 @@ public class CommandRequestsCreationController : Controller { private readonly IAccountService accountService; private readonly ICommandRequestService commandRequestService; private readonly IDisplayNameService displayNameService; + private readonly IHttpContextService httpContextService; private readonly ILoaService loaService; private readonly IRanksService ranksService; private readonly string sessionId; private readonly IUnitsService unitsService; - public CommandRequestsCreationController(ISessionService sessionService, IAccountService accountService, ICommandRequestService commandRequestService, IRanksService ranksService, ILoaService loaService, IUnitsService unitsService, IDisplayNameService displayNameService) { + public CommandRequestsCreationController(IAccountService accountService, ICommandRequestService commandRequestService, IRanksService ranksService, ILoaService loaService, IUnitsService unitsService, IDisplayNameService displayNameService, IHttpContextService httpContextService) { this.accountService = accountService; this.commandRequestService = commandRequestService; this.ranksService = ranksService; this.loaService = loaService; this.unitsService = unitsService; this.displayNameService = displayNameService; - sessionId = sessionService.GetContextId(); + this.httpContextService = httpContextService; + sessionId = httpContextService.GetUserId(); } [HttpPut("rank"), Authorize, Permissions(Permissions.COMMAND)] diff --git a/UKSF.Api/Controllers/CommentThreadController.cs b/UKSF.Api/Controllers/CommentThreadController.cs index 74658d22..a0eb7712 100644 --- a/UKSF.Api/Controllers/CommentThreadController.cs +++ b/UKSF.Api/Controllers/CommentThreadController.cs @@ -5,12 +5,13 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Bson; +using UKSF.Api.Base; +using UKSF.Api.Base.Services; using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; namespace UKSF.Api.Controllers { [Route("commentthread"), Permissions(Permissions.CONFIRMED, Permissions.MEMBER, Permissions.DISCHARGED)] @@ -19,18 +20,20 @@ public class CommentThreadController : Controller { private readonly ICommentThreadService commentThreadService; private readonly IDisplayNameService displayNameService; private readonly INotificationsService notificationsService; + private readonly IHttpContextService httpContextService; private readonly IRanksService ranksService; private readonly IRecruitmentService recruitmentService; - private readonly ISessionService sessionService; - public CommentThreadController(ICommentThreadService commentThreadService, ISessionService sessionService, IRanksService ranksService, IAccountService accountService, IDisplayNameService displayNameService, IRecruitmentService recruitmentService, INotificationsService notificationsService) { + + public CommentThreadController(ICommentThreadService commentThreadService, IRanksService ranksService, IAccountService accountService, IDisplayNameService displayNameService, IRecruitmentService recruitmentService, INotificationsService notificationsService, IHttpContextService httpContextService) { this.commentThreadService = commentThreadService; - this.sessionService = sessionService; + this.ranksService = ranksService; this.accountService = accountService; this.displayNameService = displayNameService; this.recruitmentService = recruitmentService; this.notificationsService = notificationsService; + this.httpContextService = httpContextService; } [HttpGet("{id}"), Authorize] @@ -54,10 +57,10 @@ public IActionResult Get(string id) { [HttpGet("canpost/{id}"), Authorize] public IActionResult GetCanPostComment(string id) { CommentThread commentThread = commentThreadService.Data.GetSingle(id); - Account account = sessionService.GetContextAccount(); - bool admin = sessionService.ContextHasRole(Permissions.ADMIN); + Account account = accountService.GetUserAccount(); + bool admin = httpContextService.UserHasPermission(Permissions.ADMIN); bool canPost = commentThread.mode switch { - ThreadMode.RECRUITER => commentThread.authors.Any(x => x == sessionService.GetContextId()) || admin || recruitmentService.IsRecruiter(sessionService.GetContextAccount()), + ThreadMode.RECRUITER => commentThread.authors.Any(x => x == httpContextService.GetUserId()) || admin || recruitmentService.IsRecruiter(accountService.GetUserAccount()), ThreadMode.RANKSUPERIOR => commentThread.authors.Any(x => admin || ranksService.IsSuperior(account.rank, accountService.Data.GetSingle(x).rank)), ThreadMode.RANKEQUAL => commentThread.authors.Any(x => admin || ranksService.IsEqual(account.rank, accountService.Data.GetSingle(x).rank)), ThreadMode.RANKSUPERIOROREQUAL => commentThread.authors.Any(x => admin || ranksService.IsSuperiorOrEqual(account.rank, accountService.Data.GetSingle(x).rank)), @@ -71,7 +74,7 @@ public IActionResult GetCanPostComment(string id) { public async Task AddComment(string id, [FromBody] Comment comment) { comment.id = ObjectId.GenerateNewId().ToString(); comment.timestamp = DateTime.Now; - comment.author = sessionService.GetContextId(); + comment.author = httpContextService.GetUserId(); await commentThreadService.InsertComment(id, comment); CommentThread thread = commentThreadService.Data.GetSingle(id); IEnumerable participants = commentThreadService.GetCommentThreadParticipants(thread.id); diff --git a/UKSF.Api/Controllers/DiscordConnectionController.cs b/UKSF.Api/Controllers/DiscordConnectionController.cs index 83bf5e9b..e3e83190 100644 --- a/UKSF.Api/Controllers/DiscordConnectionController.cs +++ b/UKSF.Api/Controllers/DiscordConnectionController.cs @@ -8,10 +8,9 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Newtonsoft.Json.Linq; +using UKSF.Api.Base.Events; using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Services.Admin; -using UKSF.Api.Services.Message; using UKSF.Common; namespace UKSF.Api.Controllers { @@ -23,12 +22,14 @@ public class DiscordConnectionController : Controller { private readonly IConfirmationCodeService confirmationCodeService; private readonly IVariablesService variablesService; + private readonly ILogger logger; private readonly string url; private readonly string urlReturn; - public DiscordConnectionController(IConfirmationCodeService confirmationCodeService, IConfiguration configuration, IHostEnvironment currentEnvironment, IVariablesService variablesService) { + public DiscordConnectionController(IConfirmationCodeService confirmationCodeService, IConfiguration configuration, IHostEnvironment currentEnvironment, IVariablesService variablesService, ILogger logger) { this.confirmationCodeService = confirmationCodeService; this.variablesService = variablesService; + this.logger = logger; clientId = configuration.GetSection("Discord")["clientId"]; clientSecret = configuration.GetSection("Discord")["clientSecret"]; botToken = configuration.GetSection("Discord")["botToken"]; @@ -73,13 +74,13 @@ private async Task GetUrlParameters(string code, string redirectUrl) { ); string result = await response.Content.ReadAsStringAsync(); if (!response.IsSuccessStatusCode) { - LogWrapper.Log($"A discord connection request was denied by the user, or an error occurred: {result}"); + logger.LogWarning($"A discord connection request was denied by the user, or an error occurred: {result}"); return "discordid=fail"; } string token = JObject.Parse(result)["access_token"]?.ToString(); if (string.IsNullOrEmpty(token)) { - LogWrapper.Log("A discord connection request failed. Could not get access token"); + logger.LogWarning("A discord connection request failed. Could not get access token"); return "discordid=fail"; } @@ -89,7 +90,7 @@ private async Task GetUrlParameters(string code, string redirectUrl) { string id = JObject.Parse(result)["id"]?.ToString(); string username = JObject.Parse(result)["username"]?.ToString(); if (string.IsNullOrEmpty(id) || string.IsNullOrEmpty(username)) { - LogWrapper.Log($"A discord connection request failed. Could not get username ({username}) or id ({id}) or an error occurred: {result}"); + logger.LogWarning($"A discord connection request failed. Could not get username ({username}) or id ({id}) or an error occurred: {result}"); return "discordid=fail"; } @@ -100,7 +101,7 @@ private async Task GetUrlParameters(string code, string redirectUrl) { ); string added = "true"; if (!response.IsSuccessStatusCode) { - LogWrapper.Log($"Failed to add '{username}' to guild: {response.StatusCode}, {response.Content.ReadAsStringAsync().Result}"); + logger.LogWarning($"Failed to add '{username}' to guild: {response.StatusCode}, {response.Content.ReadAsStringAsync().Result}"); added = "false"; } diff --git a/UKSF.Api/Controllers/DiscordController.cs b/UKSF.Api/Controllers/DiscordController.cs index 70522b93..44883c2e 100644 --- a/UKSF.Api/Controllers/DiscordController.cs +++ b/UKSF.Api/Controllers/DiscordController.cs @@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers { [Route("[controller]")] diff --git a/UKSF.Api/Controllers/GameServersController.cs b/UKSF.Api/Controllers/GameServersController.cs index 3d26dea5..0fab90bf 100644 --- a/UKSF.Api/Controllers/GameServersController.cs +++ b/UKSF.Api/Controllers/GameServersController.cs @@ -9,14 +9,15 @@ using MongoDB.Driver; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.Base; +using UKSF.Api.Base.Events; using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Game; using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Models.Game; using UKSF.Api.Models.Mission; -using UKSF.Api.Services.Admin; -using UKSF.Api.Services.Message; -using UKSF.Api.Services.Personnel; using UKSF.Api.Signalr.Hubs.Game; using UKSF.Common; @@ -27,12 +28,14 @@ public class GameServersController : Controller { private readonly IHubContext serversHub; private readonly IVariablesService variablesService; private readonly IGameServerHelpers gameServerHelpers; + private readonly ILogger logger; - public GameServersController(IGameServersService gameServersService, IHubContext serversHub, IVariablesService variablesService, IGameServerHelpers gameServerHelpers) { + public GameServersController(IGameServersService gameServersService, IHubContext serversHub, IVariablesService variablesService, IGameServerHelpers gameServerHelpers, ILogger logger) { this.gameServersService = gameServersService; this.serversHub = serversHub; this.variablesService = variablesService; this.gameServerHelpers = gameServerHelpers; + this.logger = logger; } [HttpGet, Authorize] @@ -59,14 +62,14 @@ public IActionResult CheckGameServers(string check, [FromBody] GameServer gameSe [HttpPut, Authorize] public async Task AddServer([FromBody] GameServer gameServer) { await gameServersService.Data.Add(gameServer); - LogWrapper.AuditLog($"Server added '{gameServer}'"); + logger.LogAudit($"Server added '{gameServer}'"); return Ok(); } [HttpPatch, Authorize] public async Task EditGameServer([FromBody] GameServer gameServer) { GameServer oldGameServer = gameServersService.Data.GetSingle(x => x.id == gameServer.id); - LogWrapper.AuditLog($"Game server '{gameServer.name}' updated:{oldGameServer.Changes(gameServer)}"); + logger.LogAudit($"Game server '{gameServer.name}' updated:{oldGameServer.Changes(gameServer)}"); bool environmentChanged = false; if (oldGameServer.environment != gameServer.environment) { environmentChanged = true; @@ -95,7 +98,7 @@ await gameServersService.Data.Update( [HttpDelete("{id}"), Authorize] public async Task DeleteGameServer(string id) { GameServer gameServer = gameServersService.Data.GetSingle(x => x.id == id); - LogWrapper.AuditLog($"Game server deleted '{gameServer.name}'"); + logger.LogAudit($"Game server deleted '{gameServer.name}'"); await gameServersService.Data.Delete(id); return Ok(gameServersService.Data.Get()); @@ -122,10 +125,10 @@ public async Task UploadMissionFile() { MissionPatchingResult missionPatchingResult = await gameServersService.PatchMissionFile(file.Name); missionPatchingResult.reports = missionPatchingResult.reports.OrderByDescending(x => x.error).ToList(); missionReports.Add(new { mission = file.Name, missionPatchingResult.reports }); - LogWrapper.AuditLog($"Uploaded mission '{file.Name}'"); + logger.LogAudit($"Uploaded mission '{file.Name}'"); } } catch (Exception exception) { - LogWrapper.Log(exception); + logger.LogError(exception); return BadRequest(exception); } @@ -174,14 +177,14 @@ public async Task LaunchServer(string id, [FromBody] JObject data // Execute launch await gameServersService.LaunchGameServer(gameServer); - LogWrapper.AuditLog($"Game server launched '{missionSelection}' on '{gameServer.name}'"); + logger.LogAudit($"Game server launched '{missionSelection}' on '{gameServer.name}'"); return Ok(patchingResult.reports); } [HttpGet("stop/{id}"), Authorize] public async Task StopServer(string id) { GameServer gameServer = gameServersService.Data.GetSingle(id); - LogWrapper.AuditLog($"Game server stopped '{gameServer.name}'"); + logger.LogAudit($"Game server stopped '{gameServer.name}'"); await gameServersService.GetGameServerStatus(gameServer); if (!gameServer.status.started && !gameServer.status.running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); await gameServersService.StopGameServer(gameServer); @@ -192,7 +195,7 @@ public async Task StopServer(string id) { [HttpGet("kill/{id}"), Authorize] public async Task KillServer(string id) { GameServer gameServer = gameServersService.Data.GetSingle(id); - LogWrapper.AuditLog($"Game server killed '{gameServer.name}'"); + logger.LogAudit($"Game server killed '{gameServer.name}'"); await gameServersService.GetGameServerStatus(gameServer); if (!gameServer.status.started && !gameServer.status.running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); try { @@ -208,7 +211,7 @@ public async Task KillServer(string id) { [HttpGet("killall"), Authorize] public IActionResult KillAllArmaProcesses() { int killed = gameServersService.KillAllArmaProcesses(); - LogWrapper.AuditLog($"Killed {killed} Arma instances"); + logger.LogAudit($"Killed {killed} Arma instances"); return Ok(); } @@ -220,8 +223,8 @@ public async Task SetGameServerMods(string id, [FromBody] JObject List mods = JsonConvert.DeserializeObject>(body.GetValueFromBody("mods")); List serverMods = JsonConvert.DeserializeObject>(body.GetValueFromBody("serverMods")); GameServer gameServer = gameServersService.Data.GetSingle(id); - LogWrapper.AuditLog($"Game server '{gameServer.name}' mods updated:{gameServer.mods.Select(x => x.name).Changes(mods.Select(x => x.name))}"); - LogWrapper.AuditLog($"Game server '{gameServer.name}' serverMods updated:{gameServer.serverMods.Select(x => x.name).Changes(serverMods.Select(x => x.name))}"); + logger.LogAudit($"Game server '{gameServer.name}' mods updated:{gameServer.mods.Select(x => x.name).Changes(mods.Select(x => x.name))}"); + logger.LogAudit($"Game server '{gameServer.name}' serverMods updated:{gameServer.serverMods.Select(x => x.name).Changes(serverMods.Select(x => x.name))}"); await gameServersService.Data.Update(id, Builders.Update.Unset(x => x.mods).Unset(x => x.serverMods)); await gameServersService.Data.Update(id, Builders.Update.Set(x => x.mods, mods).Set(x => x.serverMods, serverMods)); return Ok(gameServersService.GetAvailableMods(id)); diff --git a/UKSF.Api/Controllers/Integrations/GithubController.cs b/UKSF.Api/Controllers/Integrations/GithubController.cs index c2ff0fe7..6394e137 100644 --- a/UKSF.Api/Controllers/Integrations/GithubController.cs +++ b/UKSF.Api/Controllers/Integrations/GithubController.cs @@ -9,7 +9,6 @@ using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Models.Modpack; -using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers.Integrations { [Route("[controller]")] diff --git a/UKSF.Api/Controllers/IssueController.cs b/UKSF.Api/Controllers/IssueController.cs index 8e16f10c..34f06090 100644 --- a/UKSF.Api/Controllers/IssueController.cs +++ b/UKSF.Api/Controllers/IssueController.cs @@ -8,23 +8,27 @@ using Microsoft.Extensions.Configuration; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using UKSF.Api.Base; +using UKSF.Api.Base.Services; using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Personnel.Services; namespace UKSF.Api.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] public class IssueController : Controller { private readonly IDisplayNameService displayNameService; private readonly IEmailService emailService; + private readonly IHttpContextService httpContextService; private readonly string githubToken; - private readonly ISessionService sessionService; - public IssueController(ISessionService sessionService, IDisplayNameService displayNameService, IEmailService emailService, IConfiguration configuration) { - this.sessionService = sessionService; + + public IssueController(IDisplayNameService displayNameService, IEmailService emailService, IConfiguration configuration, IHttpContextService httpContextService) { + this.displayNameService = displayNameService; this.emailService = emailService; + this.httpContextService = httpContextService; githubToken = configuration.GetSection("Github")["token"]; } @@ -32,7 +36,7 @@ public IssueController(ISessionService sessionService, IDisplayNameService displ public async Task CreateIssue([FromQuery] int type, [FromBody] JObject data) { string title = data["title"].ToString(); string body = data["body"].ToString(); - string user = displayNameService.GetDisplayName(sessionService.GetContextId()); + string user = displayNameService.GetDisplayName(httpContextService.GetUserId()); body += $"\n\n---\n_**Submitted by:** {user}_"; string issueUrl; diff --git a/UKSF.Api/Controllers/LauncherController.cs b/UKSF.Api/Controllers/LauncherController.cs index 79524888..c8e2b476 100644 --- a/UKSF.Api/Controllers/LauncherController.cs +++ b/UKSF.Api/Controllers/LauncherController.cs @@ -6,6 +6,11 @@ using Microsoft.AspNetCore.SignalR; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.Admin.Services.Data; +using UKSF.Api.Base; +using UKSF.Api.Base.Services; using UKSF.Api.Interfaces.Admin; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Hubs; @@ -14,8 +19,7 @@ using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Launcher; using UKSF.Api.Models.Message.Logging; -using UKSF.Api.Services.Message; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Personnel.Services; using UKSF.Api.Signalr.Hubs.Integrations; using UKSF.Common; @@ -24,9 +28,10 @@ namespace UKSF.Api.Controllers { public class LauncherController : Controller { private readonly IDisplayNameService displayNameService; private readonly ILauncherFileService launcherFileService; + private readonly IHttpContextService httpContextService; private readonly IHubContext launcherHub; private readonly ILauncherService launcherService; - private readonly ISessionService sessionService; + private readonly IVariablesDataService variablesDataService; private readonly IVariablesService variablesService; @@ -35,7 +40,7 @@ public LauncherController( IHubContext launcherHub, ILauncherService launcherService, ILauncherFileService launcherFileService, - ISessionService sessionService, + IHttpContextService httpContextService, IDisplayNameService displayNameService, IVariablesService variablesService ) { @@ -43,7 +48,8 @@ IVariablesService variablesService this.launcherHub = launcherHub; this.launcherService = launcherService; this.launcherFileService = launcherFileService; - this.sessionService = sessionService; + this.httpContextService = httpContextService; + this.displayNameService = displayNameService; this.variablesService = variablesService; } @@ -81,7 +87,7 @@ public async Task GetUpdatedFiles([FromBody] JObject body) { public IActionResult ReportError([FromBody] JObject body) { string version = body["version"].ToString(); string message = body["message"].ToString(); - LogWrapper.Log(new LauncherLogMessage(version, message) { userId = sessionService.GetContextId(), name = displayNameService.GetDisplayName(sessionService.GetContextAccount()) }); + // logger.Log(new LauncherLogMessage(version, message) { userId = httpContextService.GetUserId(), name = displayNameService.GetDisplayName(accountService.GetUserAccount()) }); return Ok(); } diff --git a/UKSF.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs index 1ffcc8e2..51c0f7bb 100644 --- a/UKSF.Api/Controllers/LoaController.cs +++ b/UKSF.Api/Controllers/LoaController.cs @@ -4,17 +4,16 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Base; +using UKSF.Api.Base.Services; using UKSF.Api.Interfaces.Command; using UKSF.Api.Interfaces.Message; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Command; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; -using UKSF.Api.Services.Message; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; namespace UKSF.Api.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] @@ -24,13 +23,14 @@ public class LoaController : Controller { private readonly ICommandRequestService commandRequestService; private readonly IDisplayNameService displayNameService; private readonly ILoaService loaService; + private readonly IHttpContextService httpContextService; private readonly INotificationsService notificationsService; - private readonly ISessionService sessionService; + private readonly IUnitsService unitsService; public LoaController( ILoaService loaService, - ISessionService sessionService, + IHttpContextService httpContextService, IDisplayNameService displayNameService, IAccountService accountService, IUnitsService unitsService, @@ -39,7 +39,8 @@ public LoaController( INotificationsService notificationsService ) { this.loaService = loaService; - this.sessionService = sessionService; + this.httpContextService = httpContextService; + this.displayNameService = displayNameService; this.accountService = accountService; this.unitsService = unitsService; @@ -56,13 +57,13 @@ public IActionResult Get([FromQuery] string scope = "you") { objectIds = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER).Select(x => x.id).ToList(); break; case "unit": - Account account = sessionService.GetContextAccount(); + Account account = accountService.GetUserAccount(); IEnumerable groups = unitsService.GetAllChildren(unitsService.Data.GetSingle(x => x.name == account.unitAssignment), true); List members = groups.SelectMany(x => x.members.ToList()).ToList(); objectIds = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER && members.Contains(x.id)).Select(x => x.id).ToList(); break; case "you": - objectIds = new List {sessionService.GetContextId()}; + objectIds = new List {httpContextService.GetUserId()}; break; default: return BadRequest(); } @@ -102,10 +103,10 @@ public async Task DeleteLoa(string id) { notificationsService.Add(new Notification {owner = reviewerId, icon = NotificationIcons.REQUEST, message = $"Your review for {request.displayRequester}'s LOA is no longer required as they deleted their LOA", link = "/command/requests"}); } - LogWrapper.AuditLog($"Loa request deleted for '{displayNameService.GetDisplayName(accountService.Data.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); + logger.LogAudit($"Loa request deleted for '{displayNameService.GetDisplayName(accountService.Data.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); } - LogWrapper.AuditLog($"Loa deleted for '{displayNameService.GetDisplayName(accountService.Data.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); + logger.LogAudit($"Loa deleted for '{displayNameService.GetDisplayName(accountService.Data.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); await loaService.Data.Delete(loa); return Ok(); diff --git a/UKSF.Api/Controllers/LoggingController.cs b/UKSF.Api/Controllers/LoggingController.cs index 654cf908..86a1e720 100644 --- a/UKSF.Api/Controllers/LoggingController.cs +++ b/UKSF.Api/Controllers/LoggingController.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using UKSF.Api.Models.Message.Logging; -using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers { [Route("[controller]"), Permissions(Permissions.ADMIN)] diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api/Controllers/Modpack/ModpackController.cs index 37392863..1f6e67d5 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api/Controllers/Modpack/ModpackController.cs @@ -5,7 +5,6 @@ using UKSF.Api.Interfaces.Integrations.Github; using UKSF.Api.Interfaces.Modpack; using UKSF.Api.Models.Modpack; -using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers.Modpack { [Route("[controller]")] diff --git a/UKSF.Api/Controllers/TeamspeakController.cs b/UKSF.Api/Controllers/TeamspeakController.cs index 2b529093..fb75316f 100644 --- a/UKSF.Api/Controllers/TeamspeakController.cs +++ b/UKSF.Api/Controllers/TeamspeakController.cs @@ -3,8 +3,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Services.Personnel; namespace UKSF.Api.Controllers { [Route("[controller]")] diff --git a/UKSF.Api/EventHandlers/LoggerEventHandler.cs b/UKSF.Api/EventHandlers/LoggerEventHandler.cs new file mode 100644 index 00000000..8c6203c4 --- /dev/null +++ b/UKSF.Api/EventHandlers/LoggerEventHandler.cs @@ -0,0 +1,50 @@ +using System; +using System.Threading.Tasks; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Services; +using UKSF.Api.Services.Data; + +namespace UKSF.Api.EventHandlers { + public interface ILoggerEventHandler : IEventHandler { } + + public class LoggerEventHandler : ILoggerEventHandler { + private readonly IObjectIdConversionService objectIdConversionService; + private readonly ILogDataService data; + private readonly ILogger logger; + + public LoggerEventHandler(ILogDataService data, ILogger logger, IObjectIdConversionService objectIdConversionService) { + this.data = data; + this.logger = logger; + this.objectIdConversionService = objectIdConversionService; + } + + public void Init() { + logger.AsObservable().Subscribe(HandleLog, logger.LogError); + } + + private void HandleLog(BasicLog log) { + Task _ = HandleLogAsync(log); + } + + private async Task HandleLogAsync(BasicLog log) { + if (log is AuditLog auditLog) { + auditLog.who = objectIdConversionService.ConvertObjectId(auditLog.who); + log = auditLog; + } + + log.message = objectIdConversionService.ConvertObjectIds(log.message); + await LogToStorageAsync(log); + } + + private Task LogToStorageAsync(BasicLog log) { + return log switch { + AuditLog auditLog => data.Add(auditLog), + LauncherLog launcherLog => data.Add(launcherLog), + HttpErrorLog httpErrorLog => data.Add(httpErrorLog), + _ => data.Add(log) + }; + } + } +} diff --git a/UKSF.Api/Global.cs b/UKSF.Api/Global.cs index 669ce09c..b8f2cbf9 100644 --- a/UKSF.Api/Global.cs +++ b/UKSF.Api/Global.cs @@ -5,7 +5,5 @@ public static class Global { public const string SUPER_ADMIN = "59e38f10594c603b78aa9dbd"; public const string TOKEN_AUDIENCE = "uksf-audience"; public const string TOKEN_ISSUER = "uksf-issuer"; - - public static IServiceProvider ServiceProvider; } } diff --git a/UKSF.Api/ModsController.cs b/UKSF.Api/ModsController.cs index 4a5d6258..9f3a9ebf 100644 --- a/UKSF.Api/ModsController.cs +++ b/UKSF.Api/ModsController.cs @@ -1,6 +1,5 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Services.Personnel; namespace UKSF.Api { [Route("[controller]"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER)] diff --git a/UKSF.Api/Services/Data/LogDataService.cs b/UKSF.Api/Services/Data/LogDataService.cs new file mode 100644 index 00000000..37d0ece4 --- /dev/null +++ b/UKSF.Api/Services/Data/LogDataService.cs @@ -0,0 +1,30 @@ +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Base.Services.Data; + +namespace UKSF.Api.Services.Data { + public interface ILogDataService : IDataService { } + + public interface IAuditLogDataService : IDataService { } + + public interface IHttpErrorLogDataService : IDataService { } + + public interface ILauncherLogDataService : IDataService { } + + public class LogDataService : DataService, ILogDataService { + public LogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "logs") { } + } + + public class AuditLogDataService : DataService, IAuditLogDataService { + public AuditLogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "auditLogs") { } + } + + public class HttpErrorLogDataService : DataService, IHttpErrorLogDataService { + public HttpErrorLogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "errorLogs") { } + } + + public class LauncherLogDataService : DataService, ILauncherLogDataService { + public LauncherLogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "launcherLogs") { } + } +} diff --git a/UKSF.Api/Services/MigrationUtility.cs b/UKSF.Api/Services/MigrationUtility.cs new file mode 100644 index 00000000..740f7c02 --- /dev/null +++ b/UKSF.Api/Services/MigrationUtility.cs @@ -0,0 +1,43 @@ +using System; +using Microsoft.Extensions.Hosting; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.Base.Events; + +namespace UKSF.Api.Services { + public class MigrationUtility { + private const string KEY = "MIGRATED"; + private readonly IHostEnvironment currentEnvironment; + private readonly ILogger logger; + private readonly IVariablesService variablesService; + + public MigrationUtility(IHostEnvironment currentEnvironment, IVariablesService variablesService, ILogger logger) { + this.currentEnvironment = currentEnvironment; + this.variablesService = variablesService; + this.logger = logger; + } + + public void Migrate() { + bool migrated = true; + if (!currentEnvironment.IsDevelopment()) { + string migratedString = variablesService.GetVariable(KEY).AsString(); + migrated = bool.Parse(migratedString); + } + + // ReSharper disable once ConditionIsAlwaysTrueOrFalse + if (!migrated) { + try { + ExecuteMigration(); + logger.LogAudit("Migration utility successfully ran"); + } catch (Exception e) { + logger.LogError(e); + } finally { + variablesService.Data.Update(KEY, "true"); + } + } + } + + // TODO: CHECK BEFORE RELEASE + private static void ExecuteMigration() { } + } +} diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 31e45372..f08746ae 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -16,19 +16,18 @@ using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerUI; +using UKSF.Api.Admin; using UKSF.Api.AppStart; using UKSF.Api.AppStart.Services; using UKSF.Api.Interfaces.Integrations.Teamspeak; using UKSF.Api.Interfaces.Modpack.BuildProcess; +using UKSF.Api.Personnel.SignalrHubs; +using UKSF.Api.Personnel.SignalrHubs.Hubs; using UKSF.Api.Services; -using UKSF.Api.Services.Common; -using UKSF.Api.Services.Personnel; using UKSF.Api.Signalr.Hubs.Command; using UKSF.Api.Signalr.Hubs.Game; using UKSF.Api.Signalr.Hubs.Integrations; -using UKSF.Api.Signalr.Hubs.Message; using UKSF.Api.Signalr.Hubs.Modpack; -using UKSF.Api.Signalr.Hubs.Personnel; using UKSF.Api.Signalr.Hubs.Utility; namespace UKSF.Api { @@ -67,8 +66,8 @@ public void ConfigureServices(IServiceCollection services) { } // ReSharper disable once UnusedMember.Global - public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostApplicationLifetime) { - hostApplicationLifetime.ApplicationStopping.Register(OnShutdown); + public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostApplicationLifetime, IServiceProvider serviceProvider) { + hostApplicationLifetime.ApplicationStopping.Register(() => OnShutdown(serviceProvider)); app.UseStaticFiles(); app.UseCookiePolicy(new CookiePolicyOptions { MinimumSameSitePolicy = SameSiteMode.Lax }); app.UseSwagger(); @@ -84,7 +83,6 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl endpoints => { endpoints.MapControllers().RequireCors("CorsPolicy"); endpoints.MapHub($"/hub/{AccountHub.END_POINT}"); - endpoints.MapHub($"/hub/{AdminHub.END_POINT}"); endpoints.MapHub($"/hub/{CommandRequestsHub.END_POINT}"); endpoints.MapHub($"/hub/{CommentThreadHub.END_POINT}"); endpoints.MapHub($"/hub/{LauncherHub.END_POINT}"); @@ -93,22 +91,20 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl endpoints.MapHub($"/hub/{ServersHub.END_POINT}"); endpoints.MapHub($"/hub/{TeamspeakHub.END_POINT}").RequireHost("localhost"); endpoints.MapHub($"/hub/{TeamspeakClientsHub.END_POINT}"); - endpoints.MapHub($"/hub/{UtilityHub.END_POINT}"); + endpoints.AddUksfAdminSignalr(); } ); - Global.ServiceProvider = app.ApplicationServices; - ServiceWrapper.Provider = Global.ServiceProvider; - - StartServices.Start(); + serviceProvider.StartUksfServices(); } - private static void OnShutdown() { + // TODO: Check this works + private static void OnShutdown(IServiceProvider serviceProvider) { // Cancel any running builds - Global.ServiceProvider.GetService().CancelAll(); + serviceProvider.GetService()?.CancelAll(); // Stop teamspeak - Global.ServiceProvider.GetService().Stop(); + serviceProvider.GetService()?.Stop(); } } diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index 4508d32d..3d789bec 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -29,7 +29,7 @@ - + @@ -46,14 +46,13 @@ + + Always - - - diff --git a/UKSF.Common/DataUtilies.cs b/UKSF.Common/DataUtilies.cs deleted file mode 100644 index 437f2f15..00000000 --- a/UKSF.Common/DataUtilies.cs +++ /dev/null @@ -1,7 +0,0 @@ -using Newtonsoft.Json.Linq; - -namespace UKSF.Common { - public static class DataUtilies { - public static string GetValueFromBody(this JObject body, string key) => body[key] != null ? body[key].ToString() : string.Empty; - } -} diff --git a/UKSF.Common/UKSF.Common.csproj b/UKSF.Common/UKSF.Common.csproj index 88fc37b7..f242e11e 100644 --- a/UKSF.Common/UKSF.Common.csproj +++ b/UKSF.Common/UKSF.Common.csproj @@ -6,7 +6,7 @@ - + diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index bd649b99..85327b6b 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -7,7 +7,7 @@ using MongoDB.Bson; using MongoDB.Driver; using UKSF.Api.Data; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Personnel.Models; using UKSF.Api.Services.Utility; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs index c1450bae..8c89691b 100644 --- a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs @@ -3,7 +3,7 @@ using FluentAssertions; using MongoDB.Bson; using UKSF.Api.Models; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Personnel.Models; using UKSF.Common; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs index 6fd0ada1..a09334f5 100644 --- a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs @@ -4,11 +4,11 @@ using MongoDB.Bson; using MongoDB.Driver; using Moq; -using UKSF.Api.Data.Message; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Events; -using UKSF.Api.Models.Message; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services.Data; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs index 2a339f47..5c507402 100644 --- a/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs @@ -2,7 +2,6 @@ using System.Threading.Tasks; using FluentAssertions; using Moq; -using UKSF.Api.Data.Message; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Message.Logging; diff --git a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs index 9f70ce07..2a0e22ef 100644 --- a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Data.Personnel; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Data.Personnel { diff --git a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs index b4857eae..db10099a 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Data.Personnel; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Data.Personnel { diff --git a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs index 154dd2d3..30a10bfb 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Data.Personnel; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Data.Personnel { diff --git a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs index 0ca265ef..a9e4551c 100644 --- a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs @@ -1,16 +1,14 @@ using Moq; using UKSF.Api.Data.Command; using UKSF.Api.Data.Launcher; -using UKSF.Api.Data.Message; -using UKSF.Api.Data.Personnel; -using UKSF.Api.Data.Utility; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; using UKSF.Api.Models.Command; using UKSF.Api.Models.Launcher; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; using UKSF.Api.Models.Utility; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Data { diff --git a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index 377e359e..ae998a02 100644 --- a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Data.Units; using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Units; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services.Data; using Xunit; -using UksfUnit = UKSF.Api.Models.Units.Unit; +using UksfUnit = UKSF.Api.Personnel.Models.Unit; namespace UKSF.Tests.Unit.Data.Units { public class UnitsDataServiceTests { diff --git a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs index 899fff45..20ff02b8 100644 --- a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs @@ -7,8 +7,11 @@ using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; using UKSF.Api.Models.Events; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Signalr.Hubs.Personnel; +using UKSF.Api.Personnel.EventHandlers; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.SignalrHubs; +using UKSF.Api.Personnel.SignalrHubs.Clients; +using UKSF.Api.Personnel.SignalrHubs.Hubs; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { @@ -17,7 +20,7 @@ public class AccountEventHandlerTests { private readonly AccountEventHandler accountEventHandler; private readonly Mock> mockAccountHub; private readonly Mock mockLoggingService; - private readonly DataEventBus unitsDataEventBus; + private readonly DataEventBus unitsDataEventBus; public AccountEventHandlerTests() { Mock mockDataCollectionFactory = new Mock(); @@ -25,10 +28,10 @@ public AccountEventHandlerTests() { mockAccountHub = new Mock>(); accountDataEventBus = new DataEventBus(); - unitsDataEventBus = new DataEventBus(); + unitsDataEventBus = new DataEventBus(); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); accountEventHandler = new AccountEventHandler(accountDataEventBus, unitsDataEventBus, mockAccountHub.Object, mockLoggingService.Object); } @@ -46,7 +49,7 @@ public void ShouldLogOnException() { accountEventHandler.Init(); accountDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); - unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Exactly(2)); } @@ -63,7 +66,7 @@ public void ShouldNotRunEvent() { accountEventHandler.Init(); accountDataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); - unitsDataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); + unitsDataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Never); } @@ -80,7 +83,7 @@ public void ShouldRunEventOnUpdate() { accountEventHandler.Init(); accountDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); - unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Exactly(2)); } diff --git a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs index 50624f52..6b4cbf89 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs @@ -7,8 +7,10 @@ using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; using UKSF.Api.Models.Events; -using UKSF.Api.Models.Message; -using UKSF.Api.Signalr.Hubs.Message; +using UKSF.Api.Personnel.EventHandlers; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.SignalrHubs.Clients; +using UKSF.Api.Personnel.SignalrHubs.Hubs; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { diff --git a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs index 218d7efa..b79e259f 100644 --- a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs @@ -8,8 +8,10 @@ using UKSF.Api.Interfaces.Hubs; using UKSF.Api.Interfaces.Message; using UKSF.Api.Models.Events; -using UKSF.Api.Models.Message; -using UKSF.Api.Signalr.Hubs.Message; +using UKSF.Api.Personnel.EventHandlers; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.SignalrHubs.Clients; +using UKSF.Api.Personnel.SignalrHubs.Hubs; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs index 31bf5dfa..9da59417 100644 --- a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -14,7 +14,7 @@ using UKSF.Api.Models.Events; using UKSF.Api.Models.Events.Types; using UKSF.Api.Models.Integrations; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Personnel.Models; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { diff --git a/UKSF.Tests/Unit/Models/AccountSettingsTests.cs b/UKSF.Tests/Unit/Models/AccountSettingsTests.cs index 3988d0dd..ba55891f 100644 --- a/UKSF.Tests/Unit/Models/AccountSettingsTests.cs +++ b/UKSF.Tests/Unit/Models/AccountSettingsTests.cs @@ -1,6 +1,6 @@ using System; using FluentAssertions; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Personnel.Models; using Xunit; namespace UKSF.Tests.Unit.Models { diff --git a/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs index cfbcafdd..08a5d670 100644 --- a/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs @@ -3,7 +3,6 @@ using System.Linq; using FluentAssertions; using UKSF.Api.Models.Admin; -using UKSF.Api.Services.Admin; using UKSF.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs index 029b7c29..67a64f07 100644 --- a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using FluentAssertions; using MongoDB.Bson; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Common; +using UKSF.Api.Personnel.Models; using Xunit; namespace UKSF.Tests.Unit.Services.Common { diff --git a/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs b/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs index f1463efa..12312e1b 100644 --- a/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs @@ -7,7 +7,6 @@ using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Units; -using UKSF.Api.Services.Common; using Xunit; namespace UKSF.Tests.Unit.Services.Common { @@ -31,7 +30,7 @@ public DisplayNameUtilitiesTests() { [Theory, InlineData("5e39336e1b92ee2d14b7fe08", "Maj.Bridgford.A"), InlineData("5e39336e1b92ee2d14b7fe08, 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A, Cpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe085e3935db1b92ee2d14b7fe09", "Maj.Bridgford.ACpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe08 has requested all the things for 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A has requested all the things for Cpl.Carr.C")] public void ShouldConvertNameObjectIds(string input, string expected) { - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); mockDisplayNameService.Setup(x => x.GetDisplayName("5e39336e1b92ee2d14b7fe08")).Returns("Maj.Bridgford.A"); mockDisplayNameService.Setup(x => x.GetDisplayName("5e3935db1b92ee2d14b7fe09")).Returns("Cpl.Carr.C"); @@ -42,11 +41,11 @@ public void ShouldConvertNameObjectIds(string input, string expected) { [Fact] public void ShouldConvertCorrectUnitWithPredicate() { - Api.Models.Units.Unit unit1 = new Api.Models.Units.Unit {name = "7 Squadron"}; - Api.Models.Units.Unit unit2 = new Api.Models.Units.Unit {name = "656 Squadron"}; - List collection = new List {unit1, unit2}; + Api.Personnel.Models.Unit unit1 = new Api.Personnel.Models.Unit {name = "7 Squadron"}; + Api.Personnel.Models.Unit unit2 = new Api.Personnel.Models.Unit {name = "656 Squadron"}; + List collection = new List {unit1, unit2}; - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => collection.FirstOrDefault(x)); + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => collection.FirstOrDefault(x)); mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); string subject = unit1.id.ConvertObjectIds(); @@ -58,9 +57,9 @@ public void ShouldConvertCorrectUnitWithPredicate() { public void ShouldConvertUnitObjectIds() { const string INPUT = "5e39336e1b92ee2d14b7fe08"; const string EXPECTED = "7 Squadron"; - Api.Models.Units.Unit unit = new Api.Models.Units.Unit {name = EXPECTED, id = INPUT}; + Api.Personnel.Models.Unit unit = new Api.Personnel.Models.Unit {name = EXPECTED, id = INPUT}; - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(unit); + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(unit); mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); string subject = INPUT.ConvertObjectIds(); @@ -73,7 +72,7 @@ public void ShouldDoNothingToTextWhenNameOrUnitNotFound() { const string INPUT = "5e39336e1b92ee2d14b7fe08"; const string EXPECTED = "5e39336e1b92ee2d14b7fe08"; - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); + mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); string subject = INPUT.ConvertObjectIds(); diff --git a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs index 15c99853..fbecad34 100644 --- a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs @@ -12,12 +12,11 @@ using UKSF.Api.Interfaces.Units; using UKSF.Api.Models.Admin; using UKSF.Api.Models.Integrations; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; using UKSF.Api.Services.Integrations.Teamspeak; -using UKSF.Api.Services.Units; using Xunit; -using UksfUnit = UKSF.Api.Models.Units.Unit; +using UksfUnit = UKSF.Api.Personnel.Models.Unit; namespace UKSF.Tests.Unit.Services.Integrations.Teamspeak { public class TeamspeakGroupServiceTests { diff --git a/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs index 7a7d3f6a..1b290044 100644 --- a/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs @@ -2,8 +2,7 @@ using Moq; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Personnel.Models; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs index b96adbe8..12d7f56a 100644 --- a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs @@ -5,8 +5,8 @@ using Moq; using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs index 8df1dc52..c5d68a9f 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs @@ -3,8 +3,8 @@ using FluentAssertions; using Moq; using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs index 62f79ecb..9016768a 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs @@ -1,5 +1,4 @@ using FluentAssertions; -using UKSF.Api.Services.Personnel; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs index 0a7bb283..ef193b2c 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs @@ -4,8 +4,8 @@ using FluentAssertions; using Moq; using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs index 613bf0b2..9bda4d9a 100644 --- a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs @@ -9,6 +9,7 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Utility; using UKSF.Api.Models.Utility; +using UKSF.Api.Personnel.Models; using UKSF.Api.Services.Utility; using Xunit; diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs index 922817da..700d714d 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs @@ -7,9 +7,9 @@ using UKSF.Api.Interfaces.Data; using UKSF.Api.Interfaces.Utility.ScheduledActions; using UKSF.Api.Models.Game; -using UKSF.Api.Models.Message; using UKSF.Api.Models.Message.Logging; using UKSF.Api.Models.Modpack; +using UKSF.Api.Personnel.Models; using UKSF.Api.Services.Utility.ScheduledActions; using Xunit; diff --git a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs index 560e7cf8..67505e83 100644 --- a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs @@ -6,8 +6,7 @@ using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Personnel; +using UKSF.Api.Personnel.Models; using UKSF.Api.Services.Utility; using Xunit; @@ -16,7 +15,6 @@ public class SessionServiceTests { private readonly Mock mockHttpContextAccessor; private readonly Mock mockAccountDataService; private readonly Mock mockAccountService; - private ISessionService sessionService; private DefaultHttpContext httpContext; public SessionServiceTests() { @@ -37,7 +35,7 @@ public void ShouldGetContextId() { sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); - string subject = sessionService.GetContextId(); + string subject = httpContextService.GetUserId(); subject.Should().Be(account.id); } @@ -51,7 +49,7 @@ public void ShouldGetContextEmail() { sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); - string subject = sessionService.GetContextEmail(); + string subject = httpContextService.GetUserEmail(); subject.Should().Be(account.email); } @@ -69,7 +67,7 @@ public void ShouldGetCorrectAccount() { sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); - Account subject = sessionService.GetContextAccount(); + Account subject = accountService.GetUserAccount(); subject.Should().Be(account2); } From d8a49182e7064a8ca685172bd8f584498175a593 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 8 Nov 2020 02:32:49 +0000 Subject: [PATCH 282/369] More progress --- UKSF.Api.Admin/ApiAdminExtensions.cs | 17 +-- .../Controllers/VersionController.cs | 4 +- .../EventHandlers/LogEventHandler.cs | 4 +- .../Clients/IAdminClient.cs | 3 +- .../Clients/IUtilityClient.cs | 2 +- .../{SignalrHubs => Signalr}/Hubs/AdminHub.cs | 4 +- .../Hubs/UtilityHub.cs | 4 +- .../ApiArmaMissionsExtensions.cs | 16 ++ .../Models}/Mission.cs | 2 +- .../Models}/MissionEntity.cs | 2 +- .../Models}/MissionEntityItem.cs | 2 +- .../Models}/MissionPatchData.cs | 4 +- .../Models}/MissionPatchingReport.cs | 2 +- .../Models}/MissionPatchingResult.cs | 2 +- .../Models}/MissionPlayer.cs | 4 +- .../Models}/MissionUnit.cs | 4 +- .../Services}/MissionDataResolver.cs | 4 +- .../Services}/MissionEntityHelper.cs | 4 +- .../Services}/MissionEntityItemHelper.cs | 4 +- .../Services}/MissionPatchDataService.cs | 14 +- .../Services}/MissionPatchingService.cs | 11 +- .../Services}/MissionService.cs | 7 +- .../Services}/MissionUtilities.cs | 2 +- .../UKSF.Api.ArmaMissions.csproj | 17 +++ .../ApiArmaServerExtensions.cs | 19 +++ .../Controllers/GameServersController.cs | 17 +-- .../DataContext}/GameServersDataService.cs | 12 +- .../Models}/GameEnvironment.cs | 2 +- .../Models}/GameServer.cs | 3 +- .../Models}/GameServerMod.cs | 2 +- .../Models}/MissionFile.cs | 2 +- .../Services}/GameServerHelpers.cs | 26 +++- .../Services}/GameServersService.cs | 29 +++- UKSF.Api.ArmaServer/Services/ServerService.cs | 78 ++++++++++ .../Signalr/Clients}/IServersClient.cs | 2 +- .../Signalr/Hubs}/ServersHub.cs | 4 +- .../UKSF.Api.ArmaServer.csproj | 14 ++ UKSF.Api.Auth/ApiAuthExtensions.cs | 13 +- UKSF.Api.Auth/Controllers/LoginController.cs | 2 +- UKSF.Api.Base/ApiBaseExtensions.cs | 31 +++- UKSF.Api.Base/Services/Data/LogDataService.cs | 29 ++++ UKSF.Api.Base/Services/HttpContextService.cs | 3 + UKSF.Api.Command/ApiCommandExtensions.cs | 32 ++++ .../ApiUKSF.Api.CommandExtExtensions.cs | 10 -- .../CommandRequestArchiveDataService.cs | 13 +- .../Context}/CommandRequestDataService.cs | 12 +- .../Context}/OperationOrderDataService.cs | 12 +- .../Context}/OperationReportDataService.cs | 12 +- .../Controllers}/CommandRequestsController.cs | 26 ++-- .../CommandRequestsCreationController.cs | 9 +- .../Controllers}/OperationOrderController.cs | 7 +- .../Controllers}/OperationReportController.cs | 7 +- .../CommandRequestEventHandler.cs | 26 ++-- .../Models}/ChainOfCommandMode.cs | 2 +- .../Models}/CommandRequest.cs | 3 +- .../Models}/CommandRequestLoa.cs | 2 +- .../Models}/CreateOperationOrderRequest.cs | 2 +- .../Models}/CreateOperationReport.cs | 2 +- .../Models}/Opord.cs | 3 +- .../Models}/Oprep.cs | 5 +- .../Services}/ChainOfCommandService.cs | 25 +-- .../CommandRequestCompletionService.cs | 31 ++-- .../Services}/CommandRequestService.cs | 38 +++-- .../Services}/OperationOrderService.cs | 12 +- .../Services}/OperationReportService.cs | 14 +- .../Clients}/ICommandRequestsClient.cs | 2 +- .../Signalr/Hubs}/CommandRequestsHub.cs | 4 +- UKSF.Api.Command/UKSF.Api.Command.csproj | 24 +-- .../Fake/FakeNotificationsDataService.cs | 7 - UKSF.Api.Data/UKSF.Api.Data.csproj | 22 --- UKSF.Api.Events/UKSF.Api.Events.csproj | 20 --- .../ApiIntegrationInstagramExtensions.cs | 23 +++ .../Controllers/InstagramController.cs | 6 +- .../Models}/InstagramImage.cs | 2 +- .../ScheduledActions/InstagramImagesAction.cs | 4 +- .../ScheduledActions/InstagramTokenAction.cs | 4 +- .../Services}/InstagramService.cs | 11 +- .../UKSF.Api.Integration.Instagram.csproj | 17 +++ .../ApiIntegrationDiscordExtensions.cs | 16 ++ .../Controllers/DiscordController.cs | 5 +- .../Services}/DiscordService.cs | 13 +- .../UKSF.Api.Integrations.Discord.csproj | 22 +++ .../ApiIntegrationTeamspeakExtensions.cs | 23 +++ .../Controllers}/OperationsController.cs | 5 +- .../Controllers/TeamspeakController.cs | 4 +- .../EventHandlers}/TeamspeakEventHandler.cs | 29 ++-- .../Models}/Operation.cs | 5 +- .../Models}/TeamspeakClient.cs | 2 +- .../Models}/TeamspeakGroupProcedure.cs | 2 +- .../Models}/TeamspeakProcedureType.cs | 2 +- .../Models}/TeamspeakServerGroupUpdate.cs | 2 +- .../Models}/TeamspeakServerSnapshot.cs | 2 +- .../TeamspeakSnapshotAction.cs | 5 +- .../Services}/TeamspeakGroupService.cs | 22 +-- .../Services}/TeamspeakManagerService.cs | 22 ++- .../Services}/TeamspeakMetricsService.cs | 7 +- .../Services}/TeamspeakService.cs | 23 ++- .../Signalr/Clients}/ITeamspeakClient.cs | 4 +- .../Clients}/ITeamspeakClientsClient.cs | 2 +- .../Signalr/Hubs}/TeamspeakClientsHub.cs | 4 +- .../Signalr/Hubs}/TeamspeakHub.cs | 9 +- .../UKSF.Api.Integrations.Teamspeak.csproj | 14 ++ .../Command/IChainOfCommandService.cs | 10 -- .../ICommandRequestCompletionService.cs | 7 - .../Command/ICommandRequestService.cs | 16 -- .../Data/Cached/IBuildsDataService.cs | 10 -- .../Data/Cached/ICommandRequestDataService.cs | 5 - .../Data/Cached/IGameServersDataService.cs | 5 - .../Data/Cached/ILauncherFileDataService.cs | 5 - .../Data/Cached/IOperationOrderDataService.cs | 5 - .../Cached/IOperationReportDataService.cs | 5 - .../Data/Cached/IReleasesDataService.cs | 5 - .../Data/ICommandRequestArchiveDataService.cs | 5 - .../Events/Handlers/IBuildsEventHandler.cs | 3 - .../Handlers/ICommandRequestEventHandler.cs | 3 - .../Events/Handlers/ITeamspeakEventHandler.cs | 3 - .../Events/ISignalrEventBus.cs | 5 - .../Game/IGameServerHelpers.cs | 23 --- .../Game/IGameServersService.cs | 24 --- .../Game/IMissionPatchingService.cs | 8 - .../Integrations/Github/IGithubService.cs | 19 --- .../Integrations/IDiscordService.cs | 16 -- .../Integrations/IInstagramService.cs | 11 -- .../Integrations/IPipeManager.cs | 7 - UKSF.Api.Interfaces/Integrations/ISocket.cs | 10 -- .../Teamspeak/ITeamspeakGroupService.cs | 9 -- .../Teamspeak/ITeamspeakManagerService.cs | 11 -- .../Teamspeak/ITeamspeakMetricsService.cs | 7 - .../Teamspeak/ITeamspeakService.cs | 18 --- .../Launcher/ILauncherFileService.cs | 14 -- .../Launcher/ILauncherService.cs | 3 - .../BuildProcess/IBuildProcessorService.cs | 9 -- .../BuildProcess/IBuildQueueService.cs | 10 -- .../Modpack/BuildProcess/IBuildStepService.cs | 13 -- .../Modpack/BuildProcess/IStepLogger.cs | 15 -- .../Modpack/BuildProcess/Steps/IBuildStep.cs | 29 ---- UKSF.Api.Interfaces/Modpack/IBuildsService.cs | 26 ---- .../Modpack/IModpackService.cs | 23 --- .../Modpack/IReleaseService.cs | 15 -- .../Operations/IOperationOrderService.cs | 9 -- .../Operations/IOperationReportService.cs | 9 -- .../UKSF.Api.Interfaces.csproj | 21 --- UKSF.Api.Interfaces/Utility/IServerService.cs | 5 - UKSF.Api.Launcher/ApiLauncherExtensions.cs | 20 +++ .../Context}/LauncherFileDataService.cs | 12 +- .../Controllers/LauncherController.cs | 18 +-- .../Models}/LauncherFile.cs | 4 +- .../Services}/LauncherFileService.cs | 19 ++- .../Services}/LauncherService.cs | 9 +- .../Signalr/Clients}/ILauncherClient.cs | 2 +- .../Signalr/Hubs}/LauncherHub.cs | 4 +- UKSF.Api.Launcher/UKSF.Api.Launcher.csproj | 17 +++ UKSF.Api.Models/UKSF.Api.Models.csproj | 18 --- .../UKSF.Api.Models.csproj.DotSettings | 9 +- UKSF.Api.Models/Utility/UtilityObject.cs | 7 - UKSF.Api.Modpack/ApiModpackExtensions.cs | 30 ++++ .../Controllers}/GithubController.cs | 8 +- .../Controllers/IssueController.cs | 5 +- .../Controllers}/ModpackController.cs | 8 +- .../EventHandlers}/BuildsEventHandler.cs | 29 ++-- .../Models}/GithubCommit.cs | 2 +- .../Models}/ModpackBuild.cs | 6 +- .../Models}/ModpackBuildQueueItem.cs | 2 +- .../Models}/ModpackBuildResult.cs | 2 +- .../Models}/ModpackBuildStep.cs | 2 +- .../Models}/ModpackBuildStepLogItem.cs | 2 +- .../Models}/ModpackRelease.cs | 3 +- .../Models}/NewBuild.cs | 2 +- .../BuildProcess/BuildProcessHelper.cs | 5 +- .../BuildProcess/BuildProcessorService.cs | 26 ++-- .../BuildProcess/BuildQueueService.cs | 20 ++- .../BuildProcess/BuildStepService.cs | 25 +-- .../Services}/BuildProcess/StepLogger.cs | 17 ++- .../Services}/BuildProcess/Steps/BuildStep.cs | 36 +++-- .../BuildProcess/Steps/BuildStepAttribute.cs | 2 +- .../Steps/BuildSteps/BuildStepExtensions.cs | 4 +- .../Steps/BuildSteps/BuildStepIntercept.cs | 2 +- .../Steps/BuildSteps/BuildStepKeys.cs | 2 +- .../Steps/BuildSteps/BuildStepPrep.cs | 4 +- .../BuildSteps/BuildStepSignDependencies.cs | 6 +- .../Steps/BuildSteps/BuildStepSources.cs | 2 +- .../BuildSteps/Mods/BuildStepBuildAce.cs | 2 +- .../BuildSteps/Mods/BuildStepBuildAcre.cs | 2 +- .../BuildSteps/Mods/BuildStepBuildF35.cs | 2 +- .../BuildSteps/Mods/BuildStepBuildModpack.cs | 2 +- .../Steps/Common/BuildStepBuildRepo.cs | 4 +- .../Steps/Common/BuildStepCbaSettings.cs | 4 +- .../Steps/Common/BuildStepClean.cs | 4 +- .../Steps/Common/BuildStepDeploy.cs | 4 +- .../Steps/Common/BuildStepNotify.cs | 13 +- .../BuildProcess/Steps/FileBuildStep.cs | 2 +- .../BuildProcess/Steps/GitBuildStep.cs | 2 +- .../BuildProcess/Steps/ModBuildStep.cs | 4 +- .../Steps/ReleaseSteps/BuildStepBackup.cs | 2 +- .../Steps/ReleaseSteps/BuildStepMerge.cs | 2 +- .../Steps/ReleaseSteps/BuildStepPublish.cs | 5 +- .../ReleaseSteps/BuildStepReleaseKeys.cs | 4 +- .../Steps/ReleaseSteps/BuildStepRestore.cs | 2 +- .../Services}/BuildsService.cs | 41 +++-- .../Services/Data}/BuildsDataService.cs | 17 ++- .../Services/Data}/ReleasesDataService.cs | 12 +- .../Services}/GithubService.cs | 18 ++- .../Services}/ModpackService.cs | 31 ++-- .../Services}/ReleaseService.cs | 17 ++- .../Signalr/Clients}/IModpackClient.cs | 4 +- .../Signalr/Hubs}/BuildsHub.cs | 4 +- UKSF.Api.Modpack/UKSF.Api.Modpack.csproj | 20 +++ UKSF.Api.Personnel/ApiPersonnelExtensions.cs | 75 +++++---- .../Controllers/ApplicationsController.cs | 2 +- .../Controllers/CommentThreadController.cs | 5 +- .../DiscordConnectionController.cs | 5 +- .../Controllers/NotificationsController.cs | 3 +- .../Controllers/SteamConnectionController.cs | 3 +- .../EventHandlers/AccountEventHandler.cs | 4 +- .../CommentThreadEventHandler.cs | 4 +- .../NotificationsEventHandler.cs | 4 +- .../Services/AssignmentService.cs | 4 +- .../Services/NotificationsService.cs | 4 +- .../Clients/IAccountClient.cs | 2 +- .../Clients/ICommentThreadClient.cs | 2 +- .../Clients/INotificationsClient.cs | 2 +- .../Hubs/AccountHub.cs | 4 +- .../Hubs/CommentThreadHub.cs | 4 +- .../Hubs/NotificationsHub.cs | 4 +- .../Fake/FakeCachedDataService.cs | 7 - UKSF.Api.Services/Fake/FakeDataService.cs | 37 ----- UKSF.Api.Services/Fake/FakeDiscordService.cs | 28 ---- .../Fake/FakeNotificationsService.cs | 24 --- UKSF.Api.Services/Fake/FakePipeManager.cs | 9 -- .../Fake/FakeTeamspeakManagerService.cs | 15 -- UKSF.Api.Services/Game/ServerService.cs | 78 ---------- UKSF.Api.Services/Integrations/PipeManager.cs | 142 ------------------ .../Integrations/PipeQueueManager.cs | 20 --- UKSF.Api.Services/UKSF.Api.Services.csproj | 44 ------ UKSF.Api.Signalr/UKSF.Api.Signalr.csproj | 12 -- UKSF.Api.Utility/ApiUtilityExtensions.cs | 22 +-- .../ScheduledActions/PruneDataAction.cs | 9 +- UKSF.Api.Utility/Services/SchedulerService.cs | 6 +- UKSF.Api.sln | 140 +++++++++-------- .../Services/RegisterDataBackedServices.cs | 39 ----- .../AppStart/Services/RegisterDataServices.cs | 40 ----- .../Services/RegisterEventServices.cs | 36 ----- .../AppStart/Services/ServiceExtensions.cs | 80 ---------- UKSF.Api/AppStart/UksfServiceExtensions.cs | 29 ++++ UKSF.Api/Controllers/DocsController.cs | 56 ------- UKSF.Api/Controllers/LoaController.cs | 15 +- UKSF.Api/Controllers/LoggingController.cs | 68 ++++++--- UKSF.Api/{ => Controllers}/ModsController.cs | 3 +- UKSF.Api/Controllers/News/NewsController.cs | 41 ----- UKSF.Api/Docs/test.md | 2 - UKSF.Api/EventHandlers/LoggerEventHandler.cs | 2 +- .../ExceptionHandler.cs | 15 +- UKSF.Api/Fake/FakeCachedDataService.cs | 5 + UKSF.Api/Fake/FakeDataService.cs | 35 +++++ UKSF.Api/Fake/FakeDiscordService.cs | 23 +++ UKSF.Api/Fake/FakeNotificationsDataService.cs | 3 + UKSF.Api/Fake/FakeNotificationsService.cs | 20 +++ UKSF.Api/Fake/FakeTeamspeakManagerService.cs | 13 ++ UKSF.Api/Services/Data/LogDataService.cs | 30 ---- UKSF.Api/Startup.cs | 23 +-- UKSF.Api/UKSF.Api.csproj | 13 +- UKSF.Common/UKSF.Common.csproj | 24 --- UKSF.Tests/Common/ITestCachedDataService.cs | 2 +- UKSF.Tests/Common/ITestDataService.cs | 2 +- UKSF.Tests/Common/TestCachedDataService.cs | 6 +- UKSF.Tests/Common/TestDataModel.cs | 2 +- UKSF.Tests/Common/TestDataService.cs | 6 +- .../Integration/Data/DataCollectionTests.cs | 3 +- UKSF.Tests/UKSF.Tests.csproj | 4 + .../Unit/Common/ChangeUtilitiesTests.cs | 3 +- UKSF.Tests/Unit/Common/ClockTests.cs | 2 +- .../Unit/Common/CollectionUtilitiesTests.cs | 2 +- UKSF.Tests/Unit/Common/DataUtilitiesTests.cs | 7 +- UKSF.Tests/Unit/Common/DateUtilitiesTests.cs | 2 +- .../Unit/Common/EventModelFactoryTests.cs | 4 +- UKSF.Tests/Unit/Common/GuardUtilitesTests.cs | 2 +- UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs | 2 +- .../Unit/Common/StringUtilitiesTests.cs | 2 +- UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs | 2 +- .../Data/Admin/VariablesDataServiceTests.cs | 8 +- .../Unit/Data/CachedDataServiceTests.cs | 6 +- .../Unit/Data/CahcedDataServiceEventTests.cs | 6 +- .../Unit/Data/DataCollectionFactoryTests.cs | 3 +- UKSF.Tests/Unit/Data/DataServiceEventTests.cs | 6 +- UKSF.Tests/Unit/Data/DataServiceTests.cs | 6 +- .../Data/Game/GameServersDataServiceTests.cs | 8 +- .../Message/CommentThreadDataServiceTests.cs | 6 +- .../Unit/Data/Message/LogDataServiceTests.cs | 65 ++++---- .../Data/Modpack/BuildsDataServiceTests.cs | 10 +- .../Data/Modpack/ReleasesDataServiceTests.cs | 8 +- .../OperationOrderDataServiceTests.cs | 8 +- .../OperationReportDataServiceTests.cs | 8 +- .../Personnel/DischargeDataServiceTests.cs | 4 +- .../Data/Personnel/RanksDataServiceTests.cs | 4 +- .../Data/Personnel/RolesDataServiceTests.cs | 4 +- .../Unit/Data/SimpleDataServiceTests.cs | 16 +- .../Unit/Data/Units/UnitsDataServiceTests.cs | 4 +- UKSF.Tests/Unit/Events/EventBusTests.cs | 4 +- .../Events/EventHandlerInitialiserTests.cs | 46 ------ .../Handlers/AccountEventHandlerTests.cs | 22 ++- .../CommandRequestEventHandlerTests.cs | 23 ++- .../CommentThreadEventHandlerTests.cs | 22 ++- .../Events/Handlers/LogEventHandlerTests.cs | 102 +++++-------- .../NotificationsEventHandlerTests.cs | 21 ++- .../Handlers/TeamspeakEventHandlerTests.cs | 25 ++- .../Unit/Models/Game/MissionFileTests.cs | 2 +- .../Message/Logging/BasicLogMessageTests.cs | 15 +- .../Logging/LauncherLogMessageTests.cs | 4 +- .../Message/Logging/WebLogMessageTests.cs | 4 +- .../Mission/MissionPatchingReportTests.cs | 2 +- .../Unit/Models/Mission/MissionTests.cs | 2 +- .../Services/Admin/VariablesServiceTests.cs | 5 +- .../Services/Common/AccountUtilitiesTests.cs | 1 + ...s.cs => ObjectIdConversionServiceTests.cs} | 41 +++-- .../Teamspeak/TeamspeakGroupServiceTests.cs | 13 +- .../Personnel/DisplayNameServiceTests.cs | 4 +- .../Services/Personnel/LoaServiceTests.cs | 3 +- .../Services/Personnel/RanksServiceTests.cs | 2 +- .../Services/Personnel/RoleAttributeTests.cs | 1 + .../Services/Personnel/RolesServiceTests.cs | 2 +- .../Utility/ConfirmationCodeServiceTests.cs | 8 +- .../Services/Utility/DataCacheServiceTests.cs | 15 +- .../Utility/ScheduledActionServiceTests.cs | 6 +- ...eleteExpiredConfirmationCodeActionTests.cs | 7 +- .../ScheduledActions/PruneDataActionTests.cs | 55 ++++--- .../TeamspeakSnapshotActionTests.cs | 5 +- .../Services/Utility/SessionServiceTests.cs | 80 +++------- 327 files changed, 1811 insertions(+), 2496 deletions(-) rename UKSF.Api.Admin/{SignalrHubs => Signalr}/Clients/IAdminClient.cs (79%) rename UKSF.Api.Admin/{SignalrHubs => Signalr}/Clients/IUtilityClient.cs (73%) rename UKSF.Api.Admin/{SignalrHubs => Signalr}/Hubs/AdminHub.cs (69%) rename UKSF.Api.Admin/{SignalrHubs => Signalr}/Hubs/UtilityHub.cs (63%) create mode 100644 UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs rename {UKSF.Api.Models/Mission => UKSF.Api.ArmaMissions/Models}/Mission.cs (94%) rename {UKSF.Api.Models/Mission => UKSF.Api.ArmaMissions/Models}/MissionEntity.cs (83%) rename {UKSF.Api.Models/Mission => UKSF.Api.ArmaMissions/Models}/MissionEntityItem.cs (91%) rename {UKSF.Api.Models/Mission => UKSF.Api.ArmaMissions/Models}/MissionPatchData.cs (83%) rename {UKSF.Api.Models/Mission => UKSF.Api.ArmaMissions/Models}/MissionPatchingReport.cs (93%) rename {UKSF.Api.Models/Mission => UKSF.Api.ArmaMissions/Models}/MissionPatchingResult.cs (85%) rename {UKSF.Api.Models/Mission => UKSF.Api.ArmaMissions/Models}/MissionPlayer.cs (71%) rename {UKSF.Api.Models/Mission => UKSF.Api.ArmaMissions/Models}/MissionUnit.cs (80%) rename {UKSF.Api.Services/Game/Missions => UKSF.Api.ArmaMissions/Services}/MissionDataResolver.cs (99%) rename {UKSF.Api.Services/Game/Missions => UKSF.Api.ArmaMissions/Services}/MissionEntityHelper.cs (97%) rename {UKSF.Api.Services/Game/Missions => UKSF.Api.ArmaMissions/Services}/MissionEntityItemHelper.cs (99%) rename {UKSF.Api.Services/Game/Missions => UKSF.Api.ArmaMissions/Services}/MissionPatchDataService.cs (93%) rename {UKSF.Api.Services/Game/Missions => UKSF.Api.ArmaMissions/Services}/MissionPatchingService.cs (95%) rename {UKSF.Api.Services/Game/Missions => UKSF.Api.ArmaMissions/Services}/MissionService.cs (98%) rename {UKSF.Api.Services/Game/Missions => UKSF.Api.ArmaMissions/Services}/MissionUtilities.cs (97%) create mode 100644 UKSF.Api.ArmaMissions/UKSF.Api.ArmaMissions.csproj create mode 100644 UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs rename {UKSF.Api => UKSF.Api.ArmaServer}/Controllers/GameServersController.cs (98%) rename {UKSF.Api.Data/Game => UKSF.Api.ArmaServer/DataContext}/GameServersDataService.cs (67%) rename {UKSF.Api.Models/Game => UKSF.Api.ArmaServer/Models}/GameEnvironment.cs (66%) rename {UKSF.Api.Models/Game => UKSF.Api.ArmaServer/Models}/GameServer.cs (95%) rename {UKSF.Api.Models/Game => UKSF.Api.ArmaServer/Models}/GameServerMod.cs (85%) rename {UKSF.Api.Models/Game => UKSF.Api.ArmaServer/Models}/MissionFile.cs (90%) rename {UKSF.Api.Services/Game => UKSF.Api.ArmaServer/Services}/GameServerHelpers.cs (88%) rename {UKSF.Api.Services/Game => UKSF.Api.ArmaServer/Services}/GameServersService.cs (90%) create mode 100644 UKSF.Api.ArmaServer/Services/ServerService.cs rename {UKSF.Api.Interfaces/Hubs => UKSF.Api.ArmaServer/Signalr/Clients}/IServersClient.cs (72%) rename {UKSF.Api.Signalr/Hubs/Game => UKSF.Api.ArmaServer/Signalr/Hubs}/ServersHub.cs (62%) create mode 100644 UKSF.Api.ArmaServer/UKSF.Api.ArmaServer.csproj create mode 100644 UKSF.Api.Base/Services/Data/LogDataService.cs create mode 100644 UKSF.Api.Command/ApiCommandExtensions.cs delete mode 100644 UKSF.Api.Command/ApiUKSF.Api.CommandExtExtensions.cs rename {UKSF.Api.Data/Command => UKSF.Api.Command/Context}/CommandRequestArchiveDataService.cs (62%) rename {UKSF.Api.Data/Command => UKSF.Api.Command/Context}/CommandRequestDataService.cs (54%) rename {UKSF.Api.Data/Operations => UKSF.Api.Command/Context}/OperationOrderDataService.cs (68%) rename {UKSF.Api.Data/Operations => UKSF.Api.Command/Context}/OperationReportDataService.cs (68%) rename {UKSF.Api/Controllers/CommandRequests => UKSF.Api.Command/Controllers}/CommandRequestsController.cs (93%) rename {UKSF.Api/Controllers/CommandRequests => UKSF.Api.Command/Controllers}/CommandRequestsCreationController.cs (97%) rename {UKSF.Api/Controllers/Accounts => UKSF.Api.Command/Controllers}/OperationOrderController.cs (89%) rename {UKSF.Api/Controllers/Accounts => UKSF.Api.Command/Controllers}/OperationReportController.cs (91%) rename {UKSF.Api.Events/Handlers => UKSF.Api.Command/EventHandlers}/CommandRequestEventHandler.cs (66%) rename {UKSF.Api.Models/Command => UKSF.Api.Command/Models}/ChainOfCommandMode.cs (88%) rename {UKSF.Api.Models/Command => UKSF.Api.Command/Models}/CommandRequest.cs (95%) rename {UKSF.Api.Models/Command => UKSF.Api.Command/Models}/CommandRequestLoa.cs (84%) rename {UKSF.Api.Models/Operations => UKSF.Api.Command/Models}/CreateOperationOrderRequest.cs (87%) rename {UKSF.Api.Models/Operations => UKSF.Api.Command/Models}/CreateOperationReport.cs (88%) rename {UKSF.Api.Models/Operations => UKSF.Api.Command/Models}/Opord.cs (79%) rename {UKSF.Api.Models/Operations => UKSF.Api.Command/Models}/Oprep.cs (77%) rename {UKSF.Api.Services/Command => UKSF.Api.Command/Services}/ChainOfCommandService.cs (92%) rename {UKSF.Api.Services/Command => UKSF.Api.Command/Services}/CommandRequestCompletionService.cs (96%) rename {UKSF.Api.Services/Command => UKSF.Api.Command/Services}/CommandRequestService.cs (83%) rename {UKSF.Api.Services/Operations => UKSF.Api.Command/Services}/OperationOrderService.cs (70%) rename {UKSF.Api.Services/Operations => UKSF.Api.Command/Services}/OperationReportService.cs (75%) rename {UKSF.Api.Interfaces/Hubs => UKSF.Api.Command/Signalr/Clients}/ICommandRequestsClient.cs (73%) rename {UKSF.Api.Signalr/Hubs/Command => UKSF.Api.Command/Signalr/Hubs}/CommandRequestsHub.cs (73%) delete mode 100644 UKSF.Api.Data/Fake/FakeNotificationsDataService.cs delete mode 100644 UKSF.Api.Data/UKSF.Api.Data.csproj delete mode 100644 UKSF.Api.Events/UKSF.Api.Events.csproj create mode 100644 UKSF.Api.Integration.Instagram/ApiIntegrationInstagramExtensions.cs rename {UKSF.Api => UKSF.Api.Integration.Instagram}/Controllers/InstagramController.cs (75%) rename {UKSF.Api.Models/Integrations => UKSF.Api.Integration.Instagram/Models}/InstagramImage.cs (86%) rename {UKSF.Api.Utility => UKSF.Api.Integration.Instagram}/ScheduledActions/InstagramImagesAction.cs (80%) rename {UKSF.Api.Utility => UKSF.Api.Integration.Instagram}/ScheduledActions/InstagramTokenAction.cs (80%) rename {UKSF.Api.Services/Integrations => UKSF.Api.Integration.Instagram/Services}/InstagramService.cs (94%) create mode 100644 UKSF.Api.Integration.Instagram/UKSF.Api.Integration.Instagram.csproj create mode 100644 UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs rename {UKSF.Api => UKSF.Api.Integrations.Discord}/Controllers/DiscordController.cs (91%) rename {UKSF.Api.Services/Integrations => UKSF.Api.Integrations.Discord/Services}/DiscordService.cs (95%) create mode 100644 UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj create mode 100644 UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs rename {UKSF.Api/Controllers/Accounts => UKSF.Api.Integrations.Teamspeak/Controllers}/OperationsController.cs (96%) rename {UKSF.Api => UKSF.Api.Integrations.Teamspeak}/Controllers/TeamspeakController.cs (90%) rename {UKSF.Api.Events/Handlers => UKSF.Api.Integrations.Teamspeak/EventHandlers}/TeamspeakEventHandler.cs (85%) rename {UKSF.Api.Models/Operations => UKSF.Api.Integrations.Teamspeak/Models}/Operation.cs (74%) rename {UKSF.Api.Models/Integrations => UKSF.Api.Integrations.Teamspeak/Models}/TeamspeakClient.cs (80%) rename {UKSF.Api.Models/Integrations => UKSF.Api.Integrations.Teamspeak/Models}/TeamspeakGroupProcedure.cs (73%) rename {UKSF.Api.Models/Integrations => UKSF.Api.Integrations.Teamspeak/Models}/TeamspeakProcedureType.cs (78%) rename {UKSF.Api.Models/Integrations => UKSF.Api.Integrations.Teamspeak/Models}/TeamspeakServerGroupUpdate.cs (88%) rename {UKSF.Api.Models/Integrations => UKSF.Api.Integrations.Teamspeak/Models}/TeamspeakServerSnapshot.cs (81%) rename {UKSF.Api.Utility => UKSF.Api.Integrations.Teamspeak}/ScheduledActions/TeamspeakSnapshotAction.cs (81%) rename {UKSF.Api.Services/Integrations/Teamspeak => UKSF.Api.Integrations.Teamspeak/Services}/TeamspeakGroupService.cs (92%) rename {UKSF.Api.Services/Integrations/Teamspeak => UKSF.Api.Integrations.Teamspeak/Services}/TeamspeakManagerService.cs (84%) rename {UKSF.Api.Services/Integrations/Teamspeak => UKSF.Api.Integrations.Teamspeak/Services}/TeamspeakMetricsService.cs (54%) rename {UKSF.Api.Services/Integrations/Teamspeak => UKSF.Api.Integrations.Teamspeak/Services}/TeamspeakService.cs (84%) rename {UKSF.Api.Interfaces/Hubs => UKSF.Api.Integrations.Teamspeak/Signalr/Clients}/ITeamspeakClient.cs (64%) rename {UKSF.Api.Interfaces/Hubs => UKSF.Api.Integrations.Teamspeak/Signalr/Clients}/ITeamspeakClientsClient.cs (73%) rename {UKSF.Api.Signalr/Hubs/Integrations => UKSF.Api.Integrations.Teamspeak/Signalr/Hubs}/TeamspeakClientsHub.cs (67%) rename {UKSF.Api.Signalr/Hubs/Integrations => UKSF.Api.Integrations.Teamspeak/Signalr/Hubs}/TeamspeakHub.cs (84%) create mode 100644 UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj delete mode 100644 UKSF.Api.Interfaces/Command/IChainOfCommandService.cs delete mode 100644 UKSF.Api.Interfaces/Command/ICommandRequestCompletionService.cs delete mode 100644 UKSF.Api.Interfaces/Command/ICommandRequestService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/Cached/IReleasesDataService.cs delete mode 100644 UKSF.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs delete mode 100644 UKSF.Api.Interfaces/Events/Handlers/IBuildsEventHandler.cs delete mode 100644 UKSF.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs delete mode 100644 UKSF.Api.Interfaces/Events/Handlers/ITeamspeakEventHandler.cs delete mode 100644 UKSF.Api.Interfaces/Events/ISignalrEventBus.cs delete mode 100644 UKSF.Api.Interfaces/Game/IGameServerHelpers.cs delete mode 100644 UKSF.Api.Interfaces/Game/IGameServersService.cs delete mode 100644 UKSF.Api.Interfaces/Game/IMissionPatchingService.cs delete mode 100644 UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs delete mode 100644 UKSF.Api.Interfaces/Integrations/IDiscordService.cs delete mode 100644 UKSF.Api.Interfaces/Integrations/IInstagramService.cs delete mode 100644 UKSF.Api.Interfaces/Integrations/IPipeManager.cs delete mode 100644 UKSF.Api.Interfaces/Integrations/ISocket.cs delete mode 100644 UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs delete mode 100644 UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs delete mode 100644 UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs delete mode 100644 UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs delete mode 100644 UKSF.Api.Interfaces/Launcher/ILauncherFileService.cs delete mode 100644 UKSF.Api.Interfaces/Launcher/ILauncherService.cs delete mode 100644 UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildProcessorService.cs delete mode 100644 UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs delete mode 100644 UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs delete mode 100644 UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs delete mode 100644 UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs delete mode 100644 UKSF.Api.Interfaces/Modpack/IBuildsService.cs delete mode 100644 UKSF.Api.Interfaces/Modpack/IModpackService.cs delete mode 100644 UKSF.Api.Interfaces/Modpack/IReleaseService.cs delete mode 100644 UKSF.Api.Interfaces/Operations/IOperationOrderService.cs delete mode 100644 UKSF.Api.Interfaces/Operations/IOperationReportService.cs delete mode 100644 UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj delete mode 100644 UKSF.Api.Interfaces/Utility/IServerService.cs create mode 100644 UKSF.Api.Launcher/ApiLauncherExtensions.cs rename {UKSF.Api.Data/Launcher => UKSF.Api.Launcher/Context}/LauncherFileDataService.cs (53%) rename {UKSF.Api => UKSF.Api.Launcher}/Controllers/LauncherController.cs (86%) rename {UKSF.Api.Models/Launcher => UKSF.Api.Launcher/Models}/LauncherFile.cs (64%) rename {UKSF.Api.Services/Launcher => UKSF.Api.Launcher/Services}/LauncherFileService.cs (90%) rename {UKSF.Api.Services/Launcher => UKSF.Api.Launcher/Services}/LauncherService.cs (65%) rename {UKSF.Api.Interfaces/Hubs => UKSF.Api.Launcher/Signalr/Clients}/ILauncherClient.cs (74%) rename {UKSF.Api.Signalr/Hubs/Integrations => UKSF.Api.Launcher/Signalr/Hubs}/LauncherHub.cs (71%) create mode 100644 UKSF.Api.Launcher/UKSF.Api.Launcher.csproj delete mode 100644 UKSF.Api.Models/UKSF.Api.Models.csproj delete mode 100644 UKSF.Api.Models/Utility/UtilityObject.cs create mode 100644 UKSF.Api.Modpack/ApiModpackExtensions.cs rename {UKSF.Api/Controllers/Integrations => UKSF.Api.Modpack/Controllers}/GithubController.cs (94%) rename {UKSF.Api => UKSF.Api.Modpack}/Controllers/IssueController.cs (95%) rename {UKSF.Api/Controllers/Modpack => UKSF.Api.Modpack/Controllers}/ModpackController.cs (96%) rename {UKSF.Api.Events/Handlers => UKSF.Api.Modpack/EventHandlers}/BuildsEventHandler.cs (76%) rename {UKSF.Api.Models/Integrations/Github => UKSF.Api.Modpack/Models}/GithubCommit.cs (81%) rename {UKSF.Api.Models/Modpack => UKSF.Api.Modpack/Models}/ModpackBuild.cs (88%) rename {UKSF.Api.Models/Modpack => UKSF.Api.Modpack/Models}/ModpackBuildQueueItem.cs (73%) rename {UKSF.Api.Models/Modpack => UKSF.Api.Modpack/Models}/ModpackBuildResult.cs (78%) rename {UKSF.Api.Models/Modpack => UKSF.Api.Modpack/Models}/ModpackBuildStep.cs (95%) rename {UKSF.Api.Models/Modpack => UKSF.Api.Modpack/Models}/ModpackBuildStepLogItem.cs (88%) rename {UKSF.Api.Models/Modpack => UKSF.Api.Modpack/Models}/ModpackRelease.cs (85%) rename {UKSF.Api.Models/Modpack => UKSF.Api.Modpack/Models}/NewBuild.cs (78%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/BuildProcessHelper.cs (98%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/BuildProcessorService.cs (87%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/BuildQueueService.cs (89%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/BuildStepService.cs (87%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/StepLogger.cs (82%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/BuildStep.cs (90%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/BuildStepAttribute.cs (75%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs (95%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs (92%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs (96%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs (90%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs (97%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/BuildSteps/BuildStepSources.cs (98%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs (97%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs (96%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs (96%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs (94%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/Common/BuildStepBuildRepo.cs (88%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/Common/BuildStepCbaSettings.cs (93%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/Common/BuildStepClean.cs (94%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/Common/BuildStepDeploy.cs (93%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/Common/BuildStepNotify.cs (86%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/FileBuildStep.cs (99%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/GitBuildStep.cs (90%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/ModBuildStep.cs (88%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs (94%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs (95%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs (77%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs (90%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs (94%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/BuildsService.cs (86%) rename {UKSF.Api.Data/Modpack => UKSF.Api.Modpack/Services/Data}/BuildsDataService.cs (74%) rename {UKSF.Api.Data/Modpack => UKSF.Api.Modpack/Services/Data}/ReleasesDataService.cs (82%) rename {UKSF.Api.Services/Integrations/Github => UKSF.Api.Modpack/Services}/GithubService.cs (95%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/ModpackService.cs (87%) rename {UKSF.Api.Services/Modpack => UKSF.Api.Modpack/Services}/ReleaseService.cs (85%) rename {UKSF.Api.Interfaces/Hubs => UKSF.Api.Modpack/Signalr/Clients}/IModpackClient.cs (76%) rename {UKSF.Api.Signalr/Hubs/Modpack => UKSF.Api.Modpack/Signalr/Hubs}/BuildsHub.cs (92%) create mode 100644 UKSF.Api.Modpack/UKSF.Api.Modpack.csproj rename {UKSF.Api => UKSF.Api.Personnel}/Controllers/CommentThreadController.cs (97%) rename {UKSF.Api => UKSF.Api.Personnel}/Controllers/DiscordConnectionController.cs (97%) rename {UKSF.Api => UKSF.Api.Personnel}/Controllers/NotificationsController.cs (95%) rename {UKSF.Api => UKSF.Api.Personnel}/Controllers/SteamConnectionController.cs (96%) rename UKSF.Api.Personnel/{SignalrHubs => Signalr}/Clients/IAccountClient.cs (69%) rename UKSF.Api.Personnel/{SignalrHubs => Signalr}/Clients/ICommentThreadClient.cs (76%) rename UKSF.Api.Personnel/{SignalrHubs => Signalr}/Clients/INotificationsClient.cs (84%) rename UKSF.Api.Personnel/{SignalrHubs => Signalr}/Hubs/AccountHub.cs (90%) rename UKSF.Api.Personnel/{SignalrHubs => Signalr}/Hubs/CommentThreadHub.cs (90%) rename UKSF.Api.Personnel/{SignalrHubs => Signalr}/Hubs/NotificationsHub.cs (90%) delete mode 100644 UKSF.Api.Services/Fake/FakeCachedDataService.cs delete mode 100644 UKSF.Api.Services/Fake/FakeDataService.cs delete mode 100644 UKSF.Api.Services/Fake/FakeDiscordService.cs delete mode 100644 UKSF.Api.Services/Fake/FakeNotificationsService.cs delete mode 100644 UKSF.Api.Services/Fake/FakePipeManager.cs delete mode 100644 UKSF.Api.Services/Fake/FakeTeamspeakManagerService.cs delete mode 100644 UKSF.Api.Services/Game/ServerService.cs delete mode 100644 UKSF.Api.Services/Integrations/PipeManager.cs delete mode 100644 UKSF.Api.Services/Integrations/PipeQueueManager.cs delete mode 100644 UKSF.Api.Services/UKSF.Api.Services.csproj delete mode 100644 UKSF.Api.Signalr/UKSF.Api.Signalr.csproj delete mode 100644 UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs delete mode 100644 UKSF.Api/AppStart/Services/RegisterDataServices.cs delete mode 100644 UKSF.Api/AppStart/Services/RegisterEventServices.cs delete mode 100644 UKSF.Api/AppStart/Services/ServiceExtensions.cs create mode 100644 UKSF.Api/AppStart/UksfServiceExtensions.cs delete mode 100644 UKSF.Api/Controllers/DocsController.cs rename UKSF.Api/{ => Controllers}/ModsController.cs (86%) delete mode 100644 UKSF.Api/Controllers/News/NewsController.cs delete mode 100644 UKSF.Api/Docs/test.md rename {UKSF.Api.Services => UKSF.Api}/ExceptionHandler.cs (73%) create mode 100644 UKSF.Api/Fake/FakeCachedDataService.cs create mode 100644 UKSF.Api/Fake/FakeDataService.cs create mode 100644 UKSF.Api/Fake/FakeDiscordService.cs create mode 100644 UKSF.Api/Fake/FakeNotificationsDataService.cs create mode 100644 UKSF.Api/Fake/FakeNotificationsService.cs create mode 100644 UKSF.Api/Fake/FakeTeamspeakManagerService.cs delete mode 100644 UKSF.Api/Services/Data/LogDataService.cs delete mode 100644 UKSF.Common/UKSF.Common.csproj delete mode 100644 UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs rename UKSF.Tests/Unit/Services/Common/{DisplayNameUtilitiesTests.cs => ObjectIdConversionServiceTests.cs} (72%) diff --git a/UKSF.Api.Admin/ApiAdminExtensions.cs b/UKSF.Api.Admin/ApiAdminExtensions.cs index 84917f59..5281ab31 100644 --- a/UKSF.Api.Admin/ApiAdminExtensions.cs +++ b/UKSF.Api.Admin/ApiAdminExtensions.cs @@ -5,22 +5,21 @@ using UKSF.Api.Admin.Models; using UKSF.Api.Admin.Services; using UKSF.Api.Admin.Services.Data; -using UKSF.Api.Admin.SignalrHubs.Hubs; +using UKSF.Api.Admin.Signalr.Hubs; using UKSF.Api.Base.Events; namespace UKSF.Api.Admin { public static class ApiAdminExtensions { - public static IServiceCollection AddUksfAdmin(this IServiceCollection services) { - services.AddSingleton(); - services.AddSingleton(); - services.AddTransient(); + public static IServiceCollection AddUksfAdmin(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); - services.AddSingleton, DataEventBus>(); + private static IServiceCollection AddContexts(this IServiceCollection services) => services; - services.AddSingleton(); + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>(); - return services; - } + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); + + private static IServiceCollection AddServices(this IServiceCollection services) => + services.AddSingleton().AddTransient().AddTransient(); public static void AddUksfAdminSignalr(this IEndpointRouteBuilder builder) { builder.MapHub($"/hub/{AdminHub.END_POINT}"); diff --git a/UKSF.Api.Admin/Controllers/VersionController.cs b/UKSF.Api.Admin/Controllers/VersionController.cs index 3807a9c4..3519d4ea 100644 --- a/UKSF.Api.Admin/Controllers/VersionController.cs +++ b/UKSF.Api.Admin/Controllers/VersionController.cs @@ -5,8 +5,8 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services.Data; -using UKSF.Api.Admin.SignalrHubs.Clients; -using UKSF.Api.Admin.SignalrHubs.Hubs; +using UKSF.Api.Admin.Signalr.Clients; +using UKSF.Api.Admin.Signalr.Hubs; namespace UKSF.Api.Admin.Controllers { [Route("[controller]")] diff --git a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs b/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs index 12fea456..985e1a7f 100644 --- a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs +++ b/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Admin.SignalrHubs.Clients; -using UKSF.Api.Admin.SignalrHubs.Hubs; +using UKSF.Api.Admin.Signalr.Clients; +using UKSF.Api.Admin.Signalr.Hubs; using UKSF.Api.Base.Events; using UKSF.Api.Base.Extensions; using UKSF.Api.Base.Models; diff --git a/UKSF.Api.Admin/SignalrHubs/Clients/IAdminClient.cs b/UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs similarity index 79% rename from UKSF.Api.Admin/SignalrHubs/Clients/IAdminClient.cs rename to UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs index d1844817..2f04172e 100644 --- a/UKSF.Api.Admin/SignalrHubs/Clients/IAdminClient.cs +++ b/UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs @@ -1,8 +1,7 @@ using System.Threading.Tasks; -using UKSF.Api.Base.Models; using UKSF.Api.Base.Models.Logging; -namespace UKSF.Api.Admin.SignalrHubs.Clients { +namespace UKSF.Api.Admin.Signalr.Clients { public interface IAdminClient { Task ReceiveAuditLog(AuditLog log); Task ReceiveErrorLog(HttpErrorLog log); diff --git a/UKSF.Api.Admin/SignalrHubs/Clients/IUtilityClient.cs b/UKSF.Api.Admin/Signalr/Clients/IUtilityClient.cs similarity index 73% rename from UKSF.Api.Admin/SignalrHubs/Clients/IUtilityClient.cs rename to UKSF.Api.Admin/Signalr/Clients/IUtilityClient.cs index 236b42cb..a7c15013 100644 --- a/UKSF.Api.Admin/SignalrHubs/Clients/IUtilityClient.cs +++ b/UKSF.Api.Admin/Signalr/Clients/IUtilityClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSF.Api.Admin.SignalrHubs.Clients { +namespace UKSF.Api.Admin.Signalr.Clients { public interface IUtilityClient { Task ReceiveFrontendUpdate(string version); } diff --git a/UKSF.Api.Admin/SignalrHubs/Hubs/AdminHub.cs b/UKSF.Api.Admin/Signalr/Hubs/AdminHub.cs similarity index 69% rename from UKSF.Api.Admin/SignalrHubs/Hubs/AdminHub.cs rename to UKSF.Api.Admin/Signalr/Hubs/AdminHub.cs index fc48470e..8018c872 100644 --- a/UKSF.Api.Admin/SignalrHubs/Hubs/AdminHub.cs +++ b/UKSF.Api.Admin/Signalr/Hubs/AdminHub.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Admin.SignalrHubs.Clients; +using UKSF.Api.Admin.Signalr.Clients; -namespace UKSF.Api.Admin.SignalrHubs.Hubs { +namespace UKSF.Api.Admin.Signalr.Hubs { [Authorize] public class AdminHub : Hub { public const string END_POINT = "admin"; diff --git a/UKSF.Api.Admin/SignalrHubs/Hubs/UtilityHub.cs b/UKSF.Api.Admin/Signalr/Hubs/UtilityHub.cs similarity index 63% rename from UKSF.Api.Admin/SignalrHubs/Hubs/UtilityHub.cs rename to UKSF.Api.Admin/Signalr/Hubs/UtilityHub.cs index 97b30749..0da88174 100644 --- a/UKSF.Api.Admin/SignalrHubs/Hubs/UtilityHub.cs +++ b/UKSF.Api.Admin/Signalr/Hubs/UtilityHub.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Admin.SignalrHubs.Clients; +using UKSF.Api.Admin.Signalr.Clients; -namespace UKSF.Api.Admin.SignalrHubs.Hubs { +namespace UKSF.Api.Admin.Signalr.Hubs { public class UtilityHub : Hub { public const string END_POINT = "utility"; } diff --git a/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs b/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs new file mode 100644 index 00000000..73fd9803 --- /dev/null +++ b/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs @@ -0,0 +1,16 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.ArmaMissions.Services; + +namespace UKSF.Api.ArmaMissions { + public static class ApiArmaMissionsExtensions { + public static IServiceCollection AddUksfArmaMissions(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); + + private static IServiceCollection AddContexts(this IServiceCollection services) => services; + + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; + + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + + private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton(); + } +} diff --git a/UKSF.Api.Models/Mission/Mission.cs b/UKSF.Api.ArmaMissions/Models/Mission.cs similarity index 94% rename from UKSF.Api.Models/Mission/Mission.cs rename to UKSF.Api.ArmaMissions/Models/Mission.cs index a6f07bb5..16e817b0 100644 --- a/UKSF.Api.Models/Mission/Mission.cs +++ b/UKSF.Api.ArmaMissions/Models/Mission.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSF.Api.Models.Mission { +namespace UKSF.Api.ArmaMissions.Models { public class Mission { public static int nextId; public readonly string descriptionPath; diff --git a/UKSF.Api.Models/Mission/MissionEntity.cs b/UKSF.Api.ArmaMissions/Models/MissionEntity.cs similarity index 83% rename from UKSF.Api.Models/Mission/MissionEntity.cs rename to UKSF.Api.ArmaMissions/Models/MissionEntity.cs index eb4d582b..061b5506 100644 --- a/UKSF.Api.Models/Mission/MissionEntity.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionEntity.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSF.Api.Models.Mission { +namespace UKSF.Api.ArmaMissions.Models { public class MissionEntity { public readonly List missionEntityItems = new List(); public int itemsCount; diff --git a/UKSF.Api.Models/Mission/MissionEntityItem.cs b/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs similarity index 91% rename from UKSF.Api.Models/Mission/MissionEntityItem.cs rename to UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs index 2bd5d551..ccc09bac 100644 --- a/UKSF.Api.Models/Mission/MissionEntityItem.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSF.Api.Models.Mission { +namespace UKSF.Api.ArmaMissions.Models { public class MissionEntityItem { public static double position = 10; public static double curatorPosition = 0.5; diff --git a/UKSF.Api.Models/Mission/MissionPatchData.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs similarity index 83% rename from UKSF.Api.Models/Mission/MissionPatchData.cs rename to UKSF.Api.ArmaMissions/Models/MissionPatchData.cs index d8695f95..24743939 100644 --- a/UKSF.Api.Models/Mission/MissionPatchData.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Models.Mission { +namespace UKSF.Api.ArmaMissions.Models { public class MissionPatchData { public static MissionPatchData instance; public List orderedUnits; diff --git a/UKSF.Api.Models/Mission/MissionPatchingReport.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs similarity index 93% rename from UKSF.Api.Models/Mission/MissionPatchingReport.cs rename to UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs index df6a78f8..659da806 100644 --- a/UKSF.Api.Models/Mission/MissionPatchingReport.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs @@ -1,6 +1,6 @@ using System; -namespace UKSF.Api.Models.Mission { +namespace UKSF.Api.ArmaMissions.Models { public class MissionPatchingReport { public string detail; public bool error; diff --git a/UKSF.Api.Models/Mission/MissionPatchingResult.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs similarity index 85% rename from UKSF.Api.Models/Mission/MissionPatchingResult.cs rename to UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs index 8095cb01..d9f1c250 100644 --- a/UKSF.Api.Models/Mission/MissionPatchingResult.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSF.Api.Models.Mission { +namespace UKSF.Api.ArmaMissions.Models { public class MissionPatchingResult { public int playerCount; public List reports = new List(); diff --git a/UKSF.Api.Models/Mission/MissionPlayer.cs b/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs similarity index 71% rename from UKSF.Api.Models/Mission/MissionPlayer.cs rename to UKSF.Api.ArmaMissions/Models/MissionPlayer.cs index 72c9808a..8334f805 100644 --- a/UKSF.Api.Models/Mission/MissionPlayer.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs @@ -1,6 +1,6 @@ -using UKSF.Api.Models.Personnel; +using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Models.Mission { +namespace UKSF.Api.ArmaMissions.Models { public class MissionPlayer { public Account account; public string name; diff --git a/UKSF.Api.Models/Mission/MissionUnit.cs b/UKSF.Api.ArmaMissions/Models/MissionUnit.cs similarity index 80% rename from UKSF.Api.Models/Mission/MissionUnit.cs rename to UKSF.Api.ArmaMissions/Models/MissionUnit.cs index f25f1c9f..33f82aca 100644 --- a/UKSF.Api.Models/Mission/MissionUnit.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionUnit.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using UKSF.Api.Models.Units; +using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Models.Mission { +namespace UKSF.Api.ArmaMissions.Models { public class MissionUnit { public string callsign; public List members = new List(); diff --git a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs similarity index 99% rename from UKSF.Api.Services/Game/Missions/MissionDataResolver.cs rename to UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs index 93280793..9b92b897 100644 --- a/UKSF.Api.Services/Game/Missions/MissionDataResolver.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Models.Mission; +using UKSF.Api.ArmaMissions.Models; -namespace UKSF.Api.Services.Game.Missions { +namespace UKSF.Api.ArmaMissions.Services { public static class MissionDataResolver { // TODO: Add special display to variables area that resolves IDs as display names, unit names, ranks, roles, etc diff --git a/UKSF.Api.Services/Game/Missions/MissionEntityHelper.cs b/UKSF.Api.ArmaMissions/Services/MissionEntityHelper.cs similarity index 97% rename from UKSF.Api.Services/Game/Missions/MissionEntityHelper.cs rename to UKSF.Api.ArmaMissions/Services/MissionEntityHelper.cs index 4b0b24c4..7015b22a 100644 --- a/UKSF.Api.Services/Game/Missions/MissionEntityHelper.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionEntityHelper.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using UKSF.Api.Models.Mission; +using UKSF.Api.ArmaMissions.Models; -namespace UKSF.Api.Services.Game.Missions { +namespace UKSF.Api.ArmaMissions.Services { public static class MissionEntityHelper { public static MissionEntity CreateFromItems(List rawEntities) { MissionEntity missionEntity = new MissionEntity {itemsCount = Convert.ToInt32(MissionUtilities.ReadSingleDataByKey(rawEntities, "items"))}; diff --git a/UKSF.Api.Services/Game/Missions/MissionEntityItemHelper.cs b/UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs similarity index 99% rename from UKSF.Api.Services/Game/Missions/MissionEntityItemHelper.cs rename to UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs index e2396640..bec12fa9 100644 --- a/UKSF.Api.Services/Game/Missions/MissionEntityItemHelper.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Models.Mission; +using UKSF.Api.ArmaMissions.Models; -namespace UKSF.Api.Services.Game.Missions { +namespace UKSF.Api.ArmaMissions.Services { public static class MissionEntityItemHelper { public static MissionEntityItem CreateFromList(List rawItem) { MissionEntityItem missionEntityItem = new MissionEntityItem {rawMissionEntityItem = rawItem}; diff --git a/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs b/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs similarity index 93% rename from UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs rename to UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs index cf486dc4..f5ecd4d0 100644 --- a/UKSF.Api.Services/Game/Missions/MissionPatchDataService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs @@ -1,15 +1,13 @@ using System.Collections.Generic; using System.Linq; using MongoDB.Bson; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Models.Mission; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; -using UKSF.Common; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.ArmaMissions.Models; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Services.Game.Missions { +namespace UKSF.Api.ArmaMissions.Services { public class MissionPatchDataService { private readonly IAccountService accountService; private readonly IDisplayNameService displayNameService; diff --git a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs b/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs similarity index 95% rename from UKSF.Api.Services/Game/Missions/MissionPatchingService.cs rename to UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs index ebf74f5c..25c52eb9 100644 --- a/UKSF.Api.Services/Game/Missions/MissionPatchingService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs @@ -7,12 +7,15 @@ using System.Threading.Tasks; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; +using UKSF.Api.ArmaMissions.Models; using UKSF.Api.Base.Events; -using UKSF.Api.Interfaces.Game; -using UKSF.Api.Models.Mission; -using UKSF.Common; +using UKSF.Api.Base.Extensions; + +namespace UKSF.Api.ArmaMissions.Services { + public interface IMissionPatchingService { + Task PatchMission(string path); + } -namespace UKSF.Api.Services.Game.Missions { public class MissionPatchingService : IMissionPatchingService { private const string EXTRACT_PBO = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\ExtractPboDos.exe"; private const string MAKE_PBO = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\MakePbo.exe"; diff --git a/UKSF.Api.Services/Game/Missions/MissionService.cs b/UKSF.Api.ArmaMissions/Services/MissionService.cs similarity index 98% rename from UKSF.Api.Services/Game/Missions/MissionService.cs rename to UKSF.Api.ArmaMissions/Services/MissionService.cs index afa50434..7cfcaf30 100644 --- a/UKSF.Api.Services/Game/Missions/MissionService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionService.cs @@ -3,12 +3,9 @@ using System.Diagnostics; using System.IO; using System.Linq; -using UKSF.Api.Interfaces.Game; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Mission; -using UKSF.Common; +using UKSF.Api.ArmaMissions.Models; -namespace UKSF.Api.Services.Game.Missions { +namespace UKSF.Api.ArmaMissions.Services { public class MissionService { private const string UNBIN = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\DeRapDos.exe"; diff --git a/UKSF.Api.Services/Game/Missions/MissionUtilities.cs b/UKSF.Api.ArmaMissions/Services/MissionUtilities.cs similarity index 97% rename from UKSF.Api.Services/Game/Missions/MissionUtilities.cs rename to UKSF.Api.ArmaMissions/Services/MissionUtilities.cs index acdc5d49..e491ed8e 100644 --- a/UKSF.Api.Services/Game/Missions/MissionUtilities.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionUtilities.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace UKSF.Api.Services.Game.Missions { +namespace UKSF.Api.ArmaMissions.Services { public static class MissionUtilities { public static List ReadDataFromIndex(List source, ref int index) { List data = new List {source[index]}; diff --git a/UKSF.Api.ArmaMissions/UKSF.Api.ArmaMissions.csproj b/UKSF.Api.ArmaMissions/UKSF.Api.ArmaMissions.csproj new file mode 100644 index 00000000..1e733064 --- /dev/null +++ b/UKSF.Api.ArmaMissions/UKSF.Api.ArmaMissions.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp5.0 + Library + + + + + + + + + + + + diff --git a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs new file mode 100644 index 00000000..85783658 --- /dev/null +++ b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs @@ -0,0 +1,19 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.ArmaServer.DataContext; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.ArmaServer.Services; +using UKSF.Api.Base.Events; + +namespace UKSF.Api.ArmaServer { + public static class ApiArmaServerExtensions { + public static IServiceCollection AddUksfArmaServer(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); + + private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton(); + + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>(); + + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + + private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton(); + } +} diff --git a/UKSF.Api/Controllers/GameServersController.cs b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs similarity index 98% rename from UKSF.Api/Controllers/GameServersController.cs rename to UKSF.Api.ArmaServer/Controllers/GameServersController.cs index 0fab90bf..df597f65 100644 --- a/UKSF.Api/Controllers/GameServersController.cs +++ b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs @@ -11,17 +11,16 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; +using UKSF.Api.ArmaMissions.Models; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.ArmaServer.Services; +using UKSF.Api.ArmaServer.Signalr.Clients; +using UKSF.Api.ArmaServer.Signalr.Hubs; using UKSF.Api.Base; using UKSF.Api.Base.Events; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Game; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Mission; -using UKSF.Api.Signalr.Hubs.Game; -using UKSF.Common; - -namespace UKSF.Api.Controllers { +using UKSF.Api.Base.Extensions; + +namespace UKSF.Api.ArmaServer.Controllers { [Route("[controller]"), Permissions(Permissions.NCO, Permissions.SERVERS, Permissions.COMMAND)] public class GameServersController : Controller { private readonly IGameServersService gameServersService; diff --git a/UKSF.Api.Data/Game/GameServersDataService.cs b/UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs similarity index 67% rename from UKSF.Api.Data/Game/GameServersDataService.cs rename to UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs index a01fbbb0..0b6818c3 100644 --- a/UKSF.Api.Data/Game/GameServersDataService.cs +++ b/UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs @@ -1,11 +1,13 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Game; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; + +namespace UKSF.Api.ArmaServer.DataContext { + public interface IGameServersDataService : IDataService, ICachedDataService { } -namespace UKSF.Api.Data.Game { public class GameServersDataService : CachedDataService, IGameServersDataService { public GameServersDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "gameServers") { } diff --git a/UKSF.Api.Models/Game/GameEnvironment.cs b/UKSF.Api.ArmaServer/Models/GameEnvironment.cs similarity index 66% rename from UKSF.Api.Models/Game/GameEnvironment.cs rename to UKSF.Api.ArmaServer/Models/GameEnvironment.cs index c814d208..b92fa685 100644 --- a/UKSF.Api.Models/Game/GameEnvironment.cs +++ b/UKSF.Api.ArmaServer/Models/GameEnvironment.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Models.Game { +namespace UKSF.Api.ArmaServer.Models { public enum GameEnvironment { RELEASE, RC, diff --git a/UKSF.Api.Models/Game/GameServer.cs b/UKSF.Api.ArmaServer/Models/GameServer.cs similarity index 95% rename from UKSF.Api.Models/Game/GameServer.cs rename to UKSF.Api.ArmaServer/Models/GameServer.cs index c5e0a793..42b1b44d 100644 --- a/UKSF.Api.Models/Game/GameServer.cs +++ b/UKSF.Api.ArmaServer/Models/GameServer.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using MongoDB.Bson.Serialization.Attributes; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Models.Game { +namespace UKSF.Api.ArmaServer.Models { public enum GameServerOption { NONE, SINGLETON, diff --git a/UKSF.Api.Models/Game/GameServerMod.cs b/UKSF.Api.ArmaServer/Models/GameServerMod.cs similarity index 85% rename from UKSF.Api.Models/Game/GameServerMod.cs rename to UKSF.Api.ArmaServer/Models/GameServerMod.cs index cc0dcfff..76b1522d 100644 --- a/UKSF.Api.Models/Game/GameServerMod.cs +++ b/UKSF.Api.ArmaServer/Models/GameServerMod.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Models.Game { +namespace UKSF.Api.ArmaServer.Models { public class GameServerMod { public bool isDuplicate; public string name; diff --git a/UKSF.Api.Models/Game/MissionFile.cs b/UKSF.Api.ArmaServer/Models/MissionFile.cs similarity index 90% rename from UKSF.Api.Models/Game/MissionFile.cs rename to UKSF.Api.ArmaServer/Models/MissionFile.cs index d91e7ba6..7822c2f5 100644 --- a/UKSF.Api.Models/Game/MissionFile.cs +++ b/UKSF.Api.ArmaServer/Models/MissionFile.cs @@ -1,6 +1,6 @@ using System.IO; -namespace UKSF.Api.Models.Game { +namespace UKSF.Api.ArmaServer.Models { public class MissionFile { public string map; public string name; diff --git a/UKSF.Api.Services/Game/GameServerHelpers.cs b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs similarity index 88% rename from UKSF.Api.Services/Game/GameServerHelpers.cs rename to UKSF.Api.ArmaServer/Services/GameServerHelpers.cs index d81b4362..ffef792b 100644 --- a/UKSF.Api.Services/Game/GameServerHelpers.cs +++ b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs @@ -5,14 +5,28 @@ using System.Linq; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; +using UKSF.Api.ArmaServer.Models; using UKSF.Api.Base.Events; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Game; -using UKSF.Api.Models.Game; -using UKSF.Api.Services.Message; -using UKSF.Common; +using UKSF.Api.Base.Extensions; + +namespace UKSF.Api.ArmaServer.Services { + public interface IGameServerHelpers { + string GetGameServerExecutablePath(GameServer gameServer); + string GetGameServerSettingsPath(); + string GetGameServerMissionsPath(); + string GetGameServerConfigPath(GameServer gameServer); + string GetGameServerModsPaths(GameEnvironment environment); + IEnumerable GetGameServerExtraModsPaths(); + string FormatGameServerConfig(GameServer gameServer, int playerCount, string missionSelection); + string FormatGameServerLaunchArguments(GameServer gameServer); + string FormatHeadlessClientLaunchArguments(GameServer gameServer, int index); + string GetMaxPlayerCountFromConfig(GameServer gameServer); + int GetMaxCuratorCountFromSettings(); + TimeSpan StripMilliseconds(TimeSpan time); + IEnumerable GetArmaProcesses(); + bool IsMainOpTime(); + } -namespace UKSF.Api.Services.Game { public class GameServerHelpers : IGameServerHelpers { private static readonly string[] BASE_CONFIG = { "hostname = \"{0}\";", diff --git a/UKSF.Api.Services/Game/GameServersService.cs b/UKSF.Api.ArmaServer/Services/GameServersService.cs similarity index 90% rename from UKSF.Api.Services/Game/GameServersService.cs rename to UKSF.Api.ArmaServer/Services/GameServersService.cs index e56e4f8f..5d5767e3 100644 --- a/UKSF.Api.Services/Game/GameServersService.cs +++ b/UKSF.Api.ArmaServer/Services/GameServersService.cs @@ -8,13 +8,30 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Newtonsoft.Json; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Game; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Mission; -using UKSF.Common; +using UKSF.Api.ArmaMissions.Models; +using UKSF.Api.ArmaMissions.Services; +using UKSF.Api.ArmaServer.DataContext; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Base.Extensions; +using UKSF.Api.Base.Services.Data; + +namespace UKSF.Api.ArmaServer.Services { + public interface IGameServersService : IDataBackedService { + int GetGameInstanceCount(); + Task UploadMissionFile(IFormFile file); + List GetMissionFiles(); + Task GetGameServerStatus(GameServer gameServer); + Task> GetAllGameServerStatuses(); + Task PatchMissionFile(string missionName); + void WriteServerConfig(GameServer gameServer, int playerCount, string missionSelection); + Task LaunchGameServer(GameServer gameServer); + Task StopGameServer(GameServer gameServer); + void KillGameServer(GameServer gameServer); + int KillAllArmaProcesses(); + List GetAvailableMods(string id); + List GetEnvironmentMods(GameEnvironment environment); + } -namespace UKSF.Api.Services.Game { public class GameServersService : DataBackedService, IGameServersService { private readonly IGameServerHelpers gameServerHelpers; private readonly IMissionPatchingService missionPatchingService; diff --git a/UKSF.Api.ArmaServer/Services/ServerService.cs b/UKSF.Api.ArmaServer/Services/ServerService.cs new file mode 100644 index 00000000..57bb48c7 --- /dev/null +++ b/UKSF.Api.ArmaServer/Services/ServerService.cs @@ -0,0 +1,78 @@ +// using System; +// using System.Collections.Generic; +// using System.IO; +// using System.Linq; +// using System.Text; +// using System.Threading.Tasks; +// using UKSF.Api.Interfaces.Personnel; +// using UKSF.Api.Interfaces.Units; +// using UKSF.Api.Interfaces.Utility; +// using UKSF.Api.Models.Personnel; +// using UKSF.Api.Models.Units; +// +// // ReSharper disable HeuristicUnreachableCode +// #pragma warning disable 162 +// +// namespace UKSF.Api.Services.Game { +// public class ServerService : IServerService { +// private const string FILE_BACKUP = "backup.xml"; +// private const string FILE_SQUAD = "squad.xml"; +// private const string PATH = "C:\\wamp\\www\\uksfnew\\public\\squadtag\\A3"; +// +// private readonly IAccountService accountService; +// private readonly IDisplayNameService displayNameService; +// private readonly IRanksService ranksService; +// private readonly IUnitsService unitsService; +// +// public ServerService(IAccountService accountService, IRanksService ranksService, IDisplayNameService displayNameService, IUnitsService unitsService) { +// this.accountService = accountService; +// this.ranksService = ranksService; +// this.displayNameService = displayNameService; +// this.unitsService = unitsService; +// } +// +// public void UpdateSquadXml() { +// return; +// Task.Run( +// () => { +// IEnumerable accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER && x.rank != null); +// accounts = accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname); +// +// StringBuilder stringBuilder = new StringBuilder(); +// stringBuilder.AppendLine( +// "\n\n\n\n\n\tUnited Kingdom Special Forces\n\tuksfrecruitment@gmail.com\n\thttps://uk-sf.co.uk\n\t\n\tUnited Kingdom Special Forces\n" +// ); +// +// foreach (Account account in accounts.Where(x => ranksService.IsSuperiorOrEqual(x.rank, "Private"))) { +// StringBuilder accountStringBuilder = new StringBuilder(); +// Unit unit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); +// string unitRole = unit.roles.FirstOrDefault(x => x.Value == account.id).Key; +// accountStringBuilder.AppendLine($"\t"); +// accountStringBuilder.AppendLine($"\t\t{unit.callsign}"); +// accountStringBuilder.AppendLine($"\t\t{account.rank}"); +// accountStringBuilder.AppendLine($"\t\t{account.unitAssignment}{(string.IsNullOrEmpty(unitRole) ? "" : $" {unitRole}")}"); +// accountStringBuilder.AppendLine($"\t\t{account.roleAssignment}"); +// accountStringBuilder.AppendLine("\t"); +// stringBuilder.AppendLine(accountStringBuilder.ToString()); +// } +// +// stringBuilder.AppendLine(""); +// +// try { +// File.Copy(Path.Join(PATH, FILE_SQUAD), Path.Join(PATH, FILE_BACKUP)); +// +// try { +// File.WriteAllText(Path.Join(PATH, FILE_SQUAD), stringBuilder.ToString()); +// } catch (Exception) { +// File.Delete(Path.Join(PATH, FILE_SQUAD)); +// File.Copy(Path.Join(PATH, FILE_BACKUP), Path.Join(PATH, FILE_SQUAD)); +// File.Delete(Path.Join(PATH, FILE_BACKUP)); +// } +// } catch (Exception) { +// // ignored +// } +// } +// ); +// } +// } +// } diff --git a/UKSF.Api.Interfaces/Hubs/IServersClient.cs b/UKSF.Api.ArmaServer/Signalr/Clients/IServersClient.cs similarity index 72% rename from UKSF.Api.Interfaces/Hubs/IServersClient.cs rename to UKSF.Api.ArmaServer/Signalr/Clients/IServersClient.cs index 15e36182..dd8ab183 100644 --- a/UKSF.Api.Interfaces/Hubs/IServersClient.cs +++ b/UKSF.Api.ArmaServer/Signalr/Clients/IServersClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSF.Api.Interfaces.Hubs { +namespace UKSF.Api.ArmaServer.Signalr.Clients { public interface IServersClient { Task ReceiveDisabledState(bool state); } diff --git a/UKSF.Api.Signalr/Hubs/Game/ServersHub.cs b/UKSF.Api.ArmaServer/Signalr/Hubs/ServersHub.cs similarity index 62% rename from UKSF.Api.Signalr/Hubs/Game/ServersHub.cs rename to UKSF.Api.ArmaServer/Signalr/Hubs/ServersHub.cs index 511abdd3..90cca47e 100644 --- a/UKSF.Api.Signalr/Hubs/Game/ServersHub.cs +++ b/UKSF.Api.ArmaServer/Signalr/Hubs/ServersHub.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.ArmaServer.Signalr.Clients; -namespace UKSF.Api.Signalr.Hubs.Game { +namespace UKSF.Api.ArmaServer.Signalr.Hubs { public class ServersHub : Hub { public const string END_POINT = "servers"; } diff --git a/UKSF.Api.ArmaServer/UKSF.Api.ArmaServer.csproj b/UKSF.Api.ArmaServer/UKSF.Api.ArmaServer.csproj new file mode 100644 index 00000000..5f125b6e --- /dev/null +++ b/UKSF.Api.ArmaServer/UKSF.Api.ArmaServer.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp5.0 + Library + + + + + + + + + diff --git a/UKSF.Api.Auth/ApiAuthExtensions.cs b/UKSF.Api.Auth/ApiAuthExtensions.cs index ce04c995..f98d43b5 100644 --- a/UKSF.Api.Auth/ApiAuthExtensions.cs +++ b/UKSF.Api.Auth/ApiAuthExtensions.cs @@ -20,9 +20,18 @@ public static class ApiAuthExtensions { public static IServiceCollection AddUksfAuth(this IServiceCollection services, IConfiguration configuration) { SecurityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetSection("Secrets")["tokenKey"])); - services.AddTransient(); - services.AddTransient(); + return services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddAuthentication(); + } + + private static IServiceCollection AddContexts(this IServiceCollection services) => services; + + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; + + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + + private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton().AddSingleton(); + private static IServiceCollection AddAuthentication(this IServiceCollection services) { services.AddAuthentication( options => { options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; diff --git a/UKSF.Api.Auth/Controllers/LoginController.cs b/UKSF.Api.Auth/Controllers/LoginController.cs index f0e86ef4..cb1b0f7d 100644 --- a/UKSF.Api.Auth/Controllers/LoginController.cs +++ b/UKSF.Api.Auth/Controllers/LoginController.cs @@ -18,7 +18,7 @@ public LoginController(ILoginService loginService, IHttpContextService httpConte } [HttpGet] - public bool IsUserAuthenticated() => HttpContext.User.Identity != null && HttpContext.User.Identity.IsAuthenticated; + public bool IsUserAuthenticated() => httpContextService.IsUserAuthenticated(); [HttpGet("refresh"), Authorize] public IActionResult RefreshToken() { diff --git a/UKSF.Api.Base/ApiBaseExtensions.cs b/UKSF.Api.Base/ApiBaseExtensions.cs index 01f8e83e..8938c585 100644 --- a/UKSF.Api.Base/ApiBaseExtensions.cs +++ b/UKSF.Api.Base/ApiBaseExtensions.cs @@ -2,18 +2,33 @@ using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Base.Database; using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models.Logging; using UKSF.Api.Base.Services; +using UKSF.Api.Base.Services.Data; namespace UKSF.Api.Base { public static class ApiBaseExtensions { - public static IServiceCollection AddUksfBase(this IServiceCollection services, IConfiguration configuration) { - services.AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))); - services.AddTransient(); - services.AddTransient(); - services.AddSingleton(); - services.AddSingleton(); + public static IServiceCollection AddUksfBase(this IServiceCollection services, IConfiguration configuration) => + services.AddContexts() + .AddEventBuses() + .AddEventHandlers() + .AddServices() + .AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))) + .AddTransient() + .AddTransient() + .AddSingleton() + .AddSingleton(); - return services; - } + private static IServiceCollection AddContexts(this IServiceCollection services) => + services.AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); + + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>(); + + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + + private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton(); } } diff --git a/UKSF.Api.Base/Services/Data/LogDataService.cs b/UKSF.Api.Base/Services/Data/LogDataService.cs new file mode 100644 index 00000000..bdf7a677 --- /dev/null +++ b/UKSF.Api.Base/Services/Data/LogDataService.cs @@ -0,0 +1,29 @@ +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models.Logging; + +namespace UKSF.Api.Base.Services.Data { + public interface ILogDataService : IDataService { } + + public interface IAuditLogDataService : IDataService { } + + public interface IHttpErrorLogDataService : IDataService { } + + public interface ILauncherLogDataService : IDataService { } + + public class LogDataService : DataService, ILogDataService { + public LogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "logs") { } + } + + public class AuditLogDataService : DataService, IAuditLogDataService { + public AuditLogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "auditLogs") { } + } + + public class HttpErrorLogDataService : DataService, IHttpErrorLogDataService { + public HttpErrorLogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "errorLogs") { } + } + + public class LauncherLogDataService : DataService, ILauncherLogDataService { + public LauncherLogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "launcherLogs") { } + } +} diff --git a/UKSF.Api.Base/Services/HttpContextService.cs b/UKSF.Api.Base/Services/HttpContextService.cs index 669ea735..1b88bd36 100644 --- a/UKSF.Api.Base/Services/HttpContextService.cs +++ b/UKSF.Api.Base/Services/HttpContextService.cs @@ -4,6 +4,7 @@ namespace UKSF.Api.Base.Services { public interface IHttpContextService { + bool IsUserAuthenticated(); public string GetUserId(); public string GetUserEmail(); bool UserHasPermission(string permission); @@ -14,6 +15,8 @@ public class HttpContextService : IHttpContextService { public HttpContextService(IHttpContextAccessor httpContextAccessor) => this.httpContextAccessor = httpContextAccessor; + public bool IsUserAuthenticated() => httpContextAccessor.HttpContext?.User.Identity != null && httpContextAccessor.HttpContext.User.Identity.IsAuthenticated; + public string GetUserId() => httpContextAccessor.HttpContext?.User.Claims.Single(x => x.Type == ClaimTypes.Sid).Value; public string GetUserEmail() => httpContextAccessor.HttpContext?.User.Claims.Single(x => x.Type == ClaimTypes.Email).Value; diff --git a/UKSF.Api.Command/ApiCommandExtensions.cs b/UKSF.Api.Command/ApiCommandExtensions.cs new file mode 100644 index 00000000..1ef12f6b --- /dev/null +++ b/UKSF.Api.Command/ApiCommandExtensions.cs @@ -0,0 +1,32 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Base.Events; +using UKSF.Api.Command.Context; +using UKSF.Api.Command.EventHandlers; +using UKSF.Api.Command.Models; +using UKSF.Api.Command.Services; + +namespace UKSF.Api.Command { + public static class ApiCommandExtensions { + public static IServiceCollection AddUksfCommand(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); + + private static IServiceCollection AddContexts(this IServiceCollection services) => + services.AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); + + private static IServiceCollection AddEventBuses(this IServiceCollection services) => + services.AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>(); + + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); + + private static IServiceCollection AddServices(this IServiceCollection services) => + services.AddSingleton() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient(); + } +} diff --git a/UKSF.Api.Command/ApiUKSF.Api.CommandExtExtensions.cs b/UKSF.Api.Command/ApiUKSF.Api.CommandExtExtensions.cs deleted file mode 100644 index 039d5ded..00000000 --- a/UKSF.Api.Command/ApiUKSF.Api.CommandExtExtensions.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; - -namespace UKSF.Api.Command { - public static class ApiExtensions { - public static IServiceCollection AddUksfTemplate(this IServiceCollection services, IConfiguration configuration) { - return services; - } - } -} diff --git a/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs b/UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs similarity index 62% rename from UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs rename to UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs index 6242f34f..159fcefb 100644 --- a/UKSF.Api.Data/Command/CommandRequestArchiveDataService.cs +++ b/UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs @@ -1,9 +1,12 @@ -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Command; -using UKSF.Api.Models.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Command.Models; + +namespace UKSF.Api.Command.Context { + public interface ICommandRequestArchiveDataService : IDataService { } -namespace UKSF.Api.Data.Command { public class CommandRequestArchiveDataService : DataService, ICommandRequestArchiveDataService { public CommandRequestArchiveDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base( dataCollectionFactory, diff --git a/UKSF.Api.Data/Command/CommandRequestDataService.cs b/UKSF.Api.Command/Context/CommandRequestDataService.cs similarity index 54% rename from UKSF.Api.Data/Command/CommandRequestDataService.cs rename to UKSF.Api.Command/Context/CommandRequestDataService.cs index 17b0d4b0..189ad255 100644 --- a/UKSF.Api.Data/Command/CommandRequestDataService.cs +++ b/UKSF.Api.Command/Context/CommandRequestDataService.cs @@ -1,9 +1,11 @@ -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Command; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Command.Models; + +namespace UKSF.Api.Command.Context { + public interface ICommandRequestDataService : IDataService, ICachedDataService { } -namespace UKSF.Api.Data.Command { public class CommandRequestDataService : CachedDataService, ICommandRequestDataService { public CommandRequestDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "commandRequests") { } } diff --git a/UKSF.Api.Data/Operations/OperationOrderDataService.cs b/UKSF.Api.Command/Context/OperationOrderDataService.cs similarity index 68% rename from UKSF.Api.Data/Operations/OperationOrderDataService.cs rename to UKSF.Api.Command/Context/OperationOrderDataService.cs index dbe341cc..4a3e1219 100644 --- a/UKSF.Api.Data/Operations/OperationOrderDataService.cs +++ b/UKSF.Api.Command/Context/OperationOrderDataService.cs @@ -1,11 +1,13 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Operations; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Command.Models; + +namespace UKSF.Api.Command.Context { + public interface IOperationOrderDataService : IDataService, ICachedDataService { } -namespace UKSF.Api.Data.Operations { public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { public OperationOrderDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "opord") { } diff --git a/UKSF.Api.Data/Operations/OperationReportDataService.cs b/UKSF.Api.Command/Context/OperationReportDataService.cs similarity index 68% rename from UKSF.Api.Data/Operations/OperationReportDataService.cs rename to UKSF.Api.Command/Context/OperationReportDataService.cs index 49848e26..2cf456d2 100644 --- a/UKSF.Api.Data/Operations/OperationReportDataService.cs +++ b/UKSF.Api.Command/Context/OperationReportDataService.cs @@ -1,11 +1,13 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Operations; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Command.Models; + +namespace UKSF.Api.Command.Context { + public interface IOperationReportDataService : IDataService, ICachedDataService { } -namespace UKSF.Api.Data.Operations { public class OperationReportDataService : CachedDataService, IOperationReportDataService { public OperationReportDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "oprep") { } diff --git a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs b/UKSF.Api.Command/Controllers/CommandRequestsController.cs similarity index 93% rename from UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs rename to UKSF.Api.Command/Controllers/CommandRequestsController.cs index 0b4cf889..b20caf21 100644 --- a/UKSF.Api/Controllers/CommandRequests/CommandRequestsController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsController.cs @@ -11,22 +11,18 @@ using UKSF.Api.Admin.Services; using UKSF.Api.Admin.Services.Data; using UKSF.Api.Base; +using UKSF.Api.Base.Events; using UKSF.Api.Base.Services; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Command; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Command; +using UKSF.Api.Command.Models; +using UKSF.Api.Command.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -using UKSF.Common; -namespace UKSF.Api.Controllers.CommandRequests { +namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.COMMAND)] public class CommandRequestsController : Controller { + public const string SUPER_ADMIN = "59e38f10594c603b78aa9dbd"; + private readonly ICommandRequestCompletionService commandRequestCompletionService; private readonly IHttpContextService httpContextService; private readonly ICommandRequestService commandRequestService; @@ -36,6 +32,8 @@ public class CommandRequestsController : Controller { private readonly IUnitsService unitsService; private readonly IVariablesDataService variablesDataService; private readonly IVariablesService variablesService; + private readonly IAccountService accountService; + private readonly ILogger logger; public CommandRequestsController( ICommandRequestService commandRequestService, @@ -45,7 +43,9 @@ public CommandRequestsController( IDisplayNameService displayNameService, INotificationsService notificationsService, IVariablesDataService variablesDataService, - IVariablesService variablesService + IVariablesService variablesService, + IAccountService accountService, + ILogger logger ) { this.commandRequestService = commandRequestService; this.commandRequestCompletionService = commandRequestCompletionService; @@ -56,6 +56,8 @@ IVariablesService variablesService this.notificationsService = notificationsService; this.variablesDataService = variablesDataService; this.variablesService = variablesService; + this.accountService = accountService; + this.logger = logger; } [HttpGet, Authorize] @@ -66,7 +68,7 @@ public IActionResult Get() { string contextId = httpContextService.GetUserId(); string id = variablesDataService.GetSingle("UNIT_ID_PERSONNEL").AsString(); bool canOverride = unitsService.Data.GetSingle(id).members.Any(x => x == contextId); - bool superAdmin = contextId == Global.SUPER_ADMIN; + bool superAdmin = contextId == SUPER_ADMIN; DateTime now = DateTime.Now; foreach (CommandRequest commandRequest in allRequests) { Dictionary.KeyCollection reviewers = commandRequest.reviews.Keys; diff --git a/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs similarity index 97% rename from UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs rename to UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs index 112d715b..83aa69f7 100644 --- a/UKSF.Api/Controllers/CommandRequests/CommandRequestsCreationController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs @@ -6,15 +6,12 @@ using Microsoft.AspNetCore.Mvc; using UKSF.Api.Base; using UKSF.Api.Base.Services; -using UKSF.Api.Interfaces.Command; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Command; +using UKSF.Api.Command.Models; +using UKSF.Api.Command.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Controllers.CommandRequests { +namespace UKSF.Api.Command.Controllers { [Route("CommandRequests/Create")] public class CommandRequestsCreationController : Controller { private readonly IAccountService accountService; diff --git a/UKSF.Api/Controllers/Accounts/OperationOrderController.cs b/UKSF.Api.Command/Controllers/OperationOrderController.cs similarity index 89% rename from UKSF.Api/Controllers/Accounts/OperationOrderController.cs rename to UKSF.Api.Command/Controllers/OperationOrderController.cs index f82fe8f2..f662185c 100644 --- a/UKSF.Api/Controllers/Accounts/OperationOrderController.cs +++ b/UKSF.Api.Command/Controllers/OperationOrderController.cs @@ -1,10 +1,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Interfaces.Operations; -using UKSF.Api.Models.Operations; +using UKSF.Api.Base; +using UKSF.Api.Command.Models; +using UKSF.Api.Command.Services; -namespace UKSF.Api.Controllers.Accounts { +namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] public class OperationOrderController : Controller { private readonly IOperationOrderService operationOrderService; diff --git a/UKSF.Api/Controllers/Accounts/OperationReportController.cs b/UKSF.Api.Command/Controllers/OperationReportController.cs similarity index 91% rename from UKSF.Api/Controllers/Accounts/OperationReportController.cs rename to UKSF.Api.Command/Controllers/OperationReportController.cs index a9cc6edf..f9e50284 100644 --- a/UKSF.Api/Controllers/Accounts/OperationReportController.cs +++ b/UKSF.Api.Command/Controllers/OperationReportController.cs @@ -2,10 +2,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Interfaces.Operations; -using UKSF.Api.Models.Operations; +using UKSF.Api.Base; +using UKSF.Api.Command.Models; +using UKSF.Api.Command.Services; -namespace UKSF.Api.Controllers.Accounts { +namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] public class OperationReportController : Controller { private readonly IOperationReportService operationReportService; diff --git a/UKSF.Api.Events/Handlers/CommandRequestEventHandler.cs b/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs similarity index 66% rename from UKSF.Api.Events/Handlers/CommandRequestEventHandler.cs rename to UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs index cb05d34c..35514bdd 100644 --- a/UKSF.Api.Events/Handlers/CommandRequestEventHandler.cs +++ b/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs @@ -1,29 +1,29 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Interfaces.Events.Handlers; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Models.Command; -using UKSF.Api.Models.Events; -using UKSF.Api.Signalr.Hubs.Command; -using UKSF.Common; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Extensions; +using UKSF.Api.Base.Models; +using UKSF.Api.Command.Models; +using UKSF.Api.Command.Signalr.Clients; +using UKSF.Api.Command.Signalr.Hubs; + +namespace UKSF.Api.Command.EventHandlers { + public interface ICommandRequestEventHandler : IEventHandler { } -namespace UKSF.Api.Events.Handlers { public class CommandRequestEventHandler : ICommandRequestEventHandler { private readonly IDataEventBus commandRequestDataEventBus; private readonly IHubContext hub; - private readonly ILoggingService loggingService; + private readonly ILogger logger; - public CommandRequestEventHandler(IDataEventBus commandRequestDataEventBus, IHubContext hub, ILoggingService loggingService) { + public CommandRequestEventHandler(IDataEventBus commandRequestDataEventBus, IHubContext hub, ILogger logger) { this.commandRequestDataEventBus = commandRequestDataEventBus; this.hub = hub; - this.loggingService = loggingService; + this.logger = logger; } public void Init() { - commandRequestDataEventBus.AsObservable().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + commandRequestDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => logger.LogError(exception)); } private async Task HandleEvent(DataEventModel dataEventModel) { diff --git a/UKSF.Api.Models/Command/ChainOfCommandMode.cs b/UKSF.Api.Command/Models/ChainOfCommandMode.cs similarity index 88% rename from UKSF.Api.Models/Command/ChainOfCommandMode.cs rename to UKSF.Api.Command/Models/ChainOfCommandMode.cs index ba157936..4d9b359d 100644 --- a/UKSF.Api.Models/Command/ChainOfCommandMode.cs +++ b/UKSF.Api.Command/Models/ChainOfCommandMode.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Models.Command { +namespace UKSF.Api.Command.Models { public enum ChainOfCommandMode { FULL, NEXT_COMMANDER, diff --git a/UKSF.Api.Models/Command/CommandRequest.cs b/UKSF.Api.Command/Models/CommandRequest.cs similarity index 95% rename from UKSF.Api.Models/Command/CommandRequest.cs rename to UKSF.Api.Command/Models/CommandRequest.cs index 489190be..1e12a9c9 100644 --- a/UKSF.Api.Models/Command/CommandRequest.cs +++ b/UKSF.Api.Command/Models/CommandRequest.cs @@ -2,8 +2,9 @@ using System.Collections.Generic; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Models.Command { +namespace UKSF.Api.Command.Models { public enum ReviewState { APPROVED, REJECTED, diff --git a/UKSF.Api.Models/Command/CommandRequestLoa.cs b/UKSF.Api.Command/Models/CommandRequestLoa.cs similarity index 84% rename from UKSF.Api.Models/Command/CommandRequestLoa.cs rename to UKSF.Api.Command/Models/CommandRequestLoa.cs index 3fd68164..bf729b30 100644 --- a/UKSF.Api.Models/Command/CommandRequestLoa.cs +++ b/UKSF.Api.Command/Models/CommandRequestLoa.cs @@ -1,6 +1,6 @@ using System; -namespace UKSF.Api.Models.Command { +namespace UKSF.Api.Command.Models { public class CommandRequestLoa : CommandRequest { public string emergency; public DateTime end; diff --git a/UKSF.Api.Models/Operations/CreateOperationOrderRequest.cs b/UKSF.Api.Command/Models/CreateOperationOrderRequest.cs similarity index 87% rename from UKSF.Api.Models/Operations/CreateOperationOrderRequest.cs rename to UKSF.Api.Command/Models/CreateOperationOrderRequest.cs index 70099953..b46b8805 100644 --- a/UKSF.Api.Models/Operations/CreateOperationOrderRequest.cs +++ b/UKSF.Api.Command/Models/CreateOperationOrderRequest.cs @@ -1,6 +1,6 @@ using System; -namespace UKSF.Api.Models.Operations { +namespace UKSF.Api.Command.Models { public class CreateOperationOrderRequest { public DateTime end; public int endtime; diff --git a/UKSF.Api.Models/Operations/CreateOperationReport.cs b/UKSF.Api.Command/Models/CreateOperationReport.cs similarity index 88% rename from UKSF.Api.Models/Operations/CreateOperationReport.cs rename to UKSF.Api.Command/Models/CreateOperationReport.cs index 17b5b7c4..eae2f637 100644 --- a/UKSF.Api.Models/Operations/CreateOperationReport.cs +++ b/UKSF.Api.Command/Models/CreateOperationReport.cs @@ -1,6 +1,6 @@ using System; -namespace UKSF.Api.Models.Operations { +namespace UKSF.Api.Command.Models { public class CreateOperationReportRequest { public DateTime end; public int endtime; diff --git a/UKSF.Api.Models/Operations/Opord.cs b/UKSF.Api.Command/Models/Opord.cs similarity index 79% rename from UKSF.Api.Models/Operations/Opord.cs rename to UKSF.Api.Command/Models/Opord.cs index e268dcfc..d0e4c609 100644 --- a/UKSF.Api.Models/Operations/Opord.cs +++ b/UKSF.Api.Command/Models/Opord.cs @@ -1,6 +1,7 @@ using System; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Models.Operations { +namespace UKSF.Api.Command.Models { public class Opord : DatabaseObject { public string description; public DateTime end; diff --git a/UKSF.Api.Models/Operations/Oprep.cs b/UKSF.Api.Command/Models/Oprep.cs similarity index 77% rename from UKSF.Api.Models/Operations/Oprep.cs rename to UKSF.Api.Command/Models/Oprep.cs index c0033d10..cb72650b 100644 --- a/UKSF.Api.Models/Operations/Oprep.cs +++ b/UKSF.Api.Command/Models/Oprep.cs @@ -1,7 +1,8 @@ using System; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Models.Operations { +namespace UKSF.Api.Command.Models { public class Oprep : DatabaseObject { public AttendanceReport attendanceReport; public string description; diff --git a/UKSF.Api.Services/Command/ChainOfCommandService.cs b/UKSF.Api.Command/Services/ChainOfCommandService.cs similarity index 92% rename from UKSF.Api.Services/Command/ChainOfCommandService.cs rename to UKSF.Api.Command/Services/ChainOfCommandService.cs index fc1505a9..e0db5595 100644 --- a/UKSF.Api.Services/Command/ChainOfCommandService.cs +++ b/UKSF.Api.Command/Services/ChainOfCommandService.cs @@ -1,26 +1,29 @@ using System; using System.Collections.Generic; using System.Linq; +using UKSF.Api.Base.Extensions; using UKSF.Api.Base.Services; -using UKSF.Api.Interfaces.Command; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Command; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; -using UKSF.Common; - -namespace UKSF.Api.Services.Command { +using UKSF.Api.Command.Models; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; + +namespace UKSF.Api.Command.Services { + public interface IChainOfCommandService { + HashSet ResolveChain(ChainOfCommandMode mode, string recipient, Unit start, Unit target); + bool InContextChainOfCommand(string id); + } + public class ChainOfCommandService : IChainOfCommandService { private readonly string commanderRoleName; private readonly IUnitsService unitsService; private readonly IHttpContextService httpContextService; + private readonly IAccountService accountService; - public ChainOfCommandService(IUnitsService unitsService, IRolesService rolesService, IHttpContextService httpContextService) { + public ChainOfCommandService(IUnitsService unitsService, IRolesService rolesService, IHttpContextService httpContextService, IAccountService accountService) { this.unitsService = unitsService; this.httpContextService = httpContextService; + this.accountService = accountService; commanderRoleName = rolesService.GetUnitRoleByOrder(0).name; } diff --git a/UKSF.Api.Services/Command/CommandRequestCompletionService.cs b/UKSF.Api.Command/Services/CommandRequestCompletionService.cs similarity index 96% rename from UKSF.Api.Services/Command/CommandRequestCompletionService.cs rename to UKSF.Api.Command/Services/CommandRequestCompletionService.cs index a8556c4c..a952ee67 100644 --- a/UKSF.Api.Services/Command/CommandRequestCompletionService.cs +++ b/UKSF.Api.Command/Services/CommandRequestCompletionService.cs @@ -1,27 +1,21 @@ using System; -using System.Reactive; using System.Threading.Tasks; using AvsAnLib; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; -using Octokit; +using UKSF.Api.Base.Events; using UKSF.Api.Base.Services; -using UKSF.Api.Interfaces.Command; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Command; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; +using UKSF.Api.Command.Models; +using UKSF.Api.Command.Signalr.Clients; +using UKSF.Api.Command.Signalr.Hubs; +using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -using UKSF.Api.Services.Message; -using UKSF.Api.Signalr.Hubs.Command; -using Notification = Octokit.Notification; -namespace UKSF.Api.Services.Command { +namespace UKSF.Api.Command.Services { + public interface ICommandRequestCompletionService { + Task Resolve(string id); + } + public class CommandRequestCompletionService : ICommandRequestCompletionService { private readonly IHttpContextService httpContextService; private readonly IAccountService accountService; @@ -31,6 +25,7 @@ public class CommandRequestCompletionService : ICommandRequestCompletionService private readonly IDischargeService dischargeService; private readonly ILoaService loaService; private readonly INotificationsService notificationsService; + private readonly ILogger logger; private readonly IUnitsService unitsService; @@ -43,7 +38,8 @@ public CommandRequestCompletionService( ILoaService loaService, IUnitsService unitsService, IHubContext commandRequestsHub, - INotificationsService notificationsService + INotificationsService notificationsService, + ILogger logger ) { this.httpContextService = httpContextService; this.accountService = accountService; @@ -55,6 +51,7 @@ INotificationsService notificationsService this.dischargeService = dischargeService; this.commandRequestsHub = commandRequestsHub; this.notificationsService = notificationsService; + this.logger = logger; } public async Task Resolve(string id) { diff --git a/UKSF.Api.Services/Command/CommandRequestService.cs b/UKSF.Api.Command/Services/CommandRequestService.cs similarity index 83% rename from UKSF.Api.Services/Command/CommandRequestService.cs rename to UKSF.Api.Command/Services/CommandRequestService.cs index e5be5518..5ed0027a 100644 --- a/UKSF.Api.Services/Command/CommandRequestService.cs +++ b/UKSF.Api.Command/Services/CommandRequestService.cs @@ -4,19 +4,25 @@ using System.Threading.Tasks; using AvsAnLib; using MongoDB.Driver; -using UKSF.Api.Interfaces.Command; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Command; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Message; - -namespace UKSF.Api.Services.Command { +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Command.Context; +using UKSF.Api.Command.Models; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; + +namespace UKSF.Api.Command.Services { + public interface ICommandRequestService : IDataBackedService { + Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE); + Task ArchiveRequest(string id); + Task SetRequestReviewState(CommandRequest request, string reviewerId, ReviewState newState); + Task SetRequestAllReviewStates(CommandRequest request, ReviewState newState); + ReviewState GetReviewState(string id, string reviewer); + bool IsRequestApproved(string id); + bool IsRequestRejected(string id); + bool DoesEquivalentRequestExist(CommandRequest request); + } + public class CommandRequestService : DataBackedService, ICommandRequestService { private readonly IAccountService accountService; private readonly IChainOfCommandService chainOfCommandService; @@ -25,6 +31,7 @@ public class CommandRequestService : DataBackedService { + Task Add(CreateOperationOrderRequest request); + } -namespace UKSF.Api.Services.Operations { public class OperationOrderService : DataBackedService, IOperationOrderService { public OperationOrderService(IOperationOrderDataService data) : base(data) { } diff --git a/UKSF.Api.Services/Operations/OperationReportService.cs b/UKSF.Api.Command/Services/OperationReportService.cs similarity index 75% rename from UKSF.Api.Services/Operations/OperationReportService.cs rename to UKSF.Api.Command/Services/OperationReportService.cs index e66f1331..f326e4c4 100644 --- a/UKSF.Api.Services/Operations/OperationReportService.cs +++ b/UKSF.Api.Command/Services/OperationReportService.cs @@ -1,10 +1,14 @@ using System.Threading.Tasks; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Operations; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Models.Operations; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Command.Context; +using UKSF.Api.Command.Models; +using UKSF.Api.Personnel.Services; + +namespace UKSF.Api.Command.Services { + public interface IOperationReportService : IDataBackedService { + Task Create(CreateOperationReportRequest request); + } -namespace UKSF.Api.Services.Operations { public class OperationReportService : DataBackedService, IOperationReportService { private readonly IAttendanceService attendanceService; diff --git a/UKSF.Api.Interfaces/Hubs/ICommandRequestsClient.cs b/UKSF.Api.Command/Signalr/Clients/ICommandRequestsClient.cs similarity index 73% rename from UKSF.Api.Interfaces/Hubs/ICommandRequestsClient.cs rename to UKSF.Api.Command/Signalr/Clients/ICommandRequestsClient.cs index 257052e9..aaa53ab7 100644 --- a/UKSF.Api.Interfaces/Hubs/ICommandRequestsClient.cs +++ b/UKSF.Api.Command/Signalr/Clients/ICommandRequestsClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSF.Api.Interfaces.Hubs { +namespace UKSF.Api.Command.Signalr.Clients { public interface ICommandRequestsClient { Task ReceiveRequestUpdate(); } diff --git a/UKSF.Api.Signalr/Hubs/Command/CommandRequestsHub.cs b/UKSF.Api.Command/Signalr/Hubs/CommandRequestsHub.cs similarity index 73% rename from UKSF.Api.Signalr/Hubs/Command/CommandRequestsHub.cs rename to UKSF.Api.Command/Signalr/Hubs/CommandRequestsHub.cs index e0085e69..d7159a91 100644 --- a/UKSF.Api.Signalr/Hubs/Command/CommandRequestsHub.cs +++ b/UKSF.Api.Command/Signalr/Hubs/CommandRequestsHub.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Command.Signalr.Clients; -namespace UKSF.Api.Signalr.Hubs.Command { +namespace UKSF.Api.Command.Signalr.Hubs { [Authorize] public class CommandRequestsHub : Hub { public const string END_POINT = "commandRequests"; diff --git a/UKSF.Api.Command/UKSF.Api.Command.csproj b/UKSF.Api.Command/UKSF.Api.Command.csproj index 57bad438..370dafc4 100644 --- a/UKSF.Api.Command/UKSF.Api.Command.csproj +++ b/UKSF.Api.Command/UKSF.Api.Command.csproj @@ -1,29 +1,13 @@ - + net5.0 - UKSF.Api.Command + Library - - - - - - - - - - - - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.Extensions.Configuration.Abstractions.dll - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0-rc.1.20451.17\ref\net5.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - + + diff --git a/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs b/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs deleted file mode 100644 index 2c755f1f..00000000 --- a/UKSF.Api.Data/Fake/FakeNotificationsDataService.cs +++ /dev/null @@ -1,7 +0,0 @@ -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Message; -using UKSF.Api.Services.Fake; - -namespace UKSF.Api.Data.Fake { - public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { } -} diff --git a/UKSF.Api.Data/UKSF.Api.Data.csproj b/UKSF.Api.Data/UKSF.Api.Data.csproj deleted file mode 100644 index 8d2623bf..00000000 --- a/UKSF.Api.Data/UKSF.Api.Data.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - netcoreapp5.0 - disable - - - full - true - - - - - - - - - - - - - diff --git a/UKSF.Api.Events/UKSF.Api.Events.csproj b/UKSF.Api.Events/UKSF.Api.Events.csproj deleted file mode 100644 index c57dcdf3..00000000 --- a/UKSF.Api.Events/UKSF.Api.Events.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - netcoreapp5.0 - - - full - true - - - - - - - - - - - - diff --git a/UKSF.Api.Integration.Instagram/ApiIntegrationInstagramExtensions.cs b/UKSF.Api.Integration.Instagram/ApiIntegrationInstagramExtensions.cs new file mode 100644 index 00000000..09858ba4 --- /dev/null +++ b/UKSF.Api.Integration.Instagram/ApiIntegrationInstagramExtensions.cs @@ -0,0 +1,23 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Integration.Instagram.ScheduledActions; +using UKSF.Api.Integration.Instagram.Services; + +namespace UKSF.Api.Integration.Instagram { + public static class ApiIntegrationInstagramExtensions { + public static IServiceCollection AddUksfIntegrationInstagram(this IServiceCollection services) => + services.AddContexts() + .AddEventBuses() + .AddEventHandlers() + .AddServices() + .AddTransient() + .AddTransient(); + + private static IServiceCollection AddContexts(this IServiceCollection services) => services; + + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; + + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + + private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton(); + } +} diff --git a/UKSF.Api/Controllers/InstagramController.cs b/UKSF.Api.Integration.Instagram/Controllers/InstagramController.cs similarity index 75% rename from UKSF.Api/Controllers/InstagramController.cs rename to UKSF.Api.Integration.Instagram/Controllers/InstagramController.cs index 37071130..d09c83d7 100644 --- a/UKSF.Api/Controllers/InstagramController.cs +++ b/UKSF.Api.Integration.Instagram/Controllers/InstagramController.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Models.Integrations; +using UKSF.Api.Integration.Instagram.Models; +using UKSF.Api.Integration.Instagram.Services; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Integration.Instagram.Controllers { [Route("[controller]")] public class InstagramController : Controller { private readonly IInstagramService instagramService; diff --git a/UKSF.Api.Models/Integrations/InstagramImage.cs b/UKSF.Api.Integration.Instagram/Models/InstagramImage.cs similarity index 86% rename from UKSF.Api.Models/Integrations/InstagramImage.cs rename to UKSF.Api.Integration.Instagram/Models/InstagramImage.cs index 515b2c31..df39e1e4 100644 --- a/UKSF.Api.Models/Integrations/InstagramImage.cs +++ b/UKSF.Api.Integration.Instagram/Models/InstagramImage.cs @@ -1,7 +1,7 @@ using System; using Newtonsoft.Json; -namespace UKSF.Api.Models.Integrations { +namespace UKSF.Api.Integration.Instagram.Models { public class InstagramImage { public string id; diff --git a/UKSF.Api.Utility/ScheduledActions/InstagramImagesAction.cs b/UKSF.Api.Integration.Instagram/ScheduledActions/InstagramImagesAction.cs similarity index 80% rename from UKSF.Api.Utility/ScheduledActions/InstagramImagesAction.cs rename to UKSF.Api.Integration.Instagram/ScheduledActions/InstagramImagesAction.cs index d638ab04..e7813bed 100644 --- a/UKSF.Api.Utility/ScheduledActions/InstagramImagesAction.cs +++ b/UKSF.Api.Integration.Instagram/ScheduledActions/InstagramImagesAction.cs @@ -1,6 +1,8 @@ using System.Threading.Tasks; +using UKSF.Api.Integration.Instagram.Services; +using UKSF.Api.Utility.ScheduledActions; -namespace UKSF.Api.Utility.ScheduledActions { +namespace UKSF.Api.Integration.Instagram.ScheduledActions { public interface IInstagramImagesAction : IScheduledAction { } public class InstagramImagesAction : IInstagramImagesAction { diff --git a/UKSF.Api.Utility/ScheduledActions/InstagramTokenAction.cs b/UKSF.Api.Integration.Instagram/ScheduledActions/InstagramTokenAction.cs similarity index 80% rename from UKSF.Api.Utility/ScheduledActions/InstagramTokenAction.cs rename to UKSF.Api.Integration.Instagram/ScheduledActions/InstagramTokenAction.cs index d588a64c..1ef1394d 100644 --- a/UKSF.Api.Utility/ScheduledActions/InstagramTokenAction.cs +++ b/UKSF.Api.Integration.Instagram/ScheduledActions/InstagramTokenAction.cs @@ -1,6 +1,8 @@ using System.Threading.Tasks; +using UKSF.Api.Integration.Instagram.Services; +using UKSF.Api.Utility.ScheduledActions; -namespace UKSF.Api.Utility.ScheduledActions { +namespace UKSF.Api.Integration.Instagram.ScheduledActions { public interface IInstagramTokenAction : IScheduledAction { } public class InstagramTokenAction : IInstagramTokenAction { diff --git a/UKSF.Api.Services/Integrations/InstagramService.cs b/UKSF.Api.Integration.Instagram/Services/InstagramService.cs similarity index 94% rename from UKSF.Api.Services/Integrations/InstagramService.cs rename to UKSF.Api.Integration.Instagram/Services/InstagramService.cs index e24737b3..a5e82167 100644 --- a/UKSF.Api.Services/Integrations/InstagramService.cs +++ b/UKSF.Api.Integration.Instagram/Services/InstagramService.cs @@ -8,10 +8,15 @@ using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; using UKSF.Api.Base.Events; -using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Models.Integrations; +using UKSF.Api.Integration.Instagram.Models; + +namespace UKSF.Api.Integration.Instagram.Services { + public interface IInstagramService { + Task RefreshAccessToken(); + Task CacheInstagramImages(); + IEnumerable GetImages(); + } -namespace UKSF.Api.Services.Integrations { public class InstagramService : IInstagramService { private readonly IVariablesService variablesService; private readonly ILogger logger; diff --git a/UKSF.Api.Integration.Instagram/UKSF.Api.Integration.Instagram.csproj b/UKSF.Api.Integration.Instagram/UKSF.Api.Integration.Instagram.csproj new file mode 100644 index 00000000..6e541609 --- /dev/null +++ b/UKSF.Api.Integration.Instagram/UKSF.Api.Integration.Instagram.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp5.0 + Library + + + + + + + + + + + + diff --git a/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs b/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs new file mode 100644 index 00000000..0c16af1c --- /dev/null +++ b/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs @@ -0,0 +1,16 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Discord.Services; + +namespace UKSF.Api.Discord { + public static class ApiIntegrationDiscordExtensions { + public static IServiceCollection AddUksfPersonnel(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); + + private static IServiceCollection AddContexts(this IServiceCollection services) => services; + + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; + + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + + private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton(); + } +} diff --git a/UKSF.Api/Controllers/DiscordController.cs b/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs similarity index 91% rename from UKSF.Api/Controllers/DiscordController.cs rename to UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs index 44883c2e..8c24d21c 100644 --- a/UKSF.Api/Controllers/DiscordController.cs +++ b/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs @@ -4,9 +4,10 @@ using Discord.WebSocket; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Interfaces.Integrations; +using UKSF.Api.Base; +using UKSF.Api.Discord.Services; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Discord.Controllers { [Route("[controller]")] public class DiscordController : Controller { private readonly IDiscordService discordService; diff --git a/UKSF.Api.Services/Integrations/DiscordService.cs b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs similarity index 95% rename from UKSF.Api.Services/Integrations/DiscordService.cs rename to UKSF.Api.Integrations.Discord/Services/DiscordService.cs index b8894a93..b4fa7ced 100644 --- a/UKSF.Api.Services/Integrations/DiscordService.cs +++ b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs @@ -8,11 +8,20 @@ using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; using UKSF.Api.Base.Events; -using UKSF.Api.Interfaces.Integrations; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Services.Integrations { +namespace UKSF.Api.Discord.Services { + public interface IDiscordService { + Task ConnectDiscord(); + (bool online, string nickname) GetOnlineUserDetails(Account account); + Task SendMessageToEveryone(ulong channelId, string message); + Task SendMessage(ulong channelId, string message); + Task> GetRoles(); + Task UpdateAllUsers(); + Task UpdateAccount(Account account, ulong discordId = 0); + } + public class DiscordService : IDiscordService, IDisposable { private static readonly string[] OWNER_REPLIES = {"Why thank you {0} owo", "Thank you {0}, you're too kind", "Thank you so much {0} uwu", "Aw shucks {0} you're embarrassing me"}; private static readonly string[] REPLIES = {"Why thank you {0}", "Thank you {0}, you're too kind", "Thank you so much {0}", "Aw shucks {0} you're embarrassing me"}; diff --git a/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj b/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj new file mode 100644 index 00000000..04e5684a --- /dev/null +++ b/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj @@ -0,0 +1,22 @@ + + + + netcoreapp5.0 + Library + UKSF.Api.Discord + + + + + + + + + + + + + + + + diff --git a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs new file mode 100644 index 00000000..bd02b6c2 --- /dev/null +++ b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs @@ -0,0 +1,23 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Teamspeak.EventHandlers; +using UKSF.Api.Teamspeak.ScheduledActions; +using UKSF.Api.Teamspeak.Services; + +namespace UKSF.Api.Teamspeak { + public static class ApiIntegrationTeamspeakExtensions { + public static IServiceCollection AddUksfIntegrationTeamspeak(this IServiceCollection services) => + services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddTransient(); + + private static IServiceCollection AddContexts(this IServiceCollection services) => services; + + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; + + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); + + private static IServiceCollection AddServices(this IServiceCollection services) => + services.AddSingleton() + .AddTransient() + .AddTransient() + .AddTransient(); + } +} diff --git a/UKSF.Api/Controllers/Accounts/OperationsController.cs b/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs similarity index 96% rename from UKSF.Api/Controllers/Accounts/OperationsController.cs rename to UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs index ac2e7762..a04c2b8d 100644 --- a/UKSF.Api/Controllers/Accounts/OperationsController.cs +++ b/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs @@ -4,9 +4,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; -using UKSF.Api.Models.Integrations; +using UKSF.Api.Base; +using UKSF.Api.Teamspeak.Models; -namespace UKSF.Api.Controllers.Accounts { +namespace UKSF.Api.Teamspeak.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] public class OperationsController : Controller { private readonly IMongoDatabase database; diff --git a/UKSF.Api/Controllers/TeamspeakController.cs b/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs similarity index 90% rename from UKSF.Api/Controllers/TeamspeakController.cs rename to UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs index fb75316f..55bbaa89 100644 --- a/UKSF.Api/Controllers/TeamspeakController.cs +++ b/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs @@ -3,8 +3,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Base; +using UKSF.Api.Teamspeak.Services; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Teamspeak.Controllers { [Route("[controller]")] public class TeamspeakController : Controller { private readonly ITeamspeakService teamspeakService; diff --git a/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs similarity index 85% rename from UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs rename to UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs index 0a110520..3744cb7e 100644 --- a/UKSF.Api.Events/Handlers/TeamspeakEventHandler.cs +++ b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs @@ -5,24 +5,23 @@ using System.Threading; using System.Threading.Tasks; using Newtonsoft.Json.Linq; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Interfaces.Events.Handlers; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Events.Types; -using UKSF.Api.Models.Integrations; -using UKSF.Api.Models.Personnel; -using UKSF.Common; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Extensions; +using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Teamspeak.Models; +using UKSF.Api.Teamspeak.Services; + +namespace UKSF.Api.Teamspeak.EventHandlers { + public interface ITeamspeakEventHandler : IEventHandler { } -namespace UKSF.Api.Events.Handlers { public class TeamspeakEventHandler : ITeamspeakEventHandler { private readonly IAccountService accountService; private readonly ISignalrEventBus eventBus; - private readonly ILoggingService loggingService; private readonly ConcurrentDictionary serverGroupUpdates = new ConcurrentDictionary(); private readonly ITeamspeakGroupService teamspeakGroupService; + private readonly ILogger logger; private readonly ITeamspeakService teamspeakService; public TeamspeakEventHandler( @@ -30,17 +29,17 @@ public TeamspeakEventHandler( ITeamspeakService teamspeakService, IAccountService accountService, ITeamspeakGroupService teamspeakGroupService, - ILoggingService loggingService + ILogger logger ) { this.eventBus = eventBus; this.teamspeakService = teamspeakService; this.accountService = accountService; this.teamspeakGroupService = teamspeakGroupService; - this.loggingService = loggingService; + this.logger = logger; } public void Init() { - eventBus.AsObservable().SubscribeAsync(HandleEvent, exception => loggingService.Log(exception)); + eventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => logger.LogError(exception)); } private async Task HandleEvent(SignalrEventModel signalrEventModel) { diff --git a/UKSF.Api.Models/Operations/Operation.cs b/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs similarity index 74% rename from UKSF.Api.Models/Operations/Operation.cs rename to UKSF.Api.Integrations.Teamspeak/Models/Operation.cs index bef329c9..087b2fbf 100644 --- a/UKSF.Api.Models/Operations/Operation.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs @@ -1,7 +1,8 @@ using System; -using UKSF.Api.Models.Personnel; +using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Models.Operations { +namespace UKSF.Api.Teamspeak.Models { public class Operation : DatabaseObject { public AttendanceReport attendanceReport; public DateTime end; diff --git a/UKSF.Api.Models/Integrations/TeamspeakClient.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs similarity index 80% rename from UKSF.Api.Models/Integrations/TeamspeakClient.cs rename to UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs index b6053b47..08d8257e 100644 --- a/UKSF.Api.Models/Integrations/TeamspeakClient.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Models.Integrations { +namespace UKSF.Api.Teamspeak.Models { public class TeamspeakClient { public double channelId; public string channelName; diff --git a/UKSF.Api.Models/Integrations/TeamspeakGroupProcedure.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs similarity index 73% rename from UKSF.Api.Models/Integrations/TeamspeakGroupProcedure.cs rename to UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs index 79cdc0bb..e06cf9fd 100644 --- a/UKSF.Api.Models/Integrations/TeamspeakGroupProcedure.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Models.Integrations { +namespace UKSF.Api.Teamspeak.Models { public class TeamspeakGroupProcedure { public double clientDbId; public double serverGroup; diff --git a/UKSF.Api.Models/Integrations/TeamspeakProcedureType.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakProcedureType.cs similarity index 78% rename from UKSF.Api.Models/Integrations/TeamspeakProcedureType.cs rename to UKSF.Api.Integrations.Teamspeak/Models/TeamspeakProcedureType.cs index 69618f1e..5711772a 100644 --- a/UKSF.Api.Models/Integrations/TeamspeakProcedureType.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakProcedureType.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Models.Integrations { +namespace UKSF.Api.Teamspeak.Models { public enum TeamspeakProcedureType { EMPTY, ASSIGN, diff --git a/UKSF.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs similarity index 88% rename from UKSF.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs rename to UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs index 454a94ae..b3e50826 100644 --- a/UKSF.Api.Models/Integrations/TeamspeakServerGroupUpdate.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; -namespace UKSF.Api.Models.Integrations { +namespace UKSF.Api.Teamspeak.Models { public class TeamspeakServerGroupUpdate { public readonly List serverGroups = new List(); public CancellationTokenSource cancellationTokenSource; diff --git a/UKSF.Api.Models/Integrations/TeamspeakServerSnapshot.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs similarity index 81% rename from UKSF.Api.Models/Integrations/TeamspeakServerSnapshot.cs rename to UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs index 520434fd..4c08ded3 100644 --- a/UKSF.Api.Models/Integrations/TeamspeakServerSnapshot.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace UKSF.Api.Models.Integrations { +namespace UKSF.Api.Teamspeak.Models { public class TeamspeakServerSnapshot { public DateTime timestamp; public HashSet users; diff --git a/UKSF.Api.Utility/ScheduledActions/TeamspeakSnapshotAction.cs b/UKSF.Api.Integrations.Teamspeak/ScheduledActions/TeamspeakSnapshotAction.cs similarity index 81% rename from UKSF.Api.Utility/ScheduledActions/TeamspeakSnapshotAction.cs rename to UKSF.Api.Integrations.Teamspeak/ScheduledActions/TeamspeakSnapshotAction.cs index 30031251..edd2605c 100644 --- a/UKSF.Api.Utility/ScheduledActions/TeamspeakSnapshotAction.cs +++ b/UKSF.Api.Integrations.Teamspeak/ScheduledActions/TeamspeakSnapshotAction.cs @@ -1,4 +1,7 @@ -namespace UKSF.Api.Utility.ScheduledActions { +using UKSF.Api.Teamspeak.Services; +using UKSF.Api.Utility.ScheduledActions; + +namespace UKSF.Api.Teamspeak.ScheduledActions { public interface ITeamspeakSnapshotAction : IScheduledAction { } public class TeamspeakSnapshotAction : ITeamspeakSnapshotAction { diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs similarity index 92% rename from UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs rename to UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs index 046cc03a..fe45df92 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakGroupService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs @@ -2,17 +2,19 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Bson; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Models; -using UKSF.Api.Models.Integrations; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; -using UKSF.Common; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.Base.Extensions; +using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Teamspeak.Models; + +namespace UKSF.Api.Teamspeak.Services { + public interface ITeamspeakGroupService { + Task UpdateAccountGroups(Account account, ICollection serverGroups, double clientDbId); + } -namespace UKSF.Api.Services.Integrations.Teamspeak { public class TeamspeakGroupService : ITeamspeakGroupService { private readonly IRanksService ranksService; private readonly ITeamspeakManagerService teamspeakManagerService; diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs similarity index 84% rename from UKSF.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs rename to UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs index 98516152..221b0374 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakManagerService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs @@ -4,15 +4,21 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Models.Integrations; -using UKSF.Api.Services.Admin; -using UKSF.Api.Signalr.Hubs.Integrations; -using UKSF.Common; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.Base.Extensions; +using UKSF.Api.Teamspeak.Models; +using UKSF.Api.Teamspeak.Signalr.Clients; +using UKSF.Api.Teamspeak.Signalr.Hubs; + +namespace UKSF.Api.Teamspeak.Services { + public interface ITeamspeakManagerService { + void Start(); + void Stop(); + Task SendGroupProcedure(TeamspeakProcedureType procedure, TeamspeakGroupProcedure groupProcedure); + Task SendProcedure(TeamspeakProcedureType procedure, object args); + } -namespace UKSF.Api.Services.Integrations.Teamspeak { public class TeamspeakManagerService : ITeamspeakManagerService { private readonly IHubContext hub; private readonly IVariablesService variablesService; diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakMetricsService.cs similarity index 54% rename from UKSF.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs rename to UKSF.Api.Integrations.Teamspeak/Services/TeamspeakMetricsService.cs index f5847905..0088357c 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakMetricsService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakMetricsService.cs @@ -1,7 +1,10 @@ using System.Collections.Generic; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -namespace UKSF.Api.Services.Integrations.Teamspeak { +namespace UKSF.Api.Teamspeak.Services { + public interface ITeamspeakMetricsService { + float GetWeeklyParticipationTrend(HashSet teamspeakIdentities); + } + public class TeamspeakMetricsService : ITeamspeakMetricsService { public float GetWeeklyParticipationTrend(HashSet teamspeakIdentities) => 3; } diff --git a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs similarity index 84% rename from UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs rename to UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs index a12b14d0..2b7a36f2 100644 --- a/UKSF.Api.Services/Integrations/Teamspeak/TeamspeakService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs @@ -6,13 +6,24 @@ using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Hosting; using MongoDB.Driver; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Models.Integrations; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Signalr.Hubs.Integrations; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Teamspeak.Models; +using UKSF.Api.Teamspeak.Signalr.Clients; +using UKSF.Api.Teamspeak.Signalr.Hubs; + +namespace UKSF.Api.Teamspeak.Services { + public interface ITeamspeakService { + IEnumerable GetOnlineTeamspeakClients(); + (bool online, string nickname) GetOnlineUserDetails(Account account); + IEnumerable GetFormattedClients(); + Task UpdateClients(HashSet newClients); + Task UpdateAccountTeamspeakGroups(Account account); + Task SendTeamspeakMessageToClient(Account account, string message); + Task SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message); + Task Shutdown(); + Task StoreTeamspeakServerSnapshot(); + } -namespace UKSF.Api.Services.Integrations.Teamspeak { public class TeamspeakService : ITeamspeakService { private readonly SemaphoreSlim clientsSemaphore = new SemaphoreSlim(1); private readonly IMongoDatabase database; diff --git a/UKSF.Api.Interfaces/Hubs/ITeamspeakClient.cs b/UKSF.Api.Integrations.Teamspeak/Signalr/Clients/ITeamspeakClient.cs similarity index 64% rename from UKSF.Api.Interfaces/Hubs/ITeamspeakClient.cs rename to UKSF.Api.Integrations.Teamspeak/Signalr/Clients/ITeamspeakClient.cs index ef64b9f2..5f3d9b64 100644 --- a/UKSF.Api.Interfaces/Hubs/ITeamspeakClient.cs +++ b/UKSF.Api.Integrations.Teamspeak/Signalr/Clients/ITeamspeakClient.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using UKSF.Api.Models.Integrations; +using UKSF.Api.Teamspeak.Models; -namespace UKSF.Api.Interfaces.Hubs { +namespace UKSF.Api.Teamspeak.Signalr.Clients { public interface ITeamspeakClient { Task Receive(TeamspeakProcedureType procedure, object args); } diff --git a/UKSF.Api.Interfaces/Hubs/ITeamspeakClientsClient.cs b/UKSF.Api.Integrations.Teamspeak/Signalr/Clients/ITeamspeakClientsClient.cs similarity index 73% rename from UKSF.Api.Interfaces/Hubs/ITeamspeakClientsClient.cs rename to UKSF.Api.Integrations.Teamspeak/Signalr/Clients/ITeamspeakClientsClient.cs index 2389140d..9e3cdd1c 100644 --- a/UKSF.Api.Interfaces/Hubs/ITeamspeakClientsClient.cs +++ b/UKSF.Api.Integrations.Teamspeak/Signalr/Clients/ITeamspeakClientsClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSF.Api.Interfaces.Hubs { +namespace UKSF.Api.Teamspeak.Signalr.Clients { public interface ITeamspeakClientsClient { Task ReceiveClients(object clients); } diff --git a/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakClientsHub.cs similarity index 67% rename from UKSF.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs rename to UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakClientsHub.cs index 9845a905..44f81e66 100644 --- a/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakClientsHub.cs +++ b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakClientsHub.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Teamspeak.Signalr.Clients; -namespace UKSF.Api.Signalr.Hubs.Integrations { +namespace UKSF.Api.Teamspeak.Signalr.Hubs { public class TeamspeakClientsHub : Hub { public const string END_POINT = "teamspeakClients"; } diff --git a/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs similarity index 84% rename from UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs rename to UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs index a6634167..617a5b9f 100644 --- a/UKSF.Api.Signalr/Hubs/Integrations/TeamspeakHub.cs +++ b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs @@ -1,12 +1,11 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Events.Types; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; +using UKSF.Api.Teamspeak.Signalr.Clients; -namespace UKSF.Api.Signalr.Hubs.Integrations { +namespace UKSF.Api.Teamspeak.Signalr.Hubs { public static class TeamspeakHubState { public static bool Connected; } diff --git a/UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj b/UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj new file mode 100644 index 00000000..abdfa35a --- /dev/null +++ b/UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp5.0 + Library + UKSF.Api.Teamspeak + + + + + + + + diff --git a/UKSF.Api.Interfaces/Command/IChainOfCommandService.cs b/UKSF.Api.Interfaces/Command/IChainOfCommandService.cs deleted file mode 100644 index 034b1628..00000000 --- a/UKSF.Api.Interfaces/Command/IChainOfCommandService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections.Generic; -using UKSF.Api.Models.Command; -using UKSF.Api.Models.Units; - -namespace UKSF.Api.Interfaces.Command { - public interface IChainOfCommandService { - HashSet ResolveChain(ChainOfCommandMode mode, string recipient, Unit start, Unit target); - bool InContextChainOfCommand(string id); - } -} diff --git a/UKSF.Api.Interfaces/Command/ICommandRequestCompletionService.cs b/UKSF.Api.Interfaces/Command/ICommandRequestCompletionService.cs deleted file mode 100644 index 4933cfaa..00000000 --- a/UKSF.Api.Interfaces/Command/ICommandRequestCompletionService.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Threading.Tasks; - -namespace UKSF.Api.Interfaces.Command { - public interface ICommandRequestCompletionService { - Task Resolve(string id); - } -} diff --git a/UKSF.Api.Interfaces/Command/ICommandRequestService.cs b/UKSF.Api.Interfaces/Command/ICommandRequestService.cs deleted file mode 100644 index 6f09e4a1..00000000 --- a/UKSF.Api.Interfaces/Command/ICommandRequestService.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading.Tasks; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Command; - -namespace UKSF.Api.Interfaces.Command { - public interface ICommandRequestService : IDataBackedService { - Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE); - Task ArchiveRequest(string id); - Task SetRequestReviewState(CommandRequest request, string reviewerId, ReviewState newState); - Task SetRequestAllReviewStates(CommandRequest request, ReviewState newState); - ReviewState GetReviewState(string id, string reviewer); - bool IsRequestApproved(string id); - bool IsRequestRejected(string id); - bool DoesEquivalentRequestExist(CommandRequest request); - } -} diff --git a/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs deleted file mode 100644 index b9c9c94e..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/IBuildsDataService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Threading.Tasks; -using MongoDB.Driver; -using UKSF.Api.Models.Modpack; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface IBuildsDataService : IDataService, ICachedDataService { - Task Update(ModpackBuild build, ModpackBuildStep buildStep); - Task Update(ModpackBuild build, UpdateDefinition updateDefinition); - } -} diff --git a/UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs deleted file mode 100644 index 260efa1c..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/ICommandRequestDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Models.Command; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface ICommandRequestDataService : IDataService, ICachedDataService { } -} diff --git a/UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs deleted file mode 100644 index 6826869b..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/IGameServersDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Models.Game; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface IGameServersDataService : IDataService, ICachedDataService { } -} diff --git a/UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs b/UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs deleted file mode 100644 index d0640468..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/ILauncherFileDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Models.Launcher; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface ILauncherFileDataService : IDataService, ICachedDataService { } -} diff --git a/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs deleted file mode 100644 index e8f0edd1..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/IOperationOrderDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Models.Operations; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface IOperationOrderDataService : IDataService, ICachedDataService { } -} diff --git a/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs deleted file mode 100644 index 81c447a9..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/IOperationReportDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Models.Operations; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface IOperationReportDataService : IDataService, ICachedDataService { } -} diff --git a/UKSF.Api.Interfaces/Data/Cached/IReleasesDataService.cs b/UKSF.Api.Interfaces/Data/Cached/IReleasesDataService.cs deleted file mode 100644 index 6084c8f3..00000000 --- a/UKSF.Api.Interfaces/Data/Cached/IReleasesDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Models.Modpack; - -namespace UKSF.Api.Interfaces.Data.Cached { - public interface IReleasesDataService : IDataService, ICachedDataService { } -} diff --git a/UKSF.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs b/UKSF.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs deleted file mode 100644 index 7929ba11..00000000 --- a/UKSF.Api.Interfaces/Data/ICommandRequestArchiveDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Models.Command; - -namespace UKSF.Api.Interfaces.Data { - public interface ICommandRequestArchiveDataService : IDataService { } -} diff --git a/UKSF.Api.Interfaces/Events/Handlers/IBuildsEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/IBuildsEventHandler.cs deleted file mode 100644 index ae5c7283..00000000 --- a/UKSF.Api.Interfaces/Events/Handlers/IBuildsEventHandler.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace UKSF.Api.Interfaces.Events.Handlers { - public interface IBuildsEventHandler : IEventHandler { } -} diff --git a/UKSF.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs deleted file mode 100644 index acc61fa7..00000000 --- a/UKSF.Api.Interfaces/Events/Handlers/ICommandRequestEventHandler.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace UKSF.Api.Interfaces.Events.Handlers { - public interface ICommandRequestEventHandler : IEventHandler { } -} diff --git a/UKSF.Api.Interfaces/Events/Handlers/ITeamspeakEventHandler.cs b/UKSF.Api.Interfaces/Events/Handlers/ITeamspeakEventHandler.cs deleted file mode 100644 index 998e542c..00000000 --- a/UKSF.Api.Interfaces/Events/Handlers/ITeamspeakEventHandler.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace UKSF.Api.Interfaces.Events.Handlers { - public interface ITeamspeakEventHandler : IEventHandler { } -} diff --git a/UKSF.Api.Interfaces/Events/ISignalrEventBus.cs b/UKSF.Api.Interfaces/Events/ISignalrEventBus.cs deleted file mode 100644 index e4ec03f7..00000000 --- a/UKSF.Api.Interfaces/Events/ISignalrEventBus.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Models.Events; - -namespace UKSF.Api.Interfaces.Events { - public interface ISignalrEventBus : IEventBus { } -} diff --git a/UKSF.Api.Interfaces/Game/IGameServerHelpers.cs b/UKSF.Api.Interfaces/Game/IGameServerHelpers.cs deleted file mode 100644 index 3e5548e4..00000000 --- a/UKSF.Api.Interfaces/Game/IGameServerHelpers.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using UKSF.Api.Models.Game; - -namespace UKSF.Api.Interfaces.Game { - public interface IGameServerHelpers { - string GetGameServerExecutablePath(GameServer gameServer); - string GetGameServerSettingsPath(); - string GetGameServerMissionsPath(); - string GetGameServerConfigPath(GameServer gameServer); - string GetGameServerModsPaths(GameEnvironment environment); - IEnumerable GetGameServerExtraModsPaths(); - string FormatGameServerConfig(GameServer gameServer, int playerCount, string missionSelection); - string FormatGameServerLaunchArguments(GameServer gameServer); - string FormatHeadlessClientLaunchArguments(GameServer gameServer, int index); - string GetMaxPlayerCountFromConfig(GameServer gameServer); - int GetMaxCuratorCountFromSettings(); - TimeSpan StripMilliseconds(TimeSpan time); - IEnumerable GetArmaProcesses(); - bool IsMainOpTime(); - } -} diff --git a/UKSF.Api.Interfaces/Game/IGameServersService.cs b/UKSF.Api.Interfaces/Game/IGameServersService.cs deleted file mode 100644 index 8aff5007..00000000 --- a/UKSF.Api.Interfaces/Game/IGameServersService.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Mission; - -namespace UKSF.Api.Interfaces.Game { - public interface IGameServersService : IDataBackedService { - int GetGameInstanceCount(); - Task UploadMissionFile(IFormFile file); - List GetMissionFiles(); - Task GetGameServerStatus(GameServer gameServer); - Task> GetAllGameServerStatuses(); - Task PatchMissionFile(string missionName); - void WriteServerConfig(GameServer gameServer, int playerCount, string missionSelection); - Task LaunchGameServer(GameServer gameServer); - Task StopGameServer(GameServer gameServer); - void KillGameServer(GameServer gameServer); - int KillAllArmaProcesses(); - List GetAvailableMods(string id); - List GetEnvironmentMods(GameEnvironment environment); - } -} diff --git a/UKSF.Api.Interfaces/Game/IMissionPatchingService.cs b/UKSF.Api.Interfaces/Game/IMissionPatchingService.cs deleted file mode 100644 index 7a2663f6..00000000 --- a/UKSF.Api.Interfaces/Game/IMissionPatchingService.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Threading.Tasks; -using UKSF.Api.Models.Mission; - -namespace UKSF.Api.Interfaces.Game { - public interface IMissionPatchingService { - Task PatchMission(string path); - } -} diff --git a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs b/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs deleted file mode 100644 index a03faded..00000000 --- a/UKSF.Api.Interfaces/Integrations/Github/IGithubService.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Octokit; -using UKSF.Api.Models.Integrations.Github; -using UKSF.Api.Models.Modpack; - -namespace UKSF.Api.Interfaces.Integrations.Github { - public interface IGithubService { - Task> GetBranches(); - Task> GetHistoricReleases(); - Task GetReferenceVersion(string reference); - Task GetLatestReferenceCommit(string reference); - Task GetPushEvent(PushWebhookPayload payload, string latestCommit = ""); - bool VerifySignature(string signature, string body); - Task IsReferenceValid(string reference); - Task GenerateChangelog(string version); - Task PublishRelease(ModpackRelease release); - } -} diff --git a/UKSF.Api.Interfaces/Integrations/IDiscordService.cs b/UKSF.Api.Interfaces/Integrations/IDiscordService.cs deleted file mode 100644 index 961a8954..00000000 --- a/UKSF.Api.Interfaces/Integrations/IDiscordService.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Discord.WebSocket; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Integrations { - public interface IDiscordService { - Task ConnectDiscord(); - (bool online, string nickname) GetOnlineUserDetails(Account account); - Task SendMessageToEveryone(ulong channelId, string message); - Task SendMessage(ulong channelId, string message); - Task> GetRoles(); - Task UpdateAllUsers(); - Task UpdateAccount(Account account, ulong discordId = 0); - } -} diff --git a/UKSF.Api.Interfaces/Integrations/IInstagramService.cs b/UKSF.Api.Interfaces/Integrations/IInstagramService.cs deleted file mode 100644 index 8c12b4a1..00000000 --- a/UKSF.Api.Interfaces/Integrations/IInstagramService.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using UKSF.Api.Models.Integrations; - -namespace UKSF.Api.Interfaces.Integrations { - public interface IInstagramService { - Task RefreshAccessToken(); - Task CacheInstagramImages(); - IEnumerable GetImages(); - } -} diff --git a/UKSF.Api.Interfaces/Integrations/IPipeManager.cs b/UKSF.Api.Interfaces/Integrations/IPipeManager.cs deleted file mode 100644 index ac03d0d3..00000000 --- a/UKSF.Api.Interfaces/Integrations/IPipeManager.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System; - -namespace UKSF.Api.Interfaces.Integrations { - public interface IPipeManager : IDisposable { - void Start(); - } -} diff --git a/UKSF.Api.Interfaces/Integrations/ISocket.cs b/UKSF.Api.Interfaces/Integrations/ISocket.cs deleted file mode 100644 index 8f2f26eb..00000000 --- a/UKSF.Api.Interfaces/Integrations/ISocket.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace UKSF.Api.Interfaces.Integrations { - public interface ISocket { - void Start(string port); - void Stop(); - void SendMessageToAllClients(string message); - void SendMessageToClient(string clientName, string message); - void SendMessageToClient(string clientName, byte[] data); - bool IsClientOnline(string clientName); - } -} diff --git a/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs deleted file mode 100644 index 4cc49dd9..00000000 --- a/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakGroupService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Integrations.Teamspeak { - public interface ITeamspeakGroupService { - Task UpdateAccountGroups(Account account, ICollection serverGroups, double clientDbId); - } -} diff --git a/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs deleted file mode 100644 index 8d0e29e6..00000000 --- a/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakManagerService.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Threading.Tasks; -using UKSF.Api.Models.Integrations; - -namespace UKSF.Api.Interfaces.Integrations.Teamspeak { - public interface ITeamspeakManagerService { - void Start(); - void Stop(); - Task SendGroupProcedure(TeamspeakProcedureType procedure, TeamspeakGroupProcedure groupProcedure); - Task SendProcedure(TeamspeakProcedureType procedure, object args); - } -} diff --git a/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs deleted file mode 100644 index db62a706..00000000 --- a/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakMetricsService.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Collections.Generic; - -namespace UKSF.Api.Interfaces.Integrations.Teamspeak { - public interface ITeamspeakMetricsService { - float GetWeeklyParticipationTrend(HashSet teamspeakIdentities); - } -} diff --git a/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs b/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs deleted file mode 100644 index a9181b11..00000000 --- a/UKSF.Api.Interfaces/Integrations/Teamspeak/ITeamspeakService.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using UKSF.Api.Models.Integrations; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Interfaces.Integrations.Teamspeak { - public interface ITeamspeakService { - IEnumerable GetOnlineTeamspeakClients(); - (bool online, string nickname) GetOnlineUserDetails(Account account); - IEnumerable GetFormattedClients(); - Task UpdateClients(HashSet newClients); - Task UpdateAccountTeamspeakGroups(Account account); - Task SendTeamspeakMessageToClient(Account account, string message); - Task SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message); - Task Shutdown(); - Task StoreTeamspeakServerSnapshot(); - } -} diff --git a/UKSF.Api.Interfaces/Launcher/ILauncherFileService.cs b/UKSF.Api.Interfaces/Launcher/ILauncherFileService.cs deleted file mode 100644 index 665468f9..00000000 --- a/UKSF.Api.Interfaces/Launcher/ILauncherFileService.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Launcher; - -namespace UKSF.Api.Interfaces.Launcher { - public interface ILauncherFileService : IDataBackedService { - Task UpdateAllVersions(); - FileStreamResult GetLauncherFile(params string[] file); - Task GetUpdatedFiles(IEnumerable files); - } -} diff --git a/UKSF.Api.Interfaces/Launcher/ILauncherService.cs b/UKSF.Api.Interfaces/Launcher/ILauncherService.cs deleted file mode 100644 index a5c5b0ef..00000000 --- a/UKSF.Api.Interfaces/Launcher/ILauncherService.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace UKSF.Api.Interfaces.Launcher { - public interface ILauncherService { } -} diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildProcessorService.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildProcessorService.cs deleted file mode 100644 index f0dcbbdf..00000000 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildProcessorService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading; -using System.Threading.Tasks; -using UKSF.Api.Models.Modpack; - -namespace UKSF.Api.Interfaces.Modpack.BuildProcess { - public interface IBuildProcessorService { - Task ProcessBuild(ModpackBuild build, CancellationTokenSource cancellationTokenSource); - } -} diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs deleted file mode 100644 index b5c7789b..00000000 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildQueueService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using UKSF.Api.Models.Modpack; - -namespace UKSF.Api.Interfaces.Modpack.BuildProcess { - public interface IBuildQueueService { - void QueueBuild(ModpackBuild build); - bool CancelQueued(string id); - void Cancel(string id); - void CancelAll(); - } -} diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs deleted file mode 100644 index e034d083..00000000 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IBuildStepService.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections.Generic; -using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Modpack; - -namespace UKSF.Api.Interfaces.Modpack.BuildProcess { - public interface IBuildStepService { - void RegisterBuildSteps(); - List GetSteps(GameEnvironment environment); - ModpackBuildStep GetRestoreStepForRelease(); - IBuildStep ResolveBuildStep(string buildStepName); - } -} diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs deleted file mode 100644 index d0b2c945..00000000 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/IStepLogger.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace UKSF.Api.Interfaces.Modpack.BuildProcess { - public interface IStepLogger { - void LogStart(); - void LogSuccess(); - void LogCancelled(); - void LogSkipped(); - void LogWarning(string message); - void LogError(Exception exception); - void LogSurround(string log); - void Log(string log, string colour = ""); - void LogInline(string log); - } -} diff --git a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs b/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs deleted file mode 100644 index 2b51b76f..00000000 --- a/UKSF.Api.Interfaces/Modpack/BuildProcess/Steps/IBuildStep.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Threading; -using System.Threading.Tasks; -using MongoDB.Driver; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Models.Modpack; - -namespace UKSF.Api.Interfaces.Modpack.BuildProcess.Steps { - public interface IBuildStep { - void Init( - ModpackBuild modpackBuild, - ModpackBuildStep modpackBuildStep, - Func, Task> buildUpdateCallback, - Func stepUpdateCallback, - CancellationTokenSource cancellationTokenSource, - IVariablesService variablesService - ); - - Task Start(); - bool CheckGuards(); - Task Setup(); - Task Process(); - Task Succeed(); - Task Fail(Exception exception); - Task Cancel(); - void Warning(string message); - Task Skip(); - } -} diff --git a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs b/UKSF.Api.Interfaces/Modpack/IBuildsService.cs deleted file mode 100644 index 00178da9..00000000 --- a/UKSF.Api.Interfaces/Modpack/IBuildsService.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using MongoDB.Driver; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Integrations.Github; -using UKSF.Api.Models.Modpack; - -namespace UKSF.Api.Interfaces.Modpack { - public interface IBuildsService : IDataBackedService { - IEnumerable GetDevBuilds(); - IEnumerable GetRcBuilds(); - ModpackBuild GetLatestDevBuild(); - ModpackBuild GetLatestRcBuild(string version); - Task UpdateBuild(ModpackBuild build, UpdateDefinition updateDefinition); - Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep); - Task CreateDevBuild(string version, GithubCommit commit, NewBuild newBuild = null); - Task CreateRcBuild(string version, GithubCommit commit); - Task CreateReleaseBuild(string version); - Task SetBuildRunning(ModpackBuild build); - Task SucceedBuild(ModpackBuild build); - Task FailBuild(ModpackBuild build); - Task CancelBuild(ModpackBuild build); - Task CreateRebuild(ModpackBuild build, string newSha = ""); - void CancelInterruptedBuilds(); - } -} diff --git a/UKSF.Api.Interfaces/Modpack/IModpackService.cs b/UKSF.Api.Interfaces/Modpack/IModpackService.cs deleted file mode 100644 index f75520cc..00000000 --- a/UKSF.Api.Interfaces/Modpack/IModpackService.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Octokit; -using UKSF.Api.Models.Modpack; - -namespace UKSF.Api.Interfaces.Modpack { - public interface IModpackService { - IEnumerable GetReleases(); - IEnumerable GetRcBuilds(); - IEnumerable GetDevBuilds(); - ModpackRelease GetRelease(string version); - ModpackBuild GetBuild(string id); - Task NewBuild(NewBuild newBuild); - Task Rebuild(ModpackBuild build); - Task CancelBuild(ModpackBuild build); - Task UpdateReleaseDraft(ModpackRelease release); - Task Release(string version); - Task RegnerateReleaseDraftChangelog(string version); - Task CreateDevBuildFromPush(PushWebhookPayload payload); - Task CreateRcBuildFromPush(PushWebhookPayload payload); - void RunQueuedBuilds(); - } -} diff --git a/UKSF.Api.Interfaces/Modpack/IReleaseService.cs b/UKSF.Api.Interfaces/Modpack/IReleaseService.cs deleted file mode 100644 index eca748a1..00000000 --- a/UKSF.Api.Interfaces/Modpack/IReleaseService.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Integrations.Github; -using UKSF.Api.Models.Modpack; - -namespace UKSF.Api.Interfaces.Modpack { - public interface IReleaseService : IDataBackedService { - Task MakeDraftRelease(string version, GithubCommit commit); - Task UpdateDraft(ModpackRelease release); - Task PublishRelease(string version); - ModpackRelease GetRelease(string version); - Task AddHistoricReleases(IEnumerable releases); - } -} diff --git a/UKSF.Api.Interfaces/Operations/IOperationOrderService.cs b/UKSF.Api.Interfaces/Operations/IOperationOrderService.cs deleted file mode 100644 index c60d7500..00000000 --- a/UKSF.Api.Interfaces/Operations/IOperationOrderService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading.Tasks; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Operations; - -namespace UKSF.Api.Interfaces.Operations { - public interface IOperationOrderService : IDataBackedService { - Task Add(CreateOperationOrderRequest request); - } -} diff --git a/UKSF.Api.Interfaces/Operations/IOperationReportService.cs b/UKSF.Api.Interfaces/Operations/IOperationReportService.cs deleted file mode 100644 index 581e3aa4..00000000 --- a/UKSF.Api.Interfaces/Operations/IOperationReportService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading.Tasks; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Models.Operations; - -namespace UKSF.Api.Interfaces.Operations { - public interface IOperationReportService : IDataBackedService { - Task Create(CreateOperationReportRequest request); - } -} diff --git a/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj b/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj deleted file mode 100644 index 31acc653..00000000 --- a/UKSF.Api.Interfaces/UKSF.Api.Interfaces.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - netcoreapp5.0 - - - full - true - - - - - - - - - - - - - diff --git a/UKSF.Api.Interfaces/Utility/IServerService.cs b/UKSF.Api.Interfaces/Utility/IServerService.cs deleted file mode 100644 index 1f326a57..00000000 --- a/UKSF.Api.Interfaces/Utility/IServerService.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace UKSF.Api.Interfaces.Utility { - public interface IServerService { - void UpdateSquadXml(); - } -} diff --git a/UKSF.Api.Launcher/ApiLauncherExtensions.cs b/UKSF.Api.Launcher/ApiLauncherExtensions.cs new file mode 100644 index 00000000..ff976be2 --- /dev/null +++ b/UKSF.Api.Launcher/ApiLauncherExtensions.cs @@ -0,0 +1,20 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Launcher.Context; +using UKSF.Api.Launcher.Services; +using UKSF.Api.Personnel.ScheduledActions; + +namespace UKSF.Api.Launcher { + public static class ApiLauncherExtensions { + public static IServiceCollection AddUksfLauncher(this IServiceCollection services) => + services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddTransient(); + + private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton(); + + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; + + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + + private static IServiceCollection AddServices(this IServiceCollection services) => + services.AddSingleton().AddTransient(); + } +} diff --git a/UKSF.Api.Data/Launcher/LauncherFileDataService.cs b/UKSF.Api.Launcher/Context/LauncherFileDataService.cs similarity index 53% rename from UKSF.Api.Data/Launcher/LauncherFileDataService.cs rename to UKSF.Api.Launcher/Context/LauncherFileDataService.cs index 66e63f35..ab66df7e 100644 --- a/UKSF.Api.Data/Launcher/LauncherFileDataService.cs +++ b/UKSF.Api.Launcher/Context/LauncherFileDataService.cs @@ -1,9 +1,11 @@ -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Launcher; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Launcher.Models; + +namespace UKSF.Api.Launcher.Context { + public interface ILauncherFileDataService : IDataService, ICachedDataService { } -namespace UKSF.Api.Data.Launcher { public class LauncherFileDataService : CachedDataService, ILauncherFileDataService { public LauncherFileDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "launcherFiles") { } } diff --git a/UKSF.Api/Controllers/LauncherController.cs b/UKSF.Api.Launcher/Controllers/LauncherController.cs similarity index 86% rename from UKSF.Api/Controllers/LauncherController.cs rename to UKSF.Api.Launcher/Controllers/LauncherController.cs index c8e2b476..a20baf78 100644 --- a/UKSF.Api/Controllers/LauncherController.cs +++ b/UKSF.Api.Launcher/Controllers/LauncherController.cs @@ -11,19 +11,13 @@ using UKSF.Api.Admin.Services.Data; using UKSF.Api.Base; using UKSF.Api.Base.Services; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Launcher; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Launcher; -using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Launcher.Models; +using UKSF.Api.Launcher.Services; +using UKSF.Api.Launcher.Signalr.Clients; +using UKSF.Api.Launcher.Signalr.Hubs; using UKSF.Api.Personnel.Services; -using UKSF.Api.Signalr.Hubs.Integrations; -using UKSF.Common; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Launcher.Controllers { [Route("[controller]"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER)] public class LauncherController : Controller { private readonly IDisplayNameService displayNameService; @@ -87,7 +81,7 @@ public async Task GetUpdatedFiles([FromBody] JObject body) { public IActionResult ReportError([FromBody] JObject body) { string version = body["version"].ToString(); string message = body["message"].ToString(); - // logger.Log(new LauncherLogMessage(version, message) { userId = httpContextService.GetUserId(), name = displayNameService.GetDisplayName(accountService.GetUserAccount()) }); + // logger.Log(new LauncherLog(version, message) { userId = httpContextService.GetUserId(), name = displayNameService.GetDisplayName(accountService.GetUserAccount()) }); return Ok(); } diff --git a/UKSF.Api.Models/Launcher/LauncherFile.cs b/UKSF.Api.Launcher/Models/LauncherFile.cs similarity index 64% rename from UKSF.Api.Models/Launcher/LauncherFile.cs rename to UKSF.Api.Launcher/Models/LauncherFile.cs index 87a4c1e5..d3f501eb 100644 --- a/UKSF.Api.Models/Launcher/LauncherFile.cs +++ b/UKSF.Api.Launcher/Models/LauncherFile.cs @@ -1,4 +1,6 @@ -namespace UKSF.Api.Models.Launcher { +using UKSF.Api.Base.Models; + +namespace UKSF.Api.Launcher.Models { public class LauncherFile : DatabaseObject { public string fileName; public string version; diff --git a/UKSF.Api.Services/Launcher/LauncherFileService.cs b/UKSF.Api.Launcher/Services/LauncherFileService.cs similarity index 90% rename from UKSF.Api.Services/Launcher/LauncherFileService.cs rename to UKSF.Api.Launcher/Services/LauncherFileService.cs index d122e54d..0dfaa47d 100644 --- a/UKSF.Api.Services/Launcher/LauncherFileService.cs +++ b/UKSF.Api.Launcher/Services/LauncherFileService.cs @@ -8,14 +8,19 @@ using Microsoft.AspNetCore.Mvc; using MimeMapping; using MongoDB.Driver; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Launcher; -using UKSF.Api.Models.Launcher; -using UKSF.Api.Services.Admin; -using UKSF.Common; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Launcher.Context; +using UKSF.Api.Launcher.Models; + +namespace UKSF.Api.Launcher.Services { + public interface ILauncherFileService : IDataBackedService { + Task UpdateAllVersions(); + FileStreamResult GetLauncherFile(params string[] file); + Task GetUpdatedFiles(IEnumerable files); + } -namespace UKSF.Api.Services.Launcher { public class LauncherFileService : DataBackedService, ILauncherFileService { private readonly IVariablesService variablesService; public LauncherFileService(ILauncherFileDataService data, IVariablesService variablesService) : base(data) { diff --git a/UKSF.Api.Services/Launcher/LauncherService.cs b/UKSF.Api.Launcher/Services/LauncherService.cs similarity index 65% rename from UKSF.Api.Services/Launcher/LauncherService.cs rename to UKSF.Api.Launcher/Services/LauncherService.cs index 60244169..ccd24c34 100644 --- a/UKSF.Api.Services/Launcher/LauncherService.cs +++ b/UKSF.Api.Launcher/Services/LauncherService.cs @@ -1,9 +1,10 @@ using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Launcher; -using UKSF.Api.Signalr.Hubs.Integrations; +using UKSF.Api.Launcher.Signalr.Clients; +using UKSF.Api.Launcher.Signalr.Hubs; + +namespace UKSF.Api.Launcher.Services { + public interface ILauncherService { } -namespace UKSF.Api.Services.Launcher { public class LauncherService : ILauncherService { private readonly IHubContext launcherHub; diff --git a/UKSF.Api.Interfaces/Hubs/ILauncherClient.cs b/UKSF.Api.Launcher/Signalr/Clients/ILauncherClient.cs similarity index 74% rename from UKSF.Api.Interfaces/Hubs/ILauncherClient.cs rename to UKSF.Api.Launcher/Signalr/Clients/ILauncherClient.cs index 0ace0f82..cff8a9af 100644 --- a/UKSF.Api.Interfaces/Hubs/ILauncherClient.cs +++ b/UKSF.Api.Launcher/Signalr/Clients/ILauncherClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSF.Api.Interfaces.Hubs { +namespace UKSF.Api.Launcher.Signalr.Clients { public interface ILauncherClient { Task ReceiveLauncherVersion(string version); } diff --git a/UKSF.Api.Signalr/Hubs/Integrations/LauncherHub.cs b/UKSF.Api.Launcher/Signalr/Hubs/LauncherHub.cs similarity index 71% rename from UKSF.Api.Signalr/Hubs/Integrations/LauncherHub.cs rename to UKSF.Api.Launcher/Signalr/Hubs/LauncherHub.cs index e6aecb56..d8024dbc 100644 --- a/UKSF.Api.Signalr/Hubs/Integrations/LauncherHub.cs +++ b/UKSF.Api.Launcher/Signalr/Hubs/LauncherHub.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Launcher.Signalr.Clients; -namespace UKSF.Api.Signalr.Hubs.Integrations { +namespace UKSF.Api.Launcher.Signalr.Hubs { [Authorize] public class LauncherHub : Hub { public const string END_POINT = "launcher"; diff --git a/UKSF.Api.Launcher/UKSF.Api.Launcher.csproj b/UKSF.Api.Launcher/UKSF.Api.Launcher.csproj new file mode 100644 index 00000000..b2f78fee --- /dev/null +++ b/UKSF.Api.Launcher/UKSF.Api.Launcher.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp5.0 + Library + + + + + + + + + + + + diff --git a/UKSF.Api.Models/UKSF.Api.Models.csproj b/UKSF.Api.Models/UKSF.Api.Models.csproj deleted file mode 100644 index 55f673de..00000000 --- a/UKSF.Api.Models/UKSF.Api.Models.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - netcoreapp5.0 - UKSF.Api.Models - UKSF.Api.Models - disable - - - full - true - - - - - - - - diff --git a/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings b/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings index 6402b607..e7d45a2a 100644 --- a/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings +++ b/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings @@ -1,8 +1 @@ - - IF_OWNER_IS_SINGLE_LINE - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - - True - True - True - True \ No newline at end of file + \ No newline at end of file diff --git a/UKSF.Api.Models/Utility/UtilityObject.cs b/UKSF.Api.Models/Utility/UtilityObject.cs deleted file mode 100644 index 47686070..00000000 --- a/UKSF.Api.Models/Utility/UtilityObject.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Collections.Generic; - -namespace UKSF.Api.Models.Utility { - public class UtilityObject : DatabaseObject { - public Dictionary values = new Dictionary(); - } -} diff --git a/UKSF.Api.Modpack/ApiModpackExtensions.cs b/UKSF.Api.Modpack/ApiModpackExtensions.cs new file mode 100644 index 00000000..c974c249 --- /dev/null +++ b/UKSF.Api.Modpack/ApiModpackExtensions.cs @@ -0,0 +1,30 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Base.Events; +using UKSF.Api.Modpack.EventHandlers; +using UKSF.Api.Modpack.Models; +using UKSF.Api.Modpack.Services; +using UKSF.Api.Modpack.Services.BuildProcess; +using UKSF.Api.Modpack.Services.Data; + +namespace UKSF.Api.Modpack { + public static class ApiModpackExtensions { + public static IServiceCollection AddUksfModpack(this IServiceCollection services) => + services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddTransient(); + + private static IServiceCollection AddContexts(this IServiceCollection services) => + services.AddSingleton().AddSingleton(); + + private static IServiceCollection AddEventBuses(this IServiceCollection services) => + services.AddSingleton, DataEventBus>().AddSingleton, DataEventBus>(); + + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); + + private static IServiceCollection AddServices(this IServiceCollection services) => + services.AddSingleton() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient(); + } +} diff --git a/UKSF.Api/Controllers/Integrations/GithubController.cs b/UKSF.Api.Modpack/Controllers/GithubController.cs similarity index 94% rename from UKSF.Api/Controllers/Integrations/GithubController.cs rename to UKSF.Api.Modpack/Controllers/GithubController.cs index 6394e137..7a9d0a59 100644 --- a/UKSF.Api/Controllers/Integrations/GithubController.cs +++ b/UKSF.Api.Modpack/Controllers/GithubController.cs @@ -6,11 +6,11 @@ using Newtonsoft.Json.Linq; using Octokit; using Octokit.Internal; -using UKSF.Api.Interfaces.Integrations.Github; -using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Models.Modpack; +using UKSF.Api.Base; +using UKSF.Api.Modpack.Models; +using UKSF.Api.Modpack.Services; -namespace UKSF.Api.Controllers.Integrations { +namespace UKSF.Api.Modpack.Controllers { [Route("[controller]")] public class GithubController : Controller { private const string PUSH_EVENT = "push"; diff --git a/UKSF.Api/Controllers/IssueController.cs b/UKSF.Api.Modpack/Controllers/IssueController.cs similarity index 95% rename from UKSF.Api/Controllers/IssueController.cs rename to UKSF.Api.Modpack/Controllers/IssueController.cs index 34f06090..ce717e96 100644 --- a/UKSF.Api/Controllers/IssueController.cs +++ b/UKSF.Api.Modpack/Controllers/IssueController.cs @@ -10,12 +10,9 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Base; using UKSF.Api.Base.Services; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Modpack.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] public class IssueController : Controller { private readonly IDisplayNameService displayNameService; diff --git a/UKSF.Api/Controllers/Modpack/ModpackController.cs b/UKSF.Api.Modpack/Controllers/ModpackController.cs similarity index 96% rename from UKSF.Api/Controllers/Modpack/ModpackController.cs rename to UKSF.Api.Modpack/Controllers/ModpackController.cs index 1f6e67d5..39b1cc18 100644 --- a/UKSF.Api/Controllers/Modpack/ModpackController.cs +++ b/UKSF.Api.Modpack/Controllers/ModpackController.cs @@ -2,11 +2,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Interfaces.Integrations.Github; -using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Models.Modpack; +using UKSF.Api.Base; +using UKSF.Api.Modpack.Models; +using UKSF.Api.Modpack.Services; -namespace UKSF.Api.Controllers.Modpack { +namespace UKSF.Api.Modpack.Controllers { [Route("[controller]")] public class ModpackController : Controller { private readonly IGithubService githubService; diff --git a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs b/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs similarity index 76% rename from UKSF.Api.Events/Handlers/BuildsEventHandler.cs rename to UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs index 06a76535..2606222c 100644 --- a/UKSF.Api.Events/Handlers/BuildsEventHandler.cs +++ b/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs @@ -1,31 +1,30 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Interfaces.Events.Handlers; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Modpack; -using UKSF.Api.Signalr.Hubs.Modpack; -using UKSF.Common; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Extensions; +using UKSF.Api.Base.Models; +using UKSF.Api.Modpack.Models; +using UKSF.Api.Modpack.Signalr.Clients; +using UKSF.Api.Modpack.Signalr.Hubs; + +namespace UKSF.Api.Modpack.EventHandlers { + public interface IBuildsEventHandler : IEventHandler { } -namespace UKSF.Api.Events.Handlers { public class BuildsEventHandler : IBuildsEventHandler { private readonly IDataEventBus modpackBuildEventBus; private readonly IHubContext hub; - private readonly ILoggingService loggingService; + private readonly ILogger logger; - public BuildsEventHandler(IDataEventBus modpackBuildEventBus, IHubContext hub, ILoggingService loggingService) { + public BuildsEventHandler(IDataEventBus modpackBuildEventBus, IHubContext hub, ILogger logger) { this.modpackBuildEventBus = modpackBuildEventBus; this.hub = hub; - this.loggingService = loggingService; + this.logger = logger; } public void Init() { - modpackBuildEventBus.AsObservable().SubscribeAsync(HandleBuildEvent, exception => loggingService.Log(exception)); + modpackBuildEventBus.AsObservable().SubscribeWithAsyncNext(HandleBuildEvent, exception => logger.LogError(exception)); } private async Task HandleBuildEvent(DataEventModel dataEventModel) { diff --git a/UKSF.Api.Models/Integrations/Github/GithubCommit.cs b/UKSF.Api.Modpack/Models/GithubCommit.cs similarity index 81% rename from UKSF.Api.Models/Integrations/Github/GithubCommit.cs rename to UKSF.Api.Modpack/Models/GithubCommit.cs index 91c35b19..31e1192c 100644 --- a/UKSF.Api.Models/Integrations/Github/GithubCommit.cs +++ b/UKSF.Api.Modpack/Models/GithubCommit.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Models.Integrations.Github { +namespace UKSF.Api.Modpack.Models { public class GithubCommit { public string after; public string baseBranch; diff --git a/UKSF.Api.Models/Modpack/ModpackBuild.cs b/UKSF.Api.Modpack/Models/ModpackBuild.cs similarity index 88% rename from UKSF.Api.Models/Modpack/ModpackBuild.cs rename to UKSF.Api.Modpack/Models/ModpackBuild.cs index f32fd64b..838c5c45 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuild.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuild.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Integrations.Github; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Models.Modpack { +namespace UKSF.Api.Modpack.Models { public class ModpackBuild : DatabaseObject { [BsonRepresentation(BsonType.ObjectId)] public string builderId; public int buildNumber; diff --git a/UKSF.Api.Models/Modpack/ModpackBuildQueueItem.cs b/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs similarity index 73% rename from UKSF.Api.Models/Modpack/ModpackBuildQueueItem.cs rename to UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs index 4355bc58..50c352b5 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuildQueueItem.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Models.Modpack { +namespace UKSF.Api.Modpack.Models { public class ModpackBuildQueueItem { public string id; public ModpackBuild build; diff --git a/UKSF.Api.Models/Modpack/ModpackBuildResult.cs b/UKSF.Api.Modpack/Models/ModpackBuildResult.cs similarity index 78% rename from UKSF.Api.Models/Modpack/ModpackBuildResult.cs rename to UKSF.Api.Modpack/Models/ModpackBuildResult.cs index c1b4360b..137b42b9 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuildResult.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildResult.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Models.Modpack { +namespace UKSF.Api.Modpack.Models { public enum ModpackBuildResult { NONE, SUCCESS, diff --git a/UKSF.Api.Models/Modpack/ModpackBuildStep.cs b/UKSF.Api.Modpack/Models/ModpackBuildStep.cs similarity index 95% rename from UKSF.Api.Models/Modpack/ModpackBuildStep.cs rename to UKSF.Api.Modpack/Models/ModpackBuildStep.cs index d7481e82..4407bc37 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuildStep.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildStep.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Globalization; -namespace UKSF.Api.Models.Modpack { +namespace UKSF.Api.Modpack.Models { public class ModpackBuildStep { public ModpackBuildResult buildResult = ModpackBuildResult.NONE; public DateTime endTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); diff --git a/UKSF.Api.Models/Modpack/ModpackBuildStepLogItem.cs b/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs similarity index 88% rename from UKSF.Api.Models/Modpack/ModpackBuildStepLogItem.cs rename to UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs index 9a154312..9ebd357c 100644 --- a/UKSF.Api.Models/Modpack/ModpackBuildStepLogItem.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSF.Api.Models.Modpack { +namespace UKSF.Api.Modpack.Models { public class ModpackBuildStepLogItem { public string text; public string colour; diff --git a/UKSF.Api.Models/Modpack/ModpackRelease.cs b/UKSF.Api.Modpack/Models/ModpackRelease.cs similarity index 85% rename from UKSF.Api.Models/Modpack/ModpackRelease.cs rename to UKSF.Api.Modpack/Models/ModpackRelease.cs index 6e818b07..a0717d8b 100644 --- a/UKSF.Api.Models/Modpack/ModpackRelease.cs +++ b/UKSF.Api.Modpack/Models/ModpackRelease.cs @@ -1,8 +1,9 @@ using System; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Models.Modpack { +namespace UKSF.Api.Modpack.Models { public class ModpackRelease : DatabaseObject { public string changelog; [BsonRepresentation(BsonType.ObjectId)] public string creatorId; diff --git a/UKSF.Api.Models/Modpack/NewBuild.cs b/UKSF.Api.Modpack/Models/NewBuild.cs similarity index 78% rename from UKSF.Api.Models/Modpack/NewBuild.cs rename to UKSF.Api.Modpack/Models/NewBuild.cs index bcd65689..e7cc94c0 100644 --- a/UKSF.Api.Models/Modpack/NewBuild.cs +++ b/UKSF.Api.Modpack/Models/NewBuild.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Models.Modpack { +namespace UKSF.Api.Modpack.Models { public class NewBuild { public string reference; public bool ace; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs similarity index 98% rename from UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs rename to UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs index 1286c886..cca17536 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs @@ -4,10 +4,9 @@ using System.Linq; using System.Threading; using Newtonsoft.Json.Linq; -using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Common; +using UKSF.Api.Base.Extensions; -namespace UKSF.Api.Services.Modpack.BuildProcess { +namespace UKSF.Api.Modpack.Services.BuildProcess { public class BuildProcessHelper { private readonly CancellationTokenSource cancellationTokenSource; private readonly CancellationTokenSource errorCancellationTokenSource = new CancellationTokenSource(); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs similarity index 87% rename from UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs rename to UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs index 98b9faeb..5ca76779 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs @@ -1,26 +1,30 @@ using System; using System.Threading; using System.Threading.Tasks; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Modpack; -using UKSF.Api.Services.Message; -using UKSF.Api.Services.Modpack.BuildProcess.Steps.Common; -using UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps; +using UKSF.Api.Admin.Services; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Base.Events; +using UKSF.Api.Modpack.Models; +using UKSF.Api.Modpack.Services.BuildProcess.Steps; +using UKSF.Api.Modpack.Services.BuildProcess.Steps.Common; +using UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps; + +namespace UKSF.Api.Modpack.Services.BuildProcess { + public interface IBuildProcessorService { + Task ProcessBuild(ModpackBuild build, CancellationTokenSource cancellationTokenSource); + } -namespace UKSF.Api.Services.Modpack.BuildProcess { public class BuildProcessorService : IBuildProcessorService { private readonly IBuildsService buildsService; private readonly IBuildStepService buildStepService; private readonly IVariablesService variablesService; + private readonly ILogger logger; - public BuildProcessorService(IBuildStepService buildStepService, IBuildsService buildsService, IVariablesService variablesService) { + public BuildProcessorService(IBuildStepService buildStepService, IBuildsService buildsService, IVariablesService variablesService, ILogger logger) { this.buildStepService = buildStepService; this.buildsService = buildsService; this.variablesService = variablesService; + this.logger = logger; } public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cancellationTokenSource) { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs similarity index 89% rename from UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs rename to UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs index 3937e89c..3c368436 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs @@ -3,23 +3,31 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using UKSF.Api.Interfaces.Game; -using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Api.Models.Modpack; -using UKSF.Api.Services.Message; +using UKSF.Api.ArmaServer.Services; +using UKSF.Api.Base.Events; +using UKSF.Api.Modpack.Models; + +namespace UKSF.Api.Modpack.Services.BuildProcess { + public interface IBuildQueueService { + void QueueBuild(ModpackBuild build); + bool CancelQueued(string id); + void Cancel(string id); + void CancelAll(); + } -namespace UKSF.Api.Services.Modpack.BuildProcess { public class BuildQueueService : IBuildQueueService { private readonly IBuildProcessorService buildProcessorService; private readonly ConcurrentDictionary buildTasks = new ConcurrentDictionary(); private readonly ConcurrentDictionary cancellationTokenSources = new ConcurrentDictionary(); private readonly IGameServersService gameServersService; + private readonly ILogger logger; private ConcurrentQueue queue = new ConcurrentQueue(); private bool processing; - public BuildQueueService(IBuildProcessorService buildProcessorService, IGameServersService gameServersService) { + public BuildQueueService(IBuildProcessorService buildProcessorService, IGameServersService gameServersService, ILogger logger) { this.buildProcessorService = buildProcessorService; this.gameServersService = gameServersService; + this.logger = logger; } public void QueueBuild(ModpackBuild build) { diff --git a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs similarity index 87% rename from UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs rename to UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs index 23fc779b..b39d3f55 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs @@ -1,17 +1,22 @@ using System; using System.Collections.Generic; using System.Linq; -using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Modpack; -using UKSF.Api.Services.Modpack.BuildProcess.Steps; -using UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps; -using UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps.Mods; -using UKSF.Api.Services.Modpack.BuildProcess.Steps.Common; -using UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Modpack.Models; +using UKSF.Api.Modpack.Services.BuildProcess.Steps; +using UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps; +using UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods; +using UKSF.Api.Modpack.Services.BuildProcess.Steps.Common; +using UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps; + +namespace UKSF.Api.Modpack.Services.BuildProcess { + public interface IBuildStepService { + void RegisterBuildSteps(); + List GetSteps(GameEnvironment environment); + ModpackBuildStep GetRestoreStepForRelease(); + IBuildStep ResolveBuildStep(string buildStepName); + } -namespace UKSF.Api.Services.Modpack.BuildProcess { public class BuildStepService : IBuildStepService { private Dictionary buildStepDictionary = new Dictionary(); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs b/UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs similarity index 82% rename from UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs rename to UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs index b0105e74..37f7b9e0 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/StepLogger.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs @@ -1,10 +1,21 @@ using System; using System.Collections.Generic; using System.Linq; -using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Api.Models.Modpack; +using UKSF.Api.Modpack.Models; + +namespace UKSF.Api.Modpack.Services.BuildProcess { + public interface IStepLogger { + void LogStart(); + void LogSuccess(); + void LogCancelled(); + void LogSkipped(); + void LogWarning(string message); + void LogError(Exception exception); + void LogSurround(string log); + void Log(string log, string colour = ""); + void LogInline(string log); + } -namespace UKSF.Api.Services.Modpack.BuildProcess { public class StepLogger : IStepLogger { private readonly ModpackBuildStep buildStep; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs similarity index 90% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs index e1b31832..39640830 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs @@ -3,15 +3,33 @@ using System.Threading.Tasks; using MongoDB.Driver; using Newtonsoft.Json; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Api.Interfaces.Modpack.BuildProcess.Steps; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Modpack; -using UKSF.Api.Services.Admin; -using UKSF.Common; - -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Modpack.Models; + +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps { + public interface IBuildStep { + void Init( + ModpackBuild modpackBuild, + ModpackBuildStep modpackBuildStep, + Func, Task> buildUpdateCallback, + Func stepUpdateCallback, + CancellationTokenSource cancellationTokenSource, + IVariablesService variablesService + ); + + Task Start(); + bool CheckGuards(); + Task Setup(); + Task Process(); + Task Succeed(); + Task Fail(Exception exception); + Task Cancel(); + void Warning(string message); + Task Skip(); + } + public class BuildStep : IBuildStep { private const string COLOUR_BLUE = "#0c78ff"; private readonly TimeSpan updateInterval = TimeSpan.FromSeconds(2); diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepAttribute.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStepAttribute.cs similarity index 75% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepAttribute.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStepAttribute.cs index 4240f88f..f77e69b6 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildStepAttribute.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStepAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps { public class BuildStepAttribute : Attribute { public readonly string Name; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs similarity index 95% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs index 79d8f430..a3b1a1c6 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using UKSF.Common; +using UKSF.Api.Admin.Extensions; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] public class BuildStepExtensions : FileBuildStep { public const string NAME = "Extensions"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs similarity index 92% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs index 4df84b64..b546c885 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs @@ -1,7 +1,7 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] public class BuildStepIntercept : FileBuildStep { public const string NAME = "Intercept"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs similarity index 96% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs index 03b4bee7..bea6149b 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs @@ -2,7 +2,7 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] public class BuildStepKeys : FileBuildStep { public const string NAME = "Keys"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs similarity index 90% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs index 8cbf0876..d45c9d12 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; -using UKSF.Common; +using UKSF.Api.Admin.Extensions; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] public class BuildStepPrep : BuildStep { public const string NAME = "Prep"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs similarity index 97% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs index f3146275..a81603cb 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs @@ -3,10 +3,10 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -using UKSF.Api.Models.Game; -using UKSF.Common; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.ArmaServer.Models; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] public class BuildStepSignDependencies : FileBuildStep { public const string NAME = "Signatures"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs similarity index 98% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 05d5b6d4..f6535c8f 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -2,7 +2,7 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] public class BuildStepSources : GitBuildStep { public const string NAME = "Sources"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs similarity index 97% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs index c4dfa324..9facf165 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs @@ -3,7 +3,7 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps.Mods { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods { [BuildStep(NAME)] public class BuildStepBuildAce : ModBuildStep { public const string NAME = "Build ACE"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs similarity index 96% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index e5dcf083..99888b6d 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -3,7 +3,7 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps.Mods { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods { [BuildStep(NAME)] public class BuildStepBuildAcre : ModBuildStep { public const string NAME = "Build ACRE"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs similarity index 96% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs index 904bc198..04e378da 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs @@ -3,7 +3,7 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps.Mods { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods { [BuildStep(NAME)] public class BuildStepBuildF35 : ModBuildStep { public const string NAME = "Build F-35"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs similarity index 94% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs index b06d1269..c2f1b761 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs @@ -2,7 +2,7 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.BuildSteps.Mods { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods { [BuildStep(NAME)] public class BuildStepBuildModpack : ModBuildStep { public const string NAME = "Build UKSF"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs similarity index 88% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs index e80fe9ef..10125e28 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepBuildRepo.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; -using UKSF.Common; +using UKSF.Api.Admin.Extensions; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common { [BuildStep(NAME)] public class BuildStepBuildRepo : BuildStep { public const string NAME = "Build Repo"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepCbaSettings.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs similarity index 93% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepCbaSettings.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs index 6b5df50c..c4f08d36 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepCbaSettings.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -using UKSF.Api.Models.Game; +using UKSF.Api.ArmaServer.Models; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common { [BuildStep(NAME)] public class BuildStepCbaSettings : FileBuildStep { public const string NAME = "CBA Settings"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs similarity index 94% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs index 7b84224d..2ba07054 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepClean.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs @@ -2,9 +2,9 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -using UKSF.Api.Models.Game; +using UKSF.Api.ArmaServer.Models; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common { [BuildStep(NAME)] public class BuildStepClean : FileBuildStep { public const string NAME = "Clean folders"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepDeploy.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepDeploy.cs similarity index 93% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepDeploy.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepDeploy.cs index e37ef751..6dff7166 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepDeploy.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepDeploy.cs @@ -1,8 +1,8 @@ using System.IO; using System.Threading.Tasks; -using UKSF.Api.Models.Game; +using UKSF.Api.ArmaServer.Models; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common { [BuildStep(NAME)] public class BuildStepDeploy : FileBuildStep { public const string NAME = "Deploy"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs similarity index 86% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs index cc68cd74..54cc07f6 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/Common/BuildStepNotify.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs @@ -1,15 +1,10 @@ using System; using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Modpack; -using UKSF.Api.Services.Admin; -using UKSF.Api.Services.Common; -using UKSF.Common; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Modpack.Models; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.Common { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common { [BuildStep(NAME)] public class BuildStepNotify : BuildStep { public const string NAME = "Notify"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs similarity index 99% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs index e7f69ca4..8d3cf5ae 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/FileBuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs @@ -7,7 +7,7 @@ using Humanizer; using MoreLinq; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps { public class FileBuildStep : BuildStep { private const double FILE_COPY_TASK_SIZE_THRESHOLD = 5_000_000_000; private const double FILE_COPY_TASK_COUNT_THRESHOLD = 50; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/GitBuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/GitBuildStep.cs similarity index 90% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/GitBuildStep.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/GitBuildStep.cs index d5b683fa..de5015a8 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/GitBuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/GitBuildStep.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps { public class GitBuildStep : BuildStep { internal string GitCommand(string workingDirectory, string command) { List results = new BuildProcessHelper(Logger, CancellationTokenSource, false, false, true).Run( diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ModBuildStep.cs similarity index 88% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/ModBuildStep.cs index c5c110dd..73cc46e9 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ModBuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ModBuildStep.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using UKSF.Common; +using UKSF.Api.Admin.Extensions; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps { public class ModBuildStep : FileBuildStep { protected string PythonPath; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs similarity index 94% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs index 66d1a66a..e170f6aa 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs @@ -1,7 +1,7 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps { [BuildStep(NAME)] public class BuildStepBackup : FileBuildStep { public const string NAME = "Backup"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs similarity index 95% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs index 98b61337..5d8ea819 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs @@ -2,7 +2,7 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps { [BuildStep(NAME)] public class BuildStepMerge : GitBuildStep { public const string NAME = "Merge"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs similarity index 77% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs index 01016a70..0736ec9f 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs @@ -1,9 +1,6 @@ using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Services.Common; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps { [BuildStep(NAME)] public class BuildStepPublish : BuildStep { public const string NAME = "Publish"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs similarity index 90% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs index 245b02f0..b1b95ac3 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs @@ -1,8 +1,8 @@ using System.IO; using System.Threading.Tasks; -using UKSF.Api.Models.Game; +using UKSF.Api.ArmaServer.Models; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps { [BuildStep(NAME)] public class BuildStepReleaseKeys : FileBuildStep { public const string NAME = "Copy Keys"; diff --git a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs similarity index 94% rename from UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs index 05a4c2c7..f6fbc50b 100644 --- a/UKSF.Api.Services/Modpack/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs @@ -1,7 +1,7 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Services.Modpack.BuildProcess.Steps.ReleaseSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps { [BuildStep(NAME)] public class BuildStepRestore : FileBuildStep { public const string NAME = "Restore"; diff --git a/UKSF.Api.Services/Modpack/BuildsService.cs b/UKSF.Api.Modpack/Services/BuildsService.cs similarity index 86% rename from UKSF.Api.Services/Modpack/BuildsService.cs rename to UKSF.Api.Modpack/Services/BuildsService.cs index 07c4125c..8974b109 100644 --- a/UKSF.Api.Services/Modpack/BuildsService.cs +++ b/UKSF.Api.Modpack/Services/BuildsService.cs @@ -3,29 +3,46 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Base.Events; using UKSF.Api.Base.Services; using UKSF.Api.Base.Services.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Integrations.Github; -using UKSF.Api.Models.Modpack; -using UKSF.Api.Services.Message; - -namespace UKSF.Api.Services.Modpack { +using UKSF.Api.Modpack.Models; +using UKSF.Api.Modpack.Services.BuildProcess; +using UKSF.Api.Modpack.Services.Data; +using UKSF.Api.Personnel.Services; + +namespace UKSF.Api.Modpack.Services { + public interface IBuildsService : IDataBackedService { + IEnumerable GetDevBuilds(); + IEnumerable GetRcBuilds(); + ModpackBuild GetLatestDevBuild(); + ModpackBuild GetLatestRcBuild(string version); + Task UpdateBuild(ModpackBuild build, UpdateDefinition updateDefinition); + Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep); + Task CreateDevBuild(string version, GithubCommit commit, NewBuild newBuild = null); + Task CreateRcBuild(string version, GithubCommit commit); + Task CreateReleaseBuild(string version); + Task SetBuildRunning(ModpackBuild build); + Task SucceedBuild(ModpackBuild build); + Task FailBuild(ModpackBuild build); + Task CancelBuild(ModpackBuild build); + Task CreateRebuild(ModpackBuild build, string newSha = ""); + void CancelInterruptedBuilds(); + } + public class BuildsService : DataBackedService, IBuildsService { private readonly IAccountService accountService; private readonly IHttpContextService httpContextService; + private readonly ILogger logger; private readonly IBuildStepService buildStepService; - public BuildsService(IBuildsDataService data, IBuildStepService buildStepService, IAccountService accountService, IHttpContextService httpContextService) : base(data) { + public BuildsService(IBuildsDataService data, IBuildStepService buildStepService, IAccountService accountService, IHttpContextService httpContextService, ILogger logger) : base(data) { this.buildStepService = buildStepService; this.accountService = accountService; this.httpContextService = httpContextService; + this.logger = logger; } public async Task UpdateBuild(ModpackBuild build, UpdateDefinition updateDefinition) { diff --git a/UKSF.Api.Data/Modpack/BuildsDataService.cs b/UKSF.Api.Modpack/Services/Data/BuildsDataService.cs similarity index 74% rename from UKSF.Api.Data/Modpack/BuildsDataService.cs rename to UKSF.Api.Modpack/Services/Data/BuildsDataService.cs index cf3d3a4d..fc3685c7 100644 --- a/UKSF.Api.Data/Modpack/BuildsDataService.cs +++ b/UKSF.Api.Modpack/Services/Data/BuildsDataService.cs @@ -2,13 +2,18 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Modpack; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Modpack.Models; + +namespace UKSF.Api.Modpack.Services.Data { + public interface IBuildsDataService : IDataService, ICachedDataService { + Task Update(ModpackBuild build, ModpackBuildStep buildStep); + Task Update(ModpackBuild build, UpdateDefinition updateDefinition); + } -namespace UKSF.Api.Data.Modpack { public class BuildsDataService : CachedDataService, IBuildsDataService { public BuildsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackBuilds") { } diff --git a/UKSF.Api.Data/Modpack/ReleasesDataService.cs b/UKSF.Api.Modpack/Services/Data/ReleasesDataService.cs similarity index 82% rename from UKSF.Api.Data/Modpack/ReleasesDataService.cs rename to UKSF.Api.Modpack/Services/Data/ReleasesDataService.cs index 8ba2f00d..67dbe412 100644 --- a/UKSF.Api.Data/Modpack/ReleasesDataService.cs +++ b/UKSF.Api.Modpack/Services/Data/ReleasesDataService.cs @@ -1,11 +1,13 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Modpack; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.Modpack.Models; + +namespace UKSF.Api.Modpack.Services.Data { + public interface IReleasesDataService : IDataService, ICachedDataService { } -namespace UKSF.Api.Data.Modpack { public class ReleasesDataService : CachedDataService, IReleasesDataService { public ReleasesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackReleases") { } diff --git a/UKSF.Api.Services/Integrations/Github/GithubService.cs b/UKSF.Api.Modpack/Services/GithubService.cs similarity index 95% rename from UKSF.Api.Services/Integrations/Github/GithubService.cs rename to UKSF.Api.Modpack/Services/GithubService.cs index 43eb6437..b3d989d8 100644 --- a/UKSF.Api.Services/Integrations/Github/GithubService.cs +++ b/UKSF.Api.Modpack/Services/GithubService.cs @@ -10,11 +10,21 @@ using Microsoft.Extensions.Configuration; using Octokit; using UKSF.Api.Base.Events; -using UKSF.Api.Interfaces.Integrations.Github; -using UKSF.Api.Models.Integrations.Github; -using UKSF.Api.Models.Modpack; +using UKSF.Api.Modpack.Models; + +namespace UKSF.Api.Modpack.Services { + public interface IGithubService { + Task> GetBranches(); + Task> GetHistoricReleases(); + Task GetReferenceVersion(string reference); + Task GetLatestReferenceCommit(string reference); + Task GetPushEvent(PushWebhookPayload payload, string latestCommit = ""); + bool VerifySignature(string signature, string body); + Task IsReferenceValid(string reference); + Task GenerateChangelog(string version); + Task PublishRelease(ModpackRelease release); + } -namespace UKSF.Api.Services.Integrations.Github { public class GithubService : IGithubService { private const string REPO_ORG = "uksf"; private const string REPO_NAME = "modpack"; diff --git a/UKSF.Api.Services/Modpack/ModpackService.cs b/UKSF.Api.Modpack/Services/ModpackService.cs similarity index 87% rename from UKSF.Api.Services/Modpack/ModpackService.cs rename to UKSF.Api.Modpack/Services/ModpackService.cs index 932c7487..91138a43 100644 --- a/UKSF.Api.Services/Modpack/ModpackService.cs +++ b/UKSF.Api.Modpack/Services/ModpackService.cs @@ -3,17 +3,30 @@ using System.Linq; using System.Threading.Tasks; using Octokit; +using UKSF.Api.ArmaServer.Models; using UKSF.Api.Base.Events; using UKSF.Api.Base.Services; -using UKSF.Api.Interfaces.Integrations.Github; -using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Integrations.Github; -using UKSF.Api.Models.Modpack; - -namespace UKSF.Api.Services.Modpack { +using UKSF.Api.Modpack.Models; +using UKSF.Api.Modpack.Services.BuildProcess; + +namespace UKSF.Api.Modpack.Services { + public interface IModpackService { + IEnumerable GetReleases(); + IEnumerable GetRcBuilds(); + IEnumerable GetDevBuilds(); + ModpackRelease GetRelease(string version); + ModpackBuild GetBuild(string id); + Task NewBuild(NewBuild newBuild); + Task Rebuild(ModpackBuild build); + Task CancelBuild(ModpackBuild build); + Task UpdateReleaseDraft(ModpackRelease release); + Task Release(string version); + Task RegnerateReleaseDraftChangelog(string version); + Task CreateDevBuildFromPush(PushWebhookPayload payload); + Task CreateRcBuildFromPush(PushWebhookPayload payload); + void RunQueuedBuilds(); + } + public class ModpackService : IModpackService { private readonly IBuildQueueService buildQueueService; private readonly IBuildsService buildsService; diff --git a/UKSF.Api.Services/Modpack/ReleaseService.cs b/UKSF.Api.Modpack/Services/ReleaseService.cs similarity index 85% rename from UKSF.Api.Services/Modpack/ReleaseService.cs rename to UKSF.Api.Modpack/Services/ReleaseService.cs index 4f74629a..007d007c 100644 --- a/UKSF.Api.Services/Modpack/ReleaseService.cs +++ b/UKSF.Api.Modpack/Services/ReleaseService.cs @@ -5,14 +5,19 @@ using MongoDB.Driver; using UKSF.Api.Base.Events; using UKSF.Api.Base.Services.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Integrations.Github; -using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Models.Integrations.Github; -using UKSF.Api.Models.Modpack; +using UKSF.Api.Modpack.Models; +using UKSF.Api.Modpack.Services.Data; using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Services.Modpack { +namespace UKSF.Api.Modpack.Services { + public interface IReleaseService : IDataBackedService { + Task MakeDraftRelease(string version, GithubCommit commit); + Task UpdateDraft(ModpackRelease release); + Task PublishRelease(string version); + ModpackRelease GetRelease(string version); + Task AddHistoricReleases(IEnumerable releases); + } + public class ReleaseService : DataBackedService, IReleaseService { private readonly IAccountService accountService; private readonly ILogger logger; diff --git a/UKSF.Api.Interfaces/Hubs/IModpackClient.cs b/UKSF.Api.Modpack/Signalr/Clients/IModpackClient.cs similarity index 76% rename from UKSF.Api.Interfaces/Hubs/IModpackClient.cs rename to UKSF.Api.Modpack/Signalr/Clients/IModpackClient.cs index 4a869b76..6f82bbe8 100644 --- a/UKSF.Api.Interfaces/Hubs/IModpackClient.cs +++ b/UKSF.Api.Modpack/Signalr/Clients/IModpackClient.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using UKSF.Api.Models.Modpack; +using UKSF.Api.Modpack.Models; -namespace UKSF.Api.Interfaces.Hubs { +namespace UKSF.Api.Modpack.Signalr.Clients { public interface IModpackClient { Task ReceiveReleaseCandidateBuild(ModpackBuild build); Task ReceiveBuild(ModpackBuild build); diff --git a/UKSF.Api.Signalr/Hubs/Modpack/BuildsHub.cs b/UKSF.Api.Modpack/Signalr/Hubs/BuildsHub.cs similarity index 92% rename from UKSF.Api.Signalr/Hubs/Modpack/BuildsHub.cs rename to UKSF.Api.Modpack/Signalr/Hubs/BuildsHub.cs index 8aa5e501..5ba70ab1 100644 --- a/UKSF.Api.Signalr/Hubs/Modpack/BuildsHub.cs +++ b/UKSF.Api.Modpack/Signalr/Hubs/BuildsHub.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; -using UKSF.Api.Interfaces.Hubs; +using UKSF.Api.Modpack.Signalr.Clients; -namespace UKSF.Api.Signalr.Hubs.Modpack { +namespace UKSF.Api.Modpack.Signalr.Hubs { [Authorize] public class BuildsHub : Hub { public const string END_POINT = "builds"; diff --git a/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj b/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj new file mode 100644 index 00000000..4234b505 --- /dev/null +++ b/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj @@ -0,0 +1,20 @@ + + + + netcoreapp5.0 + Library + + + + + + + + + + + + + + + diff --git a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs index 4ef7e1a3..cfcc931b 100644 --- a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs +++ b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs @@ -8,47 +8,46 @@ namespace UKSF.Api.Personnel { public static class ApiPersonnelExtensions { - public static IServiceCollection AddUksfPersonnel(this IServiceCollection services) { - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); + public static IServiceCollection AddUksfPersonnel(this IServiceCollection services) => + services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddTransient(); - services.AddSingleton(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + private static IServiceCollection AddContexts(this IServiceCollection services) => + services.AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); + private static IServiceCollection AddEventBuses(this IServiceCollection services) => + services.AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => + services.AddSingleton() + .AddSingleton() + .AddSingleton(); - // services.AddTransient(); - services.AddTransient(); - - services.AddTransient(); - - return services; - } + private static IServiceCollection AddServices(this IServiceCollection services) => + services.AddSingleton() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient(); } } diff --git a/UKSF.Api.Personnel/Controllers/ApplicationsController.cs b/UKSF.Api.Personnel/Controllers/ApplicationsController.cs index 6de99218..1152d72c 100644 --- a/UKSF.Api.Personnel/Controllers/ApplicationsController.cs +++ b/UKSF.Api.Personnel/Controllers/ApplicationsController.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reactive; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -9,6 +8,7 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Base; using UKSF.Api.Base.Events; +using UKSF.Api.Base.Extensions; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; diff --git a/UKSF.Api/Controllers/CommentThreadController.cs b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs similarity index 97% rename from UKSF.Api/Controllers/CommentThreadController.cs rename to UKSF.Api.Personnel/Controllers/CommentThreadController.cs index a0eb7712..aed06bf4 100644 --- a/UKSF.Api/Controllers/CommentThreadController.cs +++ b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs @@ -7,13 +7,10 @@ using MongoDB.Bson; using UKSF.Api.Base; using UKSF.Api.Base.Services; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Personnel.Controllers { [Route("commentthread"), Permissions(Permissions.CONFIRMED, Permissions.MEMBER, Permissions.DISCHARGED)] public class CommentThreadController : Controller { private readonly IAccountService accountService; diff --git a/UKSF.Api/Controllers/DiscordConnectionController.cs b/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs similarity index 97% rename from UKSF.Api/Controllers/DiscordConnectionController.cs rename to UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs index e3e83190..e045eca4 100644 --- a/UKSF.Api/Controllers/DiscordConnectionController.cs +++ b/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs @@ -9,11 +9,8 @@ using Microsoft.Extensions.Hosting; using Newtonsoft.Json.Linq; using UKSF.Api.Base.Events; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Utility; -using UKSF.Common; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class DiscordConnectionController : Controller { private readonly string botToken; diff --git a/UKSF.Api/Controllers/NotificationsController.cs b/UKSF.Api.Personnel/Controllers/NotificationsController.cs similarity index 95% rename from UKSF.Api/Controllers/NotificationsController.cs rename to UKSF.Api.Personnel/Controllers/NotificationsController.cs index 7fed020c..3013452b 100644 --- a/UKSF.Api/Controllers/NotificationsController.cs +++ b/UKSF.Api.Personnel/Controllers/NotificationsController.cs @@ -4,9 +4,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSF.Api.Interfaces.Message; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class NotificationsController : Controller { private readonly INotificationsService notificationsService; diff --git a/UKSF.Api/Controllers/SteamConnectionController.cs b/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs similarity index 96% rename from UKSF.Api/Controllers/SteamConnectionController.cs rename to UKSF.Api.Personnel/Controllers/SteamConnectionController.cs index be20f660..2c011a4e 100644 --- a/UKSF.Api/Controllers/SteamConnectionController.cs +++ b/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs @@ -2,9 +2,8 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Hosting; -using UKSF.Api.Interfaces.Utility; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class SteamConnectionController : Controller { private readonly IConfirmationCodeService confirmationCodeService; diff --git a/UKSF.Api.Personnel/EventHandlers/AccountEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/AccountEventHandler.cs index 04d1a7c9..0d67f33f 100644 --- a/UKSF.Api.Personnel/EventHandlers/AccountEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/AccountEventHandler.cs @@ -4,8 +4,8 @@ using UKSF.Api.Base.Extensions; using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.SignalrHubs.Clients; -using UKSF.Api.Personnel.SignalrHubs.Hubs; +using UKSF.Api.Personnel.Signalr.Clients; +using UKSF.Api.Personnel.Signalr.Hubs; namespace UKSF.Api.Personnel.EventHandlers { public interface IAccountEventHandler : IEventHandler { } diff --git a/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs index fa6f2591..ae3cc392 100644 --- a/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs @@ -6,8 +6,8 @@ using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -using UKSF.Api.Personnel.SignalrHubs.Clients; -using UKSF.Api.Personnel.SignalrHubs.Hubs; +using UKSF.Api.Personnel.Signalr.Clients; +using UKSF.Api.Personnel.Signalr.Hubs; namespace UKSF.Api.Personnel.EventHandlers { public interface ICommentThreadEventHandler : IEventHandler { } diff --git a/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs index 11b472af..53324a07 100644 --- a/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs @@ -4,8 +4,8 @@ using UKSF.Api.Base.Extensions; using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.SignalrHubs.Clients; -using UKSF.Api.Personnel.SignalrHubs.Hubs; +using UKSF.Api.Personnel.Signalr.Clients; +using UKSF.Api.Personnel.Signalr.Hubs; namespace UKSF.Api.Personnel.EventHandlers { public interface INotificationsEventHandler : IEventHandler { } diff --git a/UKSF.Api.Personnel/Services/AssignmentService.cs b/UKSF.Api.Personnel/Services/AssignmentService.cs index d720acc9..96a562c9 100644 --- a/UKSF.Api.Personnel/Services/AssignmentService.cs +++ b/UKSF.Api.Personnel/Services/AssignmentService.cs @@ -5,8 +5,8 @@ using AvsAnLib; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.SignalrHubs.Clients; -using UKSF.Api.Personnel.SignalrHubs.Hubs; +using UKSF.Api.Personnel.Signalr.Clients; +using UKSF.Api.Personnel.Signalr.Hubs; namespace UKSF.Api.Personnel.Services { public interface IAssignmentService { diff --git a/UKSF.Api.Personnel/Services/NotificationsService.cs b/UKSF.Api.Personnel/Services/NotificationsService.cs index 58febc97..72919d9f 100644 --- a/UKSF.Api.Personnel/Services/NotificationsService.cs +++ b/UKSF.Api.Personnel/Services/NotificationsService.cs @@ -7,8 +7,8 @@ using UKSF.Api.Base.Services.Data; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services.Data; -using UKSF.Api.Personnel.SignalrHubs.Clients; -using UKSF.Api.Personnel.SignalrHubs.Hubs; +using UKSF.Api.Personnel.Signalr.Clients; +using UKSF.Api.Personnel.Signalr.Hubs; namespace UKSF.Api.Personnel.Services { public interface INotificationsService : IDataBackedService { diff --git a/UKSF.Api.Personnel/SignalrHubs/Clients/IAccountClient.cs b/UKSF.Api.Personnel/Signalr/Clients/IAccountClient.cs similarity index 69% rename from UKSF.Api.Personnel/SignalrHubs/Clients/IAccountClient.cs rename to UKSF.Api.Personnel/Signalr/Clients/IAccountClient.cs index cb6f10a5..5f8bdf97 100644 --- a/UKSF.Api.Personnel/SignalrHubs/Clients/IAccountClient.cs +++ b/UKSF.Api.Personnel/Signalr/Clients/IAccountClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSF.Api.Personnel.SignalrHubs.Clients { +namespace UKSF.Api.Personnel.Signalr.Clients { public interface IAccountClient { Task ReceiveAccountUpdate(); } diff --git a/UKSF.Api.Personnel/SignalrHubs/Clients/ICommentThreadClient.cs b/UKSF.Api.Personnel/Signalr/Clients/ICommentThreadClient.cs similarity index 76% rename from UKSF.Api.Personnel/SignalrHubs/Clients/ICommentThreadClient.cs rename to UKSF.Api.Personnel/Signalr/Clients/ICommentThreadClient.cs index 1c1a56d8..02a94329 100644 --- a/UKSF.Api.Personnel/SignalrHubs/Clients/ICommentThreadClient.cs +++ b/UKSF.Api.Personnel/Signalr/Clients/ICommentThreadClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace UKSF.Api.Personnel.SignalrHubs.Clients { +namespace UKSF.Api.Personnel.Signalr.Clients { public interface ICommentThreadClient { Task ReceiveComment(object comment); Task DeleteComment(string id); diff --git a/UKSF.Api.Personnel/SignalrHubs/Clients/INotificationsClient.cs b/UKSF.Api.Personnel/Signalr/Clients/INotificationsClient.cs similarity index 84% rename from UKSF.Api.Personnel/SignalrHubs/Clients/INotificationsClient.cs rename to UKSF.Api.Personnel/Signalr/Clients/INotificationsClient.cs index fd3554f7..adc221a6 100644 --- a/UKSF.Api.Personnel/SignalrHubs/Clients/INotificationsClient.cs +++ b/UKSF.Api.Personnel/Signalr/Clients/INotificationsClient.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace UKSF.Api.Personnel.SignalrHubs.Clients { +namespace UKSF.Api.Personnel.Signalr.Clients { public interface INotificationsClient { Task ReceiveNotification(object notification); Task ReceiveRead(IEnumerable ids); diff --git a/UKSF.Api.Personnel/SignalrHubs/Hubs/AccountHub.cs b/UKSF.Api.Personnel/Signalr/Hubs/AccountHub.cs similarity index 90% rename from UKSF.Api.Personnel/SignalrHubs/Hubs/AccountHub.cs rename to UKSF.Api.Personnel/Signalr/Hubs/AccountHub.cs index 5991ce03..8eb1825d 100644 --- a/UKSF.Api.Personnel/SignalrHubs/Hubs/AccountHub.cs +++ b/UKSF.Api.Personnel/Signalr/Hubs/AccountHub.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; -using UKSF.Api.Personnel.SignalrHubs.Clients; +using UKSF.Api.Personnel.Signalr.Clients; -namespace UKSF.Api.Personnel.SignalrHubs.Hubs { +namespace UKSF.Api.Personnel.Signalr.Hubs { [Authorize] public class AccountHub : Hub { public const string END_POINT = "account"; diff --git a/UKSF.Api.Personnel/SignalrHubs/Hubs/CommentThreadHub.cs b/UKSF.Api.Personnel/Signalr/Hubs/CommentThreadHub.cs similarity index 90% rename from UKSF.Api.Personnel/SignalrHubs/Hubs/CommentThreadHub.cs rename to UKSF.Api.Personnel/Signalr/Hubs/CommentThreadHub.cs index ca9cf2ae..e7b554d4 100644 --- a/UKSF.Api.Personnel/SignalrHubs/Hubs/CommentThreadHub.cs +++ b/UKSF.Api.Personnel/Signalr/Hubs/CommentThreadHub.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; -using UKSF.Api.Personnel.SignalrHubs.Clients; +using UKSF.Api.Personnel.Signalr.Clients; -namespace UKSF.Api.Personnel.SignalrHubs.Hubs { +namespace UKSF.Api.Personnel.Signalr.Hubs { [Authorize] public class CommentThreadHub : Hub { public const string END_POINT = "commentThread"; diff --git a/UKSF.Api.Personnel/SignalrHubs/Hubs/NotificationsHub.cs b/UKSF.Api.Personnel/Signalr/Hubs/NotificationsHub.cs similarity index 90% rename from UKSF.Api.Personnel/SignalrHubs/Hubs/NotificationsHub.cs rename to UKSF.Api.Personnel/Signalr/Hubs/NotificationsHub.cs index 54f80796..ee82bc19 100644 --- a/UKSF.Api.Personnel/SignalrHubs/Hubs/NotificationsHub.cs +++ b/UKSF.Api.Personnel/Signalr/Hubs/NotificationsHub.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Primitives; -using UKSF.Api.Personnel.SignalrHubs.Clients; +using UKSF.Api.Personnel.Signalr.Clients; -namespace UKSF.Api.Personnel.SignalrHubs.Hubs { +namespace UKSF.Api.Personnel.Signalr.Hubs { [Authorize] public class NotificationHub : Hub { public const string END_POINT = "notifications"; diff --git a/UKSF.Api.Services/Fake/FakeCachedDataService.cs b/UKSF.Api.Services/Fake/FakeCachedDataService.cs deleted file mode 100644 index e4055c46..00000000 --- a/UKSF.Api.Services/Fake/FakeCachedDataService.cs +++ /dev/null @@ -1,7 +0,0 @@ -using UKSF.Api.Models; - -namespace UKSF.Api.Services.Fake { - public class FakeCachedDataService : FakeDataService where T : DatabaseObject { - public void Refresh() { } - } -} diff --git a/UKSF.Api.Services/Fake/FakeDataService.cs b/UKSF.Api.Services/Fake/FakeDataService.cs deleted file mode 100644 index 57a28085..00000000 --- a/UKSF.Api.Services/Fake/FakeDataService.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq.Expressions; -using System.Threading.Tasks; -using MongoDB.Driver; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Models; - -namespace UKSF.Api.Services.Fake { - public abstract class FakeDataService : IDataService where T : DatabaseObject { - public IEnumerable Get() => new List(); - - public IEnumerable Get(Func predicate) => new List(); - - public T GetSingle(string id) => default; - - public T GetSingle(Func predicate) => default; - - public Task Add(T item) => Task.CompletedTask; - - public Task Update(string id, string fieldName, object value) => Task.CompletedTask; - - public Task Update(string id, UpdateDefinition update) => Task.CompletedTask; - - public Task Update(Expression> filterExpression, UpdateDefinition update) => Task.CompletedTask; - - public Task UpdateMany(Expression> filterExpression, UpdateDefinition update) => Task.CompletedTask; - - public Task Replace(T item) => Task.CompletedTask; - - public Task Delete(string id) => Task.CompletedTask; - - public Task Delete(T item) => Task.CompletedTask; - - public Task DeleteMany(Expression> filterExpression) => Task.CompletedTask; - } -} diff --git a/UKSF.Api.Services/Fake/FakeDiscordService.cs b/UKSF.Api.Services/Fake/FakeDiscordService.cs deleted file mode 100644 index d1857b13..00000000 --- a/UKSF.Api.Services/Fake/FakeDiscordService.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.Configuration; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Services.Integrations; - -namespace UKSF.Api.Services.Fake { - public class FakeDiscordService : DiscordService { - public FakeDiscordService( - IConfiguration configuration, - IRanksService ranksService, - IUnitsService unitsService, - IAccountService accountService, - IDisplayNameService displayNameService, - IVariablesService variablesService - ) : base(configuration, ranksService, unitsService, accountService, displayNameService, variablesService) { } - - public override Task SendMessageToEveryone(ulong channelId, string message) => Task.CompletedTask; - - public override Task SendMessage(ulong channelId, string message) => Task.CompletedTask; - - public override Task UpdateAllUsers() => Task.CompletedTask; - - public override Task UpdateAccount(Account account, ulong discordId = 0) => Task.CompletedTask; - } -} diff --git a/UKSF.Api.Services/Fake/FakeNotificationsService.cs b/UKSF.Api.Services/Fake/FakeNotificationsService.cs deleted file mode 100644 index 0d1d6fb1..00000000 --- a/UKSF.Api.Services/Fake/FakeNotificationsService.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Models.Message; -using UKSF.Api.Models.Personnel; - -namespace UKSF.Api.Services.Fake { - public class FakeNotificationsService : DataBackedService, INotificationsService { - public FakeNotificationsService(INotificationsDataService data) : base(data) { } - - public Task SendTeamspeakNotification(Account account, string rawMessage) => Task.CompletedTask; - - public Task SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) => Task.CompletedTask; - - public IEnumerable GetNotificationsForContext() => new List(); - - public void Add(Notification notification) { } - - public Task MarkNotificationsAsRead(List ids) => Task.CompletedTask; - - public Task Delete(List ids) => Task.CompletedTask; - } -} diff --git a/UKSF.Api.Services/Fake/FakePipeManager.cs b/UKSF.Api.Services/Fake/FakePipeManager.cs deleted file mode 100644 index a106f1fc..00000000 --- a/UKSF.Api.Services/Fake/FakePipeManager.cs +++ /dev/null @@ -1,9 +0,0 @@ -using UKSF.Api.Interfaces.Integrations; - -namespace UKSF.Api.Services.Fake { - public class FakePipeManager : IPipeManager { - public void Dispose() { } - - public void Start() { } - } -} diff --git a/UKSF.Api.Services/Fake/FakeTeamspeakManagerService.cs b/UKSF.Api.Services/Fake/FakeTeamspeakManagerService.cs deleted file mode 100644 index 7213e887..00000000 --- a/UKSF.Api.Services/Fake/FakeTeamspeakManagerService.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Threading.Tasks; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Models.Integrations; - -namespace UKSF.Api.Services.Fake { - public class FakeTeamspeakManagerService : ITeamspeakManagerService { - public void Start() { } - - public void Stop() { } - - public Task SendGroupProcedure(TeamspeakProcedureType procedure, TeamspeakGroupProcedure groupProcedure) => Task.CompletedTask; - - public Task SendProcedure(TeamspeakProcedureType procedure, object args) => Task.CompletedTask; - } -} diff --git a/UKSF.Api.Services/Game/ServerService.cs b/UKSF.Api.Services/Game/ServerService.cs deleted file mode 100644 index eee24ea9..00000000 --- a/UKSF.Api.Services/Game/ServerService.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Personnel; -using UKSF.Api.Models.Units; - -// ReSharper disable HeuristicUnreachableCode -#pragma warning disable 162 - -namespace UKSF.Api.Services.Game { - public class ServerService : IServerService { - private const string FILE_BACKUP = "backup.xml"; - private const string FILE_SQUAD = "squad.xml"; - private const string PATH = "C:\\wamp\\www\\uksfnew\\public\\squadtag\\A3"; - - private readonly IAccountService accountService; - private readonly IDisplayNameService displayNameService; - private readonly IRanksService ranksService; - private readonly IUnitsService unitsService; - - public ServerService(IAccountService accountService, IRanksService ranksService, IDisplayNameService displayNameService, IUnitsService unitsService) { - this.accountService = accountService; - this.ranksService = ranksService; - this.displayNameService = displayNameService; - this.unitsService = unitsService; - } - - public void UpdateSquadXml() { - return; - Task.Run( - () => { - IEnumerable accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER && x.rank != null); - accounts = accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname); - - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.AppendLine( - "\n\n\n\n\n\tUnited Kingdom Special Forces\n\tuksfrecruitment@gmail.com\n\thttps://uk-sf.co.uk\n\t\n\tUnited Kingdom Special Forces\n" - ); - - foreach (Account account in accounts.Where(x => ranksService.IsSuperiorOrEqual(x.rank, "Private"))) { - StringBuilder accountStringBuilder = new StringBuilder(); - Unit unit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); - string unitRole = unit.roles.FirstOrDefault(x => x.Value == account.id).Key; - accountStringBuilder.AppendLine($"\t"); - accountStringBuilder.AppendLine($"\t\t{unit.callsign}"); - accountStringBuilder.AppendLine($"\t\t{account.rank}"); - accountStringBuilder.AppendLine($"\t\t{account.unitAssignment}{(string.IsNullOrEmpty(unitRole) ? "" : $" {unitRole}")}"); - accountStringBuilder.AppendLine($"\t\t{account.roleAssignment}"); - accountStringBuilder.AppendLine("\t"); - stringBuilder.AppendLine(accountStringBuilder.ToString()); - } - - stringBuilder.AppendLine(""); - - try { - File.Copy(Path.Join(PATH, FILE_SQUAD), Path.Join(PATH, FILE_BACKUP)); - - try { - File.WriteAllText(Path.Join(PATH, FILE_SQUAD), stringBuilder.ToString()); - } catch (Exception) { - File.Delete(Path.Join(PATH, FILE_SQUAD)); - File.Copy(Path.Join(PATH, FILE_BACKUP), Path.Join(PATH, FILE_SQUAD)); - File.Delete(Path.Join(PATH, FILE_BACKUP)); - } - } catch (Exception) { - // ignored - } - } - ); - } - } -} diff --git a/UKSF.Api.Services/Integrations/PipeManager.cs b/UKSF.Api.Services/Integrations/PipeManager.cs deleted file mode 100644 index 47bb70a5..00000000 --- a/UKSF.Api.Services/Integrations/PipeManager.cs +++ /dev/null @@ -1,142 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using System.Threading.Tasks; -using UKSF.Api.Interfaces.Integrations; - -namespace UKSF.Api.Services.Integrations { - public class PipeManager : IPipeManager { - private const string PIPE_COMMAND_CLOSE = "1"; - private const string PIPE_COMMAND_OPEN = "0"; - private const string PIPE_COMMAND_READ = "3"; - private const string PIPE_COMMAND_RESET = "4"; - private const string PIPE_COMMAND_WRITE = "2"; - private static DateTime connectionCheckTime = DateTime.Now; - private static DateTime pingCheckTime = DateTime.Now; - public static DateTime PongTime = DateTime.Now; - private int pipeCode; - - private bool runAll, runServer, serverStarted; - - public void Dispose() { - runAll = false; - runServer = false; - } - - public void Start() { - runAll = true; - runServer = true; - Task.Run( - async () => { - await Task.Delay(TimeSpan.FromSeconds(3)); - ConnectionCheck(); - while (runAll) { - try { - if (runServer && (DateTime.Now - connectionCheckTime).Seconds > 1) { - connectionCheckTime = DateTime.Now; - ConnectionCheck(); - } - - if (serverStarted && runServer && (DateTime.Now - pingCheckTime).Seconds > 2) { - pingCheckTime = DateTime.Now; - if (!PingCheck()) { - runServer = false; - Task unused = Task.Run( - async () => { - await Task.Delay(TimeSpan.FromSeconds(2)); - - pipeCode = 0; - runServer = true; - PongTime = DateTime.Now; - } - ); - } - } - - ReadCheck(); - WriteCheck(); - await Task.Delay(TimeSpan.FromMilliseconds(1)); - } catch (Exception exception) { - Console.Out.WriteLine(exception); - } - } - } - ); - } - - [DllImport("serverpipe.dll", CallingConvention = CallingConvention.StdCall)] - [return: MarshalAs(UnmanagedType.BStr)] - private static extern string ExecutePipeFunction([MarshalAs(UnmanagedType.BStr)] string args); - - private void ConnectionCheck() { - if (pipeCode != 1) { - try { - PongTime = DateTime.Now; - Console.Out.WriteLine("Opening pipe"); - string result = ExecutePipeFunction(PIPE_COMMAND_OPEN); - Console.Out.WriteLine(result); - int.TryParse(result, out pipeCode); - serverStarted = pipeCode == 1; - } catch (Exception exception) { - Console.Out.WriteLine(exception); - pipeCode = 0; - serverStarted = false; - } - } - } - - private static bool PingCheck() { -// ExecutePipeFunction($"{PIPE_COMMAND_WRITE}{ProcedureDefinitons.PROC_PING}:"); - if ((DateTime.Now - PongTime).Seconds > 10) { - Console.Out.WriteLine("Resetting pipe"); - string result = ExecutePipeFunction(PIPE_COMMAND_RESET); - Console.Out.WriteLine(result); - return false; - } - - return true; - } - - private void ReadCheck() { - if (pipeCode != 1) return; - string result = ExecutePipeFunction(PIPE_COMMAND_READ); - if (string.IsNullOrEmpty(result)) return; - switch (result) { - case "FALSE": - Console.Out.WriteLine("Closing pipe"); - result = ExecutePipeFunction(PIPE_COMMAND_CLOSE); - Console.Out.WriteLine(result); - pipeCode = 0; - return; - case "NULL": - case "NOT_CONNECTED": return; - default: - HandleMessage(result); - break; - } - } - - private void HandleMessage(string message) { - string[] parts = message.Split(new[] {':'}, 2); - string procedureName = parts[0]; - if (string.IsNullOrEmpty(procedureName)) return; - - if (parts.Length > 1) { -// ITeamspeakProcedure procedure = procedures.FirstOrDefault(x => x.GetType().Name == procedureName); -// if (procedure != null) { -// string[] args = parts[1].Split('|'); -// Task.Run(() => procedure.Run(args)); -// } - } - } - - private void WriteCheck() { - if (pipeCode != 1) return; - string message = PipeQueueManager.GetMessage(); - if (string.IsNullOrEmpty(message)) return; - string result = ExecutePipeFunction($"{PIPE_COMMAND_WRITE}{message}"); - if (result != "WRITE") { - Console.Out.WriteLine(result); - } - } - } -} diff --git a/UKSF.Api.Services/Integrations/PipeQueueManager.cs b/UKSF.Api.Services/Integrations/PipeQueueManager.cs deleted file mode 100644 index d3822bad..00000000 --- a/UKSF.Api.Services/Integrations/PipeQueueManager.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections.Concurrent; - -namespace UKSF.Api.Services.Integrations { - public static class PipeQueueManager { - private static readonly ConcurrentQueue PIPE_QUEUE = new ConcurrentQueue(); - - public static void QueueMessage(string message) { - PIPE_QUEUE.Enqueue(message); - } - - public static string GetMessage() { - if (PIPE_QUEUE.Count > 0) { - PIPE_QUEUE.TryDequeue(out string item); - return item; - } - - return string.Empty; - } - } -} diff --git a/UKSF.Api.Services/UKSF.Api.Services.csproj b/UKSF.Api.Services/UKSF.Api.Services.csproj deleted file mode 100644 index 588558e2..00000000 --- a/UKSF.Api.Services/UKSF.Api.Services.csproj +++ /dev/null @@ -1,44 +0,0 @@ - - - netcoreapp5.0 - UKSF.Api.Services - UKSF.Api.Services - disable - - - full - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj b/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj deleted file mode 100644 index 11c480ec..00000000 --- a/UKSF.Api.Signalr/UKSF.Api.Signalr.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netcoreapp5.0 - - - - - - - - diff --git a/UKSF.Api.Utility/ApiUtilityExtensions.cs b/UKSF.Api.Utility/ApiUtilityExtensions.cs index 9a049b56..5f7bf923 100644 --- a/UKSF.Api.Utility/ApiUtilityExtensions.cs +++ b/UKSF.Api.Utility/ApiUtilityExtensions.cs @@ -1,28 +1,20 @@ -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Base.Events; using UKSF.Api.Utility.Models; -using UKSF.Api.Utility.ScheduledActions; using UKSF.Api.Utility.Services; using UKSF.Api.Utility.Services.Data; namespace UKSF.Api.Utility { public static class ApiUtilityExtensions { + public static IServiceCollection AddUksfUtility(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); - public static IServiceCollection AddUksfUtility(this IServiceCollection services, IConfiguration configuration) { + private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton(); - services.AddTransient(); - services.AddTransient(); - services.AddSingleton(); + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - - return services; - } + private static IServiceCollection AddServices(this IServiceCollection services) => + services.AddSingleton().AddTransient(); } } diff --git a/UKSF.Api.Utility/ScheduledActions/PruneDataAction.cs b/UKSF.Api.Utility/ScheduledActions/PruneDataAction.cs index bccf173b..4e8409ad 100644 --- a/UKSF.Api.Utility/ScheduledActions/PruneDataAction.cs +++ b/UKSF.Api.Utility/ScheduledActions/PruneDataAction.cs @@ -1,5 +1,8 @@ using System; +using System.Reactive; using System.Threading.Tasks; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Models.Logging; namespace UKSF.Api.Utility.ScheduledActions { public interface IPruneDataAction : IScheduledAction { } @@ -15,9 +18,9 @@ public class PruneDataAction : IPruneDataAction { public void Run(params object[] parameters) { DateTime now = DateTime.Now; - Task logsTask = dataCollectionFactory.CreateDataCollection("logs").DeleteManyAsync(x => x.timestamp < now.AddDays(-7)); - Task errorLogsTask = dataCollectionFactory.CreateDataCollection("errorLogs").DeleteManyAsync(x => x.timestamp < now.AddDays(-7)); - Task auditLogsTask = dataCollectionFactory.CreateDataCollection("auditLogs").DeleteManyAsync(x => x.timestamp < now.AddMonths(-3)); + Task logsTask = dataCollectionFactory.CreateDataCollection("logs").DeleteManyAsync(x => x.timestamp < now.AddDays(-7)); + Task errorLogsTask = dataCollectionFactory.CreateDataCollection("errorLogs").DeleteManyAsync(x => x.timestamp < now.AddDays(-7)); + Task auditLogsTask = dataCollectionFactory.CreateDataCollection("auditLogs").DeleteManyAsync(x => x.timestamp < now.AddMonths(-3)); Task notificationsTask = dataCollectionFactory.CreateDataCollection("notifications").DeleteManyAsync(x => x.timestamp < now.AddMonths(-1)); IDataCollection buildsData = dataCollectionFactory.CreateDataCollection("modpackBuilds"); diff --git a/UKSF.Api.Utility/Services/SchedulerService.cs b/UKSF.Api.Utility/Services/SchedulerService.cs index 4c4c1403..4d1a5090 100644 --- a/UKSF.Api.Utility/Services/SchedulerService.cs +++ b/UKSF.Api.Utility/Services/SchedulerService.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Hosting; using Newtonsoft.Json; +using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; using UKSF.Api.Base.Services.Data; using UKSF.Api.Utility.Models; @@ -21,11 +22,13 @@ public interface ISchedulerService : IDataBackedService { public class SchedulerService : DataBackedService, ISchedulerService { private static readonly ConcurrentDictionary ACTIVE_TASKS = new ConcurrentDictionary(); private readonly IHostEnvironment currentEnvironment; + private readonly ILogger logger; private readonly IScheduledActionService scheduledActionService; - public SchedulerService(ISchedulerDataService data, IScheduledActionService scheduledActionService, IHostEnvironment currentEnvironment) : base(data) { + public SchedulerService(ISchedulerDataService data, IScheduledActionService scheduledActionService, IHostEnvironment currentEnvironment, ILogger logger) : base(data) { this.scheduledActionService = scheduledActionService; this.currentEnvironment = currentEnvironment; + this.logger = logger; } public async void Load() { @@ -102,6 +105,7 @@ private void Schedule(ScheduledJob job) { ACTIVE_TASKS[job.id] = token; } + // TODO: Move out of this bit private async Task AddUnique() { if (Data.GetSingle(x => x.action == InstagramImagesAction.ACTION_NAME) == null) { await Create(DateTime.Today, TimeSpan.FromMinutes(15), InstagramImagesAction.ACTION_NAME); diff --git a/UKSF.Api.sln b/UKSF.Api.sln index 992c4b64..16544d10 100644 --- a/UKSF.Api.sln +++ b/UKSF.Api.sln @@ -10,18 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UKSF.Api", "UKSF.Api\UKSF.Api.csproj", "{E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UKSF.Api.Models", "UKSF.Api.Models\UKSF.Api.Models.csproj", "{BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UKSF.Api.Services", "UKSF.Api.Services\UKSF.Api.Services.csproj", "{F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Data", "UKSF.Api.Data\UKSF.Api.Data.csproj", "{AE15E44A-DB7B-432F-84BA-7A01E6C54010}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Interfaces", "UKSF.Api.Interfaces\UKSF.Api.Interfaces.csproj", "{462304E4-442D-46F2-B0AD-73BBCEB01C8A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Events", "UKSF.Api.Events\UKSF.Api.Events.csproj", "{F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Signalr", "UKSF.Api.Signalr\UKSF.Api.Signalr.csproj", "{6F9B12CA-26BE-45D2-B520-A032490A53F0}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.PostMessage", "UKSF.PostMessage\UKSF.PostMessage.csproj", "{B173771C-1AB7-436B-A6FF-0EF50EF5D015}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Tests", "UKSF.Tests\UKSF.Tests.csproj", "{09946FE7-A65D-483E-8B5A-ADE729760375}" @@ -36,6 +24,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Utility", "UKSF.Ap EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Personnel", "UKSF.Api.Personnel\UKSF.Api.Personnel.csproj", "{213E4782-D069-4C1E-AA2C-025CF6573C40}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Command", "UKSF.Api.Command\UKSF.Api.Command.csproj", "{5CD118FD-9B31-4D1D-B355-212A71D2D5D3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Modpack", "UKSF.Api.Modpack\UKSF.Api.Modpack.csproj", "{16CED931-667B-4A80-95BD-A90B835223B9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.ArmaServer", "UKSF.Api.ArmaServer\UKSF.Api.ArmaServer.csproj", "{AEAD533B-0A9B-4E9D-9D87-A233FD72C119}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.ArmaMissions", "UKSF.Api.ArmaMissions\UKSF.Api.ArmaMissions.csproj", "{375F0A90-4319-415D-82AB-959A6BC3D30F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Integrations.Discord", "UKSF.Api.Integrations.Discord\UKSF.Api.Integrations.Discord.csproj", "{068D9F53-2333-4ADF-B778-1C5096249A5D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Integrations.Teamspeak", "UKSF.Api.Integrations.Teamspeak\UKSF.Api.Integrations.Teamspeak.csproj", "{25126FE4-C25B-4536-BE45-FF36487D6DFD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Launcher", "UKSF.Api.Launcher\UKSF.Api.Launcher.csproj", "{7E90402E-6762-46B2-911E-AB890FC108A4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Integration.Instagram", "UKSF.Api.Integration.Instagram\UKSF.Api.Integration.Instagram.csproj", "{B248CB10-298A-4B40-A999-FAAEFDDDD3E4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -52,54 +56,6 @@ Global {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Release|x64.Build.0 = Release|Any CPU {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Release|x86.ActiveCfg = Release|Any CPU {E89A896F-CA6E-4E2E-835B-0AE7AD1B9284}.Release|x86.Build.0 = Release|Any CPU - {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Debug|x64.ActiveCfg = Debug|Any CPU - {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Debug|x64.Build.0 = Debug|Any CPU - {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Debug|x86.ActiveCfg = Debug|Any CPU - {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Debug|x86.Build.0 = Debug|Any CPU - {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Release|x64.ActiveCfg = Release|Any CPU - {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Release|x64.Build.0 = Release|Any CPU - {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Release|x86.ActiveCfg = Release|Any CPU - {BD984EC0-BAD9-4F33-8CA2-35EBD3B88C30}.Release|x86.Build.0 = Release|Any CPU - {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Debug|x64.ActiveCfg = Debug|Any CPU - {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Debug|x64.Build.0 = Debug|Any CPU - {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Debug|x86.ActiveCfg = Debug|Any CPU - {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Debug|x86.Build.0 = Debug|Any CPU - {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Release|x64.ActiveCfg = Release|Any CPU - {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Release|x64.Build.0 = Release|Any CPU - {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Release|x86.ActiveCfg = Release|Any CPU - {F450DFE1-70E9-4ADF-9911-FA32DB68EE1F}.Release|x86.Build.0 = Release|Any CPU - {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|x64.ActiveCfg = Debug|Any CPU - {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|x64.Build.0 = Debug|Any CPU - {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|x86.ActiveCfg = Debug|Any CPU - {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Debug|x86.Build.0 = Debug|Any CPU - {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x64.ActiveCfg = Release|Any CPU - {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x64.Build.0 = Release|Any CPU - {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x86.ActiveCfg = Release|Any CPU - {AE15E44A-DB7B-432F-84BA-7A01E6C54010}.Release|x86.Build.0 = Release|Any CPU - {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|x64.ActiveCfg = Debug|Any CPU - {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|x64.Build.0 = Debug|Any CPU - {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|x86.ActiveCfg = Debug|Any CPU - {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Debug|x86.Build.0 = Debug|Any CPU - {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x64.ActiveCfg = Release|Any CPU - {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x64.Build.0 = Release|Any CPU - {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x86.ActiveCfg = Release|Any CPU - {462304E4-442D-46F2-B0AD-73BBCEB01C8A}.Release|x86.Build.0 = Release|Any CPU - {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|x64.ActiveCfg = Debug|Any CPU - {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|x64.Build.0 = Debug|Any CPU - {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|x86.ActiveCfg = Debug|Any CPU - {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Debug|x86.Build.0 = Debug|Any CPU - {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x64.ActiveCfg = Release|Any CPU - {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x64.Build.0 = Release|Any CPU - {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x86.ActiveCfg = Release|Any CPU - {F4CC9D1C-5709-47E6-BB5A-5C489BC7E99B}.Release|x86.Build.0 = Release|Any CPU - {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|x64.ActiveCfg = Debug|Any CPU - {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|x64.Build.0 = Debug|Any CPU - {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|x86.ActiveCfg = Debug|Any CPU - {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Debug|x86.Build.0 = Debug|Any CPU - {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x64.ActiveCfg = Release|Any CPU - {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x64.Build.0 = Release|Any CPU - {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x86.ActiveCfg = Release|Any CPU - {6F9B12CA-26BE-45D2-B520-A032490A53F0}.Release|x86.Build.0 = Release|Any CPU {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|x64.ActiveCfg = Debug|Any CPU {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|x64.Build.0 = Debug|Any CPU {B173771C-1AB7-436B-A6FF-0EF50EF5D015}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -156,6 +112,70 @@ Global {213E4782-D069-4C1E-AA2C-025CF6573C40}.Release|x64.Build.0 = Release|Any CPU {213E4782-D069-4C1E-AA2C-025CF6573C40}.Release|x86.ActiveCfg = Release|Any CPU {213E4782-D069-4C1E-AA2C-025CF6573C40}.Release|x86.Build.0 = Release|Any CPU + {5CD118FD-9B31-4D1D-B355-212A71D2D5D3}.Debug|x64.ActiveCfg = Debug|Any CPU + {5CD118FD-9B31-4D1D-B355-212A71D2D5D3}.Debug|x64.Build.0 = Debug|Any CPU + {5CD118FD-9B31-4D1D-B355-212A71D2D5D3}.Debug|x86.ActiveCfg = Debug|Any CPU + {5CD118FD-9B31-4D1D-B355-212A71D2D5D3}.Debug|x86.Build.0 = Debug|Any CPU + {5CD118FD-9B31-4D1D-B355-212A71D2D5D3}.Release|x64.ActiveCfg = Release|Any CPU + {5CD118FD-9B31-4D1D-B355-212A71D2D5D3}.Release|x64.Build.0 = Release|Any CPU + {5CD118FD-9B31-4D1D-B355-212A71D2D5D3}.Release|x86.ActiveCfg = Release|Any CPU + {5CD118FD-9B31-4D1D-B355-212A71D2D5D3}.Release|x86.Build.0 = Release|Any CPU + {16CED931-667B-4A80-95BD-A90B835223B9}.Debug|x64.ActiveCfg = Debug|Any CPU + {16CED931-667B-4A80-95BD-A90B835223B9}.Debug|x64.Build.0 = Debug|Any CPU + {16CED931-667B-4A80-95BD-A90B835223B9}.Debug|x86.ActiveCfg = Debug|Any CPU + {16CED931-667B-4A80-95BD-A90B835223B9}.Debug|x86.Build.0 = Debug|Any CPU + {16CED931-667B-4A80-95BD-A90B835223B9}.Release|x64.ActiveCfg = Release|Any CPU + {16CED931-667B-4A80-95BD-A90B835223B9}.Release|x64.Build.0 = Release|Any CPU + {16CED931-667B-4A80-95BD-A90B835223B9}.Release|x86.ActiveCfg = Release|Any CPU + {16CED931-667B-4A80-95BD-A90B835223B9}.Release|x86.Build.0 = Release|Any CPU + {AEAD533B-0A9B-4E9D-9D87-A233FD72C119}.Debug|x64.ActiveCfg = Debug|Any CPU + {AEAD533B-0A9B-4E9D-9D87-A233FD72C119}.Debug|x64.Build.0 = Debug|Any CPU + {AEAD533B-0A9B-4E9D-9D87-A233FD72C119}.Debug|x86.ActiveCfg = Debug|Any CPU + {AEAD533B-0A9B-4E9D-9D87-A233FD72C119}.Debug|x86.Build.0 = Debug|Any CPU + {AEAD533B-0A9B-4E9D-9D87-A233FD72C119}.Release|x64.ActiveCfg = Release|Any CPU + {AEAD533B-0A9B-4E9D-9D87-A233FD72C119}.Release|x64.Build.0 = Release|Any CPU + {AEAD533B-0A9B-4E9D-9D87-A233FD72C119}.Release|x86.ActiveCfg = Release|Any CPU + {AEAD533B-0A9B-4E9D-9D87-A233FD72C119}.Release|x86.Build.0 = Release|Any CPU + {375F0A90-4319-415D-82AB-959A6BC3D30F}.Debug|x64.ActiveCfg = Debug|Any CPU + {375F0A90-4319-415D-82AB-959A6BC3D30F}.Debug|x64.Build.0 = Debug|Any CPU + {375F0A90-4319-415D-82AB-959A6BC3D30F}.Debug|x86.ActiveCfg = Debug|Any CPU + {375F0A90-4319-415D-82AB-959A6BC3D30F}.Debug|x86.Build.0 = Debug|Any CPU + {375F0A90-4319-415D-82AB-959A6BC3D30F}.Release|x64.ActiveCfg = Release|Any CPU + {375F0A90-4319-415D-82AB-959A6BC3D30F}.Release|x64.Build.0 = Release|Any CPU + {375F0A90-4319-415D-82AB-959A6BC3D30F}.Release|x86.ActiveCfg = Release|Any CPU + {375F0A90-4319-415D-82AB-959A6BC3D30F}.Release|x86.Build.0 = Release|Any CPU + {068D9F53-2333-4ADF-B778-1C5096249A5D}.Debug|x64.ActiveCfg = Debug|Any CPU + {068D9F53-2333-4ADF-B778-1C5096249A5D}.Debug|x64.Build.0 = Debug|Any CPU + {068D9F53-2333-4ADF-B778-1C5096249A5D}.Debug|x86.ActiveCfg = Debug|Any CPU + {068D9F53-2333-4ADF-B778-1C5096249A5D}.Debug|x86.Build.0 = Debug|Any CPU + {068D9F53-2333-4ADF-B778-1C5096249A5D}.Release|x64.ActiveCfg = Release|Any CPU + {068D9F53-2333-4ADF-B778-1C5096249A5D}.Release|x64.Build.0 = Release|Any CPU + {068D9F53-2333-4ADF-B778-1C5096249A5D}.Release|x86.ActiveCfg = Release|Any CPU + {068D9F53-2333-4ADF-B778-1C5096249A5D}.Release|x86.Build.0 = Release|Any CPU + {25126FE4-C25B-4536-BE45-FF36487D6DFD}.Debug|x64.ActiveCfg = Debug|Any CPU + {25126FE4-C25B-4536-BE45-FF36487D6DFD}.Debug|x64.Build.0 = Debug|Any CPU + {25126FE4-C25B-4536-BE45-FF36487D6DFD}.Debug|x86.ActiveCfg = Debug|Any CPU + {25126FE4-C25B-4536-BE45-FF36487D6DFD}.Debug|x86.Build.0 = Debug|Any CPU + {25126FE4-C25B-4536-BE45-FF36487D6DFD}.Release|x64.ActiveCfg = Release|Any CPU + {25126FE4-C25B-4536-BE45-FF36487D6DFD}.Release|x64.Build.0 = Release|Any CPU + {25126FE4-C25B-4536-BE45-FF36487D6DFD}.Release|x86.ActiveCfg = Release|Any CPU + {25126FE4-C25B-4536-BE45-FF36487D6DFD}.Release|x86.Build.0 = Release|Any CPU + {7E90402E-6762-46B2-911E-AB890FC108A4}.Debug|x64.ActiveCfg = Debug|Any CPU + {7E90402E-6762-46B2-911E-AB890FC108A4}.Debug|x64.Build.0 = Debug|Any CPU + {7E90402E-6762-46B2-911E-AB890FC108A4}.Debug|x86.ActiveCfg = Debug|Any CPU + {7E90402E-6762-46B2-911E-AB890FC108A4}.Debug|x86.Build.0 = Debug|Any CPU + {7E90402E-6762-46B2-911E-AB890FC108A4}.Release|x64.ActiveCfg = Release|Any CPU + {7E90402E-6762-46B2-911E-AB890FC108A4}.Release|x64.Build.0 = Release|Any CPU + {7E90402E-6762-46B2-911E-AB890FC108A4}.Release|x86.ActiveCfg = Release|Any CPU + {7E90402E-6762-46B2-911E-AB890FC108A4}.Release|x86.Build.0 = Release|Any CPU + {B248CB10-298A-4B40-A999-FAAEFDDDD3E4}.Debug|x64.ActiveCfg = Debug|Any CPU + {B248CB10-298A-4B40-A999-FAAEFDDDD3E4}.Debug|x64.Build.0 = Debug|Any CPU + {B248CB10-298A-4B40-A999-FAAEFDDDD3E4}.Debug|x86.ActiveCfg = Debug|Any CPU + {B248CB10-298A-4B40-A999-FAAEFDDDD3E4}.Debug|x86.Build.0 = Debug|Any CPU + {B248CB10-298A-4B40-A999-FAAEFDDDD3E4}.Release|x64.ActiveCfg = Release|Any CPU + {B248CB10-298A-4B40-A999-FAAEFDDDD3E4}.Release|x64.Build.0 = Release|Any CPU + {B248CB10-298A-4B40-A999-FAAEFDDDD3E4}.Release|x86.ActiveCfg = Release|Any CPU + {B248CB10-298A-4B40-A999-FAAEFDDDD3E4}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs b/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs deleted file mode 100644 index f2f5c8c9..00000000 --- a/UKSF.Api/AppStart/Services/RegisterDataBackedServices.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using UKSF.Api.EventHandlers; -using UKSF.Api.Interfaces.Command; -using UKSF.Api.Interfaces.Game; -using UKSF.Api.Interfaces.Launcher; -using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Interfaces.Operations; -using UKSF.Api.Personnel.Services; -using UKSF.Api.Services.Command; -using UKSF.Api.Services.Fake; -using UKSF.Api.Services.Game; -using UKSF.Api.Services.Launcher; -using UKSF.Api.Services.Modpack; -using UKSF.Api.Services.Operations; - -namespace UKSF.Api.AppStart.Services { - public static class DataBackedServiceExtensions { - public static void RegisterDataBackedServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { - // Non-Cached - - // Cached - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - - services.AddSingleton(); - - // if (currentEnvironment.IsDevelopment()) { - // services.AddTransient(); - // } else { - // } - } - } -} diff --git a/UKSF.Api/AppStart/Services/RegisterDataServices.cs b/UKSF.Api/AppStart/Services/RegisterDataServices.cs deleted file mode 100644 index 83fec53d..00000000 --- a/UKSF.Api/AppStart/Services/RegisterDataServices.cs +++ /dev/null @@ -1,40 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using UKSF.Api.Data.Command; -using UKSF.Api.Data.Fake; -using UKSF.Api.Data.Game; -using UKSF.Api.Data.Launcher; -using UKSF.Api.Data.Modpack; -using UKSF.Api.Data.Operations; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Personnel.Services.Data; -using UKSF.Api.Services.Data; - -namespace UKSF.Api.AppStart.Services { - public static class DataServiceExtensions { - public static void RegisterDataServices(this IServiceCollection services, IHostEnvironment currentEnvironment) { - // Non-Cached - services.AddSingleton(); - - // Cached - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - - // if (currentEnvironment.IsDevelopment()) { - // services.AddSingleton(); - // } else { - // } - } - } -} diff --git a/UKSF.Api/AppStart/Services/RegisterEventServices.cs b/UKSF.Api/AppStart/Services/RegisterEventServices.cs deleted file mode 100644 index bb99ff6c..00000000 --- a/UKSF.Api/AppStart/Services/RegisterEventServices.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models.Logging; -using UKSF.Api.Events.Handlers; -using UKSF.Api.Interfaces.Events.Handlers; -using UKSF.Api.Models.Command; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Launcher; -using UKSF.Api.Models.Modpack; -using UKSF.Api.Models.Operations; -using UKSF.Api.Personnel.EventHandlers; -using UKSF.Api.Personnel.Models; -using ISignalrEventBus = UKSF.Api.Interfaces.Events.ISignalrEventBus; - -namespace UKSF.Api.AppStart.Services { - public static class EventServiceExtensions { - public static void RegisterEventServices(this IServiceCollection services) { - // Event Buses - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton, DataEventBus>(); - services.AddSingleton(); - - services.AddSingleton, DataEventBus>(); - - // Event Handlers - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - } - } -} diff --git a/UKSF.Api/AppStart/Services/ServiceExtensions.cs b/UKSF.Api/AppStart/Services/ServiceExtensions.cs deleted file mode 100644 index a07ac9a7..00000000 --- a/UKSF.Api/AppStart/Services/ServiceExtensions.cs +++ /dev/null @@ -1,80 +0,0 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using UKSF.Api.Interfaces.Command; -using UKSF.Api.Interfaces.Game; -using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Interfaces.Integrations.Github; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Launcher; -using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Personnel.Services; -using UKSF.Api.Services; -using UKSF.Api.Services.Command; -using UKSF.Api.Services.Fake; -using UKSF.Api.Services.Game; -using UKSF.Api.Services.Game.Missions; -using UKSF.Api.Services.Integrations; -using UKSF.Api.Services.Integrations.Github; -using UKSF.Api.Services.Integrations.Teamspeak; -using UKSF.Api.Services.Launcher; -using UKSF.Api.Services.Modpack; -using UKSF.Api.Services.Modpack.BuildProcess; - -namespace UKSF.Api.AppStart.Services { - public static class ServiceExtensions { - public static void RegisterServices(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { - // Base - services.AddSingleton(configuration); - services.AddSingleton(currentEnvironment); - services.AddSingleton(); - services.AddSingleton(); - - // Data common - - // Events & Data - services.RegisterEventServices(); - services.RegisterDataServices(currentEnvironment); - services.RegisterDataBackedServices(currentEnvironment); - - // Scheduled action services - - // Services - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - - services.AddTransient(); - services.AddTransient(); - - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); - - if (currentEnvironment.IsDevelopment()) { - services.AddSingleton(); - services.AddSingleton(); - } else { - services.AddSingleton(); - services.AddSingleton(); - } - } - } -} diff --git a/UKSF.Api/AppStart/UksfServiceExtensions.cs b/UKSF.Api/AppStart/UksfServiceExtensions.cs new file mode 100644 index 00000000..f6c1f98e --- /dev/null +++ b/UKSF.Api/AppStart/UksfServiceExtensions.cs @@ -0,0 +1,29 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using UKSF.Api.EventHandlers; +using UKSF.Api.Services; + +namespace UKSF.Api.AppStart { + public static class ServiceExtensions { + public static IServiceCollection AddUksf(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) => + services.AddContexts() + .AddEventBuses() + .AddEventHandlers() + .AddServices() + .AddSingleton(configuration) + .AddSingleton(currentEnvironment) + .AddSingleton() + .AddSingleton() + .AddSingleton(); + + private static IServiceCollection AddContexts(this IServiceCollection services) => services; + + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; + + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); + + private static IServiceCollection AddServices(this IServiceCollection services) => services; + } +} diff --git a/UKSF.Api/Controllers/DocsController.cs b/UKSF.Api/Controllers/DocsController.cs deleted file mode 100644 index c3f0aa3f..00000000 --- a/UKSF.Api/Controllers/DocsController.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using Microsoft.AspNetCore.Mvc; - -#pragma warning disable 649 -#pragma warning disable 414 - -namespace UKSF.Api.Controllers { - [Route("[controller]")] - public class DocsController : Controller { - private readonly Doc[] toc = {new Doc {Name = "Getting started"}, new Doc {Name = "Operations", Children = new[] {new Doc {Name = "How they work"}}}}; - - [HttpGet] - public IActionResult Get() { - List docsList = new List(); - foreach (Doc doc in toc) { - if (!string.IsNullOrEmpty(doc.Minrank)) continue; - doc.Children = GetAll(doc); - docsList.Add(doc); - } - - return Ok(docsList); - } - - private static Doc[] GetAll(Doc input) { - List docsList = new List(); - foreach (Doc doc in input.Children) { - if (!string.IsNullOrEmpty(doc.Minrank)) continue; - doc.Children = GetAll(doc); - docsList.Add(doc); - } - - return docsList.ToArray(); - } - - [HttpGet("{id}")] - public IActionResult Get(string id) { - string filePath = $"Docs/{id}.md"; - if (!System.IO.File.Exists(filePath)) return Ok(new {doc = $"'{filePath}' does not exist"}); - try { - using StreamReader streamReader = new StreamReader(System.IO.File.Open(filePath, FileMode.Open, FileAccess.Read, FileShare.Read)); - // return Ok(new {doc = Markdown.ToHtml(streamReader.ReadToEnd())}); - return Ok(); - } catch (Exception) { - return Ok(new {doc = $"Could not read file '{filePath}'"}); - } - } - - private class Doc { - public Doc[] Children = new Doc[0]; - public string Minrank; - public string Name; - } - } -} diff --git a/UKSF.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs index 51c0f7bb..d6cbe53c 100644 --- a/UKSF.Api/Controllers/LoaController.cs +++ b/UKSF.Api/Controllers/LoaController.cs @@ -5,13 +5,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using UKSF.Api.Base; +using UKSF.Api.Base.Events; using UKSF.Api.Base.Services; -using UKSF.Api.Interfaces.Command; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Command; +using UKSF.Api.Command.Models; +using UKSF.Api.Command.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; @@ -25,6 +22,7 @@ public class LoaController : Controller { private readonly ILoaService loaService; private readonly IHttpContextService httpContextService; private readonly INotificationsService notificationsService; + private readonly ILogger logger; private readonly IUnitsService unitsService; @@ -36,17 +34,18 @@ public LoaController( IUnitsService unitsService, IChainOfCommandService chainOfCommandService, ICommandRequestService commandRequestService, - INotificationsService notificationsService + INotificationsService notificationsService, + ILogger logger ) { this.loaService = loaService; this.httpContextService = httpContextService; - this.displayNameService = displayNameService; this.accountService = accountService; this.unitsService = unitsService; this.chainOfCommandService = chainOfCommandService; this.commandRequestService = commandRequestService; this.notificationsService = notificationsService; + this.logger = logger; } [HttpGet, Authorize] diff --git a/UKSF.Api/Controllers/LoggingController.cs b/UKSF.Api/Controllers/LoggingController.cs index 86a1e720..8eb14265 100644 --- a/UKSF.Api/Controllers/LoggingController.cs +++ b/UKSF.Api/Controllers/LoggingController.cs @@ -1,36 +1,56 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using MongoDB.Driver; -using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Base; +using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Base.Services.Data; namespace UKSF.Api.Controllers { [Route("[controller]"), Permissions(Permissions.ADMIN)] public class LoggingController : Controller { - private readonly IMongoDatabase database; + private readonly IAuditLogDataService auditLogDataService; + private readonly IHttpErrorLogDataService httpErrorLogDataService; + private readonly ILauncherLogDataService launcherLogDataService; + private readonly ILogDataService logDataService; - public LoggingController(IMongoDatabase database) => this.database = database; + public LoggingController( + ILogDataService logDataService, + IAuditLogDataService auditLogDataService, + IHttpErrorLogDataService httpErrorLogDataService, + ILauncherLogDataService launcherLogDataService + ) { + this.logDataService = logDataService; + this.auditLogDataService = auditLogDataService; + this.httpErrorLogDataService = httpErrorLogDataService; + this.launcherLogDataService = launcherLogDataService; + } + + [HttpGet("basic"), Authorize] + public List GetBasicLogs() { + List logs = new List(logDataService.Get()); + logs.Reverse(); + return logs; + } + + [HttpGet("httpError"), Authorize] + public List GetHttpErrorLogs() { + List errorLogs = new List(httpErrorLogDataService.Get()); + errorLogs.Reverse(); + return errorLogs; + } + + [HttpGet("audit"), Authorize] + public List GetAuditLogs() { + List auditLogs = new List(auditLogDataService.Get()); + auditLogs.Reverse(); + return auditLogs; + } - [HttpGet, Authorize] - public IActionResult GetLogs([FromQuery] string type = "logs") { - switch (type) { - case "error": - List errorLogs = database.GetCollection("errorLogs").AsQueryable().ToList(); - errorLogs.Reverse(); - return Ok(errorLogs); - case "audit": - List auditLogs = database.GetCollection("auditLogs").AsQueryable().ToList(); - auditLogs.Reverse(); - return Ok(auditLogs); - case "launcher": - List launcherLogs = database.GetCollection("launcherLogs").AsQueryable().ToList(); - launcherLogs.Reverse(); - return Ok(launcherLogs); - default: - List logs = database.GetCollection("logs").AsQueryable().ToList(); - logs.Reverse(); - return Ok(logs); - } + [HttpGet("launcher"), Authorize] + public List GetLauncherLogs() { + List launcherLogs = new List(launcherLogDataService.Get()); + launcherLogs.Reverse(); + return launcherLogs; } } } diff --git a/UKSF.Api/ModsController.cs b/UKSF.Api/Controllers/ModsController.cs similarity index 86% rename from UKSF.Api/ModsController.cs rename to UKSF.Api/Controllers/ModsController.cs index 9f3a9ebf..0df0a84e 100644 --- a/UKSF.Api/ModsController.cs +++ b/UKSF.Api/Controllers/ModsController.cs @@ -1,7 +1,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Base; -namespace UKSF.Api { +namespace UKSF.Api.Controllers { [Route("[controller]"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER)] public class ModsController : Controller { // TODO: Return size of modpack folder diff --git a/UKSF.Api/Controllers/News/NewsController.cs b/UKSF.Api/Controllers/News/NewsController.cs deleted file mode 100644 index ffd4aa67..00000000 --- a/UKSF.Api/Controllers/News/NewsController.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Net.Http; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Newtonsoft.Json.Linq; - -namespace UKSF.Api.Controllers.News { - [Route("[controller]")] - public class NewsController : Controller { - [HttpGet] - public async Task Get() { - JArray output = new JArray(); - - using (HttpClient client = new HttpClient()) { - client.DefaultRequestHeaders.Add("Authorization", "Bot Mzc5ODQ2NDMwNTA1OTU5NDQ1.DO4raw.2fXCTl97ED-KYi0kUK6tXKHfcuw"); - string result = await (await client.GetAsync("https://discordapp.com/api/v6/channels/311547331935862786/messages")).Content.ReadAsStringAsync(); - - JArray json = JArray.Parse(result); - foreach (JToken jToken in json) { - JObject message = (JObject) jToken; - if (message.GetValue("content").ToString().StartsWith("@everyone")) { - string user = await (await client.GetAsync($"https://discordapp.com/api/v6/guilds/311543678126653451/members/{(message.GetValue("author") as JObject)?.GetValue("id")}")).Content.ReadAsStringAsync(); - output.Add(JObject.FromObject(new {message = CleanNewsMessage(message.GetValue("content").ToString().Replace("@everyone", "")), author = JObject.Parse(user).GetValue("nick"), timestamp = message.GetValue("timestamp")})); - } - } - } - - return Ok(new {content = output}); - } - - private static string CleanNewsMessage(string source) { - string[] filters = {" ", "-", "\n"}; - foreach (string filter in filters) { - if (!source.StartsWith(filter)) continue; - source = source.Remove(0, filter.ToCharArray().Length); - source = CleanNewsMessage(source); - } - - return source; - } - } -} diff --git a/UKSF.Api/Docs/test.md b/UKSF.Api/Docs/test.md deleted file mode 100644 index 00b73541..00000000 --- a/UKSF.Api/Docs/test.md +++ /dev/null @@ -1,2 +0,0 @@ -# A test -another test \ No newline at end of file diff --git a/UKSF.Api/EventHandlers/LoggerEventHandler.cs b/UKSF.Api/EventHandlers/LoggerEventHandler.cs index 8c6203c4..c277a5aa 100644 --- a/UKSF.Api/EventHandlers/LoggerEventHandler.cs +++ b/UKSF.Api/EventHandlers/LoggerEventHandler.cs @@ -2,9 +2,9 @@ using System.Threading.Tasks; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Base.Services.Data; using UKSF.Api.Personnel.Services; using UKSF.Api.Services; -using UKSF.Api.Services.Data; namespace UKSF.Api.EventHandlers { public interface ILoggerEventHandler : IEventHandler { } diff --git a/UKSF.Api.Services/ExceptionHandler.cs b/UKSF.Api/ExceptionHandler.cs similarity index 73% rename from UKSF.Api.Services/ExceptionHandler.cs rename to UKSF.Api/ExceptionHandler.cs index 2fecf896..485f6aea 100644 --- a/UKSF.Api.Services/ExceptionHandler.cs +++ b/UKSF.Api/ExceptionHandler.cs @@ -9,7 +9,7 @@ using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Services { +namespace UKSF.Api { public class ExceptionHandler : IExceptionFilter { private readonly IDisplayNameService displayNameService; private readonly IHttpContextService httpContextService; @@ -31,17 +31,20 @@ public void OnException(ExceptionContext filterContext) { } else { // unhandled/unexpected exception - log always HttpContext context = filterContext.HttpContext; - Log(context, filterContext.Exception); + LogError(context, filterContext.Exception); filterContext.ExceptionHandled = true; - filterContext.Result = new ContentResult {Content = $"{filterContext.Exception.Message}", ContentType = "text/plain", StatusCode = (int?) HttpStatusCode.BadRequest}; + filterContext.Result = new ContentResult { Content = $"{filterContext.Exception.Message}", ContentType = "text/plain", StatusCode = (int?) HttpStatusCode.BadRequest }; } } - private void Log(HttpContext context, Exception exception) { - bool authenticated = context != null && context.User.Identity.IsAuthenticated; + private void LogError(HttpContext context, Exception exception) { + bool authenticated = httpContextService.IsUserAuthenticated(); string userId = httpContextService.GetUserId(); HttpErrorLog log = new HttpErrorLog(exception) { - httpMethod = context?.Request.Method ?? string.Empty, url = context?.Request.GetDisplayUrl(), userId = authenticated ? userId : "GUEST", name = authenticated ? displayNameService.GetDisplayName(userId) : "GUEST" + httpMethod = context?.Request.Method ?? string.Empty, + url = context?.Request.GetDisplayUrl(), + userId = authenticated ? userId : "Guest", + name = authenticated ? displayNameService.GetDisplayName(userId) : "Guest" }; logger.LogHttpError(log); } diff --git a/UKSF.Api/Fake/FakeCachedDataService.cs b/UKSF.Api/Fake/FakeCachedDataService.cs new file mode 100644 index 00000000..5d0f36f8 --- /dev/null +++ b/UKSF.Api/Fake/FakeCachedDataService.cs @@ -0,0 +1,5 @@ +// namespace UKSF.Api.Fake { +// public class FakeCachedDataService : FakeDataService where T : DatabaseObject { +// public void Refresh() { } +// } +// } diff --git a/UKSF.Api/Fake/FakeDataService.cs b/UKSF.Api/Fake/FakeDataService.cs new file mode 100644 index 00000000..4a5120a4 --- /dev/null +++ b/UKSF.Api/Fake/FakeDataService.cs @@ -0,0 +1,35 @@ +// using System; +// using System.Collections.Generic; +// using System.Linq.Expressions; +// using System.Threading.Tasks; +// using MongoDB.Driver; +// +// namespace UKSF.Api.Fake { +// public abstract class FakeDataService : IDataService where T : DatabaseObject { +// public IEnumerable Get() => new List(); +// +// public IEnumerable Get(Func predicate) => new List(); +// +// public T GetSingle(string id) => default; +// +// public T GetSingle(Func predicate) => default; +// +// public Task Add(T item) => Task.CompletedTask; +// +// public Task Update(string id, string fieldName, object value) => Task.CompletedTask; +// +// public Task Update(string id, UpdateDefinition update) => Task.CompletedTask; +// +// public Task Update(Expression> filterExpression, UpdateDefinition update) => Task.CompletedTask; +// +// public Task UpdateMany(Expression> filterExpression, UpdateDefinition update) => Task.CompletedTask; +// +// public Task Replace(T item) => Task.CompletedTask; +// +// public Task Delete(string id) => Task.CompletedTask; +// +// public Task Delete(T item) => Task.CompletedTask; +// +// public Task DeleteMany(Expression> filterExpression) => Task.CompletedTask; +// } +// } diff --git a/UKSF.Api/Fake/FakeDiscordService.cs b/UKSF.Api/Fake/FakeDiscordService.cs new file mode 100644 index 00000000..97b6b07a --- /dev/null +++ b/UKSF.Api/Fake/FakeDiscordService.cs @@ -0,0 +1,23 @@ +// using System.Threading.Tasks; +// using Microsoft.Extensions.Configuration; +// +// namespace UKSF.Api.Fake { +// public class FakeDiscordService : DiscordService { +// public FakeDiscordService( +// IConfiguration configuration, +// IRanksService ranksService, +// IUnitsService unitsService, +// IAccountService accountService, +// IDisplayNameService displayNameService, +// IVariablesService variablesService +// ) : base(configuration, ranksService, unitsService, accountService, displayNameService, variablesService) { } +// +// public override Task SendMessageToEveryone(ulong channelId, string message) => Task.CompletedTask; +// +// public override Task SendMessage(ulong channelId, string message) => Task.CompletedTask; +// +// public override Task UpdateAllUsers() => Task.CompletedTask; +// +// public override Task UpdateAccount(Account account, ulong discordId = 0) => Task.CompletedTask; +// } +// } diff --git a/UKSF.Api/Fake/FakeNotificationsDataService.cs b/UKSF.Api/Fake/FakeNotificationsDataService.cs new file mode 100644 index 00000000..70cfc096 --- /dev/null +++ b/UKSF.Api/Fake/FakeNotificationsDataService.cs @@ -0,0 +1,3 @@ +// namespace UKSF.Api.Fake { +// public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { } +// } diff --git a/UKSF.Api/Fake/FakeNotificationsService.cs b/UKSF.Api/Fake/FakeNotificationsService.cs new file mode 100644 index 00000000..93c8dc9d --- /dev/null +++ b/UKSF.Api/Fake/FakeNotificationsService.cs @@ -0,0 +1,20 @@ +// using System.Collections.Generic; +// using System.Threading.Tasks; +// +// namespace UKSF.Api.Fake { +// public class FakeNotificationsService : DataBackedService, INotificationsService { +// public FakeNotificationsService(INotificationsDataService data) : base(data) { } +// +// public Task SendTeamspeakNotification(Account account, string rawMessage) => Task.CompletedTask; +// +// public Task SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) => Task.CompletedTask; +// +// public IEnumerable GetNotificationsForContext() => new List(); +// +// public void Add(Notification notification) { } +// +// public Task MarkNotificationsAsRead(List ids) => Task.CompletedTask; +// +// public Task Delete(List ids) => Task.CompletedTask; +// } +// } diff --git a/UKSF.Api/Fake/FakeTeamspeakManagerService.cs b/UKSF.Api/Fake/FakeTeamspeakManagerService.cs new file mode 100644 index 00000000..eeaea0cf --- /dev/null +++ b/UKSF.Api/Fake/FakeTeamspeakManagerService.cs @@ -0,0 +1,13 @@ +// using System.Threading.Tasks; +// +// namespace UKSF.Api.Fake { +// public class FakeTeamspeakManagerService : ITeamspeakManagerService { +// public void Start() { } +// +// public void Stop() { } +// +// public Task SendGroupProcedure(TeamspeakProcedureType procedure, TeamspeakGroupProcedure groupProcedure) => Task.CompletedTask; +// +// public Task SendProcedure(TeamspeakProcedureType procedure, object args) => Task.CompletedTask; +// } +// } diff --git a/UKSF.Api/Services/Data/LogDataService.cs b/UKSF.Api/Services/Data/LogDataService.cs deleted file mode 100644 index 37d0ece4..00000000 --- a/UKSF.Api/Services/Data/LogDataService.cs +++ /dev/null @@ -1,30 +0,0 @@ -using UKSF.Api.Base.Database; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models.Logging; -using UKSF.Api.Base.Services.Data; - -namespace UKSF.Api.Services.Data { - public interface ILogDataService : IDataService { } - - public interface IAuditLogDataService : IDataService { } - - public interface IHttpErrorLogDataService : IDataService { } - - public interface ILauncherLogDataService : IDataService { } - - public class LogDataService : DataService, ILogDataService { - public LogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "logs") { } - } - - public class AuditLogDataService : DataService, IAuditLogDataService { - public AuditLogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "auditLogs") { } - } - - public class HttpErrorLogDataService : DataService, IHttpErrorLogDataService { - public HttpErrorLogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "errorLogs") { } - } - - public class LauncherLogDataService : DataService, ILauncherLogDataService { - public LauncherLogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "launcherLogs") { } - } -} diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index f08746ae..425840fe 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -1,34 +1,19 @@ using System; -using System.Linq; -using System.Text; using System.Threading.Tasks; -using AspNet.Security.OpenId; using AutoMapper; -using Microsoft.AspNetCore.Authentication.Cookies; -using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Primitives; -using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerUI; using UKSF.Api.Admin; using UKSF.Api.AppStart; -using UKSF.Api.AppStart.Services; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Modpack.BuildProcess; -using UKSF.Api.Personnel.SignalrHubs; -using UKSF.Api.Personnel.SignalrHubs.Hubs; -using UKSF.Api.Services; -using UKSF.Api.Signalr.Hubs.Command; -using UKSF.Api.Signalr.Hubs.Game; -using UKSF.Api.Signalr.Hubs.Integrations; -using UKSF.Api.Signalr.Hubs.Modpack; -using UKSF.Api.Signalr.Hubs.Utility; +using UKSF.Api.Modpack.Services.BuildProcess; +using UKSF.Api.Personnel.Signalr.Hubs; +using UKSF.Api.Teamspeak.Services; namespace UKSF.Api { public class Startup { @@ -43,7 +28,7 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration } public void ConfigureServices(IServiceCollection services) { - services.RegisterServices(configuration, currentEnvironment); + services.AddUksf(configuration, currentEnvironment); services.AddCors( options => options.AddPolicy( diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index 3d789bec..db11818c 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -13,12 +13,6 @@ full true - - - - - - @@ -42,17 +36,18 @@ + + + - - Always - + diff --git a/UKSF.Common/UKSF.Common.csproj b/UKSF.Common/UKSF.Common.csproj deleted file mode 100644 index f242e11e..00000000 --- a/UKSF.Common/UKSF.Common.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - netcoreapp5.0 - - - - - - - - - - - - C:\Windows\Microsoft.NET\assembly\GAC_MSIL\System.Management\v4.0_4.0.0.0__b03f5f7f11d50a3a\System.Management.dll - - - - - - - - diff --git a/UKSF.Tests/Common/ITestCachedDataService.cs b/UKSF.Tests/Common/ITestCachedDataService.cs index b8749408..6f40eb1a 100644 --- a/UKSF.Tests/Common/ITestCachedDataService.cs +++ b/UKSF.Tests/Common/ITestCachedDataService.cs @@ -1,4 +1,4 @@ -using UKSF.Api.Interfaces.Data; +using UKSF.Api.Base.Services.Data; namespace UKSF.Tests.Common { public interface ITestCachedDataService : IDataService { } diff --git a/UKSF.Tests/Common/ITestDataService.cs b/UKSF.Tests/Common/ITestDataService.cs index f3acc3b4..c775fcfa 100644 --- a/UKSF.Tests/Common/ITestDataService.cs +++ b/UKSF.Tests/Common/ITestDataService.cs @@ -1,4 +1,4 @@ -using UKSF.Api.Interfaces.Data; +using UKSF.Api.Base.Services.Data; namespace UKSF.Tests.Common { public interface ITestDataService : IDataService { } diff --git a/UKSF.Tests/Common/TestCachedDataService.cs b/UKSF.Tests/Common/TestCachedDataService.cs index 5c5c90a9..b5939902 100644 --- a/UKSF.Tests/Common/TestCachedDataService.cs +++ b/UKSF.Tests/Common/TestCachedDataService.cs @@ -1,6 +1,6 @@ -using UKSF.Api.Data; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; namespace UKSF.Tests.Common { public class TestCachedDataService : CachedDataService, ITestCachedDataService { diff --git a/UKSF.Tests/Common/TestDataModel.cs b/UKSF.Tests/Common/TestDataModel.cs index 6af7a1ae..19424c8f 100644 --- a/UKSF.Tests/Common/TestDataModel.cs +++ b/UKSF.Tests/Common/TestDataModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using UKSF.Api.Models; +using UKSF.Api.Base.Models; namespace UKSF.Tests.Common { public class TestDataModel : DatabaseObject { diff --git a/UKSF.Tests/Common/TestDataService.cs b/UKSF.Tests/Common/TestDataService.cs index 9cbb623a..2833d12e 100644 --- a/UKSF.Tests/Common/TestDataService.cs +++ b/UKSF.Tests/Common/TestDataService.cs @@ -1,6 +1,6 @@ -using UKSF.Api.Data; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Services.Data; namespace UKSF.Tests.Common { public class TestDataService : DataService, ITestDataService { diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index 85327b6b..dc1ef1e3 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -6,9 +6,8 @@ using Mongo2Go; using MongoDB.Bson; using MongoDB.Driver; -using UKSF.Api.Data; +using UKSF.Api.Base.Database; using UKSF.Api.Personnel.Models; -using UKSF.Api.Services.Utility; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/UKSF.Tests.csproj b/UKSF.Tests/UKSF.Tests.csproj index 5671c577..7a84b303 100644 --- a/UKSF.Tests/UKSF.Tests.csproj +++ b/UKSF.Tests/UKSF.Tests.csproj @@ -27,8 +27,12 @@ + + + + diff --git a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs index 8c89691b..92330403 100644 --- a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using FluentAssertions; using MongoDB.Bson; -using UKSF.Api.Models; +using UKSF.Api.Base.Extensions; using UKSF.Api.Personnel.Models; -using UKSF.Common; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Common/ClockTests.cs b/UKSF.Tests/Unit/Common/ClockTests.cs index 22a193e5..4a33e203 100644 --- a/UKSF.Tests/Unit/Common/ClockTests.cs +++ b/UKSF.Tests/Unit/Common/ClockTests.cs @@ -1,6 +1,6 @@ using System; using FluentAssertions; -using UKSF.Common; +using UKSF.Api.Base.Services; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs b/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs index 9cd030ec..282de978 100644 --- a/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using FluentAssertions; -using UKSF.Common; +using UKSF.Api.Base.Extensions; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs b/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs index 2a3258e4..468212aa 100644 --- a/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs @@ -1,9 +1,6 @@ -using System; -using System.Collections.Generic; -using FluentAssertions; +using FluentAssertions; using Newtonsoft.Json.Linq; -using UKSF.Common; -using UKSF.Tests.Common; +using UKSF.Api.Base.Extensions; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs b/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs index f13f6a60..9a4098e2 100644 --- a/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs @@ -1,6 +1,6 @@ using System; using FluentAssertions; -using UKSF.Common; +using UKSF.Api.Base.Extensions; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs b/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs index a2a2eb90..e5cadef4 100644 --- a/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs +++ b/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs @@ -1,7 +1,7 @@ using FluentAssertions; using MongoDB.Bson; -using UKSF.Api.Data; -using UKSF.Api.Models.Events; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs b/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs index 8eaf8143..9e77d012 100644 --- a/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs +++ b/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs @@ -1,5 +1,5 @@ using FluentAssertions; -using UKSF.Common; +using UKSF.Api.Base.Extensions; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs b/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs index 80026a60..9df560a9 100644 --- a/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using FluentAssertions; -using UKSF.Common; +using UKSF.Api.Base.Extensions; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs b/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs index 42961c4c..56129bf0 100644 --- a/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using FluentAssertions; -using UKSF.Common; +using UKSF.Api.Base.Extensions; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs index 836a1049..c3ee48dd 100644 --- a/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; using FluentAssertions; -using UKSF.Common; +using UKSF.Api.Base.Extensions; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs index 0dd0c5c8..4c6cabe8 100644 --- a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs @@ -5,10 +5,10 @@ using FluentAssertions; using MongoDB.Driver; using Moq; -using UKSF.Api.Data.Admin; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Admin; +using UKSF.Api.Admin.Models; +using UKSF.Api.Admin.Services.Data; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Admin { diff --git a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs index c7db45f5..31dfd763 100644 --- a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs @@ -6,9 +6,9 @@ using FluentAssertions; using MongoDB.Driver; using Moq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs index a1c24dc0..a9d3e157 100644 --- a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs @@ -7,9 +7,9 @@ using MongoDB.Bson; using MongoDB.Driver; using Moq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs b/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs index 18597bf7..6ecfbddd 100644 --- a/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs +++ b/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs @@ -1,8 +1,7 @@ using FluentAssertions; using MongoDB.Driver; using Moq; -using UKSF.Api.Data; -using UKSF.Api.Interfaces.Data; +using UKSF.Api.Base.Database; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs index bea4f281..94af02e5 100644 --- a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs @@ -7,9 +7,9 @@ using MongoDB.Bson; using MongoDB.Driver; using Moq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Data/DataServiceTests.cs b/UKSF.Tests/Unit/Data/DataServiceTests.cs index e13e5ea3..fba888a7 100644 --- a/UKSF.Tests/Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceTests.cs @@ -7,9 +7,9 @@ using MongoDB.Bson; using MongoDB.Driver; using Moq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs index ff1424d7..a861d6ff 100644 --- a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Data.Game; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Game; +using UKSF.Api.ArmaServer.DataContext; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Game { diff --git a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs index a09334f5..431e768c 100644 --- a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs @@ -4,9 +4,9 @@ using MongoDB.Bson; using MongoDB.Driver; using Moq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services.Data; using UKSF.Tests.Common; diff --git a/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs index 5c507402..7723ba88 100644 --- a/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs @@ -2,49 +2,50 @@ using System.Threading.Tasks; using FluentAssertions; using Moq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Base.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Data.Message { public class LogDataServiceTests { private readonly LogDataService logDataService; - private readonly List mockAuditCollection; - private readonly List mockBasicCollection; - private readonly List mockErrorCollection; - private readonly List mockLauncherCollection; + private readonly List mockAuditCollection; + private readonly List mockBasicCollection; + private readonly List mockErrorCollection; + private readonly List mockLauncherCollection; public LogDataServiceTests() { - Mock> mockDataEventBus = new Mock>(); + Mock> mockDataEventBus = new Mock>(); Mock mockDataCollectionFactory = new Mock(); - Mock> mockBasicDataCollection = new Mock>(); - Mock> mockAuditDataCollection = new Mock>(); - Mock> mockLauncherDataCollection = new Mock>(); - Mock> mockErrorDataCollection = new Mock>(); + Mock> mockBasicDataCollection = new Mock>(); + Mock> mockAuditDataCollection = new Mock>(); + Mock> mockLauncherDataCollection = new Mock>(); + Mock> mockErrorDataCollection = new Mock>(); - mockBasicCollection = new List(); - mockAuditCollection = new List(); - mockLauncherCollection = new List(); - mockErrorCollection = new List(); + mockBasicCollection = new List(); + mockAuditCollection = new List(); + mockLauncherCollection = new List(); + mockErrorCollection = new List(); - mockBasicDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockBasicCollection.Add(x)); - mockAuditDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockAuditCollection.Add(x)); - mockLauncherDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockLauncherCollection.Add(x)); - mockErrorDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockErrorCollection.Add(x)); + mockBasicDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockBasicCollection.Add(x)); + mockAuditDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockAuditCollection.Add(x)); + mockLauncherDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockLauncherCollection.Add(x)); + mockErrorDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockErrorCollection.Add(x)); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("logs")).Returns(mockBasicDataCollection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("auditLogs")).Returns(mockAuditDataCollection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("launcherLogs")).Returns(mockLauncherDataCollection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("errorLogs")).Returns(mockErrorDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("logs")).Returns(mockBasicDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("auditLogs")).Returns(mockAuditDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("launcherLogs")).Returns(mockLauncherDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("errorLogs")).Returns(mockErrorDataCollection.Object); logDataService = new LogDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Fact] public async Task ShouldUseAuditLogCollection() { - AuditLogMessage logMessage = new AuditLogMessage(); + AuditLog logMessage = new AuditLog("server", "test"); await logDataService.Add(logMessage); @@ -56,10 +57,10 @@ public async Task ShouldUseAuditLogCollection() { [Fact] public async Task ShouldUseCorrectCollection() { - BasicLogMessage basicLogMessage = new BasicLogMessage("test"); - AuditLogMessage auditLogMessage = new AuditLogMessage(); - LauncherLogMessage launcherLogMessage = new LauncherLogMessage("1", "test"); - WebLogMessage webLogMessage = new WebLogMessage(); + BasicLog basicLogMessage = new BasicLog("test"); + AuditLog auditLogMessage = new AuditLog("server", "test"); + LauncherLog launcherLogMessage = new LauncherLog("1", "test"); + HttpErrorLog webLogMessage = new HttpErrorLog(); await logDataService.Add(basicLogMessage); await logDataService.Add(auditLogMessage); @@ -74,7 +75,7 @@ public async Task ShouldUseCorrectCollection() { [Fact] public async Task ShouldUseErrorLogCollection() { - WebLogMessage logMessage = new WebLogMessage(); + HttpErrorLog logMessage = new HttpErrorLog(); await logDataService.Add(logMessage); @@ -86,7 +87,7 @@ public async Task ShouldUseErrorLogCollection() { [Fact] public async Task ShouldUseLauncherLogCollection() { - LauncherLogMessage logMessage = new LauncherLogMessage("1", "test"); + LauncherLog logMessage = new LauncherLog("1", "test"); await logDataService.Add(logMessage); @@ -98,7 +99,7 @@ public async Task ShouldUseLauncherLogCollection() { [Fact] public async Task ShouldUseLogCollection() { - BasicLogMessage logMessage = new BasicLogMessage("test"); + BasicLog logMessage = new BasicLog("test"); await logDataService.Add(logMessage); diff --git a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs index af6611d5..4cb2b2b6 100644 --- a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs @@ -4,11 +4,11 @@ using MongoDB.Bson; using MongoDB.Driver; using Moq; -using UKSF.Api.Data.Modpack; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Modpack; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; +using UKSF.Api.Modpack.Models; +using UKSF.Api.Modpack.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Data.Modpack { diff --git a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs index 962b3e7d..c29155ce 100644 --- a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Data.Modpack; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Modpack; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Modpack.Models; +using UKSF.Api.Modpack.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Data.Modpack { diff --git a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs index c958f71b..d52fc002 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Data.Operations; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Operations; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Command.Context; +using UKSF.Api.Command.Models; using Xunit; namespace UKSF.Tests.Unit.Data.Operations { diff --git a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs index 1106e6dd..4b5181d3 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Data.Operations; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Operations; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Command.Context; +using UKSF.Api.Command.Models; using Xunit; namespace UKSF.Tests.Unit.Data.Operations { diff --git a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs index 2a0e22ef..5df7eb1c 100644 --- a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services.Data; using Xunit; diff --git a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs index db10099a..e164ba2c 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services.Data; using Xunit; diff --git a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs index 30a10bfb..cf5fc1e0 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services.Data; using Xunit; diff --git a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs index a9e4551c..6e591c32 100644 --- a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs @@ -1,14 +1,14 @@ using Moq; -using UKSF.Api.Data.Command; -using UKSF.Api.Data.Launcher; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Models.Command; -using UKSF.Api.Models.Launcher; -using UKSF.Api.Models.Utility; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Command.Context; +using UKSF.Api.Command.Models; +using UKSF.Api.Launcher.Context; +using UKSF.Api.Launcher.Models; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services; using UKSF.Api.Personnel.Services.Data; +using UKSF.Api.Utility.Models; +using UKSF.Api.Utility.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Data { diff --git a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index ae998a02..d90e6e9f 100644 --- a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services.Data; using Xunit; diff --git a/UKSF.Tests/Unit/Events/EventBusTests.cs b/UKSF.Tests/Unit/Events/EventBusTests.cs index 812f1257..58204d44 100644 --- a/UKSF.Tests/Unit/Events/EventBusTests.cs +++ b/UKSF.Tests/Unit/Events/EventBusTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; -using UKSF.Api.Events; -using UKSF.Api.Models.Events; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs b/UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs deleted file mode 100644 index cab195b2..00000000 --- a/UKSF.Tests/Unit/Events/EventHandlerInitialiserTests.cs +++ /dev/null @@ -1,46 +0,0 @@ -using Moq; -using UKSF.Api.Events; -using UKSF.Api.Interfaces.Events.Handlers; -using Xunit; - -namespace UKSF.Tests.Unit.Events { - public class EventHandlerInitialiserTests { - [Fact] - public void ShouldInitEventHandlers() { - Mock mockAccountEventHandler = new Mock(); - Mock mockBuildsEventHandler = new Mock(); - Mock mockCommandRequestEventHandler = new Mock(); - Mock mockCommentThreadEventHandler = new Mock(); - Mock mockLogEventHandler = new Mock(); - Mock mockNotificationsEventHandler = new Mock(); - Mock mockTeamspeakEventHandler = new Mock(); - - mockAccountEventHandler.Setup(x => x.Init()); - mockCommandRequestEventHandler.Setup(x => x.Init()); - mockCommentThreadEventHandler.Setup(x => x.Init()); - mockLogEventHandler.Setup(x => x.Init()); - mockNotificationsEventHandler.Setup(x => x.Init()); - mockTeamspeakEventHandler.Setup(x => x.Init()); - - EventHandlerInitialiser eventHandlerInitialiser = new EventHandlerInitialiser( - mockAccountEventHandler.Object, - mockBuildsEventHandler.Object, - mockCommandRequestEventHandler.Object, - mockCommentThreadEventHandler.Object, - mockLogEventHandler.Object, - mockNotificationsEventHandler.Object, - mockTeamspeakEventHandler.Object - ); - - eventHandlerInitialiser.InitEventHandlers(); - - mockAccountEventHandler.Verify(x => x.Init(), Times.Once); - mockBuildsEventHandler.Verify(x => x.Init(), Times.Once); - mockCommandRequestEventHandler.Verify(x => x.Init(), Times.Once); - mockCommentThreadEventHandler.Verify(x => x.Init(), Times.Once); - mockLogEventHandler.Verify(x => x.Init(), Times.Once); - mockNotificationsEventHandler.Verify(x => x.Init(), Times.Once); - mockTeamspeakEventHandler.Verify(x => x.Init(), Times.Once); - } - } -} diff --git a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs index 20ff02b8..84dc5631 100644 --- a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs @@ -1,17 +1,13 @@ using System; using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Events.Data; -using UKSF.Api.Events.Handlers; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Models.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Personnel.EventHandlers; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.SignalrHubs; -using UKSF.Api.Personnel.SignalrHubs.Clients; -using UKSF.Api.Personnel.SignalrHubs.Hubs; +using UKSF.Api.Personnel.Signalr.Clients; +using UKSF.Api.Personnel.Signalr.Hubs; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { @@ -19,12 +15,12 @@ public class AccountEventHandlerTests { private readonly DataEventBus accountDataEventBus; private readonly AccountEventHandler accountEventHandler; private readonly Mock> mockAccountHub; - private readonly Mock mockLoggingService; + private readonly Mock mockLoggingService; private readonly DataEventBus unitsDataEventBus; public AccountEventHandlerTests() { Mock mockDataCollectionFactory = new Mock(); - mockLoggingService = new Mock(); + mockLoggingService = new Mock(); mockAccountHub = new Mock>(); accountDataEventBus = new DataEventBus(); @@ -44,14 +40,14 @@ public void ShouldLogOnException() { mockAccountHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockAccountClient.Object); mockAccountClient.Setup(x => x.ReceiveAccountUpdate()).Throws(new Exception()); - mockLoggingService.Setup(x => x.Log(It.IsAny())); + mockLoggingService.Setup(x => x.LogError(It.IsAny())); accountEventHandler.Init(); accountDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); - mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Exactly(2)); + mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Exactly(2)); } [Fact] diff --git a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs index 23d9d532..d965f914 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs @@ -1,14 +1,13 @@ using System; using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Events.Data; -using UKSF.Api.Events.Handlers; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Models.Command; -using UKSF.Api.Models.Events; -using UKSF.Api.Signalr.Hubs.Command; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; +using UKSF.Api.Command.EventHandlers; +using UKSF.Api.Command.Models; +using UKSF.Api.Command.Signalr.Clients; +using UKSF.Api.Command.Signalr.Hubs; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { @@ -16,11 +15,11 @@ public class CommandRequestEventHandlerTests { private readonly CommandRequestEventHandler commandRequestEventHandler; private readonly DataEventBus dataEventBus; private readonly Mock> mockHub; - private readonly Mock mockLoggingService; + private readonly Mock mockLoggingService; public CommandRequestEventHandlerTests() { Mock mockDataCollectionFactory = new Mock(); - mockLoggingService = new Mock(); + mockLoggingService = new Mock(); mockHub = new Mock>(); dataEventBus = new DataEventBus(); @@ -32,13 +31,13 @@ public CommandRequestEventHandlerTests() { [Fact] public void ShouldLogOnException() { - mockLoggingService.Setup(x => x.Log(It.IsAny())); + mockLoggingService.Setup(x => x.LogError(It.IsAny())); commandRequestEventHandler.Init(); dataEventBus.Send(new DataEventModel { type = (DataEventType) 5 }); - mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); + mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); } [Fact] diff --git a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs index 6b4cbf89..a7469813 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs @@ -1,16 +1,14 @@ using System; using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Events.Data; -using UKSF.Api.Events.Handlers; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Models.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Personnel.EventHandlers; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.SignalrHubs.Clients; -using UKSF.Api.Personnel.SignalrHubs.Hubs; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.Signalr.Clients; +using UKSF.Api.Personnel.Signalr.Hubs; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { @@ -18,12 +16,12 @@ public class CommentThreadEventHandlerTests { private readonly CommentThreadEventHandler commentThreadEventHandler; private readonly DataEventBus dataEventBus; private readonly Mock> mockHub; - private readonly Mock mockLoggingService; + private readonly Mock mockLoggingService; public CommentThreadEventHandlerTests() { Mock mockDataCollectionFactory = new Mock(); Mock mockCommentThreadService = new Mock(); - mockLoggingService = new Mock(); + mockLoggingService = new Mock(); mockHub = new Mock>(); dataEventBus = new DataEventBus(); @@ -36,13 +34,13 @@ public CommentThreadEventHandlerTests() { [Fact] public void ShouldLogOnException() { - mockLoggingService.Setup(x => x.Log(It.IsAny())); + mockLoggingService.Setup(x => x.LogError(It.IsAny())); commentThreadEventHandler.Init(); dataEventBus.Send(new DataEventModel { type = (DataEventType) 5 }); - mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); + mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); } [Fact] diff --git a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs index 856360a8..1c38f663 100644 --- a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs @@ -1,67 +1,44 @@ using System; +using System.Reactive.Subjects; using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Events.Data; -using UKSF.Api.Events.Handlers; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Message.Logging; -using UKSF.Api.Signalr.Hubs.Utility; +using UKSF.Api.Admin.Signalr.Clients; +using UKSF.Api.Admin.Signalr.Hubs; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; +using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Base.Services.Data; +using UKSF.Api.EventHandlers; +using UKSF.Api.Personnel.Services; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { public class LogEventHandlerTests { - private readonly DataEventBus dataEventBus; - private readonly LogEventHandler logEventHandler; - private readonly Mock> mockHub; - private readonly Mock mockLoggingService; + private readonly LoggerEventHandler logEventHandler; + private readonly Mock mockLogDataService; + private readonly Mock mockLogger; + private readonly Subject loggerSubject = new Subject(); public LogEventHandlerTests() { - Mock mockDataCollectionFactory = new Mock(); - mockHub = new Mock>(); - mockLoggingService = new Mock(); + mockLogDataService = new Mock(); + mockLogger = new Mock(); + Mock mockObjectIdConversionService = new Mock(); - dataEventBus = new DataEventBus(); - - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); - - logEventHandler = new LogEventHandler(dataEventBus, mockHub.Object, mockLoggingService.Object); - } - - [Fact] - public void ShouldLogOnException() { - mockLoggingService.Setup(x => x.Log(It.IsAny())); + mockLogger.Setup(x => x.AsObservable()).Returns(loggerSubject); + mockObjectIdConversionService.Setup(x => x.ConvertObjectIds(It.IsAny())).Returns(x => x); + logEventHandler = new LoggerEventHandler(mockLogDataService.Object, mockLogger.Object, mockObjectIdConversionService.Object); logEventHandler.Init(); - - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new object() }); - - mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); } [Fact] - public void ShouldNotRunEventOnUpdateOrDelete() { - Mock> mockHubClients = new Mock>(); - Mock mockClient = new Mock(); - - mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); - mockHubClients.Setup(x => x.All).Returns(mockClient.Object); - mockClient.Setup(x => x.ReceiveAuditLog(It.IsAny())); - mockClient.Setup(x => x.ReceiveLauncherLog(It.IsAny())); - mockClient.Setup(x => x.ReceiveErrorLog(It.IsAny())); - mockClient.Setup(x => x.ReceiveLog(It.IsAny())); - - logEventHandler.Init(); + public void ShouldLogOnException() { + mockLogger.Setup(x => x.LogError(It.IsAny())); - dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE, data = new BasicLogMessage("test") }); - dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); + loggerSubject.OnNext(new HttpErrorLog(new Exception())); - mockClient.Verify(x => x.ReceiveAuditLog(It.IsAny()), Times.Never); - mockClient.Verify(x => x.ReceiveLauncherLog(It.IsAny()), Times.Never); - mockClient.Verify(x => x.ReceiveErrorLog(It.IsAny()), Times.Never); - mockClient.Verify(x => x.ReceiveLog(It.IsAny()), Times.Never); + mockLogDataService.Verify(x => x.Add(It.IsAny()), Times.Once); } [Fact] @@ -69,24 +46,21 @@ public void ShouldRunAddedOnAddWithCorrectType() { Mock> mockHubClients = new Mock>(); Mock mockClient = new Mock(); - mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.All).Returns(mockClient.Object); - mockClient.Setup(x => x.ReceiveAuditLog(It.IsAny())); - mockClient.Setup(x => x.ReceiveLauncherLog(It.IsAny())); - mockClient.Setup(x => x.ReceiveErrorLog(It.IsAny())); - mockClient.Setup(x => x.ReceiveLog(It.IsAny())); - - logEventHandler.Init(); - - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new AuditLogMessage() }); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new LauncherLogMessage("1.0.0", "test") }); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new WebLogMessage(new Exception("test")) }); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new BasicLogMessage("test") }); - - mockClient.Verify(x => x.ReceiveAuditLog(It.IsAny()), Times.Once); - mockClient.Verify(x => x.ReceiveLauncherLog(It.IsAny()), Times.Once); - mockClient.Verify(x => x.ReceiveErrorLog(It.IsAny()), Times.Once); - mockClient.Verify(x => x.ReceiveLog(It.IsAny()), Times.Once); + mockClient.Setup(x => x.ReceiveAuditLog(It.IsAny())); + mockClient.Setup(x => x.ReceiveLauncherLog(It.IsAny())); + mockClient.Setup(x => x.ReceiveErrorLog(It.IsAny())); + mockClient.Setup(x => x.ReceiveLog(It.IsAny())); + + loggerSubject.OnNext(new AuditLog("server", "test")); + loggerSubject.OnNext(new LauncherLog("1.0.0", "test")); + loggerSubject.OnNext(new HttpErrorLog(new Exception("test"))); + loggerSubject.OnNext(new BasicLog("test")); + + mockClient.Verify(x => x.ReceiveAuditLog(It.IsAny()), Times.Once); + mockClient.Verify(x => x.ReceiveLauncherLog(It.IsAny()), Times.Once); + mockClient.Verify(x => x.ReceiveErrorLog(It.IsAny()), Times.Once); + mockClient.Verify(x => x.ReceiveLog(It.IsAny()), Times.Once); } } } diff --git a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs index b79e259f..b78573b7 100644 --- a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs @@ -2,28 +2,25 @@ using FluentAssertions; using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Events.Data; -using UKSF.Api.Events.Handlers; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Hubs; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Models.Events; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Personnel.EventHandlers; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.SignalrHubs.Clients; -using UKSF.Api.Personnel.SignalrHubs.Hubs; +using UKSF.Api.Personnel.Signalr.Clients; +using UKSF.Api.Personnel.Signalr.Hubs; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { public class NotificationsEventHandlerTests { private readonly DataEventBus dataEventBus; private readonly Mock> mockHub; - private readonly Mock mockLoggingService; + private readonly Mock mockLoggingService; private readonly NotificationsEventHandler notificationsEventHandler; public NotificationsEventHandlerTests() { Mock mockDataCollectionFactory = new Mock(); - mockLoggingService = new Mock(); + mockLoggingService = new Mock(); mockHub = new Mock>(); dataEventBus = new DataEventBus(); @@ -41,13 +38,13 @@ public void ShouldLogOnException() { mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); mockClient.Setup(x => x.ReceiveNotification(It.IsAny())).Throws(new Exception()); - mockLoggingService.Setup(x => x.Log(It.IsAny())); + mockLoggingService.Setup(x => x.LogError(It.IsAny())); notificationsEventHandler.Init(); dataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); - mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); + mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); } [Fact] diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs index 9da59417..d380faf7 100644 --- a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -4,23 +4,20 @@ using System.Threading.Tasks; using FluentAssertions; using Moq; -using UKSF.Api.Events.Handlers; -using UKSF.Api.Events.SignalrServer; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Events; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Message; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Models.Events; -using UKSF.Api.Models.Events.Types; -using UKSF.Api.Models.Integrations; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.Services.Data; +using UKSF.Api.Teamspeak.EventHandlers; +using UKSF.Api.Teamspeak.Models; +using UKSF.Api.Teamspeak.Services; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { public class TeamspeakEventHandlerTests { private readonly Mock mockAccountService; - private readonly Mock mockLoggingService; + private readonly Mock mockLoggingService; private readonly Mock mockTeamspeakGroupService; private readonly Mock mockTeamspeakService; private readonly ISignalrEventBus signalrEventBus; @@ -31,7 +28,7 @@ public TeamspeakEventHandlerTests() { mockTeamspeakService = new Mock(); mockAccountService = new Mock(); mockTeamspeakGroupService = new Mock(); - mockLoggingService = new Mock(); + mockLoggingService = new Mock(); teamspeakEventHandler = new TeamspeakEventHandler(signalrEventBus, mockTeamspeakService.Object, mockAccountService.Object, mockTeamspeakGroupService.Object, mockLoggingService.Object); } @@ -56,13 +53,13 @@ public async Task ShouldGetNoAccountForNoMatchingIdsOrNull(double id) { [Fact] public void LogOnException() { - mockLoggingService.Setup(x => x.Log(It.IsAny())); + mockLoggingService.Setup(x => x.LogError(It.IsAny())); teamspeakEventHandler.Init(); signalrEventBus.Send(new SignalrEventModel { procedure = (TeamspeakEventType) 9 }); - mockLoggingService.Verify(x => x.Log(It.IsAny()), Times.Once); + mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); } [Fact] diff --git a/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs b/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs index d868e0b3..58d07838 100644 --- a/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs +++ b/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs @@ -1,6 +1,6 @@ using System.IO; using FluentAssertions; -using UKSF.Api.Models.Game; +using UKSF.Api.ArmaServer.Models; using Xunit; namespace UKSF.Tests.Unit.Models.Game { diff --git a/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs index 8a50df55..7851d2be 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs @@ -1,27 +1,20 @@ using System; using FluentAssertions; -using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Base.Models.Logging; using Xunit; namespace UKSF.Tests.Unit.Models.Message.Logging { public class BasicLogMessageTests { [Fact] public void ShouldSetText() { - BasicLogMessage subject = new BasicLogMessage("test"); + BasicLog subject = new BasicLog("test"); subject.message.Should().Be("test"); } - [Fact] - public void ShouldSetLogLevel() { - BasicLogMessage subject = new BasicLogMessage(LogLevel.DEBUG); - - subject.level.Should().Be(LogLevel.DEBUG); - } - [Fact] public void ShouldSetTextAndLogLevel() { - BasicLogMessage subject = new BasicLogMessage("test", LogLevel.DEBUG); + BasicLog subject = new BasicLog("test", LogLevel.DEBUG); subject.message.Should().Be("test"); subject.level.Should().Be(LogLevel.DEBUG); @@ -29,7 +22,7 @@ public void ShouldSetTextAndLogLevel() { [Fact] public void ShouldSetTextAndLogLevelFromException() { - BasicLogMessage subject = new BasicLogMessage(new Exception("test")); + BasicLog subject = new BasicLog(new Exception("test")); subject.message.Should().Be("System.Exception: test"); subject.level.Should().Be(LogLevel.ERROR); diff --git a/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs index baefd71f..6214dfd5 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs @@ -1,12 +1,12 @@ using FluentAssertions; -using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Base.Models.Logging; using Xunit; namespace UKSF.Tests.Unit.Models.Message.Logging { public class LauncherLogMessageTests { [Fact] public void ShouldSetVersionAndMessage() { - LauncherLogMessage subject = new LauncherLogMessage("1.0.0", "test"); + LauncherLog subject = new LauncherLog("1.0.0", "test"); subject.message.Should().Be("test"); subject.version.Should().Be("1.0.0"); diff --git a/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs index 1d15e487..6e45ecd1 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs @@ -1,13 +1,13 @@ using System; using FluentAssertions; -using UKSF.Api.Models.Message.Logging; +using UKSF.Api.Base.Models.Logging; using Xunit; namespace UKSF.Tests.Unit.Models.Message.Logging { public class WebLogMessageTests { [Fact] public void ShouldCreateFromException() { - WebLogMessage subject = new WebLogMessage(new Exception("test")); + HttpErrorLog subject = new HttpErrorLog(new Exception("test")); subject.message.Should().Be("test"); subject.exception.Should().Be("System.Exception: test"); diff --git a/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs b/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs index 2974a65f..92da8cc1 100644 --- a/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs +++ b/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs @@ -1,6 +1,6 @@ using System; using FluentAssertions; -using UKSF.Api.Models.Mission; +using UKSF.Api.ArmaMissions.Models; using Xunit; namespace UKSF.Tests.Unit.Models.Mission { diff --git a/UKSF.Tests/Unit/Models/Mission/MissionTests.cs b/UKSF.Tests/Unit/Models/Mission/MissionTests.cs index aec41b4f..059ac0d6 100644 --- a/UKSF.Tests/Unit/Models/Mission/MissionTests.cs +++ b/UKSF.Tests/Unit/Models/Mission/MissionTests.cs @@ -5,7 +5,7 @@ namespace UKSF.Tests.Unit.Models.Mission { public class MissionTests { [Fact] public void ShouldSetFields() { - Api.Models.Mission.Mission subject = new Api.Models.Mission.Mission("testdata/testmission.Altis"); + Api.ArmaMissions.Models.Mission subject = new Api.ArmaMissions.Models.Mission("testdata/testmission.Altis"); subject.path.Should().Be("testdata/testmission.Altis"); subject.descriptionPath.Should().Be("testdata/testmission.Altis/description.ext"); diff --git a/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs index 08a5d670..c382c277 100644 --- a/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs @@ -2,8 +2,9 @@ using System.Collections.Generic; using System.Linq; using FluentAssertions; -using UKSF.Api.Models.Admin; -using UKSF.Common; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Models; +using UKSF.Api.Base.Extensions; using Xunit; namespace UKSF.Tests.Unit.Services.Admin { diff --git a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs index 67a64f07..352e2824 100644 --- a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using FluentAssertions; using MongoDB.Bson; +using UKSF.Api.Personnel.Extensions; using UKSF.Api.Personnel.Models; using Xunit; diff --git a/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs b/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs similarity index 72% rename from UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs rename to UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs index 12312e1b..2e68152c 100644 --- a/UKSF.Tests/Unit/Services/Common/DisplayNameUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs @@ -2,53 +2,50 @@ using System.Collections.Generic; using System.Linq; using FluentAssertions; -using Microsoft.Extensions.DependencyInjection; using Moq; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Common { - public class DisplayNameUtilitiesTests { + public class ObjectIdConversionServiceTests { private readonly Mock mockDisplayNameService; private readonly Mock mockUnitsDataService; + private readonly Mock mockUnitsService; + private readonly ObjectIdConversionService objectIdConversionService; - public DisplayNameUtilitiesTests() { + public ObjectIdConversionServiceTests() { mockDisplayNameService = new Mock(); + mockUnitsService = new Mock(); mockUnitsDataService = new Mock(); - Mock mockUnitsService = new Mock(); mockUnitsService.Setup(x => x.Data).Returns(mockUnitsDataService.Object); - - ServiceCollection serviceProvider = new ServiceCollection(); - serviceProvider.AddTransient(provider => mockDisplayNameService.Object); - serviceProvider.AddTransient(provider => mockUnitsService.Object); - ServiceWrapper.Provider = serviceProvider.BuildServiceProvider(); + objectIdConversionService = new ObjectIdConversionService(mockDisplayNameService.Object, mockUnitsService.Object); } - [Theory, InlineData("5e39336e1b92ee2d14b7fe08", "Maj.Bridgford.A"), InlineData("5e39336e1b92ee2d14b7fe08, 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A, Cpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe085e3935db1b92ee2d14b7fe09", "Maj.Bridgford.ACpl.Carr.C"), + [Theory, InlineData("5e39336e1b92ee2d14b7fe08", "Maj.Bridgford.A"), InlineData("5e39336e1b92ee2d14b7fe08, 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A, Cpl.Carr.C"), + InlineData("5e39336e1b92ee2d14b7fe085e3935db1b92ee2d14b7fe09", "Maj.Bridgford.ACpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe08 has requested all the things for 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A has requested all the things for Cpl.Carr.C")] public void ShouldConvertNameObjectIds(string input, string expected) { mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); mockDisplayNameService.Setup(x => x.GetDisplayName("5e39336e1b92ee2d14b7fe08")).Returns("Maj.Bridgford.A"); mockDisplayNameService.Setup(x => x.GetDisplayName("5e3935db1b92ee2d14b7fe09")).Returns("Cpl.Carr.C"); - string subject = input.ConvertObjectIds(); + string subject = objectIdConversionService.ConvertObjectIds(input); subject.Should().Be(expected); } [Fact] public void ShouldConvertCorrectUnitWithPredicate() { - Api.Personnel.Models.Unit unit1 = new Api.Personnel.Models.Unit {name = "7 Squadron"}; - Api.Personnel.Models.Unit unit2 = new Api.Personnel.Models.Unit {name = "656 Squadron"}; - List collection = new List {unit1, unit2}; + Api.Personnel.Models.Unit unit1 = new Api.Personnel.Models.Unit { name = "7 Squadron" }; + Api.Personnel.Models.Unit unit2 = new Api.Personnel.Models.Unit { name = "656 Squadron" }; + List collection = new List { unit1, unit2 }; mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => collection.FirstOrDefault(x)); mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); - string subject = unit1.id.ConvertObjectIds(); + string subject = objectIdConversionService.ConvertObjectIds(unit1.id); subject.Should().Be("7 Squadron"); } @@ -57,12 +54,12 @@ public void ShouldConvertCorrectUnitWithPredicate() { public void ShouldConvertUnitObjectIds() { const string INPUT = "5e39336e1b92ee2d14b7fe08"; const string EXPECTED = "7 Squadron"; - Api.Personnel.Models.Unit unit = new Api.Personnel.Models.Unit {name = EXPECTED, id = INPUT}; + Api.Personnel.Models.Unit unit = new Api.Personnel.Models.Unit { name = EXPECTED, id = INPUT }; mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(unit); mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); - string subject = INPUT.ConvertObjectIds(); + string subject = objectIdConversionService.ConvertObjectIds(INPUT); subject.Should().Be(EXPECTED); } @@ -75,14 +72,14 @@ public void ShouldDoNothingToTextWhenNameOrUnitNotFound() { mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); - string subject = INPUT.ConvertObjectIds(); + string subject = objectIdConversionService.ConvertObjectIds(INPUT); subject.Should().Be(EXPECTED); } [Fact] public void ShouldReturnEmpty() { - string subject = "".ConvertObjectIds(); + string subject = objectIdConversionService.ConvertObjectIds(""); subject.Should().Be(string.Empty); } diff --git a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs index fbecad34..6121cf75 100644 --- a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs @@ -5,16 +5,13 @@ using FluentAssertions; using MongoDB.Bson; using Moq; -using UKSF.Api.Interfaces.Admin; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Units; -using UKSF.Api.Models.Admin; -using UKSF.Api.Models.Integrations; +using UKSF.Api.Admin.Models; +using UKSF.Api.Admin.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -using UKSF.Api.Services.Integrations.Teamspeak; +using UKSF.Api.Personnel.Services.Data; +using UKSF.Api.Teamspeak.Models; +using UKSF.Api.Teamspeak.Services; using Xunit; using UksfUnit = UKSF.Api.Personnel.Models.Unit; diff --git a/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs index 1b290044..f8b85329 100644 --- a/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs @@ -1,8 +1,8 @@ using FluentAssertions; using Moq; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs index 12d7f56a..d8099c1c 100644 --- a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs @@ -3,10 +3,9 @@ using System.Linq; using FluentAssertions; using Moq; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Personnel; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs index c5d68a9f..9b624e64 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs @@ -2,9 +2,9 @@ using System.Linq; using FluentAssertions; using Moq; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs index 9016768a..c912be07 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs @@ -1,4 +1,5 @@ using FluentAssertions; +using UKSF.Api.Base; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs index ef193b2c..f31087ea 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs @@ -3,9 +3,9 @@ using System.Linq; using FluentAssertions; using Moq; -using UKSF.Api.Interfaces.Data.Cached; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs index 9bda4d9a..83ca5429 100644 --- a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs @@ -6,11 +6,11 @@ using MongoDB.Bson; using Moq; using Newtonsoft.Json; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Models.Utility; using UKSF.Api.Personnel.Models; -using UKSF.Api.Services.Utility; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.Services.Data; +using UKSF.Api.Utility.Models; +using UKSF.Api.Utility.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Utility { diff --git a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs index 958680be..0c327184 100644 --- a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs @@ -1,8 +1,8 @@ -using System.Collections.Generic; +using System; +using Microsoft.Extensions.DependencyInjection; using Moq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Services.Utility; +using UKSF.Api.Admin.Services; +using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Utility { @@ -17,9 +17,12 @@ public void ShouldCallDataServiceRefresh() { mockRanksDataService.Setup(x => x.Refresh()); mockRolesDataService.Setup(x => x.Refresh()); - DataCacheService dataCacheService = new DataCacheService(); + IServiceProvider serviceProvider = new ServiceCollection().AddTransient(_ => mockAccountDataService.Object) + .AddTransient(_ => mockRanksDataService.Object) + .AddTransient(_ => mockRolesDataService.Object) + .BuildServiceProvider(); + DataCacheService dataCacheService = new DataCacheService(serviceProvider); - dataCacheService.RegisterCachedDataServices(new HashSet {mockAccountDataService.Object, mockRanksDataService.Object, mockRolesDataService.Object}); dataCacheService.InvalidateCachedData(); mockAccountDataService.Verify(x => x.Refresh(), Times.Once); diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs index b289cc1e..517be86a 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Interfaces.Utility.ScheduledActions; -using UKSF.Api.Services.Utility; +using UKSF.Api.Personnel.ScheduledActions; +using UKSF.Api.Utility.ScheduledActions; +using UKSF.Api.Utility.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Utility { diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs index bf34d570..0950f9ce 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs @@ -2,10 +2,9 @@ using FluentAssertions; using MongoDB.Bson; using Moq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Utility; -using UKSF.Api.Interfaces.Utility.ScheduledActions; -using UKSF.Api.Services.Utility.ScheduledActions; +using UKSF.Api.Personnel.ScheduledActions; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs index 700d714d..da367cce 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs @@ -4,13 +4,12 @@ using System.Linq.Expressions; using FluentAssertions; using Moq; -using UKSF.Api.Interfaces.Data; -using UKSF.Api.Interfaces.Utility.ScheduledActions; -using UKSF.Api.Models.Game; -using UKSF.Api.Models.Message.Logging; -using UKSF.Api.Models.Modpack; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Base.Database; +using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Modpack.Models; using UKSF.Api.Personnel.Models; -using UKSF.Api.Services.Utility.ScheduledActions; +using UKSF.Api.Utility.ScheduledActions; using Xunit; namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { @@ -22,18 +21,18 @@ public class PruneDataActionTests { [Fact] public void ShouldRemoveOldLogsAndNotifications() { - List mockBasicLogMessageCollection = new List { - new BasicLogMessage("test1"), new BasicLogMessage("test2") { timestamp = DateTime.Now.AddDays(-10) }, new BasicLogMessage("test3") { timestamp = DateTime.Now.AddDays(-6) } + List mockBasicLogMessageCollection = new List { + new BasicLog("test1"), new BasicLog("test2") { timestamp = DateTime.Now.AddDays(-10) }, new BasicLog("test3") { timestamp = DateTime.Now.AddDays(-6) } }; - List mockWebLogMessageCollection = new List { - new WebLogMessage(new Exception("error1")), - new WebLogMessage(new Exception("error2")) { timestamp = DateTime.Now.AddDays(-10) }, - new WebLogMessage(new Exception("error3")) { timestamp = DateTime.Now.AddDays(-6) } + List mockWebLogMessageCollection = new List { + new HttpErrorLog(new Exception("error1")), + new HttpErrorLog(new Exception("error2")) { timestamp = DateTime.Now.AddDays(-10) }, + new HttpErrorLog(new Exception("error3")) { timestamp = DateTime.Now.AddDays(-6) } }; - List mockAuditLogMessageCollection = new List { - new AuditLogMessage { message = "audit1" }, - new AuditLogMessage { message = "audit2", timestamp = DateTime.Now.AddDays(-100) }, - new AuditLogMessage { message = "audit3", timestamp = DateTime.Now.AddMonths(-2) } + List mockAuditLogMessageCollection = new List { + new AuditLog("server", "audit1"), + new AuditLog("server", "audit2") { timestamp = DateTime.Now.AddDays(-100) }, + new AuditLog("server", "audit3") { timestamp = DateTime.Now.AddMonths(-2) } }; List mockNotificationCollection = new List { new Notification { message = "notification1" }, @@ -47,28 +46,28 @@ public void ShouldRemoveOldLogsAndNotifications() { new ModpackBuild { environment = GameEnvironment.DEV, buildNumber = 150, version = "5.19.0" } }; - Mock> mockBasicLogMessageDataColection = new Mock>(); - Mock> mockWebLogMessageDataColection = new Mock>(); - Mock> mockAuditLogMessageDataColection = new Mock>(); + Mock> mockBasicLogMessageDataColection = new Mock>(); + Mock> mockWebLogMessageDataColection = new Mock>(); + Mock> mockAuditLogMessageDataColection = new Mock>(); Mock> mockNotificationDataColection = new Mock>(); Mock> mockModpackBuildDataColection = new Mock>(); mockModpackBuildDataColection.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockModpackBuildCollection.Where(x)); - mockBasicLogMessageDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) - .Callback>>(x => mockBasicLogMessageCollection.RemoveAll(y => x.Compile()(y))); - mockWebLogMessageDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) - .Callback>>(x => mockWebLogMessageCollection.RemoveAll(y => x.Compile()(y))); - mockAuditLogMessageDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) - .Callback>>(x => mockAuditLogMessageCollection.RemoveAll(y => x.Compile()(y))); + mockBasicLogMessageDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) + .Callback>>(x => mockBasicLogMessageCollection.RemoveAll(y => x.Compile()(y))); + mockWebLogMessageDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) + .Callback>>(x => mockWebLogMessageCollection.RemoveAll(y => x.Compile()(y))); + mockAuditLogMessageDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) + .Callback>>(x => mockAuditLogMessageCollection.RemoveAll(y => x.Compile()(y))); mockNotificationDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) .Callback>>(x => mockNotificationCollection.RemoveAll(y => x.Compile()(y))); mockModpackBuildDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) .Callback>>(x => mockModpackBuildCollection.RemoveAll(y => x.Compile()(y))); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("logs")).Returns(mockBasicLogMessageDataColection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("errorLogs")).Returns(mockWebLogMessageDataColection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("auditLogs")).Returns(mockAuditLogMessageDataColection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("logs")).Returns(mockBasicLogMessageDataColection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("errorLogs")).Returns(mockWebLogMessageDataColection.Object); + mockDataCollectionFactory.Setup(x => x.CreateDataCollection("auditLogs")).Returns(mockAuditLogMessageDataColection.Object); mockDataCollectionFactory.Setup(x => x.CreateDataCollection("notifications")).Returns(mockNotificationDataColection.Object); mockDataCollectionFactory.Setup(x => x.CreateDataCollection("modpackBuilds")).Returns(mockModpackBuildDataColection.Object); diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs index 6e1d70b0..461a42ff 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs @@ -1,8 +1,7 @@ using FluentAssertions; using Moq; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Utility.ScheduledActions; -using UKSF.Api.Services.Utility.ScheduledActions; +using UKSF.Api.Teamspeak.ScheduledActions; +using UKSF.Api.Teamspeak.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { diff --git a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs index 67505e83..ccec0933 100644 --- a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs @@ -3,51 +3,31 @@ using FluentAssertions; using Microsoft.AspNetCore.Http; using Moq; -using UKSF.Api.Interfaces.Data.Cached; -using UKSF.Api.Interfaces.Personnel; -using UKSF.Api.Interfaces.Utility; +using UKSF.Api.Base; +using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Models; -using UKSF.Api.Services.Utility; +using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Utility { public class SessionServiceTests { - private readonly Mock mockHttpContextAccessor; - private readonly Mock mockAccountDataService; - private readonly Mock mockAccountService; + private readonly HttpContextService httpContextService; private DefaultHttpContext httpContext; public SessionServiceTests() { - mockHttpContextAccessor = new Mock(); - mockAccountDataService = new Mock(); - mockAccountService = new Mock(); + Mock mockHttpContextAccessor = new Mock(); mockHttpContextAccessor.Setup(x => x.HttpContext).Returns(() => httpContext); - mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); - } - - [Fact] - public void ShouldGetContextId() { - Account account = new Account(); - List claims = new List {new Claim(ClaimTypes.Sid, account.id, ClaimValueTypes.String)}; - ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); - httpContext = new DefaultHttpContext {User = contextUser}; - - sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); - string subject = httpContextService.GetUserId(); - - subject.Should().Be(account.id); + httpContextService = new HttpContextService(mockHttpContextAccessor.Object); } [Fact] public void ShouldGetContextEmail() { - Account account = new Account {email = "contact.tim.here@gmail.com"}; - List claims = new List {new Claim(ClaimTypes.Email, account.email)}; + Account account = new Account { email = "contact.tim.here@gmail.com" }; + List claims = new List { new Claim(ClaimTypes.Email, account.email) }; ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); - httpContext = new DefaultHttpContext {User = contextUser}; - - sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); + httpContext = new DefaultHttpContext { User = contextUser }; string subject = httpContextService.GetUserEmail(); @@ -55,47 +35,37 @@ public void ShouldGetContextEmail() { } [Fact] - public void ShouldGetCorrectAccount() { - Account account1 = new Account(); - Account account2 = new Account(); - List claims = new List {new Claim(ClaimTypes.Sid, account2.id)}; + public void ShouldGetContextId() { + Account account = new Account(); + List claims = new List { new Claim(ClaimTypes.Sid, account.id, ClaimValueTypes.String) }; ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); - httpContext = new DefaultHttpContext {User = contextUser}; - - mockAccountDataService.Setup(x => x.GetSingle(account1.id)).Returns(account1); - mockAccountDataService.Setup(x => x.GetSingle(account2.id)).Returns(account2); + httpContext = new DefaultHttpContext { User = contextUser }; - sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); - - Account subject = accountService.GetUserAccount(); + string subject = httpContextService.GetUserId(); - subject.Should().Be(account2); + subject.Should().Be(account.id); } [Fact] - public void ShouldReturnTrueForValidRole() { - List claims = new List {new Claim(ClaimTypes.Role, Permissions.ADMIN)}; + public void ShouldReturnFalseForInvalidRole() { + List claims = new List { new Claim(ClaimTypes.Role, Permissions.ADMIN) }; ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); - httpContext = new DefaultHttpContext {User = contextUser}; - - sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); + httpContext = new DefaultHttpContext { User = contextUser }; - bool subject = sessionService.ContextHasRole(Permissions.ADMIN); + bool subject = httpContextService.UserHasPermission(Permissions.COMMAND); - subject.Should().BeTrue(); + subject.Should().BeFalse(); } [Fact] - public void ShouldReturnFalseForInvalidRole() { - List claims = new List {new Claim(ClaimTypes.Role, Permissions.ADMIN)}; + public void ShouldReturnTrueForValidRole() { + List claims = new List { new Claim(ClaimTypes.Role, Permissions.ADMIN) }; ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); - httpContext = new DefaultHttpContext {User = contextUser}; + httpContext = new DefaultHttpContext { User = contextUser }; - sessionService = new SessionService(mockHttpContextAccessor.Object, mockAccountService.Object); + bool subject = httpContextService.UserHasPermission(Permissions.ADMIN); - bool subject = sessionService.ContextHasRole(Permissions.COMMAND); - - subject.Should().BeFalse(); + subject.Should().BeTrue(); } } } From f148f886e451457631983f74ff1d34e3969d0449 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 8 Nov 2020 02:39:33 +0000 Subject: [PATCH 283/369] Move signlar hub creation to components --- .../ApiArmaServerExtensions.cs | 9 +++++- UKSF.Api.Command/ApiCommandExtensions.cs | 9 +++++- .../ApiIntegrationTeamspeakExtensions.cs | 10 ++++++- UKSF.Api.Launcher/ApiLauncherExtensions.cs | 9 +++++- UKSF.Api.Modpack/ApiModpackExtensions.cs | 9 +++++- UKSF.Api.Personnel/ApiPersonnelExtensions.cs | 11 +++++++- UKSF.Api/Startup.cs | 28 +++++++++++-------- 7 files changed, 67 insertions(+), 18 deletions(-) diff --git a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs index 85783658..d19f706c 100644 --- a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs +++ b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs @@ -1,7 +1,10 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Routing; +using Microsoft.Extensions.DependencyInjection; using UKSF.Api.ArmaServer.DataContext; using UKSF.Api.ArmaServer.Models; using UKSF.Api.ArmaServer.Services; +using UKSF.Api.ArmaServer.Signalr.Hubs; using UKSF.Api.Base.Events; namespace UKSF.Api.ArmaServer { @@ -15,5 +18,9 @@ public static class ApiArmaServerExtensions { private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton(); + + public static void AddUksfArmaServerSignalr(this IEndpointRouteBuilder builder) { + builder.MapHub($"/hub/{ServersHub.END_POINT}"); + } } } diff --git a/UKSF.Api.Command/ApiCommandExtensions.cs b/UKSF.Api.Command/ApiCommandExtensions.cs index 1ef12f6b..e9584dca 100644 --- a/UKSF.Api.Command/ApiCommandExtensions.cs +++ b/UKSF.Api.Command/ApiCommandExtensions.cs @@ -1,9 +1,12 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Routing; +using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.EventHandlers; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; +using UKSF.Api.Command.Signalr.Hubs; namespace UKSF.Api.Command { public static class ApiCommandExtensions { @@ -28,5 +31,9 @@ private static IServiceCollection AddServices(this IServiceCollection services) .AddTransient() .AddTransient() .AddTransient(); + + public static void AddUksfCommandSignalr(this IEndpointRouteBuilder builder) { + builder.MapHub($"/hub/{CommandRequestsHub.END_POINT}"); + } } } diff --git a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs index bd02b6c2..b852aa4d 100644 --- a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs +++ b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs @@ -1,7 +1,10 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Routing; +using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Teamspeak.EventHandlers; using UKSF.Api.Teamspeak.ScheduledActions; using UKSF.Api.Teamspeak.Services; +using UKSF.Api.Teamspeak.Signalr.Hubs; namespace UKSF.Api.Teamspeak { public static class ApiIntegrationTeamspeakExtensions { @@ -19,5 +22,10 @@ private static IServiceCollection AddServices(this IServiceCollection services) .AddTransient() .AddTransient() .AddTransient(); + + public static void AddUksfIntegrationTeamspeakSignalr(this IEndpointRouteBuilder builder) { + builder.MapHub($"/hub/{TeamspeakHub.END_POINT}").RequireHost("localhost"); + builder.MapHub($"/hub/{TeamspeakClientsHub.END_POINT}"); + } } } diff --git a/UKSF.Api.Launcher/ApiLauncherExtensions.cs b/UKSF.Api.Launcher/ApiLauncherExtensions.cs index ff976be2..0f7197d2 100644 --- a/UKSF.Api.Launcher/ApiLauncherExtensions.cs +++ b/UKSF.Api.Launcher/ApiLauncherExtensions.cs @@ -1,6 +1,9 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Routing; +using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Launcher.Context; using UKSF.Api.Launcher.Services; +using UKSF.Api.Launcher.Signalr.Hubs; using UKSF.Api.Personnel.ScheduledActions; namespace UKSF.Api.Launcher { @@ -16,5 +19,9 @@ public static IServiceCollection AddUksfLauncher(this IServiceCollection service private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton().AddTransient(); + + public static void AddUksfLauncherSignalr(this IEndpointRouteBuilder builder) { + builder.MapHub($"/hub/{LauncherHub.END_POINT}"); + } } } diff --git a/UKSF.Api.Modpack/ApiModpackExtensions.cs b/UKSF.Api.Modpack/ApiModpackExtensions.cs index c974c249..e58f4efe 100644 --- a/UKSF.Api.Modpack/ApiModpackExtensions.cs +++ b/UKSF.Api.Modpack/ApiModpackExtensions.cs @@ -1,10 +1,13 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Routing; +using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Base.Events; using UKSF.Api.Modpack.EventHandlers; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services; using UKSF.Api.Modpack.Services.BuildProcess; using UKSF.Api.Modpack.Services.Data; +using UKSF.Api.Modpack.Signalr.Hubs; namespace UKSF.Api.Modpack { public static class ApiModpackExtensions { @@ -26,5 +29,9 @@ private static IServiceCollection AddServices(this IServiceCollection services) .AddTransient() .AddTransient() .AddTransient(); + + public static void AddUksfModpackSignalr(this IEndpointRouteBuilder builder) { + builder.MapHub($"/hub/{BuildsHub.END_POINT}"); + } } } diff --git a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs index cfcc931b..f563e7cd 100644 --- a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs +++ b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs @@ -1,10 +1,13 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Routing; +using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Base.Events; using UKSF.Api.Personnel.EventHandlers; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.ScheduledActions; using UKSF.Api.Personnel.Services; using UKSF.Api.Personnel.Services.Data; +using UKSF.Api.Personnel.Signalr.Hubs; namespace UKSF.Api.Personnel { public static class ApiPersonnelExtensions { @@ -49,5 +52,11 @@ private static IServiceCollection AddServices(this IServiceCollection services) .AddTransient() .AddTransient() .AddTransient(); + + public static void AddUksfPersonnelSignalr(this IEndpointRouteBuilder builder) { + builder.MapHub($"/hub/{AccountHub.END_POINT}"); + builder.MapHub($"/hub/{CommentThreadHub.END_POINT}"); + builder.MapHub($"/hub/{NotificationHub.END_POINT}"); + } } } diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 425840fe..065565c4 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -11,8 +11,12 @@ using Swashbuckle.AspNetCore.SwaggerUI; using UKSF.Api.Admin; using UKSF.Api.AppStart; +using UKSF.Api.ArmaServer; +using UKSF.Api.Command; +using UKSF.Api.Modpack; using UKSF.Api.Modpack.Services.BuildProcess; -using UKSF.Api.Personnel.Signalr.Hubs; +using UKSF.Api.Personnel; +using UKSF.Api.Teamspeak; using UKSF.Api.Teamspeak.Services; namespace UKSF.Api { @@ -43,7 +47,6 @@ public void ConfigureServices(IServiceCollection services) { ); services.AddSignalR().AddNewtonsoftJsonProtocol(); - services.AddAutoMapper(typeof(AutoMapperConfigurationProfile)); services.AddControllers(); services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo { Title = "UKSF API", Version = "v1" }); }); @@ -56,7 +59,12 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl app.UseStaticFiles(); app.UseCookiePolicy(new CookiePolicyOptions { MinimumSameSitePolicy = SameSiteMode.Lax }); app.UseSwagger(); - app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF API v1"); options.DocExpansion(DocExpansion.None); }); + app.UseSwaggerUI( + options => { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF API v1"); + options.DocExpansion(DocExpansion.None); + } + ); app.UseRouting(); app.UseCors("CorsPolicy"); app.UseCorsMiddleware(); @@ -67,16 +75,12 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl app.UseEndpoints( endpoints => { endpoints.MapControllers().RequireCors("CorsPolicy"); - endpoints.MapHub($"/hub/{AccountHub.END_POINT}"); - endpoints.MapHub($"/hub/{CommandRequestsHub.END_POINT}"); - endpoints.MapHub($"/hub/{CommentThreadHub.END_POINT}"); - endpoints.MapHub($"/hub/{LauncherHub.END_POINT}"); - endpoints.MapHub($"/hub/{BuildsHub.END_POINT}"); - endpoints.MapHub($"/hub/{NotificationHub.END_POINT}"); - endpoints.MapHub($"/hub/{ServersHub.END_POINT}"); - endpoints.MapHub($"/hub/{TeamspeakHub.END_POINT}").RequireHost("localhost"); - endpoints.MapHub($"/hub/{TeamspeakClientsHub.END_POINT}"); endpoints.AddUksfAdminSignalr(); + endpoints.AddUksfArmaServerSignalr(); + endpoints.AddUksfCommandSignalr(); + endpoints.AddUksfIntegrationTeamspeakSignalr(); + endpoints.AddUksfModpackSignalr(); + endpoints.AddUksfPersonnelSignalr(); } ); From 55ff244a5c1297fc05ea07b0c0453f2ade8384db Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 8 Nov 2020 22:54:52 +0000 Subject: [PATCH 284/369] Nearly there --- UKSF.Api.Admin/ApiAdminExtensions.cs | 7 +- .../Data => Context}/VariablesDataService.cs | 5 +- .../Controllers/VariablesController.cs | 2 +- .../Controllers/VersionController.cs | 2 +- .../ScheduledActions/ActionPruneLogs.cs | 50 ++++ UKSF.Api.Admin/Services/DataCacheService.cs | 2 +- UKSF.Api.Admin/Services/VariablesService.cs | 4 +- .../Services/MissionPatchingService.cs | 61 +++-- .../Services/MissionService.cs | 134 +++++----- .../DataContext/GameServersDataService.cs | 3 +- .../Services/GameServersService.cs | 48 ++-- .../Controllers/ConfirmationCodeReceiver.cs | 9 +- UKSF.Api.Auth/Controllers/LoginController.cs | 2 +- .../Controllers/PasswordResetController.cs | 5 +- UKSF.Api.Base/ApiBaseExtensions.cs | 13 +- .../Data => Context}/CachedDataService.cs | 3 +- .../Data => Context}/DataBackedService.cs | 2 +- .../{Database => Context}/DataCollection.cs | 2 +- .../DataCollectionFactory.cs | 2 +- .../{Services/Data => Context}/DataService.cs | 3 +- .../Data => Context}/DataServiceBase.cs | 3 +- .../Data => Context}/LogDataService.cs | 3 +- .../MongoClientFactory.cs | 2 +- .../Context}/SchedulerDataService.cs | 6 +- .../Models/ScheduledJob.cs | 3 +- .../ScheduledActions/IScheduledAction.cs | 2 +- .../ISelfCreatingScheduledAction.cs | 7 + .../Services/ScheduledActionFactory.cs | 8 +- .../Services/SchedulerService.cs | 41 +-- UKSF.Api.Command/ApiCommandExtensions.cs | 5 + .../CommandRequestArchiveDataService.cs | 3 +- .../Context/CommandRequestDataService.cs | 3 +- .../Context}/DischargeDataService.cs | 7 +- .../Context}/LoaDataService.cs | 5 +- .../Context/OperationOrderDataService.cs | 5 +- .../Context/OperationReportDataService.cs | 5 +- .../Controllers/CommandRequestsController.cs | 100 ++++---- .../CommandRequestsCreationController.cs | 179 +++++++------- .../Controllers/DischargesController.cs | 8 +- .../Controllers/OperationOrderController.cs | 12 +- .../Controllers/OperationReportController.cs | 14 +- .../CommandRequestEventHandler.cs | 16 +- UKSF.Api.Command/Models/CommandRequest.cs | 24 +- UKSF.Api.Command/Models/CommandRequestLoa.cs | 8 +- .../Models/CreateOperationOrderRequest.cs | 14 +- .../Models/CreateOperationReport.cs | 16 +- .../Models/Discharge.cs | 2 +- UKSF.Api.Command/Models/Opord.cs | 12 +- UKSF.Api.Command/Models/Oprep.cs | 16 +- .../Services/ChainOfCommandService.cs | 42 ++-- .../CommandRequestCompletionService.cs | 234 +++++++++--------- .../Services/CommandRequestService.cs | 92 +++---- .../Services/DischargeService.cs | 6 +- .../Services/LoaService.cs | 19 +- .../Services/OperationOrderService.cs | 12 +- .../Services/OperationReportService.cs | 20 +- .../ApiIntegrationInstagramExtensions.cs | 4 +- .../ScheduledActions/ActionInstagramImages.cs | 37 +++ .../ScheduledActions/ActionInstagramToken.cs | 35 +++ .../ScheduledActions/InstagramImagesAction.cs | 21 -- .../ScheduledActions/InstagramTokenAction.cs | 21 -- .../ApiIntegrationTeamspeakExtensions.cs | 2 +- .../ActionTeamspeakSnapshot.cs | 35 +++ .../TeamspeakSnapshotAction.cs | 20 -- UKSF.Api.Launcher/ApiLauncherExtensions.cs | 2 +- .../Context/LauncherFileDataService.cs | 3 +- .../Controllers/LauncherController.cs | 2 +- .../Services/LauncherFileService.cs | 2 +- UKSF.Api.Modpack/ApiModpackExtensions.cs | 6 +- .../Controllers/GithubController.cs | 24 +- .../Controllers/IssueController.cs | 22 +- .../Controllers/ModpackController.cs | 46 ++-- .../EventHandlers/BuildsEventHandler.cs | 28 +-- UKSF.Api.Modpack/Models/GithubCommit.cs | 12 +- UKSF.Api.Modpack/Models/ModpackBuild.cs | 26 +- .../Models/ModpackBuildQueueItem.cs | 4 +- UKSF.Api.Modpack/Models/ModpackBuildStep.cs | 18 +- .../Models/ModpackBuildStepLogItem.cs | 8 +- UKSF.Api.Modpack/Models/ModpackRelease.cs | 12 +- UKSF.Api.Modpack/Models/NewBuild.cs | 8 +- .../ScheduledActions/ActionPruneBuilds.cs | 44 ++++ .../BuildProcess/BuildProcessHelper.cs | 124 +++++----- .../BuildProcess/BuildProcessorService.cs | 64 ++--- .../BuildProcess/BuildQueueService.cs | 68 ++--- .../Services/BuildProcess/BuildStepService.cs | 17 +- .../Services/BuildProcess/StepLogger.cs | 22 +- .../Services/BuildProcess/Steps/BuildStep.cs | 129 +++++----- .../Steps/BuildSteps/BuildStepExtensions.cs | 6 +- .../Steps/BuildSteps/BuildStepIntercept.cs | 8 +- .../Steps/BuildSteps/BuildStepKeys.cs | 18 +- .../Steps/BuildSteps/BuildStepPrep.cs | 6 +- .../BuildSteps/BuildStepSignDependencies.cs | 54 ++-- .../Steps/BuildSteps/BuildStepSources.cs | 22 +- .../BuildSteps/Mods/BuildStepBuildAce.cs | 20 +- .../BuildSteps/Mods/BuildStepBuildAcre.cs | 16 +- .../BuildSteps/Mods/BuildStepBuildF35.cs | 12 +- .../BuildSteps/Mods/BuildStepBuildModpack.cs | 12 +- .../Steps/Common/BuildStepBuildRepo.cs | 4 +- .../Steps/Common/BuildStepCbaSettings.cs | 10 +- .../Steps/Common/BuildStepClean.cs | 14 +- .../Steps/Common/BuildStepDeploy.cs | 20 +- .../Steps/Common/BuildStepNotify.cs | 32 +-- .../BuildProcess/Steps/FileBuildStep.cs | 24 +- .../BuildProcess/Steps/GitBuildStep.cs | 2 +- .../BuildProcess/Steps/ModBuildStep.cs | 4 +- .../Steps/ReleaseSteps/BuildStepBackup.cs | 10 +- .../Steps/ReleaseSteps/BuildStepMerge.cs | 2 +- .../Steps/ReleaseSteps/BuildStepPublish.cs | 11 +- .../ReleaseSteps/BuildStepReleaseKeys.cs | 10 +- .../Steps/ReleaseSteps/BuildStepRestore.cs | 10 +- UKSF.Api.Modpack/Services/BuildsService.cs | 148 +++++------ .../Services/Data/BuildsDataService.cs | 7 +- .../Services/Data/ReleasesDataService.cs | 5 +- UKSF.Api.Modpack/Services/GithubService.cs | 26 +- UKSF.Api.Modpack/Services/ModpackService.cs | 122 ++++----- UKSF.Api.Modpack/Services/ReleaseService.cs | 38 +-- UKSF.Api.Modpack/UKSF.Api.Modpack.csproj | 1 + UKSF.Api.Personnel/ApiPersonnelExtensions.cs | 12 +- .../Data => Context}/AccountDataService.cs | 5 +- .../CommentThreadDataService.cs | 5 +- .../ConfirmationCodeDataService.cs | 5 +- .../NotificationsDataService.cs | 5 +- .../Data => Context}/RanksDataService.cs | 5 +- .../Data => Context}/RolesDataService.cs | 5 +- .../Data => Context}/UnitsDataService.cs | 5 +- .../Controllers/AccountsController.cs | 2 + .../Controllers/CommunicationsController.cs | 1 + .../Controllers/DiscordCodeController.cs | 1 + .../DiscordConnectionController.cs | 3 + .../Controllers/NotificationsController.cs | 1 + .../Controllers/RanksController.cs | 1 + .../Controllers/RolesController.cs | 1 + .../Controllers/SteamConnectionController.cs | 1 + .../Controllers/UnitsController.cs | 1 + ...=> ActionDeleteExpiredConfirmationCode.cs} | 12 +- .../ActionPruneNotifications.cs | 38 +++ UKSF.Api.Personnel/Services/AccountService.cs | 6 +- .../Services/AssignmentService.cs | 2 +- .../Services/CommentThreadService.cs | 4 +- .../Services/ConfirmationCodeService.cs | 8 +- .../Services/NotificationsService.cs | 5 +- UKSF.Api.Personnel/Services/RanksService.cs | 4 +- .../Services/RecruitmentService.cs | 6 +- UKSF.Api.Personnel/Services/RolesService.cs | 4 +- UKSF.Api.Personnel/Services/UnitsService.cs | 4 +- UKSF.Api.Utility/ApiUtilityExtensions.cs | 6 +- .../ScheduledActions/PruneDataAction.cs | 33 --- UKSF.Api.Utility/UKSF.Api.Utility.csproj | 7 + UKSF.Api.sln | 10 - UKSF.Api.sln.DotSettings | 4 +- UKSF.Api/AppStart/StartServices.cs | 17 +- UKSF.Api/Controllers/LoaController.cs | 6 +- UKSF.Api/Controllers/LoggingController.cs | 2 +- UKSF.Api/EventHandlers/LoggerEventHandler.cs | 2 +- UKSF.Api/UKSF.Api.csproj | 1 + UKSF.Tests/Common/ITestCachedDataService.cs | 2 +- UKSF.Tests/Common/ITestDataService.cs | 2 +- UKSF.Tests/Common/TestCachedDataService.cs | 3 +- UKSF.Tests/Common/TestDataService.cs | 3 +- .../Integration/Data/DataCollectionTests.cs | 2 +- .../Data/Admin/VariablesDataServiceTests.cs | 4 +- .../Unit/Data/CachedDataServiceTests.cs | 2 +- .../Unit/Data/CahcedDataServiceEventTests.cs | 2 +- .../Unit/Data/DataCollectionFactoryTests.cs | 2 +- UKSF.Tests/Unit/Data/DataServiceEventTests.cs | 2 +- UKSF.Tests/Unit/Data/DataServiceTests.cs | 2 +- .../Data/Game/GameServersDataServiceTests.cs | 2 +- .../Message/CommentThreadDataServiceTests.cs | 4 +- .../Unit/Data/Message/LogDataServiceTests.cs | 3 +- .../Data/Modpack/BuildsDataServiceTests.cs | 20 +- .../Data/Modpack/ReleasesDataServiceTests.cs | 8 +- .../OperationOrderDataServiceTests.cs | 16 +- .../OperationReportDataServiceTests.cs | 16 +- .../Personnel/DischargeDataServiceTests.cs | 5 +- .../Data/Personnel/RanksDataServiceTests.cs | 4 +- .../Data/Personnel/RolesDataServiceTests.cs | 4 +- .../Unit/Data/SimpleDataServiceTests.cs | 7 +- .../Unit/Data/Units/UnitsDataServiceTests.cs | 4 +- .../Handlers/AccountEventHandlerTests.cs | 2 +- .../CommandRequestEventHandlerTests.cs | 2 +- .../CommentThreadEventHandlerTests.cs | 2 +- .../Events/Handlers/LogEventHandlerTests.cs | 3 +- .../NotificationsEventHandlerTests.cs | 2 +- .../Handlers/TeamspeakEventHandlerTests.cs | 2 +- .../Common/ObjectIdConversionServiceTests.cs | 2 +- .../Teamspeak/TeamspeakGroupServiceTests.cs | 2 +- .../Personnel/DisplayNameServiceTests.cs | 2 +- .../Services/Personnel/LoaServiceTests.cs | 3 +- .../Services/Personnel/RanksServiceTests.cs | 2 +- .../Services/Personnel/RolesServiceTests.cs | 2 +- .../Utility/ConfirmationCodeServiceTests.cs | 14 +- .../Services/Utility/DataCacheServiceTests.cs | 2 +- .../Utility/ScheduledActionServiceTests.cs | 28 +-- ...eleteExpiredConfirmationCodeActionTests.cs | 16 +- .../ScheduledActions/PruneDataActionTests.cs | 49 ++-- .../TeamspeakSnapshotActionTests.cs | 19 +- .../Services/Utility/SessionServiceTests.cs | 1 - 197 files changed, 1765 insertions(+), 1602 deletions(-) rename UKSF.Api.Admin/{Services/Data => Context}/VariablesDataService.cs (93%) create mode 100644 UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs rename {UKSF.Api.Personnel => UKSF.Api.Auth}/Controllers/ConfirmationCodeReceiver.cs (87%) rename {UKSF.Api.Personnel => UKSF.Api.Auth}/Controllers/PasswordResetController.cs (94%) rename UKSF.Api.Base/{Services/Data => Context}/CachedDataService.cs (98%) rename UKSF.Api.Base/{Services/Data => Context}/DataBackedService.cs (91%) rename UKSF.Api.Base/{Database => Context}/DataCollection.cs (99%) rename UKSF.Api.Base/{Database => Context}/DataCollectionFactory.cs (95%) rename UKSF.Api.Base/{Services/Data => Context}/DataService.cs (98%) rename UKSF.Api.Base/{Services/Data => Context}/DataServiceBase.cs (97%) rename UKSF.Api.Base/{Services/Data => Context}/LogDataService.cs (95%) rename UKSF.Api.Base/{Database => Context}/MongoClientFactory.cs (94%) rename {UKSF.Api.Utility/Services/Data => UKSF.Api.Base/Context}/SchedulerDataService.cs (73%) rename {UKSF.Api.Utility => UKSF.Api.Base}/Models/ScheduledJob.cs (78%) rename {UKSF.Api.Utility => UKSF.Api.Base}/ScheduledActions/IScheduledAction.cs (71%) create mode 100644 UKSF.Api.Base/ScheduledActions/ISelfCreatingScheduledAction.cs rename UKSF.Api.Utility/Services/ScheduledActionService.cs => UKSF.Api.Base/Services/ScheduledActionFactory.cs (82%) rename {UKSF.Api.Utility => UKSF.Api.Base}/Services/SchedulerService.cs (68%) rename {UKSF.Api.Personnel/Services/Data => UKSF.Api.Command/Context}/DischargeDataService.cs (83%) rename {UKSF.Api.Personnel/Services/Data => UKSF.Api.Command/Context}/LoaDataService.cs (77%) rename {UKSF.Api.Personnel => UKSF.Api.Command}/Controllers/DischargesController.cs (93%) rename {UKSF.Api.Personnel => UKSF.Api.Command}/Models/Discharge.cs (94%) rename {UKSF.Api.Personnel => UKSF.Api.Command}/Services/DischargeService.cs (70%) rename {UKSF.Api.Personnel => UKSF.Api.Command}/Services/LoaService.cs (72%) create mode 100644 UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramImages.cs create mode 100644 UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramToken.cs delete mode 100644 UKSF.Api.Integration.Instagram/ScheduledActions/InstagramImagesAction.cs delete mode 100644 UKSF.Api.Integration.Instagram/ScheduledActions/InstagramTokenAction.cs create mode 100644 UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs delete mode 100644 UKSF.Api.Integrations.Teamspeak/ScheduledActions/TeamspeakSnapshotAction.cs create mode 100644 UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs rename UKSF.Api.Personnel/{Services/Data => Context}/AccountDataService.cs (78%) rename UKSF.Api.Personnel/{Services/Data => Context}/CommentThreadDataService.cs (92%) rename UKSF.Api.Personnel/{Services/Data => Context}/ConfirmationCodeDataService.cs (80%) rename UKSF.Api.Personnel/{Services/Data => Context}/NotificationsDataService.cs (80%) rename UKSF.Api.Personnel/{Services/Data => Context}/RanksDataService.cs (88%) rename UKSF.Api.Personnel/{Services/Data => Context}/RolesDataService.cs (88%) rename UKSF.Api.Personnel/{Services/Data => Context}/UnitsDataService.cs (85%) rename UKSF.Api.Personnel/ScheduledActions/{DeleteExpiredConfirmationCodeAction.cs => ActionDeleteExpiredConfirmationCode.cs} (61%) create mode 100644 UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs delete mode 100644 UKSF.Api.Utility/ScheduledActions/PruneDataAction.cs diff --git a/UKSF.Api.Admin/ApiAdminExtensions.cs b/UKSF.Api.Admin/ApiAdminExtensions.cs index 5281ab31..be63494f 100644 --- a/UKSF.Api.Admin/ApiAdminExtensions.cs +++ b/UKSF.Api.Admin/ApiAdminExtensions.cs @@ -1,16 +1,17 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Admin.Context; using UKSF.Api.Admin.EventHandlers; using UKSF.Api.Admin.Models; +using UKSF.Api.Admin.ScheduledActions; using UKSF.Api.Admin.Services; -using UKSF.Api.Admin.Services.Data; using UKSF.Api.Admin.Signalr.Hubs; using UKSF.Api.Base.Events; namespace UKSF.Api.Admin { public static class ApiAdminExtensions { - public static IServiceCollection AddUksfAdmin(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); + public static IServiceCollection AddUksfAdmin(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddActions(); private static IServiceCollection AddContexts(this IServiceCollection services) => services; @@ -21,6 +22,8 @@ public static class ApiAdminExtensions { private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton().AddTransient().AddTransient(); + private static IServiceCollection AddActions(this IServiceCollection services) => services.AddSingleton(); + public static void AddUksfAdminSignalr(this IEndpointRouteBuilder builder) { builder.MapHub($"/hub/{AdminHub.END_POINT}"); builder.MapHub($"/hub/{UtilityHub.END_POINT}"); diff --git a/UKSF.Api.Admin/Services/Data/VariablesDataService.cs b/UKSF.Api.Admin/Context/VariablesDataService.cs similarity index 93% rename from UKSF.Api.Admin/Services/Data/VariablesDataService.cs rename to UKSF.Api.Admin/Context/VariablesDataService.cs index e145e6e4..6f900c9a 100644 --- a/UKSF.Api.Admin/Services/Data/VariablesDataService.cs +++ b/UKSF.Api.Admin/Context/VariablesDataService.cs @@ -2,12 +2,11 @@ using System.Linq; using System.Threading.Tasks; using UKSF.Api.Admin.Models; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Extensions; -using UKSF.Api.Base.Services.Data; -namespace UKSF.Api.Admin.Services.Data { +namespace UKSF.Api.Admin.Context { public interface IVariablesDataService : IDataService, ICachedDataService { Task Update(string key, object value); } diff --git a/UKSF.Api.Admin/Controllers/VariablesController.cs b/UKSF.Api.Admin/Controllers/VariablesController.cs index 2292fa64..bf1d7b78 100644 --- a/UKSF.Api.Admin/Controllers/VariablesController.cs +++ b/UKSF.Api.Admin/Controllers/VariablesController.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Models; -using UKSF.Api.Admin.Services.Data; using UKSF.Api.Base; using UKSF.Api.Base.Events; using UKSF.Api.Base.Extensions; diff --git a/UKSF.Api.Admin/Controllers/VersionController.cs b/UKSF.Api.Admin/Controllers/VersionController.cs index 3519d4ea..07fd043d 100644 --- a/UKSF.Api.Admin/Controllers/VersionController.cs +++ b/UKSF.Api.Admin/Controllers/VersionController.cs @@ -3,8 +3,8 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; using Newtonsoft.Json.Linq; +using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; -using UKSF.Api.Admin.Services.Data; using UKSF.Api.Admin.Signalr.Clients; using UKSF.Api.Admin.Signalr.Hubs; diff --git a/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs b/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs new file mode 100644 index 00000000..b93e081d --- /dev/null +++ b/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs @@ -0,0 +1,50 @@ +using System; +using System.Threading.Tasks; +using UKSF.Api.Base.Context; +using UKSF.Api.Base.ScheduledActions; +using UKSF.Api.Base.Services; + +namespace UKSF.Api.Admin.ScheduledActions { + public interface IActionPruneLogs : ISelfCreatingScheduledAction { } + + public class ActionPruneLogs : IActionPruneLogs { + public const string ACTION_NAME = nameof(ActionPruneLogs); + + private readonly IAuditLogDataService auditLogDataService; + private readonly IClock clock; + private readonly IHttpErrorLogDataService httpErrorLogDataService; + private readonly ILogDataService logDataService; + private readonly ISchedulerService schedulerService; + + public ActionPruneLogs( + ILogDataService logDataService, + IAuditLogDataService auditLogDataService, + IHttpErrorLogDataService httpErrorLogDataService, + ISchedulerService schedulerService, + IClock clock + ) { + this.logDataService = logDataService; + this.auditLogDataService = auditLogDataService; + this.httpErrorLogDataService = httpErrorLogDataService; + this.schedulerService = schedulerService; + this.clock = clock; + } + + public string Name => ACTION_NAME; + + public void Run(params object[] parameters) { + DateTime now = clock.UtcNow(); + Task logsTask = logDataService.DeleteMany(x => x.timestamp < now.AddDays(-7)); + Task errorLogsTask = httpErrorLogDataService.DeleteMany(x => x.timestamp < now.AddDays(-7)); + Task auditLogsTask = auditLogDataService.DeleteMany(x => x.timestamp < now.AddMonths(-3)); + + Task.WaitAll(logsTask, errorLogsTask, auditLogsTask); + } + + public async Task CreateSelf() { + if (schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + await schedulerService.CreateScheduledJob(clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); + } + } + } +} diff --git a/UKSF.Api.Admin/Services/DataCacheService.cs b/UKSF.Api.Admin/Services/DataCacheService.cs index d841f1c7..3794c1f4 100644 --- a/UKSF.Api.Admin/Services/DataCacheService.cs +++ b/UKSF.Api.Admin/Services/DataCacheService.cs @@ -1,6 +1,6 @@ using System; using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Base.Context; namespace UKSF.Api.Admin.Services { public interface IDataCacheService { diff --git a/UKSF.Api.Admin/Services/VariablesService.cs b/UKSF.Api.Admin/Services/VariablesService.cs index 14faf447..9bb38574 100644 --- a/UKSF.Api.Admin/Services/VariablesService.cs +++ b/UKSF.Api.Admin/Services/VariablesService.cs @@ -1,6 +1,6 @@ +using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Models; -using UKSF.Api.Admin.Services.Data; -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Base.Context; namespace UKSF.Api.Admin.Services { public interface IVariablesService : IDataBackedService { diff --git a/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs b/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs index 25c52eb9..ea5695ca 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs @@ -13,44 +13,43 @@ namespace UKSF.Api.ArmaMissions.Services { public interface IMissionPatchingService { - Task PatchMission(string path); + Task PatchMission(string path, string armaServerModsPath, int armaServerDefaultMaxCurators); } public class MissionPatchingService : IMissionPatchingService { private const string EXTRACT_PBO = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\ExtractPboDos.exe"; private const string MAKE_PBO = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\MakePbo.exe"; - private readonly MissionService missionService; - private readonly IVariablesService variablesService; - private readonly ILogger logger; - - private string filePath; - private string folderPath; - private string parentFolderPath; + private readonly MissionService _missionService; + private readonly IVariablesService _variablesService; + private readonly ILogger _logger; + private string _filePath; + private string _folderPath; + private string _parentFolderPath; public MissionPatchingService(MissionService missionService, IVariablesService variablesService, ILogger logger) { - this.missionService = missionService; - this.variablesService = variablesService; - this.logger = logger; + _missionService = missionService; + _variablesService = variablesService; + _logger = logger; } - public Task PatchMission(string path) { + public Task PatchMission(string path, string armaServerModsPath, int armaServerDefaultMaxCurators) { return Task.Run( async () => { - filePath = path; - parentFolderPath = Path.GetDirectoryName(filePath); + _filePath = path; + _parentFolderPath = Path.GetDirectoryName(_filePath); MissionPatchingResult result = new MissionPatchingResult(); try { CreateBackup(); UnpackPbo(); - Mission mission = new Mission(folderPath); - result.reports = missionService.ProcessMission(mission); + Mission mission = new Mission(_folderPath); + result.reports = _missionService.ProcessMission(mission, armaServerModsPath, armaServerDefaultMaxCurators); await PackPbo(); result.playerCount = mission.playerCount; result.success = result.reports.All(x => !x.error); } catch (Exception exception) { - logger.LogError(exception); + _logger.LogError(exception); result.reports = new List { new MissionPatchingReport(exception) }; result.success = false; } finally { @@ -63,44 +62,44 @@ public Task PatchMission(string path) { } private void CreateBackup() { - string backupPath = Path.Combine(variablesService.GetVariable("MISSIONS_BACKUPS").AsString(), Path.GetFileName(filePath) ?? throw new FileNotFoundException()); + string backupPath = Path.Combine(_variablesService.GetVariable("MISSIONS_BACKUPS").AsString(), Path.GetFileName(_filePath) ?? throw new FileNotFoundException()); Directory.CreateDirectory(Path.GetDirectoryName(backupPath) ?? throw new DirectoryNotFoundException()); - File.Copy(filePath, backupPath, true); + File.Copy(_filePath, backupPath, true); if (!File.Exists(backupPath)) { throw new FileNotFoundException(); } } private void UnpackPbo() { - if (Path.GetExtension(filePath) != ".pbo") { + if (Path.GetExtension(_filePath) != ".pbo") { throw new FileLoadException("File is not a pbo"); } - folderPath = Path.Combine(parentFolderPath, Path.GetFileNameWithoutExtension(filePath) ?? throw new FileNotFoundException()); - if (Directory.Exists(folderPath)) { - Directory.Delete(folderPath, true); + _folderPath = Path.Combine(_parentFolderPath, Path.GetFileNameWithoutExtension(_filePath) ?? throw new FileNotFoundException()); + if (Directory.Exists(_folderPath)) { + Directory.Delete(_folderPath, true); } - Process process = new Process { StartInfo = { FileName = EXTRACT_PBO, Arguments = $"-D -P \"{filePath}\"", UseShellExecute = false, CreateNoWindow = true } }; + Process process = new Process { StartInfo = { FileName = EXTRACT_PBO, Arguments = $"-D -P \"{_filePath}\"", UseShellExecute = false, CreateNoWindow = true } }; process.Start(); process.WaitForExit(); - if (!Directory.Exists(folderPath)) { + if (!Directory.Exists(_folderPath)) { throw new DirectoryNotFoundException("Could not find unpacked pbo"); } } private async Task PackPbo() { - if (Directory.Exists(filePath)) { - filePath += ".pbo"; + if (Directory.Exists(_filePath)) { + _filePath += ".pbo"; } Process process = new Process { StartInfo = { FileName = MAKE_PBO, - WorkingDirectory = variablesService.GetVariable("MISSIONS_WORKING_DIR").AsString(), - Arguments = $"-Z -BD -P -X=\"thumbs.db,*.txt,*.h,*.dep,*.cpp,*.bak,*.png,*.log,*.pew\" \"{folderPath}\"", + WorkingDirectory = _variablesService.GetVariable("MISSIONS_WORKING_DIR").AsString(), + Arguments = $"-Z -BD -P -X=\"thumbs.db,*.txt,*.h,*.dep,*.cpp,*.bak,*.png,*.log,*.pew\" \"{_folderPath}\"", UseShellExecute = false, CreateNoWindow = true, RedirectStandardOutput = true, @@ -112,7 +111,7 @@ private async Task PackPbo() { string errorOutput = await process.StandardError.ReadToEndAsync(); process.WaitForExit(); - if (File.Exists(filePath)) return; + if (File.Exists(_filePath)) return; List outputLines = Regex.Split($"{output}\n{errorOutput}", "\r\n|\r|\n").ToList(); output = outputLines.Where(x => !string.IsNullOrEmpty(x) && !x.ContainsIgnoreCase("compressing")).Aggregate((x, y) => $"{x}\n{y}"); throw new Exception(output); @@ -120,7 +119,7 @@ private async Task PackPbo() { private void Cleanup() { try { - Directory.Delete(folderPath, true); + Directory.Delete(_folderPath, true); } catch (Exception) { // ignore } diff --git a/UKSF.Api.ArmaMissions/Services/MissionService.cs b/UKSF.Api.ArmaMissions/Services/MissionService.cs index 7cfcaf30..93c63712 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionService.cs @@ -4,26 +4,26 @@ using System.IO; using System.Linq; using UKSF.Api.ArmaMissions.Models; +using UKSF.Api.Base.Extensions; namespace UKSF.Api.ArmaMissions.Services { public class MissionService { private const string UNBIN = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\DeRapDos.exe"; - private readonly MissionPatchDataService missionPatchDataService; - private readonly IGameServerHelpers gameServerHelpers; + private readonly MissionPatchDataService _missionPatchDataService; + private int _armaServerDefaultMaxCurators; + private string _armaServerModsPath; + private Mission _mission; + private List _reports; - private Mission mission; - private List reports; + public MissionService(MissionPatchDataService missionPatchDataService) => _missionPatchDataService = missionPatchDataService; - public MissionService(MissionPatchDataService missionPatchDataService, IGameServerHelpers gameServerHelpers) { - this.missionPatchDataService = missionPatchDataService; - this.gameServerHelpers = gameServerHelpers; - } - - public List ProcessMission(Mission tempMission) { - mission = tempMission; - reports = new List(); - if (!AssertRequiredFiles()) return reports; + public List ProcessMission(Mission tempMission, string armaServerModsPath, int armaServerDefaultMaxCurators) { + _armaServerDefaultMaxCurators = armaServerDefaultMaxCurators; + _armaServerModsPath = armaServerModsPath; + _mission = tempMission; + _reports = new List(); + if (!AssertRequiredFiles()) return _reports; if (CheckBinned()) { UnBin(); @@ -32,7 +32,7 @@ public List ProcessMission(Mission tempMission) { Read(); if (CheckIgnoreKey("missionPatchingIgnore")) { - reports.Add( + _reports.Add( new MissionPatchingReport( "Mission Patching Ignored", "Mission patching for this mission was ignored.\nThis means no changes to the mission.sqm were made." + @@ -45,19 +45,19 @@ public List ProcessMission(Mission tempMission) { ) ); PatchDescription(); - return reports; + return _reports; } - missionPatchDataService.UpdatePatchData(); + _missionPatchDataService.UpdatePatchData(); Patch(); Write(); PatchDescription(); - return reports; + return _reports; } private bool AssertRequiredFiles() { - if (!File.Exists(mission.descriptionPath)) { - reports.Add( + if (!File.Exists(_mission.descriptionPath)) { + _reports.Add( new MissionPatchingReport( "Missing file: description.ext", "The mission is missing a required file:\ndescription.ext\n\n" + @@ -68,8 +68,8 @@ private bool AssertRequiredFiles() { return false; } - if (!File.Exists(Path.Combine(mission.path, "cba_settings.sqf"))) { - reports.Add( + if (!File.Exists(Path.Combine(_mission.path, "cba_settings.sqf"))) { + _reports.Add( new MissionPatchingReport( "Missing file: cba_settings.sqf", "The mission is missing a required file:\ncba_settings.sqf\n\n" + @@ -81,78 +81,78 @@ private bool AssertRequiredFiles() { return false; } - if (File.Exists(Path.Combine(mission.path, "README.txt"))) { - File.Delete(Path.Combine(mission.path, "README.txt")); + if (File.Exists(Path.Combine(_mission.path, "README.txt"))) { + File.Delete(Path.Combine(_mission.path, "README.txt")); } return true; } private bool CheckIgnoreKey(string key) { - mission.descriptionLines = File.ReadAllLines(mission.descriptionPath).ToList(); - return mission.descriptionLines.Any(x => x.ContainsIgnoreCase(key)); + _mission.descriptionLines = File.ReadAllLines(_mission.descriptionPath).ToList(); + return _mission.descriptionLines.Any(x => x.ContainsIgnoreCase(key)); } private bool CheckBinned() { - Process process = new Process { StartInfo = { FileName = UNBIN, Arguments = $"-p -q \"{mission.sqmPath}\"", UseShellExecute = false, CreateNoWindow = true } }; + Process process = new Process { StartInfo = { FileName = UNBIN, Arguments = $"-p -q \"{_mission.sqmPath}\"", UseShellExecute = false, CreateNoWindow = true } }; process.Start(); process.WaitForExit(); return process.ExitCode == 0; } private void UnBin() { - Process process = new Process { StartInfo = { FileName = UNBIN, Arguments = $"-p \"{mission.sqmPath}\"", UseShellExecute = false, CreateNoWindow = true } }; + Process process = new Process { StartInfo = { FileName = UNBIN, Arguments = $"-p \"{_mission.sqmPath}\"", UseShellExecute = false, CreateNoWindow = true } }; process.Start(); process.WaitForExit(); - if (File.Exists($"{mission.sqmPath}.txt")) { - File.Delete(mission.sqmPath); - File.Move($"{mission.sqmPath}.txt", mission.sqmPath); + if (File.Exists($"{_mission.sqmPath}.txt")) { + File.Delete(_mission.sqmPath); + File.Move($"{_mission.sqmPath}.txt", _mission.sqmPath); } else { throw new FileNotFoundException(); } } private void Read() { - mission.sqmLines = File.ReadAllLines(mission.sqmPath).Select(x => x.Trim()).ToList(); - mission.sqmLines.RemoveAll(string.IsNullOrEmpty); + _mission.sqmLines = File.ReadAllLines(_mission.sqmPath).Select(x => x.Trim()).ToList(); + _mission.sqmLines.RemoveAll(string.IsNullOrEmpty); RemoveUnbinText(); ReadAllData(); ReadSettings(); } private void RemoveUnbinText() { - if (mission.sqmLines.First() != "////////////////////////////////////////////////////////////////////") return; + if (_mission.sqmLines.First() != "////////////////////////////////////////////////////////////////////") return; - mission.sqmLines = mission.sqmLines.Skip(7).ToList(); + _mission.sqmLines = _mission.sqmLines.Skip(7).ToList(); // mission.sqmLines = mission.sqmLines.Take(mission.sqmLines.Count - 1).ToList(); } private void ReadAllData() { - Mission.nextId = Convert.ToInt32(MissionUtilities.ReadSingleDataByKey(MissionUtilities.ReadDataByKey(mission.sqmLines, "ItemIDProvider"), "nextID")); - mission.rawEntities = MissionUtilities.ReadDataByKey(mission.sqmLines, "Entities"); - mission.missionEntity = MissionEntityHelper.CreateFromItems(mission.rawEntities); + Mission.nextId = Convert.ToInt32(MissionUtilities.ReadSingleDataByKey(MissionUtilities.ReadDataByKey(_mission.sqmLines, "ItemIDProvider"), "nextID")); + _mission.rawEntities = MissionUtilities.ReadDataByKey(_mission.sqmLines, "Entities"); + _mission.missionEntity = MissionEntityHelper.CreateFromItems(_mission.rawEntities); } private void ReadSettings() { - mission.maxCurators = 5; - string curatorsMaxLine = File.ReadAllLines(Path.Combine(mission.path, "cba_settings.sqf")).FirstOrDefault(x => x.Contains("uksf_curator_curatorsMax")); + _mission.maxCurators = 5; + string curatorsMaxLine = File.ReadAllLines(Path.Combine(_mission.path, "cba_settings.sqf")).FirstOrDefault(x => x.Contains("uksf_curator_curatorsMax")); if (string.IsNullOrEmpty(curatorsMaxLine)) { - mission.maxCurators = gameServerHelpers.GetMaxCuratorCountFromSettings(); - reports.Add( + _mission.maxCurators = _armaServerDefaultMaxCurators; + _reports.Add( new MissionPatchingReport( "Using server setting 'uksf_curator_curatorsMax'", "Could not find setting 'uksf_curator_curatorsMax' in cba_settings.sqf" + "This is required to add the correct nubmer of pre-defined curator objects." + - $"The server setting value ({mission.maxCurators}) for this will be used instead." + $"The server setting value ({_mission.maxCurators}) for this will be used instead." ) ); return; } string curatorsMaxString = curatorsMaxLine.Split("=")[1].RemoveSpaces().Replace(";", ""); - if (!int.TryParse(curatorsMaxString, out mission.maxCurators)) { - reports.Add( + if (!int.TryParse(curatorsMaxString, out _mission.maxCurators)) { + _reports.Add( new MissionPatchingReport( "Using hardcoded setting 'uksf_curator_curatorsMax'", $"Could not read malformed setting: '{curatorsMaxLine}' in cba_settings.sqf" + @@ -164,14 +164,14 @@ private void ReadSettings() { } private void Patch() { - mission.missionEntity.Patch(mission.maxCurators); + _mission.missionEntity.Patch(_mission.maxCurators); if (!CheckIgnoreKey("missionImageIgnore")) { - string imagePath = Path.Combine(mission.path, "uksf.paa"); - string modpackImagePath = Path.Combine(gameServerHelpers.GetGameServerModsPaths(GameEnvironment.RELEASE), "@uksf", "UKSFTemplate.VR", "uksf.paa"); + string imagePath = Path.Combine(_mission.path, "uksf.paa"); + string modpackImagePath = Path.Combine(_armaServerModsPath, "@uksf", "UKSFTemplate.VR", "uksf.paa"); if (File.Exists(modpackImagePath)) { if (File.Exists(imagePath) && new FileInfo(imagePath).Length != new FileInfo(modpackImagePath).Length) { - reports.Add( + _reports.Add( new MissionPatchingReport( "Loading image was different", "The mission loading image `uksf.paa` was found to be different from the default." + @@ -187,27 +187,27 @@ private void Patch() { } private void Write() { - int start = MissionUtilities.GetIndexByKey(mission.sqmLines, "Entities"); - int count = mission.rawEntities.Count; - mission.sqmLines.RemoveRange(start, count); - IEnumerable newEntities = mission.missionEntity.Serialize(); - mission.sqmLines.InsertRange(start, newEntities); - mission.sqmLines = mission.sqmLines.Select(x => x.RemoveNewLines().RemoveEmbeddedQuotes()).ToList(); - File.WriteAllLines(mission.sqmPath, mission.sqmLines); + int start = MissionUtilities.GetIndexByKey(_mission.sqmLines, "Entities"); + int count = _mission.rawEntities.Count; + _mission.sqmLines.RemoveRange(start, count); + IEnumerable newEntities = _mission.missionEntity.Serialize(); + _mission.sqmLines.InsertRange(start, newEntities); + _mission.sqmLines = _mission.sqmLines.Select(x => x.RemoveNewLines().RemoveEmbeddedQuotes()).ToList(); + File.WriteAllLines(_mission.sqmPath, _mission.sqmLines); } private void PatchDescription() { - int playable = mission.sqmLines.Select(x => x.RemoveSpaces()).Count(x => x.ContainsIgnoreCase("isPlayable=1") || x.ContainsIgnoreCase("isPlayer=1")); - mission.playerCount = playable; + int playable = _mission.sqmLines.Select(x => x.RemoveSpaces()).Count(x => x.ContainsIgnoreCase("isPlayable=1") || x.ContainsIgnoreCase("isPlayer=1")); + _mission.playerCount = playable; - mission.descriptionLines = File.ReadAllLines(mission.descriptionPath).ToList(); - mission.descriptionLines[mission.descriptionLines.FindIndex(x => x.ContainsIgnoreCase("maxPlayers"))] = $" maxPlayers = {playable};"; + _mission.descriptionLines = File.ReadAllLines(_mission.descriptionPath).ToList(); + _mission.descriptionLines[_mission.descriptionLines.FindIndex(x => x.ContainsIgnoreCase("maxPlayers"))] = $" maxPlayers = {playable};"; CheckRequiredDescriptionItems(); CheckConfigurableDescriptionItems(); - mission.descriptionLines = mission.descriptionLines.Where(x => !x.Contains("__EXEC")).ToList(); + _mission.descriptionLines = _mission.descriptionLines.Where(x => !x.Contains("__EXEC")).ToList(); - File.WriteAllLines(mission.descriptionPath, mission.descriptionLines); + File.WriteAllLines(_mission.descriptionPath, _mission.descriptionLines); } private void CheckConfigurableDescriptionItems() { @@ -232,20 +232,20 @@ private void CheckRequiredDescriptionItems() { } private void CheckDescriptionItem(string key, string defaultValue, bool required = true) { - int index = mission.descriptionLines.FindIndex(x => x.Contains($"{key} = ") || x.Contains($"{key}=") || x.Contains($"{key}= ") || x.Contains($"{key} =")); + int index = _mission.descriptionLines.FindIndex(x => x.Contains($"{key} = ") || x.Contains($"{key}=") || x.Contains($"{key}= ") || x.Contains($"{key} =")); if (index != -1) { - string itemValue = mission.descriptionLines[index].Split("=")[1].Trim(); + string itemValue = _mission.descriptionLines[index].Split("=")[1].Trim(); itemValue = itemValue.Remove(itemValue.Length - 1); bool equal = string.Equals(itemValue, defaultValue, StringComparison.InvariantCultureIgnoreCase); if (!equal && required) { - reports.Add( + _reports.Add( new MissionPatchingReport( $"Required description.ext item {key} value is not default", $"{key} in description.ext is '{itemValue}'\nThe default value is '{defaultValue}'\n\nYou should only change this if you know what you're doing" ) ); } else if (equal && !required) { - reports.Add( + _reports.Add( new MissionPatchingReport( $"Configurable description.ext item {key} value is default", $"{key} in description.ext is the same as the default value '{itemValue}'\n\nThis should be changed based on your mission" @@ -257,9 +257,9 @@ private void CheckDescriptionItem(string key, string defaultValue, bool required } if (required) { - mission.descriptionLines.Add($"{key} = {defaultValue};"); + _mission.descriptionLines.Add($"{key} = {defaultValue};"); } else { - reports.Add( + _reports.Add( new MissionPatchingReport( $"Configurable description.ext item {key} is missing", $"{key} in description.ext is missing\nThis is required for the mission\n\n" + diff --git a/UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs b/UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs index 0b6818c3..873920f9 100644 --- a/UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs +++ b/UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.ArmaServer.Models; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; namespace UKSF.Api.ArmaServer.DataContext { public interface IGameServersDataService : IDataService, ICachedDataService { } diff --git a/UKSF.Api.ArmaServer/Services/GameServersService.cs b/UKSF.Api.ArmaServer/Services/GameServersService.cs index 5d5767e3..a1da3dd5 100644 --- a/UKSF.Api.ArmaServer/Services/GameServersService.cs +++ b/UKSF.Api.ArmaServer/Services/GameServersService.cs @@ -12,8 +12,8 @@ using UKSF.Api.ArmaMissions.Services; using UKSF.Api.ArmaServer.DataContext; using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Extensions; -using UKSF.Api.Base.Services.Data; namespace UKSF.Api.ArmaServer.Services { public interface IGameServersService : IDataBackedService { @@ -33,25 +33,25 @@ public interface IGameServersService : IDataBackedService, IGameServersService { - private readonly IGameServerHelpers gameServerHelpers; - private readonly IMissionPatchingService missionPatchingService; + private readonly IGameServerHelpers _gameServerHelpers; + private readonly IMissionPatchingService _missionPatchingService; public GameServersService(IGameServersDataService data, IMissionPatchingService missionPatchingService, IGameServerHelpers gameServerHelpers) : base(data) { - this.missionPatchingService = missionPatchingService; - this.gameServerHelpers = gameServerHelpers; + this._missionPatchingService = missionPatchingService; + this._gameServerHelpers = gameServerHelpers; } - public int GetGameInstanceCount() => gameServerHelpers.GetArmaProcesses().Count(); + public int GetGameInstanceCount() => _gameServerHelpers.GetArmaProcesses().Count(); public async Task UploadMissionFile(IFormFile file) { string fileName = ContentDispositionHeaderValue.Parse(file.ContentDisposition).FileName.Trim('"'); - string filePath = Path.Combine(gameServerHelpers.GetGameServerMissionsPath(), fileName); + string filePath = Path.Combine(_gameServerHelpers.GetGameServerMissionsPath(), fileName); await using FileStream stream = new FileStream(filePath, FileMode.Create); await file.CopyToAsync(stream); } public List GetMissionFiles() { - IEnumerable files = new DirectoryInfo(gameServerHelpers.GetGameServerMissionsPath()).EnumerateFiles("*.pbo", SearchOption.TopDirectoryOnly); + IEnumerable files = new DirectoryInfo(_gameServerHelpers.GetGameServerMissionsPath()).EnumerateFiles("*.pbo", SearchOption.TopDirectoryOnly); return files.Select(fileInfo => new MissionFile(fileInfo)).OrderBy(x => x.map).ThenBy(x => x.name).ToList(); } @@ -73,8 +73,8 @@ public async Task GetGameServerStatus(GameServer gameServer) { string content = await response.Content.ReadAsStringAsync(); gameServer.status = JsonConvert.DeserializeObject(content); - gameServer.status.parsedUptime = gameServerHelpers.StripMilliseconds(TimeSpan.FromSeconds(gameServer.status.uptime)).ToString(); - gameServer.status.maxPlayers = gameServerHelpers.GetMaxPlayerCountFromConfig(gameServer); + gameServer.status.parsedUptime = _gameServerHelpers.StripMilliseconds(TimeSpan.FromSeconds(gameServer.status.uptime)).ToString(); + gameServer.status.maxPlayers = _gameServerHelpers.GetMaxPlayerCountFromConfig(gameServer); gameServer.status.running = true; gameServer.status.started = false; } catch (Exception) { @@ -96,25 +96,29 @@ public async Task PatchMissionFile(string missionName) { // }; // } - string missionPath = Path.Combine(gameServerHelpers.GetGameServerMissionsPath(), missionName); - MissionPatchingResult result = await missionPatchingService.PatchMission(missionPath); + string missionPath = Path.Combine(_gameServerHelpers.GetGameServerMissionsPath(), missionName); + MissionPatchingResult result = await _missionPatchingService.PatchMission( + missionPath, + _gameServerHelpers.GetGameServerModsPaths(GameEnvironment.RELEASE), + _gameServerHelpers.GetMaxCuratorCountFromSettings() + ); return result; } public void WriteServerConfig(GameServer gameServer, int playerCount, string missionSelection) => - File.WriteAllText(gameServerHelpers.GetGameServerConfigPath(gameServer), gameServerHelpers.FormatGameServerConfig(gameServer, playerCount, missionSelection)); + File.WriteAllText(_gameServerHelpers.GetGameServerConfigPath(gameServer), _gameServerHelpers.FormatGameServerConfig(gameServer, playerCount, missionSelection)); public async Task LaunchGameServer(GameServer gameServer) { - string launchArguments = gameServerHelpers.FormatGameServerLaunchArguments(gameServer); - gameServer.processId = ProcessUtilities.LaunchManagedProcess(gameServerHelpers.GetGameServerExecutablePath(gameServer), launchArguments); + string launchArguments = _gameServerHelpers.FormatGameServerLaunchArguments(gameServer); + gameServer.processId = ProcessUtilities.LaunchManagedProcess(_gameServerHelpers.GetGameServerExecutablePath(gameServer), launchArguments); await Task.Delay(TimeSpan.FromSeconds(1)); // launch headless clients if (gameServer.numberHeadlessClients > 0) { for (int index = 0; index < gameServer.numberHeadlessClients; index++) { - launchArguments = gameServerHelpers.FormatHeadlessClientLaunchArguments(gameServer, index); - gameServer.headlessClientProcessIds.Add(ProcessUtilities.LaunchManagedProcess(gameServerHelpers.GetGameServerExecutablePath(gameServer), launchArguments)); + launchArguments = _gameServerHelpers.FormatHeadlessClientLaunchArguments(gameServer, index); + gameServer.headlessClientProcessIds.Add(ProcessUtilities.LaunchManagedProcess(_gameServerHelpers.GetGameServerExecutablePath(gameServer), launchArguments)); await Task.Delay(TimeSpan.FromSeconds(1)); } @@ -167,7 +171,7 @@ public void KillGameServer(GameServer gameServer) { } public int KillAllArmaProcesses() { - List processes = gameServerHelpers.GetArmaProcesses().ToList(); + List processes = _gameServerHelpers.GetArmaProcesses().ToList(); foreach (Process process in processes) { process.Kill(); } @@ -185,10 +189,10 @@ public int KillAllArmaProcesses() { public List GetAvailableMods(string id) { GameServer gameServer = Data.GetSingle(id); - Uri serverExecutable = new Uri(gameServerHelpers.GetGameServerExecutablePath(gameServer)); + Uri serverExecutable = new Uri(_gameServerHelpers.GetGameServerExecutablePath(gameServer)); List mods = new List(); - IEnumerable availableModsFolders = new[] { gameServerHelpers.GetGameServerModsPaths(gameServer.environment) }; - IEnumerable extraModsFolders = gameServerHelpers.GetGameServerExtraModsPaths(); + IEnumerable availableModsFolders = new[] { _gameServerHelpers.GetGameServerModsPaths(gameServer.environment) }; + IEnumerable extraModsFolders = _gameServerHelpers.GetGameServerExtraModsPaths(); availableModsFolders = availableModsFolders.Concat(extraModsFolders); foreach (string modsPath in availableModsFolders) { IEnumerable modFolders = new DirectoryInfo(modsPath).EnumerateDirectories("@*", SearchOption.TopDirectoryOnly); @@ -222,7 +226,7 @@ public List GetAvailableMods(string id) { } public List GetEnvironmentMods(GameEnvironment environment) { - string repoModsFolder = gameServerHelpers.GetGameServerModsPaths(environment); + string repoModsFolder = _gameServerHelpers.GetGameServerModsPaths(environment); IEnumerable modFolders = new DirectoryInfo(repoModsFolder).EnumerateDirectories("@*", SearchOption.TopDirectoryOnly); return modFolders.Select(modFolder => new { modFolder, modFiles = new DirectoryInfo(modFolder.FullName).EnumerateFiles("*.pbo", SearchOption.AllDirectories) }) .Where(x => x.modFiles.Any()) diff --git a/UKSF.Api.Personnel/Controllers/ConfirmationCodeReceiver.cs b/UKSF.Api.Auth/Controllers/ConfirmationCodeReceiver.cs similarity index 87% rename from UKSF.Api.Personnel/Controllers/ConfirmationCodeReceiver.cs rename to UKSF.Api.Auth/Controllers/ConfirmationCodeReceiver.cs index 014257ef..b65599af 100644 --- a/UKSF.Api.Personnel/Controllers/ConfirmationCodeReceiver.cs +++ b/UKSF.Api.Auth/Controllers/ConfirmationCodeReceiver.cs @@ -2,10 +2,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; +using UKSF.Api.Auth.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Auth.Controllers { public abstract class ConfirmationCodeReceiver : Controller { protected readonly IAccountService AccountService; protected readonly IConfirmationCodeService ConfirmationCodeService; @@ -24,7 +25,7 @@ protected async Task AttemptLoginValidatedAction(JObject loginFor try { string validateCode = loginForm["code"].ToString(); if (codeType == "passwordreset") { - LoginToken = LoginService.LoginWithoutPassword(loginForm["email"].ToString()); + LoginToken = LoginService.LoginForPasswordReset(loginForm["email"].ToString()); Account account = AccountService.Data.GetSingle(x => string.Equals(x.email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); if (await ConfirmationCodeService.GetConfirmationCode(validateCode) == account.id && LoginToken != null) { return await ApplyValidatedPayload(loginForm["password"].ToString(), account); @@ -38,9 +39,9 @@ protected async Task AttemptLoginValidatedAction(JObject loginFor } } - return BadRequest(new {message = "Code may have timed out or bad login"}); + return BadRequest(new { message = "Code may have timed out or bad login" }); } catch (LoginFailedException e) { - return BadRequest(new {message = e.Message}); + return BadRequest(new { message = e.Message }); } } } diff --git a/UKSF.Api.Auth/Controllers/LoginController.cs b/UKSF.Api.Auth/Controllers/LoginController.cs index cb1b0f7d..394705a2 100644 --- a/UKSF.Api.Auth/Controllers/LoginController.cs +++ b/UKSF.Api.Auth/Controllers/LoginController.cs @@ -9,8 +9,8 @@ namespace UKSF.Api.Auth.Controllers { [Route("[controller]")] public class LoginController : Controller { - private readonly ILoginService loginService; private readonly IHttpContextService httpContextService; + private readonly ILoginService loginService; public LoginController(ILoginService loginService, IHttpContextService httpContextService) { this.loginService = loginService; diff --git a/UKSF.Api.Personnel/Controllers/PasswordResetController.cs b/UKSF.Api.Auth/Controllers/PasswordResetController.cs similarity index 94% rename from UKSF.Api.Personnel/Controllers/PasswordResetController.cs rename to UKSF.Api.Auth/Controllers/PasswordResetController.cs index a6886c01..4f59d875 100644 --- a/UKSF.Api.Personnel/Controllers/PasswordResetController.cs +++ b/UKSF.Api.Auth/Controllers/PasswordResetController.cs @@ -3,11 +3,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; +using UKSF.Api.Auth.Services; using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Auth.Controllers { [Route("[controller]")] public class PasswordResetController : ConfirmationCodeReceiver { private readonly IEmailService emailService; @@ -25,7 +26,7 @@ public PasswordResetController(IConfirmationCodeService confirmationCodeService, protected override async Task ApplyValidatedPayload(string codePayload, Account account) { await AccountService.Data.Update(account.id, "password", BCrypt.Net.BCrypt.HashPassword(codePayload)); logger.LogAudit($"Password changed for {account.id}", account.id); - return Ok(LoginService.RegenerateToken(account.id)); + return Ok(LoginService.RegenerateBearerToken(account.id)); } [HttpPost] diff --git a/UKSF.Api.Base/ApiBaseExtensions.cs b/UKSF.Api.Base/ApiBaseExtensions.cs index 8938c585..3dc4bf8d 100644 --- a/UKSF.Api.Base/ApiBaseExtensions.cs +++ b/UKSF.Api.Base/ApiBaseExtensions.cs @@ -1,10 +1,10 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Base.Models.Logging; using UKSF.Api.Base.Services; -using UKSF.Api.Base.Services.Data; namespace UKSF.Api.Base { public static class ApiBaseExtensions { @@ -23,12 +23,15 @@ private static IServiceCollection AddContexts(this IServiceCollection services) services.AddSingleton() .AddSingleton() .AddSingleton() - .AddSingleton(); + .AddSingleton() + .AddSingleton(); - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>(); + private static IServiceCollection AddEventBuses(this IServiceCollection services) => + services.AddSingleton, DataEventBus>().AddSingleton, DataEventBus>(); private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; - private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddServices(this IServiceCollection services) => + services.AddSingleton().AddSingleton().AddTransient(); } } diff --git a/UKSF.Api.Base/Services/Data/CachedDataService.cs b/UKSF.Api.Base/Context/CachedDataService.cs similarity index 98% rename from UKSF.Api.Base/Services/Data/CachedDataService.cs rename to UKSF.Api.Base/Context/CachedDataService.cs index 2f9f7725..cf323c6e 100644 --- a/UKSF.Api.Base/Services/Data/CachedDataService.cs +++ b/UKSF.Api.Base/Context/CachedDataService.cs @@ -5,11 +5,10 @@ using System.Threading.Tasks; using MongoDB.Driver; using MoreLinq; -using UKSF.Api.Base.Database; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; -namespace UKSF.Api.Base.Services.Data { +namespace UKSF.Api.Base.Context { public interface ICachedDataService { void Refresh(); } diff --git a/UKSF.Api.Base/Services/Data/DataBackedService.cs b/UKSF.Api.Base/Context/DataBackedService.cs similarity index 91% rename from UKSF.Api.Base/Services/Data/DataBackedService.cs rename to UKSF.Api.Base/Context/DataBackedService.cs index a341d20d..87f6283e 100644 --- a/UKSF.Api.Base/Services/Data/DataBackedService.cs +++ b/UKSF.Api.Base/Context/DataBackedService.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Base.Services.Data { +namespace UKSF.Api.Base.Context { public interface IDataBackedService { T Data { get; } } diff --git a/UKSF.Api.Base/Database/DataCollection.cs b/UKSF.Api.Base/Context/DataCollection.cs similarity index 99% rename from UKSF.Api.Base/Database/DataCollection.cs rename to UKSF.Api.Base/Context/DataCollection.cs index 768161da..42f1bad1 100644 --- a/UKSF.Api.Base/Database/DataCollection.cs +++ b/UKSF.Api.Base/Context/DataCollection.cs @@ -7,7 +7,7 @@ using MongoDB.Driver; using UKSF.Api.Base.Models; -namespace UKSF.Api.Base.Database { +namespace UKSF.Api.Base.Context { public interface IDataCollection { IEnumerable Get(); IEnumerable Get(Func predicate); diff --git a/UKSF.Api.Base/Database/DataCollectionFactory.cs b/UKSF.Api.Base/Context/DataCollectionFactory.cs similarity index 95% rename from UKSF.Api.Base/Database/DataCollectionFactory.cs rename to UKSF.Api.Base/Context/DataCollectionFactory.cs index bddff9cb..9b71f63a 100644 --- a/UKSF.Api.Base/Database/DataCollectionFactory.cs +++ b/UKSF.Api.Base/Context/DataCollectionFactory.cs @@ -1,7 +1,7 @@ using MongoDB.Driver; using UKSF.Api.Base.Models; -namespace UKSF.Api.Base.Database { +namespace UKSF.Api.Base.Context { public interface IDataCollectionFactory { IDataCollection CreateDataCollection(string collectionName) where T : DatabaseObject; } diff --git a/UKSF.Api.Base/Services/Data/DataService.cs b/UKSF.Api.Base/Context/DataService.cs similarity index 98% rename from UKSF.Api.Base/Services/Data/DataService.cs rename to UKSF.Api.Base/Context/DataService.cs index d5fece16..84157439 100644 --- a/UKSF.Api.Base/Services/Data/DataService.cs +++ b/UKSF.Api.Base/Context/DataService.cs @@ -4,11 +4,10 @@ using System.Threading.Tasks; using MongoDB.Driver; using MoreLinq; -using UKSF.Api.Base.Database; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; -namespace UKSF.Api.Base.Services.Data { +namespace UKSF.Api.Base.Context { public interface IDataService { IEnumerable Get(); IEnumerable Get(Func predicate); diff --git a/UKSF.Api.Base/Services/Data/DataServiceBase.cs b/UKSF.Api.Base/Context/DataServiceBase.cs similarity index 97% rename from UKSF.Api.Base/Services/Data/DataServiceBase.cs rename to UKSF.Api.Base/Context/DataServiceBase.cs index 1782dee3..75886832 100644 --- a/UKSF.Api.Base/Services/Data/DataServiceBase.cs +++ b/UKSF.Api.Base/Context/DataServiceBase.cs @@ -4,10 +4,9 @@ using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; -using UKSF.Api.Base.Database; using UKSF.Api.Base.Models; -namespace UKSF.Api.Base.Services.Data { +namespace UKSF.Api.Base.Context { public abstract class DataServiceBase where T : DatabaseObject { private readonly IDataCollection dataCollection; diff --git a/UKSF.Api.Base/Services/Data/LogDataService.cs b/UKSF.Api.Base/Context/LogDataService.cs similarity index 95% rename from UKSF.Api.Base/Services/Data/LogDataService.cs rename to UKSF.Api.Base/Context/LogDataService.cs index bdf7a677..0b0ddc2f 100644 --- a/UKSF.Api.Base/Services/Data/LogDataService.cs +++ b/UKSF.Api.Base/Context/LogDataService.cs @@ -1,8 +1,7 @@ -using UKSF.Api.Base.Database; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models.Logging; -namespace UKSF.Api.Base.Services.Data { +namespace UKSF.Api.Base.Context { public interface ILogDataService : IDataService { } public interface IAuditLogDataService : IDataService { } diff --git a/UKSF.Api.Base/Database/MongoClientFactory.cs b/UKSF.Api.Base/Context/MongoClientFactory.cs similarity index 94% rename from UKSF.Api.Base/Database/MongoClientFactory.cs rename to UKSF.Api.Base/Context/MongoClientFactory.cs index 9b48e10e..d8097683 100644 --- a/UKSF.Api.Base/Database/MongoClientFactory.cs +++ b/UKSF.Api.Base/Context/MongoClientFactory.cs @@ -1,7 +1,7 @@ using MongoDB.Bson.Serialization.Conventions; using MongoDB.Driver; -namespace UKSF.Api.Base.Database { +namespace UKSF.Api.Base.Context { public static class MongoClientFactory { public static IMongoDatabase GetDatabase(string connectionString) { ConventionPack conventionPack = new ConventionPack {new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true)}; diff --git a/UKSF.Api.Utility/Services/Data/SchedulerDataService.cs b/UKSF.Api.Base/Context/SchedulerDataService.cs similarity index 73% rename from UKSF.Api.Utility/Services/Data/SchedulerDataService.cs rename to UKSF.Api.Base/Context/SchedulerDataService.cs index f566e035..f8d780c7 100644 --- a/UKSF.Api.Utility/Services/Data/SchedulerDataService.cs +++ b/UKSF.Api.Base/Context/SchedulerDataService.cs @@ -1,9 +1,7 @@ -using UKSF.Api.Base.Database; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; -using UKSF.Api.Utility.Models; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Utility.Services.Data { +namespace UKSF.Api.Base.Context { public interface ISchedulerDataService : IDataService { } public class SchedulerDataService : DataService, ISchedulerDataService { diff --git a/UKSF.Api.Utility/Models/ScheduledJob.cs b/UKSF.Api.Base/Models/ScheduledJob.cs similarity index 78% rename from UKSF.Api.Utility/Models/ScheduledJob.cs rename to UKSF.Api.Base/Models/ScheduledJob.cs index 084d3fae..22c6b94a 100644 --- a/UKSF.Api.Utility/Models/ScheduledJob.cs +++ b/UKSF.Api.Base/Models/ScheduledJob.cs @@ -1,7 +1,6 @@ using System; -using UKSF.Api.Base.Models; -namespace UKSF.Api.Utility.Models { +namespace UKSF.Api.Base.Models { public class ScheduledJob : DatabaseObject { public string action; public string actionParameters; diff --git a/UKSF.Api.Utility/ScheduledActions/IScheduledAction.cs b/UKSF.Api.Base/ScheduledActions/IScheduledAction.cs similarity index 71% rename from UKSF.Api.Utility/ScheduledActions/IScheduledAction.cs rename to UKSF.Api.Base/ScheduledActions/IScheduledAction.cs index 3713a21c..a66f8b69 100644 --- a/UKSF.Api.Utility/ScheduledActions/IScheduledAction.cs +++ b/UKSF.Api.Base/ScheduledActions/IScheduledAction.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Utility.ScheduledActions { +namespace UKSF.Api.Base.ScheduledActions { public interface IScheduledAction { string Name { get; } void Run(params object[] parameters); diff --git a/UKSF.Api.Base/ScheduledActions/ISelfCreatingScheduledAction.cs b/UKSF.Api.Base/ScheduledActions/ISelfCreatingScheduledAction.cs new file mode 100644 index 00000000..367b5b98 --- /dev/null +++ b/UKSF.Api.Base/ScheduledActions/ISelfCreatingScheduledAction.cs @@ -0,0 +1,7 @@ +using System.Threading.Tasks; + +namespace UKSF.Api.Base.ScheduledActions { + public interface ISelfCreatingScheduledAction : IScheduledAction { + Task CreateSelf(); + } +} diff --git a/UKSF.Api.Utility/Services/ScheduledActionService.cs b/UKSF.Api.Base/Services/ScheduledActionFactory.cs similarity index 82% rename from UKSF.Api.Utility/Services/ScheduledActionService.cs rename to UKSF.Api.Base/Services/ScheduledActionFactory.cs index 07321f36..34b73f2a 100644 --- a/UKSF.Api.Utility/Services/ScheduledActionService.cs +++ b/UKSF.Api.Base/Services/ScheduledActionFactory.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; -using UKSF.Api.Utility.ScheduledActions; +using UKSF.Api.Base.ScheduledActions; -namespace UKSF.Api.Utility.Services { - public interface IScheduledActionService { +namespace UKSF.Api.Base.Services { + public interface IScheduledActionFactory { void RegisterScheduledActions(IEnumerable newScheduledActions); IScheduledAction GetScheduledAction(string actionName); } - public class ScheduledActionService : IScheduledActionService { + public class ScheduledActionFactory : IScheduledActionFactory { private readonly Dictionary scheduledActions = new Dictionary(); public void RegisterScheduledActions(IEnumerable newScheduledActions) { diff --git a/UKSF.Api.Utility/Services/SchedulerService.cs b/UKSF.Api.Base/Services/SchedulerService.cs similarity index 68% rename from UKSF.Api.Utility/Services/SchedulerService.cs rename to UKSF.Api.Base/Services/SchedulerService.cs index 4d1a5090..1990d74c 100644 --- a/UKSF.Api.Utility/Services/SchedulerService.cs +++ b/UKSF.Api.Base/Services/SchedulerService.cs @@ -5,17 +5,16 @@ using System.Threading.Tasks; using Microsoft.Extensions.Hosting; using Newtonsoft.Json; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; -using UKSF.Api.Base.Services.Data; -using UKSF.Api.Utility.Models; -using UKSF.Api.Utility.ScheduledActions; -using UKSF.Api.Utility.Services.Data; +using UKSF.Api.Base.ScheduledActions; -namespace UKSF.Api.Utility.Services { +namespace UKSF.Api.Base.Services { public interface ISchedulerService : IDataBackedService { void Load(); - Task CreateAndSchedule(DateTime next, TimeSpan interval, string action, params object[] actionParameters); + Task CreateAndScheduleJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters); + Task CreateScheduledJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters); Task Cancel(Func predicate); } @@ -23,10 +22,10 @@ public class SchedulerService : DataBackedService, ISched private static readonly ConcurrentDictionary ACTIVE_TASKS = new ConcurrentDictionary(); private readonly IHostEnvironment currentEnvironment; private readonly ILogger logger; - private readonly IScheduledActionService scheduledActionService; + private readonly IScheduledActionFactory scheduledActionFactory; - public SchedulerService(ISchedulerDataService data, IScheduledActionService scheduledActionService, IHostEnvironment currentEnvironment, ILogger logger) : base(data) { - this.scheduledActionService = scheduledActionService; + public SchedulerService(ISchedulerDataService data, IScheduledActionFactory scheduledActionFactory, IHostEnvironment currentEnvironment, ILogger logger) : base(data) { + this.scheduledActionFactory = scheduledActionFactory; this.currentEnvironment = currentEnvironment; this.logger = logger; } @@ -36,8 +35,8 @@ public async void Load() { Data.Get().ToList().ForEach(Schedule); } - public async Task CreateAndSchedule(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { - ScheduledJob job = await Create(next, interval, action, actionParameters); + public async Task CreateAndScheduleJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { + ScheduledJob job = await CreateScheduledJob(next, interval, action, actionParameters); Schedule(job); } @@ -52,7 +51,7 @@ public async Task Cancel(Func predicate) { await Data.Delete(job); } - private async Task Create(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { + public async Task CreateScheduledJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { ScheduledJob job = new ScheduledJob { next = next, action = action }; if (actionParameters.Length > 0) { job.actionParameters = JsonConvert.SerializeObject(actionParameters); @@ -107,24 +106,8 @@ private void Schedule(ScheduledJob job) { // TODO: Move out of this bit private async Task AddUnique() { - if (Data.GetSingle(x => x.action == InstagramImagesAction.ACTION_NAME) == null) { - await Create(DateTime.Today, TimeSpan.FromMinutes(15), InstagramImagesAction.ACTION_NAME); - } - - scheduledActionService.GetScheduledAction(InstagramImagesAction.ACTION_NAME).Run(); if (!currentEnvironment.IsDevelopment()) { - if (Data.GetSingle(x => x.action == InstagramTokenAction.ACTION_NAME) == null) { - await Create(DateTime.Today.AddDays(45), TimeSpan.FromDays(45), InstagramTokenAction.ACTION_NAME); - } - - if (Data.GetSingle(x => x.action == PruneDataAction.ACTION_NAME) == null) { - await Create(DateTime.Today.AddDays(1), TimeSpan.FromDays(1), PruneDataAction.ACTION_NAME); - } - - if (Data.GetSingle(x => x.action == TeamspeakSnapshotAction.ACTION_NAME) == null) { - await Create(DateTime.Today.AddMinutes(5), TimeSpan.FromMinutes(5), TeamspeakSnapshotAction.ACTION_NAME); - } } } @@ -138,7 +121,7 @@ private bool IsCancelled(DatabaseObject job, CancellationTokenSource token) { } private void ExecuteAction(ScheduledJob job) { - IScheduledAction action = scheduledActionService.GetScheduledAction(job.action); + IScheduledAction action = scheduledActionFactory.GetScheduledAction(job.action); object[] parameters = job.actionParameters == null ? null : JsonConvert.DeserializeObject(job.actionParameters); action.Run(parameters); } diff --git a/UKSF.Api.Command/ApiCommandExtensions.cs b/UKSF.Api.Command/ApiCommandExtensions.cs index e9584dca..44d51066 100644 --- a/UKSF.Api.Command/ApiCommandExtensions.cs +++ b/UKSF.Api.Command/ApiCommandExtensions.cs @@ -15,11 +15,14 @@ public static class ApiCommandExtensions { private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton() .AddSingleton() + .AddSingleton() + .AddSingleton() .AddSingleton() .AddSingleton(); private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>() .AddSingleton, DataEventBus>() .AddSingleton, DataEventBus>(); @@ -29,6 +32,8 @@ private static IServiceCollection AddServices(this IServiceCollection services) services.AddSingleton() .AddTransient() .AddTransient() + .AddTransient() + .AddTransient() .AddTransient() .AddTransient(); diff --git a/UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs b/UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs index 159fcefb..a957d9f4 100644 --- a/UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs +++ b/UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs @@ -1,7 +1,6 @@ -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Command.Models; namespace UKSF.Api.Command.Context { diff --git a/UKSF.Api.Command/Context/CommandRequestDataService.cs b/UKSF.Api.Command/Context/CommandRequestDataService.cs index 189ad255..1d488eb7 100644 --- a/UKSF.Api.Command/Context/CommandRequestDataService.cs +++ b/UKSF.Api.Command/Context/CommandRequestDataService.cs @@ -1,6 +1,5 @@ -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Command.Models; namespace UKSF.Api.Command.Context { diff --git a/UKSF.Api.Personnel/Services/Data/DischargeDataService.cs b/UKSF.Api.Command/Context/DischargeDataService.cs similarity index 83% rename from UKSF.Api.Personnel/Services/Data/DischargeDataService.cs rename to UKSF.Api.Command/Context/DischargeDataService.cs index b004932b..098d52a7 100644 --- a/UKSF.Api.Personnel/Services/Data/DischargeDataService.cs +++ b/UKSF.Api.Command/Context/DischargeDataService.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; -using UKSF.Api.Personnel.Models; +using UKSF.Api.Command.Models; -namespace UKSF.Api.Personnel.Services.Data { +namespace UKSF.Api.Command.Context { public interface IDischargeDataService : IDataService, ICachedDataService { } public class DischargeDataService : CachedDataService, IDischargeDataService { diff --git a/UKSF.Api.Personnel/Services/Data/LoaDataService.cs b/UKSF.Api.Command/Context/LoaDataService.cs similarity index 77% rename from UKSF.Api.Personnel/Services/Data/LoaDataService.cs rename to UKSF.Api.Command/Context/LoaDataService.cs index 4dc521fe..3ef76a71 100644 --- a/UKSF.Api.Personnel/Services/Data/LoaDataService.cs +++ b/UKSF.Api.Command/Context/LoaDataService.cs @@ -1,9 +1,8 @@ -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services.Data { +namespace UKSF.Api.Command.Context { public interface ILoaDataService : IDataService, ICachedDataService { } public class LoaDataService : CachedDataService, ILoaDataService { diff --git a/UKSF.Api.Command/Context/OperationOrderDataService.cs b/UKSF.Api.Command/Context/OperationOrderDataService.cs index 4a3e1219..51271aff 100644 --- a/UKSF.Api.Command/Context/OperationOrderDataService.cs +++ b/UKSF.Api.Command/Context/OperationOrderDataService.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Command.Models; namespace UKSF.Api.Command.Context { @@ -13,7 +12,7 @@ public OperationOrderDataService(IDataCollectionFactory dataCollectionFactory, I protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { - Cache = newCollection?.OrderBy(x => x.start).ToList(); + Cache = newCollection?.OrderBy(x => x.Start).ToList(); } } } diff --git a/UKSF.Api.Command/Context/OperationReportDataService.cs b/UKSF.Api.Command/Context/OperationReportDataService.cs index 2cf456d2..0a01f416 100644 --- a/UKSF.Api.Command/Context/OperationReportDataService.cs +++ b/UKSF.Api.Command/Context/OperationReportDataService.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Command.Models; namespace UKSF.Api.Command.Context { @@ -13,7 +12,7 @@ public OperationReportDataService(IDataCollectionFactory dataCollectionFactory, protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { - Cache = newCollection?.OrderBy(x => x.start).ToList(); + Cache = newCollection?.OrderBy(x => x.Start).ToList(); } } } diff --git a/UKSF.Api.Command/Controllers/CommandRequestsController.cs b/UKSF.Api.Command/Controllers/CommandRequestsController.cs index b20caf21..371e45d4 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsController.cs @@ -7,9 +7,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; +using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Admin.Services.Data; using UKSF.Api.Base; using UKSF.Api.Base.Events; using UKSF.Api.Base.Services; @@ -23,17 +23,17 @@ namespace UKSF.Api.Command.Controllers { public class CommandRequestsController : Controller { public const string SUPER_ADMIN = "59e38f10594c603b78aa9dbd"; - private readonly ICommandRequestCompletionService commandRequestCompletionService; - private readonly IHttpContextService httpContextService; - private readonly ICommandRequestService commandRequestService; - private readonly IDisplayNameService displayNameService; - private readonly INotificationsService notificationsService; + private readonly ICommandRequestCompletionService _commandRequestCompletionService; + private readonly IHttpContextService _httpContextService; + private readonly ICommandRequestService _commandRequestService; + private readonly IDisplayNameService _displayNameService; + private readonly INotificationsService _notificationsService; - private readonly IUnitsService unitsService; - private readonly IVariablesDataService variablesDataService; - private readonly IVariablesService variablesService; - private readonly IAccountService accountService; - private readonly ILogger logger; + private readonly IUnitsService _unitsService; + private readonly IVariablesDataService _variablesDataService; + private readonly IVariablesService _variablesService; + private readonly IAccountService _accountService; + private readonly ILogger _logger; public CommandRequestsController( ICommandRequestService commandRequestService, @@ -47,31 +47,31 @@ public CommandRequestsController( IAccountService accountService, ILogger logger ) { - this.commandRequestService = commandRequestService; - this.commandRequestCompletionService = commandRequestCompletionService; - this.httpContextService = httpContextService; - - this.unitsService = unitsService; - this.displayNameService = displayNameService; - this.notificationsService = notificationsService; - this.variablesDataService = variablesDataService; - this.variablesService = variablesService; - this.accountService = accountService; - this.logger = logger; + _commandRequestService = commandRequestService; + _commandRequestCompletionService = commandRequestCompletionService; + _httpContextService = httpContextService; + + _unitsService = unitsService; + _displayNameService = displayNameService; + _notificationsService = notificationsService; + _variablesDataService = variablesDataService; + _variablesService = variablesService; + _accountService = accountService; + _logger = logger; } [HttpGet, Authorize] public IActionResult Get() { - IEnumerable allRequests = commandRequestService.Data.Get(); + IEnumerable allRequests = _commandRequestService.Data.Get(); List myRequests = new List(); List otherRequests = new List(); - string contextId = httpContextService.GetUserId(); - string id = variablesDataService.GetSingle("UNIT_ID_PERSONNEL").AsString(); - bool canOverride = unitsService.Data.GetSingle(id).members.Any(x => x == contextId); + string contextId = _httpContextService.GetUserId(); + string id = _variablesDataService.GetSingle("UNIT_ID_PERSONNEL").AsString(); + bool canOverride = _unitsService.Data.GetSingle(id).members.Any(x => x == contextId); bool superAdmin = contextId == SUPER_ADMIN; DateTime now = DateTime.Now; foreach (CommandRequest commandRequest in allRequests) { - Dictionary.KeyCollection reviewers = commandRequest.reviews.Keys; + Dictionary.KeyCollection reviewers = commandRequest.Reviews.Keys; if (reviewers.Any(k => k == contextId)) { myRequests.Add(commandRequest); } else { @@ -85,12 +85,12 @@ public IActionResult Get() { private object GetMyRequests(IEnumerable myRequests, string contextId, bool canOverride, bool superAdmin, DateTime now) { return myRequests.Select( x => { - if (string.IsNullOrEmpty(x.reason)) x.reason = "None given"; - x.type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.type.ToLower()); + if (string.IsNullOrEmpty(x.Reason)) x.Reason = "None given"; + x.Type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.Type.ToLower()); return new { data = x, - canOverride = superAdmin || canOverride && x.reviews.Count > 1 && x.dateCreated.AddDays(1) < now && x.reviews.Any(y => y.Value == ReviewState.PENDING && y.Key != contextId), - reviews = x.reviews.Select(y => new { id = y.Key, name = displayNameService.GetDisplayName(y.Key), state = y.Value }) + canOverride = superAdmin || canOverride && x.Reviews.Count > 1 && x.DateCreated.AddDays(1) < now && x.Reviews.Any(y => y.Value == ReviewState.PENDING && y.Key != contextId), + reviews = x.Reviews.Select(y => new { id = y.Key, name = _displayNameService.GetDisplayName(y.Key), state = y.Value }) }; } ); @@ -99,12 +99,12 @@ private object GetMyRequests(IEnumerable myRequests, string cont private object GetOtherRequests(IEnumerable otherRequests, bool canOverride, bool superAdmin, DateTime now) { return otherRequests.Select( x => { - if (string.IsNullOrEmpty(x.reason)) x.reason = "None given"; - x.type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.type.ToLower()); + if (string.IsNullOrEmpty(x.Reason)) x.Reason = "None given"; + x.Type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.Type.ToLower()); return new { data = x, - canOverride = superAdmin || canOverride && x.dateCreated.AddDays(1) < now, - reviews = x.reviews.Select(y => new { name = displayNameService.GetDisplayName(y.Key), state = y.Value }) + canOverride = superAdmin || canOverride && x.DateCreated.AddDays(1) < now, + reviews = x.Reviews.Select(y => new { name = _displayNameService.GetDisplayName(y.Key), state = y.Value }) }; } ); @@ -114,45 +114,45 @@ private object GetOtherRequests(IEnumerable otherRequests, bool public async Task UpdateRequestReview(string id, [FromBody] JObject body) { bool overriden = bool.Parse(body["overriden"].ToString()); ReviewState state = Enum.Parse(body["reviewState"].ToString()); - Account sessionAccount = accountService.GetUserAccount(); - CommandRequest request = commandRequestService.Data.GetSingle(id); + Account sessionAccount = _accountService.GetUserAccount(); + CommandRequest request = _commandRequestService.Data.GetSingle(id); if (request == null) { throw new NullReferenceException($"Failed to get request with id {id}, does not exist"); } if (overriden) { - logger.LogAudit($"Review state of {request.type.ToLower()} request for {request.displayRecipient} overriden to {state}"); - await commandRequestService.SetRequestAllReviewStates(request, state); + _logger.LogAudit($"Review state of {request.Type.ToLower()} request for {request.DisplayRecipient} overriden to {state}"); + await _commandRequestService.SetRequestAllReviewStates(request, state); - foreach (string reviewerId in request.reviews.Select(x => x.Key).Where(x => x != sessionAccount.id)) { - notificationsService.Add( + foreach (string reviewerId in request.Reviews.Select(x => x.Key).Where(x => x != sessionAccount.id)) { + _notificationsService.Add( new Notification { owner = reviewerId, icon = NotificationIcons.REQUEST, - message = $"Your review on {AvsAn.Query(request.type).Article} {request.type.ToLower()} request for {request.displayRecipient} was overriden by {sessionAccount.id}" + message = $"Your review on {AvsAn.Query(request.Type).Article} {request.Type.ToLower()} request for {request.DisplayRecipient} was overriden by {sessionAccount.id}" } ); } } else { - ReviewState currentState = commandRequestService.GetReviewState(request.id, sessionAccount.id); + ReviewState currentState = _commandRequestService.GetReviewState(request.id, sessionAccount.id); if (currentState == ReviewState.ERROR) { throw new ArgumentOutOfRangeException( - $"Getting review state for {sessionAccount} from {request.id} failed. Reviews: \n{request.reviews.Select(x => $"{x.Key}: {x.Value}").Aggregate((x, y) => $"{x}\n{y}")}" + $"Getting review state for {sessionAccount} from {request.id} failed. Reviews: \n{request.Reviews.Select(x => $"{x.Key}: {x.Value}").Aggregate((x, y) => $"{x}\n{y}")}" ); } if (currentState == state) return Ok(); - logger.LogAudit($"Review state of {displayNameService.GetDisplayName(sessionAccount)} for {request.type.ToLower()} request for {request.displayRecipient} updated to {state}"); - await commandRequestService.SetRequestReviewState(request, sessionAccount.id, state); + _logger.LogAudit($"Review state of {_displayNameService.GetDisplayName(sessionAccount)} for {request.Type.ToLower()} request for {request.DisplayRecipient} updated to {state}"); + await _commandRequestService.SetRequestReviewState(request, sessionAccount.id, state); } try { - await commandRequestCompletionService.Resolve(request.id); + await _commandRequestCompletionService.Resolve(request.id); } catch (Exception) { if (overriden) { - await commandRequestService.SetRequestAllReviewStates(request, ReviewState.PENDING); + await _commandRequestService.SetRequestAllReviewStates(request, ReviewState.PENDING); } else { - await commandRequestService.SetRequestReviewState(request, sessionAccount.id, ReviewState.PENDING); + await _commandRequestService.SetRequestReviewState(request, sessionAccount.id, ReviewState.PENDING); } throw; @@ -162,6 +162,6 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje } [HttpPost("exists"), Authorize] - public IActionResult RequestExists([FromBody] CommandRequest request) => Ok(commandRequestService.DoesEquivalentRequestExist(request)); + public IActionResult RequestExists([FromBody] CommandRequest request) => Ok(_commandRequestService.DoesEquivalentRequestExist(request)); } } diff --git a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs index 83aa69f7..a6462d22 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs @@ -14,142 +14,149 @@ namespace UKSF.Api.Command.Controllers { [Route("CommandRequests/Create")] public class CommandRequestsCreationController : Controller { - private readonly IAccountService accountService; - private readonly ICommandRequestService commandRequestService; - private readonly IDisplayNameService displayNameService; - private readonly IHttpContextService httpContextService; - private readonly ILoaService loaService; - private readonly IRanksService ranksService; - - private readonly string sessionId; - private readonly IUnitsService unitsService; - - public CommandRequestsCreationController(IAccountService accountService, ICommandRequestService commandRequestService, IRanksService ranksService, ILoaService loaService, IUnitsService unitsService, IDisplayNameService displayNameService, IHttpContextService httpContextService) { - this.accountService = accountService; - this.commandRequestService = commandRequestService; - this.ranksService = ranksService; - this.loaService = loaService; - this.unitsService = unitsService; - this.displayNameService = displayNameService; - this.httpContextService = httpContextService; - sessionId = httpContextService.GetUserId(); + private readonly IAccountService _accountService; + private readonly ICommandRequestService _commandRequestService; + private readonly IDisplayNameService _displayNameService; + private readonly IHttpContextService _httpContextService; + private readonly ILoaService _loaService; + private readonly IRanksService _ranksService; + private readonly IUnitsService _unitsService; + + public CommandRequestsCreationController( + IAccountService accountService, + ICommandRequestService commandRequestService, + IRanksService ranksService, + ILoaService loaService, + IUnitsService unitsService, + IDisplayNameService displayNameService, + IHttpContextService httpContextService + ) { + _accountService = accountService; + _commandRequestService = commandRequestService; + _ranksService = ranksService; + _loaService = loaService; + _unitsService = unitsService; + _displayNameService = displayNameService; + _httpContextService = httpContextService; } [HttpPut("rank"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestRank([FromBody] CommandRequest request) { - request.requester = sessionId; - request.displayValue = request.value; - request.displayFrom = accountService.Data.GetSingle(request.recipient).rank; - if (request.displayValue == request.displayFrom) return BadRequest("Ranks are equal"); - bool direction = ranksService.IsSuperior(request.displayValue, request.displayFrom); - request.type = string.IsNullOrEmpty(request.displayFrom) ? CommandRequestType.PROMOTION : direction ? CommandRequestType.PROMOTION : CommandRequestType.DEMOTION; - if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); - await commandRequestService.Add(request); + request.Requester = _httpContextService.GetUserId(); + request.DisplayValue = request.Value; + request.DisplayFrom = _accountService.Data.GetSingle(request.Recipient).rank; + if (request.DisplayValue == request.DisplayFrom) return BadRequest("Ranks are equal"); + bool direction = _ranksService.IsSuperior(request.DisplayValue, request.DisplayFrom); + request.Type = string.IsNullOrEmpty(request.DisplayFrom) ? CommandRequestType.PROMOTION : direction ? CommandRequestType.PROMOTION : CommandRequestType.DEMOTION; + if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + await _commandRequestService.Add(request); return Ok(); } [HttpPut("loa"), Authorize, Permissions(Permissions.MEMBER)] public async Task CreateRequestLoa([FromBody] CommandRequestLoa request) { DateTime now = DateTime.UtcNow; - if (request.start <= now.AddDays(-1)) { + if (request.Start <= now.AddDays(-1)) { return BadRequest("Start date cannot be in the past"); } - if (request.end <= now) { + if (request.End <= now) { return BadRequest("End date cannot be in the past"); } - if (request.end <= request.start) { + if (request.End <= request.Start) { return BadRequest("End date cannot be before start date"); } - request.recipient = sessionId; - request.requester = sessionId; - request.displayValue = request.end.ToString(CultureInfo.InvariantCulture); - request.displayFrom = request.start.ToString(CultureInfo.InvariantCulture); - request.type = CommandRequestType.LOA; - if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); - request.value = await loaService.Add(request); - await commandRequestService.Add(request, ChainOfCommandMode.NEXT_COMMANDER_EXCLUDE_SELF); + request.Recipient = _httpContextService.GetUserId(); + request.Requester = _httpContextService.GetUserId(); + request.DisplayValue = request.End.ToString(CultureInfo.InvariantCulture); + request.DisplayFrom = request.Start.ToString(CultureInfo.InvariantCulture); + request.Type = CommandRequestType.LOA; + if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + request.Value = await _loaService.Add(request); + await _commandRequestService.Add(request, ChainOfCommandMode.NEXT_COMMANDER_EXCLUDE_SELF); return Ok(); } [HttpPut("discharge"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestDischarge([FromBody] CommandRequest request) { - request.requester = sessionId; - request.displayValue = "Discharged"; - request.displayFrom = "Member"; - request.type = CommandRequestType.DISCHARGE; - if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); - await commandRequestService.Add(request, ChainOfCommandMode.COMMANDER_AND_PERSONNEL); + request.Requester = _httpContextService.GetUserId(); + request.DisplayValue = "Discharged"; + request.DisplayFrom = "Member"; + request.Type = CommandRequestType.DISCHARGE; + if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + await _commandRequestService.Add(request, ChainOfCommandMode.COMMANDER_AND_PERSONNEL); return Ok(); } [HttpPut("role"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestIndividualRole([FromBody] CommandRequest request) { - request.requester = sessionId; - request.displayValue = request.value; - request.displayFrom = accountService.Data.GetSingle(request.recipient).roleAssignment; - request.type = CommandRequestType.INDIVIDUAL_ROLE; - if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); - await commandRequestService.Add(request, ChainOfCommandMode.NEXT_COMMANDER); + request.Requester = _httpContextService.GetUserId(); + request.DisplayValue = request.Value; + request.DisplayFrom = _accountService.Data.GetSingle(request.Recipient).roleAssignment; + request.Type = CommandRequestType.INDIVIDUAL_ROLE; + if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + await _commandRequestService.Add(request, ChainOfCommandMode.NEXT_COMMANDER); return Ok(); } [HttpPut("unitrole"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestUnitRole([FromBody] CommandRequest request) { - Unit unit = unitsService.Data.GetSingle(request.value); - bool recipientHasUnitRole = unitsService.RolesHasMember(unit, request.recipient); - if (!recipientHasUnitRole && request.secondaryValue == "None") { - return BadRequest($"{displayNameService.GetDisplayName(request.recipient)} has no unit role in {unit.name}. If you are trying to remove them from the unit, use a Unit Removal request"); + Unit unit = _unitsService.Data.GetSingle(request.Value); + bool recipientHasUnitRole = _unitsService.RolesHasMember(unit, request.Recipient); + if (!recipientHasUnitRole && request.SecondaryValue == "None") { + return BadRequest( + $"{_displayNameService.GetDisplayName(request.Recipient)} has no unit role in {unit.name}. If you are trying to remove them from the unit, use a Unit Removal request" + ); } - request.requester = sessionId; - request.displayValue = request.secondaryValue == "None" ? $"Remove role from {unit.name}" : $"{request.secondaryValue} of {unit.name}"; + request.Requester = _httpContextService.GetUserId(); + request.DisplayValue = request.SecondaryValue == "None" ? $"Remove role from {unit.name}" : $"{request.SecondaryValue} of {unit.name}"; if (recipientHasUnitRole) { - string role = unit.roles.FirstOrDefault(x => x.Value == request.recipient).Key; - request.displayFrom = $"{role} of {unit.name}"; + string role = unit.roles.FirstOrDefault(x => x.Value == request.Recipient).Key; + request.DisplayFrom = $"{role} of {unit.name}"; } else { - request.displayFrom = $"Member of {unit.name}"; + request.DisplayFrom = $"Member of {unit.name}"; } - request.type = CommandRequestType.UNIT_ROLE; - if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); - await commandRequestService.Add(request); + request.Type = CommandRequestType.UNIT_ROLE; + if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + await _commandRequestService.Add(request); return Ok(); } [HttpPut("unitremoval"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestUnitRemoval([FromBody] CommandRequest request) { - Unit removeUnit = unitsService.Data.GetSingle(request.value); + Unit removeUnit = _unitsService.Data.GetSingle(request.Value); if (removeUnit.branch == UnitBranch.COMBAT) { return BadRequest("To remove from a combat unit, use a Transfer request"); } - request.requester = sessionId; - request.displayValue = "N/A"; - request.displayFrom = removeUnit.name; - request.type = CommandRequestType.UNIT_REMOVAL; - if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); - await commandRequestService.Add(request, ChainOfCommandMode.TARGET_COMMANDER); + request.Requester = _httpContextService.GetUserId(); + request.DisplayValue = "N/A"; + request.DisplayFrom = removeUnit.name; + request.Type = CommandRequestType.UNIT_REMOVAL; + if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + await _commandRequestService.Add(request, ChainOfCommandMode.TARGET_COMMANDER); return Ok(); } [HttpPut("transfer"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestTransfer([FromBody] CommandRequest request) { - Unit toUnit = unitsService.Data.GetSingle(request.value); - request.requester = sessionId; - request.displayValue = toUnit.name; + Unit toUnit = _unitsService.Data.GetSingle(request.Value); + request.Requester = _httpContextService.GetUserId(); + request.DisplayValue = toUnit.name; if (toUnit.branch == UnitBranch.AUXILIARY) { - request.displayFrom = "N/A"; - request.type = CommandRequestType.AUXILIARY_TRANSFER; - if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); - await commandRequestService.Add(request, ChainOfCommandMode.TARGET_COMMANDER); + request.DisplayFrom = "N/A"; + request.Type = CommandRequestType.AUXILIARY_TRANSFER; + if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + await _commandRequestService.Add(request, ChainOfCommandMode.TARGET_COMMANDER); } else { - request.displayFrom = accountService.Data.GetSingle(request.recipient).unitAssignment; - request.type = CommandRequestType.TRANSFER; - if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); - await commandRequestService.Add(request, ChainOfCommandMode.COMMANDER_AND_TARGET_COMMANDER); + request.DisplayFrom = _accountService.Data.GetSingle(request.Recipient).unitAssignment; + request.Type = CommandRequestType.TRANSFER; + if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + await _commandRequestService.Add(request, ChainOfCommandMode.COMMANDER_AND_TARGET_COMMANDER); } return Ok(); @@ -157,12 +164,12 @@ public async Task CreateRequestTransfer([FromBody] CommandRequest [HttpPut("reinstate"), Authorize, Permissions(Permissions.COMMAND, Permissions.RECRUITER, Permissions.NCO)] public async Task CreateRequestReinstateMember([FromBody] CommandRequest request) { - request.requester = sessionId; - request.displayValue = "Member"; - request.displayFrom = "Discharged"; - request.type = CommandRequestType.REINSTATE_MEMBER; - if (commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); - await commandRequestService.Add(request, ChainOfCommandMode.PERSONNEL); + request.Requester = _httpContextService.GetUserId(); + request.DisplayValue = "Member"; + request.DisplayFrom = "Discharged"; + request.Type = CommandRequestType.REINSTATE_MEMBER; + if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + await _commandRequestService.Add(request, ChainOfCommandMode.PERSONNEL); return Ok(); } } diff --git a/UKSF.Api.Personnel/Controllers/DischargesController.cs b/UKSF.Api.Command/Controllers/DischargesController.cs similarity index 93% rename from UKSF.Api.Personnel/Controllers/DischargesController.cs rename to UKSF.Api.Command/Controllers/DischargesController.cs index 1a78856d..3fa3bcd0 100644 --- a/UKSF.Api.Personnel/Controllers/DischargesController.cs +++ b/UKSF.Api.Command/Controllers/DischargesController.cs @@ -3,16 +3,18 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; +using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Admin.Services.Data; using UKSF.Api.Base; using UKSF.Api.Base.Events; using UKSF.Api.Base.Services; +using UKSF.Api.Command.Models; +using UKSF.Api.Command.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.PERSONNEL, Permissions.NCO, Permissions.RECRUITER)] public class DischargesController : Controller { private readonly IAccountService accountService; @@ -56,7 +58,7 @@ public IActionResult Get() { IEnumerable discharges = dischargeService.Data.Get(); foreach (DischargeCollection discharge in discharges) { discharge.requestExists = commandRequestService.DoesEquivalentRequestExist( - new CommandRequest { recipient = discharge.accountId, type = CommandRequestType.REINSTATE_MEMBER, displayValue = "Member", displayFrom = "Discharged" } + new CommandRequest { Recipient = discharge.accountId, Type = CommandRequestType.REINSTATE_MEMBER, DisplayValue = "Member", DisplayFrom = "Discharged" } ); } diff --git a/UKSF.Api.Command/Controllers/OperationOrderController.cs b/UKSF.Api.Command/Controllers/OperationOrderController.cs index f662185c..6a36a5b8 100644 --- a/UKSF.Api.Command/Controllers/OperationOrderController.cs +++ b/UKSF.Api.Command/Controllers/OperationOrderController.cs @@ -8,25 +8,25 @@ namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] public class OperationOrderController : Controller { - private readonly IOperationOrderService operationOrderService; + private readonly IOperationOrderService _operationOrderService; - public OperationOrderController(IOperationOrderService operationOrderService) => this.operationOrderService = operationOrderService; + public OperationOrderController(IOperationOrderService operationOrderService) => _operationOrderService = operationOrderService; [HttpGet, Authorize] - public IActionResult Get() => Ok(operationOrderService.Data.Get()); + public IActionResult Get() => Ok(_operationOrderService.Data.Get()); [HttpGet("{id}"), Authorize] - public IActionResult Get(string id) => Ok(new {result = operationOrderService.Data.GetSingle(id)}); + public IActionResult Get(string id) => Ok(new {result = _operationOrderService.Data.GetSingle(id)}); [HttpPost, Authorize] public async Task Post([FromBody] CreateOperationOrderRequest request) { - await operationOrderService.Add(request); + await _operationOrderService.Add(request); return Ok(); } [HttpPut, Authorize] public async Task Put([FromBody] Opord request) { - await operationOrderService.Data.Replace(request); + await _operationOrderService.Data.Replace(request); return Ok(); } } diff --git a/UKSF.Api.Command/Controllers/OperationReportController.cs b/UKSF.Api.Command/Controllers/OperationReportController.cs index f9e50284..a466bbd0 100644 --- a/UKSF.Api.Command/Controllers/OperationReportController.cs +++ b/UKSF.Api.Command/Controllers/OperationReportController.cs @@ -9,29 +9,29 @@ namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] public class OperationReportController : Controller { - private readonly IOperationReportService operationReportService; + private readonly IOperationReportService _operationReportService; - public OperationReportController(IOperationReportService operationReportService) => this.operationReportService = operationReportService; + public OperationReportController(IOperationReportService operationReportService) => _operationReportService = operationReportService; [HttpGet("{id}"), Authorize] public IActionResult Get(string id) { - Oprep oprep = operationReportService.Data.GetSingle(id); - return Ok(new {operationEntity = oprep, groupedAttendance = oprep.attendanceReport.users.GroupBy(x => x.groupName)}); + Oprep oprep = _operationReportService.Data.GetSingle(id); + return Ok(new {operationEntity = oprep, groupedAttendance = oprep.AttendanceReport.users.GroupBy(x => x.groupName)}); } [HttpPost, Authorize] public async Task Post([FromBody] CreateOperationReportRequest request) { - await operationReportService.Create(request); + await _operationReportService.Create(request); return Ok(); } [HttpPut, Authorize] public async Task Put([FromBody] Oprep request) { - await operationReportService.Data.Replace(request); + await _operationReportService.Data.Replace(request); return Ok(); } [HttpGet, Authorize] - public IActionResult Get() => Ok(operationReportService.Data.Get()); + public IActionResult Get() => Ok(_operationReportService.Data.Get()); } } diff --git a/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs b/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs index 35514bdd..6624f449 100644 --- a/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs +++ b/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs @@ -12,18 +12,18 @@ namespace UKSF.Api.Command.EventHandlers { public interface ICommandRequestEventHandler : IEventHandler { } public class CommandRequestEventHandler : ICommandRequestEventHandler { - private readonly IDataEventBus commandRequestDataEventBus; - private readonly IHubContext hub; - private readonly ILogger logger; + private readonly IDataEventBus _commandRequestDataEventBus; + private readonly IHubContext _hub; + private readonly ILogger _logger; public CommandRequestEventHandler(IDataEventBus commandRequestDataEventBus, IHubContext hub, ILogger logger) { - this.commandRequestDataEventBus = commandRequestDataEventBus; - this.hub = hub; - this.logger = logger; + _commandRequestDataEventBus = commandRequestDataEventBus; + _hub = hub; + _logger = logger; } public void Init() { - commandRequestDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => logger.LogError(exception)); + _commandRequestDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => _logger.LogError(exception)); } private async Task HandleEvent(DataEventModel dataEventModel) { @@ -38,7 +38,7 @@ private async Task HandleEvent(DataEventModel dataEventModel) { } private async Task UpdatedEvent() { - await hub.Clients.All.ReceiveRequestUpdate(); + await _hub.Clients.All.ReceiveRequestUpdate(); } } } diff --git a/UKSF.Api.Command/Models/CommandRequest.cs b/UKSF.Api.Command/Models/CommandRequest.cs index 1e12a9c9..8a4aae9d 100644 --- a/UKSF.Api.Command/Models/CommandRequest.cs +++ b/UKSF.Api.Command/Models/CommandRequest.cs @@ -26,17 +26,17 @@ public static class CommandRequestType { } public class CommandRequest : DatabaseObject { - public DateTime dateCreated; - public string displayFrom; - public string displayRecipient; - public string displayRequester; - public string displayValue; - public string reason, type; - [BsonRepresentation(BsonType.ObjectId)] public string recipient; - [BsonRepresentation(BsonType.ObjectId)] public string requester; - public Dictionary reviews = new Dictionary(); - public string secondaryValue; - public string value; - public CommandRequest() => dateCreated = DateTime.Now; + public DateTime DateCreated; + public string DisplayFrom; + public string DisplayRecipient; + public string DisplayRequester; + public string DisplayValue; + public string Reason, Type; + [BsonRepresentation(BsonType.ObjectId)] public string Recipient; + [BsonRepresentation(BsonType.ObjectId)] public string Requester; + public Dictionary Reviews = new Dictionary(); + public string SecondaryValue; + public string Value; + public CommandRequest() => DateCreated = DateTime.Now; } } diff --git a/UKSF.Api.Command/Models/CommandRequestLoa.cs b/UKSF.Api.Command/Models/CommandRequestLoa.cs index bf729b30..dd3b601e 100644 --- a/UKSF.Api.Command/Models/CommandRequestLoa.cs +++ b/UKSF.Api.Command/Models/CommandRequestLoa.cs @@ -2,9 +2,9 @@ namespace UKSF.Api.Command.Models { public class CommandRequestLoa : CommandRequest { - public string emergency; - public DateTime end; - public string late; - public DateTime start; + public string Emergency; + public DateTime End; + public string Late; + public DateTime Start; } } diff --git a/UKSF.Api.Command/Models/CreateOperationOrderRequest.cs b/UKSF.Api.Command/Models/CreateOperationOrderRequest.cs index b46b8805..4e1c88dc 100644 --- a/UKSF.Api.Command/Models/CreateOperationOrderRequest.cs +++ b/UKSF.Api.Command/Models/CreateOperationOrderRequest.cs @@ -2,12 +2,12 @@ namespace UKSF.Api.Command.Models { public class CreateOperationOrderRequest { - public DateTime end; - public int endtime; - public string map; - public string name; - public DateTime start; - public int starttime; - public string type; + public DateTime End; + public int Endtime; + public string Map; + public string Name; + public DateTime Start; + public int Starttime; + public string Type; } } diff --git a/UKSF.Api.Command/Models/CreateOperationReport.cs b/UKSF.Api.Command/Models/CreateOperationReport.cs index eae2f637..46191437 100644 --- a/UKSF.Api.Command/Models/CreateOperationReport.cs +++ b/UKSF.Api.Command/Models/CreateOperationReport.cs @@ -2,13 +2,13 @@ namespace UKSF.Api.Command.Models { public class CreateOperationReportRequest { - public DateTime end; - public int endtime; - public string map; - public string name; - public string result; - public DateTime start; - public int starttime; - public string type; + public DateTime End; + public int Endtime; + public string Map; + public string Name; + public string Result; + public DateTime Start; + public int Starttime; + public string Type; } } diff --git a/UKSF.Api.Personnel/Models/Discharge.cs b/UKSF.Api.Command/Models/Discharge.cs similarity index 94% rename from UKSF.Api.Personnel/Models/Discharge.cs rename to UKSF.Api.Command/Models/Discharge.cs index 425a8bb7..ae6d456c 100644 --- a/UKSF.Api.Personnel/Models/Discharge.cs +++ b/UKSF.Api.Command/Models/Discharge.cs @@ -4,7 +4,7 @@ using MongoDB.Bson.Serialization.Attributes; using UKSF.Api.Base.Models; -namespace UKSF.Api.Personnel.Models { +namespace UKSF.Api.Command.Models { public class DischargeCollection : DatabaseObject { [BsonRepresentation(BsonType.ObjectId)] public string accountId; public List discharges = new List(); diff --git a/UKSF.Api.Command/Models/Opord.cs b/UKSF.Api.Command/Models/Opord.cs index d0e4c609..23e1e2cf 100644 --- a/UKSF.Api.Command/Models/Opord.cs +++ b/UKSF.Api.Command/Models/Opord.cs @@ -3,11 +3,11 @@ namespace UKSF.Api.Command.Models { public class Opord : DatabaseObject { - public string description; - public DateTime end; - public string map; - public string name; - public DateTime start; - public string type; + public string Description; + public DateTime End; + public string Map; + public string Name; + public DateTime Start; + public string Type; } } diff --git a/UKSF.Api.Command/Models/Oprep.cs b/UKSF.Api.Command/Models/Oprep.cs index cb72650b..b3ae65d4 100644 --- a/UKSF.Api.Command/Models/Oprep.cs +++ b/UKSF.Api.Command/Models/Oprep.cs @@ -4,13 +4,13 @@ namespace UKSF.Api.Command.Models { public class Oprep : DatabaseObject { - public AttendanceReport attendanceReport; - public string description; - public DateTime end; - public string map; - public string name; - public string result; - public DateTime start; - public string type; + public AttendanceReport AttendanceReport; + public string Description; + public DateTime End; + public string Map; + public string Name; + public string Result; + public DateTime Start; + public string Type; } } diff --git a/UKSF.Api.Command/Services/ChainOfCommandService.cs b/UKSF.Api.Command/Services/ChainOfCommandService.cs index e0db5595..d3f5dea4 100644 --- a/UKSF.Api.Command/Services/ChainOfCommandService.cs +++ b/UKSF.Api.Command/Services/ChainOfCommandService.cs @@ -14,18 +14,18 @@ public interface IChainOfCommandService { } public class ChainOfCommandService : IChainOfCommandService { - private readonly string commanderRoleName; + private readonly string _commanderRoleName; - private readonly IUnitsService unitsService; - private readonly IHttpContextService httpContextService; - private readonly IAccountService accountService; + private readonly IUnitsService _unitsService; + private readonly IHttpContextService _httpContextService; + private readonly IAccountService _accountService; public ChainOfCommandService(IUnitsService unitsService, IRolesService rolesService, IHttpContextService httpContextService, IAccountService accountService) { - this.unitsService = unitsService; - this.httpContextService = httpContextService; - this.accountService = accountService; + _unitsService = unitsService; + _httpContextService = httpContextService; + _accountService = accountService; - commanderRoleName = rolesService.GetUnitRoleByOrder(0).name; + _commanderRoleName = rolesService.GetUnitRoleByOrder(0).name; } public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, Unit start, Unit target) { @@ -40,13 +40,13 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U // If no chain, get root unit commander if (chain.Count == 0) { - chain.Add(GetCommander(unitsService.GetRoot())); + chain.Add(GetCommander(_unitsService.GetRoot())); chain.CleanHashset(); } // If no chain, get root unit child commanders if (chain.Count == 0) { - foreach (Unit unit in unitsService.Data.Get(x => x.parent == unitsService.GetRoot().id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) { + foreach (Unit unit in _unitsService.Data.Get(x => x.parent == _unitsService.GetRoot().id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) { chain.Add(GetCommander(unit)); } chain.CleanHashset(); @@ -62,10 +62,10 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U } public bool InContextChainOfCommand(string id) { - Account contextAccount = accountService.GetUserAccount(); + Account contextAccount = _accountService.GetUserAccount(); if (id == contextAccount.id) return true; - Unit unit = unitsService.Data.GetSingle(x => x.name == contextAccount.unitAssignment); - return unitsService.RolesHasMember(unit, contextAccount.id) && (unit.members.Contains(id) || unitsService.GetAllChildren(unit, true).Any(unitChild => unitChild.members.Contains(id))); + Unit unit = _unitsService.Data.GetSingle(x => x.name == contextAccount.unitAssignment); + return _unitsService.RolesHasMember(unit, contextAccount.id) && (unit.members.Contains(id) || _unitsService.GetAllChildren(unit, true).Any(unitChild => unitChild.members.Contains(id))); } private IEnumerable ResolveMode(ChainOfCommandMode mode, Unit start, Unit target) { @@ -89,7 +89,7 @@ private IEnumerable Full(Unit unit) { chain.Add(GetCommander(unit)); } - unit = unitsService.GetParent(unit); + unit = _unitsService.GetParent(unit); } return chain; @@ -106,7 +106,7 @@ private IEnumerable CommanderAndOneAbove(Unit unit) { chain.Add(GetCommander(unit)); } - Unit parentUnit = unitsService.GetParent(unit); + Unit parentUnit = _unitsService.GetParent(unit); if (parentUnit != null && UnitHasCommander(parentUnit)) { chain.Add(GetCommander(parentUnit)); } @@ -125,7 +125,7 @@ private IEnumerable GetCommanderAndPersonnel(Unit unit) { return chain; } - private IEnumerable GetPersonnel() => unitsService.Data.GetSingle(x => x.shortname == "SR7").members.ToHashSet(); + private IEnumerable GetPersonnel() => _unitsService.Data.GetSingle(x => x.shortname == "SR7").members.ToHashSet(); private IEnumerable GetCommanderAndTargetCommander(Unit unit, Unit targetUnit) => new HashSet {GetNextUnitCommander(unit), GetNextUnitCommander(targetUnit)}; @@ -135,7 +135,7 @@ private string GetNextUnitCommander(Unit unit) { return GetCommander(unit); } - unit = unitsService.GetParent(unit); + unit = _unitsService.GetParent(unit); } return string.Empty; @@ -145,17 +145,17 @@ private string GetNextUnitCommanderExcludeSelf(Unit unit) { while (unit != null) { if (UnitHasCommander(unit)) { string commander = GetCommander(unit); - if (commander != httpContextService.GetUserId()) return commander; + if (commander != _httpContextService.GetUserId()) return commander; } - unit = unitsService.GetParent(unit); + unit = _unitsService.GetParent(unit); } return string.Empty; } - private bool UnitHasCommander(Unit unit) => unitsService.HasRole(unit, commanderRoleName); + private bool UnitHasCommander(Unit unit) => _unitsService.HasRole(unit, _commanderRoleName); - private string GetCommander(Unit unit) => unit.roles.GetValueOrDefault(commanderRoleName, string.Empty); + private string GetCommander(Unit unit) => unit.roles.GetValueOrDefault(_commanderRoleName, string.Empty); } } diff --git a/UKSF.Api.Command/Services/CommandRequestCompletionService.cs b/UKSF.Api.Command/Services/CommandRequestCompletionService.cs index a952ee67..3e3e3f4e 100644 --- a/UKSF.Api.Command/Services/CommandRequestCompletionService.cs +++ b/UKSF.Api.Command/Services/CommandRequestCompletionService.cs @@ -17,17 +17,17 @@ public interface ICommandRequestCompletionService { } public class CommandRequestCompletionService : ICommandRequestCompletionService { - private readonly IHttpContextService httpContextService; - private readonly IAccountService accountService; - private readonly IAssignmentService assignmentService; - private readonly ICommandRequestService commandRequestService; - private readonly IHubContext commandRequestsHub; - private readonly IDischargeService dischargeService; - private readonly ILoaService loaService; - private readonly INotificationsService notificationsService; - private readonly ILogger logger; - - private readonly IUnitsService unitsService; + private readonly IHttpContextService _httpContextService; + private readonly IAccountService _accountService; + private readonly IAssignmentService _assignmentService; + private readonly ICommandRequestService _commandRequestService; + private readonly IHubContext _commandRequestsHub; + private readonly IDischargeService _dischargeService; + private readonly ILoaService _loaService; + private readonly INotificationsService _notificationsService; + private readonly ILogger _logger; + + private readonly IUnitsService _unitsService; public CommandRequestCompletionService( IHttpContextService httpContextService, @@ -41,23 +41,23 @@ public CommandRequestCompletionService( INotificationsService notificationsService, ILogger logger ) { - this.httpContextService = httpContextService; - this.accountService = accountService; - this.commandRequestService = commandRequestService; - this.dischargeService = dischargeService; - this.assignmentService = assignmentService; - this.loaService = loaService; - this.unitsService = unitsService; - this.dischargeService = dischargeService; - this.commandRequestsHub = commandRequestsHub; - this.notificationsService = notificationsService; - this.logger = logger; + _httpContextService = httpContextService; + _accountService = accountService; + _commandRequestService = commandRequestService; + _dischargeService = dischargeService; + _assignmentService = assignmentService; + _loaService = loaService; + _unitsService = unitsService; + _dischargeService = dischargeService; + _commandRequestsHub = commandRequestsHub; + _notificationsService = notificationsService; + _logger = logger; } public async Task Resolve(string id) { - if (commandRequestService.IsRequestApproved(id) || commandRequestService.IsRequestRejected(id)) { - CommandRequest request = commandRequestService.Data.GetSingle(id); - switch (request.type) { + if (_commandRequestService.IsRequestApproved(id) || _commandRequestService.IsRequestRejected(id)) { + CommandRequest request = _commandRequestService.Data.GetSingle(id); + switch (request.Type) { case CommandRequestType.PROMOTION: case CommandRequestType.DEMOTION: await Rank(request); @@ -84,155 +84,155 @@ public async Task Resolve(string id) { case CommandRequestType.REINSTATE_MEMBER: await Reinstate(request); break; - default: throw new InvalidOperationException($"Request type not recognized: '{request.type}'"); + default: throw new InvalidOperationException($"Request type not recognized: '{request.Type}'"); } } - await commandRequestsHub.Clients.All.ReceiveRequestUpdate(); + await _commandRequestsHub.Clients.All.ReceiveRequestUpdate(); } private async Task Rank(CommandRequest request) { - if (commandRequestService.IsRequestApproved(request.id)) { - string role = HandleRecruitToPrivate(request.recipient, request.value); - Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, rankString: request.value, role: role, reason: request.reason); - notificationsService.Add(notification); - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); - } else if (commandRequestService.IsRequestRejected(request.id)) { - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + if (_commandRequestService.IsRequestApproved(request.id)) { + string role = HandleRecruitToPrivate(request.Recipient, request.Value); + Notification notification = await _assignmentService.UpdateUnitRankAndRole(request.Recipient, rankString: request.Value, role: role, reason: request.Reason); + _notificationsService.Add(notification); + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); + } else if (_commandRequestService.IsRequestRejected(request.id)) { + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } private async Task Loa(CommandRequest request) { - if (commandRequestService.IsRequestApproved(request.id)) { - await loaService.SetLoaState(request.value, LoaReviewState.APPROVED); - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); - } else if (commandRequestService.IsRequestRejected(request.id)) { - await loaService.SetLoaState(request.value, LoaReviewState.REJECTED); - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + if (_commandRequestService.IsRequestApproved(request.id)) { + await _loaService.SetLoaState(request.Value, LoaReviewState.APPROVED); + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); + } else if (_commandRequestService.IsRequestRejected(request.id)) { + await _loaService.SetLoaState(request.Value, LoaReviewState.REJECTED); + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } private async Task Discharge(CommandRequest request) { - if (commandRequestService.IsRequestApproved(request.id)) { - Account account = accountService.Data.GetSingle(request.recipient); + if (_commandRequestService.IsRequestApproved(request.id)) { + Account account = _accountService.Data.GetSingle(request.Recipient); Discharge discharge = new Discharge { rank = account.rank, unit = account.unitAssignment, role = account.roleAssignment, - dischargedBy = request.displayRequester, - reason = request.reason + dischargedBy = request.DisplayRequester, + reason = request.Reason }; - DischargeCollection dischargeCollection = dischargeService.Data.GetSingle(x => x.accountId == account.id); + DischargeCollection dischargeCollection = _dischargeService.Data.GetSingle(x => x.accountId == account.id); if (dischargeCollection == null) { dischargeCollection = new DischargeCollection {accountId = account.id, name = $"{account.lastname}.{account.firstname[0]}"}; dischargeCollection.discharges.Add(discharge); - await dischargeService.Data.Add(dischargeCollection); + await _dischargeService.Data.Add(dischargeCollection); } else { dischargeCollection.discharges.Add(discharge); - await dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, false)); - await dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.name, $"{account.lastname}.{account.firstname[0]}")); - await dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.discharges, dischargeCollection.discharges)); + await _dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, false)); + await _dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.name, $"{account.lastname}.{account.firstname[0]}")); + await _dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.discharges, dischargeCollection.discharges)); } - await accountService.Data.Update(account.id, nameof(account.membershipState), MembershipState.DISCHARGED); + await _accountService.Data.Update(account.id, nameof(account.membershipState), MembershipState.DISCHARGED); - Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, request.reason, "", AssignmentService.REMOVE_FLAG); - notificationsService.Add(notification); - await assignmentService.UnassignAllUnits(account.id); - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); - } else if (commandRequestService.IsRequestRejected(request.id)) { - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.id, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, request.Reason, "", AssignmentService.REMOVE_FLAG); + _notificationsService.Add(notification); + await _assignmentService.UnassignAllUnits(account.id); + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); + } else if (_commandRequestService.IsRequestRejected(request.id)) { + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } private async Task IndividualRole(CommandRequest request) { - if (commandRequestService.IsRequestApproved(request.id)) { - Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, role: request.value == "None" ? AssignmentService.REMOVE_FLAG : request.value, reason: request.reason); - notificationsService.Add(notification); - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); - } else if (commandRequestService.IsRequestRejected(request.id)) { - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + if (_commandRequestService.IsRequestApproved(request.id)) { + Notification notification = await _assignmentService.UpdateUnitRankAndRole(request.Recipient, role: request.Value == "None" ? AssignmentService.REMOVE_FLAG : request.Value, reason: request.Reason); + _notificationsService.Add(notification); + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); + } else if (_commandRequestService.IsRequestRejected(request.id)) { + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } private async Task UnitRole(CommandRequest request) { - if (commandRequestService.IsRequestApproved(request.id)) { - if (request.secondaryValue == "None") { - if (string.IsNullOrEmpty(request.value)) { - await assignmentService.UnassignAllUnitRoles(request.recipient); - notificationsService.Add(new Notification {owner = request.recipient, message = "You have been unassigned from all roles in all units", icon = NotificationIcons.DEMOTION}); + if (_commandRequestService.IsRequestApproved(request.id)) { + if (request.SecondaryValue == "None") { + if (string.IsNullOrEmpty(request.Value)) { + await _assignmentService.UnassignAllUnitRoles(request.Recipient); + _notificationsService.Add(new Notification {owner = request.Recipient, message = "You have been unassigned from all roles in all units", icon = NotificationIcons.DEMOTION}); } else { - string role = await assignmentService.UnassignUnitRole(request.recipient, request.value); - notificationsService.Add(new Notification {owner = request.recipient, message = $"You have been unassigned as {AvsAn.Query(role).Article} {role} in {unitsService.GetChainString(unitsService.Data.GetSingle(request.value))}", icon = NotificationIcons.DEMOTION}); + string role = await _assignmentService.UnassignUnitRole(request.Recipient, request.Value); + _notificationsService.Add(new Notification {owner = request.Recipient, message = $"You have been unassigned as {AvsAn.Query(role).Article} {role} in {_unitsService.GetChainString(_unitsService.Data.GetSingle(request.Value))}", icon = NotificationIcons.DEMOTION}); } } else { - await assignmentService.AssignUnitRole(request.recipient, request.value, request.secondaryValue); - notificationsService.Add( - new Notification {owner = request.recipient, message = $"You have been assigned as {AvsAn.Query(request.secondaryValue).Article} {request.secondaryValue} in {unitsService.GetChainString(unitsService.Data.GetSingle(request.value))}", icon = NotificationIcons.PROMOTION} + await _assignmentService.AssignUnitRole(request.Recipient, request.Value, request.SecondaryValue); + _notificationsService.Add( + new Notification {owner = request.Recipient, message = $"You have been assigned as {AvsAn.Query(request.SecondaryValue).Article} {request.SecondaryValue} in {_unitsService.GetChainString(_unitsService.Data.GetSingle(request.Value))}", icon = NotificationIcons.PROMOTION} ); } - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request approved for {request.displayRecipient} as {request.displayValue} in {request.value} because '{request.reason}'"); - } else if (commandRequestService.IsRequestRejected(request.id)) { - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} as {request.displayValue} in {request.value}"); + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} as {request.DisplayValue} in {request.Value} because '{request.Reason}'"); + } else if (_commandRequestService.IsRequestRejected(request.id)) { + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} as {request.DisplayValue} in {request.Value}"); } } private async Task UnitRemoval(CommandRequest request) { - if (commandRequestService.IsRequestApproved(request.id)) { - Unit unit = unitsService.Data.GetSingle(request.value); - await assignmentService.UnassignUnit(request.recipient, unit.id); - notificationsService.Add(new Notification {owner = request.recipient, message = $"You have been removed from {unitsService.GetChainString(unit)}", icon = NotificationIcons.DEMOTION}); - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} because '{request.reason}'"); - } else if (commandRequestService.IsRequestRejected(request.id)) { - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom}"); + if (_commandRequestService.IsRequestApproved(request.id)) { + Unit unit = _unitsService.Data.GetSingle(request.Value); + await _assignmentService.UnassignUnit(request.Recipient, unit.id); + _notificationsService.Add(new Notification {owner = request.Recipient, message = $"You have been removed from {_unitsService.GetChainString(unit)}", icon = NotificationIcons.DEMOTION}); + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} because '{request.Reason}'"); + } else if (_commandRequestService.IsRequestRejected(request.id)) { + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom}"); } } private async Task Transfer(CommandRequest request) { - if (commandRequestService.IsRequestApproved(request.id)) { - Unit unit = unitsService.Data.GetSingle(request.value); - Notification notification = await assignmentService.UpdateUnitRankAndRole(request.recipient, unit.name, reason: request.reason); - notificationsService.Add(notification); - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); - } else if (commandRequestService.IsRequestRejected(request.id)) { - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + if (_commandRequestService.IsRequestApproved(request.id)) { + Unit unit = _unitsService.Data.GetSingle(request.Value); + Notification notification = await _assignmentService.UpdateUnitRankAndRole(request.Recipient, unit.name, reason: request.Reason); + _notificationsService.Add(notification); + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); + } else if (_commandRequestService.IsRequestRejected(request.id)) { + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } private async Task Reinstate(CommandRequest request) { - if (commandRequestService.IsRequestApproved(request.id)) { - DischargeCollection dischargeCollection = dischargeService.Data.GetSingle(x => x.accountId == request.recipient); - await dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); - await accountService.Data.Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); - Notification notification = await assignmentService.UpdateUnitRankAndRole(dischargeCollection.accountId, "Basic Training Unit", "Trainee", "Recruit", "", "", "your membership was reinstated"); - notificationsService.Add(notification); - - logger.LogAudit($"{httpContextService.GetUserId()} reinstated {dischargeCollection.name}'s membership"); - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request approved for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); - } else if (commandRequestService.IsRequestRejected(request.id)) { - await commandRequestService.ArchiveRequest(request.id); - logger.LogAudit($"{request.type} request rejected for {request.displayRecipient} from {request.displayFrom} to {request.displayValue}"); + if (_commandRequestService.IsRequestApproved(request.id)) { + DischargeCollection dischargeCollection = _dischargeService.Data.GetSingle(x => x.accountId == request.Recipient); + await _dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); + await _accountService.Data.Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); + Notification notification = await _assignmentService.UpdateUnitRankAndRole(dischargeCollection.accountId, "Basic Training Unit", "Trainee", "Recruit", "", "", "your membership was reinstated"); + _notificationsService.Add(notification); + + _logger.LogAudit($"{_httpContextService.GetUserId()} reinstated {dischargeCollection.name}'s membership"); + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); + } else if (_commandRequestService.IsRequestRejected(request.id)) { + await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } private string HandleRecruitToPrivate(string id, string targetRank) { - Account account = accountService.Data.GetSingle(id); + Account account = _accountService.Data.GetSingle(id); return account.rank == "Recruit" && targetRank == "Private" ? "Rifleman" : account.roleAssignment; } } diff --git a/UKSF.Api.Command/Services/CommandRequestService.cs b/UKSF.Api.Command/Services/CommandRequestService.cs index 5ed0027a..e45b55e6 100644 --- a/UKSF.Api.Command/Services/CommandRequestService.cs +++ b/UKSF.Api.Command/Services/CommandRequestService.cs @@ -4,8 +4,8 @@ using System.Threading.Tasks; using AvsAnLib; using MongoDB.Driver; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Personnel.Models; @@ -24,16 +24,16 @@ public interface ICommandRequestService : IDataBackedService, ICommandRequestService { - private readonly IAccountService accountService; - private readonly IChainOfCommandService chainOfCommandService; - private readonly ICommandRequestDataService data; - private readonly ICommandRequestArchiveDataService dataArchive; - private readonly IDisplayNameService displayNameService; - private readonly INotificationsService notificationsService; - private readonly IRanksService ranksService; - private readonly ILogger logger; + private readonly IAccountService _accountService; + private readonly IChainOfCommandService _chainOfCommandService; + private readonly ICommandRequestDataService _data; + private readonly ICommandRequestArchiveDataService _dataArchive; + private readonly IDisplayNameService _displayNameService; + private readonly INotificationsService _notificationsService; + private readonly IRanksService _ranksService; + private readonly ILogger _logger; - private readonly IUnitsService unitsService; + private readonly IUnitsService _unitsService; public CommandRequestService( ICommandRequestDataService data, @@ -46,70 +46,70 @@ public CommandRequestService( IRanksService ranksService, ILogger logger ) : base(data) { - this.data = data; - this.dataArchive = dataArchive; - this.notificationsService = notificationsService; - - this.displayNameService = displayNameService; - this.accountService = accountService; - this.chainOfCommandService = chainOfCommandService; - this.unitsService = unitsService; - this.ranksService = ranksService; - this.logger = logger; + _data = data; + _dataArchive = dataArchive; + _notificationsService = notificationsService; + + _displayNameService = displayNameService; + _accountService = accountService; + _chainOfCommandService = chainOfCommandService; + _unitsService = unitsService; + _ranksService = ranksService; + _logger = logger; } public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE) { - Account requesterAccount = accountService.GetUserAccount(); - Account recipientAccount = accountService.Data.GetSingle(request.recipient); - request.displayRequester = displayNameService.GetDisplayName(requesterAccount); - request.displayRecipient = displayNameService.GetDisplayName(recipientAccount); - HashSet ids = chainOfCommandService.ResolveChain(mode, recipientAccount.id, unitsService.Data.GetSingle(x => x.name == recipientAccount.unitAssignment), unitsService.Data.GetSingle(request.value)); - if (ids.Count == 0) throw new Exception($"Failed to get any commanders for review for {request.type.ToLower()} request for {request.displayRecipient}.\nContact an admin"); - - List accounts = ids.Select(x => accountService.Data.GetSingle(x)).OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); + Account requesterAccount = _accountService.GetUserAccount(); + Account recipientAccount = _accountService.Data.GetSingle(request.Recipient); + request.DisplayRequester = _displayNameService.GetDisplayName(requesterAccount); + request.DisplayRecipient = _displayNameService.GetDisplayName(recipientAccount); + HashSet ids = _chainOfCommandService.ResolveChain(mode, recipientAccount.id, _unitsService.Data.GetSingle(x => x.name == recipientAccount.unitAssignment), _unitsService.Data.GetSingle(request.Value)); + if (ids.Count == 0) throw new Exception($"Failed to get any commanders for review for {request.Type.ToLower()} request for {request.DisplayRecipient}.\nContact an admin"); + + List accounts = ids.Select(x => _accountService.Data.GetSingle(x)).OrderBy(x => x.rank, new RankComparer(_ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); foreach (Account account in accounts) { - request.reviews.Add(account.id, ReviewState.PENDING); + request.Reviews.Add(account.id, ReviewState.PENDING); } - await data.Add(request); - logger.LogAudit($"{request.type} request created for {request.displayRecipient} from {request.displayFrom} to {request.displayValue} because '{request.reason}'"); - bool selfRequest = request.displayRequester == request.displayRecipient; - string notificationMessage = $"{request.displayRequester} requires your review on {(selfRequest ? "their" : AvsAn.Query(request.type).Article)} {request.type.ToLower()} request{(selfRequest ? "" : $" for {request.displayRecipient}")}"; + await _data.Add(request); + _logger.LogAudit($"{request.Type} request created for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); + bool selfRequest = request.DisplayRequester == request.DisplayRecipient; + string notificationMessage = $"{request.DisplayRequester} requires your review on {(selfRequest ? "their" : AvsAn.Query(request.Type).Article)} {request.Type.ToLower()} request{(selfRequest ? "" : $" for {request.DisplayRecipient}")}"; foreach (Account account in accounts.Where(x => x.id != requesterAccount.id)) { - notificationsService.Add(new Notification {owner = account.id, icon = NotificationIcons.REQUEST, message = notificationMessage, link = "/command/requests"}); + _notificationsService.Add(new Notification {owner = account.id, icon = NotificationIcons.REQUEST, message = notificationMessage, link = "/command/requests"}); } } public async Task ArchiveRequest(string id) { - CommandRequest request = data.GetSingle(id); - await dataArchive.Add(request); - await data.Delete(id); + CommandRequest request = _data.GetSingle(id); + await _dataArchive.Add(request); + await _data.Delete(id); } public async Task SetRequestReviewState(CommandRequest request, string reviewerId, ReviewState newState) { - await data.Update(request.id, Builders.Update.Set($"reviews.{reviewerId}", newState)); + await _data.Update(request.id, Builders.Update.Set($"reviews.{reviewerId}", newState)); } public async Task SetRequestAllReviewStates(CommandRequest request, ReviewState newState) { - List keys = new List(request.reviews.Keys); + List keys = new List(request.Reviews.Keys); foreach (string key in keys) { - request.reviews[key] = newState; + request.Reviews[key] = newState; } - await data.Update(request.id, Builders.Update.Set("reviews", request.reviews)); + await _data.Update(request.id, Builders.Update.Set("reviews", request.Reviews)); } public ReviewState GetReviewState(string id, string reviewer) { - CommandRequest request = data.GetSingle(id); - return request == null ? ReviewState.ERROR : !request.reviews.ContainsKey(reviewer) ? ReviewState.ERROR : request.reviews[reviewer]; + CommandRequest request = _data.GetSingle(id); + return request == null ? ReviewState.ERROR : !request.Reviews.ContainsKey(reviewer) ? ReviewState.ERROR : request.Reviews[reviewer]; } - public bool IsRequestApproved(string id) => data.GetSingle(id).reviews.All(x => x.Value == ReviewState.APPROVED); + public bool IsRequestApproved(string id) => _data.GetSingle(id).Reviews.All(x => x.Value == ReviewState.APPROVED); - public bool IsRequestRejected(string id) => data.GetSingle(id).reviews.Any(x => x.Value == ReviewState.REJECTED); + public bool IsRequestRejected(string id) => _data.GetSingle(id).Reviews.Any(x => x.Value == ReviewState.REJECTED); public bool DoesEquivalentRequestExist(CommandRequest request) { - return data.Get().Any(x => x.recipient == request.recipient && x.type == request.type && x.displayValue == request.displayValue && x.displayFrom == request.displayFrom); + return _data.Get().Any(x => x.Recipient == request.Recipient && x.Type == request.Type && x.DisplayValue == request.DisplayValue && x.DisplayFrom == request.DisplayFrom); } } } diff --git a/UKSF.Api.Personnel/Services/DischargeService.cs b/UKSF.Api.Command/Services/DischargeService.cs similarity index 70% rename from UKSF.Api.Personnel/Services/DischargeService.cs rename to UKSF.Api.Command/Services/DischargeService.cs index dfb1cd41..9caafb9e 100644 --- a/UKSF.Api.Personnel/Services/DischargeService.cs +++ b/UKSF.Api.Command/Services/DischargeService.cs @@ -1,7 +1,7 @@ -using UKSF.Api.Base.Services.Data; -using UKSF.Api.Personnel.Services.Data; +using UKSF.Api.Base.Context; +using UKSF.Api.Command.Context; -namespace UKSF.Api.Personnel.Services { +namespace UKSF.Api.Command.Services { public interface IDischargeService : IDataBackedService { } public class DischargeService : DataBackedService, IDischargeService { diff --git a/UKSF.Api.Personnel/Services/LoaService.cs b/UKSF.Api.Command/Services/LoaService.cs similarity index 72% rename from UKSF.Api.Personnel/Services/LoaService.cs rename to UKSF.Api.Command/Services/LoaService.cs index e934e09c..f959bb47 100644 --- a/UKSF.Api.Personnel/Services/LoaService.cs +++ b/UKSF.Api.Command/Services/LoaService.cs @@ -3,11 +3,12 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Base.Context; +using UKSF.Api.Command.Context; +using UKSF.Api.Command.Models; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services.Data; -namespace UKSF.Api.Personnel.Services { +namespace UKSF.Api.Command.Services { public interface ILoaService : IDataBackedService { IEnumerable Get(List ids); Task Add(CommandRequestLoa requestBase); @@ -25,12 +26,12 @@ public IEnumerable Get(List ids) { public async Task Add(CommandRequestLoa requestBase) { Loa loa = new Loa { submitted = DateTime.Now, - recipient = requestBase.recipient, - start = requestBase.start, - end = requestBase.end, - reason = requestBase.reason, - emergency = !string.IsNullOrEmpty(requestBase.emergency) && bool.Parse(requestBase.emergency), - late = !string.IsNullOrEmpty(requestBase.late) && bool.Parse(requestBase.late) + recipient = requestBase.Recipient, + start = requestBase.Start, + end = requestBase.End, + reason = requestBase.Reason, + emergency = !string.IsNullOrEmpty(requestBase.Emergency) && bool.Parse(requestBase.Emergency), + late = !string.IsNullOrEmpty(requestBase.Late) && bool.Parse(requestBase.Late) }; await Data.Add(loa); return loa.id; diff --git a/UKSF.Api.Command/Services/OperationOrderService.cs b/UKSF.Api.Command/Services/OperationOrderService.cs index 1b183c07..1d35fcbd 100644 --- a/UKSF.Api.Command/Services/OperationOrderService.cs +++ b/UKSF.Api.Command/Services/OperationOrderService.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Base.Context; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; @@ -13,11 +13,11 @@ public OperationOrderService(IOperationOrderDataService data) : base(data) { } public async Task Add(CreateOperationOrderRequest request) { Opord operation = new Opord { - name = request.name, - map = request.map, - start = request.start.AddHours((double) request.starttime / 100), - end = request.end.AddHours((double) request.endtime / 100), - type = request.type + Name = request.Name, + Map = request.Map, + Start = request.Start.AddHours((double) request.Starttime / 100), + End = request.End.AddHours((double) request.Endtime / 100), + Type = request.Type }; await Data.Add(operation); } diff --git a/UKSF.Api.Command/Services/OperationReportService.cs b/UKSF.Api.Command/Services/OperationReportService.cs index f326e4c4..d2373288 100644 --- a/UKSF.Api.Command/Services/OperationReportService.cs +++ b/UKSF.Api.Command/Services/OperationReportService.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Base.Context; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Personnel.Services; @@ -10,20 +10,20 @@ public interface IOperationReportService : IDataBackedService, IOperationReportService { - private readonly IAttendanceService attendanceService; + private readonly IAttendanceService _attendanceService; - public OperationReportService(IOperationReportDataService data, IAttendanceService attendanceService) : base(data) => this.attendanceService = attendanceService; + public OperationReportService(IOperationReportDataService data, IAttendanceService attendanceService) : base(data) => _attendanceService = attendanceService; public async Task Create(CreateOperationReportRequest request) { Oprep operation = new Oprep { - name = request.name, - map = request.map, - start = request.start.AddHours((double) request.starttime / 100), - end = request.end.AddHours((double) request.endtime / 100), - type = request.type, - result = request.result + Name = request.Name, + Map = request.Map, + Start = request.Start.AddHours((double) request.Starttime / 100), + End = request.End.AddHours((double) request.Endtime / 100), + Type = request.Type, + Result = request.Result }; - operation.attendanceReport = await attendanceService.GenerateAttendanceReport(operation.start, operation.end); + operation.AttendanceReport = await _attendanceService.GenerateAttendanceReport(operation.Start, operation.End); await Data.Add(operation); } } diff --git a/UKSF.Api.Integration.Instagram/ApiIntegrationInstagramExtensions.cs b/UKSF.Api.Integration.Instagram/ApiIntegrationInstagramExtensions.cs index 09858ba4..74448507 100644 --- a/UKSF.Api.Integration.Instagram/ApiIntegrationInstagramExtensions.cs +++ b/UKSF.Api.Integration.Instagram/ApiIntegrationInstagramExtensions.cs @@ -9,8 +9,8 @@ public static IServiceCollection AddUksfIntegrationInstagram(this IServiceCollec .AddEventBuses() .AddEventHandlers() .AddServices() - .AddTransient() - .AddTransient(); + .AddTransient() + .AddTransient(); private static IServiceCollection AddContexts(this IServiceCollection services) => services; diff --git a/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramImages.cs b/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramImages.cs new file mode 100644 index 00000000..3b82a420 --- /dev/null +++ b/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramImages.cs @@ -0,0 +1,37 @@ +using System; +using System.Threading.Tasks; +using UKSF.Api.Base.ScheduledActions; +using UKSF.Api.Base.Services; +using UKSF.Api.Integration.Instagram.Services; + +namespace UKSF.Api.Integration.Instagram.ScheduledActions { + public interface IActionInstagramImages : ISelfCreatingScheduledAction { } + + public class ActionInstagramImages : IActionInstagramImages { + public const string ACTION_NAME = nameof(ActionInstagramImages); + + private readonly IClock clock; + private readonly IInstagramService instagramService; + private readonly ISchedulerService schedulerService; + + public ActionInstagramImages(IInstagramService instagramService, ISchedulerService schedulerService, IClock clock) { + this.instagramService = instagramService; + this.schedulerService = schedulerService; + this.clock = clock; + } + + public string Name => ACTION_NAME; + + public void Run(params object[] parameters) { + Task unused = instagramService.CacheInstagramImages(); + } + + public async Task CreateSelf() { + if (schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + await schedulerService.CreateScheduledJob(clock.Today(), TimeSpan.FromMinutes(15), ACTION_NAME); + } + + Run(); + } + } +} diff --git a/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramToken.cs b/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramToken.cs new file mode 100644 index 00000000..e61d242c --- /dev/null +++ b/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramToken.cs @@ -0,0 +1,35 @@ +using System; +using System.Threading.Tasks; +using UKSF.Api.Base.ScheduledActions; +using UKSF.Api.Base.Services; +using UKSF.Api.Integration.Instagram.Services; + +namespace UKSF.Api.Integration.Instagram.ScheduledActions { + public interface IActionInstagramToken : ISelfCreatingScheduledAction { } + + public class ActionInstagramToken : IActionInstagramToken { + public const string ACTION_NAME = nameof(ActionInstagramToken); + + private readonly IClock clock; + private readonly IInstagramService instagramService; + private readonly ISchedulerService schedulerService; + + public ActionInstagramToken(IInstagramService instagramService, ISchedulerService schedulerService, IClock clock) { + this.instagramService = instagramService; + this.schedulerService = schedulerService; + this.clock = clock; + } + + public string Name => ACTION_NAME; + + public void Run(params object[] parameters) { + Task unused = instagramService.RefreshAccessToken(); + } + + public async Task CreateSelf() { + if (schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + await schedulerService.CreateScheduledJob(clock.Today().AddDays(45), TimeSpan.FromDays(45), ACTION_NAME); + } + } + } +} diff --git a/UKSF.Api.Integration.Instagram/ScheduledActions/InstagramImagesAction.cs b/UKSF.Api.Integration.Instagram/ScheduledActions/InstagramImagesAction.cs deleted file mode 100644 index e7813bed..00000000 --- a/UKSF.Api.Integration.Instagram/ScheduledActions/InstagramImagesAction.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Threading.Tasks; -using UKSF.Api.Integration.Instagram.Services; -using UKSF.Api.Utility.ScheduledActions; - -namespace UKSF.Api.Integration.Instagram.ScheduledActions { - public interface IInstagramImagesAction : IScheduledAction { } - - public class InstagramImagesAction : IInstagramImagesAction { - public const string ACTION_NAME = nameof(InstagramImagesAction); - - private readonly IInstagramService instagramService; - - public InstagramImagesAction(IInstagramService instagramService) => this.instagramService = instagramService; - - public string Name => ACTION_NAME; - - public void Run(params object[] parameters) { - Task unused = instagramService.CacheInstagramImages(); - } - } -} diff --git a/UKSF.Api.Integration.Instagram/ScheduledActions/InstagramTokenAction.cs b/UKSF.Api.Integration.Instagram/ScheduledActions/InstagramTokenAction.cs deleted file mode 100644 index 1ef1394d..00000000 --- a/UKSF.Api.Integration.Instagram/ScheduledActions/InstagramTokenAction.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Threading.Tasks; -using UKSF.Api.Integration.Instagram.Services; -using UKSF.Api.Utility.ScheduledActions; - -namespace UKSF.Api.Integration.Instagram.ScheduledActions { - public interface IInstagramTokenAction : IScheduledAction { } - - public class InstagramTokenAction : IInstagramTokenAction { - public const string ACTION_NAME = nameof(InstagramTokenAction); - - private readonly IInstagramService instagramService; - - public InstagramTokenAction(IInstagramService instagramService) => this.instagramService = instagramService; - - public string Name => ACTION_NAME; - - public void Run(params object[] parameters) { - Task unused = instagramService.RefreshAccessToken(); - } - } -} diff --git a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs index b852aa4d..85c25937 100644 --- a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs +++ b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs @@ -9,7 +9,7 @@ namespace UKSF.Api.Teamspeak { public static class ApiIntegrationTeamspeakExtensions { public static IServiceCollection AddUksfIntegrationTeamspeak(this IServiceCollection services) => - services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddTransient(); + services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddTransient(); private static IServiceCollection AddContexts(this IServiceCollection services) => services; diff --git a/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs b/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs new file mode 100644 index 00000000..fb0deb8e --- /dev/null +++ b/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs @@ -0,0 +1,35 @@ +using System; +using System.Threading.Tasks; +using UKSF.Api.Base.ScheduledActions; +using UKSF.Api.Base.Services; +using UKSF.Api.Teamspeak.Services; + +namespace UKSF.Api.Teamspeak.ScheduledActions { + public interface IActionTeamspeakSnapshot : ISelfCreatingScheduledAction { } + + public class ActionTeamspeakSnapshot : IActionTeamspeakSnapshot { + public const string ACTION_NAME = nameof(ActionTeamspeakSnapshot); + + private readonly IClock clock; + private readonly ISchedulerService schedulerService; + private readonly ITeamspeakService teamspeakService; + + public ActionTeamspeakSnapshot(ITeamspeakService teamspeakService, ISchedulerService schedulerService, IClock clock) { + this.teamspeakService = teamspeakService; + this.schedulerService = schedulerService; + this.clock = clock; + } + + public string Name => ACTION_NAME; + + public void Run(params object[] parameters) { + teamspeakService.StoreTeamspeakServerSnapshot(); + } + + public async Task CreateSelf() { + if (schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + await schedulerService.CreateScheduledJob(clock.Today().AddMinutes(5), TimeSpan.FromMinutes(5), ACTION_NAME); + } + } + } +} diff --git a/UKSF.Api.Integrations.Teamspeak/ScheduledActions/TeamspeakSnapshotAction.cs b/UKSF.Api.Integrations.Teamspeak/ScheduledActions/TeamspeakSnapshotAction.cs deleted file mode 100644 index edd2605c..00000000 --- a/UKSF.Api.Integrations.Teamspeak/ScheduledActions/TeamspeakSnapshotAction.cs +++ /dev/null @@ -1,20 +0,0 @@ -using UKSF.Api.Teamspeak.Services; -using UKSF.Api.Utility.ScheduledActions; - -namespace UKSF.Api.Teamspeak.ScheduledActions { - public interface ITeamspeakSnapshotAction : IScheduledAction { } - - public class TeamspeakSnapshotAction : ITeamspeakSnapshotAction { - public const string ACTION_NAME = nameof(TeamspeakSnapshotAction); - - private readonly ITeamspeakService teamspeakService; - - public TeamspeakSnapshotAction(ITeamspeakService teamspeakService) => this.teamspeakService = teamspeakService; - - public string Name => ACTION_NAME; - - public void Run(params object[] parameters) { - teamspeakService.StoreTeamspeakServerSnapshot(); - } - } -} diff --git a/UKSF.Api.Launcher/ApiLauncherExtensions.cs b/UKSF.Api.Launcher/ApiLauncherExtensions.cs index 0f7197d2..999f27be 100644 --- a/UKSF.Api.Launcher/ApiLauncherExtensions.cs +++ b/UKSF.Api.Launcher/ApiLauncherExtensions.cs @@ -9,7 +9,7 @@ namespace UKSF.Api.Launcher { public static class ApiLauncherExtensions { public static IServiceCollection AddUksfLauncher(this IServiceCollection services) => - services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddTransient(); + services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddTransient(); private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton(); diff --git a/UKSF.Api.Launcher/Context/LauncherFileDataService.cs b/UKSF.Api.Launcher/Context/LauncherFileDataService.cs index ab66df7e..8a5efe59 100644 --- a/UKSF.Api.Launcher/Context/LauncherFileDataService.cs +++ b/UKSF.Api.Launcher/Context/LauncherFileDataService.cs @@ -1,6 +1,5 @@ -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Launcher.Models; namespace UKSF.Api.Launcher.Context { diff --git a/UKSF.Api.Launcher/Controllers/LauncherController.cs b/UKSF.Api.Launcher/Controllers/LauncherController.cs index a20baf78..c2ecb3e8 100644 --- a/UKSF.Api.Launcher/Controllers/LauncherController.cs +++ b/UKSF.Api.Launcher/Controllers/LauncherController.cs @@ -6,9 +6,9 @@ using Microsoft.AspNetCore.SignalR; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Admin.Services.Data; using UKSF.Api.Base; using UKSF.Api.Base.Services; using UKSF.Api.Launcher.Models; diff --git a/UKSF.Api.Launcher/Services/LauncherFileService.cs b/UKSF.Api.Launcher/Services/LauncherFileService.cs index 0dfaa47d..3f36ef93 100644 --- a/UKSF.Api.Launcher/Services/LauncherFileService.cs +++ b/UKSF.Api.Launcher/Services/LauncherFileService.cs @@ -10,7 +10,7 @@ using MongoDB.Driver; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Base.Context; using UKSF.Api.Launcher.Context; using UKSF.Api.Launcher.Models; diff --git a/UKSF.Api.Modpack/ApiModpackExtensions.cs b/UKSF.Api.Modpack/ApiModpackExtensions.cs index e58f4efe..26bfd2bf 100644 --- a/UKSF.Api.Modpack/ApiModpackExtensions.cs +++ b/UKSF.Api.Modpack/ApiModpackExtensions.cs @@ -4,6 +4,7 @@ using UKSF.Api.Base.Events; using UKSF.Api.Modpack.EventHandlers; using UKSF.Api.Modpack.Models; +using UKSF.Api.Modpack.ScheduledActions; using UKSF.Api.Modpack.Services; using UKSF.Api.Modpack.Services.BuildProcess; using UKSF.Api.Modpack.Services.Data; @@ -12,7 +13,7 @@ namespace UKSF.Api.Modpack { public static class ApiModpackExtensions { public static IServiceCollection AddUksfModpack(this IServiceCollection services) => - services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddTransient(); + services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddActions().AddTransient(); private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton().AddSingleton(); @@ -30,6 +31,9 @@ private static IServiceCollection AddServices(this IServiceCollection services) .AddTransient() .AddTransient(); + private static IServiceCollection AddActions(this IServiceCollection services) => + services.AddSingleton(); + public static void AddUksfModpackSignalr(this IEndpointRouteBuilder builder) { builder.MapHub($"/hub/{BuildsHub.END_POINT}"); } diff --git a/UKSF.Api.Modpack/Controllers/GithubController.cs b/UKSF.Api.Modpack/Controllers/GithubController.cs index 7a9d0a59..1005cec3 100644 --- a/UKSF.Api.Modpack/Controllers/GithubController.cs +++ b/UKSF.Api.Modpack/Controllers/GithubController.cs @@ -18,14 +18,14 @@ public class GithubController : Controller { private const string MASTER = "refs/heads/master"; private const string RELEASE = "refs/heads/release"; - private readonly IGithubService githubService; - private readonly IModpackService modpackService; - private readonly IReleaseService releaseService; + private readonly IGithubService _githubService; + private readonly IModpackService _modpackService; + private readonly IReleaseService _releaseService; public GithubController(IModpackService modpackService, IGithubService githubService, IReleaseService releaseService) { - this.modpackService = modpackService; - this.githubService = githubService; - this.releaseService = releaseService; + _modpackService = modpackService; + _githubService = githubService; + _releaseService = releaseService; } [HttpPost] @@ -34,7 +34,7 @@ public async Task GithubWebhook( [FromHeader(Name = "x-github-event")] string githubEvent, [FromBody] JObject body ) { - if (!githubService.VerifySignature(githubSignature, body.ToString(Formatting.None))) { + if (!_githubService.VerifySignature(githubSignature, body.ToString(Formatting.None))) { return Unauthorized(); } @@ -45,23 +45,23 @@ [FromBody] JObject body switch (payload.Ref) { case MASTER when payload.BaseRef != RELEASE: { - await modpackService.CreateDevBuildFromPush(payload); + await _modpackService.CreateDevBuildFromPush(payload); return Ok(); } case RELEASE: - await modpackService.CreateRcBuildFromPush(payload); + await _modpackService.CreateRcBuildFromPush(payload); return Ok(); default: return Ok(); } } [HttpGet("branches"), Authorize, Permissions(Permissions.TESTER)] - public async Task GetBranches() => Ok(await githubService.GetBranches()); + public async Task GetBranches() => Ok(await _githubService.GetBranches()); [HttpGet("populatereleases"), Authorize, Permissions(Permissions.ADMIN)] public async Task Release() { - List releases = await githubService.GetHistoricReleases(); - await releaseService.AddHistoricReleases(releases); + List releases = await _githubService.GetHistoricReleases(); + await _releaseService.AddHistoricReleases(releases); return Ok(); } } diff --git a/UKSF.Api.Modpack/Controllers/IssueController.cs b/UKSF.Api.Modpack/Controllers/IssueController.cs index ce717e96..d389db5f 100644 --- a/UKSF.Api.Modpack/Controllers/IssueController.cs +++ b/UKSF.Api.Modpack/Controllers/IssueController.cs @@ -15,25 +15,25 @@ namespace UKSF.Api.Modpack.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] public class IssueController : Controller { - private readonly IDisplayNameService displayNameService; - private readonly IEmailService emailService; - private readonly IHttpContextService httpContextService; - private readonly string githubToken; + private readonly IDisplayNameService _displayNameService; + private readonly IEmailService _emailService; + private readonly IHttpContextService _httpContextService; + private readonly string _githubToken; public IssueController(IDisplayNameService displayNameService, IEmailService emailService, IConfiguration configuration, IHttpContextService httpContextService) { - this.displayNameService = displayNameService; - this.emailService = emailService; - this.httpContextService = httpContextService; - githubToken = configuration.GetSection("Github")["token"]; + _displayNameService = displayNameService; + _emailService = emailService; + _httpContextService = httpContextService; + _githubToken = configuration.GetSection("Github")["token"]; } [HttpPut, Authorize] public async Task CreateIssue([FromQuery] int type, [FromBody] JObject data) { string title = data["title"].ToString(); string body = data["body"].ToString(); - string user = displayNameService.GetDisplayName(httpContextService.GetUserId()); + string user = _displayNameService.GetDisplayName(_httpContextService.GetUserId()); body += $"\n\n---\n_**Submitted by:** {user}_"; string issueUrl; @@ -41,12 +41,12 @@ public async Task CreateIssue([FromQuery] int type, [FromBody] JO using HttpClient client = new HttpClient(); StringContent content = new StringContent(JsonConvert.SerializeObject(new {title, body}), Encoding.UTF8, "application/vnd.github.v3.full+json"); string url = type == 0 ? "https://api.github.com/repos/uksf/website-issues/issues" : "https://api.github.com/repos/uksf/modpack/issues"; - client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("token", githubToken); + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("token", _githubToken); client.DefaultRequestHeaders.UserAgent.ParseAdd(user); HttpResponseMessage response = await client.PostAsync(url, content); string result = await response.Content.ReadAsStringAsync(); issueUrl = JObject.Parse(result)["html_url"].ToString(); - emailService.SendEmail("contact.tim.here@gmail.com", "New Issue Created", $"New {(type == 0 ? "website" : "modpack")} issue reported by {user}\n\n{issueUrl}"); + _emailService.SendEmail("contact.tim.here@gmail.com", "New Issue Created", $"New {(type == 0 ? "website" : "modpack")} issue reported by {user}\n\n{issueUrl}"); } catch (Exception) { return BadRequest(); } diff --git a/UKSF.Api.Modpack/Controllers/ModpackController.cs b/UKSF.Api.Modpack/Controllers/ModpackController.cs index 39b1cc18..15347844 100644 --- a/UKSF.Api.Modpack/Controllers/ModpackController.cs +++ b/UKSF.Api.Modpack/Controllers/ModpackController.cs @@ -9,38 +9,38 @@ namespace UKSF.Api.Modpack.Controllers { [Route("[controller]")] public class ModpackController : Controller { - private readonly IGithubService githubService; - private readonly IModpackService modpackService; + private readonly IGithubService _githubService; + private readonly IModpackService _modpackService; public ModpackController(IModpackService modpackService, IGithubService githubService) { - this.modpackService = modpackService; - this.githubService = githubService; + _modpackService = modpackService; + _githubService = githubService; } [HttpGet("releases"), Authorize, Permissions(Permissions.MEMBER)] - public IEnumerable GetReleases() => modpackService.GetReleases(); + public IEnumerable GetReleases() => _modpackService.GetReleases(); [HttpGet("rcs"), Authorize, Permissions(Permissions.MEMBER)] - public IEnumerable GetReleaseCandidates() => modpackService.GetRcBuilds(); + public IEnumerable GetReleaseCandidates() => _modpackService.GetRcBuilds(); [HttpGet("builds"), Authorize, Permissions(Permissions.MEMBER)] - public IEnumerable GetBuilds() => modpackService.GetDevBuilds(); + public IEnumerable GetBuilds() => _modpackService.GetDevBuilds(); [HttpGet("builds/{id}"), Authorize, Permissions(Permissions.MEMBER)] public IActionResult GetBuild(string id) { - ModpackBuild build = modpackService.GetBuild(id); + ModpackBuild build = _modpackService.GetBuild(id); return build == null ? (IActionResult) BadRequest("Build does not exist") : Ok(build); } [HttpGet("builds/{id}/step/{index}"), Authorize, Permissions(Permissions.MEMBER)] public IActionResult GetBuildStep(string id, int index) { - ModpackBuild build = modpackService.GetBuild(id); + ModpackBuild build = _modpackService.GetBuild(id); if (build == null) { return BadRequest("Build does not exist"); } - if (build.steps.Count > index) { - return Ok(build.steps[index]); + if (build.Steps.Count > index) { + return Ok(build.Steps[index]); } return BadRequest("Build step does not exist"); @@ -48,55 +48,55 @@ public IActionResult GetBuildStep(string id, int index) { [HttpGet("builds/{id}/rebuild"), Authorize, Permissions(Permissions.ADMIN)] public async Task Rebuild(string id) { - ModpackBuild build = modpackService.GetBuild(id); + ModpackBuild build = _modpackService.GetBuild(id); if (build == null) { return BadRequest("Build does not exist"); } - await modpackService.Rebuild(build); + await _modpackService.Rebuild(build); return Ok(); } [HttpGet("builds/{id}/cancel"), Authorize, Permissions(Permissions.ADMIN)] public async Task CancelBuild(string id) { - ModpackBuild build = modpackService.GetBuild(id); + ModpackBuild build = _modpackService.GetBuild(id); if (build == null) { return BadRequest("Build does not exist"); } - await modpackService.CancelBuild(build); + await _modpackService.CancelBuild(build); return Ok(); } [HttpPatch("release/{version}"), Authorize, Permissions(Permissions.ADMIN)] public async Task UpdateRelease(string version, [FromBody] ModpackRelease release) { - if (!release.isDraft) { + if (!release.IsDraft) { return BadRequest($"Release {version} is not a draft"); } - await modpackService.UpdateReleaseDraft(release); + await _modpackService.UpdateReleaseDraft(release); return Ok(); } [HttpGet("release/{version}"), Authorize, Permissions(Permissions.ADMIN)] public async Task Release(string version) { - await modpackService.Release(version); + await _modpackService.Release(version); return Ok(); } [HttpGet("release/{version}/changelog"), Authorize, Permissions(Permissions.ADMIN)] public async Task RegenerateChangelog(string version) { - await modpackService.RegnerateReleaseDraftChangelog(version); - return Ok(modpackService.GetRelease(version)); + await _modpackService.RegnerateReleaseDraftChangelog(version); + return Ok(_modpackService.GetRelease(version)); } [HttpPost("newbuild"), Authorize, Permissions(Permissions.TESTER)] public async Task NewBuild([FromBody] NewBuild newBuild) { - if (!await githubService.IsReferenceValid(newBuild.reference)) { - return BadRequest($"{newBuild.reference} cannot be built as its version does not have the required make files"); + if (!await _githubService.IsReferenceValid(newBuild.Reference)) { + return BadRequest($"{newBuild.Reference} cannot be built as its version does not have the required make files"); } - await modpackService.NewBuild(newBuild); + await _modpackService.NewBuild(newBuild); return Ok(); } } diff --git a/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs b/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs index 2606222c..a7f50007 100644 --- a/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs +++ b/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs @@ -13,18 +13,18 @@ namespace UKSF.Api.Modpack.EventHandlers { public interface IBuildsEventHandler : IEventHandler { } public class BuildsEventHandler : IBuildsEventHandler { - private readonly IDataEventBus modpackBuildEventBus; - private readonly IHubContext hub; - private readonly ILogger logger; + private readonly IDataEventBus _modpackBuildEventBus; + private readonly IHubContext _hub; + private readonly ILogger _logger; public BuildsEventHandler(IDataEventBus modpackBuildEventBus, IHubContext hub, ILogger logger) { - this.modpackBuildEventBus = modpackBuildEventBus; - this.hub = hub; - this.logger = logger; + _modpackBuildEventBus = modpackBuildEventBus; + _hub = hub; + _logger = logger; } public void Init() { - modpackBuildEventBus.AsObservable().SubscribeWithAsyncNext(HandleBuildEvent, exception => logger.LogError(exception)); + _modpackBuildEventBus.AsObservable().SubscribeWithAsyncNext(HandleBuildEvent, exception => _logger.LogError(exception)); } private async Task HandleBuildEvent(DataEventModel dataEventModel) { @@ -43,25 +43,25 @@ private async Task HandleBuildEvent(DataEventModel dataEventModel) } private async Task AddedEvent(ModpackBuild build) { - if (build.environment == GameEnvironment.DEV) { - await hub.Clients.All.ReceiveBuild(build); + if (build.Environment == GameEnvironment.DEV) { + await _hub.Clients.All.ReceiveBuild(build); } else { - await hub.Clients.All.ReceiveReleaseCandidateBuild(build); + await _hub.Clients.All.ReceiveReleaseCandidateBuild(build); } } private async Task UpdatedEvent(string id, object data) { switch (data) { case ModpackBuild build: - if (build.environment == GameEnvironment.DEV) { - await hub.Clients.All.ReceiveBuild(build); + if (build.Environment == GameEnvironment.DEV) { + await _hub.Clients.All.ReceiveBuild(build); } else { - await hub.Clients.All.ReceiveReleaseCandidateBuild(build); + await _hub.Clients.All.ReceiveReleaseCandidateBuild(build); } break; case ModpackBuildStep step: - await hub.Clients.Group(id).ReceiveBuildStep(step); + await _hub.Clients.Group(id).ReceiveBuildStep(step); break; } } diff --git a/UKSF.Api.Modpack/Models/GithubCommit.cs b/UKSF.Api.Modpack/Models/GithubCommit.cs index 31e1192c..aa99663b 100644 --- a/UKSF.Api.Modpack/Models/GithubCommit.cs +++ b/UKSF.Api.Modpack/Models/GithubCommit.cs @@ -1,10 +1,10 @@ namespace UKSF.Api.Modpack.Models { public class GithubCommit { - public string after; - public string baseBranch; - public string before; - public string branch; - public string message; - public string author; + public string After; + public string BaseBranch; + public string Before; + public string Branch; + public string Message; + public string Author; } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuild.cs b/UKSF.Api.Modpack/Models/ModpackBuild.cs index 838c5c45..0e5a57de 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuild.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuild.cs @@ -7,18 +7,18 @@ namespace UKSF.Api.Modpack.Models { public class ModpackBuild : DatabaseObject { - [BsonRepresentation(BsonType.ObjectId)] public string builderId; - public int buildNumber; - public ModpackBuildResult buildResult = ModpackBuildResult.NONE; - public GithubCommit commit; - public bool finished; - public bool isRebuild; - public GameEnvironment environment; - public bool running; - public List steps = new List(); - public DateTime startTime = DateTime.Now; - public DateTime endTime = DateTime.Now; - public string version; - public Dictionary environmentVariables = new Dictionary(); + [BsonRepresentation(BsonType.ObjectId)] public string BuilderId; + public int BuildNumber; + public ModpackBuildResult BuildResult = ModpackBuildResult.NONE; + public GithubCommit Commit; + public bool Finished; + public bool IsRebuild; + public GameEnvironment Environment; + public bool Running; + public List Steps = new List(); + public DateTime StartTime = DateTime.Now; + public DateTime EndTime = DateTime.Now; + public string Version; + public Dictionary EnvironmentVariables = new Dictionary(); } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs b/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs index 50c352b5..8f4010b2 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs @@ -1,6 +1,6 @@ namespace UKSF.Api.Modpack.Models { public class ModpackBuildQueueItem { - public string id; - public ModpackBuild build; + public string Id; + public ModpackBuild Build; } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildStep.cs b/UKSF.Api.Modpack/Models/ModpackBuildStep.cs index 4407bc37..f2e38d0f 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildStep.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildStep.cs @@ -4,15 +4,15 @@ namespace UKSF.Api.Modpack.Models { public class ModpackBuildStep { - public ModpackBuildResult buildResult = ModpackBuildResult.NONE; - public DateTime endTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); - public bool finished; - public int index; - public List logs = new List(); - public string name; - public bool running; - public DateTime startTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); + public ModpackBuildResult BuildResult = ModpackBuildResult.NONE; + public DateTime EndTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); + public bool Finished; + public int Index; + public List Logs = new List(); + public string Name; + public bool Running; + public DateTime StartTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); - public ModpackBuildStep(string name) => this.name = name; + public ModpackBuildStep(string name) => Name = name; } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs b/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs index 9ebd357c..cda499d7 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs @@ -2,12 +2,12 @@ namespace UKSF.Api.Modpack.Models { public class ModpackBuildStepLogItem { - public string text; - public string colour; + public string Text; + public string Colour; } public class ModpackBuildStepLogItemUpdate { - public bool inline; - public List logs; + public bool Inline; + public List Logs; } } diff --git a/UKSF.Api.Modpack/Models/ModpackRelease.cs b/UKSF.Api.Modpack/Models/ModpackRelease.cs index a0717d8b..f9db9146 100644 --- a/UKSF.Api.Modpack/Models/ModpackRelease.cs +++ b/UKSF.Api.Modpack/Models/ModpackRelease.cs @@ -5,11 +5,11 @@ namespace UKSF.Api.Modpack.Models { public class ModpackRelease : DatabaseObject { - public string changelog; - [BsonRepresentation(BsonType.ObjectId)] public string creatorId; - public string description; - public bool isDraft; - public DateTime timestamp; - public string version; + public string Changelog; + [BsonRepresentation(BsonType.ObjectId)] public string CreatorId; + public string Description; + public bool IsDraft; + public DateTime Timestamp; + public string Version; } } diff --git a/UKSF.Api.Modpack/Models/NewBuild.cs b/UKSF.Api.Modpack/Models/NewBuild.cs index e7cc94c0..9bba6075 100644 --- a/UKSF.Api.Modpack/Models/NewBuild.cs +++ b/UKSF.Api.Modpack/Models/NewBuild.cs @@ -1,8 +1,8 @@ namespace UKSF.Api.Modpack.Models { public class NewBuild { - public string reference; - public bool ace; - public bool acre; - public bool f35; + public string Reference; + public bool Ace; + public bool Acre; + public bool F35; } } diff --git a/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs b/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs new file mode 100644 index 00000000..af56ba81 --- /dev/null +++ b/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs @@ -0,0 +1,44 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Base.Context; +using UKSF.Api.Base.ScheduledActions; +using UKSF.Api.Base.Services; +using UKSF.Api.Modpack.Models; + +namespace UKSF.Api.Modpack.ScheduledActions { + public interface IActionPruneBuilds : ISelfCreatingScheduledAction { } + + public class ActionPruneBuilds : IActionPruneBuilds { + public const string ACTION_NAME = nameof(ActionPruneBuilds); + + private readonly IClock _clock; + private readonly IDataCollectionFactory _dataCollectionFactory; + private readonly ISchedulerService _schedulerService; + + public ActionPruneBuilds(IDataCollectionFactory dataCollectionFactory, ISchedulerService schedulerService, IClock clock) { + _dataCollectionFactory = dataCollectionFactory; + _schedulerService = schedulerService; + _clock = clock; + } + + public string Name => ACTION_NAME; + + public void Run(params object[] parameters) { + DateTime now = DateTime.Now; + + IDataCollection buildsData = _dataCollectionFactory.CreateDataCollection("modpackBuilds"); + int threshold = buildsData.Get(x => x.Environment == GameEnvironment.DEV).Select(x => x.BuildNumber).OrderByDescending(x => x).First() - 100; + Task modpackBuildsTask = buildsData.DeleteManyAsync(x => x.BuildNumber < threshold); + + Task.WaitAll(modpackBuildsTask); + } + + public async Task CreateSelf() { + if (_schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); + } + } + } +} diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs index cca17536..f6e97c37 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs @@ -8,21 +8,21 @@ namespace UKSF.Api.Modpack.Services.BuildProcess { public class BuildProcessHelper { - private readonly CancellationTokenSource cancellationTokenSource; - private readonly CancellationTokenSource errorCancellationTokenSource = new CancellationTokenSource(); - private readonly List errorExclusions; - private readonly bool errorSilently; - private readonly AutoResetEvent errorWaitHandle = new AutoResetEvent(false); - private readonly string ignoreErrorGateClose; - private readonly string ignoreErrorGateOpen; - private readonly IStepLogger logger; - private readonly AutoResetEvent outputWaitHandle = new AutoResetEvent(false); - private readonly bool raiseErrors; - private readonly List results = new List(); - private readonly bool suppressOutput; - private Exception capturedException; - private bool ignoreErrors; - private Process process; + private readonly CancellationTokenSource _cancellationTokenSource; + private readonly CancellationTokenSource _errorCancellationTokenSource = new CancellationTokenSource(); + private readonly List _errorExclusions; + private readonly bool _errorSilently; + private readonly AutoResetEvent _errorWaitHandle = new AutoResetEvent(false); + private readonly string _ignoreErrorGateClose; + private readonly string _ignoreErrorGateOpen; + private readonly IStepLogger _logger; + private readonly AutoResetEvent _outputWaitHandle = new AutoResetEvent(false); + private readonly bool _raiseErrors; + private readonly List _results = new List(); + private readonly bool _suppressOutput; + private Exception _capturedException; + private bool _ignoreErrors; + private Process _process; public BuildProcessHelper( IStepLogger logger, @@ -34,18 +34,18 @@ public BuildProcessHelper( string ignoreErrorGateClose = "", string ignoreErrorGateOpen = "" ) { - this.logger = logger; - this.cancellationTokenSource = cancellationTokenSource; - this.suppressOutput = suppressOutput; - this.raiseErrors = raiseErrors; - this.errorSilently = errorSilently; - this.errorExclusions = errorExclusions; - this.ignoreErrorGateClose = ignoreErrorGateClose; - this.ignoreErrorGateOpen = ignoreErrorGateOpen; + _logger = logger; + _cancellationTokenSource = cancellationTokenSource; + _suppressOutput = suppressOutput; + _raiseErrors = raiseErrors; + _errorSilently = errorSilently; + _errorExclusions = errorExclusions; + _ignoreErrorGateClose = ignoreErrorGateClose; + _ignoreErrorGateOpen = ignoreErrorGateOpen; } public List Run(string workingDirectory, string executable, string args, int timeout) { - process = new Process { + _process = new Process { StartInfo = { FileName = executable, WorkingDirectory = workingDirectory, @@ -58,34 +58,34 @@ public List Run(string workingDirectory, string executable, string args, EnableRaisingEvents = false }; - process.OutputDataReceived += OnOutputDataReceived; - process.ErrorDataReceived += OnErrorDataReceived; + _process.OutputDataReceived += OnOutputDataReceived; + _process.ErrorDataReceived += OnErrorDataReceived; - using CancellationTokenRegistration unused = cancellationTokenSource.Token.Register(process.Kill); - using CancellationTokenRegistration _ = errorCancellationTokenSource.Token.Register(process.Kill); + using CancellationTokenRegistration unused = _cancellationTokenSource.Token.Register(_process.Kill); + using CancellationTokenRegistration _ = _errorCancellationTokenSource.Token.Register(_process.Kill); - process.Start(); - process.BeginOutputReadLine(); - process.BeginErrorReadLine(); + _process.Start(); + _process.BeginOutputReadLine(); + _process.BeginErrorReadLine(); - if (process.WaitForExit(timeout) && outputWaitHandle.WaitOne(timeout) && errorWaitHandle.WaitOne(timeout)) { - if (cancellationTokenSource.IsCancellationRequested) { - return results; + if (_process.WaitForExit(timeout) && _outputWaitHandle.WaitOne(timeout) && _errorWaitHandle.WaitOne(timeout)) { + if (_cancellationTokenSource.IsCancellationRequested) { + return _results; } - if (capturedException != null) { - if (raiseErrors) { - throw capturedException; + if (_capturedException != null) { + if (_raiseErrors) { + throw _capturedException; } - if (!errorSilently) { - logger.LogError(capturedException); + if (!_errorSilently) { + _logger.LogError(_capturedException); } } - if (raiseErrors && process.ExitCode != 0) { + if (_raiseErrors && _process.ExitCode != 0) { string json = ""; - List> messages = ExtractMessages(results.Last(), ref json); + List> messages = ExtractMessages(_results.Last(), ref json); if (messages.Any()) { throw new Exception(messages.First().Item1); } @@ -94,71 +94,71 @@ public List Run(string workingDirectory, string executable, string args, } } else { // Timeout or cancelled - if (!cancellationTokenSource.IsCancellationRequested) { - Exception exception = new Exception($"Process exited with non-zero code ({process.ExitCode})"); - if (raiseErrors) { + if (!_cancellationTokenSource.IsCancellationRequested) { + Exception exception = new Exception($"Process exited with non-zero code ({_process.ExitCode})"); + if (_raiseErrors) { throw exception; } - if (!errorSilently) { - logger.LogError(exception); + if (!_errorSilently) { + _logger.LogError(exception); } } } - return results; + return _results; } private void OnOutputDataReceived(object sender, DataReceivedEventArgs receivedEventArgs) { if (receivedEventArgs.Data == null) { - outputWaitHandle.Set(); + _outputWaitHandle.Set(); return; } string message = receivedEventArgs.Data; if (!string.IsNullOrEmpty(message)) { - results.Add(message); + _results.Add(message); } - if (!suppressOutput) { + if (!_suppressOutput) { string json = ""; try { List> messages = ExtractMessages(message, ref json); foreach ((string text, string colour) in messages) { - logger.Log(text, colour); + _logger.Log(text, colour); } } catch (Exception exception) { - capturedException = new Exception($"Json failed: {json}\n\n{exception}"); - errorCancellationTokenSource.Cancel(); + _capturedException = new Exception($"Json failed: {json}\n\n{exception}"); + _errorCancellationTokenSource.Cancel(); } } } private void OnErrorDataReceived(object sender, DataReceivedEventArgs receivedEventArgs) { if (receivedEventArgs.Data == null) { - errorWaitHandle.Set(); + _errorWaitHandle.Set(); return; } string message = receivedEventArgs.Data; if (string.IsNullOrEmpty(message) || CheckIgnoreErrorGates(message)) return; - if (errorExclusions != null && errorExclusions.Any(x => message.ContainsIgnoreCase(x))) return; + if (_errorExclusions != null && _errorExclusions.Any(x => message.ContainsIgnoreCase(x))) return; - capturedException = new Exception(message); - errorCancellationTokenSource.Cancel(); + _capturedException = new Exception(message); + _errorCancellationTokenSource.Cancel(); } private bool CheckIgnoreErrorGates(string message) { - if (message.ContainsIgnoreCase(ignoreErrorGateClose)) { - ignoreErrors = false; + if (message.ContainsIgnoreCase(_ignoreErrorGateClose)) { + _ignoreErrors = false; return true; } - if (ignoreErrors) return true; + if (_ignoreErrors) return true; - if (message.ContainsIgnoreCase(ignoreErrorGateOpen)) { - ignoreErrors = true; + if (message.ContainsIgnoreCase(_ignoreErrorGateOpen)) { + _ignoreErrors = true; return true; } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs index 5ca76779..ff775c7b 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs @@ -15,35 +15,35 @@ public interface IBuildProcessorService { } public class BuildProcessorService : IBuildProcessorService { - private readonly IBuildsService buildsService; - private readonly IBuildStepService buildStepService; - private readonly IVariablesService variablesService; - private readonly ILogger logger; + private readonly IBuildsService _buildsService; + private readonly IServiceProvider _serviceProvider; + private readonly IBuildStepService _buildStepService; + private readonly ILogger _logger; - public BuildProcessorService(IBuildStepService buildStepService, IBuildsService buildsService, IVariablesService variablesService, ILogger logger) { - this.buildStepService = buildStepService; - this.buildsService = buildsService; - this.variablesService = variablesService; - this.logger = logger; + public BuildProcessorService(IServiceProvider serviceProvider, IBuildStepService buildStepService, IBuildsService buildsService, ILogger logger) { + _serviceProvider = serviceProvider; + _buildStepService = buildStepService; + _buildsService = buildsService; + _logger = logger; } public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cancellationTokenSource) { - await buildsService.SetBuildRunning(build); + await _buildsService.SetBuildRunning(build); - foreach (ModpackBuildStep buildStep in build.steps) { - IBuildStep step = buildStepService.ResolveBuildStep(buildStep.name); + foreach (ModpackBuildStep buildStep in build.Steps) { + IBuildStep step = _buildStepService.ResolveBuildStep(buildStep.Name); step.Init( + _serviceProvider, build, buildStep, - async updateDefinition => await buildsService.UpdateBuild(build, updateDefinition), - async () => await buildsService.UpdateBuildStep(build, buildStep), - cancellationTokenSource, - variablesService + async updateDefinition => await _buildsService.UpdateBuild(build, updateDefinition), + async () => await _buildsService.UpdateBuildStep(build, buildStep), + cancellationTokenSource ); if (cancellationTokenSource.IsCancellationRequested) { await step.Cancel(); - await buildsService.CancelBuild(build); + await _buildsService.CancelBuild(build); return; } @@ -60,43 +60,43 @@ public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cance } catch (OperationCanceledException) { await step.Cancel(); await ProcessRestore(step, build); - await buildsService.CancelBuild(build); + await _buildsService.CancelBuild(build); return; } catch (Exception exception) { await step.Fail(exception); await ProcessRestore(step, build); - await buildsService.FailBuild(build); + await _buildsService.FailBuild(build); return; } } - await buildsService.SucceedBuild(build); + await _buildsService.SucceedBuild(build); } private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) { - logger.LogInfo($"Attempting to restore repo prior to {build.version}"); - if (build.environment != GameEnvironment.RELEASE || runningStep is BuildStepClean || runningStep is BuildStepBackup) { + _logger.LogInfo($"Attempting to restore repo prior to {build.Version}"); + if (build.Environment != GameEnvironment.RELEASE || runningStep is BuildStepClean || runningStep is BuildStepBackup) { return; } - ModpackBuildStep restoreStep = buildStepService.GetRestoreStepForRelease(); + ModpackBuildStep restoreStep = _buildStepService.GetRestoreStepForRelease(); if (restoreStep == null) { - logger.LogError("Restore step expected but not found. Won't restore"); + _logger.LogError("Restore step expected but not found. Won't restore"); return; } - restoreStep.index = build.steps.Count; - IBuildStep step = buildStepService.ResolveBuildStep(restoreStep.name); + restoreStep.Index = build.Steps.Count; + IBuildStep step = _buildStepService.ResolveBuildStep(restoreStep.Name); step.Init( + _serviceProvider, build, restoreStep, - async updateDefinition => await buildsService.UpdateBuild(build, updateDefinition), - async () => await buildsService.UpdateBuildStep(build, restoreStep), - new CancellationTokenSource(), - variablesService + async updateDefinition => await _buildsService.UpdateBuild(build, updateDefinition), + async () => await _buildsService.UpdateBuildStep(build, restoreStep), + new CancellationTokenSource() ); - build.steps.Add(restoreStep); - await buildsService.UpdateBuildStep(build, restoreStep); + build.Steps.Add(restoreStep); + await _buildsService.UpdateBuildStep(build, restoreStep); try { await step.Start(); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs index 3c368436..91727321 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs @@ -16,31 +16,31 @@ public interface IBuildQueueService { } public class BuildQueueService : IBuildQueueService { - private readonly IBuildProcessorService buildProcessorService; - private readonly ConcurrentDictionary buildTasks = new ConcurrentDictionary(); - private readonly ConcurrentDictionary cancellationTokenSources = new ConcurrentDictionary(); - private readonly IGameServersService gameServersService; - private readonly ILogger logger; - private ConcurrentQueue queue = new ConcurrentQueue(); - private bool processing; + private readonly IBuildProcessorService _buildProcessorService; + private readonly ConcurrentDictionary _buildTasks = new ConcurrentDictionary(); + private readonly ConcurrentDictionary _cancellationTokenSources = new ConcurrentDictionary(); + private readonly IGameServersService _gameServersService; + private readonly ILogger _logger; + private ConcurrentQueue _queue = new ConcurrentQueue(); + private bool _processing; public BuildQueueService(IBuildProcessorService buildProcessorService, IGameServersService gameServersService, ILogger logger) { - this.buildProcessorService = buildProcessorService; - this.gameServersService = gameServersService; - this.logger = logger; + _buildProcessorService = buildProcessorService; + _gameServersService = gameServersService; + _logger = logger; } public void QueueBuild(ModpackBuild build) { - queue.Enqueue(build); - if (!processing) { + _queue.Enqueue(build); + if (!_processing) { // Processor not running, process as separate task _ = ProcessQueue(); } } public bool CancelQueued(string id) { - if (queue.Any(x => x.id == id)) { - queue = new ConcurrentQueue(queue.Where(x => x.id != id)); + if (_queue.Any(x => x.id == id)) { + _queue = new ConcurrentQueue(_queue.Where(x => x.id != id)); return true; } @@ -48,23 +48,23 @@ public bool CancelQueued(string id) { } public void Cancel(string id) { - if (cancellationTokenSources.ContainsKey(id)) { - CancellationTokenSource cancellationTokenSource = cancellationTokenSources[id]; + if (_cancellationTokenSources.ContainsKey(id)) { + CancellationTokenSource cancellationTokenSource = _cancellationTokenSources[id]; cancellationTokenSource.Cancel(); - cancellationTokenSources.TryRemove(id, out CancellationTokenSource _); + _cancellationTokenSources.TryRemove(id, out CancellationTokenSource _); } - if (buildTasks.ContainsKey(id)) { + if (_buildTasks.ContainsKey(id)) { _ = Task.Run( async () => { await Task.Delay(TimeSpan.FromMinutes(1)); - if (buildTasks.ContainsKey(id)) { - Task buildTask = buildTasks[id]; + if (_buildTasks.ContainsKey(id)) { + Task buildTask = _buildTasks[id]; if (buildTask.IsCompleted) { - buildTasks.TryRemove(id, out Task _); + _buildTasks.TryRemove(id, out Task _); } else { - logger.LogWarning($"Build {id} was cancelled but has not completed within 1 minute of cancelling"); + _logger.LogWarning($"Build {id} was cancelled but has not completed within 1 minute of cancelling"); } } } @@ -73,35 +73,35 @@ public void Cancel(string id) { } public void CancelAll() { - queue.Clear(); + _queue.Clear(); - foreach ((string _, CancellationTokenSource cancellationTokenSource) in cancellationTokenSources) { + foreach ((string _, CancellationTokenSource cancellationTokenSource) in _cancellationTokenSources) { cancellationTokenSource.Cancel(); } - cancellationTokenSources.Clear(); + _cancellationTokenSources.Clear(); } private async Task ProcessQueue() { - processing = true; - while (queue.TryDequeue(out ModpackBuild build)) { + _processing = true; + while (_queue.TryDequeue(out ModpackBuild build)) { // TODO: Expand this to check if a server is running using the repo for this build. If no servers are running but there are processes, don't build at all. // Will require better game <-> api interaction to communicate with servers and headless clients properly - if (gameServersService.GetGameInstanceCount() > 0) { - queue.Enqueue(build); + if (_gameServersService.GetGameInstanceCount() > 0) { + _queue.Enqueue(build); await Task.Delay(TimeSpan.FromMinutes(5)); continue; } CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(); - cancellationTokenSources.TryAdd(build.id, cancellationTokenSource); - Task buildTask = buildProcessorService.ProcessBuild(build, cancellationTokenSource); - buildTasks.TryAdd(build.id, buildTask); + _cancellationTokenSources.TryAdd(build.id, cancellationTokenSource); + Task buildTask = _buildProcessorService.ProcessBuild(build, cancellationTokenSource); + _buildTasks.TryAdd(build.id, buildTask); await buildTask; - cancellationTokenSources.TryRemove(build.id, out CancellationTokenSource _); + _cancellationTokenSources.TryRemove(build.id, out CancellationTokenSource _); } - processing = false; + _processing = false; } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs index b39d3f55..581274f1 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs @@ -18,13 +18,18 @@ public interface IBuildStepService { } public class BuildStepService : IBuildStepService { - private Dictionary buildStepDictionary = new Dictionary(); + private readonly IServiceProvider _serviceProvider; + private Dictionary _buildStepDictionary = new Dictionary(); + + public BuildStepService(IServiceProvider serviceProvider) { + _serviceProvider = serviceProvider; + } public void RegisterBuildSteps() { - buildStepDictionary = AppDomain.CurrentDomain.GetAssemblies() + _buildStepDictionary = AppDomain.CurrentDomain.GetAssemblies() .SelectMany(x => x.GetTypes(), (_, type) => new { type }) .Select(x => new { x.type, attributes = x.type.GetCustomAttributes(typeof(BuildStepAttribute), true) }) - .Where(x => x.attributes != null && x.attributes.Length > 0) + .Where(x => x.attributes.Length > 0) .Select(x => new { Key = x.attributes.Cast().First().Name, Value = x.type }) .ToDictionary(x => x.Key, x => x.Value); } @@ -43,11 +48,11 @@ public List GetSteps(GameEnvironment environment) { public ModpackBuildStep GetRestoreStepForRelease() => new ModpackBuildStep(BuildStepRestore.NAME); public IBuildStep ResolveBuildStep(string buildStepName) { - if (!buildStepDictionary.ContainsKey(buildStepName)) { + if (!_buildStepDictionary.ContainsKey(buildStepName)) { throw new NullReferenceException($"Build step '{buildStepName}' does not exist in build step dictionary"); } - Type type = buildStepDictionary[buildStepName]; + Type type = _buildStepDictionary[buildStepName]; IBuildStep step = Activator.CreateInstance(type) as IBuildStep; return step; } @@ -104,7 +109,7 @@ private static List GetStepsForRelease() => private static void ResolveIndices(IReadOnlyList steps) { for (int i = 0; i < steps.Count; i++) { - steps[i].index = i; + steps[i].Index = i; } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs b/UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs index 37f7b9e0..caa18aaf 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs @@ -17,18 +17,18 @@ public interface IStepLogger { } public class StepLogger : IStepLogger { - private readonly ModpackBuildStep buildStep; + private readonly ModpackBuildStep _buildStep; - public StepLogger(ModpackBuildStep buildStep) => this.buildStep = buildStep; + public StepLogger(ModpackBuildStep buildStep) => _buildStep = buildStep; public void LogStart() { - LogLines($"Starting: {buildStep.name}", string.Empty); + LogLines($"Starting: {_buildStep.Name}", string.Empty); } public void LogSuccess() { LogLines( - $"\nFinished{(buildStep.buildResult == ModpackBuildResult.WARNING ? " with warning" : "")}: {buildStep.name}", - buildStep.buildResult == ModpackBuildResult.WARNING ? "orangered" : "green" + $"\nFinished{(_buildStep.BuildResult == ModpackBuildResult.WARNING ? " with warning" : "")}: {_buildStep.Name}", + _buildStep.BuildResult == ModpackBuildResult.WARNING ? "orangered" : "green" ); } @@ -37,7 +37,7 @@ public void LogCancelled() { } public void LogSkipped() { - LogLines($"\nSkipped: {buildStep.name}", "gray"); + LogLines($"\nSkipped: {_buildStep.Name}", "gray"); } public void LogWarning(string message) { @@ -45,7 +45,7 @@ public void LogWarning(string message) { } public void LogError(Exception exception) { - LogLines($"Error\n{exception.Message}\n{exception.StackTrace}\n\nFailed: {buildStep.name}", "red"); + LogLines($"Error\n{exception.Message}\n{exception.StackTrace}\n\nFailed: {_buildStep.Name}", "red"); } public void LogSurround(string log) { @@ -57,11 +57,11 @@ public void Log(string log, string colour = "") { } public void LogInline(string log) { - PushLogUpdate(new List { new ModpackBuildStepLogItem { text = log } }, true); + PushLogUpdate(new List { new ModpackBuildStepLogItem { Text = log } }, true); } private void LogLines(string log, string colour = "") { - List logs = log.Split("\n").Select(x => new ModpackBuildStepLogItem { text = x, colour = string.IsNullOrEmpty(x) ? "" : colour }).ToList(); + List logs = log.Split("\n").Select(x => new ModpackBuildStepLogItem { Text = x, Colour = string.IsNullOrEmpty(x) ? "" : colour }).ToList(); if (logs.Count == 0) return; PushLogUpdate(logs); @@ -69,9 +69,9 @@ private void LogLines(string log, string colour = "") { private void PushLogUpdate(IEnumerable logs, bool inline = false) { if (inline) { - buildStep.logs[^1] = logs.First(); + _buildStep.Logs[^1] = logs.First(); } else { - buildStep.logs.AddRange(logs); + _buildStep.Logs.AddRange(logs); } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs index 39640830..d83f8b4b 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs @@ -1,6 +1,7 @@ using System; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using MongoDB.Driver; using Newtonsoft.Json; using UKSF.Api.Admin.Extensions; @@ -11,12 +12,12 @@ namespace UKSF.Api.Modpack.Services.BuildProcess.Steps { public interface IBuildStep { void Init( + IServiceProvider serviceProvider, ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func, Task> buildUpdateCallback, Func stepUpdateCallback, - CancellationTokenSource cancellationTokenSource, - IVariablesService variablesService + CancellationTokenSource cancellationTokenSource ); Task Start(); @@ -32,40 +33,42 @@ IVariablesService variablesService public class BuildStep : IBuildStep { private const string COLOUR_BLUE = "#0c78ff"; - private readonly TimeSpan updateInterval = TimeSpan.FromSeconds(2); - private readonly CancellationTokenSource updatePusherCancellationTokenSource = new CancellationTokenSource(); - private readonly SemaphoreSlim updateSemaphore = new SemaphoreSlim(1); + private readonly TimeSpan _updateInterval = TimeSpan.FromSeconds(2); + private readonly CancellationTokenSource _updatePusherCancellationTokenSource = new CancellationTokenSource(); + private readonly SemaphoreSlim _updateSemaphore = new SemaphoreSlim(1); + private ModpackBuildStep _buildStep; + private Func, Task> _updateBuildCallback; + private Func _updateStepCallback; protected ModpackBuild Build; - private ModpackBuildStep buildStep; protected CancellationTokenSource CancellationTokenSource; - protected IStepLogger Logger; - private Func, Task> updateBuildCallback; - private Func updateStepCallback; + protected IServiceProvider ServiceProvider; + protected IStepLogger StepLogger; protected IVariablesService VariablesService; public void Init( + IServiceProvider newServiceProvider, ModpackBuild modpackBuild, ModpackBuildStep modpackBuildStep, Func, Task> buildUpdateCallback, Func stepUpdateCallback, - CancellationTokenSource newCancellationTokenSource, - IVariablesService newVariablesService + CancellationTokenSource newCancellationTokenSource ) { - VariablesService = newVariablesService; + ServiceProvider = newServiceProvider; + VariablesService = ServiceProvider.GetService(); Build = modpackBuild; - buildStep = modpackBuildStep; - updateBuildCallback = buildUpdateCallback; - updateStepCallback = stepUpdateCallback; + _buildStep = modpackBuildStep; + _updateBuildCallback = buildUpdateCallback; + _updateStepCallback = stepUpdateCallback; CancellationTokenSource = newCancellationTokenSource; - Logger = new StepLogger(buildStep); + StepLogger = new StepLogger(_buildStep); } public async Task Start() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); StartUpdatePusher(); - buildStep.running = true; - buildStep.startTime = DateTime.Now; - Logger.LogStart(); + _buildStep.Running = true; + _buildStep.StartTime = DateTime.Now; + StepLogger.LogStart(); await Update(); } @@ -73,101 +76,101 @@ public async Task Start() { public async Task Setup() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); - Logger.Log("\nSetup", COLOUR_BLUE); + StepLogger.Log("\nSetup", COLOUR_BLUE); await SetupExecute(); await Update(); } public async Task Process() { CancellationTokenSource.Token.ThrowIfCancellationRequested(); - Logger.Log("\nProcess", COLOUR_BLUE); + StepLogger.Log("\nProcess", COLOUR_BLUE); await ProcessExecute(); await Update(); } public async Task Succeed() { - Logger.LogSuccess(); - if (buildStep.buildResult != ModpackBuildResult.WARNING) { - buildStep.buildResult = ModpackBuildResult.SUCCESS; + StepLogger.LogSuccess(); + if (_buildStep.BuildResult != ModpackBuildResult.WARNING) { + _buildStep.BuildResult = ModpackBuildResult.SUCCESS; } await Stop(); } public async Task Fail(Exception exception) { - Logger.LogError(exception); - buildStep.buildResult = ModpackBuildResult.FAILED; + StepLogger.LogError(exception); + _buildStep.BuildResult = ModpackBuildResult.FAILED; await Stop(); } public async Task Cancel() { - Logger.LogCancelled(); - buildStep.buildResult = ModpackBuildResult.CANCELLED; + StepLogger.LogCancelled(); + _buildStep.BuildResult = ModpackBuildResult.CANCELLED; await Stop(); } public void Warning(string message) { - Logger.LogWarning(message); - buildStep.buildResult = ModpackBuildResult.WARNING; + StepLogger.LogWarning(message); + _buildStep.BuildResult = ModpackBuildResult.WARNING; } public async Task Skip() { - Logger.LogSkipped(); - buildStep.buildResult = ModpackBuildResult.SKIPPED; + StepLogger.LogSkipped(); + _buildStep.BuildResult = ModpackBuildResult.SKIPPED; await Stop(); } protected virtual Task SetupExecute() { - Logger.Log("---"); + StepLogger.Log("---"); return Task.CompletedTask; } protected virtual Task ProcessExecute() { - Logger.Log("---"); + StepLogger.Log("---"); return Task.CompletedTask; } - internal string GetBuildEnvironmentPath() => GetEnvironmentPath(Build.environment); + internal string GetBuildEnvironmentPath() => GetEnvironmentPath(Build.Environment); internal string GetEnvironmentPath(GameEnvironment environment) => environment switch { GameEnvironment.RELEASE => VariablesService.GetVariable("MODPACK_PATH_RELEASE").AsString(), - GameEnvironment.RC => VariablesService.GetVariable("MODPACK_PATH_RC").AsString(), - GameEnvironment.DEV => VariablesService.GetVariable("MODPACK_PATH_DEV").AsString(), - _ => throw new ArgumentException("Invalid build environment") + GameEnvironment.RC => VariablesService.GetVariable("MODPACK_PATH_RC").AsString(), + GameEnvironment.DEV => VariablesService.GetVariable("MODPACK_PATH_DEV").AsString(), + _ => throw new ArgumentException("Invalid build environment") }; internal string GetServerEnvironmentPath(GameEnvironment environment) => environment switch { GameEnvironment.RELEASE => VariablesService.GetVariable("SERVER_PATH_RELEASE").AsString(), - GameEnvironment.RC => VariablesService.GetVariable("SERVER_PATH_RC").AsString(), - GameEnvironment.DEV => VariablesService.GetVariable("SERVER_PATH_DEV").AsString(), - _ => throw new ArgumentException("Invalid build environment") + GameEnvironment.RC => VariablesService.GetVariable("SERVER_PATH_RC").AsString(), + GameEnvironment.DEV => VariablesService.GetVariable("SERVER_PATH_DEV").AsString(), + _ => throw new ArgumentException("Invalid build environment") }; internal string GetEnvironmentRepoName() => - Build.environment switch { + Build.Environment switch { GameEnvironment.RELEASE => "UKSF", - GameEnvironment.RC => "UKSF-Rc", - GameEnvironment.DEV => "UKSF-Dev", - _ => throw new ArgumentException("Invalid build environment") + GameEnvironment.RC => "UKSF-Rc", + GameEnvironment.DEV => "UKSF-Dev", + _ => throw new ArgumentException("Invalid build environment") }; internal string GetBuildSourcesPath() => VariablesService.GetVariable("BUILD_PATH_SOURCES").AsString(); internal void SetEnvironmentVariable(string key, object value) { - if (Build.environmentVariables.ContainsKey(key)) { - Build.environmentVariables[key] = value; + if (Build.EnvironmentVariables.ContainsKey(key)) { + Build.EnvironmentVariables[key] = value; } else { - Build.environmentVariables.Add(key, value); + Build.EnvironmentVariables.Add(key, value); } - updateBuildCallback(Builders.Update.Set(x => x.environmentVariables, Build.environmentVariables)); + _updateBuildCallback(Builders.Update.Set(x => x.EnvironmentVariables, Build.EnvironmentVariables)); } internal T GetEnvironmentVariable(string key) { - if (Build.environmentVariables.ContainsKey(key)) { - object value = Build.environmentVariables[key]; + if (Build.EnvironmentVariables.ContainsKey(key)) { + object value = Build.EnvironmentVariables[key]; return (T) value; } @@ -178,19 +181,19 @@ private void StartUpdatePusher() { try { _ = Task.Run( async () => { - string previousBuildStepState = JsonConvert.SerializeObject(buildStep); + string previousBuildStepState = JsonConvert.SerializeObject(_buildStep); do { - await Task.Delay(updateInterval, updatePusherCancellationTokenSource.Token); + await Task.Delay(_updateInterval, _updatePusherCancellationTokenSource.Token); - string newBuildStepState = JsonConvert.SerializeObject(buildStep); + string newBuildStepState = JsonConvert.SerializeObject(_buildStep); if (newBuildStepState != previousBuildStepState) { await Update(); previousBuildStepState = newBuildStepState; } - } while (!updatePusherCancellationTokenSource.IsCancellationRequested); + } while (!_updatePusherCancellationTokenSource.IsCancellationRequested); }, - updatePusherCancellationTokenSource.Token + _updatePusherCancellationTokenSource.Token ); } catch (OperationCanceledException) { Console.Out.WriteLine("cancelled"); @@ -200,19 +203,19 @@ private void StartUpdatePusher() { } private void StopUpdatePusher() { - updatePusherCancellationTokenSource.Cancel(); + _updatePusherCancellationTokenSource.Cancel(); } private async Task Update() { - await updateSemaphore.WaitAsync(); - await updateStepCallback(); - updateSemaphore.Release(); + await _updateSemaphore.WaitAsync(); + await _updateStepCallback(); + _updateSemaphore.Release(); } private async Task Stop() { - buildStep.running = false; - buildStep.finished = true; - buildStep.endTime = DateTime.Now; + _buildStep.Running = false; + _buildStep.Finished = true; + _buildStep.EndTime = DateTime.Now; StopUpdatePusher(); await Update(); } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs index a3b1a1c6..1c34d21b 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs @@ -17,10 +17,10 @@ protected override async Task ProcessExecute() { DirectoryInfo uksf = new DirectoryInfo(uksfPath); DirectoryInfo intercept = new DirectoryInfo(interceptPath); - Logger.LogSurround("\nSigning extensions..."); + StepLogger.LogSurround("\nSigning extensions..."); List files = GetDirectoryContents(uksf, "*.dll").Concat(GetDirectoryContents(intercept, "*.dll")).ToList(); await SignExtensions(files); - Logger.LogSurround("Signed extensions"); + StepLogger.LogSurround("Signed extensions"); } private async Task SignExtensions(IReadOnlyCollection files) { @@ -32,7 +32,7 @@ await BatchProcessFiles( files, 2, file => { - BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, true, false, true); + BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource, true, false, true); processHelper.Run(file.DirectoryName, signTool, $"sign /f \"{certPath}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); Interlocked.Increment(ref signed); return Task.CompletedTask; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs index b546c885..b312e5b8 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs @@ -10,13 +10,13 @@ protected override async Task ProcessExecute() { string sourcePath = Path.Join(GetBuildSourcesPath(), "modpack", "@intercept"); string targetPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@intercept"); - Logger.LogSurround("\nCleaning intercept directory..."); + StepLogger.LogSurround("\nCleaning intercept directory..."); await DeleteDirectoryContents(targetPath); - Logger.LogSurround("Cleaned intercept directory"); + StepLogger.LogSurround("Cleaned intercept directory"); - Logger.LogSurround("\nCopying intercept to build..."); + StepLogger.LogSurround("\nCopying intercept to build..."); await CopyDirectory(sourcePath, targetPath); - Logger.LogSurround("Copied intercept to build"); + StepLogger.LogSurround("Copied intercept to build"); } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs index bea6149b..3c9cbd4e 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs @@ -8,14 +8,14 @@ public class BuildStepKeys : FileBuildStep { public const string NAME = "Keys"; protected override async Task SetupExecute() { - Logger.LogSurround("\nWiping server keys folder"); + StepLogger.LogSurround("\nWiping server keys folder"); string keysPath = Path.Join(GetBuildEnvironmentPath(), "Keys"); await DeleteDirectoryContents(keysPath); - Logger.LogSurround("Server keys folder wiped"); + StepLogger.LogSurround("Server keys folder wiped"); } protected override async Task ProcessExecute() { - Logger.Log("Updating keys"); + StepLogger.Log("Updating keys"); string sourceBasePath = Path.Join(GetBuildEnvironmentPath(), "BaseKeys"); string sourceRepoPath = Path.Join(GetBuildEnvironmentPath(), "Repo"); @@ -24,17 +24,17 @@ protected override async Task ProcessExecute() { DirectoryInfo sourceRepo = new DirectoryInfo(sourceRepoPath); DirectoryInfo target = new DirectoryInfo(targetPath); - Logger.LogSurround("\nCopying base keys..."); + StepLogger.LogSurround("\nCopying base keys..."); List baseKeys = GetDirectoryContents(sourceBase, "*.bikey"); - Logger.Log($"Found {baseKeys.Count} keys in base keys"); + StepLogger.Log($"Found {baseKeys.Count} keys in base keys"); await CopyFiles(sourceBase, target, baseKeys, true); - Logger.LogSurround("Copied base keys"); + StepLogger.LogSurround("Copied base keys"); - Logger.LogSurround("\nCopying repo keys..."); + StepLogger.LogSurround("\nCopying repo keys..."); List repoKeys = GetDirectoryContents(sourceRepo, "*.bikey"); - Logger.Log($"Found {repoKeys.Count} keys in repo"); + StepLogger.Log($"Found {repoKeys.Count} keys in repo"); await CopyFiles(sourceRepo, target, repoKeys, true); - Logger.LogSurround("Copied repo keys"); + StepLogger.LogSurround("Copied repo keys"); } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs index d45c9d12..417e724a 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs @@ -8,13 +8,13 @@ public class BuildStepPrep : BuildStep { public const string NAME = "Prep"; protected override Task ProcessExecute() { - Logger.Log("Mounting build environment"); + StepLogger.Log("Mounting build environment"); string projectsPath = VariablesService.GetVariable("BUILD_PATH_PROJECTS").AsString(); - BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, raiseErrors: false); + BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource, raiseErrors: false); processHelper.Run("C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\"\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); - processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, raiseErrors: false); + processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource, raiseErrors: false); processHelper.Run("C:/", "cmd.exe", "/c \"subst\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); return Task.CompletedTask; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs index a81603cb..cc979689 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs @@ -10,14 +10,14 @@ namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps { [BuildStep(NAME)] public class BuildStepSignDependencies : FileBuildStep { public const string NAME = "Signatures"; - private string dsCreateKey; - private string dsSignFile; - private string keyName; + private string _dsCreateKey; + private string _dsSignFile; + private string _keyName; protected override async Task SetupExecute() { - dsSignFile = Path.Join(VariablesService.GetVariable("BUILD_PATH_DSSIGN").AsString(), "DSSignFile.exe"); - dsCreateKey = Path.Join(VariablesService.GetVariable("BUILD_PATH_DSSIGN").AsString(), "DSCreateKey.exe"); - keyName = GetKeyname(); + _dsSignFile = Path.Join(VariablesService.GetVariable("BUILD_PATH_DSSIGN").AsString(), "DSSignFile.exe"); + _dsCreateKey = Path.Join(VariablesService.GetVariable("BUILD_PATH_DSSIGN").AsString(), "DSCreateKey.exe"); + _keyName = GetKeyname(); string keygenPath = Path.Join(GetBuildEnvironmentPath(), "PrivateKeys"); string keysPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies", "keys"); @@ -26,17 +26,17 @@ protected override async Task SetupExecute() { keygen.Create(); keys.Create(); - Logger.LogSurround("\nClearing keys directories..."); + StepLogger.LogSurround("\nClearing keys directories..."); await DeleteDirectoryContents(keysPath); await DeleteDirectoryContents(keygenPath); - Logger.LogSurround("Cleared keys directories"); + StepLogger.LogSurround("Cleared keys directories"); - Logger.LogSurround("\nCreating key..."); - BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, true); - processHelper.Run(keygenPath, dsCreateKey, keyName, (int) TimeSpan.FromSeconds(10).TotalMilliseconds); - Logger.Log($"Created {keyName}"); - await CopyFiles(keygen, keys, new List { new FileInfo(Path.Join(keygenPath, $"{keyName}.bikey")) }); - Logger.LogSurround("Created key"); + StepLogger.LogSurround("\nCreating key..."); + BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource, true); + processHelper.Run(keygenPath, _dsCreateKey, _keyName, (int) TimeSpan.FromSeconds(10).TotalMilliseconds); + StepLogger.Log($"Created {_keyName}"); + await CopyFiles(keygen, keys, new List { new FileInfo(Path.Join(keygenPath, $"{_keyName}.bikey")) }); + StepLogger.LogSurround("Created key"); } protected override async Task ProcessExecute() { @@ -46,32 +46,32 @@ protected override async Task ProcessExecute() { DirectoryInfo addons = new DirectoryInfo(addonsPath); DirectoryInfo intercept = new DirectoryInfo(interceptPath); - Logger.LogSurround("\nDeleting dependencies signatures..."); + StepLogger.LogSurround("\nDeleting dependencies signatures..."); await DeleteFiles(GetDirectoryContents(addons, "*.bisign*")); - Logger.LogSurround("Deleted dependencies signatures"); + StepLogger.LogSurround("Deleted dependencies signatures"); List repoFiles = GetDirectoryContents(addons, "*.pbo"); - Logger.LogSurround("\nSigning dependencies..."); + StepLogger.LogSurround("\nSigning dependencies..."); await SignFiles(keygenPath, addonsPath, repoFiles); - Logger.LogSurround("Signed dependencies"); + StepLogger.LogSurround("Signed dependencies"); List interceptFiles = GetDirectoryContents(intercept, "*.pbo"); - Logger.LogSurround("\nSigning intercept..."); + StepLogger.LogSurround("\nSigning intercept..."); await SignFiles(keygenPath, addonsPath, interceptFiles); - Logger.LogSurround("Signed intercept"); + StepLogger.LogSurround("Signed intercept"); } private string GetKeyname() { - return Build.environment switch { - GameEnvironment.RELEASE => $"uksf_dependencies_{Build.version}", - GameEnvironment.RC => $"uksf_dependencies_{Build.version}_rc{Build.buildNumber}", - GameEnvironment.DEV => $"uksf_dependencies_dev_{Build.buildNumber}", + return Build.Environment switch { + GameEnvironment.RELEASE => $"uksf_dependencies_{Build.Version}", + GameEnvironment.RC => $"uksf_dependencies_{Build.Version}_rc{Build.BuildNumber}", + GameEnvironment.DEV => $"uksf_dependencies_dev_{Build.BuildNumber}", _ => throw new ArgumentException("Invalid build environment") }; } private Task SignFiles(string keygenPath, string addonsPath, IReadOnlyCollection files) { - string privateKey = Path.Join(keygenPath, $"{keyName}.biprivatekey"); + string privateKey = Path.Join(keygenPath, $"{_keyName}.biprivatekey"); int signed = 0; int total = files.Count; @@ -79,8 +79,8 @@ private Task SignFiles(string keygenPath, string addonsPath, IReadOnlyCollection files, 10, file => { - BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, true); - processHelper.Run(addonsPath, dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); + BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource, true); + processHelper.Run(addonsPath, _dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); Interlocked.Increment(ref signed); return Task.CompletedTask; }, diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index f6535c8f..dad0eee0 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -8,7 +8,7 @@ public class BuildStepSources : GitBuildStep { public const string NAME = "Sources"; protected override async Task ProcessExecute() { - Logger.Log("Checking out latest sources"); + StepLogger.Log("Checking out latest sources"); await CheckoutStaticSource("ACE", "ace", "@ace", "@uksf_ace", "uksfcustom"); await CheckoutStaticSource("ACRE", "acre", "@acre2", "@acre2", "customrelease"); @@ -17,12 +17,12 @@ protected override async Task ProcessExecute() { } private Task CheckoutStaticSource(string displayName, string modName, string releaseName, string repoName, string branchName) { - Logger.LogSurround($"\nChecking out latest {displayName}..."); + StepLogger.LogSurround($"\nChecking out latest {displayName}..."); bool forceBuild = GetEnvironmentVariable($"{modName}_updated"); bool updated; if (forceBuild) { - Logger.Log("Force build"); + StepLogger.Log("Force build"); updated = true; } else { string path = Path.Join(GetBuildSourcesPath(), modName); @@ -44,36 +44,36 @@ private Task CheckoutStaticSource(string displayName, string modName, string rel string after = GitCommand(path, "git rev-parse HEAD"); if (release.Exists && repo.Exists) { - Logger.Log($"{before?.Substring(0, 7)} vs {after?.Substring(0, 7)}"); + StepLogger.Log($"{before?.Substring(0, 7)} vs {after?.Substring(0, 7)}"); updated = !string.Equals(before, after); } else { - Logger.Log("No release or repo directory, will build"); + StepLogger.Log("No release or repo directory, will build"); updated = true; } } SetEnvironmentVariable($"{modName}_updated", updated); - Logger.LogSurround($"Checked out latest {displayName}{(updated ? "" : " (No Changes)")}"); + StepLogger.LogSurround($"Checked out latest {displayName}{(updated ? "" : " (No Changes)")}"); return Task.CompletedTask; } private Task CheckoutModpack() { - string reference = string.Equals(Build.commit.branch, "None") ? Build.commit.after : Build.commit.branch.Replace("refs/heads/", ""); - string referenceName = string.Equals(Build.commit.branch, "None") ? reference : $"latest {reference}"; - Logger.LogSurround("\nChecking out modpack..."); + string reference = string.Equals(Build.Commit.Branch, "None") ? Build.Commit.After : Build.Commit.Branch.Replace("refs/heads/", ""); + string referenceName = string.Equals(Build.Commit.Branch, "None") ? reference : $"latest {reference}"; + StepLogger.LogSurround("\nChecking out modpack..."); string modpackPath = Path.Join(GetBuildSourcesPath(), "modpack"); DirectoryInfo modpack = new DirectoryInfo(modpackPath); if (!modpack.Exists) { throw new Exception("Modpack source directory does not exist. Modpack should be cloned before running a build."); } - Logger.Log($"Checking out {referenceName}"); + StepLogger.Log($"Checking out {referenceName}"); GitCommand(modpackPath, "git reset --hard HEAD && git clean -d -f && git fetch"); GitCommand(modpackPath, $"git checkout -t origin/{reference}"); GitCommand(modpackPath, $"git checkout {reference}"); GitCommand(modpackPath, "git pull"); - Logger.LogSurround("Checked out modpack"); + StepLogger.LogSurround("Checked out modpack"); return Task.CompletedTask; } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs index 9facf165..b8138623 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs @@ -8,36 +8,36 @@ namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods { public class BuildStepBuildAce : ModBuildStep { public const string NAME = "Build ACE"; private const string MOD_NAME = "ace"; - private readonly List allowedOptionals = new List { "ace_compat_rksl_pm_ii", "ace_nouniformrestrictions" }; + private readonly List _allowedOptionals = new List { "ace_compat_rksl_pm_ii", "ace_nouniformrestrictions" }; protected override async Task ProcessExecute() { - Logger.Log("Running build for ACE"); + StepLogger.Log("Running build for ACE"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@ace"); string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf_ace"); if (IsBuildNeeded(MOD_NAME)) { - Logger.LogSurround("\nRunning make.py..."); - BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version"); + StepLogger.LogSurround("\nRunning make.py..."); + BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version"); processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); - Logger.LogSurround("Make.py complete"); + StepLogger.LogSurround("Make.py complete"); } - Logger.LogSurround("\nMoving ACE release to build..."); + StepLogger.LogSurround("\nMoving ACE release to build..."); await CopyDirectory(releasePath, buildPath); - Logger.LogSurround("Moved ACE release to build"); + StepLogger.LogSurround("Moved ACE release to build"); - Logger.LogSurround("\nMoving optionals..."); + StepLogger.LogSurround("\nMoving optionals..."); await MoveOptionals(buildPath); - Logger.LogSurround("Moved optionals"); + StepLogger.LogSurround("Moved optionals"); } private async Task MoveOptionals(string buildPath) { string optionalsPath = Path.Join(buildPath, "optionals"); string addonsPath = Path.Join(buildPath, "addons"); DirectoryInfo addons = new DirectoryInfo(addonsPath); - foreach (string optionalName in allowedOptionals) { + foreach (string optionalName in _allowedOptionals) { DirectoryInfo optional = new DirectoryInfo(Path.Join(optionalsPath, $"@{optionalName}", "addons")); List files = GetDirectoryContents(optional); await CopyFiles(optional, addons, files); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index 99888b6d..af9cf364 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -8,7 +8,7 @@ namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods { public class BuildStepBuildAcre : ModBuildStep { public const string NAME = "Build ACRE"; private const string MOD_NAME = "acre"; - private readonly List errorExclusions = new List { + private readonly List _errorExclusions = new List { "Found DirectX", "Linking statically", "Visual Studio 16", @@ -17,28 +17,28 @@ public class BuildStepBuildAcre : ModBuildStep { }; protected override async Task ProcessExecute() { - Logger.Log("Running build for ACRE"); + StepLogger.Log("Running build for ACRE"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@acre2"); string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@acre2"); if (IsBuildNeeded(MOD_NAME)) { - Logger.LogSurround("\nRunning make.py..."); + StepLogger.LogSurround("\nRunning make.py..."); BuildProcessHelper processHelper = new BuildProcessHelper( - Logger, + StepLogger, CancellationTokenSource, - errorExclusions: errorExclusions, + errorExclusions: _errorExclusions, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version" ); processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect compile"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); - Logger.LogSurround("Make.py complete"); + StepLogger.LogSurround("Make.py complete"); } - Logger.LogSurround("\nMoving ACRE release to build..."); + StepLogger.LogSurround("\nMoving ACRE release to build..."); await CopyDirectory(releasePath, buildPath); - Logger.LogSurround("Moved ACRE release to build"); + StepLogger.LogSurround("Moved ACRE release to build"); } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs index 04e378da..7542456d 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs @@ -10,7 +10,7 @@ public class BuildStepBuildF35 : ModBuildStep { private const string MOD_NAME = "f35"; protected override async Task ProcessExecute() { - Logger.Log("Running build for F-35"); + StepLogger.Log("Running build for F-35"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@uksf_f35", "addons"); @@ -19,16 +19,16 @@ protected override async Task ProcessExecute() { DirectoryInfo dependencies = new DirectoryInfo(dependenciesPath); if (IsBuildNeeded(MOD_NAME)) { - Logger.LogSurround("\nRunning make.py..."); - BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource); + StepLogger.LogSurround("\nRunning make.py..."); + BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource); processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(1).TotalMilliseconds); - Logger.LogSurround("Make.py complete"); + StepLogger.LogSurround("Make.py complete"); } - Logger.LogSurround("\nMoving F-35 pbos to uksf dependencies..."); + StepLogger.LogSurround("\nMoving F-35 pbos to uksf dependencies..."); List files = GetDirectoryContents(release, "*.pbo"); await CopyFiles(release, dependencies, files); - Logger.LogSurround("Moved F-35 pbos to uksf dependencies"); + StepLogger.LogSurround("Moved F-35 pbos to uksf dependencies"); } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs index c2f1b761..18561fca 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs @@ -9,20 +9,20 @@ public class BuildStepBuildModpack : ModBuildStep { private const string MOD_NAME = "modpack"; protected override async Task ProcessExecute() { - Logger.Log("Running build for UKSF"); + StepLogger.Log("Running build for UKSF"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@uksf"); string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf"); - Logger.LogSurround("\nRunning make.py..."); - BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource); + StepLogger.LogSurround("\nRunning make.py..."); + BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource); processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(5).TotalMilliseconds); - Logger.LogSurround("Make.py complete"); + StepLogger.LogSurround("Make.py complete"); - Logger.LogSurround("\nMoving UKSF release to build..."); + StepLogger.LogSurround("\nMoving UKSF release to build..."); await CopyDirectory(releasePath, buildPath); - Logger.LogSurround("Moved UKSF release to build"); + StepLogger.LogSurround("Moved UKSF release to build"); } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs index 10125e28..5d968781 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs @@ -9,10 +9,10 @@ public class BuildStepBuildRepo : BuildStep { protected override Task ProcessExecute() { string repoName = GetEnvironmentRepoName(); - Logger.Log($"Building {repoName} repo"); + StepLogger.Log($"Building {repoName} repo"); string arma3SyncPath = VariablesService.GetVariable("BUILD_PATH_ARMA3SYNC").AsString(); - BuildProcessHelper processHelper = new BuildProcessHelper(Logger, CancellationTokenSource); + BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource); processHelper.Run(arma3SyncPath, "Java", $"-jar .\\ArmA3Sync.jar -BUILD {repoName}", (int) TimeSpan.FromMinutes(5).TotalMilliseconds); return Task.CompletedTask; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs index c4f08d36..1b25b1a5 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs @@ -9,23 +9,23 @@ public class BuildStepCbaSettings : FileBuildStep { public const string NAME = "CBA Settings"; protected override async Task ProcessExecute() { - Logger.Log("Updating CBA settings"); + StepLogger.Log("Updating CBA settings"); string sourceUserconfigPath; string targetUserconfigPath; - if (Build.environment == GameEnvironment.RELEASE) { + if (Build.Environment == GameEnvironment.RELEASE) { sourceUserconfigPath = Path.Join(GetServerEnvironmentPath(GameEnvironment.RC), "userconfig"); targetUserconfigPath = Path.Join(GetServerEnvironmentPath(GameEnvironment.RELEASE), "userconfig"); } else { sourceUserconfigPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf"); - targetUserconfigPath = Path.Join(GetServerEnvironmentPath(Build.environment), "userconfig"); + targetUserconfigPath = Path.Join(GetServerEnvironmentPath(Build.Environment), "userconfig"); } FileInfo cbaSettingsFile = new FileInfo(Path.Join(sourceUserconfigPath, "cba_settings.sqf")); - Logger.LogSurround("\nCopying cba_settings.sqf..."); + StepLogger.LogSurround("\nCopying cba_settings.sqf..."); await CopyFiles(new DirectoryInfo(sourceUserconfigPath), new DirectoryInfo(targetUserconfigPath), new List { cbaSettingsFile }); - Logger.LogSurround("Copied cba_settings.sqf"); + StepLogger.LogSurround("Copied cba_settings.sqf"); } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs index 2ba07054..8d61fe84 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs @@ -11,27 +11,27 @@ public class BuildStepClean : FileBuildStep { protected override async Task ProcessExecute() { string environmentPath = GetBuildEnvironmentPath(); - if (Build.environment == GameEnvironment.RELEASE) { + if (Build.Environment == GameEnvironment.RELEASE) { string keysPath = Path.Join(environmentPath, "Backup", "Keys"); - Logger.LogSurround("\nCleaning keys backup..."); + StepLogger.LogSurround("\nCleaning keys backup..."); await DeleteDirectoryContents(keysPath); - Logger.LogSurround("Cleaned keys backup"); + StepLogger.LogSurround("Cleaned keys backup"); } else { string path = Path.Join(environmentPath, "Build"); string repoPath = Path.Join(environmentPath, "Repo"); DirectoryInfo repo = new DirectoryInfo(repoPath); - Logger.LogSurround("\nCleaning build folder..."); + StepLogger.LogSurround("\nCleaning build folder..."); await DeleteDirectoryContents(path); - Logger.LogSurround("Cleaned build folder"); + StepLogger.LogSurround("Cleaned build folder"); - Logger.LogSurround("\nCleaning orphaned zsync files..."); + StepLogger.LogSurround("\nCleaning orphaned zsync files..."); IEnumerable contentFiles = GetDirectoryContents(repo).Where(x => !x.Name.Contains(".zsync")); IEnumerable zsyncFiles = GetDirectoryContents(repo, "*.zsync"); List orphanedFiles = zsyncFiles.Where(x => contentFiles.All(y => !x.FullName.Contains(y.FullName))).ToList(); await DeleteFiles(orphanedFiles); - Logger.LogSurround("Cleaned orphaned zsync files"); + StepLogger.LogSurround("Cleaned orphaned zsync files"); } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepDeploy.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepDeploy.cs index 6dff7166..3c60f646 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepDeploy.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepDeploy.cs @@ -10,27 +10,27 @@ public class BuildStepDeploy : FileBuildStep { protected override async Task ProcessExecute() { string sourcePath; string targetPath; - if (Build.environment == GameEnvironment.RELEASE) { - Logger.Log("Deploying files from RC to release"); + if (Build.Environment == GameEnvironment.RELEASE) { + StepLogger.Log("Deploying files from RC to release"); sourcePath = Path.Join(GetEnvironmentPath(GameEnvironment.RC), "Repo"); targetPath = Path.Join(GetBuildEnvironmentPath(), "Repo"); } else { - Logger.Log("Deploying files from build to repo"); + StepLogger.Log("Deploying files from build to repo"); sourcePath = Path.Join(GetBuildEnvironmentPath(), "Build"); targetPath = Path.Join(GetBuildEnvironmentPath(), "Repo"); } - Logger.LogSurround("\nAdding new files..."); + StepLogger.LogSurround("\nAdding new files..."); await AddFiles(sourcePath, targetPath); - Logger.LogSurround("Added new files"); + StepLogger.LogSurround("Added new files"); - Logger.LogSurround("\nCopying updated files..."); + StepLogger.LogSurround("\nCopying updated files..."); await UpdateFiles(sourcePath, targetPath); - Logger.LogSurround("Copied updated files"); + StepLogger.LogSurround("Copied updated files"); - Logger.LogSurround("\nDeleting removed files..."); - await DeleteFiles(sourcePath, targetPath, Build.environment != GameEnvironment.RELEASE); - Logger.LogSurround("Deleted removed files"); + StepLogger.LogSurround("\nDeleting removed files..."); + await DeleteFiles(sourcePath, targetPath, Build.Environment != GameEnvironment.RELEASE); + StepLogger.LogSurround("Deleted removed files"); } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs index 54cc07f6..acfe0e93 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs @@ -1,47 +1,49 @@ using System; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Admin.Extensions; using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Discord.Services; using UKSF.Api.Modpack.Models; namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common { [BuildStep(NAME)] public class BuildStepNotify : BuildStep { public const string NAME = "Notify"; - private IDiscordService discordService; - private IReleaseService releaseService; + private IDiscordService _discordService; + private IReleaseService _releaseService; protected override Task SetupExecute() { - discordService = ServiceWrapper.Provider.GetService(); - releaseService = ServiceWrapper.Provider.GetService(); - Logger.Log("Retrieved services"); + _discordService = ServiceProvider.GetService(); + _releaseService = ServiceProvider.GetService(); + StepLogger.Log("Retrieved services"); return Task.CompletedTask; } protected override async Task ProcessExecute() { - switch (Build.environment) { + switch (Build.Environment) { case GameEnvironment.RELEASE: { - ModpackRelease release = releaseService.GetRelease(Build.version); - await discordService.SendMessageToEveryone(VariablesService.GetVariable("DID_C_MODPACK_RELEASE").AsUlong(), GetDiscordMessage(release)); + ModpackRelease release = _releaseService.GetRelease(Build.Version); + await _discordService.SendMessageToEveryone(VariablesService.GetVariable("DID_C_MODPACK_RELEASE").AsUlong(), GetDiscordMessage(release)); break; } case GameEnvironment.RC: - await discordService.SendMessage(VariablesService.GetVariable("DID_C_MODPACK_DEV").AsUlong(), GetDiscordMessage()); + await _discordService.SendMessage(VariablesService.GetVariable("DID_C_MODPACK_DEV").AsUlong(), GetDiscordMessage()); break; case GameEnvironment.DEV: break; - default: throw new ArgumentOutOfRangeException(); + default: throw new ArgumentOutOfRangeException(); } - Logger.Log("Notifications sent"); + StepLogger.Log("Notifications sent"); } - private string GetBuildMessage() => $"New release candidate available for {Build.version} on the rc repository"; + private string GetBuildMessage() => $"New release candidate available for {Build.Version} on the rc repository"; - private string GetBuildLink() => $"https://uk-sf.co.uk/modpack/builds-rc?version={Build.version}&build={Build.id}"; + private string GetBuildLink() => $"https://uk-sf.co.uk/modpack/builds-rc?version={Build.Version}&build={Build.id}"; private string GetDiscordMessage(ModpackRelease release = null) => release == null - ? $"Modpack RC Build - {Build.version} RC# {Build.buildNumber}\n{GetBuildMessage()}\n<{GetBuildLink()}>" - : $"Modpack Update - {release.version}\nFull Changelog: \n\nSummary:\n```{release.description}```"; + ? $"Modpack RC Build - {Build.Version} RC# {Build.BuildNumber}\n{GetBuildMessage()}\n<{GetBuildLink()}>" + : $"Modpack Update - {release.Version}\nFull Changelog: \n\nSummary:\n```{release.Description}```"; } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs index 8d3cf5ae..366b8bbe 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs @@ -70,7 +70,7 @@ internal async Task CopyDirectory(string sourceDirectory, string targetDirectory internal async Task CopyFiles(FileSystemInfo source, FileSystemInfo target, List files, bool flatten = false) { Directory.CreateDirectory(target.FullName); if (files.Count == 0) { - Logger.Log("No files to copy"); + StepLogger.Log("No files to copy"); return; } @@ -85,7 +85,7 @@ internal async Task CopyFiles(FileSystemInfo source, FileSystemInfo target, List internal async Task DeleteDirectoryContents(string path) { DirectoryInfo directory = new DirectoryInfo(path); if (!directory.Exists) { - Logger.Log("Directory does not exist"); + StepLogger.Log("Directory does not exist"); return; } @@ -95,20 +95,20 @@ internal async Task DeleteDirectoryContents(string path) { internal void DeleteDirectories(List directories) { if (directories.Count == 0) { - Logger.Log("No directories to delete"); + StepLogger.Log("No directories to delete"); return; } foreach (DirectoryInfo directory in directories) { CancellationTokenSource.Token.ThrowIfCancellationRequested(); - Logger.Log($"Deleting directory: {directory}"); + StepLogger.Log($"Deleting directory: {directory}"); directory.Delete(true); } } internal async Task DeleteFiles(List files) { if (files.Count == 0) { - Logger.Log("No files to delete"); + StepLogger.Log("No files to delete"); return; } @@ -123,7 +123,7 @@ internal async Task DeleteEmptyDirectories(DirectoryInfo directory) { foreach (DirectoryInfo subDirectory in directory.GetDirectories()) { await DeleteEmptyDirectories(subDirectory); if (subDirectory.GetFiles().Length == 0 && subDirectory.GetDirectories().Length == 0) { - Logger.Log($"Deleting directory: {subDirectory}"); + StepLogger.Log($"Deleting directory: {subDirectory}"); subDirectory.Delete(false); } } @@ -142,7 +142,7 @@ internal async Task ParallelProcessFiles(IEnumerable files, int taskLi CancellationTokenSource.Token.ThrowIfCancellationRequested(); await process(file); - Logger.LogInline(getLog()); + StepLogger.LogInline(getLog()); } catch (OperationCanceledException) { throw; } catch (Exception exception) { @@ -156,12 +156,12 @@ internal async Task ParallelProcessFiles(IEnumerable files, int taskLi } ); - Logger.Log(getLog()); + StepLogger.Log(getLog()); await Task.WhenAll(tasks); } internal async Task BatchProcessFiles(IEnumerable files, int batchSize, Func process, Func getLog, string error) { - Logger.Log(getLog()); + StepLogger.Log(getLog()); IEnumerable> fileBatches = files.Batch(batchSize); foreach (IEnumerable fileBatch in fileBatches) { List fileList = fileBatch.ToList(); @@ -178,7 +178,7 @@ internal async Task BatchProcessFiles(IEnumerable files, int batchSize } ); await Task.WhenAll(tasks); - Logger.LogInline(getLog()); + StepLogger.LogInline(getLog()); } } @@ -186,7 +186,7 @@ private void SimpleCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnum foreach (FileInfo file in files) { CancellationTokenSource.Token.ThrowIfCancellationRequested(); string targetFile = flatten ? Path.Join(target.FullName, file.Name) : file.FullName.Replace(source.FullName, target.FullName); - Logger.Log($"Copying '{file}' to '{target.FullName}'"); + StepLogger.Log($"Copying '{file}' to '{target.FullName}'"); Directory.CreateDirectory(Path.GetDirectoryName(targetFile)); file.CopyTo(targetFile, true); } @@ -213,7 +213,7 @@ await BatchProcessFiles( private void SimpleDeleteFiles(IEnumerable files) { foreach (FileInfo file in files) { CancellationTokenSource.Token.ThrowIfCancellationRequested(); - Logger.Log($"Deleting file: {file}"); + StepLogger.Log($"Deleting file: {file}"); file.Delete(); } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/GitBuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/GitBuildStep.cs index de5015a8..d6427e2c 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/GitBuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/GitBuildStep.cs @@ -5,7 +5,7 @@ namespace UKSF.Api.Modpack.Services.BuildProcess.Steps { public class GitBuildStep : BuildStep { internal string GitCommand(string workingDirectory, string command) { - List results = new BuildProcessHelper(Logger, CancellationTokenSource, false, false, true).Run( + List results = new BuildProcessHelper(StepLogger, CancellationTokenSource, false, false, true).Run( workingDirectory, "cmd.exe", $"/c \"{command}\"", diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ModBuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ModBuildStep.cs index 73cc46e9..8a932f7c 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ModBuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ModBuildStep.cs @@ -7,13 +7,13 @@ public class ModBuildStep : FileBuildStep { protected override Task SetupExecute() { PythonPath = VariablesService.GetVariable("BUILD_PATH_PYTHON").AsString(); - Logger.Log("Retrieved python path"); + StepLogger.Log("Retrieved python path"); return Task.CompletedTask; } internal bool IsBuildNeeded(string key) { if (!GetEnvironmentVariable($"{key}_updated")) { - Logger.Log("\nBuild is not needed"); + StepLogger.Log("\nBuild is not needed"); return false; } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs index e170f6aa..ef4ba9cb 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs @@ -7,7 +7,7 @@ public class BuildStepBackup : FileBuildStep { public const string NAME = "Backup"; protected override async Task ProcessExecute() { - Logger.Log("Backing up current release"); + StepLogger.Log("Backing up current release"); string environmentPath = GetBuildEnvironmentPath(); string repoPath = Path.Join(environmentPath, "Repo"); @@ -15,15 +15,15 @@ protected override async Task ProcessExecute() { string repoBackupPath = Path.Join(environmentPath, "Backup", "Repo"); string keysBackupPath = Path.Join(environmentPath, "Backup", "Keys"); - Logger.LogSurround("\nBacking up repo..."); + StepLogger.LogSurround("\nBacking up repo..."); await AddFiles(repoPath, repoBackupPath); await UpdateFiles(repoPath, repoBackupPath); await DeleteFiles(repoPath, repoBackupPath); - Logger.LogSurround("Backed up repo"); + StepLogger.LogSurround("Backed up repo"); - Logger.LogSurround("\nBacking up keys..."); + StepLogger.LogSurround("\nBacking up keys..."); await CopyDirectory(keysPath, keysBackupPath); - Logger.LogSurround("Backed up keys"); + StepLogger.LogSurround("Backed up keys"); } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs index 5d8ea819..51e7a8ac 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs @@ -20,7 +20,7 @@ protected override Task ProcessExecute() { GitCommand(modpackPath, "git pull"); GitCommand(modpackPath, "git merge release"); GitCommand(modpackPath, "git push -u origin master"); - Logger.Log("Release branch merge to master complete"); + StepLogger.Log("Release branch merge to master complete"); } catch (Exception exception) { Warning($"Release branch merge to master failed:\n{exception}"); } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs index 0736ec9f..fe938c32 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs @@ -1,20 +1,21 @@ using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps { [BuildStep(NAME)] public class BuildStepPublish : BuildStep { public const string NAME = "Publish"; - private IReleaseService releaseService; + private IReleaseService _releaseService; protected override Task SetupExecute() { - releaseService = ServiceWrapper.Provider.GetService(); - Logger.Log("Retrieved services"); + _releaseService = ServiceProvider.GetService(); + StepLogger.Log("Retrieved services"); return Task.CompletedTask; } protected override async Task ProcessExecute() { - await releaseService.PublishRelease(Build.version); - Logger.Log("Release published"); + await _releaseService.PublishRelease(Build.Version); + StepLogger.Log("Release published"); } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs index b1b95ac3..6feec5c5 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs @@ -10,20 +10,20 @@ public class BuildStepReleaseKeys : FileBuildStep { protected override async Task SetupExecute() { string keysPath = Path.Join(GetBuildEnvironmentPath(), "Keys"); - Logger.LogSurround("Wiping release server keys folder"); + StepLogger.LogSurround("Wiping release server keys folder"); await DeleteDirectoryContents(keysPath); - Logger.LogSurround("Release server keys folder wiped"); + StepLogger.LogSurround("Release server keys folder wiped"); } protected override async Task ProcessExecute() { - Logger.Log("Copy RC keys to release keys folder"); + StepLogger.Log("Copy RC keys to release keys folder"); string keysPath = Path.Join(GetBuildEnvironmentPath(), "Keys"); string rcKeysPath = Path.Join(GetEnvironmentPath(GameEnvironment.RC), "Keys"); - Logger.LogSurround("\nCopying keys..."); + StepLogger.LogSurround("\nCopying keys..."); await CopyDirectory(rcKeysPath, keysPath); - Logger.LogSurround("Copied keys"); + StepLogger.LogSurround("Copied keys"); } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs index f6fbc50b..168b0c05 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs @@ -7,23 +7,23 @@ public class BuildStepRestore : FileBuildStep { public const string NAME = "Restore"; protected override async Task ProcessExecute() { - Logger.Log("Restoring previous release"); + StepLogger.Log("Restoring previous release"); string environmentPath = GetBuildEnvironmentPath(); string repoPath = Path.Join(environmentPath, "Repo"); string keysPath = Path.Join(environmentPath, "Keys"); string repoBackupPath = Path.Join(environmentPath, "Backup", "Repo"); string keysBackupPath = Path.Join(environmentPath, "Backup", "Keys"); - Logger.LogSurround("\nRestoring repo..."); + StepLogger.LogSurround("\nRestoring repo..."); await AddFiles(repoBackupPath, repoPath); await UpdateFiles(repoBackupPath, repoPath); await DeleteFiles(repoBackupPath, repoPath); - Logger.LogSurround("Restored repo"); + StepLogger.LogSurround("Restored repo"); - Logger.LogSurround("\nRestoring keys..."); + StepLogger.LogSurround("\nRestoring keys..."); await DeleteDirectoryContents(keysPath); await CopyDirectory(keysBackupPath, keysPath); - Logger.LogSurround("Restored keys"); + StepLogger.LogSurround("Restored keys"); } } } diff --git a/UKSF.Api.Modpack/Services/BuildsService.cs b/UKSF.Api.Modpack/Services/BuildsService.cs index 8974b109..a22cd91b 100644 --- a/UKSF.Api.Modpack/Services/BuildsService.cs +++ b/UKSF.Api.Modpack/Services/BuildsService.cs @@ -4,9 +4,9 @@ using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Services; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services.BuildProcess; using UKSF.Api.Modpack.Services.Data; @@ -32,17 +32,17 @@ public interface IBuildsService : IDataBackedService { } public class BuildsService : DataBackedService, IBuildsService { - private readonly IAccountService accountService; - private readonly IHttpContextService httpContextService; - private readonly ILogger logger; - private readonly IBuildStepService buildStepService; + private readonly IAccountService _accountService; + private readonly IHttpContextService _httpContextService; + private readonly ILogger _logger; + private readonly IBuildStepService _buildStepService; public BuildsService(IBuildsDataService data, IBuildStepService buildStepService, IAccountService accountService, IHttpContextService httpContextService, ILogger logger) : base(data) { - this.buildStepService = buildStepService; - this.accountService = accountService; - this.httpContextService = httpContextService; - this.logger = logger; + _buildStepService = buildStepService; + _accountService = accountService; + _httpContextService = httpContextService; + _logger = logger; } public async Task UpdateBuild(ModpackBuild build, UpdateDefinition updateDefinition) { @@ -53,24 +53,24 @@ public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep await Data.Update(build, buildStep); } - public IEnumerable GetDevBuilds() => Data.Get(x => x.environment == GameEnvironment.DEV); + public IEnumerable GetDevBuilds() => Data.Get(x => x.Environment == GameEnvironment.DEV); - public IEnumerable GetRcBuilds() => Data.Get(x => x.environment != GameEnvironment.DEV); + public IEnumerable GetRcBuilds() => Data.Get(x => x.Environment != GameEnvironment.DEV); public ModpackBuild GetLatestDevBuild() => GetDevBuilds().FirstOrDefault(); - public ModpackBuild GetLatestRcBuild(string version) => GetRcBuilds().FirstOrDefault(x => x.version == version); + public ModpackBuild GetLatestRcBuild(string version) => GetRcBuilds().FirstOrDefault(x => x.Version == version); public async Task CreateDevBuild(string version, GithubCommit commit, NewBuild newBuild = null) { ModpackBuild previousBuild = GetLatestDevBuild(); - string builderId = accountService.Data.GetSingle(x => x.email == commit.author)?.id; + string builderId = _accountService.Data.GetSingle(x => x.email == commit.Author)?.id; ModpackBuild build = new ModpackBuild { - version = version, - buildNumber = previousBuild?.buildNumber + 1 ?? 1, - environment = GameEnvironment.DEV, - commit = commit, - builderId = builderId, - steps = buildStepService.GetSteps(GameEnvironment.DEV) + Version = version, + BuildNumber = previousBuild?.BuildNumber + 1 ?? 1, + Environment = GameEnvironment.DEV, + Commit = commit, + BuilderId = builderId, + Steps = _buildStepService.GetSteps(GameEnvironment.DEV) }; if (previousBuild != null) { @@ -83,14 +83,14 @@ public async Task CreateDevBuild(string version, GithubCommit comm public async Task CreateRcBuild(string version, GithubCommit commit) { ModpackBuild previousBuild = GetLatestRcBuild(version); - string builderId = accountService.Data.GetSingle(x => x.email == commit.author)?.id; + string builderId = _accountService.Data.GetSingle(x => x.email == commit.Author)?.id; ModpackBuild build = new ModpackBuild { - version = version, - buildNumber = previousBuild?.buildNumber + 1 ?? 1, - environment = GameEnvironment.RC, - commit = commit, - builderId = builderId, - steps = buildStepService.GetSteps(GameEnvironment.RC) + Version = version, + BuildNumber = previousBuild?.BuildNumber + 1 ?? 1, + Environment = GameEnvironment.RC, + Commit = commit, + BuilderId = builderId, + Steps = _buildStepService.GetSteps(GameEnvironment.RC) }; if (previousBuild != null) { @@ -103,55 +103,55 @@ public async Task CreateRcBuild(string version, GithubCommit commi public async Task CreateReleaseBuild(string version) { // There must be at least one RC build to release - ModpackBuild previousBuild = GetRcBuilds().FirstOrDefault(x => x.version == version); + ModpackBuild previousBuild = GetRcBuilds().FirstOrDefault(x => x.Version == version); if (previousBuild == null) { throw new InvalidOperationException("Release build requires at leaste one RC build"); } ModpackBuild build = new ModpackBuild { - version = version, - buildNumber = previousBuild.buildNumber + 1, - environment = GameEnvironment.RELEASE, - commit = previousBuild.commit, - builderId = httpContextService.GetUserId(), - steps = buildStepService.GetSteps(GameEnvironment.RELEASE) + Version = version, + BuildNumber = previousBuild.BuildNumber + 1, + Environment = GameEnvironment.RELEASE, + Commit = previousBuild.Commit, + BuilderId = _httpContextService.GetUserId(), + Steps = _buildStepService.GetSteps(GameEnvironment.RELEASE) }; - build.commit.message = "Release deployment (no content changes)"; + build.Commit.Message = "Release deployment (no content changes)"; await Data.Add(build); return build; } public async Task CreateRebuild(ModpackBuild build, string newSha = "") { - ModpackBuild latestBuild = build.environment == GameEnvironment.DEV ? GetLatestDevBuild() : GetLatestRcBuild(build.version); + ModpackBuild latestBuild = build.Environment == GameEnvironment.DEV ? GetLatestDevBuild() : GetLatestRcBuild(build.Version); ModpackBuild rebuild = new ModpackBuild { - version = latestBuild.environment == GameEnvironment.DEV ? null : latestBuild.version, - buildNumber = latestBuild.buildNumber + 1, - isRebuild = true, - environment = latestBuild.environment, - steps = buildStepService.GetSteps(build.environment), - commit = latestBuild.commit, - builderId = httpContextService.GetUserId(), - environmentVariables = latestBuild.environmentVariables + Version = latestBuild.Environment == GameEnvironment.DEV ? null : latestBuild.Version, + BuildNumber = latestBuild.BuildNumber + 1, + IsRebuild = true, + Environment = latestBuild.Environment, + Steps = _buildStepService.GetSteps(build.Environment), + Commit = latestBuild.Commit, + BuilderId = _httpContextService.GetUserId(), + EnvironmentVariables = latestBuild.EnvironmentVariables }; if (!string.IsNullOrEmpty(newSha)) { - rebuild.commit.after = newSha; + rebuild.Commit.After = newSha; } - rebuild.commit.message = latestBuild.environment == GameEnvironment.RELEASE - ? $"Re-deployment of release {rebuild.version}" - : $"Rebuild of #{build.buildNumber}\n\n{rebuild.commit.message}"; + rebuild.Commit.Message = latestBuild.Environment == GameEnvironment.RELEASE + ? $"Re-deployment of release {rebuild.Version}" + : $"Rebuild of #{build.BuildNumber}\n\n{rebuild.Commit.Message}"; await Data.Add(rebuild); return rebuild; } public async Task SetBuildRunning(ModpackBuild build) { - build.running = true; - build.startTime = DateTime.Now; - await Data.Update(build, Builders.Update.Set(x => x.running, true).Set(x => x.startTime, DateTime.Now)); + build.Running = true; + build.StartTime = DateTime.Now; + await Data.Update(build, Builders.Update.Set(x => x.Running, true).Set(x => x.StartTime, DateTime.Now)); } public async Task SucceedBuild(ModpackBuild build) { - await FinishBuild(build, build.steps.Any(x => x.buildResult == ModpackBuildResult.WARNING) ? ModpackBuildResult.WARNING : ModpackBuildResult.SUCCESS); + await FinishBuild(build, build.Steps.Any(x => x.BuildResult == ModpackBuildResult.WARNING) ? ModpackBuildResult.WARNING : ModpackBuildResult.SUCCESS); } public async Task FailBuild(ModpackBuild build) { @@ -159,22 +159,22 @@ public async Task FailBuild(ModpackBuild build) { } public async Task CancelBuild(ModpackBuild build) { - await FinishBuild(build, build.steps.Any(x => x.buildResult == ModpackBuildResult.WARNING) ? ModpackBuildResult.WARNING : ModpackBuildResult.CANCELLED); + await FinishBuild(build, build.Steps.Any(x => x.BuildResult == ModpackBuildResult.WARNING) ? ModpackBuildResult.WARNING : ModpackBuildResult.CANCELLED); } public void CancelInterruptedBuilds() { - List builds = Data.Get(x => x.running || x.steps.Any(y => y.running)).ToList(); + List builds = Data.Get(x => x.Running || x.Steps.Any(y => y.Running)).ToList(); if (!builds.Any()) return; IEnumerable tasks = builds.Select( async build => { - ModpackBuildStep runningStep = build.steps.FirstOrDefault(x => x.running); + ModpackBuildStep runningStep = build.Steps.FirstOrDefault(x => x.Running); if (runningStep != null) { - runningStep.running = false; - runningStep.finished = true; - runningStep.endTime = DateTime.Now; - runningStep.buildResult = ModpackBuildResult.CANCELLED; - runningStep.logs.Add(new ModpackBuildStepLogItem { text = "\nBuild was interrupted", colour = "goldenrod" }); + runningStep.Running = false; + runningStep.Finished = true; + runningStep.EndTime = DateTime.Now; + runningStep.BuildResult = ModpackBuildResult.CANCELLED; + runningStep.Logs.Add(new ModpackBuildStepLogItem { Text = "\nBuild was interrupted", Colour = "goldenrod" }); await Data.Update(build, runningStep); } @@ -182,35 +182,35 @@ public void CancelInterruptedBuilds() { } ); _ = Task.WhenAll(tasks); - logger.LogAudit($"Marked {builds.Count} interrupted builds as cancelled", "SERVER"); + _logger.LogAudit($"Marked {builds.Count} interrupted builds as cancelled", "SERVER"); } private async Task FinishBuild(ModpackBuild build, ModpackBuildResult result) { - build.running = false; - build.finished = true; - build.buildResult = result; - build.endTime = DateTime.Now; - await Data.Update(build, Builders.Update.Set(x => x.running, false).Set(x => x.finished, true).Set(x => x.buildResult, result).Set(x => x.endTime, DateTime.Now)); + build.Running = false; + build.Finished = true; + build.BuildResult = result; + build.EndTime = DateTime.Now; + await Data.Update(build, Builders.Update.Set(x => x.Running, false).Set(x => x.Finished, true).Set(x => x.BuildResult, result).Set(x => x.EndTime, DateTime.Now)); } private static void SetEnvironmentVariables(ModpackBuild build, ModpackBuild previousBuild, NewBuild newBuild = null) { - CheckEnvironmentVariable(build, previousBuild, "ace_updated", "Build ACE", newBuild?.ace ?? false); - CheckEnvironmentVariable(build, previousBuild, "acre_updated", "Build ACRE", newBuild?.acre ?? false); - CheckEnvironmentVariable(build, previousBuild, "f35_updated", "Build F-35", newBuild?.f35 ?? false); + CheckEnvironmentVariable(build, previousBuild, "ace_updated", "Build ACE", newBuild?.Ace ?? false); + CheckEnvironmentVariable(build, previousBuild, "acre_updated", "Build ACRE", newBuild?.Acre ?? false); + CheckEnvironmentVariable(build, previousBuild, "f35_updated", "Build F-35", newBuild?.F35 ?? false); } private static void CheckEnvironmentVariable(ModpackBuild build, ModpackBuild previousBuild, string key, string stepName, bool force) { if (force) { - build.environmentVariables[key] = true; + build.EnvironmentVariables[key] = true; return; } - if (previousBuild.environmentVariables.ContainsKey(key)) { - bool updated = (bool) previousBuild.environmentVariables[key]; + if (previousBuild.EnvironmentVariables.ContainsKey(key)) { + bool updated = (bool) previousBuild.EnvironmentVariables[key]; if (updated) { - ModpackBuildStep step = previousBuild.steps.FirstOrDefault(x => x.name == stepName); - if (step != null && (!step.finished || step.buildResult == ModpackBuildResult.FAILED || step.buildResult == ModpackBuildResult.CANCELLED)) { - build.environmentVariables[key] = true; + ModpackBuildStep step = previousBuild.Steps.FirstOrDefault(x => x.Name == stepName); + if (step != null && (!step.Finished || step.BuildResult == ModpackBuildResult.FAILED || step.BuildResult == ModpackBuildResult.CANCELLED)) { + build.EnvironmentVariables[key] = true; } } } diff --git a/UKSF.Api.Modpack/Services/Data/BuildsDataService.cs b/UKSF.Api.Modpack/Services/Data/BuildsDataService.cs index fc3685c7..fe0b8883 100644 --- a/UKSF.Api.Modpack/Services/Data/BuildsDataService.cs +++ b/UKSF.Api.Modpack/Services/Data/BuildsDataService.cs @@ -2,10 +2,9 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Modpack.Models; namespace UKSF.Api.Modpack.Services.Data { @@ -19,12 +18,12 @@ public BuildsDataService(IDataCollectionFactory dataCollectionFactory, IDataEven protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { - Cache = newCollection?.OrderByDescending(x => x.buildNumber).ToList(); + Cache = newCollection?.OrderByDescending(x => x.BuildNumber).ToList(); } } public async Task Update(ModpackBuild build, ModpackBuildStep buildStep) { - UpdateDefinition updateDefinition = Builders.Update.Set(x => x.steps[buildStep.index], buildStep); + UpdateDefinition updateDefinition = Builders.Update.Set(x => x.Steps[buildStep.Index], buildStep); await base.Update(build.id, updateDefinition); DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, buildStep)); } diff --git a/UKSF.Api.Modpack/Services/Data/ReleasesDataService.cs b/UKSF.Api.Modpack/Services/Data/ReleasesDataService.cs index 67dbe412..666ce1a8 100644 --- a/UKSF.Api.Modpack/Services/Data/ReleasesDataService.cs +++ b/UKSF.Api.Modpack/Services/Data/ReleasesDataService.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Modpack.Models; namespace UKSF.Api.Modpack.Services.Data { @@ -15,7 +14,7 @@ protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { Cache = newCollection?.Select( x => { - int[] parts = x.version.Split('.').Select(int.Parse).ToArray(); + int[] parts = x.Version.Split('.').Select(int.Parse).ToArray(); return new { release = x, major = parts[0], minor = parts[1], patch = parts[2] }; } ) diff --git a/UKSF.Api.Modpack/Services/GithubService.cs b/UKSF.Api.Modpack/Services/GithubService.cs index b3d989d8..5bab641b 100644 --- a/UKSF.Api.Modpack/Services/GithubService.cs +++ b/UKSF.Api.Modpack/Services/GithubService.cs @@ -39,16 +39,16 @@ public class GithubService : IGithubService { private static readonly string[] LABELS_REMOVED = { "type/mod deletion" }; private static readonly string[] LABELS_EXCLUDE = { "type/cleanup", "type/by design", "fault/bi", "fault/other mod" }; - private readonly IConfiguration configuration; - private readonly ILogger logger; + private readonly IConfiguration _configuration; + private readonly ILogger _logger; public GithubService(IConfiguration configuration, ILogger logger) { - this.configuration = configuration; - this.logger = logger; + _configuration = configuration; + _logger = logger; } public bool VerifySignature(string signature, string body) { - string secret = configuration.GetSection("Github")["webhookSecret"]; + string secret = _configuration.GetSection("Github")["webhookSecret"]; byte[] data = Encoding.UTF8.GetBytes(body); byte[] secretData = Encoding.UTF8.GetBytes(secret); using HMACSHA1 hmac = new HMACSHA1(secretData); @@ -82,7 +82,7 @@ public async Task GetLatestReferenceCommit(string reference) { GitHubClient client = await GetAuthenticatedClient(); GitHubCommit commit = await client.Repository.Commit.Get(REPO_ORG, REPO_NAME, reference); string branch = Regex.Match(reference, @"^[a-fA-F0-9]{40}$").Success ? "None" : reference; - return new GithubCommit { branch = branch, before = commit.Parents.FirstOrDefault()?.Sha, after = commit.Sha, message = commit.Commit.Message, author = commit.Commit.Author.Email }; + return new GithubCommit { Branch = branch, Before = commit.Parents.FirstOrDefault()?.Sha, After = commit.Sha, Message = commit.Commit.Message, Author = commit.Commit.Author.Email }; } public async Task GetPushEvent(PushWebhookPayload payload, string latestCommit = "") { @@ -93,7 +93,7 @@ public async Task GetPushEvent(PushWebhookPayload payload, string GitHubClient client = await GetAuthenticatedClient(); CompareResult result = await client.Repository.Commit.Compare(REPO_ORG, REPO_NAME, latestCommit, payload.After); string message = result.Commits.Count > 0 ? CombineCommitMessages(result.Commits) : result.BaseCommit.Commit.Message; - return new GithubCommit { branch = payload.Ref, baseBranch = payload.BaseRef, before = payload.Before, after = payload.After, message = message, author = payload.HeadCommit.Author.Email }; + return new GithubCommit { Branch = payload.Ref, BaseBranch = payload.BaseRef, Before = payload.Before, After = payload.After, Message = message, Author = payload.HeadCommit.Author.Email }; } public async Task GenerateChangelog(string version) { @@ -133,15 +133,15 @@ public async Task PublishRelease(ModpackRelease release) { await client.Repository.Release.Create( REPO_ORG, REPO_NAME, - new NewRelease(release.version) { Name = $"Modpack Version {release.version}", Body = $"{release.description}\n\n## Changelog\n{release.changelog.Replace("
", "\n")}" } + new NewRelease(release.Version) { Name = $"Modpack Version {release.Version}", Body = $"{release.Description}\n\n## Changelog\n{release.Changelog.Replace("
", "\n")}" } ); - Milestone milestone = await GetOpenMilestone(release.version); + Milestone milestone = await GetOpenMilestone(release.Version); if (milestone != null) { await client.Issue.Milestone.Update(REPO_ORG, REPO_NAME, milestone.Number, new MilestoneUpdate { State = ItemState.Closed }); } } catch (Exception exception) { - logger.LogError(exception); + _logger.LogError(exception); } } @@ -176,7 +176,7 @@ public async Task> GetHistoricReleases() { GitHubClient client = await GetAuthenticatedClient(); IReadOnlyList releases = await client.Repository.Release.GetAll(REPO_ORG, "modpack"); - return releases.Select(x => new ModpackRelease { version = x.Name.Split(" ")[^1], timestamp = x.CreatedAt.DateTime, changelog = FormatChangelog(x.Body) }).ToList(); + return releases.Select(x => new ModpackRelease { Version = x.Name.Split(" ")[^1], Timestamp = x.CreatedAt.DateTime, Changelog = FormatChangelog(x.Body) }).ToList(); } private static string CombineCommitMessages(IReadOnlyCollection commits) { @@ -189,7 +189,7 @@ private async Task GetOpenMilestone(string version) { IReadOnlyList milestones = await client.Issue.Milestone.GetAllForRepository(REPO_ORG, REPO_NAME, new MilestoneRequest { State = ItemStateFilter.Open }); Milestone milestone = milestones.FirstOrDefault(x => x.Title == version); if (milestone == null) { - logger.LogWarning($"Could not find open milestone for version {version}"); + _logger.LogWarning($"Could not find open milestone for version {version}"); } return milestone; @@ -251,7 +251,7 @@ private async Task GetAuthenticatedClient() { } private string GetJwtToken() { - string privateKey = configuration.GetSection("Github")["appPrivateKey"].Replace("\n", Environment.NewLine, StringComparison.Ordinal); + string privateKey = _configuration.GetSection("Github")["appPrivateKey"].Replace("\n", Environment.NewLine, StringComparison.Ordinal); GitHubJwtFactory generator = new GitHubJwtFactory(new StringPrivateKeySource(privateKey), new GitHubJwtFactoryOptions { AppIntegrationId = APP_ID, ExpirationSeconds = 540 }); return generator.CreateEncodedJwtToken(); } diff --git a/UKSF.Api.Modpack/Services/ModpackService.cs b/UKSF.Api.Modpack/Services/ModpackService.cs index 91138a43..ed77a716 100644 --- a/UKSF.Api.Modpack/Services/ModpackService.cs +++ b/UKSF.Api.Modpack/Services/ModpackService.cs @@ -28,123 +28,123 @@ public interface IModpackService { } public class ModpackService : IModpackService { - private readonly IBuildQueueService buildQueueService; - private readonly IBuildsService buildsService; - private readonly IGithubService githubService; - private readonly IHttpContextService httpContextService; - private readonly ILogger logger; - private readonly IReleaseService releaseService; + private readonly IBuildQueueService _buildQueueService; + private readonly IBuildsService _buildsService; + private readonly IGithubService _githubService; + private readonly IHttpContextService _httpContextService; + private readonly ILogger _logger; + private readonly IReleaseService _releaseService; public ModpackService(IReleaseService releaseService, IBuildsService buildsService, IBuildQueueService buildQueueService, IGithubService githubService, IHttpContextService httpContextService, ILogger logger) { - this.releaseService = releaseService; - this.buildsService = buildsService; - this.buildQueueService = buildQueueService; - this.githubService = githubService; - this.httpContextService = httpContextService; - this.logger = logger; + _releaseService = releaseService; + _buildsService = buildsService; + _buildQueueService = buildQueueService; + _githubService = githubService; + _httpContextService = httpContextService; + _logger = logger; } - public IEnumerable GetReleases() => releaseService.Data.Get(); + public IEnumerable GetReleases() => _releaseService.Data.Get(); - public IEnumerable GetRcBuilds() => buildsService.GetRcBuilds(); + public IEnumerable GetRcBuilds() => _buildsService.GetRcBuilds(); - public IEnumerable GetDevBuilds() => buildsService.GetDevBuilds(); + public IEnumerable GetDevBuilds() => _buildsService.GetDevBuilds(); - public ModpackRelease GetRelease(string version) => releaseService.GetRelease(version); + public ModpackRelease GetRelease(string version) => _releaseService.GetRelease(version); - public ModpackBuild GetBuild(string id) => buildsService.Data.GetSingle(x => x.id == id); + public ModpackBuild GetBuild(string id) => _buildsService.Data.GetSingle(x => x.id == id); public async Task NewBuild(NewBuild newBuild) { - GithubCommit commit = await githubService.GetLatestReferenceCommit(newBuild.reference); - if (!string.IsNullOrEmpty(httpContextService.GetUserId())) { - commit.author = httpContextService.GetUserEmail(); + GithubCommit commit = await _githubService.GetLatestReferenceCommit(newBuild.Reference); + if (!string.IsNullOrEmpty(_httpContextService.GetUserId())) { + commit.Author = _httpContextService.GetUserEmail(); } - string version = await githubService.GetReferenceVersion(newBuild.reference); - ModpackBuild build = await buildsService.CreateDevBuild(version, commit, newBuild); - logger.LogAudit($"New build created ({GetBuildName(build)})"); - buildQueueService.QueueBuild(build); + string version = await _githubService.GetReferenceVersion(newBuild.Reference); + ModpackBuild build = await _buildsService.CreateDevBuild(version, commit, newBuild); + _logger.LogAudit($"New build created ({GetBuildName(build)})"); + _buildQueueService.QueueBuild(build); } public async Task Rebuild(ModpackBuild build) { - logger.LogAudit($"Rebuild triggered for {GetBuildName(build)}."); - ModpackBuild rebuild = await buildsService.CreateRebuild(build, build.commit.branch == "None" ? string.Empty : (await githubService.GetLatestReferenceCommit(build.commit.branch)).after); + _logger.LogAudit($"Rebuild triggered for {GetBuildName(build)}."); + ModpackBuild rebuild = await _buildsService.CreateRebuild(build, build.Commit.Branch == "None" ? string.Empty : (await _githubService.GetLatestReferenceCommit(build.Commit.Branch)).After); - buildQueueService.QueueBuild(rebuild); + _buildQueueService.QueueBuild(rebuild); } public async Task CancelBuild(ModpackBuild build) { - logger.LogAudit($"Build {GetBuildName(build)} cancelled"); + _logger.LogAudit($"Build {GetBuildName(build)} cancelled"); - if (buildQueueService.CancelQueued(build.id)) { - await buildsService.CancelBuild(build); + if (_buildQueueService.CancelQueued(build.id)) { + await _buildsService.CancelBuild(build); } else { - buildQueueService.Cancel(build.id); + _buildQueueService.Cancel(build.id); } } public async Task UpdateReleaseDraft(ModpackRelease release) { - logger.LogAudit($"Release {release.version} draft updated"); - await releaseService.UpdateDraft(release); + _logger.LogAudit($"Release {release.Version} draft updated"); + await _releaseService.UpdateDraft(release); } public async Task Release(string version) { - ModpackBuild releaseBuild = await buildsService.CreateReleaseBuild(version); - buildQueueService.QueueBuild(releaseBuild); + ModpackBuild releaseBuild = await _buildsService.CreateReleaseBuild(version); + _buildQueueService.QueueBuild(releaseBuild); - logger.LogAudit($"{version} released"); + _logger.LogAudit($"{version} released"); } public async Task RegnerateReleaseDraftChangelog(string version) { - ModpackRelease release = releaseService.GetRelease(version); - string newChangelog = await githubService.GenerateChangelog(version); - release.changelog = newChangelog; + ModpackRelease release = _releaseService.GetRelease(version); + string newChangelog = await _githubService.GenerateChangelog(version); + release.Changelog = newChangelog; - logger.LogAudit($"Release {version} draft changelog regenerated from github"); - await releaseService.UpdateDraft(release); + _logger.LogAudit($"Release {version} draft changelog regenerated from github"); + await _releaseService.UpdateDraft(release); } public async Task CreateDevBuildFromPush(PushWebhookPayload payload) { - GithubCommit devCommit = await githubService.GetPushEvent(payload); - string version = await githubService.GetReferenceVersion(payload.Ref); - ModpackBuild devBuild = await buildsService.CreateDevBuild(version, devCommit); - buildQueueService.QueueBuild(devBuild); + GithubCommit devCommit = await _githubService.GetPushEvent(payload); + string version = await _githubService.GetReferenceVersion(payload.Ref); + ModpackBuild devBuild = await _buildsService.CreateDevBuild(version, devCommit); + _buildQueueService.QueueBuild(devBuild); } public async Task CreateRcBuildFromPush(PushWebhookPayload payload) { - string rcVersion = await githubService.GetReferenceVersion(payload.Ref); - ModpackRelease release = releaseService.GetRelease(rcVersion); - if (release != null && !release.isDraft) { - logger.LogWarning($"An attempt to build a release candidate for version {rcVersion} failed because the version has already been released."); + string rcVersion = await _githubService.GetReferenceVersion(payload.Ref); + ModpackRelease release = _releaseService.GetRelease(rcVersion); + if (release != null && !release.IsDraft) { + _logger.LogWarning($"An attempt to build a release candidate for version {rcVersion} failed because the version has already been released."); return; } - ModpackBuild previousBuild = buildsService.GetLatestRcBuild(rcVersion); - GithubCommit rcCommit = await githubService.GetPushEvent(payload, previousBuild != null ? previousBuild.commit.after : string.Empty); + ModpackBuild previousBuild = _buildsService.GetLatestRcBuild(rcVersion); + GithubCommit rcCommit = await _githubService.GetPushEvent(payload, previousBuild != null ? previousBuild.Commit.After : string.Empty); if (previousBuild == null) { - await releaseService.MakeDraftRelease(rcVersion, rcCommit); + await _releaseService.MakeDraftRelease(rcVersion, rcCommit); } - ModpackBuild rcBuild = await buildsService.CreateRcBuild(rcVersion, rcCommit); - buildQueueService.QueueBuild(rcBuild); + ModpackBuild rcBuild = await _buildsService.CreateRcBuild(rcVersion, rcCommit); + _buildQueueService.QueueBuild(rcBuild); } public void RunQueuedBuilds() { - List builds = buildsService.GetDevBuilds().Where(x => !x.finished && !x.running).ToList(); - builds = builds.Concat(buildsService.GetRcBuilds().Where(x => !x.finished && !x.running)).ToList(); + List builds = _buildsService.GetDevBuilds().Where(x => !x.Finished && !x.Running).ToList(); + builds = builds.Concat(_buildsService.GetRcBuilds().Where(x => !x.Finished && !x.Running)).ToList(); if (!builds.Any()) return; foreach (ModpackBuild build in builds) { - buildQueueService.QueueBuild(build); + _buildQueueService.QueueBuild(build); } } private static string GetBuildName(ModpackBuild build) => - build.environment switch { - GameEnvironment.RELEASE => $"release {build.version}", - GameEnvironment.RC => $"{build.version} RC# {build.buildNumber}", - GameEnvironment.DEV => $"#{build.buildNumber}", + build.Environment switch { + GameEnvironment.RELEASE => $"release {build.Version}", + GameEnvironment.RC => $"{build.Version} RC# {build.BuildNumber}", + GameEnvironment.DEV => $"#{build.BuildNumber}", _ => throw new ArgumentException("Invalid build environment") }; } diff --git a/UKSF.Api.Modpack/Services/ReleaseService.cs b/UKSF.Api.Modpack/Services/ReleaseService.cs index 007d007c..e6f961a3 100644 --- a/UKSF.Api.Modpack/Services/ReleaseService.cs +++ b/UKSF.Api.Modpack/Services/ReleaseService.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services.Data; using UKSF.Api.Personnel.Services; @@ -19,28 +19,28 @@ public interface IReleaseService : IDataBackedService { } public class ReleaseService : DataBackedService, IReleaseService { - private readonly IAccountService accountService; - private readonly ILogger logger; - private readonly IGithubService githubService; + private readonly IAccountService _accountService; + private readonly ILogger _logger; + private readonly IGithubService _githubService; public ReleaseService(IReleasesDataService data, IGithubService githubService, IAccountService accountService, ILogger logger) : base(data) { - this.githubService = githubService; - this.accountService = accountService; - this.logger = logger; + _githubService = githubService; + _accountService = accountService; + _logger = logger; } public ModpackRelease GetRelease(string version) { - return Data.GetSingle(x => x.version == version); + return Data.GetSingle(x => x.Version == version); } public async Task MakeDraftRelease(string version, GithubCommit commit) { - string changelog = await githubService.GenerateChangelog(version); - string creatorId = accountService.Data.GetSingle(x => x.email == commit.author)?.id; - await Data.Add(new ModpackRelease { timestamp = DateTime.Now, version = version, changelog = changelog, isDraft = true, creatorId = creatorId }); + string changelog = await _githubService.GenerateChangelog(version); + string creatorId = _accountService.Data.GetSingle(x => x.email == commit.Author)?.id; + await Data.Add(new ModpackRelease { Timestamp = DateTime.Now, Version = version, Changelog = changelog, IsDraft = true, CreatorId = creatorId }); } public async Task UpdateDraft(ModpackRelease release) { - await Data.Update(release.id, Builders.Update.Set(x => x.description, release.description).Set(x => x.changelog, release.changelog)); + await Data.Update(release.id, Builders.Update.Set(x => x.Description, release.Description).Set(x => x.Changelog, release.Changelog)); } public async Task PublishRelease(string version) { @@ -49,20 +49,20 @@ public async Task PublishRelease(string version) { throw new NullReferenceException($"Could not find release {version}"); } - if (!release.isDraft) { - logger.LogWarning($"Attempted to release {version} again. Halting publish"); + if (!release.IsDraft) { + _logger.LogWarning($"Attempted to release {version} again. Halting publish"); } - release.changelog += release.changelog.EndsWith("\n\n") ? "
" : "\n\n
"; - release.changelog += "SR3 - Development Team
[Report and track issues here](https://github.com/uksf/modpack/issues)"; + release.Changelog += release.Changelog.EndsWith("\n\n") ? "
" : "\n\n
"; + release.Changelog += "SR3 - Development Team
[Report and track issues here](https://github.com/uksf/modpack/issues)"; - await Data.Update(release.id, Builders.Update.Set(x => x.timestamp, DateTime.Now).Set(x => x.isDraft, false).Set(x => x.changelog, release.changelog)); - await githubService.PublishRelease(release); + await Data.Update(release.id, Builders.Update.Set(x => x.Timestamp, DateTime.Now).Set(x => x.IsDraft, false).Set(x => x.Changelog, release.Changelog)); + await _githubService.PublishRelease(release); } public async Task AddHistoricReleases(IEnumerable releases) { IEnumerable existingReleases = Data.Get(); - foreach (ModpackRelease release in releases.Where(x => existingReleases.All(y => y.version != x.version))) { + foreach (ModpackRelease release in releases.Where(x => existingReleases.All(y => y.Version != x.Version))) { await Data.Add(release); } } diff --git a/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj b/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj index 4234b505..99e56cb5 100644 --- a/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj +++ b/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj @@ -8,6 +8,7 @@ + diff --git a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs index f563e7cd..ef46d843 100644 --- a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs +++ b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs @@ -2,23 +2,21 @@ using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.EventHandlers; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.ScheduledActions; using UKSF.Api.Personnel.Services; -using UKSF.Api.Personnel.Services.Data; using UKSF.Api.Personnel.Signalr.Hubs; namespace UKSF.Api.Personnel { public static class ApiPersonnelExtensions { public static IServiceCollection AddUksfPersonnel(this IServiceCollection services) => - services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddTransient(); + services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddActions().AddTransient(); private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton() .AddSingleton() - .AddSingleton() - .AddSingleton() .AddSingleton() .AddSingleton() .AddSingleton() @@ -28,7 +26,6 @@ private static IServiceCollection AddEventBuses(this IServiceCollection services services.AddSingleton, DataEventBus>() .AddSingleton, DataEventBus>() .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() .AddSingleton, DataEventBus>() .AddSingleton, DataEventBus>() .AddSingleton, DataEventBus>() @@ -44,8 +41,6 @@ private static IServiceCollection AddServices(this IServiceCollection services) services.AddSingleton() .AddTransient() .AddTransient() - .AddTransient() - .AddTransient() .AddTransient() .AddTransient() .AddTransient() @@ -53,6 +48,9 @@ private static IServiceCollection AddServices(this IServiceCollection services) .AddTransient() .AddTransient(); + private static IServiceCollection AddActions(this IServiceCollection services) => + services.AddSingleton().AddSingleton(); + public static void AddUksfPersonnelSignalr(this IEndpointRouteBuilder builder) { builder.MapHub($"/hub/{AccountHub.END_POINT}"); builder.MapHub($"/hub/{CommentThreadHub.END_POINT}"); diff --git a/UKSF.Api.Personnel/Services/Data/AccountDataService.cs b/UKSF.Api.Personnel/Context/AccountDataService.cs similarity index 78% rename from UKSF.Api.Personnel/Services/Data/AccountDataService.cs rename to UKSF.Api.Personnel/Context/AccountDataService.cs index 3c760369..85ab1470 100644 --- a/UKSF.Api.Personnel/Services/Data/AccountDataService.cs +++ b/UKSF.Api.Personnel/Context/AccountDataService.cs @@ -1,9 +1,8 @@ -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services.Data { +namespace UKSF.Api.Personnel.Context { public interface IAccountDataService : IDataService, ICachedDataService { } public class AccountDataService : CachedDataService, IAccountDataService { diff --git a/UKSF.Api.Personnel/Services/Data/CommentThreadDataService.cs b/UKSF.Api.Personnel/Context/CommentThreadDataService.cs similarity index 92% rename from UKSF.Api.Personnel/Services/Data/CommentThreadDataService.cs rename to UKSF.Api.Personnel/Context/CommentThreadDataService.cs index 2ed56141..05562c4e 100644 --- a/UKSF.Api.Personnel/Services/Data/CommentThreadDataService.cs +++ b/UKSF.Api.Personnel/Context/CommentThreadDataService.cs @@ -1,12 +1,11 @@ using System.Threading.Tasks; using MongoDB.Driver; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services.Data { +namespace UKSF.Api.Personnel.Context { public interface ICommentThreadDataService : IDataService, ICachedDataService { Task Update(string id, Comment comment, DataEventType updateType); } diff --git a/UKSF.Api.Personnel/Services/Data/ConfirmationCodeDataService.cs b/UKSF.Api.Personnel/Context/ConfirmationCodeDataService.cs similarity index 80% rename from UKSF.Api.Personnel/Services/Data/ConfirmationCodeDataService.cs rename to UKSF.Api.Personnel/Context/ConfirmationCodeDataService.cs index 4ecff51f..990241e9 100644 --- a/UKSF.Api.Personnel/Services/Data/ConfirmationCodeDataService.cs +++ b/UKSF.Api.Personnel/Context/ConfirmationCodeDataService.cs @@ -1,9 +1,8 @@ -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services.Data { +namespace UKSF.Api.Personnel.Context { public interface IConfirmationCodeDataService : IDataService { } public class ConfirmationCodeDataService : DataService, IConfirmationCodeDataService { diff --git a/UKSF.Api.Personnel/Services/Data/NotificationsDataService.cs b/UKSF.Api.Personnel/Context/NotificationsDataService.cs similarity index 80% rename from UKSF.Api.Personnel/Services/Data/NotificationsDataService.cs rename to UKSF.Api.Personnel/Context/NotificationsDataService.cs index 07069aec..dc4fae1b 100644 --- a/UKSF.Api.Personnel/Services/Data/NotificationsDataService.cs +++ b/UKSF.Api.Personnel/Context/NotificationsDataService.cs @@ -1,9 +1,8 @@ -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services.Data { +namespace UKSF.Api.Personnel.Context { public interface INotificationsDataService : IDataService, ICachedDataService { } public class NotificationsDataService : CachedDataService, INotificationsDataService { diff --git a/UKSF.Api.Personnel/Services/Data/RanksDataService.cs b/UKSF.Api.Personnel/Context/RanksDataService.cs similarity index 88% rename from UKSF.Api.Personnel/Services/Data/RanksDataService.cs rename to UKSF.Api.Personnel/Context/RanksDataService.cs index 4cef34b0..328dd45b 100644 --- a/UKSF.Api.Personnel/Services/Data/RanksDataService.cs +++ b/UKSF.Api.Personnel/Context/RanksDataService.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services.Data { +namespace UKSF.Api.Personnel.Context { public interface IRanksDataService : IDataService, ICachedDataService { new IEnumerable Get(); new Rank GetSingle(string name); diff --git a/UKSF.Api.Personnel/Services/Data/RolesDataService.cs b/UKSF.Api.Personnel/Context/RolesDataService.cs similarity index 88% rename from UKSF.Api.Personnel/Services/Data/RolesDataService.cs rename to UKSF.Api.Personnel/Context/RolesDataService.cs index 419159c7..bcb5513c 100644 --- a/UKSF.Api.Personnel/Services/Data/RolesDataService.cs +++ b/UKSF.Api.Personnel/Context/RolesDataService.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services.Data { +namespace UKSF.Api.Personnel.Context { public interface IRolesDataService : IDataService, ICachedDataService { new IEnumerable Get(); new Role GetSingle(string name); diff --git a/UKSF.Api.Personnel/Services/Data/UnitsDataService.cs b/UKSF.Api.Personnel/Context/UnitsDataService.cs similarity index 85% rename from UKSF.Api.Personnel/Services/Data/UnitsDataService.cs rename to UKSF.Api.Personnel/Context/UnitsDataService.cs index dcba6c10..6fdee22a 100644 --- a/UKSF.Api.Personnel/Services/Data/UnitsDataService.cs +++ b/UKSF.Api.Personnel/Context/UnitsDataService.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; using System.Linq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services.Data { +namespace UKSF.Api.Personnel.Context { public interface IUnitsDataService : IDataService, ICachedDataService { } public class UnitsDataService : CachedDataService, IUnitsDataService { diff --git a/UKSF.Api.Personnel/Controllers/AccountsController.cs b/UKSF.Api.Personnel/Controllers/AccountsController.cs index f04d4e60..309a61ce 100644 --- a/UKSF.Api.Personnel/Controllers/AccountsController.cs +++ b/UKSF.Api.Personnel/Controllers/AccountsController.cs @@ -158,6 +158,7 @@ public IEnumerable GetRosterAccounts() { return accountObjects; } + // TODO: This should be a teamspeak endpoint [HttpGet("online")] public IActionResult GetOnlineAccounts() { IEnumerable teamnspeakClients = teamspeakService.GetOnlineTeamspeakClients(); @@ -201,6 +202,7 @@ public IActionResult CheckUsernameOrEmailExists([FromQuery] string check) { return Ok(accountService.Data.Get().Any(x => string.Equals(x.email, check, StringComparison.InvariantCultureIgnoreCase)) ? new { exists = true } : new { exists = false }); } + // TODO: Could use an account data update event handler [HttpPut("name"), Authorize] public async Task ChangeName([FromBody] JObject changeNameRequest) { Account account = accountService.GetUserAccount(); diff --git a/UKSF.Api.Personnel/Controllers/CommunicationsController.cs b/UKSF.Api.Personnel/Controllers/CommunicationsController.cs index ba961a73..fa9b07f1 100644 --- a/UKSF.Api.Personnel/Controllers/CommunicationsController.cs +++ b/UKSF.Api.Personnel/Controllers/CommunicationsController.cs @@ -89,6 +89,7 @@ await notificationsService.SendTeamspeakNotification( return Ok(); } + // TODO: Should be part of teamspeak component private async Task ReceiveTeamspeakCode(string id, string code, string checkId) { Account account = accountService.Data.GetSingle(id); string teamspeakId = await confirmationCodeService.GetConfirmationCode(code); diff --git a/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs b/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs index 5d194b4b..d6552c7e 100644 --- a/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs +++ b/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs @@ -25,6 +25,7 @@ public DiscordCodeController(IConfirmationCodeService confirmationCodeService, I this.logger = logger; } + // TODO: Could use an account data update event handler [HttpPost("{discordId}"), Authorize] public async Task DiscordConnect(string discordId, [FromBody] JObject body) { string value = await confirmationCodeService.GetConfirmationCode(body["code"].ToString()); diff --git a/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs b/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs index e045eca4..1e1287a6 100644 --- a/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs +++ b/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs @@ -8,7 +8,10 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Newtonsoft.Json.Linq; +using UKSF.Api.Admin.Extensions; +using UKSF.Api.Admin.Services; using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Services; namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] diff --git a/UKSF.Api.Personnel/Controllers/NotificationsController.cs b/UKSF.Api.Personnel/Controllers/NotificationsController.cs index 3013452b..b2d9bb31 100644 --- a/UKSF.Api.Personnel/Controllers/NotificationsController.cs +++ b/UKSF.Api.Personnel/Controllers/NotificationsController.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; +using UKSF.Api.Personnel.Services; namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] diff --git a/UKSF.Api.Personnel/Controllers/RanksController.cs b/UKSF.Api.Personnel/Controllers/RanksController.cs index 192e0224..a14f66f5 100644 --- a/UKSF.Api.Personnel/Controllers/RanksController.cs +++ b/UKSF.Api.Personnel/Controllers/RanksController.cs @@ -7,6 +7,7 @@ using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using Notification = UKSF.Api.Personnel.Models.Notification; namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] diff --git a/UKSF.Api.Personnel/Controllers/RolesController.cs b/UKSF.Api.Personnel/Controllers/RolesController.cs index 7c492f2f..bfd1be4a 100644 --- a/UKSF.Api.Personnel/Controllers/RolesController.cs +++ b/UKSF.Api.Personnel/Controllers/RolesController.cs @@ -7,6 +7,7 @@ using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using Notification = UKSF.Api.Personnel.Models.Notification; using Unit = UKSF.Api.Personnel.Models.Unit; namespace UKSF.Api.Personnel.Controllers { diff --git a/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs b/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs index 2c011a4e..731627c4 100644 --- a/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs +++ b/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Hosting; +using UKSF.Api.Personnel.Services; namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] diff --git a/UKSF.Api.Personnel/Controllers/UnitsController.cs b/UKSF.Api.Personnel/Controllers/UnitsController.cs index e723147f..dbe764ff 100644 --- a/UKSF.Api.Personnel/Controllers/UnitsController.cs +++ b/UKSF.Api.Personnel/Controllers/UnitsController.cs @@ -118,6 +118,7 @@ public async Task AddUnit([FromBody] Unit unit) { return Ok(); } + // TODO: Could use an account data update event handler [HttpPut("{id}"), Authorize] public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit) { Unit oldUnit = unitsService.Data.GetSingle(x => x.id == id); diff --git a/UKSF.Api.Personnel/ScheduledActions/DeleteExpiredConfirmationCodeAction.cs b/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs similarity index 61% rename from UKSF.Api.Personnel/ScheduledActions/DeleteExpiredConfirmationCodeAction.cs rename to UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs index 1fa66356..e3f0f77a 100644 --- a/UKSF.Api.Personnel/ScheduledActions/DeleteExpiredConfirmationCodeAction.cs +++ b/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs @@ -1,21 +1,21 @@ using System; +using UKSF.Api.Base.ScheduledActions; using UKSF.Api.Personnel.Services; -using UKSF.Api.Utility.ScheduledActions; namespace UKSF.Api.Personnel.ScheduledActions { - public interface IDeleteExpiredConfirmationCodeAction : IScheduledAction { } + public interface IActionDeleteExpiredConfirmationCode : IScheduledAction { } - public class DeleteExpiredConfirmationCodeAction : IDeleteExpiredConfirmationCodeAction { - public const string ACTION_NAME = nameof(DeleteExpiredConfirmationCodeAction); + public class ActionDeleteExpiredConfirmationCode : IActionDeleteExpiredConfirmationCode { + public const string ACTION_NAME = nameof(ActionDeleteExpiredConfirmationCode); private readonly IConfirmationCodeService confirmationCodeService; - public DeleteExpiredConfirmationCodeAction(IConfirmationCodeService confirmationCodeService) => this.confirmationCodeService = confirmationCodeService; + public ActionDeleteExpiredConfirmationCode(IConfirmationCodeService confirmationCodeService) => this.confirmationCodeService = confirmationCodeService; public string Name => ACTION_NAME; public void Run(params object[] parameters) { - if (parameters.Length == 0) throw new ArgumentException("DeleteExpiredConfirmationCode action requires an id to be passed as a parameter"); + if (parameters.Length == 0) throw new ArgumentException("DeleteExpiredConfirmationCode action requires an id to be passed as a parameter, but no paramters were passed"); string id = parameters[0].ToString(); confirmationCodeService.Data.Delete(id); } diff --git a/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs b/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs new file mode 100644 index 00000000..4335d169 --- /dev/null +++ b/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs @@ -0,0 +1,38 @@ +using System; +using System.Threading.Tasks; +using UKSF.Api.Base.ScheduledActions; +using UKSF.Api.Base.Services; +using UKSF.Api.Personnel.Context; + +namespace UKSF.Api.Personnel.ScheduledActions { + public interface IActionPruneNotifications : ISelfCreatingScheduledAction { } + + public class ActionPruneNotifications : IActionPruneNotifications { + public const string ACTION_NAME = nameof(ActionPruneNotifications); + + private readonly IClock clock; + private readonly INotificationsDataService notificationsDataService; + private readonly ISchedulerService schedulerService; + + public ActionPruneNotifications(INotificationsDataService notificationsDataService, ISchedulerService schedulerService, IClock clock) { + this.notificationsDataService = notificationsDataService; + this.schedulerService = schedulerService; + this.clock = clock; + } + + public string Name => ACTION_NAME; + + public void Run(params object[] parameters) { + DateTime now = clock.UtcNow(); + Task notificationsTask = notificationsDataService.DeleteMany(x => x.timestamp < now.AddMonths(-1)); + + Task.WaitAll(notificationsTask); + } + + public async Task CreateSelf() { + if (schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + await schedulerService.CreateScheduledJob(clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); + } + } + } +} diff --git a/UKSF.Api.Personnel/Services/AccountService.cs b/UKSF.Api.Personnel/Services/AccountService.cs index 2692ef42..d6d855e2 100644 --- a/UKSF.Api.Personnel/Services/AccountService.cs +++ b/UKSF.Api.Personnel/Services/AccountService.cs @@ -1,7 +1,7 @@ -using UKSF.Api.Base.Services; -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Base.Context; +using UKSF.Api.Base.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services.Data; namespace UKSF.Api.Personnel.Services { public interface IAccountService : IDataBackedService { diff --git a/UKSF.Api.Personnel/Services/AssignmentService.cs b/UKSF.Api.Personnel/Services/AssignmentService.cs index 96a562c9..4ce350d8 100644 --- a/UKSF.Api.Personnel/Services/AssignmentService.cs +++ b/UKSF.Api.Personnel/Services/AssignmentService.cs @@ -118,11 +118,11 @@ public async Task UnassignUnit(string id, string unitId) { await UpdateGroupsAndRoles(unitId); } + // TODO: teamspeak and discord should probably be updated for account update events, or a separate assignment event bus could be used public async Task UpdateGroupsAndRoles(string id) { Account account = accountService.Data.GetSingle(id); await teamspeakService.UpdateAccountTeamspeakGroups(account); await discordService.UpdateAccount(account); - // serverService.UpdateSquadXml(); await accountHub.Clients.Group(id).ReceiveAccountUpdate(); } diff --git a/UKSF.Api.Personnel/Services/CommentThreadService.cs b/UKSF.Api.Personnel/Services/CommentThreadService.cs index 5b3df9a2..d58ff74d 100644 --- a/UKSF.Api.Personnel/Services/CommentThreadService.cs +++ b/UKSF.Api.Personnel/Services/CommentThreadService.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Models; -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services.Data; namespace UKSF.Api.Personnel.Services { public interface ICommentThreadService : IDataBackedService { diff --git a/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs b/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs index bd706d5a..e5a0a910 100644 --- a/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs +++ b/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.Threading.Tasks; using Newtonsoft.Json; -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Base.Context; +using UKSF.Api.Base.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.ScheduledActions; -using UKSF.Api.Personnel.Services.Data; -using UKSF.Api.Utility.Services; namespace UKSF.Api.Personnel.Services { public interface IConfirmationCodeService : IDataBackedService { @@ -24,7 +24,7 @@ public async Task CreateConfirmationCode(string value) { if (string.IsNullOrEmpty(value)) throw new ArgumentNullException(nameof(value), "Value for confirmation code cannot be null or empty"); ConfirmationCode code = new ConfirmationCode { value = value }; await Data.Add(code); - await schedulerService.CreateAndSchedule(DateTime.Now.AddMinutes(30), TimeSpan.Zero, DeleteExpiredConfirmationCodeAction.ACTION_NAME, code.id); + await schedulerService.CreateAndScheduleJob(DateTime.Now.AddMinutes(30), TimeSpan.Zero, ActionDeleteExpiredConfirmationCode.ACTION_NAME, code.id); return code.id; } diff --git a/UKSF.Api.Personnel/Services/NotificationsService.cs b/UKSF.Api.Personnel/Services/NotificationsService.cs index 72919d9f..d5c48233 100644 --- a/UKSF.Api.Personnel/Services/NotificationsService.cs +++ b/UKSF.Api.Personnel/Services/NotificationsService.cs @@ -3,10 +3,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Services; -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services.Data; using UKSF.Api.Personnel.Signalr.Clients; using UKSF.Api.Personnel.Signalr.Hubs; @@ -29,6 +29,7 @@ public class NotificationsService : DataBackedService private readonly ITeamspeakService teamspeakService; + // TODO: Need to use an event bus to place notifications on, which individual components can then retrieve and handle. Notif events should be typed for identity public NotificationsService(INotificationsDataService data, ITeamspeakService teamspeakService, IAccountService accountService, IEmailService emailService, IHubContext notificationsHub, IHttpContextService httpContextService, IObjectIdConversionService objectIdConversionService) : base(data) { this.teamspeakService = teamspeakService; this.accountService = accountService; diff --git a/UKSF.Api.Personnel/Services/RanksService.cs b/UKSF.Api.Personnel/Services/RanksService.cs index 59900524..4a7c6ae5 100644 --- a/UKSF.Api.Personnel/Services/RanksService.cs +++ b/UKSF.Api.Personnel/Services/RanksService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Base.Context; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services.Data; namespace UKSF.Api.Personnel.Services { public interface IRanksService : IDataBackedService { diff --git a/UKSF.Api.Personnel/Services/RecruitmentService.cs b/UKSF.Api.Personnel/Services/RecruitmentService.cs index cf557eeb..b2df7eae 100644 --- a/UKSF.Api.Personnel/Services/RecruitmentService.cs +++ b/UKSF.Api.Personnel/Services/RecruitmentService.cs @@ -29,14 +29,12 @@ public class RecruitmentService : IRecruitmentService { private readonly IHttpContextService httpContextService; private readonly IDiscordService discordService; private readonly IDisplayNameService displayNameService; - private readonly ITeamspeakMetricsService metricsService; private readonly IRanksService ranksService; private readonly ITeamspeakService teamspeakService; private readonly IUnitsService unitsService; private readonly IVariablesService variablesService; public RecruitmentService( - ITeamspeakMetricsService metricsService, IAccountService accountService, IHttpContextService httpContextService, IDisplayNameService displayNameService, @@ -48,8 +46,6 @@ IVariablesService variablesService ) { this.accountService = accountService; this.httpContextService = httpContextService; - - this.metricsService = metricsService; this.displayNameService = displayNameService; this.ranksService = ranksService; this.teamspeakService = teamspeakService; @@ -109,7 +105,6 @@ public JObject GetApplication(Account account) { daysProcessed = Math.Ceiling((account.application.dateAccepted - account.application.dateCreated).TotalDays), nextCandidateOp = GetNextCandidateOp(), averageProcessingTime = GetAverageProcessingTime(), - teamspeakParticipation = metricsService.GetWeeklyParticipationTrend(account.teamspeakIdentities) + "%", steamprofile = "http://steamcommunity.com/profiles/" + account.steamname, recruiter = displayNameService.GetDisplayName(recruiterAccount), recruiterId = recruiterAccount.id @@ -190,6 +185,7 @@ private JObject GetWaitingApplication(Account account) { ); } + // TODO: Should probably be individual endpoints in relevant components private (bool tsOnline, string tsNickname, bool discordOnline, string discordNickname) GetOnlineUserDetails(Account account) { (bool tsOnline, string tsNickname) = teamspeakService.GetOnlineUserDetails(account); (bool discordOnline, string discordNickname) = discordService.GetOnlineUserDetails(account); diff --git a/UKSF.Api.Personnel/Services/RolesService.cs b/UKSF.Api.Personnel/Services/RolesService.cs index ec9a27d0..b02e7848 100644 --- a/UKSF.Api.Personnel/Services/RolesService.cs +++ b/UKSF.Api.Personnel/Services/RolesService.cs @@ -1,6 +1,6 @@ -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Base.Context; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services.Data; namespace UKSF.Api.Personnel.Services { public interface IRolesService : IDataBackedService { diff --git a/UKSF.Api.Personnel/Services/UnitsService.cs b/UKSF.Api.Personnel/Services/UnitsService.cs index fd65eed4..87f817e9 100644 --- a/UKSF.Api.Personnel/Services/UnitsService.cs +++ b/UKSF.Api.Personnel/Services/UnitsService.cs @@ -4,9 +4,9 @@ using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Base.Context; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services.Data; namespace UKSF.Api.Personnel.Services { public interface IUnitsService : IDataBackedService { diff --git a/UKSF.Api.Utility/ApiUtilityExtensions.cs b/UKSF.Api.Utility/ApiUtilityExtensions.cs index 5f7bf923..5e159c28 100644 --- a/UKSF.Api.Utility/ApiUtilityExtensions.cs +++ b/UKSF.Api.Utility/ApiUtilityExtensions.cs @@ -1,8 +1,8 @@ using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Utility.Models; -using UKSF.Api.Utility.Services; -using UKSF.Api.Utility.Services.Data; +using UKSF.Api.Base.Models; +using UKSF.Api.Base.Services; namespace UKSF.Api.Utility { public static class ApiUtilityExtensions { diff --git a/UKSF.Api.Utility/ScheduledActions/PruneDataAction.cs b/UKSF.Api.Utility/ScheduledActions/PruneDataAction.cs deleted file mode 100644 index 4e8409ad..00000000 --- a/UKSF.Api.Utility/ScheduledActions/PruneDataAction.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Reactive; -using System.Threading.Tasks; -using UKSF.Api.Base.Database; -using UKSF.Api.Base.Models.Logging; - -namespace UKSF.Api.Utility.ScheduledActions { - public interface IPruneDataAction : IScheduledAction { } - - public class PruneDataAction : IPruneDataAction { - public const string ACTION_NAME = nameof(PruneDataAction); - - private readonly IDataCollectionFactory dataCollectionFactory; - - public PruneDataAction(IDataCollectionFactory dataCollectionFactory) => this.dataCollectionFactory = dataCollectionFactory; - - public string Name => ACTION_NAME; - - public void Run(params object[] parameters) { - DateTime now = DateTime.Now; - Task logsTask = dataCollectionFactory.CreateDataCollection("logs").DeleteManyAsync(x => x.timestamp < now.AddDays(-7)); - Task errorLogsTask = dataCollectionFactory.CreateDataCollection("errorLogs").DeleteManyAsync(x => x.timestamp < now.AddDays(-7)); - Task auditLogsTask = dataCollectionFactory.CreateDataCollection("auditLogs").DeleteManyAsync(x => x.timestamp < now.AddMonths(-3)); - Task notificationsTask = dataCollectionFactory.CreateDataCollection("notifications").DeleteManyAsync(x => x.timestamp < now.AddMonths(-1)); - - IDataCollection buildsData = dataCollectionFactory.CreateDataCollection("modpackBuilds"); - int threshold = buildsData.Get(x => x.environment == GameEnvironment.DEV).Select(x => x.buildNumber).OrderByDescending(x => x).First() - 100; - Task modpackBuildsTask = buildsData.DeleteManyAsync(x => x.buildNumber < threshold); - - Task.WaitAll(logsTask, errorLogsTask, auditLogsTask, notificationsTask, modpackBuildsTask); - } - } -} diff --git a/UKSF.Api.Utility/UKSF.Api.Utility.csproj b/UKSF.Api.Utility/UKSF.Api.Utility.csproj index ded27b7c..70ff7ae3 100644 --- a/UKSF.Api.Utility/UKSF.Api.Utility.csproj +++ b/UKSF.Api.Utility/UKSF.Api.Utility.csproj @@ -13,4 +13,11 @@ + + + + + + + diff --git a/UKSF.Api.sln b/UKSF.Api.sln index 16544d10..31982a5e 100644 --- a/UKSF.Api.sln +++ b/UKSF.Api.sln @@ -20,8 +20,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Auth", "UKSF.Api.A EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Admin", "UKSF.Api.Admin\UKSF.Api.Admin.csproj", "{A5A39B9A-E747-470A-853C-FBDE39BE4C0F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Utility", "UKSF.Api.Utility\UKSF.Api.Utility.csproj", "{41EE475A-438A-4715-9FD8-8B5D44179F5F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Personnel", "UKSF.Api.Personnel\UKSF.Api.Personnel.csproj", "{213E4782-D069-4C1E-AA2C-025CF6573C40}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Command", "UKSF.Api.Command\UKSF.Api.Command.csproj", "{5CD118FD-9B31-4D1D-B355-212A71D2D5D3}" @@ -96,14 +94,6 @@ Global {A5A39B9A-E747-470A-853C-FBDE39BE4C0F}.Release|x64.Build.0 = Release|Any CPU {A5A39B9A-E747-470A-853C-FBDE39BE4C0F}.Release|x86.ActiveCfg = Release|Any CPU {A5A39B9A-E747-470A-853C-FBDE39BE4C0F}.Release|x86.Build.0 = Release|Any CPU - {41EE475A-438A-4715-9FD8-8B5D44179F5F}.Debug|x64.ActiveCfg = Debug|Any CPU - {41EE475A-438A-4715-9FD8-8B5D44179F5F}.Debug|x64.Build.0 = Debug|Any CPU - {41EE475A-438A-4715-9FD8-8B5D44179F5F}.Debug|x86.ActiveCfg = Debug|Any CPU - {41EE475A-438A-4715-9FD8-8B5D44179F5F}.Debug|x86.Build.0 = Debug|Any CPU - {41EE475A-438A-4715-9FD8-8B5D44179F5F}.Release|x64.ActiveCfg = Release|Any CPU - {41EE475A-438A-4715-9FD8-8B5D44179F5F}.Release|x64.Build.0 = Release|Any CPU - {41EE475A-438A-4715-9FD8-8B5D44179F5F}.Release|x86.ActiveCfg = Release|Any CPU - {41EE475A-438A-4715-9FD8-8B5D44179F5F}.Release|x86.Build.0 = Release|Any CPU {213E4782-D069-4C1E-AA2C-025CF6573C40}.Debug|x64.ActiveCfg = Debug|Any CPU {213E4782-D069-4C1E-AA2C-025CF6573C40}.Debug|x64.Build.0 = Debug|Any CPU {213E4782-D069-4C1E-AA2C-025CF6573C40}.Debug|x86.ActiveCfg = Debug|Any CPU diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index d37bdb99..cfb06502 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -361,8 +361,8 @@ <Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /> <Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /> <Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> - <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /> + <Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /> <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /> diff --git a/UKSF.Api/AppStart/StartServices.cs b/UKSF.Api/AppStart/StartServices.cs index 5c3e82d2..0efefc0c 100644 --- a/UKSF.Api/AppStart/StartServices.cs +++ b/UKSF.Api/AppStart/StartServices.cs @@ -4,13 +4,13 @@ using MoreLinq; using UKSF.Api.Admin.Services; using UKSF.Api.Base.Events; -using UKSF.Api.Interfaces.Integrations; -using UKSF.Api.Interfaces.Integrations.Teamspeak; -using UKSF.Api.Interfaces.Modpack; -using UKSF.Api.Interfaces.Modpack.BuildProcess; +using UKSF.Api.Base.ScheduledActions; +using UKSF.Api.Base.Services; +using UKSF.Api.Discord.Services; +using UKSF.Api.Modpack.Services; +using UKSF.Api.Modpack.Services.BuildProcess; using UKSF.Api.Services; -using UKSF.Api.Utility.ScheduledActions; -using UKSF.Api.Utility.Services; +using UKSF.Api.Teamspeak.Services; namespace UKSF.Api.AppStart { public static class StartServices { @@ -26,8 +26,9 @@ public static void StartUksfServices(this IServiceProvider serviceProvider) { // Warm cached data services serviceProvider.GetService()?.InvalidateCachedData(); - // Register scheduled actions - serviceProvider.GetService()?.RegisterScheduledActions(serviceProvider.GetServices()); + // Register scheduled actions & run self-creating scheduled actions + serviceProvider.GetService()?.RegisterScheduledActions(serviceProvider.GetServices()); + serviceProvider.GetServices().ForEach(x => x.CreateSelf()); // Register build steps serviceProvider.GetService()?.RegisterBuildSteps(); diff --git a/UKSF.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs index d6cbe53c..bcc3d3f7 100644 --- a/UKSF.Api/Controllers/LoaController.cs +++ b/UKSF.Api/Controllers/LoaController.cs @@ -95,11 +95,11 @@ public IActionResult Get([FromQuery] string scope = "you") { [HttpDelete("{id}"), Authorize] public async Task DeleteLoa(string id) { Loa loa = loaService.Data.GetSingle(id); - CommandRequest request = commandRequestService.Data.GetSingle(x => x.value == id); + CommandRequest request = commandRequestService.Data.GetSingle(x => x.Value == id); if (request != null) { await commandRequestService.Data.Delete(request); - foreach (string reviewerId in request.reviews.Keys.Where(x => x != request.requester)) { - notificationsService.Add(new Notification {owner = reviewerId, icon = NotificationIcons.REQUEST, message = $"Your review for {request.displayRequester}'s LOA is no longer required as they deleted their LOA", link = "/command/requests"}); + foreach (string reviewerId in request.Reviews.Keys.Where(x => x != request.Requester)) { + notificationsService.Add(new Notification {owner = reviewerId, icon = NotificationIcons.REQUEST, message = $"Your review for {request.DisplayRequester}'s LOA is no longer required as they deleted their LOA", link = "/command/requests"}); } logger.LogAudit($"Loa request deleted for '{displayNameService.GetDisplayName(accountService.Data.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); diff --git a/UKSF.Api/Controllers/LoggingController.cs b/UKSF.Api/Controllers/LoggingController.cs index 8eb14265..dded4656 100644 --- a/UKSF.Api/Controllers/LoggingController.cs +++ b/UKSF.Api/Controllers/LoggingController.cs @@ -2,8 +2,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using UKSF.Api.Base; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Models.Logging; -using UKSF.Api.Base.Services.Data; namespace UKSF.Api.Controllers { [Route("[controller]"), Permissions(Permissions.ADMIN)] diff --git a/UKSF.Api/EventHandlers/LoggerEventHandler.cs b/UKSF.Api/EventHandlers/LoggerEventHandler.cs index c277a5aa..6d9fcf1a 100644 --- a/UKSF.Api/EventHandlers/LoggerEventHandler.cs +++ b/UKSF.Api/EventHandlers/LoggerEventHandler.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models.Logging; -using UKSF.Api.Base.Services.Data; using UKSF.Api.Personnel.Services; using UKSF.Api.Services; diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index db11818c..1faf075e 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -39,6 +39,7 @@ + diff --git a/UKSF.Tests/Common/ITestCachedDataService.cs b/UKSF.Tests/Common/ITestCachedDataService.cs index 6f40eb1a..e0077ff1 100644 --- a/UKSF.Tests/Common/ITestCachedDataService.cs +++ b/UKSF.Tests/Common/ITestCachedDataService.cs @@ -1,4 +1,4 @@ -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Base.Context; namespace UKSF.Tests.Common { public interface ITestCachedDataService : IDataService { } diff --git a/UKSF.Tests/Common/ITestDataService.cs b/UKSF.Tests/Common/ITestDataService.cs index c775fcfa..d0bdfb32 100644 --- a/UKSF.Tests/Common/ITestDataService.cs +++ b/UKSF.Tests/Common/ITestDataService.cs @@ -1,4 +1,4 @@ -using UKSF.Api.Base.Services.Data; +using UKSF.Api.Base.Context; namespace UKSF.Tests.Common { public interface ITestDataService : IDataService { } diff --git a/UKSF.Tests/Common/TestCachedDataService.cs b/UKSF.Tests/Common/TestCachedDataService.cs index b5939902..18748cd2 100644 --- a/UKSF.Tests/Common/TestCachedDataService.cs +++ b/UKSF.Tests/Common/TestCachedDataService.cs @@ -1,6 +1,5 @@ -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; namespace UKSF.Tests.Common { public class TestCachedDataService : CachedDataService, ITestCachedDataService { diff --git a/UKSF.Tests/Common/TestDataService.cs b/UKSF.Tests/Common/TestDataService.cs index 2833d12e..28cbab42 100644 --- a/UKSF.Tests/Common/TestDataService.cs +++ b/UKSF.Tests/Common/TestDataService.cs @@ -1,6 +1,5 @@ -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services.Data; namespace UKSF.Tests.Common { public class TestDataService : DataService, ITestDataService { diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index dc1ef1e3..28f97c3e 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -6,7 +6,7 @@ using Mongo2Go; using MongoDB.Bson; using MongoDB.Driver; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Personnel.Models; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs index 4c6cabe8..2ec13f93 100644 --- a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs @@ -5,9 +5,9 @@ using FluentAssertions; using MongoDB.Driver; using Moq; +using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Models; -using UKSF.Api.Admin.Services.Data; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using Xunit; diff --git a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs index 31dfd763..0bfb96f2 100644 --- a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs @@ -6,7 +6,7 @@ using FluentAssertions; using MongoDB.Driver; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; using UKSF.Tests.Common; diff --git a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs index a9d3e157..2f2aec71 100644 --- a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs @@ -7,7 +7,7 @@ using MongoDB.Bson; using MongoDB.Driver; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; using UKSF.Tests.Common; diff --git a/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs b/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs index 6ecfbddd..f09981ab 100644 --- a/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs +++ b/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs @@ -1,7 +1,7 @@ using FluentAssertions; using MongoDB.Driver; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs index 94af02e5..3a856a73 100644 --- a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs @@ -7,7 +7,7 @@ using MongoDB.Bson; using MongoDB.Driver; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; using UKSF.Tests.Common; diff --git a/UKSF.Tests/Unit/Data/DataServiceTests.cs b/UKSF.Tests/Unit/Data/DataServiceTests.cs index fba888a7..4f15af7c 100644 --- a/UKSF.Tests/Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceTests.cs @@ -7,7 +7,7 @@ using MongoDB.Bson; using MongoDB.Driver; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; using UKSF.Tests.Common; diff --git a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs index a861d6ff..2f17a4ff 100644 --- a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs @@ -3,7 +3,7 @@ using Moq; using UKSF.Api.ArmaServer.DataContext; using UKSF.Api.ArmaServer.Models; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using Xunit; diff --git a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs index 431e768c..a23e5fcb 100644 --- a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs @@ -4,11 +4,11 @@ using MongoDB.Bson; using MongoDB.Driver; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services.Data; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs index 7723ba88..aba7255e 100644 --- a/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs @@ -2,10 +2,9 @@ using System.Threading.Tasks; using FluentAssertions; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models.Logging; -using UKSF.Api.Base.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Data.Message { diff --git a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs index 4cb2b2b6..e956f20f 100644 --- a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs @@ -4,7 +4,7 @@ using MongoDB.Bson; using MongoDB.Driver; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; using UKSF.Api.Modpack.Models; @@ -29,9 +29,9 @@ public BuildsDataServiceTests() { [Fact] public void Should_get_collection_in_order() { - ModpackBuild item1 = new ModpackBuild { buildNumber = 4 }; - ModpackBuild item2 = new ModpackBuild { buildNumber = 10 }; - ModpackBuild item3 = new ModpackBuild { buildNumber = 9 }; + ModpackBuild item1 = new ModpackBuild { BuildNumber = 4 }; + ModpackBuild item2 = new ModpackBuild { BuildNumber = 10 }; + ModpackBuild item3 = new ModpackBuild { BuildNumber = 9 }; mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); @@ -43,18 +43,18 @@ public void Should_get_collection_in_order() { [Fact] public void Should_update_build_step_with_event() { string id = ObjectId.GenerateNewId().ToString(); - ModpackBuildStep modpackBuildStep = new ModpackBuildStep("step") { index = 0, running = false }; - ModpackBuild modpackBuild = new ModpackBuild { id = id, buildNumber = 1, steps = new List { modpackBuildStep } }; + ModpackBuildStep modpackBuildStep = new ModpackBuildStep("step") { Index = 0, Running = false }; + ModpackBuild modpackBuild = new ModpackBuild { id = id, BuildNumber = 1, Steps = new List { modpackBuildStep } }; DataEventModel subject = null; mockDataCollection.Setup(x => x.Get()).Returns(new List()); mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) - .Callback(() => { modpackBuild.steps.First().running = true; }); + .Callback(() => { modpackBuild.Steps.First().Running = true; }); mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(x => subject = x); buildsDataService.Update(modpackBuild, modpackBuildStep); - modpackBuildStep.running.Should().BeTrue(); + modpackBuildStep.Running.Should().BeTrue(); subject.data.Should().NotBeNull(); subject.data.Should().Be(modpackBuildStep); } @@ -68,8 +68,8 @@ public void Should_update_build_with_event_data() { mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())); mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(x => subject = x); - ModpackBuild modpackBuild = new ModpackBuild { id = id, buildNumber = 1 }; - buildsDataService.Update(modpackBuild, Builders.Update.Set(x => x.running, true)); + ModpackBuild modpackBuild = new ModpackBuild { id = id, BuildNumber = 1 }; + buildsDataService.Update(modpackBuild, Builders.Update.Set(x => x.Running, true)); subject.data.Should().NotBeNull(); subject.data.Should().Be(modpackBuild); diff --git a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs index c29155ce..8fcba487 100644 --- a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services.Data; @@ -24,9 +24,9 @@ public ReleasesDataServiceTests() { [Fact] public void Should_get_collection_in_order() { - ModpackRelease item1 = new ModpackRelease { version = "4.19.11" }; - ModpackRelease item2 = new ModpackRelease { version = "5.19.6" }; - ModpackRelease item3 = new ModpackRelease { version = "5.18.8" }; + ModpackRelease item1 = new ModpackRelease { Version = "4.19.11" }; + ModpackRelease item2 = new ModpackRelease { Version = "5.19.6" }; + ModpackRelease item3 = new ModpackRelease { Version = "5.18.8" }; mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); diff --git a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs index d52fc002..e51784e8 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; @@ -25,9 +25,9 @@ public OperationOrderDataServiceTests() { [Fact] public void Should_get_collection_in_order() { - Opord item1 = new Opord { start = DateTime.Now.AddDays(-1) }; - Opord item2 = new Opord { start = DateTime.Now.AddDays(-2) }; - Opord item3 = new Opord { start = DateTime.Now.AddDays(-3) }; + Opord item1 = new Opord { Start = DateTime.Now.AddDays(-1) }; + Opord item2 = new Opord { Start = DateTime.Now.AddDays(-2) }; + Opord item3 = new Opord { Start = DateTime.Now.AddDays(-3) }; mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); @@ -38,13 +38,13 @@ public void Should_get_collection_in_order() { [Fact] public void ShouldGetOrderedCollectionByPredicate() { - Opord item1 = new Opord { description = "1", start = DateTime.Now.AddDays(-1) }; - Opord item2 = new Opord { description = "2", start = DateTime.Now.AddDays(-2) }; - Opord item3 = new Opord { description = "1", start = DateTime.Now.AddDays(-3) }; + Opord item1 = new Opord { Description = "1", Start = DateTime.Now.AddDays(-1) }; + Opord item2 = new Opord { Description = "2", Start = DateTime.Now.AddDays(-2) }; + Opord item3 = new Opord { Description = "1", Start = DateTime.Now.AddDays(-3) }; mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); - IEnumerable subject = operationOrderDataService.Get(x => x.description == "1"); + IEnumerable subject = operationOrderDataService.Get(x => x.Description == "1"); subject.Should().ContainInOrder(item3, item1); } diff --git a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs index 4b5181d3..3143fd55 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; @@ -25,9 +25,9 @@ public OperationReportDataServiceTests() { [Fact] public void Should_get_collection_in_order() { - Oprep item1 = new Oprep { start = DateTime.Now.AddDays(-1) }; - Oprep item2 = new Oprep { start = DateTime.Now.AddDays(-2) }; - Oprep item3 = new Oprep { start = DateTime.Now.AddDays(-3) }; + Oprep item1 = new Oprep { Start = DateTime.Now.AddDays(-1) }; + Oprep item2 = new Oprep { Start = DateTime.Now.AddDays(-2) }; + Oprep item3 = new Oprep { Start = DateTime.Now.AddDays(-3) }; mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); @@ -38,13 +38,13 @@ public void Should_get_collection_in_order() { [Fact] public void ShouldGetOrderedCollectionByPredicate() { - Oprep item1 = new Oprep { description = "1", start = DateTime.Now.AddDays(-1) }; - Oprep item2 = new Oprep { description = "2", start = DateTime.Now.AddDays(-2) }; - Oprep item3 = new Oprep { description = "1", start = DateTime.Now.AddDays(-3) }; + Oprep item1 = new Oprep { Description = "1", Start = DateTime.Now.AddDays(-1) }; + Oprep item2 = new Oprep { Description = "2", Start = DateTime.Now.AddDays(-2) }; + Oprep item3 = new Oprep { Description = "1", Start = DateTime.Now.AddDays(-3) }; mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); - IEnumerable subject = operationReportDataService.Get(x => x.description == "1"); + IEnumerable subject = operationReportDataService.Get(x => x.Description == "1"); subject.Should().ContainInOrder(item3, item1); } diff --git a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs index 5df7eb1c..6637b011 100644 --- a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -2,10 +2,11 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; +using UKSF.Api.Command.Context; +using UKSF.Api.Command.Models; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Data.Personnel { diff --git a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs index e164ba2c..2881f3c7 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Data.Personnel { diff --git a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs index cf5fc1e0..f7fad772 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Data.Personnel { diff --git a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs index 6e591c32..16f97adc 100644 --- a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs @@ -1,14 +1,13 @@ using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Launcher.Context; using UKSF.Api.Launcher.Models; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services.Data; -using UKSF.Api.Utility.Models; -using UKSF.Api.Utility.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Data { diff --git a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index d90e6e9f..0065e7a7 100644 --- a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using FluentAssertions; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services.Data; using Xunit; using UksfUnit = UKSF.Api.Personnel.Models.Unit; diff --git a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs index 84dc5631..6d96a98c 100644 --- a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs @@ -1,7 +1,7 @@ using System; using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; using UKSF.Api.Personnel.EventHandlers; diff --git a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs index d965f914..747cf3c8 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs @@ -1,7 +1,7 @@ using System; using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; using UKSF.Api.Command.EventHandlers; diff --git a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs index a7469813..b044f346 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs @@ -1,7 +1,7 @@ using System; using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; using UKSF.Api.Personnel.EventHandlers; diff --git a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs index 1c38f663..7e63d324 100644 --- a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs @@ -4,11 +4,10 @@ using Moq; using UKSF.Api.Admin.Signalr.Clients; using UKSF.Api.Admin.Signalr.Hubs; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; using UKSF.Api.Base.Models.Logging; -using UKSF.Api.Base.Services.Data; using UKSF.Api.EventHandlers; using UKSF.Api.Personnel.Services; using Xunit; diff --git a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs index b78573b7..83d3e00c 100644 --- a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs @@ -2,7 +2,7 @@ using FluentAssertions; using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; using UKSF.Api.Personnel.EventHandlers; diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs index d380faf7..b9d6db3c 100644 --- a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -6,9 +6,9 @@ using Moq; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -using UKSF.Api.Personnel.Services.Data; using UKSF.Api.Teamspeak.EventHandlers; using UKSF.Api.Teamspeak.Models; using UKSF.Api.Teamspeak.Services; diff --git a/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs b/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs index 2e68152c..914186a8 100644 --- a/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs @@ -3,8 +3,8 @@ using System.Linq; using FluentAssertions; using Moq; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Services; -using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Common { diff --git a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs index 6121cf75..4dfce360 100644 --- a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs @@ -7,9 +7,9 @@ using Moq; using UKSF.Api.Admin.Models; using UKSF.Api.Admin.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -using UKSF.Api.Personnel.Services.Data; using UKSF.Api.Teamspeak.Models; using UKSF.Api.Teamspeak.Services; using Xunit; diff --git a/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs index f8b85329..0b33be5f 100644 --- a/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs @@ -1,8 +1,8 @@ using FluentAssertions; using Moq; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs index d8099c1c..8852dfaa 100644 --- a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs @@ -3,9 +3,10 @@ using System.Linq; using FluentAssertions; using Moq; +using UKSF.Api.Command.Context; +using UKSF.Api.Command.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs index 9b624e64..1040abd7 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs @@ -2,9 +2,9 @@ using System.Linq; using FluentAssertions; using Moq; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs index f31087ea..19a1f653 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs @@ -3,9 +3,9 @@ using System.Linq; using FluentAssertions; using Moq; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs index 83ca5429..cf1b640a 100644 --- a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs @@ -6,11 +6,11 @@ using MongoDB.Bson; using Moq; using Newtonsoft.Json; +using UKSF.Api.Base.Models; +using UKSF.Api.Base.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -using UKSF.Api.Personnel.Services.Data; -using UKSF.Api.Utility.Models; -using UKSF.Api.Utility.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Utility { @@ -39,7 +39,7 @@ public async Task ShouldSetConfirmationCodeValue() { ConfirmationCode subject = null; mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); - mockSchedulerService.Setup(x => x.CreateAndSchedule(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); await confirmationCodeService.CreateConfirmationCode("test"); @@ -50,7 +50,7 @@ public async Task ShouldSetConfirmationCodeValue() { [Theory, InlineData(null), InlineData("")] public async Task ShouldThrowForCreateWhenValueNullOrEmpty(string value) { mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); - mockSchedulerService.Setup(x => x.CreateAndSchedule(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); Func act = async () => await confirmationCodeService.CreateConfirmationCode(value); @@ -82,7 +82,7 @@ public async Task ShouldCreateConfirmationCode() { ConfirmationCode subject = null; mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); - mockSchedulerService.Setup(x => x.CreateAndSchedule(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); await confirmationCodeService.CreateConfirmationCode("test"); @@ -122,7 +122,7 @@ public async Task ShouldReturnCodeValue() { [Fact] public async Task ShouldReturnValidCodeId() { mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); - mockSchedulerService.Setup(x => x.CreateAndSchedule(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); string subject = await confirmationCodeService.CreateConfirmationCode("test"); diff --git a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs index 0c327184..30552a76 100644 --- a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using Moq; using UKSF.Api.Admin.Services; -using UKSF.Api.Personnel.Services.Data; +using UKSF.Api.Personnel.Context; using Xunit; namespace UKSF.Tests.Unit.Services.Utility { diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs index 517be86a..e91a572f 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs @@ -2,47 +2,47 @@ using System.Collections.Generic; using FluentAssertions; using Moq; +using UKSF.Api.Base.ScheduledActions; +using UKSF.Api.Base.Services; using UKSF.Api.Personnel.ScheduledActions; -using UKSF.Api.Utility.ScheduledActions; -using UKSF.Api.Utility.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Utility { public class ScheduledActionServiceTests { [Fact] public void ShouldRegisterActions() { - Mock mockDeleteExpiredConfirmationCodeAction = new Mock(); + Mock mockDeleteExpiredConfirmationCodeAction = new Mock(); mockDeleteExpiredConfirmationCodeAction.Setup(x => x.Name).Returns("TestAction"); - IScheduledActionService scheduledActionService = new ScheduledActionService(); - scheduledActionService.RegisterScheduledActions(new HashSet {mockDeleteExpiredConfirmationCodeAction.Object}); + IScheduledActionFactory scheduledActionFactory = new ScheduledActionFactory(); + scheduledActionFactory.RegisterScheduledActions(new HashSet {mockDeleteExpiredConfirmationCodeAction.Object}); - IScheduledAction subject = scheduledActionService.GetScheduledAction("TestAction"); + IScheduledAction subject = scheduledActionFactory.GetScheduledAction("TestAction"); subject.Should().Be(mockDeleteExpiredConfirmationCodeAction.Object); } [Fact] public void ShouldOverwriteRegisteredActions() { - Mock mockDeleteExpiredConfirmationCodeAction1 = new Mock(); - Mock mockDeleteExpiredConfirmationCodeAction2 = new Mock(); + Mock mockDeleteExpiredConfirmationCodeAction1 = new Mock(); + Mock mockDeleteExpiredConfirmationCodeAction2 = new Mock(); mockDeleteExpiredConfirmationCodeAction1.Setup(x => x.Name).Returns("TestAction"); mockDeleteExpiredConfirmationCodeAction2.Setup(x => x.Name).Returns("TestAction"); - IScheduledActionService scheduledActionService = new ScheduledActionService(); - scheduledActionService.RegisterScheduledActions(new HashSet {mockDeleteExpiredConfirmationCodeAction1.Object}); - scheduledActionService.RegisterScheduledActions(new HashSet {mockDeleteExpiredConfirmationCodeAction2.Object}); + IScheduledActionFactory scheduledActionFactory = new ScheduledActionFactory(); + scheduledActionFactory.RegisterScheduledActions(new HashSet {mockDeleteExpiredConfirmationCodeAction1.Object}); + scheduledActionFactory.RegisterScheduledActions(new HashSet {mockDeleteExpiredConfirmationCodeAction2.Object}); - IScheduledAction subject = scheduledActionService.GetScheduledAction("TestAction"); + IScheduledAction subject = scheduledActionFactory.GetScheduledAction("TestAction"); subject.Should().Be(mockDeleteExpiredConfirmationCodeAction2.Object); } [Fact] public void ShouldThrowWhenActionNotFound() { - IScheduledActionService scheduledActionService = new ScheduledActionService(); + IScheduledActionFactory scheduledActionFactory = new ScheduledActionFactory(); - Action act = () => scheduledActionService.GetScheduledAction("TestAction"); + Action act = () => scheduledActionFactory.GetScheduledAction("TestAction"); act.Should().Throw(); } diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs index 0950f9ce..b9158228 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs @@ -2,16 +2,16 @@ using FluentAssertions; using MongoDB.Bson; using Moq; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.ScheduledActions; using UKSF.Api.Personnel.Services; -using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { public class DeleteExpiredConfirmationCodeActionTests { private readonly Mock mockConfirmationCodeDataService; private readonly Mock mockConfirmationCodeService; - private IDeleteExpiredConfirmationCodeAction deleteExpiredConfirmationCodeAction; + private IActionDeleteExpiredConfirmationCode actionDeleteExpiredConfirmationCode; public DeleteExpiredConfirmationCodeActionTests() { mockConfirmationCodeDataService = new Mock(); @@ -24,27 +24,27 @@ public DeleteExpiredConfirmationCodeActionTests() { public void ShouldDeleteCorrectId() { string id = ObjectId.GenerateNewId().ToString(); - deleteExpiredConfirmationCodeAction = new DeleteExpiredConfirmationCodeAction(mockConfirmationCodeService.Object); + actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(mockConfirmationCodeService.Object); - deleteExpiredConfirmationCodeAction.Run(id); + actionDeleteExpiredConfirmationCode.Run(id); mockConfirmationCodeDataService.Verify(x => x.Delete(id), Times.Once); } [Fact] public void ShouldReturnActionName() { - deleteExpiredConfirmationCodeAction = new DeleteExpiredConfirmationCodeAction(mockConfirmationCodeService.Object); + actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(mockConfirmationCodeService.Object); - string subject = deleteExpiredConfirmationCodeAction.Name; + string subject = actionDeleteExpiredConfirmationCode.Name; subject.Should().Be("DeleteExpiredConfirmationCodeAction"); } [Fact] public void ShouldThrowForNoId() { - deleteExpiredConfirmationCodeAction = new DeleteExpiredConfirmationCodeAction(mockConfirmationCodeService.Object); + actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(mockConfirmationCodeService.Object); - Action act = () => deleteExpiredConfirmationCodeAction.Run(); + Action act = () => actionDeleteExpiredConfirmationCode.Run(); act.Should().Throw(); } diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs index da367cce..39c65698 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs @@ -4,20 +4,33 @@ using System.Linq.Expressions; using FluentAssertions; using Moq; +using UKSF.Api.Admin.ScheduledActions; using UKSF.Api.ArmaServer.Models; -using UKSF.Api.Base.Database; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Base.Services; using UKSF.Api.Modpack.Models; using UKSF.Api.Personnel.Models; -using UKSF.Api.Utility.ScheduledActions; using Xunit; namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { public class PruneDataActionTests { - private readonly Mock mockDataCollectionFactory; - private IPruneDataAction pruneDataAction; + private readonly Mock _mockAuditLogDataService; + private readonly Mock _mockHttpErrorLogDataService; + private readonly Mock _mockLogDataService; + private readonly Mock _mockClock; + private readonly Mock _mockSchedulerService; + private IActionPruneLogs _actionPruneLogs; - public PruneDataActionTests() => mockDataCollectionFactory = new Mock(); + public PruneDataActionTests() { + _mockLogDataService = new Mock(); + _mockAuditLogDataService = new Mock(); + _mockHttpErrorLogDataService = new Mock(); + _mockClock = new Mock(); + _mockSchedulerService = new Mock(); + + _actionPruneLogs = new ActionPruneLogs(_mockLogDataService.Object, _mockAuditLogDataService.Object, _mockHttpErrorLogDataService.Object, _mockSchedulerService.Object, _mockClock.Object); + } [Fact] public void ShouldRemoveOldLogsAndNotifications() { @@ -40,10 +53,10 @@ public void ShouldRemoveOldLogsAndNotifications() { new Notification { message = "notification3", timestamp = DateTime.Now.AddDays(-25) } }; List mockModpackBuildCollection = new List { - new ModpackBuild { environment = GameEnvironment.DEV, buildNumber = 1, version = "5.0.0" }, - new ModpackBuild { environment = GameEnvironment.RC, buildNumber = 1, version = "5.18.0" }, - new ModpackBuild { environment = GameEnvironment.RELEASE, buildNumber = 2, version = "5.18.0" }, - new ModpackBuild { environment = GameEnvironment.DEV, buildNumber = 150, version = "5.19.0" } + new ModpackBuild { Environment = GameEnvironment.DEV, BuildNumber = 1, Version = "5.0.0" }, + new ModpackBuild { Environment = GameEnvironment.RC, BuildNumber = 1, Version = "5.18.0" }, + new ModpackBuild { Environment = GameEnvironment.RELEASE, BuildNumber = 2, Version = "5.18.0" }, + new ModpackBuild { Environment = GameEnvironment.DEV, BuildNumber = 150, Version = "5.19.0" } }; Mock> mockBasicLogMessageDataColection = new Mock>(); @@ -65,29 +78,19 @@ public void ShouldRemoveOldLogsAndNotifications() { mockModpackBuildDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) .Callback>>(x => mockModpackBuildCollection.RemoveAll(y => x.Compile()(y))); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("logs")).Returns(mockBasicLogMessageDataColection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("errorLogs")).Returns(mockWebLogMessageDataColection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("auditLogs")).Returns(mockAuditLogMessageDataColection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("notifications")).Returns(mockNotificationDataColection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("modpackBuilds")).Returns(mockModpackBuildDataColection.Object); - - pruneDataAction = new PruneDataAction(mockDataCollectionFactory.Object); - - pruneDataAction.Run(); + _actionPruneLogs.Run(); mockBasicLogMessageCollection.Should().NotContain(x => x.message == "test2"); mockWebLogMessageCollection.Should().NotContain(x => x.message == "error2"); mockAuditLogMessageCollection.Should().NotContain(x => x.message == "audit2"); mockNotificationCollection.Should().NotContain(x => x.message == "notification2"); - mockModpackBuildCollection.Should().NotContain(x => x.version == "5.0.0"); - mockModpackBuildCollection.Should().NotContain(x => x.version == "5.18.0"); + mockModpackBuildCollection.Should().NotContain(x => x.Version == "5.0.0"); + mockModpackBuildCollection.Should().NotContain(x => x.Version == "5.18.0"); } [Fact] public void ShouldReturnActionName() { - pruneDataAction = new PruneDataAction(mockDataCollectionFactory.Object); - - string subject = pruneDataAction.Name; + string subject = _actionPruneLogs.Name; subject.Should().Be("PruneDataAction"); } diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs index 461a42ff..a8391b4d 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs @@ -1,30 +1,37 @@ using FluentAssertions; using Moq; +using UKSF.Api.Base.Services; using UKSF.Api.Teamspeak.ScheduledActions; using UKSF.Api.Teamspeak.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { public class TeamspeakSnapshotActionTests { + private readonly Mock _mockClock; + private readonly Mock _mockSchedulerService; private readonly Mock mockTeamspeakService; - private ITeamspeakSnapshotAction teamspeakSnapshotAction; + private IActionTeamspeakSnapshot actionTeamspeakSnapshot; - public TeamspeakSnapshotActionTests() => mockTeamspeakService = new Mock(); + public TeamspeakSnapshotActionTests() { + mockTeamspeakService = new Mock(); + _mockClock = new Mock(); + _mockSchedulerService = new Mock(); + } [Fact] public void ShouldReturnActionName() { - teamspeakSnapshotAction = new TeamspeakSnapshotAction(mockTeamspeakService.Object); + actionTeamspeakSnapshot = new ActionTeamspeakSnapshot(mockTeamspeakService.Object, _mockSchedulerService.Object, _mockClock.Object); - string subject = teamspeakSnapshotAction.Name; + string subject = actionTeamspeakSnapshot.Name; subject.Should().Be("TeamspeakSnapshotAction"); } [Fact] public void ShouldRunSnapshot() { - teamspeakSnapshotAction = new TeamspeakSnapshotAction(mockTeamspeakService.Object); + actionTeamspeakSnapshot = new ActionTeamspeakSnapshot(mockTeamspeakService.Object, _mockSchedulerService.Object, _mockClock.Object); - teamspeakSnapshotAction.Run(); + actionTeamspeakSnapshot.Run(); mockTeamspeakService.Verify(x => x.StoreTeamspeakServerSnapshot(), Times.Once); } diff --git a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs index ccec0933..0380cfed 100644 --- a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs @@ -6,7 +6,6 @@ using UKSF.Api.Base; using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services.Data; using Xunit; namespace UKSF.Tests.Unit.Services.Utility { From 9105421df287ae90c26b58480fb59875fb320e0d Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 15 Nov 2020 17:17:44 +0000 Subject: [PATCH 285/369] All errors and tests fixed --- UKSF.Api.Admin/ApiAdminExtensions.cs | 2 +- .../Context/VariablesDataService.cs | 5 +- UKSF.Api.Admin/Controllers/DataController.cs | 4 +- UKSF.Api.Admin/Controllers/DebugController.cs | 2 +- .../Controllers/VariablesController.cs | 6 +- .../EventHandlers/LogEventHandler.cs | 6 +- .../Extensions/VariablesExtensions.cs | 2 +- .../ScheduledActions/ActionPruneLogs.cs | 44 +++-- UKSF.Api.Admin/Services/DataCacheService.cs | 14 +- .../Signalr/Clients/IAdminClient.cs | 2 +- UKSF.Api.Admin/UKSF.Api.Admin.csproj | 1 + .../Services/MissionPatchingService.cs | 4 +- .../Services/MissionService.cs | 2 +- .../ApiArmaServerExtensions.cs | 2 +- .../Controllers/GameServersController.cs | 6 +- .../DataContext/GameServersDataService.cs | 3 +- .../Services/GameServerHelpers.cs | 4 +- .../Services/GameServersService.cs | 2 +- UKSF.Api.Auth/Controllers/LoginController.cs | 4 +- .../Controllers/PasswordResetController.cs | 2 +- UKSF.Api.Auth/Services/PermissionsService.cs | 2 +- UKSF.Api.Base/ApiBaseExtensions.cs | 22 +-- UKSF.Api.Base/Context/MongoClientFactory.cs | 2 +- UKSF.Api.Base/Services/HttpContextService.cs | 27 --- UKSF.Api.Command/ApiCommandExtensions.cs | 2 +- .../CommandRequestArchiveDataService.cs | 5 +- .../Context/CommandRequestDataService.cs | 3 +- .../Context/DischargeDataService.cs | 3 +- UKSF.Api.Command/Context/LoaDataService.cs | 3 +- .../Context/OperationOrderDataService.cs | 3 +- .../Context/OperationReportDataService.cs | 3 +- .../Controllers/CommandRequestsController.cs | 21 +-- .../CommandRequestsCreationController.cs | 4 +- .../Controllers/DischargesController.cs | 73 ++++---- .../Controllers/OperationOrderController.cs | 2 +- .../Controllers/OperationReportController.cs | 2 +- .../CommandRequestEventHandler.cs | 5 +- .../Services/ChainOfCommandService.cs | 4 +- .../CommandRequestCompletionService.cs | 4 +- .../Services/CommandRequestService.cs | 2 +- .../ScheduledActions/ActionInstagramImages.cs | 33 ++-- .../ScheduledActions/ActionInstagramToken.cs | 29 +-- .../Services/InstagramService.cs | 2 +- .../UKSF.Api.Integration.Instagram.csproj | 1 - .../ApiIntegrationDiscordExtensions.cs | 5 +- .../Controllers/DiscordController.cs | 15 +- .../DiscordAccountEventHandler.cs | 30 ++++ .../Services/DiscordService.cs | 2 +- .../UKSF.Api.Integrations.Discord.csproj | 4 - .../ApiIntegrationTeamspeakExtensions.cs | 9 +- .../Controllers/OperationsController.cs | 2 +- .../Controllers/TeamspeakController.cs | 76 +++++++- .../TeamspeakAccountEventHandler.cs | 31 ++++ .../EventHandlers/TeamspeakEventHandler.cs | 49 +++-- .../TeamspeakMessageEventHandler.cs | 30 ++++ .../ActionTeamspeakSnapshot.cs | 29 +-- .../Services/TeamspeakGroupService.cs | 2 +- .../Services/TeamspeakManagerService.cs | 2 +- .../Services/TeamspeakService.cs | 52 +++--- .../Signalr/Hubs/TeamspeakHub.cs | 4 +- .../Context/LauncherFileDataService.cs | 3 +- .../Controllers/LauncherController.cs | 52 +++--- .../Services/LauncherFileService.cs | 19 +- UKSF.Api.Launcher/Services/LauncherService.cs | 6 +- .../UKSF.Api.Models.csproj.DotSettings | 1 - UKSF.Api.Modpack/ApiModpackExtensions.cs | 2 +- .../Controllers/GithubController.cs | 2 +- .../Controllers/IssueController.cs | 4 +- .../Controllers/ModpackController.cs | 2 +- .../EventHandlers/BuildsEventHandler.cs | 5 +- .../ScheduledActions/ActionPruneBuilds.cs | 13 +- .../BuildProcess/BuildProcessHelper.cs | 2 +- .../BuildProcess/BuildProcessorService.cs | 3 +- .../BuildProcess/BuildQueueService.cs | 2 +- .../Services/BuildProcess/BuildStepService.cs | 21 +-- UKSF.Api.Modpack/Services/BuildsService.cs | 4 +- .../Services/Data/BuildsDataService.cs | 5 +- .../Services/Data/ReleasesDataService.cs | 3 +- UKSF.Api.Modpack/Services/GithubService.cs | 2 +- UKSF.Api.Modpack/Services/ModpackService.cs | 4 +- UKSF.Api.Modpack/Services/ReleaseService.cs | 2 +- UKSF.Api.Personnel/ApiPersonnelExtensions.cs | 6 +- .../Context/AccountDataService.cs | 3 +- .../Context/CommentThreadDataService.cs | 5 +- .../Context/ConfirmationCodeDataService.cs | 3 +- .../Context/NotificationsDataService.cs | 3 +- .../Context/RanksDataService.cs | 3 +- .../Context/RolesDataService.cs | 3 +- .../Context/UnitsDataService.cs | 3 +- .../Controllers/AccountsController.cs | 166 +++++++---------- .../Controllers/ApplicationsController.cs | 6 +- .../Controllers/CommentThreadController.cs | 4 +- .../Controllers/CommunicationsController.cs | 61 +++---- .../Controllers/DiscordCodeController.cs | 45 +++-- .../DiscordConnectionController.cs | 2 +- .../Controllers/RanksController.cs | 3 +- .../Controllers/RecruitmentController.cs | 6 +- .../Controllers/RolesController.cs | 3 +- .../Controllers/SteamCodeController.cs | 4 +- .../Controllers/UnitsController.cs | 167 +++++++++--------- .../EventHandlers/AccountDataEventHandler.cs | 48 +++++ .../EventHandlers/AccountEventHandler.cs | 47 ----- .../CommentThreadEventHandler.cs | 4 +- .../NotificationsEventHandler.cs | 5 +- .../Extensions/AccountExtensions.cs | 2 +- UKSF.Api.Personnel/Models/ServiceRecord.cs | 12 +- .../ActionDeleteExpiredConfirmationCode.cs | 2 +- .../ActionPruneNotifications.cs | 35 ++-- UKSF.Api.Personnel/Services/AccountService.cs | 2 +- .../Services/AssignmentService.cs | 107 ++++++----- .../Services/AttendanceService.cs | 3 - .../Services/CommentThreadService.cs | 2 +- .../Services/ConfirmationCodeService.cs | 2 +- .../Services/NotificationsService.cs | 80 +++++---- .../Services/ObjectIdConversionService.cs | 20 ++- .../Services/RecruitmentService.cs | 24 +-- .../Services/ServiceRecordService.cs | 2 +- UKSF.Api.Personnel/UKSF.Api.Personnel.csproj | 2 +- UKSF.Api.Shared/ApiSharedExtensions.cs | 35 ++++ .../Context/CachedDataService.cs | 6 +- .../Context/DataService.cs | 6 +- .../Context/LogDataService.cs | 7 +- .../Context/SchedulerDataService.cs | 7 +- .../Events/DataEventBus.cs | 4 +- .../Events/EventModelFactory.cs | 3 +- .../Events/Logger.cs | 7 +- .../Events/SignalrEventBus.cs | 5 +- .../Extensions/ChangeUtilities.cs | 2 +- .../Extensions/CollectionExtensions.cs | 2 +- .../Extensions/DateExtensions.cs | 2 +- .../Extensions/GuardUtilites.cs | 2 +- .../Extensions/JsonExtensions.cs | 2 +- .../Extensions/ObjectExtensions.cs | 42 +++++ .../Extensions/ObservableExtensions.cs | 4 +- .../Extensions/ProcessUtilities.cs | 2 +- .../Extensions/ServiceExtensions.cs | 32 ++++ .../Extensions/StringExtensions.cs | 2 +- .../Extensions/TaskUtilities.cs | 2 +- .../Models}/AuditLog.cs | 2 +- .../Models}/BasicLog.cs | 3 +- .../Models/DataEventModel.cs | 4 +- .../Models}/HttpErrorLog.cs | 2 +- .../Models}/LauncherLog.cs | 2 +- .../Models/ScheduledJob.cs | 3 +- .../Models/SignalrEventModel.cs | 2 +- .../Models/TeamspeakEventType.cs | 2 +- .../Models/TeamspeakMessageEventModel.cs | 13 ++ .../Permissions.cs | 2 +- .../Services/Clock.cs | 2 +- .../Services/HttpContextService.cs | 27 +++ .../Services/ScheduledActionFactory.cs | 2 +- .../Services/SchedulerService.cs | 35 ++-- UKSF.Api.Shared/UKSF.Api.Shared.csproj | 11 ++ UKSF.Api.Utility/ApiUtilityExtensions.cs | 20 --- UKSF.Api.Utility/UKSF.Api.Utility.csproj | 23 --- UKSF.Api.sln | 10 ++ UKSF.Api/AppStart/StartServices.cs | 11 +- UKSF.Api/AppStart/UksfServiceExtensions.cs | 31 +++- UKSF.Api/Controllers/LoaController.cs | 6 +- UKSF.Api/Controllers/LoggingController.cs | 6 +- UKSF.Api/Controllers/ModsController.cs | 2 +- UKSF.Api/EventHandlers/LoggerEventHandler.cs | 49 +++-- UKSF.Api/ExceptionHandler.cs | 6 +- UKSF.Api/Global.cs | 4 +- UKSF.Api/Services/MigrationUtility.cs | 2 +- UKSF.Api/Startup.cs | 26 ++- UKSF.Api/UKSF.Api.csproj | 108 +++++------ UKSF.Tests/Common/ITestCachedDataService.cs | 2 +- UKSF.Tests/Common/ITestDataService.cs | 2 +- UKSF.Tests/Common/TestCachedDataService.cs | 3 +- UKSF.Tests/Common/TestDataService.cs | 3 +- UKSF.Tests/UKSF.Tests.csproj | 5 - .../Unit/Common/ChangeUtilitiesTests.cs | 6 +- UKSF.Tests/Unit/Common/ClockTests.cs | 2 +- .../Unit/Common/CollectionUtilitiesTests.cs | 2 +- UKSF.Tests/Unit/Common/DataUtilitiesTests.cs | 2 +- UKSF.Tests/Unit/Common/DateUtilitiesTests.cs | 2 +- .../Unit/Common/EventModelFactoryTests.cs | 4 +- UKSF.Tests/Unit/Common/GuardUtilitesTests.cs | 2 +- UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs | 2 +- .../Unit/Common/StringUtilitiesTests.cs | 2 +- UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs | 2 +- .../Data/Admin/VariablesDataServiceTests.cs | 2 +- .../Unit/Data/CachedDataServiceTests.cs | 4 +- .../Unit/Data/CahcedDataServiceEventTests.cs | 4 +- UKSF.Tests/Unit/Data/DataServiceEventTests.cs | 4 +- UKSF.Tests/Unit/Data/DataServiceTests.cs | 8 +- .../Data/Game/GameServersDataServiceTests.cs | 2 +- .../Message/CommentThreadDataServiceTests.cs | 4 +- .../Unit/Data/Message/LogDataServiceTests.cs | 111 ------------ .../Data/Modpack/BuildsDataServiceTests.cs | 4 +- .../Data/Modpack/ReleasesDataServiceTests.cs | 2 +- .../OperationOrderDataServiceTests.cs | 2 +- .../OperationReportDataServiceTests.cs | 2 +- .../Personnel/DischargeDataServiceTests.cs | 3 +- .../Data/Personnel/RanksDataServiceTests.cs | 2 +- .../Data/Personnel/RolesDataServiceTests.cs | 2 +- .../Unit/Data/SimpleDataServiceTests.cs | 5 +- .../Unit/Data/Units/UnitsDataServiceTests.cs | 2 +- UKSF.Tests/Unit/Events/EventBusTests.cs | 2 +- .../Handlers/AccountEventHandlerTests.cs | 14 +- .../CommandRequestEventHandlerTests.cs | 4 +- .../CommentThreadEventHandlerTests.cs | 4 +- .../Events/Handlers/LogEventHandlerTests.cs | 98 +++++----- .../NotificationsEventHandlerTests.cs | 4 +- .../Handlers/TeamspeakEventHandlerTests.cs | 140 ++++++++------- .../Message/Logging/BasicLogMessageTests.cs | 2 +- .../Logging/LauncherLogMessageTests.cs | 2 +- .../Message/Logging/WebLogMessageTests.cs | 2 +- .../Services/Admin/VariablesServiceTests.cs | 2 +- .../Services/Common/AccountUtilitiesTests.cs | 4 +- .../Common/ObjectIdConversionServiceTests.cs | 45 +++-- .../Services/Personnel/LoaServiceTests.cs | 1 - .../Services/Personnel/RoleAttributeTests.cs | 2 +- .../Utility/ConfirmationCodeServiceTests.cs | 4 +- .../Services/Utility/DataCacheServiceTests.cs | 14 +- .../Utility/ScheduledActionServiceTests.cs | 2 +- ...eleteExpiredConfirmationCodeActionTests.cs | 36 ++-- .../ScheduledActions/PruneDataActionTests.cs | 111 +++++------- .../TeamspeakSnapshotActionTests.cs | 34 ++-- .../Services/Utility/SessionServiceTests.cs | 4 +- 221 files changed, 1622 insertions(+), 1471 deletions(-) delete mode 100644 UKSF.Api.Base/Services/HttpContextService.cs create mode 100644 UKSF.Api.Integrations.Discord/EventHandlers/DiscordAccountEventHandler.cs create mode 100644 UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakAccountEventHandler.cs create mode 100644 UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakMessageEventHandler.cs delete mode 100644 UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings create mode 100644 UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs delete mode 100644 UKSF.Api.Personnel/EventHandlers/AccountEventHandler.cs create mode 100644 UKSF.Api.Shared/ApiSharedExtensions.cs rename {UKSF.Api.Base => UKSF.Api.Shared}/Context/CachedDataService.cs (97%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Context/DataService.cs (96%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Context/LogDataService.cs (91%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Context/SchedulerDataService.cs (74%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Events/DataEventBus.cs (80%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Events/EventModelFactory.cs (81%) rename UKSF.Api.Base/Events/LogEventBus.cs => UKSF.Api.Shared/Events/Logger.cs (92%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Events/SignalrEventBus.cs (75%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Extensions/ChangeUtilities.cs (99%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Extensions/CollectionExtensions.cs (85%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Extensions/DateExtensions.cs (93%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Extensions/GuardUtilites.cs (96%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Extensions/JsonExtensions.cs (94%) create mode 100644 UKSF.Api.Shared/Extensions/ObjectExtensions.cs rename {UKSF.Api.Base => UKSF.Api.Shared}/Extensions/ObservableExtensions.cs (79%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Extensions/ProcessUtilities.cs (98%) create mode 100644 UKSF.Api.Shared/Extensions/ServiceExtensions.cs rename {UKSF.Api.Base => UKSF.Api.Shared}/Extensions/StringExtensions.cs (97%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Extensions/TaskUtilities.cs (94%) rename {UKSF.Api.Base/Models/Logging => UKSF.Api.Shared/Models}/AuditLog.cs (83%) rename {UKSF.Api.Base/Models/Logging => UKSF.Api.Shared/Models}/BasicLog.cs (91%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Models/DataEventModel.cs (82%) rename {UKSF.Api.Base/Models/Logging => UKSF.Api.Shared/Models}/HttpErrorLog.cs (91%) rename {UKSF.Api.Base/Models/Logging => UKSF.Api.Shared/Models}/LauncherLog.cs (84%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Models/ScheduledJob.cs (78%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Models/SignalrEventModel.cs (77%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Models/TeamspeakEventType.cs (75%) create mode 100644 UKSF.Api.Shared/Models/TeamspeakMessageEventModel.cs rename {UKSF.Api.Base => UKSF.Api.Shared}/Permissions.cs (97%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Services/Clock.cs (90%) create mode 100644 UKSF.Api.Shared/Services/HttpContextService.cs rename {UKSF.Api.Base => UKSF.Api.Shared}/Services/ScheduledActionFactory.cs (96%) rename {UKSF.Api.Base => UKSF.Api.Shared}/Services/SchedulerService.cs (82%) create mode 100644 UKSF.Api.Shared/UKSF.Api.Shared.csproj delete mode 100644 UKSF.Api.Utility/ApiUtilityExtensions.cs delete mode 100644 UKSF.Api.Utility/UKSF.Api.Utility.csproj delete mode 100644 UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs diff --git a/UKSF.Api.Admin/ApiAdminExtensions.cs b/UKSF.Api.Admin/ApiAdminExtensions.cs index be63494f..e0a51fb6 100644 --- a/UKSF.Api.Admin/ApiAdminExtensions.cs +++ b/UKSF.Api.Admin/ApiAdminExtensions.cs @@ -7,7 +7,7 @@ using UKSF.Api.Admin.ScheduledActions; using UKSF.Api.Admin.Services; using UKSF.Api.Admin.Signalr.Hubs; -using UKSF.Api.Base.Events; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Admin { public static class ApiAdminExtensions { diff --git a/UKSF.Api.Admin/Context/VariablesDataService.cs b/UKSF.Api.Admin/Context/VariablesDataService.cs index 6f900c9a..377bf943 100644 --- a/UKSF.Api.Admin/Context/VariablesDataService.cs +++ b/UKSF.Api.Admin/Context/VariablesDataService.cs @@ -3,8 +3,9 @@ using System.Threading.Tasks; using UKSF.Api.Admin.Models; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Admin.Context { public interface IVariablesDataService : IDataService, ICachedDataService { diff --git a/UKSF.Api.Admin/Controllers/DataController.cs b/UKSF.Api.Admin/Controllers/DataController.cs index 4c34af95..7730778d 100644 --- a/UKSF.Api.Admin/Controllers/DataController.cs +++ b/UKSF.Api.Admin/Controllers/DataController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using UKSF.Api.Admin.Services; -using UKSF.Api.Base; +using UKSF.Api.Shared; namespace UKSF.Api.Admin.Controllers { [Route("[controller]"), Permissions(Permissions.ADMIN)] @@ -12,7 +12,7 @@ public class DataController : Controller { [HttpGet("invalidate"), Authorize] public IActionResult Invalidate() { - dataCacheService.InvalidateCachedData(); + dataCacheService.RefreshCachedData(); return Ok(); } } diff --git a/UKSF.Api.Admin/Controllers/DebugController.cs b/UKSF.Api.Admin/Controllers/DebugController.cs index 852ba9e6..c2a2d122 100644 --- a/UKSF.Api.Admin/Controllers/DebugController.cs +++ b/UKSF.Api.Admin/Controllers/DebugController.cs @@ -30,7 +30,7 @@ public DebugController(IHostEnvironment currentEnvironment, DataCacheService dat public IActionResult InvalidateData() { if (!currentEnvironment.IsDevelopment()) return Ok(); - dataCacheService.InvalidateCachedData(); + dataCacheService.RefreshCachedData(); return Ok(); } } diff --git a/UKSF.Api.Admin/Controllers/VariablesController.cs b/UKSF.Api.Admin/Controllers/VariablesController.cs index bf1d7b78..fa612e66 100644 --- a/UKSF.Api.Admin/Controllers/VariablesController.cs +++ b/UKSF.Api.Admin/Controllers/VariablesController.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Mvc; using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Models; -using UKSF.Api.Base; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Admin.Controllers { [Route("[controller]"), Permissions(Permissions.ADMIN)] diff --git a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs b/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs index 985e1a7f..39b30561 100644 --- a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs +++ b/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs @@ -4,9 +4,9 @@ using UKSF.Api.Admin.Signalr.Clients; using UKSF.Api.Admin.Signalr.Hubs; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; -using UKSF.Api.Base.Models; -using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Admin.EventHandlers { public interface ILogDataEventHandler : IEventHandler { } diff --git a/UKSF.Api.Admin/Extensions/VariablesExtensions.cs b/UKSF.Api.Admin/Extensions/VariablesExtensions.cs index 65ea77b2..3742201d 100644 --- a/UKSF.Api.Admin/Extensions/VariablesExtensions.cs +++ b/UKSF.Api.Admin/Extensions/VariablesExtensions.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text.RegularExpressions; using UKSF.Api.Admin.Models; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Admin.Extensions { public static class VariablesExtensions { diff --git a/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs b/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs index b93e081d..f139c426 100644 --- a/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs +++ b/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs @@ -1,49 +1,55 @@ using System; using System.Threading.Tasks; -using UKSF.Api.Base.Context; +using Microsoft.Extensions.Hosting; using UKSF.Api.Base.ScheduledActions; -using UKSF.Api.Base.Services; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Admin.ScheduledActions { public interface IActionPruneLogs : ISelfCreatingScheduledAction { } public class ActionPruneLogs : IActionPruneLogs { - public const string ACTION_NAME = nameof(ActionPruneLogs); + private const string ACTION_NAME = nameof(ActionPruneLogs); - private readonly IAuditLogDataService auditLogDataService; - private readonly IClock clock; - private readonly IHttpErrorLogDataService httpErrorLogDataService; - private readonly ILogDataService logDataService; - private readonly ISchedulerService schedulerService; + private readonly IAuditLogDataService _auditLogDataService; + private readonly IClock _clock; + private readonly IHostEnvironment _currentEnvironment; + private readonly IHttpErrorLogDataService _httpErrorLogDataService; + private readonly ILogDataService _logDataService; + private readonly ISchedulerService _schedulerService; public ActionPruneLogs( ILogDataService logDataService, IAuditLogDataService auditLogDataService, IHttpErrorLogDataService httpErrorLogDataService, ISchedulerService schedulerService, + IHostEnvironment currentEnvironment, IClock clock ) { - this.logDataService = logDataService; - this.auditLogDataService = auditLogDataService; - this.httpErrorLogDataService = httpErrorLogDataService; - this.schedulerService = schedulerService; - this.clock = clock; + _logDataService = logDataService; + _auditLogDataService = auditLogDataService; + _httpErrorLogDataService = httpErrorLogDataService; + _schedulerService = schedulerService; + _currentEnvironment = currentEnvironment; + _clock = clock; } public string Name => ACTION_NAME; public void Run(params object[] parameters) { - DateTime now = clock.UtcNow(); - Task logsTask = logDataService.DeleteMany(x => x.timestamp < now.AddDays(-7)); - Task errorLogsTask = httpErrorLogDataService.DeleteMany(x => x.timestamp < now.AddDays(-7)); - Task auditLogsTask = auditLogDataService.DeleteMany(x => x.timestamp < now.AddMonths(-3)); + DateTime now = _clock.UtcNow(); + Task logsTask = _logDataService.DeleteMany(x => x.timestamp < now.AddDays(-7)); + Task auditLogsTask = _auditLogDataService.DeleteMany(x => x.timestamp < now.AddMonths(-3)); + Task errorLogsTask = _httpErrorLogDataService.DeleteMany(x => x.timestamp < now.AddDays(-7)); Task.WaitAll(logsTask, errorLogsTask, auditLogsTask); } public async Task CreateSelf() { - if (schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { - await schedulerService.CreateScheduledJob(clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); + if (_currentEnvironment.IsDevelopment()) return; + + if (_schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); } } } diff --git a/UKSF.Api.Admin/Services/DataCacheService.cs b/UKSF.Api.Admin/Services/DataCacheService.cs index 3794c1f4..1e9f06dd 100644 --- a/UKSF.Api.Admin/Services/DataCacheService.cs +++ b/UKSF.Api.Admin/Services/DataCacheService.cs @@ -1,19 +1,19 @@ using System; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Base.Context; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Admin.Services { public interface IDataCacheService { - void InvalidateCachedData(); + void RefreshCachedData(); } public class DataCacheService : IDataCacheService { - private readonly IServiceProvider serviceProvider; + private readonly IServiceProvider _serviceProvider; - public DataCacheService(IServiceProvider serviceProvider) => this.serviceProvider = serviceProvider; + public DataCacheService(IServiceProvider serviceProvider) => _serviceProvider = serviceProvider; - public void InvalidateCachedData() { - foreach (ICachedDataService cachedDataService in serviceProvider.GetServices()) { + public void RefreshCachedData() { + foreach (ICachedDataService cachedDataService in _serviceProvider.GetInterfaceServices()) { cachedDataService.Refresh(); } } diff --git a/UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs b/UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs index 2f04172e..249f9801 100644 --- a/UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs +++ b/UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Admin.Signalr.Clients { public interface IAdminClient { diff --git a/UKSF.Api.Admin/UKSF.Api.Admin.csproj b/UKSF.Api.Admin/UKSF.Api.Admin.csproj index ded27b7c..13cbe51e 100644 --- a/UKSF.Api.Admin/UKSF.Api.Admin.csproj +++ b/UKSF.Api.Admin/UKSF.Api.Admin.csproj @@ -7,6 +7,7 @@ + diff --git a/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs b/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs index ea5695ca..693e0188 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs @@ -8,8 +8,8 @@ using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; using UKSF.Api.ArmaMissions.Models; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.ArmaMissions.Services { public interface IMissionPatchingService { diff --git a/UKSF.Api.ArmaMissions/Services/MissionService.cs b/UKSF.Api.ArmaMissions/Services/MissionService.cs index 93c63712..368fc6ea 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionService.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using UKSF.Api.ArmaMissions.Models; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.ArmaMissions.Services { public class MissionService { diff --git a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs index d19f706c..80bab99c 100644 --- a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs +++ b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs @@ -5,7 +5,7 @@ using UKSF.Api.ArmaServer.Models; using UKSF.Api.ArmaServer.Services; using UKSF.Api.ArmaServer.Signalr.Hubs; -using UKSF.Api.Base.Events; +using UKSF.Api.Shared.Events; namespace UKSF.Api.ArmaServer { public static class ApiArmaServerExtensions { diff --git a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs index df597f65..65cbd438 100644 --- a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs +++ b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs @@ -16,9 +16,9 @@ using UKSF.Api.ArmaServer.Services; using UKSF.Api.ArmaServer.Signalr.Clients; using UKSF.Api.ArmaServer.Signalr.Hubs; -using UKSF.Api.Base; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.ArmaServer.Controllers { [Route("[controller]"), Permissions(Permissions.NCO, Permissions.SERVERS, Permissions.COMMAND)] diff --git a/UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs b/UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs index 873920f9..f284ba0c 100644 --- a/UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs +++ b/UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs @@ -2,7 +2,8 @@ using System.Linq; using UKSF.Api.ArmaServer.Models; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Api.ArmaServer.DataContext { public interface IGameServersDataService : IDataService, ICachedDataService { } diff --git a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs index ffef792b..821fb1e4 100644 --- a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs +++ b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs @@ -6,8 +6,8 @@ using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; using UKSF.Api.ArmaServer.Models; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.ArmaServer.Services { public interface IGameServerHelpers { diff --git a/UKSF.Api.ArmaServer/Services/GameServersService.cs b/UKSF.Api.ArmaServer/Services/GameServersService.cs index a1da3dd5..beafeffb 100644 --- a/UKSF.Api.ArmaServer/Services/GameServersService.cs +++ b/UKSF.Api.ArmaServer/Services/GameServersService.cs @@ -13,7 +13,7 @@ using UKSF.Api.ArmaServer.DataContext; using UKSF.Api.ArmaServer.Models; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.ArmaServer.Services { public interface IGameServersService : IDataBackedService { diff --git a/UKSF.Api.Auth/Controllers/LoginController.cs b/UKSF.Api.Auth/Controllers/LoginController.cs index 394705a2..a72fb02a 100644 --- a/UKSF.Api.Auth/Controllers/LoginController.cs +++ b/UKSF.Api.Auth/Controllers/LoginController.cs @@ -3,8 +3,8 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; using UKSF.Api.Auth.Services; -using UKSF.Api.Base.Extensions; -using UKSF.Api.Base.Services; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Auth.Controllers { [Route("[controller]")] diff --git a/UKSF.Api.Auth/Controllers/PasswordResetController.cs b/UKSF.Api.Auth/Controllers/PasswordResetController.cs index 4f59d875..bb04aafb 100644 --- a/UKSF.Api.Auth/Controllers/PasswordResetController.cs +++ b/UKSF.Api.Auth/Controllers/PasswordResetController.cs @@ -4,9 +4,9 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; using UKSF.Api.Auth.Services; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Auth.Controllers { [Route("[controller]")] diff --git a/UKSF.Api.Auth/Services/PermissionsService.cs b/UKSF.Api.Auth/Services/PermissionsService.cs index c7479bde..9ddcb62b 100644 --- a/UKSF.Api.Auth/Services/PermissionsService.cs +++ b/UKSF.Api.Auth/Services/PermissionsService.cs @@ -2,9 +2,9 @@ using System.Linq; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Base; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared; namespace UKSF.Api.Auth.Services { public interface IPermissionsService { diff --git a/UKSF.Api.Base/ApiBaseExtensions.cs b/UKSF.Api.Base/ApiBaseExtensions.cs index 3dc4bf8d..c9dfb68f 100644 --- a/UKSF.Api.Base/ApiBaseExtensions.cs +++ b/UKSF.Api.Base/ApiBaseExtensions.cs @@ -1,10 +1,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; -using UKSF.Api.Base.Models.Logging; -using UKSF.Api.Base.Services; namespace UKSF.Api.Base { public static class ApiBaseExtensions { @@ -14,24 +10,14 @@ public static IServiceCollection AddUksfBase(this IServiceCollection services, I .AddEventHandlers() .AddServices() .AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))) - .AddTransient() - .AddTransient() - .AddSingleton() - .AddSingleton(); + .AddTransient(); - private static IServiceCollection AddContexts(this IServiceCollection services) => - services.AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton(); + private static IServiceCollection AddContexts(this IServiceCollection services) => services; - private static IServiceCollection AddEventBuses(this IServiceCollection services) => - services.AddSingleton, DataEventBus>().AddSingleton, DataEventBus>(); + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; - private static IServiceCollection AddServices(this IServiceCollection services) => - services.AddSingleton().AddSingleton().AddTransient(); + private static IServiceCollection AddServices(this IServiceCollection services) => services; } } diff --git a/UKSF.Api.Base/Context/MongoClientFactory.cs b/UKSF.Api.Base/Context/MongoClientFactory.cs index d8097683..4188130c 100644 --- a/UKSF.Api.Base/Context/MongoClientFactory.cs +++ b/UKSF.Api.Base/Context/MongoClientFactory.cs @@ -5,7 +5,7 @@ namespace UKSF.Api.Base.Context { public static class MongoClientFactory { public static IMongoDatabase GetDatabase(string connectionString) { ConventionPack conventionPack = new ConventionPack {new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true)}; - ConventionRegistry.Register("DefaultConventions", conventionPack, t => true); + ConventionRegistry.Register("DefaultConventions", conventionPack, _ => true); string database = MongoUrl.Create(connectionString).DatabaseName; return new MongoClient(connectionString).GetDatabase(database); } diff --git a/UKSF.Api.Base/Services/HttpContextService.cs b/UKSF.Api.Base/Services/HttpContextService.cs deleted file mode 100644 index 1b88bd36..00000000 --- a/UKSF.Api.Base/Services/HttpContextService.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Linq; -using System.Security.Claims; -using Microsoft.AspNetCore.Http; - -namespace UKSF.Api.Base.Services { - public interface IHttpContextService { - bool IsUserAuthenticated(); - public string GetUserId(); - public string GetUserEmail(); - bool UserHasPermission(string permission); - } - - public class HttpContextService : IHttpContextService { - private readonly IHttpContextAccessor httpContextAccessor; - - public HttpContextService(IHttpContextAccessor httpContextAccessor) => this.httpContextAccessor = httpContextAccessor; - - public bool IsUserAuthenticated() => httpContextAccessor.HttpContext?.User.Identity != null && httpContextAccessor.HttpContext.User.Identity.IsAuthenticated; - - public string GetUserId() => httpContextAccessor.HttpContext?.User.Claims.Single(x => x.Type == ClaimTypes.Sid).Value; - - public string GetUserEmail() => httpContextAccessor.HttpContext?.User.Claims.Single(x => x.Type == ClaimTypes.Email).Value; - - public bool UserHasPermission(string permission) => - httpContextAccessor.HttpContext != null && httpContextAccessor.HttpContext.User.Claims.Any(x => x.Type == ClaimTypes.Role && x.Value == permission); - } -} diff --git a/UKSF.Api.Command/ApiCommandExtensions.cs b/UKSF.Api.Command/ApiCommandExtensions.cs index 44d51066..12faa168 100644 --- a/UKSF.Api.Command/ApiCommandExtensions.cs +++ b/UKSF.Api.Command/ApiCommandExtensions.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.EventHandlers; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; using UKSF.Api.Command.Signalr.Hubs; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Command { public static class ApiCommandExtensions { diff --git a/UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs b/UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs index a957d9f4..f3ce5463 100644 --- a/UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs +++ b/UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs @@ -1,7 +1,8 @@ using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; using UKSF.Api.Command.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Command.Context { public interface ICommandRequestArchiveDataService : IDataService { } diff --git a/UKSF.Api.Command/Context/CommandRequestDataService.cs b/UKSF.Api.Command/Context/CommandRequestDataService.cs index 1d488eb7..bd695f18 100644 --- a/UKSF.Api.Command/Context/CommandRequestDataService.cs +++ b/UKSF.Api.Command/Context/CommandRequestDataService.cs @@ -1,6 +1,7 @@ using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Command.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Command.Context { public interface ICommandRequestDataService : IDataService, ICachedDataService { } diff --git a/UKSF.Api.Command/Context/DischargeDataService.cs b/UKSF.Api.Command/Context/DischargeDataService.cs index 098d52a7..2dfe2bd8 100644 --- a/UKSF.Api.Command/Context/DischargeDataService.cs +++ b/UKSF.Api.Command/Context/DischargeDataService.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Command.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Command.Context { public interface IDischargeDataService : IDataService, ICachedDataService { } diff --git a/UKSF.Api.Command/Context/LoaDataService.cs b/UKSF.Api.Command/Context/LoaDataService.cs index 3ef76a71..fc3ba0c7 100644 --- a/UKSF.Api.Command/Context/LoaDataService.cs +++ b/UKSF.Api.Command/Context/LoaDataService.cs @@ -1,6 +1,7 @@ using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Command.Context { public interface ILoaDataService : IDataService, ICachedDataService { } diff --git a/UKSF.Api.Command/Context/OperationOrderDataService.cs b/UKSF.Api.Command/Context/OperationOrderDataService.cs index 51271aff..d1e7d950 100644 --- a/UKSF.Api.Command/Context/OperationOrderDataService.cs +++ b/UKSF.Api.Command/Context/OperationOrderDataService.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Command.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Command.Context { public interface IOperationOrderDataService : IDataService, ICachedDataService { } diff --git a/UKSF.Api.Command/Context/OperationReportDataService.cs b/UKSF.Api.Command/Context/OperationReportDataService.cs index 0a01f416..b2f4aba2 100644 --- a/UKSF.Api.Command/Context/OperationReportDataService.cs +++ b/UKSF.Api.Command/Context/OperationReportDataService.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Command.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Command.Context { public interface IOperationReportDataService : IDataService, ICachedDataService { } diff --git a/UKSF.Api.Command/Controllers/CommandRequestsController.cs b/UKSF.Api.Command/Controllers/CommandRequestsController.cs index 371e45d4..77b9d25c 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsController.cs @@ -9,31 +9,27 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; -using UKSF.Api.Admin.Services; -using UKSF.Api.Base; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.COMMAND)] public class CommandRequestsController : Controller { - public const string SUPER_ADMIN = "59e38f10594c603b78aa9dbd"; - + private const string SUPER_ADMIN = "59e38f10594c603b78aa9dbd"; + private readonly IAccountService _accountService; private readonly ICommandRequestCompletionService _commandRequestCompletionService; - private readonly IHttpContextService _httpContextService; private readonly ICommandRequestService _commandRequestService; private readonly IDisplayNameService _displayNameService; + private readonly IHttpContextService _httpContextService; + private readonly ILogger _logger; private readonly INotificationsService _notificationsService; - private readonly IUnitsService _unitsService; private readonly IVariablesDataService _variablesDataService; - private readonly IVariablesService _variablesService; - private readonly IAccountService _accountService; - private readonly ILogger _logger; public CommandRequestsController( ICommandRequestService commandRequestService, @@ -43,19 +39,16 @@ public CommandRequestsController( IDisplayNameService displayNameService, INotificationsService notificationsService, IVariablesDataService variablesDataService, - IVariablesService variablesService, IAccountService accountService, ILogger logger ) { _commandRequestService = commandRequestService; _commandRequestCompletionService = commandRequestCompletionService; _httpContextService = httpContextService; - _unitsService = unitsService; _displayNameService = displayNameService; _notificationsService = notificationsService; _variablesDataService = variablesDataService; - _variablesService = variablesService; _accountService = accountService; _logger = logger; } diff --git a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs index a6462d22..c85b7f45 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs @@ -4,12 +4,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Base; -using UKSF.Api.Base.Services; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Command.Controllers { [Route("CommandRequests/Create")] diff --git a/UKSF.Api.Command/Controllers/DischargesController.cs b/UKSF.Api.Command/Controllers/DischargesController.cs index 3fa3bcd0..4527c246 100644 --- a/UKSF.Api.Command/Controllers/DischargesController.cs +++ b/UKSF.Api.Command/Controllers/DischargesController.cs @@ -5,29 +5,26 @@ using MongoDB.Driver; using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; -using UKSF.Api.Admin.Services; -using UKSF.Api.Base; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.PERSONNEL, Permissions.NCO, Permissions.RECRUITER)] public class DischargesController : Controller { - private readonly IAccountService accountService; - private readonly IAssignmentService assignmentService; - private readonly ICommandRequestService commandRequestService; - private readonly IDischargeService dischargeService; - private readonly INotificationsService notificationsService; - private readonly IHttpContextService httpContextService; - - private readonly IUnitsService unitsService; - private readonly IVariablesDataService variablesDataService; - private readonly IVariablesService variablesService; - private readonly ILogger logger; + private readonly IAccountService _accountService; + private readonly IAssignmentService _assignmentService; + private readonly ICommandRequestService _commandRequestService; + private readonly IDischargeService _dischargeService; + private readonly IHttpContextService _httpContextService; + private readonly ILogger _logger; + private readonly INotificationsService _notificationsService; + private readonly IUnitsService _unitsService; + private readonly IVariablesDataService _variablesDataService; public DischargesController( IAccountService accountService, @@ -38,26 +35,24 @@ public DischargesController( IHttpContextService httpContextService, IUnitsService unitsService, IVariablesDataService variablesDataService, - IVariablesService variablesService, ILogger logger ) { - this.accountService = accountService; - this.assignmentService = assignmentService; - this.commandRequestService = commandRequestService; - this.dischargeService = dischargeService; - this.notificationsService = notificationsService; - this.httpContextService = httpContextService; - this.unitsService = unitsService; - this.variablesDataService = variablesDataService; - this.variablesService = variablesService; - this.logger = logger; + _accountService = accountService; + _assignmentService = assignmentService; + _commandRequestService = commandRequestService; + _dischargeService = dischargeService; + _notificationsService = notificationsService; + _httpContextService = httpContextService; + _unitsService = unitsService; + _variablesDataService = variablesDataService; + _logger = logger; } [HttpGet] public IActionResult Get() { - IEnumerable discharges = dischargeService.Data.Get(); + IEnumerable discharges = _dischargeService.Data.Get(); foreach (DischargeCollection discharge in discharges) { - discharge.requestExists = commandRequestService.DoesEquivalentRequestExist( + discharge.requestExists = _commandRequestService.DoesEquivalentRequestExist( new CommandRequest { Recipient = discharge.accountId, Type = CommandRequestType.REINSTATE_MEMBER, DisplayValue = "Member", DisplayFrom = "Discharged" } ); } @@ -67,10 +62,10 @@ public IActionResult Get() { [HttpGet("reinstate/{id}")] public async Task Reinstate(string id) { - DischargeCollection dischargeCollection = dischargeService.Data.GetSingle(id); - await dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); - await accountService.Data.Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); - Notification notification = await assignmentService.UpdateUnitRankAndRole( + DischargeCollection dischargeCollection = _dischargeService.Data.GetSingle(id); + await _dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); + await _accountService.Data.Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); + Notification notification = await _assignmentService.UpdateUnitRankAndRole( dischargeCollection.accountId, "Basic Training Unit", "Trainee", @@ -79,17 +74,17 @@ public async Task Reinstate(string id) { "", "your membership was reinstated" ); - notificationsService.Add(notification); + _notificationsService.Add(notification); - logger.LogAudit($"{httpContextService.GetUserId()} reinstated {dischargeCollection.name}'s membership", httpContextService.GetUserId()); - string personnelId = variablesDataService.GetSingle("UNIT_ID_PERSONNEL").AsString(); - foreach (string member in unitsService.Data.GetSingle(personnelId).members.Where(x => x != httpContextService.GetUserId())) { - notificationsService.Add( - new Notification { owner = member, icon = NotificationIcons.PROMOTION, message = $"{dischargeCollection.name}'s membership was reinstated by {httpContextService.GetUserId()}" } + _logger.LogAudit($"{_httpContextService.GetUserId()} reinstated {dischargeCollection.name}'s membership", _httpContextService.GetUserId()); + string personnelId = _variablesDataService.GetSingle("UNIT_ID_PERSONNEL").AsString(); + foreach (string member in _unitsService.Data.GetSingle(personnelId).members.Where(x => x != _httpContextService.GetUserId())) { + _notificationsService.Add( + new Notification { owner = member, icon = NotificationIcons.PROMOTION, message = $"{dischargeCollection.name}'s membership was reinstated by {_httpContextService.GetUserId()}" } ); } - return Ok(dischargeService.Data.Get()); + return Ok(_dischargeService.Data.Get()); } } } diff --git a/UKSF.Api.Command/Controllers/OperationOrderController.cs b/UKSF.Api.Command/Controllers/OperationOrderController.cs index 6a36a5b8..95b434f9 100644 --- a/UKSF.Api.Command/Controllers/OperationOrderController.cs +++ b/UKSF.Api.Command/Controllers/OperationOrderController.cs @@ -1,9 +1,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Base; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; +using UKSF.Api.Shared; namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] diff --git a/UKSF.Api.Command/Controllers/OperationReportController.cs b/UKSF.Api.Command/Controllers/OperationReportController.cs index a466bbd0..a5a9351d 100644 --- a/UKSF.Api.Command/Controllers/OperationReportController.cs +++ b/UKSF.Api.Command/Controllers/OperationReportController.cs @@ -2,9 +2,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Base; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; +using UKSF.Api.Shared; namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] diff --git a/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs b/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs index 6624f449..e9ef1635 100644 --- a/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs +++ b/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs @@ -2,11 +2,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; -using UKSF.Api.Base.Models; using UKSF.Api.Command.Models; using UKSF.Api.Command.Signalr.Clients; using UKSF.Api.Command.Signalr.Hubs; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Command.EventHandlers { public interface ICommandRequestEventHandler : IEventHandler { } diff --git a/UKSF.Api.Command/Services/ChainOfCommandService.cs b/UKSF.Api.Command/Services/ChainOfCommandService.cs index d3f5dea4..1f4699d9 100644 --- a/UKSF.Api.Command/Services/ChainOfCommandService.cs +++ b/UKSF.Api.Command/Services/ChainOfCommandService.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using UKSF.Api.Base.Extensions; -using UKSF.Api.Base.Services; using UKSF.Api.Command.Models; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Command.Services { public interface IChainOfCommandService { diff --git a/UKSF.Api.Command/Services/CommandRequestCompletionService.cs b/UKSF.Api.Command/Services/CommandRequestCompletionService.cs index 3e3e3f4e..66e80b9c 100644 --- a/UKSF.Api.Command/Services/CommandRequestCompletionService.cs +++ b/UKSF.Api.Command/Services/CommandRequestCompletionService.cs @@ -3,13 +3,13 @@ using AvsAnLib; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services; using UKSF.Api.Command.Models; using UKSF.Api.Command.Signalr.Clients; using UKSF.Api.Command.Signalr.Hubs; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Command.Services { public interface ICommandRequestCompletionService { diff --git a/UKSF.Api.Command/Services/CommandRequestService.cs b/UKSF.Api.Command/Services/CommandRequestService.cs index e45b55e6..d0c8ba06 100644 --- a/UKSF.Api.Command/Services/CommandRequestService.cs +++ b/UKSF.Api.Command/Services/CommandRequestService.cs @@ -5,11 +5,11 @@ using AvsAnLib; using MongoDB.Driver; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Command.Services { public interface ICommandRequestService : IDataBackedService { diff --git a/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramImages.cs b/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramImages.cs index 3b82a420..1e0d4ea1 100644 --- a/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramImages.cs +++ b/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramImages.cs @@ -1,34 +1,39 @@ using System; using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; using UKSF.Api.Base.ScheduledActions; -using UKSF.Api.Base.Services; using UKSF.Api.Integration.Instagram.Services; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Integration.Instagram.ScheduledActions { public interface IActionInstagramImages : ISelfCreatingScheduledAction { } public class ActionInstagramImages : IActionInstagramImages { - public const string ACTION_NAME = nameof(ActionInstagramImages); - - private readonly IClock clock; - private readonly IInstagramService instagramService; - private readonly ISchedulerService schedulerService; - - public ActionInstagramImages(IInstagramService instagramService, ISchedulerService schedulerService, IClock clock) { - this.instagramService = instagramService; - this.schedulerService = schedulerService; - this.clock = clock; + private const string ACTION_NAME = nameof(ActionInstagramImages); + + private readonly IClock _clock; + private readonly IHostEnvironment _currentEnvironment; + private readonly IInstagramService _instagramService; + private readonly ISchedulerService _schedulerService; + + public ActionInstagramImages(IInstagramService instagramService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + _instagramService = instagramService; + _schedulerService = schedulerService; + _currentEnvironment = currentEnvironment; + _clock = clock; } public string Name => ACTION_NAME; public void Run(params object[] parameters) { - Task unused = instagramService.CacheInstagramImages(); + Task unused = _instagramService.CacheInstagramImages(); } public async Task CreateSelf() { - if (schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { - await schedulerService.CreateScheduledJob(clock.Today(), TimeSpan.FromMinutes(15), ACTION_NAME); + if (_currentEnvironment.IsDevelopment()) return; + + if (_schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + await _schedulerService.CreateScheduledJob(_clock.Today(), TimeSpan.FromMinutes(15), ACTION_NAME); } Run(); diff --git a/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramToken.cs b/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramToken.cs index e61d242c..d94a5973 100644 --- a/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramToken.cs +++ b/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramToken.cs @@ -1,34 +1,39 @@ using System; using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; using UKSF.Api.Base.ScheduledActions; -using UKSF.Api.Base.Services; using UKSF.Api.Integration.Instagram.Services; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Integration.Instagram.ScheduledActions { public interface IActionInstagramToken : ISelfCreatingScheduledAction { } public class ActionInstagramToken : IActionInstagramToken { - public const string ACTION_NAME = nameof(ActionInstagramToken); + private const string ACTION_NAME = nameof(ActionInstagramToken); - private readonly IClock clock; - private readonly IInstagramService instagramService; - private readonly ISchedulerService schedulerService; + private readonly IClock _clock; + private readonly IHostEnvironment _currentEnvironment; + private readonly IInstagramService _instagramService; + private readonly ISchedulerService _schedulerService; - public ActionInstagramToken(IInstagramService instagramService, ISchedulerService schedulerService, IClock clock) { - this.instagramService = instagramService; - this.schedulerService = schedulerService; - this.clock = clock; + public ActionInstagramToken(IInstagramService instagramService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + _instagramService = instagramService; + _schedulerService = schedulerService; + _currentEnvironment = currentEnvironment; + _clock = clock; } public string Name => ACTION_NAME; public void Run(params object[] parameters) { - Task unused = instagramService.RefreshAccessToken(); + Task unused = _instagramService.RefreshAccessToken(); } public async Task CreateSelf() { - if (schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { - await schedulerService.CreateScheduledJob(clock.Today().AddDays(45), TimeSpan.FromDays(45), ACTION_NAME); + if (_currentEnvironment.IsDevelopment()) return; + + if (_schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(45), TimeSpan.FromDays(45), ACTION_NAME); } } } diff --git a/UKSF.Api.Integration.Instagram/Services/InstagramService.cs b/UKSF.Api.Integration.Instagram/Services/InstagramService.cs index a5e82167..b52429ec 100644 --- a/UKSF.Api.Integration.Instagram/Services/InstagramService.cs +++ b/UKSF.Api.Integration.Instagram/Services/InstagramService.cs @@ -7,8 +7,8 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Base.Events; using UKSF.Api.Integration.Instagram.Models; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Integration.Instagram.Services { public interface IInstagramService { diff --git a/UKSF.Api.Integration.Instagram/UKSF.Api.Integration.Instagram.csproj b/UKSF.Api.Integration.Instagram/UKSF.Api.Integration.Instagram.csproj index 6e541609..0fb77d50 100644 --- a/UKSF.Api.Integration.Instagram/UKSF.Api.Integration.Instagram.csproj +++ b/UKSF.Api.Integration.Instagram/UKSF.Api.Integration.Instagram.csproj @@ -11,7 +11,6 @@ - diff --git a/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs b/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs index 0c16af1c..86f4a1db 100644 --- a/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs +++ b/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs @@ -1,15 +1,16 @@ using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Discord.EventHandlers; using UKSF.Api.Discord.Services; namespace UKSF.Api.Discord { public static class ApiIntegrationDiscordExtensions { - public static IServiceCollection AddUksfPersonnel(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); + public static IServiceCollection AddUksfIntegrationDiscord(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); private static IServiceCollection AddContexts(this IServiceCollection services) => services; private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton(); } diff --git a/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs b/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs index 8c24d21c..5f8ddf8b 100644 --- a/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs +++ b/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs @@ -4,26 +4,31 @@ using Discord.WebSocket; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Base; using UKSF.Api.Discord.Services; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared; namespace UKSF.Api.Discord.Controllers { [Route("[controller]")] public class DiscordController : Controller { - private readonly IDiscordService discordService; + private readonly IDiscordService _discordService; - public DiscordController(IDiscordService discordService) => this.discordService = discordService; + public DiscordController(IDiscordService discordService) => _discordService = discordService; [HttpGet("roles"), Authorize, Permissions(Permissions.ADMIN)] public async Task GetRoles() { - IReadOnlyCollection roles = await discordService.GetRoles(); + IReadOnlyCollection roles = await _discordService.GetRoles(); return Ok(roles.OrderBy(x => x.Name).Select(x => $"{x.Name}: {x.Id}").Aggregate((x, y) => $"{x}\n{y}")); } [HttpGet("updateuserroles"), Authorize, Permissions(Permissions.ADMIN)] public async Task UpdateUserRoles() { - await discordService.UpdateAllUsers(); + await _discordService.UpdateAllUsers(); return Ok(); } + + // TODO: Use in frontend. Check return type. Check permissions + [HttpGet("onlineUserDetails"), Authorize] + public (bool discordOnline, string discordNickname) GetOnlineUserDetails(Account account) => _discordService.GetOnlineUserDetails(account); } } diff --git a/UKSF.Api.Integrations.Discord/EventHandlers/DiscordAccountEventHandler.cs b/UKSF.Api.Integrations.Discord/EventHandlers/DiscordAccountEventHandler.cs new file mode 100644 index 00000000..67d79cd7 --- /dev/null +++ b/UKSF.Api.Integrations.Discord/EventHandlers/DiscordAccountEventHandler.cs @@ -0,0 +1,30 @@ +using System.Threading.Tasks; +using UKSF.Api.Base.Events; +using UKSF.Api.Discord.Services; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; + +namespace UKSF.Api.Discord.EventHandlers { + public interface IDiscordAccountEventHandler : IEventHandler { } + + public class DiscordAccountEventHandler : IDiscordAccountEventHandler { + private readonly IEventBus _accountEventBus; + private readonly IDiscordService _discordService; + private readonly ILogger _logger; + + public DiscordAccountEventHandler(IEventBus accountEventBus, ILogger logger, IDiscordService discordService) { + _accountEventBus = accountEventBus; + _logger = logger; + _discordService = discordService; + } + + public void Init() { + _accountEventBus.AsObservable().SubscribeWithAsyncNext(HandleAccountEvent, exception => _logger.LogError(exception)); + } + + private async Task HandleAccountEvent(Account account) { + await _discordService.UpdateAccount(account); + } + } +} diff --git a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs index b4fa7ced..38897b39 100644 --- a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs +++ b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs @@ -7,9 +7,9 @@ using Microsoft.Extensions.Configuration; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Discord.Services { public interface IDiscordService { diff --git a/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj b/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj index 04e5684a..1490be48 100644 --- a/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj +++ b/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj @@ -6,10 +6,6 @@ UKSF.Api.Discord - - - - diff --git a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs index 85c25937..c2779595 100644 --- a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs +++ b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs @@ -1,6 +1,8 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Base.Events; +using UKSF.Api.Shared.Models; using UKSF.Api.Teamspeak.EventHandlers; using UKSF.Api.Teamspeak.ScheduledActions; using UKSF.Api.Teamspeak.Services; @@ -13,9 +15,12 @@ public static IServiceCollection AddUksfIntegrationTeamspeak(this IServiceCollec private static IServiceCollection AddContexts(this IServiceCollection services) => services; - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton>(); - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => + services.AddSingleton() + .AddSingleton() + .AddSingleton(); private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton() diff --git a/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs b/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs index a04c2b8d..c06c240a 100644 --- a/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs +++ b/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; -using UKSF.Api.Base; +using UKSF.Api.Shared; using UKSF.Api.Teamspeak.Models; namespace UKSF.Api.Teamspeak.Controllers { diff --git a/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs b/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs index 55bbaa89..e4bdc5c3 100644 --- a/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs +++ b/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs @@ -1,26 +1,92 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Base; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared; +using UKSF.Api.Teamspeak.Models; using UKSF.Api.Teamspeak.Services; namespace UKSF.Api.Teamspeak.Controllers { [Route("[controller]")] public class TeamspeakController : Controller { - private readonly ITeamspeakService teamspeakService; + private readonly IAccountService _accountService; + private readonly IDisplayNameService _displayNameService; + private readonly IRanksService _ranksService; + private readonly IRecruitmentService _recruitmentService; + private readonly ITeamspeakService _teamspeakService; + private readonly IUnitsService _unitsService; - public TeamspeakController(ITeamspeakService teamspeakService) => this.teamspeakService = teamspeakService; + public TeamspeakController( + ITeamspeakService teamspeakService, + IAccountService accountService, + IRanksService ranksService, + IUnitsService unitsService, + IRecruitmentService recruitmentService, + IDisplayNameService displayNameService + ) { + _teamspeakService = teamspeakService; + _accountService = accountService; + _ranksService = ranksService; + _unitsService = unitsService; + _recruitmentService = recruitmentService; + _displayNameService = displayNameService; + } [HttpGet("online"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER, Permissions.DISCHARGED)] - public IEnumerable GetOnlineClients() => teamspeakService.GetFormattedClients(); + public IEnumerable GetOnlineClients() => _teamspeakService.GetFormattedClients(); [HttpGet("shutdown"), Authorize, Permissions(Permissions.ADMIN)] public async Task Shutdown() { - await teamspeakService.Shutdown(); + await _teamspeakService.Shutdown(); await Task.Delay(TimeSpan.FromSeconds(3)); return Ok(); } + + // TODO: Frontend needs reference updating + [HttpGet("onlineAccounts")] + public IActionResult GetOnlineAccounts() { + IEnumerable teamnspeakClients = _teamspeakService.GetOnlineTeamspeakClients(); + IEnumerable allAccounts = _accountService.Data.Get(); + var clients = teamnspeakClients.Where(x => x != null) + .Select( + x => new { + account = allAccounts.FirstOrDefault(y => y.teamspeakIdentities != null && y.teamspeakIdentities.Any(z => z.Equals(x.clientDbId))), client = x + } + ) + .ToList(); + var clientAccounts = clients.Where(x => x.account != null && x.account.membershipState == MembershipState.MEMBER) + .OrderBy(x => x.account.rank, new RankComparer(_ranksService)) + .ThenBy(x => x.account.lastname) + .ThenBy(x => x.account.firstname); + List commandAccounts = _unitsService.GetAuxilliaryRoot().members; + + List commanders = new List(); + List recruiters = new List(); + List members = new List(); + List guests = new List(); + foreach (var onlineClient in clientAccounts) { + if (commandAccounts.Contains(onlineClient.account.id)) { + commanders.Add(new { displayName = _displayNameService.GetDisplayName(onlineClient.account) }); + } else if (_recruitmentService.IsRecruiter(onlineClient.account)) { + recruiters.Add(new { displayName = _displayNameService.GetDisplayName(onlineClient.account) }); + } else { + members.Add(new { displayName = _displayNameService.GetDisplayName(onlineClient.account) }); + } + } + + foreach (var client in clients.Where(x => x.account == null || x.account.membershipState != MembershipState.MEMBER)) { + guests.Add(new { displayName = client.client.clientName }); + } + + return Ok(new { commanders, recruiters, members, guests }); + } + + // TODO: Use in frontend. Check return type. Check permissions + [HttpGet("onlineUserDetails"), Authorize] + public (bool tsOnline, string tsNickname) GetOnlineUserDetails(Account account) => _teamspeakService.GetOnlineUserDetails(account); } } diff --git a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakAccountEventHandler.cs b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakAccountEventHandler.cs new file mode 100644 index 00000000..1e400897 --- /dev/null +++ b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakAccountEventHandler.cs @@ -0,0 +1,31 @@ +using System.Threading.Tasks; +using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Teamspeak.Services; + +namespace UKSF.Api.Teamspeak.EventHandlers { + public interface ITeamspeakAccountEventHandler : IEventHandler { } + + // TODO: Come up with better naming and a better structure for event handlers in components (multiple components can consume the same event, can't all be called XHandler) + public class TeamspeakAccountEventHandler : ITeamspeakAccountEventHandler { + private readonly IEventBus _accountEventBus; + private readonly ILogger _logger; + private readonly ITeamspeakService _teamspeakService; + + public TeamspeakAccountEventHandler(IEventBus accountEventBus, ILogger logger, ITeamspeakService teamspeakService) { + _accountEventBus = accountEventBus; + _logger = logger; + _teamspeakService = teamspeakService; + } + + public void Init() { + _accountEventBus.AsObservable().SubscribeWithAsyncNext(HandleAccountEvent, exception => _logger.LogError(exception)); + } + + private async Task HandleAccountEvent(Account account) { + await _teamspeakService.UpdateAccountTeamspeakGroups(account); + } + } +} diff --git a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs index 3744cb7e..f1f12d21 100644 --- a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs +++ b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs @@ -6,10 +6,11 @@ using System.Threading.Tasks; using Newtonsoft.Json.Linq; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; -using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Models; using UKSF.Api.Teamspeak.Models; using UKSF.Api.Teamspeak.Services; @@ -17,29 +18,23 @@ namespace UKSF.Api.Teamspeak.EventHandlers { public interface ITeamspeakEventHandler : IEventHandler { } public class TeamspeakEventHandler : ITeamspeakEventHandler { - private readonly IAccountService accountService; - private readonly ISignalrEventBus eventBus; - private readonly ConcurrentDictionary serverGroupUpdates = new ConcurrentDictionary(); - private readonly ITeamspeakGroupService teamspeakGroupService; - private readonly ILogger logger; - private readonly ITeamspeakService teamspeakService; + private readonly IAccountService _accountService; + private readonly ISignalrEventBus _eventBus; + private readonly ILogger _logger; + private readonly ConcurrentDictionary _serverGroupUpdates = new ConcurrentDictionary(); + private readonly ITeamspeakGroupService _teamspeakGroupService; + private readonly ITeamspeakService _teamspeakService; - public TeamspeakEventHandler( - ISignalrEventBus eventBus, - ITeamspeakService teamspeakService, - IAccountService accountService, - ITeamspeakGroupService teamspeakGroupService, - ILogger logger - ) { - this.eventBus = eventBus; - this.teamspeakService = teamspeakService; - this.accountService = accountService; - this.teamspeakGroupService = teamspeakGroupService; - this.logger = logger; + public TeamspeakEventHandler(ISignalrEventBus eventBus, ITeamspeakService teamspeakService, IAccountService accountService, ITeamspeakGroupService teamspeakGroupService, ILogger logger) { + _eventBus = eventBus; + _teamspeakService = teamspeakService; + _accountService = accountService; + _teamspeakGroupService = teamspeakGroupService; + _logger = logger; } public void Init() { - eventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => logger.LogError(exception)); + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => _logger.LogError(exception)); } private async Task HandleEvent(SignalrEventModel signalrEventModel) { @@ -51,7 +46,7 @@ private async Task HandleEvent(SignalrEventModel signalrEventModel) { await UpdateClientServerGroups(signalrEventModel.args.ToString()); break; case TeamspeakEventType.EMPTY: break; - default: throw new ArgumentOutOfRangeException(nameof(signalrEventModel)); + default: throw new ArgumentException($"Invalid teamspeak event type"); } } @@ -62,7 +57,7 @@ private async Task UpdateClients(string args) { HashSet clients = clientsArray.ToObject>(); await Console.Out.WriteLineAsync("Updating online clients"); - await teamspeakService.UpdateClients(clients); + await _teamspeakService.UpdateClients(clients); } private async Task UpdateClientServerGroups(string args) { @@ -71,7 +66,7 @@ private async Task UpdateClientServerGroups(string args) { double serverGroupId = double.Parse(updateObject["serverGroupId"].ToString()); await Console.Out.WriteLineAsync($"Server group for {clientDbid}: {serverGroupId}"); - TeamspeakServerGroupUpdate update = serverGroupUpdates.GetOrAdd(clientDbid, x => new TeamspeakServerGroupUpdate()); + TeamspeakServerGroupUpdate update = _serverGroupUpdates.GetOrAdd(clientDbid, _ => new TeamspeakServerGroupUpdate()); update.serverGroups.Add(serverGroupId); update.cancellationTokenSource?.Cancel(); update.cancellationTokenSource = new CancellationTokenSource(); @@ -87,10 +82,10 @@ private async Task UpdateClientServerGroups(string args) { private async Task ProcessAccountData(double clientDbId, ICollection serverGroups) { await Console.Out.WriteLineAsync($"Processing server groups for {clientDbId}"); - Account account = accountService.Data.GetSingle(x => x.teamspeakIdentities != null && x.teamspeakIdentities.Any(y => y.Equals(clientDbId))); - Task unused = teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); + Account account = _accountService.Data.GetSingle(x => x.teamspeakIdentities != null && x.teamspeakIdentities.Any(y => y.Equals(clientDbId))); + Task unused = _teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); - serverGroupUpdates.TryRemove(clientDbId, out TeamspeakServerGroupUpdate _); + _serverGroupUpdates.TryRemove(clientDbId, out TeamspeakServerGroupUpdate _); } } } diff --git a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakMessageEventHandler.cs b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakMessageEventHandler.cs new file mode 100644 index 00000000..9787c4ad --- /dev/null +++ b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakMessageEventHandler.cs @@ -0,0 +1,30 @@ +using System.Threading.Tasks; +using UKSF.Api.Base.Events; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Models; +using UKSF.Api.Teamspeak.Services; + +namespace UKSF.Api.Teamspeak.EventHandlers { + public interface ITeamspeakMessageEventHandler : IEventHandler { } + + public class TeamspeakMessageEventHandler : ITeamspeakMessageEventHandler { + private readonly IEventBus _accountEventBus; + private readonly ILogger _logger; + private readonly ITeamspeakService _teamspeakService; + + public TeamspeakMessageEventHandler(IEventBus accountEventBus, ILogger logger, ITeamspeakService teamspeakService) { + _accountEventBus = accountEventBus; + _logger = logger; + _teamspeakService = teamspeakService; + } + + public void Init() { + _accountEventBus.AsObservable().SubscribeWithAsyncNext(HandleMessageEvent, exception => _logger.LogError(exception)); + } + + private async Task HandleMessageEvent(TeamspeakMessageEventModel messageEvent) { + await _teamspeakService.SendTeamspeakMessageToClient(messageEvent.ClientDbIds, messageEvent.Message); + } + } +} diff --git a/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs b/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs index fb0deb8e..9c3aebcd 100644 --- a/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs +++ b/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs @@ -1,34 +1,39 @@ using System; using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; using UKSF.Api.Base.ScheduledActions; -using UKSF.Api.Base.Services; +using UKSF.Api.Shared.Services; using UKSF.Api.Teamspeak.Services; namespace UKSF.Api.Teamspeak.ScheduledActions { public interface IActionTeamspeakSnapshot : ISelfCreatingScheduledAction { } public class ActionTeamspeakSnapshot : IActionTeamspeakSnapshot { - public const string ACTION_NAME = nameof(ActionTeamspeakSnapshot); + private const string ACTION_NAME = nameof(ActionTeamspeakSnapshot); - private readonly IClock clock; - private readonly ISchedulerService schedulerService; - private readonly ITeamspeakService teamspeakService; + private readonly IClock _clock; + private readonly IHostEnvironment _currentEnvironment; + private readonly ISchedulerService _schedulerService; + private readonly ITeamspeakService _teamspeakService; - public ActionTeamspeakSnapshot(ITeamspeakService teamspeakService, ISchedulerService schedulerService, IClock clock) { - this.teamspeakService = teamspeakService; - this.schedulerService = schedulerService; - this.clock = clock; + public ActionTeamspeakSnapshot(ITeamspeakService teamspeakService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + _teamspeakService = teamspeakService; + _schedulerService = schedulerService; + _currentEnvironment = currentEnvironment; + _clock = clock; } public string Name => ACTION_NAME; public void Run(params object[] parameters) { - teamspeakService.StoreTeamspeakServerSnapshot(); + _teamspeakService.StoreTeamspeakServerSnapshot(); } public async Task CreateSelf() { - if (schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { - await schedulerService.CreateScheduledJob(clock.Today().AddMinutes(5), TimeSpan.FromMinutes(5), ACTION_NAME); + if (_currentEnvironment.IsDevelopment()) return; + + if (_schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + await _schedulerService.CreateScheduledJob(_clock.Today().AddMinutes(5), TimeSpan.FromMinutes(5), ACTION_NAME); } } } diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs index fe45df92..cf2e9b21 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs @@ -4,10 +4,10 @@ using MongoDB.Bson; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Base.Extensions; using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Extensions; using UKSF.Api.Teamspeak.Models; namespace UKSF.Api.Teamspeak.Services { diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs index 221b0374..3bed3cc7 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.SignalR; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Extensions; using UKSF.Api.Teamspeak.Models; using UKSF.Api.Teamspeak.Signalr.Clients; using UKSF.Api.Teamspeak.Signalr.Hubs; diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs index 2b7a36f2..b25fdb08 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs @@ -25,73 +25,71 @@ public interface ITeamspeakService { } public class TeamspeakService : ITeamspeakService { - private readonly SemaphoreSlim clientsSemaphore = new SemaphoreSlim(1); - private readonly IMongoDatabase database; - private readonly IHubContext teamspeakClientsHub; - private readonly ITeamspeakManagerService teamspeakManagerService; - private readonly IHostEnvironment environment; - private HashSet clients = new HashSet(); + private readonly SemaphoreSlim _clientsSemaphore = new SemaphoreSlim(1); + private readonly IMongoDatabase _database; + private readonly IHubContext _teamspeakClientsHub; + private readonly ITeamspeakManagerService _teamspeakManagerService; + private readonly IHostEnvironment _environment; + private HashSet _clients = new HashSet(); public TeamspeakService(IMongoDatabase database, IHubContext teamspeakClientsHub, ITeamspeakManagerService teamspeakManagerService, IHostEnvironment environment) { - this.database = database; - this.teamspeakClientsHub = teamspeakClientsHub; - this.teamspeakManagerService = teamspeakManagerService; - this.environment = environment; + _database = database; + _teamspeakClientsHub = teamspeakClientsHub; + _teamspeakManagerService = teamspeakManagerService; + _environment = environment; } - public IEnumerable GetOnlineTeamspeakClients() => clients; + public IEnumerable GetOnlineTeamspeakClients() => _clients; public async Task UpdateClients(HashSet newClients) { - await clientsSemaphore.WaitAsync(); - clients = newClients; - clientsSemaphore.Release(); - await teamspeakClientsHub.Clients.All.ReceiveClients(GetFormattedClients()); + await _clientsSemaphore.WaitAsync(); + _clients = newClients; + _clientsSemaphore.Release(); + await _teamspeakClientsHub.Clients.All.ReceiveClients(GetFormattedClients()); } public async Task UpdateAccountTeamspeakGroups(Account account) { if (account?.teamspeakIdentities == null) return; foreach (double clientDbId in account.teamspeakIdentities) { - await teamspeakManagerService.SendProcedure(TeamspeakProcedureType.GROUPS, new {clientDbId}); + await _teamspeakManagerService.SendProcedure(TeamspeakProcedureType.GROUPS, new {clientDbId}); } } public async Task SendTeamspeakMessageToClient(Account account, string message) { - if (account.teamspeakIdentities == null) return; - if (account.teamspeakIdentities.Count == 0) return; await SendTeamspeakMessageToClient(account.teamspeakIdentities, message); } public async Task SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message) { message = FormatTeamspeakMessage(message); foreach (double clientDbId in clientDbIds) { - await teamspeakManagerService.SendProcedure(TeamspeakProcedureType.MESSAGE, new {clientDbId, message}); + await _teamspeakManagerService.SendProcedure(TeamspeakProcedureType.MESSAGE, new {clientDbId, message}); } } public async Task StoreTeamspeakServerSnapshot() { - if (clients.Count == 0) { + if (_clients.Count == 0) { await Console.Out.WriteLineAsync("No client data for snapshot"); return; } - TeamspeakServerSnapshot teamspeakServerSnapshot = new TeamspeakServerSnapshot {timestamp = DateTime.UtcNow, users = clients}; - await database.GetCollection("teamspeakSnapshots").InsertOneAsync(teamspeakServerSnapshot); + TeamspeakServerSnapshot teamspeakServerSnapshot = new TeamspeakServerSnapshot {timestamp = DateTime.UtcNow, users = _clients}; + await _database.GetCollection("teamspeakSnapshots").InsertOneAsync(teamspeakServerSnapshot); } public async Task Shutdown() { - await teamspeakManagerService.SendProcedure(TeamspeakProcedureType.SHUTDOWN, new {}); + await _teamspeakManagerService.SendProcedure(TeamspeakProcedureType.SHUTDOWN, new {}); } public IEnumerable GetFormattedClients() { - if (environment.IsDevelopment()) return new List {new {name = "SqnLdr.Beswick.T", clientDbId = (double) 2}}; - return clients.Where(x => x != null).Select(x => new {name = $"{x.clientName}", x.clientDbId}); + if (_environment.IsDevelopment()) return new List {new {name = "SqnLdr.Beswick.T", clientDbId = (double) 2}}; + return _clients.Where(x => x != null).Select(x => new {name = $"{x.clientName}", x.clientDbId}); } public (bool online, string nickname) GetOnlineUserDetails(Account account) { if (account.teamspeakIdentities == null) return (false, ""); - if (clients.Count == 0) return (false, ""); + if (_clients.Count == 0) return (false, ""); - foreach (TeamspeakClient client in clients.Where(x => x != null)) { + foreach (TeamspeakClient client in _clients.Where(x => x != null)) { if (account.teamspeakIdentities.Any(y => y.Equals(client.clientDbId))) { return (true, client.clientName); } diff --git a/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs index 617a5b9f..2401d62d 100644 --- a/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs +++ b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using UKSF.Api.Teamspeak.Signalr.Clients; namespace UKSF.Api.Teamspeak.Signalr.Hubs { diff --git a/UKSF.Api.Launcher/Context/LauncherFileDataService.cs b/UKSF.Api.Launcher/Context/LauncherFileDataService.cs index 8a5efe59..4674018a 100644 --- a/UKSF.Api.Launcher/Context/LauncherFileDataService.cs +++ b/UKSF.Api.Launcher/Context/LauncherFileDataService.cs @@ -1,6 +1,7 @@ using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Launcher.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Launcher.Context { public interface ILauncherFileDataService : IDataService, ICachedDataService { } diff --git a/UKSF.Api.Launcher/Controllers/LauncherController.cs b/UKSF.Api.Launcher/Controllers/LauncherController.cs index c2ecb3e8..549f8b76 100644 --- a/UKSF.Api.Launcher/Controllers/LauncherController.cs +++ b/UKSF.Api.Launcher/Controllers/LauncherController.cs @@ -9,25 +9,28 @@ using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Base; -using UKSF.Api.Base.Services; using UKSF.Api.Launcher.Models; using UKSF.Api.Launcher.Services; using UKSF.Api.Launcher.Signalr.Clients; using UKSF.Api.Launcher.Signalr.Hubs; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Services; + +// ReSharper disable UnusedVariable +// ReSharper disable UnusedParameter.Global +// ReSharper disable NotAccessedField.Local namespace UKSF.Api.Launcher.Controllers { [Route("[controller]"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER)] public class LauncherController : Controller { - private readonly IDisplayNameService displayNameService; - private readonly ILauncherFileService launcherFileService; - private readonly IHttpContextService httpContextService; - private readonly IHubContext launcherHub; - private readonly ILauncherService launcherService; - - private readonly IVariablesDataService variablesDataService; - private readonly IVariablesService variablesService; + private readonly IDisplayNameService _displayNameService; + private readonly IHttpContextService _httpContextService; + private readonly ILauncherFileService _launcherFileService; + private readonly IHubContext _launcherHub; + private readonly ILauncherService _launcherService; + private readonly IVariablesDataService _variablesDataService; + private readonly IVariablesService _variablesService; public LauncherController( IVariablesDataService variablesDataService, @@ -38,41 +41,40 @@ public LauncherController( IDisplayNameService displayNameService, IVariablesService variablesService ) { - this.variablesDataService = variablesDataService; - this.launcherHub = launcherHub; - this.launcherService = launcherService; - this.launcherFileService = launcherFileService; - this.httpContextService = httpContextService; - - this.displayNameService = displayNameService; - this.variablesService = variablesService; + _variablesDataService = variablesDataService; + _launcherHub = launcherHub; + _launcherService = launcherService; + _launcherFileService = launcherFileService; + _httpContextService = httpContextService; + _displayNameService = displayNameService; + _variablesService = variablesService; } [HttpGet("update/{platform}/{version}")] public IActionResult GetUpdate(string platform, string version) => Ok(); [HttpGet("version")] - public IActionResult GetVersion() => Ok(variablesDataService.GetSingle("LAUNCHER_VERSION").AsString()); + public IActionResult GetVersion() => Ok(_variablesDataService.GetSingle("LAUNCHER_VERSION").AsString()); [HttpPost("version"), Permissions(Permissions.ADMIN)] public async Task UpdateVersion([FromBody] JObject body) { string version = body["version"].ToString(); - await variablesDataService.Update("LAUNCHER_VERSION", version); - await launcherFileService.UpdateAllVersions(); - await launcherHub.Clients.All.ReceiveLauncherVersion(version); + await _variablesDataService.Update("LAUNCHER_VERSION", version); + await _launcherFileService.UpdateAllVersions(); + await _launcherHub.Clients.All.ReceiveLauncherVersion(version); return Ok(); } [HttpGet("download/setup")] - public IActionResult GetLauncher() => launcherFileService.GetLauncherFile("UKSF Launcher Setup.msi"); + public IActionResult GetLauncher() => _launcherFileService.GetLauncherFile("UKSF Launcher Setup.msi"); [HttpGet("download/updater")] - public IActionResult GetUpdater() => launcherFileService.GetLauncherFile("Updater", "UKSF.Launcher.Updater.exe"); + public IActionResult GetUpdater() => _launcherFileService.GetLauncherFile("Updater", "UKSF.Launcher.Updater.exe"); [HttpPost("download/update")] public async Task GetUpdatedFiles([FromBody] JObject body) { List files = JsonConvert.DeserializeObject>(body["files"].ToString()); - Stream updatedFiles = await launcherFileService.GetUpdatedFiles(files); + Stream updatedFiles = await _launcherFileService.GetUpdatedFiles(files); FileStreamResult stream = new FileStreamResult(updatedFiles, "application/octet-stream"); return stream; } diff --git a/UKSF.Api.Launcher/Services/LauncherFileService.cs b/UKSF.Api.Launcher/Services/LauncherFileService.cs index 3f36ef93..976cdcec 100644 --- a/UKSF.Api.Launcher/Services/LauncherFileService.cs +++ b/UKSF.Api.Launcher/Services/LauncherFileService.cs @@ -22,14 +22,13 @@ public interface ILauncherFileService : IDataBackedService, ILauncherFileService { - private readonly IVariablesService variablesService; - public LauncherFileService(ILauncherFileDataService data, IVariablesService variablesService) : base(data) { - this.variablesService = variablesService; - } + private readonly IVariablesService _variablesService; + + public LauncherFileService(ILauncherFileDataService data, IVariablesService variablesService) : base(data) => _variablesService = variablesService; public async Task UpdateAllVersions() { List storedVersions = Data.Get().ToList(); - string launcherDirectory = Path.Combine(variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), "Launcher"); + string launcherDirectory = Path.Combine(_variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), "Launcher"); List fileNames = new List(); foreach (string filePath in Directory.EnumerateFiles(launcherDirectory)) { string fileName = Path.GetFileName(filePath); @@ -37,7 +36,7 @@ public async Task UpdateAllVersions() { fileNames.Add(fileName); LauncherFile storedFile = storedVersions.FirstOrDefault(x => x.fileName == fileName); if (storedFile == null) { - await Data.Add(new LauncherFile {fileName = fileName, version = version}); + await Data.Add(new LauncherFile { fileName = fileName, version = version }); continue; } @@ -52,14 +51,14 @@ public async Task UpdateAllVersions() { } public FileStreamResult GetLauncherFile(params string[] file) { - string[] paths = file.Prepend(variablesService.GetVariable("LAUNCHER_LOCATION").AsString()).ToArray(); + string[] paths = file.Prepend(_variablesService.GetVariable("LAUNCHER_LOCATION").AsString()).ToArray(); string path = Path.Combine(paths); FileStreamResult fileStreamResult = new FileStreamResult(new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read), MimeUtility.GetMimeMapping(path)); return fileStreamResult; } public async Task GetUpdatedFiles(IEnumerable files) { - string launcherDirectory = Path.Combine(variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), "Launcher"); + string launcherDirectory = Path.Combine(_variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), "Launcher"); List storedVersions = Data.Get().ToList(); List updatedFiles = new List(); List deletedFiles = new List(); @@ -76,7 +75,7 @@ public async Task GetUpdatedFiles(IEnumerable files) { } string updateFolderName = Guid.NewGuid().ToString("N"); - string updateFolder = Path.Combine(variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), updateFolderName); + string updateFolder = Path.Combine(_variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), updateFolderName); Directory.CreateDirectory(updateFolder); string deletedFilesPath = Path.Combine(updateFolder, "deleted"); @@ -86,7 +85,7 @@ public async Task GetUpdatedFiles(IEnumerable files) { File.Copy(Path.Combine(launcherDirectory, file), Path.Combine(updateFolder, file), true); } - string updateZipPath = Path.Combine(variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), $"{updateFolderName}.zip"); + string updateZipPath = Path.Combine(_variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), $"{updateFolderName}.zip"); ZipFile.CreateFromDirectory(updateFolder, updateZipPath); MemoryStream stream = new MemoryStream(); await using (FileStream fileStream = new FileStream(updateZipPath, FileMode.Open, FileAccess.Read, FileShare.None)) { diff --git a/UKSF.Api.Launcher/Services/LauncherService.cs b/UKSF.Api.Launcher/Services/LauncherService.cs index ccd24c34..b4df1fbf 100644 --- a/UKSF.Api.Launcher/Services/LauncherService.cs +++ b/UKSF.Api.Launcher/Services/LauncherService.cs @@ -2,12 +2,14 @@ using UKSF.Api.Launcher.Signalr.Clients; using UKSF.Api.Launcher.Signalr.Hubs; +// ReSharper disable NotAccessedField.Local + namespace UKSF.Api.Launcher.Services { public interface ILauncherService { } public class LauncherService : ILauncherService { - private readonly IHubContext launcherHub; + private readonly IHubContext _launcherHub; - public LauncherService(IHubContext launcherHub) => this.launcherHub = launcherHub; + public LauncherService(IHubContext launcherHub) => _launcherHub = launcherHub; } } diff --git a/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings b/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings deleted file mode 100644 index e7d45a2a..00000000 --- a/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/UKSF.Api.Modpack/ApiModpackExtensions.cs b/UKSF.Api.Modpack/ApiModpackExtensions.cs index 26bfd2bf..78a95556 100644 --- a/UKSF.Api.Modpack/ApiModpackExtensions.cs +++ b/UKSF.Api.Modpack/ApiModpackExtensions.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Base.Events; using UKSF.Api.Modpack.EventHandlers; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.ScheduledActions; @@ -9,6 +8,7 @@ using UKSF.Api.Modpack.Services.BuildProcess; using UKSF.Api.Modpack.Services.Data; using UKSF.Api.Modpack.Signalr.Hubs; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Modpack { public static class ApiModpackExtensions { diff --git a/UKSF.Api.Modpack/Controllers/GithubController.cs b/UKSF.Api.Modpack/Controllers/GithubController.cs index 1005cec3..512f619e 100644 --- a/UKSF.Api.Modpack/Controllers/GithubController.cs +++ b/UKSF.Api.Modpack/Controllers/GithubController.cs @@ -6,9 +6,9 @@ using Newtonsoft.Json.Linq; using Octokit; using Octokit.Internal; -using UKSF.Api.Base; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services; +using UKSF.Api.Shared; namespace UKSF.Api.Modpack.Controllers { [Route("[controller]")] diff --git a/UKSF.Api.Modpack/Controllers/IssueController.cs b/UKSF.Api.Modpack/Controllers/IssueController.cs index d389db5f..dd8a0ff1 100644 --- a/UKSF.Api.Modpack/Controllers/IssueController.cs +++ b/UKSF.Api.Modpack/Controllers/IssueController.cs @@ -8,9 +8,9 @@ using Microsoft.Extensions.Configuration; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using UKSF.Api.Base; -using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Modpack.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] diff --git a/UKSF.Api.Modpack/Controllers/ModpackController.cs b/UKSF.Api.Modpack/Controllers/ModpackController.cs index 15347844..332c5a1a 100644 --- a/UKSF.Api.Modpack/Controllers/ModpackController.cs +++ b/UKSF.Api.Modpack/Controllers/ModpackController.cs @@ -2,9 +2,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Base; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services; +using UKSF.Api.Shared; namespace UKSF.Api.Modpack.Controllers { [Route("[controller]")] diff --git a/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs b/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs index a7f50007..c192f1c1 100644 --- a/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs +++ b/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs @@ -3,11 +3,12 @@ using Microsoft.AspNetCore.SignalR; using UKSF.Api.ArmaServer.Models; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; -using UKSF.Api.Base.Models; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Signalr.Clients; using UKSF.Api.Modpack.Signalr.Hubs; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Modpack.EventHandlers { public interface IBuildsEventHandler : IEventHandler { } diff --git a/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs b/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs index af56ba81..cadcdfcd 100644 --- a/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs +++ b/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs @@ -1,33 +1,34 @@ using System; using System.Linq; using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; using UKSF.Api.ArmaServer.Models; using UKSF.Api.Base.Context; using UKSF.Api.Base.ScheduledActions; -using UKSF.Api.Base.Services; using UKSF.Api.Modpack.Models; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Modpack.ScheduledActions { public interface IActionPruneBuilds : ISelfCreatingScheduledAction { } public class ActionPruneBuilds : IActionPruneBuilds { - public const string ACTION_NAME = nameof(ActionPruneBuilds); + private const string ACTION_NAME = nameof(ActionPruneBuilds); private readonly IClock _clock; private readonly IDataCollectionFactory _dataCollectionFactory; private readonly ISchedulerService _schedulerService; + private readonly IHostEnvironment _currentEnvironment; - public ActionPruneBuilds(IDataCollectionFactory dataCollectionFactory, ISchedulerService schedulerService, IClock clock) { + public ActionPruneBuilds(IDataCollectionFactory dataCollectionFactory, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { _dataCollectionFactory = dataCollectionFactory; _schedulerService = schedulerService; + _currentEnvironment = currentEnvironment; _clock = clock; } public string Name => ACTION_NAME; public void Run(params object[] parameters) { - DateTime now = DateTime.Now; - IDataCollection buildsData = _dataCollectionFactory.CreateDataCollection("modpackBuilds"); int threshold = buildsData.Get(x => x.Environment == GameEnvironment.DEV).Select(x => x.BuildNumber).OrderByDescending(x => x).First() - 100; Task modpackBuildsTask = buildsData.DeleteManyAsync(x => x.BuildNumber < threshold); @@ -36,6 +37,8 @@ public void Run(params object[] parameters) { } public async Task CreateSelf() { + if (_currentEnvironment.IsDevelopment()) return; + if (_schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs index f6e97c37..182e0c3e 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading; using Newtonsoft.Json.Linq; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Modpack.Services.BuildProcess { public class BuildProcessHelper { diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs index ff775c7b..bcd61094 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs @@ -1,13 +1,12 @@ using System; using System.Threading; using System.Threading.Tasks; -using UKSF.Api.Admin.Services; using UKSF.Api.ArmaServer.Models; -using UKSF.Api.Base.Events; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services.BuildProcess.Steps; using UKSF.Api.Modpack.Services.BuildProcess.Steps.Common; using UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Modpack.Services.BuildProcess { public interface IBuildProcessorService { diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs index 91727321..8b13ca0c 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs @@ -4,8 +4,8 @@ using System.Threading; using System.Threading.Tasks; using UKSF.Api.ArmaServer.Services; -using UKSF.Api.Base.Events; using UKSF.Api.Modpack.Models; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Modpack.Services.BuildProcess { public interface IBuildQueueService { diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs index 581274f1..044333a8 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs @@ -18,28 +18,23 @@ public interface IBuildStepService { } public class BuildStepService : IBuildStepService { - private readonly IServiceProvider _serviceProvider; private Dictionary _buildStepDictionary = new Dictionary(); - public BuildStepService(IServiceProvider serviceProvider) { - _serviceProvider = serviceProvider; - } - public void RegisterBuildSteps() { _buildStepDictionary = AppDomain.CurrentDomain.GetAssemblies() - .SelectMany(x => x.GetTypes(), (_, type) => new { type }) - .Select(x => new { x.type, attributes = x.type.GetCustomAttributes(typeof(BuildStepAttribute), true) }) - .Where(x => x.attributes.Length > 0) - .Select(x => new { Key = x.attributes.Cast().First().Name, Value = x.type }) - .ToDictionary(x => x.Key, x => x.Value); + .SelectMany(x => x.GetTypes(), (_, type) => new { type }) + .Select(x => new { x.type, attributes = x.type.GetCustomAttributes(typeof(BuildStepAttribute), true) }) + .Where(x => x.attributes.Length > 0) + .Select(x => new { Key = x.attributes.Cast().First().Name, Value = x.type }) + .ToDictionary(x => x.Key, x => x.Value); } public List GetSteps(GameEnvironment environment) { List steps = environment switch { GameEnvironment.RELEASE => GetStepsForRelease(), - GameEnvironment.RC => GetStepsForRc(), - GameEnvironment.DEV => GetStepsForBuild(), - _ => throw new ArgumentException("Invalid build environment") + GameEnvironment.RC => GetStepsForRc(), + GameEnvironment.DEV => GetStepsForBuild(), + _ => throw new ArgumentException("Invalid build environment") }; ResolveIndices(steps); return steps; diff --git a/UKSF.Api.Modpack/Services/BuildsService.cs b/UKSF.Api.Modpack/Services/BuildsService.cs index a22cd91b..b6512339 100644 --- a/UKSF.Api.Modpack/Services/BuildsService.cs +++ b/UKSF.Api.Modpack/Services/BuildsService.cs @@ -5,12 +5,12 @@ using MongoDB.Driver; using UKSF.Api.ArmaServer.Models; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services.BuildProcess; using UKSF.Api.Modpack.Services.Data; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Modpack.Services { public interface IBuildsService : IDataBackedService { diff --git a/UKSF.Api.Modpack/Services/Data/BuildsDataService.cs b/UKSF.Api.Modpack/Services/Data/BuildsDataService.cs index fe0b8883..2cb291a4 100644 --- a/UKSF.Api.Modpack/Services/Data/BuildsDataService.cs +++ b/UKSF.Api.Modpack/Services/Data/BuildsDataService.cs @@ -3,9 +3,10 @@ using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; using UKSF.Api.Modpack.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Modpack.Services.Data { public interface IBuildsDataService : IDataService, ICachedDataService { diff --git a/UKSF.Api.Modpack/Services/Data/ReleasesDataService.cs b/UKSF.Api.Modpack/Services/Data/ReleasesDataService.cs index 666ce1a8..defade6a 100644 --- a/UKSF.Api.Modpack/Services/Data/ReleasesDataService.cs +++ b/UKSF.Api.Modpack/Services/Data/ReleasesDataService.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Modpack.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Modpack.Services.Data { public interface IReleasesDataService : IDataService, ICachedDataService { } diff --git a/UKSF.Api.Modpack/Services/GithubService.cs b/UKSF.Api.Modpack/Services/GithubService.cs index 5bab641b..a0530f5e 100644 --- a/UKSF.Api.Modpack/Services/GithubService.cs +++ b/UKSF.Api.Modpack/Services/GithubService.cs @@ -9,8 +9,8 @@ using GitHubJwt; using Microsoft.Extensions.Configuration; using Octokit; -using UKSF.Api.Base.Events; using UKSF.Api.Modpack.Models; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Modpack.Services { public interface IGithubService { diff --git a/UKSF.Api.Modpack/Services/ModpackService.cs b/UKSF.Api.Modpack/Services/ModpackService.cs index ed77a716..c9188541 100644 --- a/UKSF.Api.Modpack/Services/ModpackService.cs +++ b/UKSF.Api.Modpack/Services/ModpackService.cs @@ -4,10 +4,10 @@ using System.Threading.Tasks; using Octokit; using UKSF.Api.ArmaServer.Models; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services.BuildProcess; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Modpack.Services { public interface IModpackService { diff --git a/UKSF.Api.Modpack/Services/ReleaseService.cs b/UKSF.Api.Modpack/Services/ReleaseService.cs index e6f961a3..bd4f79bf 100644 --- a/UKSF.Api.Modpack/Services/ReleaseService.cs +++ b/UKSF.Api.Modpack/Services/ReleaseService.cs @@ -4,10 +4,10 @@ using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services.Data; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Modpack.Services { public interface IReleaseService : IDataBackedService { diff --git a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs index ef46d843..a0f9ab4e 100644 --- a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs +++ b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs @@ -8,6 +8,7 @@ using UKSF.Api.Personnel.ScheduledActions; using UKSF.Api.Personnel.Services; using UKSF.Api.Personnel.Signalr.Hubs; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel { public static class ApiPersonnelExtensions { @@ -30,10 +31,11 @@ private static IServiceCollection AddEventBuses(this IServiceCollection services .AddSingleton, DataEventBus>() .AddSingleton, DataEventBus>() .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>(); + .AddSingleton, DataEventBus>() + .AddSingleton, EventBus>(); private static IServiceCollection AddEventHandlers(this IServiceCollection services) => - services.AddSingleton() + services.AddSingleton() .AddSingleton() .AddSingleton(); diff --git a/UKSF.Api.Personnel/Context/AccountDataService.cs b/UKSF.Api.Personnel/Context/AccountDataService.cs index 85ab1470..00035413 100644 --- a/UKSF.Api.Personnel/Context/AccountDataService.cs +++ b/UKSF.Api.Personnel/Context/AccountDataService.cs @@ -1,6 +1,7 @@ using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Context { public interface IAccountDataService : IDataService, ICachedDataService { } diff --git a/UKSF.Api.Personnel/Context/CommentThreadDataService.cs b/UKSF.Api.Personnel/Context/CommentThreadDataService.cs index 05562c4e..eba7f7c1 100644 --- a/UKSF.Api.Personnel/Context/CommentThreadDataService.cs +++ b/UKSF.Api.Personnel/Context/CommentThreadDataService.cs @@ -1,9 +1,10 @@ using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Personnel.Context { public interface ICommentThreadDataService : IDataService, ICachedDataService { diff --git a/UKSF.Api.Personnel/Context/ConfirmationCodeDataService.cs b/UKSF.Api.Personnel/Context/ConfirmationCodeDataService.cs index 990241e9..fe5a698c 100644 --- a/UKSF.Api.Personnel/Context/ConfirmationCodeDataService.cs +++ b/UKSF.Api.Personnel/Context/ConfirmationCodeDataService.cs @@ -1,6 +1,7 @@ using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Context { public interface IConfirmationCodeDataService : IDataService { } diff --git a/UKSF.Api.Personnel/Context/NotificationsDataService.cs b/UKSF.Api.Personnel/Context/NotificationsDataService.cs index dc4fae1b..1557c772 100644 --- a/UKSF.Api.Personnel/Context/NotificationsDataService.cs +++ b/UKSF.Api.Personnel/Context/NotificationsDataService.cs @@ -1,6 +1,7 @@ using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Context { public interface INotificationsDataService : IDataService, ICachedDataService { } diff --git a/UKSF.Api.Personnel/Context/RanksDataService.cs b/UKSF.Api.Personnel/Context/RanksDataService.cs index 328dd45b..c2a05e86 100644 --- a/UKSF.Api.Personnel/Context/RanksDataService.cs +++ b/UKSF.Api.Personnel/Context/RanksDataService.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Context { public interface IRanksDataService : IDataService, ICachedDataService { diff --git a/UKSF.Api.Personnel/Context/RolesDataService.cs b/UKSF.Api.Personnel/Context/RolesDataService.cs index bcb5513c..62a2cd7f 100644 --- a/UKSF.Api.Personnel/Context/RolesDataService.cs +++ b/UKSF.Api.Personnel/Context/RolesDataService.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Context { public interface IRolesDataService : IDataService, ICachedDataService { diff --git a/UKSF.Api.Personnel/Context/UnitsDataService.cs b/UKSF.Api.Personnel/Context/UnitsDataService.cs index 6fdee22a..cda08aca 100644 --- a/UKSF.Api.Personnel/Context/UnitsDataService.cs +++ b/UKSF.Api.Personnel/Context/UnitsDataService.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Context { public interface IUnitsDataService : IDataService, ICachedDataService { } diff --git a/UKSF.Api.Personnel/Controllers/AccountsController.cs b/UKSF.Api.Personnel/Controllers/AccountsController.cs index 309a61ce..65559da8 100644 --- a/UKSF.Api.Personnel/Controllers/AccountsController.cs +++ b/UKSF.Api.Personnel/Controllers/AccountsController.cs @@ -7,29 +7,26 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSF.Api.Base; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; -using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Extensions; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class AccountsController : Controller { - private readonly IAccountService accountService; - private readonly IConfirmationCodeService confirmationCodeService; - private readonly IDiscordService discordService; - private readonly IDisplayNameService displayNameService; - private readonly IHttpContextService httpContextService; - private readonly IEmailService emailService; - private readonly IRanksService ranksService; - private readonly IRecruitmentService recruitmentService; - - private readonly ITeamspeakService teamspeakService; - private readonly IUnitsService unitsService; - private readonly ILogger logger; + private readonly IEventBus _accountEventBus; + private readonly IAccountService _accountService; + private readonly IConfirmationCodeService _confirmationCodeService; + private readonly IDisplayNameService _displayNameService; + private readonly IEmailService _emailService; + private readonly IHttpContextService _httpContextService; + private readonly ILogger _logger; + private readonly IRanksService _ranksService; public AccountsController( IConfirmationCodeService confirmationCodeService, @@ -37,42 +34,36 @@ public AccountsController( IAccountService accountService, IDisplayNameService displayNameService, IHttpContextService httpContextService, - IRecruitmentService recruitmentService, - ITeamspeakService teamspeakService, IEmailService emailService, - IDiscordService discordService, - IUnitsService unitsService, + IEventBus accountEventBus, ILogger logger ) { - this.confirmationCodeService = confirmationCodeService; - this.ranksService = ranksService; - this.accountService = accountService; - this.displayNameService = displayNameService; - this.httpContextService = httpContextService; - this.recruitmentService = recruitmentService; - this.teamspeakService = teamspeakService; - this.emailService = emailService; - this.discordService = discordService; - this.unitsService = unitsService; - this.logger = logger; + _confirmationCodeService = confirmationCodeService; + _ranksService = ranksService; + _accountService = accountService; + _displayNameService = displayNameService; + _httpContextService = httpContextService; + _emailService = emailService; + _accountEventBus = accountEventBus; + _logger = logger; } [HttpGet, Authorize] public IActionResult Get() { - Account account = accountService.GetUserAccount(); + Account account = _accountService.GetUserAccount(); return Ok(PubliciseAccount(account)); } [HttpGet("{id}"), Authorize] public IActionResult GetById(string id) { - Account account = accountService.Data.GetSingle(id); + Account account = _accountService.Data.GetSingle(id); return Ok(PubliciseAccount(account)); } [HttpPut] public async Task Put([FromBody] JObject body) { string email = body["email"].ToString(); - if (accountService.Data.Get(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)).Any()) { + if (_accountService.Data.Get(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)).Any()) { return BadRequest(new { error = "an account with this email or username exists" }); } @@ -85,9 +76,9 @@ public async Task Put([FromBody] JObject body) { nation = body["nation"].ToString(), membershipState = MembershipState.UNCONFIRMED }; - await accountService.Data.Add(account); + await _accountService.Data.Add(account); await SendConfirmationCode(account); - logger.LogAudit($"New account created: '{account.firstname} {account.lastname}, {account.email}'", accountService.Data.GetSingle(x => x.email == account.email).id); + _logger.LogAudit($"New account created: '{account.firstname} {account.lastname}, {account.email}'", _accountService.Data.GetSingle(x => x.email == account.email).id); return Ok(new { account.email }); } @@ -103,32 +94,32 @@ public async Task ApplyConfirmationCode([FromBody] JObject body) return BadRequest(new { error = exception.Message }); } - Account account = accountService.Data.GetSingle(x => x.email == email); + Account account = _accountService.Data.GetSingle(x => x.email == email); if (account == null) { return BadRequest(new { error = $"An account with the email '{email}' doesn't exist. This should be impossible so please contact an admin for help" }); } - string value = await confirmationCodeService.GetConfirmationCode(code); + string value = await _confirmationCodeService.GetConfirmationCode(code); if (value == email) { - await accountService.Data.Update(account.id, "membershipState", MembershipState.CONFIRMED); - logger.LogAudit($"Email address confirmed for {account.id}"); + await _accountService.Data.Update(account.id, "membershipState", MembershipState.CONFIRMED); + _logger.LogAudit($"Email address confirmed for {account.id}"); return Ok(); } - await confirmationCodeService.ClearConfirmationCodes(x => x.value == email); + await _confirmationCodeService.ClearConfirmationCodes(x => x.value == email); await SendConfirmationCode(account); return BadRequest(new { error = $"The confirmation code was invalid or expired. A new code has been sent to '{account.email}'" }); } [HttpPost("resend-email-code"), Authorize] public async Task ResendConfirmationCode() { - Account account = accountService.GetUserAccount(); + Account account = _accountService.GetUserAccount(); if (account.membershipState != MembershipState.UNCONFIRMED) { return BadRequest(new { error = "Account email has already been confirmed" }); } - await confirmationCodeService.ClearConfirmationCodes(x => x.value == account.email); + await _confirmationCodeService.ClearConfirmationCodes(x => x.value == account.email); await SendConfirmationCode(account); return Ok(PubliciseAccount(account)); } @@ -137,117 +128,86 @@ public async Task ResendConfirmationCode() { public IActionResult GetAccountsUnder([FromQuery] bool reverse = false) { List accounts = new List(); - List memberAccounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER).ToList(); - memberAccounts = memberAccounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); + List memberAccounts = _accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER).ToList(); + memberAccounts = memberAccounts.OrderBy(x => x.rank, new RankComparer(_ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); if (reverse) { memberAccounts.Reverse(); } - accounts.AddRange(memberAccounts.Select(x => new { value = x.id, displayValue = displayNameService.GetDisplayName(x) })); + accounts.AddRange(memberAccounts.Select(x => new { value = x.id, displayValue = _displayNameService.GetDisplayName(x) })); return Ok(accounts); } [HttpGet("roster"), Authorize] public IEnumerable GetRosterAccounts() { - IEnumerable accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER); - IEnumerable accountObjects = accounts.OrderBy(x => x.rank, new RankComparer(ranksService)) + IEnumerable accounts = _accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER); + IEnumerable accountObjects = accounts.OrderBy(x => x.rank, new RankComparer(_ranksService)) .ThenBy(x => x.lastname) .ThenBy(x => x.firstname) - .Select(x => new RosterAccount { id = x.id, nation = x.nation, rank = x.rank, roleAssignment = x.roleAssignment, unitAssignment = x.unitAssignment, name = $"{x.lastname}, {x.firstname}" }); + .Select( + x => new RosterAccount { + id = x.id, + nation = x.nation, + rank = x.rank, + roleAssignment = x.roleAssignment, + unitAssignment = x.unitAssignment, + name = $"{x.lastname}, {x.firstname}" + } + ); return accountObjects; } - // TODO: This should be a teamspeak endpoint - [HttpGet("online")] - public IActionResult GetOnlineAccounts() { - IEnumerable teamnspeakClients = teamspeakService.GetOnlineTeamspeakClients(); - IEnumerable allAccounts = accountService.Data.Get(); - var clients = teamnspeakClients.Where(x => x != null) - .Select( - x => new { - account = allAccounts.FirstOrDefault(y => y.teamspeakIdentities != null && y.teamspeakIdentities.Any(z => z.Equals(x.clientDbId))), client = x - } - ) - .ToList(); - var clientAccounts = clients.Where(x => x.account != null && x.account.membershipState == MembershipState.MEMBER) - .OrderBy(x => x.account.rank, new RankComparer(ranksService)) - .ThenBy(x => x.account.lastname) - .ThenBy(x => x.account.firstname); - List commandAccounts = unitsService.GetAuxilliaryRoot().members; - - List commanders = new List(); - List recruiters = new List(); - List members = new List(); - List guests = new List(); - foreach (var onlineClient in clientAccounts) { - if (commandAccounts.Contains(onlineClient.account.id)) { - commanders.Add(new { displayName = displayNameService.GetDisplayName(onlineClient.account) }); - } else if (recruitmentService.IsRecruiter(onlineClient.account)) { - recruiters.Add(new { displayName = displayNameService.GetDisplayName(onlineClient.account) }); - } else { - members.Add(new { displayName = displayNameService.GetDisplayName(onlineClient.account) }); - } - } - - foreach (var client in clients.Where(x => x.account == null || x.account.membershipState != MembershipState.MEMBER)) { - guests.Add(new { displayName = client.client.clientName }); - } - - return Ok(new { commanders, recruiters, members, guests }); - } - [HttpGet("exists")] public IActionResult CheckUsernameOrEmailExists([FromQuery] string check) { - return Ok(accountService.Data.Get().Any(x => string.Equals(x.email, check, StringComparison.InvariantCultureIgnoreCase)) ? new { exists = true } : new { exists = false }); + return Ok(_accountService.Data.Get().Any(x => string.Equals(x.email, check, StringComparison.InvariantCultureIgnoreCase)) ? new { exists = true } : new { exists = false }); } - // TODO: Could use an account data update event handler [HttpPut("name"), Authorize] public async Task ChangeName([FromBody] JObject changeNameRequest) { - Account account = accountService.GetUserAccount(); - await accountService.Data.Update( + Account account = _accountService.GetUserAccount(); + await _accountService.Data.Update( account.id, Builders.Update.Set(x => x.firstname, changeNameRequest["firstname"].ToString()).Set(x => x.lastname, changeNameRequest["lastname"].ToString()) ); - logger.LogAudit($"{account.lastname}, {account.firstname} changed their name to {changeNameRequest["lastname"]}, {changeNameRequest["firstname"]}"); - await discordService.UpdateAccount(accountService.Data.GetSingle(account.id)); + _logger.LogAudit($"{account.lastname}, {account.firstname} changed their name to {changeNameRequest["lastname"]}, {changeNameRequest["firstname"]}"); + _accountEventBus.Send(_accountService.Data.GetSingle(account.id)); return Ok(); } [HttpPut("password"), Authorize] public async Task ChangePassword([FromBody] JObject changePasswordRequest) { - string contextId = httpContextService.GetUserId(); - await accountService.Data.Update(contextId, "password", BCrypt.Net.BCrypt.HashPassword(changePasswordRequest["password"].ToString())); - logger.LogAudit($"Password changed for {contextId}"); + string contextId = _httpContextService.GetUserId(); + await _accountService.Data.Update(contextId, "password", BCrypt.Net.BCrypt.HashPassword(changePasswordRequest["password"].ToString())); + _logger.LogAudit($"Password changed for {contextId}"); return Ok(); } [HttpPost("updatesetting/{id}"), Authorize] public async Task UpdateSetting(string id, [FromBody] JObject body) { - Account account = string.IsNullOrEmpty(id) ? accountService.GetUserAccount() : accountService.Data.GetSingle(id); - await accountService.Data.Update(account.id, $"settings.{body["name"]}", body["value"]); - logger.LogAudit($"Setting {body["name"]} updated for {account.id} from {account.settings.GetAttribute(body["name"].ToString())} to {body["value"]}"); + Account account = string.IsNullOrEmpty(id) ? _accountService.GetUserAccount() : _accountService.Data.GetSingle(id); + await _accountService.Data.Update(account.id, $"settings.{body["name"]}", body["value"]); + _logger.LogAudit($"Setting {body["name"]} updated for {account.id} from {account.settings.GetAttribute(body["name"].ToString())} to {body["value"]}"); return Ok(); } [HttpGet("test")] public IActionResult Test() { - logger.LogInfo("This is a test"); + _logger.LogInfo("This is a test"); return Ok(new { value = DateTime.Now.ToLongTimeString() }); } private PublicAccount PubliciseAccount(Account account) { PublicAccount publicAccount = account.ToPublicAccount(); - publicAccount.displayName = displayNameService.GetDisplayName(account); + publicAccount.displayName = _displayNameService.GetDisplayName(account); return publicAccount; } private async Task SendConfirmationCode(Account account) { - string code = await confirmationCodeService.CreateConfirmationCode(account.email); + string code = await _confirmationCodeService.CreateConfirmationCode(account.email); string htmlContent = $"Your email was given for an application to join UKSF
Copy this code to your clipboard and return to the UKSF website application page to enter the code:

{code}


If this request was not made by you, please contact an admin

"; - emailService.SendEmail(account.email, "UKSF Email Confirmation", htmlContent); + _emailService.SendEmail(account.email, "UKSF Email Confirmation", htmlContent); } } } diff --git a/UKSF.Api.Personnel/Controllers/ApplicationsController.cs b/UKSF.Api.Personnel/Controllers/ApplicationsController.cs index 1152d72c..66785fdc 100644 --- a/UKSF.Api.Personnel/Controllers/ApplicationsController.cs +++ b/UKSF.Api.Personnel/Controllers/ApplicationsController.cs @@ -6,11 +6,11 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSF.Api.Base; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] diff --git a/UKSF.Api.Personnel/Controllers/CommentThreadController.cs b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs index aed06bf4..cd22f836 100644 --- a/UKSF.Api.Personnel/Controllers/CommentThreadController.cs +++ b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs @@ -5,10 +5,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Bson; -using UKSF.Api.Base; -using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Controllers { [Route("commentthread"), Permissions(Permissions.CONFIRMED, Permissions.MEMBER, Permissions.DISCHARGED)] diff --git a/UKSF.Api.Personnel/Controllers/CommunicationsController.cs b/UKSF.Api.Personnel/Controllers/CommunicationsController.cs index fa9b07f1..baeaa86e 100644 --- a/UKSF.Api.Personnel/Controllers/CommunicationsController.cs +++ b/UKSF.Api.Personnel/Controllers/CommunicationsController.cs @@ -6,37 +6,31 @@ using MongoDB.Driver; using Newtonsoft.Json.Linq; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Personnel.Controllers { + // TODO: Needs to be renamed and singled out. Won't be any other communication connections to add [Route("[controller]")] public class CommunicationsController : Controller { - private readonly IAccountService accountService; - private readonly IConfirmationCodeService confirmationCodeService; - private readonly INotificationsService notificationsService; - private readonly ILogger logger; + private readonly IAccountService _accountService; + private readonly IConfirmationCodeService _confirmationCodeService; + private readonly ILogger _logger; + private readonly IEventBus _accountEventBus; + private readonly INotificationsService _notificationsService; - private readonly ITeamspeakService teamspeakService; - - public CommunicationsController( - IConfirmationCodeService confirmationCodeService, - IAccountService accountService, - ITeamspeakService teamspeakService, - INotificationsService notificationsService, - ILogger logger - ) { - this.confirmationCodeService = confirmationCodeService; - this.accountService = accountService; - - this.teamspeakService = teamspeakService; - this.notificationsService = notificationsService; - this.logger = logger; + public CommunicationsController(IConfirmationCodeService confirmationCodeService, IAccountService accountService, INotificationsService notificationsService, ILogger logger, IEventBus accountEventBus) { + _confirmationCodeService = confirmationCodeService; + _accountService = accountService; + _notificationsService = notificationsService; + _logger = logger; + _accountEventBus = accountEventBus; } [HttpGet, Authorize] - public IActionResult GetTeamspeakStatus() => Ok(new { isConnected = accountService.GetUserAccount().teamspeakIdentities?.Count > 0 }); + public IActionResult GetTeamspeakStatus() => Ok(new { isConnected = _accountService.GetUserAccount().teamspeakIdentities?.Count > 0 }); [HttpPost("send"), Authorize] public async Task SendCode([FromBody] JObject body) { @@ -52,7 +46,7 @@ public async Task SendCode([FromBody] JObject body) { return mode switch { "teamspeak" => await SendTeamspeakCode(data), - _ => BadRequest(new { error = $"Mode '{mode}' not recognized" }) + _ => BadRequest(new { error = $"Mode '{mode}' not recognized" }) }; } @@ -69,44 +63,43 @@ public async Task ReceiveCode([FromBody] JObject body) { GuardUtilites.ValidateId(code, _ => throw new ArgumentException($"Code '{code}' is invalid. Please try again")); GuardUtilites.ValidateString(mode, _ => throw new ArgumentException("Mode is invalid")); GuardUtilites.ValidateString(data, _ => throw new ArgumentException("Data is invalid")); - GuardUtilites.ValidateArray(dataArray, x => x.Length > 0, x => true, () => throw new ArgumentException("Data array is empty")); + GuardUtilites.ValidateArray(dataArray, x => x.Length > 0, _ => true, () => throw new ArgumentException("Data array is empty")); } catch (ArgumentException exception) { return BadRequest(new { error = exception.Message }); } return mode switch { "teamspeak" => await ReceiveTeamspeakCode(id, code, dataArray[0]), - _ => BadRequest(new { error = $"Mode '{mode}' not recognized" }) + _ => BadRequest(new { error = $"Mode '{mode}' not recognized" }) }; } private async Task SendTeamspeakCode(string teamspeakDbId) { - string code = await confirmationCodeService.CreateConfirmationCode(teamspeakDbId); - await notificationsService.SendTeamspeakNotification( + string code = await _confirmationCodeService.CreateConfirmationCode(teamspeakDbId); + _notificationsService.SendTeamspeakNotification( new HashSet { teamspeakDbId.ToDouble() }, $"This Teamspeak ID was selected for connection to the website. Copy this code to your clipboard and return to the UKSF website application page to enter the code:\n{code}\nIf this request was not made by you, please contact an admin" ); return Ok(); } - // TODO: Should be part of teamspeak component private async Task ReceiveTeamspeakCode(string id, string code, string checkId) { - Account account = accountService.Data.GetSingle(id); - string teamspeakId = await confirmationCodeService.GetConfirmationCode(code); + Account account = _accountService.Data.GetSingle(id); + string teamspeakId = await _confirmationCodeService.GetConfirmationCode(code); if (string.IsNullOrWhiteSpace(teamspeakId) || teamspeakId != checkId) { return BadRequest(new { error = "The confirmation code has expired or is invalid. Please try again" }); } account.teamspeakIdentities ??= new HashSet(); account.teamspeakIdentities.Add(double.Parse(teamspeakId)); - await accountService.Data.Update(account.id, Builders.Update.Set("teamspeakIdentities", account.teamspeakIdentities)); - account = accountService.Data.GetSingle(account.id); - await teamspeakService.UpdateAccountTeamspeakGroups(account); - await notificationsService.SendTeamspeakNotification( + await _accountService.Data.Update(account.id, Builders.Update.Set("teamspeakIdentities", account.teamspeakIdentities)); + account = _accountService.Data.GetSingle(account.id); + _accountEventBus.Send(account); + _notificationsService.SendTeamspeakNotification( new HashSet { teamspeakId.ToDouble() }, $"This teamspeak identity has been linked to the account with email '{account.email}'\nIf this was not done by you, please contact an admin" ); - logger.LogAudit($"Teamspeak ID {teamspeakId} added for {account.id}"); + _logger.LogAudit($"Teamspeak ID {teamspeakId} added for {account.id}"); return Ok(); } } diff --git a/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs b/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs index d6552c7e..306ddaf7 100644 --- a/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs +++ b/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs @@ -4,40 +4,47 @@ using MongoDB.Driver; using Newtonsoft.Json.Linq; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class DiscordCodeController : Controller { - private readonly IAccountService accountService; - private readonly IHttpContextService httpContextService; - private readonly IConfirmationCodeService confirmationCodeService; - private readonly IDiscordService discordService; - private readonly ILogger logger; + private readonly IEventBus _accountEventBus; + private readonly IAccountService _accountService; + private readonly IConfirmationCodeService _confirmationCodeService; + private readonly IHttpContextService _httpContextService; + private readonly ILogger _logger; - public DiscordCodeController(IConfirmationCodeService confirmationCodeService, IAccountService accountService, IHttpContextService httpContextService, IDiscordService discordService, ILogger logger) { - this.confirmationCodeService = confirmationCodeService; - this.accountService = accountService; - this.httpContextService = httpContextService; - this.discordService = discordService; - this.logger = logger; + public DiscordCodeController( + IConfirmationCodeService confirmationCodeService, + IAccountService accountService, + IHttpContextService httpContextService, + IEventBus accountEventBus, + ILogger logger + ) { + _confirmationCodeService = confirmationCodeService; + _accountService = accountService; + _httpContextService = httpContextService; + _accountEventBus = accountEventBus; + _logger = logger; } // TODO: Could use an account data update event handler [HttpPost("{discordId}"), Authorize] public async Task DiscordConnect(string discordId, [FromBody] JObject body) { - string value = await confirmationCodeService.GetConfirmationCode(body["code"].ToString()); + string value = await _confirmationCodeService.GetConfirmationCode(body["code"].ToString()); if (string.IsNullOrEmpty(value) || value != discordId) { - return BadRequest(new {error = "Code was invalid or expired. Please try again"}); + return BadRequest(new { error = "Code was invalid or expired. Please try again" }); } - string id = httpContextService.GetUserId(); - await accountService.Data.Update(id, Builders.Update.Set(x => x.discordId, discordId)); - Account account = accountService.Data.GetSingle(id); - await discordService.UpdateAccount(account); - logger.LogAudit($"DiscordID updated for {account.id} to {discordId}"); + string id = _httpContextService.GetUserId(); + await _accountService.Data.Update(id, Builders.Update.Set(x => x.discordId, discordId)); + Account account = _accountService.Data.GetSingle(id); + _accountEventBus.Send(account); + _logger.LogAudit($"DiscordID updated for {account.id} to {discordId}"); return Ok(); } } diff --git a/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs b/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs index 1e1287a6..48e8f5b4 100644 --- a/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs +++ b/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs @@ -10,8 +10,8 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] diff --git a/UKSF.Api.Personnel/Controllers/RanksController.cs b/UKSF.Api.Personnel/Controllers/RanksController.cs index a14f66f5..3fc67dec 100644 --- a/UKSF.Api.Personnel/Controllers/RanksController.cs +++ b/UKSF.Api.Personnel/Controllers/RanksController.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; -using System.Reactive; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; using Notification = UKSF.Api.Personnel.Models.Notification; namespace UKSF.Api.Personnel.Controllers { diff --git a/UKSF.Api.Personnel/Controllers/RecruitmentController.cs b/UKSF.Api.Personnel/Controllers/RecruitmentController.cs index d70874de..f4bb69b0 100644 --- a/UKSF.Api.Personnel/Controllers/RecruitmentController.cs +++ b/UKSF.Api.Personnel/Controllers/RecruitmentController.cs @@ -6,11 +6,11 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using UKSF.Api.Base; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] diff --git a/UKSF.Api.Personnel/Controllers/RolesController.cs b/UKSF.Api.Personnel/Controllers/RolesController.cs index bfd1be4a..f8985647 100644 --- a/UKSF.Api.Personnel/Controllers/RolesController.cs +++ b/UKSF.Api.Personnel/Controllers/RolesController.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; using System.Linq; -using System.Reactive; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; using Notification = UKSF.Api.Personnel.Models.Notification; using Unit = UKSF.Api.Personnel.Models.Unit; diff --git a/UKSF.Api.Personnel/Controllers/SteamCodeController.cs b/UKSF.Api.Personnel/Controllers/SteamCodeController.cs index af1891dc..8785b65e 100644 --- a/UKSF.Api.Personnel/Controllers/SteamCodeController.cs +++ b/UKSF.Api.Personnel/Controllers/SteamCodeController.cs @@ -2,10 +2,10 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] diff --git a/UKSF.Api.Personnel/Controllers/UnitsController.cs b/UKSF.Api.Personnel/Controllers/UnitsController.cs index dbe764ff..18360b49 100644 --- a/UKSF.Api.Personnel/Controllers/UnitsController.cs +++ b/UKSF.Api.Personnel/Controllers/UnitsController.cs @@ -7,25 +7,25 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Bson; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class UnitsController : Controller { - private readonly IAccountService accountService; - private readonly IAssignmentService assignmentService; - private readonly IDiscordService discordService; - private readonly IDisplayNameService displayNameService; - private readonly IMapper mapper; - private readonly ILogger logger; - private readonly INotificationsService notificationsService; - private readonly IRanksService ranksService; - private readonly IRolesService rolesService; - private readonly ITeamspeakService teamspeakService; - private readonly IUnitsService unitsService; + private readonly IEventBus _accountEventBus; + private readonly IAccountService _accountService; + private readonly IAssignmentService _assignmentService; + private readonly IDisplayNameService _displayNameService; + private readonly ILogger _logger; + private readonly IMapper _mapper; + private readonly INotificationsService _notificationsService; + private readonly IRanksService _ranksService; + private readonly IRolesService _rolesService; + private readonly IUnitsService _unitsService; public UnitsController( IAccountService accountService, @@ -33,47 +33,45 @@ public UnitsController( IRanksService ranksService, IUnitsService unitsService, IRolesService rolesService, - ITeamspeakService teamspeakService, IAssignmentService assignmentService, - IDiscordService discordService, INotificationsService notificationsService, + IEventBus accountEventBus, IMapper mapper, ILogger logger ) { - this.accountService = accountService; - this.displayNameService = displayNameService; - this.ranksService = ranksService; - this.unitsService = unitsService; - this.rolesService = rolesService; - this.teamspeakService = teamspeakService; - this.assignmentService = assignmentService; - this.discordService = discordService; - this.notificationsService = notificationsService; - this.mapper = mapper; - this.logger = logger; + _accountService = accountService; + _displayNameService = displayNameService; + _ranksService = ranksService; + _unitsService = unitsService; + _rolesService = rolesService; + _assignmentService = assignmentService; + _notificationsService = notificationsService; + _accountEventBus = accountEventBus; + _mapper = mapper; + _logger = logger; } [HttpGet, Authorize] public IActionResult Get([FromQuery] string filter = "", [FromQuery] string accountId = "") { if (!string.IsNullOrEmpty(accountId)) { IEnumerable response = filter switch { - "auxiliary" => unitsService.GetSortedUnits(x => x.branch == UnitBranch.AUXILIARY && x.members.Contains(accountId)), - "available" => unitsService.GetSortedUnits(x => !x.members.Contains(accountId)), - _ => unitsService.GetSortedUnits(x => x.members.Contains(accountId)) + "auxiliary" => _unitsService.GetSortedUnits(x => x.branch == UnitBranch.AUXILIARY && x.members.Contains(accountId)), + "available" => _unitsService.GetSortedUnits(x => !x.members.Contains(accountId)), + _ => _unitsService.GetSortedUnits(x => x.members.Contains(accountId)) }; return Ok(response); } - return Ok(unitsService.GetSortedUnits()); + return Ok(_unitsService.GetSortedUnits()); } [HttpGet("{id}"), Authorize] public IActionResult GetSingle([FromRoute] string id) { - Unit unit = unitsService.Data.GetSingle(id); - Unit parent = unitsService.GetParent(unit); + Unit unit = _unitsService.Data.GetSingle(id); + Unit parent = _unitsService.GetParent(unit); // TODO: Use a factory or mapper - ResponseUnit response = mapper.Map(unit); - response.code = unitsService.GetChainString(unit); + ResponseUnit response = _mapper.Map(unit); + response.code = _unitsService.GetChainString(unit); response.parentName = parent?.name; response.unitMembers = MapUnitMembers(unit); return Ok(response); @@ -83,7 +81,7 @@ public IActionResult GetSingle([FromRoute] string id) { public IActionResult GetUnitExists([FromRoute] string check, [FromQuery] string id = "") { if (string.IsNullOrEmpty(check)) Ok(false); - bool exists = unitsService.Data.GetSingle( + bool exists = _unitsService.Data.GetSingle( x => (string.IsNullOrEmpty(id) || x.id != id) && (string.Equals(x.name, check, StringComparison.InvariantCultureIgnoreCase) || string.Equals(x.shortname, check, StringComparison.InvariantCultureIgnoreCase) || @@ -97,8 +95,8 @@ public IActionResult GetUnitExists([FromRoute] string check, [FromQuery] string [HttpGet("tree"), Authorize] public IActionResult GetTree() { - Unit combatRoot = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); - Unit auxiliaryRoot = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); + Unit combatRoot = _unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); + Unit auxiliaryRoot = _unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); ResponseUnitTreeDataSet dataSet = new ResponseUnitTreeDataSet { combatNodes = new List { new ResponseUnitTree { id = combatRoot.id, name = combatRoot.name, children = GetUnitTreeChildren(combatRoot) } }, auxiliaryNodes = new List { new ResponseUnitTree { id = auxiliaryRoot.id, name = auxiliaryRoot.name, children = GetUnitTreeChildren(auxiliaryRoot) } } @@ -108,41 +106,40 @@ public IActionResult GetTree() { // TODO: Use a mapper private IEnumerable GetUnitTreeChildren(DatabaseObject parentUnit) { - return unitsService.Data.Get(x => x.parent == parentUnit.id).Select(unit => new ResponseUnitTree { id = unit.id, name = unit.name, children = GetUnitTreeChildren(unit) }); + return _unitsService.Data.Get(x => x.parent == parentUnit.id).Select(unit => new ResponseUnitTree { id = unit.id, name = unit.name, children = GetUnitTreeChildren(unit) }); } [HttpPost, Authorize] public async Task AddUnit([FromBody] Unit unit) { - await unitsService.Data.Add(unit); - logger.LogAudit($"New unit added: '{unit}'"); + await _unitsService.Data.Add(unit); + _logger.LogAudit($"New unit added: '{unit}'"); return Ok(); } - // TODO: Could use an account data update event handler [HttpPut("{id}"), Authorize] public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit) { - Unit oldUnit = unitsService.Data.GetSingle(x => x.id == id); - await unitsService.Data.Replace(unit); - logger.LogAudit($"Unit '{unit.shortname}' updated: {oldUnit.Changes(unit)}"); + Unit oldUnit = _unitsService.Data.GetSingle(x => x.id == id); + await _unitsService.Data.Replace(unit); + _logger.LogAudit($"Unit '{unit.shortname}' updated: {oldUnit.Changes(unit)}"); // TODO: Move this elsewhere - unit = unitsService.Data.GetSingle(unit.id); + unit = _unitsService.Data.GetSingle(unit.id); if (unit.name != oldUnit.name) { - foreach (Account account in accountService.Data.Get(x => x.unitAssignment == oldUnit.name)) { - await accountService.Data.Update(account.id, "unitAssignment", unit.name); - await teamspeakService.UpdateAccountTeamspeakGroups(accountService.Data.GetSingle(account.id)); + foreach (Account account in _accountService.Data.Get(x => x.unitAssignment == oldUnit.name)) { + await _accountService.Data.Update(account.id, "unitAssignment", unit.name); + _accountEventBus.Send(account); } } if (unit.teamspeakGroup != oldUnit.teamspeakGroup) { - foreach (Account account in unit.members.Select(x => accountService.Data.GetSingle(x))) { - await teamspeakService.UpdateAccountTeamspeakGroups(account); + foreach (Account account in unit.members.Select(x => _accountService.Data.GetSingle(x))) { + _accountEventBus.Send(account); } } if (unit.discordRoleId != oldUnit.discordRoleId) { - foreach (Account account in unit.members.Select(x => accountService.Data.GetSingle(x))) { - await discordService.UpdateAccount(account); + foreach (Account account in unit.members.Select(x => _accountService.Data.GetSingle(x))) { + _accountEventBus.Send(account); } } @@ -151,39 +148,39 @@ public async Task EditUnit([FromRoute] string id, [FromBody] Unit [HttpDelete("{id}"), Authorize] public async Task DeleteUnit([FromRoute] string id) { - Unit unit = unitsService.Data.GetSingle(id); - logger.LogAudit($"Unit deleted '{unit.name}'"); - foreach (Account account in accountService.Data.Get(x => x.unitAssignment == unit.name)) { - Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, "Reserves", reason: $"{unit.name} was deleted"); - notificationsService.Add(notification); + Unit unit = _unitsService.Data.GetSingle(id); + _logger.LogAudit($"Unit deleted '{unit.name}'"); + foreach (Account account in _accountService.Data.Get(x => x.unitAssignment == unit.name)) { + Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.id, "Reserves", reason: $"{unit.name} was deleted"); + _notificationsService.Add(notification); } - await unitsService.Data.Delete(id); + await _unitsService.Data.Delete(id); return Ok(); } [HttpPatch("{id}/parent"), Authorize] public async Task UpdateParent([FromRoute] string id, [FromBody] RequestUnitUpdateParent unitUpdate) { - Unit unit = unitsService.Data.GetSingle(id); - Unit parentUnit = unitsService.Data.GetSingle(unitUpdate.parentId); + Unit unit = _unitsService.Data.GetSingle(id); + Unit parentUnit = _unitsService.Data.GetSingle(unitUpdate.parentId); if (unit.parent == parentUnit.id) return Ok(); - await unitsService.Data.Update(id, "parent", parentUnit.id); + await _unitsService.Data.Update(id, "parent", parentUnit.id); if (unit.branch != parentUnit.branch) { - await unitsService.Data.Update(id, "branch", parentUnit.branch); + await _unitsService.Data.Update(id, "branch", parentUnit.branch); } - List parentChildren = unitsService.Data.Get(x => x.parent == parentUnit.id).ToList(); + List parentChildren = _unitsService.Data.Get(x => x.parent == parentUnit.id).ToList(); parentChildren.Remove(parentChildren.FirstOrDefault(x => x.id == unit.id)); parentChildren.Insert(unitUpdate.index, unit); foreach (Unit child in parentChildren) { - await unitsService.Data.Update(child.id, "order", parentChildren.IndexOf(child)); + await _unitsService.Data.Update(child.id, "order", parentChildren.IndexOf(child)); } - unit = unitsService.Data.GetSingle(unit.id); - foreach (Unit child in unitsService.GetAllChildren(unit, true)) { + unit = _unitsService.Data.GetSingle(unit.id); + foreach (Unit child in _unitsService.GetAllChildren(unit, true)) { foreach (string accountId in child.members) { - await assignmentService.UpdateGroupsAndRoles(accountId); + await _assignmentService.UpdateGroupsAndRoles(accountId); } } @@ -192,13 +189,13 @@ public async Task UpdateParent([FromRoute] string id, [FromBody] [HttpPatch("{id}/order"), Authorize] public IActionResult UpdateSortOrder([FromRoute] string id, [FromBody] RequestUnitUpdateOrder unitUpdate) { - Unit unit = unitsService.Data.GetSingle(id); - Unit parentUnit = unitsService.Data.GetSingle(x => x.id == unit.parent); - List parentChildren = unitsService.Data.Get(x => x.parent == parentUnit.id).ToList(); + Unit unit = _unitsService.Data.GetSingle(id); + Unit parentUnit = _unitsService.Data.GetSingle(x => x.id == unit.parent); + List parentChildren = _unitsService.Data.Get(x => x.parent == parentUnit.id).ToList(); parentChildren.Remove(parentChildren.FirstOrDefault(x => x.id == unit.id)); parentChildren.Insert(unitUpdate.index, unit); foreach (Unit child in parentChildren) { - unitsService.Data.Update(child.id, "order", parentChildren.IndexOf(child)); + _unitsService.Data.Update(child.id, "order", parentChildren.IndexOf(child)); } return Ok(); @@ -209,7 +206,7 @@ public IActionResult UpdateSortOrder([FromRoute] string id, [FromBody] RequestUn public IActionResult GetUnitsChart([FromRoute] string type) { switch (type) { case "combat": - Unit combatRoot = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); + Unit combatRoot = _unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); return Ok( new ResponseUnitChartNode { id = combatRoot.id, @@ -219,7 +216,7 @@ public IActionResult GetUnitsChart([FromRoute] string type) { } ); case "auxiliary": - Unit auxiliaryRoot = unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); + Unit auxiliaryRoot = _unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); return Ok( new ResponseUnitChartNode { id = auxiliaryRoot.id, @@ -233,12 +230,12 @@ public IActionResult GetUnitsChart([FromRoute] string type) { } private IEnumerable GetUnitChartChildren(string parent) { - return unitsService.Data.Get(x => x.parent == parent) - .Select( - unit => new ResponseUnitChartNode { - id = unit.id, name = unit.preferShortname ? unit.shortname : unit.name, members = MapUnitMembers(unit), children = GetUnitChartChildren(unit.id) - } - ); + return _unitsService.Data.Get(x => x.parent == parent) + .Select( + unit => new ResponseUnitChartNode { + id = unit.id, name = unit.preferShortname ? unit.shortname : unit.name, members = MapUnitMembers(unit), children = GetUnitChartChildren(unit.id) + } + ); } private IEnumerable MapUnitMembers(Unit unit) { @@ -246,14 +243,14 @@ private IEnumerable MapUnitMembers(Unit unit) { } private ResponseUnitMember MapUnitMember(Account member, Unit unit) => - new ResponseUnitMember { name = displayNameService.GetDisplayName(member), role = member.roleAssignment, unitRole = GetRole(unit, member.id) }; + new ResponseUnitMember { name = _displayNameService.GetDisplayName(member), role = member.roleAssignment, unitRole = GetRole(unit, member.id) }; // TODO: Move somewhere else private IEnumerable SortMembers(IEnumerable members, Unit unit) { return members.Select( x => { - Account account = accountService.Data.GetSingle(x); - return new { account, rankIndex = ranksService.GetRankOrder(account.rank), roleIndex = unitsService.GetMemberRoleOrder(account, unit) }; + Account account = _accountService.Data.GetSingle(x); + return new { account, rankIndex = _ranksService.GetRankOrder(account.rank), roleIndex = _unitsService.GetMemberRoleOrder(account, unit) }; } ) .OrderByDescending(x => x.roleIndex) @@ -264,9 +261,9 @@ private IEnumerable SortMembers(IEnumerable members, Unit unit) } private string GetRole(Unit unit, string accountId) => - unitsService.MemberHasRole(accountId, unit, rolesService.GetUnitRoleByOrder(0).name) ? "1" : - unitsService.MemberHasRole(accountId, unit, rolesService.GetUnitRoleByOrder(1).name) ? "2" : - unitsService.MemberHasRole(accountId, unit, rolesService.GetUnitRoleByOrder(2).name) ? "3" : - unitsService.MemberHasRole(accountId, unit, rolesService.GetUnitRoleByOrder(3).name) ? "N" : ""; + _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(0).name) ? "1" : + _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(1).name) ? "2" : + _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(2).name) ? "3" : + _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(3).name) ? "N" : ""; } } diff --git a/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs new file mode 100644 index 00000000..cf7b5b44 --- /dev/null +++ b/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs @@ -0,0 +1,48 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.SignalR; +using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Signalr.Clients; +using UKSF.Api.Personnel.Signalr.Hubs; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Models; + +namespace UKSF.Api.Personnel.EventHandlers { + public interface IAccountDataEventHandler : IEventHandler { } + + public class AccountDataEventHandler : IAccountDataEventHandler { + private readonly IDataEventBus _accountDataEventBus; + private readonly IHubContext _hub; + private readonly ILogger _logger; + private readonly IDataEventBus _unitDataEventBus; + + public AccountDataEventHandler(IDataEventBus accountDataEventBus, IDataEventBus unitDataEventBus, IHubContext hub, ILogger logger) { + _accountDataEventBus = accountDataEventBus; + _unitDataEventBus = unitDataEventBus; + _hub = hub; + _logger = logger; + } + + public void Init() { + _accountDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleAccountsEvent, exception => _logger.LogError(exception)); + _unitDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleUnitsEvent, exception => _logger.LogError(exception)); + } + + private async Task HandleAccountsEvent(DataEventModel dataEventModel) { + if (dataEventModel.type == DataEventType.UPDATE) { + await UpdatedEvent(dataEventModel.id); + } + } + + private async Task HandleUnitsEvent(DataEventModel dataEventModel) { + if (dataEventModel.type == DataEventType.UPDATE) { + await UpdatedEvent(dataEventModel.id); + } + } + + private async Task UpdatedEvent(string id) { + await _hub.Clients.Group(id).ReceiveAccountUpdate(); + } + } +} diff --git a/UKSF.Api.Personnel/EventHandlers/AccountEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/AccountEventHandler.cs deleted file mode 100644 index 0d67f33f..00000000 --- a/UKSF.Api.Personnel/EventHandlers/AccountEventHandler.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.SignalR; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; -using UKSF.Api.Base.Models; -using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Signalr.Clients; -using UKSF.Api.Personnel.Signalr.Hubs; - -namespace UKSF.Api.Personnel.EventHandlers { - public interface IAccountEventHandler : IEventHandler { } - - public class AccountEventHandler : IAccountEventHandler { - private readonly IDataEventBus accountDataEventBus; - private readonly IHubContext hub; - private readonly ILogger logger; - private readonly IDataEventBus unitDataEventBus; - - public AccountEventHandler(IDataEventBus accountDataEventBus, IDataEventBus unitDataEventBus, IHubContext hub, ILogger logger) { - this.accountDataEventBus = accountDataEventBus; - this.unitDataEventBus = unitDataEventBus; - this.hub = hub; - this.logger = logger; - } - - public void Init() { - accountDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleAccountsEvent, exception => logger.LogError(exception)); - unitDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleUnitsEvent, exception => logger.LogError(exception)); - } - - private async Task HandleAccountsEvent(DataEventModel dataEventModel) { - if (dataEventModel.type == DataEventType.UPDATE) { - await UpdatedEvent(dataEventModel.id); - } - } - - private async Task HandleUnitsEvent(DataEventModel dataEventModel) { - if (dataEventModel.type == DataEventType.UPDATE) { - await UpdatedEvent(dataEventModel.id); - } - } - - private async Task UpdatedEvent(string id) { - await hub.Clients.Group(id).ReceiveAccountUpdate(); - } - } -} diff --git a/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs index ae3cc392..94cb911c 100644 --- a/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs @@ -2,12 +2,14 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Personnel.Signalr.Clients; using UKSF.Api.Personnel.Signalr.Hubs; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Personnel.EventHandlers { public interface ICommentThreadEventHandler : IEventHandler { } diff --git a/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs index 53324a07..de01cf7c 100644 --- a/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs @@ -1,11 +1,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Extensions; -using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Signalr.Clients; using UKSF.Api.Personnel.Signalr.Hubs; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Personnel.EventHandlers { public interface INotificationsEventHandler : IEventHandler { } diff --git a/UKSF.Api.Personnel/Extensions/AccountExtensions.cs b/UKSF.Api.Personnel/Extensions/AccountExtensions.cs index 20d13bff..8be201b5 100644 --- a/UKSF.Api.Personnel/Extensions/AccountExtensions.cs +++ b/UKSF.Api.Personnel/Extensions/AccountExtensions.cs @@ -1,5 +1,5 @@ -using UKSF.Api.Base.Extensions; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Personnel.Extensions { public static class AccountExtensions { diff --git a/UKSF.Api.Personnel/Models/ServiceRecord.cs b/UKSF.Api.Personnel/Models/ServiceRecord.cs index 33d598c5..beb5207b 100644 --- a/UKSF.Api.Personnel/Models/ServiceRecord.cs +++ b/UKSF.Api.Personnel/Models/ServiceRecord.cs @@ -2,17 +2,17 @@ namespace UKSF.Api.Personnel.Models { public class ServiceRecordEntry : IEquatable { - public string notes; - public string occurence; - public DateTime timestamp; + public string Notes { get; init; } + public string Occurence { get; init; } + public DateTime Timestamp { get; init; } public bool Equals(ServiceRecordEntry other) { if (ReferenceEquals(null, other)) return false; if (ReferenceEquals(this, other)) return true; - return notes == other.notes && occurence == other.occurence && timestamp.Equals(other.timestamp); + return Notes == other.Notes && Occurence == other.Occurence && Timestamp.Equals(other.Timestamp); } - public override string ToString() => $"{timestamp:dd/MM/yyyy}: {occurence}{(string.IsNullOrEmpty(notes) ? "" : $"({notes})")}"; + public override string ToString() => $"{Timestamp:dd/MM/yyyy}: {Occurence}{(string.IsNullOrEmpty(Notes) ? "" : $"({Notes})")}"; public override bool Equals(object obj) { if (ReferenceEquals(null, obj)) return false; @@ -20,6 +20,6 @@ public override bool Equals(object obj) { return obj.GetType() == GetType() && Equals((ServiceRecordEntry) obj); } - public override int GetHashCode() => HashCode.Combine(notes, occurence, timestamp); + public override int GetHashCode() => HashCode.Combine(Notes, Occurence, Timestamp); } } diff --git a/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs b/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs index e3f0f77a..523518a0 100644 --- a/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs +++ b/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs @@ -15,7 +15,7 @@ public class ActionDeleteExpiredConfirmationCode : IActionDeleteExpiredConfirmat public string Name => ACTION_NAME; public void Run(params object[] parameters) { - if (parameters.Length == 0) throw new ArgumentException("DeleteExpiredConfirmationCode action requires an id to be passed as a parameter, but no paramters were passed"); + if (parameters.Length == 0) throw new ArgumentException("ActionDeleteExpiredConfirmationCode requires an id to be passed as a parameter, but no paramters were passed"); string id = parameters[0].ToString(); confirmationCodeService.Data.Delete(id); } diff --git a/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs b/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs index 4335d169..ca91bdf3 100644 --- a/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs +++ b/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs @@ -1,37 +1,42 @@ using System; using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; using UKSF.Api.Base.ScheduledActions; -using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Context; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.ScheduledActions { public interface IActionPruneNotifications : ISelfCreatingScheduledAction { } public class ActionPruneNotifications : IActionPruneNotifications { - public const string ACTION_NAME = nameof(ActionPruneNotifications); - - private readonly IClock clock; - private readonly INotificationsDataService notificationsDataService; - private readonly ISchedulerService schedulerService; - - public ActionPruneNotifications(INotificationsDataService notificationsDataService, ISchedulerService schedulerService, IClock clock) { - this.notificationsDataService = notificationsDataService; - this.schedulerService = schedulerService; - this.clock = clock; + private const string ACTION_NAME = nameof(ActionPruneNotifications); + + private readonly IClock _clock; + private readonly INotificationsDataService _notificationsDataService; + private readonly ISchedulerService _schedulerService; + private readonly IHostEnvironment _currentEnvironment; + + public ActionPruneNotifications(INotificationsDataService notificationsDataService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + _notificationsDataService = notificationsDataService; + _schedulerService = schedulerService; + _currentEnvironment = currentEnvironment; + _clock = clock; } public string Name => ACTION_NAME; public void Run(params object[] parameters) { - DateTime now = clock.UtcNow(); - Task notificationsTask = notificationsDataService.DeleteMany(x => x.timestamp < now.AddMonths(-1)); + DateTime now = _clock.UtcNow(); + Task notificationsTask = _notificationsDataService.DeleteMany(x => x.timestamp < now.AddMonths(-1)); Task.WaitAll(notificationsTask); } public async Task CreateSelf() { - if (schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { - await schedulerService.CreateScheduledJob(clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); + if (_currentEnvironment.IsDevelopment()) return; + + if (_schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); } } } diff --git a/UKSF.Api.Personnel/Services/AccountService.cs b/UKSF.Api.Personnel/Services/AccountService.cs index d6d855e2..082326de 100644 --- a/UKSF.Api.Personnel/Services/AccountService.cs +++ b/UKSF.Api.Personnel/Services/AccountService.cs @@ -1,7 +1,7 @@ using UKSF.Api.Base.Context; -using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Services { public interface IAccountService : IDataBackedService { diff --git a/UKSF.Api.Personnel/Services/AssignmentService.cs b/UKSF.Api.Personnel/Services/AssignmentService.cs index 4ce350d8..31c2033f 100644 --- a/UKSF.Api.Personnel/Services/AssignmentService.cs +++ b/UKSF.Api.Personnel/Services/AssignmentService.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using AvsAnLib; using Microsoft.AspNetCore.SignalR; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Signalr.Clients; using UKSF.Api.Personnel.Signalr.Hubs; @@ -21,33 +22,30 @@ public interface IAssignmentService { public class AssignmentService : IAssignmentService { public const string REMOVE_FLAG = "REMOVE"; - private readonly IHubContext accountHub; - private readonly IAccountService accountService; - private readonly IDiscordService discordService; - private readonly IDisplayNameService displayNameService; - private readonly IRanksService ranksService; - private readonly IServiceRecordService serviceRecordService; - private readonly ITeamspeakService teamspeakService; - private readonly IUnitsService unitsService; + private readonly IEventBus _accountEventBus; + private readonly IHubContext _accountHub; + private readonly IAccountService _accountService; + private readonly IDisplayNameService _displayNameService; + private readonly IRanksService _ranksService; + private readonly IServiceRecordService _serviceRecordService; + private readonly IUnitsService _unitsService; public AssignmentService( IServiceRecordService serviceRecordService, IAccountService accountService, IRanksService ranksService, IUnitsService unitsService, - ITeamspeakService teamspeakService, IDisplayNameService displayNameService, - IDiscordService discordService, - IHubContext accountHub + IHubContext accountHub, + IEventBus accountEventBus ) { - this.serviceRecordService = serviceRecordService; - this.accountService = accountService; - this.ranksService = ranksService; - this.unitsService = unitsService; - this.teamspeakService = teamspeakService; - this.displayNameService = displayNameService; - this.discordService = discordService; - this.accountHub = accountHub; + _serviceRecordService = serviceRecordService; + _accountService = accountService; + _ranksService = ranksService; + _unitsService = unitsService; + _displayNameService = displayNameService; + _accountHub = accountHub; + _accountEventBus = accountEventBus; } public async Task UpdateUnitRankAndRole(string id, string unitString = "", string role = "", string rankString = "", string notes = "", string message = "", string reason = "") { @@ -71,41 +69,41 @@ public async Task UpdateUnitRankAndRole(string id, string unitStri } if (rankUpdate) { - message = $"{message}. Please change your name to {displayNameService.GetDisplayName(id)}"; + message = $"{message}. Please change your name to {_displayNameService.GetDisplayName(id)}"; } } - serviceRecordService.AddServiceRecord(id, message, notes); + _serviceRecordService.AddServiceRecord(id, message, notes); await UpdateGroupsAndRoles(id); - return message != REMOVE_FLAG ? new Notification {owner = id, message = message, icon = positive ? NotificationIcons.PROMOTION : NotificationIcons.DEMOTION} : null; + return message != REMOVE_FLAG ? new Notification { owner = id, message = message, icon = positive ? NotificationIcons.PROMOTION : NotificationIcons.DEMOTION } : null; } public async Task AssignUnitRole(string id, string unitId, string role) { - await unitsService.SetMemberRole(id, unitId, role); + await _unitsService.SetMemberRole(id, unitId, role); await UpdateGroupsAndRoles(id); } public async Task UnassignAllUnits(string id) { - foreach (Unit unit in unitsService.Data.Get()) { - await unitsService.RemoveMember(id, unit); + foreach (Unit unit in _unitsService.Data.Get()) { + await _unitsService.RemoveMember(id, unit); } await UpdateGroupsAndRoles(id); } public async Task UnassignAllUnitRoles(string id) { - foreach (Unit unit in unitsService.Data.Get()) { - await unitsService.SetMemberRole(id, unit); + foreach (Unit unit in _unitsService.Data.Get()) { + await _unitsService.SetMemberRole(id, unit); } await UpdateGroupsAndRoles(id); } public async Task UnassignUnitRole(string id, string unitId) { - Unit unit = unitsService.Data.GetSingle(unitId); + Unit unit = _unitsService.Data.GetSingle(unitId); string role = unit.roles.FirstOrDefault(x => x.Value == id).Key; - if (unitsService.RolesHasMember(unit, id)) { - await unitsService.SetMemberRole(id, unitId); + if (_unitsService.RolesHasMember(unit, id)) { + await _unitsService.SetMemberRole(id, unitId); await UpdateGroupsAndRoles(id); } @@ -113,39 +111,38 @@ public async Task UnassignUnitRole(string id, string unitId) { } public async Task UnassignUnit(string id, string unitId) { - Unit unit = unitsService.Data.GetSingle(unitId); - await unitsService.RemoveMember(id, unit); + Unit unit = _unitsService.Data.GetSingle(unitId); + await _unitsService.RemoveMember(id, unit); await UpdateGroupsAndRoles(unitId); } // TODO: teamspeak and discord should probably be updated for account update events, or a separate assignment event bus could be used public async Task UpdateGroupsAndRoles(string id) { - Account account = accountService.Data.GetSingle(id); - await teamspeakService.UpdateAccountTeamspeakGroups(account); - await discordService.UpdateAccount(account); - await accountHub.Clients.Group(id).ReceiveAccountUpdate(); + Account account = _accountService.Data.GetSingle(id); + _accountEventBus.Send(account); + await _accountHub.Clients.Group(id).ReceiveAccountUpdate(); } private async Task> UpdateUnit(string id, string unitString, StringBuilder notificationMessage) { bool unitUpdate = false; bool positive = true; - Unit unit = unitsService.Data.GetSingle(x => x.name == unitString); + Unit unit = _unitsService.Data.GetSingle(x => x.name == unitString); if (unit != null) { if (unit.branch == UnitBranch.COMBAT) { - await unitsService.RemoveMember(id, accountService.Data.GetSingle(id).unitAssignment); - await accountService.Data.Update(id, "unitAssignment", unit.name); + await _unitsService.RemoveMember(id, _accountService.Data.GetSingle(id).unitAssignment); + await _accountService.Data.Update(id, "unitAssignment", unit.name); } - await unitsService.AddMember(id, unit.id); - notificationMessage.Append($"You have been transfered to {unitsService.GetChainString(unit)}"); + await _unitsService.AddMember(id, unit.id); + notificationMessage.Append($"You have been transfered to {_unitsService.GetChainString(unit)}"); unitUpdate = true; } else if (unitString == REMOVE_FLAG) { - string currentUnit = accountService.Data.GetSingle(id).unitAssignment; + string currentUnit = _accountService.Data.GetSingle(id).unitAssignment; if (string.IsNullOrEmpty(currentUnit)) return new Tuple(false, false); - unit = unitsService.Data.GetSingle(x => x.name == currentUnit); - await unitsService.RemoveMember(id, currentUnit); - await accountService.Data.Update(id, "unitAssignment", null); - notificationMessage.Append($"You have been removed from {unitsService.GetChainString(unit)}"); + unit = _unitsService.Data.GetSingle(x => x.name == currentUnit); + await _unitsService.RemoveMember(id, currentUnit); + await _accountService.Data.Update(id, "unitAssignment", null); + notificationMessage.Append($"You have been removed from {_unitsService.GetChainString(unit)}"); unitUpdate = true; positive = false; } @@ -157,12 +154,12 @@ private async Task> UpdateRole(string id, string role, bool un bool roleUpdate = false; bool positive = true; if (!string.IsNullOrEmpty(role) && role != REMOVE_FLAG) { - await accountService.Data.Update(id, "roleAssignment", role); + await _accountService.Data.Update(id, "roleAssignment", role); notificationMessage.Append($"{(unitUpdate ? $" as {AvsAn.Query(role).Article} {role}" : $"You have been assigned as {AvsAn.Query(role).Article} {role}")}"); roleUpdate = true; } else if (role == REMOVE_FLAG) { - string currentRole = accountService.Data.GetSingle(id).roleAssignment; - await accountService.Data.Update(id, "roleAssignment", null); + string currentRole = _accountService.Data.GetSingle(id).roleAssignment; + await _accountService.Data.Update(id, "roleAssignment", null); notificationMessage.Append( string.IsNullOrEmpty(currentRole) ? $"{(unitUpdate ? " and unassigned from your role" : "You have been unassigned from your role")}" @@ -179,15 +176,17 @@ private async Task> UpdateRole(string id, string role, bool un private async Task> UpdateRank(string id, string rank, bool unitUpdate, bool roleUpdate, StringBuilder notificationMessage) { bool rankUpdate = false; bool positive = true; - string currentRank = accountService.Data.GetSingle(id).rank; + string currentRank = _accountService.Data.GetSingle(id).rank; if (!string.IsNullOrEmpty(rank) && rank != REMOVE_FLAG) { if (currentRank == rank) return new Tuple(false, true); - await accountService.Data.Update(id, "rank", rank); - bool promotion = string.IsNullOrEmpty(currentRank) || ranksService.IsSuperior(rank, currentRank); - notificationMessage.Append($"{(unitUpdate || roleUpdate ? $" and {(promotion ? "promoted" : "demoted")} to {rank}" : $"You have been {(promotion ? "promoted" : "demoted")} to {rank}")}"); + await _accountService.Data.Update(id, "rank", rank); + bool promotion = string.IsNullOrEmpty(currentRank) || _ranksService.IsSuperior(rank, currentRank); + notificationMessage.Append( + $"{(unitUpdate || roleUpdate ? $" and {(promotion ? "promoted" : "demoted")} to {rank}" : $"You have been {(promotion ? "promoted" : "demoted")} to {rank}")}" + ); rankUpdate = true; } else if (rank == REMOVE_FLAG) { - await accountService.Data.Update(id, "rank", null); + await _accountService.Data.Update(id, "rank", null); notificationMessage.Append($"{(unitUpdate || roleUpdate ? $" and demoted from {currentRank}" : $"You have been demoted from {currentRank}")}"); rankUpdate = true; positive = false; diff --git a/UKSF.Api.Personnel/Services/AttendanceService.cs b/UKSF.Api.Personnel/Services/AttendanceService.cs index b8982c3d..3986f8e7 100644 --- a/UKSF.Api.Personnel/Services/AttendanceService.cs +++ b/UKSF.Api.Personnel/Services/AttendanceService.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; -using MongoDB.Driver; using UKSF.Api.Personnel.Models; namespace UKSF.Api.Personnel.Services { diff --git a/UKSF.Api.Personnel/Services/CommentThreadService.cs b/UKSF.Api.Personnel/Services/CommentThreadService.cs index d58ff74d..494fe6cd 100644 --- a/UKSF.Api.Personnel/Services/CommentThreadService.cs +++ b/UKSF.Api.Personnel/Services/CommentThreadService.cs @@ -2,9 +2,9 @@ using System.Linq; using System.Threading.Tasks; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Personnel.Services { public interface ICommentThreadService : IDataBackedService { diff --git a/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs b/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs index e5a0a910..7ff033ff 100644 --- a/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs +++ b/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs @@ -3,10 +3,10 @@ using System.Threading.Tasks; using Newtonsoft.Json; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.ScheduledActions; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Services { public interface IConfirmationCodeService : IDataBackedService { diff --git a/UKSF.Api.Personnel/Services/NotificationsService.cs b/UKSF.Api.Personnel/Services/NotificationsService.cs index d5c48233..ac50e6e4 100644 --- a/UKSF.Api.Personnel/Services/NotificationsService.cs +++ b/UKSF.Api.Personnel/Services/NotificationsService.cs @@ -4,54 +4,63 @@ using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Services; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Signalr.Clients; using UKSF.Api.Personnel.Signalr.Hubs; +using UKSF.Api.Shared.Models; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Services { public interface INotificationsService : IDataBackedService { void Add(Notification notification); - Task SendTeamspeakNotification(Account account, string rawMessage); - Task SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage); + void SendTeamspeakNotification(Account account, string rawMessage); + void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage); IEnumerable GetNotificationsForContext(); Task MarkNotificationsAsRead(List ids); Task Delete(List ids); } public class NotificationsService : DataBackedService, INotificationsService { - private readonly IAccountService accountService; - private readonly IEmailService emailService; - private readonly IHubContext notificationsHub; - private readonly IHttpContextService httpContextService; - private readonly IObjectIdConversionService objectIdConversionService; + private readonly IAccountService _accountService; + private readonly IEmailService _emailService; + private readonly IHttpContextService _httpContextService; + private readonly IHubContext _notificationsHub; + private readonly IObjectIdConversionService _objectIdConversionService; + private readonly IEventBus _teamspeakMessageEventBus; - private readonly ITeamspeakService teamspeakService; - - // TODO: Need to use an event bus to place notifications on, which individual components can then retrieve and handle. Notif events should be typed for identity - public NotificationsService(INotificationsDataService data, ITeamspeakService teamspeakService, IAccountService accountService, IEmailService emailService, IHubContext notificationsHub, IHttpContextService httpContextService, IObjectIdConversionService objectIdConversionService) : base(data) { - this.teamspeakService = teamspeakService; - this.accountService = accountService; - - this.emailService = emailService; - this.notificationsHub = notificationsHub; - this.httpContextService = httpContextService; - this.objectIdConversionService = objectIdConversionService; + public NotificationsService( + INotificationsDataService data, + IAccountService accountService, + IEmailService emailService, + IHubContext notificationsHub, + IHttpContextService httpContextService, + IObjectIdConversionService objectIdConversionService, + IEventBus teamspeakMessageEventBus + ) : base(data) { + _accountService = accountService; + _emailService = emailService; + _notificationsHub = notificationsHub; + _httpContextService = httpContextService; + _objectIdConversionService = objectIdConversionService; + _teamspeakMessageEventBus = teamspeakMessageEventBus; } - public async Task SendTeamspeakNotification(Account account, string rawMessage) { - rawMessage = rawMessage.Replace("", "[/url]"); - await teamspeakService.SendTeamspeakMessageToClient(account, rawMessage); + public void SendTeamspeakNotification(Account account, string rawMessage) { + if (account.teamspeakIdentities == null) return; + if (account.teamspeakIdentities.Count == 0) return; + + SendTeamspeakNotification(account.teamspeakIdentities, rawMessage); } - public async Task SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { + public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { rawMessage = rawMessage.Replace("", "[/url]"); - await teamspeakService.SendTeamspeakMessageToClient(clientDbIds, rawMessage); + _teamspeakMessageEventBus.Send(new TeamspeakMessageEventModel(clientDbIds, rawMessage)); } public IEnumerable GetNotificationsForContext() { - string contextId = httpContextService.GetUserId(); + string contextId = _httpContextService.GetUserId(); return Data.Get(x => x.owner == contextId); } @@ -61,34 +70,37 @@ public void Add(Notification notification) { } public async Task MarkNotificationsAsRead(List ids) { - string contextId = httpContextService.GetUserId(); + string contextId = _httpContextService.GetUserId(); await Data.UpdateMany(x => x.owner == contextId && ids.Contains(x.id), Builders.Update.Set(x => x.read, true)); - await notificationsHub.Clients.Group(contextId).ReceiveRead(ids); + await _notificationsHub.Clients.Group(contextId).ReceiveRead(ids); } public async Task Delete(List ids) { ids = ids.ToList(); - string contextId = httpContextService.GetUserId(); + string contextId = _httpContextService.GetUserId(); await Data.DeleteMany(x => x.owner == contextId && ids.Contains(x.id)); - await notificationsHub.Clients.Group(contextId).ReceiveClear(ids); + await _notificationsHub.Clients.Group(contextId).ReceiveClear(ids); } private async Task AddNotificationAsync(Notification notification) { - notification.message = objectIdConversionService.ConvertObjectIds(notification.message); + notification.message = _objectIdConversionService.ConvertObjectIds(notification.message); await Data.Add(notification); - Account account = accountService.Data.GetSingle(notification.owner); + Account account = _accountService.Data.GetSingle(notification.owner); if (account.settings.notificationsEmail) { - SendEmailNotification(account.email, $"{notification.message}{(notification.link != null ? $"
https://uk-sf.co.uk{notification.link}" : "")}"); + SendEmailNotification( + account.email, + $"{notification.message}{(notification.link != null ? $"
https://uk-sf.co.uk{notification.link}" : "")}" + ); } if (account.settings.notificationsTeamspeak) { - await SendTeamspeakNotification(account, $"{notification.message}{(notification.link != null ? $"\n[url]https://uk-sf.co.uk{notification.link}[/url]" : "")}"); + SendTeamspeakNotification(account, $"{notification.message}{(notification.link != null ? $"\n[url]https://uk-sf.co.uk{notification.link}[/url]" : "")}"); } } private void SendEmailNotification(string email, string message) { message += "

You can opt-out of these emails by unchecking 'Email notifications' in your Profile"; - emailService.SendEmail(email, "UKSF Notification", message); + _emailService.SendEmail(email, "UKSF Notification", message); } } } diff --git a/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs b/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs index be9a996a..9744e15b 100644 --- a/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs +++ b/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs @@ -1,4 +1,5 @@ -using UKSF.Api.Base.Extensions; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Personnel.Services { public interface IObjectIdConversionService { @@ -7,21 +8,24 @@ public interface IObjectIdConversionService { } public class ObjectIdConversionService : IObjectIdConversionService { - private readonly IDisplayNameService displayNameService; - private readonly IUnitsService unitsService; + private readonly IDisplayNameService _displayNameService; + private readonly IUnitsService _unitsService; public ObjectIdConversionService(IDisplayNameService displayNameService, IUnitsService unitsService) { - this.displayNameService = displayNameService; - this.unitsService = unitsService; + _displayNameService = displayNameService; + _unitsService = unitsService; } public string ConvertObjectIds(string text) { if (string.IsNullOrEmpty(text)) return text; foreach (string objectId in text.ExtractObjectIds()) { - string displayString = displayNameService.GetDisplayName(objectId); + string displayString = _displayNameService.GetDisplayName(objectId); if (displayString == objectId) { - displayString = unitsService.Data.GetSingle(x => x.id == objectId)?.name; + Unit unit = _unitsService.Data.GetSingle(x => x.id == objectId); + if (unit != null) { + displayString = unit.name; + } } text = text.Replace(objectId, displayString); @@ -30,6 +34,6 @@ public string ConvertObjectIds(string text) { return text; } - public string ConvertObjectId(string id) => string.IsNullOrEmpty(id) ? id : displayNameService.GetDisplayName(id); + public string ConvertObjectId(string id) => string.IsNullOrEmpty(id) ? id : _displayNameService.GetDisplayName(id); } } diff --git a/UKSF.Api.Personnel/Services/RecruitmentService.cs b/UKSF.Api.Personnel/Services/RecruitmentService.cs index b2df7eae..04ccff8a 100644 --- a/UKSF.Api.Personnel/Services/RecruitmentService.cs +++ b/UKSF.Api.Personnel/Services/RecruitmentService.cs @@ -6,9 +6,9 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Base.Extensions; -using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Services { public interface IRecruitmentService { @@ -27,10 +27,8 @@ public interface IRecruitmentService { public class RecruitmentService : IRecruitmentService { private readonly IAccountService accountService; private readonly IHttpContextService httpContextService; - private readonly IDiscordService discordService; private readonly IDisplayNameService displayNameService; private readonly IRanksService ranksService; - private readonly ITeamspeakService teamspeakService; private readonly IUnitsService unitsService; private readonly IVariablesService variablesService; @@ -38,9 +36,7 @@ public RecruitmentService( IAccountService accountService, IHttpContextService httpContextService, IDisplayNameService displayNameService, - IDiscordService discordService, IRanksService ranksService, - ITeamspeakService teamspeakService, IUnitsService unitsService, IVariablesService variablesService ) { @@ -48,10 +44,8 @@ IVariablesService variablesService this.httpContextService = httpContextService; this.displayNameService = displayNameService; this.ranksService = ranksService; - this.teamspeakService = teamspeakService; this.unitsService = unitsService; this.variablesService = variablesService; - this.discordService = discordService; } public bool IsRecruiter(Account account) => GetRecruiters(true).Any(x => x.id == account.id); @@ -91,16 +85,15 @@ public object GetAllApplications() { return new {waiting, allWaiting, complete, recruiters}; } + // TODO: Make sure frontend calls get online user details for ts and discord public JObject GetApplication(Account account) { Account recruiterAccount = accountService.Data.GetSingle(account.application.recruiter); - (bool tsOnline, string tsNickname, bool discordOnline, string discordNickname) = GetOnlineUserDetails(account); (int years, int months) = account.dob.ToAge(); return JObject.FromObject( new { account, displayName = displayNameService.GetDisplayName(account), age = new {years, months}, - communications = new {tsOnline, tsNickname = tsOnline ? tsNickname : "", discordOnline, discordNickname}, daysProcessing = Math.Ceiling((DateTime.Now - account.application.dateCreated).TotalDays), daysProcessed = Math.Ceiling((account.application.dateAccepted - account.application.dateCreated).TotalDays), nextCandidateOp = GetNextCandidateOp(), @@ -168,15 +161,14 @@ private JObject GetCompletedApplication(Account account) => new {account, displayName = displayNameService.GetDisplayNameWithoutRank(account), daysProcessed = Math.Ceiling((account.application.dateAccepted - account.application.dateCreated).TotalDays), recruiter = displayNameService.GetDisplayName(account.application.recruiter)} ); + // TODO: Make sure frontend calls get online user details for ts and discord private JObject GetWaitingApplication(Account account) { - (bool tsOnline, string tsNickname, bool discordOnline, string discordNickname) = GetOnlineUserDetails(account); double averageProcessingTime = GetAverageProcessingTime(); double daysProcessing = Math.Ceiling((DateTime.Now - account.application.dateCreated).TotalDays); double processingDifference = daysProcessing - averageProcessingTime; return JObject.FromObject( new { account, - communications = new {tsOnline, tsNickname = tsOnline ? tsNickname : "", discordOnline, discordNickname}, steamprofile = "http://steamcommunity.com/profiles/" + account.steamname, daysProcessing, processingDifference, @@ -185,14 +177,6 @@ private JObject GetWaitingApplication(Account account) { ); } - // TODO: Should probably be individual endpoints in relevant components - private (bool tsOnline, string tsNickname, bool discordOnline, string discordNickname) GetOnlineUserDetails(Account account) { - (bool tsOnline, string tsNickname) = teamspeakService.GetOnlineUserDetails(account); - (bool discordOnline, string discordNickname) = discordService.GetOnlineUserDetails(account); - - return (tsOnline, tsNickname, discordOnline, discordNickname); - } - private static string GetNextCandidateOp() { DateTime nextDate = DateTime.Now; while (nextDate.DayOfWeek == DayOfWeek.Monday || nextDate.DayOfWeek == DayOfWeek.Wednesday || nextDate.DayOfWeek == DayOfWeek.Saturday) { diff --git a/UKSF.Api.Personnel/Services/ServiceRecordService.cs b/UKSF.Api.Personnel/Services/ServiceRecordService.cs index 27ecd01b..7373676e 100644 --- a/UKSF.Api.Personnel/Services/ServiceRecordService.cs +++ b/UKSF.Api.Personnel/Services/ServiceRecordService.cs @@ -13,7 +13,7 @@ public class ServiceRecordService : IServiceRecordService { public ServiceRecordService(IAccountService accountService) => this.accountService = accountService; public void AddServiceRecord(string id, string occurence, string notes) { - accountService.Data.Update(id, Builders.Update.Push("serviceRecord", new ServiceRecordEntry {timestamp = DateTime.Now, occurence = occurence, notes = notes})); + accountService.Data.Update(id, Builders.Update.Push("serviceRecord", new ServiceRecordEntry {Timestamp = DateTime.Now, Occurence = occurence, Notes = notes})); } } } diff --git a/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj b/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj index 1dad725e..9be7540b 100644 --- a/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj +++ b/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj @@ -8,7 +8,7 @@ - + diff --git a/UKSF.Api.Shared/ApiSharedExtensions.cs b/UKSF.Api.Shared/ApiSharedExtensions.cs new file mode 100644 index 00000000..6a0afc13 --- /dev/null +++ b/UKSF.Api.Shared/ApiSharedExtensions.cs @@ -0,0 +1,35 @@ +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Base.Context; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; +using UKSF.Api.Shared.Services; + +namespace UKSF.Api.Shared { + public static class ApiSharedExtensions { + public static IServiceCollection AddUksfShared(this IServiceCollection services) => + services.AddContexts() + .AddEventBuses() + .AddEventHandlers() + .AddServices() + .AddTransient() + .AddTransient() + .AddSingleton() + .AddSingleton(); + + private static IServiceCollection AddContexts(this IServiceCollection services) => + services.AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); + + private static IServiceCollection AddEventBuses(this IServiceCollection services) => + services.AddSingleton, DataEventBus>().AddSingleton, DataEventBus>(); + + private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + + private static IServiceCollection AddServices(this IServiceCollection services) => + services.AddSingleton().AddTransient(); + } +} diff --git a/UKSF.Api.Base/Context/CachedDataService.cs b/UKSF.Api.Shared/Context/CachedDataService.cs similarity index 97% rename from UKSF.Api.Base/Context/CachedDataService.cs rename to UKSF.Api.Shared/Context/CachedDataService.cs index cf323c6e..71fe9dda 100644 --- a/UKSF.Api.Base/Context/CachedDataService.cs +++ b/UKSF.Api.Shared/Context/CachedDataService.cs @@ -5,10 +5,12 @@ using System.Threading.Tasks; using MongoDB.Driver; using MoreLinq; -using UKSF.Api.Base.Events; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Models; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; -namespace UKSF.Api.Base.Context { +namespace UKSF.Api.Shared.Context { public interface ICachedDataService { void Refresh(); } diff --git a/UKSF.Api.Base/Context/DataService.cs b/UKSF.Api.Shared/Context/DataService.cs similarity index 96% rename from UKSF.Api.Base/Context/DataService.cs rename to UKSF.Api.Shared/Context/DataService.cs index 84157439..8ce621b0 100644 --- a/UKSF.Api.Base/Context/DataService.cs +++ b/UKSF.Api.Shared/Context/DataService.cs @@ -4,10 +4,12 @@ using System.Threading.Tasks; using MongoDB.Driver; using MoreLinq; -using UKSF.Api.Base.Events; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Models; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; -namespace UKSF.Api.Base.Context { +namespace UKSF.Api.Shared.Context { public interface IDataService { IEnumerable Get(); IEnumerable Get(Func predicate); diff --git a/UKSF.Api.Base/Context/LogDataService.cs b/UKSF.Api.Shared/Context/LogDataService.cs similarity index 91% rename from UKSF.Api.Base/Context/LogDataService.cs rename to UKSF.Api.Shared/Context/LogDataService.cs index 0b0ddc2f..0f96fa72 100644 --- a/UKSF.Api.Base/Context/LogDataService.cs +++ b/UKSF.Api.Shared/Context/LogDataService.cs @@ -1,7 +1,8 @@ -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Base.Context; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; -namespace UKSF.Api.Base.Context { +namespace UKSF.Api.Shared.Context { public interface ILogDataService : IDataService { } public interface IAuditLogDataService : IDataService { } diff --git a/UKSF.Api.Base/Context/SchedulerDataService.cs b/UKSF.Api.Shared/Context/SchedulerDataService.cs similarity index 74% rename from UKSF.Api.Base/Context/SchedulerDataService.cs rename to UKSF.Api.Shared/Context/SchedulerDataService.cs index f8d780c7..44713ad9 100644 --- a/UKSF.Api.Base/Context/SchedulerDataService.cs +++ b/UKSF.Api.Shared/Context/SchedulerDataService.cs @@ -1,7 +1,8 @@ -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; +using UKSF.Api.Base.Context; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; -namespace UKSF.Api.Base.Context { +namespace UKSF.Api.Shared.Context { public interface ISchedulerDataService : IDataService { } public class SchedulerDataService : DataService, ISchedulerDataService { diff --git a/UKSF.Api.Base/Events/DataEventBus.cs b/UKSF.Api.Shared/Events/DataEventBus.cs similarity index 80% rename from UKSF.Api.Base/Events/DataEventBus.cs rename to UKSF.Api.Shared/Events/DataEventBus.cs index 76652d64..a71b6823 100644 --- a/UKSF.Api.Base/Events/DataEventBus.cs +++ b/UKSF.Api.Shared/Events/DataEventBus.cs @@ -1,8 +1,10 @@ using System; using System.Reactive.Linq; +using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; +using UKSF.Api.Shared.Models; -namespace UKSF.Api.Base.Events { +namespace UKSF.Api.Shared.Events { public interface IDataEventBus : IEventBus> where T : DatabaseObject { } public class DataEventBus : EventBus>, IDataEventBus where T : DatabaseObject { diff --git a/UKSF.Api.Base/Events/EventModelFactory.cs b/UKSF.Api.Shared/Events/EventModelFactory.cs similarity index 81% rename from UKSF.Api.Base/Events/EventModelFactory.cs rename to UKSF.Api.Shared/Events/EventModelFactory.cs index 9a399fb4..85a2f6ea 100644 --- a/UKSF.Api.Base/Events/EventModelFactory.cs +++ b/UKSF.Api.Shared/Events/EventModelFactory.cs @@ -1,6 +1,7 @@ using UKSF.Api.Base.Models; +using UKSF.Api.Shared.Models; -namespace UKSF.Api.Base.Events { +namespace UKSF.Api.Shared.Events { public static class EventModelFactory { public static DataEventModel CreateDataEvent(DataEventType type, string id, object data = null) where T : DatabaseObject => new DataEventModel { type = type, id = id, data = data }; } diff --git a/UKSF.Api.Base/Events/LogEventBus.cs b/UKSF.Api.Shared/Events/Logger.cs similarity index 92% rename from UKSF.Api.Base/Events/LogEventBus.cs rename to UKSF.Api.Shared/Events/Logger.cs index f669b9cf..a83a464e 100644 --- a/UKSF.Api.Base/Events/LogEventBus.cs +++ b/UKSF.Api.Shared/Events/Logger.cs @@ -1,8 +1,9 @@ using System; -using UKSF.Api.Base.Models.Logging; -using UKSF.Api.Base.Services; +using UKSF.Api.Base.Events; +using UKSF.Api.Shared.Models; +using UKSF.Api.Shared.Services; -namespace UKSF.Api.Base.Events { +namespace UKSF.Api.Shared.Events { public interface ILogger : IEventBus { void LogInfo(string message); void LogWarning(string message); diff --git a/UKSF.Api.Base/Events/SignalrEventBus.cs b/UKSF.Api.Shared/Events/SignalrEventBus.cs similarity index 75% rename from UKSF.Api.Base/Events/SignalrEventBus.cs rename to UKSF.Api.Shared/Events/SignalrEventBus.cs index 634b64c9..073483c0 100644 --- a/UKSF.Api.Base/Events/SignalrEventBus.cs +++ b/UKSF.Api.Shared/Events/SignalrEventBus.cs @@ -1,6 +1,7 @@ -using UKSF.Api.Base.Models; +using UKSF.Api.Base.Events; +using UKSF.Api.Shared.Models; -namespace UKSF.Api.Base.Events { +namespace UKSF.Api.Shared.Events { public interface ISignalrEventBus : IEventBus { } public class SignalrEventBus : EventBus, ISignalrEventBus { diff --git a/UKSF.Api.Base/Extensions/ChangeUtilities.cs b/UKSF.Api.Shared/Extensions/ChangeUtilities.cs similarity index 99% rename from UKSF.Api.Base/Extensions/ChangeUtilities.cs rename to UKSF.Api.Shared/Extensions/ChangeUtilities.cs index 7b5010cc..09fefa52 100644 --- a/UKSF.Api.Base/Extensions/ChangeUtilities.cs +++ b/UKSF.Api.Shared/Extensions/ChangeUtilities.cs @@ -5,7 +5,7 @@ using System.Reflection; using Newtonsoft.Json.Linq; -namespace UKSF.Api.Base.Extensions { +namespace UKSF.Api.Shared.Extensions { public static class ChangeUtilities { public static string Changes(this T original, T updated) => DeepEquals(original, updated) ? "No changes" : FormatChanges(GetChanges(original, updated)); diff --git a/UKSF.Api.Base/Extensions/CollectionExtensions.cs b/UKSF.Api.Shared/Extensions/CollectionExtensions.cs similarity index 85% rename from UKSF.Api.Base/Extensions/CollectionExtensions.cs rename to UKSF.Api.Shared/Extensions/CollectionExtensions.cs index 31a3068d..00ad4780 100644 --- a/UKSF.Api.Base/Extensions/CollectionExtensions.cs +++ b/UKSF.Api.Shared/Extensions/CollectionExtensions.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UKSF.Api.Base.Extensions { +namespace UKSF.Api.Shared.Extensions { public static class CollectionExtensions { public static void CleanHashset(this HashSet collection) { collection.RemoveWhere(string.IsNullOrEmpty); diff --git a/UKSF.Api.Base/Extensions/DateExtensions.cs b/UKSF.Api.Shared/Extensions/DateExtensions.cs similarity index 93% rename from UKSF.Api.Base/Extensions/DateExtensions.cs rename to UKSF.Api.Shared/Extensions/DateExtensions.cs index 62dfd64c..f92dc025 100644 --- a/UKSF.Api.Base/Extensions/DateExtensions.cs +++ b/UKSF.Api.Shared/Extensions/DateExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace UKSF.Api.Base.Extensions { +namespace UKSF.Api.Shared.Extensions { public static class DateExtensions { public static (int years, int months) ToAge(this DateTime dob, DateTime? date = null) { DateTime today = date ?? DateTime.Today; diff --git a/UKSF.Api.Base/Extensions/GuardUtilites.cs b/UKSF.Api.Shared/Extensions/GuardUtilites.cs similarity index 96% rename from UKSF.Api.Base/Extensions/GuardUtilites.cs rename to UKSF.Api.Shared/Extensions/GuardUtilites.cs index 05478273..a3311510 100644 --- a/UKSF.Api.Base/Extensions/GuardUtilites.cs +++ b/UKSF.Api.Shared/Extensions/GuardUtilites.cs @@ -2,7 +2,7 @@ using System.Linq; using MongoDB.Bson; -namespace UKSF.Api.Base.Extensions { +namespace UKSF.Api.Shared.Extensions { public static class GuardUtilites { public static void ValidateString(string text, Action onInvalid) { if (string.IsNullOrEmpty(text)) onInvalid(text); diff --git a/UKSF.Api.Base/Extensions/JsonExtensions.cs b/UKSF.Api.Shared/Extensions/JsonExtensions.cs similarity index 94% rename from UKSF.Api.Base/Extensions/JsonExtensions.cs rename to UKSF.Api.Shared/Extensions/JsonExtensions.cs index 54bec179..64ae0e80 100644 --- a/UKSF.Api.Base/Extensions/JsonExtensions.cs +++ b/UKSF.Api.Shared/Extensions/JsonExtensions.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace UKSF.Api.Base.Extensions { +namespace UKSF.Api.Shared.Extensions { public static class JsonExtensions { public static T Copy(this object source) { JsonSerializerSettings deserializeSettings = new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace }; diff --git a/UKSF.Api.Shared/Extensions/ObjectExtensions.cs b/UKSF.Api.Shared/Extensions/ObjectExtensions.cs new file mode 100644 index 00000000..2bb5cf04 --- /dev/null +++ b/UKSF.Api.Shared/Extensions/ObjectExtensions.cs @@ -0,0 +1,42 @@ +using System; +using System.Reflection; + +namespace UKSF.Api.Shared.Extensions { + public static class ObjectExtensions { + public static object GetFieldValue(this object obj, string fieldName) { + if (obj == null) throw new ArgumentNullException(nameof(obj)); + Type objType = obj.GetType(); + FieldInfo fieldInfo = GetFieldInfo(objType, fieldName); + if (fieldInfo == null) throw new ArgumentOutOfRangeException(fieldName, $"Couldn't find field {fieldName} in type {objType.FullName}"); + return fieldInfo.GetValue(obj); + } + + private static FieldInfo GetFieldInfo(Type type, string fieldName) { + FieldInfo fieldInfo; + do { + fieldInfo = type.GetField(fieldName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); + type = type.BaseType; + } while (fieldInfo == null && type != null); + + return fieldInfo; + } + + public static object GetPropertyValue(this object obj, string propertyName) { + if (obj == null) throw new ArgumentNullException(nameof(obj)); + Type objType = obj.GetType(); + PropertyInfo propertyInfo = GetPropertyInfo(objType, propertyName); + if (propertyInfo == null) throw new ArgumentOutOfRangeException(propertyName, $"Couldn't find property {propertyName} in type {objType.FullName}"); + return propertyInfo.GetValue(obj, null); + } + + private static PropertyInfo GetPropertyInfo(Type type, string propertyName) { + PropertyInfo propertyInfo; + do { + propertyInfo = type.GetProperty(propertyName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); + type = type.BaseType; + } while (propertyInfo == null && type != null); + + return propertyInfo; + } + } +} diff --git a/UKSF.Api.Base/Extensions/ObservableExtensions.cs b/UKSF.Api.Shared/Extensions/ObservableExtensions.cs similarity index 79% rename from UKSF.Api.Base/Extensions/ObservableExtensions.cs rename to UKSF.Api.Shared/Extensions/ObservableExtensions.cs index cb3e8e04..8878b4a3 100644 --- a/UKSF.Api.Base/Extensions/ObservableExtensions.cs +++ b/UKSF.Api.Shared/Extensions/ObservableExtensions.cs @@ -3,10 +3,10 @@ using System.Reactive.Threading.Tasks; using System.Threading.Tasks; -namespace UKSF.Api.Base.Extensions { +namespace UKSF.Api.Shared.Extensions { public static class ObservableExtensions { public static void SubscribeWithAsyncNext(this IObservable source, Func onNext, Action onError) { - source.Select(x => Observable.Defer(() => onNext(x).ToObservable())).Concat().Subscribe(x => { }, onError); + source.Select(x => Observable.Defer(() => onNext(x).ToObservable())).Concat().Subscribe(_ => { }, onError); } } } diff --git a/UKSF.Api.Base/Extensions/ProcessUtilities.cs b/UKSF.Api.Shared/Extensions/ProcessUtilities.cs similarity index 98% rename from UKSF.Api.Base/Extensions/ProcessUtilities.cs rename to UKSF.Api.Shared/Extensions/ProcessUtilities.cs index 0db4e841..28dec298 100644 --- a/UKSF.Api.Base/Extensions/ProcessUtilities.cs +++ b/UKSF.Api.Shared/Extensions/ProcessUtilities.cs @@ -5,7 +5,7 @@ using Microsoft.Win32.TaskScheduler; using Task = System.Threading.Tasks.Task; -namespace UKSF.Api.Base.Extensions { +namespace UKSF.Api.Shared.Extensions { [ExcludeFromCodeCoverage] public static class ProcessUtilities { private const int SC_CLOSE = 0xF060; diff --git a/UKSF.Api.Shared/Extensions/ServiceExtensions.cs b/UKSF.Api.Shared/Extensions/ServiceExtensions.cs new file mode 100644 index 00000000..9a01655b --- /dev/null +++ b/UKSF.Api.Shared/Extensions/ServiceExtensions.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using Microsoft.Extensions.DependencyInjection; + +// ReSharper disable once ForeachCanBeConvertedToQueryUsingAnotherGetEnumerator + +namespace UKSF.Api.Shared.Extensions { + public static class ServiceExtensions { + public static IEnumerable GetInterfaceServices(this IServiceProvider provider) { + if (provider is ServiceProvider serviceProvider) { + List services = new List(); + + object engine = serviceProvider.GetFieldValue("_engine"); + object callSiteFactory = engine.GetPropertyValue("CallSiteFactory"); + object descriptorLookup = callSiteFactory.GetFieldValue("_descriptorLookup"); + if (descriptorLookup is IDictionary dictionary) { + foreach (DictionaryEntry entry in dictionary) { + if (typeof(T).IsAssignableFrom((Type) entry.Key)) { + services.Add((ServiceDescriptor) entry.Value.GetPropertyValue("Last")); + } + } + } + + return services.Select(x => (T) provider.GetService(x.ServiceType)); + } + + throw new Exception(); + } + } +} diff --git a/UKSF.Api.Base/Extensions/StringExtensions.cs b/UKSF.Api.Shared/Extensions/StringExtensions.cs similarity index 97% rename from UKSF.Api.Base/Extensions/StringExtensions.cs rename to UKSF.Api.Shared/Extensions/StringExtensions.cs index cbe51e35..e99290f4 100644 --- a/UKSF.Api.Base/Extensions/StringExtensions.cs +++ b/UKSF.Api.Shared/Extensions/StringExtensions.cs @@ -4,7 +4,7 @@ using System.Text.RegularExpressions; using MongoDB.Bson; -namespace UKSF.Api.Base.Extensions { +namespace UKSF.Api.Shared.Extensions { public static class StringExtensions { public static bool ContainsIgnoreCase(this string text, string searchElement) => !string.IsNullOrEmpty(text) && !string.IsNullOrEmpty(searchElement) && text.ToUpper().Contains(searchElement.ToUpper()); diff --git a/UKSF.Api.Base/Extensions/TaskUtilities.cs b/UKSF.Api.Shared/Extensions/TaskUtilities.cs similarity index 94% rename from UKSF.Api.Base/Extensions/TaskUtilities.cs rename to UKSF.Api.Shared/Extensions/TaskUtilities.cs index f490401b..73e0983b 100644 --- a/UKSF.Api.Base/Extensions/TaskUtilities.cs +++ b/UKSF.Api.Shared/Extensions/TaskUtilities.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; -namespace UKSF.Api.Base.Extensions { +namespace UKSF.Api.Shared.Extensions { public static class TaskUtilities { public static async Task Delay(TimeSpan timeSpan, CancellationToken token) { try { diff --git a/UKSF.Api.Base/Models/Logging/AuditLog.cs b/UKSF.Api.Shared/Models/AuditLog.cs similarity index 83% rename from UKSF.Api.Base/Models/Logging/AuditLog.cs rename to UKSF.Api.Shared/Models/AuditLog.cs index 34f710af..44a398bf 100644 --- a/UKSF.Api.Base/Models/Logging/AuditLog.cs +++ b/UKSF.Api.Shared/Models/AuditLog.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Base.Models.Logging { +namespace UKSF.Api.Shared.Models { public class AuditLog : BasicLog { public string who; diff --git a/UKSF.Api.Base/Models/Logging/BasicLog.cs b/UKSF.Api.Shared/Models/BasicLog.cs similarity index 91% rename from UKSF.Api.Base/Models/Logging/BasicLog.cs rename to UKSF.Api.Shared/Models/BasicLog.cs index e4cca978..8e8111a7 100644 --- a/UKSF.Api.Base/Models/Logging/BasicLog.cs +++ b/UKSF.Api.Shared/Models/BasicLog.cs @@ -1,6 +1,7 @@ using System; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Base.Models.Logging { +namespace UKSF.Api.Shared.Models { public enum LogLevel { DEBUG, INFO, diff --git a/UKSF.Api.Base/Models/DataEventModel.cs b/UKSF.Api.Shared/Models/DataEventModel.cs similarity index 82% rename from UKSF.Api.Base/Models/DataEventModel.cs rename to UKSF.Api.Shared/Models/DataEventModel.cs index aa052d44..4e66e003 100644 --- a/UKSF.Api.Base/Models/DataEventModel.cs +++ b/UKSF.Api.Shared/Models/DataEventModel.cs @@ -1,4 +1,6 @@ -namespace UKSF.Api.Base.Models { +using UKSF.Api.Base.Models; + +namespace UKSF.Api.Shared.Models { public enum DataEventType { ADD, UPDATE, diff --git a/UKSF.Api.Base/Models/Logging/HttpErrorLog.cs b/UKSF.Api.Shared/Models/HttpErrorLog.cs similarity index 91% rename from UKSF.Api.Base/Models/Logging/HttpErrorLog.cs rename to UKSF.Api.Shared/Models/HttpErrorLog.cs index 3953e488..1d880d1c 100644 --- a/UKSF.Api.Base/Models/Logging/HttpErrorLog.cs +++ b/UKSF.Api.Shared/Models/HttpErrorLog.cs @@ -1,6 +1,6 @@ using System; -namespace UKSF.Api.Base.Models.Logging { +namespace UKSF.Api.Shared.Models { public class HttpErrorLog : BasicLog { public string exception; public string httpMethod; diff --git a/UKSF.Api.Base/Models/Logging/LauncherLog.cs b/UKSF.Api.Shared/Models/LauncherLog.cs similarity index 84% rename from UKSF.Api.Base/Models/Logging/LauncherLog.cs rename to UKSF.Api.Shared/Models/LauncherLog.cs index 826d52b8..062665dd 100644 --- a/UKSF.Api.Base/Models/Logging/LauncherLog.cs +++ b/UKSF.Api.Shared/Models/LauncherLog.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Base.Models.Logging { +namespace UKSF.Api.Shared.Models { public class LauncherLog : BasicLog { public string name; public string userId; diff --git a/UKSF.Api.Base/Models/ScheduledJob.cs b/UKSF.Api.Shared/Models/ScheduledJob.cs similarity index 78% rename from UKSF.Api.Base/Models/ScheduledJob.cs rename to UKSF.Api.Shared/Models/ScheduledJob.cs index 22c6b94a..8a354397 100644 --- a/UKSF.Api.Base/Models/ScheduledJob.cs +++ b/UKSF.Api.Shared/Models/ScheduledJob.cs @@ -1,6 +1,7 @@ using System; +using UKSF.Api.Base.Models; -namespace UKSF.Api.Base.Models { +namespace UKSF.Api.Shared.Models { public class ScheduledJob : DatabaseObject { public string action; public string actionParameters; diff --git a/UKSF.Api.Base/Models/SignalrEventModel.cs b/UKSF.Api.Shared/Models/SignalrEventModel.cs similarity index 77% rename from UKSF.Api.Base/Models/SignalrEventModel.cs rename to UKSF.Api.Shared/Models/SignalrEventModel.cs index 72220e7b..1b678077 100644 --- a/UKSF.Api.Base/Models/SignalrEventModel.cs +++ b/UKSF.Api.Shared/Models/SignalrEventModel.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Base.Models { +namespace UKSF.Api.Shared.Models { public class SignalrEventModel { public TeamspeakEventType procedure; public object args; diff --git a/UKSF.Api.Base/Models/TeamspeakEventType.cs b/UKSF.Api.Shared/Models/TeamspeakEventType.cs similarity index 75% rename from UKSF.Api.Base/Models/TeamspeakEventType.cs rename to UKSF.Api.Shared/Models/TeamspeakEventType.cs index 7534d0fc..71f86b98 100644 --- a/UKSF.Api.Base/Models/TeamspeakEventType.cs +++ b/UKSF.Api.Shared/Models/TeamspeakEventType.cs @@ -1,4 +1,4 @@ -namespace UKSF.Api.Base.Models { +namespace UKSF.Api.Shared.Models { public enum TeamspeakEventType { EMPTY, CLIENTS, diff --git a/UKSF.Api.Shared/Models/TeamspeakMessageEventModel.cs b/UKSF.Api.Shared/Models/TeamspeakMessageEventModel.cs new file mode 100644 index 00000000..7b6278e6 --- /dev/null +++ b/UKSF.Api.Shared/Models/TeamspeakMessageEventModel.cs @@ -0,0 +1,13 @@ +using System.Collections.Generic; + +namespace UKSF.Api.Shared.Models { + public class TeamspeakMessageEventModel { + public IEnumerable ClientDbIds { get; } + public string Message { get; } + + public TeamspeakMessageEventModel(IEnumerable clientDbIds, string message) { + ClientDbIds = clientDbIds; + Message = message; + } + } +} diff --git a/UKSF.Api.Base/Permissions.cs b/UKSF.Api.Shared/Permissions.cs similarity index 97% rename from UKSF.Api.Base/Permissions.cs rename to UKSF.Api.Shared/Permissions.cs index 66c554da..5007ea19 100644 --- a/UKSF.Api.Base/Permissions.cs +++ b/UKSF.Api.Shared/Permissions.cs @@ -2,7 +2,7 @@ using System.Linq; using Microsoft.AspNetCore.Authorization; -namespace UKSF.Api.Base { +namespace UKSF.Api.Shared { public static class Permissions { #region MemberStates diff --git a/UKSF.Api.Base/Services/Clock.cs b/UKSF.Api.Shared/Services/Clock.cs similarity index 90% rename from UKSF.Api.Base/Services/Clock.cs rename to UKSF.Api.Shared/Services/Clock.cs index 5ca65f00..a72e1816 100644 --- a/UKSF.Api.Base/Services/Clock.cs +++ b/UKSF.Api.Shared/Services/Clock.cs @@ -1,6 +1,6 @@ using System; -namespace UKSF.Api.Base.Services { +namespace UKSF.Api.Shared.Services { public interface IClock { public DateTime Now(); public DateTime Today(); diff --git a/UKSF.Api.Shared/Services/HttpContextService.cs b/UKSF.Api.Shared/Services/HttpContextService.cs new file mode 100644 index 00000000..37e2d864 --- /dev/null +++ b/UKSF.Api.Shared/Services/HttpContextService.cs @@ -0,0 +1,27 @@ +using System.Linq; +using System.Security.Claims; +using Microsoft.AspNetCore.Http; + +namespace UKSF.Api.Shared.Services { + public interface IHttpContextService { + bool IsUserAuthenticated(); + public string GetUserId(); + public string GetUserEmail(); + bool UserHasPermission(string permission); + } + + public class HttpContextService : IHttpContextService { + private readonly IHttpContextAccessor _httpContextAccessor; + + public HttpContextService(IHttpContextAccessor httpContextAccessor) => _httpContextAccessor = httpContextAccessor; + + public bool IsUserAuthenticated() => _httpContextAccessor.HttpContext?.User.Identity != null && _httpContextAccessor.HttpContext.User.Identity.IsAuthenticated; + + public string GetUserId() => _httpContextAccessor.HttpContext?.User.Claims.Single(x => x.Type == ClaimTypes.Sid).Value; + + public string GetUserEmail() => _httpContextAccessor.HttpContext?.User.Claims.Single(x => x.Type == ClaimTypes.Email).Value; + + public bool UserHasPermission(string permission) => + _httpContextAccessor.HttpContext != null && _httpContextAccessor.HttpContext.User.Claims.Any(x => x.Type == ClaimTypes.Role && x.Value == permission); + } +} diff --git a/UKSF.Api.Base/Services/ScheduledActionFactory.cs b/UKSF.Api.Shared/Services/ScheduledActionFactory.cs similarity index 96% rename from UKSF.Api.Base/Services/ScheduledActionFactory.cs rename to UKSF.Api.Shared/Services/ScheduledActionFactory.cs index 34b73f2a..e15f3636 100644 --- a/UKSF.Api.Base/Services/ScheduledActionFactory.cs +++ b/UKSF.Api.Shared/Services/ScheduledActionFactory.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UKSF.Api.Base.ScheduledActions; -namespace UKSF.Api.Base.Services { +namespace UKSF.Api.Shared.Services { public interface IScheduledActionFactory { void RegisterScheduledActions(IEnumerable newScheduledActions); IScheduledAction GetScheduledAction(string actionName); diff --git a/UKSF.Api.Base/Services/SchedulerService.cs b/UKSF.Api.Shared/Services/SchedulerService.cs similarity index 82% rename from UKSF.Api.Base/Services/SchedulerService.cs rename to UKSF.Api.Shared/Services/SchedulerService.cs index 1990d74c..ad0da794 100644 --- a/UKSF.Api.Base/Services/SchedulerService.cs +++ b/UKSF.Api.Shared/Services/SchedulerService.cs @@ -3,14 +3,15 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.Extensions.Hosting; using Newtonsoft.Json; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; using UKSF.Api.Base.ScheduledActions; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; -namespace UKSF.Api.Base.Services { +namespace UKSF.Api.Shared.Services { public interface ISchedulerService : IDataBackedService { void Load(); Task CreateAndScheduleJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters); @@ -20,18 +21,15 @@ public interface ISchedulerService : IDataBackedService { public class SchedulerService : DataBackedService, ISchedulerService { private static readonly ConcurrentDictionary ACTIVE_TASKS = new ConcurrentDictionary(); - private readonly IHostEnvironment currentEnvironment; - private readonly ILogger logger; - private readonly IScheduledActionFactory scheduledActionFactory; - - public SchedulerService(ISchedulerDataService data, IScheduledActionFactory scheduledActionFactory, IHostEnvironment currentEnvironment, ILogger logger) : base(data) { - this.scheduledActionFactory = scheduledActionFactory; - this.currentEnvironment = currentEnvironment; - this.logger = logger; + private readonly ILogger _logger; + private readonly IScheduledActionFactory _scheduledActionFactory; + + public SchedulerService(ISchedulerDataService data, IScheduledActionFactory scheduledActionFactory, ILogger logger) : base(data) { + _scheduledActionFactory = scheduledActionFactory; + _logger = logger; } - public async void Load() { - await AddUnique(); + public void Load() { Data.Get().ToList().ForEach(Schedule); } @@ -87,7 +85,7 @@ private void Schedule(ScheduledJob job) { try { ExecuteAction(job); } catch (Exception exception) { - logger.LogError(exception); + _logger.LogError(exception); } if (job.repeat) { @@ -104,13 +102,6 @@ private void Schedule(ScheduledJob job) { ACTIVE_TASKS[job.id] = token; } - // TODO: Move out of this bit - private async Task AddUnique() { - - if (!currentEnvironment.IsDevelopment()) { - } - } - private async Task SetNext(ScheduledJob job) { await Data.Update(job.id, "next", job.next); } @@ -121,7 +112,7 @@ private bool IsCancelled(DatabaseObject job, CancellationTokenSource token) { } private void ExecuteAction(ScheduledJob job) { - IScheduledAction action = scheduledActionFactory.GetScheduledAction(job.action); + IScheduledAction action = _scheduledActionFactory.GetScheduledAction(job.action); object[] parameters = job.actionParameters == null ? null : JsonConvert.DeserializeObject(job.actionParameters); action.Run(parameters); } diff --git a/UKSF.Api.Shared/UKSF.Api.Shared.csproj b/UKSF.Api.Shared/UKSF.Api.Shared.csproj new file mode 100644 index 00000000..04b5c1ea --- /dev/null +++ b/UKSF.Api.Shared/UKSF.Api.Shared.csproj @@ -0,0 +1,11 @@ + + + + net5.0 + + + + + + + diff --git a/UKSF.Api.Utility/ApiUtilityExtensions.cs b/UKSF.Api.Utility/ApiUtilityExtensions.cs deleted file mode 100644 index 5e159c28..00000000 --- a/UKSF.Api.Utility/ApiUtilityExtensions.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; -using UKSF.Api.Base.Services; - -namespace UKSF.Api.Utility { - public static class ApiUtilityExtensions { - public static IServiceCollection AddUksfUtility(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); - - private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton(); - - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>(); - - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; - - private static IServiceCollection AddServices(this IServiceCollection services) => - services.AddSingleton().AddTransient(); - } -} diff --git a/UKSF.Api.Utility/UKSF.Api.Utility.csproj b/UKSF.Api.Utility/UKSF.Api.Utility.csproj deleted file mode 100644 index 70ff7ae3..00000000 --- a/UKSF.Api.Utility/UKSF.Api.Utility.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - netcoreapp5.0 - Library - - - - - - - - - - - - - - - - - - diff --git a/UKSF.Api.sln b/UKSF.Api.sln index 31982a5e..66159cef 100644 --- a/UKSF.Api.sln +++ b/UKSF.Api.sln @@ -38,6 +38,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Launcher", "UKSF.A EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Integration.Instagram", "UKSF.Api.Integration.Instagram\UKSF.Api.Integration.Instagram.csproj", "{B248CB10-298A-4B40-A999-FAAEFDDDD3E4}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Shared", "UKSF.Api.Shared\UKSF.Api.Shared.csproj", "{5CADD496-CF3E-4176-9AF3-F6300329827E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -166,6 +168,14 @@ Global {B248CB10-298A-4B40-A999-FAAEFDDDD3E4}.Release|x64.Build.0 = Release|Any CPU {B248CB10-298A-4B40-A999-FAAEFDDDD3E4}.Release|x86.ActiveCfg = Release|Any CPU {B248CB10-298A-4B40-A999-FAAEFDDDD3E4}.Release|x86.Build.0 = Release|Any CPU + {5CADD496-CF3E-4176-9AF3-F6300329827E}.Debug|x64.ActiveCfg = Debug|Any CPU + {5CADD496-CF3E-4176-9AF3-F6300329827E}.Debug|x64.Build.0 = Debug|Any CPU + {5CADD496-CF3E-4176-9AF3-F6300329827E}.Debug|x86.ActiveCfg = Debug|Any CPU + {5CADD496-CF3E-4176-9AF3-F6300329827E}.Debug|x86.Build.0 = Debug|Any CPU + {5CADD496-CF3E-4176-9AF3-F6300329827E}.Release|x64.ActiveCfg = Release|Any CPU + {5CADD496-CF3E-4176-9AF3-F6300329827E}.Release|x64.Build.0 = Release|Any CPU + {5CADD496-CF3E-4176-9AF3-F6300329827E}.Release|x86.ActiveCfg = Release|Any CPU + {5CADD496-CF3E-4176-9AF3-F6300329827E}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UKSF.Api/AppStart/StartServices.cs b/UKSF.Api/AppStart/StartServices.cs index 0efefc0c..654465e5 100644 --- a/UKSF.Api/AppStart/StartServices.cs +++ b/UKSF.Api/AppStart/StartServices.cs @@ -5,11 +5,12 @@ using UKSF.Api.Admin.Services; using UKSF.Api.Base.Events; using UKSF.Api.Base.ScheduledActions; -using UKSF.Api.Base.Services; using UKSF.Api.Discord.Services; using UKSF.Api.Modpack.Services; using UKSF.Api.Modpack.Services.BuildProcess; using UKSF.Api.Services; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Services; using UKSF.Api.Teamspeak.Services; namespace UKSF.Api.AppStart { @@ -24,17 +25,17 @@ public static void StartUksfServices(this IServiceProvider serviceProvider) { serviceProvider.GetService()?.Migrate(); // Warm cached data services - serviceProvider.GetService()?.InvalidateCachedData(); + serviceProvider.GetService()?.RefreshCachedData(); // Register scheduled actions & run self-creating scheduled actions - serviceProvider.GetService()?.RegisterScheduledActions(serviceProvider.GetServices()); - serviceProvider.GetServices().ForEach(x => x.CreateSelf()); + serviceProvider.GetService()?.RegisterScheduledActions(serviceProvider.GetInterfaceServices()); + serviceProvider.GetInterfaceServices().ForEach(x => x.CreateSelf()); // Register build steps serviceProvider.GetService()?.RegisterBuildSteps(); // Add event handlers - serviceProvider.GetServices().ForEach(x => x.Init()); + serviceProvider.GetInterfaceServices().ForEach(x => x.Init()); // Start teamspeak manager serviceProvider.GetService()?.Start(); diff --git a/UKSF.Api/AppStart/UksfServiceExtensions.cs b/UKSF.Api/AppStart/UksfServiceExtensions.cs index f6c1f98e..f47c7757 100644 --- a/UKSF.Api/AppStart/UksfServiceExtensions.cs +++ b/UKSF.Api/AppStart/UksfServiceExtensions.cs @@ -2,8 +2,21 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using UKSF.Api.Admin; +using UKSF.Api.ArmaMissions; +using UKSF.Api.ArmaServer; +using UKSF.Api.Auth; +using UKSF.Api.Base; +using UKSF.Api.Command; +using UKSF.Api.Discord; using UKSF.Api.EventHandlers; +using UKSF.Api.Integration.Instagram; +using UKSF.Api.Launcher; +using UKSF.Api.Modpack; +using UKSF.Api.Personnel; using UKSF.Api.Services; +using UKSF.Api.Shared; +using UKSF.Api.Teamspeak; namespace UKSF.Api.AppStart { public static class ServiceExtensions { @@ -16,7 +29,8 @@ public static IServiceCollection AddUksf(this IServiceCollection services, IConf .AddSingleton(currentEnvironment) .AddSingleton() .AddSingleton() - .AddSingleton(); + .AddSingleton() + .AddComponents(configuration); private static IServiceCollection AddContexts(this IServiceCollection services) => services; @@ -25,5 +39,20 @@ public static IServiceCollection AddUksf(this IServiceCollection services, IConf private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); private static IServiceCollection AddServices(this IServiceCollection services) => services; + + private static IServiceCollection AddComponents(this IServiceCollection services, IConfiguration configuration) => + services.AddUksfBase(configuration) + .AddUksfShared() + .AddUksfAuth(configuration) + .AddUksfAdmin() + .AddUksfCommand() + .AddUksfModpack() + .AddUksfPersonnel() + .AddUksfArmaMissions() + .AddUksfArmaServer() + .AddUksfLauncher() + .AddUksfIntegrationDiscord() + .AddUksfIntegrationInstagram() + .AddUksfIntegrationTeamspeak(); } } diff --git a/UKSF.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs index bcc3d3f7..5648333f 100644 --- a/UKSF.Api/Controllers/LoaController.cs +++ b/UKSF.Api/Controllers/LoaController.cs @@ -4,13 +4,13 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Base; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Services; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Services; namespace UKSF.Api.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] diff --git a/UKSF.Api/Controllers/LoggingController.cs b/UKSF.Api/Controllers/LoggingController.cs index dded4656..e0fab1e8 100644 --- a/UKSF.Api/Controllers/LoggingController.cs +++ b/UKSF.Api/Controllers/LoggingController.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Base; -using UKSF.Api.Base.Context; -using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Controllers { [Route("[controller]"), Permissions(Permissions.ADMIN)] diff --git a/UKSF.Api/Controllers/ModsController.cs b/UKSF.Api/Controllers/ModsController.cs index 0df0a84e..5a83b926 100644 --- a/UKSF.Api/Controllers/ModsController.cs +++ b/UKSF.Api/Controllers/ModsController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Base; +using UKSF.Api.Shared; namespace UKSF.Api.Controllers { [Route("[controller]"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER)] diff --git a/UKSF.Api/EventHandlers/LoggerEventHandler.cs b/UKSF.Api/EventHandlers/LoggerEventHandler.cs index 6d9fcf1a..db9b5174 100644 --- a/UKSF.Api/EventHandlers/LoggerEventHandler.cs +++ b/UKSF.Api/EventHandlers/LoggerEventHandler.cs @@ -1,27 +1,40 @@ using System; using System.Threading.Tasks; -using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models.Logging; using UKSF.Api.Personnel.Services; -using UKSF.Api.Services; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; namespace UKSF.Api.EventHandlers { public interface ILoggerEventHandler : IEventHandler { } public class LoggerEventHandler : ILoggerEventHandler { - private readonly IObjectIdConversionService objectIdConversionService; - private readonly ILogDataService data; - private readonly ILogger logger; - - public LoggerEventHandler(ILogDataService data, ILogger logger, IObjectIdConversionService objectIdConversionService) { - this.data = data; - this.logger = logger; - this.objectIdConversionService = objectIdConversionService; + private readonly IAuditLogDataService _auditLogDataService; + private readonly IHttpErrorLogDataService _httpErrorLogDataService; + private readonly ILauncherLogDataService _launcherLogDataService; + private readonly ILogDataService _logDataService; + private readonly ILogger _logger; + private readonly IObjectIdConversionService _objectIdConversionService; + + public LoggerEventHandler( + ILogDataService logDataService, + IAuditLogDataService auditLogDataService, + IHttpErrorLogDataService httpErrorLogDataService, + ILauncherLogDataService launcherLogDataService, + ILogger logger, + IObjectIdConversionService objectIdConversionService + ) { + _logDataService = logDataService; + _auditLogDataService = auditLogDataService; + _httpErrorLogDataService = httpErrorLogDataService; + _launcherLogDataService = launcherLogDataService; + _logger = logger; + _objectIdConversionService = objectIdConversionService; } public void Init() { - logger.AsObservable().Subscribe(HandleLog, logger.LogError); + _logger.AsObservable().Subscribe(HandleLog, _logger.LogError); } private void HandleLog(BasicLog log) { @@ -30,20 +43,20 @@ private void HandleLog(BasicLog log) { private async Task HandleLogAsync(BasicLog log) { if (log is AuditLog auditLog) { - auditLog.who = objectIdConversionService.ConvertObjectId(auditLog.who); + auditLog.who = _objectIdConversionService.ConvertObjectId(auditLog.who); log = auditLog; } - log.message = objectIdConversionService.ConvertObjectIds(log.message); + log.message = _objectIdConversionService.ConvertObjectIds(log.message); await LogToStorageAsync(log); } private Task LogToStorageAsync(BasicLog log) { return log switch { - AuditLog auditLog => data.Add(auditLog), - LauncherLog launcherLog => data.Add(launcherLog), - HttpErrorLog httpErrorLog => data.Add(httpErrorLog), - _ => data.Add(log) + AuditLog auditLog => _auditLogDataService.Add(auditLog), + LauncherLog launcherLog => _launcherLogDataService.Add(launcherLog), + HttpErrorLog httpErrorLog => _httpErrorLogDataService.Add(httpErrorLog), + _ => _logDataService.Add(log) }; } } diff --git a/UKSF.Api/ExceptionHandler.cs b/UKSF.Api/ExceptionHandler.cs index 485f6aea..46f0f7ae 100644 --- a/UKSF.Api/ExceptionHandler.cs +++ b/UKSF.Api/ExceptionHandler.cs @@ -4,10 +4,10 @@ using Microsoft.AspNetCore.Http.Extensions; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models.Logging; -using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; +using UKSF.Api.Shared.Services; namespace UKSF.Api { public class ExceptionHandler : IExceptionFilter { diff --git a/UKSF.Api/Global.cs b/UKSF.Api/Global.cs index b8f2cbf9..d3566f1d 100644 --- a/UKSF.Api/Global.cs +++ b/UKSF.Api/Global.cs @@ -1,6 +1,4 @@ -using System; - -namespace UKSF.Api { +namespace UKSF.Api { public static class Global { public const string SUPER_ADMIN = "59e38f10594c603b78aa9dbd"; public const string TOKEN_AUDIENCE = "uksf-audience"; diff --git a/UKSF.Api/Services/MigrationUtility.cs b/UKSF.Api/Services/MigrationUtility.cs index 740f7c02..b7c2865e 100644 --- a/UKSF.Api/Services/MigrationUtility.cs +++ b/UKSF.Api/Services/MigrationUtility.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.Hosting; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Base.Events; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Services { public class MigrationUtility { diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 065565c4..3e9acab0 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -21,18 +21,18 @@ namespace UKSF.Api { public class Startup { - private readonly IConfiguration configuration; - private readonly IHostEnvironment currentEnvironment; + private readonly IConfiguration _configuration; + private readonly IHostEnvironment _currentEnvironment; public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration) { - this.configuration = configuration; - this.currentEnvironment = currentEnvironment; + _configuration = configuration; + _currentEnvironment = currentEnvironment; IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); builder.Build(); } public void ConfigureServices(IServiceCollection services) { - services.AddUksf(configuration, currentEnvironment); + services.AddUksf(_configuration, _currentEnvironment); services.AddCors( options => options.AddPolicy( @@ -53,9 +53,9 @@ public void ConfigureServices(IServiceCollection services) { services.AddMvc(options => { options.Filters.Add(); }).AddNewtonsoftJson(); } - // ReSharper disable once UnusedMember.Global public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostApplicationLifetime, IServiceProvider serviceProvider) { hostApplicationLifetime.ApplicationStopping.Register(() => OnShutdown(serviceProvider)); + app.UseStaticFiles(); app.UseCookiePolicy(new CookiePolicyOptions { MinimumSameSitePolicy = SameSiteMode.Lax }); app.UseSwagger(); @@ -87,7 +87,6 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl serviceProvider.StartUksfServices(); } - // TODO: Check this works private static void OnShutdown(IServiceProvider serviceProvider) { // Cancel any running builds serviceProvider.GetService()?.CancelAll(); @@ -97,25 +96,22 @@ private static void OnShutdown(IServiceProvider serviceProvider) { } } - // ReSharper disable once ClassNeverInstantiated.Global public class CorsMiddleware { - private readonly RequestDelegate next; + private readonly RequestDelegate _next; - public CorsMiddleware(RequestDelegate next) => this.next = next; + public CorsMiddleware(RequestDelegate next) => _next = next; - // ReSharper disable once UnusedMember.Global public Task Invoke(HttpContext httpContext) { - if (httpContext.Request.Path.Value.Contains("hub")) { + if (httpContext.Request.Path.Value != null && httpContext.Request.Path.Value.Contains("hub")) { httpContext.Response.Headers["Access-Control-Allow-Origin"] = httpContext.Request.Headers["Origin"]; httpContext.Response.Headers["Access-Control-Allow-Credentials"] = "true"; } - return next(httpContext); + return _next(httpContext); } } public static class CorsMiddlewareExtensions { - // ReSharper disable once UnusedMethodReturnValue.Global - public static IApplicationBuilder UseCorsMiddleware(this IApplicationBuilder builder) => builder.UseMiddleware(); + public static void UseCorsMiddleware(this IApplicationBuilder builder) => builder.UseMiddleware(); } } diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index 1faf075e..f69433b8 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -1,54 +1,58 @@  - - netcoreapp5.0 - win7-x64 - UKSF.Api - Exe - win7-x64 - default - disable - - - 1701;1702;1705;1591 - full - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + netcoreapp5.0 + win7-x64 + UKSF.Api + Exe + win7-x64 + default + disable + + + + 1701;1702;1705;1591 + full + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/UKSF.Tests/Common/ITestCachedDataService.cs b/UKSF.Tests/Common/ITestCachedDataService.cs index e0077ff1..173703bb 100644 --- a/UKSF.Tests/Common/ITestCachedDataService.cs +++ b/UKSF.Tests/Common/ITestCachedDataService.cs @@ -1,4 +1,4 @@ -using UKSF.Api.Base.Context; +using UKSF.Api.Shared.Context; namespace UKSF.Tests.Common { public interface ITestCachedDataService : IDataService { } diff --git a/UKSF.Tests/Common/ITestDataService.cs b/UKSF.Tests/Common/ITestDataService.cs index d0bdfb32..e9cbe51d 100644 --- a/UKSF.Tests/Common/ITestDataService.cs +++ b/UKSF.Tests/Common/ITestDataService.cs @@ -1,4 +1,4 @@ -using UKSF.Api.Base.Context; +using UKSF.Api.Shared.Context; namespace UKSF.Tests.Common { public interface ITestDataService : IDataService { } diff --git a/UKSF.Tests/Common/TestCachedDataService.cs b/UKSF.Tests/Common/TestCachedDataService.cs index 18748cd2..43b4c23d 100644 --- a/UKSF.Tests/Common/TestCachedDataService.cs +++ b/UKSF.Tests/Common/TestCachedDataService.cs @@ -1,5 +1,6 @@ using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Tests.Common { public class TestCachedDataService : CachedDataService, ITestCachedDataService { diff --git a/UKSF.Tests/Common/TestDataService.cs b/UKSF.Tests/Common/TestDataService.cs index 28cbab42..7b26aa95 100644 --- a/UKSF.Tests/Common/TestDataService.cs +++ b/UKSF.Tests/Common/TestDataService.cs @@ -1,5 +1,6 @@ using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; namespace UKSF.Tests.Common { public class TestDataService : DataService, ITestDataService { diff --git a/UKSF.Tests/UKSF.Tests.csproj b/UKSF.Tests/UKSF.Tests.csproj index 7a84b303..72b80f83 100644 --- a/UKSF.Tests/UKSF.Tests.csproj +++ b/UKSF.Tests/UKSF.Tests.csproj @@ -2,7 +2,6 @@ netcoreapp5.0 - false @@ -28,14 +27,10 @@ - - - - diff --git a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs index 92330403..6a3c00d3 100644 --- a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using FluentAssertions; using MongoDB.Bson; -using UKSF.Api.Base.Extensions; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Extensions; using UKSF.Tests.Common; using Xunit; @@ -101,9 +101,9 @@ public void Should_detect_changes_for_hashset() { [Fact] public void Should_detect_changes_for_object_list() { string id = ObjectId.GenerateNewId().ToString(); - Account original = new Account { id = id, serviceRecord = new List { new ServiceRecordEntry { occurence = "Event" } } }; + Account original = new Account { id = id, serviceRecord = new List { new ServiceRecordEntry { Occurence = "Event" } } }; Account updated = new Account { - id = id, serviceRecord = new List { new ServiceRecordEntry { occurence = "Event" }, new ServiceRecordEntry { occurence = "Another Event" } } + id = id, serviceRecord = new List { new ServiceRecordEntry { Occurence = "Event" }, new ServiceRecordEntry { Occurence = "Another Event" } } }; string subject = original.Changes(updated); diff --git a/UKSF.Tests/Unit/Common/ClockTests.cs b/UKSF.Tests/Unit/Common/ClockTests.cs index 4a33e203..19f27aa1 100644 --- a/UKSF.Tests/Unit/Common/ClockTests.cs +++ b/UKSF.Tests/Unit/Common/ClockTests.cs @@ -1,6 +1,6 @@ using System; using FluentAssertions; -using UKSF.Api.Base.Services; +using UKSF.Api.Shared.Services; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs b/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs index 282de978..454a111c 100644 --- a/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using FluentAssertions; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Extensions; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs b/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs index 468212aa..418af135 100644 --- a/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs @@ -1,6 +1,6 @@ using FluentAssertions; using Newtonsoft.Json.Linq; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Extensions; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs b/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs index 9a4098e2..8a7c790f 100644 --- a/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs @@ -1,6 +1,6 @@ using System; using FluentAssertions; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Extensions; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs b/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs index e5cadef4..17a4c3a9 100644 --- a/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs +++ b/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs @@ -1,7 +1,7 @@ using FluentAssertions; using MongoDB.Bson; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs b/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs index 9e77d012..b2e7b63c 100644 --- a/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs +++ b/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs @@ -1,5 +1,5 @@ using FluentAssertions; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Extensions; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs b/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs index 9df560a9..cb84847b 100644 --- a/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using FluentAssertions; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Extensions; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs b/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs index 56129bf0..4fb1cd65 100644 --- a/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using FluentAssertions; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Extensions; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs index c3ee48dd..b3cf8734 100644 --- a/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs @@ -2,7 +2,7 @@ using System.Threading; using System.Threading.Tasks; using FluentAssertions; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Extensions; using Xunit; namespace UKSF.Tests.Unit.Common { diff --git a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs index 2ec13f93..1254a5c1 100644 --- a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs @@ -8,7 +8,7 @@ using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Models; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; +using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Admin { diff --git a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs index 0bfb96f2..6cba5b9b 100644 --- a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs @@ -7,8 +7,8 @@ using MongoDB.Driver; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs index 2f2aec71..71753957 100644 --- a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs @@ -8,8 +8,8 @@ using MongoDB.Driver; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs index 3a856a73..e4223c07 100644 --- a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs @@ -8,8 +8,8 @@ using MongoDB.Driver; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Data/DataServiceTests.cs b/UKSF.Tests/Unit/Data/DataServiceTests.cs index 4f15af7c..99e25488 100644 --- a/UKSF.Tests/Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceTests.cs @@ -8,8 +8,8 @@ using MongoDB.Driver; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using UKSF.Tests.Common; using Xunit; @@ -244,7 +244,7 @@ public async Task Should_update_item_with_set() { mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) - .Callback((string x, UpdateDefinition y) => subject = y); + .Callback((string _, UpdateDefinition y) => subject = y); await testDataService.Update(item1.id, "Name", "2"); @@ -260,7 +260,7 @@ public async Task Should_update_item_with_unset() { mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) - .Callback((string x, UpdateDefinition y) => subject = y); + .Callback((string _, UpdateDefinition y) => subject = y); await testDataService.Update(item1.id, "Name", null); diff --git a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs index 2f17a4ff..17f00686 100644 --- a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs @@ -4,7 +4,7 @@ using UKSF.Api.ArmaServer.DataContext; using UKSF.Api.ArmaServer.Models; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; +using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Game { diff --git a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs index a23e5fcb..7700e82e 100644 --- a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs @@ -5,10 +5,10 @@ using MongoDB.Driver; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs deleted file mode 100644 index aba7255e..00000000 --- a/UKSF.Tests/Unit/Data/Message/LogDataServiceTests.cs +++ /dev/null @@ -1,111 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using FluentAssertions; -using Moq; -using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models.Logging; -using Xunit; - -namespace UKSF.Tests.Unit.Data.Message { - public class LogDataServiceTests { - private readonly LogDataService logDataService; - private readonly List mockAuditCollection; - private readonly List mockBasicCollection; - private readonly List mockErrorCollection; - private readonly List mockLauncherCollection; - - public LogDataServiceTests() { - Mock> mockDataEventBus = new Mock>(); - Mock mockDataCollectionFactory = new Mock(); - - Mock> mockBasicDataCollection = new Mock>(); - Mock> mockAuditDataCollection = new Mock>(); - Mock> mockLauncherDataCollection = new Mock>(); - Mock> mockErrorDataCollection = new Mock>(); - - mockBasicCollection = new List(); - mockAuditCollection = new List(); - mockLauncherCollection = new List(); - mockErrorCollection = new List(); - - mockBasicDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockBasicCollection.Add(x)); - mockAuditDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockAuditCollection.Add(x)); - mockLauncherDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockLauncherCollection.Add(x)); - mockErrorDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask).Callback(x => mockErrorCollection.Add(x)); - - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("logs")).Returns(mockBasicDataCollection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("auditLogs")).Returns(mockAuditDataCollection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("launcherLogs")).Returns(mockLauncherDataCollection.Object); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection("errorLogs")).Returns(mockErrorDataCollection.Object); - - logDataService = new LogDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); - } - - [Fact] - public async Task ShouldUseAuditLogCollection() { - AuditLog logMessage = new AuditLog("server", "test"); - - await logDataService.Add(logMessage); - - mockBasicCollection.Should().BeEmpty(); - mockAuditCollection.Should().ContainSingle().And.Contain(logMessage); - mockLauncherCollection.Should().BeEmpty(); - mockErrorCollection.Should().BeEmpty(); - } - - [Fact] - public async Task ShouldUseCorrectCollection() { - BasicLog basicLogMessage = new BasicLog("test"); - AuditLog auditLogMessage = new AuditLog("server", "test"); - LauncherLog launcherLogMessage = new LauncherLog("1", "test"); - HttpErrorLog webLogMessage = new HttpErrorLog(); - - await logDataService.Add(basicLogMessage); - await logDataService.Add(auditLogMessage); - await logDataService.Add(launcherLogMessage); - await logDataService.Add(webLogMessage); - - mockBasicCollection.Should().ContainSingle().And.Contain(basicLogMessage); - mockAuditCollection.Should().ContainSingle().And.Contain(auditLogMessage); - mockLauncherCollection.Should().ContainSingle().And.Contain(launcherLogMessage); - mockErrorCollection.Should().ContainSingle().And.Contain(webLogMessage); - } - - [Fact] - public async Task ShouldUseErrorLogCollection() { - HttpErrorLog logMessage = new HttpErrorLog(); - - await logDataService.Add(logMessage); - - mockBasicCollection.Should().BeEmpty(); - mockAuditCollection.Should().BeEmpty(); - mockLauncherCollection.Should().BeEmpty(); - mockErrorCollection.Should().ContainSingle().And.Contain(logMessage); - } - - [Fact] - public async Task ShouldUseLauncherLogCollection() { - LauncherLog logMessage = new LauncherLog("1", "test"); - - await logDataService.Add(logMessage); - - mockBasicCollection.Should().BeEmpty(); - mockAuditCollection.Should().BeEmpty(); - mockLauncherCollection.Should().ContainSingle().And.Contain(logMessage); - mockErrorCollection.Should().BeEmpty(); - } - - [Fact] - public async Task ShouldUseLogCollection() { - BasicLog logMessage = new BasicLog("test"); - - await logDataService.Add(logMessage); - - mockBasicCollection.Should().ContainSingle().And.Contain(logMessage); - mockAuditCollection.Should().BeEmpty(); - mockLauncherCollection.Should().BeEmpty(); - mockErrorCollection.Should().BeEmpty(); - } - } -} diff --git a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs index e956f20f..dfa21656 100644 --- a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs @@ -5,10 +5,10 @@ using MongoDB.Driver; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services.Data; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Data.Modpack { diff --git a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs index 8fcba487..7dab20e7 100644 --- a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs @@ -2,9 +2,9 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services.Data; +using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Modpack { diff --git a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs index e51784e8..6f25e096 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs @@ -3,9 +3,9 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; +using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Operations { diff --git a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs index 3143fd55..870418fd 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs @@ -3,9 +3,9 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; +using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Operations { diff --git a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs index 6637b011..eee7d2f5 100644 --- a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -3,10 +3,9 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; -using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Personnel { diff --git a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs index 2881f3c7..24bfd5f7 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs @@ -2,9 +2,9 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Personnel { diff --git a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs index f7fad772..f6737ddd 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs @@ -2,9 +2,9 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Personnel { diff --git a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs index 16f97adc..08bc50dc 100644 --- a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs @@ -1,13 +1,14 @@ using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Launcher.Context; using UKSF.Api.Launcher.Models; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Data { diff --git a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index 0065e7a7..a6b26c3b 100644 --- a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -2,9 +2,9 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Events; using Xunit; using UksfUnit = UKSF.Api.Personnel.Models.Unit; diff --git a/UKSF.Tests/Unit/Events/EventBusTests.cs b/UKSF.Tests/Unit/Events/EventBusTests.cs index 58204d44..e058f824 100644 --- a/UKSF.Tests/Unit/Events/EventBusTests.cs +++ b/UKSF.Tests/Unit/Events/EventBusTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; +using UKSF.Api.Shared.Models; using UKSF.Tests.Common; using Xunit; diff --git a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs index 6d96a98c..9e218e1d 100644 --- a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs @@ -2,18 +2,18 @@ using Microsoft.AspNetCore.SignalR; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; using UKSF.Api.Personnel.EventHandlers; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Signalr.Clients; using UKSF.Api.Personnel.Signalr.Hubs; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { public class AccountEventHandlerTests { private readonly DataEventBus accountDataEventBus; - private readonly AccountEventHandler accountEventHandler; + private readonly AccountDataEventHandler _accountDataEventHandler; private readonly Mock> mockAccountHub; private readonly Mock mockLoggingService; private readonly DataEventBus unitsDataEventBus; @@ -29,7 +29,7 @@ public AccountEventHandlerTests() { mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); - accountEventHandler = new AccountEventHandler(accountDataEventBus, unitsDataEventBus, mockAccountHub.Object, mockLoggingService.Object); + _accountDataEventHandler = new AccountDataEventHandler(accountDataEventBus, unitsDataEventBus, mockAccountHub.Object, mockLoggingService.Object); } [Fact] @@ -42,7 +42,7 @@ public void ShouldLogOnException() { mockAccountClient.Setup(x => x.ReceiveAccountUpdate()).Throws(new Exception()); mockLoggingService.Setup(x => x.LogError(It.IsAny())); - accountEventHandler.Init(); + _accountDataEventHandler.Init(); accountDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); @@ -59,7 +59,7 @@ public void ShouldNotRunEvent() { mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockAccountClient.Object); mockAccountClient.Setup(x => x.ReceiveAccountUpdate()); - accountEventHandler.Init(); + _accountDataEventHandler.Init(); accountDataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); unitsDataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); @@ -76,7 +76,7 @@ public void ShouldRunEventOnUpdate() { mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockAccountClient.Object); mockAccountClient.Setup(x => x.ReceiveAccountUpdate()); - accountEventHandler.Init(); + _accountDataEventHandler.Init(); accountDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); diff --git a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs index 747cf3c8..81992a9e 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs @@ -2,12 +2,12 @@ using Microsoft.AspNetCore.SignalR; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; using UKSF.Api.Command.EventHandlers; using UKSF.Api.Command.Models; using UKSF.Api.Command.Signalr.Clients; using UKSF.Api.Command.Signalr.Hubs; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { diff --git a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs index b044f346..e6440e27 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs @@ -2,13 +2,13 @@ using Microsoft.AspNetCore.SignalR; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; using UKSF.Api.Personnel.EventHandlers; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Personnel.Signalr.Clients; using UKSF.Api.Personnel.Signalr.Hubs; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { diff --git a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs index 7e63d324..4dddc5a0 100644 --- a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs @@ -1,65 +1,83 @@ using System; using System.Reactive.Subjects; -using Microsoft.AspNetCore.SignalR; using Moq; -using UKSF.Api.Admin.Signalr.Clients; -using UKSF.Api.Admin.Signalr.Hubs; -using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; -using UKSF.Api.Base.Models.Logging; using UKSF.Api.EventHandlers; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { public class LogEventHandlerTests { - private readonly LoggerEventHandler logEventHandler; - private readonly Mock mockLogDataService; - private readonly Mock mockLogger; - private readonly Subject loggerSubject = new Subject(); + private readonly Subject _loggerSubject = new Subject(); + private readonly Mock _mockAuditLogDataService; + private readonly Mock _mockHttpErrorLogDataService; + private readonly Mock _mockLauncherLogDataService; + private readonly Mock _mockLogDataService; + private readonly Mock _mockObjectIdConversionService; public LogEventHandlerTests() { - mockLogDataService = new Mock(); - mockLogger = new Mock(); - Mock mockObjectIdConversionService = new Mock(); + _mockLogDataService = new Mock(); + _mockAuditLogDataService = new Mock(); + _mockHttpErrorLogDataService = new Mock(); + _mockLauncherLogDataService = new Mock(); + _mockObjectIdConversionService = new Mock(); - mockLogger.Setup(x => x.AsObservable()).Returns(loggerSubject); - mockObjectIdConversionService.Setup(x => x.ConvertObjectIds(It.IsAny())).Returns(x => x); + Mock mockLogger = new Mock(); + mockLogger.Setup(x => x.AsObservable()).Returns(_loggerSubject); + _mockObjectIdConversionService.Setup(x => x.ConvertObjectIds(It.IsAny())).Returns(x => x); - logEventHandler = new LoggerEventHandler(mockLogDataService.Object, mockLogger.Object, mockObjectIdConversionService.Object); + LoggerEventHandler logEventHandler = new LoggerEventHandler( + _mockLogDataService.Object, + _mockAuditLogDataService.Object, + _mockHttpErrorLogDataService.Object, + _mockLauncherLogDataService.Object, + mockLogger.Object, + _mockObjectIdConversionService.Object + ); logEventHandler.Init(); } [Fact] - public void ShouldLogOnException() { - mockLogger.Setup(x => x.LogError(It.IsAny())); + public void When_handling_a_basic_log() { + BasicLog basicLog = new BasicLog("test"); - loggerSubject.OnNext(new HttpErrorLog(new Exception())); + _loggerSubject.OnNext(basicLog); - mockLogDataService.Verify(x => x.Add(It.IsAny()), Times.Once); + _mockObjectIdConversionService.Verify(x => x.ConvertObjectIds("test"), Times.Once); + _mockLogDataService.Verify(x => x.Add(basicLog), Times.Once); } [Fact] - public void ShouldRunAddedOnAddWithCorrectType() { - Mock> mockHubClients = new Mock>(); - Mock mockClient = new Mock(); - - mockHubClients.Setup(x => x.All).Returns(mockClient.Object); - mockClient.Setup(x => x.ReceiveAuditLog(It.IsAny())); - mockClient.Setup(x => x.ReceiveLauncherLog(It.IsAny())); - mockClient.Setup(x => x.ReceiveErrorLog(It.IsAny())); - mockClient.Setup(x => x.ReceiveLog(It.IsAny())); - - loggerSubject.OnNext(new AuditLog("server", "test")); - loggerSubject.OnNext(new LauncherLog("1.0.0", "test")); - loggerSubject.OnNext(new HttpErrorLog(new Exception("test"))); - loggerSubject.OnNext(new BasicLog("test")); - - mockClient.Verify(x => x.ReceiveAuditLog(It.IsAny()), Times.Once); - mockClient.Verify(x => x.ReceiveLauncherLog(It.IsAny()), Times.Once); - mockClient.Verify(x => x.ReceiveErrorLog(It.IsAny()), Times.Once); - mockClient.Verify(x => x.ReceiveLog(It.IsAny()), Times.Once); + public void When_handling_a_launcher_log() { + LauncherLog launcherLog = new LauncherLog("1.0.0", "test"); + + _loggerSubject.OnNext(launcherLog); + + _mockObjectIdConversionService.Verify(x => x.ConvertObjectIds("test"), Times.Once); + _mockLauncherLogDataService.Verify(x => x.Add(launcherLog), Times.Once); + } + + [Fact] + public void When_handling_an_audit_log() { + AuditLog basicLog = new AuditLog("server", "test"); + + _loggerSubject.OnNext(basicLog); + + _mockObjectIdConversionService.Verify(x => x.ConvertObjectId("server"), Times.Once); + _mockObjectIdConversionService.Verify(x => x.ConvertObjectIds("test"), Times.Once); + _mockAuditLogDataService.Verify(x => x.Add(basicLog), Times.Once); + } + + [Fact] + public void When_handling_an_http_error_log() { + HttpErrorLog httpErrorLog = new HttpErrorLog(new Exception()); + + _loggerSubject.OnNext(httpErrorLog); + + _mockObjectIdConversionService.Verify(x => x.ConvertObjectIds("Exception of type 'System.Exception' was thrown."), Times.Once); + _mockHttpErrorLogDataService.Verify(x => x.Add(httpErrorLog), Times.Once); } } } diff --git a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs index 83d3e00c..bb91d900 100644 --- a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs @@ -3,12 +3,12 @@ using Microsoft.AspNetCore.SignalR; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; using UKSF.Api.Personnel.EventHandlers; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Signalr.Clients; using UKSF.Api.Personnel.Signalr.Hubs; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs index b9d6db3c..79a3f566 100644 --- a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -4,11 +4,11 @@ using System.Threading.Tasks; using FluentAssertions; using Moq; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using UKSF.Api.Teamspeak.EventHandlers; using UKSF.Api.Teamspeak.Models; using UKSF.Api.Teamspeak.Services; @@ -16,21 +16,21 @@ namespace UKSF.Tests.Unit.Events.Handlers { public class TeamspeakEventHandlerTests { - private readonly Mock mockAccountService; - private readonly Mock mockLoggingService; - private readonly Mock mockTeamspeakGroupService; - private readonly Mock mockTeamspeakService; - private readonly ISignalrEventBus signalrEventBus; - private readonly TeamspeakEventHandler teamspeakEventHandler; + private readonly Mock _mockAccountService; + private readonly Mock _mockLoggingService; + private readonly Mock _mockTeamspeakGroupService; + private readonly Mock _mockTeamspeakService; + private readonly ISignalrEventBus _signalrEventBus; + private readonly TeamspeakEventHandler _teamspeakEventHandler; public TeamspeakEventHandlerTests() { - signalrEventBus = new SignalrEventBus(); - mockTeamspeakService = new Mock(); - mockAccountService = new Mock(); - mockTeamspeakGroupService = new Mock(); - mockLoggingService = new Mock(); + _signalrEventBus = new SignalrEventBus(); + _mockTeamspeakService = new Mock(); + _mockAccountService = new Mock(); + _mockTeamspeakGroupService = new Mock(); + _mockLoggingService = new Mock(); - teamspeakEventHandler = new TeamspeakEventHandler(signalrEventBus, mockTeamspeakService.Object, mockAccountService.Object, mockTeamspeakGroupService.Object, mockLoggingService.Object); + _teamspeakEventHandler = new TeamspeakEventHandler(_signalrEventBus, _mockTeamspeakService.Object, _mockAccountService.Object, _mockTeamspeakGroupService.Object, _mockLoggingService.Object); } [Theory, InlineData(2), InlineData(-1)] @@ -40,36 +40,34 @@ public async Task ShouldGetNoAccountForNoMatchingIdsOrNull(double id) { Mock mockAccountDataService = new Mock(); mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockAccountCollection.FirstOrDefault(x)); - mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); - mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())).Returns(Task.CompletedTask); + _mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())).Returns(Task.CompletedTask); - teamspeakEventHandler.Init(); + _teamspeakEventHandler.Init(); - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); await Task.Delay(TimeSpan.FromSeconds(1)); - mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(null, new List { 5 }, 1), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(null, new List { 5 }, 1), Times.Once); } [Fact] public void LogOnException() { - mockLoggingService.Setup(x => x.LogError(It.IsAny())); + _teamspeakEventHandler.Init(); - teamspeakEventHandler.Init(); + _signalrEventBus.Send(new SignalrEventModel { procedure = (TeamspeakEventType) 9 }); - signalrEventBus.Send(new SignalrEventModel { procedure = (TeamspeakEventType) 9 }); - - mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); + _mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); } [Fact] public void ShouldCorrectlyParseClients() { HashSet subject = new HashSet(); - mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())).Callback((HashSet x) => subject = x); + _mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())).Callback((HashSet x) => subject = x); - teamspeakEventHandler.Init(); + _teamspeakEventHandler.Init(); - signalrEventBus.Send( + _signalrEventBus.Send( new SignalrEventModel { procedure = TeamspeakEventType.CLIENTS, args = "[{\"channelId\": 1, \"channelName\": \"Test Channel 1\", \"clientDbId\": 5, \"clientName\": \"Test Name 1\"}," + @@ -95,39 +93,39 @@ public async Task ShouldGetCorrectAccount() { Mock mockAccountDataService = new Mock(); mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockAccountCollection.FirstOrDefault(x)); - mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); - mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(account1, It.IsAny>(), 1)).Returns(Task.CompletedTask); + _mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(account1, It.IsAny>(), 1)).Returns(Task.CompletedTask); - teamspeakEventHandler.Init(); + _teamspeakEventHandler.Init(); - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); await Task.Delay(TimeSpan.FromSeconds(1)); - mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); } [Fact] public void ShouldNotRunEventOnEmpty() { - mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); - mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); + _mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); + _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); - teamspeakEventHandler.Init(); + _teamspeakEventHandler.Init(); - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.EMPTY }); + _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.EMPTY }); - mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Never); - mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny()), Times.Never); + _mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Never); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny()), Times.Never); } [Fact] public void ShouldNotRunUpdateClientsForNoClients() { - mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); + _mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); - teamspeakEventHandler.Init(); + _teamspeakEventHandler.Init(); - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENTS, args = "[]" }); + _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENTS, args = "[]" }); - mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Never); + _mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Never); } [Fact] @@ -136,15 +134,15 @@ public async Task ShouldRunClientGroupsUpdate() { Mock mockAccountDataService = new Mock(); mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); - mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); - mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(account, It.IsAny>(), 1)).Returns(Task.CompletedTask); + _mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(account, It.IsAny>(), 1)).Returns(Task.CompletedTask); - teamspeakEventHandler.Init(); + _teamspeakEventHandler.Init(); - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); await Task.Delay(TimeSpan.FromSeconds(1)); - mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5 }, 1), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5 }, 1), Times.Once); } [Fact] @@ -153,18 +151,18 @@ public async Task ShouldRunClientGroupsUpdateTwiceForTwoEventsWithDelay() { Mock mockAccountDataService = new Mock(); mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); - mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); - mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); + _mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); - teamspeakEventHandler.Init(); + _teamspeakEventHandler.Init(); - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); await Task.Delay(TimeSpan.FromSeconds(1)); - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); + _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); await Task.Delay(TimeSpan.FromSeconds(1)); - mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5 }, 1), Times.Once); - mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 10 }, 1), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5 }, 1), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 10 }, 1), Times.Once); } [Fact] @@ -175,17 +173,17 @@ public async Task ShouldRunSingleClientGroupsUpdateForEachClient() { Mock mockAccountDataService = new Mock(); mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.FirstOrDefault(x)); - mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); - mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); + _mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); - teamspeakEventHandler.Init(); + _teamspeakEventHandler.Init(); - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 2, \"serverGroupId\": 10}" }); + _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 2, \"serverGroupId\": 10}" }); await Task.Delay(TimeSpan.FromSeconds(2)); - mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); - mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account2, new List { 10 }, 2), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account2, new List { 10 }, 2), Times.Once); } [Fact] @@ -194,29 +192,29 @@ public async Task ShouldRunSingleClientGroupsUpdateForMultipleEventsWithOneClien Mock mockAccountDataService = new Mock(); mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); - mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); - mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); + _mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); - teamspeakEventHandler.Init(); + _teamspeakEventHandler.Init(); - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); - signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); + _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); await Task.Delay(TimeSpan.FromSeconds(2)); - mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5, 10 }, 1), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5, 10 }, 1), Times.Once); } [Fact] public void ShouldRunUpdateClients() { - mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); + _mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); - teamspeakEventHandler.Init(); + _teamspeakEventHandler.Init(); - signalrEventBus.Send( + _signalrEventBus.Send( new SignalrEventModel { procedure = TeamspeakEventType.CLIENTS, args = "[{\"channelId\": 1, \"channelName\": \"Test Channel\", \"clientDbId\": 5, \"clientName\": \"Test Name\"}]" } ); - mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Once); + _mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Once); } } } diff --git a/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs index 7851d2be..247647a6 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs @@ -1,6 +1,6 @@ using System; using FluentAssertions; -using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Models.Message.Logging { diff --git a/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs index 6214dfd5..78af5e3d 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs @@ -1,5 +1,5 @@ using FluentAssertions; -using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Models.Message.Logging { diff --git a/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs index 6e45ecd1..4779bae7 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs @@ -1,6 +1,6 @@ using System; using FluentAssertions; -using UKSF.Api.Base.Models.Logging; +using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Models.Message.Logging { diff --git a/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs index c382c277..2b388841 100644 --- a/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs @@ -4,7 +4,7 @@ using FluentAssertions; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Models; -using UKSF.Api.Base.Extensions; +using UKSF.Api.Shared.Extensions; using Xunit; namespace UKSF.Tests.Unit.Services.Admin { diff --git a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs index 352e2824..0076c6ee 100644 --- a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs @@ -18,7 +18,7 @@ public void ShouldCopyAccountCorrectly() { lastname = "McTest", membershipState = MembershipState.MEMBER, teamspeakIdentities = new HashSet {4, 4}, - serviceRecord = new List {new ServiceRecordEntry {occurence = "Test", timestamp = timestamp}}, + serviceRecord = new List {new ServiceRecordEntry {Occurence = "Test", Timestamp = timestamp}}, rolePreferences = new List {"Aviation"}, militaryExperience = false }; @@ -30,7 +30,7 @@ public void ShouldCopyAccountCorrectly() { subject.lastname.Should().Be("McTest"); subject.membershipState.Should().Be(MembershipState.MEMBER); subject.teamspeakIdentities.Should().NotBeEmpty().And.HaveCount(1).And.ContainInOrder(new[] {4}); - subject.serviceRecord.Should().NotBeEmpty().And.HaveCount(1).And.OnlyContain(x => x.occurence == "Test" && x.timestamp == timestamp); + subject.serviceRecord.Should().NotBeEmpty().And.HaveCount(1).And.OnlyContain(x => x.Occurence == "Test" && x.Timestamp == timestamp); subject.rolePreferences.Should().Contain("Aviation"); subject.militaryExperience.Should().BeFalse(); } diff --git a/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs b/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs index 914186a8..36127835 100644 --- a/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs @@ -9,29 +9,28 @@ namespace UKSF.Tests.Unit.Services.Common { public class ObjectIdConversionServiceTests { - private readonly Mock mockDisplayNameService; - private readonly Mock mockUnitsDataService; - private readonly Mock mockUnitsService; - private readonly ObjectIdConversionService objectIdConversionService; + private readonly Mock _mockDisplayNameService; + private readonly Mock _mockUnitsDataService; + private readonly ObjectIdConversionService _objectIdConversionService; public ObjectIdConversionServiceTests() { - mockDisplayNameService = new Mock(); - mockUnitsService = new Mock(); - mockUnitsDataService = new Mock(); + _mockDisplayNameService = new Mock(); + _mockUnitsDataService = new Mock(); - mockUnitsService.Setup(x => x.Data).Returns(mockUnitsDataService.Object); - objectIdConversionService = new ObjectIdConversionService(mockDisplayNameService.Object, mockUnitsService.Object); + Mock mockUnitsService = new Mock(); + mockUnitsService.Setup(x => x.Data).Returns(_mockUnitsDataService.Object); + _objectIdConversionService = new ObjectIdConversionService(_mockDisplayNameService.Object, mockUnitsService.Object); } [Theory, InlineData("5e39336e1b92ee2d14b7fe08", "Maj.Bridgford.A"), InlineData("5e39336e1b92ee2d14b7fe08, 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A, Cpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe085e3935db1b92ee2d14b7fe09", "Maj.Bridgford.ACpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe08 has requested all the things for 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A has requested all the things for Cpl.Carr.C")] public void ShouldConvertNameObjectIds(string input, string expected) { - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); - mockDisplayNameService.Setup(x => x.GetDisplayName("5e39336e1b92ee2d14b7fe08")).Returns("Maj.Bridgford.A"); - mockDisplayNameService.Setup(x => x.GetDisplayName("5e3935db1b92ee2d14b7fe09")).Returns("Cpl.Carr.C"); + _mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); + _mockDisplayNameService.Setup(x => x.GetDisplayName("5e39336e1b92ee2d14b7fe08")).Returns("Maj.Bridgford.A"); + _mockDisplayNameService.Setup(x => x.GetDisplayName("5e3935db1b92ee2d14b7fe09")).Returns("Cpl.Carr.C"); - string subject = objectIdConversionService.ConvertObjectIds(input); + string subject = _objectIdConversionService.ConvertObjectIds(input); subject.Should().Be(expected); } @@ -42,10 +41,10 @@ public void ShouldConvertCorrectUnitWithPredicate() { Api.Personnel.Models.Unit unit2 = new Api.Personnel.Models.Unit { name = "656 Squadron" }; List collection = new List { unit1, unit2 }; - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => collection.FirstOrDefault(x)); - mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); + _mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => collection.FirstOrDefault(x)); + _mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); - string subject = objectIdConversionService.ConvertObjectIds(unit1.id); + string subject = _objectIdConversionService.ConvertObjectIds(unit1.id); subject.Should().Be("7 Squadron"); } @@ -56,10 +55,10 @@ public void ShouldConvertUnitObjectIds() { const string EXPECTED = "7 Squadron"; Api.Personnel.Models.Unit unit = new Api.Personnel.Models.Unit { name = EXPECTED, id = INPUT }; - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(unit); - mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); + _mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(unit); + _mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); - string subject = objectIdConversionService.ConvertObjectIds(INPUT); + string subject = _objectIdConversionService.ConvertObjectIds(INPUT); subject.Should().Be(EXPECTED); } @@ -69,17 +68,17 @@ public void ShouldDoNothingToTextWhenNameOrUnitNotFound() { const string INPUT = "5e39336e1b92ee2d14b7fe08"; const string EXPECTED = "5e39336e1b92ee2d14b7fe08"; - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); - mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); + _mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); + _mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); - string subject = objectIdConversionService.ConvertObjectIds(INPUT); + string subject = _objectIdConversionService.ConvertObjectIds(INPUT); subject.Should().Be(EXPECTED); } [Fact] public void ShouldReturnEmpty() { - string subject = objectIdConversionService.ConvertObjectIds(""); + string subject = _objectIdConversionService.ConvertObjectIds(""); subject.Should().Be(string.Empty); } diff --git a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs index 8852dfaa..447c3415 100644 --- a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs @@ -6,7 +6,6 @@ using UKSF.Api.Command.Context; using UKSF.Api.Command.Services; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs index c912be07..6c59d922 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs @@ -1,5 +1,5 @@ using FluentAssertions; -using UKSF.Api.Base; +using UKSF.Api.Shared; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel { diff --git a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs index cf1b640a..b880d497 100644 --- a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs @@ -6,11 +6,11 @@ using MongoDB.Bson; using Moq; using Newtonsoft.Json; -using UKSF.Api.Base.Models; -using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Models; +using UKSF.Api.Shared.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Utility { diff --git a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs index 30552a76..7a9a2bd0 100644 --- a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs @@ -8,22 +8,18 @@ namespace UKSF.Tests.Unit.Services.Utility { public class DataCacheServiceTests { [Fact] - public void ShouldCallDataServiceRefresh() { + public void When_refreshing_data_caches() { Mock mockAccountDataService = new Mock(); Mock mockRanksDataService = new Mock(); Mock mockRolesDataService = new Mock(); - mockAccountDataService.Setup(x => x.Refresh()); - mockRanksDataService.Setup(x => x.Refresh()); - mockRolesDataService.Setup(x => x.Refresh()); - - IServiceProvider serviceProvider = new ServiceCollection().AddTransient(_ => mockAccountDataService.Object) - .AddTransient(_ => mockRanksDataService.Object) - .AddTransient(_ => mockRolesDataService.Object) + IServiceProvider serviceProvider = new ServiceCollection().AddSingleton(_ => mockAccountDataService.Object) + .AddSingleton(_ => mockRanksDataService.Object) + .AddSingleton(_ => mockRolesDataService.Object) .BuildServiceProvider(); DataCacheService dataCacheService = new DataCacheService(serviceProvider); - dataCacheService.InvalidateCachedData(); + dataCacheService.RefreshCachedData(); mockAccountDataService.Verify(x => x.Refresh(), Times.Once); mockRanksDataService.Verify(x => x.Refresh(), Times.Once); diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs index e91a572f..5f233563 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs @@ -3,8 +3,8 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.ScheduledActions; -using UKSF.Api.Base.Services; using UKSF.Api.Personnel.ScheduledActions; +using UKSF.Api.Shared.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Utility { diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs index b9158228..c5e25eaf 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs @@ -9,44 +9,44 @@ namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { public class DeleteExpiredConfirmationCodeActionTests { - private readonly Mock mockConfirmationCodeDataService; - private readonly Mock mockConfirmationCodeService; - private IActionDeleteExpiredConfirmationCode actionDeleteExpiredConfirmationCode; + private readonly Mock _mockConfirmationCodeDataService; + private readonly Mock _mockConfirmationCodeService; + private IActionDeleteExpiredConfirmationCode _actionDeleteExpiredConfirmationCode; public DeleteExpiredConfirmationCodeActionTests() { - mockConfirmationCodeDataService = new Mock(); - mockConfirmationCodeService = new Mock(); + _mockConfirmationCodeDataService = new Mock(); + _mockConfirmationCodeService = new Mock(); - mockConfirmationCodeService.Setup(x => x.Data).Returns(mockConfirmationCodeDataService.Object); + _mockConfirmationCodeService.Setup(x => x.Data).Returns(_mockConfirmationCodeDataService.Object); } [Fact] - public void ShouldDeleteCorrectId() { + public void When_deleting_confirmation_code() { string id = ObjectId.GenerateNewId().ToString(); - actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(mockConfirmationCodeService.Object); + _actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(_mockConfirmationCodeService.Object); - actionDeleteExpiredConfirmationCode.Run(id); + _actionDeleteExpiredConfirmationCode.Run(id); - mockConfirmationCodeDataService.Verify(x => x.Delete(id), Times.Once); + _mockConfirmationCodeDataService.Verify(x => x.Delete(id), Times.Once); } [Fact] - public void ShouldReturnActionName() { - actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(mockConfirmationCodeService.Object); + public void When_deleting_confirmation_code_with_no_id() { + _actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(_mockConfirmationCodeService.Object); - string subject = actionDeleteExpiredConfirmationCode.Name; + Action act = () => _actionDeleteExpiredConfirmationCode.Run(); - subject.Should().Be("DeleteExpiredConfirmationCodeAction"); + act.Should().Throw(); } [Fact] - public void ShouldThrowForNoId() { - actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(mockConfirmationCodeService.Object); + public void When_getting_action_name() { + _actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(_mockConfirmationCodeService.Object); - Action act = () => actionDeleteExpiredConfirmationCode.Run(); + string subject = _actionDeleteExpiredConfirmationCode.Name; - act.Should().Throw(); + subject.Should().Be("ActionDeleteExpiredConfirmationCode"); } } } diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs index 39c65698..1a6ab94b 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs @@ -1,98 +1,75 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; +using System.Threading.Tasks; using FluentAssertions; +using Microsoft.Extensions.Hosting; using Moq; using UKSF.Api.Admin.ScheduledActions; -using UKSF.Api.ArmaServer.Models; -using UKSF.Api.Base.Context; -using UKSF.Api.Base.Models.Logging; -using UKSF.Api.Base.Services; -using UKSF.Api.Modpack.Models; -using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Models; +using UKSF.Api.Shared.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { public class PruneDataActionTests { + private readonly IActionPruneLogs _actionPruneLogs; private readonly Mock _mockAuditLogDataService; private readonly Mock _mockHttpErrorLogDataService; private readonly Mock _mockLogDataService; - private readonly Mock _mockClock; - private readonly Mock _mockSchedulerService; - private IActionPruneLogs _actionPruneLogs; + private readonly DateTime _now; public PruneDataActionTests() { _mockLogDataService = new Mock(); _mockAuditLogDataService = new Mock(); _mockHttpErrorLogDataService = new Mock(); - _mockClock = new Mock(); - _mockSchedulerService = new Mock(); + Mock mockClock = new Mock(); + Mock mockHostEnvironment = new Mock(); + Mock mockSchedulerService = new Mock(); - _actionPruneLogs = new ActionPruneLogs(_mockLogDataService.Object, _mockAuditLogDataService.Object, _mockHttpErrorLogDataService.Object, _mockSchedulerService.Object, _mockClock.Object); + _now = new DateTime(2020, 11, 14); + mockClock.Setup(x => x.UtcNow()).Returns(_now); + + _actionPruneLogs = new ActionPruneLogs( + _mockLogDataService.Object, + _mockAuditLogDataService.Object, + _mockHttpErrorLogDataService.Object, + mockSchedulerService.Object, + mockHostEnvironment.Object, + mockClock.Object + ); } [Fact] - public void ShouldRemoveOldLogsAndNotifications() { - List mockBasicLogMessageCollection = new List { - new BasicLog("test1"), new BasicLog("test2") { timestamp = DateTime.Now.AddDays(-10) }, new BasicLog("test3") { timestamp = DateTime.Now.AddDays(-6) } - }; - List mockWebLogMessageCollection = new List { - new HttpErrorLog(new Exception("error1")), - new HttpErrorLog(new Exception("error2")) { timestamp = DateTime.Now.AddDays(-10) }, - new HttpErrorLog(new Exception("error3")) { timestamp = DateTime.Now.AddDays(-6) } - }; - List mockAuditLogMessageCollection = new List { - new AuditLog("server", "audit1"), - new AuditLog("server", "audit2") { timestamp = DateTime.Now.AddDays(-100) }, - new AuditLog("server", "audit3") { timestamp = DateTime.Now.AddMonths(-2) } - }; - List mockNotificationCollection = new List { - new Notification { message = "notification1" }, - new Notification { message = "notification2", timestamp = DateTime.Now.AddDays(-40) }, - new Notification { message = "notification3", timestamp = DateTime.Now.AddDays(-25) } - }; - List mockModpackBuildCollection = new List { - new ModpackBuild { Environment = GameEnvironment.DEV, BuildNumber = 1, Version = "5.0.0" }, - new ModpackBuild { Environment = GameEnvironment.RC, BuildNumber = 1, Version = "5.18.0" }, - new ModpackBuild { Environment = GameEnvironment.RELEASE, BuildNumber = 2, Version = "5.18.0" }, - new ModpackBuild { Environment = GameEnvironment.DEV, BuildNumber = 150, Version = "5.19.0" } - }; + public void When_getting_action_name() { + string subject = _actionPruneLogs.Name; - Mock> mockBasicLogMessageDataColection = new Mock>(); - Mock> mockWebLogMessageDataColection = new Mock>(); - Mock> mockAuditLogMessageDataColection = new Mock>(); - Mock> mockNotificationDataColection = new Mock>(); - Mock> mockModpackBuildDataColection = new Mock>(); + subject.Should().Be("ActionPruneLogs"); + } - mockModpackBuildDataColection.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockModpackBuildCollection.Where(x)); + [Fact] + public void When_pruning_logs() { + List basicLogs = new List { new BasicLog("test1") { timestamp = _now.AddDays(-8) }, new BasicLog("test2") { timestamp = _now.AddDays(-6) } }; + List auditLogs = new List { new AuditLog("server", "audit1") { timestamp = _now.AddMonths(-4) }, new AuditLog("server", "audit2") { timestamp = _now.AddMonths(-2) } }; + List httpErrorLogs = new List { + new HttpErrorLog(new Exception("error1")) { timestamp = _now.AddDays(-8) }, new HttpErrorLog(new Exception("error2")) { timestamp = _now.AddDays(-6) } + }; - mockBasicLogMessageDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) - .Callback>>(x => mockBasicLogMessageCollection.RemoveAll(y => x.Compile()(y))); - mockWebLogMessageDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) - .Callback>>(x => mockWebLogMessageCollection.RemoveAll(y => x.Compile()(y))); - mockAuditLogMessageDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) - .Callback>>(x => mockAuditLogMessageCollection.RemoveAll(y => x.Compile()(y))); - mockNotificationDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) - .Callback>>(x => mockNotificationCollection.RemoveAll(y => x.Compile()(y))); - mockModpackBuildDataColection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) - .Callback>>(x => mockModpackBuildCollection.RemoveAll(y => x.Compile()(y))); + _mockLogDataService.Setup(x => x.DeleteMany(It.IsAny>>())) + .Returns(Task.CompletedTask) + .Callback>>(x => basicLogs.RemoveAll(y => x.Compile()(y))); + _mockAuditLogDataService.Setup(x => x.DeleteMany(It.IsAny>>())) + .Returns(Task.CompletedTask) + .Callback>>(x => auditLogs.RemoveAll(y => x.Compile()(y))); + _mockHttpErrorLogDataService.Setup(x => x.DeleteMany(It.IsAny>>())) + .Returns(Task.CompletedTask) + .Callback>>(x => httpErrorLogs.RemoveAll(y => x.Compile()(y))); _actionPruneLogs.Run(); - mockBasicLogMessageCollection.Should().NotContain(x => x.message == "test2"); - mockWebLogMessageCollection.Should().NotContain(x => x.message == "error2"); - mockAuditLogMessageCollection.Should().NotContain(x => x.message == "audit2"); - mockNotificationCollection.Should().NotContain(x => x.message == "notification2"); - mockModpackBuildCollection.Should().NotContain(x => x.Version == "5.0.0"); - mockModpackBuildCollection.Should().NotContain(x => x.Version == "5.18.0"); - } - - [Fact] - public void ShouldReturnActionName() { - string subject = _actionPruneLogs.Name; - - subject.Should().Be("PruneDataAction"); + basicLogs.Should().NotContain(x => x.message == "test1"); + auditLogs.Should().NotContain(x => x.message == "audit1"); + httpErrorLogs.Should().NotContain(x => x.message == "error1"); } } } diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs index a8391b4d..91aebff0 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs @@ -1,39 +1,37 @@ using FluentAssertions; +using Microsoft.Extensions.Hosting; using Moq; -using UKSF.Api.Base.Services; +using UKSF.Api.Shared.Services; using UKSF.Api.Teamspeak.ScheduledActions; using UKSF.Api.Teamspeak.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { public class TeamspeakSnapshotActionTests { - private readonly Mock _mockClock; - private readonly Mock _mockSchedulerService; - private readonly Mock mockTeamspeakService; - private IActionTeamspeakSnapshot actionTeamspeakSnapshot; + private readonly IActionTeamspeakSnapshot _actionTeamspeakSnapshot; + private readonly Mock _mockTeamspeakService; public TeamspeakSnapshotActionTests() { - mockTeamspeakService = new Mock(); - _mockClock = new Mock(); - _mockSchedulerService = new Mock(); + _mockTeamspeakService = new Mock(); + Mock mockClock = new Mock(); + Mock mockSchedulerService = new Mock(); + Mock mockHostEnvironment = new Mock(); + + _actionTeamspeakSnapshot = new ActionTeamspeakSnapshot(_mockTeamspeakService.Object, mockSchedulerService.Object, mockHostEnvironment.Object, mockClock.Object); } [Fact] - public void ShouldReturnActionName() { - actionTeamspeakSnapshot = new ActionTeamspeakSnapshot(mockTeamspeakService.Object, _mockSchedulerService.Object, _mockClock.Object); - - string subject = actionTeamspeakSnapshot.Name; + public void When_getting_action_name() { + string subject = _actionTeamspeakSnapshot.Name; - subject.Should().Be("TeamspeakSnapshotAction"); + subject.Should().Be("ActionTeamspeakSnapshot"); } [Fact] - public void ShouldRunSnapshot() { - actionTeamspeakSnapshot = new ActionTeamspeakSnapshot(mockTeamspeakService.Object, _mockSchedulerService.Object, _mockClock.Object); - - actionTeamspeakSnapshot.Run(); + public void When_running_snapshot() { + _actionTeamspeakSnapshot.Run(); - mockTeamspeakService.Verify(x => x.StoreTeamspeakServerSnapshot(), Times.Once); + _mockTeamspeakService.Verify(x => x.StoreTeamspeakServerSnapshot(), Times.Once); } } } diff --git a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs index 0380cfed..2814a661 100644 --- a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs @@ -3,9 +3,9 @@ using FluentAssertions; using Microsoft.AspNetCore.Http; using Moq; -using UKSF.Api.Base; -using UKSF.Api.Base.Services; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Utility { From 0c2851a336e4b3ab65565ef2d1892468be25b984 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 21 Nov 2020 17:22:36 +0000 Subject: [PATCH 286/369] Large refactor, rename data services to contexts --- Tests/Tests.csproj | 7 + .../UKSF.Api.Admin.Tests.csproj | 22 + .../UKSF.Api.ArmaMissions.Tests.csproj | 22 + .../UKSF.Api.ArmaServer.Tests.csproj | 22 + .../UKSF.Api.Auth.Tests.csproj | 22 + .../DependencyInjectionTests.cs | 23 + .../UKSF.Api.Base.Tests.csproj | 30 + .../UKSF.Api.Command.Tests.csproj | 22 + ...UKSF.Api.Integrations.Discord.Tests.csproj | 22 + ...SF.Api.Integrations.Instagram.Tests.csproj | 22 + .../UKSF.Api.Integrations.Teamspeak.csproj | 22 + .../UKSF.Api.Launcher.Tests.csproj | 22 + .../UKSF.Api.Modpack.Tests.csproj | 22 + .../UKSF.Api.Personnel.Tests.csproj | 22 + .../DependencyInjectionTests.cs | 75 +++ .../UKSF.Api.Shared.Tests.csproj | 27 + .../DependencyInjectionTestsBase.cs | 16 + .../ITestCachedDataService.cs | 5 + .../UKSF.Api.Tests.Common/ITestDataService.cs | 5 + .../TestCachedContext.cs | 13 + .../TestComplexDataModel.cs | 6 +- .../TestConfigurationProvider.cs | 7 + Tests/UKSF.Api.Tests.Common/TestContext.cs | 13 + Tests/UKSF.Api.Tests.Common/TestDataModel.cs | 10 + Tests/UKSF.Api.Tests.Common/TestUtilities.cs | 13 + .../UKSF.Api.Tests.Common.csproj | 35 ++ Tests/UKSF.Api.Tests.Common/appsettings.json | 23 + Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj | 22 + UKSF.Api.Admin/ApiAdminExtensions.cs | 2 +- ...blesDataService.cs => VariablesContext.cs} | 22 +- UKSF.Api.Admin/Controllers/DataController.cs | 6 +- UKSF.Api.Admin/Controllers/DebugController.cs | 25 +- .../Controllers/VariablesController.cs | 40 +- .../Controllers/VersionController.cs | 16 +- .../EventHandlers/LogEventHandler.cs | 26 +- .../Extensions/VariablesExtensions.cs | 6 +- UKSF.Api.Admin/Models/VariableItem.cs | 6 +- .../ScheduledActions/ActionPruneLogs.cs | 29 +- UKSF.Api.Admin/Services/DataCacheService.cs | 2 +- UKSF.Api.Admin/Services/VariablesService.cs | 11 +- UKSF.Api.ArmaMissions/Models/Mission.cs | 26 +- UKSF.Api.ArmaMissions/Models/MissionEntity.cs | 4 +- .../Models/MissionEntityItem.cs | 16 +- .../Models/MissionPatchData.cs | 14 +- .../Models/MissionPatchingReport.cs | 18 +- .../Models/MissionPatchingResult.cs | 6 +- UKSF.Api.ArmaMissions/Models/MissionPlayer.cs | 10 +- UKSF.Api.ArmaMissions/Models/MissionUnit.cs | 8 +- .../Services/MissionDataResolver.cs | 64 +-- .../Services/MissionEntityHelper.cs | 38 +- .../Services/MissionEntityItemHelper.cs | 180 +++--- .../Services/MissionPatchDataService.cs | 79 +-- .../Services/MissionPatchingService.cs | 20 +- .../Services/MissionService.cs | 82 +-- .../Services/MissionUtilities.cs | 4 +- .../ApiArmaServerExtensions.cs | 2 +- .../Controllers/GameServersController.cs | 214 +++---- .../DataContext/GameServersContext.cs | 20 + .../DataContext/GameServersDataService.cs | 20 - UKSF.Api.ArmaServer/Models/GameServer.cs | 54 +- UKSF.Api.ArmaServer/Models/GameServerMod.cs | 10 +- UKSF.Api.ArmaServer/Models/MissionFile.cs | 12 +- .../Services/GameServerHelpers.cs | 51 +- .../Services/GameServersService.cs | 117 ++-- UKSF.Api.ArmaServer/Services/ServerService.cs | 6 +- .../Controllers/ConfirmationCodeReceiver.cs | 13 +- UKSF.Api.Auth/Controllers/LoginController.cs | 14 +- .../Controllers/PasswordResetController.cs | 27 +- UKSF.Api.Auth/Services/LoginService.cs | 22 +- UKSF.Api.Auth/Services/PermissionsService.cs | 51 +- UKSF.Api.Auth/UKSF.Api.Auth.csproj | 10 +- UKSF.Api.Base/ApiBaseExtensions.cs | 2 +- UKSF.Api.Base/Context/DataBackedService.cs | 13 - .../Context/DataCollectionFactory.cs | 19 - UKSF.Api.Base/Context/MongoClientFactory.cs | 2 +- .../{DataCollection.cs => MongoCollection.cs} | 24 +- .../Context/MongoCollectionFactory.cs | 19 + ...DataServiceBase.cs => MongoContextBase.cs} | 40 +- UKSF.Api.Base/Events/EventBus.cs | 2 +- .../{DatabaseObject.cs => MongoObject.cs} | 4 +- UKSF.Api.Base/UKSF.Api.Base.csproj | 5 +- UKSF.Api.Command/ApiCommandExtensions.cs | 13 +- .../Context/CommandRequestArchiveContext.cs | 19 + .../CommandRequestArchiveDataService.cs | 19 - .../Context/CommandRequestContext.cs | 12 + .../Context/CommandRequestDataService.cs | 12 - UKSF.Api.Command/Context/DischargeContext.cs | 20 + .../Context/DischargeDataService.cs | 20 - UKSF.Api.Command/Context/LoaContext.cs | 12 + UKSF.Api.Command/Context/LoaDataService.cs | 12 - ...ataService.cs => OperationOrderContext.cs} | 6 +- ...taService.cs => OperationReportContext.cs} | 6 +- .../Controllers/CommandRequestsController.cs | 44 +- .../CommandRequestsCreationController.cs | 40 +- .../Controllers/DischargesController.cs | 50 +- .../Controllers/OperationOrderController.cs | 13 +- .../Controllers/OperationReportController.cs | 15 +- .../CommandRequestEventHandler.cs | 2 +- UKSF.Api.Command/Models/CommandRequest.cs | 4 +- UKSF.Api.Command/Models/CommandRequestLoa.cs | 2 +- UKSF.Api.Command/Models/Discharge.cs | 26 +- UKSF.Api.Command/Models/Opord.cs | 2 +- UKSF.Api.Command/Models/Oprep.cs | 2 +- .../Services/ChainOfCommandService.cs | 53 +- .../CommandRequestCompletionService.cs | 193 ++++--- .../Services/CommandRequestService.cs | 71 +-- UKSF.Api.Command/Services/DischargeService.cs | 10 - UKSF.Api.Command/Services/LoaService.cs | 35 +- .../Services/OperationOrderService.cs | 13 +- .../Services/OperationReportService.cs | 15 +- .../Controllers/InstagramController.cs | 16 - .../Models/InstagramImage.cs | 15 - .../Services/DiscordService.cs | 203 ++++--- .../ApiIntegrationInstagramExtensions.cs | 6 +- .../Controllers/InstagramController.cs | 16 + .../Models/InstagramImage.cs | 15 + .../ScheduledActions/ActionInstagramImages.cs | 11 +- .../ScheduledActions/ActionInstagramToken.cs | 11 +- .../Services/InstagramService.cs | 67 +-- .../UKSF.Api.Integrations.Instagram.csproj | 0 .../Controllers/OperationsController.cs | 34 +- .../Controllers/TeamspeakController.cs | 35 +- .../EventHandlers/TeamspeakEventHandler.cs | 32 +- .../Models/Operation.cs | 16 +- .../Models/TeamspeakClient.cs | 8 +- .../Models/TeamspeakGroupProcedure.cs | 4 +- .../Models/TeamspeakServerGroupUpdate.cs | 6 +- .../Models/TeamspeakServerSnapshot.cs | 4 +- .../ActionTeamspeakSnapshot.cs | 7 +- .../Services/TeamspeakGroupService.cs | 75 +-- .../Services/TeamspeakManagerService.cs | 36 +- .../Services/TeamspeakService.cs | 39 +- .../Signalr/Hubs/TeamspeakHub.cs | 6 +- UKSF.Api.Launcher/ApiLauncherExtensions.cs | 2 +- .../Context/LauncherFileContext.cs | 12 + .../Context/LauncherFileDataService.cs | 12 - .../Controllers/LauncherController.cs | 12 +- UKSF.Api.Launcher/Models/LauncherFile.cs | 6 +- .../Services/LauncherFileService.cs | 47 +- .../UKSF.Api.Models.csproj.DotSettings | 1 + UKSF.Api.Modpack/ApiModpackExtensions.cs | 8 +- .../BuildsContext.cs} | 28 +- .../ReleasesContext.cs} | 8 +- .../Controllers/IssueController.cs | 10 +- .../EventHandlers/BuildsEventHandler.cs | 12 +- UKSF.Api.Modpack/Models/GithubCommit.cs | 2 +- UKSF.Api.Modpack/Models/ModpackBuild.cs | 10 +- .../Models/ModpackBuildQueueItem.cs | 2 +- UKSF.Api.Modpack/Models/ModpackBuildStep.cs | 2 +- .../Models/ModpackBuildStepLogItem.cs | 2 +- UKSF.Api.Modpack/Models/ModpackRelease.cs | 2 +- UKSF.Api.Modpack/Models/NewBuild.cs | 2 +- .../ScheduledActions/ActionPruneBuilds.cs | 21 +- .../BuildProcess/BuildProcessHelper.cs | 12 +- .../BuildProcess/BuildProcessorService.cs | 2 +- .../BuildProcess/BuildQueueService.cs | 18 +- .../Services/BuildProcess/BuildStepService.cs | 10 +- .../Services/BuildProcess/StepLogger.cs | 2 +- .../Services/BuildProcess/Steps/BuildStep.cs | 4 +- .../Steps/BuildSteps/BuildStepExtensions.cs | 6 +- .../Steps/BuildSteps/BuildStepKeys.cs | 6 +- .../Steps/BuildSteps/BuildStepPrep.cs | 2 +- .../BuildSteps/BuildStepSignDependencies.cs | 14 +- .../Steps/BuildSteps/BuildStepSources.cs | 8 +- .../BuildSteps/Mods/BuildStepBuildAce.cs | 8 +- .../BuildSteps/Mods/BuildStepBuildAcre.cs | 11 +- .../BuildSteps/Mods/BuildStepBuildF35.cs | 6 +- .../BuildSteps/Mods/BuildStepBuildModpack.cs | 2 +- .../Steps/Common/BuildStepBuildRepo.cs | 2 +- .../Steps/Common/BuildStepCbaSettings.cs | 2 +- .../Steps/Common/BuildStepClean.cs | 2 +- .../Steps/Common/BuildStepNotify.cs | 2 +- .../BuildProcess/Steps/FileBuildStep.cs | 22 +- UKSF.Api.Modpack/Services/BuildsService.cs | 56 +- UKSF.Api.Modpack/Services/GithubService.cs | 10 +- UKSF.Api.Modpack/Services/ModpackService.cs | 31 +- UKSF.Api.Modpack/Services/ReleaseService.cs | 33 +- UKSF.Api.Personnel/ApiPersonnelExtensions.cs | 12 +- UKSF.Api.Personnel/Context/AccountContext.cs | 12 + .../Context/AccountDataService.cs | 12 - ...DataService.cs => CommentThreadContext.cs} | 8 +- .../Context/ConfirmationCodeContext.cs | 13 + .../Context/ConfirmationCodeDataService.cs | 12 - .../Context/NotificationsContext.cs | 12 + .../Context/NotificationsDataService.cs | 12 - .../{RanksDataService.cs => RanksContext.cs} | 12 +- .../{RolesDataService.cs => RolesContext.cs} | 12 +- UKSF.Api.Personnel/Context/UnitsContext.cs | 20 + .../Context/UnitsDataService.cs | 20 - .../Controllers/AccountsController.cs | 100 ++-- .../Controllers/ApplicationsController.cs | 122 ++-- .../Controllers/CommentThreadController.cs | 109 ++-- .../Controllers/CommunicationsController.cs | 30 +- .../Controllers/DiscordCodeController.cs | 14 +- .../DiscordConnectionController.cs | 68 +-- .../Controllers/DisplayNameController.cs | 6 +- .../Controllers/NotificationsController.cs | 10 +- .../Controllers/RanksController.cs | 77 +-- .../Controllers/RecruitmentController.cs | 171 +++--- .../Controllers/RolesController.cs | 99 ++-- .../Controllers/SteamCodeController.cs | 33 +- .../Controllers/SteamConnectionController.cs | 22 +- .../Controllers/UnitsController.cs | 166 +++--- .../EventHandlers/AccountDataEventHandler.cs | 8 +- .../CommentThreadEventHandler.cs | 28 +- .../NotificationsEventHandler.cs | 20 +- .../Extensions/AccountExtensions.cs | 2 +- UKSF.Api.Personnel/Models/Account.cs | 62 +-- .../Models/AccountAttendanceStatus.cs | 12 +- UKSF.Api.Personnel/Models/AccountSettings.cs | 18 +- UKSF.Api.Personnel/Models/Application.cs | 14 +- UKSF.Api.Personnel/Models/AttendanceReport.cs | 2 +- UKSF.Api.Personnel/Models/Comment.cs | 8 +- UKSF.Api.Personnel/Models/CommentThread.cs | 8 +- UKSF.Api.Personnel/Models/ConfirmationCode.cs | 4 +- UKSF.Api.Personnel/Models/Loa.cs | 18 +- UKSF.Api.Personnel/Models/Notification.cs | 14 +- UKSF.Api.Personnel/Models/Rank.cs | 12 +- UKSF.Api.Personnel/Models/Role.cs | 8 +- UKSF.Api.Personnel/Models/Unit.cs | 68 +-- .../ActionDeleteExpiredConfirmationCode.cs | 8 +- .../ActionPruneNotifications.cs | 21 +- UKSF.Api.Personnel/Services/AccountService.cs | 17 +- .../Services/AssignmentService.cs | 54 +- .../Services/AttendanceService.cs | 4 +- .../Services/CommentThreadService.cs | 32 +- .../Services/ConfirmationCodeService.cs | 40 +- .../Services/DisplayNameService.cs | 21 +- UKSF.Api.Personnel/Services/EmailService.cs | 14 +- .../Services/NotificationsService.cs | 45 +- .../Services/ObjectIdConversionService.cs | 13 +- UKSF.Api.Personnel/Services/RanksService.cs | 40 +- .../Services/RecruitmentService.cs | 140 ++--- UKSF.Api.Personnel/Services/RolesService.cs | 20 +- .../Services/ServiceRecordService.cs | 7 +- UKSF.Api.Personnel/Services/UnitsService.cs | 95 ++-- UKSF.Api.Personnel/UKSF.Api.Personnel.csproj | 4 +- UKSF.Api.Shared/ApiSharedExtensions.cs | 19 +- ...edDataService.cs => CachedMongoContext.cs} | 35 +- UKSF.Api.Shared/Context/LogContext.cs | 35 ++ UKSF.Api.Shared/Context/LogDataService.cs | 29 - .../{DataService.cs => MongoContext.cs} | 32 +- UKSF.Api.Shared/Context/SchedulerContext.cs | 11 + .../Context/SchedulerDataService.cs | 11 - UKSF.Api.Shared/Events/DataEventBus.cs | 4 +- UKSF.Api.Shared/Events/EventModelFactory.cs | 2 +- UKSF.Api.Shared/Events/Logger.cs | 11 +- UKSF.Api.Shared/Extensions/ChangeUtilities.cs | 8 +- UKSF.Api.Shared/Extensions/JsonExtensions.cs | 2 +- .../Extensions/ProcessUtilities.cs | 4 +- .../Extensions/ServiceExtensions.cs | 2 +- UKSF.Api.Shared/Models/AuditLog.cs | 8 +- UKSF.Api.Shared/Models/BasicLog.cs | 25 +- UKSF.Api.Shared/Models/DataEventModel.cs | 8 +- UKSF.Api.Shared/Models/DiscordLog.cs | 20 + UKSF.Api.Shared/Models/HttpErrorLog.cs | 29 +- UKSF.Api.Shared/Models/LauncherLog.cs | 10 +- UKSF.Api.Shared/Models/ScheduledJob.cs | 12 +- UKSF.Api.Shared/Models/SignalrEventModel.cs | 4 +- .../Models/TeamspeakMessageEventModel.cs | 6 +- UKSF.Api.Shared/Permissions.cs | 14 +- .../Services/ScheduledActionFactory.cs | 6 +- UKSF.Api.Shared/Services/SchedulerService.cs | 65 +-- UKSF.Api.sln | 171 +++++- UKSF.Api.sln.DotSettings | 12 +- UKSF.Api/AppStart/StartServices.cs | 8 + UKSF.Api/AppStart/TestDataSetup.cs | 2 + UKSF.Api/AppStart/UksfServiceExtensions.cs | 2 +- UKSF.Api/Controllers/LoaController.cs | 114 ++-- UKSF.Api/Controllers/LoggingController.cs | 56 +- UKSF.Api/EventHandlers/LoggerEventHandler.cs | 40 +- UKSF.Api/ExceptionHandler.cs | 31 +- UKSF.Api/Fake/FakeCachedDataService.cs | 2 + UKSF.Api/Fake/FakeDataService.cs | 2 + UKSF.Api/Fake/FakeDiscordService.cs | 2 + UKSF.Api/Fake/FakeNotificationsDataService.cs | 2 + UKSF.Api/Fake/FakeNotificationsService.cs | 4 +- UKSF.Api/Fake/FakeTeamspeakManagerService.cs | 2 + UKSF.Api/Program.cs | 18 +- UKSF.Api/Services/MigrationUtility.cs | 27 +- UKSF.Api/Startup.cs | 9 +- UKSF.Api/UKSF.Api.csproj | 21 +- UKSF.Tests/Common/ITestCachedDataService.cs | 5 - UKSF.Tests/Common/ITestDataService.cs | 5 - UKSF.Tests/Common/TestCachedDataService.cs | 9 - UKSF.Tests/Common/TestDataModel.cs | 10 - UKSF.Tests/Common/TestDataService.cs | 9 - UKSF.Tests/Common/TestUtilities.cs | 10 - .../Integration/Data/DataCollectionTests.cs | 520 +++++++++--------- UKSF.Tests/UKSF.Tests.csproj | 8 +- .../Unit/Common/ChangeUtilitiesTests.cs | 124 ++--- UKSF.Tests/Unit/Common/ClockTests.cs | 12 +- .../Unit/Common/CollectionUtilitiesTests.cs | 2 +- UKSF.Tests/Unit/Common/DataUtilitiesTests.cs | 16 +- UKSF.Tests/Unit/Common/DateUtilitiesTests.cs | 2 +- .../Unit/Common/EventModelFactoryTests.cs | 8 +- UKSF.Tests/Unit/Common/GuardUtilitesTests.cs | 3 +- UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs | 23 +- .../Unit/Common/StringUtilitiesTests.cs | 9 +- UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs | 50 +- .../Data/Admin/VariablesDataServiceTests.cs | 92 ++-- .../Unit/Data/CachedDataServiceTests.cs | 276 +++++----- .../Unit/Data/CahcedDataServiceEventTests.cs | 132 ++--- .../Unit/Data/DataCollectionFactoryTests.cs | 8 +- UKSF.Tests/Unit/Data/DataServiceEventTests.cs | 142 ++--- UKSF.Tests/Unit/Data/DataServiceTests.cs | 234 ++++---- .../Data/Game/GameServersDataServiceTests.cs | 24 +- .../Message/CommentThreadDataServiceTests.cs | 52 +- .../Data/Modpack/BuildsDataServiceTests.cs | 59 +- .../Data/Modpack/ReleasesDataServiceTests.cs | 26 +- .../OperationOrderDataServiceTests.cs | 34 +- .../OperationReportDataServiceTests.cs | 34 +- .../Personnel/DischargeDataServiceTests.cs | 22 +- .../Data/Personnel/RanksDataServiceTests.cs | 46 +- .../Data/Personnel/RolesDataServiceTests.cs | 46 +- .../Unit/Data/SimpleDataServiceTests.cs | 32 +- .../Unit/Data/Units/UnitsDataServiceTests.cs | 38 +- UKSF.Tests/Unit/Events/EventBusTests.cs | 4 +- .../Handlers/AccountEventHandlerTests.cs | 58 +- .../CommandRequestEventHandlerTests.cs | 50 +- .../CommentThreadEventHandlerTests.cs | 60 +- .../Events/Handlers/LogEventHandlerTests.cs | 42 +- .../NotificationsEventHandlerTests.cs | 66 +-- .../Handlers/TeamspeakEventHandlerTests.cs | 95 ++-- .../Unit/Models/AccountSettingsTests.cs | 37 -- .../Unit/Models/Game/MissionFileTests.cs | 8 +- .../Message/Logging/BasicLogMessageTests.cs | 16 +- .../Logging/LauncherLogMessageTests.cs | 6 +- .../Message/Logging/WebLogMessageTests.cs | 8 +- .../Mission/MissionPatchingReportTests.cs | 24 +- .../Unit/Models/Mission/MissionTests.cs | 8 +- .../Services/Admin/VariablesServiceTests.cs | 88 +-- .../Services/Common/AccountUtilitiesTests.cs | 40 +- .../Common/ObjectIdConversionServiceTests.cs | 26 +- .../Teamspeak/TeamspeakGroupServiceTests.cs | 351 ++++++------ .../Services/Modpack/BuildsServiceTests.cs | 2 + .../Personnel/DisplayNameServiceTests.cs | 71 ++- .../Services/Personnel/LoaServiceTests.cs | 24 +- .../Services/Personnel/RanksServiceTests.cs | 149 +++-- .../Services/Personnel/RoleAttributeTests.cs | 2 +- .../Services/Personnel/RolesServiceTests.cs | 62 +-- .../Utility/ConfirmationCodeServiceTests.cs | 110 ++-- .../Services/Utility/DataCacheServiceTests.cs | 8 +- .../Utility/ScheduledActionServiceTests.cs | 26 +- ...eleteExpiredConfirmationCodeActionTests.cs | 19 +- .../ScheduledActions/PruneDataActionTests.cs | 53 +- .../TeamspeakSnapshotActionTests.cs | 16 +- .../Services/Utility/SessionServiceTests.cs | 50 +- 348 files changed, 5863 insertions(+), 4820 deletions(-) create mode 100644 Tests/Tests.csproj create mode 100644 Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj create mode 100644 Tests/UKSF.Api.ArmaMissions.Tests/UKSF.Api.ArmaMissions.Tests.csproj create mode 100644 Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj create mode 100644 Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj create mode 100644 Tests/UKSF.Api.Base.Tests/DependencyInjectionTests.cs create mode 100644 Tests/UKSF.Api.Base.Tests/UKSF.Api.Base.Tests.csproj create mode 100644 Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj create mode 100644 Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj create mode 100644 Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj create mode 100644 Tests/UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj create mode 100644 Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj create mode 100644 Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj create mode 100644 Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj create mode 100644 Tests/UKSF.Api.Shared.Tests/DependencyInjectionTests.cs create mode 100644 Tests/UKSF.Api.Shared.Tests/UKSF.Api.Shared.Tests.csproj create mode 100644 Tests/UKSF.Api.Tests.Common/DependencyInjectionTestsBase.cs create mode 100644 Tests/UKSF.Api.Tests.Common/ITestCachedDataService.cs create mode 100644 Tests/UKSF.Api.Tests.Common/ITestDataService.cs create mode 100644 Tests/UKSF.Api.Tests.Common/TestCachedContext.cs rename {UKSF.Tests/Common => Tests/UKSF.Api.Tests.Common}/TestComplexDataModel.cs (63%) create mode 100644 Tests/UKSF.Api.Tests.Common/TestConfigurationProvider.cs create mode 100644 Tests/UKSF.Api.Tests.Common/TestContext.cs create mode 100644 Tests/UKSF.Api.Tests.Common/TestDataModel.cs create mode 100644 Tests/UKSF.Api.Tests.Common/TestUtilities.cs create mode 100644 Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj create mode 100644 Tests/UKSF.Api.Tests.Common/appsettings.json create mode 100644 Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj rename UKSF.Api.Admin/Context/{VariablesDataService.cs => VariablesContext.cs} (65%) create mode 100644 UKSF.Api.ArmaServer/DataContext/GameServersContext.cs delete mode 100644 UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs delete mode 100644 UKSF.Api.Base/Context/DataBackedService.cs delete mode 100644 UKSF.Api.Base/Context/DataCollectionFactory.cs rename UKSF.Api.Base/Context/{DataCollection.cs => MongoCollection.cs} (80%) create mode 100644 UKSF.Api.Base/Context/MongoCollectionFactory.cs rename UKSF.Api.Base/Context/{DataServiceBase.cs => MongoContextBase.cs} (51%) rename UKSF.Api.Base/Models/{DatabaseObject.cs => MongoObject.cs} (67%) create mode 100644 UKSF.Api.Command/Context/CommandRequestArchiveContext.cs delete mode 100644 UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs create mode 100644 UKSF.Api.Command/Context/CommandRequestContext.cs delete mode 100644 UKSF.Api.Command/Context/CommandRequestDataService.cs create mode 100644 UKSF.Api.Command/Context/DischargeContext.cs delete mode 100644 UKSF.Api.Command/Context/DischargeDataService.cs create mode 100644 UKSF.Api.Command/Context/LoaContext.cs delete mode 100644 UKSF.Api.Command/Context/LoaDataService.cs rename UKSF.Api.Command/Context/{OperationOrderDataService.cs => OperationOrderContext.cs} (53%) rename UKSF.Api.Command/Context/{OperationReportDataService.cs => OperationReportContext.cs} (53%) delete mode 100644 UKSF.Api.Command/Services/DischargeService.cs delete mode 100644 UKSF.Api.Integration.Instagram/Controllers/InstagramController.cs delete mode 100644 UKSF.Api.Integration.Instagram/Models/InstagramImage.cs rename {UKSF.Api.Integration.Instagram => UKSF.Api.Integrations.Instagram}/ApiIntegrationInstagramExtensions.cs (87%) create mode 100644 UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs create mode 100644 UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs rename {UKSF.Api.Integration.Instagram => UKSF.Api.Integrations.Instagram}/ScheduledActions/ActionInstagramImages.cs (69%) rename {UKSF.Api.Integration.Instagram => UKSF.Api.Integrations.Instagram}/ScheduledActions/ActionInstagramToken.cs (69%) rename {UKSF.Api.Integration.Instagram => UKSF.Api.Integrations.Instagram}/Services/InstagramService.cs (55%) rename UKSF.Api.Integration.Instagram/UKSF.Api.Integration.Instagram.csproj => UKSF.Api.Integrations.Instagram/UKSF.Api.Integrations.Instagram.csproj (100%) create mode 100644 UKSF.Api.Launcher/Context/LauncherFileContext.cs delete mode 100644 UKSF.Api.Launcher/Context/LauncherFileDataService.cs create mode 100644 UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings rename UKSF.Api.Modpack/{Services/Data/BuildsDataService.cs => Context/BuildsContext.cs} (64%) rename UKSF.Api.Modpack/{Services/Data/ReleasesDataService.cs => Context/ReleasesContext.cs} (71%) create mode 100644 UKSF.Api.Personnel/Context/AccountContext.cs delete mode 100644 UKSF.Api.Personnel/Context/AccountDataService.cs rename UKSF.Api.Personnel/Context/{CommentThreadDataService.cs => CommentThreadContext.cs} (61%) create mode 100644 UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs delete mode 100644 UKSF.Api.Personnel/Context/ConfirmationCodeDataService.cs create mode 100644 UKSF.Api.Personnel/Context/NotificationsContext.cs delete mode 100644 UKSF.Api.Personnel/Context/NotificationsDataService.cs rename UKSF.Api.Personnel/Context/{RanksDataService.cs => RanksContext.cs} (55%) rename UKSF.Api.Personnel/Context/{RolesDataService.cs => RolesContext.cs} (55%) create mode 100644 UKSF.Api.Personnel/Context/UnitsContext.cs delete mode 100644 UKSF.Api.Personnel/Context/UnitsDataService.cs rename UKSF.Api.Shared/Context/{CachedDataService.cs => CachedMongoContext.cs} (78%) create mode 100644 UKSF.Api.Shared/Context/LogContext.cs delete mode 100644 UKSF.Api.Shared/Context/LogDataService.cs rename UKSF.Api.Shared/Context/{DataService.cs => MongoContext.cs} (76%) create mode 100644 UKSF.Api.Shared/Context/SchedulerContext.cs delete mode 100644 UKSF.Api.Shared/Context/SchedulerDataService.cs create mode 100644 UKSF.Api.Shared/Models/DiscordLog.cs delete mode 100644 UKSF.Tests/Common/ITestCachedDataService.cs delete mode 100644 UKSF.Tests/Common/ITestDataService.cs delete mode 100644 UKSF.Tests/Common/TestCachedDataService.cs delete mode 100644 UKSF.Tests/Common/TestDataModel.cs delete mode 100644 UKSF.Tests/Common/TestDataService.cs delete mode 100644 UKSF.Tests/Common/TestUtilities.cs delete mode 100644 UKSF.Tests/Unit/Models/AccountSettingsTests.cs diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj new file mode 100644 index 00000000..cbfa5815 --- /dev/null +++ b/Tests/Tests.csproj @@ -0,0 +1,7 @@ + + + + net5.0 + + + diff --git a/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj b/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj new file mode 100644 index 00000000..9fc420ef --- /dev/null +++ b/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj @@ -0,0 +1,22 @@ + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + diff --git a/Tests/UKSF.Api.ArmaMissions.Tests/UKSF.Api.ArmaMissions.Tests.csproj b/Tests/UKSF.Api.ArmaMissions.Tests/UKSF.Api.ArmaMissions.Tests.csproj new file mode 100644 index 00000000..9fc420ef --- /dev/null +++ b/Tests/UKSF.Api.ArmaMissions.Tests/UKSF.Api.ArmaMissions.Tests.csproj @@ -0,0 +1,22 @@ + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + diff --git a/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj b/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj new file mode 100644 index 00000000..9fc420ef --- /dev/null +++ b/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj @@ -0,0 +1,22 @@ + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + diff --git a/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj b/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj new file mode 100644 index 00000000..9fc420ef --- /dev/null +++ b/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj @@ -0,0 +1,22 @@ + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + diff --git a/Tests/UKSF.Api.Base.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Base.Tests/DependencyInjectionTests.cs new file mode 100644 index 00000000..0c3f9ef1 --- /dev/null +++ b/Tests/UKSF.Api.Base.Tests/DependencyInjectionTests.cs @@ -0,0 +1,23 @@ +using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Base.Context; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.Base.Tests { + public class DependencyInjectionTests : DependencyInjectionTestsBase { + public DependencyInjectionTests() { + Services.AddUksfBase(TestConfiguration); + } + + [Fact] + public void When_resolving_MongoCollectionFactory() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + IMongoCollectionFactory subject = serviceProvider.GetRequiredService(); + + subject.Should().NotBeNull(); + } + } +} diff --git a/Tests/UKSF.Api.Base.Tests/UKSF.Api.Base.Tests.csproj b/Tests/UKSF.Api.Base.Tests/UKSF.Api.Base.Tests.csproj new file mode 100644 index 00000000..f57e1c60 --- /dev/null +++ b/Tests/UKSF.Api.Base.Tests/UKSF.Api.Base.Tests.csproj @@ -0,0 +1,30 @@ + + + + net5.0 + + false + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + diff --git a/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj b/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj new file mode 100644 index 00000000..9fc420ef --- /dev/null +++ b/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj @@ -0,0 +1,22 @@ + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + diff --git a/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj b/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj new file mode 100644 index 00000000..9fc420ef --- /dev/null +++ b/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj @@ -0,0 +1,22 @@ + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + diff --git a/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj b/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj new file mode 100644 index 00000000..9fc420ef --- /dev/null +++ b/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj @@ -0,0 +1,22 @@ + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + diff --git a/Tests/UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj b/Tests/UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj new file mode 100644 index 00000000..9fc420ef --- /dev/null +++ b/Tests/UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj @@ -0,0 +1,22 @@ + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + diff --git a/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj b/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj new file mode 100644 index 00000000..9fc420ef --- /dev/null +++ b/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj @@ -0,0 +1,22 @@ + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + diff --git a/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj b/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj new file mode 100644 index 00000000..9fc420ef --- /dev/null +++ b/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj @@ -0,0 +1,22 @@ + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + diff --git a/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj b/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj new file mode 100644 index 00000000..9fc420ef --- /dev/null +++ b/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj @@ -0,0 +1,22 @@ + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + diff --git a/Tests/UKSF.Api.Shared.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Shared.Tests/DependencyInjectionTests.cs new file mode 100644 index 00000000..d7ed83b1 --- /dev/null +++ b/Tests/UKSF.Api.Shared.Tests/DependencyInjectionTests.cs @@ -0,0 +1,75 @@ +using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Base; +using UKSF.Api.Shared.Context; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.Shared.Tests { + public class DependencyInjectionTests : DependencyInjectionTestsBase { + public DependencyInjectionTests() { + Services.AddUksfBase(TestConfiguration); + Services.AddUksfShared(); + } + + [Fact] + public void When_resolving_LogContext() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + ILogContext subject = serviceProvider.GetRequiredService(); + + subject.Should().NotBeNull(); + } + + [Fact] + public void When_resolving_AuditLogContext() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + IAuditLogContext subject = serviceProvider.GetRequiredService(); + + subject.Should().NotBeNull(); + } + + [Fact] + public void When_resolving_HttpErrorLogContext() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + IHttpErrorLogContext subject = serviceProvider.GetRequiredService(); + + subject.Should().NotBeNull(); + } + + [Fact] + public void When_resolving_LauncherLogContext() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + ILauncherLogContext subject = serviceProvider.GetRequiredService(); + + subject.Should().NotBeNull(); + } + + [Fact] + public void When_resolving_DiscordLogContext() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + IDiscordLogContext subject = serviceProvider.GetRequiredService(); + + subject.Should().NotBeNull(); + } + + [Fact] + public void When_resolving_SchedulerContext() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + ISchedulerContext subject = serviceProvider.GetRequiredService(); + + subject.Should().NotBeNull(); + } + } +} diff --git a/Tests/UKSF.Api.Shared.Tests/UKSF.Api.Shared.Tests.csproj b/Tests/UKSF.Api.Shared.Tests/UKSF.Api.Shared.Tests.csproj new file mode 100644 index 00000000..06abb5c8 --- /dev/null +++ b/Tests/UKSF.Api.Shared.Tests/UKSF.Api.Shared.Tests.csproj @@ -0,0 +1,27 @@ + + + + net5.0 + + false + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + diff --git a/Tests/UKSF.Api.Tests.Common/DependencyInjectionTestsBase.cs b/Tests/UKSF.Api.Tests.Common/DependencyInjectionTestsBase.cs new file mode 100644 index 00000000..8a897c55 --- /dev/null +++ b/Tests/UKSF.Api.Tests.Common/DependencyInjectionTestsBase.cs @@ -0,0 +1,16 @@ +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; + +namespace UKSF.Api.Tests.Common { + public class DependencyInjectionTestsBase { + protected readonly ServiceCollection Services; + protected readonly IConfigurationRoot TestConfiguration; + + protected DependencyInjectionTestsBase() { + Services = new ServiceCollection(); + TestConfiguration = TestConfigurationProvider.GetTestConfiguration(); + + Services.AddSingleton(TestConfiguration); + } + } +} diff --git a/Tests/UKSF.Api.Tests.Common/ITestCachedDataService.cs b/Tests/UKSF.Api.Tests.Common/ITestCachedDataService.cs new file mode 100644 index 00000000..06c96a94 --- /dev/null +++ b/Tests/UKSF.Api.Tests.Common/ITestCachedDataService.cs @@ -0,0 +1,5 @@ +using UKSF.Api.Shared.Context; + +namespace UKSF.Api.Tests.Common { + public interface ITestCachedContext : IMongoContext { } +} diff --git a/Tests/UKSF.Api.Tests.Common/ITestDataService.cs b/Tests/UKSF.Api.Tests.Common/ITestDataService.cs new file mode 100644 index 00000000..26f9e4e2 --- /dev/null +++ b/Tests/UKSF.Api.Tests.Common/ITestDataService.cs @@ -0,0 +1,5 @@ +using UKSF.Api.Shared.Context; + +namespace UKSF.Api.Tests.Common { + public interface ITestContext : IMongoContext { } +} diff --git a/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs b/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs new file mode 100644 index 00000000..171490e1 --- /dev/null +++ b/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs @@ -0,0 +1,13 @@ +using UKSF.Api.Base.Context; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; + +namespace UKSF.Api.Tests.Common { + public class TestCachedContext : CachedMongoContext, ITestCachedContext { + public TestCachedContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base( + mongoCollectionFactory, + dataEventBus, + collectionName + ) { } + } +} diff --git a/UKSF.Tests/Common/TestComplexDataModel.cs b/Tests/UKSF.Api.Tests.Common/TestComplexDataModel.cs similarity index 63% rename from UKSF.Tests/Common/TestComplexDataModel.cs rename to Tests/UKSF.Api.Tests.Common/TestComplexDataModel.cs index a2db41b7..cb757837 100644 --- a/UKSF.Tests/Common/TestComplexDataModel.cs +++ b/Tests/UKSF.Api.Tests.Common/TestComplexDataModel.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -namespace UKSF.Tests.Common { - public class TestComplexDataModel : TestDataModel { +namespace UKSF.Api.Tests.Common { + public record TestComplexDataModel : TestDataModel { public TestDataModel Data; - public List List; public List DataList; + public List List; } } diff --git a/Tests/UKSF.Api.Tests.Common/TestConfigurationProvider.cs b/Tests/UKSF.Api.Tests.Common/TestConfigurationProvider.cs new file mode 100644 index 00000000..e837fa3c --- /dev/null +++ b/Tests/UKSF.Api.Tests.Common/TestConfigurationProvider.cs @@ -0,0 +1,7 @@ +using Microsoft.Extensions.Configuration; + +namespace UKSF.Api.Tests.Common { + public static class TestConfigurationProvider { + public static IConfigurationRoot GetTestConfiguration() => new ConfigurationBuilder().AddJsonFile("appsettings.json").Build(); + } +} diff --git a/Tests/UKSF.Api.Tests.Common/TestContext.cs b/Tests/UKSF.Api.Tests.Common/TestContext.cs new file mode 100644 index 00000000..e046bff4 --- /dev/null +++ b/Tests/UKSF.Api.Tests.Common/TestContext.cs @@ -0,0 +1,13 @@ +using UKSF.Api.Base.Context; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; + +namespace UKSF.Api.Tests.Common { + public class TestContext : MongoContext, ITestContext { + public TestContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base( + mongoCollectionFactory, + dataEventBus, + collectionName + ) { } + } +} diff --git a/Tests/UKSF.Api.Tests.Common/TestDataModel.cs b/Tests/UKSF.Api.Tests.Common/TestDataModel.cs new file mode 100644 index 00000000..c3538342 --- /dev/null +++ b/Tests/UKSF.Api.Tests.Common/TestDataModel.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; +using UKSF.Api.Base.Models; + +namespace UKSF.Api.Tests.Common { + public record TestDataModel : MongoObject { + public Dictionary Dictionary = new(); + public string Name; + public List Stuff; + } +} diff --git a/Tests/UKSF.Api.Tests.Common/TestUtilities.cs b/Tests/UKSF.Api.Tests.Common/TestUtilities.cs new file mode 100644 index 00000000..c11958b8 --- /dev/null +++ b/Tests/UKSF.Api.Tests.Common/TestUtilities.cs @@ -0,0 +1,13 @@ +using MongoDB.Bson; +using MongoDB.Bson.Serialization; +using MongoDB.Driver; + +namespace UKSF.Api.Tests.Common { + public static class TestUtilities { + public static BsonValue RenderUpdate(UpdateDefinition updateDefinition) => + updateDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); + + public static BsonValue RenderFilter(FilterDefinition filterDefinition) => + filterDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); + } +} diff --git a/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj b/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj new file mode 100644 index 00000000..7c3b4601 --- /dev/null +++ b/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj @@ -0,0 +1,35 @@ + + + + net5.0 + + false + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + + true + PreserveNewest + PreserveNewest + + + + diff --git a/Tests/UKSF.Api.Tests.Common/appsettings.json b/Tests/UKSF.Api.Tests.Common/appsettings.json new file mode 100644 index 00000000..790ef383 --- /dev/null +++ b/Tests/UKSF.Api.Tests.Common/appsettings.json @@ -0,0 +1,23 @@ +{ + "ConnectionStrings": { + "database": "mongodb://127.0.0.1:27018/tests", + "discord": "" + }, + "Secrets": { + "tokenKey": "" + }, + "EmailSettings": { + "username": "", + "password": "" + }, + "Discord": { + "clientId": "", + "clientSecret": "", + "botToken": "" + }, + "Github": { + "token": "", + "webhookSecret": "", + "appPrivateKey": "" + } +} diff --git a/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj b/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj new file mode 100644 index 00000000..9fc420ef --- /dev/null +++ b/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj @@ -0,0 +1,22 @@ + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + diff --git a/UKSF.Api.Admin/ApiAdminExtensions.cs b/UKSF.Api.Admin/ApiAdminExtensions.cs index e0a51fb6..b323f265 100644 --- a/UKSF.Api.Admin/ApiAdminExtensions.cs +++ b/UKSF.Api.Admin/ApiAdminExtensions.cs @@ -20,7 +20,7 @@ public static class ApiAdminExtensions { private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); private static IServiceCollection AddServices(this IServiceCollection services) => - services.AddSingleton().AddTransient().AddTransient(); + services.AddSingleton().AddTransient().AddTransient(); private static IServiceCollection AddActions(this IServiceCollection services) => services.AddSingleton(); diff --git a/UKSF.Api.Admin/Context/VariablesDataService.cs b/UKSF.Api.Admin/Context/VariablesContext.cs similarity index 65% rename from UKSF.Api.Admin/Context/VariablesDataService.cs rename to UKSF.Api.Admin/Context/VariablesContext.cs index 377bf943..34b764b6 100644 --- a/UKSF.Api.Admin/Context/VariablesDataService.cs +++ b/UKSF.Api.Admin/Context/VariablesContext.cs @@ -8,27 +8,21 @@ using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Admin.Context { - public interface IVariablesDataService : IDataService, ICachedDataService { + public interface IVariablesContext : IMongoContext, ICachedMongoContext { Task Update(string key, object value); } - public class VariablesDataService : CachedDataService, IVariablesDataService { - public VariablesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "variables") { } - - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { - Cache = newCollection?.OrderBy(x => x.key).ToList(); - } - } + public class VariablesContext : CachedMongoContext, IVariablesContext { + public VariablesContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "variables") { } public override VariableItem GetSingle(string key) { - return base.GetSingle(x => x.key == key.Keyify()); + return base.GetSingle(x => x.Key == key.Keyify()); } public async Task Update(string key, object value) { VariableItem variableItem = GetSingle(key); if (variableItem == null) throw new KeyNotFoundException($"Variable Item with key '{key}' does not exist"); - await base.Update(variableItem.id, nameof(variableItem.item), value); + await base.Update(variableItem.Id, nameof(variableItem.Item), value); } public override async Task Delete(string key) { @@ -36,5 +30,11 @@ public override async Task Delete(string key) { if (variableItem == null) throw new KeyNotFoundException($"Variable Item with key '{key}' does not exist"); await base.Delete(variableItem); } + + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.OrderBy(x => x.Key).ToList(); + } + } } } diff --git a/UKSF.Api.Admin/Controllers/DataController.cs b/UKSF.Api.Admin/Controllers/DataController.cs index 7730778d..7d81003a 100644 --- a/UKSF.Api.Admin/Controllers/DataController.cs +++ b/UKSF.Api.Admin/Controllers/DataController.cs @@ -6,13 +6,13 @@ namespace UKSF.Api.Admin.Controllers { [Route("[controller]"), Permissions(Permissions.ADMIN)] public class DataController : Controller { - private readonly DataCacheService dataCacheService; + private readonly DataCacheService _dataCacheService; - public DataController(DataCacheService dataCacheService) => this.dataCacheService = dataCacheService; + public DataController(DataCacheService dataCacheService) => _dataCacheService = dataCacheService; [HttpGet("invalidate"), Authorize] public IActionResult Invalidate() { - dataCacheService.RefreshCachedData(); + _dataCacheService.RefreshCachedData(); return Ok(); } } diff --git a/UKSF.Api.Admin/Controllers/DebugController.cs b/UKSF.Api.Admin/Controllers/DebugController.cs index c2a2d122..f7aadf7b 100644 --- a/UKSF.Api.Admin/Controllers/DebugController.cs +++ b/UKSF.Api.Admin/Controllers/DebugController.cs @@ -5,32 +5,19 @@ namespace UKSF.Api.Admin.Controllers { [Route("[controller]")] public class DebugController : Controller { - private readonly IHostEnvironment currentEnvironment; - private readonly DataCacheService dataCacheService; + private readonly IHostEnvironment _currentEnvironment; + private readonly DataCacheService _dataCacheService; public DebugController(IHostEnvironment currentEnvironment, DataCacheService dataCacheService) { - this.currentEnvironment = currentEnvironment; - this.dataCacheService = dataCacheService; + _currentEnvironment = currentEnvironment; + _dataCacheService = dataCacheService; } - // TODO: Should be in notifcation controller - // [HttpGet("notifications-test"), Authorize] - // public IActionResult NotificationsTest() { - // if (!currentEnvironment.IsDevelopment()) return Ok(); - // - // notificationsService.Add( - // new Notification { - // owner = httpContextService.GetContextId(), message = $"This is a test notification. The time is {DateTime.Now:HH:mm:ss}", timestamp = DateTime.Now, icon = NotificationIcons.REQUEST - // } - // ); - // return Ok(); - // } - [HttpGet("invalidate-data")] public IActionResult InvalidateData() { - if (!currentEnvironment.IsDevelopment()) return Ok(); + if (!_currentEnvironment.IsDevelopment()) return Ok(); - dataCacheService.RefreshCachedData(); + _dataCacheService.RefreshCachedData(); return Ok(); } } diff --git a/UKSF.Api.Admin/Controllers/VariablesController.cs b/UKSF.Api.Admin/Controllers/VariablesController.cs index fa612e66..3074e2e7 100644 --- a/UKSF.Api.Admin/Controllers/VariablesController.cs +++ b/UKSF.Api.Admin/Controllers/VariablesController.cs @@ -10,53 +10,53 @@ namespace UKSF.Api.Admin.Controllers { [Route("[controller]"), Permissions(Permissions.ADMIN)] public class VariablesController : Controller { - private readonly IVariablesDataService variablesDataService; - private readonly ILogger logger; + private readonly ILogger _logger; + private readonly IVariablesContext _variablesContext; - public VariablesController(IVariablesDataService variablesDataService, ILogger logger) { - this.variablesDataService = variablesDataService; - this.logger = logger; + public VariablesController(IVariablesContext variablesContext, ILogger logger) { + _variablesContext = variablesContext; + _logger = logger; } [HttpGet, Authorize] - public IActionResult GetAll() => Ok(variablesDataService.Get()); + public IActionResult GetAll() => Ok(_variablesContext.Get()); [HttpGet("{key}"), Authorize] - public IActionResult GetVariableItems(string key) => Ok(variablesDataService.GetSingle(key)); + public IActionResult GetVariableItems(string key) => Ok(_variablesContext.GetSingle(key)); [HttpPost("{key}"), Authorize] public IActionResult CheckVariableItem(string key, [FromBody] VariableItem variableItem = null) { if (string.IsNullOrEmpty(key)) return Ok(); if (variableItem != null) { VariableItem safeVariableItem = variableItem; - return Ok(variablesDataService.GetSingle(x => x.id != safeVariableItem.id && x.key == key.Keyify())); + return Ok(_variablesContext.GetSingle(x => x.Id != safeVariableItem.Id && x.Key == key.Keyify())); } - return Ok(variablesDataService.GetSingle(x => x.key == key.Keyify())); + return Ok(_variablesContext.GetSingle(x => x.Key == key.Keyify())); } [HttpPut, Authorize] public async Task AddVariableItem([FromBody] VariableItem variableItem) { - variableItem.key = variableItem.key.Keyify(); - await variablesDataService.Add(variableItem); - logger.LogAudit($"VariableItem added '{variableItem.key}, {variableItem.item}'"); + variableItem.Key = variableItem.Key.Keyify(); + await _variablesContext.Add(variableItem); + _logger.LogAudit($"VariableItem added '{variableItem.Key}, {variableItem.Item}'"); return Ok(); } [HttpPatch, Authorize] public async Task EditVariableItem([FromBody] VariableItem variableItem) { - VariableItem oldVariableItem = variablesDataService.GetSingle(variableItem.key); - logger.LogAudit($"VariableItem '{oldVariableItem.key}' updated from '{oldVariableItem.item}' to '{variableItem.item}'"); - await variablesDataService.Update(variableItem.key, variableItem.item); - return Ok(variablesDataService.Get()); + VariableItem oldVariableItem = _variablesContext.GetSingle(variableItem.Key); + _logger.LogAudit($"VariableItem '{oldVariableItem.Key}' updated from '{oldVariableItem.Item}' to '{variableItem.Item}'"); + await _variablesContext.Update(variableItem.Key, variableItem.Item); + return Ok(_variablesContext.Get()); } [HttpDelete("{key}"), Authorize] public async Task DeleteVariableItem(string key) { - VariableItem variableItem = variablesDataService.GetSingle(key); - logger.LogAudit($"VariableItem deleted '{variableItem.key}, {variableItem.item}'"); - await variablesDataService.Delete(key); - return Ok(variablesDataService.Get()); + VariableItem variableItem = _variablesContext.GetSingle(key); + _logger.LogAudit($"VariableItem deleted '{variableItem.Key}, {variableItem.Item}'"); + await _variablesContext.Delete(key); + return Ok(_variablesContext.Get()); } } } diff --git a/UKSF.Api.Admin/Controllers/VersionController.cs b/UKSF.Api.Admin/Controllers/VersionController.cs index 07fd043d..0d29bdf4 100644 --- a/UKSF.Api.Admin/Controllers/VersionController.cs +++ b/UKSF.Api.Admin/Controllers/VersionController.cs @@ -11,22 +11,22 @@ namespace UKSF.Api.Admin.Controllers { [Route("[controller]")] public class VersionController : Controller { - private readonly IHubContext utilityHub; - private readonly IVariablesDataService variablesDataService; + private readonly IHubContext _utilityHub; + private readonly IVariablesContext _variablesContext; - public VersionController(IVariablesDataService variablesDataService, IHubContext utilityHub) { - this.variablesDataService = variablesDataService; - this.utilityHub = utilityHub; + public VersionController(IVariablesContext variablesContext, IHubContext utilityHub) { + _variablesContext = variablesContext; + _utilityHub = utilityHub; } [HttpGet] - public IActionResult GetFrontendVersion() => Ok(variablesDataService.GetSingle("FRONTEND_VERSION").AsString()); + public IActionResult GetFrontendVersion() => Ok(_variablesContext.GetSingle("FRONTEND_VERSION").AsString()); [HttpPost("update"), Authorize] public async Task UpdateFrontendVersion([FromBody] JObject body) { string version = body["version"].ToString(); - await variablesDataService.Update("FRONTEND_VERSION", version); - await utilityHub.Clients.All.ReceiveFrontendUpdate(version); + await _variablesContext.Update("FRONTEND_VERSION", version); + await _utilityHub.Clients.All.ReceiveFrontendUpdate(version); return Ok(); } } diff --git a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs b/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs index 39b30561..97c1097a 100644 --- a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs +++ b/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs @@ -12,32 +12,32 @@ namespace UKSF.Api.Admin.EventHandlers { public interface ILogDataEventHandler : IEventHandler { } public class LogDataEventHandler : ILogDataEventHandler { - private readonly IDataEventBus logDataEventBus; - private readonly IHubContext hub; - private readonly ILogger logger; + private readonly IHubContext _hub; + private readonly IDataEventBus _logDataEventBus; + private readonly ILogger _logger; public LogDataEventHandler(IDataEventBus logDataEventBus, IHubContext hub, ILogger logger) { - this.logDataEventBus = logDataEventBus; - this.hub = hub; - this.logger = logger; + _logDataEventBus = logDataEventBus; + _hub = hub; + _logger = logger; } public void Init() { - logDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => logger.LogError(exception)); + _logDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => _logger.LogError(exception)); } private async Task HandleEvent(DataEventModel dataEventModel) { - if (dataEventModel.type == DataEventType.ADD) { - await AddedEvent(dataEventModel.data); + if (dataEventModel.Type == DataEventType.ADD) { + await AddedEvent(dataEventModel.Data); } } private Task AddedEvent(object log) { return log switch { - AuditLog message => hub.Clients.All.ReceiveAuditLog(message), - LauncherLog message => hub.Clients.All.ReceiveLauncherLog(message), - HttpErrorLog message => hub.Clients.All.ReceiveErrorLog(message), - BasicLog message => hub.Clients.All.ReceiveLog(message), + AuditLog message => _hub.Clients.All.ReceiveAuditLog(message), + LauncherLog message => _hub.Clients.All.ReceiveLauncherLog(message), + HttpErrorLog message => _hub.Clients.All.ReceiveErrorLog(message), + BasicLog message => _hub.Clients.All.ReceiveLog(message), _ => throw new ArgumentOutOfRangeException(nameof(log), "Log type is not valid") }; } diff --git a/UKSF.Api.Admin/Extensions/VariablesExtensions.cs b/UKSF.Api.Admin/Extensions/VariablesExtensions.cs index 3742201d..77638b66 100644 --- a/UKSF.Api.Admin/Extensions/VariablesExtensions.cs +++ b/UKSF.Api.Admin/Extensions/VariablesExtensions.cs @@ -8,14 +8,14 @@ namespace UKSF.Api.Admin.Extensions { public static class VariablesExtensions { public static VariableItem AssertHasItem(this VariableItem variableItem) { - if (variableItem.item == null) { - throw new Exception($"Variable {variableItem.key} has no item"); + if (variableItem.Item == null) { + throw new Exception($"Variable {variableItem.Key} has no item"); } return variableItem; } - public static string AsString(this VariableItem variable) => variable.AssertHasItem().item.ToString(); + public static string AsString(this VariableItem variable) => variable.AssertHasItem().Item.ToString(); public static double AsDouble(this VariableItem variable) { string item = variable.AsString(); diff --git a/UKSF.Api.Admin/Models/VariableItem.cs b/UKSF.Api.Admin/Models/VariableItem.cs index 6a9a11d2..363c7739 100644 --- a/UKSF.Api.Admin/Models/VariableItem.cs +++ b/UKSF.Api.Admin/Models/VariableItem.cs @@ -1,8 +1,8 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Admin.Models { - public class VariableItem : DatabaseObject { - public object item; - public string key; + public record VariableItem : MongoObject { + public object Item; + public string Key; } } diff --git a/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs b/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs index f139c426..fa3c72a5 100644 --- a/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs +++ b/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs @@ -11,25 +11,28 @@ public interface IActionPruneLogs : ISelfCreatingScheduledAction { } public class ActionPruneLogs : IActionPruneLogs { private const string ACTION_NAME = nameof(ActionPruneLogs); - private readonly IAuditLogDataService _auditLogDataService; + private readonly IAuditLogContext _auditLogContext; private readonly IClock _clock; private readonly IHostEnvironment _currentEnvironment; - private readonly IHttpErrorLogDataService _httpErrorLogDataService; - private readonly ILogDataService _logDataService; + private readonly IHttpErrorLogContext _httpErrorLogContext; + private readonly ILogContext _logContext; + private readonly ISchedulerContext _schedulerContext; private readonly ISchedulerService _schedulerService; public ActionPruneLogs( - ILogDataService logDataService, - IAuditLogDataService auditLogDataService, - IHttpErrorLogDataService httpErrorLogDataService, + ILogContext logContext, + IAuditLogContext auditLogContext, + IHttpErrorLogContext httpErrorLogContext, ISchedulerService schedulerService, + ISchedulerContext schedulerContext, IHostEnvironment currentEnvironment, IClock clock ) { - _logDataService = logDataService; - _auditLogDataService = auditLogDataService; - _httpErrorLogDataService = httpErrorLogDataService; + _logContext = logContext; + _auditLogContext = auditLogContext; + _httpErrorLogContext = httpErrorLogContext; _schedulerService = schedulerService; + _schedulerContext = schedulerContext; _currentEnvironment = currentEnvironment; _clock = clock; } @@ -38,9 +41,9 @@ IClock clock public void Run(params object[] parameters) { DateTime now = _clock.UtcNow(); - Task logsTask = _logDataService.DeleteMany(x => x.timestamp < now.AddDays(-7)); - Task auditLogsTask = _auditLogDataService.DeleteMany(x => x.timestamp < now.AddMonths(-3)); - Task errorLogsTask = _httpErrorLogDataService.DeleteMany(x => x.timestamp < now.AddDays(-7)); + Task logsTask = _logContext.DeleteMany(x => x.Timestamp < now.AddDays(-7)); + Task auditLogsTask = _auditLogContext.DeleteMany(x => x.Timestamp < now.AddMonths(-3)); + Task errorLogsTask = _httpErrorLogContext.DeleteMany(x => x.Timestamp < now.AddDays(-7)); Task.WaitAll(logsTask, errorLogsTask, auditLogsTask); } @@ -48,7 +51,7 @@ public void Run(params object[] parameters) { public async Task CreateSelf() { if (_currentEnvironment.IsDevelopment()) return; - if (_schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); } } diff --git a/UKSF.Api.Admin/Services/DataCacheService.cs b/UKSF.Api.Admin/Services/DataCacheService.cs index 1e9f06dd..5ab5199b 100644 --- a/UKSF.Api.Admin/Services/DataCacheService.cs +++ b/UKSF.Api.Admin/Services/DataCacheService.cs @@ -13,7 +13,7 @@ public class DataCacheService : IDataCacheService { public DataCacheService(IServiceProvider serviceProvider) => _serviceProvider = serviceProvider; public void RefreshCachedData() { - foreach (ICachedDataService cachedDataService in _serviceProvider.GetInterfaceServices()) { + foreach (ICachedMongoContext cachedDataService in _serviceProvider.GetInterfaceServices()) { cachedDataService.Refresh(); } } diff --git a/UKSF.Api.Admin/Services/VariablesService.cs b/UKSF.Api.Admin/Services/VariablesService.cs index 9bb38574..e56132a2 100644 --- a/UKSF.Api.Admin/Services/VariablesService.cs +++ b/UKSF.Api.Admin/Services/VariablesService.cs @@ -1,15 +1,16 @@ using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Models; -using UKSF.Api.Base.Context; namespace UKSF.Api.Admin.Services { - public interface IVariablesService : IDataBackedService { + public interface IVariablesService { VariableItem GetVariable(string key); } - public class VariablesService : DataBackedService, IVariablesService { - public VariablesService(IVariablesDataService data) : base(data) { } + public class VariablesService : IVariablesService { + private readonly IVariablesContext _context; - public VariableItem GetVariable(string key) => Data.GetSingle(key); + public VariablesService(IVariablesContext context) => _context = context; + + public VariableItem GetVariable(string key) => _context.GetSingle(key); } } diff --git a/UKSF.Api.ArmaMissions/Models/Mission.cs b/UKSF.Api.ArmaMissions/Models/Mission.cs index 16e817b0..69a90f6c 100644 --- a/UKSF.Api.ArmaMissions/Models/Mission.cs +++ b/UKSF.Api.ArmaMissions/Models/Mission.cs @@ -2,21 +2,21 @@ namespace UKSF.Api.ArmaMissions.Models { public class Mission { - public static int nextId; - public readonly string descriptionPath; - public readonly string path; - public readonly string sqmPath; - public List descriptionLines; - public MissionEntity missionEntity; - public int playerCount; - public int maxCurators; - public List rawEntities; - public List sqmLines; + public static int NextId; + public readonly string DescriptionPath; + public readonly string Path; + public readonly string SqmPath; + public List DescriptionLines; + public int MaxCurators; + public MissionEntity MissionEntity; + public int PlayerCount; + public List RawEntities; + public List SqmLines; public Mission(string path) { - this.path = path; - descriptionPath = $"{this.path}/description.ext"; - sqmPath = $"{this.path}/mission.sqm"; + Path = path; + DescriptionPath = $"{Path}/description.ext"; + SqmPath = $"{Path}/mission.sqm"; } } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionEntity.cs b/UKSF.Api.ArmaMissions/Models/MissionEntity.cs index 061b5506..b9fb0d58 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionEntity.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionEntity.cs @@ -2,7 +2,7 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionEntity { - public readonly List missionEntityItems = new List(); - public int itemsCount; + public readonly List MissionEntityItems = new(); + public int ItemsCount; } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs b/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs index ccc09bac..bdc22bc5 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs @@ -2,13 +2,13 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionEntityItem { - public static double position = 10; - public static double curatorPosition = 0.5; - public bool isPlayable; - public string dataType; - public string type; - public MissionEntity missionEntity; - public List rawMissionEntities = new List(); - public List rawMissionEntityItem = new List(); + public static double Position = 10; + public static double CuratorPosition = 0.5; + public string DataType; + public bool IsPlayable; + public MissionEntity MissionEntity; + public List RawMissionEntities = new(); + public List RawMissionEntityItem = new(); + public string Type; } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs index 24743939..b1579fe0 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs @@ -3,12 +3,12 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionPatchData { - public static MissionPatchData instance; - public List orderedUnits; - public List players; - public List ranks; - public List units; - public IEnumerable medicIds; - public IEnumerable engineerIds; + public static MissionPatchData Instance; + public IEnumerable EngineerIds; + public IEnumerable MedicIds; + public List OrderedUnits; + public List Players; + public List Ranks; + public List Units; } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs index 659da806..84ce6603 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs @@ -2,20 +2,20 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionPatchingReport { - public string detail; - public bool error; - public string title; + public string Detail; + public bool Error; + public string Title; public MissionPatchingReport(Exception exception) { - title = exception.GetBaseException().Message; - detail = exception.ToString(); - error = true; + Title = exception.GetBaseException().Message; + Detail = exception.ToString(); + Error = true; } public MissionPatchingReport(string title, string detail, bool error = false) { - this.title = error ? $"Error: {title}" : $"Warning: {title}"; - this.detail = detail; - this.error = error; + Title = error ? $"Error: {title}" : $"Warning: {title}"; + Detail = detail; + Error = error; } } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs index d9f1c250..68446506 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs @@ -2,8 +2,8 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionPatchingResult { - public int playerCount; - public List reports = new List(); - public bool success; + public int PlayerCount; + public List Reports = new(); + public bool Success; } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs b/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs index 8334f805..c2f08904 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs @@ -2,10 +2,10 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionPlayer { - public Account account; - public string name; - public string objectClass; - public Rank rank; - public MissionUnit unit; + public Account Account; + public string Name; + public string ObjectClass; + public Rank Rank; + public MissionUnit Unit; } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionUnit.cs b/UKSF.Api.ArmaMissions/Models/MissionUnit.cs index 33f82aca..05c77127 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionUnit.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionUnit.cs @@ -3,9 +3,9 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionUnit { - public string callsign; - public List members = new List(); - public Dictionary roles = new Dictionary(); - public Unit sourceUnit; + public string Callsign; + public List Members = new(); + public Dictionary Roles = new(); + public Unit SourceUnit; } } diff --git a/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs index 9b92b897..4a749621 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs @@ -9,7 +9,7 @@ public static class MissionDataResolver { public static string ResolveObjectClass(MissionPlayer player) { if (IsMedic(player)) return "UKSF_B_Medic"; // Team Medic - return player.unit.sourceUnit.id switch { + return player.Unit.SourceUnit.Id switch { "5a435eea905d47336442c75a" => "UKSF_B_Pilot", // "Joint Special Forces Aviation Wing" "5a848590eab14d12cc7fa618" => "UKSF_B_Pilot", // "RAF Cranwell" "5c98d7b396dba31f24cdb19c" => "UKSF_B_Pilot", // "51 Squadron" @@ -25,19 +25,19 @@ public static string ResolveObjectClass(MissionPlayer player) { } private static int ResolvePlayerUnitRole(MissionPlayer player) { - if (player.unit.roles.ContainsKey("1iC") && player.unit.roles["1iC"] == player) return 3; - if (player.unit.roles.ContainsKey("2iC") && player.unit.roles["2iC"] == player) return 2; - if (player.unit.roles.ContainsKey("3iC") && player.unit.roles["3iC"] == player) return 1; - if (player.unit.roles.ContainsKey("NCOiC") && player.unit.roles["NCOiC"] == player) return 0; + if (player.Unit.Roles.ContainsKey("1iC") && player.Unit.Roles["1iC"] == player) return 3; + if (player.Unit.Roles.ContainsKey("2iC") && player.Unit.Roles["2iC"] == player) return 2; + if (player.Unit.Roles.ContainsKey("3iC") && player.Unit.Roles["3iC"] == player) return 1; + if (player.Unit.Roles.ContainsKey("NCOiC") && player.Unit.Roles["NCOiC"] == player) return 0; return -1; } - private static bool IsMedic(MissionPlayer player) => MissionPatchData.instance.medicIds.Contains(player.account?.id); + private static bool IsMedic(MissionPlayer player) => MissionPatchData.Instance.MedicIds.Contains(player.Account?.Id); - public static bool IsEngineer(MissionPlayer player) => MissionPatchData.instance.engineerIds.Contains(player.account?.id); + public static bool IsEngineer(MissionPlayer player) => MissionPatchData.Instance.EngineerIds.Contains(player.Account?.Id); public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) { - return unit.sourceUnit.id switch { + return unit.SourceUnit.Id switch { "5a42835b55d6109bf0b081bd" => "JSFAW", // "UKSF" "5a435eea905d47336442c75a" => "JSFAW", // "Joint Special Forces Aviation Wing" "5a441619730e9d162834500b" => "JSFAW", // "7 Squadron" @@ -50,9 +50,9 @@ public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) { } public static void ResolveSpecialUnits(ref List orderedUnits) { - List newOrderedUnits = new List(); + List newOrderedUnits = new(); foreach (MissionUnit unit in orderedUnits) { - switch (unit.sourceUnit.id) { + switch (unit.SourceUnit.Id) { case "5a42835b55d6109bf0b081bd": // "UKSF" case "5a441619730e9d162834500b": // "7 Squadron" case "5a441602730e9d162834500a": // "656 Squadron" @@ -70,26 +70,26 @@ public static void ResolveSpecialUnits(ref List orderedUnits) { } public static List ResolveUnitSlots(MissionUnit unit) { - List slots = new List(); + List slots = new(); int max = 8; int fillerCount; - switch (unit.sourceUnit.id) { + switch (unit.SourceUnit.Id) { case "5a435eea905d47336442c75a": // "Joint Special Forces Aviation Wing" - slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a42835b55d6109bf0b081bd")?.members ?? new List()); - slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a435eea905d47336442c75a")?.members ?? new List()); - slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a441619730e9d162834500b")?.members ?? new List()); - slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a441602730e9d162834500a")?.members ?? new List()); - slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a4415d8730e9d1628345007")?.members ?? new List()); - slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5a848590eab14d12cc7fa618")?.members ?? new List()); - slots.AddRange(MissionPatchData.instance.units.Find(x => x.sourceUnit.id == "5c98d7b396dba31f24cdb19c")?.members ?? new List()); + slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5a42835b55d6109bf0b081bd")?.Members ?? new List()); + slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5a435eea905d47336442c75a")?.Members ?? new List()); + slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5a441619730e9d162834500b")?.Members ?? new List()); + slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5a441602730e9d162834500a")?.Members ?? new List()); + slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5a4415d8730e9d1628345007")?.Members ?? new List()); + slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5a848590eab14d12cc7fa618")?.Members ?? new List()); + slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5c98d7b396dba31f24cdb19c")?.Members ?? new List()); break; case "5a68b28e196530164c9b4fed": // "Sniper Platoon" max = 3; - slots.AddRange(unit.members); + slots.AddRange(unit.Members); fillerCount = max - slots.Count; for (int i = 0; i < fillerCount; i++) { - MissionPlayer player = new MissionPlayer { name = "Sniper", unit = unit, rank = MissionPatchData.instance.ranks.Find(x => x.name == "Private") }; - player.objectClass = ResolveObjectClass(player); + MissionPlayer player = new() { Name = "Sniper", Unit = unit, Rank = MissionPatchData.Instance.Ranks.Find(x => x.Name == "Private") }; + player.ObjectClass = ResolveObjectClass(player); slots.Add(player); } @@ -97,25 +97,25 @@ public static List ResolveUnitSlots(MissionUnit unit) { case "5bbbb9645eb3a4170c488b36": // "Guardian 1-1" case "5bbbbdab5eb3a4170c488f2e": // "Guardian 1-2" case "5bbbbe365eb3a4170c488f30": // "Guardian 1-3" - slots.AddRange(unit.members); + slots.AddRange(unit.Members); fillerCount = max - slots.Count; for (int i = 0; i < fillerCount; i++) { - MissionPlayer player = new MissionPlayer { name = "Reserve", unit = unit, rank = MissionPatchData.instance.ranks.Find(x => x.name == "Recruit") }; - player.objectClass = ResolveObjectClass(player); + MissionPlayer player = new() { Name = "Reserve", Unit = unit, Rank = MissionPatchData.Instance.Ranks.Find(x => x.Name == "Recruit") }; + player.ObjectClass = ResolveObjectClass(player); slots.Add(player); } break; case "5ad748e0de5d414f4c4055e0": // "Guardian 1-R" for (int i = 0; i < 6; i++) { - MissionPlayer player = new MissionPlayer { name = "Reserve", unit = unit, rank = MissionPatchData.instance.ranks.Find(x => x.name == "Recruit") }; - player.objectClass = ResolveObjectClass(player); + MissionPlayer player = new() { Name = "Reserve", Unit = unit, Rank = MissionPatchData.Instance.Ranks.Find(x => x.Name == "Recruit") }; + player.ObjectClass = ResolveObjectClass(player); slots.Add(player); } break; default: - slots = unit.members; + slots = unit.Members; break; } @@ -123,16 +123,16 @@ public static List ResolveUnitSlots(MissionUnit unit) { (a, b) => { int roleA = ResolvePlayerUnitRole(a); int roleB = ResolvePlayerUnitRole(b); - int rankA = MissionPatchData.instance.ranks.IndexOf(a.rank); - int rankB = MissionPatchData.instance.ranks.IndexOf(b.rank); - return roleA < roleB ? 1 : roleA > roleB ? -1 : rankA < rankB ? -1 : rankA > rankB ? 1 : string.CompareOrdinal(a.name, b.name); + int rankA = MissionPatchData.Instance.Ranks.IndexOf(a.Rank); + int rankB = MissionPatchData.Instance.Ranks.IndexOf(b.Rank); + return roleA < roleB ? 1 : roleA > roleB ? -1 : rankA < rankB ? -1 : rankA > rankB ? 1 : string.CompareOrdinal(a.Name, b.Name); } ); return slots; } public static bool IsUnitPermanent(MissionUnit unit) { - return unit.sourceUnit.id switch { + return unit.SourceUnit.Id switch { "5bbbb9645eb3a4170c488b36" => true, // "Guardian 1-1" "5bbbbdab5eb3a4170c488f2e" => true, // "Guardian 1-2" "5bbbbe365eb3a4170c488f30" => true, // "Guardian 1-3" diff --git a/UKSF.Api.ArmaMissions/Services/MissionEntityHelper.cs b/UKSF.Api.ArmaMissions/Services/MissionEntityHelper.cs index 7015b22a..ae0b222f 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionEntityHelper.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionEntityHelper.cs @@ -6,48 +6,48 @@ namespace UKSF.Api.ArmaMissions.Services { public static class MissionEntityHelper { public static MissionEntity CreateFromItems(List rawEntities) { - MissionEntity missionEntity = new MissionEntity {itemsCount = Convert.ToInt32(MissionUtilities.ReadSingleDataByKey(rawEntities, "items"))}; + MissionEntity missionEntity = new() { ItemsCount = Convert.ToInt32(MissionUtilities.ReadSingleDataByKey(rawEntities, "items")) }; int index = rawEntities.FindIndex(x => x.Contains("class Item")); - while (missionEntity.missionEntityItems.Count != missionEntity.itemsCount) { - missionEntity.missionEntityItems.Add(MissionEntityItemHelper.CreateFromList(MissionUtilities.ReadDataFromIndex(rawEntities, ref index))); + while (missionEntity.MissionEntityItems.Count != missionEntity.ItemsCount) { + missionEntity.MissionEntityItems.Add(MissionEntityItemHelper.CreateFromList(MissionUtilities.ReadDataFromIndex(rawEntities, ref index))); } return missionEntity; } private static MissionEntity CreateFromUnit(MissionUnit unit) { - MissionEntity missionEntity = new MissionEntity(); + MissionEntity missionEntity = new(); List slots = MissionDataResolver.ResolveUnitSlots(unit); for (int i = 0; i < slots.Count; i++) { - missionEntity.missionEntityItems.Add(MissionEntityItemHelper.CreateFromPlayer(slots[i], i)); + missionEntity.MissionEntityItems.Add(MissionEntityItemHelper.CreateFromPlayer(slots[i], i)); } return missionEntity; } public static void Patch(this MissionEntity missionEntity, int maxCurators) { - MissionEntityItem.position = 10; - missionEntity.missionEntityItems.RemoveAll(x => x.dataType.Equals("Group") && x.missionEntity != null && x.missionEntity.missionEntityItems.All(y => y.isPlayable && !y.Ignored())); - foreach (MissionUnit unit in MissionPatchData.instance.orderedUnits) { - missionEntity.missionEntityItems.Add(MissionEntityItemHelper.CreateFromMissionEntity(CreateFromUnit(unit), unit.callsign)); + MissionEntityItem.Position = 10; + missionEntity.MissionEntityItems.RemoveAll(x => x.DataType.Equals("Group") && x.MissionEntity != null && x.MissionEntity.MissionEntityItems.All(y => y.IsPlayable && !y.Ignored())); + foreach (MissionUnit unit in MissionPatchData.Instance.OrderedUnits) { + missionEntity.MissionEntityItems.Add(MissionEntityItemHelper.CreateFromMissionEntity(CreateFromUnit(unit), unit.Callsign)); } - - MissionEntityItem.curatorPosition = 0.5; - missionEntity.missionEntityItems.RemoveAll(x => x.dataType == "Logic" && x.type == "ModuleCurator_F"); + + MissionEntityItem.CuratorPosition = 0.5; + missionEntity.MissionEntityItems.RemoveAll(x => x.DataType == "Logic" && x.Type == "ModuleCurator_F"); for (int index = 0; index < maxCurators; index++) { - missionEntity.missionEntityItems.Add(MissionEntityItemHelper.CreateCuratorEntity()); + missionEntity.MissionEntityItems.Add(MissionEntityItemHelper.CreateCuratorEntity()); } - missionEntity.itemsCount = missionEntity.missionEntityItems.Count; - for (int index = 0; index < missionEntity.missionEntityItems.Count; index++) { - missionEntity.missionEntityItems[index].Patch(index); + missionEntity.ItemsCount = missionEntity.MissionEntityItems.Count; + for (int index = 0; index < missionEntity.MissionEntityItems.Count; index++) { + missionEntity.MissionEntityItems[index].Patch(index); } } public static IEnumerable Serialize(this MissionEntity missionEntity) { - missionEntity.itemsCount = missionEntity.missionEntityItems.Count; - List serialized = new List {"class Entities", "{", $"items = {missionEntity.itemsCount};"}; - foreach (MissionEntityItem item in missionEntity.missionEntityItems) { + missionEntity.ItemsCount = missionEntity.MissionEntityItems.Count; + List serialized = new() { "class Entities", "{", $"items = {missionEntity.ItemsCount};" }; + foreach (MissionEntityItem item in missionEntity.MissionEntityItems) { serialized.AddRange(item.Serialize()); } diff --git a/UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs b/UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs index bec12fa9..67cf249c 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs @@ -5,25 +5,25 @@ namespace UKSF.Api.ArmaMissions.Services { public static class MissionEntityItemHelper { public static MissionEntityItem CreateFromList(List rawItem) { - MissionEntityItem missionEntityItem = new MissionEntityItem {rawMissionEntityItem = rawItem}; - missionEntityItem.dataType = MissionUtilities.ReadSingleDataByKey(missionEntityItem.rawMissionEntityItem, "dataType").ToString(); - if (missionEntityItem.dataType.Equals("Group")) { - missionEntityItem.rawMissionEntities = MissionUtilities.ReadDataByKey(missionEntityItem.rawMissionEntityItem, "Entities"); - if (missionEntityItem.rawMissionEntities.Count > 0) { - missionEntityItem.missionEntity = MissionEntityHelper.CreateFromItems(missionEntityItem.rawMissionEntities); + MissionEntityItem missionEntityItem = new() { RawMissionEntityItem = rawItem }; + missionEntityItem.DataType = MissionUtilities.ReadSingleDataByKey(missionEntityItem.RawMissionEntityItem, "dataType").ToString(); + if (missionEntityItem.DataType.Equals("Group")) { + missionEntityItem.RawMissionEntities = MissionUtilities.ReadDataByKey(missionEntityItem.RawMissionEntityItem, "Entities"); + if (missionEntityItem.RawMissionEntities.Count > 0) { + missionEntityItem.MissionEntity = MissionEntityHelper.CreateFromItems(missionEntityItem.RawMissionEntities); } - } else if (missionEntityItem.dataType.Equals("Object")) { - string isPlayable = MissionUtilities.ReadSingleDataByKey(missionEntityItem.rawMissionEntityItem, "isPlayable").ToString(); - string isPlayer = MissionUtilities.ReadSingleDataByKey(missionEntityItem.rawMissionEntityItem, "isPlayer").ToString(); + } else if (missionEntityItem.DataType.Equals("Object")) { + string isPlayable = MissionUtilities.ReadSingleDataByKey(missionEntityItem.RawMissionEntityItem, "isPlayable").ToString(); + string isPlayer = MissionUtilities.ReadSingleDataByKey(missionEntityItem.RawMissionEntityItem, "isPlayer").ToString(); if (!string.IsNullOrEmpty(isPlayable)) { - missionEntityItem.isPlayable = isPlayable == "1"; + missionEntityItem.IsPlayable = isPlayable == "1"; } else if (!string.IsNullOrEmpty(isPlayer)) { - missionEntityItem.isPlayable = isPlayer == "1"; + missionEntityItem.IsPlayable = isPlayer == "1"; } - } else if (missionEntityItem.dataType.Equals("Logic")) { - string type = MissionUtilities.ReadSingleDataByKey(missionEntityItem.rawMissionEntityItem, "type").ToString(); + } else if (missionEntityItem.DataType.Equals("Logic")) { + string type = MissionUtilities.ReadSingleDataByKey(missionEntityItem.RawMissionEntityItem, "type").ToString(); if (!string.IsNullOrEmpty(type)) { - missionEntityItem.type = type; + missionEntityItem.Type = type; } } @@ -31,103 +31,103 @@ public static MissionEntityItem CreateFromList(List rawItem) { } public static MissionEntityItem CreateFromPlayer(MissionPlayer missionPlayer, int index) { - MissionEntityItem missionEntityItem = new MissionEntityItem(); - missionEntityItem.rawMissionEntityItem.Add($"class Item{index}"); - missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("dataType=\"Object\";"); - missionEntityItem.rawMissionEntityItem.Add($"flags={(index == 0 ? "7" : "5")};"); - missionEntityItem.rawMissionEntityItem.Add($"id={Mission.nextId++};"); - missionEntityItem.rawMissionEntityItem.Add("class PositionInfo"); - missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("position[]={" + $"{MissionEntityItem.position++}" + ",0,0};"); - missionEntityItem.rawMissionEntityItem.Add("};"); - missionEntityItem.rawMissionEntityItem.Add("side=\"West\";"); - missionEntityItem.rawMissionEntityItem.Add($"type=\"{missionPlayer.objectClass}\";"); - missionEntityItem.rawMissionEntityItem.Add("class Attributes"); - missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("isPlayable=1;"); - missionEntityItem.rawMissionEntityItem.Add( - $"description=\"{missionPlayer.name}{(string.IsNullOrEmpty(missionPlayer.account?.roleAssignment) ? "" : $" - {missionPlayer.account?.roleAssignment}")}@{MissionDataResolver.ResolveCallsign(missionPlayer.unit, missionPlayer.unit.sourceUnit?.callsign)}\";" + MissionEntityItem missionEntityItem = new(); + missionEntityItem.RawMissionEntityItem.Add($"class Item{index}"); + missionEntityItem.RawMissionEntityItem.Add("{"); + missionEntityItem.RawMissionEntityItem.Add("dataType=\"Object\";"); + missionEntityItem.RawMissionEntityItem.Add($"flags={(index == 0 ? "7" : "5")};"); + missionEntityItem.RawMissionEntityItem.Add($"id={Mission.NextId++};"); + missionEntityItem.RawMissionEntityItem.Add("class PositionInfo"); + missionEntityItem.RawMissionEntityItem.Add("{"); + missionEntityItem.RawMissionEntityItem.Add("position[]={" + $"{MissionEntityItem.Position++}" + ",0,0};"); + missionEntityItem.RawMissionEntityItem.Add("};"); + missionEntityItem.RawMissionEntityItem.Add("side=\"West\";"); + missionEntityItem.RawMissionEntityItem.Add($"type=\"{missionPlayer.ObjectClass}\";"); + missionEntityItem.RawMissionEntityItem.Add("class Attributes"); + missionEntityItem.RawMissionEntityItem.Add("{"); + missionEntityItem.RawMissionEntityItem.Add("isPlayable=1;"); + missionEntityItem.RawMissionEntityItem.Add( + $"description=\"{missionPlayer.Name}{(string.IsNullOrEmpty(missionPlayer.Account?.RoleAssignment) ? "" : $" - {missionPlayer.Account?.RoleAssignment}")}@{MissionDataResolver.ResolveCallsign(missionPlayer.Unit, missionPlayer.Unit.SourceUnit?.Callsign)}\";" ); - missionEntityItem.rawMissionEntityItem.Add("};"); - if (MissionDataResolver.IsEngineer(missionPlayer)) missionEntityItem.rawMissionEntityItem.AddEngineerTrait(); - missionEntityItem.rawMissionEntityItem.Add("};"); + missionEntityItem.RawMissionEntityItem.Add("};"); + if (MissionDataResolver.IsEngineer(missionPlayer)) missionEntityItem.RawMissionEntityItem.AddEngineerTrait(); + missionEntityItem.RawMissionEntityItem.Add("};"); return missionEntityItem; } public static MissionEntityItem CreateFromMissionEntity(MissionEntity entities, string callsign) { - MissionEntityItem missionEntityItem = new MissionEntityItem {missionEntity = entities}; - missionEntityItem.rawMissionEntityItem.Add("class Item"); - missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("dataType=\"Group\";"); - missionEntityItem.rawMissionEntityItem.Add("side=\"West\";"); - missionEntityItem.rawMissionEntityItem.Add($"id={Mission.nextId++};"); - missionEntityItem.rawMissionEntityItem.Add("class Entities"); - missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("};"); - missionEntityItem.rawMissionEntityItem.Add("class Attributes"); - missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("};"); - missionEntityItem.rawMissionEntityItem.Add("class CustomAttributes"); - missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("class Attribute0"); - missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("property=\"groupID\";"); - missionEntityItem.rawMissionEntityItem.Add("expression=\"[_this, _value] call CBA_fnc_setCallsign\";"); - missionEntityItem.rawMissionEntityItem.Add("class Value"); - missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("class data"); - missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("class type"); - missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("type[]={\"STRING\"};"); - missionEntityItem.rawMissionEntityItem.Add("};"); - missionEntityItem.rawMissionEntityItem.Add($"value=\"{callsign}\";"); - missionEntityItem.rawMissionEntityItem.Add("};"); - missionEntityItem.rawMissionEntityItem.Add("};"); - missionEntityItem.rawMissionEntityItem.Add("};"); - missionEntityItem.rawMissionEntityItem.Add("nAttributes=1;"); - missionEntityItem.rawMissionEntityItem.Add("};"); - missionEntityItem.rawMissionEntityItem.Add("};"); - missionEntityItem.rawMissionEntities = MissionUtilities.ReadDataByKey(missionEntityItem.rawMissionEntityItem, "Entities"); + MissionEntityItem missionEntityItem = new() { MissionEntity = entities }; + missionEntityItem.RawMissionEntityItem.Add("class Item"); + missionEntityItem.RawMissionEntityItem.Add("{"); + missionEntityItem.RawMissionEntityItem.Add("dataType=\"Group\";"); + missionEntityItem.RawMissionEntityItem.Add("side=\"West\";"); + missionEntityItem.RawMissionEntityItem.Add($"id={Mission.NextId++};"); + missionEntityItem.RawMissionEntityItem.Add("class Entities"); + missionEntityItem.RawMissionEntityItem.Add("{"); + missionEntityItem.RawMissionEntityItem.Add("};"); + missionEntityItem.RawMissionEntityItem.Add("class Attributes"); + missionEntityItem.RawMissionEntityItem.Add("{"); + missionEntityItem.RawMissionEntityItem.Add("};"); + missionEntityItem.RawMissionEntityItem.Add("class CustomAttributes"); + missionEntityItem.RawMissionEntityItem.Add("{"); + missionEntityItem.RawMissionEntityItem.Add("class Attribute0"); + missionEntityItem.RawMissionEntityItem.Add("{"); + missionEntityItem.RawMissionEntityItem.Add("property=\"groupID\";"); + missionEntityItem.RawMissionEntityItem.Add("expression=\"[_this, _value] call CBA_fnc_setCallsign\";"); + missionEntityItem.RawMissionEntityItem.Add("class Value"); + missionEntityItem.RawMissionEntityItem.Add("{"); + missionEntityItem.RawMissionEntityItem.Add("class data"); + missionEntityItem.RawMissionEntityItem.Add("{"); + missionEntityItem.RawMissionEntityItem.Add("class type"); + missionEntityItem.RawMissionEntityItem.Add("{"); + missionEntityItem.RawMissionEntityItem.Add("type[]={\"STRING\"};"); + missionEntityItem.RawMissionEntityItem.Add("};"); + missionEntityItem.RawMissionEntityItem.Add($"value=\"{callsign}\";"); + missionEntityItem.RawMissionEntityItem.Add("};"); + missionEntityItem.RawMissionEntityItem.Add("};"); + missionEntityItem.RawMissionEntityItem.Add("};"); + missionEntityItem.RawMissionEntityItem.Add("nAttributes=1;"); + missionEntityItem.RawMissionEntityItem.Add("};"); + missionEntityItem.RawMissionEntityItem.Add("};"); + missionEntityItem.RawMissionEntities = MissionUtilities.ReadDataByKey(missionEntityItem.RawMissionEntityItem, "Entities"); return missionEntityItem; } public static MissionEntityItem CreateCuratorEntity() { - MissionEntityItem missionEntityItem = new MissionEntityItem(); - missionEntityItem.rawMissionEntityItem.Add("class Item"); - missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("dataType=\"Logic\";"); - missionEntityItem.rawMissionEntityItem.Add($"id={Mission.nextId++};"); - missionEntityItem.rawMissionEntityItem.Add("class PositionInfo"); - missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("position[]={" + $"{MissionEntityItem.curatorPosition++}" + ",0,0.25};"); - missionEntityItem.rawMissionEntityItem.Add("};"); - missionEntityItem.rawMissionEntityItem.Add("type=\"ModuleCurator_F\";"); - missionEntityItem.rawMissionEntityItem.Add("class CustomAttributes"); - missionEntityItem.rawMissionEntityItem.Add("{"); - missionEntityItem.rawMissionEntityItem.Add("};"); - missionEntityItem.rawMissionEntityItem.Add("};"); + MissionEntityItem missionEntityItem = new(); + missionEntityItem.RawMissionEntityItem.Add("class Item"); + missionEntityItem.RawMissionEntityItem.Add("{"); + missionEntityItem.RawMissionEntityItem.Add("dataType=\"Logic\";"); + missionEntityItem.RawMissionEntityItem.Add($"id={Mission.NextId++};"); + missionEntityItem.RawMissionEntityItem.Add("class PositionInfo"); + missionEntityItem.RawMissionEntityItem.Add("{"); + missionEntityItem.RawMissionEntityItem.Add("position[]={" + $"{MissionEntityItem.CuratorPosition++}" + ",0,0.25};"); + missionEntityItem.RawMissionEntityItem.Add("};"); + missionEntityItem.RawMissionEntityItem.Add("type=\"ModuleCurator_F\";"); + missionEntityItem.RawMissionEntityItem.Add("class CustomAttributes"); + missionEntityItem.RawMissionEntityItem.Add("{"); + missionEntityItem.RawMissionEntityItem.Add("};"); + missionEntityItem.RawMissionEntityItem.Add("};"); return missionEntityItem; } public static bool Ignored(this MissionEntityItem missionEntityItem) { - return missionEntityItem.rawMissionEntityItem.Any(x => x.ToLower().Contains("@ignore")); + return missionEntityItem.RawMissionEntityItem.Any(x => x.ToLower().Contains("@ignore")); } public static void Patch(this MissionEntityItem missionEntityItem, int index) { - missionEntityItem.rawMissionEntityItem[0] = $"class Item{index}"; + missionEntityItem.RawMissionEntityItem[0] = $"class Item{index}"; } public static IEnumerable Serialize(this MissionEntityItem missionEntityItem) { - if (missionEntityItem.rawMissionEntities.Count > 0) { - int start = MissionUtilities.GetIndexByKey(missionEntityItem.rawMissionEntityItem, "Entities"); - int count = missionEntityItem.rawMissionEntities.Count; - missionEntityItem.rawMissionEntityItem.RemoveRange(start, count); - missionEntityItem.rawMissionEntityItem.InsertRange(start, missionEntityItem.missionEntity.Serialize()); + if (missionEntityItem.RawMissionEntities.Count > 0) { + int start = MissionUtilities.GetIndexByKey(missionEntityItem.RawMissionEntityItem, "Entities"); + int count = missionEntityItem.RawMissionEntities.Count; + missionEntityItem.RawMissionEntityItem.RemoveRange(start, count); + missionEntityItem.RawMissionEntityItem.InsertRange(start, missionEntityItem.MissionEntity.Serialize()); } - return missionEntityItem.rawMissionEntityItem.ToList(); + return missionEntityItem.RawMissionEntityItem.ToList(); } private static void AddEngineerTrait(this ICollection entity) { diff --git a/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs b/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs index f5ecd4d0..3dc9212c 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs @@ -4,62 +4,75 @@ using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; using UKSF.Api.ArmaMissions.Models; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; namespace UKSF.Api.ArmaMissions.Services { public class MissionPatchDataService { - private readonly IAccountService accountService; - private readonly IDisplayNameService displayNameService; - private readonly IVariablesService variablesService; - private readonly IRanksService ranksService; - private readonly IUnitsService unitsService; + private readonly IAccountContext _accountContext; + private readonly IDisplayNameService _displayNameService; + private readonly IRanksContext _ranksContext; + private readonly IRanksService _ranksService; + private readonly IUnitsContext _unitContext; + private readonly IVariablesService _variablesService; - public MissionPatchDataService(IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService, IVariablesService variablesService) { - this.ranksService = ranksService; - this.unitsService = unitsService; - this.accountService = accountService; - this.displayNameService = displayNameService; - this.variablesService = variablesService; + public MissionPatchDataService( + IRanksContext ranksContext, + IAccountContext accountContext, + IUnitsContext unitContext, + IRanksService ranksService, + IDisplayNameService displayNameService, + IVariablesService variablesService + ) { + _ranksContext = ranksContext; + _accountContext = accountContext; + _unitContext = unitContext; + _ranksService = ranksService; + _displayNameService = displayNameService; + _variablesService = variablesService; } public void UpdatePatchData() { - MissionPatchData.instance = new MissionPatchData { - units = new List(), ranks = ranksService.Data.Get().ToList(), players = new List(), orderedUnits = new List(), - medicIds = variablesService.GetVariable("MISSIONS_MEDIC_IDS").AsEnumerable(), - engineerIds = variablesService.GetVariable("MISSIONS_ENGINEER_IDS").AsEnumerable() + MissionPatchData.Instance = new MissionPatchData { + Units = new List(), + Ranks = _ranksContext.Get().ToList(), + Players = new List(), + OrderedUnits = new List(), + MedicIds = _variablesService.GetVariable("MISSIONS_MEDIC_IDS").AsEnumerable(), + EngineerIds = _variablesService.GetVariable("MISSIONS_ENGINEER_IDS").AsEnumerable() }; - foreach (Unit unit in unitsService.Data.Get(x => x.branch == UnitBranch.COMBAT).ToList()) { - MissionPatchData.instance.units.Add(new MissionUnit { sourceUnit = unit }); + foreach (Unit unit in _unitContext.Get(x => x.Branch == UnitBranch.COMBAT).ToList()) { + MissionPatchData.Instance.Units.Add(new MissionUnit { SourceUnit = unit }); } - foreach (Account account in accountService.Data.Get().Where(x => !string.IsNullOrEmpty(x.rank) && ranksService.IsSuperiorOrEqual(x.rank, "Recruit"))) { - MissionPatchData.instance.players.Add(new MissionPlayer { account = account, rank = ranksService.Data.GetSingle(account.rank), name = displayNameService.GetDisplayName(account) }); + foreach (Account account in _accountContext.Get().Where(x => !string.IsNullOrEmpty(x.Rank) && _ranksService.IsSuperiorOrEqual(x.Rank, "Recruit"))) { + MissionPatchData.Instance.Players.Add(new MissionPlayer { Account = account, Rank = _ranksContext.GetSingle(account.Rank), Name = _displayNameService.GetDisplayName(account) }); } - foreach (MissionUnit missionUnit in MissionPatchData.instance.units) { - missionUnit.callsign = MissionDataResolver.ResolveCallsign(missionUnit, missionUnit.sourceUnit.callsign); - missionUnit.members = missionUnit.sourceUnit.members.Select(x => MissionPatchData.instance.players.FirstOrDefault(y => y.account.id == x)).ToList(); - if (missionUnit.sourceUnit.roles.Count > 0) { - missionUnit.roles = missionUnit.sourceUnit.roles.ToDictionary(pair => pair.Key, pair => MissionPatchData.instance.players.FirstOrDefault(y => y.account.id == pair.Value)); + foreach (MissionUnit missionUnit in MissionPatchData.Instance.Units) { + missionUnit.Callsign = MissionDataResolver.ResolveCallsign(missionUnit, missionUnit.SourceUnit.Callsign); + missionUnit.Members = missionUnit.SourceUnit.Members.Select(x => MissionPatchData.Instance.Players.FirstOrDefault(y => y.Account.Id == x)).ToList(); + if (missionUnit.SourceUnit.Roles.Count > 0) { + missionUnit.Roles = missionUnit.SourceUnit.Roles.ToDictionary(pair => pair.Key, pair => MissionPatchData.Instance.Players.FirstOrDefault(y => y.Account.Id == pair.Value)); } } - foreach (MissionPlayer missionPlayer in MissionPatchData.instance.players) { - missionPlayer.unit = MissionPatchData.instance.units.Find(x => x.sourceUnit.name == missionPlayer.account.unitAssignment); - missionPlayer.objectClass = MissionDataResolver.ResolveObjectClass(missionPlayer); + foreach (MissionPlayer missionPlayer in MissionPatchData.Instance.Players) { + missionPlayer.Unit = MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Name == missionPlayer.Account.UnitAssignment); + missionPlayer.ObjectClass = MissionDataResolver.ResolveObjectClass(missionPlayer); } - MissionUnit parent = MissionPatchData.instance.units.First(x => x.sourceUnit.parent == ObjectId.Empty.ToString()); - MissionPatchData.instance.orderedUnits.Add(parent); - InsertUnitChildren(MissionPatchData.instance.orderedUnits, parent); - MissionPatchData.instance.orderedUnits.RemoveAll(x => !MissionDataResolver.IsUnitPermanent(x) && x.members.Count == 0 || string.IsNullOrEmpty(x.callsign)); - MissionDataResolver.ResolveSpecialUnits(ref MissionPatchData.instance.orderedUnits); + MissionUnit parent = MissionPatchData.Instance.Units.First(x => x.SourceUnit.Parent == ObjectId.Empty.ToString()); + MissionPatchData.Instance.OrderedUnits.Add(parent); + InsertUnitChildren(MissionPatchData.Instance.OrderedUnits, parent); + MissionPatchData.Instance.OrderedUnits.RemoveAll(x => !MissionDataResolver.IsUnitPermanent(x) && x.Members.Count == 0 || string.IsNullOrEmpty(x.Callsign)); + MissionDataResolver.ResolveSpecialUnits(ref MissionPatchData.Instance.OrderedUnits); } private static void InsertUnitChildren(List newUnits, MissionUnit parent) { - List children = MissionPatchData.instance.units.Where(x => x.sourceUnit.parent == parent.sourceUnit.id).OrderBy(x => x.sourceUnit.order).ToList(); + List children = MissionPatchData.Instance.Units.Where(x => x.SourceUnit.Parent == parent.SourceUnit.Id).OrderBy(x => x.SourceUnit.Order).ToList(); if (children.Count == 0) return; int index = newUnits.IndexOf(parent); newUnits.InsertRange(index + 1, children); diff --git a/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs b/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs index 693e0188..04e23ae9 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs @@ -19,10 +19,10 @@ public interface IMissionPatchingService { public class MissionPatchingService : IMissionPatchingService { private const string EXTRACT_PBO = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\ExtractPboDos.exe"; private const string MAKE_PBO = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\MakePbo.exe"; + private readonly ILogger _logger; private readonly MissionService _missionService; private readonly IVariablesService _variablesService; - private readonly ILogger _logger; private string _filePath; private string _folderPath; private string _parentFolderPath; @@ -38,20 +38,20 @@ public Task PatchMission(string path, string armaServerMo async () => { _filePath = path; _parentFolderPath = Path.GetDirectoryName(_filePath); - MissionPatchingResult result = new MissionPatchingResult(); + MissionPatchingResult result = new(); try { CreateBackup(); UnpackPbo(); - Mission mission = new Mission(_folderPath); - result.reports = _missionService.ProcessMission(mission, armaServerModsPath, armaServerDefaultMaxCurators); + Mission mission = new(_folderPath); + result.Reports = _missionService.ProcessMission(mission, armaServerModsPath, armaServerDefaultMaxCurators); await PackPbo(); - result.playerCount = mission.playerCount; - result.success = result.reports.All(x => !x.error); + result.PlayerCount = mission.PlayerCount; + result.Success = result.Reports.All(x => !x.Error); } catch (Exception exception) { _logger.LogError(exception); - result.reports = new List { new MissionPatchingReport(exception) }; - result.success = false; + result.Reports = new List { new(exception) }; + result.Success = false; } finally { Cleanup(); } @@ -81,7 +81,7 @@ private void UnpackPbo() { Directory.Delete(_folderPath, true); } - Process process = new Process { StartInfo = { FileName = EXTRACT_PBO, Arguments = $"-D -P \"{_filePath}\"", UseShellExecute = false, CreateNoWindow = true } }; + Process process = new() { StartInfo = { FileName = EXTRACT_PBO, Arguments = $"-D -P \"{_filePath}\"", UseShellExecute = false, CreateNoWindow = true } }; process.Start(); process.WaitForExit(); @@ -95,7 +95,7 @@ private async Task PackPbo() { _filePath += ".pbo"; } - Process process = new Process { + Process process = new() { StartInfo = { FileName = MAKE_PBO, WorkingDirectory = _variablesService.GetVariable("MISSIONS_WORKING_DIR").AsString(), diff --git a/UKSF.Api.ArmaMissions/Services/MissionService.cs b/UKSF.Api.ArmaMissions/Services/MissionService.cs index 368fc6ea..616b0298 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionService.cs @@ -56,7 +56,7 @@ public List ProcessMission(Mission tempMission, string ar } private bool AssertRequiredFiles() { - if (!File.Exists(_mission.descriptionPath)) { + if (!File.Exists(_mission.DescriptionPath)) { _reports.Add( new MissionPatchingReport( "Missing file: description.ext", @@ -68,7 +68,7 @@ private bool AssertRequiredFiles() { return false; } - if (!File.Exists(Path.Combine(_mission.path, "cba_settings.sqf"))) { + if (!File.Exists(Path.Combine(_mission.Path, "cba_settings.sqf"))) { _reports.Add( new MissionPatchingReport( "Missing file: cba_settings.sqf", @@ -81,77 +81,77 @@ private bool AssertRequiredFiles() { return false; } - if (File.Exists(Path.Combine(_mission.path, "README.txt"))) { - File.Delete(Path.Combine(_mission.path, "README.txt")); + if (File.Exists(Path.Combine(_mission.Path, "README.txt"))) { + File.Delete(Path.Combine(_mission.Path, "README.txt")); } return true; } private bool CheckIgnoreKey(string key) { - _mission.descriptionLines = File.ReadAllLines(_mission.descriptionPath).ToList(); - return _mission.descriptionLines.Any(x => x.ContainsIgnoreCase(key)); + _mission.DescriptionLines = File.ReadAllLines(_mission.DescriptionPath).ToList(); + return _mission.DescriptionLines.Any(x => x.ContainsIgnoreCase(key)); } private bool CheckBinned() { - Process process = new Process { StartInfo = { FileName = UNBIN, Arguments = $"-p -q \"{_mission.sqmPath}\"", UseShellExecute = false, CreateNoWindow = true } }; + Process process = new() { StartInfo = { FileName = UNBIN, Arguments = $"-p -q \"{_mission.SqmPath}\"", UseShellExecute = false, CreateNoWindow = true } }; process.Start(); process.WaitForExit(); return process.ExitCode == 0; } private void UnBin() { - Process process = new Process { StartInfo = { FileName = UNBIN, Arguments = $"-p \"{_mission.sqmPath}\"", UseShellExecute = false, CreateNoWindow = true } }; + Process process = new() { StartInfo = { FileName = UNBIN, Arguments = $"-p \"{_mission.SqmPath}\"", UseShellExecute = false, CreateNoWindow = true } }; process.Start(); process.WaitForExit(); - if (File.Exists($"{_mission.sqmPath}.txt")) { - File.Delete(_mission.sqmPath); - File.Move($"{_mission.sqmPath}.txt", _mission.sqmPath); + if (File.Exists($"{_mission.SqmPath}.txt")) { + File.Delete(_mission.SqmPath); + File.Move($"{_mission.SqmPath}.txt", _mission.SqmPath); } else { throw new FileNotFoundException(); } } private void Read() { - _mission.sqmLines = File.ReadAllLines(_mission.sqmPath).Select(x => x.Trim()).ToList(); - _mission.sqmLines.RemoveAll(string.IsNullOrEmpty); + _mission.SqmLines = File.ReadAllLines(_mission.SqmPath).Select(x => x.Trim()).ToList(); + _mission.SqmLines.RemoveAll(string.IsNullOrEmpty); RemoveUnbinText(); ReadAllData(); ReadSettings(); } private void RemoveUnbinText() { - if (_mission.sqmLines.First() != "////////////////////////////////////////////////////////////////////") return; + if (_mission.SqmLines.First() != "////////////////////////////////////////////////////////////////////") return; - _mission.sqmLines = _mission.sqmLines.Skip(7).ToList(); + _mission.SqmLines = _mission.SqmLines.Skip(7).ToList(); // mission.sqmLines = mission.sqmLines.Take(mission.sqmLines.Count - 1).ToList(); } private void ReadAllData() { - Mission.nextId = Convert.ToInt32(MissionUtilities.ReadSingleDataByKey(MissionUtilities.ReadDataByKey(_mission.sqmLines, "ItemIDProvider"), "nextID")); - _mission.rawEntities = MissionUtilities.ReadDataByKey(_mission.sqmLines, "Entities"); - _mission.missionEntity = MissionEntityHelper.CreateFromItems(_mission.rawEntities); + Mission.NextId = Convert.ToInt32(MissionUtilities.ReadSingleDataByKey(MissionUtilities.ReadDataByKey(_mission.SqmLines, "ItemIDProvider"), "nextID")); + _mission.RawEntities = MissionUtilities.ReadDataByKey(_mission.SqmLines, "Entities"); + _mission.MissionEntity = MissionEntityHelper.CreateFromItems(_mission.RawEntities); } private void ReadSettings() { - _mission.maxCurators = 5; - string curatorsMaxLine = File.ReadAllLines(Path.Combine(_mission.path, "cba_settings.sqf")).FirstOrDefault(x => x.Contains("uksf_curator_curatorsMax")); + _mission.MaxCurators = 5; + string curatorsMaxLine = File.ReadAllLines(Path.Combine(_mission.Path, "cba_settings.sqf")).FirstOrDefault(x => x.Contains("uksf_curator_curatorsMax")); if (string.IsNullOrEmpty(curatorsMaxLine)) { - _mission.maxCurators = _armaServerDefaultMaxCurators; + _mission.MaxCurators = _armaServerDefaultMaxCurators; _reports.Add( new MissionPatchingReport( "Using server setting 'uksf_curator_curatorsMax'", "Could not find setting 'uksf_curator_curatorsMax' in cba_settings.sqf" + "This is required to add the correct nubmer of pre-defined curator objects." + - $"The server setting value ({_mission.maxCurators}) for this will be used instead." + $"The server setting value ({_mission.MaxCurators}) for this will be used instead." ) ); return; } string curatorsMaxString = curatorsMaxLine.Split("=")[1].RemoveSpaces().Replace(";", ""); - if (!int.TryParse(curatorsMaxString, out _mission.maxCurators)) { + if (!int.TryParse(curatorsMaxString, out _mission.MaxCurators)) { _reports.Add( new MissionPatchingReport( "Using hardcoded setting 'uksf_curator_curatorsMax'", @@ -164,10 +164,10 @@ private void ReadSettings() { } private void Patch() { - _mission.missionEntity.Patch(_mission.maxCurators); + _mission.MissionEntity.Patch(_mission.MaxCurators); if (!CheckIgnoreKey("missionImageIgnore")) { - string imagePath = Path.Combine(_mission.path, "uksf.paa"); + string imagePath = Path.Combine(_mission.Path, "uksf.paa"); string modpackImagePath = Path.Combine(_armaServerModsPath, "@uksf", "UKSFTemplate.VR", "uksf.paa"); if (File.Exists(modpackImagePath)) { if (File.Exists(imagePath) && new FileInfo(imagePath).Length != new FileInfo(modpackImagePath).Length) { @@ -187,27 +187,27 @@ private void Patch() { } private void Write() { - int start = MissionUtilities.GetIndexByKey(_mission.sqmLines, "Entities"); - int count = _mission.rawEntities.Count; - _mission.sqmLines.RemoveRange(start, count); - IEnumerable newEntities = _mission.missionEntity.Serialize(); - _mission.sqmLines.InsertRange(start, newEntities); - _mission.sqmLines = _mission.sqmLines.Select(x => x.RemoveNewLines().RemoveEmbeddedQuotes()).ToList(); - File.WriteAllLines(_mission.sqmPath, _mission.sqmLines); + int start = MissionUtilities.GetIndexByKey(_mission.SqmLines, "Entities"); + int count = _mission.RawEntities.Count; + _mission.SqmLines.RemoveRange(start, count); + IEnumerable newEntities = _mission.MissionEntity.Serialize(); + _mission.SqmLines.InsertRange(start, newEntities); + _mission.SqmLines = _mission.SqmLines.Select(x => x.RemoveNewLines().RemoveEmbeddedQuotes()).ToList(); + File.WriteAllLines(_mission.SqmPath, _mission.SqmLines); } private void PatchDescription() { - int playable = _mission.sqmLines.Select(x => x.RemoveSpaces()).Count(x => x.ContainsIgnoreCase("isPlayable=1") || x.ContainsIgnoreCase("isPlayer=1")); - _mission.playerCount = playable; + int playable = _mission.SqmLines.Select(x => x.RemoveSpaces()).Count(x => x.ContainsIgnoreCase("isPlayable=1") || x.ContainsIgnoreCase("isPlayer=1")); + _mission.PlayerCount = playable; - _mission.descriptionLines = File.ReadAllLines(_mission.descriptionPath).ToList(); - _mission.descriptionLines[_mission.descriptionLines.FindIndex(x => x.ContainsIgnoreCase("maxPlayers"))] = $" maxPlayers = {playable};"; + _mission.DescriptionLines = File.ReadAllLines(_mission.DescriptionPath).ToList(); + _mission.DescriptionLines[_mission.DescriptionLines.FindIndex(x => x.ContainsIgnoreCase("maxPlayers"))] = $" maxPlayers = {playable};"; CheckRequiredDescriptionItems(); CheckConfigurableDescriptionItems(); - _mission.descriptionLines = _mission.descriptionLines.Where(x => !x.Contains("__EXEC")).ToList(); + _mission.DescriptionLines = _mission.DescriptionLines.Where(x => !x.Contains("__EXEC")).ToList(); - File.WriteAllLines(_mission.descriptionPath, _mission.descriptionLines); + File.WriteAllLines(_mission.DescriptionPath, _mission.DescriptionLines); } private void CheckConfigurableDescriptionItems() { @@ -232,9 +232,9 @@ private void CheckRequiredDescriptionItems() { } private void CheckDescriptionItem(string key, string defaultValue, bool required = true) { - int index = _mission.descriptionLines.FindIndex(x => x.Contains($"{key} = ") || x.Contains($"{key}=") || x.Contains($"{key}= ") || x.Contains($"{key} =")); + int index = _mission.DescriptionLines.FindIndex(x => x.Contains($"{key} = ") || x.Contains($"{key}=") || x.Contains($"{key}= ") || x.Contains($"{key} =")); if (index != -1) { - string itemValue = _mission.descriptionLines[index].Split("=")[1].Trim(); + string itemValue = _mission.DescriptionLines[index].Split("=")[1].Trim(); itemValue = itemValue.Remove(itemValue.Length - 1); bool equal = string.Equals(itemValue, defaultValue, StringComparison.InvariantCultureIgnoreCase); if (!equal && required) { @@ -257,7 +257,7 @@ private void CheckDescriptionItem(string key, string defaultValue, bool required } if (required) { - _mission.descriptionLines.Add($"{key} = {defaultValue};"); + _mission.DescriptionLines.Add($"{key} = {defaultValue};"); } else { _reports.Add( new MissionPatchingReport( diff --git a/UKSF.Api.ArmaMissions/Services/MissionUtilities.cs b/UKSF.Api.ArmaMissions/Services/MissionUtilities.cs index e491ed8e..e2d0469a 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionUtilities.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionUtilities.cs @@ -4,10 +4,10 @@ namespace UKSF.Api.ArmaMissions.Services { public static class MissionUtilities { public static List ReadDataFromIndex(List source, ref int index) { - List data = new List {source[index]}; + List data = new() { source[index] }; index += 1; string opening = source[index]; - Stack stack = new Stack(); + Stack stack = new(); stack.Push(opening); data.Add(opening); index += 1; diff --git a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs index 80bab99c..2c9b509e 100644 --- a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs +++ b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs @@ -11,7 +11,7 @@ namespace UKSF.Api.ArmaServer { public static class ApiArmaServerExtensions { public static IServiceCollection AddUksfArmaServer(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); - private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton(); private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>(); diff --git a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs index 65cbd438..85c2e778 100644 --- a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs +++ b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs @@ -9,9 +9,11 @@ using MongoDB.Driver; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; using UKSF.Api.ArmaMissions.Models; +using UKSF.Api.ArmaServer.DataContext; using UKSF.Api.ArmaServer.Models; using UKSF.Api.ArmaServer.Services; using UKSF.Api.ArmaServer.Signalr.Clients; @@ -23,226 +25,238 @@ namespace UKSF.Api.ArmaServer.Controllers { [Route("[controller]"), Permissions(Permissions.NCO, Permissions.SERVERS, Permissions.COMMAND)] public class GameServersController : Controller { - private readonly IGameServersService gameServersService; - private readonly IHubContext serversHub; - private readonly IVariablesService variablesService; - private readonly IGameServerHelpers gameServerHelpers; - private readonly ILogger logger; - - public GameServersController(IGameServersService gameServersService, IHubContext serversHub, IVariablesService variablesService, IGameServerHelpers gameServerHelpers, ILogger logger) { - this.gameServersService = gameServersService; - this.serversHub = serversHub; - this.variablesService = variablesService; - this.gameServerHelpers = gameServerHelpers; - this.logger = logger; + private readonly IGameServerHelpers _gameServerHelpers; + private readonly IGameServersContext _gameServersContext; + private readonly IGameServersService _gameServersService; + private readonly ILogger _logger; + private readonly IHubContext _serversHub; + private readonly IVariablesContext _variablesContext; + private readonly IVariablesService _variablesService; + + public GameServersController( + IGameServersContext gameServersContext, + IVariablesContext variablesContext, + IGameServersService gameServersService, + IHubContext serversHub, + IVariablesService variablesService, + IGameServerHelpers gameServerHelpers, + ILogger logger + ) { + _gameServersContext = gameServersContext; + _variablesContext = variablesContext; + _gameServersService = gameServersService; + _serversHub = serversHub; + _variablesService = variablesService; + _gameServerHelpers = gameServerHelpers; + _logger = logger; } [HttpGet, Authorize] public IActionResult GetGameServers() => - Ok(new { servers = gameServersService.Data.Get(), missions = gameServersService.GetMissionFiles(), instanceCount = gameServersService.GetGameInstanceCount() }); + Ok(new { servers = _gameServersContext.Get(), missions = _gameServersService.GetMissionFiles(), instanceCount = _gameServersService.GetGameInstanceCount() }); [HttpGet("status/{id}"), Authorize] public async Task GetGameServerStatus(string id) { - GameServer gameServer = gameServersService.Data.GetSingle(id); - await gameServersService.GetGameServerStatus(gameServer); - return Ok(new { gameServer, instanceCount = gameServersService.GetGameInstanceCount() }); + GameServer gameServer = _gameServersContext.GetSingle(id); + await _gameServersService.GetGameServerStatus(gameServer); + return Ok(new { gameServer, instanceCount = _gameServersService.GetGameInstanceCount() }); } [HttpPost("{check}"), Authorize] public IActionResult CheckGameServers(string check, [FromBody] GameServer gameServer = null) { if (gameServer != null) { GameServer safeGameServer = gameServer; - return Ok(gameServersService.Data.GetSingle(x => x.id != safeGameServer.id && (x.name == check || x.apiPort.ToString() == check))); + return Ok(_gameServersContext.GetSingle(x => x.Id != safeGameServer.Id && (x.Name == check || x.ApiPort.ToString() == check))); } - return Ok(gameServersService.Data.GetSingle(x => x.name == check || x.apiPort.ToString() == check)); + return Ok(_gameServersContext.GetSingle(x => x.Name == check || x.ApiPort.ToString() == check)); } [HttpPut, Authorize] public async Task AddServer([FromBody] GameServer gameServer) { - await gameServersService.Data.Add(gameServer); - logger.LogAudit($"Server added '{gameServer}'"); + await _gameServersContext.Add(gameServer); + _logger.LogAudit($"Server added '{gameServer}'"); return Ok(); } [HttpPatch, Authorize] public async Task EditGameServer([FromBody] GameServer gameServer) { - GameServer oldGameServer = gameServersService.Data.GetSingle(x => x.id == gameServer.id); - logger.LogAudit($"Game server '{gameServer.name}' updated:{oldGameServer.Changes(gameServer)}"); + GameServer oldGameServer = _gameServersContext.GetSingle(x => x.Id == gameServer.Id); + _logger.LogAudit($"Game server '{gameServer.Name}' updated:{oldGameServer.Changes(gameServer)}"); bool environmentChanged = false; - if (oldGameServer.environment != gameServer.environment) { + if (oldGameServer.Environment != gameServer.Environment) { environmentChanged = true; - gameServer.mods = gameServersService.GetEnvironmentMods(gameServer.environment); - gameServer.serverMods = new List(); + gameServer.Mods = _gameServersService.GetEnvironmentMods(gameServer.Environment); + gameServer.ServerMods = new List(); } - await gameServersService.Data.Update( - gameServer.id, - Builders.Update.Set("name", gameServer.name) - .Set("port", gameServer.port) - .Set("apiPort", gameServer.apiPort) - .Set("numberHeadlessClients", gameServer.numberHeadlessClients) - .Set("profileName", gameServer.profileName) - .Set("hostName", gameServer.hostName) - .Set("password", gameServer.password) - .Set("adminPassword", gameServer.adminPassword) - .Set("environment", gameServer.environment) - .Set("serverOption", gameServer.serverOption) - .Set("mods", gameServer.mods) - .Set("serverMods", gameServer.serverMods) + await _gameServersContext.Update( + gameServer.Id, + Builders.Update.Set("name", gameServer.Name) + .Set("port", gameServer.Port) + .Set("apiPort", gameServer.ApiPort) + .Set("numberHeadlessClients", gameServer.NumberHeadlessClients) + .Set("profileName", gameServer.ProfileName) + .Set("hostName", gameServer.HostName) + .Set("password", gameServer.Password) + .Set("adminPassword", gameServer.AdminPassword) + .Set("environment", gameServer.Environment) + .Set("serverOption", gameServer.ServerOption) + .Set("mods", gameServer.Mods) + .Set("serverMods", gameServer.ServerMods) ); return Ok(new { environmentChanged }); } [HttpDelete("{id}"), Authorize] public async Task DeleteGameServer(string id) { - GameServer gameServer = gameServersService.Data.GetSingle(x => x.id == id); - logger.LogAudit($"Game server deleted '{gameServer.name}'"); - await gameServersService.Data.Delete(id); + GameServer gameServer = _gameServersContext.GetSingle(x => x.Id == id); + _logger.LogAudit($"Game server deleted '{gameServer.Name}'"); + await _gameServersContext.Delete(id); - return Ok(gameServersService.Data.Get()); + return Ok(_gameServersContext.Get()); } [HttpPost("order"), Authorize] public async Task UpdateOrder([FromBody] List newServerOrder) { for (int index = 0; index < newServerOrder.Count; index++) { GameServer gameServer = newServerOrder[index]; - if (gameServersService.Data.GetSingle(gameServer.id).order != index) { - await gameServersService.Data.Update(gameServer.id, "order", index); + if (_gameServersContext.GetSingle(gameServer.Id).Order != index) { + await _gameServersContext.Update(gameServer.Id, "order", index); } } - return Ok(gameServersService.Data.Get()); + return Ok(_gameServersContext.Get()); } [HttpPost("mission"), Authorize, RequestSizeLimit(10485760), RequestFormLimits(MultipartBodyLengthLimit = 10485760)] public async Task UploadMissionFile() { - List missionReports = new List(); + List missionReports = new(); try { foreach (IFormFile file in Request.Form.Files.Where(x => x.Length > 0)) { - await gameServersService.UploadMissionFile(file); - MissionPatchingResult missionPatchingResult = await gameServersService.PatchMissionFile(file.Name); - missionPatchingResult.reports = missionPatchingResult.reports.OrderByDescending(x => x.error).ToList(); - missionReports.Add(new { mission = file.Name, missionPatchingResult.reports }); - logger.LogAudit($"Uploaded mission '{file.Name}'"); + await _gameServersService.UploadMissionFile(file); + MissionPatchingResult missionPatchingResult = await _gameServersService.PatchMissionFile(file.Name); + missionPatchingResult.Reports = missionPatchingResult.Reports.OrderByDescending(x => x.Error).ToList(); + missionReports.Add(new { mission = file.Name, reports = missionPatchingResult.Reports }); + _logger.LogAudit($"Uploaded mission '{file.Name}'"); } } catch (Exception exception) { - logger.LogError(exception); + _logger.LogError(exception); return BadRequest(exception); } - return Ok(new { missions = gameServersService.GetMissionFiles(), missionReports }); + return Ok(new { missions = _gameServersService.GetMissionFiles(), missionReports }); } [HttpPost("launch/{id}"), Authorize] public async Task LaunchServer(string id, [FromBody] JObject data) { - Task.WaitAll(gameServersService.Data.Get().Select(x => gameServersService.GetGameServerStatus(x)).ToArray()); - GameServer gameServer = gameServersService.Data.GetSingle(id); - if (gameServer.status.running) return BadRequest("Server is already running. This shouldn't happen so please contact an admin"); - if (gameServerHelpers.IsMainOpTime()) { - if (gameServer.serverOption == GameServerOption.SINGLETON) { - if (gameServersService.Data.Get(x => x.serverOption != GameServerOption.SINGLETON).Any(x => x.status.started || x.status.running)) { + Task.WaitAll(_gameServersContext.Get().Select(x => _gameServersService.GetGameServerStatus(x)).ToArray()); + GameServer gameServer = _gameServersContext.GetSingle(id); + if (gameServer.Status.Running) return BadRequest("Server is already running. This shouldn't happen so please contact an admin"); + if (_gameServerHelpers.IsMainOpTime()) { + if (gameServer.ServerOption == GameServerOption.SINGLETON) { + if (_gameServersContext.Get(x => x.ServerOption != GameServerOption.SINGLETON).Any(x => x.Status.Started || x.Status.Running)) { return BadRequest("Server must be launched on its own. Stop the other running servers first"); } } - if (gameServersService.Data.Get(x => x.serverOption == GameServerOption.SINGLETON).Any(x => x.status.started || x.status.running)) { + if (_gameServersContext.Get(x => x.ServerOption == GameServerOption.SINGLETON).Any(x => x.Status.Started || x.Status.Running)) { return BadRequest("Server cannot be launched whilst main server is running at this time"); } } - if (gameServersService.Data.Get(x => x.port == gameServer.port).Any(x => x.status.started || x.status.running)) { + if (_gameServersContext.Get(x => x.Port == gameServer.Port).Any(x => x.Status.Started || x.Status.Running)) { return BadRequest("Server cannot be launched while another server with the same port is running"); } // Patch mission string missionSelection = data["missionName"].ToString(); - MissionPatchingResult patchingResult = await gameServersService.PatchMissionFile(missionSelection); - if (!patchingResult.success) { - patchingResult.reports = patchingResult.reports.OrderByDescending(x => x.error).ToList(); + MissionPatchingResult patchingResult = await _gameServersService.PatchMissionFile(missionSelection); + if (!patchingResult.Success) { + patchingResult.Reports = patchingResult.Reports.OrderByDescending(x => x.Error).ToList(); return BadRequest( new { - patchingResult.reports, + reports = patchingResult.Reports, message = - $"{(patchingResult.reports.Count > 0 ? "Failed to patch mission for the reasons detailed below" : "Failed to patch mission for an unknown reason")}.\n\nContact an admin for help" + $"{(patchingResult.Reports.Count > 0 ? "Failed to patch mission for the reasons detailed below" : "Failed to patch mission for an unknown reason")}.\n\nContact an admin for help" } ); } // Write config - gameServersService.WriteServerConfig(gameServer, patchingResult.playerCount, missionSelection); - gameServer.status.mission = missionSelection; + _gameServersService.WriteServerConfig(gameServer, patchingResult.PlayerCount, missionSelection); + gameServer.Status.Mission = missionSelection; // Execute launch - await gameServersService.LaunchGameServer(gameServer); + await _gameServersService.LaunchGameServer(gameServer); - logger.LogAudit($"Game server launched '{missionSelection}' on '{gameServer.name}'"); - return Ok(patchingResult.reports); + _logger.LogAudit($"Game server launched '{missionSelection}' on '{gameServer.Name}'"); + return Ok(patchingResult.Reports); } [HttpGet("stop/{id}"), Authorize] public async Task StopServer(string id) { - GameServer gameServer = gameServersService.Data.GetSingle(id); - logger.LogAudit($"Game server stopped '{gameServer.name}'"); - await gameServersService.GetGameServerStatus(gameServer); - if (!gameServer.status.started && !gameServer.status.running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); - await gameServersService.StopGameServer(gameServer); - await gameServersService.GetGameServerStatus(gameServer); - return Ok(new { gameServer, instanceCount = gameServersService.GetGameInstanceCount() }); + GameServer gameServer = _gameServersContext.GetSingle(id); + _logger.LogAudit($"Game server stopped '{gameServer.Name}'"); + await _gameServersService.GetGameServerStatus(gameServer); + if (!gameServer.Status.Started && !gameServer.Status.Running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); + await _gameServersService.StopGameServer(gameServer); + await _gameServersService.GetGameServerStatus(gameServer); + return Ok(new { gameServer, instanceCount = _gameServersService.GetGameInstanceCount() }); } [HttpGet("kill/{id}"), Authorize] public async Task KillServer(string id) { - GameServer gameServer = gameServersService.Data.GetSingle(id); - logger.LogAudit($"Game server killed '{gameServer.name}'"); - await gameServersService.GetGameServerStatus(gameServer); - if (!gameServer.status.started && !gameServer.status.running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); + GameServer gameServer = _gameServersContext.GetSingle(id); + _logger.LogAudit($"Game server killed '{gameServer.Name}'"); + await _gameServersService.GetGameServerStatus(gameServer); + if (!gameServer.Status.Started && !gameServer.Status.Running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); try { - gameServersService.KillGameServer(gameServer); + _gameServersService.KillGameServer(gameServer); } catch (Exception) { return BadRequest("Failed to stop server. Contact an admin"); } - await gameServersService.GetGameServerStatus(gameServer); - return Ok(new { gameServer, instanceCount = gameServersService.GetGameInstanceCount() }); + await _gameServersService.GetGameServerStatus(gameServer); + return Ok(new { gameServer, instanceCount = _gameServersService.GetGameInstanceCount() }); } [HttpGet("killall"), Authorize] public IActionResult KillAllArmaProcesses() { - int killed = gameServersService.KillAllArmaProcesses(); - logger.LogAudit($"Killed {killed} Arma instances"); + int killed = _gameServersService.KillAllArmaProcesses(); + _logger.LogAudit($"Killed {killed} Arma instances"); return Ok(); } [HttpGet("{id}/mods"), Authorize] - public IActionResult GetAvailableMods(string id) => Ok(gameServersService.GetAvailableMods(id)); + public IActionResult GetAvailableMods(string id) => Ok(_gameServersService.GetAvailableMods(id)); [HttpPost("{id}/mods"), Authorize] public async Task SetGameServerMods(string id, [FromBody] JObject body) { List mods = JsonConvert.DeserializeObject>(body.GetValueFromBody("mods")); List serverMods = JsonConvert.DeserializeObject>(body.GetValueFromBody("serverMods")); - GameServer gameServer = gameServersService.Data.GetSingle(id); - logger.LogAudit($"Game server '{gameServer.name}' mods updated:{gameServer.mods.Select(x => x.name).Changes(mods.Select(x => x.name))}"); - logger.LogAudit($"Game server '{gameServer.name}' serverMods updated:{gameServer.serverMods.Select(x => x.name).Changes(serverMods.Select(x => x.name))}"); - await gameServersService.Data.Update(id, Builders.Update.Unset(x => x.mods).Unset(x => x.serverMods)); - await gameServersService.Data.Update(id, Builders.Update.Set(x => x.mods, mods).Set(x => x.serverMods, serverMods)); - return Ok(gameServersService.GetAvailableMods(id)); + GameServer gameServer = _gameServersContext.GetSingle(id); + _logger.LogAudit($"Game server '{gameServer.Name}' mods updated:{gameServer.Mods.Select(x => x.Name).Changes(mods.Select(x => x.Name))}"); + _logger.LogAudit($"Game server '{gameServer.Name}' serverMods updated:{gameServer.ServerMods.Select(x => x.Name).Changes(serverMods.Select(x => x.Name))}"); + await _gameServersContext.Update(id, Builders.Update.Unset(x => x.Mods).Unset(x => x.ServerMods)); + await _gameServersContext.Update(id, Builders.Update.Set(x => x.Mods, mods).Set(x => x.ServerMods, serverMods)); + return Ok(_gameServersService.GetAvailableMods(id)); } [HttpGet("{id}/mods/reset"), Authorize] public IActionResult ResetGameServerMods(string id) { - GameServer gameServer = gameServersService.Data.GetSingle(id); - return Ok(new { availableMods = gameServersService.GetAvailableMods(id), mods = gameServersService.GetEnvironmentMods(gameServer.environment), serverMods = new List()}); + GameServer gameServer = _gameServersContext.GetSingle(id); + return Ok(new { availableMods = _gameServersService.GetAvailableMods(id), mods = _gameServersService.GetEnvironmentMods(gameServer.Environment), serverMods = new List() }); } [HttpGet("disabled"), Authorize] - public IActionResult GetDisabledState() => Ok(new { state = variablesService.GetVariable("SERVER_CONTROL_DISABLED").AsBool() }); + public IActionResult GetDisabledState() => Ok(new { state = _variablesService.GetVariable("SERVER_CONTROL_DISABLED").AsBool() }); [HttpPost("disabled"), Authorize] public async Task SetDisabledState([FromBody] JObject body) { bool state = bool.Parse(body["state"].ToString()); - await variablesService.Data.Update("SERVER_CONTROL_DISABLED", state); - await serversHub.Clients.All.ReceiveDisabledState(state); + await _variablesContext.Update("SERVER_CONTROL_DISABLED", state); + await _serversHub.Clients.All.ReceiveDisabledState(state); return Ok(); } } diff --git a/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs b/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs new file mode 100644 index 00000000..9f95a638 --- /dev/null +++ b/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs @@ -0,0 +1,20 @@ +using System.Collections.Generic; +using System.Linq; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Base.Context; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; + +namespace UKSF.Api.ArmaServer.DataContext { + public interface IGameServersContext : IMongoContext, ICachedMongoContext { } + + public class GameServersContext : CachedMongoContext, IGameServersContext { + public GameServersContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "gameServers") { } + + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.OrderBy(x => x.Order).ToList(); + } + } + } +} diff --git a/UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs b/UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs deleted file mode 100644 index f284ba0c..00000000 --- a/UKSF.Api.ArmaServer/DataContext/GameServersDataService.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using UKSF.Api.ArmaServer.Models; -using UKSF.Api.Base.Context; -using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; - -namespace UKSF.Api.ArmaServer.DataContext { - public interface IGameServersDataService : IDataService, ICachedDataService { } - - public class GameServersDataService : CachedDataService, IGameServersDataService { - public GameServersDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "gameServers") { } - - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { - Cache = newCollection?.OrderBy(x => x.order).ToList(); - } - } - } -} diff --git a/UKSF.Api.ArmaServer/Models/GameServer.cs b/UKSF.Api.ArmaServer/Models/GameServer.cs index 42b1b44d..bfb0b7b5 100644 --- a/UKSF.Api.ArmaServer/Models/GameServer.cs +++ b/UKSF.Api.ArmaServer/Models/GameServer.cs @@ -9,36 +9,36 @@ public enum GameServerOption { DCG } - public class GameServer : DatabaseObject { - [BsonIgnore] public readonly List headlessClientProcessIds = new List(); - public string adminPassword; - public int apiPort; - [BsonIgnore] public bool canLaunch; - public string hostName; - public List mods = new List(); - public string name; - public int numberHeadlessClients; - public int order = 0; - public string password; - public int port; - [BsonIgnore] public int? processId; - public string profileName; - public GameEnvironment environment; - public List serverMods = new List(); - public GameServerOption serverOption; - [BsonIgnore] public GameServerStatus status = new GameServerStatus(); + public record GameServer : MongoObject { + [BsonIgnore] public readonly List HeadlessClientProcessIds = new(); + public string AdminPassword; + public int ApiPort; + [BsonIgnore] public bool CanLaunch; + public GameEnvironment Environment; + public string HostName; + public List Mods = new(); + public string Name; + public int NumberHeadlessClients; + public int Order = 0; + public string Password; + public int Port; + [BsonIgnore] public int? ProcessId; + public string ProfileName; + public List ServerMods = new(); + public GameServerOption ServerOption; + [BsonIgnore] public GameServerStatus Status = new(); - public override string ToString() => $"{name}, {port}, {apiPort}, {numberHeadlessClients}, {profileName}, {hostName}, {password}, {adminPassword}, {environment}, {serverOption}"; + public override string ToString() => $"{Name}, {Port}, {ApiPort}, {NumberHeadlessClients}, {ProfileName}, {HostName}, {Password}, {AdminPassword}, {Environment}, {ServerOption}"; } public class GameServerStatus { - public string map; - public string maxPlayers; - public string mission; - public string parsedUptime; - public int players; - public bool running; - public bool started; - public float uptime; + public string Map; + public string MaxPlayers; + public string Mission; + public string ParsedUptime; + public int Players; + public bool Running; + public bool Started; + public float Uptime; } } diff --git a/UKSF.Api.ArmaServer/Models/GameServerMod.cs b/UKSF.Api.ArmaServer/Models/GameServerMod.cs index 76b1522d..c12b79fe 100644 --- a/UKSF.Api.ArmaServer/Models/GameServerMod.cs +++ b/UKSF.Api.ArmaServer/Models/GameServerMod.cs @@ -1,10 +1,10 @@ namespace UKSF.Api.ArmaServer.Models { public class GameServerMod { - public bool isDuplicate; - public string name; - public string path; - public string pathRelativeToServerExecutable; + public bool IsDuplicate; + public string Name; + public string Path; + public string PathRelativeToServerExecutable; - public override string ToString() => name; + public override string ToString() => Name; } } diff --git a/UKSF.Api.ArmaServer/Models/MissionFile.cs b/UKSF.Api.ArmaServer/Models/MissionFile.cs index 7822c2f5..ae668653 100644 --- a/UKSF.Api.ArmaServer/Models/MissionFile.cs +++ b/UKSF.Api.ArmaServer/Models/MissionFile.cs @@ -2,15 +2,15 @@ namespace UKSF.Api.ArmaServer.Models { public class MissionFile { - public string map; - public string name; - public string path; + public string Map; + public string Name; + public string Path; public MissionFile(FileSystemInfo fileInfo) { string[] fileNameParts = fileInfo.Name.Split("."); - path = fileInfo.Name; - name = fileNameParts[0]; - map = fileNameParts[1]; + Path = fileInfo.Name; + Name = fileNameParts[0]; + Map = fileNameParts[1]; } } } diff --git a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs index 821fb1e4..5e04c20d 100644 --- a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs +++ b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs @@ -71,29 +71,30 @@ public class GameServerHelpers : IGameServerHelpers { "}};" }; - private readonly IVariablesService variablesService; - private readonly ILogger logger; + private readonly ILogger _logger; + + private readonly IVariablesService _variablesService; public GameServerHelpers(IVariablesService variablesService, ILogger logger) { - this.variablesService = variablesService; - this.logger = logger; + _variablesService = variablesService; + _logger = logger; } public string GetGameServerExecutablePath(GameServer gameServer) { - string variableKey = gameServer.environment switch { + string variableKey = gameServer.Environment switch { GameEnvironment.RELEASE => "SERVER_PATH_RELEASE", GameEnvironment.RC => "SERVER_PATH_RC", GameEnvironment.DEV => "SERVER_PATH_DEV", _ => throw new ArgumentException("Server environment is invalid") }; - return Path.Join(variablesService.GetVariable(variableKey).AsString(), "arma3server_x64.exe"); + return Path.Join(_variablesService.GetVariable(variableKey).AsString(), "arma3server_x64.exe"); } - public string GetGameServerSettingsPath() => Path.Join(variablesService.GetVariable("SERVER_PATH_RELEASE").AsString(), "userconfig", "cba_settings.sqf"); + public string GetGameServerSettingsPath() => Path.Join(_variablesService.GetVariable("SERVER_PATH_RELEASE").AsString(), "userconfig", "cba_settings.sqf"); - public string GetGameServerMissionsPath() => variablesService.GetVariable("MISSIONS_PATH").AsString(); + public string GetGameServerMissionsPath() => _variablesService.GetVariable("MISSIONS_PATH").AsString(); - public string GetGameServerConfigPath(GameServer gameServer) => Path.Combine(variablesService.GetVariable("SERVER_PATH_CONFIGS").AsString(), $"{gameServer.profileName}.cfg"); + public string GetGameServerConfigPath(GameServer gameServer) => Path.Combine(_variablesService.GetVariable("SERVER_PATH_CONFIGS").AsString(), $"{gameServer.ProfileName}.cfg"); public string GetGameServerModsPaths(GameEnvironment environment) { string variableKey = environment switch { @@ -102,21 +103,21 @@ public string GetGameServerModsPaths(GameEnvironment environment) { GameEnvironment.DEV => "MODPACK_PATH_DEV", _ => throw new ArgumentException("Server environment is invalid") }; - return Path.Join(variablesService.GetVariable(variableKey).AsString(), "Repo"); + return Path.Join(_variablesService.GetVariable(variableKey).AsString(), "Repo"); } - public IEnumerable GetGameServerExtraModsPaths() => variablesService.GetVariable("SERVER_PATH_MODS").AsArray(x => x.RemoveQuotes()); + public IEnumerable GetGameServerExtraModsPaths() => _variablesService.GetVariable("SERVER_PATH_MODS").AsArray(x => x.RemoveQuotes()); public string FormatGameServerConfig(GameServer gameServer, int playerCount, string missionSelection) => - string.Format(string.Join("\n", BASE_CONFIG), gameServer.hostName, gameServer.password, gameServer.adminPassword, playerCount, missionSelection.Replace(".pbo", "")); + string.Format(string.Join("\n", BASE_CONFIG), gameServer.HostName, gameServer.Password, gameServer.AdminPassword, playerCount, missionSelection.Replace(".pbo", "")); public string FormatGameServerLaunchArguments(GameServer gameServer) => $"-config={GetGameServerConfigPath(gameServer)}" + $" -profiles={GetGameServerProfilesPath()}" + $" -cfg={GetGameServerPerfConfigPath()}" + - $" -name={gameServer.name}" + - $" -port={gameServer.port}" + - $" -apiport=\"{gameServer.apiPort}\"" + + $" -name={gameServer.Name}" + + $" -port={gameServer.Port}" + + $" -apiport=\"{gameServer.ApiPort}\"" + $" {(string.IsNullOrEmpty(FormatGameServerServerMods(gameServer)) ? "" : $"\"-serverMod={FormatGameServerServerMods(gameServer)}\"")}" + $" {(string.IsNullOrEmpty(FormatGameServerMods(gameServer)) ? "" : $"\"-mod={FormatGameServerMods(gameServer)}\"")}" + " -bandwidthAlg=2 -hugepages -loadMissionToMemory -filePatching -limitFPS=200"; @@ -124,10 +125,10 @@ public string FormatGameServerLaunchArguments(GameServer gameServer) => public string FormatHeadlessClientLaunchArguments(GameServer gameServer, int index) => $"-profiles={GetGameServerProfilesPath()}" + $" -name={GetHeadlessClientName(index)}" + - $" -port={gameServer.port}" + - $" -apiport=\"{gameServer.apiPort + index + 1}\"" + + $" -port={gameServer.Port}" + + $" -apiport=\"{gameServer.ApiPort + index + 1}\"" + $" {(string.IsNullOrEmpty(FormatGameServerMods(gameServer)) ? "" : $"\"-mod={FormatGameServerMods(gameServer)}\"")}" + - $" -password={gameServer.password}" + + $" -password={gameServer.Password}" + " -localhost=127.0.0.1 -connect=localhost -client -hugepages -filePatching -limitFPS=200"; public string GetMaxPlayerCountFromConfig(GameServer gameServer) { @@ -140,7 +141,7 @@ public int GetMaxCuratorCountFromSettings() { string[] lines = File.ReadAllLines(GetGameServerSettingsPath()); string curatorsMaxString = lines.FirstOrDefault(x => x.Contains("uksf_curator_curatorsMax")); if (string.IsNullOrEmpty(curatorsMaxString)) { - logger.LogWarning("Could not find max curators in server settings file. Loading hardcoded deault '5'"); + _logger.LogWarning("Could not find max curators in server settings file. Loading hardcoded deault '5'"); return 5; } @@ -148,7 +149,7 @@ public int GetMaxCuratorCountFromSettings() { return int.Parse(curatorsMaxString); } - public TimeSpan StripMilliseconds(TimeSpan time) => new TimeSpan(time.Hours, time.Minutes, time.Seconds); + public TimeSpan StripMilliseconds(TimeSpan time) => new(time.Hours, time.Minutes, time.Seconds); public IEnumerable GetArmaProcesses() => Process.GetProcesses().Where(x => x.ProcessName.StartsWith("arma3")); @@ -158,14 +159,14 @@ public bool IsMainOpTime() { } private string FormatGameServerMods(GameServer gameServer) => - gameServer.mods.Count > 0 ? $"{string.Join(";", gameServer.mods.Select(x => x.pathRelativeToServerExecutable ?? x.path))};" : string.Empty; + gameServer.Mods.Count > 0 ? $"{string.Join(";", gameServer.Mods.Select(x => x.PathRelativeToServerExecutable ?? x.Path))};" : string.Empty; - private string FormatGameServerServerMods(GameServer gameServer) => gameServer.serverMods.Count > 0 ? $"{string.Join(";", gameServer.serverMods.Select(x => x.name))};" : string.Empty; + private string FormatGameServerServerMods(GameServer gameServer) => gameServer.ServerMods.Count > 0 ? $"{string.Join(";", gameServer.ServerMods.Select(x => x.Name))};" : string.Empty; - private string GetGameServerProfilesPath() => variablesService.GetVariable("SERVER_PATH_PROFILES").AsString(); + private string GetGameServerProfilesPath() => _variablesService.GetVariable("SERVER_PATH_PROFILES").AsString(); - private string GetGameServerPerfConfigPath() => variablesService.GetVariable("SERVER_PATH_PERF").AsString(); + private string GetGameServerPerfConfigPath() => _variablesService.GetVariable("SERVER_PATH_PERF").AsString(); - private string GetHeadlessClientName(int index) => variablesService.GetVariable("SERVER_HEADLESS_NAMES").AsArray()[index]; + private string GetHeadlessClientName(int index) => _variablesService.GetVariable("SERVER_HEADLESS_NAMES").AsArray()[index]; } } diff --git a/UKSF.Api.ArmaServer/Services/GameServersService.cs b/UKSF.Api.ArmaServer/Services/GameServersService.cs index beafeffb..c6d6952d 100644 --- a/UKSF.Api.ArmaServer/Services/GameServersService.cs +++ b/UKSF.Api.ArmaServer/Services/GameServersService.cs @@ -12,11 +12,10 @@ using UKSF.Api.ArmaMissions.Services; using UKSF.Api.ArmaServer.DataContext; using UKSF.Api.ArmaServer.Models; -using UKSF.Api.Base.Context; using UKSF.Api.Shared.Extensions; namespace UKSF.Api.ArmaServer.Services { - public interface IGameServersService : IDataBackedService { + public interface IGameServersService { int GetGameInstanceCount(); Task UploadMissionFile(IFormFile file); List GetMissionFiles(); @@ -32,13 +31,15 @@ public interface IGameServersService : IDataBackedService GetEnvironmentMods(GameEnvironment environment); } - public class GameServersService : DataBackedService, IGameServersService { + public class GameServersService : IGameServersService { private readonly IGameServerHelpers _gameServerHelpers; + private readonly IGameServersContext _gameServersContext; private readonly IMissionPatchingService _missionPatchingService; - public GameServersService(IGameServersDataService data, IMissionPatchingService missionPatchingService, IGameServerHelpers gameServerHelpers) : base(data) { - this._missionPatchingService = missionPatchingService; - this._gameServerHelpers = gameServerHelpers; + public GameServersService(IGameServersContext gameServersContext, IMissionPatchingService missionPatchingService, IGameServerHelpers gameServerHelpers) { + _gameServersContext = gameServersContext; + _missionPatchingService = missionPatchingService; + _gameServerHelpers = gameServerHelpers; } public int GetGameInstanceCount() => _gameServerHelpers.GetArmaProcesses().Count(); @@ -46,44 +47,44 @@ public GameServersService(IGameServersDataService data, IMissionPatchingService public async Task UploadMissionFile(IFormFile file) { string fileName = ContentDispositionHeaderValue.Parse(file.ContentDisposition).FileName.Trim('"'); string filePath = Path.Combine(_gameServerHelpers.GetGameServerMissionsPath(), fileName); - await using FileStream stream = new FileStream(filePath, FileMode.Create); + await using FileStream stream = new(filePath, FileMode.Create); await file.CopyToAsync(stream); } public List GetMissionFiles() { IEnumerable files = new DirectoryInfo(_gameServerHelpers.GetGameServerMissionsPath()).EnumerateFiles("*.pbo", SearchOption.TopDirectoryOnly); - return files.Select(fileInfo => new MissionFile(fileInfo)).OrderBy(x => x.map).ThenBy(x => x.name).ToList(); + return files.Select(fileInfo => new MissionFile(fileInfo)).OrderBy(x => x.Map).ThenBy(x => x.Name).ToList(); } public async Task GetGameServerStatus(GameServer gameServer) { - if (gameServer.processId != 0) { - gameServer.status.started = Process.GetProcesses().Any(x => x.Id == gameServer.processId); - if (!gameServer.status.started) { - gameServer.processId = 0; + if (gameServer.ProcessId != 0) { + gameServer.Status.Started = Process.GetProcesses().Any(x => x.Id == gameServer.ProcessId); + if (!gameServer.Status.Started) { + gameServer.ProcessId = 0; } } - using HttpClient client = new HttpClient(); + using HttpClient client = new(); client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); try { - HttpResponseMessage response = await client.GetAsync($"http://localhost:{gameServer.apiPort}/server"); + HttpResponseMessage response = await client.GetAsync($"http://localhost:{gameServer.ApiPort}/server"); if (!response.IsSuccessStatusCode) { - gameServer.status.running = false; + gameServer.Status.Running = false; } string content = await response.Content.ReadAsStringAsync(); - gameServer.status = JsonConvert.DeserializeObject(content); - gameServer.status.parsedUptime = _gameServerHelpers.StripMilliseconds(TimeSpan.FromSeconds(gameServer.status.uptime)).ToString(); - gameServer.status.maxPlayers = _gameServerHelpers.GetMaxPlayerCountFromConfig(gameServer); - gameServer.status.running = true; - gameServer.status.started = false; + gameServer.Status = JsonConvert.DeserializeObject(content); + gameServer.Status.ParsedUptime = _gameServerHelpers.StripMilliseconds(TimeSpan.FromSeconds(gameServer.Status.Uptime)).ToString(); + gameServer.Status.MaxPlayers = _gameServerHelpers.GetMaxPlayerCountFromConfig(gameServer); + gameServer.Status.Running = true; + gameServer.Status.Started = false; } catch (Exception) { - gameServer.status.running = false; + gameServer.Status.Running = false; } } public async Task> GetAllGameServerStatuses() { - List gameServers = Data.Get().ToList(); + List gameServers = _gameServersContext.Get().ToList(); await Task.WhenAll(gameServers.Select(GetGameServerStatus)); return gameServers; } @@ -110,15 +111,15 @@ public void WriteServerConfig(GameServer gameServer, int playerCount, string mis public async Task LaunchGameServer(GameServer gameServer) { string launchArguments = _gameServerHelpers.FormatGameServerLaunchArguments(gameServer); - gameServer.processId = ProcessUtilities.LaunchManagedProcess(_gameServerHelpers.GetGameServerExecutablePath(gameServer), launchArguments); + gameServer.ProcessId = ProcessUtilities.LaunchManagedProcess(_gameServerHelpers.GetGameServerExecutablePath(gameServer), launchArguments); await Task.Delay(TimeSpan.FromSeconds(1)); // launch headless clients - if (gameServer.numberHeadlessClients > 0) { - for (int index = 0; index < gameServer.numberHeadlessClients; index++) { + if (gameServer.NumberHeadlessClients > 0) { + for (int index = 0; index < gameServer.NumberHeadlessClients; index++) { launchArguments = _gameServerHelpers.FormatHeadlessClientLaunchArguments(gameServer, index); - gameServer.headlessClientProcessIds.Add(ProcessUtilities.LaunchManagedProcess(_gameServerHelpers.GetGameServerExecutablePath(gameServer), launchArguments)); + gameServer.HeadlessClientProcessIds.Add(ProcessUtilities.LaunchManagedProcess(_gameServerHelpers.GetGameServerExecutablePath(gameServer), launchArguments)); await Task.Delay(TimeSpan.FromSeconds(1)); } @@ -127,19 +128,19 @@ public async Task LaunchGameServer(GameServer gameServer) { public async Task StopGameServer(GameServer gameServer) { try { - using HttpClient client = new HttpClient(); + using HttpClient client = new(); client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - await client.GetAsync($"http://localhost:{gameServer.apiPort}/server/stop"); + await client.GetAsync($"http://localhost:{gameServer.ApiPort}/server/stop"); } catch (Exception) { // ignored } - if (gameServer.numberHeadlessClients > 0) { - for (int index = 0; index < gameServer.numberHeadlessClients; index++) { + if (gameServer.NumberHeadlessClients > 0) { + for (int index = 0; index < gameServer.NumberHeadlessClients; index++) { try { - using HttpClient client = new HttpClient(); + using HttpClient client = new(); client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - await client.GetAsync($"http://localhost:{gameServer.apiPort + index + 1}/server/stop"); + await client.GetAsync($"http://localhost:{gameServer.ApiPort + index + 1}/server/stop"); } catch (Exception) { // ignored } @@ -148,18 +149,18 @@ public async Task StopGameServer(GameServer gameServer) { } public void KillGameServer(GameServer gameServer) { - if (!gameServer.processId.HasValue) { + if (!gameServer.ProcessId.HasValue) { throw new NullReferenceException(); } - Process process = Process.GetProcesses().FirstOrDefault(x => x.Id == gameServer.processId.Value); + Process process = Process.GetProcesses().FirstOrDefault(x => x.Id == gameServer.ProcessId.Value); if (process != null && !process.HasExited) { process.Kill(); } - gameServer.processId = null; + gameServer.ProcessId = null; - gameServer.headlessClientProcessIds.ForEach( + gameServer.HeadlessClientProcessIds.ForEach( x => { process = Process.GetProcesses().FirstOrDefault(y => y.Id == x); if (process != null && !process.HasExited) { @@ -167,7 +168,7 @@ public void KillGameServer(GameServer gameServer) { } } ); - gameServer.headlessClientProcessIds.Clear(); + gameServer.HeadlessClientProcessIds.Clear(); } public int KillAllArmaProcesses() { @@ -176,36 +177,36 @@ public int KillAllArmaProcesses() { process.Kill(); } - Data.Get() - .ToList() - .ForEach( - x => { - x.processId = null; - x.headlessClientProcessIds.Clear(); - } - ); + _gameServersContext.Get() + .ToList() + .ForEach( + x => { + x.ProcessId = null; + x.HeadlessClientProcessIds.Clear(); + } + ); return processes.Count; } public List GetAvailableMods(string id) { - GameServer gameServer = Data.GetSingle(id); - Uri serverExecutable = new Uri(_gameServerHelpers.GetGameServerExecutablePath(gameServer)); - List mods = new List(); - IEnumerable availableModsFolders = new[] { _gameServerHelpers.GetGameServerModsPaths(gameServer.environment) }; + GameServer gameServer = _gameServersContext.GetSingle(id); + Uri serverExecutable = new(_gameServerHelpers.GetGameServerExecutablePath(gameServer)); + List mods = new(); + IEnumerable availableModsFolders = new[] { _gameServerHelpers.GetGameServerModsPaths(gameServer.Environment) }; IEnumerable extraModsFolders = _gameServerHelpers.GetGameServerExtraModsPaths(); availableModsFolders = availableModsFolders.Concat(extraModsFolders); foreach (string modsPath in availableModsFolders) { IEnumerable modFolders = new DirectoryInfo(modsPath).EnumerateDirectories("@*", SearchOption.TopDirectoryOnly); foreach (DirectoryInfo modFolder in modFolders) { - if (mods.Any(x => x.path == modFolder.FullName)) continue; + if (mods.Any(x => x.Path == modFolder.FullName)) continue; IEnumerable modFiles = new DirectoryInfo(modFolder.FullName).EnumerateFiles("*.pbo", SearchOption.AllDirectories); if (!modFiles.Any()) continue; - GameServerMod mod = new GameServerMod { name = modFolder.Name, path = modFolder.FullName }; - Uri modFolderUri = new Uri(mod.path); + GameServerMod mod = new() { Name = modFolder.Name, Path = modFolder.FullName }; + Uri modFolderUri = new(mod.Path); if (serverExecutable.IsBaseOf(modFolderUri)) { - mod.pathRelativeToServerExecutable = Uri.UnescapeDataString(serverExecutable.MakeRelativeUri(modFolderUri).ToString()); + mod.PathRelativeToServerExecutable = Uri.UnescapeDataString(serverExecutable.MakeRelativeUri(modFolderUri).ToString()); } mods.Add(mod); @@ -213,12 +214,12 @@ public List GetAvailableMods(string id) { } foreach (GameServerMod mod in mods) { - if (mods.Any(x => x.name == mod.name && x.path != mod.path)) { - mod.isDuplicate = true; + if (mods.Any(x => x.Name == mod.Name && x.Path != mod.Path)) { + mod.IsDuplicate = true; } - foreach (GameServerMod duplicate in mods.Where(x => x.name == mod.name && x.path != mod.path)) { - duplicate.isDuplicate = true; + foreach (GameServerMod duplicate in mods.Where(x => x.Name == mod.Name && x.Path != mod.Path)) { + duplicate.IsDuplicate = true; } } @@ -230,7 +231,7 @@ public List GetEnvironmentMods(GameEnvironment environment) { IEnumerable modFolders = new DirectoryInfo(repoModsFolder).EnumerateDirectories("@*", SearchOption.TopDirectoryOnly); return modFolders.Select(modFolder => new { modFolder, modFiles = new DirectoryInfo(modFolder.FullName).EnumerateFiles("*.pbo", SearchOption.AllDirectories) }) .Where(x => x.modFiles.Any()) - .Select(x => new GameServerMod { name = x.modFolder.Name, path = x.modFolder.FullName }) + .Select(x => new GameServerMod { Name = x.modFolder.Name, Path = x.modFolder.FullName }) .ToList(); } } diff --git a/UKSF.Api.ArmaServer/Services/ServerService.cs b/UKSF.Api.ArmaServer/Services/ServerService.cs index 57bb48c7..b69c0d62 100644 --- a/UKSF.Api.ArmaServer/Services/ServerService.cs +++ b/UKSF.Api.ArmaServer/Services/ServerService.cs @@ -35,7 +35,7 @@ // return; // Task.Run( // () => { -// IEnumerable accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER && x.rank != null); +// IEnumerable accounts = _accountContext.Get(x => x.membershipState == MembershipState.MEMBER && x.rank != null); // accounts = accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname); // // StringBuilder stringBuilder = new StringBuilder(); @@ -45,7 +45,7 @@ // // foreach (Account account in accounts.Where(x => ranksService.IsSuperiorOrEqual(x.rank, "Private"))) { // StringBuilder accountStringBuilder = new StringBuilder(); -// Unit unit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); +// Unit unit = _unitsContext.GetSingle(x => x.name == account.unitAssignment); // string unitRole = unit.roles.FirstOrDefault(x => x.Value == account.id).Key; // accountStringBuilder.AppendLine($"\t"); // accountStringBuilder.AppendLine($"\t\t{unit.callsign}"); @@ -76,3 +76,5 @@ // } // } // } + + diff --git a/UKSF.Api.Auth/Controllers/ConfirmationCodeReceiver.cs b/UKSF.Api.Auth/Controllers/ConfirmationCodeReceiver.cs index b65599af..c51cf8a0 100644 --- a/UKSF.Api.Auth/Controllers/ConfirmationCodeReceiver.cs +++ b/UKSF.Api.Auth/Controllers/ConfirmationCodeReceiver.cs @@ -3,20 +3,21 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; using UKSF.Api.Auth.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; namespace UKSF.Api.Auth.Controllers { public abstract class ConfirmationCodeReceiver : Controller { - protected readonly IAccountService AccountService; + protected readonly IAccountContext AccountContext; protected readonly IConfirmationCodeService ConfirmationCodeService; internal readonly ILoginService LoginService; protected string LoginToken; - protected ConfirmationCodeReceiver(IConfirmationCodeService confirmationCodeService, ILoginService loginService, IAccountService accountService) { + protected ConfirmationCodeReceiver(IConfirmationCodeService confirmationCodeService, ILoginService loginService, IAccountContext accountContext) { LoginService = loginService; ConfirmationCodeService = confirmationCodeService; - AccountService = accountService; + AccountContext = accountContext; } protected abstract Task ApplyValidatedPayload(string codePayload, Account account1); @@ -26,13 +27,13 @@ protected async Task AttemptLoginValidatedAction(JObject loginFor string validateCode = loginForm["code"].ToString(); if (codeType == "passwordreset") { LoginToken = LoginService.LoginForPasswordReset(loginForm["email"].ToString()); - Account account = AccountService.Data.GetSingle(x => string.Equals(x.email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); - if (await ConfirmationCodeService.GetConfirmationCode(validateCode) == account.id && LoginToken != null) { + Account account = AccountContext.GetSingle(x => string.Equals(x.Email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); + if (await ConfirmationCodeService.GetConfirmationCode(validateCode) == account.Id && LoginToken != null) { return await ApplyValidatedPayload(loginForm["password"].ToString(), account); } } else { LoginToken = LoginService.Login(loginForm["email"].ToString(), loginForm["password"].ToString()); - Account account = AccountService.Data.GetSingle(x => string.Equals(x.email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); + Account account = AccountContext.GetSingle(x => string.Equals(x.Email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); string codeValue = await ConfirmationCodeService.GetConfirmationCode(validateCode); if (!string.IsNullOrWhiteSpace(codeValue)) { return await ApplyValidatedPayload(codeValue, account); diff --git a/UKSF.Api.Auth/Controllers/LoginController.cs b/UKSF.Api.Auth/Controllers/LoginController.cs index a72fb02a..4d1d4a0c 100644 --- a/UKSF.Api.Auth/Controllers/LoginController.cs +++ b/UKSF.Api.Auth/Controllers/LoginController.cs @@ -9,20 +9,20 @@ namespace UKSF.Api.Auth.Controllers { [Route("[controller]")] public class LoginController : Controller { - private readonly IHttpContextService httpContextService; - private readonly ILoginService loginService; + private readonly IHttpContextService _httpContextService; + private readonly ILoginService _loginService; public LoginController(ILoginService loginService, IHttpContextService httpContextService) { - this.loginService = loginService; - this.httpContextService = httpContextService; + _loginService = loginService; + _httpContextService = httpContextService; } [HttpGet] - public bool IsUserAuthenticated() => httpContextService.IsUserAuthenticated(); + public bool IsUserAuthenticated() => _httpContextService.IsUserAuthenticated(); [HttpGet("refresh"), Authorize] public IActionResult RefreshToken() { - string loginToken = loginService.RegenerateBearerToken(httpContextService.GetUserId()); + string loginToken = _loginService.RegenerateBearerToken(_httpContextService.GetUserId()); return loginToken != null ? (IActionResult) Ok(loginToken) : BadRequest(); } @@ -39,7 +39,7 @@ public IActionResult Login([FromBody] JObject body) { } try { - return Ok(loginService.Login(email, password)); + return Ok(_loginService.Login(email, password)); } catch (LoginFailedException e) { return BadRequest(new { message = e.Message }); } diff --git a/UKSF.Api.Auth/Controllers/PasswordResetController.cs b/UKSF.Api.Auth/Controllers/PasswordResetController.cs index bb04aafb..ba390d63 100644 --- a/UKSF.Api.Auth/Controllers/PasswordResetController.cs +++ b/UKSF.Api.Auth/Controllers/PasswordResetController.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; using UKSF.Api.Auth.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; @@ -11,22 +12,22 @@ namespace UKSF.Api.Auth.Controllers { [Route("[controller]")] public class PasswordResetController : ConfirmationCodeReceiver { - private readonly IEmailService emailService; - private readonly ILogger logger; + private readonly IEmailService _emailService; + private readonly ILogger _logger; - public PasswordResetController(IConfirmationCodeService confirmationCodeService, ILoginService loginService, IEmailService emailService, IAccountService accountService, ILogger logger) : base( + public PasswordResetController(IConfirmationCodeService confirmationCodeService, ILoginService loginService, IEmailService emailService, IAccountContext accountContext, ILogger logger) : base( confirmationCodeService, loginService, - accountService + accountContext ) { - this.emailService = emailService; - this.logger = logger; + _emailService = emailService; + _logger = logger; } protected override async Task ApplyValidatedPayload(string codePayload, Account account) { - await AccountService.Data.Update(account.id, "password", BCrypt.Net.BCrypt.HashPassword(codePayload)); - logger.LogAudit($"Password changed for {account.id}", account.id); - return Ok(LoginService.RegenerateBearerToken(account.id)); + await AccountContext.Update(account.Id, "password", BCrypt.Net.BCrypt.HashPassword(codePayload)); + _logger.LogAudit($"Password changed for {account.Id}", account.Id); + return Ok(LoginService.RegenerateBearerToken(account.Id)); } [HttpPost] @@ -34,17 +35,17 @@ protected override async Task ApplyValidatedPayload(string codePa [HttpPut] public async Task ResetPassword([FromBody] JObject body) { - Account account = AccountService.Data.GetSingle(x => string.Equals(x.email, body["email"]?.ToString(), StringComparison.InvariantCultureIgnoreCase)); + Account account = AccountContext.GetSingle(x => string.Equals(x.Email, body["email"]?.ToString(), StringComparison.InvariantCultureIgnoreCase)); if (account == null) { return BadRequest(); } - string code = await ConfirmationCodeService.CreateConfirmationCode(account.id); + string code = await ConfirmationCodeService.CreateConfirmationCode(account.Id); string url = $"https://uk-sf.co.uk/login?validatecode={code}&validatetype={WebUtility.UrlEncode("password reset")}&validateurl={WebUtility.UrlEncode("passwordreset")}"; string html = $"

UKSF Password Reset


Please reset your password by clicking here." + "

If this request was not made by you seek assistance from UKSF staff.

"; - emailService.SendEmail(account.email, "UKSF Password Reset", html); - logger.LogAudit($"Password reset request made for {account.id}", account.id); + _emailService.SendEmail(account.Email, "UKSF Password Reset", html); + _logger.LogAudit($"Password reset request made for {account.Id}", account.Id); return Ok(LoginToken); } } diff --git a/UKSF.Api.Auth/Services/LoginService.cs b/UKSF.Api.Auth/Services/LoginService.cs index 866ceacd..b2660a4e 100644 --- a/UKSF.Api.Auth/Services/LoginService.cs +++ b/UKSF.Api.Auth/Services/LoginService.cs @@ -5,8 +5,8 @@ using System.Security.Claims; using Microsoft.IdentityModel.Tokens; using Newtonsoft.Json; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services; namespace UKSF.Api.Auth.Services { public interface ILoginService { @@ -16,12 +16,12 @@ public interface ILoginService { } public class LoginService : ILoginService { - private readonly IAccountService accountService; - private readonly IPermissionsService permissionsService; + private readonly IAccountContext _accountContext; + private readonly IPermissionsService _permissionsService; - public LoginService(IAccountService accountService, IPermissionsService permissionsService) { - this.accountService = accountService; - this.permissionsService = permissionsService; + public LoginService(IAccountContext accountContext, IPermissionsService permissionsService) { + _accountContext = accountContext; + _permissionsService = permissionsService; } public string Login(string email, string password) { @@ -34,11 +34,11 @@ public string LoginForPasswordReset(string email) { return GenerateBearerToken(account); } - public string RegenerateBearerToken(string accountId) => GenerateBearerToken(accountService.Data.GetSingle(accountId)); + public string RegenerateBearerToken(string accountId) => GenerateBearerToken(_accountContext.GetSingle(accountId)); private Account AuthenticateAccount(string email, string password, bool passwordReset = false) { - Account account = accountService.Data.GetSingle(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)); - if (account != null && (passwordReset || BCrypt.Net.BCrypt.Verify(password, account.password))) { + Account account = _accountContext.GetSingle(x => string.Equals(x.Email, email, StringComparison.InvariantCultureIgnoreCase)); + if (account != null && (passwordReset || BCrypt.Net.BCrypt.Verify(password, account.Password))) { return account; } @@ -46,8 +46,8 @@ private Account AuthenticateAccount(string email, string password, bool password } private string GenerateBearerToken(Account account) { - List claims = new List { new Claim(ClaimTypes.Email, account.email, ClaimValueTypes.String), new Claim(ClaimTypes.Sid, account.id, ClaimValueTypes.String) }; - claims.AddRange(permissionsService.GrantPermissions(account).Select(x => new Claim(ClaimTypes.Role, x))); + List claims = new() { new Claim(ClaimTypes.Email, account.Email, ClaimValueTypes.String), new Claim(ClaimTypes.Sid, account.Id, ClaimValueTypes.String) }; + claims.AddRange(_permissionsService.GrantPermissions(account).Select(x => new Claim(ClaimTypes.Role, x))); return JsonConvert.ToString( new JwtSecurityTokenHandler().WriteToken( diff --git a/UKSF.Api.Auth/Services/PermissionsService.cs b/UKSF.Api.Auth/Services/PermissionsService.cs index 9ddcb62b..1b08c7f3 100644 --- a/UKSF.Api.Auth/Services/PermissionsService.cs +++ b/UKSF.Api.Auth/Services/PermissionsService.cs @@ -2,6 +2,7 @@ using System.Linq; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; @@ -12,60 +13,62 @@ public interface IPermissionsService { } public class PermissionsService : IPermissionsService { - private readonly string[] admins = { "59e38f10594c603b78aa9dbd", "5a1e894463d0f71710089106", "5a1ae0f0b9bcb113a44edada" }; // TODO: Make this an account flag - private readonly IRanksService ranksService; - private readonly IRecruitmentService recruitmentService; - private readonly IUnitsService unitsService; - private readonly IVariablesService variablesService; + private readonly string[] _admins = { "59e38f10594c603b78aa9dbd", "5a1e894463d0f71710089106", "5a1ae0f0b9bcb113a44edada" }; // TODO: Make this an account flag + private readonly IRanksService _ranksService; + private readonly IRecruitmentService _recruitmentService; + private readonly IUnitsContext _unitsContext; + private readonly IUnitsService _unitsService; + private readonly IVariablesService _variablesService; - public PermissionsService(IRanksService ranksService, IUnitsService unitsService, IRecruitmentService recruitmentService, IVariablesService variablesService) { - this.ranksService = ranksService; - this.unitsService = unitsService; - this.recruitmentService = recruitmentService; - this.variablesService = variablesService; + public PermissionsService(IRanksService ranksService, IUnitsContext unitsContext, IUnitsService unitsService, IRecruitmentService recruitmentService, IVariablesService variablesService) { + _ranksService = ranksService; + _unitsContext = unitsContext; + _unitsService = unitsService; + _recruitmentService = recruitmentService; + _variablesService = variablesService; } public IEnumerable GrantPermissions(Account account) { - HashSet permissions = new HashSet(); + HashSet permissions = new(); - switch (account.membershipState) { + switch (account.MembershipState) { case MembershipState.MEMBER: { permissions.Add(Permissions.MEMBER); - bool admin = admins.Contains(account.id); + bool admin = _admins.Contains(account.Id); if (admin) { permissions.UnionWith(Permissions.ALL); break; } - if (unitsService.MemberHasAnyRole(account.id)) { + if (_unitsService.MemberHasAnyRole(account.Id)) { permissions.Add(Permissions.COMMAND); } - // TODO: Remove hardcoded value - if (account.rank != null && ranksService.IsSuperiorOrEqual(account.rank, "Senior Aircraftman")) { + // TODO: Remove hardcoded rank + if (account.Rank != null && _ranksService.IsSuperiorOrEqual(account.Rank, "Senior Aircraftman")) { permissions.Add(Permissions.NCO); } - if (recruitmentService.IsRecruiterLead(account)) { + if (_recruitmentService.IsRecruiterLead(account)) { permissions.Add(Permissions.RECRUITER_LEAD); } - if (recruitmentService.IsRecruiter(account)) { + if (_recruitmentService.IsRecruiter(account)) { permissions.Add(Permissions.RECRUITER); } - string personnelId = variablesService.GetVariable("UNIT_ID_PERSONNEL").AsString(); - if (unitsService.Data.GetSingle(personnelId).members.Contains(account.id)) { + string personnelId = _variablesService.GetVariable("UNIT_ID_PERSONNEL").AsString(); + if (_unitsContext.GetSingle(personnelId).Members.Contains(account.Id)) { permissions.Add(Permissions.PERSONNEL); } - string[] missionsId = variablesService.GetVariable("UNIT_ID_MISSIONS").AsArray(); - if (unitsService.Data.GetSingle(x => missionsId.Contains(x.id)).members.Contains(account.id)) { + string[] missionsId = _variablesService.GetVariable("UNIT_ID_MISSIONS").AsArray(); + if (_unitsContext.GetSingle(x => missionsId.Contains(x.Id)).Members.Contains(account.Id)) { permissions.Add(Permissions.SERVERS); } - string testersId = variablesService.GetVariable("UNIT_ID_TESTERS").AsString(); - if (unitsService.Data.GetSingle(testersId).members.Contains(account.id)) { + string testersId = _variablesService.GetVariable("UNIT_ID_TESTERS").AsString(); + if (_unitsContext.GetSingle(testersId).Members.Contains(account.Id)) { permissions.Add(Permissions.TESTER); } diff --git a/UKSF.Api.Auth/UKSF.Api.Auth.csproj b/UKSF.Api.Auth/UKSF.Api.Auth.csproj index a007bd32..2051ba3b 100644 --- a/UKSF.Api.Auth/UKSF.Api.Auth.csproj +++ b/UKSF.Api.Auth/UKSF.Api.Auth.csproj @@ -6,11 +6,11 @@ - - - - - + + + + + diff --git a/UKSF.Api.Base/ApiBaseExtensions.cs b/UKSF.Api.Base/ApiBaseExtensions.cs index c9dfb68f..7dea1b4f 100644 --- a/UKSF.Api.Base/ApiBaseExtensions.cs +++ b/UKSF.Api.Base/ApiBaseExtensions.cs @@ -10,7 +10,7 @@ public static IServiceCollection AddUksfBase(this IServiceCollection services, I .AddEventHandlers() .AddServices() .AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))) - .AddTransient(); + .AddTransient(); private static IServiceCollection AddContexts(this IServiceCollection services) => services; diff --git a/UKSF.Api.Base/Context/DataBackedService.cs b/UKSF.Api.Base/Context/DataBackedService.cs deleted file mode 100644 index 87f6283e..00000000 --- a/UKSF.Api.Base/Context/DataBackedService.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace UKSF.Api.Base.Context { - public interface IDataBackedService { - T Data { get; } - } - - // TODO: Either remove this and just make the services rely on the data service properly, - // or make this protected and make data consumers use the data services directly - public abstract class DataBackedService : IDataBackedService { - protected DataBackedService(T data) => Data = data; - - public T Data { get; } - } -} diff --git a/UKSF.Api.Base/Context/DataCollectionFactory.cs b/UKSF.Api.Base/Context/DataCollectionFactory.cs deleted file mode 100644 index 9b71f63a..00000000 --- a/UKSF.Api.Base/Context/DataCollectionFactory.cs +++ /dev/null @@ -1,19 +0,0 @@ -using MongoDB.Driver; -using UKSF.Api.Base.Models; - -namespace UKSF.Api.Base.Context { - public interface IDataCollectionFactory { - IDataCollection CreateDataCollection(string collectionName) where T : DatabaseObject; - } - - public class DataCollectionFactory : IDataCollectionFactory { - private readonly IMongoDatabase database; - - public DataCollectionFactory(IMongoDatabase database) => this.database = database; - - public IDataCollection CreateDataCollection(string collectionName) where T : DatabaseObject { - IDataCollection dataCollection = new DataCollection(database, collectionName); - return dataCollection; - } - } -} diff --git a/UKSF.Api.Base/Context/MongoClientFactory.cs b/UKSF.Api.Base/Context/MongoClientFactory.cs index 4188130c..570bee7b 100644 --- a/UKSF.Api.Base/Context/MongoClientFactory.cs +++ b/UKSF.Api.Base/Context/MongoClientFactory.cs @@ -4,7 +4,7 @@ namespace UKSF.Api.Base.Context { public static class MongoClientFactory { public static IMongoDatabase GetDatabase(string connectionString) { - ConventionPack conventionPack = new ConventionPack {new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true)}; + ConventionPack conventionPack = new() { new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true) }; ConventionRegistry.Register("DefaultConventions", conventionPack, _ => true); string database = MongoUrl.Create(connectionString).DatabaseName; return new MongoClient(connectionString).GetDatabase(database); diff --git a/UKSF.Api.Base/Context/DataCollection.cs b/UKSF.Api.Base/Context/MongoCollection.cs similarity index 80% rename from UKSF.Api.Base/Context/DataCollection.cs rename to UKSF.Api.Base/Context/MongoCollection.cs index 42f1bad1..7e81816a 100644 --- a/UKSF.Api.Base/Context/DataCollection.cs +++ b/UKSF.Api.Base/Context/MongoCollection.cs @@ -8,7 +8,7 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Base.Context { - public interface IDataCollection { + public interface IMongoCollection { IEnumerable Get(); IEnumerable Get(Func predicate); T GetSingle(string id); @@ -22,13 +22,13 @@ public interface IDataCollection { Task DeleteManyAsync(Expression> predicate); } - public class DataCollection : IDataCollection where T : DatabaseObject { - private readonly string collectionName; - private readonly IMongoDatabase database; + public class MongoCollection : IMongoCollection where T : MongoObject { + private readonly string _collectionName; + private readonly IMongoDatabase _database; - public DataCollection(IMongoDatabase database, string collectionName) { - this.database = database; - this.collectionName = collectionName; + public MongoCollection(IMongoDatabase database, string collectionName) { + _database = database; + _collectionName = collectionName; } public IEnumerable Get() => GetCollection().AsQueryable(); @@ -54,7 +54,7 @@ public async Task UpdateAsync(FilterDefinition filter, UpdateDefinition up public async Task UpdateManyAsync(Expression> predicate, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter // Getting ids by the filter predicate is necessary to cover filtering items by a default model value // (e.g Role order default 0, may not be stored in document, and is thus not filterable) - IEnumerable ids = Get(predicate.Compile()).Select(x => x.id); + IEnumerable ids = Get(predicate.Compile()).Select(x => x.Id); await GetCollection().UpdateManyAsync(Builders.Filter.In("id", ids), update); } @@ -68,18 +68,18 @@ public async Task DeleteAsync(string id) { public async Task DeleteManyAsync(Expression> predicate) { IEnumerable ids = Get(predicate.Compile()) - .Select(x => x.id); // This is necessary for filtering items by a default model value (e.g Role order default 0, may not be stored in document) + .Select(x => x.Id); // This is necessary for filtering items by a default model value (e.g Role order default 0, may not be stored in document) await GetCollection().DeleteManyAsync(Builders.Filter.In("id", ids)); } public async Task AssertCollectionExistsAsync() { if (!await CollectionExistsAsync()) { - await database.CreateCollectionAsync(collectionName); + await _database.CreateCollectionAsync(_collectionName); } } - private IMongoCollection GetCollection() => database.GetCollection(collectionName); + private MongoDB.Driver.IMongoCollection GetCollection() => _database.GetCollection(_collectionName); - private async Task CollectionExistsAsync() => await (await database.ListCollectionsAsync(new ListCollectionsOptions { Filter = new BsonDocument("name", collectionName) })).AnyAsync(); + private async Task CollectionExistsAsync() => await (await _database.ListCollectionsAsync(new ListCollectionsOptions { Filter = new BsonDocument("name", _collectionName) })).AnyAsync(); } } diff --git a/UKSF.Api.Base/Context/MongoCollectionFactory.cs b/UKSF.Api.Base/Context/MongoCollectionFactory.cs new file mode 100644 index 00000000..149b2fd2 --- /dev/null +++ b/UKSF.Api.Base/Context/MongoCollectionFactory.cs @@ -0,0 +1,19 @@ +using MongoDB.Driver; +using UKSF.Api.Base.Models; + +namespace UKSF.Api.Base.Context { + public interface IMongoCollectionFactory { + IMongoCollection CreateMongoCollection(string collectionName) where T : MongoObject; + } + + public class MongoCollectionFactory : IMongoCollectionFactory { + private readonly IMongoDatabase _database; + + public MongoCollectionFactory(IMongoDatabase database) => _database = database; + + public IMongoCollection CreateMongoCollection(string collectionName) where T : MongoObject { + IMongoCollection mongoCollection = new MongoCollection(_database, collectionName); + return mongoCollection; + } + } +} diff --git a/UKSF.Api.Base/Context/DataServiceBase.cs b/UKSF.Api.Base/Context/MongoContextBase.cs similarity index 51% rename from UKSF.Api.Base/Context/DataServiceBase.cs rename to UKSF.Api.Base/Context/MongoContextBase.cs index 75886832..80f2e819 100644 --- a/UKSF.Api.Base/Context/DataServiceBase.cs +++ b/UKSF.Api.Base/Context/MongoContextBase.cs @@ -7,66 +7,72 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Base.Context { - public abstract class DataServiceBase where T : DatabaseObject { - private readonly IDataCollection dataCollection; + public abstract class MongoContextBase where T : MongoObject { + private readonly IMongoCollection _mongoCollection; - protected DataServiceBase(IDataCollectionFactory dataCollectionFactory, string collectionName) => dataCollection = dataCollectionFactory.CreateDataCollection(collectionName); + protected MongoContextBase(IMongoCollectionFactory mongoCollectionFactory, string collectionName) => _mongoCollection = mongoCollectionFactory.CreateMongoCollection(collectionName); - public virtual IEnumerable Get() => dataCollection.Get(); + public virtual IEnumerable Get() => _mongoCollection.Get(); - public virtual IEnumerable Get(Func predicate) => dataCollection.Get(predicate); + public virtual IEnumerable Get(Func predicate) => _mongoCollection.Get(predicate); public virtual T GetSingle(string id) { ValidateId(id); - return dataCollection.GetSingle(id); + return _mongoCollection.GetSingle(id); } - public virtual T GetSingle(Func predicate) => dataCollection.GetSingle(predicate); + public virtual T GetSingle(Func predicate) => _mongoCollection.GetSingle(predicate); public virtual async Task Add(T item) { if (item == null) throw new ArgumentNullException(nameof(item)); - await dataCollection.AddAsync(item); + await _mongoCollection.AddAsync(item); + } + + public virtual async Task Update(string id, Expression> fieldSelector, object value) { + ValidateId(id); + UpdateDefinition update = value == null ? Builders.Update.Unset(fieldSelector) : Builders.Update.Set(fieldSelector, value); + await _mongoCollection.UpdateAsync(id, update); } public virtual async Task Update(string id, string fieldName, object value) { ValidateId(id); UpdateDefinition update = value == null ? Builders.Update.Unset(fieldName) : Builders.Update.Set(fieldName, value); - await dataCollection.UpdateAsync(id, update); + await _mongoCollection.UpdateAsync(id, update); } public virtual async Task Update(string id, UpdateDefinition update) { ValidateId(id); - await dataCollection.UpdateAsync(id, update); + await _mongoCollection.UpdateAsync(id, update); } public virtual async Task Update(Expression> filterExpression, UpdateDefinition update) { - await dataCollection.UpdateAsync(Builders.Filter.Where(filterExpression), update); + await _mongoCollection.UpdateAsync(Builders.Filter.Where(filterExpression), update); } public virtual async Task UpdateMany(Expression> filterExpression, UpdateDefinition update) { - await dataCollection.UpdateManyAsync(filterExpression, update); + await _mongoCollection.UpdateManyAsync(filterExpression, update); } public virtual async Task Replace(T item) { - await dataCollection.ReplaceAsync(item.id, item); + await _mongoCollection.ReplaceAsync(item.Id, item); } public virtual async Task Delete(string id) { ValidateId(id); - await dataCollection.DeleteAsync(id); + await _mongoCollection.DeleteAsync(id); } public virtual async Task Delete(T item) { - await dataCollection.DeleteAsync(item.id); + await _mongoCollection.DeleteAsync(item.Id); } public virtual async Task DeleteMany(Expression> filterExpression) { - await dataCollection.DeleteManyAsync(filterExpression); + await _mongoCollection.DeleteManyAsync(filterExpression); } private static void ValidateId(string id) { if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Id cannot be empty"); - if (!ObjectId.TryParse(id, out ObjectId _)) throw new KeyNotFoundException("Id must be valid"); + if (!ObjectId.TryParse(id, out ObjectId _)) throw new KeyNotFoundException("Id must be a valid ObjectId"); } } } diff --git a/UKSF.Api.Base/Events/EventBus.cs b/UKSF.Api.Base/Events/EventBus.cs index 8df738cc..b6adee62 100644 --- a/UKSF.Api.Base/Events/EventBus.cs +++ b/UKSF.Api.Base/Events/EventBus.cs @@ -9,7 +9,7 @@ public interface IEventBus { } public class EventBus : IEventBus { - protected readonly Subject Subject = new Subject(); + protected readonly Subject Subject = new(); public void Send(T message) { Subject.OnNext(message); diff --git a/UKSF.Api.Base/Models/DatabaseObject.cs b/UKSF.Api.Base/Models/MongoObject.cs similarity index 67% rename from UKSF.Api.Base/Models/DatabaseObject.cs rename to UKSF.Api.Base/Models/MongoObject.cs index 866b3036..bccbe1ff 100644 --- a/UKSF.Api.Base/Models/DatabaseObject.cs +++ b/UKSF.Api.Base/Models/MongoObject.cs @@ -2,7 +2,7 @@ using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Base.Models { - public class DatabaseObject { - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string id = ObjectId.GenerateNewId().ToString(); + public record MongoObject { + [BsonId, BsonRepresentation(BsonType.ObjectId)] public string Id = ObjectId.GenerateNewId().ToString(); } } diff --git a/UKSF.Api.Base/UKSF.Api.Base.csproj b/UKSF.Api.Base/UKSF.Api.Base.csproj index acba56cb..afa002b7 100644 --- a/UKSF.Api.Base/UKSF.Api.Base.csproj +++ b/UKSF.Api.Base/UKSF.Api.Base.csproj @@ -3,6 +3,7 @@ netcoreapp5.0 Library + default @@ -10,8 +11,8 @@ - - + + diff --git a/UKSF.Api.Command/ApiCommandExtensions.cs b/UKSF.Api.Command/ApiCommandExtensions.cs index 12faa168..ce15b062 100644 --- a/UKSF.Api.Command/ApiCommandExtensions.cs +++ b/UKSF.Api.Command/ApiCommandExtensions.cs @@ -13,12 +13,12 @@ public static class ApiCommandExtensions { public static IServiceCollection AddUksfCommand(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); private static IServiceCollection AddContexts(this IServiceCollection services) => - services.AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton(); + services.AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>() @@ -32,7 +32,6 @@ private static IServiceCollection AddServices(this IServiceCollection services) services.AddSingleton() .AddTransient() .AddTransient() - .AddTransient() .AddTransient() .AddTransient() .AddTransient(); diff --git a/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs b/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs new file mode 100644 index 00000000..da0284c6 --- /dev/null +++ b/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs @@ -0,0 +1,19 @@ +using UKSF.Api.Base.Context; +using UKSF.Api.Command.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; + +namespace UKSF.Api.Command.Context { + public interface ICommandRequestArchiveContext : IMongoContext { } + + public class CommandRequestArchiveContext : MongoContext, ICommandRequestArchiveContext { + public CommandRequestArchiveContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base( + mongoCollectionFactory, + dataEventBus, + "commandRequestsArchive" + ) { } + + protected override void DataEvent(DataEventModel dataEvent) { } + } +} diff --git a/UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs b/UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs deleted file mode 100644 index f3ce5463..00000000 --- a/UKSF.Api.Command/Context/CommandRequestArchiveDataService.cs +++ /dev/null @@ -1,19 +0,0 @@ -using UKSF.Api.Base.Context; -using UKSF.Api.Command.Models; -using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; - -namespace UKSF.Api.Command.Context { - public interface ICommandRequestArchiveDataService : IDataService { } - - public class CommandRequestArchiveDataService : DataService, ICommandRequestArchiveDataService { - public CommandRequestArchiveDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base( - dataCollectionFactory, - dataEventBus, - "commandRequestsArchive" - ) { } - - protected override void DataEvent(DataEventModel dataEvent) { } - } -} diff --git a/UKSF.Api.Command/Context/CommandRequestContext.cs b/UKSF.Api.Command/Context/CommandRequestContext.cs new file mode 100644 index 00000000..3f637b66 --- /dev/null +++ b/UKSF.Api.Command/Context/CommandRequestContext.cs @@ -0,0 +1,12 @@ +using UKSF.Api.Base.Context; +using UKSF.Api.Command.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; + +namespace UKSF.Api.Command.Context { + public interface ICommandRequestContext : IMongoContext, ICachedMongoContext { } + + public class CommandRequestContext : CachedMongoContext, ICommandRequestContext { + public CommandRequestContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "commandRequests") { } + } +} diff --git a/UKSF.Api.Command/Context/CommandRequestDataService.cs b/UKSF.Api.Command/Context/CommandRequestDataService.cs deleted file mode 100644 index bd695f18..00000000 --- a/UKSF.Api.Command/Context/CommandRequestDataService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using UKSF.Api.Base.Context; -using UKSF.Api.Command.Models; -using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; - -namespace UKSF.Api.Command.Context { - public interface ICommandRequestDataService : IDataService, ICachedDataService { } - - public class CommandRequestDataService : CachedDataService, ICommandRequestDataService { - public CommandRequestDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "commandRequests") { } - } -} diff --git a/UKSF.Api.Command/Context/DischargeContext.cs b/UKSF.Api.Command/Context/DischargeContext.cs new file mode 100644 index 00000000..3089797e --- /dev/null +++ b/UKSF.Api.Command/Context/DischargeContext.cs @@ -0,0 +1,20 @@ +using System.Collections.Generic; +using System.Linq; +using UKSF.Api.Base.Context; +using UKSF.Api.Command.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; + +namespace UKSF.Api.Command.Context { + public interface IDischargeContext : IMongoContext, ICachedMongoContext { } + + public class DischargeContext : CachedMongoContext, IDischargeContext { + public DischargeContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "discharges") { } + + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.OrderByDescending(x => x.Discharges.Last().Timestamp).ToList(); + } + } + } +} diff --git a/UKSF.Api.Command/Context/DischargeDataService.cs b/UKSF.Api.Command/Context/DischargeDataService.cs deleted file mode 100644 index 2dfe2bd8..00000000 --- a/UKSF.Api.Command/Context/DischargeDataService.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using UKSF.Api.Base.Context; -using UKSF.Api.Command.Models; -using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; - -namespace UKSF.Api.Command.Context { - public interface IDischargeDataService : IDataService, ICachedDataService { } - - public class DischargeDataService : CachedDataService, IDischargeDataService { - public DischargeDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "discharges") { } - - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { - Cache = newCollection?.OrderByDescending(x => x.discharges.Last().timestamp).ToList(); - } - } - } -} diff --git a/UKSF.Api.Command/Context/LoaContext.cs b/UKSF.Api.Command/Context/LoaContext.cs new file mode 100644 index 00000000..7cb26488 --- /dev/null +++ b/UKSF.Api.Command/Context/LoaContext.cs @@ -0,0 +1,12 @@ +using UKSF.Api.Base.Context; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; + +namespace UKSF.Api.Command.Context { + public interface ILoaContext : IMongoContext, ICachedMongoContext { } + + public class LoaContext : CachedMongoContext, ILoaContext { + public LoaContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "loas") { } + } +} diff --git a/UKSF.Api.Command/Context/LoaDataService.cs b/UKSF.Api.Command/Context/LoaDataService.cs deleted file mode 100644 index fc3ba0c7..00000000 --- a/UKSF.Api.Command/Context/LoaDataService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using UKSF.Api.Base.Context; -using UKSF.Api.Personnel.Models; -using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; - -namespace UKSF.Api.Command.Context { - public interface ILoaDataService : IDataService, ICachedDataService { } - - public class LoaDataService : CachedDataService, ILoaDataService { - public LoaDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "loas") { } - } -} diff --git a/UKSF.Api.Command/Context/OperationOrderDataService.cs b/UKSF.Api.Command/Context/OperationOrderContext.cs similarity index 53% rename from UKSF.Api.Command/Context/OperationOrderDataService.cs rename to UKSF.Api.Command/Context/OperationOrderContext.cs index d1e7d950..f5f15be9 100644 --- a/UKSF.Api.Command/Context/OperationOrderDataService.cs +++ b/UKSF.Api.Command/Context/OperationOrderContext.cs @@ -6,10 +6,10 @@ using UKSF.Api.Shared.Events; namespace UKSF.Api.Command.Context { - public interface IOperationOrderDataService : IDataService, ICachedDataService { } + public interface IOperationOrderContext : IMongoContext, ICachedMongoContext { } - public class OperationOrderDataService : CachedDataService, IOperationOrderDataService { - public OperationOrderDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "opord") { } + public class OperationOrderContext : CachedMongoContext, IOperationOrderContext { + public OperationOrderContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "opord") { } protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { diff --git a/UKSF.Api.Command/Context/OperationReportDataService.cs b/UKSF.Api.Command/Context/OperationReportContext.cs similarity index 53% rename from UKSF.Api.Command/Context/OperationReportDataService.cs rename to UKSF.Api.Command/Context/OperationReportContext.cs index b2f4aba2..e4f2b5e0 100644 --- a/UKSF.Api.Command/Context/OperationReportDataService.cs +++ b/UKSF.Api.Command/Context/OperationReportContext.cs @@ -6,10 +6,10 @@ using UKSF.Api.Shared.Events; namespace UKSF.Api.Command.Context { - public interface IOperationReportDataService : IDataService, ICachedDataService { } + public interface IOperationReportContext : IMongoContext, ICachedMongoContext { } - public class OperationReportDataService : CachedDataService, IOperationReportDataService { - public OperationReportDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "oprep") { } + public class OperationReportContext : CachedMongoContext, IOperationReportContext { + public OperationReportContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "oprep") { } protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { diff --git a/UKSF.Api.Command/Controllers/CommandRequestsController.cs b/UKSF.Api.Command/Controllers/CommandRequestsController.cs index 77b9d25c..63a20c2b 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsController.cs @@ -9,8 +9,10 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; +using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; @@ -23,22 +25,26 @@ public class CommandRequestsController : Controller { private const string SUPER_ADMIN = "59e38f10594c603b78aa9dbd"; private readonly IAccountService _accountService; private readonly ICommandRequestCompletionService _commandRequestCompletionService; + private readonly ICommandRequestContext _commandRequestContext; private readonly ICommandRequestService _commandRequestService; private readonly IDisplayNameService _displayNameService; private readonly IHttpContextService _httpContextService; private readonly ILogger _logger; private readonly INotificationsService _notificationsService; + private readonly IUnitsContext _unitsContext; private readonly IUnitsService _unitsService; - private readonly IVariablesDataService _variablesDataService; + private readonly IVariablesContext _variablesContext; public CommandRequestsController( ICommandRequestService commandRequestService, ICommandRequestCompletionService commandRequestCompletionService, IHttpContextService httpContextService, IUnitsService unitsService, + IUnitsContext unitsContext, + ICommandRequestContext commandRequestContext, IDisplayNameService displayNameService, INotificationsService notificationsService, - IVariablesDataService variablesDataService, + IVariablesContext variablesContext, IAccountService accountService, ILogger logger ) { @@ -46,21 +52,23 @@ ILogger logger _commandRequestCompletionService = commandRequestCompletionService; _httpContextService = httpContextService; _unitsService = unitsService; + _unitsContext = unitsContext; + _commandRequestContext = commandRequestContext; _displayNameService = displayNameService; _notificationsService = notificationsService; - _variablesDataService = variablesDataService; + _variablesContext = variablesContext; _accountService = accountService; _logger = logger; } [HttpGet, Authorize] public IActionResult Get() { - IEnumerable allRequests = _commandRequestService.Data.Get(); - List myRequests = new List(); - List otherRequests = new List(); + IEnumerable allRequests = _commandRequestContext.Get(); + List myRequests = new(); + List otherRequests = new(); string contextId = _httpContextService.GetUserId(); - string id = _variablesDataService.GetSingle("UNIT_ID_PERSONNEL").AsString(); - bool canOverride = _unitsService.Data.GetSingle(id).members.Any(x => x == contextId); + string id = _variablesContext.GetSingle("UNIT_ID_PERSONNEL").AsString(); + bool canOverride = _unitsContext.GetSingle(id).Members.Any(x => x == contextId); bool superAdmin = contextId == SUPER_ADMIN; DateTime now = DateTime.Now; foreach (CommandRequest commandRequest in allRequests) { @@ -108,7 +116,7 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje bool overriden = bool.Parse(body["overriden"].ToString()); ReviewState state = Enum.Parse(body["reviewState"].ToString()); Account sessionAccount = _accountService.GetUserAccount(); - CommandRequest request = _commandRequestService.Data.GetSingle(id); + CommandRequest request = _commandRequestContext.GetSingle(id); if (request == null) { throw new NullReferenceException($"Failed to get request with id {id}, does not exist"); } @@ -117,35 +125,35 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje _logger.LogAudit($"Review state of {request.Type.ToLower()} request for {request.DisplayRecipient} overriden to {state}"); await _commandRequestService.SetRequestAllReviewStates(request, state); - foreach (string reviewerId in request.Reviews.Select(x => x.Key).Where(x => x != sessionAccount.id)) { + foreach (string reviewerId in request.Reviews.Select(x => x.Key).Where(x => x != sessionAccount.Id)) { _notificationsService.Add( new Notification { - owner = reviewerId, - icon = NotificationIcons.REQUEST, - message = $"Your review on {AvsAn.Query(request.Type).Article} {request.Type.ToLower()} request for {request.DisplayRecipient} was overriden by {sessionAccount.id}" + Owner = reviewerId, + Icon = NotificationIcons.REQUEST, + Message = $"Your review on {AvsAn.Query(request.Type).Article} {request.Type.ToLower()} request for {request.DisplayRecipient} was overriden by {sessionAccount.Id}" } ); } } else { - ReviewState currentState = _commandRequestService.GetReviewState(request.id, sessionAccount.id); + ReviewState currentState = _commandRequestService.GetReviewState(request.Id, sessionAccount.Id); if (currentState == ReviewState.ERROR) { throw new ArgumentOutOfRangeException( - $"Getting review state for {sessionAccount} from {request.id} failed. Reviews: \n{request.Reviews.Select(x => $"{x.Key}: {x.Value}").Aggregate((x, y) => $"{x}\n{y}")}" + $"Getting review state for {sessionAccount} from {request.Id} failed. Reviews: \n{request.Reviews.Select(x => $"{x.Key}: {x.Value}").Aggregate((x, y) => $"{x}\n{y}")}" ); } if (currentState == state) return Ok(); _logger.LogAudit($"Review state of {_displayNameService.GetDisplayName(sessionAccount)} for {request.Type.ToLower()} request for {request.DisplayRecipient} updated to {state}"); - await _commandRequestService.SetRequestReviewState(request, sessionAccount.id, state); + await _commandRequestService.SetRequestReviewState(request, sessionAccount.Id, state); } try { - await _commandRequestCompletionService.Resolve(request.id); + await _commandRequestCompletionService.Resolve(request.Id); } catch (Exception) { if (overriden) { await _commandRequestService.SetRequestAllReviewStates(request, ReviewState.PENDING); } else { - await _commandRequestService.SetRequestReviewState(request, sessionAccount.id, ReviewState.PENDING); + await _commandRequestService.SetRequestReviewState(request, sessionAccount.Id, ReviewState.PENDING); } throw; diff --git a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs index c85b7f45..fd8728c9 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; @@ -14,16 +15,18 @@ namespace UKSF.Api.Command.Controllers { [Route("CommandRequests/Create")] public class CommandRequestsCreationController : Controller { - private readonly IAccountService _accountService; + private readonly IAccountContext _accountContext; private readonly ICommandRequestService _commandRequestService; private readonly IDisplayNameService _displayNameService; private readonly IHttpContextService _httpContextService; private readonly ILoaService _loaService; private readonly IRanksService _ranksService; + private readonly IUnitsContext _unitsContext; private readonly IUnitsService _unitsService; public CommandRequestsCreationController( - IAccountService accountService, + IAccountContext accountContext, + IUnitsContext unitsContext, ICommandRequestService commandRequestService, IRanksService ranksService, ILoaService loaService, @@ -31,7 +34,8 @@ public CommandRequestsCreationController( IDisplayNameService displayNameService, IHttpContextService httpContextService ) { - _accountService = accountService; + _accountContext = accountContext; + _unitsContext = unitsContext; _commandRequestService = commandRequestService; _ranksService = ranksService; _loaService = loaService; @@ -44,7 +48,7 @@ IHttpContextService httpContextService public async Task CreateRequestRank([FromBody] CommandRequest request) { request.Requester = _httpContextService.GetUserId(); request.DisplayValue = request.Value; - request.DisplayFrom = _accountService.Data.GetSingle(request.Recipient).rank; + request.DisplayFrom = _accountContext.GetSingle(request.Recipient).Rank; if (request.DisplayValue == request.DisplayFrom) return BadRequest("Ranks are equal"); bool direction = _ranksService.IsSuperior(request.DisplayValue, request.DisplayFrom); request.Type = string.IsNullOrEmpty(request.DisplayFrom) ? CommandRequestType.PROMOTION : direction ? CommandRequestType.PROMOTION : CommandRequestType.DEMOTION; @@ -94,7 +98,7 @@ public async Task CreateRequestDischarge([FromBody] CommandReques public async Task CreateRequestIndividualRole([FromBody] CommandRequest request) { request.Requester = _httpContextService.GetUserId(); request.DisplayValue = request.Value; - request.DisplayFrom = _accountService.Data.GetSingle(request.Recipient).roleAssignment; + request.DisplayFrom = _accountContext.GetSingle(request.Recipient).RoleAssignment; request.Type = CommandRequestType.INDIVIDUAL_ROLE; if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); await _commandRequestService.Add(request, ChainOfCommandMode.NEXT_COMMANDER); @@ -103,21 +107,21 @@ public async Task CreateRequestIndividualRole([FromBody] CommandR [HttpPut("unitrole"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestUnitRole([FromBody] CommandRequest request) { - Unit unit = _unitsService.Data.GetSingle(request.Value); + Unit unit = _unitsContext.GetSingle(request.Value); bool recipientHasUnitRole = _unitsService.RolesHasMember(unit, request.Recipient); if (!recipientHasUnitRole && request.SecondaryValue == "None") { return BadRequest( - $"{_displayNameService.GetDisplayName(request.Recipient)} has no unit role in {unit.name}. If you are trying to remove them from the unit, use a Unit Removal request" + $"{_displayNameService.GetDisplayName(request.Recipient)} has no unit role in {unit.Name}. If you are trying to remove them from the unit, use a Unit Removal request" ); } request.Requester = _httpContextService.GetUserId(); - request.DisplayValue = request.SecondaryValue == "None" ? $"Remove role from {unit.name}" : $"{request.SecondaryValue} of {unit.name}"; + request.DisplayValue = request.SecondaryValue == "None" ? $"Remove role from {unit.Name}" : $"{request.SecondaryValue} of {unit.Name}"; if (recipientHasUnitRole) { - string role = unit.roles.FirstOrDefault(x => x.Value == request.Recipient).Key; - request.DisplayFrom = $"{role} of {unit.name}"; + string role = unit.Roles.FirstOrDefault(x => x.Value == request.Recipient).Key; + request.DisplayFrom = $"{role} of {unit.Name}"; } else { - request.DisplayFrom = $"Member of {unit.name}"; + request.DisplayFrom = $"Member of {unit.Name}"; } request.Type = CommandRequestType.UNIT_ROLE; @@ -128,14 +132,14 @@ public async Task CreateRequestUnitRole([FromBody] CommandRequest [HttpPut("unitremoval"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestUnitRemoval([FromBody] CommandRequest request) { - Unit removeUnit = _unitsService.Data.GetSingle(request.Value); - if (removeUnit.branch == UnitBranch.COMBAT) { + Unit removeUnit = _unitsContext.GetSingle(request.Value); + if (removeUnit.Branch == UnitBranch.COMBAT) { return BadRequest("To remove from a combat unit, use a Transfer request"); } request.Requester = _httpContextService.GetUserId(); request.DisplayValue = "N/A"; - request.DisplayFrom = removeUnit.name; + request.DisplayFrom = removeUnit.Name; request.Type = CommandRequestType.UNIT_REMOVAL; if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); await _commandRequestService.Add(request, ChainOfCommandMode.TARGET_COMMANDER); @@ -144,16 +148,16 @@ public async Task CreateRequestUnitRemoval([FromBody] CommandRequ [HttpPut("transfer"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestTransfer([FromBody] CommandRequest request) { - Unit toUnit = _unitsService.Data.GetSingle(request.Value); + Unit toUnit = _unitsContext.GetSingle(request.Value); request.Requester = _httpContextService.GetUserId(); - request.DisplayValue = toUnit.name; - if (toUnit.branch == UnitBranch.AUXILIARY) { + request.DisplayValue = toUnit.Name; + if (toUnit.Branch == UnitBranch.AUXILIARY) { request.DisplayFrom = "N/A"; request.Type = CommandRequestType.AUXILIARY_TRANSFER; if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); await _commandRequestService.Add(request, ChainOfCommandMode.TARGET_COMMANDER); } else { - request.DisplayFrom = _accountService.Data.GetSingle(request.Recipient).unitAssignment; + request.DisplayFrom = _accountContext.GetSingle(request.Recipient).UnitAssignment; request.Type = CommandRequestType.TRANSFER; if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); await _commandRequestService.Add(request, ChainOfCommandMode.COMMANDER_AND_TARGET_COMMANDER); diff --git a/UKSF.Api.Command/Controllers/DischargesController.cs b/UKSF.Api.Command/Controllers/DischargesController.cs index 4527c246..ec4b4cc1 100644 --- a/UKSF.Api.Command/Controllers/DischargesController.cs +++ b/UKSF.Api.Command/Controllers/DischargesController.cs @@ -5,8 +5,10 @@ using MongoDB.Driver; using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; +using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; @@ -16,44 +18,44 @@ namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.PERSONNEL, Permissions.NCO, Permissions.RECRUITER)] public class DischargesController : Controller { - private readonly IAccountService _accountService; + private readonly IAccountContext _accountContext; private readonly IAssignmentService _assignmentService; private readonly ICommandRequestService _commandRequestService; - private readonly IDischargeService _dischargeService; + private readonly IDischargeContext _dischargeContext; private readonly IHttpContextService _httpContextService; private readonly ILogger _logger; private readonly INotificationsService _notificationsService; - private readonly IUnitsService _unitsService; - private readonly IVariablesDataService _variablesDataService; + private readonly IUnitsContext _unitsContext; + private readonly IVariablesContext _variablesContext; public DischargesController( - IAccountService accountService, + IDischargeContext dischargeContext, + IAccountContext accountContext, + IUnitsContext unitsContext, IAssignmentService assignmentService, ICommandRequestService commandRequestService, - IDischargeService dischargeService, INotificationsService notificationsService, IHttpContextService httpContextService, - IUnitsService unitsService, - IVariablesDataService variablesDataService, + IVariablesContext variablesContext, ILogger logger ) { - _accountService = accountService; + _dischargeContext = dischargeContext; + _accountContext = accountContext; + _unitsContext = unitsContext; _assignmentService = assignmentService; _commandRequestService = commandRequestService; - _dischargeService = dischargeService; _notificationsService = notificationsService; _httpContextService = httpContextService; - _unitsService = unitsService; - _variablesDataService = variablesDataService; + _variablesContext = variablesContext; _logger = logger; } [HttpGet] public IActionResult Get() { - IEnumerable discharges = _dischargeService.Data.Get(); + IEnumerable discharges = _dischargeContext.Get(); foreach (DischargeCollection discharge in discharges) { - discharge.requestExists = _commandRequestService.DoesEquivalentRequestExist( - new CommandRequest { Recipient = discharge.accountId, Type = CommandRequestType.REINSTATE_MEMBER, DisplayValue = "Member", DisplayFrom = "Discharged" } + discharge.RequestExists = _commandRequestService.DoesEquivalentRequestExist( + new CommandRequest { Recipient = discharge.AccountId, Type = CommandRequestType.REINSTATE_MEMBER, DisplayValue = "Member", DisplayFrom = "Discharged" } ); } @@ -62,11 +64,11 @@ public IActionResult Get() { [HttpGet("reinstate/{id}")] public async Task Reinstate(string id) { - DischargeCollection dischargeCollection = _dischargeService.Data.GetSingle(id); - await _dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); - await _accountService.Data.Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); + DischargeCollection dischargeCollection = _dischargeContext.GetSingle(id); + await _dischargeContext.Update(dischargeCollection.Id, Builders.Update.Set(x => x.Reinstated, true)); + await _accountContext.Update(dischargeCollection.AccountId, x => x.MembershipState, MembershipState.MEMBER); Notification notification = await _assignmentService.UpdateUnitRankAndRole( - dischargeCollection.accountId, + dischargeCollection.AccountId, "Basic Training Unit", "Trainee", "Recruit", @@ -76,15 +78,15 @@ public async Task Reinstate(string id) { ); _notificationsService.Add(notification); - _logger.LogAudit($"{_httpContextService.GetUserId()} reinstated {dischargeCollection.name}'s membership", _httpContextService.GetUserId()); - string personnelId = _variablesDataService.GetSingle("UNIT_ID_PERSONNEL").AsString(); - foreach (string member in _unitsService.Data.GetSingle(personnelId).members.Where(x => x != _httpContextService.GetUserId())) { + _logger.LogAudit($"{_httpContextService.GetUserId()} reinstated {dischargeCollection.Name}'s membership", _httpContextService.GetUserId()); + string personnelId = _variablesContext.GetSingle("UNIT_ID_PERSONNEL").AsString(); + foreach (string member in _unitsContext.GetSingle(personnelId).Members.Where(x => x != _httpContextService.GetUserId())) { _notificationsService.Add( - new Notification { owner = member, icon = NotificationIcons.PROMOTION, message = $"{dischargeCollection.name}'s membership was reinstated by {_httpContextService.GetUserId()}" } + new Notification { Owner = member, Icon = NotificationIcons.PROMOTION, Message = $"{dischargeCollection.Name}'s membership was reinstated by {_httpContextService.GetUserId()}" } ); } - return Ok(_dischargeService.Data.Get()); + return Ok(_dischargeContext.Get()); } } } diff --git a/UKSF.Api.Command/Controllers/OperationOrderController.cs b/UKSF.Api.Command/Controllers/OperationOrderController.cs index 95b434f9..bae60f6e 100644 --- a/UKSF.Api.Command/Controllers/OperationOrderController.cs +++ b/UKSF.Api.Command/Controllers/OperationOrderController.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; using UKSF.Api.Shared; @@ -8,15 +9,19 @@ namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] public class OperationOrderController : Controller { + private readonly IOperationOrderContext _operationOrderContext; private readonly IOperationOrderService _operationOrderService; - public OperationOrderController(IOperationOrderService operationOrderService) => _operationOrderService = operationOrderService; + public OperationOrderController(IOperationOrderService operationOrderService, IOperationOrderContext operationOrderContext) { + _operationOrderService = operationOrderService; + _operationOrderContext = operationOrderContext; + } [HttpGet, Authorize] - public IActionResult Get() => Ok(_operationOrderService.Data.Get()); + public IActionResult Get() => Ok(_operationOrderContext.Get()); [HttpGet("{id}"), Authorize] - public IActionResult Get(string id) => Ok(new {result = _operationOrderService.Data.GetSingle(id)}); + public IActionResult Get(string id) => Ok(new { result = _operationOrderContext.GetSingle(id) }); [HttpPost, Authorize] public async Task Post([FromBody] CreateOperationOrderRequest request) { @@ -26,7 +31,7 @@ public async Task Post([FromBody] CreateOperationOrderRequest req [HttpPut, Authorize] public async Task Put([FromBody] Opord request) { - await _operationOrderService.Data.Replace(request); + await _operationOrderContext.Replace(request); return Ok(); } } diff --git a/UKSF.Api.Command/Controllers/OperationReportController.cs b/UKSF.Api.Command/Controllers/OperationReportController.cs index a5a9351d..455d79ef 100644 --- a/UKSF.Api.Command/Controllers/OperationReportController.cs +++ b/UKSF.Api.Command/Controllers/OperationReportController.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; using UKSF.Api.Shared; @@ -9,14 +10,18 @@ namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] public class OperationReportController : Controller { + private readonly IOperationReportContext _operationReportContext; private readonly IOperationReportService _operationReportService; - public OperationReportController(IOperationReportService operationReportService) => _operationReportService = operationReportService; + public OperationReportController(IOperationReportService operationReportService, IOperationReportContext operationReportContext) { + _operationReportService = operationReportService; + _operationReportContext = operationReportContext; + } [HttpGet("{id}"), Authorize] public IActionResult Get(string id) { - Oprep oprep = _operationReportService.Data.GetSingle(id); - return Ok(new {operationEntity = oprep, groupedAttendance = oprep.AttendanceReport.users.GroupBy(x => x.groupName)}); + Oprep oprep = _operationReportContext.GetSingle(id); + return Ok(new { operationEntity = oprep, groupedAttendance = oprep.AttendanceReport.Users.GroupBy(x => x.GroupName) }); } [HttpPost, Authorize] @@ -27,11 +32,11 @@ public async Task Post([FromBody] CreateOperationReportRequest re [HttpPut, Authorize] public async Task Put([FromBody] Oprep request) { - await _operationReportService.Data.Replace(request); + await _operationReportContext.Replace(request); return Ok(); } [HttpGet, Authorize] - public IActionResult Get() => Ok(_operationReportService.Data.Get()); + public IActionResult Get() => Ok(_operationReportContext.Get()); } } diff --git a/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs b/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs index e9ef1635..a6ff9238 100644 --- a/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs +++ b/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs @@ -28,7 +28,7 @@ public void Init() { } private async Task HandleEvent(DataEventModel dataEventModel) { - switch (dataEventModel.type) { + switch (dataEventModel.Type) { case DataEventType.ADD: case DataEventType.UPDATE: await UpdatedEvent(); diff --git a/UKSF.Api.Command/Models/CommandRequest.cs b/UKSF.Api.Command/Models/CommandRequest.cs index 8a4aae9d..d290621a 100644 --- a/UKSF.Api.Command/Models/CommandRequest.cs +++ b/UKSF.Api.Command/Models/CommandRequest.cs @@ -25,7 +25,7 @@ public static class CommandRequestType { public const string UNIT_ROLE = "Unit Role"; } - public class CommandRequest : DatabaseObject { + public record CommandRequest : MongoObject { public DateTime DateCreated; public string DisplayFrom; public string DisplayRecipient; @@ -34,7 +34,7 @@ public class CommandRequest : DatabaseObject { public string Reason, Type; [BsonRepresentation(BsonType.ObjectId)] public string Recipient; [BsonRepresentation(BsonType.ObjectId)] public string Requester; - public Dictionary Reviews = new Dictionary(); + public Dictionary Reviews = new(); public string SecondaryValue; public string Value; public CommandRequest() => DateCreated = DateTime.Now; diff --git a/UKSF.Api.Command/Models/CommandRequestLoa.cs b/UKSF.Api.Command/Models/CommandRequestLoa.cs index dd3b601e..8b59583f 100644 --- a/UKSF.Api.Command/Models/CommandRequestLoa.cs +++ b/UKSF.Api.Command/Models/CommandRequestLoa.cs @@ -1,7 +1,7 @@ using System; namespace UKSF.Api.Command.Models { - public class CommandRequestLoa : CommandRequest { + public record CommandRequestLoa : CommandRequest { public string Emergency; public DateTime End; public string Late; diff --git a/UKSF.Api.Command/Models/Discharge.cs b/UKSF.Api.Command/Models/Discharge.cs index ae6d456c..9d26d752 100644 --- a/UKSF.Api.Command/Models/Discharge.cs +++ b/UKSF.Api.Command/Models/Discharge.cs @@ -5,20 +5,20 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Command.Models { - public class DischargeCollection : DatabaseObject { - [BsonRepresentation(BsonType.ObjectId)] public string accountId; - public List discharges = new List(); - public string name; - public bool reinstated; - [BsonIgnore] public bool requestExists; + public record DischargeCollection : MongoObject { + [BsonRepresentation(BsonType.ObjectId)] public string AccountId; + public List Discharges = new(); + public string Name; + public bool Reinstated; + [BsonIgnore] public bool RequestExists; } - public class Discharge : DatabaseObject { - public string dischargedBy; - public string rank; - public string reason; - public string role; - public DateTime timestamp = DateTime.Now; - public string unit; + public record Discharge : MongoObject { + public string DischargedBy; + public string Rank; + public string Reason; + public string Role; + public DateTime Timestamp = DateTime.Now; + public string Unit; } } diff --git a/UKSF.Api.Command/Models/Opord.cs b/UKSF.Api.Command/Models/Opord.cs index 23e1e2cf..1eaf8a69 100644 --- a/UKSF.Api.Command/Models/Opord.cs +++ b/UKSF.Api.Command/Models/Opord.cs @@ -2,7 +2,7 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Command.Models { - public class Opord : DatabaseObject { + public record Opord : MongoObject { public string Description; public DateTime End; public string Map; diff --git a/UKSF.Api.Command/Models/Oprep.cs b/UKSF.Api.Command/Models/Oprep.cs index b3ae65d4..9d08a02b 100644 --- a/UKSF.Api.Command/Models/Oprep.cs +++ b/UKSF.Api.Command/Models/Oprep.cs @@ -3,7 +3,7 @@ using UKSF.Api.Personnel.Models; namespace UKSF.Api.Command.Models { - public class Oprep : DatabaseObject { + public record Oprep : MongoObject { public AttendanceReport AttendanceReport; public string Description; public DateTime End; diff --git a/UKSF.Api.Command/Services/ChainOfCommandService.cs b/UKSF.Api.Command/Services/ChainOfCommandService.cs index 1f4699d9..2bbed7d5 100644 --- a/UKSF.Api.Command/Services/ChainOfCommandService.cs +++ b/UKSF.Api.Command/Services/ChainOfCommandService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Command.Models; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Extensions; @@ -14,18 +15,19 @@ public interface IChainOfCommandService { } public class ChainOfCommandService : IChainOfCommandService { + private readonly IAccountService _accountService; private readonly string _commanderRoleName; - - private readonly IUnitsService _unitsService; private readonly IHttpContextService _httpContextService; - private readonly IAccountService _accountService; + private readonly IUnitsContext _unitsContext; + private readonly IUnitsService _unitsService; - public ChainOfCommandService(IUnitsService unitsService, IRolesService rolesService, IHttpContextService httpContextService, IAccountService accountService) { + public ChainOfCommandService(IUnitsContext unitsContext, IUnitsService unitsService, IRolesService rolesService, IHttpContextService httpContextService, IAccountService accountService) { + _unitsContext = unitsContext; _unitsService = unitsService; _httpContextService = httpContextService; _accountService = accountService; - _commanderRoleName = rolesService.GetUnitRoleByOrder(0).name; + _commanderRoleName = rolesService.GetUnitRoleByOrder(0).Name; } public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, Unit start, Unit target) { @@ -46,9 +48,10 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U // If no chain, get root unit child commanders if (chain.Count == 0) { - foreach (Unit unit in _unitsService.Data.Get(x => x.parent == _unitsService.GetRoot().id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) { + foreach (Unit unit in _unitsContext.Get(x => x.Parent == _unitsService.GetRoot().Id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) { chain.Add(GetCommander(unit)); } + chain.CleanHashset(); } @@ -63,27 +66,27 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U public bool InContextChainOfCommand(string id) { Account contextAccount = _accountService.GetUserAccount(); - if (id == contextAccount.id) return true; - Unit unit = _unitsService.Data.GetSingle(x => x.name == contextAccount.unitAssignment); - return _unitsService.RolesHasMember(unit, contextAccount.id) && (unit.members.Contains(id) || _unitsService.GetAllChildren(unit, true).Any(unitChild => unitChild.members.Contains(id))); + if (id == contextAccount.Id) return true; + Unit unit = _unitsContext.GetSingle(x => x.Name == contextAccount.UnitAssignment); + return _unitsService.RolesHasMember(unit, contextAccount.Id) && (unit.Members.Contains(id) || _unitsService.GetAllChildren(unit, true).Any(unitChild => unitChild.Members.Contains(id))); } private IEnumerable ResolveMode(ChainOfCommandMode mode, Unit start, Unit target) { return mode switch { - ChainOfCommandMode.FULL => Full(start), - ChainOfCommandMode.NEXT_COMMANDER => GetNextCommander(start), - ChainOfCommandMode.NEXT_COMMANDER_EXCLUDE_SELF => GetNextCommanderExcludeSelf(start), - ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE => CommanderAndOneAbove(start), - ChainOfCommandMode.COMMANDER_AND_PERSONNEL => GetCommanderAndPersonnel(start), + ChainOfCommandMode.FULL => Full(start), + ChainOfCommandMode.NEXT_COMMANDER => GetNextCommander(start), + ChainOfCommandMode.NEXT_COMMANDER_EXCLUDE_SELF => GetNextCommanderExcludeSelf(start), + ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE => CommanderAndOneAbove(start), + ChainOfCommandMode.COMMANDER_AND_PERSONNEL => GetCommanderAndPersonnel(start), ChainOfCommandMode.COMMANDER_AND_TARGET_COMMANDER => GetCommanderAndTargetCommander(start, target), - ChainOfCommandMode.PERSONNEL => GetPersonnel(), - ChainOfCommandMode.TARGET_COMMANDER => GetNextCommander(target), - _ => throw new InvalidOperationException("Chain of command mode not recognized") + ChainOfCommandMode.PERSONNEL => GetPersonnel(), + ChainOfCommandMode.TARGET_COMMANDER => GetNextCommander(target), + _ => throw new InvalidOperationException("Chain of command mode not recognized") }; } private IEnumerable Full(Unit unit) { - HashSet chain = new HashSet(); + HashSet chain = new(); while (unit != null) { if (UnitHasCommander(unit)) { chain.Add(GetCommander(unit)); @@ -95,12 +98,12 @@ private IEnumerable Full(Unit unit) { return chain; } - private IEnumerable GetNextCommander(Unit unit) => new HashSet {GetNextUnitCommander(unit)}; + private IEnumerable GetNextCommander(Unit unit) => new HashSet { GetNextUnitCommander(unit) }; - private IEnumerable GetNextCommanderExcludeSelf(Unit unit) => new HashSet {GetNextUnitCommanderExcludeSelf(unit)}; + private IEnumerable GetNextCommanderExcludeSelf(Unit unit) => new HashSet { GetNextUnitCommanderExcludeSelf(unit) }; private IEnumerable CommanderAndOneAbove(Unit unit) { - HashSet chain = new HashSet(); + HashSet chain = new(); if (unit != null) { if (UnitHasCommander(unit)) { chain.Add(GetCommander(unit)); @@ -116,7 +119,7 @@ private IEnumerable CommanderAndOneAbove(Unit unit) { } private IEnumerable GetCommanderAndPersonnel(Unit unit) { - HashSet chain = new HashSet(); + HashSet chain = new(); if (UnitHasCommander(unit)) { chain.Add(GetCommander(unit)); } @@ -125,9 +128,9 @@ private IEnumerable GetCommanderAndPersonnel(Unit unit) { return chain; } - private IEnumerable GetPersonnel() => _unitsService.Data.GetSingle(x => x.shortname == "SR7").members.ToHashSet(); + private IEnumerable GetPersonnel() => _unitsContext.GetSingle(x => x.Shortname == "SR7").Members.ToHashSet(); - private IEnumerable GetCommanderAndTargetCommander(Unit unit, Unit targetUnit) => new HashSet {GetNextUnitCommander(unit), GetNextUnitCommander(targetUnit)}; + private IEnumerable GetCommanderAndTargetCommander(Unit unit, Unit targetUnit) => new HashSet { GetNextUnitCommander(unit), GetNextUnitCommander(targetUnit) }; private string GetNextUnitCommander(Unit unit) { while (unit != null) { @@ -156,6 +159,6 @@ private string GetNextUnitCommanderExcludeSelf(Unit unit) { private bool UnitHasCommander(Unit unit) => _unitsService.HasRole(unit, _commanderRoleName); - private string GetCommander(Unit unit) => unit.roles.GetValueOrDefault(_commanderRoleName, string.Empty); + private string GetCommander(Unit unit) => unit.Roles.GetValueOrDefault(_commanderRoleName, string.Empty); } } diff --git a/UKSF.Api.Command/Services/CommandRequestCompletionService.cs b/UKSF.Api.Command/Services/CommandRequestCompletionService.cs index 66e80b9c..561eef0b 100644 --- a/UKSF.Api.Command/Services/CommandRequestCompletionService.cs +++ b/UKSF.Api.Command/Services/CommandRequestCompletionService.cs @@ -3,9 +3,11 @@ using AvsAnLib; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; +using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Command.Signalr.Clients; using UKSF.Api.Command.Signalr.Hubs; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; @@ -17,23 +19,27 @@ public interface ICommandRequestCompletionService { } public class CommandRequestCompletionService : ICommandRequestCompletionService { - private readonly IHttpContextService _httpContextService; - private readonly IAccountService _accountService; + private readonly IAccountContext _accountContext; private readonly IAssignmentService _assignmentService; + private readonly ICommandRequestContext _commandRequestContext; private readonly ICommandRequestService _commandRequestService; private readonly IHubContext _commandRequestsHub; - private readonly IDischargeService _dischargeService; + private readonly IDischargeContext _dischargeContext; + private readonly IHttpContextService _httpContextService; private readonly ILoaService _loaService; - private readonly INotificationsService _notificationsService; private readonly ILogger _logger; + private readonly INotificationsService _notificationsService; + private readonly IUnitsContext _unitsContext; private readonly IUnitsService _unitsService; public CommandRequestCompletionService( + IDischargeContext dischargeContext, + ICommandRequestContext commandRequestContext, + IAccountContext accountContext, + IUnitsContext unitsContext, IHttpContextService httpContextService, - IAccountService accountService, ICommandRequestService commandRequestService, - IDischargeService dischargeService, IAssignmentService assignmentService, ILoaService loaService, IUnitsService unitsService, @@ -41,14 +47,15 @@ public CommandRequestCompletionService( INotificationsService notificationsService, ILogger logger ) { + _dischargeContext = dischargeContext; + _commandRequestContext = commandRequestContext; + _accountContext = accountContext; + _unitsContext = unitsContext; _httpContextService = httpContextService; - _accountService = accountService; _commandRequestService = commandRequestService; - _dischargeService = dischargeService; _assignmentService = assignmentService; _loaService = loaService; _unitsService = unitsService; - _dischargeService = dischargeService; _commandRequestsHub = commandRequestsHub; _notificationsService = notificationsService; _logger = logger; @@ -56,7 +63,7 @@ ILogger logger public async Task Resolve(string id) { if (_commandRequestService.IsRequestApproved(id) || _commandRequestService.IsRequestRejected(id)) { - CommandRequest request = _commandRequestService.Data.GetSingle(id); + CommandRequest request = _commandRequestContext.GetSingle(id); switch (request.Type) { case CommandRequestType.PROMOTION: case CommandRequestType.DEMOTION: @@ -92,148 +99,178 @@ public async Task Resolve(string id) { } private async Task Rank(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.id)) { + if (_commandRequestService.IsRequestApproved(request.Id)) { string role = HandleRecruitToPrivate(request.Recipient, request.Value); - Notification notification = await _assignmentService.UpdateUnitRankAndRole(request.Recipient, rankString: request.Value, role: role, reason: request.Reason); + Notification notification = await _assignmentService.UpdateUnitRankAndRole(request.Recipient, rankString: request.Value, role: role, reason: request.Reason); _notificationsService.Add(notification); - await _commandRequestService.ArchiveRequest(request.id); + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.id)) { - await _commandRequestService.ArchiveRequest(request.id); + } else if (_commandRequestService.IsRequestRejected(request.Id)) { + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } private async Task Loa(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.id)) { + if (_commandRequestService.IsRequestApproved(request.Id)) { await _loaService.SetLoaState(request.Value, LoaReviewState.APPROVED); - await _commandRequestService.ArchiveRequest(request.id); + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.id)) { + } else if (_commandRequestService.IsRequestRejected(request.Id)) { await _loaService.SetLoaState(request.Value, LoaReviewState.REJECTED); - await _commandRequestService.ArchiveRequest(request.id); + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } private async Task Discharge(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.id)) { - Account account = _accountService.Data.GetSingle(request.Recipient); - Discharge discharge = new Discharge { - rank = account.rank, - unit = account.unitAssignment, - role = account.roleAssignment, - dischargedBy = request.DisplayRequester, - reason = request.Reason - }; - DischargeCollection dischargeCollection = _dischargeService.Data.GetSingle(x => x.accountId == account.id); + if (_commandRequestService.IsRequestApproved(request.Id)) { + Account account = _accountContext.GetSingle(request.Recipient); + Discharge discharge = new() { Rank = account.Rank, Unit = account.UnitAssignment, Role = account.RoleAssignment, DischargedBy = request.DisplayRequester, Reason = request.Reason }; + DischargeCollection dischargeCollection = _dischargeContext.GetSingle(x => x.AccountId == account.Id); if (dischargeCollection == null) { - dischargeCollection = new DischargeCollection {accountId = account.id, name = $"{account.lastname}.{account.firstname[0]}"}; - dischargeCollection.discharges.Add(discharge); - await _dischargeService.Data.Add(dischargeCollection); + dischargeCollection = new DischargeCollection { AccountId = account.Id, Name = $"{account.Lastname}.{account.Firstname[0]}" }; + dischargeCollection.Discharges.Add(discharge); + await _dischargeContext.Add(dischargeCollection); } else { - dischargeCollection.discharges.Add(discharge); - await _dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, false)); - await _dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.name, $"{account.lastname}.{account.firstname[0]}")); - await _dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.discharges, dischargeCollection.discharges)); + dischargeCollection.Discharges.Add(discharge); + await _dischargeContext.Update( + dischargeCollection.Id, + Builders.Update.Set(x => x.Reinstated, false) + .Set(x => x.Name, $"{account.Lastname}.{account.Firstname[0]}") + .Set(x => x.Discharges, dischargeCollection.Discharges) + ); } - await _accountService.Data.Update(account.id, nameof(account.membershipState), MembershipState.DISCHARGED); + await _accountContext.Update(account.Id, x => x.MembershipState, MembershipState.DISCHARGED); - Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.id, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, request.Reason, "", AssignmentService.REMOVE_FLAG); + Notification notification = await _assignmentService.UpdateUnitRankAndRole( + account.Id, + AssignmentService.REMOVE_FLAG, + AssignmentService.REMOVE_FLAG, + AssignmentService.REMOVE_FLAG, + request.Reason, + "", + AssignmentService.REMOVE_FLAG + ); _notificationsService.Add(notification); - await _assignmentService.UnassignAllUnits(account.id); - await _commandRequestService.ArchiveRequest(request.id); + await _assignmentService.UnassignAllUnits(account.Id); + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.id)) { - await _commandRequestService.ArchiveRequest(request.id); + } else if (_commandRequestService.IsRequestRejected(request.Id)) { + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } private async Task IndividualRole(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.id)) { - Notification notification = await _assignmentService.UpdateUnitRankAndRole(request.Recipient, role: request.Value == "None" ? AssignmentService.REMOVE_FLAG : request.Value, reason: request.Reason); + if (_commandRequestService.IsRequestApproved(request.Id)) { + Notification notification = await _assignmentService.UpdateUnitRankAndRole( + request.Recipient, + role: request.Value == "None" ? AssignmentService.REMOVE_FLAG : request.Value, + reason: request.Reason + ); _notificationsService.Add(notification); - await _commandRequestService.ArchiveRequest(request.id); + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.id)) { - await _commandRequestService.ArchiveRequest(request.id); + } else if (_commandRequestService.IsRequestRejected(request.Id)) { + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } private async Task UnitRole(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.id)) { + if (_commandRequestService.IsRequestApproved(request.Id)) { if (request.SecondaryValue == "None") { if (string.IsNullOrEmpty(request.Value)) { await _assignmentService.UnassignAllUnitRoles(request.Recipient); - _notificationsService.Add(new Notification {owner = request.Recipient, message = "You have been unassigned from all roles in all units", icon = NotificationIcons.DEMOTION}); + _notificationsService.Add(new Notification { Owner = request.Recipient, Message = "You have been unassigned from all roles in all units", Icon = NotificationIcons.DEMOTION }); } else { string role = await _assignmentService.UnassignUnitRole(request.Recipient, request.Value); - _notificationsService.Add(new Notification {owner = request.Recipient, message = $"You have been unassigned as {AvsAn.Query(role).Article} {role} in {_unitsService.GetChainString(_unitsService.Data.GetSingle(request.Value))}", icon = NotificationIcons.DEMOTION}); + _notificationsService.Add( + new Notification { + Owner = request.Recipient, + Message = $"You have been unassigned as {AvsAn.Query(role).Article} {role} in {_unitsService.GetChainString(_unitsContext.GetSingle(request.Value))}", + Icon = NotificationIcons.DEMOTION + } + ); } } else { await _assignmentService.AssignUnitRole(request.Recipient, request.Value, request.SecondaryValue); _notificationsService.Add( - new Notification {owner = request.Recipient, message = $"You have been assigned as {AvsAn.Query(request.SecondaryValue).Article} {request.SecondaryValue} in {_unitsService.GetChainString(_unitsService.Data.GetSingle(request.Value))}", icon = NotificationIcons.PROMOTION} + new Notification { + Owner = request.Recipient, + Message = + $"You have been assigned as {AvsAn.Query(request.SecondaryValue).Article} {request.SecondaryValue} in {_unitsService.GetChainString(_unitsContext.GetSingle(request.Value))}", + Icon = NotificationIcons.PROMOTION + } ); } - await _commandRequestService.ArchiveRequest(request.id); + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} as {request.DisplayValue} in {request.Value} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.id)) { - await _commandRequestService.ArchiveRequest(request.id); + } else if (_commandRequestService.IsRequestRejected(request.Id)) { + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} as {request.DisplayValue} in {request.Value}"); } } private async Task UnitRemoval(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.id)) { - Unit unit = _unitsService.Data.GetSingle(request.Value); - await _assignmentService.UnassignUnit(request.Recipient, unit.id); - _notificationsService.Add(new Notification {owner = request.Recipient, message = $"You have been removed from {_unitsService.GetChainString(unit)}", icon = NotificationIcons.DEMOTION}); - await _commandRequestService.ArchiveRequest(request.id); + if (_commandRequestService.IsRequestApproved(request.Id)) { + Unit unit = _unitsContext.GetSingle(request.Value); + await _assignmentService.UnassignUnit(request.Recipient, unit.Id); + _notificationsService.Add( + new Notification { Owner = request.Recipient, Message = $"You have been removed from {_unitsService.GetChainString(unit)}", Icon = NotificationIcons.DEMOTION } + ); + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.id)) { - await _commandRequestService.ArchiveRequest(request.id); + } else if (_commandRequestService.IsRequestRejected(request.Id)) { + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom}"); } } private async Task Transfer(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.id)) { - Unit unit = _unitsService.Data.GetSingle(request.Value); - Notification notification = await _assignmentService.UpdateUnitRankAndRole(request.Recipient, unit.name, reason: request.Reason); + if (_commandRequestService.IsRequestApproved(request.Id)) { + Unit unit = _unitsContext.GetSingle(request.Value); + Notification notification = await _assignmentService.UpdateUnitRankAndRole(request.Recipient, unit.Name, reason: request.Reason); _notificationsService.Add(notification); - await _commandRequestService.ArchiveRequest(request.id); + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.id)) { - await _commandRequestService.ArchiveRequest(request.id); + } else if (_commandRequestService.IsRequestRejected(request.Id)) { + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } private async Task Reinstate(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.id)) { - DischargeCollection dischargeCollection = _dischargeService.Data.GetSingle(x => x.accountId == request.Recipient); - await _dischargeService.Data.Update(dischargeCollection.id, Builders.Update.Set(x => x.reinstated, true)); - await _accountService.Data.Update(dischargeCollection.accountId, "membershipState", MembershipState.MEMBER); - Notification notification = await _assignmentService.UpdateUnitRankAndRole(dischargeCollection.accountId, "Basic Training Unit", "Trainee", "Recruit", "", "", "your membership was reinstated"); + if (_commandRequestService.IsRequestApproved(request.Id)) { + DischargeCollection dischargeCollection = _dischargeContext.GetSingle(x => x.AccountId == request.Recipient); + await _dischargeContext.Update(dischargeCollection.Id, x => x.Reinstated, true); + await _accountContext.Update(dischargeCollection.AccountId, x => x.MembershipState, MembershipState.MEMBER); + Notification notification = await _assignmentService.UpdateUnitRankAndRole( + dischargeCollection.AccountId, + "Basic Training Unit", + "Trainee", + "Recruit", + "", + "", + "your membership was reinstated" + ); _notificationsService.Add(notification); - _logger.LogAudit($"{_httpContextService.GetUserId()} reinstated {dischargeCollection.name}'s membership"); - await _commandRequestService.ArchiveRequest(request.id); + _logger.LogAudit($"{_httpContextService.GetUserId()} reinstated {dischargeCollection.Name}'s membership"); + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.id)) { - await _commandRequestService.ArchiveRequest(request.id); + } else if (_commandRequestService.IsRequestRejected(request.Id)) { + await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } private string HandleRecruitToPrivate(string id, string targetRank) { - Account account = _accountService.Data.GetSingle(id); - return account.rank == "Recruit" && targetRank == "Private" ? "Rifleman" : account.roleAssignment; + Account account = _accountContext.GetSingle(id); + return account.Rank == "Recruit" && targetRank == "Private" ? "Rifleman" : account.RoleAssignment; } } } diff --git a/UKSF.Api.Command/Services/CommandRequestService.cs b/UKSF.Api.Command/Services/CommandRequestService.cs index d0c8ba06..81a11696 100644 --- a/UKSF.Api.Command/Services/CommandRequestService.cs +++ b/UKSF.Api.Command/Services/CommandRequestService.cs @@ -4,15 +4,15 @@ using System.Threading.Tasks; using AvsAnLib; using MongoDB.Driver; -using UKSF.Api.Base.Context; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; namespace UKSF.Api.Command.Services { - public interface ICommandRequestService : IDataBackedService { + public interface ICommandRequestService { Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE); Task ArchiveRequest(string id); Task SetRequestReviewState(CommandRequest request, string reviewerId, ReviewState newState); @@ -23,93 +23,100 @@ public interface ICommandRequestService : IDataBackedService, ICommandRequestService { + public class CommandRequestService : ICommandRequestService { + private readonly IAccountContext _accountContext; private readonly IAccountService _accountService; private readonly IChainOfCommandService _chainOfCommandService; - private readonly ICommandRequestDataService _data; - private readonly ICommandRequestArchiveDataService _dataArchive; + private readonly ICommandRequestContext _commandRequestContext; + private readonly ICommandRequestArchiveContext _dataArchive; private readonly IDisplayNameService _displayNameService; + private readonly ILogger _logger; private readonly INotificationsService _notificationsService; private readonly IRanksService _ranksService; - private readonly ILogger _logger; - - private readonly IUnitsService _unitsService; + private readonly IUnitsContext _unitsContext; public CommandRequestService( - ICommandRequestDataService data, - ICommandRequestArchiveDataService dataArchive, + IAccountContext accountContext, + IUnitsContext unitsContext, + ICommandRequestContext commandRequestContext, + ICommandRequestArchiveContext dataArchive, INotificationsService notificationsService, IDisplayNameService displayNameService, IAccountService accountService, IChainOfCommandService chainOfCommandService, - IUnitsService unitsService, IRanksService ranksService, ILogger logger - ) : base(data) { - _data = data; + ) { + _accountContext = accountContext; + _unitsContext = unitsContext; + _commandRequestContext = commandRequestContext; _dataArchive = dataArchive; _notificationsService = notificationsService; - _displayNameService = displayNameService; _accountService = accountService; _chainOfCommandService = chainOfCommandService; - _unitsService = unitsService; _ranksService = ranksService; _logger = logger; } public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE) { Account requesterAccount = _accountService.GetUserAccount(); - Account recipientAccount = _accountService.Data.GetSingle(request.Recipient); + Account recipientAccount = _accountContext.GetSingle(request.Recipient); request.DisplayRequester = _displayNameService.GetDisplayName(requesterAccount); request.DisplayRecipient = _displayNameService.GetDisplayName(recipientAccount); - HashSet ids = _chainOfCommandService.ResolveChain(mode, recipientAccount.id, _unitsService.Data.GetSingle(x => x.name == recipientAccount.unitAssignment), _unitsService.Data.GetSingle(request.Value)); + HashSet ids = _chainOfCommandService.ResolveChain( + mode, + recipientAccount.Id, + _unitsContext.GetSingle(x => x.Name == recipientAccount.UnitAssignment), + _unitsContext.GetSingle(request.Value) + ); if (ids.Count == 0) throw new Exception($"Failed to get any commanders for review for {request.Type.ToLower()} request for {request.DisplayRecipient}.\nContact an admin"); - List accounts = ids.Select(x => _accountService.Data.GetSingle(x)).OrderBy(x => x.rank, new RankComparer(_ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); + List accounts = ids.Select(x => _accountContext.GetSingle(x)).OrderBy(x => x.Rank, new RankComparer(_ranksService)).ThenBy(x => x.Lastname).ThenBy(x => x.Firstname).ToList(); foreach (Account account in accounts) { - request.Reviews.Add(account.id, ReviewState.PENDING); + request.Reviews.Add(account.Id, ReviewState.PENDING); } - await _data.Add(request); + await _commandRequestContext.Add(request); _logger.LogAudit($"{request.Type} request created for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); bool selfRequest = request.DisplayRequester == request.DisplayRecipient; - string notificationMessage = $"{request.DisplayRequester} requires your review on {(selfRequest ? "their" : AvsAn.Query(request.Type).Article)} {request.Type.ToLower()} request{(selfRequest ? "" : $" for {request.DisplayRecipient}")}"; - foreach (Account account in accounts.Where(x => x.id != requesterAccount.id)) { - _notificationsService.Add(new Notification {owner = account.id, icon = NotificationIcons.REQUEST, message = notificationMessage, link = "/command/requests"}); + string notificationMessage = + $"{request.DisplayRequester} requires your review on {(selfRequest ? "their" : AvsAn.Query(request.Type).Article)} {request.Type.ToLower()} request{(selfRequest ? "" : $" for {request.DisplayRecipient}")}"; + foreach (Account account in accounts.Where(x => x.Id != requesterAccount.Id)) { + _notificationsService.Add(new Notification { Owner = account.Id, Icon = NotificationIcons.REQUEST, Message = notificationMessage, Link = "/command/requests" }); } } public async Task ArchiveRequest(string id) { - CommandRequest request = _data.GetSingle(id); + CommandRequest request = _commandRequestContext.GetSingle(id); await _dataArchive.Add(request); - await _data.Delete(id); + await _commandRequestContext.Delete(id); } public async Task SetRequestReviewState(CommandRequest request, string reviewerId, ReviewState newState) { - await _data.Update(request.id, Builders.Update.Set($"reviews.{reviewerId}", newState)); + await _commandRequestContext.Update(request.Id, Builders.Update.Set($"reviews.{reviewerId}", newState)); } public async Task SetRequestAllReviewStates(CommandRequest request, ReviewState newState) { - List keys = new List(request.Reviews.Keys); + List keys = new(request.Reviews.Keys); foreach (string key in keys) { request.Reviews[key] = newState; } - await _data.Update(request.id, Builders.Update.Set("reviews", request.Reviews)); + await _commandRequestContext.Update(request.Id, Builders.Update.Set("reviews", request.Reviews)); } public ReviewState GetReviewState(string id, string reviewer) { - CommandRequest request = _data.GetSingle(id); + CommandRequest request = _commandRequestContext.GetSingle(id); return request == null ? ReviewState.ERROR : !request.Reviews.ContainsKey(reviewer) ? ReviewState.ERROR : request.Reviews[reviewer]; } - public bool IsRequestApproved(string id) => _data.GetSingle(id).Reviews.All(x => x.Value == ReviewState.APPROVED); + public bool IsRequestApproved(string id) => _commandRequestContext.GetSingle(id).Reviews.All(x => x.Value == ReviewState.APPROVED); - public bool IsRequestRejected(string id) => _data.GetSingle(id).Reviews.Any(x => x.Value == ReviewState.REJECTED); + public bool IsRequestRejected(string id) => _commandRequestContext.GetSingle(id).Reviews.Any(x => x.Value == ReviewState.REJECTED); public bool DoesEquivalentRequestExist(CommandRequest request) { - return _data.Get().Any(x => x.Recipient == request.Recipient && x.Type == request.Type && x.DisplayValue == request.DisplayValue && x.DisplayFrom == request.DisplayFrom); + return _commandRequestContext.Get().Any(x => x.Recipient == request.Recipient && x.Type == request.Type && x.DisplayValue == request.DisplayValue && x.DisplayFrom == request.DisplayFrom); } } } diff --git a/UKSF.Api.Command/Services/DischargeService.cs b/UKSF.Api.Command/Services/DischargeService.cs deleted file mode 100644 index 9caafb9e..00000000 --- a/UKSF.Api.Command/Services/DischargeService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using UKSF.Api.Base.Context; -using UKSF.Api.Command.Context; - -namespace UKSF.Api.Command.Services { - public interface IDischargeService : IDataBackedService { } - - public class DischargeService : DataBackedService, IDischargeService { - public DischargeService(IDischargeDataService data) : base(data) { } - } -} diff --git a/UKSF.Api.Command/Services/LoaService.cs b/UKSF.Api.Command/Services/LoaService.cs index f959bb47..3c40ae3c 100644 --- a/UKSF.Api.Command/Services/LoaService.cs +++ b/UKSF.Api.Command/Services/LoaService.cs @@ -3,46 +3,47 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSF.Api.Base.Context; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Personnel.Models; namespace UKSF.Api.Command.Services { - public interface ILoaService : IDataBackedService { + public interface ILoaService { IEnumerable Get(List ids); Task Add(CommandRequestLoa requestBase); Task SetLoaState(string id, LoaReviewState state); bool IsLoaCovered(string id, DateTime eventStart); } - public class LoaService : DataBackedService, ILoaService { - public LoaService(ILoaDataService data) : base(data) { } + public class LoaService : ILoaService { + private readonly ILoaContext _loaContext; + + public LoaService(ILoaContext loaContext) => _loaContext = loaContext; public IEnumerable Get(List ids) { - return Data.Get(x => ids.Contains(x.recipient) && x.end > DateTime.Now.AddDays(-30)); + return _loaContext.Get(x => ids.Contains(x.Recipient) && x.End > DateTime.Now.AddDays(-30)); } public async Task Add(CommandRequestLoa requestBase) { - Loa loa = new Loa { - submitted = DateTime.Now, - recipient = requestBase.Recipient, - start = requestBase.Start, - end = requestBase.End, - reason = requestBase.Reason, - emergency = !string.IsNullOrEmpty(requestBase.Emergency) && bool.Parse(requestBase.Emergency), - late = !string.IsNullOrEmpty(requestBase.Late) && bool.Parse(requestBase.Late) + Loa loa = new() { + Submitted = DateTime.Now, + Recipient = requestBase.Recipient, + Start = requestBase.Start, + End = requestBase.End, + Reason = requestBase.Reason, + Emergency = !string.IsNullOrEmpty(requestBase.Emergency) && bool.Parse(requestBase.Emergency), + Late = !string.IsNullOrEmpty(requestBase.Late) && bool.Parse(requestBase.Late) }; - await Data.Add(loa); - return loa.id; + await _loaContext.Add(loa); + return loa.Id; } public async Task SetLoaState(string id, LoaReviewState state) { - await Data.Update(id, Builders.Update.Set(x => x.state, state)); + await _loaContext.Update(id, Builders.Update.Set(x => x.State, state)); } public bool IsLoaCovered(string id, DateTime eventStart) { - return Data.Get(loa => loa.recipient == id && loa.start < eventStart && loa.end > eventStart).Any(); + return _loaContext.Get(loa => loa.Recipient == id && loa.Start < eventStart && loa.End > eventStart).Any(); } } } diff --git a/UKSF.Api.Command/Services/OperationOrderService.cs b/UKSF.Api.Command/Services/OperationOrderService.cs index 1d35fcbd..4d4555b8 100644 --- a/UKSF.Api.Command/Services/OperationOrderService.cs +++ b/UKSF.Api.Command/Services/OperationOrderService.cs @@ -1,25 +1,26 @@ using System.Threading.Tasks; -using UKSF.Api.Base.Context; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; namespace UKSF.Api.Command.Services { - public interface IOperationOrderService : IDataBackedService { + public interface IOperationOrderService { Task Add(CreateOperationOrderRequest request); } - public class OperationOrderService : DataBackedService, IOperationOrderService { - public OperationOrderService(IOperationOrderDataService data) : base(data) { } + public class OperationOrderService : IOperationOrderService { + private readonly IOperationOrderContext _operationOrderContext; + + public OperationOrderService(IOperationOrderContext operationOrderContext) => _operationOrderContext = operationOrderContext; public async Task Add(CreateOperationOrderRequest request) { - Opord operation = new Opord { + Opord operation = new() { Name = request.Name, Map = request.Map, Start = request.Start.AddHours((double) request.Starttime / 100), End = request.End.AddHours((double) request.Endtime / 100), Type = request.Type }; - await Data.Add(operation); + await _operationOrderContext.Add(operation); } } } diff --git a/UKSF.Api.Command/Services/OperationReportService.cs b/UKSF.Api.Command/Services/OperationReportService.cs index d2373288..0942056a 100644 --- a/UKSF.Api.Command/Services/OperationReportService.cs +++ b/UKSF.Api.Command/Services/OperationReportService.cs @@ -1,21 +1,24 @@ using System.Threading.Tasks; -using UKSF.Api.Base.Context; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Personnel.Services; namespace UKSF.Api.Command.Services { - public interface IOperationReportService : IDataBackedService { + public interface IOperationReportService { Task Create(CreateOperationReportRequest request); } - public class OperationReportService : DataBackedService, IOperationReportService { + public class OperationReportService : IOperationReportService { private readonly IAttendanceService _attendanceService; + private readonly IOperationReportContext _operationReportContext; - public OperationReportService(IOperationReportDataService data, IAttendanceService attendanceService) : base(data) => _attendanceService = attendanceService; + public OperationReportService(IOperationReportContext operationReportContext, IAttendanceService attendanceService) { + _operationReportContext = operationReportContext; + _attendanceService = attendanceService; + } public async Task Create(CreateOperationReportRequest request) { - Oprep operation = new Oprep { + Oprep operation = new() { Name = request.Name, Map = request.Map, Start = request.Start.AddHours((double) request.Starttime / 100), @@ -24,7 +27,7 @@ public async Task Create(CreateOperationReportRequest request) { Result = request.Result }; operation.AttendanceReport = await _attendanceService.GenerateAttendanceReport(operation.Start, operation.End); - await Data.Add(operation); + await _operationReportContext.Add(operation); } } } diff --git a/UKSF.Api.Integration.Instagram/Controllers/InstagramController.cs b/UKSF.Api.Integration.Instagram/Controllers/InstagramController.cs deleted file mode 100644 index d09c83d7..00000000 --- a/UKSF.Api.Integration.Instagram/Controllers/InstagramController.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections.Generic; -using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Integration.Instagram.Models; -using UKSF.Api.Integration.Instagram.Services; - -namespace UKSF.Api.Integration.Instagram.Controllers { - [Route("[controller]")] - public class InstagramController : Controller { - private readonly IInstagramService instagramService; - - public InstagramController(IInstagramService instagramService) => this.instagramService = instagramService; - - [HttpGet] - public IEnumerable GetImages() => instagramService.GetImages(); - } -} diff --git a/UKSF.Api.Integration.Instagram/Models/InstagramImage.cs b/UKSF.Api.Integration.Instagram/Models/InstagramImage.cs deleted file mode 100644 index df39e1e4..00000000 --- a/UKSF.Api.Integration.Instagram/Models/InstagramImage.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using Newtonsoft.Json; - -namespace UKSF.Api.Integration.Instagram.Models { - public class InstagramImage { - public string id; - - [JsonProperty("media_type")] public string mediaType; - [JsonProperty("media_url")] public string mediaUrl; - - public string permalink; - public DateTime timestamp; - public string base64; - } -} diff --git a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs index 38897b39..c72dbba4 100644 --- a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs +++ b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs @@ -7,9 +7,11 @@ using Microsoft.Extensions.Configuration; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Discord.Services { public interface IDiscordService { @@ -23,90 +25,103 @@ public interface IDiscordService { } public class DiscordService : IDiscordService, IDisposable { - private static readonly string[] OWNER_REPLIES = {"Why thank you {0} owo", "Thank you {0}, you're too kind", "Thank you so much {0} uwu", "Aw shucks {0} you're embarrassing me"}; - private static readonly string[] REPLIES = {"Why thank you {0}", "Thank you {0}, you're too kind", "Thank you so much {0}", "Aw shucks {0} you're embarrassing me"}; - private static readonly string[] TRIGGERS = {"thank you", "thank", "best", "mvp", "love you", "appreciate you", "good"}; - private readonly IAccountService accountService; - private readonly IConfiguration configuration; - private readonly IDisplayNameService displayNameService; - private readonly IVariablesService variablesService; - private readonly ILogger logger; - private readonly IRanksService ranksService; - private readonly ulong specialUser; - private readonly IUnitsService unitsService; - private DiscordSocketClient client; - private bool connected; - private SocketGuild guild; - private IReadOnlyCollection roles; - - public DiscordService(IConfiguration configuration, IRanksService ranksService, IUnitsService unitsService, IAccountService accountService, IDisplayNameService displayNameService, IVariablesService variablesService, ILogger logger) { - this.configuration = configuration; - this.ranksService = ranksService; - this.unitsService = unitsService; - this.accountService = accountService; - this.displayNameService = displayNameService; - this.variablesService = variablesService; - this.logger = logger; - specialUser = variablesService.GetVariable("DID_U_OWNER").AsUlong(); + private static readonly string[] OWNER_REPLIES = { "Why thank you {0} owo", "Thank you {0}, you're too kind", "Thank you so much {0} uwu", "Aw shucks {0} you're embarrassing me" }; + private static readonly string[] REPLIES = { "Why thank you {0}", "Thank you {0}, you're too kind", "Thank you so much {0}", "Aw shucks {0} you're embarrassing me" }; + private static readonly string[] TRIGGERS = { "thank you", "thank", "best", "mvp", "love you", "appreciate you", "good" }; + private readonly IAccountContext _accountContext; + private readonly IConfiguration _configuration; + private readonly IDisplayNameService _displayNameService; + private readonly ILogger _logger; + private readonly IRanksContext _ranksContext; + private readonly ulong _specialUser; + private readonly IUnitsContext _unitsContext; + private readonly IUnitsService _unitsService; + private readonly IVariablesService _variablesService; + private DiscordSocketClient _client; + private bool _connected; + private SocketGuild _guild; + private IReadOnlyCollection _roles; + + public DiscordService( + IUnitsContext unitsContext, + IRanksContext ranksContext, + IAccountContext accountContext, + IConfiguration configuration, + IUnitsService unitsService, + IDisplayNameService displayNameService, + IVariablesService variablesService, + ILogger logger + ) { + _unitsContext = unitsContext; + _ranksContext = ranksContext; + _accountContext = accountContext; + _configuration = configuration; + _unitsService = unitsService; + _displayNameService = displayNameService; + _variablesService = variablesService; + _logger = logger; + _specialUser = variablesService.GetVariable("DID_U_OWNER").AsUlong(); } public async Task ConnectDiscord() { - if (client != null) { - client.StopAsync().Wait(TimeSpan.FromSeconds(5)); - client = null; + if (_client != null) { + _client.StopAsync().Wait(TimeSpan.FromSeconds(5)); + _client = null; } - client = new DiscordSocketClient(); - client.Ready += OnClientOnReady; - client.Disconnected += ClientOnDisconnected; - client.MessageReceived += ClientOnMessageReceived; - client.UserJoined += ClientOnUserJoined; - client.GuildMemberUpdated += ClientOnGuildMemberUpdated; - await client.LoginAsync(TokenType.Bot, configuration.GetConnectionString("discord")); - await client.StartAsync(); + _client = new DiscordSocketClient(); + _client.Ready += OnClientOnReady; + _client.Disconnected += ClientOnDisconnected; + _client.MessageReceived += ClientOnMessageReceived; + _client.UserJoined += ClientOnUserJoined; + _client.GuildMemberUpdated += ClientOnGuildMemberUpdated; + AddUserEventLogs(); + + await _client.LoginAsync(TokenType.Bot, _configuration.GetConnectionString("discord")); + await _client.StartAsync(); } - public virtual async Task SendMessage(ulong channelId, string message) { + public async Task SendMessage(ulong channelId, string message) { await AssertOnline(); - SocketTextChannel channel = guild.GetTextChannel(channelId); + SocketTextChannel channel = _guild.GetTextChannel(channelId); await channel.SendMessageAsync(message); } - public virtual async Task SendMessageToEveryone(ulong channelId, string message) { - await SendMessage(channelId, $"{guild.EveryoneRole} {message}"); + public async Task SendMessageToEveryone(ulong channelId, string message) { + await SendMessage(channelId, $"{_guild.EveryoneRole} {message}"); } public async Task> GetRoles() { await AssertOnline(); - return roles; + return _roles; } - public virtual async Task UpdateAllUsers() { + public async Task UpdateAllUsers() { await AssertOnline(); await Task.Run( () => { - foreach (SocketGuildUser user in guild.Users) { + foreach (SocketGuildUser user in _guild.Users) { Task unused = UpdateAccount(null, user.Id); } } ); } - public virtual async Task UpdateAccount(Account account, ulong discordId = 0) { + public async Task UpdateAccount(Account account, ulong discordId = 0) { await AssertOnline(); - if (discordId == 0 && account != null && !string.IsNullOrEmpty(account.discordId)) { - discordId = ulong.Parse(account.discordId); + if (discordId == 0 && account != null && !string.IsNullOrEmpty(account.DiscordId)) { + discordId = ulong.Parse(account.DiscordId); } if (discordId != 0 && account == null) { - account = accountService.Data.GetSingle(x => !string.IsNullOrEmpty(x.discordId) && x.discordId == discordId.ToString()); + account = _accountContext.GetSingle(x => !string.IsNullOrEmpty(x.DiscordId) && x.DiscordId == discordId.ToString()); } if (discordId == 0) return; - if (variablesService.GetVariable("DID_U_BLACKLIST").AsArray().Contains(discordId.ToString())) return; + if (_variablesService.GetVariable("DID_U_BLACKLIST").AsArray().Contains(discordId.ToString())) return; - SocketGuildUser user = guild.GetUser(discordId); + SocketGuildUser user = _guild.GetUser(discordId); if (user == null) return; await UpdateAccountRoles(user, account); await UpdateAccountNickname(user, account); @@ -119,29 +134,31 @@ public virtual async Task UpdateAccount(Account account, ulong discordId = 0) { return (online, nickname); } - private bool IsAccountOnline(Account account) => account.discordId != null && guild.GetUser(ulong.Parse(account.discordId))?.Status == UserStatus.Online; + public void Dispose() { + _client.StopAsync().Wait(TimeSpan.FromSeconds(5)); + } + + private bool IsAccountOnline(Account account) => account.DiscordId != null && _guild.GetUser(ulong.Parse(account.DiscordId))?.Status == UserStatus.Online; private string GetAccountNickname(Account account) { - if (account.discordId == null) return ""; + if (account.DiscordId == null) return ""; - SocketGuildUser user = guild.GetUser(ulong.Parse(account.discordId)); - return user == null ? "" : string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname; + SocketGuildUser user = _guild.GetUser(ulong.Parse(account.DiscordId)); + return GetUserNickname(user); } - public void Dispose() { - client.StopAsync().Wait(TimeSpan.FromSeconds(5)); - } + private static string GetUserNickname(SocketGuildUser user) => user == null ? "" : string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname; private async Task UpdateAccountRoles(SocketGuildUser user, Account account) { IReadOnlyCollection userRoles = user.Roles; - HashSet allowedRoles = new HashSet(); + HashSet allowedRoles = new(); if (account != null) { UpdateAccountRanks(account, allowedRoles); UpdateAccountUnits(account, allowedRoles); } - string[] rolesBlacklist = variablesService.GetVariable("DID_R_BLACKLIST").AsArray(); + string[] rolesBlacklist = _variablesService.GetVariable("DID_R_BLACKLIST").AsArray(); foreach (SocketRole role in userRoles) { if (!allowedRoles.Contains(role.Id.ToString()) && !rolesBlacklist.Contains(role.Id.ToString())) { await user.RemoveRoleAsync(role); @@ -150,41 +167,41 @@ private async Task UpdateAccountRoles(SocketGuildUser user, Account account) { foreach (string role in allowedRoles.Where(role => userRoles.All(x => x.Id.ToString() != role))) { if (ulong.TryParse(role, out ulong roleId)) { - await user.AddRoleAsync(roles.First(x => x.Id == roleId)); + await user.AddRoleAsync(_roles.First(x => x.Id == roleId)); } } } private async Task UpdateAccountNickname(IGuildUser user, Account account) { - string name = displayNameService.GetDisplayName(account); + string name = _displayNameService.GetDisplayName(account); if (user.Nickname != name) { try { await user.ModifyAsync(x => x.Nickname = name); } catch (Exception) { - logger.LogError($"Failed to update nickname for {(string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname)}. Must manually be changed to: {name}"); + _logger.LogError($"Failed to update nickname for {(string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname)}. Must manually be changed to: {name}"); } } } private void UpdateAccountRanks(Account account, ISet allowedRoles) { - string rank = account.rank; - foreach (Rank x in ranksService.Data.Get().Where(x => rank == x.name)) { - allowedRoles.Add(x.discordRoleId); + string rank = account.Rank; + foreach (Rank x in _ranksContext.Get().Where(x => rank == x.Name)) { + allowedRoles.Add(x.DiscordRoleId); } } private void UpdateAccountUnits(Account account, ISet allowedRoles) { - Unit accountUnit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); - List accountUnits = unitsService.Data.Get(x => x.members.Contains(account.id)).Where(x => !string.IsNullOrEmpty(x.discordRoleId)).ToList(); - List accountUnitParents = unitsService.GetParents(accountUnit).Where(x => !string.IsNullOrEmpty(x.discordRoleId)).ToList(); - accountUnits.ForEach(x => allowedRoles.Add(x.discordRoleId)); - accountUnitParents.ForEach(x => allowedRoles.Add(x.discordRoleId)); + Unit accountUnit = _unitsContext.GetSingle(x => x.Name == account.UnitAssignment); + List accountUnits = _unitsContext.Get(x => x.Members.Contains(account.Id)).Where(x => !string.IsNullOrEmpty(x.DiscordRoleId)).ToList(); + List accountUnitParents = _unitsService.GetParents(accountUnit).Where(x => !string.IsNullOrEmpty(x.DiscordRoleId)).ToList(); + accountUnits.ForEach(x => allowedRoles.Add(x.DiscordRoleId)); + accountUnitParents.ForEach(x => allowedRoles.Add(x.DiscordRoleId)); } private async Task AssertOnline() { - if (!connected) { + if (!_connected) { await ConnectDiscord(); - while (!connected) { + while (!_connected) { await Task.Delay(50); } } @@ -205,9 +222,9 @@ private async Task ClientOnUserJoined(SocketGuildUser user) { private async Task ClientOnMessageReceived(SocketMessage incomingMessage) { if (incomingMessage.Content.Contains("bot", StringComparison.InvariantCultureIgnoreCase) || incomingMessage.MentionedUsers.Any(x => x.IsBot)) { if (TRIGGERS.Any(x => incomingMessage.Content.Contains(x, StringComparison.InvariantCultureIgnoreCase))) { - bool owner = incomingMessage.Author.Id == specialUser; + bool owner = incomingMessage.Author.Id == _specialUser; string message = owner ? OWNER_REPLIES[new Random().Next(0, OWNER_REPLIES.Length)] : REPLIES[new Random().Next(0, REPLIES.Length)]; - string[] parts = guild.GetUser(incomingMessage.Author.Id).Nickname.Split('.'); + string[] parts = _guild.GetUser(incomingMessage.Author.Id).Nickname.Split('.'); string nickname = owner ? "Daddy" : parts.Length > 1 ? parts[1] : parts[0]; await SendMessage(incomingMessage.Channel.Id, string.Format(message, nickname)); } @@ -215,18 +232,42 @@ private async Task ClientOnMessageReceived(SocketMessage incomingMessage) { } private Task OnClientOnReady() { - guild = client.GetGuild(variablesService.GetVariable("DID_SERVER").AsUlong()); - roles = guild.Roles; - connected = true; - return null; + _guild = _client.GetGuild(_variablesService.GetVariable("DID_SERVER").AsUlong()); + _roles = _guild.Roles; + _connected = true; + return Task.CompletedTask; } private Task ClientOnDisconnected(Exception arg) { - connected = false; - client.StopAsync().Wait(TimeSpan.FromSeconds(5)); - client = null; + _connected = false; + _client.StopAsync().Wait(TimeSpan.FromSeconds(5)); + _client = null; Task.Run(ConnectDiscord); - return null; + return Task.CompletedTask; + } + + private void AddUserEventLogs() { + _client.UserJoined += user => { + string name = GetUserNickname(user); + _logger.LogDiscordEvent(DiscordUserEventType.JOINED, name, user.Id.ToString(), $"{name} joined"); + return Task.CompletedTask; + }; + + _client.UserLeft += user => { + string name = GetUserNickname(user); + _logger.LogDiscordEvent(DiscordUserEventType.LEFT, name, user.Id.ToString(), $"{name} left"); + return Task.CompletedTask; + }; + + _client.UserBanned += (user, _) => { + _logger.LogDiscordEvent(DiscordUserEventType.BANNED, user.Username, user.Id.ToString(), $"{user.Username} banned"); + return Task.CompletedTask; + }; + + _client.UserUnbanned += (user, _) => { + _logger.LogDiscordEvent(DiscordUserEventType.UNBANNED, user.Username, user.Id.ToString(), $"{user.Username} unbanned"); + return Task.CompletedTask; + }; } } } diff --git a/UKSF.Api.Integration.Instagram/ApiIntegrationInstagramExtensions.cs b/UKSF.Api.Integrations.Instagram/ApiIntegrationInstagramExtensions.cs similarity index 87% rename from UKSF.Api.Integration.Instagram/ApiIntegrationInstagramExtensions.cs rename to UKSF.Api.Integrations.Instagram/ApiIntegrationInstagramExtensions.cs index 74448507..5aabd131 100644 --- a/UKSF.Api.Integration.Instagram/ApiIntegrationInstagramExtensions.cs +++ b/UKSF.Api.Integrations.Instagram/ApiIntegrationInstagramExtensions.cs @@ -1,8 +1,8 @@ using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Integration.Instagram.ScheduledActions; -using UKSF.Api.Integration.Instagram.Services; +using UKSF.Api.Integrations.Instagram.ScheduledActions; +using UKSF.Api.Integrations.Instagram.Services; -namespace UKSF.Api.Integration.Instagram { +namespace UKSF.Api.Integrations.Instagram { public static class ApiIntegrationInstagramExtensions { public static IServiceCollection AddUksfIntegrationInstagram(this IServiceCollection services) => services.AddContexts() diff --git a/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs b/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs new file mode 100644 index 00000000..64c5fb69 --- /dev/null +++ b/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs @@ -0,0 +1,16 @@ +using System.Collections.Generic; +using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Integrations.Instagram.Models; +using UKSF.Api.Integrations.Instagram.Services; + +namespace UKSF.Api.Integrations.Instagram.Controllers { + [Route("[controller]")] + public class InstagramController : Controller { + private readonly IInstagramService _instagramService; + + public InstagramController(IInstagramService instagramService) => _instagramService = instagramService; + + [HttpGet] + public IEnumerable GetImages() => _instagramService.GetImages(); + } +} diff --git a/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs b/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs new file mode 100644 index 00000000..1358ee55 --- /dev/null +++ b/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs @@ -0,0 +1,15 @@ +using System; +using Newtonsoft.Json; + +namespace UKSF.Api.Integrations.Instagram.Models { + public class InstagramImage { + public string Base64; + public string Id; + + [JsonProperty("media_type")] public string MediaType; + [JsonProperty("media_url")] public string MediaUrl; + + public string Permalink; + public DateTime Timestamp; + } +} diff --git a/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramImages.cs b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs similarity index 69% rename from UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramImages.cs rename to UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs index 1e0d4ea1..96e78ecd 100644 --- a/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramImages.cs +++ b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs @@ -2,10 +2,11 @@ using System.Threading.Tasks; using Microsoft.Extensions.Hosting; using UKSF.Api.Base.ScheduledActions; -using UKSF.Api.Integration.Instagram.Services; +using UKSF.Api.Integrations.Instagram.Services; +using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Integration.Instagram.ScheduledActions { +namespace UKSF.Api.Integrations.Instagram.ScheduledActions { public interface IActionInstagramImages : ISelfCreatingScheduledAction { } public class ActionInstagramImages : IActionInstagramImages { @@ -14,9 +15,11 @@ public class ActionInstagramImages : IActionInstagramImages { private readonly IClock _clock; private readonly IHostEnvironment _currentEnvironment; private readonly IInstagramService _instagramService; + private readonly ISchedulerContext _schedulerContext; private readonly ISchedulerService _schedulerService; - public ActionInstagramImages(IInstagramService instagramService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + public ActionInstagramImages(ISchedulerContext schedulerContext, IInstagramService instagramService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + _schedulerContext = schedulerContext; _instagramService = instagramService; _schedulerService = schedulerService; _currentEnvironment = currentEnvironment; @@ -32,7 +35,7 @@ public void Run(params object[] parameters) { public async Task CreateSelf() { if (_currentEnvironment.IsDevelopment()) return; - if (_schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { await _schedulerService.CreateScheduledJob(_clock.Today(), TimeSpan.FromMinutes(15), ACTION_NAME); } diff --git a/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramToken.cs b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs similarity index 69% rename from UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramToken.cs rename to UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs index d94a5973..9c4cbae5 100644 --- a/UKSF.Api.Integration.Instagram/ScheduledActions/ActionInstagramToken.cs +++ b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs @@ -2,10 +2,11 @@ using System.Threading.Tasks; using Microsoft.Extensions.Hosting; using UKSF.Api.Base.ScheduledActions; -using UKSF.Api.Integration.Instagram.Services; +using UKSF.Api.Integrations.Instagram.Services; +using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Integration.Instagram.ScheduledActions { +namespace UKSF.Api.Integrations.Instagram.ScheduledActions { public interface IActionInstagramToken : ISelfCreatingScheduledAction { } public class ActionInstagramToken : IActionInstagramToken { @@ -14,9 +15,11 @@ public class ActionInstagramToken : IActionInstagramToken { private readonly IClock _clock; private readonly IHostEnvironment _currentEnvironment; private readonly IInstagramService _instagramService; + private readonly ISchedulerContext _schedulerContext; private readonly ISchedulerService _schedulerService; - public ActionInstagramToken(IInstagramService instagramService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + public ActionInstagramToken(ISchedulerContext schedulerContext, IInstagramService instagramService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + _schedulerContext = schedulerContext; _instagramService = instagramService; _schedulerService = schedulerService; _currentEnvironment = currentEnvironment; @@ -32,7 +35,7 @@ public void Run(params object[] parameters) { public async Task CreateSelf() { if (_currentEnvironment.IsDevelopment()) return; - if (_schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(45), TimeSpan.FromDays(45), ACTION_NAME); } } diff --git a/UKSF.Api.Integration.Instagram/Services/InstagramService.cs b/UKSF.Api.Integrations.Instagram/Services/InstagramService.cs similarity index 55% rename from UKSF.Api.Integration.Instagram/Services/InstagramService.cs rename to UKSF.Api.Integrations.Instagram/Services/InstagramService.cs index b52429ec..b601b0d1 100644 --- a/UKSF.Api.Integration.Instagram/Services/InstagramService.cs +++ b/UKSF.Api.Integrations.Instagram/Services/InstagramService.cs @@ -5,12 +5,13 @@ using System.Threading.Tasks; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Integration.Instagram.Models; +using UKSF.Api.Integrations.Instagram.Models; using UKSF.Api.Shared.Events; -namespace UKSF.Api.Integration.Instagram.Services { +namespace UKSF.Api.Integrations.Instagram.Services { public interface IInstagramService { Task RefreshAccessToken(); Task CacheInstagramImages(); @@ -18,69 +19,71 @@ public interface IInstagramService { } public class InstagramService : IInstagramService { - private readonly IVariablesService variablesService; - private readonly ILogger logger; - private List images = new List(); - - public InstagramService(IVariablesService variablesService, ILogger logger) { - this.variablesService = variablesService; - this.logger = logger; + private readonly ILogger _logger; + private readonly IVariablesContext _variablesContext; + private readonly IVariablesService _variablesService; + private List _images = new(); + + public InstagramService(IVariablesContext variablesContext, IVariablesService variablesService, ILogger logger) { + _variablesContext = variablesContext; + _variablesService = variablesService; + _logger = logger; } public async Task RefreshAccessToken() { try { - string accessToken = variablesService.GetVariable("INSTAGRAM_ACCESS_TOKEN").AsString(); + string accessToken = _variablesService.GetVariable("INSTAGRAM_ACCESS_TOKEN").AsString(); - using HttpClient client = new HttpClient(); + using HttpClient client = new(); HttpResponseMessage response = await client.GetAsync($"https://graph.instagram.com/refresh_access_token?access_token={accessToken}&grant_type=ig_refresh_token"); if (!response.IsSuccessStatusCode) { - logger.LogError($"Failed to get instagram access token, error: {response}"); + _logger.LogError($"Failed to get instagram access token, error: {response}"); return; } string contentString = await response.Content.ReadAsStringAsync(); - logger.LogInfo($"Instagram response: {contentString}"); + _logger.LogInfo($"Instagram response: {contentString}"); string newAccessToken = JObject.Parse(contentString)["access_token"]?.ToString(); if (string.IsNullOrEmpty(newAccessToken)) { - logger.LogError($"Failed to get instagram access token from response: {contentString}"); + _logger.LogError($"Failed to get instagram access token from response: {contentString}"); return; } - await variablesService.Data.Update("INSTAGRAM_ACCESS_TOKEN", newAccessToken); - logger.LogInfo("Updated Instagram access token"); + await _variablesContext.Update("INSTAGRAM_ACCESS_TOKEN", newAccessToken); + _logger.LogInfo("Updated Instagram access token"); } catch (Exception exception) { - logger.LogError(exception); + _logger.LogError(exception); } } public async Task CacheInstagramImages() { try { - string userId = variablesService.GetVariable("INSTAGRAM_USER_ID").AsString(); - string accessToken = variablesService.GetVariable("INSTAGRAM_ACCESS_TOKEN").AsString(); + string userId = _variablesService.GetVariable("INSTAGRAM_USER_ID").AsString(); + string accessToken = _variablesService.GetVariable("INSTAGRAM_ACCESS_TOKEN").AsString(); - using HttpClient client = new HttpClient(); + using HttpClient client = new(); HttpResponseMessage response = await client.GetAsync($"https://graph.instagram.com/{userId}/media?access_token={accessToken}&fields=id,timestamp,media_type,media_url,permalink"); if (!response.IsSuccessStatusCode) { - logger.LogError($"Failed to get instagram images, error: {response}"); + _logger.LogError($"Failed to get instagram images, error: {response}"); return; } string contentString = await response.Content.ReadAsStringAsync(); JObject contentObject = JObject.Parse(contentString); List allMedia = JsonConvert.DeserializeObject>(contentObject["data"]?.ToString() ?? ""); - allMedia = allMedia.OrderByDescending(x => x.timestamp).ToList(); + allMedia = allMedia.OrderByDescending(x => x.Timestamp).ToList(); if (allMedia.Count == 0) { - logger.LogWarning($"Instagram response contains no images: {contentObject}"); + _logger.LogWarning($"Instagram response contains no images: {contentObject}"); return; } - if (images.Count > 0 && allMedia.First().id == images.First().id) { + if (_images.Count > 0 && allMedia.First().Id == _images.First().Id) { return; } - List newImages = allMedia.Where(x => x.mediaType == "IMAGE").ToList(); + List newImages = allMedia.Where(x => x.MediaType == "IMAGE").ToList(); // // Handle carousel images // foreach ((InstagramImage value, int index) instagramImage in newImages.Select((value, index) => ( value, index ))) { @@ -89,21 +92,21 @@ public async Task CacheInstagramImages() { // } // } - images = newImages.Take(12).ToList(); + _images = newImages.Take(12).ToList(); - foreach (InstagramImage instagramImage in images) { - instagramImage.base64 = await GetBase64(instagramImage); + foreach (InstagramImage instagramImage in _images) { + instagramImage.Base64 = await GetBase64(instagramImage); } } catch (Exception exception) { - logger.LogError(exception); + _logger.LogError(exception); } } - public IEnumerable GetImages() => images; + public IEnumerable GetImages() => _images; private static async Task GetBase64(InstagramImage image) { - using HttpClient client = new HttpClient(); - byte[] bytes = await client.GetByteArrayAsync(image.mediaUrl); + using HttpClient client = new(); + byte[] bytes = await client.GetByteArrayAsync(image.MediaUrl); return "data:image/jpeg;base64," + Convert.ToBase64String(bytes); } } diff --git a/UKSF.Api.Integration.Instagram/UKSF.Api.Integration.Instagram.csproj b/UKSF.Api.Integrations.Instagram/UKSF.Api.Integrations.Instagram.csproj similarity index 100% rename from UKSF.Api.Integration.Instagram/UKSF.Api.Integration.Instagram.csproj rename to UKSF.Api.Integrations.Instagram/UKSF.Api.Integrations.Instagram.csproj diff --git a/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs b/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs index c06c240a..04f7c357 100644 --- a/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs +++ b/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs @@ -10,27 +10,28 @@ namespace UKSF.Api.Teamspeak.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] public class OperationsController : Controller { - private readonly IMongoDatabase database; + private readonly IMongoDatabase _database; - public OperationsController(IMongoDatabase database) => this.database = database; + public OperationsController(IMongoDatabase database) => _database = database; [HttpGet, Authorize] public IActionResult Get() { - List tsServerSnapshots = database.GetCollection("teamspeakSnapshots").Find(x => x.timestamp > DateTime.Now.AddDays(-7)).ToList(); - var acreData = new {labels = GetLabels(), datasets = GetDataSets(tsServerSnapshots, true)}; - var data = new {labels = GetLabels(), datasets = GetDataSets(tsServerSnapshots, false)}; - return Ok(new {acreData, data}); + List tsServerSnapshots = _database.GetCollection("teamspeakSnapshots").Find(x => x.Timestamp > DateTime.Now.AddDays(-7)).ToList(); + var acreData = new { labels = GetLabels(), datasets = GetDataSets(tsServerSnapshots, true) }; + var data = new { labels = GetLabels(), datasets = GetDataSets(tsServerSnapshots, false) }; + return Ok(new { acreData, data }); } private static int[] GetData(IReadOnlyCollection serverSnapshots, DateTime day, bool acre) { - List dataset = new List(); + List dataset = new(); for (int i = 0; i < 48; i++) { DateTime startdate = DateTime.Today.AddMinutes(30 * i); DateTime enddate = DateTime.Today.AddMinutes(30 * (i + 1)); try { - TeamspeakServerSnapshot serverSnapshot = serverSnapshots.FirstOrDefault(x => x.timestamp.TimeOfDay > startdate.TimeOfDay && x.timestamp.TimeOfDay < enddate.TimeOfDay && x.timestamp.Date == day); + TeamspeakServerSnapshot serverSnapshot = + serverSnapshots.FirstOrDefault(x => x.Timestamp.TimeOfDay > startdate.TimeOfDay && x.Timestamp.TimeOfDay < enddate.TimeOfDay && x.Timestamp.Date == day); if (serverSnapshot != null) { - dataset.Add(acre ? serverSnapshot.users.Where(x => x.channelName == "ACRE").ToArray().Length : serverSnapshot.users.Count); + dataset.Add(acre ? serverSnapshot.Users.Where(x => x.ChannelName == "ACRE").ToArray().Length : serverSnapshot.Users.Count); } else { dataset.Add(0); } @@ -43,7 +44,7 @@ private static int[] GetData(IReadOnlyCollection server } private static List GetLabels() { - List labels = new List(); + List labels = new(); for (int i = 0; i < 48; i++) { DateTime startdate = DateTime.Today.AddMinutes(30 * i); @@ -55,11 +56,18 @@ private static List GetLabels() { } private static List GetDataSets(IReadOnlyCollection tsServerSnapshots, bool acre) { - List datasets = new List(); - string[] colors = {"#4bc0c0", "#3992e6", "#a539e6", "#42e639", "#aae639", "#e6d239", "#e63939"}; + List datasets = new(); + string[] colors = { "#4bc0c0", "#3992e6", "#a539e6", "#42e639", "#aae639", "#e6d239", "#e63939" }; for (int i = 0; i < 7; i++) { - datasets.Add(new {label = $"{DateTime.Now.AddDays(-i).DayOfWeek} - {DateTime.Now.AddDays(-i).ToShortDateString()}", data = GetData(tsServerSnapshots, DateTime.Now.AddDays(-i).Date, acre), fill = true, borderColor = colors[i]}); + datasets.Add( + new { + label = $"{DateTime.Now.AddDays(-i).DayOfWeek} - {DateTime.Now.AddDays(-i).ToShortDateString()}", + data = GetData(tsServerSnapshots, DateTime.Now.AddDays(-i).Date, acre), + fill = true, + borderColor = colors[i] + } + ); } return datasets; diff --git a/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs b/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs index e4bdc5c3..50c69e1f 100644 --- a/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs +++ b/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; @@ -13,7 +14,7 @@ namespace UKSF.Api.Teamspeak.Controllers { [Route("[controller]")] public class TeamspeakController : Controller { - private readonly IAccountService _accountService; + private readonly IAccountContext _accountContext; private readonly IDisplayNameService _displayNameService; private readonly IRanksService _ranksService; private readonly IRecruitmentService _recruitmentService; @@ -21,15 +22,15 @@ public class TeamspeakController : Controller { private readonly IUnitsService _unitsService; public TeamspeakController( + IAccountContext accountContext, ITeamspeakService teamspeakService, - IAccountService accountService, IRanksService ranksService, IUnitsService unitsService, IRecruitmentService recruitmentService, IDisplayNameService displayNameService ) { + _accountContext = accountContext; _teamspeakService = teamspeakService; - _accountService = accountService; _ranksService = ranksService; _unitsService = unitsService; _recruitmentService = recruitmentService; @@ -50,26 +51,26 @@ public async Task Shutdown() { [HttpGet("onlineAccounts")] public IActionResult GetOnlineAccounts() { IEnumerable teamnspeakClients = _teamspeakService.GetOnlineTeamspeakClients(); - IEnumerable allAccounts = _accountService.Data.Get(); + IEnumerable allAccounts = _accountContext.Get(); var clients = teamnspeakClients.Where(x => x != null) .Select( x => new { - account = allAccounts.FirstOrDefault(y => y.teamspeakIdentities != null && y.teamspeakIdentities.Any(z => z.Equals(x.clientDbId))), client = x + account = allAccounts.FirstOrDefault(y => y.TeamspeakIdentities != null && y.TeamspeakIdentities.Any(z => z.Equals(x.ClientDbId))), client = x } ) .ToList(); - var clientAccounts = clients.Where(x => x.account != null && x.account.membershipState == MembershipState.MEMBER) - .OrderBy(x => x.account.rank, new RankComparer(_ranksService)) - .ThenBy(x => x.account.lastname) - .ThenBy(x => x.account.firstname); - List commandAccounts = _unitsService.GetAuxilliaryRoot().members; + var clientAccounts = clients.Where(x => x.account != null && x.account.MembershipState == MembershipState.MEMBER) + .OrderBy(x => x.account.Rank, new RankComparer(_ranksService)) + .ThenBy(x => x.account.Lastname) + .ThenBy(x => x.account.Firstname); + List commandAccounts = _unitsService.GetAuxilliaryRoot().Members; - List commanders = new List(); - List recruiters = new List(); - List members = new List(); - List guests = new List(); + List commanders = new(); + List recruiters = new(); + List members = new(); + List guests = new(); foreach (var onlineClient in clientAccounts) { - if (commandAccounts.Contains(onlineClient.account.id)) { + if (commandAccounts.Contains(onlineClient.account.Id)) { commanders.Add(new { displayName = _displayNameService.GetDisplayName(onlineClient.account) }); } else if (_recruitmentService.IsRecruiter(onlineClient.account)) { recruiters.Add(new { displayName = _displayNameService.GetDisplayName(onlineClient.account) }); @@ -78,8 +79,8 @@ public IActionResult GetOnlineAccounts() { } } - foreach (var client in clients.Where(x => x.account == null || x.account.membershipState != MembershipState.MEMBER)) { - guests.Add(new { displayName = client.client.clientName }); + foreach (var client in clients.Where(x => x.account == null || x.account.MembershipState != MembershipState.MEMBER)) { + guests.Add(new { displayName = client.client.ClientName }); } return Ok(new { commanders, recruiters, members, guests }); diff --git a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs index f1f12d21..0ff7482c 100644 --- a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs +++ b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs @@ -6,8 +6,8 @@ using System.Threading.Tasks; using Newtonsoft.Json.Linq; using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Models; @@ -18,17 +18,17 @@ namespace UKSF.Api.Teamspeak.EventHandlers { public interface ITeamspeakEventHandler : IEventHandler { } public class TeamspeakEventHandler : ITeamspeakEventHandler { - private readonly IAccountService _accountService; + private readonly IAccountContext _accountContext; private readonly ISignalrEventBus _eventBus; private readonly ILogger _logger; - private readonly ConcurrentDictionary _serverGroupUpdates = new ConcurrentDictionary(); + private readonly ConcurrentDictionary _serverGroupUpdates = new(); private readonly ITeamspeakGroupService _teamspeakGroupService; private readonly ITeamspeakService _teamspeakService; - public TeamspeakEventHandler(ISignalrEventBus eventBus, ITeamspeakService teamspeakService, IAccountService accountService, ITeamspeakGroupService teamspeakGroupService, ILogger logger) { + public TeamspeakEventHandler(IAccountContext accountContext, ISignalrEventBus eventBus, ITeamspeakService teamspeakService, ITeamspeakGroupService teamspeakGroupService, ILogger logger) { + _accountContext = accountContext; _eventBus = eventBus; _teamspeakService = teamspeakService; - _accountService = accountService; _teamspeakGroupService = teamspeakGroupService; _logger = logger; } @@ -38,15 +38,15 @@ public void Init() { } private async Task HandleEvent(SignalrEventModel signalrEventModel) { - switch (signalrEventModel.procedure) { + switch (signalrEventModel.Procedure) { case TeamspeakEventType.CLIENTS: - await UpdateClients(signalrEventModel.args.ToString()); + await UpdateClients(signalrEventModel.Args.ToString()); break; case TeamspeakEventType.CLIENT_SERVER_GROUPS: - await UpdateClientServerGroups(signalrEventModel.args.ToString()); + await UpdateClientServerGroups(signalrEventModel.Args.ToString()); break; case TeamspeakEventType.EMPTY: break; - default: throw new ArgumentException($"Invalid teamspeak event type"); + default: throw new ArgumentException("Invalid teamspeak event type"); } } @@ -67,22 +67,22 @@ private async Task UpdateClientServerGroups(string args) { await Console.Out.WriteLineAsync($"Server group for {clientDbid}: {serverGroupId}"); TeamspeakServerGroupUpdate update = _serverGroupUpdates.GetOrAdd(clientDbid, _ => new TeamspeakServerGroupUpdate()); - update.serverGroups.Add(serverGroupId); - update.cancellationTokenSource?.Cancel(); - update.cancellationTokenSource = new CancellationTokenSource(); + update.ServerGroups.Add(serverGroupId); + update.CancellationTokenSource?.Cancel(); + update.CancellationTokenSource = new CancellationTokenSource(); Task unused = TaskUtilities.DelayWithCallback( TimeSpan.FromMilliseconds(500), - update.cancellationTokenSource.Token, + update.CancellationTokenSource.Token, async () => { - update.cancellationTokenSource.Cancel(); - await ProcessAccountData(clientDbid, update.serverGroups); + update.CancellationTokenSource.Cancel(); + await ProcessAccountData(clientDbid, update.ServerGroups); } ); } private async Task ProcessAccountData(double clientDbId, ICollection serverGroups) { await Console.Out.WriteLineAsync($"Processing server groups for {clientDbId}"); - Account account = _accountService.Data.GetSingle(x => x.teamspeakIdentities != null && x.teamspeakIdentities.Any(y => y.Equals(clientDbId))); + Account account = _accountContext.GetSingle(x => x.TeamspeakIdentities != null && x.TeamspeakIdentities.Any(y => y.Equals(clientDbId))); Task unused = _teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); _serverGroupUpdates.TryRemove(clientDbId, out TeamspeakServerGroupUpdate _); diff --git a/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs b/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs index 087b2fbf..3e659959 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs @@ -3,13 +3,13 @@ using UKSF.Api.Personnel.Models; namespace UKSF.Api.Teamspeak.Models { - public class Operation : DatabaseObject { - public AttendanceReport attendanceReport; - public DateTime end; - public string map; - public string name; - public string result; - public DateTime start; - public string type; + public record Operation : MongoObject { + public AttendanceReport AttendanceReport; + public DateTime End; + public string Map; + public string Name; + public string Result; + public DateTime Start; + public string Type; } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs index 08d8257e..85c71eed 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs @@ -1,8 +1,8 @@ namespace UKSF.Api.Teamspeak.Models { public class TeamspeakClient { - public double channelId; - public string channelName; - public double clientDbId; - public string clientName; + public double ChannelId; + public string ChannelName; + public double ClientDbId; + public string ClientName; } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs index e06cf9fd..a883e2aa 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs @@ -1,6 +1,6 @@ namespace UKSF.Api.Teamspeak.Models { public class TeamspeakGroupProcedure { - public double clientDbId; - public double serverGroup; + public double ClientDbId; + public double ServerGroup; } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs index b3e50826..85ff8de7 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs @@ -4,8 +4,8 @@ namespace UKSF.Api.Teamspeak.Models { public class TeamspeakServerGroupUpdate { - public readonly List serverGroups = new List(); - public CancellationTokenSource cancellationTokenSource; - public Task delayedProcessTask; + public readonly List ServerGroups = new(); + public CancellationTokenSource CancellationTokenSource; + public Task DelayedProcessTask; } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs index 4c08ded3..2767f80e 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs @@ -3,7 +3,7 @@ namespace UKSF.Api.Teamspeak.Models { public class TeamspeakServerSnapshot { - public DateTime timestamp; - public HashSet users; + public DateTime Timestamp; + public HashSet Users; } } diff --git a/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs b/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs index 9c3aebcd..875ee944 100644 --- a/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs +++ b/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Hosting; using UKSF.Api.Base.ScheduledActions; +using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Services; using UKSF.Api.Teamspeak.Services; @@ -13,10 +14,12 @@ public class ActionTeamspeakSnapshot : IActionTeamspeakSnapshot { private readonly IClock _clock; private readonly IHostEnvironment _currentEnvironment; + private readonly ISchedulerContext _schedulerContext; private readonly ISchedulerService _schedulerService; private readonly ITeamspeakService _teamspeakService; - public ActionTeamspeakSnapshot(ITeamspeakService teamspeakService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + public ActionTeamspeakSnapshot(ISchedulerContext schedulerContext, ITeamspeakService teamspeakService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + _schedulerContext = schedulerContext; _teamspeakService = teamspeakService; _schedulerService = schedulerService; _currentEnvironment = currentEnvironment; @@ -32,7 +35,7 @@ public void Run(params object[] parameters) { public async Task CreateSelf() { if (_currentEnvironment.IsDevelopment()) return; - if (_schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { await _schedulerService.CreateScheduledJob(_clock.Today().AddMinutes(5), TimeSpan.FromMinutes(5), ACTION_NAME); } } diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs index cf2e9b21..2c85e1a6 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs @@ -5,6 +5,7 @@ using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Extensions; @@ -16,30 +17,38 @@ public interface ITeamspeakGroupService { } public class TeamspeakGroupService : ITeamspeakGroupService { - private readonly IRanksService ranksService; - private readonly ITeamspeakManagerService teamspeakManagerService; - private readonly IUnitsService unitsService; - private readonly IVariablesService variablesService; + private readonly IRanksContext _ranksContext; + private readonly ITeamspeakManagerService _teamspeakManagerService; + private readonly IUnitsContext _unitsContext; + private readonly IUnitsService _unitsService; + private readonly IVariablesService _variablesService; - public TeamspeakGroupService(IRanksService ranksService, IUnitsService unitsService, ITeamspeakManagerService teamspeakManagerService, IVariablesService variablesService) { - this.ranksService = ranksService; - this.unitsService = unitsService; - this.teamspeakManagerService = teamspeakManagerService; - this.variablesService = variablesService; + public TeamspeakGroupService( + IRanksContext ranksContext, + IUnitsContext unitsContext, + IUnitsService unitsService, + ITeamspeakManagerService teamspeakManagerService, + IVariablesService variablesService + ) { + _ranksContext = ranksContext; + _unitsContext = unitsContext; + _unitsService = unitsService; + _teamspeakManagerService = teamspeakManagerService; + _variablesService = variablesService; } public async Task UpdateAccountGroups(Account account, ICollection serverGroups, double clientDbId) { - HashSet memberGroups = new HashSet(); + HashSet memberGroups = new(); if (account == null) { - memberGroups.Add(variablesService.GetVariable("TEAMSPEAK_GID_UNVERIFIED").AsDouble()); + memberGroups.Add(_variablesService.GetVariable("TEAMSPEAK_GID_UNVERIFIED").AsDouble()); } else { - switch (account.membershipState) { + switch (account.MembershipState) { case MembershipState.UNCONFIRMED: - memberGroups.Add(variablesService.GetVariable("TEAMSPEAK_GID_UNVERIFIED").AsDouble()); + memberGroups.Add(_variablesService.GetVariable("TEAMSPEAK_GID_UNVERIFIED").AsDouble()); break; case MembershipState.DISCHARGED: - memberGroups.Add(variablesService.GetVariable("TEAMSPEAK_GID_DISCHARGED").AsDouble()); + memberGroups.Add(_variablesService.GetVariable("TEAMSPEAK_GID_DISCHARGED").AsDouble()); break; case MembershipState.CONFIRMED: ResolveRankGroup(account, memberGroups); @@ -49,12 +58,12 @@ public async Task UpdateAccountGroups(Account account, ICollection serve ResolveUnitGroup(account, memberGroups); ResolveParentUnitGroup(account, memberGroups); ResolveAuxiliaryUnitGroups(account, memberGroups); - memberGroups.Add(variablesService.GetVariable("TEAMSPEAK_GID_ROOT").AsDouble()); + memberGroups.Add(_variablesService.GetVariable("TEAMSPEAK_GID_ROOT").AsDouble()); break; } } - List groupsBlacklist = variablesService.GetVariable("TEAMSPEAK_GID_BLACKLIST").AsDoublesArray().ToList(); + List groupsBlacklist = _variablesService.GetVariable("TEAMSPEAK_GID_BLACKLIST").AsDoublesArray().ToList(); foreach (double serverGroup in serverGroups) { if (!memberGroups.Contains(serverGroup) && !groupsBlacklist.Contains(serverGroup)) { await RemoveServerGroup(clientDbId, serverGroup); @@ -67,18 +76,18 @@ public async Task UpdateAccountGroups(Account account, ICollection serve } private void ResolveRankGroup(Account account, ISet memberGroups) { - memberGroups.Add(ranksService.Data.GetSingle(account.rank).teamspeakGroup.ToDouble()); + memberGroups.Add(_ranksContext.GetSingle(account.Rank).TeamspeakGroup.ToDouble()); } private void ResolveUnitGroup(Account account, ISet memberGroups) { - Unit accountUnit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); - Unit elcom = unitsService.GetAuxilliaryRoot(); + Unit accountUnit = _unitsContext.GetSingle(x => x.Name == account.UnitAssignment); + Unit elcom = _unitsService.GetAuxilliaryRoot(); - if (accountUnit.parent == ObjectId.Empty.ToString()) { - memberGroups.Add(accountUnit.teamspeakGroup.ToDouble()); + if (accountUnit.Parent == ObjectId.Empty.ToString()) { + memberGroups.Add(accountUnit.TeamspeakGroup.ToDouble()); } - double group = elcom.members.Contains(account.id) ? variablesService.GetVariable("TEAMSPEAK_GID_ELCOM").AsDouble() : accountUnit.teamspeakGroup.ToDouble(); + double group = elcom.Members.Contains(account.Id) ? _variablesService.GetVariable("TEAMSPEAK_GID_ELCOM").AsDouble() : accountUnit.TeamspeakGroup.ToDouble(); if (group == 0) { ResolveParentUnitGroup(account, memberGroups); } else { @@ -87,29 +96,29 @@ private void ResolveUnitGroup(Account account, ISet memberGroups) { } private void ResolveParentUnitGroup(Account account, ISet memberGroups) { - Unit accountUnit = unitsService.Data.GetSingle(x => x.name == account.unitAssignment); - Unit parentUnit = unitsService.GetParents(accountUnit).Skip(1).FirstOrDefault(x => !string.IsNullOrEmpty(x.teamspeakGroup) && !memberGroups.Contains(x.teamspeakGroup.ToDouble())); - if (parentUnit != null && parentUnit.parent != ObjectId.Empty.ToString()) { - memberGroups.Add(parentUnit.teamspeakGroup.ToDouble()); + Unit accountUnit = _unitsContext.GetSingle(x => x.Name == account.UnitAssignment); + Unit parentUnit = _unitsService.GetParents(accountUnit).Skip(1).FirstOrDefault(x => !string.IsNullOrEmpty(x.TeamspeakGroup) && !memberGroups.Contains(x.TeamspeakGroup.ToDouble())); + if (parentUnit != null && parentUnit.Parent != ObjectId.Empty.ToString()) { + memberGroups.Add(parentUnit.TeamspeakGroup.ToDouble()); } else { - memberGroups.Add(accountUnit.teamspeakGroup.ToDouble()); + memberGroups.Add(accountUnit.TeamspeakGroup.ToDouble()); } } - private void ResolveAuxiliaryUnitGroups(DatabaseObject account, ISet memberGroups) { - IEnumerable accountUnits = unitsService.Data.Get(x => x.parent != ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY && x.members.Contains(account.id)) - .Where(x => !string.IsNullOrEmpty(x.teamspeakGroup)); + private void ResolveAuxiliaryUnitGroups(MongoObject account, ISet memberGroups) { + IEnumerable accountUnits = _unitsContext.Get(x => x.Parent != ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY && x.Members.Contains(account.Id)) + .Where(x => !string.IsNullOrEmpty(x.TeamspeakGroup)); foreach (Unit unit in accountUnits) { - memberGroups.Add(unit.teamspeakGroup.ToDouble()); + memberGroups.Add(unit.TeamspeakGroup.ToDouble()); } } private async Task AddServerGroup(double clientDbId, double serverGroup) { - await teamspeakManagerService.SendGroupProcedure(TeamspeakProcedureType.ASSIGN, new TeamspeakGroupProcedure { clientDbId = clientDbId, serverGroup = serverGroup }); + await _teamspeakManagerService.SendGroupProcedure(TeamspeakProcedureType.ASSIGN, new TeamspeakGroupProcedure { ClientDbId = clientDbId, ServerGroup = serverGroup }); } private async Task RemoveServerGroup(double clientDbId, double serverGroup) { - await teamspeakManagerService.SendGroupProcedure(TeamspeakProcedureType.UNASSIGN, new TeamspeakGroupProcedure { clientDbId = clientDbId, serverGroup = serverGroup }); + await _teamspeakManagerService.SendGroupProcedure(TeamspeakProcedureType.UNASSIGN, new TeamspeakGroupProcedure { ClientDbId = clientDbId, ServerGroup = serverGroup }); } } } diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs index 3bed3cc7..55b3abd9 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs @@ -20,41 +20,41 @@ public interface ITeamspeakManagerService { } public class TeamspeakManagerService : ITeamspeakManagerService { - private readonly IHubContext hub; - private readonly IVariablesService variablesService; - private bool runTeamspeak; - private CancellationTokenSource token; + private readonly IHubContext _hub; + private readonly IVariablesService _variablesService; + private bool _runTeamspeak; + private CancellationTokenSource _token; public TeamspeakManagerService(IHubContext hub, IVariablesService variablesService) { - this.hub = hub; - this.variablesService = variablesService; + _hub = hub; + _variablesService = variablesService; } public void Start() { - runTeamspeak = true; - token = new CancellationTokenSource(); + _runTeamspeak = true; + _token = new CancellationTokenSource(); Task.Run(KeepOnline); } public void Stop() { - runTeamspeak = false; - token.Cancel(); + _runTeamspeak = false; + _token.Cancel(); Task.Delay(TimeSpan.FromSeconds(5)).Wait(); ShutTeamspeak().Wait(); } public async Task SendGroupProcedure(TeamspeakProcedureType procedure, TeamspeakGroupProcedure groupProcedure) { - await hub.Clients.All.Receive(procedure, groupProcedure); + await _hub.Clients.All.Receive(procedure, groupProcedure); } public async Task SendProcedure(TeamspeakProcedureType procedure, object args) { - await hub.Clients.All.Receive(procedure, args); + await _hub.Clients.All.Receive(procedure, args); } private async void KeepOnline() { - await TaskUtilities.Delay(TimeSpan.FromSeconds(5), token.Token); - while (runTeamspeak) { - if (variablesService.GetVariable("TEAMSPEAK_RUN").AsBool()) { + await TaskUtilities.Delay(TimeSpan.FromSeconds(5), _token.Token); + while (_runTeamspeak) { + if (_variablesService.GetVariable("TEAMSPEAK_RUN").AsBool()) { if (!TeamspeakHubState.Connected) { if (Process.GetProcessesByName("ts3client_win64").Length == 0) { await LaunchTeamspeak(); @@ -65,12 +65,12 @@ private async void KeepOnline() { } } - await TaskUtilities.Delay(TimeSpan.FromSeconds(30), token.Token); + await TaskUtilities.Delay(TimeSpan.FromSeconds(30), _token.Token); } } private async Task LaunchTeamspeak() { - await ProcessUtilities.LaunchExternalProcess("Teamspeak", $"start \"\" \"{variablesService.GetVariable("TEAMSPEAK_PATH").AsString()}\""); + await ProcessUtilities.LaunchExternalProcess("Teamspeak", $"start \"\" \"{_variablesService.GetVariable("TEAMSPEAK_PATH").AsString()}\""); } private async Task ShutTeamspeak() { @@ -82,7 +82,7 @@ private async Task ShutTeamspeak() { process.Refresh(); if (!process.HasExited) { process.Kill(); - await TaskUtilities.Delay(TimeSpan.FromMilliseconds(100), token.Token); + await TaskUtilities.Delay(TimeSpan.FromMilliseconds(100), _token.Token); } } } diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs index b25fdb08..9d153214 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs @@ -25,14 +25,19 @@ public interface ITeamspeakService { } public class TeamspeakService : ITeamspeakService { - private readonly SemaphoreSlim _clientsSemaphore = new SemaphoreSlim(1); + private readonly SemaphoreSlim _clientsSemaphore = new(1); private readonly IMongoDatabase _database; + private readonly IHostEnvironment _environment; private readonly IHubContext _teamspeakClientsHub; private readonly ITeamspeakManagerService _teamspeakManagerService; - private readonly IHostEnvironment _environment; - private HashSet _clients = new HashSet(); - - public TeamspeakService(IMongoDatabase database, IHubContext teamspeakClientsHub, ITeamspeakManagerService teamspeakManagerService, IHostEnvironment environment) { + private HashSet _clients = new(); + + public TeamspeakService( + IMongoDatabase database, + IHubContext teamspeakClientsHub, + ITeamspeakManagerService teamspeakManagerService, + IHostEnvironment environment + ) { _database = database; _teamspeakClientsHub = teamspeakClientsHub; _teamspeakManagerService = teamspeakManagerService; @@ -49,20 +54,20 @@ public async Task UpdateClients(HashSet newClients) { } public async Task UpdateAccountTeamspeakGroups(Account account) { - if (account?.teamspeakIdentities == null) return; - foreach (double clientDbId in account.teamspeakIdentities) { - await _teamspeakManagerService.SendProcedure(TeamspeakProcedureType.GROUPS, new {clientDbId}); + if (account?.TeamspeakIdentities == null) return; + foreach (double clientDbId in account.TeamspeakIdentities) { + await _teamspeakManagerService.SendProcedure(TeamspeakProcedureType.GROUPS, new { clientDbId }); } } public async Task SendTeamspeakMessageToClient(Account account, string message) { - await SendTeamspeakMessageToClient(account.teamspeakIdentities, message); + await SendTeamspeakMessageToClient(account.TeamspeakIdentities, message); } public async Task SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message) { message = FormatTeamspeakMessage(message); foreach (double clientDbId in clientDbIds) { - await _teamspeakManagerService.SendProcedure(TeamspeakProcedureType.MESSAGE, new {clientDbId, message}); + await _teamspeakManagerService.SendProcedure(TeamspeakProcedureType.MESSAGE, new { clientDbId, message }); } } @@ -72,26 +77,26 @@ public async Task StoreTeamspeakServerSnapshot() { return; } - TeamspeakServerSnapshot teamspeakServerSnapshot = new TeamspeakServerSnapshot {timestamp = DateTime.UtcNow, users = _clients}; + TeamspeakServerSnapshot teamspeakServerSnapshot = new() { Timestamp = DateTime.UtcNow, Users = _clients }; await _database.GetCollection("teamspeakSnapshots").InsertOneAsync(teamspeakServerSnapshot); } public async Task Shutdown() { - await _teamspeakManagerService.SendProcedure(TeamspeakProcedureType.SHUTDOWN, new {}); + await _teamspeakManagerService.SendProcedure(TeamspeakProcedureType.SHUTDOWN, new { }); } public IEnumerable GetFormattedClients() { - if (_environment.IsDevelopment()) return new List {new {name = "SqnLdr.Beswick.T", clientDbId = (double) 2}}; - return _clients.Where(x => x != null).Select(x => new {name = $"{x.clientName}", x.clientDbId}); + if (_environment.IsDevelopment()) return new List { new { name = "SqnLdr.Beswick.T", clientDbId = (double) 2 } }; + return _clients.Where(x => x != null).Select(x => new { name = $"{x.ClientName}", clientDbId = x.ClientDbId }); } public (bool online, string nickname) GetOnlineUserDetails(Account account) { - if (account.teamspeakIdentities == null) return (false, ""); + if (account.TeamspeakIdentities == null) return (false, ""); if (_clients.Count == 0) return (false, ""); foreach (TeamspeakClient client in _clients.Where(x => x != null)) { - if (account.teamspeakIdentities.Any(y => y.Equals(client.clientDbId))) { - return (true, client.clientName); + if (account.TeamspeakIdentities.Any(y => y.Equals(client.ClientDbId))) { + return (true, client.ClientName); } } diff --git a/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs index 2401d62d..4cf5bc0b 100644 --- a/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs +++ b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs @@ -12,13 +12,13 @@ public static class TeamspeakHubState { public class TeamspeakHub : Hub { public const string END_POINT = "teamspeak"; - private readonly ISignalrEventBus eventBus; + private readonly ISignalrEventBus _eventBus; - public TeamspeakHub(ISignalrEventBus eventBus) => this.eventBus = eventBus; + public TeamspeakHub(ISignalrEventBus eventBus) => _eventBus = eventBus; // ReSharper disable once UnusedMember.Global public void Invoke(int procedure, object args) { - eventBus.Send(new SignalrEventModel {procedure = (TeamspeakEventType) procedure, args = args}); + _eventBus.Send(new SignalrEventModel { Procedure = (TeamspeakEventType) procedure, Args = args }); } public override Task OnConnectedAsync() { diff --git a/UKSF.Api.Launcher/ApiLauncherExtensions.cs b/UKSF.Api.Launcher/ApiLauncherExtensions.cs index 999f27be..c648cc02 100644 --- a/UKSF.Api.Launcher/ApiLauncherExtensions.cs +++ b/UKSF.Api.Launcher/ApiLauncherExtensions.cs @@ -11,7 +11,7 @@ public static class ApiLauncherExtensions { public static IServiceCollection AddUksfLauncher(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddTransient(); - private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton(); private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; diff --git a/UKSF.Api.Launcher/Context/LauncherFileContext.cs b/UKSF.Api.Launcher/Context/LauncherFileContext.cs new file mode 100644 index 00000000..b05b81cf --- /dev/null +++ b/UKSF.Api.Launcher/Context/LauncherFileContext.cs @@ -0,0 +1,12 @@ +using UKSF.Api.Base.Context; +using UKSF.Api.Launcher.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; + +namespace UKSF.Api.Launcher.Context { + public interface ILauncherFileContext : IMongoContext, ICachedMongoContext { } + + public class LauncherFileContext : CachedMongoContext, ILauncherFileContext { + public LauncherFileContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "launcherFiles") { } + } +} diff --git a/UKSF.Api.Launcher/Context/LauncherFileDataService.cs b/UKSF.Api.Launcher/Context/LauncherFileDataService.cs deleted file mode 100644 index 4674018a..00000000 --- a/UKSF.Api.Launcher/Context/LauncherFileDataService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using UKSF.Api.Base.Context; -using UKSF.Api.Launcher.Models; -using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; - -namespace UKSF.Api.Launcher.Context { - public interface ILauncherFileDataService : IDataService, ICachedDataService { } - - public class LauncherFileDataService : CachedDataService, ILauncherFileDataService { - public LauncherFileDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "launcherFiles") { } - } -} diff --git a/UKSF.Api.Launcher/Controllers/LauncherController.cs b/UKSF.Api.Launcher/Controllers/LauncherController.cs index 549f8b76..c5e11927 100644 --- a/UKSF.Api.Launcher/Controllers/LauncherController.cs +++ b/UKSF.Api.Launcher/Controllers/LauncherController.cs @@ -29,11 +29,11 @@ public class LauncherController : Controller { private readonly ILauncherFileService _launcherFileService; private readonly IHubContext _launcherHub; private readonly ILauncherService _launcherService; - private readonly IVariablesDataService _variablesDataService; + private readonly IVariablesContext _variablesContext; private readonly IVariablesService _variablesService; public LauncherController( - IVariablesDataService variablesDataService, + IVariablesContext variablesContext, IHubContext launcherHub, ILauncherService launcherService, ILauncherFileService launcherFileService, @@ -41,7 +41,7 @@ public LauncherController( IDisplayNameService displayNameService, IVariablesService variablesService ) { - _variablesDataService = variablesDataService; + _variablesContext = variablesContext; _launcherHub = launcherHub; _launcherService = launcherService; _launcherFileService = launcherFileService; @@ -54,12 +54,12 @@ IVariablesService variablesService public IActionResult GetUpdate(string platform, string version) => Ok(); [HttpGet("version")] - public IActionResult GetVersion() => Ok(_variablesDataService.GetSingle("LAUNCHER_VERSION").AsString()); + public IActionResult GetVersion() => Ok(_variablesContext.GetSingle("LAUNCHER_VERSION").AsString()); [HttpPost("version"), Permissions(Permissions.ADMIN)] public async Task UpdateVersion([FromBody] JObject body) { string version = body["version"].ToString(); - await _variablesDataService.Update("LAUNCHER_VERSION", version); + await _variablesContext.Update("LAUNCHER_VERSION", version); await _launcherFileService.UpdateAllVersions(); await _launcherHub.Clients.All.ReceiveLauncherVersion(version); return Ok(); @@ -75,7 +75,7 @@ public async Task UpdateVersion([FromBody] JObject body) { public async Task GetUpdatedFiles([FromBody] JObject body) { List files = JsonConvert.DeserializeObject>(body["files"].ToString()); Stream updatedFiles = await _launcherFileService.GetUpdatedFiles(files); - FileStreamResult stream = new FileStreamResult(updatedFiles, "application/octet-stream"); + FileStreamResult stream = new(updatedFiles, "application/octet-stream"); return stream; } diff --git a/UKSF.Api.Launcher/Models/LauncherFile.cs b/UKSF.Api.Launcher/Models/LauncherFile.cs index d3f501eb..97e735ee 100644 --- a/UKSF.Api.Launcher/Models/LauncherFile.cs +++ b/UKSF.Api.Launcher/Models/LauncherFile.cs @@ -1,8 +1,8 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Launcher.Models { - public class LauncherFile : DatabaseObject { - public string fileName; - public string version; + public record LauncherFile : MongoObject { + public string FileName; + public string Version; } } diff --git a/UKSF.Api.Launcher/Services/LauncherFileService.cs b/UKSF.Api.Launcher/Services/LauncherFileService.cs index 976cdcec..067f1848 100644 --- a/UKSF.Api.Launcher/Services/LauncherFileService.cs +++ b/UKSF.Api.Launcher/Services/LauncherFileService.cs @@ -10,67 +10,70 @@ using MongoDB.Driver; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; -using UKSF.Api.Base.Context; using UKSF.Api.Launcher.Context; using UKSF.Api.Launcher.Models; namespace UKSF.Api.Launcher.Services { - public interface ILauncherFileService : IDataBackedService { + public interface ILauncherFileService { Task UpdateAllVersions(); FileStreamResult GetLauncherFile(params string[] file); Task GetUpdatedFiles(IEnumerable files); } - public class LauncherFileService : DataBackedService, ILauncherFileService { + public class LauncherFileService : ILauncherFileService { + private readonly ILauncherFileContext _launcherFileContext; private readonly IVariablesService _variablesService; - public LauncherFileService(ILauncherFileDataService data, IVariablesService variablesService) : base(data) => _variablesService = variablesService; + public LauncherFileService(ILauncherFileContext launcherFileContext, IVariablesService variablesService) { + _launcherFileContext = launcherFileContext; + _variablesService = variablesService; + } public async Task UpdateAllVersions() { - List storedVersions = Data.Get().ToList(); + List storedVersions = _launcherFileContext.Get().ToList(); string launcherDirectory = Path.Combine(_variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), "Launcher"); - List fileNames = new List(); + List fileNames = new(); foreach (string filePath in Directory.EnumerateFiles(launcherDirectory)) { string fileName = Path.GetFileName(filePath); string version = FileVersionInfo.GetVersionInfo(filePath).FileVersion; fileNames.Add(fileName); - LauncherFile storedFile = storedVersions.FirstOrDefault(x => x.fileName == fileName); + LauncherFile storedFile = storedVersions.FirstOrDefault(x => x.FileName == fileName); if (storedFile == null) { - await Data.Add(new LauncherFile { fileName = fileName, version = version }); + await _launcherFileContext.Add(new LauncherFile { FileName = fileName, Version = version }); continue; } - if (storedFile.version != version) { - await Data.Update(storedFile.id, Builders.Update.Set(x => x.version, version)); + if (storedFile.Version != version) { + await _launcherFileContext.Update(storedFile.Id, Builders.Update.Set(x => x.Version, version)); } } - foreach (LauncherFile storedVersion in storedVersions.Where(storedVersion => fileNames.All(x => x != storedVersion.fileName))) { - await Data.Delete(storedVersion); + foreach (LauncherFile storedVersion in storedVersions.Where(storedVersion => fileNames.All(x => x != storedVersion.FileName))) { + await _launcherFileContext.Delete(storedVersion); } } public FileStreamResult GetLauncherFile(params string[] file) { string[] paths = file.Prepend(_variablesService.GetVariable("LAUNCHER_LOCATION").AsString()).ToArray(); string path = Path.Combine(paths); - FileStreamResult fileStreamResult = new FileStreamResult(new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read), MimeUtility.GetMimeMapping(path)); + FileStreamResult fileStreamResult = new(new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read), MimeUtility.GetMimeMapping(path)); return fileStreamResult; } public async Task GetUpdatedFiles(IEnumerable files) { string launcherDirectory = Path.Combine(_variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), "Launcher"); - List storedVersions = Data.Get().ToList(); - List updatedFiles = new List(); - List deletedFiles = new List(); + List storedVersions = _launcherFileContext.Get().ToList(); + List updatedFiles = new(); + List deletedFiles = new(); foreach (LauncherFile launcherFile in files) { - LauncherFile storedFile = storedVersions.FirstOrDefault(x => x.fileName == launcherFile.fileName); + LauncherFile storedFile = storedVersions.FirstOrDefault(x => x.FileName == launcherFile.FileName); if (storedFile == null) { - deletedFiles.Add(launcherFile.fileName); + deletedFiles.Add(launcherFile.FileName); continue; } - if (storedFile.version != launcherFile.version || new Random().Next(0, 100) > 80) { //TODO: remove before release - updatedFiles.Add(launcherFile.fileName); + if (storedFile.Version != launcherFile.Version || new Random().Next(0, 100) > 80) { //TODO: remove before release + updatedFiles.Add(launcherFile.FileName); } } @@ -87,8 +90,8 @@ public async Task GetUpdatedFiles(IEnumerable files) { string updateZipPath = Path.Combine(_variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), $"{updateFolderName}.zip"); ZipFile.CreateFromDirectory(updateFolder, updateZipPath); - MemoryStream stream = new MemoryStream(); - await using (FileStream fileStream = new FileStream(updateZipPath, FileMode.Open, FileAccess.Read, FileShare.None)) { + MemoryStream stream = new(); + await using (FileStream fileStream = new(updateZipPath, FileMode.Open, FileAccess.Read, FileShare.None)) { await fileStream.CopyToAsync(stream); } diff --git a/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings b/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings new file mode 100644 index 00000000..e7d45a2a --- /dev/null +++ b/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/UKSF.Api.Modpack/ApiModpackExtensions.cs b/UKSF.Api.Modpack/ApiModpackExtensions.cs index 78a95556..e2497129 100644 --- a/UKSF.Api.Modpack/ApiModpackExtensions.cs +++ b/UKSF.Api.Modpack/ApiModpackExtensions.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Modpack.Context; using UKSF.Api.Modpack.EventHandlers; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.ScheduledActions; using UKSF.Api.Modpack.Services; using UKSF.Api.Modpack.Services.BuildProcess; -using UKSF.Api.Modpack.Services.Data; using UKSF.Api.Modpack.Signalr.Hubs; using UKSF.Api.Shared.Events; @@ -15,8 +15,7 @@ public static class ApiModpackExtensions { public static IServiceCollection AddUksfModpack(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddActions().AddTransient(); - private static IServiceCollection AddContexts(this IServiceCollection services) => - services.AddSingleton().AddSingleton(); + private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton().AddSingleton(); private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>().AddSingleton, DataEventBus>(); @@ -31,8 +30,7 @@ private static IServiceCollection AddServices(this IServiceCollection services) .AddTransient() .AddTransient(); - private static IServiceCollection AddActions(this IServiceCollection services) => - services.AddSingleton(); + private static IServiceCollection AddActions(this IServiceCollection services) => services.AddSingleton(); public static void AddUksfModpackSignalr(this IEndpointRouteBuilder builder) { builder.MapHub($"/hub/{BuildsHub.END_POINT}"); diff --git a/UKSF.Api.Modpack/Services/Data/BuildsDataService.cs b/UKSF.Api.Modpack/Context/BuildsContext.cs similarity index 64% rename from UKSF.Api.Modpack/Services/Data/BuildsDataService.cs rename to UKSF.Api.Modpack/Context/BuildsContext.cs index 2cb291a4..ef77685d 100644 --- a/UKSF.Api.Modpack/Services/Data/BuildsDataService.cs +++ b/UKSF.Api.Modpack/Context/BuildsContext.cs @@ -8,30 +8,30 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; -namespace UKSF.Api.Modpack.Services.Data { - public interface IBuildsDataService : IDataService, ICachedDataService { +namespace UKSF.Api.Modpack.Context { + public interface IBuildsContext : IMongoContext, ICachedMongoContext { Task Update(ModpackBuild build, ModpackBuildStep buildStep); Task Update(ModpackBuild build, UpdateDefinition updateDefinition); } - public class BuildsDataService : CachedDataService, IBuildsDataService { - public BuildsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackBuilds") { } - - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { - Cache = newCollection?.OrderByDescending(x => x.BuildNumber).ToList(); - } - } + public class BuildsContext : CachedMongoContext, IBuildsContext { + public BuildsContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "modpackBuilds") { } public async Task Update(ModpackBuild build, ModpackBuildStep buildStep) { UpdateDefinition updateDefinition = Builders.Update.Set(x => x.Steps[buildStep.Index], buildStep); - await base.Update(build.id, updateDefinition); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, buildStep)); + await base.Update(build.Id, updateDefinition); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.Id, buildStep)); } public async Task Update(ModpackBuild build, UpdateDefinition updateDefinition) { - await base.Update(build.id, updateDefinition); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.id, build)); + await base.Update(build.Id, updateDefinition); + DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.Id, build)); + } + + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.OrderByDescending(x => x.BuildNumber).ToList(); + } } } } diff --git a/UKSF.Api.Modpack/Services/Data/ReleasesDataService.cs b/UKSF.Api.Modpack/Context/ReleasesContext.cs similarity index 71% rename from UKSF.Api.Modpack/Services/Data/ReleasesDataService.cs rename to UKSF.Api.Modpack/Context/ReleasesContext.cs index defade6a..24e86ba1 100644 --- a/UKSF.Api.Modpack/Services/Data/ReleasesDataService.cs +++ b/UKSF.Api.Modpack/Context/ReleasesContext.cs @@ -5,11 +5,11 @@ using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; -namespace UKSF.Api.Modpack.Services.Data { - public interface IReleasesDataService : IDataService, ICachedDataService { } +namespace UKSF.Api.Modpack.Context { + public interface IReleasesContext : IMongoContext, ICachedMongoContext { } - public class ReleasesDataService : CachedDataService, IReleasesDataService { - public ReleasesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "modpackReleases") { } + public class ReleasesContext : CachedMongoContext, IReleasesContext { + public ReleasesContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "modpackReleases") { } protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { diff --git a/UKSF.Api.Modpack/Controllers/IssueController.cs b/UKSF.Api.Modpack/Controllers/IssueController.cs index dd8a0ff1..3aefd84c 100644 --- a/UKSF.Api.Modpack/Controllers/IssueController.cs +++ b/UKSF.Api.Modpack/Controllers/IssueController.cs @@ -17,12 +17,10 @@ namespace UKSF.Api.Modpack.Controllers { public class IssueController : Controller { private readonly IDisplayNameService _displayNameService; private readonly IEmailService _emailService; - private readonly IHttpContextService _httpContextService; private readonly string _githubToken; - + private readonly IHttpContextService _httpContextService; public IssueController(IDisplayNameService displayNameService, IEmailService emailService, IConfiguration configuration, IHttpContextService httpContextService) { - _displayNameService = displayNameService; _emailService = emailService; _httpContextService = httpContextService; @@ -38,8 +36,8 @@ public async Task CreateIssue([FromQuery] int type, [FromBody] JO string issueUrl; try { - using HttpClient client = new HttpClient(); - StringContent content = new StringContent(JsonConvert.SerializeObject(new {title, body}), Encoding.UTF8, "application/vnd.github.v3.full+json"); + using HttpClient client = new(); + StringContent content = new(JsonConvert.SerializeObject(new { title, body }), Encoding.UTF8, "application/vnd.github.v3.full+json"); string url = type == 0 ? "https://api.github.com/repos/uksf/website-issues/issues" : "https://api.github.com/repos/uksf/modpack/issues"; client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("token", _githubToken); client.DefaultRequestHeaders.UserAgent.ParseAdd(user); @@ -51,7 +49,7 @@ public async Task CreateIssue([FromQuery] int type, [FromBody] JO return BadRequest(); } - return Ok(new {issueUrl}); + return Ok(new { issueUrl }); } } } diff --git a/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs b/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs index c192f1c1..7bb23138 100644 --- a/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs +++ b/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs @@ -14,9 +14,9 @@ namespace UKSF.Api.Modpack.EventHandlers { public interface IBuildsEventHandler : IEventHandler { } public class BuildsEventHandler : IBuildsEventHandler { - private readonly IDataEventBus _modpackBuildEventBus; private readonly IHubContext _hub; private readonly ILogger _logger; + private readonly IDataEventBus _modpackBuildEventBus; public BuildsEventHandler(IDataEventBus modpackBuildEventBus, IHubContext hub, ILogger logger) { _modpackBuildEventBus = modpackBuildEventBus; @@ -29,17 +29,17 @@ public void Init() { } private async Task HandleBuildEvent(DataEventModel dataEventModel) { - if (dataEventModel.data == null) return; + if (dataEventModel.Data == null) return; - switch (dataEventModel.type) { + switch (dataEventModel.Type) { case DataEventType.ADD: - await AddedEvent(dataEventModel.data as ModpackBuild); + await AddedEvent(dataEventModel.Data as ModpackBuild); break; case DataEventType.UPDATE: - await UpdatedEvent(dataEventModel.id, dataEventModel.data); + await UpdatedEvent(dataEventModel.Id, dataEventModel.Data); break; case DataEventType.DELETE: break; - default: throw new ArgumentOutOfRangeException(nameof(dataEventModel)); + default: throw new ArgumentOutOfRangeException(nameof(dataEventModel)); } } diff --git a/UKSF.Api.Modpack/Models/GithubCommit.cs b/UKSF.Api.Modpack/Models/GithubCommit.cs index aa99663b..63bf86de 100644 --- a/UKSF.Api.Modpack/Models/GithubCommit.cs +++ b/UKSF.Api.Modpack/Models/GithubCommit.cs @@ -1,10 +1,10 @@ namespace UKSF.Api.Modpack.Models { public class GithubCommit { public string After; + public string Author; public string BaseBranch; public string Before; public string Branch; public string Message; - public string Author; } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuild.cs b/UKSF.Api.Modpack/Models/ModpackBuild.cs index 0e5a57de..8c9c5c77 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuild.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuild.cs @@ -6,19 +6,19 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Modpack.Models { - public class ModpackBuild : DatabaseObject { + public record ModpackBuild : MongoObject { [BsonRepresentation(BsonType.ObjectId)] public string BuilderId; public int BuildNumber; public ModpackBuildResult BuildResult = ModpackBuildResult.NONE; public GithubCommit Commit; + public DateTime EndTime = DateTime.Now; + public GameEnvironment Environment; + public Dictionary EnvironmentVariables = new(); public bool Finished; public bool IsRebuild; - public GameEnvironment Environment; public bool Running; - public List Steps = new List(); public DateTime StartTime = DateTime.Now; - public DateTime EndTime = DateTime.Now; + public List Steps = new(); public string Version; - public Dictionary EnvironmentVariables = new Dictionary(); } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs b/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs index 8f4010b2..aae49b0c 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs @@ -1,6 +1,6 @@ namespace UKSF.Api.Modpack.Models { public class ModpackBuildQueueItem { - public string Id; public ModpackBuild Build; + public string Id; } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildStep.cs b/UKSF.Api.Modpack/Models/ModpackBuildStep.cs index f2e38d0f..b29788bd 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildStep.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildStep.cs @@ -8,7 +8,7 @@ public class ModpackBuildStep { public DateTime EndTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); public bool Finished; public int Index; - public List Logs = new List(); + public List Logs = new(); public string Name; public bool Running; public DateTime StartTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); diff --git a/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs b/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs index cda499d7..26794b31 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs @@ -2,8 +2,8 @@ namespace UKSF.Api.Modpack.Models { public class ModpackBuildStepLogItem { - public string Text; public string Colour; + public string Text; } public class ModpackBuildStepLogItemUpdate { diff --git a/UKSF.Api.Modpack/Models/ModpackRelease.cs b/UKSF.Api.Modpack/Models/ModpackRelease.cs index f9db9146..a90f554f 100644 --- a/UKSF.Api.Modpack/Models/ModpackRelease.cs +++ b/UKSF.Api.Modpack/Models/ModpackRelease.cs @@ -4,7 +4,7 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Modpack.Models { - public class ModpackRelease : DatabaseObject { + public record ModpackRelease : MongoObject { public string Changelog; [BsonRepresentation(BsonType.ObjectId)] public string CreatorId; public string Description; diff --git a/UKSF.Api.Modpack/Models/NewBuild.cs b/UKSF.Api.Modpack/Models/NewBuild.cs index 9bba6075..bc1e96f6 100644 --- a/UKSF.Api.Modpack/Models/NewBuild.cs +++ b/UKSF.Api.Modpack/Models/NewBuild.cs @@ -1,8 +1,8 @@ namespace UKSF.Api.Modpack.Models { public class NewBuild { - public string Reference; public bool Ace; public bool Acre; public bool F35; + public string Reference; } } diff --git a/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs b/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs index cadcdfcd..e0ee1b54 100644 --- a/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs +++ b/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs @@ -3,9 +3,9 @@ using System.Threading.Tasks; using Microsoft.Extensions.Hosting; using UKSF.Api.ArmaServer.Models; -using UKSF.Api.Base.Context; using UKSF.Api.Base.ScheduledActions; -using UKSF.Api.Modpack.Models; +using UKSF.Api.Modpack.Context; +using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Services; namespace UKSF.Api.Modpack.ScheduledActions { @@ -13,14 +13,16 @@ public interface IActionPruneBuilds : ISelfCreatingScheduledAction { } public class ActionPruneBuilds : IActionPruneBuilds { private const string ACTION_NAME = nameof(ActionPruneBuilds); + private readonly IBuildsContext _buildsContext; private readonly IClock _clock; - private readonly IDataCollectionFactory _dataCollectionFactory; - private readonly ISchedulerService _schedulerService; private readonly IHostEnvironment _currentEnvironment; + private readonly ISchedulerContext _schedulerContext; + private readonly ISchedulerService _schedulerService; - public ActionPruneBuilds(IDataCollectionFactory dataCollectionFactory, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { - _dataCollectionFactory = dataCollectionFactory; + public ActionPruneBuilds(IBuildsContext buildsContext, ISchedulerContext schedulerContext, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + _buildsContext = buildsContext; + _schedulerContext = schedulerContext; _schedulerService = schedulerService; _currentEnvironment = currentEnvironment; _clock = clock; @@ -29,9 +31,8 @@ public ActionPruneBuilds(IDataCollectionFactory dataCollectionFactory, ISchedule public string Name => ACTION_NAME; public void Run(params object[] parameters) { - IDataCollection buildsData = _dataCollectionFactory.CreateDataCollection("modpackBuilds"); - int threshold = buildsData.Get(x => x.Environment == GameEnvironment.DEV).Select(x => x.BuildNumber).OrderByDescending(x => x).First() - 100; - Task modpackBuildsTask = buildsData.DeleteManyAsync(x => x.BuildNumber < threshold); + int threshold = _buildsContext.Get(x => x.Environment == GameEnvironment.DEV).Select(x => x.BuildNumber).OrderByDescending(x => x).First() - 100; + Task modpackBuildsTask = _buildsContext.DeleteMany(x => x.BuildNumber < threshold); Task.WaitAll(modpackBuildsTask); } @@ -39,7 +40,7 @@ public void Run(params object[] parameters) { public async Task CreateSelf() { if (_currentEnvironment.IsDevelopment()) return; - if (_schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs index 182e0c3e..0bed3578 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs @@ -9,16 +9,16 @@ namespace UKSF.Api.Modpack.Services.BuildProcess { public class BuildProcessHelper { private readonly CancellationTokenSource _cancellationTokenSource; - private readonly CancellationTokenSource _errorCancellationTokenSource = new CancellationTokenSource(); + private readonly CancellationTokenSource _errorCancellationTokenSource = new(); private readonly List _errorExclusions; private readonly bool _errorSilently; - private readonly AutoResetEvent _errorWaitHandle = new AutoResetEvent(false); + private readonly AutoResetEvent _errorWaitHandle = new(false); private readonly string _ignoreErrorGateClose; private readonly string _ignoreErrorGateOpen; private readonly IStepLogger _logger; - private readonly AutoResetEvent _outputWaitHandle = new AutoResetEvent(false); + private readonly AutoResetEvent _outputWaitHandle = new(false); private readonly bool _raiseErrors; - private readonly List _results = new List(); + private readonly List _results = new(); private readonly bool _suppressOutput; private Exception _capturedException; private bool _ignoreErrors; @@ -95,7 +95,7 @@ public List Run(string workingDirectory, string executable, string args, } else { // Timeout or cancelled if (!_cancellationTokenSource.IsCancellationRequested) { - Exception exception = new Exception($"Process exited with non-zero code ({_process.ExitCode})"); + Exception exception = new($"Process exited with non-zero code ({_process.ExitCode})"); if (_raiseErrors) { throw exception; } @@ -166,7 +166,7 @@ private bool CheckIgnoreErrorGates(string message) { } private static List> ExtractMessages(string message, ref string json) { - List> messages = new List>(); + List> messages = new(); if (message.Length > 5 && message.Substring(0, 4) == "JSON") { string[] parts = message.Split('{', '}'); // covers cases where buffer gets extra data flushed to it after the closing brace json = $"{{{parts[1].Escape().Replace("\\\\n", "\\n")}}}"; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs index bcd61094..0d99be58 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs @@ -15,9 +15,9 @@ public interface IBuildProcessorService { public class BuildProcessorService : IBuildProcessorService { private readonly IBuildsService _buildsService; - private readonly IServiceProvider _serviceProvider; private readonly IBuildStepService _buildStepService; private readonly ILogger _logger; + private readonly IServiceProvider _serviceProvider; public BuildProcessorService(IServiceProvider serviceProvider, IBuildStepService buildStepService, IBuildsService buildsService, ILogger logger) { _serviceProvider = serviceProvider; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs index 8b13ca0c..00c1b5a4 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs @@ -17,12 +17,12 @@ public interface IBuildQueueService { public class BuildQueueService : IBuildQueueService { private readonly IBuildProcessorService _buildProcessorService; - private readonly ConcurrentDictionary _buildTasks = new ConcurrentDictionary(); - private readonly ConcurrentDictionary _cancellationTokenSources = new ConcurrentDictionary(); + private readonly ConcurrentDictionary _buildTasks = new(); + private readonly ConcurrentDictionary _cancellationTokenSources = new(); private readonly IGameServersService _gameServersService; private readonly ILogger _logger; - private ConcurrentQueue _queue = new ConcurrentQueue(); private bool _processing; + private ConcurrentQueue _queue = new(); public BuildQueueService(IBuildProcessorService buildProcessorService, IGameServersService gameServersService, ILogger logger) { _buildProcessorService = buildProcessorService; @@ -39,8 +39,8 @@ public void QueueBuild(ModpackBuild build) { } public bool CancelQueued(string id) { - if (_queue.Any(x => x.id == id)) { - _queue = new ConcurrentQueue(_queue.Where(x => x.id != id)); + if (_queue.Any(x => x.Id == id)) { + _queue = new ConcurrentQueue(_queue.Where(x => x.Id != id)); return true; } @@ -93,12 +93,12 @@ private async Task ProcessQueue() { continue; } - CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(); - _cancellationTokenSources.TryAdd(build.id, cancellationTokenSource); + CancellationTokenSource cancellationTokenSource = new(); + _cancellationTokenSources.TryAdd(build.Id, cancellationTokenSource); Task buildTask = _buildProcessorService.ProcessBuild(build, cancellationTokenSource); - _buildTasks.TryAdd(build.id, buildTask); + _buildTasks.TryAdd(build.Id, buildTask); await buildTask; - _cancellationTokenSources.TryRemove(build.id, out CancellationTokenSource _); + _cancellationTokenSources.TryRemove(build.Id, out CancellationTokenSource _); } _processing = false; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs index 044333a8..2d859fa4 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs @@ -18,7 +18,7 @@ public interface IBuildStepService { } public class BuildStepService : IBuildStepService { - private Dictionary _buildStepDictionary = new Dictionary(); + private Dictionary _buildStepDictionary = new(); public void RegisterBuildSteps() { _buildStepDictionary = AppDomain.CurrentDomain.GetAssemblies() @@ -40,7 +40,7 @@ public List GetSteps(GameEnvironment environment) { return steps; } - public ModpackBuildStep GetRestoreStepForRelease() => new ModpackBuildStep(BuildStepRestore.NAME); + public ModpackBuildStep GetRestoreStepForRelease() => new(BuildStepRestore.NAME); public IBuildStep ResolveBuildStep(string buildStepName) { if (!_buildStepDictionary.ContainsKey(buildStepName)) { @@ -53,7 +53,7 @@ public IBuildStep ResolveBuildStep(string buildStepName) { } private static List GetStepsForBuild() => - new List { + new() { new ModpackBuildStep(BuildStepPrep.NAME), new ModpackBuildStep(BuildStepClean.NAME), new ModpackBuildStep(BuildStepSources.NAME), @@ -71,7 +71,7 @@ private static List GetStepsForBuild() => }; private static List GetStepsForRc() => - new List { + new() { new ModpackBuildStep(BuildStepPrep.NAME), new ModpackBuildStep(BuildStepClean.NAME), new ModpackBuildStep(BuildStepSources.NAME), @@ -90,7 +90,7 @@ private static List GetStepsForRc() => }; private static List GetStepsForRelease() => - new List { + new() { new ModpackBuildStep(BuildStepClean.NAME), new ModpackBuildStep(BuildStepBackup.NAME), new ModpackBuildStep(BuildStepDeploy.NAME), diff --git a/UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs b/UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs index caa18aaf..174afe34 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs @@ -57,7 +57,7 @@ public void Log(string log, string colour = "") { } public void LogInline(string log) { - PushLogUpdate(new List { new ModpackBuildStepLogItem { Text = log } }, true); + PushLogUpdate(new List { new() { Text = log } }, true); } private void LogLines(string log, string colour = "") { diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs index d83f8b4b..b542feb3 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs @@ -34,8 +34,8 @@ CancellationTokenSource cancellationTokenSource public class BuildStep : IBuildStep { private const string COLOUR_BLUE = "#0c78ff"; private readonly TimeSpan _updateInterval = TimeSpan.FromSeconds(2); - private readonly CancellationTokenSource _updatePusherCancellationTokenSource = new CancellationTokenSource(); - private readonly SemaphoreSlim _updateSemaphore = new SemaphoreSlim(1); + private readonly CancellationTokenSource _updatePusherCancellationTokenSource = new(); + private readonly SemaphoreSlim _updateSemaphore = new(1); private ModpackBuildStep _buildStep; private Func, Task> _updateBuildCallback; private Func _updateStepCallback; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs index 1c34d21b..a48dce35 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs @@ -14,8 +14,8 @@ public class BuildStepExtensions : FileBuildStep { protected override async Task ProcessExecute() { string uksfPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf", "intercept"); string interceptPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@intercept"); - DirectoryInfo uksf = new DirectoryInfo(uksfPath); - DirectoryInfo intercept = new DirectoryInfo(interceptPath); + DirectoryInfo uksf = new(uksfPath); + DirectoryInfo intercept = new(interceptPath); StepLogger.LogSurround("\nSigning extensions..."); List files = GetDirectoryContents(uksf, "*.dll").Concat(GetDirectoryContents(intercept, "*.dll")).ToList(); @@ -32,7 +32,7 @@ await BatchProcessFiles( files, 2, file => { - BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource, true, false, true); + BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource, true, false, true); processHelper.Run(file.DirectoryName, signTool, $"sign /f \"{certPath}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); Interlocked.Increment(ref signed); return Task.CompletedTask; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs index 3c9cbd4e..7272d77e 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs @@ -20,9 +20,9 @@ protected override async Task ProcessExecute() { string sourceBasePath = Path.Join(GetBuildEnvironmentPath(), "BaseKeys"); string sourceRepoPath = Path.Join(GetBuildEnvironmentPath(), "Repo"); string targetPath = Path.Join(GetBuildEnvironmentPath(), "Keys"); - DirectoryInfo sourceBase = new DirectoryInfo(sourceBasePath); - DirectoryInfo sourceRepo = new DirectoryInfo(sourceRepoPath); - DirectoryInfo target = new DirectoryInfo(targetPath); + DirectoryInfo sourceBase = new(sourceBasePath); + DirectoryInfo sourceRepo = new(sourceRepoPath); + DirectoryInfo target = new(targetPath); StepLogger.LogSurround("\nCopying base keys..."); List baseKeys = GetDirectoryContents(sourceBase, "*.bikey"); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs index 417e724a..7b953ffd 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs @@ -11,7 +11,7 @@ protected override Task ProcessExecute() { StepLogger.Log("Mounting build environment"); string projectsPath = VariablesService.GetVariable("BUILD_PATH_PROJECTS").AsString(); - BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource, raiseErrors: false); + BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource, raiseErrors: false); processHelper.Run("C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\"\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource, raiseErrors: false); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs index cc979689..1602911a 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs @@ -21,8 +21,8 @@ protected override async Task SetupExecute() { string keygenPath = Path.Join(GetBuildEnvironmentPath(), "PrivateKeys"); string keysPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies", "keys"); - DirectoryInfo keygen = new DirectoryInfo(keygenPath); - DirectoryInfo keys = new DirectoryInfo(keysPath); + DirectoryInfo keygen = new(keygenPath); + DirectoryInfo keys = new(keysPath); keygen.Create(); keys.Create(); @@ -32,10 +32,10 @@ protected override async Task SetupExecute() { StepLogger.LogSurround("Cleared keys directories"); StepLogger.LogSurround("\nCreating key..."); - BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource, true); + BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource, true); processHelper.Run(keygenPath, _dsCreateKey, _keyName, (int) TimeSpan.FromSeconds(10).TotalMilliseconds); StepLogger.Log($"Created {_keyName}"); - await CopyFiles(keygen, keys, new List { new FileInfo(Path.Join(keygenPath, $"{_keyName}.bikey")) }); + await CopyFiles(keygen, keys, new List { new(Path.Join(keygenPath, $"{_keyName}.bikey")) }); StepLogger.LogSurround("Created key"); } @@ -43,8 +43,8 @@ protected override async Task ProcessExecute() { string addonsPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies", "addons"); string interceptPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@intercept", "addons"); string keygenPath = Path.Join(GetBuildEnvironmentPath(), "PrivateKeys"); - DirectoryInfo addons = new DirectoryInfo(addonsPath); - DirectoryInfo intercept = new DirectoryInfo(interceptPath); + DirectoryInfo addons = new(addonsPath); + DirectoryInfo intercept = new(interceptPath); StepLogger.LogSurround("\nDeleting dependencies signatures..."); await DeleteFiles(GetDirectoryContents(addons, "*.bisign*")); @@ -79,7 +79,7 @@ private Task SignFiles(string keygenPath, string addonsPath, IReadOnlyCollection files, 10, file => { - BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource, true); + BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource, true); processHelper.Run(addonsPath, _dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); Interlocked.Increment(ref signed); return Task.CompletedTask; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index dad0eee0..f5d76465 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -26,15 +26,15 @@ private Task CheckoutStaticSource(string displayName, string modName, string rel updated = true; } else { string path = Path.Join(GetBuildSourcesPath(), modName); - DirectoryInfo directory = new DirectoryInfo(path); + DirectoryInfo directory = new(path); if (!directory.Exists) { throw new Exception($"{displayName} source directory does not exist. {displayName} should be cloned before running a build."); } string releasePath = Path.Join(GetBuildSourcesPath(), modName, "release", releaseName); string repoPath = Path.Join(GetBuildEnvironmentPath(), "Repo", repoName); - DirectoryInfo release = new DirectoryInfo(releasePath); - DirectoryInfo repo = new DirectoryInfo(repoPath); + DirectoryInfo release = new(releasePath); + DirectoryInfo repo = new(repoPath); GitCommand(path, "git reset --hard HEAD && git clean -d -f && git fetch"); GitCommand(path, $"git checkout -t origin/{branchName}"); @@ -63,7 +63,7 @@ private Task CheckoutModpack() { string referenceName = string.Equals(Build.Commit.Branch, "None") ? reference : $"latest {reference}"; StepLogger.LogSurround("\nChecking out modpack..."); string modpackPath = Path.Join(GetBuildSourcesPath(), "modpack"); - DirectoryInfo modpack = new DirectoryInfo(modpackPath); + DirectoryInfo modpack = new(modpackPath); if (!modpack.Exists) { throw new Exception("Modpack source directory does not exist. Modpack should be cloned before running a build."); } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs index b8138623..8d0a75d0 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs @@ -8,7 +8,7 @@ namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods { public class BuildStepBuildAce : ModBuildStep { public const string NAME = "Build ACE"; private const string MOD_NAME = "ace"; - private readonly List _allowedOptionals = new List { "ace_compat_rksl_pm_ii", "ace_nouniformrestrictions" }; + private readonly List _allowedOptionals = new() { "ace_compat_rksl_pm_ii", "ace_nouniformrestrictions" }; protected override async Task ProcessExecute() { StepLogger.Log("Running build for ACE"); @@ -19,7 +19,7 @@ protected override async Task ProcessExecute() { if (IsBuildNeeded(MOD_NAME)) { StepLogger.LogSurround("\nRunning make.py..."); - BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version"); + BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version"); processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); StepLogger.LogSurround("Make.py complete"); } @@ -36,9 +36,9 @@ protected override async Task ProcessExecute() { private async Task MoveOptionals(string buildPath) { string optionalsPath = Path.Join(buildPath, "optionals"); string addonsPath = Path.Join(buildPath, "addons"); - DirectoryInfo addons = new DirectoryInfo(addonsPath); + DirectoryInfo addons = new(addonsPath); foreach (string optionalName in _allowedOptionals) { - DirectoryInfo optional = new DirectoryInfo(Path.Join(optionalsPath, $"@{optionalName}", "addons")); + DirectoryInfo optional = new(Path.Join(optionalsPath, $"@{optionalName}", "addons")); List files = GetDirectoryContents(optional); await CopyFiles(optional, addons, files); } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index af9cf364..77328a11 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -8,13 +8,8 @@ namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods { public class BuildStepBuildAcre : ModBuildStep { public const string NAME = "Build ACRE"; private const string MOD_NAME = "acre"; - private readonly List _errorExclusions = new List { - "Found DirectX", - "Linking statically", - "Visual Studio 16", - "INFO: Building", - "Build Type" - }; + + private readonly List _errorExclusions = new() { "Found DirectX", "Linking statically", "Visual Studio 16", "INFO: Building", "Build Type" }; protected override async Task ProcessExecute() { StepLogger.Log("Running build for ACRE"); @@ -25,7 +20,7 @@ protected override async Task ProcessExecute() { if (IsBuildNeeded(MOD_NAME)) { StepLogger.LogSurround("\nRunning make.py..."); - BuildProcessHelper processHelper = new BuildProcessHelper( + BuildProcessHelper processHelper = new( StepLogger, CancellationTokenSource, errorExclusions: _errorExclusions, diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs index 7542456d..3691e0b5 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs @@ -15,12 +15,12 @@ protected override async Task ProcessExecute() { string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@uksf_f35", "addons"); string dependenciesPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies", "addons"); - DirectoryInfo release = new DirectoryInfo(releasePath); - DirectoryInfo dependencies = new DirectoryInfo(dependenciesPath); + DirectoryInfo release = new(releasePath); + DirectoryInfo dependencies = new(dependenciesPath); if (IsBuildNeeded(MOD_NAME)) { StepLogger.LogSurround("\nRunning make.py..."); - BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource); + BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource); processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(1).TotalMilliseconds); StepLogger.LogSurround("Make.py complete"); } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs index 18561fca..c9bb43f6 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs @@ -16,7 +16,7 @@ protected override async Task ProcessExecute() { string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf"); StepLogger.LogSurround("\nRunning make.py..."); - BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource); + BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource); processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(5).TotalMilliseconds); StepLogger.LogSurround("Make.py complete"); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs index 5d968781..2f86159f 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs @@ -12,7 +12,7 @@ protected override Task ProcessExecute() { StepLogger.Log($"Building {repoName} repo"); string arma3SyncPath = VariablesService.GetVariable("BUILD_PATH_ARMA3SYNC").AsString(); - BuildProcessHelper processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource); + BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource); processHelper.Run(arma3SyncPath, "Java", $"-jar .\\ArmA3Sync.jar -BUILD {repoName}", (int) TimeSpan.FromMinutes(5).TotalMilliseconds); return Task.CompletedTask; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs index 1b25b1a5..135764eb 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs @@ -21,7 +21,7 @@ protected override async Task ProcessExecute() { targetUserconfigPath = Path.Join(GetServerEnvironmentPath(Build.Environment), "userconfig"); } - FileInfo cbaSettingsFile = new FileInfo(Path.Join(sourceUserconfigPath, "cba_settings.sqf")); + FileInfo cbaSettingsFile = new(Path.Join(sourceUserconfigPath, "cba_settings.sqf")); StepLogger.LogSurround("\nCopying cba_settings.sqf..."); await CopyFiles(new DirectoryInfo(sourceUserconfigPath), new DirectoryInfo(targetUserconfigPath), new List { cbaSettingsFile }); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs index 8d61fe84..b7ed1e23 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs @@ -20,7 +20,7 @@ protected override async Task ProcessExecute() { } else { string path = Path.Join(environmentPath, "Build"); string repoPath = Path.Join(environmentPath, "Repo"); - DirectoryInfo repo = new DirectoryInfo(repoPath); + DirectoryInfo repo = new(repoPath); StepLogger.LogSurround("\nCleaning build folder..."); await DeleteDirectoryContents(path); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs index acfe0e93..2cdc2552 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs @@ -39,7 +39,7 @@ protected override async Task ProcessExecute() { private string GetBuildMessage() => $"New release candidate available for {Build.Version} on the rc repository"; - private string GetBuildLink() => $"https://uk-sf.co.uk/modpack/builds-rc?version={Build.Version}&build={Build.id}"; + private string GetBuildLink() => $"https://uk-sf.co.uk/modpack/builds-rc?version={Build.Version}&build={Build.Id}"; private string GetDiscordMessage(ModpackRelease release = null) => release == null diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs index 366b8bbe..b5f9fc23 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs @@ -16,8 +16,8 @@ public class FileBuildStep : BuildStep { internal static List GetDirectoryContents(DirectoryInfo source, string searchPattern = "*") => source.GetFiles(searchPattern, SearchOption.AllDirectories).ToList(); internal async Task AddFiles(string sourcePath, string targetPath) { - DirectoryInfo source = new DirectoryInfo(sourcePath); - DirectoryInfo target = new DirectoryInfo(targetPath); + DirectoryInfo source = new(sourcePath); + DirectoryInfo target = new(targetPath); IEnumerable sourceFiles = GetDirectoryContents(source); List addedFiles = sourceFiles.Select(sourceFile => new { sourceFile, targetFile = new FileInfo(sourceFile.FullName.Replace(source.FullName, target.FullName)) }) .Where(x => !x.targetFile.Exists) @@ -27,8 +27,8 @@ internal async Task AddFiles(string sourcePath, string targetPath) { } internal async Task UpdateFiles(string sourcePath, string targetPath) { - DirectoryInfo source = new DirectoryInfo(sourcePath); - DirectoryInfo target = new DirectoryInfo(targetPath); + DirectoryInfo source = new(sourcePath); + DirectoryInfo target = new(targetPath); IEnumerable sourceFiles = GetDirectoryContents(source); List updatedFiles = sourceFiles.Select(sourceFile => new { sourceFile, targetFile = new FileInfo(sourceFile.FullName.Replace(source.FullName, target.FullName)) }) .Where(x => x.targetFile.Exists && (x.targetFile.Length != x.sourceFile.Length || x.targetFile.LastWriteTime < x.sourceFile.LastWriteTime)) @@ -38,8 +38,8 @@ internal async Task UpdateFiles(string sourcePath, string targetPath) { } internal async Task DeleteFiles(string sourcePath, string targetPath, bool matchSubdirectories = false) { - DirectoryInfo source = new DirectoryInfo(sourcePath); - DirectoryInfo target = new DirectoryInfo(targetPath); + DirectoryInfo source = new(sourcePath); + DirectoryInfo target = new(targetPath); IEnumerable targetFiles = GetDirectoryContents(target); List deletedFiles = targetFiles.Select(targetFile => new { targetFile, sourceFile = new FileInfo(targetFile.FullName.Replace(target.FullName, source.FullName)) }) .Where( @@ -50,7 +50,7 @@ internal async Task DeleteFiles(string sourcePath, string targetPath, bool match string sourceSubdirectoryPath = x.sourceFile.FullName.Replace(sourcePath, "") .Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries) .First(); - DirectoryInfo sourceSubdirectory = new DirectoryInfo(Path.Join(sourcePath, sourceSubdirectoryPath)); + DirectoryInfo sourceSubdirectory = new(Path.Join(sourcePath, sourceSubdirectoryPath)); return sourceSubdirectory.Exists; } ) @@ -61,8 +61,8 @@ internal async Task DeleteFiles(string sourcePath, string targetPath, bool match } internal async Task CopyDirectory(string sourceDirectory, string targetDirectory) { - DirectoryInfo source = new DirectoryInfo(sourceDirectory); - DirectoryInfo target = new DirectoryInfo(targetDirectory); + DirectoryInfo source = new(sourceDirectory); + DirectoryInfo target = new(targetDirectory); List files = GetDirectoryContents(source); await CopyFiles(source, target, files); } @@ -83,7 +83,7 @@ internal async Task CopyFiles(FileSystemInfo source, FileSystemInfo target, List } internal async Task DeleteDirectoryContents(string path) { - DirectoryInfo directory = new DirectoryInfo(path); + DirectoryInfo directory = new(path); if (!directory.Exists) { StepLogger.Log("Directory does not exist"); return; @@ -130,7 +130,7 @@ internal async Task DeleteEmptyDirectories(DirectoryInfo directory) { } internal async Task ParallelProcessFiles(IEnumerable files, int taskLimit, Func process, Func getLog, string error) { - SemaphoreSlim taskLimiter = new SemaphoreSlim(taskLimit); + SemaphoreSlim taskLimiter = new(taskLimit); IEnumerable tasks = files.Select( file => { return Task.Run( diff --git a/UKSF.Api.Modpack/Services/BuildsService.cs b/UKSF.Api.Modpack/Services/BuildsService.cs index b6512339..a31f56f0 100644 --- a/UKSF.Api.Modpack/Services/BuildsService.cs +++ b/UKSF.Api.Modpack/Services/BuildsService.cs @@ -4,16 +4,15 @@ using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.ArmaServer.Models; -using UKSF.Api.Base.Context; +using UKSF.Api.Modpack.Context; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services.BuildProcess; -using UKSF.Api.Modpack.Services.Data; -using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Services; namespace UKSF.Api.Modpack.Services { - public interface IBuildsService : IDataBackedService { + public interface IBuildsService { IEnumerable GetDevBuilds(); IEnumerable GetRcBuilds(); ModpackBuild GetLatestDevBuild(); @@ -31,31 +30,32 @@ public interface IBuildsService : IDataBackedService { void CancelInterruptedBuilds(); } - public class BuildsService : DataBackedService, IBuildsService { - private readonly IAccountService _accountService; + public class BuildsService : IBuildsService { + private readonly IAccountContext _accountContext; + private readonly IBuildsContext _buildsContext; + private readonly IBuildStepService _buildStepService; private readonly IHttpContextService _httpContextService; private readonly ILogger _logger; - private readonly IBuildStepService _buildStepService; - - public BuildsService(IBuildsDataService data, IBuildStepService buildStepService, IAccountService accountService, IHttpContextService httpContextService, ILogger logger) : base(data) { + public BuildsService(IBuildsContext buildsContext, IBuildStepService buildStepService, IAccountContext accountContext, IHttpContextService httpContextService, ILogger logger) { + _buildsContext = buildsContext; _buildStepService = buildStepService; - _accountService = accountService; + _accountContext = accountContext; _httpContextService = httpContextService; _logger = logger; } public async Task UpdateBuild(ModpackBuild build, UpdateDefinition updateDefinition) { - await Data.Update(build, updateDefinition); + await _buildsContext.Update(build, updateDefinition); } public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep) { - await Data.Update(build, buildStep); + await _buildsContext.Update(build, buildStep); } - public IEnumerable GetDevBuilds() => Data.Get(x => x.Environment == GameEnvironment.DEV); + public IEnumerable GetDevBuilds() => _buildsContext.Get(x => x.Environment == GameEnvironment.DEV); - public IEnumerable GetRcBuilds() => Data.Get(x => x.Environment != GameEnvironment.DEV); + public IEnumerable GetRcBuilds() => _buildsContext.Get(x => x.Environment != GameEnvironment.DEV); public ModpackBuild GetLatestDevBuild() => GetDevBuilds().FirstOrDefault(); @@ -63,8 +63,8 @@ public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep public async Task CreateDevBuild(string version, GithubCommit commit, NewBuild newBuild = null) { ModpackBuild previousBuild = GetLatestDevBuild(); - string builderId = _accountService.Data.GetSingle(x => x.email == commit.Author)?.id; - ModpackBuild build = new ModpackBuild { + string builderId = _accountContext.GetSingle(x => x.Email == commit.Author)?.Id; + ModpackBuild build = new() { Version = version, BuildNumber = previousBuild?.BuildNumber + 1 ?? 1, Environment = GameEnvironment.DEV, @@ -77,14 +77,14 @@ public async Task CreateDevBuild(string version, GithubCommit comm SetEnvironmentVariables(build, previousBuild, newBuild); } - await Data.Add(build); + await _buildsContext.Add(build); return build; } public async Task CreateRcBuild(string version, GithubCommit commit) { ModpackBuild previousBuild = GetLatestRcBuild(version); - string builderId = _accountService.Data.GetSingle(x => x.email == commit.Author)?.id; - ModpackBuild build = new ModpackBuild { + string builderId = _accountContext.GetSingle(x => x.Email == commit.Author)?.Id; + ModpackBuild build = new() { Version = version, BuildNumber = previousBuild?.BuildNumber + 1 ?? 1, Environment = GameEnvironment.RC, @@ -97,7 +97,7 @@ public async Task CreateRcBuild(string version, GithubCommit commi SetEnvironmentVariables(build, previousBuild); } - await Data.Add(build); + await _buildsContext.Add(build); return build; } @@ -108,7 +108,7 @@ public async Task CreateReleaseBuild(string version) { throw new InvalidOperationException("Release build requires at leaste one RC build"); } - ModpackBuild build = new ModpackBuild { + ModpackBuild build = new() { Version = version, BuildNumber = previousBuild.BuildNumber + 1, Environment = GameEnvironment.RELEASE, @@ -117,13 +117,13 @@ public async Task CreateReleaseBuild(string version) { Steps = _buildStepService.GetSteps(GameEnvironment.RELEASE) }; build.Commit.Message = "Release deployment (no content changes)"; - await Data.Add(build); + await _buildsContext.Add(build); return build; } public async Task CreateRebuild(ModpackBuild build, string newSha = "") { ModpackBuild latestBuild = build.Environment == GameEnvironment.DEV ? GetLatestDevBuild() : GetLatestRcBuild(build.Version); - ModpackBuild rebuild = new ModpackBuild { + ModpackBuild rebuild = new() { Version = latestBuild.Environment == GameEnvironment.DEV ? null : latestBuild.Version, BuildNumber = latestBuild.BuildNumber + 1, IsRebuild = true, @@ -140,14 +140,14 @@ public async Task CreateRebuild(ModpackBuild build, string newSha rebuild.Commit.Message = latestBuild.Environment == GameEnvironment.RELEASE ? $"Re-deployment of release {rebuild.Version}" : $"Rebuild of #{build.BuildNumber}\n\n{rebuild.Commit.Message}"; - await Data.Add(rebuild); + await _buildsContext.Add(rebuild); return rebuild; } public async Task SetBuildRunning(ModpackBuild build) { build.Running = true; build.StartTime = DateTime.Now; - await Data.Update(build, Builders.Update.Set(x => x.Running, true).Set(x => x.StartTime, DateTime.Now)); + await _buildsContext.Update(build, Builders.Update.Set(x => x.Running, true).Set(x => x.StartTime, DateTime.Now)); } public async Task SucceedBuild(ModpackBuild build) { @@ -163,7 +163,7 @@ public async Task CancelBuild(ModpackBuild build) { } public void CancelInterruptedBuilds() { - List builds = Data.Get(x => x.Running || x.Steps.Any(y => y.Running)).ToList(); + List builds = _buildsContext.Get(x => x.Running || x.Steps.Any(y => y.Running)).ToList(); if (!builds.Any()) return; IEnumerable tasks = builds.Select( @@ -175,7 +175,7 @@ public void CancelInterruptedBuilds() { runningStep.EndTime = DateTime.Now; runningStep.BuildResult = ModpackBuildResult.CANCELLED; runningStep.Logs.Add(new ModpackBuildStepLogItem { Text = "\nBuild was interrupted", Colour = "goldenrod" }); - await Data.Update(build, runningStep); + await _buildsContext.Update(build, runningStep); } await FinishBuild(build, ModpackBuildResult.CANCELLED); @@ -190,7 +190,7 @@ private async Task FinishBuild(ModpackBuild build, ModpackBuildResult result) { build.Finished = true; build.BuildResult = result; build.EndTime = DateTime.Now; - await Data.Update(build, Builders.Update.Set(x => x.Running, false).Set(x => x.Finished, true).Set(x => x.BuildResult, result).Set(x => x.EndTime, DateTime.Now)); + await _buildsContext.Update(build, Builders.Update.Set(x => x.Running, false).Set(x => x.Finished, true).Set(x => x.BuildResult, result).Set(x => x.EndTime, DateTime.Now)); } private static void SetEnvironmentVariables(ModpackBuild build, ModpackBuild previousBuild, NewBuild newBuild = null) { diff --git a/UKSF.Api.Modpack/Services/GithubService.cs b/UKSF.Api.Modpack/Services/GithubService.cs index a0530f5e..afe7a6c8 100644 --- a/UKSF.Api.Modpack/Services/GithubService.cs +++ b/UKSF.Api.Modpack/Services/GithubService.cs @@ -51,7 +51,7 @@ public bool VerifySignature(string signature, string body) { string secret = _configuration.GetSection("Github")["webhookSecret"]; byte[] data = Encoding.UTF8.GetBytes(body); byte[] secretData = Encoding.UTF8.GetBytes(secret); - using HMACSHA1 hmac = new HMACSHA1(secretData); + using HMACSHA1 hmac = new(secretData); byte[] hash = hmac.ComputeHash(data); string sha1 = $"sha1={BitConverter.ToString(hash).ToLower().Replace("-", "")}"; return string.Equals(sha1, signature); @@ -148,7 +148,7 @@ await client.Repository.Release.Create( public async Task> GetBranches() { GitHubClient client = await GetAuthenticatedClient(); IReadOnlyList branches = await client.Repository.Branch.GetAll(REPO_ORG, REPO_NAME); - ConcurrentBag validBranchesBag = new ConcurrentBag(); + ConcurrentBag validBranchesBag = new(); IEnumerable task = branches.Select( async branch => { if (await IsReferenceValid(branch.Name)) { @@ -244,15 +244,15 @@ private static string FormatChangelog(string body) { } private async Task GetAuthenticatedClient() { - GitHubClient client = new GitHubClient(new ProductHeaderValue(APP_NAME)) { Credentials = new Credentials(GetJwtToken(), AuthenticationType.Bearer) }; + GitHubClient client = new(new ProductHeaderValue(APP_NAME)) { Credentials = new Credentials(GetJwtToken(), AuthenticationType.Bearer) }; AccessToken response = await client.GitHubApps.CreateInstallationToken(APP_INSTALLATION); - GitHubClient installationClient = new GitHubClient(new ProductHeaderValue(APP_NAME)) { Credentials = new Credentials(response.Token) }; + GitHubClient installationClient = new(new ProductHeaderValue(APP_NAME)) { Credentials = new Credentials(response.Token) }; return installationClient; } private string GetJwtToken() { string privateKey = _configuration.GetSection("Github")["appPrivateKey"].Replace("\n", Environment.NewLine, StringComparison.Ordinal); - GitHubJwtFactory generator = new GitHubJwtFactory(new StringPrivateKeySource(privateKey), new GitHubJwtFactoryOptions { AppIntegrationId = APP_ID, ExpirationSeconds = 540 }); + GitHubJwtFactory generator = new(new StringPrivateKeySource(privateKey), new GitHubJwtFactoryOptions { AppIntegrationId = APP_ID, ExpirationSeconds = 540 }); return generator.CreateEncodedJwtToken(); } } diff --git a/UKSF.Api.Modpack/Services/ModpackService.cs b/UKSF.Api.Modpack/Services/ModpackService.cs index c9188541..085c42be 100644 --- a/UKSF.Api.Modpack/Services/ModpackService.cs +++ b/UKSF.Api.Modpack/Services/ModpackService.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using Octokit; using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Modpack.Context; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services.BuildProcess; using UKSF.Api.Shared.Events; @@ -29,14 +30,26 @@ public interface IModpackService { public class ModpackService : IModpackService { private readonly IBuildQueueService _buildQueueService; + private readonly IBuildsContext _buildsContext; private readonly IBuildsService _buildsService; private readonly IGithubService _githubService; private readonly IHttpContextService _httpContextService; private readonly ILogger _logger; + private readonly IReleasesContext _releasesContext; private readonly IReleaseService _releaseService; - - public ModpackService(IReleaseService releaseService, IBuildsService buildsService, IBuildQueueService buildQueueService, IGithubService githubService, IHttpContextService httpContextService, ILogger logger) { + public ModpackService( + IReleasesContext releasesContext, + IBuildsContext buildsContext, + IReleaseService releaseService, + IBuildsService buildsService, + IBuildQueueService buildQueueService, + IGithubService githubService, + IHttpContextService httpContextService, + ILogger logger + ) { + _releasesContext = releasesContext; + _buildsContext = buildsContext; _releaseService = releaseService; _buildsService = buildsService; _buildQueueService = buildQueueService; @@ -45,7 +58,7 @@ public ModpackService(IReleaseService releaseService, IBuildsService buildsServi _logger = logger; } - public IEnumerable GetReleases() => _releaseService.Data.Get(); + public IEnumerable GetReleases() => _releasesContext.Get(); public IEnumerable GetRcBuilds() => _buildsService.GetRcBuilds(); @@ -53,7 +66,7 @@ public ModpackService(IReleaseService releaseService, IBuildsService buildsServi public ModpackRelease GetRelease(string version) => _releaseService.GetRelease(version); - public ModpackBuild GetBuild(string id) => _buildsService.Data.GetSingle(x => x.id == id); + public ModpackBuild GetBuild(string id) => _buildsContext.GetSingle(x => x.Id == id); public async Task NewBuild(NewBuild newBuild) { GithubCommit commit = await _githubService.GetLatestReferenceCommit(newBuild.Reference); @@ -77,10 +90,10 @@ public async Task Rebuild(ModpackBuild build) { public async Task CancelBuild(ModpackBuild build) { _logger.LogAudit($"Build {GetBuildName(build)} cancelled"); - if (_buildQueueService.CancelQueued(build.id)) { + if (_buildQueueService.CancelQueued(build.Id)) { await _buildsService.CancelBuild(build); } else { - _buildQueueService.Cancel(build.id); + _buildQueueService.Cancel(build.Id); } } @@ -143,9 +156,9 @@ public void RunQueuedBuilds() { private static string GetBuildName(ModpackBuild build) => build.Environment switch { GameEnvironment.RELEASE => $"release {build.Version}", - GameEnvironment.RC => $"{build.Version} RC# {build.BuildNumber}", - GameEnvironment.DEV => $"#{build.BuildNumber}", - _ => throw new ArgumentException("Invalid build environment") + GameEnvironment.RC => $"{build.Version} RC# {build.BuildNumber}", + GameEnvironment.DEV => $"#{build.BuildNumber}", + _ => throw new ArgumentException("Invalid build environment") }; } } diff --git a/UKSF.Api.Modpack/Services/ReleaseService.cs b/UKSF.Api.Modpack/Services/ReleaseService.cs index bd4f79bf..c4be48af 100644 --- a/UKSF.Api.Modpack/Services/ReleaseService.cs +++ b/UKSF.Api.Modpack/Services/ReleaseService.cs @@ -3,14 +3,13 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using UKSF.Api.Base.Context; +using UKSF.Api.Modpack.Context; using UKSF.Api.Modpack.Models; -using UKSF.Api.Modpack.Services.Data; -using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Shared.Events; namespace UKSF.Api.Modpack.Services { - public interface IReleaseService : IDataBackedService { + public interface IReleaseService { Task MakeDraftRelease(string version, GithubCommit commit); Task UpdateDraft(ModpackRelease release); Task PublishRelease(string version); @@ -18,29 +17,31 @@ public interface IReleaseService : IDataBackedService { Task AddHistoricReleases(IEnumerable releases); } - public class ReleaseService : DataBackedService, IReleaseService { - private readonly IAccountService _accountService; - private readonly ILogger _logger; + public class ReleaseService : IReleaseService { + private readonly IAccountContext _accountContext; private readonly IGithubService _githubService; + private readonly ILogger _logger; + private readonly IReleasesContext _releasesContext; - public ReleaseService(IReleasesDataService data, IGithubService githubService, IAccountService accountService, ILogger logger) : base(data) { + public ReleaseService(IReleasesContext releasesContext, IAccountContext accountContext, IGithubService githubService, ILogger logger) { + _releasesContext = releasesContext; + _accountContext = accountContext; _githubService = githubService; - _accountService = accountService; _logger = logger; } public ModpackRelease GetRelease(string version) { - return Data.GetSingle(x => x.Version == version); + return _releasesContext.GetSingle(x => x.Version == version); } public async Task MakeDraftRelease(string version, GithubCommit commit) { string changelog = await _githubService.GenerateChangelog(version); - string creatorId = _accountService.Data.GetSingle(x => x.email == commit.Author)?.id; - await Data.Add(new ModpackRelease { Timestamp = DateTime.Now, Version = version, Changelog = changelog, IsDraft = true, CreatorId = creatorId }); + string creatorId = _accountContext.GetSingle(x => x.Email == commit.Author)?.Id; + await _releasesContext.Add(new ModpackRelease { Timestamp = DateTime.Now, Version = version, Changelog = changelog, IsDraft = true, CreatorId = creatorId }); } public async Task UpdateDraft(ModpackRelease release) { - await Data.Update(release.id, Builders.Update.Set(x => x.Description, release.Description).Set(x => x.Changelog, release.Changelog)); + await _releasesContext.Update(release.Id, Builders.Update.Set(x => x.Description, release.Description).Set(x => x.Changelog, release.Changelog)); } public async Task PublishRelease(string version) { @@ -56,14 +57,14 @@ public async Task PublishRelease(string version) { release.Changelog += release.Changelog.EndsWith("\n\n") ? "
" : "\n\n
"; release.Changelog += "SR3 - Development Team
[Report and track issues here](https://github.com/uksf/modpack/issues)"; - await Data.Update(release.id, Builders.Update.Set(x => x.Timestamp, DateTime.Now).Set(x => x.IsDraft, false).Set(x => x.Changelog, release.Changelog)); + await _releasesContext.Update(release.Id, Builders.Update.Set(x => x.Timestamp, DateTime.Now).Set(x => x.IsDraft, false).Set(x => x.Changelog, release.Changelog)); await _githubService.PublishRelease(release); } public async Task AddHistoricReleases(IEnumerable releases) { - IEnumerable existingReleases = Data.Get(); + IEnumerable existingReleases = _releasesContext.Get(); foreach (ModpackRelease release in releases.Where(x => existingReleases.All(y => y.Version != x.Version))) { - await Data.Add(release); + await _releasesContext.Add(release); } } } diff --git a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs index a0f9ab4e..df89e9a2 100644 --- a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs +++ b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs @@ -16,12 +16,12 @@ public static IServiceCollection AddUksfPersonnel(this IServiceCollection servic services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddActions().AddTransient(); private static IServiceCollection AddContexts(this IServiceCollection services) => - services.AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton(); + services.AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>() diff --git a/UKSF.Api.Personnel/Context/AccountContext.cs b/UKSF.Api.Personnel/Context/AccountContext.cs new file mode 100644 index 00000000..b900b468 --- /dev/null +++ b/UKSF.Api.Personnel/Context/AccountContext.cs @@ -0,0 +1,12 @@ +using UKSF.Api.Base.Context; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; + +namespace UKSF.Api.Personnel.Context { + public interface IAccountContext : IMongoContext, ICachedMongoContext { } + + public class AccountContext : CachedMongoContext, IAccountContext { + public AccountContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "accounts") { } + } +} diff --git a/UKSF.Api.Personnel/Context/AccountDataService.cs b/UKSF.Api.Personnel/Context/AccountDataService.cs deleted file mode 100644 index 00035413..00000000 --- a/UKSF.Api.Personnel/Context/AccountDataService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using UKSF.Api.Base.Context; -using UKSF.Api.Personnel.Models; -using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; - -namespace UKSF.Api.Personnel.Context { - public interface IAccountDataService : IDataService, ICachedDataService { } - - public class AccountDataService : CachedDataService, IAccountDataService { - public AccountDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "accounts") { } - } -} diff --git a/UKSF.Api.Personnel/Context/CommentThreadDataService.cs b/UKSF.Api.Personnel/Context/CommentThreadContext.cs similarity index 61% rename from UKSF.Api.Personnel/Context/CommentThreadDataService.cs rename to UKSF.Api.Personnel/Context/CommentThreadContext.cs index eba7f7c1..38874565 100644 --- a/UKSF.Api.Personnel/Context/CommentThreadDataService.cs +++ b/UKSF.Api.Personnel/Context/CommentThreadContext.cs @@ -7,15 +7,15 @@ using UKSF.Api.Shared.Models; namespace UKSF.Api.Personnel.Context { - public interface ICommentThreadDataService : IDataService, ICachedDataService { + public interface ICommentThreadContext : IMongoContext, ICachedMongoContext { Task Update(string id, Comment comment, DataEventType updateType); } - public class CommentThreadDataService : CachedDataService, ICommentThreadDataService { - public CommentThreadDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "commentThreads") { } + public class CommentThreadContext : CachedMongoContext, ICommentThreadContext { + public CommentThreadContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "commentThreads") { } public async Task Update(string id, Comment comment, DataEventType updateType) { - await base.Update(id, updateType == DataEventType.ADD ? Builders.Update.Push(x => x.comments, comment) : Builders.Update.Pull(x => x.comments, comment)); + await base.Update(id, updateType == DataEventType.ADD ? Builders.Update.Push(x => x.Comments, comment) : Builders.Update.Pull(x => x.Comments, comment)); CommentThreadDataEvent(EventModelFactory.CreateDataEvent(updateType, id, comment)); } diff --git a/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs b/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs new file mode 100644 index 00000000..a571fc27 --- /dev/null +++ b/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs @@ -0,0 +1,13 @@ +using UKSF.Api.Base.Context; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; + +namespace UKSF.Api.Personnel.Context { + public interface IConfirmationCodeContext : IMongoContext { } + + public class ConfirmationCodeContext : MongoContext, IConfirmationCodeContext { + public ConfirmationCodeContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : + base(mongoCollectionFactory, dataEventBus, "confirmationCodes") { } + } +} diff --git a/UKSF.Api.Personnel/Context/ConfirmationCodeDataService.cs b/UKSF.Api.Personnel/Context/ConfirmationCodeDataService.cs deleted file mode 100644 index fe5a698c..00000000 --- a/UKSF.Api.Personnel/Context/ConfirmationCodeDataService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using UKSF.Api.Base.Context; -using UKSF.Api.Personnel.Models; -using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; - -namespace UKSF.Api.Personnel.Context { - public interface IConfirmationCodeDataService : IDataService { } - - public class ConfirmationCodeDataService : DataService, IConfirmationCodeDataService { - public ConfirmationCodeDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "confirmationCodes") { } - } -} diff --git a/UKSF.Api.Personnel/Context/NotificationsContext.cs b/UKSF.Api.Personnel/Context/NotificationsContext.cs new file mode 100644 index 00000000..17a12698 --- /dev/null +++ b/UKSF.Api.Personnel/Context/NotificationsContext.cs @@ -0,0 +1,12 @@ +using UKSF.Api.Base.Context; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; + +namespace UKSF.Api.Personnel.Context { + public interface INotificationsContext : IMongoContext, ICachedMongoContext { } + + public class NotificationsContext : CachedMongoContext, INotificationsContext { + public NotificationsContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "notifications") { } + } +} diff --git a/UKSF.Api.Personnel/Context/NotificationsDataService.cs b/UKSF.Api.Personnel/Context/NotificationsDataService.cs deleted file mode 100644 index 1557c772..00000000 --- a/UKSF.Api.Personnel/Context/NotificationsDataService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using UKSF.Api.Base.Context; -using UKSF.Api.Personnel.Models; -using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; - -namespace UKSF.Api.Personnel.Context { - public interface INotificationsDataService : IDataService, ICachedDataService { } - - public class NotificationsDataService : CachedDataService, INotificationsDataService { - public NotificationsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "notifications") { } - } -} diff --git a/UKSF.Api.Personnel/Context/RanksDataService.cs b/UKSF.Api.Personnel/Context/RanksContext.cs similarity index 55% rename from UKSF.Api.Personnel/Context/RanksDataService.cs rename to UKSF.Api.Personnel/Context/RanksContext.cs index c2a05e86..fadff056 100644 --- a/UKSF.Api.Personnel/Context/RanksDataService.cs +++ b/UKSF.Api.Personnel/Context/RanksContext.cs @@ -6,20 +6,20 @@ using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Context { - public interface IRanksDataService : IDataService, ICachedDataService { + public interface IRanksContext : IMongoContext, ICachedMongoContext { new IEnumerable Get(); new Rank GetSingle(string name); } - public class RanksDataService : CachedDataService, IRanksDataService { - public RanksDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "ranks") { } + public class RanksContext : CachedMongoContext, IRanksContext { + public RanksContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "ranks") { } + + public override Rank GetSingle(string name) => GetSingle(x => x.Name == name); protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { - Cache = newCollection?.OrderBy(x => x.order).ToList(); + Cache = newCollection?.OrderBy(x => x.Order).ToList(); } } - - public override Rank GetSingle(string name) => GetSingle(x => x.name == name); } } diff --git a/UKSF.Api.Personnel/Context/RolesDataService.cs b/UKSF.Api.Personnel/Context/RolesContext.cs similarity index 55% rename from UKSF.Api.Personnel/Context/RolesDataService.cs rename to UKSF.Api.Personnel/Context/RolesContext.cs index 62a2cd7f..48ee4e03 100644 --- a/UKSF.Api.Personnel/Context/RolesDataService.cs +++ b/UKSF.Api.Personnel/Context/RolesContext.cs @@ -6,20 +6,20 @@ using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Context { - public interface IRolesDataService : IDataService, ICachedDataService { + public interface IRolesContext : IMongoContext, ICachedMongoContext { new IEnumerable Get(); new Role GetSingle(string name); } - public class RolesDataService : CachedDataService, IRolesDataService { - public RolesDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "roles") { } + public class RolesContext : CachedMongoContext, IRolesContext { + public RolesContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "roles") { } + + public override Role GetSingle(string name) => GetSingle(x => x.Name == name); protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { - Cache = newCollection?.OrderBy(x => x.name).ToList(); + Cache = newCollection?.OrderBy(x => x.Name).ToList(); } } - - public override Role GetSingle(string name) => GetSingle(x => x.name == name); } } diff --git a/UKSF.Api.Personnel/Context/UnitsContext.cs b/UKSF.Api.Personnel/Context/UnitsContext.cs new file mode 100644 index 00000000..4488cbd4 --- /dev/null +++ b/UKSF.Api.Personnel/Context/UnitsContext.cs @@ -0,0 +1,20 @@ +using System.Collections.Generic; +using System.Linq; +using UKSF.Api.Base.Context; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Events; + +namespace UKSF.Api.Personnel.Context { + public interface IUnitsContext : IMongoContext, ICachedMongoContext { } + + public class UnitsContext : CachedMongoContext, IUnitsContext { + public UnitsContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "units") { } + + protected override void SetCache(IEnumerable newCollection) { + lock (LockObject) { + Cache = newCollection?.OrderBy(x => x.Order).ToList(); + } + } + } +} diff --git a/UKSF.Api.Personnel/Context/UnitsDataService.cs b/UKSF.Api.Personnel/Context/UnitsDataService.cs deleted file mode 100644 index cda08aca..00000000 --- a/UKSF.Api.Personnel/Context/UnitsDataService.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using UKSF.Api.Base.Context; -using UKSF.Api.Personnel.Models; -using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; - -namespace UKSF.Api.Personnel.Context { - public interface IUnitsDataService : IDataService, ICachedDataService { } - - public class UnitsDataService : CachedDataService, IUnitsDataService { - public UnitsDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "units") { } - - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { - Cache = newCollection?.OrderBy(x => x.order).ToList(); - } - } - } -} diff --git a/UKSF.Api.Personnel/Controllers/AccountsController.cs b/UKSF.Api.Personnel/Controllers/AccountsController.cs index 65559da8..076a5087 100644 --- a/UKSF.Api.Personnel/Controllers/AccountsController.cs +++ b/UKSF.Api.Personnel/Controllers/AccountsController.cs @@ -8,6 +8,7 @@ using MongoDB.Driver; using Newtonsoft.Json.Linq; using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Extensions; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; @@ -19,6 +20,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class AccountsController : Controller { + private readonly IAccountContext _accountContext; private readonly IEventBus _accountEventBus; private readonly IAccountService _accountService; private readonly IConfirmationCodeService _confirmationCodeService; @@ -29,6 +31,7 @@ public class AccountsController : Controller { private readonly IRanksService _ranksService; public AccountsController( + IAccountContext accountContext, IConfirmationCodeService confirmationCodeService, IRanksService ranksService, IAccountService accountService, @@ -38,6 +41,7 @@ public AccountsController( IEventBus accountEventBus, ILogger logger ) { + _accountContext = accountContext; _confirmationCodeService = confirmationCodeService; _ranksService = ranksService; _accountService = accountService; @@ -56,30 +60,30 @@ public IActionResult Get() { [HttpGet("{id}"), Authorize] public IActionResult GetById(string id) { - Account account = _accountService.Data.GetSingle(id); + Account account = _accountContext.GetSingle(id); return Ok(PubliciseAccount(account)); } [HttpPut] public async Task Put([FromBody] JObject body) { string email = body["email"].ToString(); - if (_accountService.Data.Get(x => string.Equals(x.email, email, StringComparison.InvariantCultureIgnoreCase)).Any()) { + if (_accountContext.Get(x => string.Equals(x.Email, email, StringComparison.InvariantCultureIgnoreCase)).Any()) { return BadRequest(new { error = "an account with this email or username exists" }); } - Account account = new Account { - email = email, - password = BCrypt.Net.BCrypt.HashPassword(body["password"].ToString()), - firstname = body["firstname"].ToString().ToTitleCase(), - lastname = body["lastname"].ToString().ToTitleCase(), - dob = DateTime.ParseExact($"{body["dobGroup"]["year"]}-{body["dobGroup"]["month"]}-{body["dobGroup"]["day"]}", "yyyy-M-d", CultureInfo.InvariantCulture), - nation = body["nation"].ToString(), - membershipState = MembershipState.UNCONFIRMED + Account account = new() { + Email = email, + Password = BCrypt.Net.BCrypt.HashPassword(body["password"].ToString()), + Firstname = body["firstname"].ToString().ToTitleCase(), + Lastname = body["lastname"].ToString().ToTitleCase(), + Dob = DateTime.ParseExact($"{body["dobGroup"]["year"]}-{body["dobGroup"]["month"]}-{body["dobGroup"]["day"]}", "yyyy-M-d", CultureInfo.InvariantCulture), + Nation = body["nation"].ToString(), + MembershipState = MembershipState.UNCONFIRMED }; - await _accountService.Data.Add(account); + await _accountContext.Add(account); await SendConfirmationCode(account); - _logger.LogAudit($"New account created: '{account.firstname} {account.lastname}, {account.email}'", _accountService.Data.GetSingle(x => x.email == account.email).id); - return Ok(new { account.email }); + _logger.LogAudit($"New account created: '{account.Firstname} {account.Lastname}, {account.Email}'", _accountContext.GetSingle(x => x.Email == account.Email).Id); + return Ok(new { email = account.Email }); } [HttpPost, Authorize] @@ -94,65 +98,65 @@ public async Task ApplyConfirmationCode([FromBody] JObject body) return BadRequest(new { error = exception.Message }); } - Account account = _accountService.Data.GetSingle(x => x.email == email); + Account account = _accountContext.GetSingle(x => x.Email == email); if (account == null) { return BadRequest(new { error = $"An account with the email '{email}' doesn't exist. This should be impossible so please contact an admin for help" }); } string value = await _confirmationCodeService.GetConfirmationCode(code); if (value == email) { - await _accountService.Data.Update(account.id, "membershipState", MembershipState.CONFIRMED); - _logger.LogAudit($"Email address confirmed for {account.id}"); + await _accountContext.Update(account.Id, "membershipState", MembershipState.CONFIRMED); + _logger.LogAudit($"Email address confirmed for {account.Id}"); return Ok(); } - await _confirmationCodeService.ClearConfirmationCodes(x => x.value == email); + await _confirmationCodeService.ClearConfirmationCodes(x => x.Value == email); await SendConfirmationCode(account); - return BadRequest(new { error = $"The confirmation code was invalid or expired. A new code has been sent to '{account.email}'" }); + return BadRequest(new { error = $"The confirmation code was invalid or expired. A new code has been sent to '{account.Email}'" }); } [HttpPost("resend-email-code"), Authorize] public async Task ResendConfirmationCode() { Account account = _accountService.GetUserAccount(); - if (account.membershipState != MembershipState.UNCONFIRMED) { + if (account.MembershipState != MembershipState.UNCONFIRMED) { return BadRequest(new { error = "Account email has already been confirmed" }); } - await _confirmationCodeService.ClearConfirmationCodes(x => x.value == account.email); + await _confirmationCodeService.ClearConfirmationCodes(x => x.Value == account.Email); await SendConfirmationCode(account); return Ok(PubliciseAccount(account)); } [HttpGet("under"), Authorize(Roles = Permissions.COMMAND)] public IActionResult GetAccountsUnder([FromQuery] bool reverse = false) { - List accounts = new List(); + List accounts = new(); - List memberAccounts = _accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER).ToList(); - memberAccounts = memberAccounts.OrderBy(x => x.rank, new RankComparer(_ranksService)).ThenBy(x => x.lastname).ThenBy(x => x.firstname).ToList(); + List memberAccounts = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER).ToList(); + memberAccounts = memberAccounts.OrderBy(x => x.Rank, new RankComparer(_ranksService)).ThenBy(x => x.Lastname).ThenBy(x => x.Firstname).ToList(); if (reverse) { memberAccounts.Reverse(); } - accounts.AddRange(memberAccounts.Select(x => new { value = x.id, displayValue = _displayNameService.GetDisplayName(x) })); + accounts.AddRange(memberAccounts.Select(x => new { value = x.Id, displayValue = _displayNameService.GetDisplayName(x) })); return Ok(accounts); } [HttpGet("roster"), Authorize] public IEnumerable GetRosterAccounts() { - IEnumerable accounts = _accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER); - IEnumerable accountObjects = accounts.OrderBy(x => x.rank, new RankComparer(_ranksService)) - .ThenBy(x => x.lastname) - .ThenBy(x => x.firstname) + IEnumerable accounts = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER); + IEnumerable accountObjects = accounts.OrderBy(x => x.Rank, new RankComparer(_ranksService)) + .ThenBy(x => x.Lastname) + .ThenBy(x => x.Firstname) .Select( x => new RosterAccount { - id = x.id, - nation = x.nation, - rank = x.rank, - roleAssignment = x.roleAssignment, - unitAssignment = x.unitAssignment, - name = $"{x.lastname}, {x.firstname}" + Id = x.Id, + Nation = x.Nation, + Rank = x.Rank, + RoleAssignment = x.RoleAssignment, + UnitAssignment = x.UnitAssignment, + Name = $"{x.Lastname}, {x.Firstname}" } ); return accountObjects; @@ -160,34 +164,34 @@ public IEnumerable GetRosterAccounts() { [HttpGet("exists")] public IActionResult CheckUsernameOrEmailExists([FromQuery] string check) { - return Ok(_accountService.Data.Get().Any(x => string.Equals(x.email, check, StringComparison.InvariantCultureIgnoreCase)) ? new { exists = true } : new { exists = false }); + return Ok(_accountContext.Get().Any(x => string.Equals(x.Email, check, StringComparison.InvariantCultureIgnoreCase)) ? new { exists = true } : new { exists = false }); } [HttpPut("name"), Authorize] public async Task ChangeName([FromBody] JObject changeNameRequest) { Account account = _accountService.GetUserAccount(); - await _accountService.Data.Update( - account.id, - Builders.Update.Set(x => x.firstname, changeNameRequest["firstname"].ToString()).Set(x => x.lastname, changeNameRequest["lastname"].ToString()) + await _accountContext.Update( + account.Id, + Builders.Update.Set(x => x.Firstname, changeNameRequest["firstname"].ToString()).Set(x => x.Lastname, changeNameRequest["lastname"].ToString()) ); - _logger.LogAudit($"{account.lastname}, {account.firstname} changed their name to {changeNameRequest["lastname"]}, {changeNameRequest["firstname"]}"); - _accountEventBus.Send(_accountService.Data.GetSingle(account.id)); + _logger.LogAudit($"{account.Lastname}, {account.Firstname} changed their name to {changeNameRequest["lastname"]}, {changeNameRequest["firstname"]}"); + _accountEventBus.Send(_accountContext.GetSingle(account.Id)); return Ok(); } [HttpPut("password"), Authorize] public async Task ChangePassword([FromBody] JObject changePasswordRequest) { string contextId = _httpContextService.GetUserId(); - await _accountService.Data.Update(contextId, "password", BCrypt.Net.BCrypt.HashPassword(changePasswordRequest["password"].ToString())); + await _accountContext.Update(contextId, "password", BCrypt.Net.BCrypt.HashPassword(changePasswordRequest["password"].ToString())); _logger.LogAudit($"Password changed for {contextId}"); return Ok(); } [HttpPost("updatesetting/{id}"), Authorize] - public async Task UpdateSetting(string id, [FromBody] JObject body) { - Account account = string.IsNullOrEmpty(id) ? _accountService.GetUserAccount() : _accountService.Data.GetSingle(id); - await _accountService.Data.Update(account.id, $"settings.{body["name"]}", body["value"]); - _logger.LogAudit($"Setting {body["name"]} updated for {account.id} from {account.settings.GetAttribute(body["name"].ToString())} to {body["value"]}"); + public async Task UpdateSetting(string id, [FromBody] AccountSettings settings) { + Account account = string.IsNullOrEmpty(id) ? _accountService.GetUserAccount() : _accountContext.GetSingle(id); + await _accountContext.Update(account.Id, Builders.Update.Set(x => x.Settings, settings)); + _logger.LogAudit($"Account settings updated: {account.Settings.Changes(settings)}"); return Ok(); } @@ -199,15 +203,15 @@ public IActionResult Test() { private PublicAccount PubliciseAccount(Account account) { PublicAccount publicAccount = account.ToPublicAccount(); - publicAccount.displayName = _displayNameService.GetDisplayName(account); + publicAccount.DisplayName = _displayNameService.GetDisplayName(account); return publicAccount; } private async Task SendConfirmationCode(Account account) { - string code = await _confirmationCodeService.CreateConfirmationCode(account.email); + string code = await _confirmationCodeService.CreateConfirmationCode(account.Email); string htmlContent = $"Your email was given for an application to join UKSF
Copy this code to your clipboard and return to the UKSF website application page to enter the code:

{code}


If this request was not made by you, please contact an admin

"; - _emailService.SendEmail(account.email, "UKSF Email Confirmation", htmlContent); + _emailService.SendEmail(account.Email, "UKSF Email Confirmation", htmlContent); } } } diff --git a/UKSF.Api.Personnel/Controllers/ApplicationsController.cs b/UKSF.Api.Personnel/Controllers/ApplicationsController.cs index 66785fdc..69708203 100644 --- a/UKSF.Api.Personnel/Controllers/ApplicationsController.cs +++ b/UKSF.Api.Personnel/Controllers/ApplicationsController.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; @@ -15,85 +16,104 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class ApplicationsController : Controller { - private readonly IAccountService accountService; - private readonly IAssignmentService assignmentService; - private readonly ICommentThreadService commentThreadService; - private readonly IDisplayNameService displayNameService; - private readonly ILogger logger; - private readonly INotificationsService notificationsService; - private readonly IRecruitmentService recruitmentService; - + private readonly IAccountContext _accountContext; + private readonly IAccountService _accountService; + private readonly IAssignmentService _assignmentService; + private readonly ICommentThreadContext _commentThreadContext; + private readonly IDisplayNameService _displayNameService; + private readonly ILogger _logger; + private readonly INotificationsService _notificationsService; + private readonly IRecruitmentService _recruitmentService; public ApplicationsController( + IAccountContext accountContext, + ICommentThreadContext commentThreadContext, IRecruitmentService recruitmentService, IAssignmentService assignmentService, IAccountService accountService, - ICommentThreadService commentThreadService, INotificationsService notificationsService, IDisplayNameService displayNameService, ILogger logger ) { - this.assignmentService = assignmentService; - this.recruitmentService = recruitmentService; - - this.accountService = accountService; - this.commentThreadService = commentThreadService; - this.notificationsService = notificationsService; - this.displayNameService = displayNameService; - this.logger = logger; + _accountContext = accountContext; + _commentThreadContext = commentThreadContext; + _assignmentService = assignmentService; + _recruitmentService = recruitmentService; + _accountService = accountService; + _notificationsService = notificationsService; + _displayNameService = displayNameService; + _logger = logger; } [HttpPost, Authorize, Permissions(Permissions.CONFIRMED)] public async Task Post([FromBody] JObject body) { - Account account = accountService.GetUserAccount(); + Account account = _accountService.GetUserAccount(); await Update(body, account); - CommentThread recruiterCommentThread = new CommentThread {authors = recruitmentService.GetRecruiterLeads().Values.ToArray(), mode = ThreadMode.RECRUITER}; - CommentThread applicationCommentThread = new CommentThread {authors = new[] {account.id}, mode = ThreadMode.RECRUITER}; - await commentThreadService.Data.Add(recruiterCommentThread); - await commentThreadService.Data.Add(applicationCommentThread); - Application application = new Application { - dateCreated = DateTime.Now, - state = ApplicationState.WAITING, - recruiter = recruitmentService.GetRecruiter(), - recruiterCommentThread = recruiterCommentThread.id, - applicationCommentThread = applicationCommentThread.id + CommentThread recruiterCommentThread = new() { Authors = _recruitmentService.GetRecruiterLeads().Values.ToArray(), Mode = ThreadMode.RECRUITER }; + CommentThread applicationCommentThread = new() { Authors = new[] { account.Id }, Mode = ThreadMode.RECRUITER }; + await _commentThreadContext.Add(recruiterCommentThread); + await _commentThreadContext.Add(applicationCommentThread); + Application application = new() { + DateCreated = DateTime.Now, + State = ApplicationState.WAITING, + Recruiter = _recruitmentService.GetRecruiter(), + RecruiterCommentThread = recruiterCommentThread.Id, + ApplicationCommentThread = applicationCommentThread.Id }; - await accountService.Data.Update(account.id, Builders.Update.Set(x => x.application, application)); - account = accountService.Data.GetSingle(account.id); - Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, "", "Applicant", "Candidate", reason: "you were entered into the recruitment process"); - notificationsService.Add(notification); - notificationsService.Add(new Notification {owner = application.recruiter, icon = NotificationIcons.APPLICATION, message = $"You have been assigned {account.firstname} {account.lastname}'s application", link = $"/recruitment/{account.id}"}); - foreach (string id in recruitmentService.GetRecruiterLeads().Values.Where(x => account.application.recruiter != x)) { - notificationsService.Add( - new Notification {owner = id, icon = NotificationIcons.APPLICATION, message = $"{displayNameService.GetDisplayName(account.application.recruiter)} has been assigned {account.firstname} {account.lastname}'s application", link = $"/recruitment/{account.id}"} + await _accountContext.Update(account.Id, Builders.Update.Set(x => x.Application, application)); + account = _accountContext.GetSingle(account.Id); + Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, "", "Applicant", "Candidate", reason: "you were entered into the recruitment process"); + _notificationsService.Add(notification); + _notificationsService.Add( + new Notification { + Owner = application.Recruiter, + Icon = NotificationIcons.APPLICATION, + Message = $"You have been assigned {account.Firstname} {account.Lastname}'s application", + Link = $"/recruitment/{account.Id}" + } + ); + foreach (string id in _recruitmentService.GetRecruiterLeads().Values.Where(x => account.Application.Recruiter != x)) { + _notificationsService.Add( + new Notification { + Owner = id, + Icon = NotificationIcons.APPLICATION, + Message = $"{_displayNameService.GetDisplayName(account.Application.Recruiter)} has been assigned {account.Firstname} {account.Lastname}'s application", + Link = $"/recruitment/{account.Id}" + } ); } - logger.LogAudit($"Application submitted for {account.id}. Assigned to {displayNameService.GetDisplayName(account.application.recruiter)}"); + _logger.LogAudit($"Application submitted for {account.Id}. Assigned to {_displayNameService.GetDisplayName(account.Application.Recruiter)}"); return Ok(); } [HttpPost("update"), Authorize, Permissions(Permissions.CONFIRMED)] public async Task PostUpdate([FromBody] JObject body) { - Account account = accountService.GetUserAccount(); + Account account = _accountService.GetUserAccount(); await Update(body, account); - notificationsService.Add(new Notification {owner = account.application.recruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname} updated their application", link = $"/recruitment/{account.id}"}); - string difference = account.Changes(accountService.Data.GetSingle(account.id)); - logger.LogAudit($"Application updated for {account.id}: {difference}"); + _notificationsService.Add( + new Notification { + Owner = account.Application.Recruiter, + Icon = NotificationIcons.APPLICATION, + Message = $"{account.Firstname} {account.Lastname} updated their application", + Link = $"/recruitment/{account.Id}" + } + ); + string difference = account.Changes(_accountContext.GetSingle(account.Id)); + _logger.LogAudit($"Application updated for {account.Id}: {difference}"); return Ok(); } private async Task Update(JObject body, Account account) { - await accountService.Data - .Update( - account.id, - Builders.Update.Set(x => x.armaExperience, body["armaExperience"].ToString()) - .Set(x => x.unitsExperience, body["unitsExperience"].ToString()) - .Set(x => x.background, body["background"].ToString()) - .Set(x => x.militaryExperience, string.Equals(body["militaryExperience"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) - .Set(x => x.rolePreferences, body["rolePreferences"].ToObject>()) - .Set(x => x.reference, body["reference"].ToString()) - ); + await _accountContext.Update( + account.Id, + Builders.Update.Set(x => x.ArmaExperience, body["armaExperience"].ToString()) + .Set(x => x.UnitsExperience, body["unitsExperience"].ToString()) + .Set(x => x.Background, body["background"].ToString()) + .Set(x => x.MilitaryExperience, string.Equals(body["militaryExperience"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) + .Set(x => x.RolePreferences, body["rolePreferences"].ToObject>()) + .Set(x => x.Reference, body["reference"].ToString()) + ); } } } diff --git a/UKSF.Api.Personnel/Controllers/CommentThreadController.cs b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs index cd22f836..fbf5d3c8 100644 --- a/UKSF.Api.Personnel/Controllers/CommentThreadController.cs +++ b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Bson; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; @@ -13,38 +14,50 @@ namespace UKSF.Api.Personnel.Controllers { [Route("commentthread"), Permissions(Permissions.CONFIRMED, Permissions.MEMBER, Permissions.DISCHARGED)] public class CommentThreadController : Controller { - private readonly IAccountService accountService; - private readonly ICommentThreadService commentThreadService; - private readonly IDisplayNameService displayNameService; - private readonly INotificationsService notificationsService; - private readonly IHttpContextService httpContextService; - private readonly IRanksService ranksService; - private readonly IRecruitmentService recruitmentService; + private readonly IAccountContext _accountContext; + private readonly IAccountService _accountService; + private readonly ICommentThreadContext _commentThreadContext; + private readonly ICommentThreadService _commentThreadService; + private readonly IDisplayNameService _displayNameService; + private readonly IHttpContextService _httpContextService; + private readonly INotificationsService _notificationsService; + private readonly IRanksService _ranksService; + private readonly IRecruitmentService _recruitmentService; - - public CommentThreadController(ICommentThreadService commentThreadService, IRanksService ranksService, IAccountService accountService, IDisplayNameService displayNameService, IRecruitmentService recruitmentService, INotificationsService notificationsService, IHttpContextService httpContextService) { - this.commentThreadService = commentThreadService; - - this.ranksService = ranksService; - this.accountService = accountService; - this.displayNameService = displayNameService; - this.recruitmentService = recruitmentService; - this.notificationsService = notificationsService; - this.httpContextService = httpContextService; + public CommentThreadController( + IAccountContext accountContext, + ICommentThreadContext commentThreadContext, + ICommentThreadService commentThreadService, + IRanksService ranksService, + IAccountService accountService, + IDisplayNameService displayNameService, + IRecruitmentService recruitmentService, + INotificationsService notificationsService, + IHttpContextService httpContextService + ) { + _accountContext = accountContext; + _commentThreadContext = commentThreadContext; + _commentThreadService = commentThreadService; + _ranksService = ranksService; + _accountService = accountService; + _displayNameService = displayNameService; + _recruitmentService = recruitmentService; + _notificationsService = notificationsService; + _httpContextService = httpContextService; } [HttpGet("{id}"), Authorize] public IActionResult Get(string id) { - IEnumerable comments = commentThreadService.GetCommentThreadComments(id); + IEnumerable comments = _commentThreadService.GetCommentThreadComments(id); return Ok( new { comments = comments.Select( comment => new { - Id = comment.id.ToString(), - Author = comment.author.ToString(), - DisplayName = displayNameService.GetDisplayName(accountService.Data.GetSingle(comment.author)), - Content = comment.content, - Timestamp = comment.timestamp + Id = comment.Id.ToString(), + Author = comment.Author.ToString(), + DisplayName = _displayNameService.GetDisplayName(_accountContext.GetSingle(comment.Author)), + comment.Content, + comment.Timestamp } ) } @@ -53,35 +66,35 @@ public IActionResult Get(string id) { [HttpGet("canpost/{id}"), Authorize] public IActionResult GetCanPostComment(string id) { - CommentThread commentThread = commentThreadService.Data.GetSingle(id); - Account account = accountService.GetUserAccount(); - bool admin = httpContextService.UserHasPermission(Permissions.ADMIN); - bool canPost = commentThread.mode switch { - ThreadMode.RECRUITER => commentThread.authors.Any(x => x == httpContextService.GetUserId()) || admin || recruitmentService.IsRecruiter(accountService.GetUserAccount()), - ThreadMode.RANKSUPERIOR => commentThread.authors.Any(x => admin || ranksService.IsSuperior(account.rank, accountService.Data.GetSingle(x).rank)), - ThreadMode.RANKEQUAL => commentThread.authors.Any(x => admin || ranksService.IsEqual(account.rank, accountService.Data.GetSingle(x).rank)), - ThreadMode.RANKSUPERIOROREQUAL => commentThread.authors.Any(x => admin || ranksService.IsSuperiorOrEqual(account.rank, accountService.Data.GetSingle(x).rank)), - _ => true + CommentThread commentThread = _commentThreadContext.GetSingle(id); + Account account = _accountService.GetUserAccount(); + bool admin = _httpContextService.UserHasPermission(Permissions.ADMIN); + bool canPost = commentThread.Mode switch { + ThreadMode.RECRUITER => commentThread.Authors.Any(x => x == _httpContextService.GetUserId()) || admin || _recruitmentService.IsRecruiter(_accountService.GetUserAccount()), + ThreadMode.RANKSUPERIOR => commentThread.Authors.Any(x => admin || _ranksService.IsSuperior(account.Rank, _accountContext.GetSingle(x).Rank)), + ThreadMode.RANKEQUAL => commentThread.Authors.Any(x => admin || _ranksService.IsEqual(account.Rank, _accountContext.GetSingle(x).Rank)), + ThreadMode.RANKSUPERIOROREQUAL => commentThread.Authors.Any(x => admin || _ranksService.IsSuperiorOrEqual(account.Rank, _accountContext.GetSingle(x).Rank)), + _ => true }; - return Ok(new {canPost}); + return Ok(new { canPost }); } [HttpPut("{id}"), Authorize] public async Task AddComment(string id, [FromBody] Comment comment) { - comment.id = ObjectId.GenerateNewId().ToString(); - comment.timestamp = DateTime.Now; - comment.author = httpContextService.GetUserId(); - await commentThreadService.InsertComment(id, comment); - CommentThread thread = commentThreadService.Data.GetSingle(id); - IEnumerable participants = commentThreadService.GetCommentThreadParticipants(thread.id); - foreach (string objectId in participants.Where(x => x != comment.author)) { - notificationsService.Add( // TODO: Set correct link when comment thread is between /application and /recruitment/id + comment.Id = ObjectId.GenerateNewId().ToString(); + comment.Timestamp = DateTime.Now; + comment.Author = _httpContextService.GetUserId(); + await _commentThreadService.InsertComment(id, comment); + CommentThread thread = _commentThreadContext.GetSingle(id); + IEnumerable participants = _commentThreadService.GetCommentThreadParticipants(thread.Id); + foreach (string objectId in participants.Where(x => x != comment.Author)) { + _notificationsService.Add( // TODO: Set correct link when comment thread is between /application and /recruitment/id new Notification { - owner = objectId, - icon = NotificationIcons.COMMENT, - message = $"{displayNameService.GetDisplayName(comment.author)} replied to a comment:\n\"{comment.content}\"", - link = HttpContext.Request.Headers["Referer"].ToString().Replace("http://localhost:4200", "").Replace("https://www.uk-sf.co.uk", "").Replace("https://uk-sf.co.uk", "") + Owner = objectId, + Icon = NotificationIcons.COMMENT, + Message = $"{_displayNameService.GetDisplayName(comment.Author)} replied to a comment:\n\"{comment.Content}\"", + Link = HttpContext.Request.Headers["Referer"].ToString().Replace("http://localhost:4200", "").Replace("https://www.uk-sf.co.uk", "").Replace("https://uk-sf.co.uk", "") } ); } @@ -91,9 +104,9 @@ public async Task AddComment(string id, [FromBody] Comment commen [HttpPost("{id}/{commentId}"), Authorize] public async Task DeleteComment(string id, string commentId) { - List comments = commentThreadService.GetCommentThreadComments(id).ToList(); - Comment comment = comments.FirstOrDefault(x => x.id == commentId); - await commentThreadService.RemoveComment(id, comment); + List comments = _commentThreadService.GetCommentThreadComments(id).ToList(); + Comment comment = comments.FirstOrDefault(x => x.Id == commentId); + await _commentThreadService.RemoveComment(id, comment); return Ok(); } } diff --git a/UKSF.Api.Personnel/Controllers/CommunicationsController.cs b/UKSF.Api.Personnel/Controllers/CommunicationsController.cs index baeaa86e..cec6e76b 100644 --- a/UKSF.Api.Personnel/Controllers/CommunicationsController.cs +++ b/UKSF.Api.Personnel/Controllers/CommunicationsController.cs @@ -6,6 +6,7 @@ using MongoDB.Driver; using Newtonsoft.Json.Linq; using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; @@ -15,13 +16,22 @@ namespace UKSF.Api.Personnel.Controllers { // TODO: Needs to be renamed and singled out. Won't be any other communication connections to add [Route("[controller]")] public class CommunicationsController : Controller { + private readonly IAccountContext _accountContext; + private readonly IEventBus _accountEventBus; private readonly IAccountService _accountService; private readonly IConfirmationCodeService _confirmationCodeService; private readonly ILogger _logger; - private readonly IEventBus _accountEventBus; private readonly INotificationsService _notificationsService; - public CommunicationsController(IConfirmationCodeService confirmationCodeService, IAccountService accountService, INotificationsService notificationsService, ILogger logger, IEventBus accountEventBus) { + public CommunicationsController( + IAccountContext accountContext, + IConfirmationCodeService confirmationCodeService, + IAccountService accountService, + INotificationsService notificationsService, + ILogger logger, + IEventBus accountEventBus + ) { + _accountContext = accountContext; _confirmationCodeService = confirmationCodeService; _accountService = accountService; _notificationsService = notificationsService; @@ -30,7 +40,7 @@ public CommunicationsController(IConfirmationCodeService confirmationCodeService } [HttpGet, Authorize] - public IActionResult GetTeamspeakStatus() => Ok(new { isConnected = _accountService.GetUserAccount().teamspeakIdentities?.Count > 0 }); + public IActionResult GetTeamspeakStatus() => Ok(new { isConnected = _accountService.GetUserAccount().TeamspeakIdentities?.Count > 0 }); [HttpPost("send"), Authorize] public async Task SendCode([FromBody] JObject body) { @@ -84,22 +94,22 @@ private async Task SendTeamspeakCode(string teamspeakDbId) { } private async Task ReceiveTeamspeakCode(string id, string code, string checkId) { - Account account = _accountService.Data.GetSingle(id); + Account account = _accountContext.GetSingle(id); string teamspeakId = await _confirmationCodeService.GetConfirmationCode(code); if (string.IsNullOrWhiteSpace(teamspeakId) || teamspeakId != checkId) { return BadRequest(new { error = "The confirmation code has expired or is invalid. Please try again" }); } - account.teamspeakIdentities ??= new HashSet(); - account.teamspeakIdentities.Add(double.Parse(teamspeakId)); - await _accountService.Data.Update(account.id, Builders.Update.Set("teamspeakIdentities", account.teamspeakIdentities)); - account = _accountService.Data.GetSingle(account.id); + account.TeamspeakIdentities ??= new HashSet(); + account.TeamspeakIdentities.Add(double.Parse(teamspeakId)); + await _accountContext.Update(account.Id, Builders.Update.Set("teamspeakIdentities", account.TeamspeakIdentities)); + account = _accountContext.GetSingle(account.Id); _accountEventBus.Send(account); _notificationsService.SendTeamspeakNotification( new HashSet { teamspeakId.ToDouble() }, - $"This teamspeak identity has been linked to the account with email '{account.email}'\nIf this was not done by you, please contact an admin" + $"This teamspeak identity has been linked to the account with email '{account.Email}'\nIf this was not done by you, please contact an admin" ); - _logger.LogAudit($"Teamspeak ID {teamspeakId} added for {account.id}"); + _logger.LogAudit($"Teamspeak ID {teamspeakId} added for {account.Id}"); return Ok(); } } diff --git a/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs b/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs index 306ddaf7..0854704d 100644 --- a/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs +++ b/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs @@ -4,6 +4,7 @@ using MongoDB.Driver; using Newtonsoft.Json.Linq; using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; @@ -12,27 +13,26 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class DiscordCodeController : Controller { + private readonly IAccountContext _accountContext; private readonly IEventBus _accountEventBus; - private readonly IAccountService _accountService; private readonly IConfirmationCodeService _confirmationCodeService; private readonly IHttpContextService _httpContextService; private readonly ILogger _logger; public DiscordCodeController( + IAccountContext accountContext, IConfirmationCodeService confirmationCodeService, - IAccountService accountService, IHttpContextService httpContextService, IEventBus accountEventBus, ILogger logger ) { + _accountContext = accountContext; _confirmationCodeService = confirmationCodeService; - _accountService = accountService; _httpContextService = httpContextService; _accountEventBus = accountEventBus; _logger = logger; } - // TODO: Could use an account data update event handler [HttpPost("{discordId}"), Authorize] public async Task DiscordConnect(string discordId, [FromBody] JObject body) { string value = await _confirmationCodeService.GetConfirmationCode(body["code"].ToString()); @@ -41,10 +41,10 @@ public async Task DiscordConnect(string discordId, [FromBody] JOb } string id = _httpContextService.GetUserId(); - await _accountService.Data.Update(id, Builders.Update.Set(x => x.discordId, discordId)); - Account account = _accountService.Data.GetSingle(id); + await _accountContext.Update(id, Builders.Update.Set(x => x.DiscordId, discordId)); + Account account = _accountContext.GetSingle(id); _accountEventBus.Send(account); - _logger.LogAudit($"DiscordID updated for {account.id} to {discordId}"); + _logger.LogAudit($"DiscordID updated for {account.Id} to {discordId}"); return Ok(); } } diff --git a/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs b/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs index 48e8f5b4..13d2a6e4 100644 --- a/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs +++ b/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs @@ -16,55 +16,61 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class DiscordConnectionController : Controller { - private readonly string botToken; - private readonly string clientId; - private readonly string clientSecret; + private readonly string _botToken; + private readonly string _clientId; + private readonly string _clientSecret; - private readonly IConfirmationCodeService confirmationCodeService; - private readonly IVariablesService variablesService; - private readonly ILogger logger; - private readonly string url; - private readonly string urlReturn; + private readonly IConfirmationCodeService _confirmationCodeService; + private readonly ILogger _logger; + private readonly string _url; + private readonly string _urlReturn; + private readonly IVariablesService _variablesService; - public DiscordConnectionController(IConfirmationCodeService confirmationCodeService, IConfiguration configuration, IHostEnvironment currentEnvironment, IVariablesService variablesService, ILogger logger) { - this.confirmationCodeService = confirmationCodeService; - this.variablesService = variablesService; - this.logger = logger; - clientId = configuration.GetSection("Discord")["clientId"]; - clientSecret = configuration.GetSection("Discord")["clientSecret"]; - botToken = configuration.GetSection("Discord")["botToken"]; + public DiscordConnectionController( + IConfirmationCodeService confirmationCodeService, + IConfiguration configuration, + IHostEnvironment currentEnvironment, + IVariablesService variablesService, + ILogger logger + ) { + _confirmationCodeService = confirmationCodeService; + _variablesService = variablesService; + _logger = logger; + _clientId = configuration.GetSection("Discord")["clientId"]; + _clientSecret = configuration.GetSection("Discord")["clientSecret"]; + _botToken = configuration.GetSection("Discord")["botToken"]; - url = currentEnvironment.IsDevelopment() ? "http://localhost:5000" : "https://api.uk-sf.co.uk"; - urlReturn = currentEnvironment.IsDevelopment() ? "http://localhost:4200" : "https://uk-sf.co.uk"; + _url = currentEnvironment.IsDevelopment() ? "http://localhost:5000" : "https://api.uk-sf.co.uk"; + _urlReturn = currentEnvironment.IsDevelopment() ? "http://localhost:4200" : "https://uk-sf.co.uk"; } [HttpGet] public IActionResult Get() => Redirect( - $"https://discord.com/api/oauth2/authorize?client_id={clientId}&redirect_uri={HttpUtility.UrlEncode($"{url}/discordconnection/success")}&response_type=code&scope=identify%20guilds.join" + $"https://discord.com/api/oauth2/authorize?client_id={_clientId}&redirect_uri={HttpUtility.UrlEncode($"{_url}/discordconnection/success")}&response_type=code&scope=identify%20guilds.join" ); [HttpGet("application")] public IActionResult GetFromApplication() => Redirect( - $"https://discord.com/api/oauth2/authorize?client_id={clientId}&redirect_uri={HttpUtility.UrlEncode($"{url}/discordconnection/success/application")}&response_type=code&scope=identify%20guilds.join" + $"https://discord.com/api/oauth2/authorize?client_id={_clientId}&redirect_uri={HttpUtility.UrlEncode($"{_url}/discordconnection/success/application")}&response_type=code&scope=identify%20guilds.join" ); [HttpGet("success")] - public async Task Success([FromQuery] string code) => Redirect($"{urlReturn}/profile?{await GetUrlParameters(code, $"{url}/discordconnection/success")}"); + public async Task Success([FromQuery] string code) => Redirect($"{_urlReturn}/profile?{await GetUrlParameters(code, $"{_url}/discordconnection/success")}"); [HttpGet("success/application")] public async Task SuccessFromApplication([FromQuery] string code) => - Redirect($"{urlReturn}/application?{await GetUrlParameters(code, $"{url}/discordconnection/success/application")}"); + Redirect($"{_urlReturn}/application?{await GetUrlParameters(code, $"{_url}/discordconnection/success/application")}"); private async Task GetUrlParameters(string code, string redirectUrl) { - using HttpClient client = new HttpClient(); + using HttpClient client = new(); HttpResponseMessage response = await client.PostAsync( "https://discord.com/api/oauth2/token", new FormUrlEncodedContent( new Dictionary { - { "client_id", clientId }, - { "client_secret", clientSecret }, + { "client_id", _clientId }, + { "client_secret", _clientSecret }, { "grant_type", "authorization_code" }, { "code", code }, { "redirect_uri", redirectUrl }, @@ -74,13 +80,13 @@ private async Task GetUrlParameters(string code, string redirectUrl) { ); string result = await response.Content.ReadAsStringAsync(); if (!response.IsSuccessStatusCode) { - logger.LogWarning($"A discord connection request was denied by the user, or an error occurred: {result}"); + _logger.LogWarning($"A discord connection request was denied by the user, or an error occurred: {result}"); return "discordid=fail"; } string token = JObject.Parse(result)["access_token"]?.ToString(); if (string.IsNullOrEmpty(token)) { - logger.LogWarning("A discord connection request failed. Could not get access token"); + _logger.LogWarning("A discord connection request failed. Could not get access token"); return "discordid=fail"; } @@ -90,22 +96,22 @@ private async Task GetUrlParameters(string code, string redirectUrl) { string id = JObject.Parse(result)["id"]?.ToString(); string username = JObject.Parse(result)["username"]?.ToString(); if (string.IsNullOrEmpty(id) || string.IsNullOrEmpty(username)) { - logger.LogWarning($"A discord connection request failed. Could not get username ({username}) or id ({id}) or an error occurred: {result}"); + _logger.LogWarning($"A discord connection request failed. Could not get username ({username}) or id ({id}) or an error occurred: {result}"); return "discordid=fail"; } - client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bot", botToken); + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bot", _botToken); response = await client.PutAsync( - $"https://discord.com/api/guilds/{variablesService.GetVariable("DID_SERVER").AsUlong()}/members/{id}", + $"https://discord.com/api/guilds/{_variablesService.GetVariable("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json") ); string added = "true"; if (!response.IsSuccessStatusCode) { - logger.LogWarning($"Failed to add '{username}' to guild: {response.StatusCode}, {response.Content.ReadAsStringAsync().Result}"); + _logger.LogWarning($"Failed to add '{username}' to guild: {response.StatusCode}, {response.Content.ReadAsStringAsync().Result}"); added = "false"; } - string confirmationCode = await confirmationCodeService.CreateConfirmationCode(id); + string confirmationCode = await _confirmationCodeService.CreateConfirmationCode(id); return $"validation={confirmationCode}&discordid={id}&added={added}"; } } diff --git a/UKSF.Api.Personnel/Controllers/DisplayNameController.cs b/UKSF.Api.Personnel/Controllers/DisplayNameController.cs index 6974a763..18a12f40 100644 --- a/UKSF.Api.Personnel/Controllers/DisplayNameController.cs +++ b/UKSF.Api.Personnel/Controllers/DisplayNameController.cs @@ -4,11 +4,11 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class DisplayNameController : Controller { - private readonly IDisplayNameService displayNameService; + private readonly IDisplayNameService _displayNameService; - public DisplayNameController(IDisplayNameService displayNameService) => this.displayNameService = displayNameService; + public DisplayNameController(IDisplayNameService displayNameService) => _displayNameService = displayNameService; [HttpGet("{id}")] - public IActionResult GetName(string id) => Ok(new {name = displayNameService.GetDisplayName(id)}); + public IActionResult GetName(string id) => Ok(new { name = _displayNameService.GetDisplayName(id) }); } } diff --git a/UKSF.Api.Personnel/Controllers/NotificationsController.cs b/UKSF.Api.Personnel/Controllers/NotificationsController.cs index b2d9bb31..4d5a2135 100644 --- a/UKSF.Api.Personnel/Controllers/NotificationsController.cs +++ b/UKSF.Api.Personnel/Controllers/NotificationsController.cs @@ -9,19 +9,19 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class NotificationsController : Controller { - private readonly INotificationsService notificationsService; + private readonly INotificationsService _notificationsService; - public NotificationsController(INotificationsService notificationsService) => this.notificationsService = notificationsService; + public NotificationsController(INotificationsService notificationsService) => _notificationsService = notificationsService; [HttpGet, Authorize] public IActionResult Get() { - return Ok(notificationsService.GetNotificationsForContext().OrderByDescending(x => x.timestamp)); + return Ok(_notificationsService.GetNotificationsForContext().OrderByDescending(x => x.Timestamp)); } [HttpPost("read"), Authorize] public async Task MarkAsRead([FromBody] JObject jObject) { List ids = JArray.Parse(jObject["notifications"].ToString()).Select(notification => notification["id"].ToString()).ToList(); - await notificationsService.MarkNotificationsAsRead(ids); + await _notificationsService.MarkNotificationsAsRead(ids); return Ok(); } @@ -29,7 +29,7 @@ public async Task MarkAsRead([FromBody] JObject jObject) { public async Task Clear([FromBody] JObject jObject) { JArray clear = JArray.Parse(jObject["clear"].ToString()); List ids = clear.Select(notification => notification["id"].ToString()).ToList(); - await notificationsService.Delete(ids); + await _notificationsService.Delete(ids); return Ok(); } } diff --git a/UKSF.Api.Personnel/Controllers/RanksController.cs b/UKSF.Api.Personnel/Controllers/RanksController.cs index 3fc67dec..737e0cf0 100644 --- a/UKSF.Api.Personnel/Controllers/RanksController.cs +++ b/UKSF.Api.Personnel/Controllers/RanksController.cs @@ -3,35 +3,35 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; -using Notification = UKSF.Api.Personnel.Models.Notification; namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class RanksController : Controller { - private readonly IAccountService accountService; - private readonly IAssignmentService assignmentService; - private readonly INotificationsService notificationsService; - private readonly ILogger logger; - private readonly IRanksService ranksService; + private readonly IAccountContext _accountContext; + private readonly IAssignmentService _assignmentService; + private readonly ILogger _logger; + private readonly INotificationsService _notificationsService; + private readonly IRanksContext _ranksContext; - public RanksController(IRanksService ranksService, IAccountService accountService, IAssignmentService assignmentService, INotificationsService notificationsService, ILogger logger) { - this.ranksService = ranksService; - this.accountService = accountService; - this.assignmentService = assignmentService; - this.notificationsService = notificationsService; - this.logger = logger; + public RanksController(IAccountContext accountContext, IRanksContext ranksContext, IAssignmentService assignmentService, INotificationsService notificationsService, ILogger logger) { + _accountContext = accountContext; + _ranksContext = ranksContext; + _assignmentService = assignmentService; + _notificationsService = notificationsService; + _logger = logger; } [HttpGet, Authorize] - public IActionResult GetRanks() => Ok(ranksService.Data.Get()); + public IActionResult GetRanks() => Ok(_ranksContext.Get()); [HttpGet("{id}"), Authorize] public IActionResult GetRanks(string id) { - Account account = accountService.Data.GetSingle(id); - return Ok(ranksService.Data.Get(x => x.name != account.rank)); + Account account = _accountContext.GetSingle(id); + return Ok(_ranksContext.Get(x => x.Name != account.Rank)); } [HttpPost("{check}"), Authorize] @@ -39,60 +39,65 @@ public IActionResult CheckRank(string check, [FromBody] Rank rank = null) { if (string.IsNullOrEmpty(check)) return Ok(); if (rank != null) { Rank safeRank = rank; - return Ok(ranksService.Data.GetSingle(x => x.id != safeRank.id && (x.name == check || x.teamspeakGroup == check))); + return Ok(_ranksContext.GetSingle(x => x.Id != safeRank.Id && (x.Name == check || x.TeamspeakGroup == check))); } - return Ok(ranksService.Data.GetSingle(x => x.name == check || x.teamspeakGroup == check)); + return Ok(_ranksContext.GetSingle(x => x.Name == check || x.TeamspeakGroup == check)); } [HttpPost, Authorize] public IActionResult CheckRank([FromBody] Rank rank) { - return rank != null ? (IActionResult) Ok(ranksService.Data.GetSingle(x => x.id != rank.id && (x.name == rank.name || x.teamspeakGroup == rank.teamspeakGroup))) : Ok(); + return rank != null ? (IActionResult) Ok(_ranksContext.GetSingle(x => x.Id != rank.Id && (x.Name == rank.Name || x.TeamspeakGroup == rank.TeamspeakGroup))) : Ok(); } [HttpPut, Authorize] public async Task AddRank([FromBody] Rank rank) { - await ranksService.Data.Add(rank); - logger.LogAudit($"Rank added '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}'"); + await _ranksContext.Add(rank); + _logger.LogAudit($"Rank added '{rank.Name}, {rank.Abbreviation}, {rank.TeamspeakGroup}'"); return Ok(); } [HttpPatch, Authorize] public async Task EditRank([FromBody] Rank rank) { - Rank oldRank = ranksService.Data.GetSingle(x => x.id == rank.id); - logger.LogAudit($"Rank updated from '{oldRank.name}, {oldRank.abbreviation}, {oldRank.teamspeakGroup}, {oldRank.discordRoleId}' to '{rank.name}, {rank.abbreviation}, {rank.teamspeakGroup}, {rank.discordRoleId}'"); - await ranksService.Data.Update(rank.id, Builders.Update.Set("name", rank.name).Set("abbreviation", rank.abbreviation).Set("teamspeakGroup", rank.teamspeakGroup).Set("discordRoleId", rank.discordRoleId)); - foreach (Account account in accountService.Data.Get(x => x.rank == oldRank.name)) { + Rank oldRank = _ranksContext.GetSingle(x => x.Id == rank.Id); + _logger.LogAudit( + $"Rank updated from '{oldRank.Name}, {oldRank.Abbreviation}, {oldRank.TeamspeakGroup}, {oldRank.DiscordRoleId}' to '{rank.Name}, {rank.Abbreviation}, {rank.TeamspeakGroup}, {rank.DiscordRoleId}'" + ); + await _ranksContext.Update( + rank.Id, + Builders.Update.Set("name", rank.Name).Set("abbreviation", rank.Abbreviation).Set("teamspeakGroup", rank.TeamspeakGroup).Set("discordRoleId", rank.DiscordRoleId) + ); + foreach (Account account in _accountContext.Get(x => x.Rank == oldRank.Name)) { // TODO: Notify user to update name in TS if rank abbreviate changed - await accountService.Data.Update(account.id, "rank", rank.name); + await _accountContext.Update(account.Id, "rank", rank.Name); } - return Ok(ranksService.Data.Get()); + return Ok(_ranksContext.Get()); } [HttpDelete("{id}"), Authorize] public async Task DeleteRank(string id) { - Rank rank = ranksService.Data.GetSingle(x => x.id == id); - logger.LogAudit($"Rank deleted '{rank.name}'"); - await ranksService.Data.Delete(id); - foreach (Account account in accountService.Data.Get(x => x.rank == rank.name)) { - Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, rankString: AssignmentService.REMOVE_FLAG, reason: $"the '{rank.name}' rank was deleted"); - notificationsService.Add(notification); + Rank rank = _ranksContext.GetSingle(x => x.Id == id); + _logger.LogAudit($"Rank deleted '{rank.Name}'"); + await _ranksContext.Delete(id); + foreach (Account account in _accountContext.Get(x => x.Rank == rank.Name)) { + Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, rankString: AssignmentService.REMOVE_FLAG, reason: $"the '{rank.Name}' rank was deleted"); + _notificationsService.Add(notification); } - return Ok(ranksService.Data.Get()); + return Ok(_ranksContext.Get()); } [HttpPost("order"), Authorize] public async Task UpdateOrder([FromBody] List newRankOrder) { for (int index = 0; index < newRankOrder.Count; index++) { Rank rank = newRankOrder[index]; - if (ranksService.Data.GetSingle(rank.name).order != index) { - await ranksService.Data.Update(rank.id, "order", index); + if (_ranksContext.GetSingle(rank.Name).Order != index) { + await _ranksContext.Update(rank.Id, "order", index); } } - return Ok(ranksService.Data.Get()); + return Ok(_ranksContext.Get()); } } } diff --git a/UKSF.Api.Personnel/Controllers/RecruitmentController.cs b/UKSF.Api.Personnel/Controllers/RecruitmentController.cs index f4bb69b0..5e2bcd61 100644 --- a/UKSF.Api.Personnel/Controllers/RecruitmentController.cs +++ b/UKSF.Api.Personnel/Controllers/RecruitmentController.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; using Newtonsoft.Json.Linq; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; @@ -15,77 +16,92 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class RecruitmentController : Controller { - private readonly IAccountService accountService; - private readonly IAssignmentService assignmentService; - private readonly IDisplayNameService displayNameService; - private readonly INotificationsService notificationsService; - private readonly IHttpContextService httpContextService; - private readonly ILogger logger; - private readonly IRecruitmentService recruitmentService; - - - public RecruitmentController(IAccountService accountService, IRecruitmentService recruitmentService, IAssignmentService assignmentService, IDisplayNameService displayNameService, INotificationsService notificationsService, IHttpContextService httpContextService, ILogger logger) { - this.accountService = accountService; - this.recruitmentService = recruitmentService; - this.assignmentService = assignmentService; - - this.displayNameService = displayNameService; - this.notificationsService = notificationsService; - this.httpContextService = httpContextService; - this.logger = logger; + private readonly IAccountContext _accountContext; + private readonly IAccountService _accountService; + private readonly IAssignmentService _assignmentService; + private readonly IDisplayNameService _displayNameService; + private readonly IHttpContextService _httpContextService; + private readonly ILogger _logger; + private readonly INotificationsService _notificationsService; + private readonly IRecruitmentService _recruitmentService; + + public RecruitmentController( + IAccountContext accountContext, + IAccountService accountService, + IRecruitmentService recruitmentService, + IAssignmentService assignmentService, + IDisplayNameService displayNameService, + INotificationsService notificationsService, + IHttpContextService httpContextService, + ILogger logger + ) { + _accountContext = accountContext; + _accountService = accountService; + _recruitmentService = recruitmentService; + _assignmentService = assignmentService; + _displayNameService = displayNameService; + _notificationsService = notificationsService; + _httpContextService = httpContextService; + _logger = logger; } [HttpGet, Authorize, Permissions(Permissions.RECRUITER)] - public IActionResult GetAll() => Ok(recruitmentService.GetAllApplications()); + public IActionResult GetAll() => Ok(_recruitmentService.GetAllApplications()); [HttpGet("{id}"), Authorize] public IActionResult GetSingle(string id) { - Account account = accountService.Data.GetSingle(id); - return Ok(recruitmentService.GetApplication(account)); + Account account = _accountContext.GetSingle(id); + return Ok(_recruitmentService.GetApplication(account)); } [HttpGet("isrecruiter"), Authorize, Permissions(Permissions.RECRUITER)] - public IActionResult GetIsRecruiter() => Ok(new {recruiter = recruitmentService.IsRecruiter(accountService.GetUserAccount())}); + public IActionResult GetIsRecruiter() => Ok(new { recruiter = _recruitmentService.IsRecruiter(_accountService.GetUserAccount()) }); [HttpGet("stats"), Authorize, Permissions(Permissions.RECRUITER)] public IActionResult GetRecruitmentStats() { - string account = httpContextService.GetUserId(); - List activity = new List(); - foreach (Account recruiterAccount in recruitmentService.GetRecruiters()) { - List recruiterApplications = accountService.Data.Get(x => x.application != null && x.application.recruiter == recruiterAccount.id).ToList(); + string account = _httpContextService.GetUserId(); + List activity = new(); + foreach (Account recruiterAccount in _recruitmentService.GetRecruiters()) { + List recruiterApplications = _accountContext.Get(x => x.Application != null && x.Application.Recruiter == recruiterAccount.Id).ToList(); activity.Add( new { - account = new {recruiterAccount.id, recruiterAccount.settings}, - name = displayNameService.GetDisplayName(recruiterAccount), - active = recruiterApplications.Count(x => x.application.state == ApplicationState.WAITING), - accepted = recruiterApplications.Count(x => x.application.state == ApplicationState.ACCEPTED), - rejected = recruiterApplications.Count(x => x.application.state == ApplicationState.REJECTED) + account = new { id = recruiterAccount.Id, settings = recruiterAccount.Settings }, + name = _displayNameService.GetDisplayName(recruiterAccount), + active = recruiterApplications.Count(x => x.Application.State == ApplicationState.WAITING), + accepted = recruiterApplications.Count(x => x.Application.State == ApplicationState.ACCEPTED), + rejected = recruiterApplications.Count(x => x.Application.State == ApplicationState.REJECTED) } ); } - return Ok(new {activity, yourStats = new {lastMonth = recruitmentService.GetStats(account, true), overall = recruitmentService.GetStats(account, false)}, sr1Stats = new {lastMonth = recruitmentService.GetStats("", true), overall = recruitmentService.GetStats("", false)}}); + return Ok( + new { + activity, + yourStats = new { lastMonth = _recruitmentService.GetStats(account, true), overall = _recruitmentService.GetStats(account, false) }, + sr1Stats = new { lastMonth = _recruitmentService.GetStats("", true), overall = _recruitmentService.GetStats("", false) } + } + ); } [HttpPost("{id}"), Authorize, Permissions(Permissions.RECRUITER)] public async Task UpdateState([FromBody] dynamic body, string id) { ApplicationState updatedState = body.updatedState; - Account account = accountService.Data.GetSingle(id); - if (updatedState == account.application.state) return Ok(); - string sessionId = httpContextService.GetUserId(); - await accountService.Data.Update(id, Builders.Update.Set(x => x.application.state, updatedState)); - logger.LogAudit($"Application state changed for {id} from {account.application.state} to {updatedState}"); + Account account = _accountContext.GetSingle(id); + if (updatedState == account.Application.State) return Ok(); + string sessionId = _httpContextService.GetUserId(); + await _accountContext.Update(id, Builders.Update.Set(x => x.Application.State, updatedState)); + _logger.LogAudit($"Application state changed for {id} from {account.Application.State} to {updatedState}"); switch (updatedState) { case ApplicationState.ACCEPTED: { - await accountService.Data.Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now).Set(x => x.membershipState, MembershipState.MEMBER)); - Notification notification = await assignmentService.UpdateUnitRankAndRole(id, "Basic Training Unit", "Trainee", "Recruit", reason: "your application was accepted"); - notificationsService.Add(notification); + await _accountContext.Update(id, Builders.Update.Set(x => x.Application.DateAccepted, DateTime.Now).Set(x => x.MembershipState, MembershipState.MEMBER)); + Notification notification = await _assignmentService.UpdateUnitRankAndRole(id, "Basic Training Unit", "Trainee", "Recruit", reason: "your application was accepted"); + _notificationsService.Add(notification); break; } case ApplicationState.REJECTED: { - await accountService.Data.Update(id, Builders.Update.Set(x => x.application.dateAccepted, DateTime.Now).Set(x => x.membershipState, MembershipState.CONFIRMED)); - Notification notification = await assignmentService.UpdateUnitRankAndRole( + await _accountContext.Update(id, Builders.Update.Set(x => x.Application.DateAccepted, DateTime.Now).Set(x => x.MembershipState, MembershipState.CONFIRMED)); + Notification notification = await _assignmentService.UpdateUnitRankAndRole( id, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, @@ -93,17 +109,20 @@ public async Task UpdateState([FromBody] dynamic body, string id) "", $"Unfortunately you have not been accepted into our unit, however we thank you for your interest and hope you find a suitable alternative. You can view any comments on your application here: [url]https://uk-sf.co.uk/recruitment/{id}[/url]" ); - notificationsService.Add(notification); + _notificationsService.Add(notification); break; } case ApplicationState.WAITING: { - await accountService.Data.Update(id, Builders.Update.Set(x => x.application.dateCreated, DateTime.Now).Unset(x => x.application.dateAccepted).Set(x => x.membershipState, MembershipState.CONFIRMED)); - Notification notification = await assignmentService.UpdateUnitRankAndRole(id, AssignmentService.REMOVE_FLAG, "Applicant", "Candidate", reason: "your application was reactivated"); - notificationsService.Add(notification); - if (recruitmentService.GetRecruiters().All(x => x.id != account.application.recruiter)) { - string newRecruiterId = recruitmentService.GetRecruiter(); - logger.LogAudit($"Application recruiter for {id} is no longer SR1, reassigning from {account.application.recruiter} to {newRecruiterId}"); - await accountService.Data.Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiterId)); + await _accountContext.Update( + id, + Builders.Update.Set(x => x.Application.DateCreated, DateTime.Now).Unset(x => x.Application.DateAccepted).Set(x => x.MembershipState, MembershipState.CONFIRMED) + ); + Notification notification = await _assignmentService.UpdateUnitRankAndRole(id, AssignmentService.REMOVE_FLAG, "Applicant", "Candidate", reason: "your application was reactivated"); + _notificationsService.Add(notification); + if (_recruitmentService.GetRecruiters().All(x => x.Id != account.Application.Recruiter)) { + string newRecruiterId = _recruitmentService.GetRecruiter(); + _logger.LogAudit($"Application recruiter for {id} is no longer SR1, reassigning from {account.Application.Recruiter} to {newRecruiterId}"); + await _accountContext.Update(id, Builders.Update.Set(x => x.Application.Recruiter, newRecruiterId)); } break; @@ -111,16 +130,28 @@ public async Task UpdateState([FromBody] dynamic body, string id) default: throw new ArgumentOutOfRangeException(); } - account = accountService.Data.GetSingle(id); + account = _accountContext.GetSingle(id); string message = updatedState == ApplicationState.WAITING ? "was reactivated" : $"was {updatedState}"; - if (sessionId != account.application.recruiter) { - notificationsService.Add( - new Notification {owner = account.application.recruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application {message} by {displayNameService.GetDisplayName(accountService.GetUserAccount())}", link = $"/recruitment/{id}"} + if (sessionId != account.Application.Recruiter) { + _notificationsService.Add( + new Notification { + Owner = account.Application.Recruiter, + Icon = NotificationIcons.APPLICATION, + Message = $"{account.Firstname} {account.Lastname}'s application {message} by {_displayNameService.GetDisplayName(_accountService.GetUserAccount())}", + Link = $"/recruitment/{id}" + } ); } - foreach (string value in recruitmentService.GetRecruiterLeads().Values.Where(value => sessionId != value && account.application.recruiter != value)) { - notificationsService.Add(new Notification {owner = value, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application {message} by {displayNameService.GetDisplayName(accountService.GetUserAccount())}", link = $"/recruitment/{id}"}); + foreach (string value in _recruitmentService.GetRecruiterLeads().Values.Where(value => sessionId != value && account.Application.Recruiter != value)) { + _notificationsService.Add( + new Notification { + Owner = value, + Icon = NotificationIcons.APPLICATION, + Message = $"{account.Firstname} {account.Lastname}'s application {message} by {_displayNameService.GetDisplayName(_accountService.GetUserAccount())}", + Link = $"/recruitment/{id}" + } + ); } return Ok(); @@ -128,21 +159,31 @@ public async Task UpdateState([FromBody] dynamic body, string id) [HttpPost("recruiter/{id}"), Authorize, Permissions(Permissions.RECRUITER_LEAD)] public async Task PostReassignment([FromBody] JObject newRecruiter, string id) { - if (!httpContextService.UserHasPermission(Permissions.ADMIN) && !recruitmentService.IsRecruiterLead()) throw new Exception($"attempted to assign recruiter to {newRecruiter}. Context is not recruitment lead."); + if (!_httpContextService.UserHasPermission(Permissions.ADMIN) && !_recruitmentService.IsRecruiterLead()) { + throw new Exception($"attempted to assign recruiter to {newRecruiter}. Context is not recruitment lead."); + } + string recruiter = newRecruiter["newRecruiter"].ToString(); - await recruitmentService.SetRecruiter(id, recruiter); - Account account = accountService.Data.GetSingle(id); - if (account.application.state == ApplicationState.WAITING) { - notificationsService.Add(new Notification {owner = recruiter, icon = NotificationIcons.APPLICATION, message = $"{account.firstname} {account.lastname}'s application has been transferred to you", link = $"/recruitment/{account.id}"}); + await _recruitmentService.SetRecruiter(id, recruiter); + Account account = _accountContext.GetSingle(id); + if (account.Application.State == ApplicationState.WAITING) { + _notificationsService.Add( + new Notification { + Owner = recruiter, + Icon = NotificationIcons.APPLICATION, + Message = $"{account.Firstname} {account.Lastname}'s application has been transferred to you", + Link = $"/recruitment/{account.Id}" + } + ); } - logger.LogAudit($"Application recruiter changed for {id} to {newRecruiter["newRecruiter"]}"); + _logger.LogAudit($"Application recruiter changed for {id} to {newRecruiter["newRecruiter"]}"); return Ok(); } [HttpPost("ratings/{id}"), Authorize, Permissions(Permissions.RECRUITER)] public async Task> Ratings([FromBody] KeyValuePair value, string id) { - Dictionary ratings = accountService.Data.GetSingle(id).application.ratings; + Dictionary ratings = _accountContext.GetSingle(id).Application.Ratings; (string key, uint rating) = value; if (ratings.ContainsKey(key)) { @@ -151,11 +192,11 @@ public async Task> Ratings([FromBody] KeyValuePair.Update.Set(x => x.application.ratings, ratings)); + await _accountContext.Update(id, Builders.Update.Set(x => x.Application.Ratings, ratings)); return ratings; } [HttpGet("recruiters"), Authorize, Permissions(Permissions.RECRUITER_LEAD)] - public IActionResult GetRecruiters() => Ok(recruitmentService.GetActiveRecruiters()); + public IActionResult GetRecruiters() => Ok(_recruitmentService.GetActiveRecruiters()); } } diff --git a/UKSF.Api.Personnel/Controllers/RolesController.cs b/UKSF.Api.Personnel/Controllers/RolesController.cs index f8985647..9e2c779b 100644 --- a/UKSF.Api.Personnel/Controllers/RolesController.cs +++ b/UKSF.Api.Personnel/Controllers/RolesController.cs @@ -3,47 +3,56 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; -using Notification = UKSF.Api.Personnel.Models.Notification; -using Unit = UKSF.Api.Personnel.Models.Unit; namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class RolesController : Controller { - private readonly IAccountService accountService; - private readonly IAssignmentService assignmentService; - private readonly INotificationsService notificationsService; - private readonly ILogger logger; - private readonly IRolesService rolesService; - private readonly IUnitsService unitsService; + private readonly IAccountContext _accountContext; + private readonly IAssignmentService _assignmentService; + private readonly ILogger _logger; + private readonly INotificationsService _notificationsService; + private readonly IRolesContext _rolesContext; + private readonly IUnitsContext _unitsContext; + private readonly IUnitsService _unitsService; - public RolesController(IRolesService rolesService, IAccountService accountService, IAssignmentService assignmentService, IUnitsService unitsService, INotificationsService notificationsService, ILogger logger) { - this.rolesService = rolesService; - this.accountService = accountService; - this.assignmentService = assignmentService; - this.unitsService = unitsService; - this.notificationsService = notificationsService; - this.logger = logger; + public RolesController( + IUnitsContext unitsContext, + IRolesContext rolesContext, + IAccountContext accountContext, + IAssignmentService assignmentService, + IUnitsService unitsService, + INotificationsService notificationsService, + ILogger logger + ) { + _unitsContext = unitsContext; + _rolesContext = rolesContext; + _accountContext = accountContext; + _assignmentService = assignmentService; + _unitsService = unitsService; + _notificationsService = notificationsService; + _logger = logger; } [HttpGet, Authorize] public IActionResult GetRoles([FromQuery] string id = "", [FromQuery] string unitId = "") { if (!string.IsNullOrEmpty(id) && !string.IsNullOrEmpty(unitId)) { - Unit unit = unitsService.Data.GetSingle(unitId); - IOrderedEnumerable unitRoles = rolesService.Data.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order); - IEnumerable> existingPairs = unit.roles.Where(x => x.Value == id); - IEnumerable filteredRoles = unitRoles.Where(x => existingPairs.All(y => y.Key != x.name)); + Unit unit = _unitsContext.GetSingle(unitId); + IOrderedEnumerable unitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order); + IEnumerable> existingPairs = unit.Roles.Where(x => x.Value == id); + IEnumerable filteredRoles = unitRoles.Where(x => existingPairs.All(y => y.Key != x.Name)); return Ok(filteredRoles); } if (!string.IsNullOrEmpty(id)) { - Account account = accountService.Data.GetSingle(id); - return Ok(rolesService.Data.Get(x => x.roleType == RoleType.INDIVIDUAL && x.name != account.roleAssignment).OrderBy(x => x.order)); + Account account = _accountContext.GetSingle(id); + return Ok(_rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL && x.Name != account.RoleAssignment).OrderBy(x => x.Order)); } - return Ok(new {individualRoles = rolesService.Data.Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); + return Ok(new { individualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), unitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }); } [HttpPost("{roleType}/{check}"), Authorize] @@ -51,56 +60,56 @@ public IActionResult CheckRole(RoleType roleType, string check, [FromBody] Role if (string.IsNullOrEmpty(check)) return Ok(); if (role != null) { Role safeRole = role; - return Ok(rolesService.Data.GetSingle(x => x.id != safeRole.id && x.roleType == roleType && x.name == check)); + return Ok(_rolesContext.GetSingle(x => x.Id != safeRole.Id && x.RoleType == roleType && x.Name == check)); } - return Ok(rolesService.Data.GetSingle(x => x.roleType == roleType && x.name == check)); + return Ok(_rolesContext.GetSingle(x => x.RoleType == roleType && x.Name == check)); } [HttpPut, Authorize] public async Task AddRole([FromBody] Role role) { - await rolesService.Data.Add(role); - logger.LogAudit($"Role added '{role.name}'"); - return Ok(new {individualRoles = rolesService.Data.Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); + await _rolesContext.Add(role); + _logger.LogAudit($"Role added '{role.Name}'"); + return Ok(new { individualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), unitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }); } [HttpPatch, Authorize] public async Task EditRole([FromBody] Role role) { - Role oldRole = rolesService.Data.GetSingle(x => x.id == role.id); - logger.LogAudit($"Role updated from '{oldRole.name}' to '{role.name}'"); - await rolesService.Data.Update(role.id, "name", role.name); - foreach (Account account in accountService.Data.Get(x => x.roleAssignment == oldRole.name)) { - await accountService.Data.Update(account.id, "roleAssignment", role.name); + Role oldRole = _rolesContext.GetSingle(x => x.Id == role.Id); + _logger.LogAudit($"Role updated from '{oldRole.Name}' to '{role.Name}'"); + await _rolesContext.Update(role.Id, "name", role.Name); + foreach (Account account in _accountContext.Get(x => x.RoleAssignment == oldRole.Name)) { + await _accountContext.Update(account.Id, "roleAssignment", role.Name); } - await unitsService.RenameRole(oldRole.name, role.name); - return Ok(new {individualRoles = rolesService.Data.Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); + await _unitsService.RenameRole(oldRole.Name, role.Name); + return Ok(new { individualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), unitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }); } [HttpDelete("{id}"), Authorize] public async Task DeleteRole(string id) { - Role role = rolesService.Data.GetSingle(x => x.id == id); - logger.LogAudit($"Role deleted '{role.name}'"); - await rolesService.Data.Delete(id); - foreach (Account account in accountService.Data.Get(x => x.roleAssignment == role.name)) { - Notification notification = await assignmentService.UpdateUnitRankAndRole(account.id, role: AssignmentService.REMOVE_FLAG, reason: $"the '{role.name}' role was deleted"); - notificationsService.Add(notification); + Role role = _rolesContext.GetSingle(x => x.Id == id); + _logger.LogAudit($"Role deleted '{role.Name}'"); + await _rolesContext.Delete(id); + foreach (Account account in _accountContext.Get(x => x.RoleAssignment == role.Name)) { + Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, role: AssignmentService.REMOVE_FLAG, reason: $"the '{role.Name}' role was deleted"); + _notificationsService.Add(notification); } - await unitsService.DeleteRole(role.name); - return Ok(new {individualRoles = rolesService.Data.Get(x => x.roleType == RoleType.INDIVIDUAL), unitRoles = rolesService.Data.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)}); + await _unitsService.DeleteRole(role.Name); + return Ok(new { individualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), unitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }); } [HttpPost("order"), Authorize] public async Task UpdateOrder([FromBody] List newRoleOrder) { for (int index = 0; index < newRoleOrder.Count; index++) { Role role = newRoleOrder[index]; - if (rolesService.Data.GetSingle(role.name).order != index) { - await rolesService.Data.Update(role.id, "order", index); + if (_rolesContext.GetSingle(role.Name).Order != index) { + await _rolesContext.Update(role.Id, "order", index); } } - return Ok(rolesService.Data.Get(x => x.roleType == RoleType.UNIT).OrderBy(x => x.order)); + return Ok(_rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order)); } } } diff --git a/UKSF.Api.Personnel/Controllers/SteamCodeController.cs b/UKSF.Api.Personnel/Controllers/SteamCodeController.cs index 8785b65e..2f5d656b 100644 --- a/UKSF.Api.Personnel/Controllers/SteamCodeController.cs +++ b/UKSF.Api.Personnel/Controllers/SteamCodeController.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; @@ -10,31 +11,29 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class SteamCodeController : Controller { - private readonly IAccountService accountService; - private readonly IHttpContextService httpContextService; - private readonly ILogger logger; - private readonly IConfirmationCodeService confirmationCodeService; + private readonly IAccountContext _accountContext; + private readonly IConfirmationCodeService _confirmationCodeService; + private readonly IHttpContextService _httpContextService; + private readonly ILogger _logger; - - public SteamCodeController(IConfirmationCodeService confirmationCodeService, IAccountService accountService, IHttpContextService httpContextService, ILogger logger) { - - this.confirmationCodeService = confirmationCodeService; - this.accountService = accountService; - this.httpContextService = httpContextService; - this.logger = logger; + public SteamCodeController(IAccountContext accountContext, IConfirmationCodeService confirmationCodeService, IHttpContextService httpContextService, ILogger logger) { + _accountContext = accountContext; + _confirmationCodeService = confirmationCodeService; + _httpContextService = httpContextService; + _logger = logger; } [HttpPost("{steamId}"), Authorize] public async Task SteamConnect(string steamId, [FromBody] JObject body) { - string value = await confirmationCodeService.GetConfirmationCode(body["code"].ToString()); + string value = await _confirmationCodeService.GetConfirmationCode(body["code"].ToString()); if (string.IsNullOrEmpty(value) || value != steamId) { - return BadRequest(new {error = "Code was invalid or expired. Please try again"}); + return BadRequest(new { error = "Code was invalid or expired. Please try again" }); } - string id = httpContextService.GetUserId(); - await accountService.Data.Update(id, "steamname", steamId); - Account account = accountService.Data.GetSingle(id); - logger.LogAudit($"SteamID updated for {account.id} to {steamId}"); + string id = _httpContextService.GetUserId(); + await _accountContext.Update(id, "steamname", steamId); + Account account = _accountContext.GetSingle(id); + _logger.LogAudit($"SteamID updated for {account.Id} to {steamId}"); return Ok(); } } diff --git a/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs b/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs index 731627c4..580a2faf 100644 --- a/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs +++ b/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs @@ -7,35 +7,35 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class SteamConnectionController : Controller { - private readonly IConfirmationCodeService confirmationCodeService; - private readonly string url; - private readonly string urlReturn; + private readonly IConfirmationCodeService _confirmationCodeService; + private readonly string _url; + private readonly string _urlReturn; public SteamConnectionController(IConfirmationCodeService confirmationCodeService, IHostEnvironment currentEnvironment) { - this.confirmationCodeService = confirmationCodeService; + _confirmationCodeService = confirmationCodeService; - url = currentEnvironment.IsDevelopment() ? "http://localhost:5000" : "https://api.uk-sf.co.uk"; - urlReturn = currentEnvironment.IsDevelopment() ? "http://localhost:4200" : "https://uk-sf.co.uk"; + _url = currentEnvironment.IsDevelopment() ? "http://localhost:5000" : "https://api.uk-sf.co.uk"; + _urlReturn = currentEnvironment.IsDevelopment() ? "http://localhost:4200" : "https://uk-sf.co.uk"; } [HttpGet] - public IActionResult Get() => Challenge(new AuthenticationProperties { RedirectUri = $"{url}/steamconnection/success" }, "Steam"); + public IActionResult Get() => Challenge(new AuthenticationProperties { RedirectUri = $"{_url}/steamconnection/success" }, "Steam"); [HttpGet("application")] - public IActionResult GetFromApplication() => Challenge(new AuthenticationProperties { RedirectUri = $"{url}/steamconnection/success/application" }, "Steam"); + public IActionResult GetFromApplication() => Challenge(new AuthenticationProperties { RedirectUri = $"{_url}/steamconnection/success/application" }, "Steam"); [HttpGet("success")] - public async Task Success([FromQuery] string id) => Redirect($"{urlReturn}/profile?{await GetUrlParameters(id)}"); + public async Task Success([FromQuery] string id) => Redirect($"{_urlReturn}/profile?{await GetUrlParameters(id)}"); [HttpGet("success/application")] - public async Task SuccessFromApplication([FromQuery] string id) => Redirect($"{urlReturn}/application?{await GetUrlParameters(id)}"); + public async Task SuccessFromApplication([FromQuery] string id) => Redirect($"{_urlReturn}/application?{await GetUrlParameters(id)}"); private async Task GetUrlParameters(string id) { if (string.IsNullOrEmpty(id)) { return "steamid=fail"; } - string code = await confirmationCodeService.CreateConfirmationCode(id); + string code = await _confirmationCodeService.CreateConfirmationCode(id); return $"validation={code}&steamid={id}"; } } diff --git a/UKSF.Api.Personnel/Controllers/UnitsController.cs b/UKSF.Api.Personnel/Controllers/UnitsController.cs index 18360b49..3db6366c 100644 --- a/UKSF.Api.Personnel/Controllers/UnitsController.cs +++ b/UKSF.Api.Personnel/Controllers/UnitsController.cs @@ -8,6 +8,7 @@ using MongoDB.Bson; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; @@ -16,8 +17,8 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class UnitsController : Controller { + private readonly IAccountContext _accountContext; private readonly IEventBus _accountEventBus; - private readonly IAccountService _accountService; private readonly IAssignmentService _assignmentService; private readonly IDisplayNameService _displayNameService; private readonly ILogger _logger; @@ -25,10 +26,12 @@ public class UnitsController : Controller { private readonly INotificationsService _notificationsService; private readonly IRanksService _ranksService; private readonly IRolesService _rolesService; + private readonly IUnitsContext _unitsContext; private readonly IUnitsService _unitsService; public UnitsController( - IAccountService accountService, + IAccountContext accountContext, + IUnitsContext unitsContext, IDisplayNameService displayNameService, IRanksService ranksService, IUnitsService unitsService, @@ -39,7 +42,8 @@ public UnitsController( IMapper mapper, ILogger logger ) { - _accountService = accountService; + _accountContext = accountContext; + _unitsContext = unitsContext; _displayNameService = displayNameService; _ranksService = ranksService; _unitsService = unitsService; @@ -55,9 +59,9 @@ ILogger logger public IActionResult Get([FromQuery] string filter = "", [FromQuery] string accountId = "") { if (!string.IsNullOrEmpty(accountId)) { IEnumerable response = filter switch { - "auxiliary" => _unitsService.GetSortedUnits(x => x.branch == UnitBranch.AUXILIARY && x.members.Contains(accountId)), - "available" => _unitsService.GetSortedUnits(x => !x.members.Contains(accountId)), - _ => _unitsService.GetSortedUnits(x => x.members.Contains(accountId)) + "auxiliary" => _unitsService.GetSortedUnits(x => x.Branch == UnitBranch.AUXILIARY && x.Members.Contains(accountId)), + "available" => _unitsService.GetSortedUnits(x => !x.Members.Contains(accountId)), + _ => _unitsService.GetSortedUnits(x => x.Members.Contains(accountId)) }; return Ok(response); } @@ -67,13 +71,13 @@ public IActionResult Get([FromQuery] string filter = "", [FromQuery] string acco [HttpGet("{id}"), Authorize] public IActionResult GetSingle([FromRoute] string id) { - Unit unit = _unitsService.Data.GetSingle(id); + Unit unit = _unitsContext.GetSingle(id); Unit parent = _unitsService.GetParent(unit); // TODO: Use a factory or mapper ResponseUnit response = _mapper.Map(unit); - response.code = _unitsService.GetChainString(unit); - response.parentName = parent?.name; - response.unitMembers = MapUnitMembers(unit); + response.Code = _unitsService.GetChainString(unit); + response.ParentName = parent?.Name; + response.UnitMembers = MapUnitMembers(unit); return Ok(response); } @@ -81,13 +85,13 @@ public IActionResult GetSingle([FromRoute] string id) { public IActionResult GetUnitExists([FromRoute] string check, [FromQuery] string id = "") { if (string.IsNullOrEmpty(check)) Ok(false); - bool exists = _unitsService.Data.GetSingle( - x => (string.IsNullOrEmpty(id) || x.id != id) && - (string.Equals(x.name, check, StringComparison.InvariantCultureIgnoreCase) || - string.Equals(x.shortname, check, StringComparison.InvariantCultureIgnoreCase) || - string.Equals(x.teamspeakGroup, check, StringComparison.InvariantCultureIgnoreCase) || - string.Equals(x.discordRoleId, check, StringComparison.InvariantCultureIgnoreCase) || - string.Equals(x.callsign, check, StringComparison.InvariantCultureIgnoreCase)) + bool exists = _unitsContext.GetSingle( + x => (string.IsNullOrEmpty(id) || x.Id != id) && + (string.Equals(x.Name, check, StringComparison.InvariantCultureIgnoreCase) || + string.Equals(x.Shortname, check, StringComparison.InvariantCultureIgnoreCase) || + string.Equals(x.TeamspeakGroup, check, StringComparison.InvariantCultureIgnoreCase) || + string.Equals(x.DiscordRoleId, check, StringComparison.InvariantCultureIgnoreCase) || + string.Equals(x.Callsign, check, StringComparison.InvariantCultureIgnoreCase)) ) != null; return Ok(exists); @@ -95,50 +99,50 @@ public IActionResult GetUnitExists([FromRoute] string check, [FromQuery] string [HttpGet("tree"), Authorize] public IActionResult GetTree() { - Unit combatRoot = _unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); - Unit auxiliaryRoot = _unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); - ResponseUnitTreeDataSet dataSet = new ResponseUnitTreeDataSet { - combatNodes = new List { new ResponseUnitTree { id = combatRoot.id, name = combatRoot.name, children = GetUnitTreeChildren(combatRoot) } }, - auxiliaryNodes = new List { new ResponseUnitTree { id = auxiliaryRoot.id, name = auxiliaryRoot.name, children = GetUnitTreeChildren(auxiliaryRoot) } } + Unit combatRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); + Unit auxiliaryRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); + ResponseUnitTreeDataSet dataSet = new() { + CombatNodes = new List { new() { Id = combatRoot.Id, Name = combatRoot.Name, Children = GetUnitTreeChildren(combatRoot) } }, + AuxiliaryNodes = new List { new() { Id = auxiliaryRoot.Id, Name = auxiliaryRoot.Name, Children = GetUnitTreeChildren(auxiliaryRoot) } } }; return Ok(dataSet); } // TODO: Use a mapper - private IEnumerable GetUnitTreeChildren(DatabaseObject parentUnit) { - return _unitsService.Data.Get(x => x.parent == parentUnit.id).Select(unit => new ResponseUnitTree { id = unit.id, name = unit.name, children = GetUnitTreeChildren(unit) }); + private IEnumerable GetUnitTreeChildren(MongoObject parentUnit) { + return _unitsContext.Get(x => x.Parent == parentUnit.Id).Select(unit => new ResponseUnitTree { Id = unit.Id, Name = unit.Name, Children = GetUnitTreeChildren(unit) }); } [HttpPost, Authorize] public async Task AddUnit([FromBody] Unit unit) { - await _unitsService.Data.Add(unit); + await _unitsContext.Add(unit); _logger.LogAudit($"New unit added: '{unit}'"); return Ok(); } [HttpPut("{id}"), Authorize] public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit) { - Unit oldUnit = _unitsService.Data.GetSingle(x => x.id == id); - await _unitsService.Data.Replace(unit); - _logger.LogAudit($"Unit '{unit.shortname}' updated: {oldUnit.Changes(unit)}"); + Unit oldUnit = _unitsContext.GetSingle(x => x.Id == id); + await _unitsContext.Replace(unit); + _logger.LogAudit($"Unit '{unit.Shortname}' updated: {oldUnit.Changes(unit)}"); // TODO: Move this elsewhere - unit = _unitsService.Data.GetSingle(unit.id); - if (unit.name != oldUnit.name) { - foreach (Account account in _accountService.Data.Get(x => x.unitAssignment == oldUnit.name)) { - await _accountService.Data.Update(account.id, "unitAssignment", unit.name); + unit = _unitsContext.GetSingle(unit.Id); + if (unit.Name != oldUnit.Name) { + foreach (Account account in _accountContext.Get(x => x.UnitAssignment == oldUnit.Name)) { + await _accountContext.Update(account.Id, "unitAssignment", unit.Name); _accountEventBus.Send(account); } } - if (unit.teamspeakGroup != oldUnit.teamspeakGroup) { - foreach (Account account in unit.members.Select(x => _accountService.Data.GetSingle(x))) { + if (unit.TeamspeakGroup != oldUnit.TeamspeakGroup) { + foreach (Account account in unit.Members.Select(x => _accountContext.GetSingle(x))) { _accountEventBus.Send(account); } } - if (unit.discordRoleId != oldUnit.discordRoleId) { - foreach (Account account in unit.members.Select(x => _accountService.Data.GetSingle(x))) { + if (unit.DiscordRoleId != oldUnit.DiscordRoleId) { + foreach (Account account in unit.Members.Select(x => _accountContext.GetSingle(x))) { _accountEventBus.Send(account); } } @@ -148,38 +152,38 @@ public async Task EditUnit([FromRoute] string id, [FromBody] Unit [HttpDelete("{id}"), Authorize] public async Task DeleteUnit([FromRoute] string id) { - Unit unit = _unitsService.Data.GetSingle(id); - _logger.LogAudit($"Unit deleted '{unit.name}'"); - foreach (Account account in _accountService.Data.Get(x => x.unitAssignment == unit.name)) { - Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.id, "Reserves", reason: $"{unit.name} was deleted"); + Unit unit = _unitsContext.GetSingle(id); + _logger.LogAudit($"Unit deleted '{unit.Name}'"); + foreach (Account account in _accountContext.Get(x => x.UnitAssignment == unit.Name)) { + Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, "Reserves", reason: $"{unit.Name} was deleted"); _notificationsService.Add(notification); } - await _unitsService.Data.Delete(id); + await _unitsContext.Delete(id); return Ok(); } [HttpPatch("{id}/parent"), Authorize] public async Task UpdateParent([FromRoute] string id, [FromBody] RequestUnitUpdateParent unitUpdate) { - Unit unit = _unitsService.Data.GetSingle(id); - Unit parentUnit = _unitsService.Data.GetSingle(unitUpdate.parentId); - if (unit.parent == parentUnit.id) return Ok(); + Unit unit = _unitsContext.GetSingle(id); + Unit parentUnit = _unitsContext.GetSingle(unitUpdate.ParentId); + if (unit.Parent == parentUnit.Id) return Ok(); - await _unitsService.Data.Update(id, "parent", parentUnit.id); - if (unit.branch != parentUnit.branch) { - await _unitsService.Data.Update(id, "branch", parentUnit.branch); + await _unitsContext.Update(id, "parent", parentUnit.Id); + if (unit.Branch != parentUnit.Branch) { + await _unitsContext.Update(id, "branch", parentUnit.Branch); } - List parentChildren = _unitsService.Data.Get(x => x.parent == parentUnit.id).ToList(); - parentChildren.Remove(parentChildren.FirstOrDefault(x => x.id == unit.id)); - parentChildren.Insert(unitUpdate.index, unit); + List parentChildren = _unitsContext.Get(x => x.Parent == parentUnit.Id).ToList(); + parentChildren.Remove(parentChildren.FirstOrDefault(x => x.Id == unit.Id)); + parentChildren.Insert(unitUpdate.Index, unit); foreach (Unit child in parentChildren) { - await _unitsService.Data.Update(child.id, "order", parentChildren.IndexOf(child)); + await _unitsContext.Update(child.Id, "order", parentChildren.IndexOf(child)); } - unit = _unitsService.Data.GetSingle(unit.id); + unit = _unitsContext.GetSingle(unit.Id); foreach (Unit child in _unitsService.GetAllChildren(unit, true)) { - foreach (string accountId in child.members) { + foreach (string accountId in child.Members) { await _assignmentService.UpdateGroupsAndRoles(accountId); } } @@ -189,13 +193,13 @@ public async Task UpdateParent([FromRoute] string id, [FromBody] [HttpPatch("{id}/order"), Authorize] public IActionResult UpdateSortOrder([FromRoute] string id, [FromBody] RequestUnitUpdateOrder unitUpdate) { - Unit unit = _unitsService.Data.GetSingle(id); - Unit parentUnit = _unitsService.Data.GetSingle(x => x.id == unit.parent); - List parentChildren = _unitsService.Data.Get(x => x.parent == parentUnit.id).ToList(); - parentChildren.Remove(parentChildren.FirstOrDefault(x => x.id == unit.id)); - parentChildren.Insert(unitUpdate.index, unit); + Unit unit = _unitsContext.GetSingle(id); + Unit parentUnit = _unitsContext.GetSingle(x => x.Id == unit.Parent); + List parentChildren = _unitsContext.Get(x => x.Parent == parentUnit.Id).ToList(); + parentChildren.Remove(parentChildren.FirstOrDefault(x => x.Id == unit.Id)); + parentChildren.Insert(unitUpdate.Index, unit); foreach (Unit child in parentChildren) { - _unitsService.Data.Update(child.id, "order", parentChildren.IndexOf(child)); + _unitsContext.Update(child.Id, "order", parentChildren.IndexOf(child)); } return Ok(); @@ -206,23 +210,23 @@ public IActionResult UpdateSortOrder([FromRoute] string id, [FromBody] RequestUn public IActionResult GetUnitsChart([FromRoute] string type) { switch (type) { case "combat": - Unit combatRoot = _unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); + Unit combatRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); return Ok( new ResponseUnitChartNode { - id = combatRoot.id, - name = combatRoot.preferShortname ? combatRoot.shortname : combatRoot.name, - members = MapUnitMembers(combatRoot), - children = GetUnitChartChildren(combatRoot.id) + Id = combatRoot.Id, + Name = combatRoot.PreferShortname ? combatRoot.Shortname : combatRoot.Name, + Members = MapUnitMembers(combatRoot), + Children = GetUnitChartChildren(combatRoot.Id) } ); case "auxiliary": - Unit auxiliaryRoot = _unitsService.Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); + Unit auxiliaryRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); return Ok( new ResponseUnitChartNode { - id = auxiliaryRoot.id, - name = auxiliaryRoot.preferShortname ? auxiliaryRoot.shortname : auxiliaryRoot.name, - members = MapUnitMembers(auxiliaryRoot), - children = GetUnitChartChildren(auxiliaryRoot.id) + Id = auxiliaryRoot.Id, + Name = auxiliaryRoot.PreferShortname ? auxiliaryRoot.Shortname : auxiliaryRoot.Name, + Members = MapUnitMembers(auxiliaryRoot), + Children = GetUnitChartChildren(auxiliaryRoot.Id) } ); default: return Ok(); @@ -230,40 +234,40 @@ public IActionResult GetUnitsChart([FromRoute] string type) { } private IEnumerable GetUnitChartChildren(string parent) { - return _unitsService.Data.Get(x => x.parent == parent) + return _unitsContext.Get(x => x.Parent == parent) .Select( unit => new ResponseUnitChartNode { - id = unit.id, name = unit.preferShortname ? unit.shortname : unit.name, members = MapUnitMembers(unit), children = GetUnitChartChildren(unit.id) + Id = unit.Id, Name = unit.PreferShortname ? unit.Shortname : unit.Name, Members = MapUnitMembers(unit), Children = GetUnitChartChildren(unit.Id) } ); } private IEnumerable MapUnitMembers(Unit unit) { - return SortMembers(unit.members, unit).Select(x => MapUnitMember(x, unit)); + return SortMembers(unit.Members, unit).Select(x => MapUnitMember(x, unit)); } private ResponseUnitMember MapUnitMember(Account member, Unit unit) => - new ResponseUnitMember { name = _displayNameService.GetDisplayName(member), role = member.roleAssignment, unitRole = GetRole(unit, member.id) }; + new() { Name = _displayNameService.GetDisplayName(member), Role = member.RoleAssignment, UnitRole = GetRole(unit, member.Id) }; // TODO: Move somewhere else private IEnumerable SortMembers(IEnumerable members, Unit unit) { return members.Select( x => { - Account account = _accountService.Data.GetSingle(x); - return new { account, rankIndex = _ranksService.GetRankOrder(account.rank), roleIndex = _unitsService.GetMemberRoleOrder(account, unit) }; + Account account = _accountContext.GetSingle(x); + return new { account, rankIndex = _ranksService.GetRankOrder(account.Rank), roleIndex = _unitsService.GetMemberRoleOrder(account, unit) }; } ) .OrderByDescending(x => x.roleIndex) .ThenBy(x => x.rankIndex) - .ThenBy(x => x.account.lastname) - .ThenBy(x => x.account.firstname) + .ThenBy(x => x.account.Lastname) + .ThenBy(x => x.account.Firstname) .Select(x => x.account); } private string GetRole(Unit unit, string accountId) => - _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(0).name) ? "1" : - _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(1).name) ? "2" : - _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(2).name) ? "3" : - _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(3).name) ? "N" : ""; + _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(0).Name) ? "1" : + _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(1).Name) ? "2" : + _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(2).Name) ? "3" : + _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(3).Name) ? "N" : ""; } } diff --git a/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs index cf7b5b44..7263e93c 100644 --- a/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs @@ -30,14 +30,14 @@ public void Init() { } private async Task HandleAccountsEvent(DataEventModel dataEventModel) { - if (dataEventModel.type == DataEventType.UPDATE) { - await UpdatedEvent(dataEventModel.id); + if (dataEventModel.Type == DataEventType.UPDATE) { + await UpdatedEvent(dataEventModel.Id); } } private async Task HandleUnitsEvent(DataEventModel dataEventModel) { - if (dataEventModel.type == DataEventType.UPDATE) { - await UpdatedEvent(dataEventModel.id); + if (dataEventModel.Type == DataEventType.UPDATE) { + await UpdatedEvent(dataEventModel.Id); } } diff --git a/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs index 94cb911c..5f58ef87 100644 --- a/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs @@ -15,10 +15,10 @@ namespace UKSF.Api.Personnel.EventHandlers { public interface ICommentThreadEventHandler : IEventHandler { } public class CommentThreadEventHandler : ICommentThreadEventHandler { - private readonly IDataEventBus commentThreadDataEventBus; - private readonly ICommentThreadService commentThreadService; - private readonly IHubContext hub; - private readonly ILogger logger; + private readonly IDataEventBus _commentThreadDataEventBus; + private readonly ICommentThreadService _commentThreadService; + private readonly IHubContext _hub; + private readonly ILogger _logger; public CommentThreadEventHandler( IDataEventBus commentThreadDataEventBus, @@ -26,31 +26,31 @@ public CommentThreadEventHandler( ICommentThreadService commentThreadService, ILogger logger ) { - this.commentThreadDataEventBus = commentThreadDataEventBus; - this.hub = hub; - this.commentThreadService = commentThreadService; - this.logger = logger; + _commentThreadDataEventBus = commentThreadDataEventBus; + _hub = hub; + _commentThreadService = commentThreadService; + _logger = logger; } public void Init() { - commentThreadDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => logger.LogError(exception)); + _commentThreadDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => _logger.LogError(exception)); } private async Task HandleEvent(DataEventModel dataEventModel) { - switch (dataEventModel.type) { + switch (dataEventModel.Type) { case DataEventType.ADD: - await AddedEvent(dataEventModel.id, dataEventModel.data as Comment); + await AddedEvent(dataEventModel.Id, dataEventModel.Data as Comment); break; case DataEventType.DELETE: - await DeletedEvent(dataEventModel.id, dataEventModel.data as Comment); + await DeletedEvent(dataEventModel.Id, dataEventModel.Data as Comment); break; case DataEventType.UPDATE: break; default: throw new ArgumentOutOfRangeException(nameof(dataEventModel)); } } - private Task AddedEvent(string id, Comment comment) => hub.Clients.Group(id).ReceiveComment(commentThreadService.FormatComment(comment)); + private Task AddedEvent(string id, Comment comment) => _hub.Clients.Group(id).ReceiveComment(_commentThreadService.FormatComment(comment)); - private Task DeletedEvent(string id, DatabaseObject comment) => hub.Clients.Group(id).DeleteComment(comment.id); + private Task DeletedEvent(string id, MongoObject comment) => _hub.Clients.Group(id).DeleteComment(comment.Id); } } diff --git a/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs index de01cf7c..339b861c 100644 --- a/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs @@ -12,28 +12,28 @@ namespace UKSF.Api.Personnel.EventHandlers { public interface INotificationsEventHandler : IEventHandler { } public class NotificationsEventHandler : INotificationsEventHandler { - private readonly IHubContext hub; - private readonly ILogger logger; - private readonly IDataEventBus notificationDataEventBus; + private readonly IHubContext _hub; + private readonly ILogger _logger; + private readonly IDataEventBus _notificationDataEventBus; public NotificationsEventHandler(IDataEventBus notificationDataEventBus, IHubContext hub, ILogger logger) { - this.notificationDataEventBus = notificationDataEventBus; - this.hub = hub; - this.logger = logger; + _notificationDataEventBus = notificationDataEventBus; + _hub = hub; + _logger = logger; } public void Init() { - notificationDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => logger.LogError(exception)); + _notificationDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => _logger.LogError(exception)); } private async Task HandleEvent(DataEventModel dataEventModel) { - if (dataEventModel.type == DataEventType.ADD) { - await AddedEvent(dataEventModel.data as Notification); + if (dataEventModel.Type == DataEventType.ADD) { + await AddedEvent(dataEventModel.Data as Notification); } } private async Task AddedEvent(Notification notification) { - await hub.Clients.Group(notification.owner).ReceiveNotification(notification); + await _hub.Clients.Group(notification.Owner).ReceiveNotification(notification); } } } diff --git a/UKSF.Api.Personnel/Extensions/AccountExtensions.cs b/UKSF.Api.Personnel/Extensions/AccountExtensions.cs index 8be201b5..4f9e1d90 100644 --- a/UKSF.Api.Personnel/Extensions/AccountExtensions.cs +++ b/UKSF.Api.Personnel/Extensions/AccountExtensions.cs @@ -6,7 +6,7 @@ public static class AccountExtensions { // TODO: Use automapper public static PublicAccount ToPublicAccount(this Account account) { PublicAccount publicAccount = account.Copy(); - publicAccount.password = null; + publicAccount.Password = null; return publicAccount; } } diff --git a/UKSF.Api.Personnel/Models/Account.cs b/UKSF.Api.Personnel/Models/Account.cs index d608ea91..f9d4c4ef 100644 --- a/UKSF.Api.Personnel/Models/Account.cs +++ b/UKSF.Api.Personnel/Models/Account.cs @@ -3,40 +3,40 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Personnel.Models { - public class Account : DatabaseObject { - public Application application; - public string armaExperience; - public string background; - public string discordId; - public DateTime dob; - public string email; - public string firstname; - public string lastname; - public MembershipState membershipState = MembershipState.UNCONFIRMED; - public bool militaryExperience; - public string nation; - public string password; - public string rank; - public string reference; - public string roleAssignment; - public List rolePreferences = new List(); - public List serviceRecord = new List(); - public AccountSettings settings = new AccountSettings(); - public string steamname; - public HashSet teamspeakIdentities; - public string unitAssignment; - public string unitsExperience; + public record Account : MongoObject { + public Application Application; + public string ArmaExperience; + public string Background; + public string DiscordId; + public DateTime Dob; + public string Email; + public string Firstname; + public string Lastname; + public MembershipState MembershipState = MembershipState.UNCONFIRMED; + public bool MilitaryExperience; + public string Nation; + public string Password; + public string Rank; + public string Reference; + public string RoleAssignment; + public List RolePreferences = new(); + public List ServiceRecord = new(); + public AccountSettings Settings = new(); + public string Steamname; + public HashSet TeamspeakIdentities; + public string UnitAssignment; + public string UnitsExperience; } - public class RosterAccount : DatabaseObject { - public string name; - public string rank; - public string roleAssignment; - public string unitAssignment; - public string nation; + public record RosterAccount : MongoObject { + public string Name; + public string Nation; + public string Rank; + public string RoleAssignment; + public string UnitAssignment; } - public class PublicAccount : Account { - public string displayName; + public record PublicAccount : Account { + public string DisplayName; } } diff --git a/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs b/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs index 80c92eff..e92317e4 100644 --- a/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs +++ b/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs @@ -3,12 +3,12 @@ namespace UKSF.Api.Personnel.Models { public class AccountAttendanceStatus { - [BsonRepresentation(BsonType.ObjectId)] public string accountId; - public float attendancePercent; - public AttendanceState attendanceState; - public string displayName; - [BsonRepresentation(BsonType.ObjectId)] public string groupId; - public string groupName; + [BsonRepresentation(BsonType.ObjectId)] public string AccountId; + public float AttendancePercent; + public AttendanceState AttendanceState; + public string DisplayName; + [BsonRepresentation(BsonType.ObjectId)] public string GroupId; + public string GroupName; } public enum AttendanceState { diff --git a/UKSF.Api.Personnel/Models/AccountSettings.cs b/UKSF.Api.Personnel/Models/AccountSettings.cs index 3e030600..7e0601d4 100644 --- a/UKSF.Api.Personnel/Models/AccountSettings.cs +++ b/UKSF.Api.Personnel/Models/AccountSettings.cs @@ -1,17 +1,7 @@ -using System; -using System.Reflection; - -namespace UKSF.Api.Personnel.Models { +namespace UKSF.Api.Personnel.Models { public class AccountSettings { - public bool errorEmails = false; - public bool notificationsEmail = true; - public bool notificationsTeamspeak = true; - public bool sr1Enabled = true; - - public T GetAttribute(string name) { - FieldInfo setting = typeof(AccountSettings).GetField(name); - if (setting == null) throw new ArgumentException($"Could not find setting with name '{name}'"); - return (T) setting.GetValue(this); - } + public bool NotificationsEmail { get; set; } = true; + public bool NotificationsTeamspeak { get; set; } = true; + public bool Sr1Enabled { get; set; } = true; } } diff --git a/UKSF.Api.Personnel/Models/Application.cs b/UKSF.Api.Personnel/Models/Application.cs index bf547532..9703b943 100644 --- a/UKSF.Api.Personnel/Models/Application.cs +++ b/UKSF.Api.Personnel/Models/Application.cs @@ -11,12 +11,12 @@ public enum ApplicationState { } public class Application { - [BsonRepresentation(BsonType.ObjectId)] public string applicationCommentThread; - public DateTime dateAccepted; - public DateTime dateCreated; - public Dictionary ratings = new Dictionary(); - [BsonRepresentation(BsonType.ObjectId)] public string recruiter; - [BsonRepresentation(BsonType.ObjectId)] public string recruiterCommentThread; - public ApplicationState state = ApplicationState.WAITING; + [BsonRepresentation(BsonType.ObjectId)] public string ApplicationCommentThread; + public DateTime DateAccepted; + public DateTime DateCreated; + public Dictionary Ratings = new(); + [BsonRepresentation(BsonType.ObjectId)] public string Recruiter; + [BsonRepresentation(BsonType.ObjectId)] public string RecruiterCommentThread; + public ApplicationState State = ApplicationState.WAITING; } } diff --git a/UKSF.Api.Personnel/Models/AttendanceReport.cs b/UKSF.Api.Personnel/Models/AttendanceReport.cs index c52040b5..b6f73f62 100644 --- a/UKSF.Api.Personnel/Models/AttendanceReport.cs +++ b/UKSF.Api.Personnel/Models/AttendanceReport.cs @@ -1,5 +1,5 @@ namespace UKSF.Api.Personnel.Models { public class AttendanceReport { - public AccountAttendanceStatus[] users; + public AccountAttendanceStatus[] Users; } } diff --git a/UKSF.Api.Personnel/Models/Comment.cs b/UKSF.Api.Personnel/Models/Comment.cs index cd629b08..84e18cc9 100644 --- a/UKSF.Api.Personnel/Models/Comment.cs +++ b/UKSF.Api.Personnel/Models/Comment.cs @@ -4,9 +4,9 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Personnel.Models { - public class Comment : DatabaseObject { - [BsonRepresentation(BsonType.ObjectId)] public string author; - public string content; - public DateTime timestamp; + public record Comment : MongoObject { + [BsonRepresentation(BsonType.ObjectId)] public string Author; + public string Content; + public DateTime Timestamp; } } diff --git a/UKSF.Api.Personnel/Models/CommentThread.cs b/UKSF.Api.Personnel/Models/CommentThread.cs index 5365b1d8..b59a350b 100644 --- a/UKSF.Api.Personnel/Models/CommentThread.cs +++ b/UKSF.Api.Personnel/Models/CommentThread.cs @@ -11,9 +11,9 @@ public enum ThreadMode { RANKSUPERIOROREQUAL } - public class CommentThread : DatabaseObject { - [BsonRepresentation(BsonType.ObjectId)] public string[] authors; - public Comment[] comments = { }; - public ThreadMode mode; + public record CommentThread : MongoObject { + [BsonRepresentation(BsonType.ObjectId)] public string[] Authors; + public Comment[] Comments = { }; + public ThreadMode Mode; } } diff --git a/UKSF.Api.Personnel/Models/ConfirmationCode.cs b/UKSF.Api.Personnel/Models/ConfirmationCode.cs index 98e05d94..63493ca3 100644 --- a/UKSF.Api.Personnel/Models/ConfirmationCode.cs +++ b/UKSF.Api.Personnel/Models/ConfirmationCode.cs @@ -1,7 +1,7 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Personnel.Models { - public class ConfirmationCode : DatabaseObject { - public string value; + public record ConfirmationCode : MongoObject { + public string Value; } } diff --git a/UKSF.Api.Personnel/Models/Loa.cs b/UKSF.Api.Personnel/Models/Loa.cs index 2b5d9fe3..157fc47a 100644 --- a/UKSF.Api.Personnel/Models/Loa.cs +++ b/UKSF.Api.Personnel/Models/Loa.cs @@ -10,14 +10,14 @@ public enum LoaReviewState { REJECTED } - public class Loa : DatabaseObject { - public bool emergency; - public DateTime end; - public bool late; - public string reason; - [BsonRepresentation(BsonType.ObjectId)] public string recipient; - public DateTime start; - public LoaReviewState state; - public DateTime submitted; + public record Loa : MongoObject { + public bool Emergency; + public DateTime End; + public bool Late; + public string Reason; + [BsonRepresentation(BsonType.ObjectId)] public string Recipient; + public DateTime Start; + public LoaReviewState State; + public DateTime Submitted; } } diff --git a/UKSF.Api.Personnel/Models/Notification.cs b/UKSF.Api.Personnel/Models/Notification.cs index a2d83142..0e2dfcdf 100644 --- a/UKSF.Api.Personnel/Models/Notification.cs +++ b/UKSF.Api.Personnel/Models/Notification.cs @@ -4,12 +4,12 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Personnel.Models { - public class Notification : DatabaseObject { - public string icon; - public string link; - public string message; - [BsonRepresentation(BsonType.ObjectId)] public string owner; - public bool read; - public DateTime timestamp = DateTime.Now; + public record Notification : MongoObject { + public string Icon; + public string Link; + public string Message; + [BsonRepresentation(BsonType.ObjectId)] public string Owner; + public bool Read; + public DateTime Timestamp = DateTime.Now; } } diff --git a/UKSF.Api.Personnel/Models/Rank.cs b/UKSF.Api.Personnel/Models/Rank.cs index 3100207e..361d16e6 100644 --- a/UKSF.Api.Personnel/Models/Rank.cs +++ b/UKSF.Api.Personnel/Models/Rank.cs @@ -1,11 +1,11 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Personnel.Models { - public class Rank : DatabaseObject { - public string abbreviation; - public string discordRoleId; - public string name; - public int order; - public string teamspeakGroup; + public record Rank : MongoObject { + public string Abbreviation; + public string DiscordRoleId; + public string Name; + public int Order; + public string TeamspeakGroup; } } diff --git a/UKSF.Api.Personnel/Models/Role.cs b/UKSF.Api.Personnel/Models/Role.cs index 4d054847..38a9d4eb 100644 --- a/UKSF.Api.Personnel/Models/Role.cs +++ b/UKSF.Api.Personnel/Models/Role.cs @@ -6,9 +6,9 @@ public enum RoleType { UNIT } - public class Role : DatabaseObject { - public string name; - public int order = 0; - public RoleType roleType = RoleType.INDIVIDUAL; + public record Role : MongoObject { + public string Name; + public int Order = 0; + public RoleType RoleType = RoleType.INDIVIDUAL; } } diff --git a/UKSF.Api.Personnel/Models/Unit.cs b/UKSF.Api.Personnel/Models/Unit.cs index 62ccf922..b2ef527c 100644 --- a/UKSF.Api.Personnel/Models/Unit.cs +++ b/UKSF.Api.Personnel/Models/Unit.cs @@ -4,21 +4,21 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Personnel.Models { - public class Unit : DatabaseObject { - public UnitBranch branch = UnitBranch.COMBAT; - public string callsign; - public string discordRoleId; - public string icon; - [BsonRepresentation(BsonType.ObjectId)] public List members = new List(); - public string name; - public int order; - [BsonRepresentation(BsonType.ObjectId)] public string parent; - public bool preferShortname; - [BsonRepresentation(BsonType.ObjectId)] public Dictionary roles = new Dictionary(); - public string shortname; - public string teamspeakGroup; + public record Unit : MongoObject { + public UnitBranch Branch = UnitBranch.COMBAT; + public string Callsign; + public string DiscordRoleId; + public string Icon; + [BsonRepresentation(BsonType.ObjectId)] public List Members = new(); + public string Name; + public int Order; + [BsonRepresentation(BsonType.ObjectId)] public string Parent; + public bool PreferShortname; + [BsonRepresentation(BsonType.ObjectId)] public Dictionary Roles = new(); + public string Shortname; + public string TeamspeakGroup; - public override string ToString() => $"{name}, {shortname}, {callsign}, {branch}, {teamspeakGroup}, {discordRoleId}"; + public override string ToString() => $"{Name}, {Shortname}, {Callsign}, {Branch}, {TeamspeakGroup}, {DiscordRoleId}"; } public enum UnitBranch { @@ -27,43 +27,43 @@ public enum UnitBranch { } // TODO: Cleaner way of doing this? Inside controllers? - public class ResponseUnit : Unit { - public string code; - public string parentName; - public IEnumerable unitMembers; + public record ResponseUnit : Unit { + public string Code; + public string ParentName; + public IEnumerable UnitMembers; } public class ResponseUnitMember { - public string name; - public string role; - public string unitRole; + public string Name; + public string Role; + public string UnitRole; } public class ResponseUnitTree { - public IEnumerable children; - public string id; - public string name; + public IEnumerable Children; + public string Id; + public string Name; } public class ResponseUnitTreeDataSet { - public IEnumerable auxiliaryNodes; - public IEnumerable combatNodes; + public IEnumerable AuxiliaryNodes; + public IEnumerable CombatNodes; } public class ResponseUnitChartNode { - public IEnumerable children; - public string id; - public IEnumerable members; - public string name; - public bool preferShortname; + public IEnumerable Children; + public string Id; + public IEnumerable Members; + public string Name; + public bool PreferShortname; } public class RequestUnitUpdateParent { - public int index; - public string parentId; + public int Index; + public string ParentId; } public class RequestUnitUpdateOrder { - public int index; + public int Index; } } diff --git a/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs b/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs index 523518a0..105e1f95 100644 --- a/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs +++ b/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs @@ -1,6 +1,6 @@ using System; using UKSF.Api.Base.ScheduledActions; -using UKSF.Api.Personnel.Services; +using UKSF.Api.Personnel.Context; namespace UKSF.Api.Personnel.ScheduledActions { public interface IActionDeleteExpiredConfirmationCode : IScheduledAction { } @@ -8,16 +8,16 @@ public interface IActionDeleteExpiredConfirmationCode : IScheduledAction { } public class ActionDeleteExpiredConfirmationCode : IActionDeleteExpiredConfirmationCode { public const string ACTION_NAME = nameof(ActionDeleteExpiredConfirmationCode); - private readonly IConfirmationCodeService confirmationCodeService; + private readonly IConfirmationCodeContext _confirmationCodeContext; - public ActionDeleteExpiredConfirmationCode(IConfirmationCodeService confirmationCodeService) => this.confirmationCodeService = confirmationCodeService; + public ActionDeleteExpiredConfirmationCode(IConfirmationCodeContext confirmationCodeContext) => _confirmationCodeContext = confirmationCodeContext; public string Name => ACTION_NAME; public void Run(params object[] parameters) { if (parameters.Length == 0) throw new ArgumentException("ActionDeleteExpiredConfirmationCode requires an id to be passed as a parameter, but no paramters were passed"); string id = parameters[0].ToString(); - confirmationCodeService.Data.Delete(id); + _confirmationCodeContext.Delete(id); } } } diff --git a/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs b/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs index ca91bdf3..20f6637f 100644 --- a/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs +++ b/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.Hosting; using UKSF.Api.Base.ScheduledActions; using UKSF.Api.Personnel.Context; +using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.ScheduledActions { @@ -12,12 +13,20 @@ public class ActionPruneNotifications : IActionPruneNotifications { private const string ACTION_NAME = nameof(ActionPruneNotifications); private readonly IClock _clock; - private readonly INotificationsDataService _notificationsDataService; - private readonly ISchedulerService _schedulerService; private readonly IHostEnvironment _currentEnvironment; + private readonly INotificationsContext _notificationsContext; + private readonly ISchedulerContext _schedulerContext; + private readonly ISchedulerService _schedulerService; - public ActionPruneNotifications(INotificationsDataService notificationsDataService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { - _notificationsDataService = notificationsDataService; + public ActionPruneNotifications( + ISchedulerContext schedulerContext, + INotificationsContext notificationsContext, + ISchedulerService schedulerService, + IHostEnvironment currentEnvironment, + IClock clock + ) { + _schedulerContext = schedulerContext; + _notificationsContext = notificationsContext; _schedulerService = schedulerService; _currentEnvironment = currentEnvironment; _clock = clock; @@ -27,7 +36,7 @@ public ActionPruneNotifications(INotificationsDataService notificationsDataServi public void Run(params object[] parameters) { DateTime now = _clock.UtcNow(); - Task notificationsTask = _notificationsDataService.DeleteMany(x => x.timestamp < now.AddMonths(-1)); + Task notificationsTask = _notificationsContext.DeleteMany(x => x.Timestamp < now.AddMonths(-1)); Task.WaitAll(notificationsTask); } @@ -35,7 +44,7 @@ public void Run(params object[] parameters) { public async Task CreateSelf() { if (_currentEnvironment.IsDevelopment()) return; - if (_schedulerService.Data.GetSingle(x => x.action == ACTION_NAME) == null) { + if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); } } diff --git a/UKSF.Api.Personnel/Services/AccountService.cs b/UKSF.Api.Personnel/Services/AccountService.cs index 082326de..655af9d3 100644 --- a/UKSF.Api.Personnel/Services/AccountService.cs +++ b/UKSF.Api.Personnel/Services/AccountService.cs @@ -1,18 +1,21 @@ -using UKSF.Api.Base.Context; -using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Services { - public interface IAccountService : IDataBackedService { + public interface IAccountService { Account GetUserAccount(); } - public class AccountService : DataBackedService, IAccountService { - private readonly IHttpContextService httpContextService; + public class AccountService : IAccountService { + private readonly IAccountContext _accountContext; + private readonly IHttpContextService _httpContextService; - public AccountService(IAccountDataService data, IHttpContextService httpContextService) : base(data) => this.httpContextService = httpContextService; + public AccountService(IAccountContext accountContext, IHttpContextService httpContextService) { + _accountContext = accountContext; + _httpContextService = httpContextService; + } - public Account GetUserAccount() => Data.GetSingle(httpContextService.GetUserId()); + public Account GetUserAccount() => _accountContext.GetSingle(_httpContextService.GetUserId()); } } diff --git a/UKSF.Api.Personnel/Services/AssignmentService.cs b/UKSF.Api.Personnel/Services/AssignmentService.cs index 31c2033f..1694caa9 100644 --- a/UKSF.Api.Personnel/Services/AssignmentService.cs +++ b/UKSF.Api.Personnel/Services/AssignmentService.cs @@ -5,6 +5,7 @@ using AvsAnLib; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Signalr.Clients; using UKSF.Api.Personnel.Signalr.Hubs; @@ -22,25 +23,28 @@ public interface IAssignmentService { public class AssignmentService : IAssignmentService { public const string REMOVE_FLAG = "REMOVE"; + private readonly IAccountContext _accountContext; private readonly IEventBus _accountEventBus; private readonly IHubContext _accountHub; - private readonly IAccountService _accountService; private readonly IDisplayNameService _displayNameService; private readonly IRanksService _ranksService; private readonly IServiceRecordService _serviceRecordService; + private readonly IUnitsContext _unitsContext; private readonly IUnitsService _unitsService; public AssignmentService( + IAccountContext accountContext, + IUnitsContext unitsContext, IServiceRecordService serviceRecordService, - IAccountService accountService, IRanksService ranksService, IUnitsService unitsService, IDisplayNameService displayNameService, IHubContext accountHub, IEventBus accountEventBus ) { + _accountContext = accountContext; + _unitsContext = unitsContext; _serviceRecordService = serviceRecordService; - _accountService = accountService; _ranksService = ranksService; _unitsService = unitsService; _displayNameService = displayNameService; @@ -49,7 +53,7 @@ IEventBus accountEventBus } public async Task UpdateUnitRankAndRole(string id, string unitString = "", string role = "", string rankString = "", string notes = "", string message = "", string reason = "") { - StringBuilder notificationBuilder = new StringBuilder(); + StringBuilder notificationBuilder = new(); (bool unitUpdate, bool unitPositive) = await UpdateUnit(id, unitString, notificationBuilder); (bool roleUpdate, bool rolePositive) = await UpdateRole(id, role, unitUpdate, notificationBuilder); @@ -75,7 +79,7 @@ public async Task UpdateUnitRankAndRole(string id, string unitStri _serviceRecordService.AddServiceRecord(id, message, notes); await UpdateGroupsAndRoles(id); - return message != REMOVE_FLAG ? new Notification { owner = id, message = message, icon = positive ? NotificationIcons.PROMOTION : NotificationIcons.DEMOTION } : null; + return message != REMOVE_FLAG ? new Notification { Owner = id, Message = message, Icon = positive ? NotificationIcons.PROMOTION : NotificationIcons.DEMOTION } : null; } public async Task AssignUnitRole(string id, string unitId, string role) { @@ -84,7 +88,7 @@ public async Task AssignUnitRole(string id, string unitId, string role) { } public async Task UnassignAllUnits(string id) { - foreach (Unit unit in _unitsService.Data.Get()) { + foreach (Unit unit in _unitsContext.Get()) { await _unitsService.RemoveMember(id, unit); } @@ -92,7 +96,7 @@ public async Task UnassignAllUnits(string id) { } public async Task UnassignAllUnitRoles(string id) { - foreach (Unit unit in _unitsService.Data.Get()) { + foreach (Unit unit in _unitsContext.Get()) { await _unitsService.SetMemberRole(id, unit); } @@ -100,8 +104,8 @@ public async Task UnassignAllUnitRoles(string id) { } public async Task UnassignUnitRole(string id, string unitId) { - Unit unit = _unitsService.Data.GetSingle(unitId); - string role = unit.roles.FirstOrDefault(x => x.Value == id).Key; + Unit unit = _unitsContext.GetSingle(unitId); + string role = unit.Roles.FirstOrDefault(x => x.Value == id).Key; if (_unitsService.RolesHasMember(unit, id)) { await _unitsService.SetMemberRole(id, unitId); await UpdateGroupsAndRoles(id); @@ -111,14 +115,14 @@ public async Task UnassignUnitRole(string id, string unitId) { } public async Task UnassignUnit(string id, string unitId) { - Unit unit = _unitsService.Data.GetSingle(unitId); + Unit unit = _unitsContext.GetSingle(unitId); await _unitsService.RemoveMember(id, unit); await UpdateGroupsAndRoles(unitId); } // TODO: teamspeak and discord should probably be updated for account update events, or a separate assignment event bus could be used public async Task UpdateGroupsAndRoles(string id) { - Account account = _accountService.Data.GetSingle(id); + Account account = _accountContext.GetSingle(id); _accountEventBus.Send(account); await _accountHub.Clients.Group(id).ReceiveAccountUpdate(); } @@ -126,22 +130,22 @@ public async Task UpdateGroupsAndRoles(string id) { private async Task> UpdateUnit(string id, string unitString, StringBuilder notificationMessage) { bool unitUpdate = false; bool positive = true; - Unit unit = _unitsService.Data.GetSingle(x => x.name == unitString); + Unit unit = _unitsContext.GetSingle(x => x.Name == unitString); if (unit != null) { - if (unit.branch == UnitBranch.COMBAT) { - await _unitsService.RemoveMember(id, _accountService.Data.GetSingle(id).unitAssignment); - await _accountService.Data.Update(id, "unitAssignment", unit.name); + if (unit.Branch == UnitBranch.COMBAT) { + await _unitsService.RemoveMember(id, _accountContext.GetSingle(id).UnitAssignment); + await _accountContext.Update(id, "unitAssignment", unit.Name); } - await _unitsService.AddMember(id, unit.id); + await _unitsService.AddMember(id, unit.Id); notificationMessage.Append($"You have been transfered to {_unitsService.GetChainString(unit)}"); unitUpdate = true; } else if (unitString == REMOVE_FLAG) { - string currentUnit = _accountService.Data.GetSingle(id).unitAssignment; + string currentUnit = _accountContext.GetSingle(id).UnitAssignment; if (string.IsNullOrEmpty(currentUnit)) return new Tuple(false, false); - unit = _unitsService.Data.GetSingle(x => x.name == currentUnit); + unit = _unitsContext.GetSingle(x => x.Name == currentUnit); await _unitsService.RemoveMember(id, currentUnit); - await _accountService.Data.Update(id, "unitAssignment", null); + await _accountContext.Update(id, "unitAssignment", null); notificationMessage.Append($"You have been removed from {_unitsService.GetChainString(unit)}"); unitUpdate = true; positive = false; @@ -154,12 +158,12 @@ private async Task> UpdateRole(string id, string role, bool un bool roleUpdate = false; bool positive = true; if (!string.IsNullOrEmpty(role) && role != REMOVE_FLAG) { - await _accountService.Data.Update(id, "roleAssignment", role); + await _accountContext.Update(id, "roleAssignment", role); notificationMessage.Append($"{(unitUpdate ? $" as {AvsAn.Query(role).Article} {role}" : $"You have been assigned as {AvsAn.Query(role).Article} {role}")}"); roleUpdate = true; } else if (role == REMOVE_FLAG) { - string currentRole = _accountService.Data.GetSingle(id).roleAssignment; - await _accountService.Data.Update(id, "roleAssignment", null); + string currentRole = _accountContext.GetSingle(id).RoleAssignment; + await _accountContext.Update(id, "roleAssignment", null); notificationMessage.Append( string.IsNullOrEmpty(currentRole) ? $"{(unitUpdate ? " and unassigned from your role" : "You have been unassigned from your role")}" @@ -176,17 +180,17 @@ private async Task> UpdateRole(string id, string role, bool un private async Task> UpdateRank(string id, string rank, bool unitUpdate, bool roleUpdate, StringBuilder notificationMessage) { bool rankUpdate = false; bool positive = true; - string currentRank = _accountService.Data.GetSingle(id).rank; + string currentRank = _accountContext.GetSingle(id).Rank; if (!string.IsNullOrEmpty(rank) && rank != REMOVE_FLAG) { if (currentRank == rank) return new Tuple(false, true); - await _accountService.Data.Update(id, "rank", rank); + await _accountContext.Update(id, "rank", rank); bool promotion = string.IsNullOrEmpty(currentRank) || _ranksService.IsSuperior(rank, currentRank); notificationMessage.Append( $"{(unitUpdate || roleUpdate ? $" and {(promotion ? "promoted" : "demoted")} to {rank}" : $"You have been {(promotion ? "promoted" : "demoted")} to {rank}")}" ); rankUpdate = true; } else if (rank == REMOVE_FLAG) { - await _accountService.Data.Update(id, "rank", null); + await _accountContext.Update(id, "rank", null); notificationMessage.Append($"{(unitUpdate || roleUpdate ? $" and demoted from {currentRank}" : $"You have been demoted from {currentRank}")}"); rankUpdate = true; positive = false; diff --git a/UKSF.Api.Personnel/Services/AttendanceService.cs b/UKSF.Api.Personnel/Services/AttendanceService.cs index 3986f8e7..9ee43d81 100644 --- a/UKSF.Api.Personnel/Services/AttendanceService.cs +++ b/UKSF.Api.Personnel/Services/AttendanceService.cs @@ -33,7 +33,7 @@ public interface IAttendanceService { // displayName = displayNameService.GetDisplayName(x), // attendancePercent = GetAttendancePercent(x.teamspeakIdentities), // attendanceState = loaService.IsLoaCovered(x.id, start) ? AttendanceState.LOA : GetAttendanceState(GetAttendancePercent(x.teamspeakIdentities)), - // groupId = unitsService.Data.GetSingle(y => y.name == x.unitAssignment).id, + // groupId = _unitsContext.GetSingle(y => y.name == x.unitAssignment).id, // groupName = x.unitAssignment // } // ) @@ -42,7 +42,7 @@ public interface IAttendanceService { // } // // private void GetAccounts() { - // accounts = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER); + // accounts = _accountContext.Get(x => x.membershipState == MembershipState.MEMBER); // } // // private async Task GetRecords(DateTime start, DateTime end) { diff --git a/UKSF.Api.Personnel/Services/CommentThreadService.cs b/UKSF.Api.Personnel/Services/CommentThreadService.cs index 494fe6cd..ef9dbd28 100644 --- a/UKSF.Api.Personnel/Services/CommentThreadService.cs +++ b/UKSF.Api.Personnel/Services/CommentThreadService.cs @@ -1,13 +1,12 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using UKSF.Api.Base.Context; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Models; namespace UKSF.Api.Personnel.Services { - public interface ICommentThreadService : IDataBackedService { + public interface ICommentThreadService { IEnumerable GetCommentThreadComments(string id); Task InsertComment(string id, Comment comment); Task RemoveComment(string id, Comment comment); @@ -15,34 +14,31 @@ public interface ICommentThreadService : IDataBackedService, ICommentThreadService { - private readonly IDisplayNameService displayNameService; + public class CommentThreadService : ICommentThreadService { + private readonly ICommentThreadContext _commentThreadContext; + private readonly IDisplayNameService _displayNameService; - public CommentThreadService(ICommentThreadDataService data, IDisplayNameService displayNameService) : base(data) => this.displayNameService = displayNameService; + public CommentThreadService(ICommentThreadContext commentThreadContext, IDisplayNameService displayNameService) { + _commentThreadContext = commentThreadContext; + _displayNameService = displayNameService; + } - public IEnumerable GetCommentThreadComments(string id) => Data.GetSingle(id).comments.Reverse(); + public IEnumerable GetCommentThreadComments(string id) => _commentThreadContext.GetSingle(id).Comments.Reverse(); public async Task InsertComment(string id, Comment comment) { - await Data.Update(id, comment, DataEventType.ADD); + await _commentThreadContext.Update(id, comment, DataEventType.ADD); } public async Task RemoveComment(string id, Comment comment) { - await Data.Update(id, comment, DataEventType.DELETE); + await _commentThreadContext.Update(id, comment, DataEventType.DELETE); } public IEnumerable GetCommentThreadParticipants(string id) { - HashSet participants = GetCommentThreadComments(id).Select(x => x.author).ToHashSet(); - participants.UnionWith(Data.GetSingle(id).authors); + HashSet participants = GetCommentThreadComments(id).Select(x => x.Author).ToHashSet(); + participants.UnionWith(_commentThreadContext.GetSingle(id).Authors); return participants; } - public object FormatComment(Comment comment) => - new { - Id = comment.id, - Author = comment.author, - Content = comment.content, - DisplayName = displayNameService.GetDisplayName(comment.author), - Timestamp = comment.timestamp - }; + public object FormatComment(Comment comment) => new { comment.Id, comment.Author, comment.Content, DisplayName = _displayNameService.GetDisplayName(comment.Author), comment.Timestamp }; } } diff --git a/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs b/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs index 7ff033ff..11bca57a 100644 --- a/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs +++ b/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs @@ -2,48 +2,52 @@ using System.Collections.Generic; using System.Threading.Tasks; using Newtonsoft.Json; -using UKSF.Api.Base.Context; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.ScheduledActions; using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Services { - public interface IConfirmationCodeService : IDataBackedService { + public interface IConfirmationCodeService { Task CreateConfirmationCode(string value); Task GetConfirmationCode(string id); Task ClearConfirmationCodes(Func predicate); } - public class ConfirmationCodeService : DataBackedService, IConfirmationCodeService { - private readonly ISchedulerService schedulerService; + public class ConfirmationCodeService : IConfirmationCodeService { + private readonly IConfirmationCodeContext _confirmationCodeContext; + private readonly ISchedulerService _schedulerService; - public ConfirmationCodeService(IConfirmationCodeDataService data, ISchedulerService schedulerService) : base(data) => this.schedulerService = schedulerService; + public ConfirmationCodeService(IConfirmationCodeContext confirmationCodeContext, ISchedulerService schedulerService) { + _confirmationCodeContext = confirmationCodeContext; + _schedulerService = schedulerService; + } public async Task CreateConfirmationCode(string value) { if (string.IsNullOrEmpty(value)) throw new ArgumentNullException(nameof(value), "Value for confirmation code cannot be null or empty"); - ConfirmationCode code = new ConfirmationCode { value = value }; - await Data.Add(code); - await schedulerService.CreateAndScheduleJob(DateTime.Now.AddMinutes(30), TimeSpan.Zero, ActionDeleteExpiredConfirmationCode.ACTION_NAME, code.id); - return code.id; + ConfirmationCode code = new() { Value = value }; + await _confirmationCodeContext.Add(code); + await _schedulerService.CreateAndScheduleJob(DateTime.Now.AddMinutes(30), TimeSpan.Zero, ActionDeleteExpiredConfirmationCode.ACTION_NAME, code.Id); + return code.Id; } public async Task GetConfirmationCode(string id) { - ConfirmationCode confirmationCode = Data.GetSingle(id); + ConfirmationCode confirmationCode = _confirmationCodeContext.GetSingle(id); if (confirmationCode == null) return string.Empty; - await Data.Delete(confirmationCode); - string actionParameters = JsonConvert.SerializeObject(new object[] { confirmationCode.id }); - await schedulerService.Cancel(x => x.actionParameters == actionParameters); - return confirmationCode.value; + await _confirmationCodeContext.Delete(confirmationCode); + string actionParameters = JsonConvert.SerializeObject(new object[] { confirmationCode.Id }); + await _schedulerService.Cancel(x => x.ActionParameters == actionParameters); + return confirmationCode.Value; } public async Task ClearConfirmationCodes(Func predicate) { - IEnumerable codes = Data.Get(predicate); + IEnumerable codes = _confirmationCodeContext.Get(predicate); foreach (ConfirmationCode confirmationCode in codes) { - string actionParameters = JsonConvert.SerializeObject(new object[] { confirmationCode.id }); - await schedulerService.Cancel(x => x.actionParameters == actionParameters); + string actionParameters = JsonConvert.SerializeObject(new object[] { confirmationCode.Id }); + await _schedulerService.Cancel(x => x.ActionParameters == actionParameters); } - await Data.DeleteMany(x => predicate(x)); + + await _confirmationCodeContext.DeleteMany(x => predicate(x)); } } } diff --git a/UKSF.Api.Personnel/Services/DisplayNameService.cs b/UKSF.Api.Personnel/Services/DisplayNameService.cs index a47bdd2d..b5a496b0 100644 --- a/UKSF.Api.Personnel/Services/DisplayNameService.cs +++ b/UKSF.Api.Personnel/Services/DisplayNameService.cs @@ -1,4 +1,5 @@ -using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Models; namespace UKSF.Api.Personnel.Services { public interface IDisplayNameService { @@ -8,24 +9,24 @@ public interface IDisplayNameService { } public class DisplayNameService : IDisplayNameService { - private readonly IAccountService accountService; - private readonly IRanksService ranksService; + private readonly IAccountContext _accountContext; + private readonly IRanksContext _ranksContext; - public DisplayNameService(IRanksService ranksService, IAccountService accountService) { - this.ranksService = ranksService; - this.accountService = accountService; + public DisplayNameService(IAccountContext accountContext, IRanksContext ranksContext) { + _accountContext = accountContext; + _ranksContext = ranksContext; } public string GetDisplayName(Account account) { - Rank rank = account.rank != null ? ranksService.Data.GetSingle(account.rank) : null; - return rank == null ? $"{account.lastname}.{account.firstname[0]}" : $"{rank.abbreviation}.{account.lastname}.{account.firstname[0]}"; + Rank rank = account.Rank != null ? _ranksContext.GetSingle(account.Rank) : null; + return rank == null ? $"{account.Lastname}.{account.Firstname[0]}" : $"{rank.Abbreviation}.{account.Lastname}.{account.Firstname[0]}"; } public string GetDisplayName(string id) { - Account account = accountService.Data.GetSingle(id); + Account account = _accountContext.GetSingle(id); return account != null ? GetDisplayName(account) : id; } - public string GetDisplayNameWithoutRank(Account account) => string.IsNullOrEmpty(account?.lastname) ? "Guest" : $"{account.lastname}.{account.firstname[0]}"; + public string GetDisplayNameWithoutRank(Account account) => string.IsNullOrEmpty(account?.Lastname) ? "Guest" : $"{account.Lastname}.{account.Firstname[0]}"; } } diff --git a/UKSF.Api.Personnel/Services/EmailService.cs b/UKSF.Api.Personnel/Services/EmailService.cs index 9ce40695..4feaa89f 100644 --- a/UKSF.Api.Personnel/Services/EmailService.cs +++ b/UKSF.Api.Personnel/Services/EmailService.cs @@ -8,23 +8,23 @@ public interface IEmailService { } public class EmailService : IEmailService { - private readonly string password; - private readonly string username; + private readonly string _password; + private readonly string _username; public EmailService(IConfiguration configuration) { - username = configuration.GetSection("EmailSettings")["username"]; - password = configuration.GetSection("EmailSettings")["password"]; + _username = configuration.GetSection("EmailSettings")["username"]; + _password = configuration.GetSection("EmailSettings")["password"]; } public void SendEmail(string targetEmail, string subject, string htmlEmail) { - if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password)) return; - using MailMessage mail = new MailMessage {From = new MailAddress(username, "UKSF")}; + if (string.IsNullOrEmpty(_username) || string.IsNullOrEmpty(_password)) return; + using MailMessage mail = new() { From = new MailAddress(_username, "UKSF") }; mail.To.Add(targetEmail); mail.Subject = subject; mail.Body = htmlEmail; mail.IsBodyHtml = true; - using SmtpClient smtp = new SmtpClient("smtp.gmail.com", 587) {Credentials = new NetworkCredential(username, password), EnableSsl = true}; + using SmtpClient smtp = new("smtp.gmail.com", 587) { Credentials = new NetworkCredential(_username, _password), EnableSsl = true }; smtp.Send(mail); } } diff --git a/UKSF.Api.Personnel/Services/NotificationsService.cs b/UKSF.Api.Personnel/Services/NotificationsService.cs index ac50e6e4..e16868e9 100644 --- a/UKSF.Api.Personnel/Services/NotificationsService.cs +++ b/UKSF.Api.Personnel/Services/NotificationsService.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; -using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; @@ -13,7 +12,7 @@ using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Services { - public interface INotificationsService : IDataBackedService { + public interface INotificationsService { void Add(Notification notification); void SendTeamspeakNotification(Account account, string rawMessage); void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage); @@ -22,24 +21,26 @@ public interface INotificationsService : IDataBackedService ids); } - public class NotificationsService : DataBackedService, INotificationsService { - private readonly IAccountService _accountService; + public class NotificationsService : INotificationsService { + private readonly IAccountContext _accountContext; private readonly IEmailService _emailService; private readonly IHttpContextService _httpContextService; + private readonly INotificationsContext _notificationsContext; private readonly IHubContext _notificationsHub; private readonly IObjectIdConversionService _objectIdConversionService; private readonly IEventBus _teamspeakMessageEventBus; public NotificationsService( - INotificationsDataService data, - IAccountService accountService, + IAccountContext accountContext, + INotificationsContext notificationsContext, IEmailService emailService, IHubContext notificationsHub, IHttpContextService httpContextService, IObjectIdConversionService objectIdConversionService, IEventBus teamspeakMessageEventBus - ) : base(data) { - _accountService = accountService; + ) { + _accountContext = accountContext; + _notificationsContext = notificationsContext; _emailService = emailService; _notificationsHub = notificationsHub; _httpContextService = httpContextService; @@ -48,10 +49,10 @@ IEventBus teamspeakMessageEventBus } public void SendTeamspeakNotification(Account account, string rawMessage) { - if (account.teamspeakIdentities == null) return; - if (account.teamspeakIdentities.Count == 0) return; + if (account.TeamspeakIdentities == null) return; + if (account.TeamspeakIdentities.Count == 0) return; - SendTeamspeakNotification(account.teamspeakIdentities, rawMessage); + SendTeamspeakNotification(account.TeamspeakIdentities, rawMessage); } public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { @@ -61,7 +62,7 @@ public void SendTeamspeakNotification(IEnumerable clientDbIds, string ra public IEnumerable GetNotificationsForContext() { string contextId = _httpContextService.GetUserId(); - return Data.Get(x => x.owner == contextId); + return _notificationsContext.Get(x => x.Owner == contextId); } public void Add(Notification notification) { @@ -71,30 +72,30 @@ public void Add(Notification notification) { public async Task MarkNotificationsAsRead(List ids) { string contextId = _httpContextService.GetUserId(); - await Data.UpdateMany(x => x.owner == contextId && ids.Contains(x.id), Builders.Update.Set(x => x.read, true)); + await _notificationsContext.UpdateMany(x => x.Owner == contextId && ids.Contains(x.Id), Builders.Update.Set(x => x.Read, true)); await _notificationsHub.Clients.Group(contextId).ReceiveRead(ids); } public async Task Delete(List ids) { ids = ids.ToList(); string contextId = _httpContextService.GetUserId(); - await Data.DeleteMany(x => x.owner == contextId && ids.Contains(x.id)); + await _notificationsContext.DeleteMany(x => x.Owner == contextId && ids.Contains(x.Id)); await _notificationsHub.Clients.Group(contextId).ReceiveClear(ids); } private async Task AddNotificationAsync(Notification notification) { - notification.message = _objectIdConversionService.ConvertObjectIds(notification.message); - await Data.Add(notification); - Account account = _accountService.Data.GetSingle(notification.owner); - if (account.settings.notificationsEmail) { + notification.Message = _objectIdConversionService.ConvertObjectIds(notification.Message); + await _notificationsContext.Add(notification); + Account account = _accountContext.GetSingle(notification.Owner); + if (account.Settings.NotificationsEmail) { SendEmailNotification( - account.email, - $"{notification.message}{(notification.link != null ? $"
https://uk-sf.co.uk{notification.link}" : "")}" + account.Email, + $"{notification.Message}{(notification.Link != null ? $"
https://uk-sf.co.uk{notification.Link}" : "")}" ); } - if (account.settings.notificationsTeamspeak) { - SendTeamspeakNotification(account, $"{notification.message}{(notification.link != null ? $"\n[url]https://uk-sf.co.uk{notification.link}[/url]" : "")}"); + if (account.Settings.NotificationsTeamspeak) { + SendTeamspeakNotification(account, $"{notification.Message}{(notification.Link != null ? $"\n[url]https://uk-sf.co.uk{notification.Link}[/url]" : "")}"); } } diff --git a/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs b/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs index 9744e15b..34ba6fc4 100644 --- a/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs +++ b/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs @@ -1,4 +1,5 @@ -using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Personnel.Services { @@ -9,11 +10,11 @@ public interface IObjectIdConversionService { public class ObjectIdConversionService : IObjectIdConversionService { private readonly IDisplayNameService _displayNameService; - private readonly IUnitsService _unitsService; + private readonly IUnitsContext _unitsContext; - public ObjectIdConversionService(IDisplayNameService displayNameService, IUnitsService unitsService) { + public ObjectIdConversionService(IUnitsContext unitsContext, IDisplayNameService displayNameService) { + _unitsContext = unitsContext; _displayNameService = displayNameService; - _unitsService = unitsService; } public string ConvertObjectIds(string text) { @@ -22,9 +23,9 @@ public string ConvertObjectIds(string text) { foreach (string objectId in text.ExtractObjectIds()) { string displayString = _displayNameService.GetDisplayName(objectId); if (displayString == objectId) { - Unit unit = _unitsService.Data.GetSingle(x => x.id == objectId); + Unit unit = _unitsContext.GetSingle(x => x.Id == objectId); if (unit != null) { - displayString = unit.name; + displayString = unit.Name; } } diff --git a/UKSF.Api.Personnel/Services/RanksService.cs b/UKSF.Api.Personnel/Services/RanksService.cs index 4a7c6ae5..5828b979 100644 --- a/UKSF.Api.Personnel/Services/RanksService.cs +++ b/UKSF.Api.Personnel/Services/RanksService.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; -using UKSF.Api.Base.Context; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; namespace UKSF.Api.Personnel.Services { - public interface IRanksService : IDataBackedService { + public interface IRanksService { int GetRankOrder(string rankName); int Sort(string nameA, string nameB); bool IsEqual(string nameA, string nameB); @@ -12,33 +11,34 @@ public interface IRanksService : IDataBackedService { bool IsSuperiorOrEqual(string nameA, string nameB); } - public class RanksService : DataBackedService, IRanksService { + public class RanksService : IRanksService { + private readonly IRanksContext _ranksContext; - public RanksService(IRanksDataService data) : base(data) { } + public RanksService(IRanksContext ranksContext) => _ranksContext = ranksContext; - public int GetRankOrder(string rankName) => Data.GetSingle(rankName)?.order ?? -1; + public int GetRankOrder(string rankName) => _ranksContext.GetSingle(rankName)?.Order ?? -1; public int Sort(string nameA, string nameB) { - Rank rankA = Data.GetSingle(nameA); - Rank rankB = Data.GetSingle(nameB); - int rankOrderA = rankA?.order ?? int.MaxValue; - int rankOrderB = rankB?.order ?? int.MaxValue; + Rank rankA = _ranksContext.GetSingle(nameA); + Rank rankB = _ranksContext.GetSingle(nameB); + int rankOrderA = rankA?.Order ?? int.MaxValue; + int rankOrderB = rankB?.Order ?? int.MaxValue; return rankOrderA < rankOrderB ? -1 : rankOrderA > rankOrderB ? 1 : 0; } public bool IsSuperior(string nameA, string nameB) { - Rank rankA = Data.GetSingle(nameA); - Rank rankB = Data.GetSingle(nameB); - int rankOrderA = rankA?.order ?? int.MaxValue; - int rankOrderB = rankB?.order ?? int.MaxValue; + Rank rankA = _ranksContext.GetSingle(nameA); + Rank rankB = _ranksContext.GetSingle(nameB); + int rankOrderA = rankA?.Order ?? int.MaxValue; + int rankOrderB = rankB?.Order ?? int.MaxValue; return rankOrderA < rankOrderB; } public bool IsEqual(string nameA, string nameB) { - Rank rankA = Data.GetSingle(nameA); - Rank rankB = Data.GetSingle(nameB); - int rankOrderA = rankA?.order ?? int.MinValue; - int rankOrderB = rankB?.order ?? int.MinValue; + Rank rankA = _ranksContext.GetSingle(nameA); + Rank rankB = _ranksContext.GetSingle(nameB); + int rankOrderA = rankA?.Order ?? int.MinValue; + int rankOrderB = rankB?.Order ?? int.MinValue; return rankOrderA == rankOrderB; } @@ -46,9 +46,9 @@ public bool IsEqual(string nameA, string nameB) { } public class RankComparer : IComparer { - private readonly IRanksService ranksService; - public RankComparer(IRanksService ranksService) => this.ranksService = ranksService; + private readonly IRanksService _ranksService; + public RankComparer(IRanksService ranksService) => _ranksService = ranksService; - public int Compare(string rankA, string rankB) => ranksService.Sort(rankA, rankB); + public int Compare(string rankA, string rankB) => _ranksService.Sort(rankA, rankB); } } diff --git a/UKSF.Api.Personnel/Services/RecruitmentService.cs b/UKSF.Api.Personnel/Services/RecruitmentService.cs index 04ccff8a..8ce62e0d 100644 --- a/UKSF.Api.Personnel/Services/RecruitmentService.cs +++ b/UKSF.Api.Personnel/Services/RecruitmentService.cs @@ -6,6 +6,7 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Services; @@ -25,50 +26,50 @@ public interface IRecruitmentService { } public class RecruitmentService : IRecruitmentService { - private readonly IAccountService accountService; - private readonly IHttpContextService httpContextService; - private readonly IDisplayNameService displayNameService; - private readonly IRanksService ranksService; - private readonly IUnitsService unitsService; - private readonly IVariablesService variablesService; + private readonly IAccountContext _accountContext; + private readonly IDisplayNameService _displayNameService; + private readonly IHttpContextService _httpContextService; + private readonly IRanksService _ranksService; + private readonly IUnitsContext _unitsContext; + private readonly IVariablesService _variablesService; public RecruitmentService( - IAccountService accountService, + IAccountContext accountContext, + IUnitsContext unitsContext, IHttpContextService httpContextService, IDisplayNameService displayNameService, IRanksService ranksService, - IUnitsService unitsService, IVariablesService variablesService ) { - this.accountService = accountService; - this.httpContextService = httpContextService; - this.displayNameService = displayNameService; - this.ranksService = ranksService; - this.unitsService = unitsService; - this.variablesService = variablesService; + _accountContext = accountContext; + _unitsContext = unitsContext; + _httpContextService = httpContextService; + _displayNameService = displayNameService; + _ranksService = ranksService; + _variablesService = variablesService; } - public bool IsRecruiter(Account account) => GetRecruiters(true).Any(x => x.id == account.id); + public bool IsRecruiter(Account account) => GetRecruiters(true).Any(x => x.Id == account.Id); - public Dictionary GetRecruiterLeads() => GetRecruiterUnit().roles; + public Dictionary GetRecruiterLeads() => GetRecruiterUnit().Roles; public IEnumerable GetRecruiters(bool skipSort = false) { - IEnumerable members = GetRecruiterUnit().members; - List accounts = members.Select(x => accountService.Data.GetSingle(x)).ToList(); + IEnumerable members = GetRecruiterUnit().Members; + List accounts = members.Select(x => _accountContext.GetSingle(x)).ToList(); if (skipSort) return accounts; - return accounts.OrderBy(x => x.rank, new RankComparer(ranksService)).ThenBy(x => x.lastname); + return accounts.OrderBy(x => x.Rank, new RankComparer(_ranksService)).ThenBy(x => x.Lastname); } public object GetAllApplications() { - JArray waiting = new JArray(); - JArray allWaiting = new JArray(); - JArray complete = new JArray(); - JArray recruiters = new JArray(); - string me = httpContextService.GetUserId(); - IEnumerable accounts = accountService.Data.Get(x => x.application != null); + JArray waiting = new(); + JArray allWaiting = new(); + JArray complete = new(); + JArray recruiters = new(); + string me = _httpContextService.GetUserId(); + IEnumerable accounts = _accountContext.Get(x => x.Application != null); foreach (Account account in accounts) { - if (account.application.state == ApplicationState.WAITING) { - if (account.application.recruiter == me) { + if (account.Application.State == ApplicationState.WAITING) { + if (account.Application.Recruiter == me) { waiting.Add(GetWaitingApplication(account)); } else { allWaiting.Add(GetWaitingApplication(account)); @@ -79,100 +80,107 @@ public object GetAllApplications() { } foreach (Account account in GetRecruiters(true)) { - recruiters.Add(displayNameService.GetDisplayName(account)); + recruiters.Add(_displayNameService.GetDisplayName(account)); } - return new {waiting, allWaiting, complete, recruiters}; + return new { waiting, allWaiting, complete, recruiters }; } // TODO: Make sure frontend calls get online user details for ts and discord public JObject GetApplication(Account account) { - Account recruiterAccount = accountService.Data.GetSingle(account.application.recruiter); - (int years, int months) = account.dob.ToAge(); + Account recruiterAccount = _accountContext.GetSingle(account.Application.Recruiter); + (int years, int months) = account.Dob.ToAge(); return JObject.FromObject( new { account, - displayName = displayNameService.GetDisplayName(account), - age = new {years, months}, - daysProcessing = Math.Ceiling((DateTime.Now - account.application.dateCreated).TotalDays), - daysProcessed = Math.Ceiling((account.application.dateAccepted - account.application.dateCreated).TotalDays), + displayName = _displayNameService.GetDisplayName(account), + age = new { years, months }, + daysProcessing = Math.Ceiling((DateTime.Now - account.Application.DateCreated).TotalDays), + daysProcessed = Math.Ceiling((account.Application.DateAccepted - account.Application.DateCreated).TotalDays), nextCandidateOp = GetNextCandidateOp(), averageProcessingTime = GetAverageProcessingTime(), - steamprofile = "http://steamcommunity.com/profiles/" + account.steamname, - recruiter = displayNameService.GetDisplayName(recruiterAccount), - recruiterId = recruiterAccount.id + steamprofile = "http://steamcommunity.com/profiles/" + account.Steamname, + recruiter = _displayNameService.GetDisplayName(recruiterAccount), + recruiterId = recruiterAccount.Id } ); } - public object GetActiveRecruiters() => GetRecruiters().Where(x => x.settings.sr1Enabled).Select(x => JObject.FromObject(new {value = x.id, viewValue = displayNameService.GetDisplayName(x)})); + public object GetActiveRecruiters() => + GetRecruiters().Where(x => x.Settings.Sr1Enabled).Select(x => JObject.FromObject(new { value = x.Id, viewValue = _displayNameService.GetDisplayName(x) })); - public bool IsRecruiterLead(Account account = null) => account != null ? GetRecruiterUnit().roles.ContainsValue(account.id) : GetRecruiterUnit().roles.ContainsValue(httpContextService.GetUserId()); + public bool IsRecruiterLead(Account account = null) => + account != null ? GetRecruiterUnit().Roles.ContainsValue(account.Id) : GetRecruiterUnit().Roles.ContainsValue(_httpContextService.GetUserId()); public async Task SetRecruiter(string id, string newRecruiter) { - await accountService.Data.Update(id, Builders.Update.Set(x => x.application.recruiter, newRecruiter)); + await _accountContext.Update(id, Builders.Update.Set(x => x.Application.Recruiter, newRecruiter)); } public object GetStats(string account, bool monthly) { - IEnumerable accounts = accountService.Data.Get(x => x.application != null); + IEnumerable accounts = _accountContext.Get(x => x.Application != null); if (account != string.Empty) { - accounts = accounts.Where(x => x.application.recruiter == account); + accounts = accounts.Where(x => x.Application.Recruiter == account); } if (monthly) { - accounts = accounts.Where(x => x.application.dateAccepted < DateTime.Now && x.application.dateAccepted > DateTime.Now.AddMonths(-1)); + accounts = accounts.Where(x => x.Application.DateAccepted < DateTime.Now && x.Application.DateAccepted > DateTime.Now.AddMonths(-1)); } List accountsList = accounts.ToList(); - int acceptedApps = accountsList.Count(x => x.application.state == ApplicationState.ACCEPTED); - int rejectedApps = accountsList.Count(x => x.application.state == ApplicationState.REJECTED); - int waitingApps = accountsList.Count(x => x.application.state == ApplicationState.WAITING); + int acceptedApps = accountsList.Count(x => x.Application.State == ApplicationState.ACCEPTED); + int rejectedApps = accountsList.Count(x => x.Application.State == ApplicationState.REJECTED); + int waitingApps = accountsList.Count(x => x.Application.State == ApplicationState.WAITING); - List processedApplications = accountsList.Where(x => x.application.state != ApplicationState.WAITING).ToList(); - double totalProcessingTime = processedApplications.Sum(x => (x.application.dateAccepted - x.application.dateCreated).TotalDays); + List processedApplications = accountsList.Where(x => x.Application.State != ApplicationState.WAITING).ToList(); + double totalProcessingTime = processedApplications.Sum(x => (x.Application.DateAccepted - x.Application.DateCreated).TotalDays); double averageProcessingTime = totalProcessingTime > 0 ? Math.Round(totalProcessingTime / processedApplications.Count, 1) : 0; double enlistmentRate = acceptedApps != 0 || rejectedApps != 0 ? Math.Round((double) acceptedApps / (acceptedApps + rejectedApps) * 100, 1) : 0; return new[] { - new {fieldName = "Accepted applications", fieldValue = acceptedApps.ToString()}, - new {fieldName = "Rejected applications", fieldValue = rejectedApps.ToString()}, - new {fieldName = "Waiting applications", fieldValue = waitingApps.ToString()}, - new {fieldName = "Average processing time", fieldValue = averageProcessingTime + " Days"}, - new {fieldName = "Enlistment Rate", fieldValue = enlistmentRate + "%"} + new { fieldName = "Accepted applications", fieldValue = acceptedApps.ToString() }, + new { fieldName = "Rejected applications", fieldValue = rejectedApps.ToString() }, + new { fieldName = "Waiting applications", fieldValue = waitingApps.ToString() }, + new { fieldName = "Average processing time", fieldValue = averageProcessingTime + " Days" }, + new { fieldName = "Enlistment Rate", fieldValue = enlistmentRate + "%" } }; } public string GetRecruiter() { - IEnumerable recruiters = GetRecruiters().Where(x => x.settings.sr1Enabled); - List waiting = accountService.Data.Get(x => x.application != null && x.application.state == ApplicationState.WAITING).ToList(); - List complete = accountService.Data.Get(x => x.application != null && x.application.state != ApplicationState.WAITING).ToList(); - var unsorted = recruiters.Select(x => new {x.id, complete = complete.Count(y => y.application.recruiter == x.id), waiting = waiting.Count(y => y.application.recruiter == x.id)}); + IEnumerable recruiters = GetRecruiters().Where(x => x.Settings.Sr1Enabled); + List waiting = _accountContext.Get(x => x.Application != null && x.Application.State == ApplicationState.WAITING).ToList(); + List complete = _accountContext.Get(x => x.Application != null && x.Application.State != ApplicationState.WAITING).ToList(); + var unsorted = recruiters.Select(x => new { id = x.Id, complete = complete.Count(y => y.Application.Recruiter == x.Id), waiting = waiting.Count(y => y.Application.Recruiter == x.Id) }); var sorted = unsorted.OrderBy(x => x.waiting).ThenBy(x => x.complete); return sorted.First().id; } private Unit GetRecruiterUnit() { - string id = variablesService.GetVariable("UNIT_ID_RECRUITMENT").AsString(); - return unitsService.Data.GetSingle(id); + string id = _variablesService.GetVariable("UNIT_ID_RECRUITMENT").AsString(); + return _unitsContext.GetSingle(id); } private JObject GetCompletedApplication(Account account) => JObject.FromObject( - new {account, displayName = displayNameService.GetDisplayNameWithoutRank(account), daysProcessed = Math.Ceiling((account.application.dateAccepted - account.application.dateCreated).TotalDays), recruiter = displayNameService.GetDisplayName(account.application.recruiter)} + new { + account, + displayName = _displayNameService.GetDisplayNameWithoutRank(account), + daysProcessed = Math.Ceiling((account.Application.DateAccepted - account.Application.DateCreated).TotalDays), + recruiter = _displayNameService.GetDisplayName(account.Application.Recruiter) + } ); // TODO: Make sure frontend calls get online user details for ts and discord private JObject GetWaitingApplication(Account account) { double averageProcessingTime = GetAverageProcessingTime(); - double daysProcessing = Math.Ceiling((DateTime.Now - account.application.dateCreated).TotalDays); + double daysProcessing = Math.Ceiling((DateTime.Now - account.Application.DateCreated).TotalDays); double processingDifference = daysProcessing - averageProcessingTime; return JObject.FromObject( new { account, - steamprofile = "http://steamcommunity.com/profiles/" + account.steamname, + steamprofile = "http://steamcommunity.com/profiles/" + account.Steamname, daysProcessing, processingDifference, - recruiter = displayNameService.GetDisplayName(account.application.recruiter) + recruiter = _displayNameService.GetDisplayName(account.Application.Recruiter) } ); } @@ -191,8 +199,8 @@ private static string GetNextCandidateOp() { } private double GetAverageProcessingTime() { - List waitingApplications = accountService.Data.Get(x => x.application != null && x.application.state != ApplicationState.WAITING).ToList(); - double days = waitingApplications.Sum(x => (x.application.dateAccepted - x.application.dateCreated).TotalDays); + List waitingApplications = _accountContext.Get(x => x.Application != null && x.Application.State != ApplicationState.WAITING).ToList(); + double days = waitingApplications.Sum(x => (x.Application.DateAccepted - x.Application.DateCreated).TotalDays); double time = Math.Round(days / waitingApplications.Count, 1); return time; } diff --git a/UKSF.Api.Personnel/Services/RolesService.cs b/UKSF.Api.Personnel/Services/RolesService.cs index b02e7848..91d6af31 100644 --- a/UKSF.Api.Personnel/Services/RolesService.cs +++ b/UKSF.Api.Personnel/Services/RolesService.cs @@ -1,25 +1,25 @@ -using UKSF.Api.Base.Context; -using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; namespace UKSF.Api.Personnel.Services { - public interface IRolesService : IDataBackedService { + public interface IRolesService { int Sort(string nameA, string nameB); Role GetUnitRoleByOrder(int order); } - public class RolesService : DataBackedService, IRolesService { + public class RolesService : IRolesService { + private readonly IRolesContext _rolesContext; - public RolesService(IRolesDataService data) : base(data) { } + public RolesService(IRolesContext rolesContext) => _rolesContext = rolesContext; public int Sort(string nameA, string nameB) { - Role roleA = Data.GetSingle(nameA); - Role roleB = Data.GetSingle(nameB); - int roleOrderA = roleA?.order ?? 0; - int roleOrderB = roleB?.order ?? 0; + Role roleA = _rolesContext.GetSingle(nameA); + Role roleB = _rolesContext.GetSingle(nameB); + int roleOrderA = roleA?.Order ?? 0; + int roleOrderB = roleB?.Order ?? 0; return roleOrderA < roleOrderB ? -1 : roleOrderA > roleOrderB ? 1 : 0; } - public Role GetUnitRoleByOrder(int order) => Data.GetSingle(x => x.roleType == RoleType.UNIT && x.order == order); + public Role GetUnitRoleByOrder(int order) => _rolesContext.GetSingle(x => x.RoleType == RoleType.UNIT && x.Order == order); } } diff --git a/UKSF.Api.Personnel/Services/ServiceRecordService.cs b/UKSF.Api.Personnel/Services/ServiceRecordService.cs index 7373676e..82f7dfec 100644 --- a/UKSF.Api.Personnel/Services/ServiceRecordService.cs +++ b/UKSF.Api.Personnel/Services/ServiceRecordService.cs @@ -1,5 +1,6 @@ using System; using MongoDB.Driver; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; namespace UKSF.Api.Personnel.Services { @@ -8,12 +9,12 @@ public interface IServiceRecordService { } public class ServiceRecordService : IServiceRecordService { - private readonly IAccountService accountService; + private readonly IAccountContext _accountContext; - public ServiceRecordService(IAccountService accountService) => this.accountService = accountService; + public ServiceRecordService(IAccountContext accountContext) => _accountContext = accountContext; public void AddServiceRecord(string id, string occurence, string notes) { - accountService.Data.Update(id, Builders.Update.Push("serviceRecord", new ServiceRecordEntry {Timestamp = DateTime.Now, Occurence = occurence, Notes = notes})); + _accountContext.Update(id, Builders.Update.Push("serviceRecord", new ServiceRecordEntry { Timestamp = DateTime.Now, Occurence = occurence, Notes = notes })); } } } diff --git a/UKSF.Api.Personnel/Services/UnitsService.cs b/UKSF.Api.Personnel/Services/UnitsService.cs index 87f817e9..44108137 100644 --- a/UKSF.Api.Personnel/Services/UnitsService.cs +++ b/UKSF.Api.Personnel/Services/UnitsService.cs @@ -4,12 +4,11 @@ using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; -using UKSF.Api.Base.Context; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; namespace UKSF.Api.Personnel.Services { - public interface IUnitsService : IDataBackedService { + public interface IUnitsService { IEnumerable GetSortedUnits(Func predicate = null); Task AddMember(string id, string unitId); Task RemoveMember(string id, string unitName); @@ -39,15 +38,19 @@ public interface IUnitsService : IDataBackedService { string GetChainString(Unit unit); } - public class UnitsService : DataBackedService, IUnitsService { - private readonly IRolesService rolesService; + public class UnitsService : IUnitsService { + private readonly IRolesContext _rolesContext; + private readonly IUnitsContext _unitsContext; - public UnitsService(IUnitsDataService data, IRolesService rolesService) : base(data) => this.rolesService = rolesService; + public UnitsService(IUnitsContext unitsContext, IRolesContext rolesContext) { + _unitsContext = unitsContext; + _rolesContext = rolesContext; + } public IEnumerable GetSortedUnits(Func predicate = null) { - List sortedUnits = new List(); - Unit combatRoot = Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); - Unit auxiliaryRoot = Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); + List sortedUnits = new(); + Unit combatRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); + Unit auxiliaryRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); sortedUnits.Add(combatRoot); sortedUnits.AddRange(GetAllChildren(combatRoot)); sortedUnits.Add(auxiliaryRoot); @@ -57,27 +60,27 @@ public IEnumerable GetSortedUnits(Func predicate = null) { } public async Task AddMember(string id, string unitId) { - if (Data.GetSingle(x => x.id == unitId && x.members.Contains(id)) != null) return; - await Data.Update(unitId, Builders.Update.Push(x => x.members, id)); + if (_unitsContext.GetSingle(x => x.Id == unitId && x.Members.Contains(id)) != null) return; + await _unitsContext.Update(unitId, Builders.Update.Push(x => x.Members, id)); } public async Task RemoveMember(string id, string unitName) { - Unit unit = Data.GetSingle(x => x.name == unitName); + Unit unit = _unitsContext.GetSingle(x => x.Name == unitName); if (unit == null) return; await RemoveMember(id, unit); } public async Task RemoveMember(string id, Unit unit) { - if (unit.members.Contains(id)) { - await Data.Update(unit.id, Builders.Update.Pull(x => x.members, id)); + if (unit.Members.Contains(id)) { + await _unitsContext.Update(unit.Id, Builders.Update.Pull(x => x.Members, id)); } await RemoveMemberRoles(id, unit); } public async Task SetMemberRole(string id, string unitId, string role = "") { - Unit unit = Data.GetSingle(x => x.id == unitId); + Unit unit = _unitsContext.GetSingle(x => x.Id == unitId); if (unit == null) return; await SetMemberRole(id, unit, role); @@ -86,82 +89,82 @@ public async Task SetMemberRole(string id, string unitId, string role = "") { public async Task SetMemberRole(string id, Unit unit, string role = "") { await RemoveMemberRoles(id, unit); if (!string.IsNullOrEmpty(role)) { - await Data.Update(unit.id, Builders.Update.Set($"roles.{role}", id)); + await _unitsContext.Update(unit.Id, Builders.Update.Set($"roles.{role}", id)); } } public async Task RenameRole(string oldName, string newName) { - foreach (Unit unit in Data.Get(x => x.roles.ContainsKey(oldName))) { - string id = unit.roles[oldName]; - await Data.Update(unit.id, Builders.Update.Unset($"roles.{oldName}")); - await Data.Update(unit.id, Builders.Update.Set($"roles.{newName}", id)); + foreach (Unit unit in _unitsContext.Get(x => x.Roles.ContainsKey(oldName))) { + string id = unit.Roles[oldName]; + await _unitsContext.Update(unit.Id, Builders.Update.Unset($"roles.{oldName}")); + await _unitsContext.Update(unit.Id, Builders.Update.Set($"roles.{newName}", id)); } } public async Task DeleteRole(string role) { - foreach (Unit unit in from unit in Data.Get(x => x.roles.ContainsKey(role)) let id = unit.roles[role] select unit) { - await Data.Update(unit.id, Builders.Update.Unset($"roles.{role}")); + foreach (Unit unit in from unit in _unitsContext.Get(x => x.Roles.ContainsKey(role)) let id = unit.Roles[role] select unit) { + await _unitsContext.Update(unit.Id, Builders.Update.Unset($"roles.{role}")); } } public bool HasRole(string unitId, string role) { - Unit unit = Data.GetSingle(x => x.id == unitId); + Unit unit = _unitsContext.GetSingle(x => x.Id == unitId); return HasRole(unit, role); } - public bool HasRole(Unit unit, string role) => unit.roles.ContainsKey(role); + public bool HasRole(Unit unit, string role) => unit.Roles.ContainsKey(role); public bool RolesHasMember(string unitId, string id) { - Unit unit = Data.GetSingle(x => x.id == unitId); + Unit unit = _unitsContext.GetSingle(x => x.Id == unitId); return RolesHasMember(unit, id); } - public bool RolesHasMember(Unit unit, string id) => unit.roles.ContainsValue(id); + public bool RolesHasMember(Unit unit, string id) => unit.Roles.ContainsValue(id); public bool MemberHasRole(string id, string unitId, string role) { - Unit unit = Data.GetSingle(x => x.id == unitId); + Unit unit = _unitsContext.GetSingle(x => x.Id == unitId); return MemberHasRole(id, unit, role); } - public bool MemberHasRole(string id, Unit unit, string role) => unit.roles.GetValueOrDefault(role, string.Empty) == id; + public bool MemberHasRole(string id, Unit unit, string role) => unit.Roles.GetValueOrDefault(role, string.Empty) == id; - public bool MemberHasAnyRole(string id) => Data.Get().Any(x => RolesHasMember(x, id)); + public bool MemberHasAnyRole(string id) => _unitsContext.Get().Any(x => RolesHasMember(x, id)); public int GetMemberRoleOrder(Account account, Unit unit) { - if (RolesHasMember(unit, account.id)) { - return int.MaxValue - rolesService.Data.GetSingle(x => x.name == unit.roles.FirstOrDefault(y => y.Value == account.id).Key).order; + if (RolesHasMember(unit, account.Id)) { + return int.MaxValue - _rolesContext.GetSingle(x => x.Name == unit.Roles.FirstOrDefault(y => y.Value == account.Id).Key).Order; } return -1; } - public Unit GetRoot() => Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.COMBAT); + public Unit GetRoot() => _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); - public Unit GetAuxilliaryRoot() => Data.GetSingle(x => x.parent == ObjectId.Empty.ToString() && x.branch == UnitBranch.AUXILIARY); + public Unit GetAuxilliaryRoot() => _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); public Unit GetParent(Unit unit) { - return unit.parent != string.Empty ? Data.GetSingle(x => x.id == unit.parent) : null; + return unit.Parent != string.Empty ? _unitsContext.GetSingle(x => x.Id == unit.Parent) : null; } // TODO: Change this to not add the child unit to the return public IEnumerable GetParents(Unit unit) { if (unit == null) return new List(); - List parentUnits = new List(); + List parentUnits = new(); do { parentUnits.Add(unit); Unit child = unit; - unit = !string.IsNullOrEmpty(unit.parent) ? Data.GetSingle(x => x.id == child.parent) : null; + unit = !string.IsNullOrEmpty(unit.Parent) ? _unitsContext.GetSingle(x => x.Id == child.Parent) : null; if (unit == child) break; } while (unit != null); return parentUnits; } - public IEnumerable GetChildren(Unit parent) => Data.Get(x => x.parent == parent.id).ToList(); + public IEnumerable GetChildren(Unit parent) => _unitsContext.Get(x => x.Parent == parent.Id).ToList(); public IEnumerable GetAllChildren(Unit parent, bool includeParent = false) { - List children = includeParent ? new List {parent} : new List(); - foreach (Unit unit in Data.Get(x => x.parent == parent.id)) { + List children = includeParent ? new List { parent } : new List(); + foreach (Unit unit in _unitsContext.Get(x => x.Parent == parent.Id)) { children.Add(unit); children.AddRange(GetAllChildren(unit)); } @@ -170,15 +173,15 @@ public IEnumerable GetAllChildren(Unit parent, bool includeParent = false) } public int GetUnitDepth(Unit unit) { - if (unit.parent == ObjectId.Empty.ToString()) { + if (unit.Parent == ObjectId.Empty.ToString()) { return 0; } int depth = 0; - Unit parent = Data.GetSingle(unit.parent); + Unit parent = _unitsContext.GetSingle(unit.Parent); while (parent != null) { depth++; - parent = Data.GetSingle(parent.parent); + parent = _unitsContext.GetSingle(parent.Parent); } return depth; @@ -186,20 +189,20 @@ public int GetUnitDepth(Unit unit) { public string GetChainString(Unit unit) { List parentUnits = GetParents(unit).Skip(1).ToList(); - string unitNames = unit.name; - parentUnits.ForEach(x => unitNames += $", {x.name}"); + string unitNames = unit.Name; + parentUnits.ForEach(x => unitNames += $", {x.Name}"); return unitNames; } private async Task RemoveMemberRoles(string id, Unit unit) { - Dictionary roles = unit.roles; - int originalCount = unit.roles.Count; + Dictionary roles = unit.Roles; + int originalCount = unit.Roles.Count; foreach ((string key, string _) in roles.Where(x => x.Value == id).ToList()) { roles.Remove(key); } if (roles.Count != originalCount) { - await Data.Update(unit.id, Builders.Update.Set(x => x.roles, roles)); + await _unitsContext.Update(unit.Id, Builders.Update.Set(x => x.Roles, roles)); } } } diff --git a/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj b/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj index 9be7540b..e96e9f03 100644 --- a/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj +++ b/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj @@ -12,9 +12,9 @@ - + - + diff --git a/UKSF.Api.Shared/ApiSharedExtensions.cs b/UKSF.Api.Shared/ApiSharedExtensions.cs index 6a0afc13..3467d21c 100644 --- a/UKSF.Api.Shared/ApiSharedExtensions.cs +++ b/UKSF.Api.Shared/ApiSharedExtensions.cs @@ -12,20 +12,25 @@ public static IServiceCollection AddUksfShared(this IServiceCollection services) .AddEventBuses() .AddEventHandlers() .AddServices() - .AddTransient() .AddTransient() .AddSingleton() .AddSingleton(); private static IServiceCollection AddContexts(this IServiceCollection services) => - services.AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton(); + services.AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); private static IServiceCollection AddEventBuses(this IServiceCollection services) => - services.AddSingleton, DataEventBus>().AddSingleton, DataEventBus>(); + services.AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>() + .AddSingleton, DataEventBus>(); private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; diff --git a/UKSF.Api.Shared/Context/CachedDataService.cs b/UKSF.Api.Shared/Context/CachedMongoContext.cs similarity index 78% rename from UKSF.Api.Shared/Context/CachedDataService.cs rename to UKSF.Api.Shared/Context/CachedMongoContext.cs index 71fe9dda..376d468e 100644 --- a/UKSF.Api.Shared/Context/CachedDataService.cs +++ b/UKSF.Api.Shared/Context/CachedMongoContext.cs @@ -11,15 +11,16 @@ using UKSF.Api.Shared.Models; namespace UKSF.Api.Shared.Context { - public interface ICachedDataService { + public interface ICachedMongoContext { void Refresh(); } - public class CachedDataService : DataServiceBase, IDataService, ICachedDataService where T : DatabaseObject { - private readonly IDataEventBus dataEventBus; - protected readonly object LockObject = new object(); + public class CachedMongoContext : MongoContextBase, IMongoContext, ICachedMongoContext where T : MongoObject { + private readonly IDataEventBus _dataEventBus; + protected readonly object LockObject = new(); - protected CachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, collectionName) => this.dataEventBus = dataEventBus; + protected CachedMongoContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(mongoCollectionFactory, collectionName) => + _dataEventBus = dataEventBus; public List Cache { get; protected set; } @@ -44,7 +45,7 @@ public override IEnumerable Get(Func predicate) { public override T GetSingle(string id) { if (Cache == null) Get(); - return Cache.FirstOrDefault(x => x.id == id); + return Cache.FirstOrDefault(x => x.Id == id); } public override T GetSingle(Func predicate) { @@ -56,7 +57,13 @@ public override async Task Add(T item) { if (Cache == null) Get(); await base.Add(item); SetCache(Cache.Concat(new[] { item })); - DataAddEvent(item.id, item); + DataAddEvent(item.Id, item); + } + + public override async Task Update(string id, Expression> fieldSelector, object value) { + await base.Update(id, fieldSelector, value); + Refresh(); // TODO: intelligent refresh + DataUpdateEvent(id); } public override async Task Update(string id, string fieldName, object value) { @@ -74,21 +81,21 @@ public override async Task Update(string id, UpdateDefinition update) { public override async Task Update(Expression> filterExpression, UpdateDefinition update) { await base.Update(filterExpression, update); Refresh(); // TODO: intelligent refresh - DataUpdateEvent(GetSingle(filterExpression.Compile()).id); + DataUpdateEvent(GetSingle(filterExpression.Compile()).Id); } public override async Task UpdateMany(Expression> filterExpression, UpdateDefinition update) { await base.UpdateMany(filterExpression, update); Refresh(); // TODO: intelligent refresh - Get(filterExpression.Compile()).ForEach(x => DataUpdateEvent(x.id)); + Get(filterExpression.Compile()).ForEach(x => DataUpdateEvent(x.Id)); } public override async Task Replace(T item) { - string id = item.id; + string id = item.Id; T cacheItem = GetSingle(id); await base.Replace(item); SetCache(Cache.Except(new[] { cacheItem }).Concat(new[] { item })); - DataUpdateEvent(item.id); + DataUpdateEvent(item.Id); } public override async Task Delete(string id) { @@ -102,14 +109,14 @@ public override async Task Delete(T item) { if (Cache == null) Get(); await base.Delete(item); SetCache(Cache.Except(new[] { item })); - DataDeleteEvent(item.id); + DataDeleteEvent(item.Id); } public override async Task DeleteMany(Expression> filterExpression) { List ids = Get(filterExpression.Compile()).ToList(); await base.DeleteMany(filterExpression); SetCache(Cache.Except(ids)); - ids.ForEach(x => DataDeleteEvent(x.id)); + ids.ForEach(x => DataDeleteEvent(x.Id)); } protected virtual void SetCache(IEnumerable newCollection) { @@ -131,7 +138,7 @@ private void DataDeleteEvent(string id) { } protected virtual void DataEvent(DataEventModel dataEvent) { - dataEventBus.Send(dataEvent); + _dataEventBus.Send(dataEvent); } } } diff --git a/UKSF.Api.Shared/Context/LogContext.cs b/UKSF.Api.Shared/Context/LogContext.cs new file mode 100644 index 00000000..84d38fde --- /dev/null +++ b/UKSF.Api.Shared/Context/LogContext.cs @@ -0,0 +1,35 @@ +using UKSF.Api.Base.Context; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; + +namespace UKSF.Api.Shared.Context { + public interface ILogContext : IMongoContext { } + + public interface IAuditLogContext : IMongoContext { } + + public interface IHttpErrorLogContext : IMongoContext { } + + public interface ILauncherLogContext : IMongoContext { } + + public interface IDiscordLogContext : IMongoContext { } + + public class LogContext : MongoContext, ILogContext { + public LogContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "logs") { } + } + + public class AuditLogContext : MongoContext, IAuditLogContext { + public AuditLogContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "auditLogs") { } + } + + public class HttpErrorLogContext : MongoContext, IHttpErrorLogContext { + public HttpErrorLogContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "errorLogs") { } + } + + public class LauncherLogContext : MongoContext, ILauncherLogContext { + public LauncherLogContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "launcherLogs") { } + } + + public class DiscordLogContext : MongoContext, IDiscordLogContext { + public DiscordLogContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "discordLogs") { } + } +} diff --git a/UKSF.Api.Shared/Context/LogDataService.cs b/UKSF.Api.Shared/Context/LogDataService.cs deleted file mode 100644 index 0f96fa72..00000000 --- a/UKSF.Api.Shared/Context/LogDataService.cs +++ /dev/null @@ -1,29 +0,0 @@ -using UKSF.Api.Base.Context; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; - -namespace UKSF.Api.Shared.Context { - public interface ILogDataService : IDataService { } - - public interface IAuditLogDataService : IDataService { } - - public interface IHttpErrorLogDataService : IDataService { } - - public interface ILauncherLogDataService : IDataService { } - - public class LogDataService : DataService, ILogDataService { - public LogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "logs") { } - } - - public class AuditLogDataService : DataService, IAuditLogDataService { - public AuditLogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "auditLogs") { } - } - - public class HttpErrorLogDataService : DataService, IHttpErrorLogDataService { - public HttpErrorLogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "errorLogs") { } - } - - public class LauncherLogDataService : DataService, ILauncherLogDataService { - public LauncherLogDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "launcherLogs") { } - } -} diff --git a/UKSF.Api.Shared/Context/DataService.cs b/UKSF.Api.Shared/Context/MongoContext.cs similarity index 76% rename from UKSF.Api.Shared/Context/DataService.cs rename to UKSF.Api.Shared/Context/MongoContext.cs index 8ce621b0..976893dd 100644 --- a/UKSF.Api.Shared/Context/DataService.cs +++ b/UKSF.Api.Shared/Context/MongoContext.cs @@ -10,12 +10,13 @@ using UKSF.Api.Shared.Models; namespace UKSF.Api.Shared.Context { - public interface IDataService { + public interface IMongoContext { IEnumerable Get(); IEnumerable Get(Func predicate); T GetSingle(string id); T GetSingle(Func predicate); Task Add(T item); + Task Update(string id, Expression> fieldSelector, object value); Task Update(string id, string fieldName, object value); Task Update(string id, UpdateDefinition update); Task Update(Expression> filterExpression, UpdateDefinition update); @@ -26,18 +27,23 @@ public interface IDataService { Task DeleteMany(Expression> filterExpression); } - public abstract class - DataService : DataServiceBase, IDataService where T : DatabaseObject { - private readonly IDataEventBus dataEventBus; + public class MongoContext : MongoContextBase, IMongoContext where T : MongoObject { + private readonly IDataEventBus _dataEventBus; - protected DataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, collectionName) => - this.dataEventBus = dataEventBus; + protected MongoContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(mongoCollectionFactory, collectionName) => + _dataEventBus = dataEventBus; public override async Task Add(T item) { await base.Add(item); - DataAddEvent(item.id, item); + DataAddEvent(item.Id, item); } + public override async Task Update(string id, Expression> fieldSelector, object value) { + await base.Update(id, fieldSelector, value); + DataUpdateEvent(id); + } + + // TODO: Deprecate public override async Task Update(string id, string fieldName, object value) { await base.Update(id, fieldName, value); DataUpdateEvent(id); @@ -50,17 +56,17 @@ public override async Task Update(string id, UpdateDefinition update) { public override async Task Update(Expression> filterExpression, UpdateDefinition update) { await base.Update(filterExpression, update); - DataUpdateEvent(GetSingle(filterExpression.Compile()).id); + DataUpdateEvent(GetSingle(filterExpression.Compile()).Id); } public override async Task UpdateMany(Expression> filterExpression, UpdateDefinition update) { await base.UpdateMany(filterExpression, update); - Get(filterExpression.Compile()).ForEach(x => DataUpdateEvent(x.id)); + Get(filterExpression.Compile()).ForEach(x => DataUpdateEvent(x.Id)); } public override async Task Replace(T item) { await base.Replace(item); - DataUpdateEvent(item.id); + DataUpdateEvent(item.Id); } public override async Task Delete(string id) { @@ -70,12 +76,12 @@ public override async Task Delete(string id) { public override async Task Delete(T item) { await base.Delete(item); - DataDeleteEvent(item.id); + DataDeleteEvent(item.Id); } public override async Task DeleteMany(Expression> filterExpression) { await base.DeleteMany(filterExpression); - Get(filterExpression.Compile()).ForEach(x => DataDeleteEvent(x.id)); + Get(filterExpression.Compile()).ForEach(x => DataDeleteEvent(x.Id)); } private void DataAddEvent(string id, T item) { @@ -91,7 +97,7 @@ private void DataDeleteEvent(string id) { } protected virtual void DataEvent(DataEventModel dataEvent) { - dataEventBus.Send(dataEvent); + _dataEventBus.Send(dataEvent); } } } diff --git a/UKSF.Api.Shared/Context/SchedulerContext.cs b/UKSF.Api.Shared/Context/SchedulerContext.cs new file mode 100644 index 00000000..4afef289 --- /dev/null +++ b/UKSF.Api.Shared/Context/SchedulerContext.cs @@ -0,0 +1,11 @@ +using UKSF.Api.Base.Context; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; + +namespace UKSF.Api.Shared.Context { + public interface ISchedulerContext : IMongoContext { } + + public class SchedulerContext : MongoContext, ISchedulerContext { + public SchedulerContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "scheduledJobs") { } + } +} diff --git a/UKSF.Api.Shared/Context/SchedulerDataService.cs b/UKSF.Api.Shared/Context/SchedulerDataService.cs deleted file mode 100644 index 44713ad9..00000000 --- a/UKSF.Api.Shared/Context/SchedulerDataService.cs +++ /dev/null @@ -1,11 +0,0 @@ -using UKSF.Api.Base.Context; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; - -namespace UKSF.Api.Shared.Context { - public interface ISchedulerDataService : IDataService { } - - public class SchedulerDataService : DataService, ISchedulerDataService { - public SchedulerDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus) : base(dataCollectionFactory, dataEventBus, "scheduledJobs") { } - } -} diff --git a/UKSF.Api.Shared/Events/DataEventBus.cs b/UKSF.Api.Shared/Events/DataEventBus.cs index a71b6823..fee2fea2 100644 --- a/UKSF.Api.Shared/Events/DataEventBus.cs +++ b/UKSF.Api.Shared/Events/DataEventBus.cs @@ -5,9 +5,9 @@ using UKSF.Api.Shared.Models; namespace UKSF.Api.Shared.Events { - public interface IDataEventBus : IEventBus> where T : DatabaseObject { } + public interface IDataEventBus : IEventBus> where T : MongoObject { } - public class DataEventBus : EventBus>, IDataEventBus where T : DatabaseObject { + public class DataEventBus : EventBus>, IDataEventBus where T : MongoObject { public override IObservable> AsObservable() => Subject.OfType>(); } } diff --git a/UKSF.Api.Shared/Events/EventModelFactory.cs b/UKSF.Api.Shared/Events/EventModelFactory.cs index 85a2f6ea..cd5d9e69 100644 --- a/UKSF.Api.Shared/Events/EventModelFactory.cs +++ b/UKSF.Api.Shared/Events/EventModelFactory.cs @@ -3,6 +3,6 @@ namespace UKSF.Api.Shared.Events { public static class EventModelFactory { - public static DataEventModel CreateDataEvent(DataEventType type, string id, object data = null) where T : DatabaseObject => new DataEventModel { type = type, id = id, data = data }; + public static DataEventModel CreateDataEvent(DataEventType type, string id, object data = null) where T : MongoObject => new() { Type = type, Id = id, Data = data }; } } diff --git a/UKSF.Api.Shared/Events/Logger.cs b/UKSF.Api.Shared/Events/Logger.cs index a83a464e..8ef58198 100644 --- a/UKSF.Api.Shared/Events/Logger.cs +++ b/UKSF.Api.Shared/Events/Logger.cs @@ -12,12 +12,13 @@ public interface ILogger : IEventBus { void LogHttpError(Exception exception); void LogHttpError(HttpErrorLog log); void LogAudit(string message, string userId = ""); + void LogDiscordEvent(DiscordUserEventType discordUserEventType, string name, string userId, string message); } public class Logger : EventBus, ILogger { - private readonly IHttpContextService httpContextService; + private readonly IHttpContextService _httpContextService; - public Logger(IHttpContextService httpContextService) => this.httpContextService = httpContextService; + public Logger(IHttpContextService httpContextService) => _httpContextService = httpContextService; public void LogInfo(string message) { Log(new BasicLog(message, LogLevel.INFO)); @@ -44,10 +45,14 @@ public void LogHttpError(HttpErrorLog log) { } public void LogAudit(string message, string userId = "") { - userId = string.IsNullOrEmpty(userId) ? httpContextService.GetUserId() ?? "Server" : userId; + userId = string.IsNullOrEmpty(userId) ? _httpContextService.GetUserId() ?? "Server" : userId; Log(new AuditLog(userId, message)); } + public void LogDiscordEvent(DiscordUserEventType discordUserEventType, string name, string userId, string message) { + Log(new DiscordLog(discordUserEventType, name, userId, message)); + } + private void Log(BasicLog log) { Send(log); } diff --git a/UKSF.Api.Shared/Extensions/ChangeUtilities.cs b/UKSF.Api.Shared/Extensions/ChangeUtilities.cs index 09fefa52..487c8726 100644 --- a/UKSF.Api.Shared/Extensions/ChangeUtilities.cs +++ b/UKSF.Api.Shared/Extensions/ChangeUtilities.cs @@ -7,10 +7,10 @@ namespace UKSF.Api.Shared.Extensions { public static class ChangeUtilities { - public static string Changes(this T original, T updated) => DeepEquals(original, updated) ? "No changes" : FormatChanges(GetChanges(original, updated)); + public static string Changes(this T original, T updated) => DeepEquals(original, updated) ? "\tNo changes" : FormatChanges(GetChanges(original, updated)); private static List GetChanges(this T original, T updated) { - List changes = new List(); + List changes = new(); Type type = original.GetType(); foreach (FieldInfo fieldInfo in type.GetFields()) { string name = fieldInfo.Name; @@ -58,7 +58,7 @@ private static bool DeepEquals(object original, object updated) { } private static string FormatChanges(IReadOnlyCollection changes, string indentation = "") { - if (!changes.Any()) return "No changes"; + if (!changes.Any()) return "\tNo changes"; return changes.OrderBy(x => x.Type) .ThenBy(x => x.Name) @@ -92,7 +92,7 @@ private static string FormatListChanges(IEnumerable changes, string inde } public class Change { - public List InnerChanges = new List(); + public List InnerChanges = new(); public string Name; public string Original; public ChangeType Type; diff --git a/UKSF.Api.Shared/Extensions/JsonExtensions.cs b/UKSF.Api.Shared/Extensions/JsonExtensions.cs index 64ae0e80..720c78c2 100644 --- a/UKSF.Api.Shared/Extensions/JsonExtensions.cs +++ b/UKSF.Api.Shared/Extensions/JsonExtensions.cs @@ -4,7 +4,7 @@ namespace UKSF.Api.Shared.Extensions { public static class JsonExtensions { public static T Copy(this object source) { - JsonSerializerSettings deserializeSettings = new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace }; + JsonSerializerSettings deserializeSettings = new() { ObjectCreationHandling = ObjectCreationHandling.Replace }; return JsonConvert.DeserializeObject(JsonConvert.SerializeObject(source), deserializeSettings); } diff --git a/UKSF.Api.Shared/Extensions/ProcessUtilities.cs b/UKSF.Api.Shared/Extensions/ProcessUtilities.cs index 28dec298..557b5401 100644 --- a/UKSF.Api.Shared/Extensions/ProcessUtilities.cs +++ b/UKSF.Api.Shared/Extensions/ProcessUtilities.cs @@ -13,8 +13,8 @@ public static class ProcessUtilities { public static int LaunchManagedProcess(string executable, string arguments = null) { int processId = default; - using ManagementClass managementClass = new ManagementClass("Win32_Process"); - ManagementClass processInfo = new ManagementClass("Win32_ProcessStartup"); + using ManagementClass managementClass = new("Win32_Process"); + ManagementClass processInfo = new("Win32_ProcessStartup"); processInfo.Properties["CreateFlags"].Value = 0x00000008; ManagementBaseObject inParameters = managementClass.GetMethodParameters("Create"); diff --git a/UKSF.Api.Shared/Extensions/ServiceExtensions.cs b/UKSF.Api.Shared/Extensions/ServiceExtensions.cs index 9a01655b..b6077abf 100644 --- a/UKSF.Api.Shared/Extensions/ServiceExtensions.cs +++ b/UKSF.Api.Shared/Extensions/ServiceExtensions.cs @@ -10,7 +10,7 @@ namespace UKSF.Api.Shared.Extensions { public static class ServiceExtensions { public static IEnumerable GetInterfaceServices(this IServiceProvider provider) { if (provider is ServiceProvider serviceProvider) { - List services = new List(); + List services = new(); object engine = serviceProvider.GetFieldValue("_engine"); object callSiteFactory = engine.GetPropertyValue("CallSiteFactory"); diff --git a/UKSF.Api.Shared/Models/AuditLog.cs b/UKSF.Api.Shared/Models/AuditLog.cs index 44a398bf..e4d3c580 100644 --- a/UKSF.Api.Shared/Models/AuditLog.cs +++ b/UKSF.Api.Shared/Models/AuditLog.cs @@ -1,10 +1,10 @@ namespace UKSF.Api.Shared.Models { - public class AuditLog : BasicLog { - public string who; + public record AuditLog : BasicLog { + public string Who; public AuditLog(string who, string message) : base(message) { - this.who = who; - level = LogLevel.INFO; + Who = who; + Level = LogLevel.INFO; } } } diff --git a/UKSF.Api.Shared/Models/BasicLog.cs b/UKSF.Api.Shared/Models/BasicLog.cs index 8e8111a7..df60cf05 100644 --- a/UKSF.Api.Shared/Models/BasicLog.cs +++ b/UKSF.Api.Shared/Models/BasicLog.cs @@ -9,23 +9,26 @@ public enum LogLevel { WARNING } - public class BasicLog : DatabaseObject { - public LogLevel level = LogLevel.INFO; - public string message; - public DateTime timestamp = DateTime.UtcNow; - - protected BasicLog() { } + public record BasicLog : MongoObject { + protected BasicLog() { + Level = LogLevel.INFO; + Timestamp = DateTime.UtcNow; + } - public BasicLog(string text) : this() => message = text; + public BasicLog(string text) : this() => Message = text; public BasicLog(string text, LogLevel logLevel) : this() { - message = text; - level = logLevel; + Message = text; + Level = logLevel; } public BasicLog(Exception exception) : this() { - message = exception.GetBaseException().ToString(); - level = LogLevel.ERROR; + Message = exception.GetBaseException().ToString(); + Level = LogLevel.ERROR; } + + public LogLevel Level { get; protected init; } + public string Message { get; set; } + public DateTime Timestamp { get; init; } } } diff --git a/UKSF.Api.Shared/Models/DataEventModel.cs b/UKSF.Api.Shared/Models/DataEventModel.cs index 4e66e003..20452c04 100644 --- a/UKSF.Api.Shared/Models/DataEventModel.cs +++ b/UKSF.Api.Shared/Models/DataEventModel.cs @@ -8,9 +8,9 @@ public enum DataEventType { } // ReSharper disable once UnusedTypeParameter - public class DataEventModel where T : DatabaseObject { - public object data; - public string id; - public DataEventType type; + public class DataEventModel where T : MongoObject { + public object Data; + public string Id; + public DataEventType Type; } } diff --git a/UKSF.Api.Shared/Models/DiscordLog.cs b/UKSF.Api.Shared/Models/DiscordLog.cs new file mode 100644 index 00000000..42552207 --- /dev/null +++ b/UKSF.Api.Shared/Models/DiscordLog.cs @@ -0,0 +1,20 @@ +namespace UKSF.Api.Shared.Models { + public enum DiscordUserEventType { + JOINED, + LEFT, + BANNED, + UNBANNED + } + + public record DiscordLog : BasicLog { + public DiscordLog(DiscordUserEventType discordUserEventType, string name, string userId, string message) : base(message) { + UserId = userId; + Name = name; + DiscordUserEventType = discordUserEventType; + } + + public string UserId { get; } + public string Name { get; } + public DiscordUserEventType DiscordUserEventType { get; } + } +} diff --git a/UKSF.Api.Shared/Models/HttpErrorLog.cs b/UKSF.Api.Shared/Models/HttpErrorLog.cs index 1d880d1c..922bec96 100644 --- a/UKSF.Api.Shared/Models/HttpErrorLog.cs +++ b/UKSF.Api.Shared/Models/HttpErrorLog.cs @@ -1,19 +1,24 @@ using System; namespace UKSF.Api.Shared.Models { - public class HttpErrorLog : BasicLog { - public string exception; - public string httpMethod; - public string name; - public string url; - public string userId; - - public HttpErrorLog() { } - + public record HttpErrorLog : BasicLog { public HttpErrorLog(Exception exception) { - message = exception.GetBaseException().Message; - this.exception = exception.ToString(); - level = LogLevel.ERROR; + Exception = exception.ToString(); + Message = exception.GetBaseException().Message; + Level = LogLevel.ERROR; } + + public HttpErrorLog(Exception exception, string name, string userId, string httpMethod, string url) : this(exception) { + Name = name; + UserId = userId; + HttpMethod = httpMethod; + Url = url; + } + + public string Exception { get; } + public string HttpMethod { get; } + public string Name { get; } + public string Url { get; } + public string UserId { get; } } } diff --git a/UKSF.Api.Shared/Models/LauncherLog.cs b/UKSF.Api.Shared/Models/LauncherLog.cs index 062665dd..86c969b3 100644 --- a/UKSF.Api.Shared/Models/LauncherLog.cs +++ b/UKSF.Api.Shared/Models/LauncherLog.cs @@ -1,9 +1,9 @@ namespace UKSF.Api.Shared.Models { - public class LauncherLog : BasicLog { - public string name; - public string userId; - public string version; + public record LauncherLog : BasicLog { + public string Name; + public string UserId; + public string Version; - public LauncherLog(string version, string message) : base(message) => this.version = version; + public LauncherLog(string version, string message) : base(message) => Version = version; } } diff --git a/UKSF.Api.Shared/Models/ScheduledJob.cs b/UKSF.Api.Shared/Models/ScheduledJob.cs index 8a354397..74d62dc7 100644 --- a/UKSF.Api.Shared/Models/ScheduledJob.cs +++ b/UKSF.Api.Shared/Models/ScheduledJob.cs @@ -2,11 +2,11 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Shared.Models { - public class ScheduledJob : DatabaseObject { - public string action; - public string actionParameters; - public TimeSpan interval; - public DateTime next; - public bool repeat; + public record ScheduledJob : MongoObject { + public string Action; + public string ActionParameters; + public TimeSpan Interval; + public DateTime Next; + public bool Repeat; } } diff --git a/UKSF.Api.Shared/Models/SignalrEventModel.cs b/UKSF.Api.Shared/Models/SignalrEventModel.cs index 1b678077..e3a1e663 100644 --- a/UKSF.Api.Shared/Models/SignalrEventModel.cs +++ b/UKSF.Api.Shared/Models/SignalrEventModel.cs @@ -1,6 +1,6 @@ namespace UKSF.Api.Shared.Models { public class SignalrEventModel { - public TeamspeakEventType procedure; - public object args; + public object Args; + public TeamspeakEventType Procedure; } } diff --git a/UKSF.Api.Shared/Models/TeamspeakMessageEventModel.cs b/UKSF.Api.Shared/Models/TeamspeakMessageEventModel.cs index 7b6278e6..e70ef76d 100644 --- a/UKSF.Api.Shared/Models/TeamspeakMessageEventModel.cs +++ b/UKSF.Api.Shared/Models/TeamspeakMessageEventModel.cs @@ -2,12 +2,12 @@ namespace UKSF.Api.Shared.Models { public class TeamspeakMessageEventModel { - public IEnumerable ClientDbIds { get; } - public string Message { get; } - public TeamspeakMessageEventModel(IEnumerable clientDbIds, string message) { ClientDbIds = clientDbIds; Message = message; } + + public IEnumerable ClientDbIds { get; } + public string Message { get; } } } diff --git a/UKSF.Api.Shared/Permissions.cs b/UKSF.Api.Shared/Permissions.cs index 5007ea19..290c60b9 100644 --- a/UKSF.Api.Shared/Permissions.cs +++ b/UKSF.Api.Shared/Permissions.cs @@ -4,6 +4,8 @@ namespace UKSF.Api.Shared { public static class Permissions { + public static readonly HashSet ALL = new() { MEMBER, ADMIN, COMMAND, NCO, RECRUITER, RECRUITER_LEAD, PERSONNEL, SERVERS, TESTER }; + #region MemberStates public const string CONFIRMED = "CONFIRMED"; @@ -25,18 +27,6 @@ public static class Permissions { public const string TESTER = "TESTER"; #endregion - - public static readonly HashSet ALL = new HashSet { - MEMBER, - ADMIN, - COMMAND, - NCO, - RECRUITER, - RECRUITER_LEAD, - PERSONNEL, - SERVERS, - TESTER - }; } public class PermissionsAttribute : AuthorizeAttribute { diff --git a/UKSF.Api.Shared/Services/ScheduledActionFactory.cs b/UKSF.Api.Shared/Services/ScheduledActionFactory.cs index e15f3636..91879970 100644 --- a/UKSF.Api.Shared/Services/ScheduledActionFactory.cs +++ b/UKSF.Api.Shared/Services/ScheduledActionFactory.cs @@ -9,16 +9,16 @@ public interface IScheduledActionFactory { } public class ScheduledActionFactory : IScheduledActionFactory { - private readonly Dictionary scheduledActions = new Dictionary(); + private readonly Dictionary _scheduledActions = new(); public void RegisterScheduledActions(IEnumerable newScheduledActions) { foreach (IScheduledAction scheduledAction in newScheduledActions) { - scheduledActions[scheduledAction.Name] = scheduledAction; + _scheduledActions[scheduledAction.Name] = scheduledAction; } } public IScheduledAction GetScheduledAction(string actionName) { - if (scheduledActions.TryGetValue(actionName, out IScheduledAction action)) { + if (_scheduledActions.TryGetValue(actionName, out IScheduledAction action)) { return action; } diff --git a/UKSF.Api.Shared/Services/SchedulerService.cs b/UKSF.Api.Shared/Services/SchedulerService.cs index ad0da794..e0cfea21 100644 --- a/UKSF.Api.Shared/Services/SchedulerService.cs +++ b/UKSF.Api.Shared/Services/SchedulerService.cs @@ -4,7 +4,6 @@ using System.Threading; using System.Threading.Tasks; using Newtonsoft.Json; -using UKSF.Api.Base.Context; using UKSF.Api.Base.Models; using UKSF.Api.Base.ScheduledActions; using UKSF.Api.Shared.Context; @@ -12,25 +11,27 @@ using UKSF.Api.Shared.Models; namespace UKSF.Api.Shared.Services { - public interface ISchedulerService : IDataBackedService { + public interface ISchedulerService { void Load(); Task CreateAndScheduleJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters); Task CreateScheduledJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters); Task Cancel(Func predicate); } - public class SchedulerService : DataBackedService, ISchedulerService { - private static readonly ConcurrentDictionary ACTIVE_TASKS = new ConcurrentDictionary(); + public class SchedulerService : ISchedulerService { + private static readonly ConcurrentDictionary ACTIVE_TASKS = new(); + private readonly ISchedulerContext _context; private readonly ILogger _logger; private readonly IScheduledActionFactory _scheduledActionFactory; - public SchedulerService(ISchedulerDataService data, IScheduledActionFactory scheduledActionFactory, ILogger logger) : base(data) { + public SchedulerService(ISchedulerContext context, IScheduledActionFactory scheduledActionFactory, ILogger logger) { + _context = context; _scheduledActionFactory = scheduledActionFactory; _logger = logger; } public void Load() { - Data.Get().ToList().ForEach(Schedule); + _context.Get().ToList().ForEach(Schedule); } public async Task CreateAndScheduleJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { @@ -39,45 +40,45 @@ public async Task CreateAndScheduleJob(DateTime next, TimeSpan interval, string } public async Task Cancel(Func predicate) { - ScheduledJob job = Data.GetSingle(predicate); + ScheduledJob job = _context.GetSingle(predicate); if (job == null) return; - if (ACTIVE_TASKS.TryGetValue(job.id, out CancellationTokenSource token)) { + if (ACTIVE_TASKS.TryGetValue(job.Id, out CancellationTokenSource token)) { token.Cancel(); - ACTIVE_TASKS.TryRemove(job.id, out CancellationTokenSource _); + ACTIVE_TASKS.TryRemove(job.Id, out CancellationTokenSource _); } - await Data.Delete(job); + await _context.Delete(job); } public async Task CreateScheduledJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { - ScheduledJob job = new ScheduledJob { next = next, action = action }; + ScheduledJob job = new() { Next = next, Action = action }; if (actionParameters.Length > 0) { - job.actionParameters = JsonConvert.SerializeObject(actionParameters); + job.ActionParameters = JsonConvert.SerializeObject(actionParameters); } if (interval != TimeSpan.Zero) { - job.interval = interval; - job.repeat = true; + job.Interval = interval; + job.Repeat = true; } - await Data.Add(job); + await _context.Add(job); return job; } private void Schedule(ScheduledJob job) { - CancellationTokenSource token = new CancellationTokenSource(); + CancellationTokenSource token = new(); Task unused = Task.Run( async () => { DateTime now = DateTime.Now; - if (now < job.next) { - TimeSpan delay = job.next - now; + if (now < job.Next) { + TimeSpan delay = job.Next - now; await Task.Delay(delay, token.Token); if (IsCancelled(job, token)) return; } else { - if (job.repeat) { - DateTime nowLessInterval = now - job.interval; - while (job.next < nowLessInterval) { - job.next += job.interval; + if (job.Repeat) { + DateTime nowLessInterval = now - job.Interval; + while (job.Next < nowLessInterval) { + job.Next += job.Interval; } } } @@ -88,32 +89,32 @@ private void Schedule(ScheduledJob job) { _logger.LogError(exception); } - if (job.repeat) { - job.next += job.interval; + if (job.Repeat) { + job.Next += job.Interval; await SetNext(job); Schedule(job); } else { - await Data.Delete(job); - ACTIVE_TASKS.TryRemove(job.id, out CancellationTokenSource _); + await _context.Delete(job); + ACTIVE_TASKS.TryRemove(job.Id, out CancellationTokenSource _); } }, token.Token ); - ACTIVE_TASKS[job.id] = token; + ACTIVE_TASKS[job.Id] = token; } private async Task SetNext(ScheduledJob job) { - await Data.Update(job.id, "next", job.next); + await _context.Update(job.Id, "next", job.Next); } - private bool IsCancelled(DatabaseObject job, CancellationTokenSource token) { + private bool IsCancelled(MongoObject job, CancellationTokenSource token) { if (token.IsCancellationRequested) return true; - return Data.GetSingle(job.id) == null; + return _context.GetSingle(job.Id) == null; } private void ExecuteAction(ScheduledJob job) { - IScheduledAction action = _scheduledActionFactory.GetScheduledAction(job.action); - object[] parameters = job.actionParameters == null ? null : JsonConvert.DeserializeObject(job.actionParameters); + IScheduledAction action = _scheduledActionFactory.GetScheduledAction(job.Action); + object[] parameters = job.ActionParameters == null ? null : JsonConvert.DeserializeObject(job.ActionParameters); action.Run(parameters); } } diff --git a/UKSF.Api.sln b/UKSF.Api.sln index 66159cef..a436c7de 100644 --- a/UKSF.Api.sln +++ b/UKSF.Api.sln @@ -36,10 +36,42 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Integrations.Teams EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Launcher", "UKSF.Api.Launcher\UKSF.Api.Launcher.csproj", "{7E90402E-6762-46B2-911E-AB890FC108A4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Integration.Instagram", "UKSF.Api.Integration.Instagram\UKSF.Api.Integration.Instagram.csproj", "{B248CB10-298A-4B40-A999-FAAEFDDDD3E4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Integrations.Instagram", "UKSF.Api.Integrations.Instagram\UKSF.Api.Integrations.Instagram.csproj", "{B248CB10-298A-4B40-A999-FAAEFDDDD3E4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Shared", "UKSF.Api.Shared\UKSF.Api.Shared.csproj", "{5CADD496-CF3E-4176-9AF3-F6300329827E}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CC667E2D-8CA8-44C6-8459-A4EE9A4DE234}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Tests", "Tests\UKSF.Api.Tests\UKSF.Api.Tests.csproj", "{56594A9C-D7DF-49E5-A515-6342F142A8A1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Admin.Tests", "Tests\UKSF.Api.Admin.Tests\UKSF.Api.Admin.Tests.csproj", "{55CB96AD-366C-43BC-B21E-E0EA6714696C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.ArmaMissions.Tests", "Tests\UKSF.Api.ArmaMissions.Tests\UKSF.Api.ArmaMissions.Tests.csproj", "{69C177CF-6C1A-4693-831B-81624E18296A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.ArmaServer.Tests", "Tests\UKSF.Api.ArmaServer.Tests\UKSF.Api.ArmaServer.Tests.csproj", "{556EFE05-0058-4FB4-AAAA-518DD8BA4FBC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Auth.Tests", "Tests\UKSF.Api.Auth.Tests\UKSF.Api.Auth.Tests.csproj", "{E519456D-F78C-49D1-B64D-85B9E6277638}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Base.Tests", "Tests\UKSF.Api.Base.Tests\UKSF.Api.Base.Tests.csproj", "{5F98C140-D0D1-4B1D-A3DD-CA995A62523D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Command.Tests", "Tests\UKSF.Api.Command.Tests\UKSF.Api.Command.Tests.csproj", "{0F4FE9D2-CE8F-4A2A-8B7B-CD04E84405BE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Integrations.Instagram.Tests", "Tests\UKSF.Api.Integrations.Instagram.Tests\UKSF.Api.Integrations.Instagram.Tests.csproj", "{0A645C96-01A9-4EEB-9FC8-3E588CB2FC06}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Integrations.Discord.Tests", "Tests\UKSF.Api.Integrations.Discord.Tests\UKSF.Api.Integrations.Discord.Tests.csproj", "{31AF7726-44C5-49C3-AD39-F9660B9138B3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Integrations.Teamspeak", "Tests\UKSF.Api.Integrations.Teamspeak\UKSF.Api.Integrations.Teamspeak.csproj", "{22611568-B956-4086-AA66-803C0040EBBC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Launcher.Tests", "Tests\UKSF.Api.Launcher.Tests\UKSF.Api.Launcher.Tests.csproj", "{B63BA910-2192-4C26-AFF9-59A995941F83}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Modpack.Tests", "Tests\UKSF.Api.Modpack.Tests\UKSF.Api.Modpack.Tests.csproj", "{61EBA2B4-AFC8-4650-80AC-3A5BEE3E9514}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Personnel.Tests", "Tests\UKSF.Api.Personnel.Tests\UKSF.Api.Personnel.Tests.csproj", "{AB2D396E-3F44-4227-AE09-B0FD88CC651B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Shared.Tests", "Tests\UKSF.Api.Shared.Tests\UKSF.Api.Shared.Tests.csproj", "{010C435A-4D9D-43FB-910A-D3C7B3789F7E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Tests.Common", "Tests\UKSF.Api.Tests.Common\UKSF.Api.Tests.Common.csproj", "{A14C3385-FFD7-417D-9D49-D9953774F21C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -176,6 +208,126 @@ Global {5CADD496-CF3E-4176-9AF3-F6300329827E}.Release|x64.Build.0 = Release|Any CPU {5CADD496-CF3E-4176-9AF3-F6300329827E}.Release|x86.ActiveCfg = Release|Any CPU {5CADD496-CF3E-4176-9AF3-F6300329827E}.Release|x86.Build.0 = Release|Any CPU + {56594A9C-D7DF-49E5-A515-6342F142A8A1}.Debug|x64.ActiveCfg = Debug|Any CPU + {56594A9C-D7DF-49E5-A515-6342F142A8A1}.Debug|x64.Build.0 = Debug|Any CPU + {56594A9C-D7DF-49E5-A515-6342F142A8A1}.Debug|x86.ActiveCfg = Debug|Any CPU + {56594A9C-D7DF-49E5-A515-6342F142A8A1}.Debug|x86.Build.0 = Debug|Any CPU + {56594A9C-D7DF-49E5-A515-6342F142A8A1}.Release|x64.ActiveCfg = Release|Any CPU + {56594A9C-D7DF-49E5-A515-6342F142A8A1}.Release|x64.Build.0 = Release|Any CPU + {56594A9C-D7DF-49E5-A515-6342F142A8A1}.Release|x86.ActiveCfg = Release|Any CPU + {56594A9C-D7DF-49E5-A515-6342F142A8A1}.Release|x86.Build.0 = Release|Any CPU + {55CB96AD-366C-43BC-B21E-E0EA6714696C}.Debug|x64.ActiveCfg = Debug|Any CPU + {55CB96AD-366C-43BC-B21E-E0EA6714696C}.Debug|x64.Build.0 = Debug|Any CPU + {55CB96AD-366C-43BC-B21E-E0EA6714696C}.Debug|x86.ActiveCfg = Debug|Any CPU + {55CB96AD-366C-43BC-B21E-E0EA6714696C}.Debug|x86.Build.0 = Debug|Any CPU + {55CB96AD-366C-43BC-B21E-E0EA6714696C}.Release|x64.ActiveCfg = Release|Any CPU + {55CB96AD-366C-43BC-B21E-E0EA6714696C}.Release|x64.Build.0 = Release|Any CPU + {55CB96AD-366C-43BC-B21E-E0EA6714696C}.Release|x86.ActiveCfg = Release|Any CPU + {55CB96AD-366C-43BC-B21E-E0EA6714696C}.Release|x86.Build.0 = Release|Any CPU + {69C177CF-6C1A-4693-831B-81624E18296A}.Debug|x64.ActiveCfg = Debug|Any CPU + {69C177CF-6C1A-4693-831B-81624E18296A}.Debug|x64.Build.0 = Debug|Any CPU + {69C177CF-6C1A-4693-831B-81624E18296A}.Debug|x86.ActiveCfg = Debug|Any CPU + {69C177CF-6C1A-4693-831B-81624E18296A}.Debug|x86.Build.0 = Debug|Any CPU + {69C177CF-6C1A-4693-831B-81624E18296A}.Release|x64.ActiveCfg = Release|Any CPU + {69C177CF-6C1A-4693-831B-81624E18296A}.Release|x64.Build.0 = Release|Any CPU + {69C177CF-6C1A-4693-831B-81624E18296A}.Release|x86.ActiveCfg = Release|Any CPU + {69C177CF-6C1A-4693-831B-81624E18296A}.Release|x86.Build.0 = Release|Any CPU + {556EFE05-0058-4FB4-AAAA-518DD8BA4FBC}.Debug|x64.ActiveCfg = Debug|Any CPU + {556EFE05-0058-4FB4-AAAA-518DD8BA4FBC}.Debug|x64.Build.0 = Debug|Any CPU + {556EFE05-0058-4FB4-AAAA-518DD8BA4FBC}.Debug|x86.ActiveCfg = Debug|Any CPU + {556EFE05-0058-4FB4-AAAA-518DD8BA4FBC}.Debug|x86.Build.0 = Debug|Any CPU + {556EFE05-0058-4FB4-AAAA-518DD8BA4FBC}.Release|x64.ActiveCfg = Release|Any CPU + {556EFE05-0058-4FB4-AAAA-518DD8BA4FBC}.Release|x64.Build.0 = Release|Any CPU + {556EFE05-0058-4FB4-AAAA-518DD8BA4FBC}.Release|x86.ActiveCfg = Release|Any CPU + {556EFE05-0058-4FB4-AAAA-518DD8BA4FBC}.Release|x86.Build.0 = Release|Any CPU + {E519456D-F78C-49D1-B64D-85B9E6277638}.Debug|x64.ActiveCfg = Debug|Any CPU + {E519456D-F78C-49D1-B64D-85B9E6277638}.Debug|x64.Build.0 = Debug|Any CPU + {E519456D-F78C-49D1-B64D-85B9E6277638}.Debug|x86.ActiveCfg = Debug|Any CPU + {E519456D-F78C-49D1-B64D-85B9E6277638}.Debug|x86.Build.0 = Debug|Any CPU + {E519456D-F78C-49D1-B64D-85B9E6277638}.Release|x64.ActiveCfg = Release|Any CPU + {E519456D-F78C-49D1-B64D-85B9E6277638}.Release|x64.Build.0 = Release|Any CPU + {E519456D-F78C-49D1-B64D-85B9E6277638}.Release|x86.ActiveCfg = Release|Any CPU + {E519456D-F78C-49D1-B64D-85B9E6277638}.Release|x86.Build.0 = Release|Any CPU + {5F98C140-D0D1-4B1D-A3DD-CA995A62523D}.Debug|x64.ActiveCfg = Debug|Any CPU + {5F98C140-D0D1-4B1D-A3DD-CA995A62523D}.Debug|x64.Build.0 = Debug|Any CPU + {5F98C140-D0D1-4B1D-A3DD-CA995A62523D}.Debug|x86.ActiveCfg = Debug|Any CPU + {5F98C140-D0D1-4B1D-A3DD-CA995A62523D}.Debug|x86.Build.0 = Debug|Any CPU + {5F98C140-D0D1-4B1D-A3DD-CA995A62523D}.Release|x64.ActiveCfg = Release|Any CPU + {5F98C140-D0D1-4B1D-A3DD-CA995A62523D}.Release|x64.Build.0 = Release|Any CPU + {5F98C140-D0D1-4B1D-A3DD-CA995A62523D}.Release|x86.ActiveCfg = Release|Any CPU + {5F98C140-D0D1-4B1D-A3DD-CA995A62523D}.Release|x86.Build.0 = Release|Any CPU + {0F4FE9D2-CE8F-4A2A-8B7B-CD04E84405BE}.Debug|x64.ActiveCfg = Debug|Any CPU + {0F4FE9D2-CE8F-4A2A-8B7B-CD04E84405BE}.Debug|x64.Build.0 = Debug|Any CPU + {0F4FE9D2-CE8F-4A2A-8B7B-CD04E84405BE}.Debug|x86.ActiveCfg = Debug|Any CPU + {0F4FE9D2-CE8F-4A2A-8B7B-CD04E84405BE}.Debug|x86.Build.0 = Debug|Any CPU + {0F4FE9D2-CE8F-4A2A-8B7B-CD04E84405BE}.Release|x64.ActiveCfg = Release|Any CPU + {0F4FE9D2-CE8F-4A2A-8B7B-CD04E84405BE}.Release|x64.Build.0 = Release|Any CPU + {0F4FE9D2-CE8F-4A2A-8B7B-CD04E84405BE}.Release|x86.ActiveCfg = Release|Any CPU + {0F4FE9D2-CE8F-4A2A-8B7B-CD04E84405BE}.Release|x86.Build.0 = Release|Any CPU + {0A645C96-01A9-4EEB-9FC8-3E588CB2FC06}.Debug|x64.ActiveCfg = Debug|Any CPU + {0A645C96-01A9-4EEB-9FC8-3E588CB2FC06}.Debug|x64.Build.0 = Debug|Any CPU + {0A645C96-01A9-4EEB-9FC8-3E588CB2FC06}.Debug|x86.ActiveCfg = Debug|Any CPU + {0A645C96-01A9-4EEB-9FC8-3E588CB2FC06}.Debug|x86.Build.0 = Debug|Any CPU + {0A645C96-01A9-4EEB-9FC8-3E588CB2FC06}.Release|x64.ActiveCfg = Release|Any CPU + {0A645C96-01A9-4EEB-9FC8-3E588CB2FC06}.Release|x64.Build.0 = Release|Any CPU + {0A645C96-01A9-4EEB-9FC8-3E588CB2FC06}.Release|x86.ActiveCfg = Release|Any CPU + {0A645C96-01A9-4EEB-9FC8-3E588CB2FC06}.Release|x86.Build.0 = Release|Any CPU + {31AF7726-44C5-49C3-AD39-F9660B9138B3}.Debug|x64.ActiveCfg = Debug|Any CPU + {31AF7726-44C5-49C3-AD39-F9660B9138B3}.Debug|x64.Build.0 = Debug|Any CPU + {31AF7726-44C5-49C3-AD39-F9660B9138B3}.Debug|x86.ActiveCfg = Debug|Any CPU + {31AF7726-44C5-49C3-AD39-F9660B9138B3}.Debug|x86.Build.0 = Debug|Any CPU + {31AF7726-44C5-49C3-AD39-F9660B9138B3}.Release|x64.ActiveCfg = Release|Any CPU + {31AF7726-44C5-49C3-AD39-F9660B9138B3}.Release|x64.Build.0 = Release|Any CPU + {31AF7726-44C5-49C3-AD39-F9660B9138B3}.Release|x86.ActiveCfg = Release|Any CPU + {31AF7726-44C5-49C3-AD39-F9660B9138B3}.Release|x86.Build.0 = Release|Any CPU + {22611568-B956-4086-AA66-803C0040EBBC}.Debug|x64.ActiveCfg = Debug|Any CPU + {22611568-B956-4086-AA66-803C0040EBBC}.Debug|x64.Build.0 = Debug|Any CPU + {22611568-B956-4086-AA66-803C0040EBBC}.Debug|x86.ActiveCfg = Debug|Any CPU + {22611568-B956-4086-AA66-803C0040EBBC}.Debug|x86.Build.0 = Debug|Any CPU + {22611568-B956-4086-AA66-803C0040EBBC}.Release|x64.ActiveCfg = Release|Any CPU + {22611568-B956-4086-AA66-803C0040EBBC}.Release|x64.Build.0 = Release|Any CPU + {22611568-B956-4086-AA66-803C0040EBBC}.Release|x86.ActiveCfg = Release|Any CPU + {22611568-B956-4086-AA66-803C0040EBBC}.Release|x86.Build.0 = Release|Any CPU + {B63BA910-2192-4C26-AFF9-59A995941F83}.Debug|x64.ActiveCfg = Debug|Any CPU + {B63BA910-2192-4C26-AFF9-59A995941F83}.Debug|x64.Build.0 = Debug|Any CPU + {B63BA910-2192-4C26-AFF9-59A995941F83}.Debug|x86.ActiveCfg = Debug|Any CPU + {B63BA910-2192-4C26-AFF9-59A995941F83}.Debug|x86.Build.0 = Debug|Any CPU + {B63BA910-2192-4C26-AFF9-59A995941F83}.Release|x64.ActiveCfg = Release|Any CPU + {B63BA910-2192-4C26-AFF9-59A995941F83}.Release|x64.Build.0 = Release|Any CPU + {B63BA910-2192-4C26-AFF9-59A995941F83}.Release|x86.ActiveCfg = Release|Any CPU + {B63BA910-2192-4C26-AFF9-59A995941F83}.Release|x86.Build.0 = Release|Any CPU + {61EBA2B4-AFC8-4650-80AC-3A5BEE3E9514}.Debug|x64.ActiveCfg = Debug|Any CPU + {61EBA2B4-AFC8-4650-80AC-3A5BEE3E9514}.Debug|x64.Build.0 = Debug|Any CPU + {61EBA2B4-AFC8-4650-80AC-3A5BEE3E9514}.Debug|x86.ActiveCfg = Debug|Any CPU + {61EBA2B4-AFC8-4650-80AC-3A5BEE3E9514}.Debug|x86.Build.0 = Debug|Any CPU + {61EBA2B4-AFC8-4650-80AC-3A5BEE3E9514}.Release|x64.ActiveCfg = Release|Any CPU + {61EBA2B4-AFC8-4650-80AC-3A5BEE3E9514}.Release|x64.Build.0 = Release|Any CPU + {61EBA2B4-AFC8-4650-80AC-3A5BEE3E9514}.Release|x86.ActiveCfg = Release|Any CPU + {61EBA2B4-AFC8-4650-80AC-3A5BEE3E9514}.Release|x86.Build.0 = Release|Any CPU + {AB2D396E-3F44-4227-AE09-B0FD88CC651B}.Debug|x64.ActiveCfg = Debug|Any CPU + {AB2D396E-3F44-4227-AE09-B0FD88CC651B}.Debug|x64.Build.0 = Debug|Any CPU + {AB2D396E-3F44-4227-AE09-B0FD88CC651B}.Debug|x86.ActiveCfg = Debug|Any CPU + {AB2D396E-3F44-4227-AE09-B0FD88CC651B}.Debug|x86.Build.0 = Debug|Any CPU + {AB2D396E-3F44-4227-AE09-B0FD88CC651B}.Release|x64.ActiveCfg = Release|Any CPU + {AB2D396E-3F44-4227-AE09-B0FD88CC651B}.Release|x64.Build.0 = Release|Any CPU + {AB2D396E-3F44-4227-AE09-B0FD88CC651B}.Release|x86.ActiveCfg = Release|Any CPU + {AB2D396E-3F44-4227-AE09-B0FD88CC651B}.Release|x86.Build.0 = Release|Any CPU + {010C435A-4D9D-43FB-910A-D3C7B3789F7E}.Debug|x64.ActiveCfg = Debug|Any CPU + {010C435A-4D9D-43FB-910A-D3C7B3789F7E}.Debug|x64.Build.0 = Debug|Any CPU + {010C435A-4D9D-43FB-910A-D3C7B3789F7E}.Debug|x86.ActiveCfg = Debug|Any CPU + {010C435A-4D9D-43FB-910A-D3C7B3789F7E}.Debug|x86.Build.0 = Debug|Any CPU + {010C435A-4D9D-43FB-910A-D3C7B3789F7E}.Release|x64.ActiveCfg = Release|Any CPU + {010C435A-4D9D-43FB-910A-D3C7B3789F7E}.Release|x64.Build.0 = Release|Any CPU + {010C435A-4D9D-43FB-910A-D3C7B3789F7E}.Release|x86.ActiveCfg = Release|Any CPU + {010C435A-4D9D-43FB-910A-D3C7B3789F7E}.Release|x86.Build.0 = Release|Any CPU + {A14C3385-FFD7-417D-9D49-D9953774F21C}.Debug|x64.ActiveCfg = Debug|Any CPU + {A14C3385-FFD7-417D-9D49-D9953774F21C}.Debug|x64.Build.0 = Debug|Any CPU + {A14C3385-FFD7-417D-9D49-D9953774F21C}.Debug|x86.ActiveCfg = Debug|Any CPU + {A14C3385-FFD7-417D-9D49-D9953774F21C}.Debug|x86.Build.0 = Debug|Any CPU + {A14C3385-FFD7-417D-9D49-D9953774F21C}.Release|x64.ActiveCfg = Release|Any CPU + {A14C3385-FFD7-417D-9D49-D9953774F21C}.Release|x64.Build.0 = Release|Any CPU + {A14C3385-FFD7-417D-9D49-D9953774F21C}.Release|x86.ActiveCfg = Release|Any CPU + {A14C3385-FFD7-417D-9D49-D9953774F21C}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -183,4 +335,21 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {52F31DC3-E48E-4603-8110-C86CEBCE9272} EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {56594A9C-D7DF-49E5-A515-6342F142A8A1} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + {55CB96AD-366C-43BC-B21E-E0EA6714696C} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + {69C177CF-6C1A-4693-831B-81624E18296A} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + {556EFE05-0058-4FB4-AAAA-518DD8BA4FBC} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + {E519456D-F78C-49D1-B64D-85B9E6277638} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + {5F98C140-D0D1-4B1D-A3DD-CA995A62523D} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + {0F4FE9D2-CE8F-4A2A-8B7B-CD04E84405BE} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + {0A645C96-01A9-4EEB-9FC8-3E588CB2FC06} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + {31AF7726-44C5-49C3-AD39-F9660B9138B3} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + {22611568-B956-4086-AA66-803C0040EBBC} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + {B63BA910-2192-4C26-AFF9-59A995941F83} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + {61EBA2B4-AFC8-4650-80AC-3A5BEE3E9514} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + {AB2D396E-3F44-4227-AE09-B0FD88CC651B} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + {010C435A-4D9D-43FB-910A-D3C7B3789F7E} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + {A14C3385-FFD7-417D-9D49-D9953774F21C} = {CC667E2D-8CA8-44C6-8459-A4EE9A4DE234} + EndGlobalSection EndGlobal diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index cfb06502..3fb8d6aa 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -24,7 +24,7 @@ WARNING WARNING WARNING - SUGGESTION + WARNING DO_NOT_SHOW DO_NOT_SHOW DO_NOT_SHOW @@ -415,18 +415,18 @@ 198 C:\Users\Tim\AppData\Local\JetBrains\Transient\ReSharperPlatformVs15\v11_4a79c293\SolutionCaches - True - C:\Storage\UKSF\Website\UKSF.Api.Backend\UKSF.Api.Models\UKSF.Api.Models.csproj.DotSettings - ..\UKSF.Api.Models\UKSF.Api.Models.csproj.DotSettings + + + True E:\Workspace\UKSF\api\UKSF.Tests\UKSF.Tests.csproj.DotSettings ..\UKSF.Tests\UKSF.Tests.csproj.DotSettings - True - 0.5 + + True 1.5 diff --git a/UKSF.Api/AppStart/StartServices.cs b/UKSF.Api/AppStart/StartServices.cs index 654465e5..4f761ee5 100644 --- a/UKSF.Api/AppStart/StartServices.cs +++ b/UKSF.Api/AppStart/StartServices.cs @@ -50,5 +50,13 @@ public static void StartUksfServices(this IServiceProvider serviceProvider) { serviceProvider.GetService()?.CancelInterruptedBuilds(); serviceProvider.GetService()?.RunQueuedBuilds(); } + + public static void StopUksfSerices(this IServiceProvider serviceProvider) { + // Cancel any running builds + serviceProvider.GetService()?.CancelAll(); + + // Stop teamspeak + serviceProvider.GetService()?.Stop(); + } } } diff --git a/UKSF.Api/AppStart/TestDataSetup.cs b/UKSF.Api/AppStart/TestDataSetup.cs index 403f30c8..e59ed244 100644 --- a/UKSF.Api/AppStart/TestDataSetup.cs +++ b/UKSF.Api/AppStart/TestDataSetup.cs @@ -171,3 +171,5 @@ // } // } // } + + diff --git a/UKSF.Api/AppStart/UksfServiceExtensions.cs b/UKSF.Api/AppStart/UksfServiceExtensions.cs index f47c7757..a7f173b2 100644 --- a/UKSF.Api/AppStart/UksfServiceExtensions.cs +++ b/UKSF.Api/AppStart/UksfServiceExtensions.cs @@ -10,7 +10,7 @@ using UKSF.Api.Command; using UKSF.Api.Discord; using UKSF.Api.EventHandlers; -using UKSF.Api.Integration.Instagram; +using UKSF.Api.Integrations.Instagram; using UKSF.Api.Launcher; using UKSF.Api.Modpack; using UKSF.Api.Personnel; diff --git a/UKSF.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs index 5648333f..95505d97 100644 --- a/UKSF.Api/Controllers/LoaController.cs +++ b/UKSF.Api/Controllers/LoaController.cs @@ -4,8 +4,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; @@ -15,37 +17,46 @@ namespace UKSF.Api.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] public class LoaController : Controller { - private readonly IAccountService accountService; - private readonly IChainOfCommandService chainOfCommandService; - private readonly ICommandRequestService commandRequestService; - private readonly IDisplayNameService displayNameService; - private readonly ILoaService loaService; - private readonly IHttpContextService httpContextService; - private readonly INotificationsService notificationsService; - private readonly ILogger logger; + private readonly IAccountContext _accountContext; + private readonly IAccountService _accountService; + private readonly IChainOfCommandService _chainOfCommandService; + private readonly ICommandRequestContext _commandRequestContext; + private readonly IDisplayNameService _displayNameService; + private readonly IHttpContextService _httpContextService; + private readonly ILoaContext _loaContext; + private readonly ILoaService _loaService; + private readonly ILogger _logger; + private readonly INotificationsService _notificationsService; + private readonly IUnitsContext _unitsContext; - private readonly IUnitsService unitsService; + private readonly IUnitsService _unitsService; public LoaController( + ILoaContext loaContext, + IAccountContext accountContext, + ICommandRequestContext commandRequestContext, + IUnitsContext unitsContext, ILoaService loaService, IHttpContextService httpContextService, IDisplayNameService displayNameService, IAccountService accountService, IUnitsService unitsService, IChainOfCommandService chainOfCommandService, - ICommandRequestService commandRequestService, INotificationsService notificationsService, ILogger logger ) { - this.loaService = loaService; - this.httpContextService = httpContextService; - this.displayNameService = displayNameService; - this.accountService = accountService; - this.unitsService = unitsService; - this.chainOfCommandService = chainOfCommandService; - this.commandRequestService = commandRequestService; - this.notificationsService = notificationsService; - this.logger = logger; + _loaContext = loaContext; + _accountContext = accountContext; + _commandRequestContext = commandRequestContext; + _unitsContext = unitsContext; + _loaService = loaService; + _httpContextService = httpContextService; + _displayNameService = displayNameService; + _accountService = accountService; + _unitsService = unitsService; + _chainOfCommandService = chainOfCommandService; + _notificationsService = notificationsService; + _logger = logger; } [HttpGet, Authorize] @@ -53,36 +64,36 @@ public IActionResult Get([FromQuery] string scope = "you") { List objectIds; switch (scope) { case "all": - objectIds = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER).Select(x => x.id).ToList(); + objectIds = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER).Select(x => x.Id).ToList(); break; case "unit": - Account account = accountService.GetUserAccount(); - IEnumerable groups = unitsService.GetAllChildren(unitsService.Data.GetSingle(x => x.name == account.unitAssignment), true); - List members = groups.SelectMany(x => x.members.ToList()).ToList(); - objectIds = accountService.Data.Get(x => x.membershipState == MembershipState.MEMBER && members.Contains(x.id)).Select(x => x.id).ToList(); + Account account = _accountService.GetUserAccount(); + IEnumerable groups = _unitsService.GetAllChildren(_unitsContext.GetSingle(x => x.Name == account.UnitAssignment), true); + List members = groups.SelectMany(x => x.Members.ToList()).ToList(); + objectIds = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER && members.Contains(x.Id)).Select(x => x.Id).ToList(); break; case "you": - objectIds = new List {httpContextService.GetUserId()}; + objectIds = new List { _httpContextService.GetUserId() }; break; default: return BadRequest(); } - IEnumerable loaReports = loaService.Get(objectIds) - .Select( - x => new { - x.id, - x.start, - x.end, - x.state, - x.emergency, - x.late, - x.reason, - name = displayNameService.GetDisplayName(accountService.Data.GetSingle(x.recipient)), - inChainOfCommand = chainOfCommandService.InContextChainOfCommand(x.recipient), - longTerm = (x.end - x.start).Days > 21 - } - ) - .ToList(); + IEnumerable loaReports = _loaService.Get(objectIds) + .Select( + x => new { + id = x.Id, + start = x.Start, + end = x.End, + state = x.State, + emergency = x.Emergency, + late = x.Late, + reason = x.Reason, + name = _displayNameService.GetDisplayName(_accountContext.GetSingle(x.Recipient)), + inChainOfCommand = _chainOfCommandService.InContextChainOfCommand(x.Recipient), + longTerm = (x.End - x.Start).Days > 21 + } + ) + .ToList(); return Ok( new { activeLoas = loaReports.Where(x => x.start <= DateTime.Now && x.end > DateTime.Now).OrderBy(x => x.end).ThenBy(x => x.start), @@ -94,19 +105,26 @@ public IActionResult Get([FromQuery] string scope = "you") { [HttpDelete("{id}"), Authorize] public async Task DeleteLoa(string id) { - Loa loa = loaService.Data.GetSingle(id); - CommandRequest request = commandRequestService.Data.GetSingle(x => x.Value == id); + Loa loa = _loaContext.GetSingle(id); + CommandRequest request = _commandRequestContext.GetSingle(x => x.Value == id); if (request != null) { - await commandRequestService.Data.Delete(request); + await _commandRequestContext.Delete(request); foreach (string reviewerId in request.Reviews.Keys.Where(x => x != request.Requester)) { - notificationsService.Add(new Notification {owner = reviewerId, icon = NotificationIcons.REQUEST, message = $"Your review for {request.DisplayRequester}'s LOA is no longer required as they deleted their LOA", link = "/command/requests"}); + _notificationsService.Add( + new Notification { + Owner = reviewerId, + Icon = NotificationIcons.REQUEST, + Message = $"Your review for {request.DisplayRequester}'s LOA is no longer required as they deleted their LOA", + Link = "/command/requests" + } + ); } - logger.LogAudit($"Loa request deleted for '{displayNameService.GetDisplayName(accountService.Data.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); + _logger.LogAudit($"Loa request deleted for '{_displayNameService.GetDisplayName(_accountContext.GetSingle(loa.Recipient))}' from '{loa.Start}' to '{loa.End}'"); } - logger.LogAudit($"Loa deleted for '{displayNameService.GetDisplayName(accountService.Data.GetSingle(loa.recipient))}' from '{loa.start}' to '{loa.end}'"); - await loaService.Data.Delete(loa); + _logger.LogAudit($"Loa deleted for '{_displayNameService.GetDisplayName(_accountContext.GetSingle(loa.Recipient))}' from '{loa.Start}' to '{loa.End}'"); + await _loaContext.Delete(loa); return Ok(); } diff --git a/UKSF.Api/Controllers/LoggingController.cs b/UKSF.Api/Controllers/LoggingController.cs index e0fab1e8..593130eb 100644 --- a/UKSF.Api/Controllers/LoggingController.cs +++ b/UKSF.Api/Controllers/LoggingController.cs @@ -8,49 +8,61 @@ namespace UKSF.Api.Controllers { [Route("[controller]"), Permissions(Permissions.ADMIN)] public class LoggingController : Controller { - private readonly IAuditLogDataService auditLogDataService; - private readonly IHttpErrorLogDataService httpErrorLogDataService; - private readonly ILauncherLogDataService launcherLogDataService; - private readonly ILogDataService logDataService; + private readonly IAuditLogContext _auditLogContext; + private readonly IDiscordLogContext _discordLogContext; + private readonly IHttpErrorLogContext _httpErrorLogContext; + private readonly ILauncherLogContext _launcherLogContext; + private readonly ILogContext _logContext; public LoggingController( - ILogDataService logDataService, - IAuditLogDataService auditLogDataService, - IHttpErrorLogDataService httpErrorLogDataService, - ILauncherLogDataService launcherLogDataService + ILogContext logContext, + IAuditLogContext auditLogContext, + IHttpErrorLogContext httpErrorLogContext, + ILauncherLogContext launcherLogContext, + IDiscordLogContext discordLogContext ) { - this.logDataService = logDataService; - this.auditLogDataService = auditLogDataService; - this.httpErrorLogDataService = httpErrorLogDataService; - this.launcherLogDataService = launcherLogDataService; + _logContext = logContext; + _auditLogContext = auditLogContext; + _httpErrorLogContext = httpErrorLogContext; + _launcherLogContext = launcherLogContext; + _discordLogContext = discordLogContext; } + // TODO: Pagination + [HttpGet("basic"), Authorize] public List GetBasicLogs() { - List logs = new List(logDataService.Get()); + List logs = new(_logContext.Get()); logs.Reverse(); return logs; } [HttpGet("httpError"), Authorize] public List GetHttpErrorLogs() { - List errorLogs = new List(httpErrorLogDataService.Get()); - errorLogs.Reverse(); - return errorLogs; + List logs = new(_httpErrorLogContext.Get()); + logs.Reverse(); + return logs; } [HttpGet("audit"), Authorize] public List GetAuditLogs() { - List auditLogs = new List(auditLogDataService.Get()); - auditLogs.Reverse(); - return auditLogs; + List logs = new(_auditLogContext.Get()); + logs.Reverse(); + return logs; } [HttpGet("launcher"), Authorize] public List GetLauncherLogs() { - List launcherLogs = new List(launcherLogDataService.Get()); - launcherLogs.Reverse(); - return launcherLogs; + List logs = new(_launcherLogContext.Get()); + logs.Reverse(); + return logs; + } + + [HttpGet("discord"), Authorize] + public List GetDiscordLogs() { + List logs = new(_discordLogContext.Get()); + logs.Reverse(); + return logs; } } } diff --git a/UKSF.Api/EventHandlers/LoggerEventHandler.cs b/UKSF.Api/EventHandlers/LoggerEventHandler.cs index db9b5174..1473fa5b 100644 --- a/UKSF.Api/EventHandlers/LoggerEventHandler.cs +++ b/UKSF.Api/EventHandlers/LoggerEventHandler.cs @@ -10,25 +10,28 @@ namespace UKSF.Api.EventHandlers { public interface ILoggerEventHandler : IEventHandler { } public class LoggerEventHandler : ILoggerEventHandler { - private readonly IAuditLogDataService _auditLogDataService; - private readonly IHttpErrorLogDataService _httpErrorLogDataService; - private readonly ILauncherLogDataService _launcherLogDataService; - private readonly ILogDataService _logDataService; + private readonly IAuditLogContext _auditLogContext; + private readonly IDiscordLogContext _discordLogContext; + private readonly IHttpErrorLogContext _httpErrorLogContext; + private readonly ILauncherLogContext _launcherLogContext; + private readonly ILogContext _logContext; private readonly ILogger _logger; private readonly IObjectIdConversionService _objectIdConversionService; public LoggerEventHandler( - ILogDataService logDataService, - IAuditLogDataService auditLogDataService, - IHttpErrorLogDataService httpErrorLogDataService, - ILauncherLogDataService launcherLogDataService, + ILogContext logContext, + IAuditLogContext auditLogContext, + IHttpErrorLogContext httpErrorLogContext, + ILauncherLogContext launcherLogContext, + IDiscordLogContext discordLogContext, ILogger logger, IObjectIdConversionService objectIdConversionService ) { - _logDataService = logDataService; - _auditLogDataService = auditLogDataService; - _httpErrorLogDataService = httpErrorLogDataService; - _launcherLogDataService = launcherLogDataService; + _logContext = logContext; + _auditLogContext = auditLogContext; + _httpErrorLogContext = httpErrorLogContext; + _launcherLogContext = launcherLogContext; + _discordLogContext = discordLogContext; _logger = logger; _objectIdConversionService = objectIdConversionService; } @@ -43,20 +46,21 @@ private void HandleLog(BasicLog log) { private async Task HandleLogAsync(BasicLog log) { if (log is AuditLog auditLog) { - auditLog.who = _objectIdConversionService.ConvertObjectId(auditLog.who); + auditLog.Who = _objectIdConversionService.ConvertObjectId(auditLog.Who); log = auditLog; } - log.message = _objectIdConversionService.ConvertObjectIds(log.message); + log.Message = _objectIdConversionService.ConvertObjectIds(log.Message); await LogToStorageAsync(log); } private Task LogToStorageAsync(BasicLog log) { return log switch { - AuditLog auditLog => _auditLogDataService.Add(auditLog), - LauncherLog launcherLog => _launcherLogDataService.Add(launcherLog), - HttpErrorLog httpErrorLog => _httpErrorLogDataService.Add(httpErrorLog), - _ => _logDataService.Add(log) + AuditLog auditLog => _auditLogContext.Add(auditLog), + LauncherLog launcherLog => _launcherLogContext.Add(launcherLog), + HttpErrorLog httpErrorLog => _httpErrorLogContext.Add(httpErrorLog), + DiscordLog discordLog => _discordLogContext.Add(discordLog), + _ => _logContext.Add(log) }; } } diff --git a/UKSF.Api/ExceptionHandler.cs b/UKSF.Api/ExceptionHandler.cs index 46f0f7ae..69aab29e 100644 --- a/UKSF.Api/ExceptionHandler.cs +++ b/UKSF.Api/ExceptionHandler.cs @@ -11,14 +11,14 @@ namespace UKSF.Api { public class ExceptionHandler : IExceptionFilter { - private readonly IDisplayNameService displayNameService; - private readonly IHttpContextService httpContextService; - private readonly ILogger logger; + private readonly IDisplayNameService _displayNameService; + private readonly IHttpContextService _httpContextService; + private readonly ILogger _logger; public ExceptionHandler(IDisplayNameService displayNameService, IHttpContextService httpContextService, ILogger logger) { - this.displayNameService = displayNameService; - this.httpContextService = httpContextService; - this.logger = logger; + _displayNameService = displayNameService; + _httpContextService = httpContextService; + _logger = logger; } public void OnException(ExceptionContext filterContext) { @@ -38,15 +38,16 @@ public void OnException(ExceptionContext filterContext) { } private void LogError(HttpContext context, Exception exception) { - bool authenticated = httpContextService.IsUserAuthenticated(); - string userId = httpContextService.GetUserId(); - HttpErrorLog log = new HttpErrorLog(exception) { - httpMethod = context?.Request.Method ?? string.Empty, - url = context?.Request.GetDisplayUrl(), - userId = authenticated ? userId : "Guest", - name = authenticated ? displayNameService.GetDisplayName(userId) : "Guest" - }; - logger.LogHttpError(log); + bool authenticated = _httpContextService.IsUserAuthenticated(); + string userId = _httpContextService.GetUserId(); + HttpErrorLog log = new( + exception, + authenticated ? _displayNameService.GetDisplayName(userId) : "Guest", + authenticated ? userId : "Guest", + context?.Request.Method ?? string.Empty, + context?.Request.GetDisplayUrl() + ); + _logger.LogHttpError(log); } } } diff --git a/UKSF.Api/Fake/FakeCachedDataService.cs b/UKSF.Api/Fake/FakeCachedDataService.cs index 5d0f36f8..a31e5895 100644 --- a/UKSF.Api/Fake/FakeCachedDataService.cs +++ b/UKSF.Api/Fake/FakeCachedDataService.cs @@ -3,3 +3,5 @@ // public void Refresh() { } // } // } + + diff --git a/UKSF.Api/Fake/FakeDataService.cs b/UKSF.Api/Fake/FakeDataService.cs index 4a5120a4..d5737527 100644 --- a/UKSF.Api/Fake/FakeDataService.cs +++ b/UKSF.Api/Fake/FakeDataService.cs @@ -33,3 +33,5 @@ // public Task DeleteMany(Expression> filterExpression) => Task.CompletedTask; // } // } + + diff --git a/UKSF.Api/Fake/FakeDiscordService.cs b/UKSF.Api/Fake/FakeDiscordService.cs index 97b6b07a..8c6eeaf0 100644 --- a/UKSF.Api/Fake/FakeDiscordService.cs +++ b/UKSF.Api/Fake/FakeDiscordService.cs @@ -21,3 +21,5 @@ // public override Task UpdateAccount(Account account, ulong discordId = 0) => Task.CompletedTask; // } // } + + diff --git a/UKSF.Api/Fake/FakeNotificationsDataService.cs b/UKSF.Api/Fake/FakeNotificationsDataService.cs index 70cfc096..8ff4efff 100644 --- a/UKSF.Api/Fake/FakeNotificationsDataService.cs +++ b/UKSF.Api/Fake/FakeNotificationsDataService.cs @@ -1,3 +1,5 @@ // namespace UKSF.Api.Fake { // public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { } // } + + diff --git a/UKSF.Api/Fake/FakeNotificationsService.cs b/UKSF.Api/Fake/FakeNotificationsService.cs index 93c8dc9d..c1331f01 100644 --- a/UKSF.Api/Fake/FakeNotificationsService.cs +++ b/UKSF.Api/Fake/FakeNotificationsService.cs @@ -2,7 +2,7 @@ // using System.Threading.Tasks; // // namespace UKSF.Api.Fake { -// public class FakeNotificationsService : DataBackedService, INotificationsService { +// public class FakeNotificationsService : INotificationsService { // public FakeNotificationsService(INotificationsDataService data) : base(data) { } // // public Task SendTeamspeakNotification(Account account, string rawMessage) => Task.CompletedTask; @@ -18,3 +18,5 @@ // public Task Delete(List ids) => Task.CompletedTask; // } // } + + diff --git a/UKSF.Api/Fake/FakeTeamspeakManagerService.cs b/UKSF.Api/Fake/FakeTeamspeakManagerService.cs index eeaea0cf..454e18c2 100644 --- a/UKSF.Api/Fake/FakeTeamspeakManagerService.cs +++ b/UKSF.Api/Fake/FakeTeamspeakManagerService.cs @@ -11,3 +11,5 @@ // public Task SendProcedure(TeamspeakProcedureType procedure, object args) => Task.CompletedTask; // } // } + + diff --git a/UKSF.Api/Program.cs b/UKSF.Api/Program.cs index 26fadcad..88696be8 100644 --- a/UKSF.Api/Program.cs +++ b/UKSF.Api/Program.cs @@ -31,13 +31,7 @@ public static void Main(string[] args) { } private static IWebHost BuildDebugWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseUrls("http://*:5000") - .UseIISIntegration() - .Build(); + WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel().UseContentRoot(Directory.GetCurrentDirectory()).UseUrls("http://*:5000").UseIISIntegration().Build(); private static IWebHost BuildProductionWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) @@ -45,7 +39,11 @@ private static IWebHost BuildProductionWebHost(string[] args) => .UseKestrel( options => { options.Listen(IPAddress.Loopback, 5000); - options.Listen(IPAddress.Loopback, 5001, listenOptions => { listenOptions.UseHttps("C:\\ProgramData\\win-acme\\acme-v02.api.letsencrypt.org\\Certificates\\uk-sf.co.uk.pfx"); }); + options.Listen( + IPAddress.Loopback, + 5001, + listenOptions => { listenOptions.UseHttps("C:\\ProgramData\\win-acme\\acme-v02.api.letsencrypt.org\\Certificates\\uk-sf.co.uk.pfx"); } + ); } ) .UseContentRoot(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule?.FileName)) @@ -67,8 +65,8 @@ private static void InitLogging() { Console.Out.WriteLine($"Log file not created: {logFile}. {e.Message}"); } - FileStream fileStream = new FileStream(logFile, FileMode.Create); - StreamWriter streamWriter = new StreamWriter(fileStream) {AutoFlush = true}; + FileStream fileStream = new(logFile, FileMode.Create); + StreamWriter streamWriter = new(fileStream) { AutoFlush = true }; Console.SetOut(streamWriter); Console.SetError(streamWriter); } diff --git a/UKSF.Api/Services/MigrationUtility.cs b/UKSF.Api/Services/MigrationUtility.cs index b7c2865e..8f62e16c 100644 --- a/UKSF.Api/Services/MigrationUtility.cs +++ b/UKSF.Api/Services/MigrationUtility.cs @@ -1,5 +1,6 @@ using System; using Microsoft.Extensions.Hosting; +using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; using UKSF.Api.Shared.Events; @@ -7,20 +8,22 @@ namespace UKSF.Api.Services { public class MigrationUtility { private const string KEY = "MIGRATED"; - private readonly IHostEnvironment currentEnvironment; - private readonly ILogger logger; - private readonly IVariablesService variablesService; + private readonly IHostEnvironment _currentEnvironment; + private readonly ILogger _logger; + private readonly IVariablesContext _variablesContext; + private readonly IVariablesService _variablesService; - public MigrationUtility(IHostEnvironment currentEnvironment, IVariablesService variablesService, ILogger logger) { - this.currentEnvironment = currentEnvironment; - this.variablesService = variablesService; - this.logger = logger; + public MigrationUtility(IHostEnvironment currentEnvironment, IVariablesService variablesService, IVariablesContext variablesContext, ILogger logger) { + _currentEnvironment = currentEnvironment; + _variablesService = variablesService; + _variablesContext = variablesContext; + _logger = logger; } public void Migrate() { bool migrated = true; - if (!currentEnvironment.IsDevelopment()) { - string migratedString = variablesService.GetVariable(KEY).AsString(); + if (!_currentEnvironment.IsDevelopment()) { + string migratedString = _variablesService.GetVariable(KEY).AsString(); migrated = bool.Parse(migratedString); } @@ -28,11 +31,11 @@ public void Migrate() { if (!migrated) { try { ExecuteMigration(); - logger.LogAudit("Migration utility successfully ran"); + _logger.LogAudit("Migration utility successfully ran"); } catch (Exception e) { - logger.LogError(e); + _logger.LogError(e); } finally { - variablesService.Data.Update(KEY, "true"); + _variablesContext.Update(KEY, "true"); } } } diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 3e9acab0..dc950659 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -14,10 +14,8 @@ using UKSF.Api.ArmaServer; using UKSF.Api.Command; using UKSF.Api.Modpack; -using UKSF.Api.Modpack.Services.BuildProcess; using UKSF.Api.Personnel; using UKSF.Api.Teamspeak; -using UKSF.Api.Teamspeak.Services; namespace UKSF.Api { public class Startup { @@ -46,7 +44,6 @@ public void ConfigureServices(IServiceCollection services) { ) ); services.AddSignalR().AddNewtonsoftJsonProtocol(); - services.AddAutoMapper(typeof(AutoMapperConfigurationProfile)); services.AddControllers(); services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo { Title = "UKSF API", Version = "v1" }); }); @@ -88,11 +85,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl } private static void OnShutdown(IServiceProvider serviceProvider) { - // Cancel any running builds - serviceProvider.GetService()?.CancelAll(); - - // Stop teamspeak - serviceProvider.GetService()?.Stop(); + serviceProvider.StopUksfSerices(); } } diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index f69433b8..be1735d5 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -17,17 +17,18 @@ - - - - + + + + - - - - - + + + + + + @@ -43,7 +44,7 @@ - + diff --git a/UKSF.Tests/Common/ITestCachedDataService.cs b/UKSF.Tests/Common/ITestCachedDataService.cs deleted file mode 100644 index 173703bb..00000000 --- a/UKSF.Tests/Common/ITestCachedDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Shared.Context; - -namespace UKSF.Tests.Common { - public interface ITestCachedDataService : IDataService { } -} diff --git a/UKSF.Tests/Common/ITestDataService.cs b/UKSF.Tests/Common/ITestDataService.cs deleted file mode 100644 index e9cbe51d..00000000 --- a/UKSF.Tests/Common/ITestDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -using UKSF.Api.Shared.Context; - -namespace UKSF.Tests.Common { - public interface ITestDataService : IDataService { } -} diff --git a/UKSF.Tests/Common/TestCachedDataService.cs b/UKSF.Tests/Common/TestCachedDataService.cs deleted file mode 100644 index 43b4c23d..00000000 --- a/UKSF.Tests/Common/TestCachedDataService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using UKSF.Api.Base.Context; -using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; - -namespace UKSF.Tests.Common { - public class TestCachedDataService : CachedDataService, ITestCachedDataService { - public TestCachedDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } - } -} diff --git a/UKSF.Tests/Common/TestDataModel.cs b/UKSF.Tests/Common/TestDataModel.cs deleted file mode 100644 index 19424c8f..00000000 --- a/UKSF.Tests/Common/TestDataModel.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections.Generic; -using UKSF.Api.Base.Models; - -namespace UKSF.Tests.Common { - public class TestDataModel : DatabaseObject { - public string Name; - public List Stuff; - public Dictionary Dictionary = new Dictionary(); - } -} diff --git a/UKSF.Tests/Common/TestDataService.cs b/UKSF.Tests/Common/TestDataService.cs deleted file mode 100644 index 7b26aa95..00000000 --- a/UKSF.Tests/Common/TestDataService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using UKSF.Api.Base.Context; -using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; - -namespace UKSF.Tests.Common { - public class TestDataService : DataService, ITestDataService { - public TestDataService(IDataCollectionFactory dataCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(dataCollectionFactory, dataEventBus, collectionName) { } - } -} diff --git a/UKSF.Tests/Common/TestUtilities.cs b/UKSF.Tests/Common/TestUtilities.cs deleted file mode 100644 index 312ef5b7..00000000 --- a/UKSF.Tests/Common/TestUtilities.cs +++ /dev/null @@ -1,10 +0,0 @@ -using MongoDB.Bson; -using MongoDB.Bson.Serialization; -using MongoDB.Driver; - -namespace UKSF.Tests.Common { - public static class TestUtilities { - public static BsonValue RenderUpdate(UpdateDefinition updateDefinition) => updateDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); - public static BsonValue RenderFilter(FilterDefinition filterDefinition) => filterDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); - } -} diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index 28f97c3e..fe4bdfee 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -1,260 +1,260 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using FluentAssertions; -using Mongo2Go; -using MongoDB.Bson; -using MongoDB.Driver; -using UKSF.Api.Base.Context; -using UKSF.Api.Personnel.Models; -using UKSF.Tests.Common; -using Xunit; - -// Available test collections as json: -// accounts -// commentThreads -// discharges -// gameServers -// ranks -// roles -// scheduledJobs -// teamspeakSnapshots -// units -// variables - -namespace UKSF.Tests.Integration.Data { - public class DataCollectionTests : IDisposable { - private const string TEST_COLLECTION_NAME = "roles"; - private MongoDbRunner mongoDbRunner; - - public void Dispose() { - mongoDbRunner?.Dispose(); - } - - private async Task MongoTest(Func testFunction) { - mongoDbRunner = MongoDbRunner.Start(additionalMongodArguments: "--quiet"); - - IMongoDatabase database = MongoClientFactory.GetDatabase($"{mongoDbRunner.ConnectionString}{Guid.NewGuid()}"); - - await testFunction(database); - - mongoDbRunner.Dispose(); - } - - private static async Task<(DataCollection dataCollection, string testId)> SetupTestCollection(IMongoDatabase database) { - DataCollection dataCollection = new DataCollection(database, TEST_COLLECTION_NAME); - await dataCollection.AssertCollectionExistsAsync(); - - string testId = ObjectId.GenerateNewId().ToString(); - List roles = new List { - new Role { name = "Rifleman" }, - new Role { name = "Trainee" }, - new Role { name = "Marksman", id = testId }, - new Role { name = "1iC", roleType = RoleType.UNIT, order = 0 }, - new Role { name = "2iC", roleType = RoleType.UNIT, order = 1 }, - new Role { name = "NCOiC", roleType = RoleType.UNIT, order = 3 }, - new Role { name = "NCOiC Air Troop", roleType = RoleType.INDIVIDUAL, order = 0 } - }; - roles.ForEach(x => dataCollection.AddAsync(x).Wait()); - - return (dataCollection, testId); - } - - [Fact] - public async Task Should_add_item() { - await MongoTest( - async database => { - (DataCollection dataCollection, _) = await SetupTestCollection(database); - - Role role = new Role { name = "Section Leader" }; - await dataCollection.AddAsync(role); - - List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); - - subject.Should().Contain(x => x.name == role.name); - } - ); - } - - [Fact] - public async Task Should_create_collection() { - await MongoTest( - async database => { - DataCollection dataCollection = new DataCollection(database, "test"); - - await dataCollection.AssertCollectionExistsAsync(); - - IMongoCollection subject = database.GetCollection("test"); - - subject.Should().NotBeNull(); - } - ); - } - - [Fact] - public async Task Should_delete_item_by_id() { - await MongoTest( - async database => { - (DataCollection dataCollection, string testId) = await SetupTestCollection(database); - - await dataCollection.DeleteAsync(testId); - - List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); - - subject.Should().NotContain(x => x.id == testId); - } - ); - } - - [Fact] - public async Task Should_delete_many_by_predicate() { - await MongoTest( - async database => { - (DataCollection dataCollection, _) = await SetupTestCollection(database); - - await dataCollection.DeleteManyAsync(x => x.order == 0); - - List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); - - subject.Should().NotContain(x => x.order == 0); - } - ); - } - - [Fact] - public async Task Should_get_many_by_predicate() { - await MongoTest( - async database => { - (DataCollection dataCollection, _) = await SetupTestCollection(database); - - List subject = dataCollection.Get(x => x.order == 0).ToList(); - - subject.Should().NotBeNull(); - subject.Count.Should().Be(5); - subject.Should().Contain(x => x.name == "Trainee"); - } - ); - } - - [Fact] - public async Task Should_get_collection() { - await MongoTest( - async database => { - (DataCollection dataCollection, _) = await SetupTestCollection(database); - - List subject = dataCollection.Get().ToList(); - - subject.Should().NotBeNull(); - subject.Count.Should().Be(7); - subject.Should().Contain(x => x.name == "NCOiC"); - } - ); - } - - [Fact] - public async Task Should_get_item_by_id() { - await MongoTest( - async database => { - (DataCollection dataCollection, string testId) = await SetupTestCollection(database); - - Role subject = dataCollection.GetSingle(testId); - - subject.Should().NotBeNull(); - subject.name.Should().Be("Marksman"); - } - ); - } - - [Fact] - public async Task Should_get_item_by_predicate() { - await MongoTest( - async database => { - (DataCollection dataCollection, _) = await SetupTestCollection(database); - - Role subject = dataCollection.GetSingle(x => x.roleType == RoleType.UNIT && x.order == 1); - - subject.Should().NotBeNull(); - subject.name.Should().Be("2iC"); - } - ); - } - - [Fact] - public async Task Should_not_throw_when_collection_exists() { - await MongoTest( - async database => { - await database.CreateCollectionAsync("test"); - DataCollection dataCollection = new DataCollection(database, "test"); - - Func act = async () => await dataCollection.AssertCollectionExistsAsync(); - - await act.Should().NotThrowAsync(); - } - ); - } - - [Fact] - public async Task Should_replace_item() { - await MongoTest( - async database => { - (DataCollection dataCollection, string testId) = await SetupTestCollection(database); - - Role role = new Role { id = testId, name = "Sharpshooter" }; - await dataCollection.ReplaceAsync(role.id, role); - - Role subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.id == testId); - - subject.name.Should().Be(role.name); - subject.order.Should().Be(0); - subject.roleType.Should().Be(RoleType.INDIVIDUAL); - } - ); - } - - [Fact] - public async Task Should_update_item_by_id() { - await MongoTest( - async database => { - (DataCollection dataCollection, string testId) = await SetupTestCollection(database); - - await dataCollection.UpdateAsync(testId, Builders.Update.Set(x => x.order, 10)); - - Rank subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.id == testId); - - subject.order.Should().Be(10); - } - ); - } - - [Fact] - public async Task Should_update_item_by_filter() { - await MongoTest( - async database => { - (DataCollection dataCollection, string testId) = await SetupTestCollection(database); - - await dataCollection.UpdateAsync(Builders.Filter.Where(x => x.id == testId), Builders.Update.Set(x => x.order, 10)); - - Rank subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.id == testId); - - subject.order.Should().Be(10); - } - ); - } - - [Fact] - public async Task Should_update_many_by_predicate() { - await MongoTest( - async database => { - (DataCollection dataCollection, _) = await SetupTestCollection(database); - - await dataCollection.UpdateManyAsync(x => x.order == 0, Builders.Update.Set(x => x.order, 10)); - - List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().Where(x => x.order == 10).ToList(); - - subject.Count.Should().Be(5); - } - ); - } - } -} +// using System; +// using System.Collections.Generic; +// using System.Linq; +// using System.Threading.Tasks; +// using FluentAssertions; +// using Mongo2Go; +// using MongoDB.Bson; +// using MongoDB.Driver; +// using UKSF.Api.Base.Context; +// using UKSF.Api.Personnel.Models; +// using UKSF.Tests.Common; +// using Xunit; + +// // Available test collections as json: +// // accounts +// // commentThreads +// // discharges +// // gameServers +// // ranks +// // roles +// // scheduledJobs +// // teamspeakSnapshots +// // units +// // variables + +// namespace UKSF.Tests.Integration.Data { + // public class DataCollectionTests : IDisposable { + // private const string TEST_COLLECTION_NAME = "roles"; + // private MongoDbRunner _mongoDbRunner; + + // public void Dispose() { + // _mongoDbRunner?.Dispose(); + // } + + // private async Task MongoTest(Func testFunction) { + // _mongoDbRunner = MongoDbRunner.Start(additionalMongodArguments: "--quiet"); + + // IMongoDatabase database = MongoClientFactory.GetDatabase($"{_mongoDbRunner.ConnectionString}{Guid.NewGuid()}"); + + // await testFunction(database); + + // _mongoDbRunner.Dispose(); + // } + + // private static async Task<(MongoCollection dataCollection, string testId)> SetupTestCollection(IMongoDatabase database) { + // MongoCollection mongoCollection = new(database, TEST_COLLECTION_NAME); + // await mongoCollection.AssertCollectionExistsAsync(); + + // string testId = ObjectId.GenerateNewId().ToString(); + // List roles = new() { + // new Role { Name = "Rifleman" }, + // new Role { Name = "Trainee" }, + // new Role { Name = "Marksman", Id = testId }, + // new Role { Name = "1iC", RoleType = RoleType.UNIT, Order = 0 }, + // new Role { Name = "2iC", RoleType = RoleType.UNIT, Order = 1 }, + // new Role { Name = "NCOiC", RoleType = RoleType.UNIT, Order = 3 }, + // new Role { Name = "NCOiC Air Troop", RoleType = RoleType.INDIVIDUAL, Order = 0 } + // }; + // roles.ForEach(x => mongoCollection.AddAsync(x).Wait()); + + // return (mongoCollection, testId); + // } + + // [Fact] + // public async Task Should_add_item() { + // await MongoTest( + // async database => { + // (MongoCollection dataCollection, _) = await SetupTestCollection(database); + + // Role role = new() { Name = "Section Leader" }; + // await dataCollection.AddAsync(role); + + // List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); + + // subject.Should().Contain(x => x.Name == role.Name); + // } + // ); + // } + + // [Fact] + // public async Task Should_create_collection() { + // await MongoTest( + // async database => { + // MongoCollection mongoCollection = new(database, "test"); + + // await mongoCollection.AssertCollectionExistsAsync(); + + // MongoDB.Driver.IMongoCollection subject = database.GetCollection("test"); + + // subject.Should().NotBeNull(); + // } + // ); + // } + + // [Fact] + // public async Task Should_delete_item_by_id() { + // await MongoTest( + // async database => { + // (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); + + // await dataCollection.DeleteAsync(testId); + + // List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); + + // subject.Should().NotContain(x => x.Id == testId); + // } + // ); + // } + + // [Fact] + // public async Task Should_delete_many_by_predicate() { + // await MongoTest( + // async database => { + // (MongoCollection dataCollection, _) = await SetupTestCollection(database); + + // await dataCollection.DeleteManyAsync(x => x.Order == 0); + + // List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); + + // subject.Should().NotContain(x => x.Order == 0); + // } + // ); + // } + + // [Fact] + // public async Task Should_get_many_by_predicate() { + // await MongoTest( + // async database => { + // (MongoCollection dataCollection, _) = await SetupTestCollection(database); + + // List subject = dataCollection.Get(x => x.Order == 0).ToList(); + + // subject.Should().NotBeNull(); + // subject.Count.Should().Be(5); + // subject.Should().Contain(x => x.Name == "Trainee"); + // } + // ); + // } + + // [Fact] + // public async Task Should_get_collection() { + // await MongoTest( + // async database => { + // (MongoCollection dataCollection, _) = await SetupTestCollection(database); + + // List subject = dataCollection.Get().ToList(); + + // subject.Should().NotBeNull(); + // subject.Count.Should().Be(7); + // subject.Should().Contain(x => x.Name == "NCOiC"); + // } + // ); + // } + + // [Fact] + // public async Task Should_get_item_by_id() { + // await MongoTest( + // async database => { + // (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); + + // Role subject = dataCollection.GetSingle(testId); + + // subject.Should().NotBeNull(); + // subject.Name.Should().Be("Marksman"); + // } + // ); + // } + + // [Fact] + // public async Task Should_get_item_by_predicate() { + // await MongoTest( + // async database => { + // (MongoCollection dataCollection, _) = await SetupTestCollection(database); + + // Role subject = dataCollection.GetSingle(x => x.RoleType == RoleType.UNIT && x.Order == 1); + + // subject.Should().NotBeNull(); + // subject.Name.Should().Be("2iC"); + // } + // ); + // } + + // [Fact] + // public async Task Should_not_throw_when_collection_exists() { + // await MongoTest( + // async database => { + // await database.CreateCollectionAsync("test"); + // MongoCollection mongoCollection = new MongoCollection(database, "test"); + + // Func act = async () => await mongoCollection.AssertCollectionExistsAsync(); + + // await act.Should().NotThrowAsync(); + // } + // ); + // } + + // [Fact] + // public async Task Should_replace_item() { + // await MongoTest( + // async database => { + // (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); + + // Role role = new Role { Id = testId, Name = "Sharpshooter" }; + // await dataCollection.ReplaceAsync(role.Id, role); + + // Role subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.Id == testId); + + // subject.Name.Should().Be(role.Name); + // subject.Order.Should().Be(0); + // subject.RoleType.Should().Be(RoleType.INDIVIDUAL); + // } + // ); + // } + + // [Fact] + // public async Task Should_update_item_by_id() { + // await MongoTest( + // async database => { + // (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); + + // await dataCollection.UpdateAsync(testId, Builders.Update.Set(x => x.Order, 10)); + + // Rank subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.Id == testId); + + // subject.Order.Should().Be(10); + // } + // ); + // } + + // [Fact] + // public async Task Should_update_item_by_filter() { + // await MongoTest( + // async database => { + // (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); + + // await dataCollection.UpdateAsync(Builders.Filter.Where(x => x.Id == testId), Builders.Update.Set(x => x.Order, 10)); + + // Rank subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.Id == testId); + + // subject.Order.Should().Be(10); + // } + // ); + // } + + // [Fact] + // public async Task Should_update_many_by_predicate() { + // await MongoTest( + // async database => { + // (MongoCollection dataCollection, _) = await SetupTestCollection(database); + + // await dataCollection.UpdateManyAsync(x => x.Order == 0, Builders.Update.Set(x => x.Order, 10)); + + // List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().Where(x => x.Order == 10).ToList(); + + // subject.Count.Should().Be(5); + // } + // ); + // } + // } +// } diff --git a/UKSF.Tests/UKSF.Tests.csproj b/UKSF.Tests/UKSF.Tests.csproj index 72b80f83..d1c676ea 100644 --- a/UKSF.Tests/UKSF.Tests.csproj +++ b/UKSF.Tests/UKSF.Tests.csproj @@ -11,9 +11,9 @@ all - - - + + + all @@ -26,6 +26,7 @@ + @@ -34,6 +35,7 @@ + diff --git a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs index 6a3c00d3..72640dd9 100644 --- a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs @@ -4,7 +4,7 @@ using MongoDB.Bson; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Extensions; -using UKSF.Tests.Common; +using UKSF.Api.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Common { @@ -12,64 +12,64 @@ public class ChangeUtilitiesTests { [Fact] public void Should_detect_changes_for_complex_object() { string id = ObjectId.GenerateNewId().ToString(); - Account original = new Account { - id = id, - firstname = "Tim", - background = "I like trains", - dob = DateTime.Parse("2018-08-09T05:00:00.307"), - rank = "Private", - application = new Application { state = ApplicationState.WAITING, recruiter = "Bob", applicationCommentThread = "thread1", dateCreated = DateTime.Parse("2020-05-02T10:34:39.786") }, - rolePreferences = new List { "Aviatin", "NCO" } + Account original = new() { + Id = id, + Firstname = "Tim", + Background = "I like trains", + Dob = DateTime.Parse("2018-08-09T05:00:00.307"), + Rank = "Private", + Application = new Application { State = ApplicationState.WAITING, Recruiter = "Bob", ApplicationCommentThread = "thread1", DateCreated = DateTime.Parse("2020-05-02T10:34:39.786") }, + RolePreferences = new List { "Aviatin", "NCO" } }; - Account updated = new Account { - id = id, - firstname = "Timmy", - lastname = "Bob", - background = "I like planes", - dob = DateTime.Parse("2020-10-03T05:00:34.307"), - application = new Application { - state = ApplicationState.ACCEPTED, recruiter = "Bob", dateCreated = DateTime.Parse("2020-05-02T10:34:39.786"), dateAccepted = DateTime.Parse("2020-07-02T10:34:39.786") + Account updated = new() { + Id = id, + Firstname = "Timmy", + Lastname = "Bob", + Background = "I like planes", + Dob = DateTime.Parse("2020-10-03T05:00:34.307"), + Application = new Application { + State = ApplicationState.ACCEPTED, Recruiter = "Bob", DateCreated = DateTime.Parse("2020-05-02T10:34:39.786"), DateAccepted = DateTime.Parse("2020-07-02T10:34:39.786") }, - rolePreferences = new List { "Aviation", "Officer" } + RolePreferences = new List { "Aviation", "Officer" } }; string subject = original.Changes(updated); subject.Should() .Be( - "\n\t'lastname' added as 'Bob'" + - "\n\t'background' changed from 'I like trains' to 'I like planes'" + - "\n\t'dob' changed from '09/08/2018 05:00:00' to '03/10/2020 05:00:34'" + - "\n\t'firstname' changed from 'Tim' to 'Timmy'" + - "\n\t'rolePreferences' changed:" + + "\n\t'Lastname' added as 'Bob'" + + "\n\t'Background' changed from 'I like trains' to 'I like planes'" + + "\n\t'Dob' changed from '09/08/2018 05:00:00' to '03/10/2020 05:00:34'" + + "\n\t'Firstname' changed from 'Tim' to 'Timmy'" + + "\n\t'RolePreferences' changed:" + "\n\t\tadded: 'Aviation'" + "\n\t\tadded: 'Officer'" + "\n\t\tremoved: 'Aviatin'" + "\n\t\tremoved: 'NCO'" + - "\n\t'rank' as 'Private' removed" + - "\n\t'application' changed:" + - "\n\t\t'dateAccepted' changed from '01/01/0001 00:00:00' to '02/07/2020 10:34:39'" + - "\n\t\t'state' changed from 'WAITING' to 'ACCEPTED'" + - "\n\t\t'applicationCommentThread' as 'thread1' removed" + "\n\t'Rank' as 'Private' removed" + + "\n\t'Application' changed:" + + "\n\t\t'DateAccepted' changed from '01/01/0001 00:00:00' to '02/07/2020 10:34:39'" + + "\n\t\t'State' changed from 'WAITING' to 'ACCEPTED'" + + "\n\t\t'ApplicationCommentThread' as 'thread1' removed" ); } [Fact] public void Should_detect_changes_for_date() { string id = ObjectId.GenerateNewId().ToString(); - Account original = new Account { id = id, dob = DateTime.Parse("2020-10-03T05:00:34.307") }; - Account updated = new Account { id = id, dob = DateTime.Parse("2020-11-03T00:00:00.000") }; + Account original = new() { Id = id, Dob = DateTime.Parse("2020-10-03T05:00:34.307") }; + Account updated = new() { Id = id, Dob = DateTime.Parse("2020-11-03T00:00:00.000") }; string subject = original.Changes(updated); - subject.Should().Be("\n\t'dob' changed from '03/10/2020 05:00:34' to '03/11/2020 00:00:00'"); + subject.Should().Be("\n\t'Dob' changed from '03/10/2020 05:00:34' to '03/11/2020 00:00:00'"); } [Fact] public void Should_detect_changes_for_dictionary() { string id = ObjectId.GenerateNewId().ToString(); - TestDataModel original = new TestDataModel { id = id, Dictionary = new Dictionary { { "0", "variable0" }, { "1", "variable0" } } }; - TestDataModel updated = new TestDataModel { id = id, Dictionary = new Dictionary { { "0", "variable0" }, { "1", "variable1" }, { "2", "variable2" } } }; + TestDataModel original = new() { Id = id, Dictionary = new Dictionary { { "0", "variable0" }, { "1", "variable0" } } }; + TestDataModel updated = new() { Id = id, Dictionary = new Dictionary { { "0", "variable0" }, { "1", "variable1" }, { "2", "variable2" } } }; string subject = original.Changes(updated); @@ -79,87 +79,85 @@ public void Should_detect_changes_for_dictionary() { [Fact] public void Should_detect_changes_for_enum() { string id = ObjectId.GenerateNewId().ToString(); - Account original = new Account { id = id, membershipState = MembershipState.UNCONFIRMED }; - Account updated = new Account { id = id, membershipState = MembershipState.MEMBER }; + Account original = new() { Id = id, MembershipState = MembershipState.UNCONFIRMED }; + Account updated = new() { Id = id, MembershipState = MembershipState.MEMBER }; string subject = original.Changes(updated); - subject.Should().Be("\n\t'membershipState' changed from 'UNCONFIRMED' to 'MEMBER'"); + subject.Should().Be("\n\t'MembershipState' changed from 'UNCONFIRMED' to 'MEMBER'"); } [Fact] public void Should_detect_changes_for_hashset() { string id = ObjectId.GenerateNewId().ToString(); - Account original = new Account { id = id, teamspeakIdentities = new HashSet { 0 } }; - Account updated = new Account { id = id, teamspeakIdentities = new HashSet { 0, 1, 2, 2 } }; + Account original = new() { Id = id, TeamspeakIdentities = new HashSet { 0 } }; + Account updated = new() { Id = id, TeamspeakIdentities = new HashSet { 0, 1, 2, 2 } }; string subject = original.Changes(updated); - subject.Should().Be("\n\t'teamspeakIdentities' changed:" + "\n\t\tadded: '1'" + "\n\t\tadded: '2'"); + subject.Should().Be("\n\t'TeamspeakIdentities' changed:" + "\n\t\tadded: '1'" + "\n\t\tadded: '2'"); } [Fact] public void Should_detect_changes_for_object_list() { string id = ObjectId.GenerateNewId().ToString(); - Account original = new Account { id = id, serviceRecord = new List { new ServiceRecordEntry { Occurence = "Event" } } }; - Account updated = new Account { - id = id, serviceRecord = new List { new ServiceRecordEntry { Occurence = "Event" }, new ServiceRecordEntry { Occurence = "Another Event" } } - }; + Account original = new() { Id = id, ServiceRecord = new List { new() { Occurence = "Event" } } }; + Account updated = new() { Id = id, ServiceRecord = new List { new() { Occurence = "Event" }, new() { Occurence = "Another Event" } } }; string subject = original.Changes(updated); - subject.Should().Be("\n\t'serviceRecord' changed:" + "\n\t\tadded: '01/01/0001: Another Event'"); + subject.Should().Be("\n\t'ServiceRecord' changed:" + "\n\t\tadded: '01/01/0001: Another Event'"); } [Fact] public void Should_detect_changes_for_simple_list() { string id = ObjectId.GenerateNewId().ToString(); - Account original = new Account { id = id, rolePreferences = new List { "Aviatin", "NCO" } }; - Account updated = new Account { id = id, rolePreferences = new List { "Aviation", "NCO", "Officer" } }; + Account original = new() { Id = id, RolePreferences = new List { "Aviatin", "NCO" } }; + Account updated = new() { Id = id, RolePreferences = new List { "Aviation", "NCO", "Officer" } }; string subject = original.Changes(updated); - subject.Should().Be("\n\t'rolePreferences' changed:" + "\n\t\tadded: 'Aviation'" + "\n\t\tadded: 'Officer'" + "\n\t\tremoved: 'Aviatin'"); + subject.Should().Be("\n\t'RolePreferences' changed:" + "\n\t\tadded: 'Aviation'" + "\n\t\tadded: 'Officer'" + "\n\t\tremoved: 'Aviatin'"); } [Fact] public void Should_detect_changes_for_simple_object() { string id = ObjectId.GenerateNewId().ToString(); - Rank original = new Rank { id = id, abbreviation = "Pte", name = "Privte", order = 1 }; - Rank updated = new Rank { id = id, name = "Private", order = 5, teamspeakGroup = "4" }; + Rank original = new() { Id = id, Abbreviation = "Pte", Name = "Privte", Order = 1 }; + Rank updated = new() { Id = id, Name = "Private", Order = 5, TeamspeakGroup = "4" }; string subject = original.Changes(updated); - subject.Should().Be("\n\t'teamspeakGroup' added as '4'" + "\n\t'name' changed from 'Privte' to 'Private'" + "\n\t'order' changed from '1' to '5'" + "\n\t'abbreviation' as 'Pte' removed"); - } - - [Fact] - public void Should_do_nothing_when_null() { - string subject = ((Rank) null).Changes(null); - - subject.Should().Be("No changes"); + subject.Should().Be("\n\t'TeamspeakGroup' added as '4'" + "\n\t'Name' changed from 'Privte' to 'Private'" + "\n\t'Order' changed from '1' to '5'" + "\n\t'Abbreviation' as 'Pte' removed"); } [Fact] public void Should_do_nothing_when_field_is_null() { string id = ObjectId.GenerateNewId().ToString(); - Rank original = new Rank { id = id, abbreviation = null }; - Rank updated = new Rank { id = id, abbreviation = null }; + Rank original = new() { Id = id, Abbreviation = null }; + Rank updated = new() { Id = id, Abbreviation = null }; string subject = original.Changes(updated); - subject.Should().Be("No changes"); + subject.Should().Be("\tNo changes"); + } + + [Fact] + public void Should_do_nothing_when_null() { + string subject = ((Rank) null).Changes(null); + + subject.Should().Be("\tNo changes"); } [Fact] public void Should_do_nothing_when_objects_are_equal() { string id = ObjectId.GenerateNewId().ToString(); - Rank original = new Rank { id = id, abbreviation = "Pte" }; - Rank updated = new Rank { id = id, abbreviation = "Pte" }; + Rank original = new() { Id = id, Abbreviation = "Pte" }; + Rank updated = new() { Id = id, Abbreviation = "Pte" }; string subject = original.Changes(updated); - subject.Should().Be("No changes"); + subject.Should().Be("\tNo changes"); } } } diff --git a/UKSF.Tests/Unit/Common/ClockTests.cs b/UKSF.Tests/Unit/Common/ClockTests.cs index 19f27aa1..a2b3f363 100644 --- a/UKSF.Tests/Unit/Common/ClockTests.cs +++ b/UKSF.Tests/Unit/Common/ClockTests.cs @@ -6,17 +6,17 @@ namespace UKSF.Tests.Unit.Common { public class ClockTests { [Fact] - public void Should_return_current_date_and_time() { - DateTime subject = new Clock().Now(); + public void Should_return_current_date() { + DateTime subject = new Clock().Today(); - subject.Should().BeCloseTo(DateTime.Now, TimeSpan.FromMilliseconds(10)); + subject.Should().BeCloseTo(DateTime.Today, TimeSpan.FromMilliseconds(0)); } [Fact] - public void Should_return_current_date() { - DateTime subject = new Clock().Today(); + public void Should_return_current_date_and_time() { + DateTime subject = new Clock().Now(); - subject.Should().BeCloseTo(DateTime.Today, TimeSpan.FromMilliseconds(0)); + subject.Should().BeCloseTo(DateTime.Now, TimeSpan.FromMilliseconds(10)); } [Fact] diff --git a/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs b/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs index 454a111c..81b4589f 100644 --- a/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs @@ -7,7 +7,7 @@ namespace UKSF.Tests.Unit.Common { public class CollectionUtilitiesTests { [Fact] public void Should_remove_empty_strings_from_hashset() { - HashSet subject = new HashSet {"1", "", null, "3"}; + HashSet subject = new() { "1", "", null, "3" }; subject.CleanHashset(); diff --git a/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs b/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs index 418af135..9d339ed2 100644 --- a/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs @@ -15,21 +15,21 @@ public void Should_return_correct_value_from_body() { } [Fact] - public void Should_return_value_as_string_from_body_when_data_is_not_string() { - JObject jObject = JObject.Parse("{\"key\":2}"); + public void Should_return_nothing_from_body_for_invalid_key() { + JObject jObject = JObject.Parse("{\"key\":\"value\"}"); - string subject = jObject.GetValueFromBody("key"); + string subject = jObject.GetValueFromBody("notthekey"); - subject.Should().Be("2"); + subject.Should().Be(string.Empty); } [Fact] - public void Should_return_nothing_from_body_for_invalid_key() { - JObject jObject = JObject.Parse("{\"key\":\"value\"}"); + public void Should_return_value_as_string_from_body_when_data_is_not_string() { + JObject jObject = JObject.Parse("{\"key\":2}"); - string subject = jObject.GetValueFromBody("notthekey"); + string subject = jObject.GetValueFromBody("key"); - subject.Should().Be(string.Empty); + subject.Should().Be("2"); } } } diff --git a/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs b/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs index 8a7c790f..ccfa8db1 100644 --- a/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs @@ -17,7 +17,7 @@ public void ShouldGiveCorrectAge(int years, int months, int expectedYears, int e [Fact] public void ShouldGiveCorrectMonthsForDay() { - DateTime dob = new DateTime(2019, 1, 20); + DateTime dob = new(2019, 1, 20); (int _, int subjectMonths) = dob.ToAge(new DateTime(2020, 1, 16)); diff --git a/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs b/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs index 17a4c3a9..dd9e28e7 100644 --- a/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs +++ b/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs @@ -2,7 +2,7 @@ using MongoDB.Bson; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; -using UKSF.Tests.Common; +using UKSF.Api.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Common { @@ -15,9 +15,9 @@ public void Should_create_data_event_correctly() { DataEventModel subject = EventModelFactory.CreateDataEvent(DataEventType.ADD, id, data); subject.Should().NotBeNull(); - subject.type.Should().Be(DataEventType.ADD); - subject.id.Should().Be(id); - subject.data.Should().Be(data); + subject.Type.Should().Be(DataEventType.ADD); + subject.Id.Should().Be(id); + subject.Data.Should().Be(data); } } } diff --git a/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs b/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs index b2e7b63c..69230ab4 100644 --- a/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs +++ b/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs @@ -31,7 +31,8 @@ public void ShouldValidateStringCorrectly(string text, bool valid) { subject.Should().Be(valid); } - [Theory, InlineData(new[] { "" }, false, false), InlineData(new[] { "", "2" }, true, false), InlineData(new[] { "5ed43018bea2f1945440f37d", "2" }, true, false), InlineData(new[] { "5ed43018bea2f1945440f37d", "5ed43018bea2f1945440f37e" }, true, true)] + [Theory, InlineData(new[] { "" }, false, false), InlineData(new[] { "", "2" }, true, false), InlineData(new[] { "5ed43018bea2f1945440f37d", "2" }, true, false), + InlineData(new[] { "5ed43018bea2f1945440f37d", "5ed43018bea2f1945440f37e" }, true, true)] public void ShouldValidateIdArrayCorrectly(string[] array, bool valid, bool idValid) { bool subject = true; bool subjectId = true; diff --git a/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs b/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs index cb84847b..1b2000ad 100644 --- a/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs @@ -1,38 +1,39 @@ using System.Collections.Generic; using FluentAssertions; using UKSF.Api.Shared.Extensions; -using UKSF.Tests.Common; +using UKSF.Api.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Common { public class JsonUtilitiesTests { [Fact] public void ShouldCopyComplexObject() { - TestDataModel testDataModel1 = new TestDataModel {Name = "1"}; - TestDataModel testDataModel2 = new TestDataModel {Name = "2"}; - TestDataModel testDataModel3 = new TestDataModel {Name = "3"}; - TestComplexDataModel testComplexDataModel = new TestComplexDataModel {Name = "Test", Data = testDataModel1, List = new List {"a", "b", "c"}, DataList = new List {testDataModel1, testDataModel2, testDataModel3}}; + TestDataModel testDataModel1 = new() { Name = "1" }; + TestDataModel testDataModel2 = new() { Name = "2" }; + TestDataModel testDataModel3 = new() { Name = "3" }; + TestComplexDataModel testComplexDataModel = new() { + Name = "Test", Data = testDataModel1, List = new List { "a", "b", "c" }, DataList = new List { testDataModel1, testDataModel2, testDataModel3 } + }; TestComplexDataModel subject = testComplexDataModel.Copy(); - subject.id.Should().Be(testComplexDataModel.id); + subject.Id.Should().Be(testComplexDataModel.Id); subject.Name.Should().Be(testComplexDataModel.Name); subject.Data.Should().NotBe(testDataModel1); - subject.List.Should().HaveCount(3).And.Contain(new List {"a", "b", "c"}); - subject.DataList.Should().HaveCount(3).And.NotContain(new List {testDataModel1, testDataModel2, testDataModel3}); + subject.List.Should().HaveCount(3).And.Contain(new List { "a", "b", "c" }); + subject.DataList.Should().HaveCount(3).And.NotContain(new List { testDataModel1, testDataModel2, testDataModel3 }); } [Fact] public void ShouldCopyObject() { - TestDataModel testDataModel = new TestDataModel {Name = "Test"}; + TestDataModel testDataModel = new() { Name = "Test" }; TestDataModel subject = testDataModel.Copy(); - subject.id.Should().Be(testDataModel.id); + subject.Id.Should().Be(testDataModel.Id); subject.Name.Should().Be(testDataModel.Name); } - [Fact] public void ShouldEscapeJsonString() { const string UNESCAPED_JSON = "JSON:{\"message\": \"\\nMaking zeus \\ at 'C:\\test\\path'\", \"colour\": \"#20d18b\"}"; diff --git a/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs b/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs index 4fb1cd65..252be963 100644 --- a/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs @@ -7,7 +7,8 @@ namespace UKSF.Tests.Unit.Common { public class StringUtilitiesTests { - [Theory, InlineData("", "", false), InlineData("", "hello", false), InlineData("hello world hello world", "hello", true), InlineData("hello", "HELLO", true), InlineData("hello world", "HELLOWORLD", false)] + [Theory, InlineData("", "", false), InlineData("", "hello", false), InlineData("hello world hello world", "hello", true), InlineData("hello", "HELLO", true), + InlineData("hello world", "HELLOWORLD", false)] public void ShouldIgnoreCase(string text, string searchElement, bool expected) { bool subject = text.ContainsIgnoreCase(searchElement); @@ -21,7 +22,8 @@ public void ShouldNotThrowExceptionForDouble(string text) { act.Should().NotThrow(); } - [Theory, InlineData("", 0), InlineData("2", 2), InlineData("1.79769313486232E+307", 1.79769313486232E+307d), InlineData("-1.79769313486232E+307", -1.79769313486232E+307d)] // E+307 is one less than double max/min + [Theory, InlineData("", 0), InlineData("2", 2), InlineData("1.79769313486232E+307", 1.79769313486232E+307d), + InlineData("-1.79769313486232E+307", -1.79769313486232E+307d)] // E+307 is one less than double max/min public void ShouldParseDoubleCorrectly(string text, double expected) { double subject = text.ToDouble(); @@ -63,7 +65,8 @@ public void ShouldRemoveQuotes(string text, string expected) { subject.Should().Be(expected); } - [Theory, InlineData("", ""), InlineData("\"hello \"\"test\"\" world\"", "\"hello 'test' world\""), InlineData("\"hello \" \"test\"\" world\"", "\"hello test' world\""), InlineData("\"\"\"\"", "''")] + [Theory, InlineData("", ""), InlineData("\"hello \"\"test\"\" world\"", "\"hello 'test' world\""), InlineData("\"hello \" \"test\"\" world\"", "\"hello test' world\""), + InlineData("\"\"\"\"", "''")] public void ShouldRemoveEmbeddedQuotes(string text, string expected) { string subject = text.RemoveEmbeddedQuotes(); diff --git a/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs index b3cf8734..84bbcafd 100644 --- a/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs @@ -7,30 +7,11 @@ namespace UKSF.Tests.Unit.Common { public class TaskUtilitiesTests { - [Fact] - public void ShouldDelay() { - CancellationTokenSource token = new CancellationTokenSource(); - Action act = async () => await TaskUtilities.Delay(TimeSpan.FromMilliseconds(10), token.Token); - - act.ExecutionTime().Should().BeLessOrEqualTo(TimeSpan.FromMilliseconds(10)); - } - - [Fact] - public void ShouldNotThrowExceptionForDelay() { - Action act = () => { - CancellationTokenSource token = new CancellationTokenSource(); - Task unused = TaskUtilities.Delay(TimeSpan.FromMilliseconds(50), token.Token); - token.Cancel(); - }; - - act.Should().NotThrow(); - } - [Fact] public async Task ShouldCallbackAfterDelay() { bool subject = false; Func act = async () => { - CancellationTokenSource token = new CancellationTokenSource(); + CancellationTokenSource token = new(); await TaskUtilities.DelayWithCallback( TimeSpan.FromMilliseconds(10), token.Token, @@ -46,20 +27,33 @@ await TaskUtilities.DelayWithCallback( subject.Should().BeTrue(); } + [Fact] + public void ShouldDelay() { + CancellationTokenSource token = new(); + Action act = async () => await TaskUtilities.Delay(TimeSpan.FromMilliseconds(10), token.Token); + + act.ExecutionTime().Should().BeLessOrEqualTo(TimeSpan.FromMilliseconds(10)); + } + [Fact] public void ShouldNotCallbackForCancellation() { - CancellationTokenSource token = new CancellationTokenSource(); - Func act = async () => { - await TaskUtilities.DelayWithCallback( - TimeSpan.FromMilliseconds(10), - token.Token, - null - ); - }; + CancellationTokenSource token = new(); + Func act = async () => { await TaskUtilities.DelayWithCallback(TimeSpan.FromMilliseconds(10), token.Token, null); }; act.Should().NotThrowAsync(); token.Cancel(); act.ExecutionTime().Should().BeLessThan(TimeSpan.FromMilliseconds(10)); } + + [Fact] + public void ShouldNotThrowExceptionForDelay() { + Action act = () => { + CancellationTokenSource token = new(); + Task unused = TaskUtilities.Delay(TimeSpan.FromMilliseconds(50), token.Token); + token.Cancel(); + }; + + act.Should().NotThrow(); + } } } diff --git a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs index 1254a5c1..7edc113a 100644 --- a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs @@ -13,99 +13,99 @@ namespace UKSF.Tests.Unit.Data.Admin { public class VariablesDataServiceTests { - private readonly Mock> mockDataCollection; - private readonly VariablesDataService variablesDataService; - private List mockCollection; + private readonly Mock> _mockDataCollection; + private readonly VariablesContext _variablesContext; + private List _mockCollection; public VariablesDataServiceTests() { - Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); + Mock mockDataCollectionFactory = new(); + Mock> mockDataEventBus = new(); + _mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); + _mockDataCollection.Setup(x => x.Get()).Returns(() => _mockCollection); - variablesDataService = new VariablesDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _variablesContext = new VariablesContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Theory, InlineData(""), InlineData("game path")] public void ShouldGetNothingWhenNoKeyOrNotFound(string key) { - VariableItem item1 = new VariableItem { key = "MISSIONS_PATH" }; - VariableItem item2 = new VariableItem { key = "SERVER_PATH" }; - VariableItem item3 = new VariableItem { key = "DISCORD_IDS" }; - mockCollection = new List { item1, item2, item3 }; + VariableItem item1 = new() { Key = "MISSIONS_PATH" }; + VariableItem item2 = new() { Key = "SERVER_PATH" }; + VariableItem item3 = new() { Key = "DISCORD_IDS" }; + _mockCollection = new List { item1, item2, item3 }; - VariableItem subject = variablesDataService.GetSingle(key); + VariableItem subject = _variablesContext.GetSingle(key); subject.Should().Be(null); } [Theory, InlineData(""), InlineData(null)] public async Task ShouldThrowForUpdateWhenNoKeyOrNull(string key) { - mockCollection = new List(); + _mockCollection = new List(); - Func act = async () => await variablesDataService.Update(key, "75"); + Func act = async () => await _variablesContext.Update(key, "75"); await act.Should().ThrowAsync(); } [Theory, InlineData(""), InlineData(null)] public async Task ShouldThrowForDeleteWhenNoKeyOrNull(string key) { - mockCollection = new List(); + _mockCollection = new List(); - Func act = async () => await variablesDataService.Delete(key); + Func act = async () => await _variablesContext.Delete(key); await act.Should().ThrowAsync(); } [Fact] - public async Task ShouldDeleteItem() { - VariableItem item1 = new VariableItem { key = "DISCORD_ID", item = "50" }; - mockCollection = new List { item1 }; - - mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + public void Should_get_collection_in_order() { + VariableItem item1 = new() { Key = "MISSIONS_PATH" }; + VariableItem item2 = new() { Key = "SERVER_PATH" }; + VariableItem item3 = new() { Key = "DISCORD_IDS" }; + _mockCollection = new List { item1, item2, item3 }; - await variablesDataService.Delete("discord id"); + IEnumerable subject = _variablesContext.Get(); - mockCollection.Should().HaveCount(0); + subject.Should().ContainInOrder(item3, item1, item2); } [Fact] - public void ShouldGetItemByKey() { - VariableItem item1 = new VariableItem { key = "MISSIONS_PATH" }; - VariableItem item2 = new VariableItem { key = "SERVER_PATH" }; - VariableItem item3 = new VariableItem { key = "DISCORD_IDS" }; - mockCollection = new List { item1, item2, item3 }; + public async Task ShouldDeleteItem() { + VariableItem item1 = new() { Key = "DISCORD_ID", Item = "50" }; + _mockCollection = new List { item1 }; - VariableItem subject = variablesDataService.GetSingle("server path"); + _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask).Callback((string id) => _mockCollection.RemoveAll(x => x.Id == id)); - subject.Should().Be(item2); + await _variablesContext.Delete("discord id"); + + _mockCollection.Should().HaveCount(0); } [Fact] - public void Should_get_collection_in_order() { - VariableItem item1 = new VariableItem { key = "MISSIONS_PATH" }; - VariableItem item2 = new VariableItem { key = "SERVER_PATH" }; - VariableItem item3 = new VariableItem { key = "DISCORD_IDS" }; - mockCollection = new List { item1, item2, item3 }; + public void ShouldGetItemByKey() { + VariableItem item1 = new() { Key = "MISSIONS_PATH" }; + VariableItem item2 = new() { Key = "SERVER_PATH" }; + VariableItem item3 = new() { Key = "DISCORD_IDS" }; + _mockCollection = new List { item1, item2, item3 }; - IEnumerable subject = variablesDataService.Get(); + VariableItem subject = _variablesContext.GetSingle("server path"); - subject.Should().ContainInOrder(item3, item1, item2); + subject.Should().Be(item2); } [Fact] public async Task ShouldUpdateItemValue() { - VariableItem subject = new VariableItem { key = "DISCORD_ID", item = "50" }; - mockCollection = new List { subject }; + VariableItem subject = new() { Key = "DISCORD_ID", Item = "50" }; + _mockCollection = new List { subject }; - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) - .Returns(Task.CompletedTask) - .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).item = "75"); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((string id, UpdateDefinition _) => _mockCollection.First(x => x.Id == id).Item = "75"); - await variablesDataService.Update("discord id", "75"); + await _variablesContext.Update("discord id", "75"); - subject.item.Should().Be("75"); + subject.Item.Should().Be("75"); } } } diff --git a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs index 6cba5b9b..4c1fc6b1 100644 --- a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs @@ -9,261 +9,261 @@ using UKSF.Api.Base.Context; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; -using UKSF.Tests.Common; +using UKSF.Api.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Data { public class CachedDataServiceTests { - private readonly Mock> mockDataCollection; - private readonly Mock mockDataCollectionFactory; - private readonly Mock> mockDataEventBus; - private List mockCollection; - private TestCachedDataService testCachedDataService; + private readonly Mock> _mockDataCollection; + private readonly Mock _mockDataCollectionFactory; + private readonly Mock> _mockDataEventBus; + private List _mockCollection; + private TestCachedContext _testCachedContext; public CachedDataServiceTests() { - mockDataCollectionFactory = new Mock(); - mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); + _mockDataCollectionFactory = new Mock(); + _mockDataEventBus = new Mock>(); + _mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(() => new List(mockCollection)); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())); + _mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); + _mockDataCollection.Setup(x => x.Get()).Returns(() => new List(_mockCollection)); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())); } [Fact] public void Should_cache_collection_when_null_for_get() { - mockCollection = new List(); + _mockCollection = new List(); - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); - testCachedDataService.Cache.Should().BeNull(); + _testCachedContext.Cache.Should().BeNull(); - testCachedDataService.Get(); + _testCachedContext.Get(); - testCachedDataService.Cache.Should().NotBeNull(); - testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); + _testCachedContext.Cache.Should().NotBeNull(); + _testCachedContext.Cache.Should().BeEquivalentTo(_mockCollection); } [Fact] public void Should_cache_collection_when_null_for_get_single_by_id() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Name = "2" }; + _mockCollection = new List { item1, item2 }; - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); - TestDataModel subject = testCachedDataService.GetSingle(item2.id); + TestDataModel subject = _testCachedContext.GetSingle(item2.Id); - testCachedDataService.Cache.Should().NotBeNull(); - testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); + _testCachedContext.Cache.Should().NotBeNull(); + _testCachedContext.Cache.Should().BeEquivalentTo(_mockCollection); subject.Should().Be(item2); } [Fact] public void Should_cache_collection_when_null_for_get_single_by_predicate() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Name = "2" }; + _mockCollection = new List { item1, item2 }; - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); - TestDataModel subject = testCachedDataService.GetSingle(x => x.Name == "2"); + TestDataModel subject = _testCachedContext.GetSingle(x => x.Name == "2"); - testCachedDataService.Cache.Should().NotBeNull(); - testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); + _testCachedContext.Cache.Should().NotBeNull(); + _testCachedContext.Cache.Should().BeEquivalentTo(_mockCollection); subject.Should().Be(item2); } [Fact] public void Should_cache_collection_when_null_for_get_with_predicate() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Name = "2" }; + _mockCollection = new List { item1, item2 }; - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); - IEnumerable subject = testCachedDataService.Get(x => x.Name == "1"); + IEnumerable subject = _testCachedContext.Get(x => x.Name == "1"); - testCachedDataService.Cache.Should().NotBeNull(); - subject.Should().BeSubsetOf(testCachedDataService.Cache); + _testCachedContext.Cache.Should().NotBeNull(); + subject.Should().BeSubsetOf(_testCachedContext.Cache); } [Fact] public void Should_cache_collection_when_null_for_refresh() { - mockCollection = new List(); + _mockCollection = new List(); - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); - testCachedDataService.Cache.Should().BeNull(); + _testCachedContext.Cache.Should().BeNull(); - testCachedDataService.Refresh(); + _testCachedContext.Refresh(); - testCachedDataService.Cache.Should().NotBeNull(); - testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); + _testCachedContext.Cache.Should().NotBeNull(); + _testCachedContext.Cache.Should().BeEquivalentTo(_mockCollection); } [Fact] public void Should_return_cached_collection_for_get() { - mockCollection = new List(); + _mockCollection = new List(); - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); - testCachedDataService.Cache.Should().BeNull(); + _testCachedContext.Cache.Should().BeNull(); - List subject1 = testCachedDataService.Get().ToList(); + List subject1 = _testCachedContext.Get().ToList(); subject1.Should().NotBeNull(); - subject1.Should().BeEquivalentTo(mockCollection); + subject1.Should().BeEquivalentTo(_mockCollection); - List subject2 = testCachedDataService.Get().ToList(); + List subject2 = _testCachedContext.Get().ToList(); subject2.Should().NotBeNull(); - subject2.Should().BeEquivalentTo(mockCollection).And.BeEquivalentTo(subject1); + subject2.Should().BeEquivalentTo(_mockCollection).And.BeEquivalentTo(subject1); } [Fact] public async Task Should_update_cache_for_add() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - mockCollection = new List(); + TestDataModel item1 = new() { Name = "1" }; + _mockCollection = new List(); - mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Callback(x => mockCollection.Add(x)); + _mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Callback(x => _mockCollection.Add(x)); - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); - testCachedDataService.Cache.Should().BeNull(); + _testCachedContext.Cache.Should().BeNull(); - await testCachedDataService.Add(item1); + await _testCachedContext.Add(item1); - testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); - testCachedDataService.Cache.Should().Contain(item1); + _testCachedContext.Cache.Should().BeEquivalentTo(_mockCollection); + _testCachedContext.Cache.Should().Contain(item1); } [Fact] - public async Task Should_update_cache_for_delete_by_id() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + public async Task Should_update_cache_for_delete() { + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Name = "2" }; + _mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => _mockCollection.RemoveAll(x => x.Id == id)); - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); - await testCachedDataService.Delete(item1.id); + await _testCachedContext.Delete(item1); - testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); - testCachedDataService.Cache.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); + _testCachedContext.Cache.Should().BeEquivalentTo(_mockCollection); + _testCachedContext.Cache.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); } [Fact] - public async Task Should_update_cache_for_delete() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + public async Task Should_update_cache_for_delete_by_id() { + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Name = "2" }; + _mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => _mockCollection.RemoveAll(x => x.Id == id)); - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); - await testCachedDataService.Delete(item1); + await _testCachedContext.Delete(item1.Id); - testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); - testCachedDataService.Cache.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); + _testCachedContext.Cache.Should().BeEquivalentTo(_mockCollection); + _testCachedContext.Cache.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); } [Fact] public async Task Should_update_cache_for_delete_many() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { Name = "1" }; - TestDataModel item3 = new TestDataModel { Name = "3" }; - mockCollection = new List { item1, item2, item3 }; + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Name = "1" }; + TestDataModel item3 = new() { Name = "3" }; + _mockCollection = new List { item1, item2, item3 }; - mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) - .Returns(Task.CompletedTask) - .Callback((Expression> expression) => mockCollection.RemoveAll(x => mockCollection.Where(expression.Compile()).Contains(x))); + _mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) + .Returns(Task.CompletedTask) + .Callback((Expression> expression) => _mockCollection.RemoveAll(x => _mockCollection.Where(expression.Compile()).Contains(x))); - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); - await testCachedDataService.DeleteMany(x => x.Name == "1"); + await _testCachedContext.DeleteMany(x => x.Name == "1"); - testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); - testCachedDataService.Cache.Should().HaveCount(1); - testCachedDataService.Cache.Should().Contain(item3); + _testCachedContext.Cache.Should().BeEquivalentTo(_mockCollection); + _testCachedContext.Cache.Should().HaveCount(1); + _testCachedContext.Cache.Should().Contain(item3); } [Fact] public async Task ShouldRefreshCollectionForReplace() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { id = item1.id, Name = "2" }; - mockCollection = new List { item1 }; + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Id = item1.Id, Name = "2" }; + _mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())) - .Returns(Task.CompletedTask) - .Callback((string id, TestDataModel value) => mockCollection[mockCollection.FindIndex(x => x.id == id)] = value); + _mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())) + .Returns(Task.CompletedTask) + .Callback((string id, TestDataModel value) => _mockCollection[_mockCollection.FindIndex(x => x.Id == id)] = value); - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); - await testCachedDataService.Replace(item2); + await _testCachedContext.Replace(item2); - testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); - testCachedDataService.Cache.First().Name.Should().Be("2"); + _testCachedContext.Cache.Should().BeEquivalentTo(_mockCollection); + _testCachedContext.Cache.First().Name.Should().Be("2"); } [Fact] public async Task ShouldRefreshCollectionForUpdate() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - mockCollection = new List { item1 }; + TestDataModel item1 = new() { Name = "1" }; + _mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) - .Returns(Task.CompletedTask) - .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((string id, UpdateDefinition _) => _mockCollection.First(x => x.Id == id).Name = "2"); - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); - await testCachedDataService.Update(item1.id, "Name", "2"); + await _testCachedContext.Update(item1.Id, "Name", "2"); - testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); - testCachedDataService.Cache.First().Name.Should().Be("2"); + _testCachedContext.Cache.Should().BeEquivalentTo(_mockCollection); + _testCachedContext.Cache.First().Name.Should().Be("2"); } [Fact] public async Task ShouldRefreshCollectionForUpdateByUpdateDefinition() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - mockCollection = new List { item1 }; + TestDataModel item1 = new() { Name = "1" }; + _mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) - .Returns(Task.CompletedTask) - .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((string id, UpdateDefinition _) => _mockCollection.First(x => x.Id == id).Name = "2"); - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); - await testCachedDataService.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); + await _testCachedContext.Update(item1.Id, Builders.Update.Set(x => x.Name, "2")); - testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); - testCachedDataService.Cache.First().Name.Should().Be("2"); + _testCachedContext.Cache.Should().BeEquivalentTo(_mockCollection); + _testCachedContext.Cache.First().Name.Should().Be("2"); } [Fact] public async Task ShouldRefreshCollectionForUpdateMany() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { Name = "1" }; - TestDataModel item3 = new TestDataModel { Name = "3" }; - mockCollection = new List { item1, item2, item3 }; - - mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())) - .Returns(Task.CompletedTask) - .Callback( - (Expression> expression, UpdateDefinition _) => - mockCollection.Where(expression.Compile()).ToList().ForEach(x => x.Name = "3") - ); - - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); - - await testCachedDataService.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "3")); - - testCachedDataService.Cache.Should().BeEquivalentTo(mockCollection); - testCachedDataService.Cache.ToList()[0].Name.Should().Be("3"); - testCachedDataService.Cache.ToList()[1].Name.Should().Be("3"); - testCachedDataService.Cache.ToList()[2].Name.Should().Be("3"); + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Name = "1" }; + TestDataModel item3 = new() { Name = "3" }; + _mockCollection = new List { item1, item2, item3 }; + + _mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback( + (Expression> expression, UpdateDefinition _) => + _mockCollection.Where(expression.Compile()).ToList().ForEach(x => x.Name = "3") + ); + + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + + await _testCachedContext.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "3")); + + _testCachedContext.Cache.Should().BeEquivalentTo(_mockCollection); + _testCachedContext.Cache.ToList()[0].Name.Should().Be("3"); + _testCachedContext.Cache.ToList()[1].Name.Should().Be("3"); + _testCachedContext.Cache.ToList()[2].Name.Should().Be("3"); } } } diff --git a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs index 71753957..eb630aa5 100644 --- a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs @@ -10,80 +10,80 @@ using UKSF.Api.Base.Context; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; -using UKSF.Tests.Common; +using UKSF.Api.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Data { public class CachedDataServiceEventTests { - private readonly string id1; - private readonly string id2; - private readonly string id3; - private readonly TestDataModel item1; - private readonly Mock> mockDataCollection; - private readonly Mock> mockDataEventBus; - private readonly TestCachedDataService testCachedDataService; + private readonly string _id1; + private readonly string _id2; + private readonly string _id3; + private readonly TestDataModel _item1; + private readonly Mock> _mockDataCollection; + private readonly Mock> _mockDataEventBus; + private readonly TestCachedContext _testCachedContext; public CachedDataServiceEventTests() { - Mock mockDataCollectionFactory = new Mock(); - mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); - id1 = ObjectId.GenerateNewId().ToString(); - id2 = ObjectId.GenerateNewId().ToString(); - id3 = ObjectId.GenerateNewId().ToString(); - item1 = new TestDataModel { id = id1, Name = "1" }; - TestDataModel item2 = new TestDataModel { id = id2, Name = "1" }; - TestDataModel item3 = new TestDataModel { id = id3, Name = "3" }; - List mockCollection = new List { item1, item2, item3 }; - - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => mockCollection.Where(predicate)); - mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => mockCollection.FirstOrDefault(predicate)); - mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(id => mockCollection.FirstOrDefault(x => x.id == id)); - - testCachedDataService = new TestCachedDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + Mock mockDataCollectionFactory = new(); + _mockDataEventBus = new Mock>(); + _mockDataCollection = new Mock>(); + _id1 = ObjectId.GenerateNewId().ToString(); + _id2 = ObjectId.GenerateNewId().ToString(); + _id3 = ObjectId.GenerateNewId().ToString(); + _item1 = new TestDataModel { Id = _id1, Name = "1" }; + TestDataModel item2 = new() { Id = _id2, Name = "1" }; + TestDataModel item3 = new() { Id = _id3, Name = "3" }; + List mockCollection = new() { _item1, item2, item3 }; + + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); + _mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + _mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => mockCollection.Where(predicate)); + _mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => mockCollection.FirstOrDefault(predicate)); + _mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(id => mockCollection.FirstOrDefault(x => x.Id == id)); + + _testCachedContext = new TestCachedContext(mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); } [Fact] public async Task Should_create_correct_add_event_for_add() { DataEventModel subject = null; - mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + _mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); - await testCachedDataService.Add(item1); + await _testCachedContext.Add(_item1); - mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); - subject.Should().BeEquivalentTo(new DataEventModel { id = id1, type = DataEventType.ADD, data = item1 }); + _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); + subject.Should().BeEquivalentTo(new DataEventModel { Id = _id1, Type = DataEventType.ADD, Data = _item1 }); } [Fact] public async Task Should_create_correct_delete_event_for_delete() { DataEventModel subject = null; - mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); - await testCachedDataService.Delete(id1); + await _testCachedContext.Delete(_id1); - mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); - subject.Should().BeEquivalentTo(new DataEventModel { id = id1, type = DataEventType.DELETE, data = null }); + _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); + subject.Should().BeEquivalentTo(new DataEventModel { Id = _id1, Type = DataEventType.DELETE, Data = null }); } [Fact] public async Task Should_create_correct_delete_events_for_delete_many() { - List> subjects = new List>(); + List> subjects = new(); - mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())).Returns(Task.CompletedTask); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + _mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())).Returns(Task.CompletedTask); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); - await testCachedDataService.DeleteMany(x => x.Name == "1"); + await _testCachedContext.DeleteMany(x => x.Name == "1"); - mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); + _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); subjects.Should() .BeEquivalentTo( - new DataEventModel { id = id1, type = DataEventType.DELETE, data = null }, - new DataEventModel { id = id2, type = DataEventType.DELETE, data = null } + new DataEventModel { Id = _id1, Type = DataEventType.DELETE, Data = null }, + new DataEventModel { Id = _id2, Type = DataEventType.DELETE, Data = null } ); } @@ -91,50 +91,50 @@ public async Task Should_create_correct_delete_events_for_delete_many() { public async Task Should_create_correct_update_event_for_replace() { DataEventModel subject = null; - mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + _mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); - await testCachedDataService.Replace(item1); + await _testCachedContext.Replace(_item1); - mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); - subject.Should().BeEquivalentTo(new DataEventModel { id = id1, type = DataEventType.UPDATE, data = null }); + _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); + subject.Should().BeEquivalentTo(new DataEventModel { Id = _id1, Type = DataEventType.UPDATE, Data = null }); } [Fact] public async Task Should_create_correct_update_events_for_update_many() { - List> subjects = new List>(); + List> subjects = new(); - mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())).Returns(Task.CompletedTask); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + _mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())).Returns(Task.CompletedTask); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); - await testCachedDataService.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); + await _testCachedContext.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); - mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); + _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); subjects.Should() .BeEquivalentTo( - new DataEventModel { id = id1, type = DataEventType.UPDATE, data = null }, - new DataEventModel { id = id2, type = DataEventType.UPDATE, data = null } + new DataEventModel { Id = _id1, Type = DataEventType.UPDATE, Data = null }, + new DataEventModel { Id = _id2, Type = DataEventType.UPDATE, Data = null } ); } [Fact] public async Task Should_create_correct_update_events_for_updates() { - List> subjects = new List>(); + List> subjects = new(); - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask); - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())).Returns(Task.CompletedTask); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())).Returns(Task.CompletedTask); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); - await testCachedDataService.Update(id1, "Name", "1"); - await testCachedDataService.Update(id2, Builders.Update.Set(x => x.Name, "2")); - await testCachedDataService.Update(x => x.id == id3, Builders.Update.Set(x => x.Name, "3")); + await _testCachedContext.Update(_id1, "Name", "1"); + await _testCachedContext.Update(_id2, Builders.Update.Set(x => x.Name, "2")); + await _testCachedContext.Update(x => x.Id == _id3, Builders.Update.Set(x => x.Name, "3")); - mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(3)); + _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(3)); subjects.Should() .BeEquivalentTo( - new DataEventModel { id = id1, type = DataEventType.UPDATE, data = null }, - new DataEventModel { id = id2, type = DataEventType.UPDATE, data = null }, - new DataEventModel { id = id3, type = DataEventType.UPDATE, data = null } + new DataEventModel { Id = _id1, Type = DataEventType.UPDATE, Data = null }, + new DataEventModel { Id = _id2, Type = DataEventType.UPDATE, Data = null }, + new DataEventModel { Id = _id3, Type = DataEventType.UPDATE, Data = null } ); } } diff --git a/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs b/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs index f09981ab..c167ec4b 100644 --- a/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs +++ b/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs @@ -2,18 +2,18 @@ using MongoDB.Driver; using Moq; using UKSF.Api.Base.Context; -using UKSF.Tests.Common; +using UKSF.Api.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Data { public class DataCollectionFactoryTests { [Fact] public void ShouldCreateDataCollection() { - Mock mockMongoDatabase = new Mock(); + Mock mockMongoDatabase = new(); - DataCollectionFactory dataCollectionFactory = new DataCollectionFactory(mockMongoDatabase.Object); + MongoCollectionFactory mongoCollectionFactory = new(mockMongoDatabase.Object); - IDataCollection subject = dataCollectionFactory.CreateDataCollection("test"); + Api.Base.Context.IMongoCollection subject = mongoCollectionFactory.CreateMongoCollection("test"); subject.Should().NotBeNull(); } diff --git a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs index e4223c07..1c6d661d 100644 --- a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs @@ -10,93 +10,93 @@ using UKSF.Api.Base.Context; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; -using UKSF.Tests.Common; +using UKSF.Api.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Data { public class DataServiceEventTests { - private readonly string id1; - private readonly string id2; - private readonly string id3; - private readonly TestDataModel item1; - private readonly Mock> mockDataCollection; - private readonly Mock> mockDataEventBus; - private readonly TestDataService testDataService; + private readonly string _id1; + private readonly string _id2; + private readonly string _id3; + private readonly TestDataModel _item1; + private readonly Mock> _mockDataCollection; + private readonly Mock> _mockDataEventBus; + private readonly TestContext _testContext; public DataServiceEventTests() { - Mock mockDataCollectionFactory = new Mock(); - mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); - id1 = ObjectId.GenerateNewId().ToString(); - id2 = ObjectId.GenerateNewId().ToString(); - id3 = ObjectId.GenerateNewId().ToString(); - item1 = new TestDataModel { id = id1, Name = "1" }; - TestDataModel item2 = new TestDataModel { id = id2, Name = "1" }; - TestDataModel item3 = new TestDataModel { id = id3, Name = "3" }; - List mockCollection = new List { item1, item2, item3 }; - - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => mockCollection.Where(predicate)); - mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => mockCollection.FirstOrDefault(predicate)); - mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(id => mockCollection.FirstOrDefault(x => x.id == id)); - - testDataService = new TestDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + Mock mockDataCollectionFactory = new(); + _mockDataEventBus = new Mock>(); + _mockDataCollection = new Mock>(); + _id1 = ObjectId.GenerateNewId().ToString(); + _id2 = ObjectId.GenerateNewId().ToString(); + _id3 = ObjectId.GenerateNewId().ToString(); + _item1 = new TestDataModel { Id = _id1, Name = "1" }; + TestDataModel item2 = new() { Id = _id2, Name = "1" }; + TestDataModel item3 = new() { Id = _id3, Name = "3" }; + List mockCollection = new() { _item1, item2, item3 }; + + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); + _mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + _mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => mockCollection.Where(predicate)); + _mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => mockCollection.FirstOrDefault(predicate)); + _mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(id => mockCollection.FirstOrDefault(x => x.Id == id)); + + _testContext = new TestContext(mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); } [Fact] public async Task Should_create_correct_add_event_for_add() { DataEventModel subject = null; - mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + _mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); - await testDataService.Add(item1); + await _testContext.Add(_item1); - mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); - subject.Should().BeEquivalentTo(new DataEventModel { id = id1, type = DataEventType.ADD, data = item1 }); + _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); + subject.Should().BeEquivalentTo(new DataEventModel { Id = _id1, Type = DataEventType.ADD, Data = _item1 }); } [Fact] public async Task Should_create_correct_delete_event_for_delete() { DataEventModel subject = null; - mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); - await testDataService.Delete(new TestDataModel { id = id1 }); + await _testContext.Delete(new TestDataModel { Id = _id1 }); - mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); - subject.Should().BeEquivalentTo(new DataEventModel { id = id1, type = DataEventType.DELETE, data = null }); + _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); + subject.Should().BeEquivalentTo(new DataEventModel { Id = _id1, Type = DataEventType.DELETE, Data = null }); } [Fact] public async Task Should_create_correct_delete_event_for_delete_by_id() { DataEventModel subject = null; - mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); - await testDataService.Delete(id1); + await _testContext.Delete(_id1); - mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); - subject.Should().BeEquivalentTo(new DataEventModel { id = id1, type = DataEventType.DELETE, data = null }); + _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); + subject.Should().BeEquivalentTo(new DataEventModel { Id = _id1, Type = DataEventType.DELETE, Data = null }); } [Fact] public async Task Should_create_correct_delete_events_for_delete_many() { - List> subjects = new List>(); + List> subjects = new(); - mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())).Returns(Task.CompletedTask); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + _mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())).Returns(Task.CompletedTask); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); - await testDataService.DeleteMany(x => x.Name == "1"); + await _testContext.DeleteMany(x => x.Name == "1"); - mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); + _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); subjects.Should() .BeEquivalentTo( - new DataEventModel { id = id1, type = DataEventType.DELETE, data = null }, - new DataEventModel { id = id2, type = DataEventType.DELETE, data = null } + new DataEventModel { Id = _id1, Type = DataEventType.DELETE, Data = null }, + new DataEventModel { Id = _id2, Type = DataEventType.DELETE, Data = null } ); } @@ -104,50 +104,50 @@ public async Task Should_create_correct_delete_events_for_delete_many() { public async Task Should_create_correct_update_event_for_replace() { DataEventModel subject = null; - mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + _mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); - await testDataService.Replace(item1); + await _testContext.Replace(_item1); - mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); - subject.Should().BeEquivalentTo(new DataEventModel { id = id1, type = DataEventType.UPDATE, data = null }); + _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); + subject.Should().BeEquivalentTo(new DataEventModel { Id = _id1, Type = DataEventType.UPDATE, Data = null }); } [Fact] public async Task Should_create_correct_update_events_for_update_many() { - List> subjects = new List>(); + List> subjects = new(); - mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())).Returns(Task.CompletedTask); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + _mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())).Returns(Task.CompletedTask); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); - await testDataService.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); + await _testContext.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); - mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); + _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); subjects.Should() .BeEquivalentTo( - new DataEventModel { id = id1, type = DataEventType.UPDATE, data = null }, - new DataEventModel { id = id2, type = DataEventType.UPDATE, data = null } + new DataEventModel { Id = _id1, Type = DataEventType.UPDATE, Data = null }, + new DataEventModel { Id = _id2, Type = DataEventType.UPDATE, Data = null } ); } [Fact] public async Task Should_create_correct_update_events_for_updates() { - List> subjects = new List>(); + List> subjects = new(); - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask); - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())).Returns(Task.CompletedTask); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())).Returns(Task.CompletedTask); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); - await testDataService.Update(id1, "Name", "1"); - await testDataService.Update(id2, Builders.Update.Set(x => x.Name, "2")); - await testDataService.Update(x => x.id == id3, Builders.Update.Set(x => x.Name, "3")); + await _testContext.Update(_id1, "Name", "1"); + await _testContext.Update(_id2, Builders.Update.Set(x => x.Name, "2")); + await _testContext.Update(x => x.Id == _id3, Builders.Update.Set(x => x.Name, "3")); - mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(3)); + _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(3)); subjects.Should() .BeEquivalentTo( - new DataEventModel { id = id1, type = DataEventType.UPDATE, data = null }, - new DataEventModel { id = id2, type = DataEventType.UPDATE, data = null }, - new DataEventModel { id = id3, type = DataEventType.UPDATE, data = null } + new DataEventModel { Id = _id1, Type = DataEventType.UPDATE, Data = null }, + new DataEventModel { Id = _id2, Type = DataEventType.UPDATE, Data = null }, + new DataEventModel { Id = _id3, Type = DataEventType.UPDATE, Data = null } ); } } diff --git a/UKSF.Tests/Unit/Data/DataServiceTests.cs b/UKSF.Tests/Unit/Data/DataServiceTests.cs index 99e25488..1076ba10 100644 --- a/UKSF.Tests/Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceTests.cs @@ -10,198 +10,198 @@ using UKSF.Api.Base.Context; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; -using UKSF.Tests.Common; +using UKSF.Api.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Data { public class DataServiceTests { - private readonly Mock> mockDataCollection; - private readonly TestDataService testDataService; - private List mockCollection; + private readonly Mock> _mockDataCollection; + private readonly TestContext _testContext; + private List _mockCollection; public DataServiceTests() { - Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); + Mock mockDataCollectionFactory = new(); + Mock> mockDataEventBus = new(); + _mockDataCollection = new Mock>(); mockDataEventBus.Setup(x => x.Send(It.IsAny>())); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - testDataService = new TestDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testContext = new TestContext(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); } [Theory, InlineData(""), InlineData("1"), InlineData(null)] public async Task Should_throw_for_delete_single_item_when_key_is_invalid(string id) { - Func act = async () => await testDataService.Delete(id); + Func act = async () => await _testContext.Delete(id); await act.Should().ThrowAsync(); } [Theory, InlineData(""), InlineData("1"), InlineData(null)] public void Should_throw_for_get_single_item_when_key_is_invalid(string id) { - Action act = () => testDataService.GetSingle(id); + Action act = () => _testContext.GetSingle(id); act.Should().Throw(); } [Theory, InlineData(""), InlineData("1"), InlineData(null)] public async Task Should_throw_for_update_by_id_when_key_is_invalid(string id) { - Func act = async () => await testDataService.Update(id, "Name", null); + Func act = async () => await _testContext.Update(id, "Name", null); await act.Should().ThrowAsync(); } [Theory, InlineData(""), InlineData("1"), InlineData(null)] public async Task Should_throw_for_update_by_update_definition_when_key_is_invalid(string id) { - Func act = async () => await testDataService.Update(id, Builders.Update.Set(x => x.Name, "2")); + Func act = async () => await _testContext.Update(id, Builders.Update.Set(x => x.Name, "2")); await act.Should().ThrowAsync(); } [Fact] public async Task Should_add_single_item() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - mockCollection = new List(); + TestDataModel item1 = new() { Name = "1" }; + _mockCollection = new List(); - mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Callback(x => mockCollection.Add(x)); + _mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Callback(x => _mockCollection.Add(x)); - await testDataService.Add(item1); + await _testContext.Add(item1); - mockCollection.Should().Contain(item1); + _mockCollection.Should().Contain(item1); } [Fact] public async Task Should_delete_many_items() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { Name = "1" }; - mockCollection = new List { item1, item2 }; + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Name = "1" }; + _mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) - .Returns(Task.CompletedTask) - .Callback((Expression> expression) => mockCollection.RemoveAll(x => mockCollection.Where(expression.Compile()).Contains(x))); + _mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(() => _mockCollection); + _mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) + .Returns(Task.CompletedTask) + .Callback((Expression> expression) => _mockCollection.RemoveAll(x => _mockCollection.Where(expression.Compile()).Contains(x))); - await testDataService.DeleteMany(x => x.Name == "1"); + await _testContext.DeleteMany(x => x.Name == "1"); - mockCollection.Should().BeEmpty(); + _mockCollection.Should().BeEmpty(); } [Fact] - public async Task Should_delete_single_item_by_id() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + public async Task Should_delete_single_item() { + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Name = "2" }; + _mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => _mockCollection.RemoveAll(x => x.Id == id)); - await testDataService.Delete(item1.id); + await _testContext.Delete(item1); - mockCollection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); + _mockCollection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); } [Fact] - public async Task Should_delete_single_item() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + public async Task Should_delete_single_item_by_id() { + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Name = "2" }; + _mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => mockCollection.RemoveAll(x => x.id == id)); + _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => _mockCollection.RemoveAll(x => x.Id == id)); - await testDataService.Delete(item1); + await _testContext.Delete(item1.Id); - mockCollection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); + _mockCollection.Should().HaveCount(1).And.NotContain(item1).And.Contain(item2); } [Fact] public void Should_get_all_items() { - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + _mockDataCollection.Setup(x => x.Get()).Returns(() => _mockCollection); - IEnumerable subject = testDataService.Get(); + IEnumerable subject = _testContext.Get(); - subject.Should().BeSameAs(mockCollection); + subject.Should().BeSameAs(_mockCollection); } [Fact] public void Should_get_items_matching_predicate() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Name = "2" }; + _mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockCollection.Where(x).ToList()); + _mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(x => _mockCollection.Where(x).ToList()); - IEnumerable subject = testDataService.Get(x => x.id == item1.id); + IEnumerable subject = _testContext.Get(x => x.Id == item1.Id); subject.Should().HaveCount(1).And.Contain(item1); } [Fact] public void Should_get_single_item_by_id() { - TestDataModel item1 = new TestDataModel { Name = "1" }; + TestDataModel item1 = new() { Name = "1" }; - mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); + _mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); - TestDataModel subject = testDataService.GetSingle(item1.id); + TestDataModel subject = _testContext.GetSingle(item1.Id); subject.Should().Be(item1); } [Fact] public void Should_get_single_item_matching_predicate() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { Name = "2" }; - mockCollection = new List { item1, item2 }; + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Name = "2" }; + _mockCollection = new List { item1, item2 }; - mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.First(x)); + _mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => _mockCollection.First(x)); - TestDataModel subject = testDataService.GetSingle(x => x.id == item1.id); + TestDataModel subject = _testContext.GetSingle(x => x.Id == item1.Id); subject.Should().Be(item1); } [Fact] public async Task Should_replace_item() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { id = item1.id, Name = "2" }; - mockCollection = new List { item1 }; + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Id = item1.Id, Name = "2" }; + _mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); - mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())) - .Returns(Task.CompletedTask) - .Callback((string id, TestDataModel item) => mockCollection[mockCollection.FindIndex(x => x.id == id)] = item); + _mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); + _mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())) + .Returns(Task.CompletedTask) + .Callback((string id, TestDataModel item) => _mockCollection[_mockCollection.FindIndex(x => x.Id == id)] = item); - await testDataService.Replace(item2); + await _testContext.Replace(item2); - mockCollection.Should().ContainSingle(); - mockCollection.First().Should().Be(item2); + _mockCollection.Should().ContainSingle(); + _mockCollection.First().Should().Be(item2); } [Fact] public async Task Should_throw_for_add_when_item_is_null() { - Func act = async () => await testDataService.Add(null); + Func act = async () => await _testContext.Add(null); await act.Should().ThrowAsync(); } [Fact] public async Task Should_update_item_by_filter_and_update_definition() { - TestDataModel item1 = new TestDataModel { id = "1", Name = "1" }; - mockCollection = new List { item1 }; + TestDataModel item1 = new() { Id = "1", Name = "1" }; + _mockCollection = new List { item1 }; BsonValue expectedFilter = TestUtilities.RenderFilter(Builders.Filter.Where(x => x.Name == "1")); BsonValue expectedUpdate = TestUtilities.RenderUpdate(Builders.Update.Set(x => x.Name, "2")); FilterDefinition subjectFilter = null; UpdateDefinition subjectUpdate = null; - mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns(item1); - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())) - .Returns(Task.CompletedTask) - .Callback( - (FilterDefinition filter, UpdateDefinition update) => { - subjectFilter = filter; - subjectUpdate = update; - } - ); + _mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns(item1); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback( + (FilterDefinition filter, UpdateDefinition update) => { + subjectFilter = filter; + subjectUpdate = update; + } + ); - await testDataService.Update(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); + await _testContext.Update(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); TestUtilities.RenderFilter(subjectFilter).Should().BeEquivalentTo(expectedFilter); TestUtilities.RenderUpdate(subjectUpdate).Should().BeEquivalentTo(expectedUpdate); @@ -209,79 +209,79 @@ public async Task Should_update_item_by_filter_and_update_definition() { [Fact] public async Task Should_update_item_by_id() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - mockCollection = new List { item1 }; + TestDataModel item1 = new() { Name = "1" }; + _mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) - .Returns(Task.CompletedTask) - .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((string id, UpdateDefinition _) => _mockCollection.First(x => x.Id == id).Name = "2"); - await testDataService.Update(item1.id, "Name", "2"); + await _testContext.Update(item1.Id, "Name", "2"); item1.Name.Should().Be("2"); } [Fact] public async Task Should_update_item_by_update_definition() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - mockCollection = new List { item1 }; + TestDataModel item1 = new() { Name = "1" }; + _mockCollection = new List { item1 }; - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) - .Returns(Task.CompletedTask) - .Callback((string id, UpdateDefinition _) => mockCollection.First(x => x.id == id).Name = "2"); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((string id, UpdateDefinition _) => _mockCollection.First(x => x.Id == id).Name = "2"); - await testDataService.Update(item1.id, Builders.Update.Set(x => x.Name, "2")); + await _testContext.Update(item1.Id, Builders.Update.Set(x => x.Name, "2")); item1.Name.Should().Be("2"); } [Fact] public async Task Should_update_item_with_set() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - mockCollection = new List { item1 }; + TestDataModel item1 = new() { Name = "1" }; + _mockCollection = new List { item1 }; BsonValue expected = TestUtilities.RenderUpdate(Builders.Update.Set(x => x.Name, "2")); UpdateDefinition subject = null; - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) - .Returns(Task.CompletedTask) - .Callback((string _, UpdateDefinition y) => subject = y); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((string _, UpdateDefinition y) => subject = y); - await testDataService.Update(item1.id, "Name", "2"); + await _testContext.Update(item1.Id, "Name", "2"); TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); } [Fact] public async Task Should_update_item_with_unset() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - mockCollection = new List { item1 }; + TestDataModel item1 = new() { Name = "1" }; + _mockCollection = new List { item1 }; BsonValue expected = TestUtilities.RenderUpdate(Builders.Update.Unset(x => x.Name)); UpdateDefinition subject = null; - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) - .Returns(Task.CompletedTask) - .Callback((string _, UpdateDefinition y) => subject = y); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback((string _, UpdateDefinition y) => subject = y); - await testDataService.Update(item1.id, "Name", null); + await _testContext.Update(item1.Id, "Name", null); TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); } [Fact] public async Task Should_update_many_items() { - TestDataModel item1 = new TestDataModel { Name = "1" }; - TestDataModel item2 = new TestDataModel { Name = "1" }; - mockCollection = new List { item1, item2 }; - - mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(() => mockCollection); - mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())) - .Returns(Task.CompletedTask) - .Callback( - (Expression> expression, UpdateDefinition _) => - mockCollection.Where(expression.Compile()).ToList().ForEach(y => y.Name = "2") - ); - - await testDataService.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); + TestDataModel item1 = new() { Name = "1" }; + TestDataModel item2 = new() { Name = "1" }; + _mockCollection = new List { item1, item2 }; + + _mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(() => _mockCollection); + _mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback( + (Expression> expression, UpdateDefinition _) => + _mockCollection.Where(expression.Compile()).ToList().ForEach(y => y.Name = "2") + ); + + await _testContext.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); item1.Name.Should().Be("2"); item2.Name.Should().Be("2"); diff --git a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs index 17f00686..d785e8e0 100644 --- a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs @@ -9,28 +9,28 @@ namespace UKSF.Tests.Unit.Data.Game { public class GameServersDataServiceTests { - private readonly GameServersDataService gameServersDataService; - private readonly Mock> mockDataCollection; + private readonly GameServersContext _gameServersContext; + private readonly Mock> _mockDataCollection; public GameServersDataServiceTests() { - Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); + Mock mockDataCollectionFactory = new(); + Mock> mockDataEventBus = new(); + _mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - gameServersDataService = new GameServersDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _gameServersContext = new GameServersContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Fact] public void Should_get_collection_in_order() { - GameServer rank1 = new GameServer { order = 2 }; - GameServer rank2 = new GameServer { order = 0 }; - GameServer rank3 = new GameServer { order = 1 }; + GameServer rank1 = new() { Order = 2 }; + GameServer rank2 = new() { Order = 0 }; + GameServer rank3 = new() { Order = 1 }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); - IEnumerable subject = gameServersDataService.Get(); + IEnumerable subject = _gameServersContext.Get(); subject.Should().ContainInOrder(rank2, rank3, rank1); } diff --git a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs index 7700e82e..dd21cf8b 100644 --- a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs @@ -9,58 +9,58 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; -using UKSF.Tests.Common; +using UKSF.Api.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Data.Message { public class CommentThreadDataServiceTests { - private readonly CommentThreadDataService commentThreadDataService; - private readonly Mock> mockDataCollection; - private List mockCollection; + private readonly CommentThreadContext _commentThreadContext; + private readonly Mock> _mockDataCollection; + private List _mockCollection; public CommentThreadDataServiceTests() { - Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); + Mock mockDataCollectionFactory = new(); + Mock> mockDataEventBus = new(); + _mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); + _mockDataCollection.Setup(x => x.Get()).Returns(() => _mockCollection); - commentThreadDataService = new CommentThreadDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _commentThreadContext = new CommentThreadContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Fact] public async Task ShouldCreateCorrectUdpateDefinitionForAdd() { - CommentThread commentThread = new CommentThread(); - mockCollection = new List { commentThread }; + CommentThread commentThread = new(); + _mockCollection = new List { commentThread }; - Comment comment = new Comment { author = ObjectId.GenerateNewId().ToString(), content = "Hello there" }; - BsonValue expected = TestUtilities.RenderUpdate(Builders.Update.Push(x => x.comments, comment)); + Comment comment = new() { Author = ObjectId.GenerateNewId().ToString(), Content = "Hello there" }; + BsonValue expected = TestUtilities.RenderUpdate(Builders.Update.Push(x => x.Comments, comment)); UpdateDefinition subject = null; - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) - .Returns(Task.CompletedTask) - .Callback>((_, update) => subject = update); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback>((_, update) => subject = update); - await commentThreadDataService.Update(commentThread.id, comment, DataEventType.ADD); + await _commentThreadContext.Update(commentThread.Id, comment, DataEventType.ADD); TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); } [Fact] public async Task ShouldCreateCorrectUdpateDefinitionForDelete() { - CommentThread commentThread = new CommentThread(); - mockCollection = new List { commentThread }; + CommentThread commentThread = new(); + _mockCollection = new List { commentThread }; - Comment comment = new Comment { author = ObjectId.GenerateNewId().ToString(), content = "Hello there" }; - BsonValue expected = TestUtilities.RenderUpdate(Builders.Update.Pull(x => x.comments, comment)); + Comment comment = new() { Author = ObjectId.GenerateNewId().ToString(), Content = "Hello there" }; + BsonValue expected = TestUtilities.RenderUpdate(Builders.Update.Pull(x => x.Comments, comment)); UpdateDefinition subject = null; - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) - .Returns(Task.CompletedTask) - .Callback>((_, update) => subject = update); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback>((_, update) => subject = update); - await commentThreadDataService.Update(commentThread.id, comment, DataEventType.DELETE); + await _commentThreadContext.Update(commentThread.Id, comment, DataEventType.DELETE); TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); } diff --git a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs index dfa21656..b17da761 100644 --- a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs @@ -5,37 +5,37 @@ using MongoDB.Driver; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Modpack.Context; using UKSF.Api.Modpack.Models; -using UKSF.Api.Modpack.Services.Data; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Data.Modpack { public class BuildsDataServiceTests { - private readonly BuildsDataService buildsDataService; - private readonly Mock> mockDataCollection; - private readonly Mock> mockDataEventBus; + private readonly BuildsContext _buildsContext; + private readonly Mock> _mockDataCollection; + private readonly Mock> _mockDataEventBus; public BuildsDataServiceTests() { - Mock mockDataCollectionFactory = new Mock(); - mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); + Mock mockDataCollectionFactory = new(); + _mockDataEventBus = new Mock>(); + _mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - buildsDataService = new BuildsDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _buildsContext = new BuildsContext(mockDataCollectionFactory.Object, _mockDataEventBus.Object); } [Fact] public void Should_get_collection_in_order() { - ModpackBuild item1 = new ModpackBuild { BuildNumber = 4 }; - ModpackBuild item2 = new ModpackBuild { BuildNumber = 10 }; - ModpackBuild item3 = new ModpackBuild { BuildNumber = 9 }; + ModpackBuild item1 = new() { BuildNumber = 4 }; + ModpackBuild item2 = new() { BuildNumber = 10 }; + ModpackBuild item3 = new() { BuildNumber = 9 }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); - IEnumerable subject = buildsDataService.Get(); + IEnumerable subject = _buildsContext.Get(); subject.Should().ContainInOrder(item2, item3, item1); } @@ -43,20 +43,19 @@ public void Should_get_collection_in_order() { [Fact] public void Should_update_build_step_with_event() { string id = ObjectId.GenerateNewId().ToString(); - ModpackBuildStep modpackBuildStep = new ModpackBuildStep("step") { Index = 0, Running = false }; - ModpackBuild modpackBuild = new ModpackBuild { id = id, BuildNumber = 1, Steps = new List { modpackBuildStep } }; + ModpackBuildStep modpackBuildStep = new("step") { Index = 0, Running = false }; + ModpackBuild modpackBuild = new() { Id = id, BuildNumber = 1, Steps = new List { modpackBuildStep } }; DataEventModel subject = null; - mockDataCollection.Setup(x => x.Get()).Returns(new List()); - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) - .Callback(() => { modpackBuild.Steps.First().Running = true; }); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(x => subject = x); + _mockDataCollection.Setup(x => x.Get()).Returns(new List()); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Callback(() => { modpackBuild.Steps.First().Running = true; }); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(x => subject = x); - buildsDataService.Update(modpackBuild, modpackBuildStep); + _buildsContext.Update(modpackBuild, modpackBuildStep); modpackBuildStep.Running.Should().BeTrue(); - subject.data.Should().NotBeNull(); - subject.data.Should().Be(modpackBuildStep); + subject.Data.Should().NotBeNull(); + subject.Data.Should().Be(modpackBuildStep); } [Fact] @@ -64,15 +63,15 @@ public void Should_update_build_with_event_data() { string id = ObjectId.GenerateNewId().ToString(); DataEventModel subject = null; - mockDataCollection.Setup(x => x.Get()).Returns(new List()); - mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(x => subject = x); + _mockDataCollection.Setup(x => x.Get()).Returns(new List()); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())); + _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(x => subject = x); - ModpackBuild modpackBuild = new ModpackBuild { id = id, BuildNumber = 1 }; - buildsDataService.Update(modpackBuild, Builders.Update.Set(x => x.Running, true)); + ModpackBuild modpackBuild = new() { Id = id, BuildNumber = 1 }; + _buildsContext.Update(modpackBuild, Builders.Update.Set(x => x.Running, true)); - subject.data.Should().NotBeNull(); - subject.data.Should().Be(modpackBuild); + subject.Data.Should().NotBeNull(); + subject.Data.Should().Be(modpackBuild); } } } diff --git a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs index 7dab20e7..36297152 100644 --- a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs @@ -2,35 +2,35 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Modpack.Context; using UKSF.Api.Modpack.Models; -using UKSF.Api.Modpack.Services.Data; using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Modpack { public class ReleasesDataServiceTests { - private readonly ReleasesDataService releasesDataService; - private readonly Mock> mockDataCollection; + private readonly Mock> _mockDataCollection; + private readonly ReleasesContext _releasesContext; public ReleasesDataServiceTests() { - Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); + Mock mockDataCollectionFactory = new(); + Mock> mockDataEventBus = new(); + _mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - releasesDataService = new ReleasesDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _releasesContext = new ReleasesContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Fact] public void Should_get_collection_in_order() { - ModpackRelease item1 = new ModpackRelease { Version = "4.19.11" }; - ModpackRelease item2 = new ModpackRelease { Version = "5.19.6" }; - ModpackRelease item3 = new ModpackRelease { Version = "5.18.8" }; + ModpackRelease item1 = new() { Version = "4.19.11" }; + ModpackRelease item2 = new() { Version = "5.19.6" }; + ModpackRelease item3 = new() { Version = "5.18.8" }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); - IEnumerable subject = releasesDataService.Get(); + IEnumerable subject = _releasesContext.Get(); subject.Should().ContainInOrder(item2, item3, item1); } diff --git a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs index 6f25e096..7886b0da 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs @@ -10,41 +10,41 @@ namespace UKSF.Tests.Unit.Data.Operations { public class OperationOrderDataServiceTests { - private readonly Mock> mockDataCollection; - private readonly OperationOrderDataService operationOrderDataService; + private readonly Mock> _mockDataCollection; + private readonly OperationOrderContext _operationOrderContext; public OperationOrderDataServiceTests() { - Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); + Mock mockDataCollectionFactory = new(); + Mock> mockDataEventBus = new(); + _mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - operationOrderDataService = new OperationOrderDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _operationOrderContext = new OperationOrderContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Fact] public void Should_get_collection_in_order() { - Opord item1 = new Opord { Start = DateTime.Now.AddDays(-1) }; - Opord item2 = new Opord { Start = DateTime.Now.AddDays(-2) }; - Opord item3 = new Opord { Start = DateTime.Now.AddDays(-3) }; + Opord item1 = new() { Start = DateTime.Now.AddDays(-1) }; + Opord item2 = new() { Start = DateTime.Now.AddDays(-2) }; + Opord item3 = new() { Start = DateTime.Now.AddDays(-3) }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); - IEnumerable subject = operationOrderDataService.Get(); + IEnumerable subject = _operationOrderContext.Get(); subject.Should().ContainInOrder(item3, item2, item1); } [Fact] public void ShouldGetOrderedCollectionByPredicate() { - Opord item1 = new Opord { Description = "1", Start = DateTime.Now.AddDays(-1) }; - Opord item2 = new Opord { Description = "2", Start = DateTime.Now.AddDays(-2) }; - Opord item3 = new Opord { Description = "1", Start = DateTime.Now.AddDays(-3) }; + Opord item1 = new() { Description = "1", Start = DateTime.Now.AddDays(-1) }; + Opord item2 = new() { Description = "2", Start = DateTime.Now.AddDays(-2) }; + Opord item3 = new() { Description = "1", Start = DateTime.Now.AddDays(-3) }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); - IEnumerable subject = operationOrderDataService.Get(x => x.Description == "1"); + IEnumerable subject = _operationOrderContext.Get(x => x.Description == "1"); subject.Should().ContainInOrder(item3, item1); } diff --git a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs index 870418fd..bca0fa2f 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs @@ -10,41 +10,41 @@ namespace UKSF.Tests.Unit.Data.Operations { public class OperationReportDataServiceTests { - private readonly Mock> mockDataCollection; - private readonly OperationReportDataService operationReportDataService; + private readonly Mock> _mockDataCollection; + private readonly OperationReportContext _operationReportContext; public OperationReportDataServiceTests() { - Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); + Mock mockDataCollectionFactory = new(); + Mock> mockDataEventBus = new(); + _mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - operationReportDataService = new OperationReportDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _operationReportContext = new OperationReportContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Fact] public void Should_get_collection_in_order() { - Oprep item1 = new Oprep { Start = DateTime.Now.AddDays(-1) }; - Oprep item2 = new Oprep { Start = DateTime.Now.AddDays(-2) }; - Oprep item3 = new Oprep { Start = DateTime.Now.AddDays(-3) }; + Oprep item1 = new() { Start = DateTime.Now.AddDays(-1) }; + Oprep item2 = new() { Start = DateTime.Now.AddDays(-2) }; + Oprep item3 = new() { Start = DateTime.Now.AddDays(-3) }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); - IEnumerable subject = operationReportDataService.Get(); + IEnumerable subject = _operationReportContext.Get(); subject.Should().ContainInOrder(item3, item2, item1); } [Fact] public void ShouldGetOrderedCollectionByPredicate() { - Oprep item1 = new Oprep { Description = "1", Start = DateTime.Now.AddDays(-1) }; - Oprep item2 = new Oprep { Description = "2", Start = DateTime.Now.AddDays(-2) }; - Oprep item3 = new Oprep { Description = "1", Start = DateTime.Now.AddDays(-3) }; + Oprep item1 = new() { Description = "1", Start = DateTime.Now.AddDays(-1) }; + Oprep item2 = new() { Description = "2", Start = DateTime.Now.AddDays(-2) }; + Oprep item3 = new() { Description = "1", Start = DateTime.Now.AddDays(-3) }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); - IEnumerable subject = operationReportDataService.Get(x => x.Description == "1"); + IEnumerable subject = _operationReportContext.Get(x => x.Description == "1"); subject.Should().ContainInOrder(item3, item1); } diff --git a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs index eee7d2f5..1ee5ab00 100644 --- a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -12,24 +12,20 @@ namespace UKSF.Tests.Unit.Data.Personnel { public class DischargeDataServiceTests { [Fact] public void Should_get_collection_in_order() { - Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - Mock> mockDataCollection = new Mock>(); + Mock mockDataCollectionFactory = new(); + Mock> mockDataEventBus = new(); + Mock> mockDataCollection = new(); - DischargeCollection item1 = new DischargeCollection { discharges = new List { new Discharge { timestamp = DateTime.Now.AddDays(-3) } } }; - DischargeCollection item2 = new DischargeCollection { - discharges = new List { new Discharge { timestamp = DateTime.Now.AddDays(-10) }, new Discharge { timestamp = DateTime.Now.AddDays(-1) } } - }; - DischargeCollection item3 = new DischargeCollection { - discharges = new List { new Discharge { timestamp = DateTime.Now.AddDays(-5) }, new Discharge { timestamp = DateTime.Now.AddDays(-2) } } - }; + DischargeCollection item1 = new() { Discharges = new List { new() { Timestamp = DateTime.Now.AddDays(-3) } } }; + DischargeCollection item2 = new() { Discharges = new List { new() { Timestamp = DateTime.Now.AddDays(-10) }, new() { Timestamp = DateTime.Now.AddDays(-1) } } }; + DischargeCollection item3 = new() { Discharges = new List { new() { Timestamp = DateTime.Now.AddDays(-5) }, new() { Timestamp = DateTime.Now.AddDays(-2) } } }; - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); - DischargeDataService dischargeDataService = new DischargeDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + DischargeContext dischargeContext = new(mockDataCollectionFactory.Object, mockDataEventBus.Object); - IEnumerable subject = dischargeDataService.Get(); + IEnumerable subject = dischargeContext.Get(); subject.Should().ContainInOrder(item2, item3, item1); } diff --git a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs index 24bfd5f7..892ef24f 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs @@ -9,52 +9,52 @@ namespace UKSF.Tests.Unit.Data.Personnel { public class RanksDataServiceTests { - private readonly Mock> mockDataCollection; - private readonly RanksDataService ranksDataService; + private readonly Mock> _mockDataCollection; + private readonly RanksContext _ranksContext; public RanksDataServiceTests() { - Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); + Mock mockDataCollectionFactory = new(); + Mock> mockDataEventBus = new(); + _mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - ranksDataService = new RanksDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _ranksContext = new RanksContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Theory, InlineData(""), InlineData(null)] public void Should_return_nothing_for_empty_or_null_name(string name) { - mockDataCollection.Setup(x => x.Get()).Returns(new List()); + _mockDataCollection.Setup(x => x.Get()).Returns(new List()); - Rank subject = ranksDataService.GetSingle(name); + Rank subject = _ranksContext.GetSingle(name); subject.Should().Be(null); } [Fact] - public void Should_return_item_by_name() { - Rank rank1 = new Rank { name = "Private", order = 2 }; - Rank rank2 = new Rank { name = "Recruit", order = 1 }; - Rank rank3 = new Rank { name = "Candidate", order = 0 }; + public void Should_return_collection_in_order() { + Rank rank1 = new() { Order = 2 }; + Rank rank2 = new() { Order = 0 }; + Rank rank3 = new() { Order = 1 }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); - Rank subject = ranksDataService.GetSingle("Recruit"); + IEnumerable subject = _ranksContext.Get(); - subject.Should().Be(rank2); + subject.Should().ContainInOrder(rank2, rank3, rank1); } [Fact] - public void Should_return_collection_in_order() { - Rank rank1 = new Rank { order = 2 }; - Rank rank2 = new Rank { order = 0 }; - Rank rank3 = new Rank { order = 1 }; + public void Should_return_item_by_name() { + Rank rank1 = new() { Name = "Private", Order = 2 }; + Rank rank2 = new() { Name = "Recruit", Order = 1 }; + Rank rank3 = new() { Name = "Candidate", Order = 0 }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); - IEnumerable subject = ranksDataService.Get(); + Rank subject = _ranksContext.GetSingle("Recruit"); - subject.Should().ContainInOrder(rank2, rank3, rank1); + subject.Should().Be(rank2); } } } diff --git a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs index f6737ddd..9237cb46 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs @@ -9,52 +9,52 @@ namespace UKSF.Tests.Unit.Data.Personnel { public class RolesDataServiceTests { - private readonly Mock> mockDataCollection; - private readonly RolesDataService rolesDataService; + private readonly Mock> _mockDataCollection; + private readonly RolesContext _rolesContext; public RolesDataServiceTests() { - Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - mockDataCollection = new Mock>(); + Mock mockDataCollectionFactory = new(); + Mock> mockDataEventBus = new(); + _mockDataCollection = new Mock>(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - rolesDataService = new RolesDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _rolesContext = new RolesContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); } [Theory, InlineData(""), InlineData(null)] public void ShouldGetNothingWhenNoName(string name) { - mockDataCollection.Setup(x => x.Get()).Returns(new List()); + _mockDataCollection.Setup(x => x.Get()).Returns(new List()); - Role subject = rolesDataService.GetSingle(name); + Role subject = _rolesContext.GetSingle(name); subject.Should().Be(null); } [Fact] - public void ShouldGetSingleByName() { - Role role1 = new Role { name = "Rifleman" }; - Role role2 = new Role { name = "Trainee" }; - Role role3 = new Role { name = "Marksman" }; + public void Should_get_collection_in_order() { + Role role1 = new() { Name = "Rifleman" }; + Role role2 = new() { Name = "Trainee" }; + Role role3 = new() { Name = "Marksman" }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { role1, role2, role3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { role1, role2, role3 }); - Role subject = rolesDataService.GetSingle("Trainee"); + IEnumerable subject = _rolesContext.Get(); - subject.Should().Be(role2); + subject.Should().ContainInOrder(role3, role1, role2); } [Fact] - public void Should_get_collection_in_order() { - Role role1 = new Role { name = "Rifleman" }; - Role role2 = new Role { name = "Trainee" }; - Role role3 = new Role { name = "Marksman" }; + public void ShouldGetSingleByName() { + Role role1 = new() { Name = "Rifleman" }; + Role role2 = new() { Name = "Trainee" }; + Role role3 = new() { Name = "Marksman" }; - mockDataCollection.Setup(x => x.Get()).Returns(new List { role1, role2, role3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { role1, role2, role3 }); - IEnumerable subject = rolesDataService.Get(); + Role subject = _rolesContext.GetSingle("Trainee"); - subject.Should().ContainInOrder(role3, role1, role2); + subject.Should().Be(role2); } } } diff --git a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs index 08bc50dc..303b2620 100644 --- a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs @@ -15,24 +15,24 @@ namespace UKSF.Tests.Unit.Data { public class SimpleDataServiceTests { [Fact] public void Should_create_collections() { - Mock mockDataCollectionFactory = new Mock(); + Mock mockDataCollectionFactory = new(); - AccountDataService unused1 = new AccountDataService(mockDataCollectionFactory.Object, new Mock>().Object); - CommandRequestDataService unused2 = new CommandRequestDataService(mockDataCollectionFactory.Object, new Mock>().Object); - CommandRequestArchiveDataService unused3 = new CommandRequestArchiveDataService(mockDataCollectionFactory.Object, new Mock>().Object); - ConfirmationCodeDataService unused4 = new ConfirmationCodeDataService(mockDataCollectionFactory.Object, new Mock>().Object); - LauncherFileDataService unused5 = new LauncherFileDataService(mockDataCollectionFactory.Object, new Mock>().Object); - LoaDataService unused6 = new LoaDataService(mockDataCollectionFactory.Object, new Mock>().Object); - NotificationsDataService unused7 = new NotificationsDataService(mockDataCollectionFactory.Object, new Mock>().Object); - SchedulerDataService unused8 = new SchedulerDataService(mockDataCollectionFactory.Object, new Mock>().Object); + AccountContext unused1 = new(mockDataCollectionFactory.Object, new Mock>().Object); + CommandRequestContext unused2 = new(mockDataCollectionFactory.Object, new Mock>().Object); + CommandRequestArchiveContext unused3 = new(mockDataCollectionFactory.Object, new Mock>().Object); + ConfirmationCodeContext unused4 = new(mockDataCollectionFactory.Object, new Mock>().Object); + LauncherFileContext unused5 = new(mockDataCollectionFactory.Object, new Mock>().Object); + LoaContext unused6 = new(mockDataCollectionFactory.Object, new Mock>().Object); + NotificationsContext unused7 = new(mockDataCollectionFactory.Object, new Mock>().Object); + SchedulerContext unused8 = new(mockDataCollectionFactory.Object, new Mock>().Object); - mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); - mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Exactly(2)); - mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); - mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); - mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); - mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); - mockDataCollectionFactory.Verify(x => x.CreateDataCollection(It.IsAny()), Times.Once); + mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); + mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Exactly(2)); + mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); + mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); + mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); + mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); + mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); } } } diff --git a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index a6b26c3b..4c2c19c5 100644 --- a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -12,41 +12,41 @@ namespace UKSF.Tests.Unit.Data.Units { public class UnitsDataServiceTests { [Fact] public void Should_get_collection_in_order() { - Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - Mock> mockDataCollection = new Mock>(); + Mock mockDataCollectionFactory = new(); + Mock> mockDataEventBus = new(); + Mock> mockDataCollection = new(); - UksfUnit rank1 = new UksfUnit { name = "Air Troop", order = 2 }; - UksfUnit rank2 = new UksfUnit { name = "UKSF", order = 0 }; - UksfUnit rank3 = new UksfUnit { name = "SAS", order = 1 }; + UksfUnit rank1 = new() { Name = "Air Troop", Order = 2 }; + UksfUnit rank2 = new() { Name = "UKSF", Order = 0 }; + UksfUnit rank3 = new() { Name = "SAS", Order = 1 }; - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); - UnitsDataService unitsDataService = new UnitsDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + UnitsContext unitsContext = new(mockDataCollectionFactory.Object, mockDataEventBus.Object); - IEnumerable subject = unitsDataService.Get(); + IEnumerable subject = unitsContext.Get(); subject.Should().ContainInOrder(rank2, rank3, rank1); } [Fact] public void ShouldGetOrderedCollectionFromPredicate() { - Mock mockDataCollectionFactory = new Mock(); - Mock> mockDataEventBus = new Mock>(); - Mock> mockDataCollection = new Mock>(); + Mock mockDataCollectionFactory = new(); + Mock> mockDataEventBus = new(); + Mock> mockDataCollection = new(); - UksfUnit rank1 = new UksfUnit { name = "Air Troop", order = 3, branch = UnitBranch.COMBAT }; - UksfUnit rank2 = new UksfUnit { name = "Boat Troop", order = 2, branch = UnitBranch.COMBAT }; - UksfUnit rank3 = new UksfUnit { name = "UKSF", order = 0, branch = UnitBranch.AUXILIARY }; - UksfUnit rank4 = new UksfUnit { name = "SAS", order = 1, branch = UnitBranch.AUXILIARY }; + UksfUnit rank1 = new() { Name = "Air Troop", Order = 3, Branch = UnitBranch.COMBAT }; + UksfUnit rank2 = new() { Name = "Boat Troop", Order = 2, Branch = UnitBranch.COMBAT }; + UksfUnit rank3 = new() { Name = "UKSF", Order = 0, Branch = UnitBranch.AUXILIARY }; + UksfUnit rank4 = new() { Name = "SAS", Order = 1, Branch = UnitBranch.AUXILIARY }; - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3, rank4 }); - UnitsDataService unitsDataService = new UnitsDataService(mockDataCollectionFactory.Object, mockDataEventBus.Object); + UnitsContext unitsContext = new(mockDataCollectionFactory.Object, mockDataEventBus.Object); - IEnumerable subject = unitsDataService.Get(x => x.branch == UnitBranch.COMBAT); + IEnumerable subject = unitsContext.Get(x => x.Branch == UnitBranch.COMBAT); subject.Should().ContainInOrder(rank2, rank1); } diff --git a/UKSF.Tests/Unit/Events/EventBusTests.cs b/UKSF.Tests/Unit/Events/EventBusTests.cs index e058f824..5938afc8 100644 --- a/UKSF.Tests/Unit/Events/EventBusTests.cs +++ b/UKSF.Tests/Unit/Events/EventBusTests.cs @@ -2,14 +2,14 @@ using FluentAssertions; using UKSF.Api.Base.Events; using UKSF.Api.Shared.Models; -using UKSF.Tests.Common; +using UKSF.Api.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Events { public class EventBusTests { [Fact] public void Should_return_observable() { - EventBus> eventBus = new EventBus>(); + EventBus> eventBus = new(); IObservable> subject = eventBus.AsObservable(); diff --git a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs index 9e218e1d..9acd17c2 100644 --- a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs @@ -12,74 +12,74 @@ namespace UKSF.Tests.Unit.Events.Handlers { public class AccountEventHandlerTests { - private readonly DataEventBus accountDataEventBus; + private readonly DataEventBus _accountDataEventBus; private readonly AccountDataEventHandler _accountDataEventHandler; - private readonly Mock> mockAccountHub; - private readonly Mock mockLoggingService; - private readonly DataEventBus unitsDataEventBus; + private readonly Mock> _mockAccountHub; + private readonly Mock _mockLoggingService; + private readonly DataEventBus _unitsDataEventBus; public AccountEventHandlerTests() { - Mock mockDataCollectionFactory = new Mock(); - mockLoggingService = new Mock(); - mockAccountHub = new Mock>(); + Mock mockDataCollectionFactory = new(); + _mockLoggingService = new Mock(); + _mockAccountHub = new Mock>(); - accountDataEventBus = new DataEventBus(); - unitsDataEventBus = new DataEventBus(); + _accountDataEventBus = new DataEventBus(); + _unitsDataEventBus = new DataEventBus(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); - _accountDataEventHandler = new AccountDataEventHandler(accountDataEventBus, unitsDataEventBus, mockAccountHub.Object, mockLoggingService.Object); + _accountDataEventHandler = new AccountDataEventHandler(_accountDataEventBus, _unitsDataEventBus, _mockAccountHub.Object, _mockLoggingService.Object); } [Fact] public void ShouldLogOnException() { - Mock> mockHubClients = new Mock>(); - Mock mockAccountClient = new Mock(); + Mock> mockHubClients = new(); + Mock mockAccountClient = new(); - mockAccountHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + _mockAccountHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockAccountClient.Object); mockAccountClient.Setup(x => x.ReceiveAccountUpdate()).Throws(new Exception()); - mockLoggingService.Setup(x => x.LogError(It.IsAny())); + _mockLoggingService.Setup(x => x.LogError(It.IsAny())); _accountDataEventHandler.Init(); - accountDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); - unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + _accountDataEventBus.Send(new DataEventModel { Type = DataEventType.UPDATE }); + _unitsDataEventBus.Send(new DataEventModel { Type = DataEventType.UPDATE }); - mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Exactly(2)); + _mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Exactly(2)); } [Fact] public void ShouldNotRunEvent() { - Mock> mockHubClients = new Mock>(); - Mock mockAccountClient = new Mock(); + Mock> mockHubClients = new(); + Mock mockAccountClient = new(); - mockAccountHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + _mockAccountHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockAccountClient.Object); mockAccountClient.Setup(x => x.ReceiveAccountUpdate()); _accountDataEventHandler.Init(); - accountDataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); - unitsDataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); + _accountDataEventBus.Send(new DataEventModel { Type = DataEventType.DELETE }); + _unitsDataEventBus.Send(new DataEventModel { Type = DataEventType.ADD }); mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Never); } [Fact] public void ShouldRunEventOnUpdate() { - Mock> mockHubClients = new Mock>(); - Mock mockAccountClient = new Mock(); + Mock> mockHubClients = new(); + Mock mockAccountClient = new(); - mockAccountHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + _mockAccountHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockAccountClient.Object); mockAccountClient.Setup(x => x.ReceiveAccountUpdate()); _accountDataEventHandler.Init(); - accountDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); - unitsDataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + _accountDataEventBus.Send(new DataEventModel { Type = DataEventType.UPDATE }); + _unitsDataEventBus.Send(new DataEventModel { Type = DataEventType.UPDATE }); mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Exactly(2)); } diff --git a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs index 81992a9e..938c96df 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs @@ -12,63 +12,63 @@ namespace UKSF.Tests.Unit.Events.Handlers { public class CommandRequestEventHandlerTests { - private readonly CommandRequestEventHandler commandRequestEventHandler; - private readonly DataEventBus dataEventBus; - private readonly Mock> mockHub; - private readonly Mock mockLoggingService; + private readonly CommandRequestEventHandler _commandRequestEventHandler; + private readonly DataEventBus _dataEventBus; + private readonly Mock> _mockHub; + private readonly Mock _mockLoggingService; public CommandRequestEventHandlerTests() { - Mock mockDataCollectionFactory = new Mock(); - mockLoggingService = new Mock(); - mockHub = new Mock>(); + Mock mockDataCollectionFactory = new(); + _mockLoggingService = new Mock(); + _mockHub = new Mock>(); - dataEventBus = new DataEventBus(); + _dataEventBus = new DataEventBus(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); - commandRequestEventHandler = new CommandRequestEventHandler(dataEventBus, mockHub.Object, mockLoggingService.Object); + _commandRequestEventHandler = new CommandRequestEventHandler(_dataEventBus, _mockHub.Object, _mockLoggingService.Object); } [Fact] public void ShouldLogOnException() { - mockLoggingService.Setup(x => x.LogError(It.IsAny())); + _mockLoggingService.Setup(x => x.LogError(It.IsAny())); - commandRequestEventHandler.Init(); + _commandRequestEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = (DataEventType) 5 }); + _dataEventBus.Send(new DataEventModel { Type = (DataEventType) 5 }); - mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); + _mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); } [Fact] public void ShouldNotRunEventOnDelete() { - Mock> mockHubClients = new Mock>(); - Mock mockClient = new Mock(); + Mock> mockHubClients = new(); + Mock mockClient = new(); - mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + _mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.All).Returns(mockClient.Object); mockClient.Setup(x => x.ReceiveRequestUpdate()); - commandRequestEventHandler.Init(); + _commandRequestEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); + _dataEventBus.Send(new DataEventModel { Type = DataEventType.DELETE }); mockClient.Verify(x => x.ReceiveRequestUpdate(), Times.Never); } [Fact] public void ShouldRunEventOnUpdateAndAdd() { - Mock> mockHubClients = new Mock>(); - Mock mockClient = new Mock(); + Mock> mockHubClients = new(); + Mock mockClient = new(); - mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + _mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.All).Returns(mockClient.Object); mockClient.Setup(x => x.ReceiveRequestUpdate()); - commandRequestEventHandler.Init(); + _commandRequestEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); - dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); + _dataEventBus.Send(new DataEventModel { Type = DataEventType.ADD }); + _dataEventBus.Send(new DataEventModel { Type = DataEventType.UPDATE }); mockClient.Verify(x => x.ReceiveRequestUpdate(), Times.Exactly(2)); } diff --git a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs index e6440e27..ba3c1402 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs @@ -13,49 +13,49 @@ namespace UKSF.Tests.Unit.Events.Handlers { public class CommentThreadEventHandlerTests { - private readonly CommentThreadEventHandler commentThreadEventHandler; - private readonly DataEventBus dataEventBus; - private readonly Mock> mockHub; - private readonly Mock mockLoggingService; + private readonly CommentThreadEventHandler _commentThreadEventHandler; + private readonly DataEventBus _dataEventBus; + private readonly Mock> _mockHub; + private readonly Mock _mockLoggingService; public CommentThreadEventHandlerTests() { - Mock mockDataCollectionFactory = new Mock(); - Mock mockCommentThreadService = new Mock(); - mockLoggingService = new Mock(); - mockHub = new Mock>(); + Mock mockDataCollectionFactory = new(); + Mock mockCommentThreadService = new(); + _mockLoggingService = new Mock(); + _mockHub = new Mock>(); - dataEventBus = new DataEventBus(); + _dataEventBus = new DataEventBus(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); mockCommentThreadService.Setup(x => x.FormatComment(It.IsAny())).Returns(null); - commentThreadEventHandler = new CommentThreadEventHandler(dataEventBus, mockHub.Object, mockCommentThreadService.Object, mockLoggingService.Object); + _commentThreadEventHandler = new CommentThreadEventHandler(_dataEventBus, _mockHub.Object, mockCommentThreadService.Object, _mockLoggingService.Object); } [Fact] public void ShouldLogOnException() { - mockLoggingService.Setup(x => x.LogError(It.IsAny())); + _mockLoggingService.Setup(x => x.LogError(It.IsAny())); - commentThreadEventHandler.Init(); + _commentThreadEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = (DataEventType) 5 }); + _dataEventBus.Send(new DataEventModel { Type = (DataEventType) 5 }); - mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); + _mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); } [Fact] public void ShouldNotRunEventOnUpdate() { - Mock> mockHubClients = new Mock>(); - Mock mockClient = new Mock(); + Mock> mockHubClients = new(); + Mock mockClient = new(); - mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + _mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); mockClient.Setup(x => x.ReceiveComment(It.IsAny())); mockClient.Setup(x => x.DeleteComment(It.IsAny())); - commentThreadEventHandler.Init(); + _commentThreadEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE, data = new Comment() }); + _dataEventBus.Send(new DataEventModel { Type = DataEventType.UPDATE, Data = new Comment() }); mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Never); mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Never); @@ -63,17 +63,17 @@ public void ShouldNotRunEventOnUpdate() { [Fact] public void ShouldRunAddedOnAdd() { - Mock> mockHubClients = new Mock>(); - Mock mockClient = new Mock(); + Mock> mockHubClients = new(); + Mock mockClient = new(); - mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + _mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); mockClient.Setup(x => x.ReceiveComment(It.IsAny())); mockClient.Setup(x => x.DeleteComment(It.IsAny())); - commentThreadEventHandler.Init(); + _commentThreadEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new Comment() }); + _dataEventBus.Send(new DataEventModel { Type = DataEventType.ADD, Data = new Comment() }); mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Once); mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Never); @@ -81,17 +81,17 @@ public void ShouldRunAddedOnAdd() { [Fact] public void ShouldRunDeletedOnDelete() { - Mock> mockHubClients = new Mock>(); - Mock mockClient = new Mock(); + Mock> mockHubClients = new(); + Mock mockClient = new(); - mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + _mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); mockClient.Setup(x => x.ReceiveComment(It.IsAny())); mockClient.Setup(x => x.DeleteComment(It.IsAny())); - commentThreadEventHandler.Init(); + _commentThreadEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE, data = new Comment() }); + _dataEventBus.Send(new DataEventModel { Type = DataEventType.DELETE, Data = new Comment() }); mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Never); mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Once); diff --git a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs index 4dddc5a0..8a165e01 100644 --- a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs @@ -10,29 +10,32 @@ namespace UKSF.Tests.Unit.Events.Handlers { public class LogEventHandlerTests { - private readonly Subject _loggerSubject = new Subject(); - private readonly Mock _mockAuditLogDataService; - private readonly Mock _mockHttpErrorLogDataService; - private readonly Mock _mockLauncherLogDataService; - private readonly Mock _mockLogDataService; + private readonly Subject _loggerSubject = new(); + private readonly Mock _mockAuditLogDataService; + private readonly Mock _mockDiscordLogDataService; + private readonly Mock _mockHttpErrorLogDataService; + private readonly Mock _mockLauncherLogDataService; + private readonly Mock _mockLogDataService; private readonly Mock _mockObjectIdConversionService; public LogEventHandlerTests() { - _mockLogDataService = new Mock(); - _mockAuditLogDataService = new Mock(); - _mockHttpErrorLogDataService = new Mock(); - _mockLauncherLogDataService = new Mock(); + _mockLogDataService = new Mock(); + _mockAuditLogDataService = new Mock(); + _mockHttpErrorLogDataService = new Mock(); + _mockLauncherLogDataService = new Mock(); + _mockDiscordLogDataService = new Mock(); _mockObjectIdConversionService = new Mock(); - Mock mockLogger = new Mock(); + Mock mockLogger = new(); mockLogger.Setup(x => x.AsObservable()).Returns(_loggerSubject); _mockObjectIdConversionService.Setup(x => x.ConvertObjectIds(It.IsAny())).Returns(x => x); - LoggerEventHandler logEventHandler = new LoggerEventHandler( + LoggerEventHandler logEventHandler = new( _mockLogDataService.Object, _mockAuditLogDataService.Object, _mockHttpErrorLogDataService.Object, _mockLauncherLogDataService.Object, + _mockDiscordLogDataService.Object, mockLogger.Object, _mockObjectIdConversionService.Object ); @@ -41,7 +44,7 @@ public LogEventHandlerTests() { [Fact] public void When_handling_a_basic_log() { - BasicLog basicLog = new BasicLog("test"); + BasicLog basicLog = new("test"); _loggerSubject.OnNext(basicLog); @@ -49,9 +52,18 @@ public void When_handling_a_basic_log() { _mockLogDataService.Verify(x => x.Add(basicLog), Times.Once); } + [Fact] + public void When_handling_a_discord_log() { + DiscordLog discordLog = new(DiscordUserEventType.JOINED, "SqnLdr.Beswick.T", "12345", "SqnLdr.Beswick.T joined"); + + _loggerSubject.OnNext(discordLog); + + _mockDiscordLogDataService.Verify(x => x.Add(discordLog), Times.Once); + } + [Fact] public void When_handling_a_launcher_log() { - LauncherLog launcherLog = new LauncherLog("1.0.0", "test"); + LauncherLog launcherLog = new("1.0.0", "test"); _loggerSubject.OnNext(launcherLog); @@ -61,7 +73,7 @@ public void When_handling_a_launcher_log() { [Fact] public void When_handling_an_audit_log() { - AuditLog basicLog = new AuditLog("server", "test"); + AuditLog basicLog = new("server", "test"); _loggerSubject.OnNext(basicLog); @@ -72,7 +84,7 @@ public void When_handling_an_audit_log() { [Fact] public void When_handling_an_http_error_log() { - HttpErrorLog httpErrorLog = new HttpErrorLog(new Exception()); + HttpErrorLog httpErrorLog = new(new Exception()); _loggerSubject.OnNext(httpErrorLog); diff --git a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs index bb91d900..16f16dbd 100644 --- a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs @@ -13,86 +13,86 @@ namespace UKSF.Tests.Unit.Events.Handlers { public class NotificationsEventHandlerTests { - private readonly DataEventBus dataEventBus; - private readonly Mock> mockHub; - private readonly Mock mockLoggingService; - private readonly NotificationsEventHandler notificationsEventHandler; + private readonly DataEventBus _dataEventBus; + private readonly Mock> _mockHub; + private readonly Mock _mockLoggingService; + private readonly NotificationsEventHandler _notificationsEventHandler; public NotificationsEventHandlerTests() { - Mock mockDataCollectionFactory = new Mock(); - mockLoggingService = new Mock(); - mockHub = new Mock>(); + Mock mockDataCollectionFactory = new(); + _mockLoggingService = new Mock(); + _mockHub = new Mock>(); - dataEventBus = new DataEventBus(); + _dataEventBus = new DataEventBus(); - mockDataCollectionFactory.Setup(x => x.CreateDataCollection(It.IsAny())); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); - notificationsEventHandler = new NotificationsEventHandler(dataEventBus, mockHub.Object, mockLoggingService.Object); + _notificationsEventHandler = new NotificationsEventHandler(_dataEventBus, _mockHub.Object, _mockLoggingService.Object); } [Fact] public void ShouldLogOnException() { - Mock> mockHubClients = new Mock>(); - Mock mockClient = new Mock(); + Mock> mockHubClients = new(); + Mock mockClient = new(); - mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + _mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); mockClient.Setup(x => x.ReceiveNotification(It.IsAny())).Throws(new Exception()); - mockLoggingService.Setup(x => x.LogError(It.IsAny())); + _mockLoggingService.Setup(x => x.LogError(It.IsAny())); - notificationsEventHandler.Init(); + _notificationsEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD }); + _dataEventBus.Send(new DataEventModel { Type = DataEventType.ADD }); - mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); + _mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); } [Fact] public void ShouldNotRunEventOnUpdateOrDelete() { - Mock> mockHubClients = new Mock>(); - Mock mockClient = new Mock(); + Mock> mockHubClients = new(); + Mock mockClient = new(); - mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + _mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); mockClient.Setup(x => x.ReceiveNotification(It.IsAny())); - notificationsEventHandler.Init(); + _notificationsEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.UPDATE }); - dataEventBus.Send(new DataEventModel { type = DataEventType.DELETE }); + _dataEventBus.Send(new DataEventModel { Type = DataEventType.UPDATE }); + _dataEventBus.Send(new DataEventModel { Type = DataEventType.DELETE }); mockClient.Verify(x => x.ReceiveNotification(It.IsAny()), Times.Never); } [Fact] public void ShouldRunAddedOnAdd() { - Mock> mockHubClients = new Mock>(); - Mock mockClient = new Mock(); + Mock> mockHubClients = new(); + Mock mockClient = new(); - mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + _mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); mockClient.Setup(x => x.ReceiveNotification(It.IsAny())); - notificationsEventHandler.Init(); + _notificationsEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new Notification() }); + _dataEventBus.Send(new DataEventModel { Type = DataEventType.ADD, Data = new Notification() }); mockClient.Verify(x => x.ReceiveNotification(It.IsAny()), Times.Once); } [Fact] public void ShouldUseOwnerAsIdInAdded() { - Mock> mockHubClients = new Mock>(); - Mock mockClient = new Mock(); + Mock> mockHubClients = new(); + Mock mockClient = new(); string subject = ""; - mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); + _mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group("1")).Returns(mockClient.Object).Callback((string x) => subject = x); mockClient.Setup(x => x.ReceiveNotification(It.IsAny())); - notificationsEventHandler.Init(); + _notificationsEventHandler.Init(); - dataEventBus.Send(new DataEventModel { type = DataEventType.ADD, data = new Notification { owner = "1" } }); + _dataEventBus.Send(new DataEventModel { Type = DataEventType.ADD, Data = new Notification { Owner = "1" } }); subject.Should().Be("1"); } diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs index 79a3f566..6ce0e046 100644 --- a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -6,7 +6,6 @@ using Moq; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; using UKSF.Api.Teamspeak.EventHandlers; @@ -16,7 +15,7 @@ namespace UKSF.Tests.Unit.Events.Handlers { public class TeamspeakEventHandlerTests { - private readonly Mock _mockAccountService; + private readonly Mock _mockAccountContext; private readonly Mock _mockLoggingService; private readonly Mock _mockTeamspeakGroupService; private readonly Mock _mockTeamspeakService; @@ -25,27 +24,31 @@ public class TeamspeakEventHandlerTests { public TeamspeakEventHandlerTests() { _signalrEventBus = new SignalrEventBus(); + _mockAccountContext = new Mock(); _mockTeamspeakService = new Mock(); - _mockAccountService = new Mock(); _mockTeamspeakGroupService = new Mock(); _mockLoggingService = new Mock(); - _teamspeakEventHandler = new TeamspeakEventHandler(_signalrEventBus, _mockTeamspeakService.Object, _mockAccountService.Object, _mockTeamspeakGroupService.Object, _mockLoggingService.Object); + _teamspeakEventHandler = new TeamspeakEventHandler( + _mockAccountContext.Object, + _signalrEventBus, + _mockTeamspeakService.Object, + _mockTeamspeakGroupService.Object, + _mockLoggingService.Object + ); } [Theory, InlineData(2), InlineData(-1)] public async Task ShouldGetNoAccountForNoMatchingIdsOrNull(double id) { - Account account = new Account { teamspeakIdentities = Math.Abs(id - -1) < 0.01 ? null : new HashSet { id } }; - List mockAccountCollection = new List { account }; - Mock mockAccountDataService = new Mock(); + Account account = new() { TeamspeakIdentities = Math.Abs(id - -1) < 0.01 ? null : new HashSet { id } }; + List mockAccountCollection = new() { account }; - mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockAccountCollection.FirstOrDefault(x)); - _mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockAccountCollection.FirstOrDefault(x)); _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())).Returns(Task.CompletedTask); _teamspeakEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); await Task.Delay(TimeSpan.FromSeconds(1)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(null, new List { 5 }, 1), Times.Once); @@ -55,22 +58,22 @@ public async Task ShouldGetNoAccountForNoMatchingIdsOrNull(double id) { public void LogOnException() { _teamspeakEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { procedure = (TeamspeakEventType) 9 }); + _signalrEventBus.Send(new SignalrEventModel { Procedure = (TeamspeakEventType) 9 }); _mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); } [Fact] public void ShouldCorrectlyParseClients() { - HashSet subject = new HashSet(); + HashSet subject = new(); _mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())).Callback((HashSet x) => subject = x); _teamspeakEventHandler.Init(); _signalrEventBus.Send( new SignalrEventModel { - procedure = TeamspeakEventType.CLIENTS, - args = "[{\"channelId\": 1, \"channelName\": \"Test Channel 1\", \"clientDbId\": 5, \"clientName\": \"Test Name 1\"}," + + Procedure = TeamspeakEventType.CLIENTS, + Args = "[{\"channelId\": 1, \"channelName\": \"Test Channel 1\", \"clientDbId\": 5, \"clientName\": \"Test Name 1\"}," + "{\"channelId\": 2, \"channelName\": \"Test Channel 2\", \"clientDbId\": 10, \"clientName\": \"Test Name 2\"}]" } ); @@ -79,26 +82,24 @@ public void ShouldCorrectlyParseClients() { subject.Should() .BeEquivalentTo( new HashSet { - new TeamspeakClient { channelId = 1, channelName = "Test Channel 1", clientDbId = 5, clientName = "Test Name 1" }, - new TeamspeakClient { channelId = 2, channelName = "Test Channel 2", clientDbId = 10, clientName = "Test Name 2" } + new() { ChannelId = 1, ChannelName = "Test Channel 1", ClientDbId = 5, ClientName = "Test Name 1" }, + new() { ChannelId = 2, ChannelName = "Test Channel 2", ClientDbId = 10, ClientName = "Test Name 2" } } ); } [Fact] public async Task ShouldGetCorrectAccount() { - Account account1 = new Account { teamspeakIdentities = new HashSet { 1 } }; - Account account2 = new Account { teamspeakIdentities = new HashSet { 2 } }; - List mockAccountCollection = new List { account1, account2 }; - Mock mockAccountDataService = new Mock(); + Account account1 = new() { TeamspeakIdentities = new HashSet { 1 } }; + Account account2 = new() { TeamspeakIdentities = new HashSet { 2 } }; + List mockAccountCollection = new() { account1, account2 }; - mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockAccountCollection.FirstOrDefault(x)); - _mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockAccountCollection.FirstOrDefault(x)); _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(account1, It.IsAny>(), 1)).Returns(Task.CompletedTask); _teamspeakEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); await Task.Delay(TimeSpan.FromSeconds(1)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); @@ -111,7 +112,7 @@ public void ShouldNotRunEventOnEmpty() { _teamspeakEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.EMPTY }); + _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.EMPTY }); _mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Never); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny()), Times.Never); @@ -123,23 +124,21 @@ public void ShouldNotRunUpdateClientsForNoClients() { _teamspeakEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENTS, args = "[]" }); + _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENTS, Args = "[]" }); _mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Never); } [Fact] public async Task ShouldRunClientGroupsUpdate() { - Account account = new Account { teamspeakIdentities = new HashSet { 1 } }; - Mock mockAccountDataService = new Mock(); + Account account = new() { TeamspeakIdentities = new HashSet { 1 } }; - mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); - _mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(account, It.IsAny>(), 1)).Returns(Task.CompletedTask); _teamspeakEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); await Task.Delay(TimeSpan.FromSeconds(1)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5 }, 1), Times.Once); @@ -147,18 +146,16 @@ public async Task ShouldRunClientGroupsUpdate() { [Fact] public async Task ShouldRunClientGroupsUpdateTwiceForTwoEventsWithDelay() { - Account account = new Account { teamspeakIdentities = new HashSet { 1 } }; - Mock mockAccountDataService = new Mock(); + Account account = new() { TeamspeakIdentities = new HashSet { 1 } }; - mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); - _mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); _teamspeakEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); await Task.Delay(TimeSpan.FromSeconds(1)); - _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); + _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); await Task.Delay(TimeSpan.FromSeconds(1)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5 }, 1), Times.Once); @@ -167,19 +164,17 @@ public async Task ShouldRunClientGroupsUpdateTwiceForTwoEventsWithDelay() { [Fact] public async Task ShouldRunSingleClientGroupsUpdateForEachClient() { - Account account1 = new Account { teamspeakIdentities = new HashSet { 1 } }; - Account account2 = new Account { teamspeakIdentities = new HashSet { 2 } }; - List mockCollection = new List { account1, account2 }; - Mock mockAccountDataService = new Mock(); + Account account1 = new() { TeamspeakIdentities = new HashSet { 1 } }; + Account account2 = new() { TeamspeakIdentities = new HashSet { 2 } }; + List mockCollection = new() { account1, account2 }; - mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.FirstOrDefault(x)); - _mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.FirstOrDefault(x)); _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); _teamspeakEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); - _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 2, \"serverGroupId\": 10}" }); + _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 2, \"serverGroupId\": 10}" }); await Task.Delay(TimeSpan.FromSeconds(2)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); @@ -188,17 +183,15 @@ public async Task ShouldRunSingleClientGroupsUpdateForEachClient() { [Fact] public async Task ShouldRunSingleClientGroupsUpdateForMultipleEventsWithOneClient() { - Account account = new Account { teamspeakIdentities = new HashSet { 1 } }; - Mock mockAccountDataService = new Mock(); + Account account = new() { TeamspeakIdentities = new HashSet { 1 } }; - mockAccountDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); - _mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); _teamspeakEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); - _signalrEventBus.Send(new SignalrEventModel { procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); + _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); await Task.Delay(TimeSpan.FromSeconds(2)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5, 10 }, 1), Times.Once); @@ -211,7 +204,7 @@ public void ShouldRunUpdateClients() { _teamspeakEventHandler.Init(); _signalrEventBus.Send( - new SignalrEventModel { procedure = TeamspeakEventType.CLIENTS, args = "[{\"channelId\": 1, \"channelName\": \"Test Channel\", \"clientDbId\": 5, \"clientName\": \"Test Name\"}]" } + new SignalrEventModel { Procedure = TeamspeakEventType.CLIENTS, Args = "[{\"channelId\": 1, \"channelName\": \"Test Channel\", \"clientDbId\": 5, \"clientName\": \"Test Name\"}]" } ); _mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Once); diff --git a/UKSF.Tests/Unit/Models/AccountSettingsTests.cs b/UKSF.Tests/Unit/Models/AccountSettingsTests.cs deleted file mode 100644 index ba55891f..00000000 --- a/UKSF.Tests/Unit/Models/AccountSettingsTests.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using FluentAssertions; -using UKSF.Api.Personnel.Models; -using Xunit; - -namespace UKSF.Tests.Unit.Models { - public class AccountSettingsTests { - [Fact] - public void ShouldReturnBool() { - AccountSettings subject = new AccountSettings(); - - bool attribute = subject.GetAttribute("sr1Enabled"); - - attribute.GetType().Should().Be(typeof(bool)); - } - - [Fact] - public void ShouldReturnCorrectValue() { - AccountSettings subject = new AccountSettings {sr1Enabled = false, errorEmails = true}; - - bool sr1Enabled = subject.GetAttribute("sr1Enabled"); - bool errorEmails = subject.GetAttribute("errorEmails"); - - sr1Enabled.Should().BeFalse(); - errorEmails.Should().BeTrue(); - } - - [Theory, InlineData(""), InlineData(null)] - public void ShouldThrowWhenSettingNotFound(string name) { - AccountSettings accountSettings = new AccountSettings(); - - Action act = () => accountSettings.GetAttribute(name); - - act.Should().Throw(); - } - } -} diff --git a/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs b/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs index 58d07838..3d6d83d0 100644 --- a/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs +++ b/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs @@ -7,11 +7,11 @@ namespace UKSF.Tests.Unit.Models.Game { public class MissionFileTests { [Fact] public void ShouldSetFields() { - MissionFile subject = new MissionFile(new FileInfo("../../../testdata/testmission.Altis.pbo")); + MissionFile subject = new(new FileInfo("../../../testdata/testmission.Altis.pbo")); - subject.path.Should().Be("testmission.Altis.pbo"); - subject.map.Should().Be("Altis"); - subject.name.Should().Be("testmission"); + subject.Path.Should().Be("testmission.Altis.pbo"); + subject.Map.Should().Be("Altis"); + subject.Name.Should().Be("testmission"); } } } diff --git a/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs index 247647a6..f31a050f 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs @@ -7,25 +7,25 @@ namespace UKSF.Tests.Unit.Models.Message.Logging { public class BasicLogMessageTests { [Fact] public void ShouldSetText() { - BasicLog subject = new BasicLog("test"); + BasicLog subject = new("test"); - subject.message.Should().Be("test"); + subject.Message.Should().Be("test"); } [Fact] public void ShouldSetTextAndLogLevel() { - BasicLog subject = new BasicLog("test", LogLevel.DEBUG); + BasicLog subject = new("test", LogLevel.DEBUG); - subject.message.Should().Be("test"); - subject.level.Should().Be(LogLevel.DEBUG); + subject.Message.Should().Be("test"); + subject.Level.Should().Be(LogLevel.DEBUG); } [Fact] public void ShouldSetTextAndLogLevelFromException() { - BasicLog subject = new BasicLog(new Exception("test")); + BasicLog subject = new(new Exception("test")); - subject.message.Should().Be("System.Exception: test"); - subject.level.Should().Be(LogLevel.ERROR); + subject.Message.Should().Be("System.Exception: test"); + subject.Level.Should().Be(LogLevel.ERROR); } } } diff --git a/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs index 78af5e3d..2eb78e06 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs @@ -6,10 +6,10 @@ namespace UKSF.Tests.Unit.Models.Message.Logging { public class LauncherLogMessageTests { [Fact] public void ShouldSetVersionAndMessage() { - LauncherLog subject = new LauncherLog("1.0.0", "test"); + LauncherLog subject = new("1.0.0", "test"); - subject.message.Should().Be("test"); - subject.version.Should().Be("1.0.0"); + subject.Message.Should().Be("test"); + subject.Version.Should().Be("1.0.0"); } } } diff --git a/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs index 4779bae7..a36fadf9 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs @@ -7,11 +7,11 @@ namespace UKSF.Tests.Unit.Models.Message.Logging { public class WebLogMessageTests { [Fact] public void ShouldCreateFromException() { - HttpErrorLog subject = new HttpErrorLog(new Exception("test")); + HttpErrorLog subject = new(new Exception("test")); - subject.message.Should().Be("test"); - subject.exception.Should().Be("System.Exception: test"); - subject.level.Should().Be(LogLevel.ERROR); + subject.Message.Should().Be("test"); + subject.Exception.Should().Be("System.Exception: test"); + subject.Level.Should().Be(LogLevel.ERROR); } } } diff --git a/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs b/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs index 92da8cc1..8998be76 100644 --- a/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs +++ b/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs @@ -7,29 +7,29 @@ namespace UKSF.Tests.Unit.Models.Mission { public class MissionPatchingReportTests { [Fact] public void ShouldSetFieldsAsError() { - MissionPatchingReport subject = new MissionPatchingReport("Test Title", "Test details, like what went wrong, what needs to be done to fix it", true); + MissionPatchingReport subject = new("Test Title", "Test details, like what went wrong, what needs to be done to fix it", true); - subject.title.Should().Be("Error: Test Title"); - subject.detail.Should().Be("Test details, like what went wrong, what needs to be done to fix it"); - subject.error.Should().BeTrue(); + subject.Title.Should().Be("Error: Test Title"); + subject.Detail.Should().Be("Test details, like what went wrong, what needs to be done to fix it"); + subject.Error.Should().BeTrue(); } [Fact] public void ShouldSetFieldsAsWarning() { - MissionPatchingReport subject = new MissionPatchingReport("Test Title", "Test details, like what went wrong, what needs to be done to fix it"); + MissionPatchingReport subject = new("Test Title", "Test details, like what went wrong, what needs to be done to fix it"); - subject.title.Should().Be("Warning: Test Title"); - subject.detail.Should().Be("Test details, like what went wrong, what needs to be done to fix it"); - subject.error.Should().BeFalse(); + subject.Title.Should().Be("Warning: Test Title"); + subject.Detail.Should().Be("Test details, like what went wrong, what needs to be done to fix it"); + subject.Error.Should().BeFalse(); } [Fact] public void ShouldSetFieldsFromException() { - MissionPatchingReport subject = new MissionPatchingReport(new Exception("An error occured")); + MissionPatchingReport subject = new(new Exception("An error occured")); - subject.title.Should().Be("An error occured"); - subject.detail.Should().Be("System.Exception: An error occured"); - subject.error.Should().BeTrue(); + subject.Title.Should().Be("An error occured"); + subject.Detail.Should().Be("System.Exception: An error occured"); + subject.Error.Should().BeTrue(); } } } diff --git a/UKSF.Tests/Unit/Models/Mission/MissionTests.cs b/UKSF.Tests/Unit/Models/Mission/MissionTests.cs index 059ac0d6..29fda0c2 100644 --- a/UKSF.Tests/Unit/Models/Mission/MissionTests.cs +++ b/UKSF.Tests/Unit/Models/Mission/MissionTests.cs @@ -5,11 +5,11 @@ namespace UKSF.Tests.Unit.Models.Mission { public class MissionTests { [Fact] public void ShouldSetFields() { - Api.ArmaMissions.Models.Mission subject = new Api.ArmaMissions.Models.Mission("testdata/testmission.Altis"); + Api.ArmaMissions.Models.Mission subject = new("testdata/testmission.Altis"); - subject.path.Should().Be("testdata/testmission.Altis"); - subject.descriptionPath.Should().Be("testdata/testmission.Altis/description.ext"); - subject.sqmPath.Should().Be("testdata/testmission.Altis/mission.sqm"); + subject.Path.Should().Be("testdata/testmission.Altis"); + subject.DescriptionPath.Should().Be("testdata/testmission.Altis/description.ext"); + subject.SqmPath.Should().Be("testdata/testmission.Altis/mission.sqm"); } } } diff --git a/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs index 2b388841..5c8d27da 100644 --- a/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs @@ -10,29 +10,29 @@ namespace UKSF.Tests.Unit.Services.Admin { public class VariablesServiceTests { [Fact] - public void ShouldGetVariableAsString() { - const string EXPECTED = "Value"; - VariableItem variableItem = new VariableItem {key = "Test", item = EXPECTED}; + public void ShouldGetVariableAsArray() { + VariableItem variableItem = new() { Key = "Test", Item = "item1,item2, item3" }; - string subject = variableItem.AsString(); + string[] subject = variableItem.AsArray(); - subject.Should().Be(EXPECTED); + subject.Should().HaveCount(3); + subject.Should().Contain(new[] { "item1", "item2", "item3" }); } [Fact] - public void ShouldGetVariableAsDouble() { - const double EXPECTED = 1.5; - VariableItem variableItem = new VariableItem {key = "Test", item = EXPECTED}; + public void ShouldGetVariableAsArrayWithPredicate() { + VariableItem variableItem = new() { Key = "Test", Item = "\"item1\",item2" }; - double subject = variableItem.AsDouble(); + string[] subject = variableItem.AsArray(x => x.RemoveQuotes()); - subject.Should().Be(EXPECTED); + subject.Should().HaveCount(2); + subject.Should().Contain(new[] { "item1", "item2" }); } [Fact] public void ShouldGetVariableAsBool() { const bool EXPECTED = true; - VariableItem variableItem = new VariableItem {key = "Test", item = EXPECTED}; + VariableItem variableItem = new() { Key = "Test", Item = EXPECTED }; bool subject = variableItem.AsBool(); @@ -40,61 +40,61 @@ public void ShouldGetVariableAsBool() { } [Fact] - public void ShouldGetVariableAsUlong() { - const ulong EXPECTED = ulong.MaxValue; - VariableItem variableItem = new VariableItem {key = "Test", item = EXPECTED}; + public void ShouldGetVariableAsDouble() { + const double EXPECTED = 1.5; + VariableItem variableItem = new() { Key = "Test", Item = EXPECTED }; - ulong subject = variableItem.AsUlong(); + double subject = variableItem.AsDouble(); subject.Should().Be(EXPECTED); } [Fact] - public void ShouldGetVariableAsArray() { - VariableItem variableItem = new VariableItem {key = "Test", item = "item1,item2, item3"}; + public void ShouldGetVariableAsDoublesArray() { + VariableItem variableItem = new() { Key = "Test", Item = "1.5,1.67845567657, -0.000000456" }; - string[] subject = variableItem.AsArray(); + List subject = variableItem.AsDoublesArray().ToList(); subject.Should().HaveCount(3); - subject.Should().Contain(new[] {"item1", "item2", "item3"}); + subject.Should().Contain(new[] { 1.5, 1.67845567657, -0.000000456 }); } // ReSharper disable PossibleMultipleEnumeration [Fact] public void ShouldGetVariableAsEnumerable() { - VariableItem variableItem = new VariableItem {key = "Test", item = "item1,item2, item3"}; + VariableItem variableItem = new() { Key = "Test", Item = "item1,item2, item3" }; IEnumerable subject = variableItem.AsEnumerable(); subject.Should().BeAssignableTo>(); subject.Should().HaveCount(3); - subject.Should().Contain(new[] {"item1", "item2", "item3"}); + subject.Should().Contain(new[] { "item1", "item2", "item3" }); } // ReSharper restore PossibleMultipleEnumeration [Fact] - public void ShouldGetVariableAsArrayWithPredicate() { - VariableItem variableItem = new VariableItem {key = "Test", item = "\"item1\",item2"}; + public void ShouldGetVariableAsString() { + const string EXPECTED = "Value"; + VariableItem variableItem = new() { Key = "Test", Item = EXPECTED }; - string[] subject = variableItem.AsArray(x => x.RemoveQuotes()); + string subject = variableItem.AsString(); - subject.Should().HaveCount(2); - subject.Should().Contain(new[] {"item1", "item2"}); + subject.Should().Be(EXPECTED); } [Fact] - public void ShouldGetVariableAsDoublesArray() { - VariableItem variableItem = new VariableItem {key = "Test", item = "1.5,1.67845567657, -0.000000456"}; + public void ShouldGetVariableAsUlong() { + const ulong EXPECTED = ulong.MaxValue; + VariableItem variableItem = new() { Key = "Test", Item = EXPECTED }; - List subject = variableItem.AsDoublesArray().ToList(); + ulong subject = variableItem.AsUlong(); - subject.Should().HaveCount(3); - subject.Should().Contain(new[] {1.5, 1.67845567657, -0.000000456}); + subject.Should().Be(EXPECTED); } [Fact] public void ShouldHaveItem() { - VariableItem variableItem = new VariableItem {key = "Test", item = "test"}; + VariableItem variableItem = new() { Key = "Test", Item = "test" }; Action act = () => variableItem.AssertHasItem(); @@ -102,17 +102,17 @@ public void ShouldHaveItem() { } [Fact] - public void ShouldThrowWithNoItem() { - VariableItem variableItem = new VariableItem {key = "Test"}; + public void ShouldThrowWithInvalidBool() { + VariableItem variableItem = new() { Key = "Test", Item = "wontwork" }; - Action act = () => variableItem.AssertHasItem(); + Action act = () => variableItem.AsBool(); - act.Should().Throw(); + act.Should().Throw(); } [Fact] public void ShouldThrowWithInvalidDouble() { - VariableItem variableItem = new VariableItem {key = "Test", item = "wontwork"}; + VariableItem variableItem = new() { Key = "Test", Item = "wontwork" }; Action act = () => variableItem.AsDouble(); @@ -120,21 +120,21 @@ public void ShouldThrowWithInvalidDouble() { } [Fact] - public void ShouldThrowWithInvalidBool() { - VariableItem variableItem = new VariableItem {key = "Test", item = "wontwork"}; + public void ShouldThrowWithInvalidUlong() { + VariableItem variableItem = new() { Key = "Test", Item = "wontwork" }; - Action act = () => variableItem.AsBool(); + Action act = () => variableItem.AsUlong(); act.Should().Throw(); } [Fact] - public void ShouldThrowWithInvalidUlong() { - VariableItem variableItem = new VariableItem {key = "Test", item = "wontwork"}; + public void ShouldThrowWithNoItem() { + VariableItem variableItem = new() { Key = "Test" }; - Action act = () => variableItem.AsUlong(); + Action act = () => variableItem.AssertHasItem(); - act.Should().Throw(); + act.Should().Throw(); } } } diff --git a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs index 0076c6ee..bc3bcb9e 100644 --- a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs @@ -12,38 +12,38 @@ public class AccountUtilitiesTests { public void ShouldCopyAccountCorrectly() { string id = ObjectId.GenerateNewId().ToString(); DateTime timestamp = DateTime.Now.AddDays(-1); - Account account = new Account { - id = id, - firstname = "Bob", - lastname = "McTest", - membershipState = MembershipState.MEMBER, - teamspeakIdentities = new HashSet {4, 4}, - serviceRecord = new List {new ServiceRecordEntry {Occurence = "Test", Timestamp = timestamp}}, - rolePreferences = new List {"Aviation"}, - militaryExperience = false + Account account = new() { + Id = id, + Firstname = "Bob", + Lastname = "McTest", + MembershipState = MembershipState.MEMBER, + TeamspeakIdentities = new HashSet { 4, 4 }, + ServiceRecord = new List { new() { Occurence = "Test", Timestamp = timestamp } }, + RolePreferences = new List { "Aviation" }, + MilitaryExperience = false }; PublicAccount subject = account.ToPublicAccount(); - subject.id.Should().Be(id); - subject.firstname.Should().Be("Bob"); - subject.lastname.Should().Be("McTest"); - subject.membershipState.Should().Be(MembershipState.MEMBER); - subject.teamspeakIdentities.Should().NotBeEmpty().And.HaveCount(1).And.ContainInOrder(new[] {4}); - subject.serviceRecord.Should().NotBeEmpty().And.HaveCount(1).And.OnlyContain(x => x.Occurence == "Test" && x.Timestamp == timestamp); - subject.rolePreferences.Should().Contain("Aviation"); - subject.militaryExperience.Should().BeFalse(); + subject.Id.Should().Be(id); + subject.Firstname.Should().Be("Bob"); + subject.Lastname.Should().Be("McTest"); + subject.MembershipState.Should().Be(MembershipState.MEMBER); + subject.TeamspeakIdentities.Should().NotBeEmpty().And.HaveCount(1).And.ContainInOrder(new[] { 4 }); + subject.ServiceRecord.Should().NotBeEmpty().And.HaveCount(1).And.OnlyContain(x => x.Occurence == "Test" && x.Timestamp == timestamp); + subject.RolePreferences.Should().Contain("Aviation"); + subject.MilitaryExperience.Should().BeFalse(); } [Fact] public void ShouldNotCopyPassword() { string id = ObjectId.GenerateNewId().ToString(); - Account account = new Account {id = id, password = "thiswontappear"}; + Account account = new() { Id = id, Password = "thiswontappear" }; PublicAccount subject = account.ToPublicAccount(); - subject.id.Should().Be(id); - subject.password.Should().BeNull(); + subject.Id.Should().Be(id); + subject.Password.Should().BeNull(); } } } diff --git a/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs b/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs index 36127835..91151495 100644 --- a/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs @@ -10,23 +10,21 @@ namespace UKSF.Tests.Unit.Services.Common { public class ObjectIdConversionServiceTests { private readonly Mock _mockDisplayNameService; - private readonly Mock _mockUnitsDataService; + private readonly Mock _mockUnitsContext; private readonly ObjectIdConversionService _objectIdConversionService; public ObjectIdConversionServiceTests() { _mockDisplayNameService = new Mock(); - _mockUnitsDataService = new Mock(); + _mockUnitsContext = new Mock(); - Mock mockUnitsService = new Mock(); - mockUnitsService.Setup(x => x.Data).Returns(_mockUnitsDataService.Object); - _objectIdConversionService = new ObjectIdConversionService(_mockDisplayNameService.Object, mockUnitsService.Object); + _objectIdConversionService = new ObjectIdConversionService(_mockUnitsContext.Object, _mockDisplayNameService.Object); } [Theory, InlineData("5e39336e1b92ee2d14b7fe08", "Maj.Bridgford.A"), InlineData("5e39336e1b92ee2d14b7fe08, 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A, Cpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe085e3935db1b92ee2d14b7fe09", "Maj.Bridgford.ACpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe08 has requested all the things for 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A has requested all the things for Cpl.Carr.C")] public void ShouldConvertNameObjectIds(string input, string expected) { - _mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); _mockDisplayNameService.Setup(x => x.GetDisplayName("5e39336e1b92ee2d14b7fe08")).Returns("Maj.Bridgford.A"); _mockDisplayNameService.Setup(x => x.GetDisplayName("5e3935db1b92ee2d14b7fe09")).Returns("Cpl.Carr.C"); @@ -37,14 +35,14 @@ public void ShouldConvertNameObjectIds(string input, string expected) { [Fact] public void ShouldConvertCorrectUnitWithPredicate() { - Api.Personnel.Models.Unit unit1 = new Api.Personnel.Models.Unit { name = "7 Squadron" }; - Api.Personnel.Models.Unit unit2 = new Api.Personnel.Models.Unit { name = "656 Squadron" }; - List collection = new List { unit1, unit2 }; + Api.Personnel.Models.Unit unit1 = new() { Name = "7 Squadron" }; + Api.Personnel.Models.Unit unit2 = new() { Name = "656 Squadron" }; + List collection = new() { unit1, unit2 }; - _mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => collection.FirstOrDefault(x)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => collection.FirstOrDefault(x)); _mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); - string subject = _objectIdConversionService.ConvertObjectIds(unit1.id); + string subject = _objectIdConversionService.ConvertObjectIds(unit1.Id); subject.Should().Be("7 Squadron"); } @@ -53,9 +51,9 @@ public void ShouldConvertCorrectUnitWithPredicate() { public void ShouldConvertUnitObjectIds() { const string INPUT = "5e39336e1b92ee2d14b7fe08"; const string EXPECTED = "7 Squadron"; - Api.Personnel.Models.Unit unit = new Api.Personnel.Models.Unit { name = EXPECTED, id = INPUT }; + Api.Personnel.Models.Unit unit = new() { Name = EXPECTED, Id = INPUT }; - _mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(unit); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(unit); _mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); string subject = _objectIdConversionService.ConvertObjectIds(INPUT); @@ -68,7 +66,7 @@ public void ShouldDoNothingToTextWhenNameOrUnitNotFound() { const string INPUT = "5e39336e1b92ee2d14b7fe08"; const string EXPECTED = "5e39336e1b92ee2d14b7fe08"; - _mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); _mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); string subject = _objectIdConversionService.ConvertObjectIds(INPUT); diff --git a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs index 4dfce360..fa3aec72 100644 --- a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs @@ -17,49 +17,58 @@ namespace UKSF.Tests.Unit.Services.Integrations.Teamspeak { public class TeamspeakGroupServiceTests { - private static readonly VariableItem TEAMSPEAK_GID_UNVERIFIED = new VariableItem { key = "TEAMSPEAK_GID_UNVERIFIED", item = "1" }; - private static readonly VariableItem TEAMSPEAK_GID_DISCHARGED = new VariableItem { key = "TEAMSPEAK_GID_DISCHARGED", item = "2" }; - private static readonly VariableItem TEAMSPEAK_GID_ROOT = new VariableItem { key = "TEAMSPEAK_GID_ROOT", item = "3" }; - private static readonly VariableItem TEAMSPEAK_GID_ELCOM = new VariableItem { key = "TEAMSPEAK_GID_ELCOM", item = "4" }; - private static readonly VariableItem TEAMSPEAK_GID_BLACKLIST = new VariableItem { key = "TEAMSPEAK_GID_BLACKLIST", item = "99,100" }; - - private readonly List addedGroups = new List(); - private readonly UksfUnit elcomUnit = new UksfUnit { id = ObjectId.GenerateNewId().ToString(), name = "ELCOM", branch = UnitBranch.AUXILIARY, parent = ObjectId.Empty.ToString() }; - private readonly Mock mockRanksDataService = new Mock(); - private readonly Mock mockRanksService = new Mock(); - private readonly Mock mockRolesService = new Mock(); - private readonly Mock mockTeampeakManagerService = new Mock(); - private readonly Mock mockUnitsDataService = new Mock(); - private readonly Mock mockVariablesService = new Mock(); - private readonly List removedGroups = new List(); - private readonly TeamspeakGroupService teamspeakGroupService; + private static readonly VariableItem TEAMSPEAK_GID_UNVERIFIED = new() { Key = "TEAMSPEAK_GID_UNVERIFIED", Item = "1" }; + private static readonly VariableItem TEAMSPEAK_GID_DISCHARGED = new() { Key = "TEAMSPEAK_GID_DISCHARGED", Item = "2" }; + private static readonly VariableItem TEAMSPEAK_GID_ROOT = new() { Key = "TEAMSPEAK_GID_ROOT", Item = "3" }; + private static readonly VariableItem TEAMSPEAK_GID_ELCOM = new() { Key = "TEAMSPEAK_GID_ELCOM", Item = "4" }; + private static readonly VariableItem TEAMSPEAK_GID_BLACKLIST = new() { Key = "TEAMSPEAK_GID_BLACKLIST", Item = "99,100" }; + + private readonly List _addedGroups = new(); + private readonly UksfUnit _elcomUnit = new() { Id = ObjectId.GenerateNewId().ToString(), Name = "ELCOM", Branch = UnitBranch.AUXILIARY, Parent = ObjectId.Empty.ToString() }; + private readonly Mock _mockRanksContext = new(); + private readonly Mock _mockRolesContext = new(); + private readonly Mock _mockTeampeakManagerService = new(); + private readonly Mock _mockUnitsContext = new(); + private readonly Mock _mockVariablesService = new(); + private readonly List _removedGroups = new(); + private readonly TeamspeakGroupService _teamspeakGroupService; public TeamspeakGroupServiceTests() { - mockRanksService.Setup(x => x.Data).Returns(mockRanksDataService.Object); - - mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_UNVERIFIED")).Returns(TEAMSPEAK_GID_UNVERIFIED); - mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_DISCHARGED")).Returns(TEAMSPEAK_GID_DISCHARGED); - mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_ROOT")).Returns(TEAMSPEAK_GID_ROOT); - mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_ELCOM")).Returns(TEAMSPEAK_GID_ELCOM); - mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_BLACKLIST")).Returns(TEAMSPEAK_GID_BLACKLIST); - - mockTeampeakManagerService.Setup(x => x.SendGroupProcedure(TeamspeakProcedureType.ASSIGN, It.IsAny())) - .Returns(Task.CompletedTask) - .Callback((TeamspeakProcedureType _, TeamspeakGroupProcedure groupProcedure) => addedGroups.Add(groupProcedure.serverGroup)); - mockTeampeakManagerService.Setup(x => x.SendGroupProcedure(TeamspeakProcedureType.UNASSIGN, It.IsAny())) - .Returns(Task.CompletedTask) - .Callback((TeamspeakProcedureType _, TeamspeakGroupProcedure groupProcedure) => removedGroups.Add(groupProcedure.serverGroup)); - - IUnitsService unitsService = new UnitsService(mockUnitsDataService.Object, mockRolesService.Object); - teamspeakGroupService = new TeamspeakGroupService(mockRanksService.Object, unitsService, mockTeampeakManagerService.Object, mockVariablesService.Object); + _mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_UNVERIFIED")).Returns(TEAMSPEAK_GID_UNVERIFIED); + _mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_DISCHARGED")).Returns(TEAMSPEAK_GID_DISCHARGED); + _mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_ROOT")).Returns(TEAMSPEAK_GID_ROOT); + _mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_ELCOM")).Returns(TEAMSPEAK_GID_ELCOM); + _mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_BLACKLIST")).Returns(TEAMSPEAK_GID_BLACKLIST); + + _mockTeampeakManagerService.Setup(x => x.SendGroupProcedure(TeamspeakProcedureType.ASSIGN, It.IsAny())) + .Returns(Task.CompletedTask) + .Callback((TeamspeakProcedureType _, TeamspeakGroupProcedure groupProcedure) => _addedGroups.Add(groupProcedure.ServerGroup)); + _mockTeampeakManagerService.Setup(x => x.SendGroupProcedure(TeamspeakProcedureType.UNASSIGN, It.IsAny())) + .Returns(Task.CompletedTask) + .Callback((TeamspeakProcedureType _, TeamspeakGroupProcedure groupProcedure) => _removedGroups.Add(groupProcedure.ServerGroup)); + + IUnitsService unitsService = new UnitsService(_mockUnitsContext.Object, _mockRolesContext.Object); + _teamspeakGroupService = new TeamspeakGroupService(_mockRanksContext.Object, _mockUnitsContext.Object, unitsService, _mockTeampeakManagerService.Object, _mockVariablesService.Object); + } + + [Fact] + public async Task Should_add_correct_groups_for_candidate() { + string id = ObjectId.GenerateNewId().ToString(); + + _mockRanksContext.Setup(x => x.GetSingle("Candidate")).Returns(new Rank { Name = "Candidate", TeamspeakGroup = "5" }); + + await _teamspeakGroupService.UpdateAccountGroups(new Account { Id = id, MembershipState = MembershipState.CONFIRMED, Rank = "Candidate" }, new List(), 2); + + _addedGroups.Should().BeEquivalentTo(5); + _removedGroups.Should().BeEmpty(); } [Fact] public async Task Should_add_correct_groups_for_discharged() { - await teamspeakGroupService.UpdateAccountGroups(new Account { membershipState = MembershipState.DISCHARGED }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups(new Account { MembershipState = MembershipState.DISCHARGED }, new List(), 2); - addedGroups.Should().BeEquivalentTo(2); - removedGroups.Should().BeEmpty(); + _addedGroups.Should().BeEquivalentTo(2); + _removedGroups.Should().BeEmpty(); } [Fact] @@ -67,155 +76,143 @@ public async Task Should_add_correct_groups_for_elcom() { string id = ObjectId.GenerateNewId().ToString(); string parentId = ObjectId.GenerateNewId().ToString(); string parentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new UksfUnit { name = "1 Section", teamspeakGroup = "6", members = new List { id }, parent = parentId }; - UksfUnit unitParent = new UksfUnit { id = parentId, name = "SFSG", teamspeakGroup = "7", parent = parentParentId }; - UksfUnit unitParentParent = new UksfUnit { id = parentParentId, name = "UKSF", teamspeakGroup = "8" }; - UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; - List units = new List { unit, unitParent, unitParentParent, elcomUnit, auxiliaryUnit }; - elcomUnit.members.Add(id); - - mockUnitsDataService.Setup(x => x.Get()).Returns(units); - mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); - - await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "1 Section" }, new List(), 2); - - addedGroups.Should().BeEquivalentTo(3, 4, 5, 7, 9); - removedGroups.Should().BeEmpty(); + UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new List { id }, Parent = parentId }; + UksfUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; + UksfUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; + UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new List { id } }; + List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; + _elcomUnit.Members.Add(id); + + _mockUnitsContext.Setup(x => x.Get()).Returns(units); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); + + await _teamspeakGroupService.UpdateAccountGroups(new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List(), 2); + + _addedGroups.Should().BeEquivalentTo(3, 4, 5, 7, 9); + _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_member() { + public async Task Should_add_correct_groups_for_first_root_child() { string id = ObjectId.GenerateNewId().ToString(); - string parentId = ObjectId.GenerateNewId().ToString(); - string parentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new UksfUnit { name = "1 Section", teamspeakGroup = "6", members = new List { id }, parent = parentId }; - UksfUnit unitParent = new UksfUnit { id = parentId, name = "SFSG", teamspeakGroup = "7", parent = parentParentId }; - UksfUnit unitParentParent = new UksfUnit { id = parentParentId, name = "UKSF", teamspeakGroup = "8" }; - UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; - List units = new List { unit, unitParent, unitParentParent, elcomUnit, auxiliaryUnit }; + string rootId = ObjectId.GenerateNewId().ToString(); + UksfUnit rootUnit = new() { Id = rootId, Name = "UKSF", TeamspeakGroup = "10", Parent = ObjectId.Empty.ToString() }; + UksfUnit unit = new() { Name = "JSFAW", TeamspeakGroup = "6", Members = new List { id }, Parent = rootId }; + UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new List { id } }; + List units = new() { rootUnit, unit, _elcomUnit, auxiliaryUnit }; - mockUnitsDataService.Setup(x => x.Get()).Returns(units); - mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); + _mockUnitsContext.Setup(x => x.Get()).Returns(units); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); - await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "1 Section" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups(new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "JSFAW" }, new List(), 2); - addedGroups.Should().BeEquivalentTo(3, 5, 6, 7, 9); - removedGroups.Should().BeEmpty(); + _addedGroups.Should().BeEquivalentTo(3, 5, 6, 9); + _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_candidate() { + public async Task Should_add_correct_groups_for_first_root_child_in_elcom() { string id = ObjectId.GenerateNewId().ToString(); + string rootId = ObjectId.GenerateNewId().ToString(); + UksfUnit rootUnit = new() { Id = rootId, Name = "UKSF", TeamspeakGroup = "10", Parent = ObjectId.Empty.ToString() }; + UksfUnit unit = new() { Name = "JSFAW", TeamspeakGroup = "6", Members = new List { id }, Parent = rootId }; + UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new List { id } }; + List units = new() { rootUnit, unit, _elcomUnit, auxiliaryUnit }; + _elcomUnit.Members.Add(id); - mockRanksDataService.Setup(x => x.GetSingle("Candidate")).Returns(new Rank { name = "Candidate", teamspeakGroup = "5" }); + _mockUnitsContext.Setup(x => x.Get()).Returns(units); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); - await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.CONFIRMED, rank = "Candidate" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups(new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "JSFAW" }, new List(), 2); - addedGroups.Should().BeEquivalentTo(5); - removedGroups.Should().BeEmpty(); + _addedGroups.Should().BeEquivalentTo(3, 5, 4, 6, 9); + _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_member_with_gaps_in_parents() { + public async Task Should_add_correct_groups_for_member() { string id = ObjectId.GenerateNewId().ToString(); string parentId = ObjectId.GenerateNewId().ToString(); string parentParentId = ObjectId.GenerateNewId().ToString(); - string parentParentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new UksfUnit { name = "1 Section", members = new List { id }, parent = parentId }; - UksfUnit unitParent = new UksfUnit { id = parentId, name = "1 Platoon", teamspeakGroup = "7", parent = parentParentId }; - UksfUnit unitParentParent = new UksfUnit { id = parentParentId, name = "A Company", parent = parentParentParentId }; - UksfUnit unitParentParentParent = new UksfUnit { id = parentParentParentId, name = "SFSG", teamspeakGroup = "8" }; - List units = new List { unit, unitParent, unitParentParent, unitParentParentParent, elcomUnit }; + UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new List { id }, Parent = parentId }; + UksfUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; + UksfUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; + UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new List { id } }; + List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; - mockUnitsDataService.Setup(x => x.Get()).Returns(units); - mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); + _mockUnitsContext.Setup(x => x.Get()).Returns(units); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); - await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "1 Section" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups(new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List(), 2); - addedGroups.Should().BeEquivalentTo(3, 5, 7, 8); - removedGroups.Should().BeEmpty(); + _addedGroups.Should().BeEquivalentTo(3, 5, 6, 7, 9); + _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_non_member_with_no_account() { - await teamspeakGroupService.UpdateAccountGroups(null, new List(), 2); + public async Task Should_add_correct_groups_for_member_with_gaps_in_parents() { + string id = ObjectId.GenerateNewId().ToString(); + string parentId = ObjectId.GenerateNewId().ToString(); + string parentParentId = ObjectId.GenerateNewId().ToString(); + string parentParentParentId = ObjectId.GenerateNewId().ToString(); + UksfUnit unit = new() { Name = "1 Section", Members = new List { id }, Parent = parentId }; + UksfUnit unitParent = new() { Id = parentId, Name = "1 Platoon", TeamspeakGroup = "7", Parent = parentParentId }; + UksfUnit unitParentParent = new() { Id = parentParentId, Name = "A Company", Parent = parentParentParentId }; + UksfUnit unitParentParentParent = new() { Id = parentParentParentId, Name = "SFSG", TeamspeakGroup = "8" }; + List units = new() { unit, unitParent, unitParentParent, unitParentParentParent, _elcomUnit }; - addedGroups.Should().BeEquivalentTo(1); - removedGroups.Should().BeEmpty(); - } + _mockUnitsContext.Setup(x => x.Get()).Returns(units); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); - [Fact] - public async Task Should_add_correct_groups_for_non_member() { - await teamspeakGroupService.UpdateAccountGroups(new Account { membershipState = MembershipState.UNCONFIRMED }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups(new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List(), 2); - addedGroups.Should().BeEquivalentTo(1); - removedGroups.Should().BeEmpty(); + _addedGroups.Should().BeEquivalentTo(3, 5, 7, 8); + _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_stratcom() { - string id = ObjectId.GenerateNewId().ToString(); - UksfUnit rootUnit = new UksfUnit { name = "UKSF", teamspeakGroup = "10", members = new List { id }, parent = ObjectId.Empty.ToString() }; - UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; - List units = new List { rootUnit, elcomUnit, auxiliaryUnit }; - elcomUnit.members.Add(id); - - mockUnitsDataService.Setup(x => x.Get()).Returns(units); - mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); - - await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "UKSF" }, new List(), 2); + public async Task Should_add_correct_groups_for_non_member() { + await _teamspeakGroupService.UpdateAccountGroups(new Account { MembershipState = MembershipState.UNCONFIRMED }, new List(), 2); - addedGroups.Should().BeEquivalentTo(3, 4, 5, 10, 9); - removedGroups.Should().BeEmpty(); + _addedGroups.Should().BeEquivalentTo(1); + _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_first_root_child() { - string id = ObjectId.GenerateNewId().ToString(); - string rootId = ObjectId.GenerateNewId().ToString(); - UksfUnit rootUnit = new UksfUnit { id = rootId, name = "UKSF", teamspeakGroup = "10", parent = ObjectId.Empty.ToString() }; - UksfUnit unit = new UksfUnit { name = "JSFAW", teamspeakGroup = "6", members = new List { id }, parent = rootId }; - UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; - List units = new List { rootUnit, unit, elcomUnit, auxiliaryUnit }; - - mockUnitsDataService.Setup(x => x.Get()).Returns(units); - mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); - - await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "JSFAW" }, new List(), 2); + public async Task Should_add_correct_groups_for_non_member_with_no_account() { + await _teamspeakGroupService.UpdateAccountGroups(null, new List(), 2); - addedGroups.Should().BeEquivalentTo(3, 5, 6, 9); - removedGroups.Should().BeEmpty(); + _addedGroups.Should().BeEquivalentTo(1); + _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_first_root_child_in_elcom() { + public async Task Should_add_correct_groups_for_stratcom() { string id = ObjectId.GenerateNewId().ToString(); - string rootId = ObjectId.GenerateNewId().ToString(); - UksfUnit rootUnit = new UksfUnit { id = rootId, name = "UKSF", teamspeakGroup = "10", parent = ObjectId.Empty.ToString() }; - UksfUnit unit = new UksfUnit { name = "JSFAW", teamspeakGroup = "6", members = new List { id }, parent = rootId }; - UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; - List units = new List { rootUnit, unit, elcomUnit, auxiliaryUnit }; - elcomUnit.members.Add(id); + UksfUnit rootUnit = new() { Name = "UKSF", TeamspeakGroup = "10", Members = new List { id }, Parent = ObjectId.Empty.ToString() }; + UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new List { id } }; + List units = new() { rootUnit, _elcomUnit, auxiliaryUnit }; + _elcomUnit.Members.Add(id); - mockUnitsDataService.Setup(x => x.Get()).Returns(units); - mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); + _mockUnitsContext.Setup(x => x.Get()).Returns(units); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); - await teamspeakGroupService.UpdateAccountGroups(new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "JSFAW" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups(new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "UKSF" }, new List(), 2); - addedGroups.Should().BeEquivalentTo(3, 5, 4, 6, 9); - removedGroups.Should().BeEmpty(); + _addedGroups.Should().BeEquivalentTo(3, 4, 5, 10, 9); + _removedGroups.Should().BeEmpty(); } [Fact] @@ -223,25 +220,25 @@ public async Task Should_only_add_groups_if_not_set() { string id = ObjectId.GenerateNewId().ToString(); string parentId = ObjectId.GenerateNewId().ToString(); string parentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new UksfUnit { name = "1 Section", teamspeakGroup = "6", members = new List { id }, parent = parentId }; - UksfUnit unitParent = new UksfUnit { id = parentId, name = "SFSG", teamspeakGroup = "7", parent = parentParentId }; - UksfUnit unitParentParent = new UksfUnit { id = parentParentId, name = "UKSF", teamspeakGroup = "8" }; - UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; - List units = new List { unit, unitParent, unitParentParent, elcomUnit, auxiliaryUnit }; - - mockUnitsDataService.Setup(x => x.Get()).Returns(units); - mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); - - await teamspeakGroupService.UpdateAccountGroups( - new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "1 Section" }, + UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new List { id }, Parent = parentId }; + UksfUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; + UksfUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; + UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new List { id } }; + List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; + + _mockUnitsContext.Setup(x => x.Get()).Returns(units); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); + + await _teamspeakGroupService.UpdateAccountGroups( + new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List { 3, 5 }, 2 ); - addedGroups.Should().BeEquivalentTo(6, 7, 9); - removedGroups.Should().BeEmpty(); + _addedGroups.Should().BeEquivalentTo(6, 7, 9); + _removedGroups.Should().BeEmpty(); } [Fact] @@ -249,41 +246,41 @@ public async Task Should_remove_correct_groups() { string id = ObjectId.GenerateNewId().ToString(); string parentId = ObjectId.GenerateNewId().ToString(); string parentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new UksfUnit { name = "1 Section", teamspeakGroup = "6", members = new List { id }, parent = parentId }; - UksfUnit unitParent = new UksfUnit { id = parentId, name = "SFSG", teamspeakGroup = "7", parent = parentParentId }; - UksfUnit unitParentParent = new UksfUnit { id = parentParentId, name = "UKSF", teamspeakGroup = "8" }; - UksfUnit auxiliaryUnit = new UksfUnit { branch = UnitBranch.AUXILIARY, name = "SR1", teamspeakGroup = "9", parent = elcomUnit.id, members = new List { id } }; - List units = new List { unit, unitParent, unitParentParent, elcomUnit, auxiliaryUnit }; - - mockUnitsDataService.Setup(x => x.Get()).Returns(units); - mockUnitsDataService.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - mockUnitsDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(new Rank { name = "Private", teamspeakGroup = "5" }); - - await teamspeakGroupService.UpdateAccountGroups( - new Account { id = id, membershipState = MembershipState.MEMBER, rank = "Private", unitAssignment = "1 Section" }, + UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new List { id }, Parent = parentId }; + UksfUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; + UksfUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; + UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new List { id } }; + List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; + + _mockUnitsContext.Setup(x => x.Get()).Returns(units); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); + + await _teamspeakGroupService.UpdateAccountGroups( + new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List { 1, 10 }, 2 ); - addedGroups.Should().BeEquivalentTo(3, 5, 6, 7, 9); - removedGroups.Should().BeEquivalentTo(1, 10); + _addedGroups.Should().BeEquivalentTo(3, 5, 6, 7, 9); + _removedGroups.Should().BeEquivalentTo(1, 10); } [Fact] public async Task Should_remove_groups() { - await teamspeakGroupService.UpdateAccountGroups(null, new List { 1, 3, 4 }, 2); + await _teamspeakGroupService.UpdateAccountGroups(null, new List { 1, 3, 4 }, 2); - addedGroups.Should().BeEmpty(); - removedGroups.Should().BeEquivalentTo(3, 4); + _addedGroups.Should().BeEmpty(); + _removedGroups.Should().BeEquivalentTo(3, 4); } [Fact] public async Task Should_remove_groups_except_blacklisted() { - await teamspeakGroupService.UpdateAccountGroups(null, new List { 1, 3, 4, 99, 100 }, 2); + await _teamspeakGroupService.UpdateAccountGroups(null, new List { 1, 3, 4, 99, 100 }, 2); - addedGroups.Should().BeEmpty(); - removedGroups.Should().BeEquivalentTo(3, 4); + _addedGroups.Should().BeEmpty(); + _removedGroups.Should().BeEquivalentTo(3, 4); } } } diff --git a/UKSF.Tests/Unit/Services/Modpack/BuildsServiceTests.cs b/UKSF.Tests/Unit/Services/Modpack/BuildsServiceTests.cs index 66c26b4f..98df1cd5 100644 --- a/UKSF.Tests/Unit/Services/Modpack/BuildsServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Modpack/BuildsServiceTests.cs @@ -136,3 +136,5 @@ // } // } // } + + diff --git a/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs index 0b33be5f..b1358363 100644 --- a/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs @@ -7,86 +7,81 @@ namespace UKSF.Tests.Unit.Services.Personnel { public class DisplayNameServiceTests { - private readonly Mock mockRanksDataService; - private readonly Mock mockAccountDataService; - private readonly DisplayNameService displayNameService; + private readonly DisplayNameService _displayNameService; + private readonly Mock _mockAccountContext; + private readonly Mock _mockRanksContext; public DisplayNameServiceTests() { - mockRanksDataService = new Mock(); - mockAccountDataService = new Mock(); - Mock mockRanksService = new Mock(); - Mock mockAccountService = new Mock(); + _mockRanksContext = new Mock(); + _mockAccountContext = new Mock(); - mockRanksService.Setup(x => x.Data).Returns(mockRanksDataService.Object); - mockAccountService.Setup(x => x.Data).Returns(mockAccountDataService.Object); - - displayNameService = new DisplayNameService(mockRanksService.Object, mockAccountService.Object); + _displayNameService = new DisplayNameService(_mockAccountContext.Object, _mockRanksContext.Object); } [Fact] - public void ShouldGetDisplayNameById() { - Account account = new Account {lastname = "Beswick", firstname = "Tim"}; - - mockAccountDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(account); + public void ShouldGetDisplayNameByAccount() { + Account account = new() { Lastname = "Beswick", Firstname = "Tim" }; - string subject = displayNameService.GetDisplayName(account.id); + string subject = _displayNameService.GetDisplayName(account); subject.Should().Be("Beswick.T"); } [Fact] - public void ShouldGetNoDisplayNameWhenAccountNotFound() { - mockAccountDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); + public void ShouldGetDisplayNameById() { + Account account = new() { Lastname = "Beswick", Firstname = "Tim" }; - string subject = displayNameService.GetDisplayName("5e39336e1b92ee2d14b7fe08"); + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny())).Returns(account); - subject.Should().Be("5e39336e1b92ee2d14b7fe08"); + string subject = _displayNameService.GetDisplayName(account.Id); + + subject.Should().Be("Beswick.T"); } [Fact] - public void ShouldGetDisplayNameByAccount() { - Account account = new Account {lastname = "Beswick", firstname = "Tim"}; + public void ShouldGetDisplayNameWithoutRank() { + Account account = new() { Lastname = "Beswick", Firstname = "Tim" }; - string subject = displayNameService.GetDisplayName(account); + string subject = _displayNameService.GetDisplayNameWithoutRank(account); subject.Should().Be("Beswick.T"); } [Fact] public void ShouldGetDisplayNameWithRank() { - Account account = new Account {lastname = "Beswick", firstname = "Tim", rank = "Squadron Leader"}; - Rank rank = new Rank {abbreviation = "SqnLdr"}; + Account account = new() { Lastname = "Beswick", Firstname = "Tim", Rank = "Squadron Leader" }; + Rank rank = new() { Abbreviation = "SqnLdr" }; - mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(rank); + _mockRanksContext.Setup(x => x.GetSingle(It.IsAny())).Returns(rank); - string subject = displayNameService.GetDisplayName(account); + string subject = _displayNameService.GetDisplayName(account); subject.Should().Be("SqnLdr.Beswick.T"); } [Fact] - public void ShouldGetDisplayNameWithoutRank() { - Account account = new Account {lastname = "Beswick", firstname = "Tim"}; + public void ShouldGetGuestWhenAccountHasNoName() { + Account account = new(); - string subject = displayNameService.GetDisplayNameWithoutRank(account); + string subject = _displayNameService.GetDisplayNameWithoutRank(account); - subject.Should().Be("Beswick.T"); + subject.Should().Be("Guest"); } [Fact] - public void ShouldGetGuestWhenAccountHasNoName() { - Account account = new Account(); - - string subject = displayNameService.GetDisplayNameWithoutRank(account); + public void ShouldGetGuestWhenAccountIsNull() { + string subject = _displayNameService.GetDisplayNameWithoutRank(null); subject.Should().Be("Guest"); } [Fact] - public void ShouldGetGuestWhenAccountIsNull() { - string subject = displayNameService.GetDisplayNameWithoutRank(null); + public void ShouldGetNoDisplayNameWhenAccountNotFound() { + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny())).Returns(null); - subject.Should().Be("Guest"); + string subject = _displayNameService.GetDisplayName("5e39336e1b92ee2d14b7fe08"); + + subject.Should().Be("5e39336e1b92ee2d14b7fe08"); } } } diff --git a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs index 447c3415..89dcf6da 100644 --- a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs @@ -10,27 +10,27 @@ namespace UKSF.Tests.Unit.Services.Personnel { public class LoaServiceTests { - private readonly ILoaService loaService; - private readonly Mock mockLoaDataService; + private readonly ILoaService _loaService; + private readonly Mock _mockLoaDataService; public LoaServiceTests() { - mockLoaDataService = new Mock(); + _mockLoaDataService = new Mock(); - loaService = new LoaService(mockLoaDataService.Object); + _loaService = new LoaService(_mockLoaDataService.Object); } [Fact] public void ShouldGetCorrectLoas() { - Loa loa1 = new Loa { recipient = "5ed524b04f5b532a5437bba1", end = DateTime.Now.AddDays(-5) }; - Loa loa2 = new Loa { recipient = "5ed524b04f5b532a5437bba1", end = DateTime.Now.AddDays(-35) }; - Loa loa3 = new Loa { recipient = "5ed524b04f5b532a5437bba2", end = DateTime.Now.AddDays(-45) }; - Loa loa4 = new Loa { recipient = "5ed524b04f5b532a5437bba2", end = DateTime.Now.AddDays(-30).AddSeconds(1) }; - Loa loa5 = new Loa { recipient = "5ed524b04f5b532a5437bba3", end = DateTime.Now.AddDays(-5) }; - List mockCollection = new List { loa1, loa2, loa3, loa4, loa5 }; + Loa loa1 = new() { Recipient = "5ed524b04f5b532a5437bba1", End = DateTime.Now.AddDays(-5) }; + Loa loa2 = new() { Recipient = "5ed524b04f5b532a5437bba1", End = DateTime.Now.AddDays(-35) }; + Loa loa3 = new() { Recipient = "5ed524b04f5b532a5437bba2", End = DateTime.Now.AddDays(-45) }; + Loa loa4 = new() { Recipient = "5ed524b04f5b532a5437bba2", End = DateTime.Now.AddDays(-30).AddSeconds(1) }; + Loa loa5 = new() { Recipient = "5ed524b04f5b532a5437bba3", End = DateTime.Now.AddDays(-5) }; + List mockCollection = new() { loa1, loa2, loa3, loa4, loa5 }; - mockLoaDataService.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockCollection.Where(x).ToList()); + _mockLoaDataService.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockCollection.Where(x).ToList()); - IEnumerable subject = loaService.Get(new List { "5ed524b04f5b532a5437bba1", "5ed524b04f5b532a5437bba2" }); + IEnumerable subject = _loaService.Get(new List { "5ed524b04f5b532a5437bba1", "5ed524b04f5b532a5437bba2" }); subject.Should().Contain(new List { loa1, loa4 }); } diff --git a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs index 1040abd7..b3c9f371 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs @@ -9,128 +9,127 @@ namespace UKSF.Tests.Unit.Services.Personnel { public class RanksServiceTests { - private readonly Mock mockRanksDataService; - private readonly RanksService ranksService; + private readonly Mock _mockRanksDataService; + private readonly RanksService _ranksService; public RanksServiceTests() { - mockRanksDataService = new Mock(); - ranksService = new RanksService(mockRanksDataService.Object); + _mockRanksDataService = new Mock(); + _ranksService = new RanksService(_mockRanksDataService.Object); } - [Fact] - public void ShouldGetCorrectIndex() { - Rank rank1 = new Rank {name = "Private"}; - Rank rank2 = new Rank {name = "Recruit"}; - List mockCollection = new List {rank1, rank2}; + [Theory, InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false), InlineData("Sergeant", "Corporal", false)] + public void ShouldResolveSuperior(string rankName1, string rankName2, bool expected) { + Rank rank1 = new() { Name = "Private", Order = 0 }; + Rank rank2 = new() { Name = "Recruit", Order = 1 }; + Rank rank3 = new() { Name = "Candidate", Order = 2 }; + List mockCollection = new() { rank1, rank2, rank3 }; - mockRanksDataService.Setup(x => x.Get()).Returns(mockCollection); - mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(rank1); + _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); - int subject = ranksService.GetRankOrder("Private"); + bool subject = _ranksService.IsSuperior(rankName1, rankName2); - subject.Should().Be(0); + subject.Should().Be(expected); } - [Fact] - public void ShouldReturnInvalidIndexGetIndexWhenRankNotFound() { - mockRanksDataService.Setup(x => x.Get()).Returns(new List()); + [Theory, InlineData("Private", "Private", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] + public void ShouldResolveEqual(string rankName1, string rankName2, bool expected) { + Rank rank1 = new() { Name = "Private", Order = 0 }; + Rank rank2 = new() { Name = "Recruit", Order = 1 }; + Rank rank3 = new() { Name = "Candidate", Order = 2 }; + List mockCollection = new() { rank1, rank2, rank3 }; - int subject = ranksService.GetRankOrder("Private"); - mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(null); + _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); - subject.Should().Be(-1); + bool subject = _ranksService.IsEqual(rankName1, rankName2); + + subject.Should().Be(expected); } - [Fact] - public void ShouldGetCorrectSortValueByName() { - Rank rank1 = new Rank {name = "Private", order = 0}; - Rank rank2 = new Rank {name = "Recruit", order = 1}; - List mockCollection = new List {rank1, rank2}; + [Theory, InlineData("Private", "Private", true), InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] + public void ShouldResolveSuperiorOrEqual(string rankName1, string rankName2, bool expected) { + Rank rank1 = new() { Name = "Private", Order = 0 }; + Rank rank2 = new() { Name = "Recruit", Order = 1 }; + Rank rank3 = new() { Name = "Candidate", Order = 2 }; + List mockCollection = new() { rank1, rank2, rank3 }; - mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.name == x)); + _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); - int subject = ranksService.Sort("Recruit", "Private"); + bool subject = _ranksService.IsSuperiorOrEqual(rankName1, rankName2); - subject.Should().Be(1); + subject.Should().Be(expected); } [Fact] - public void ShouldReturnZeroForSortWhenRanksAreNull() { - mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); - - int subject = ranksService.Sort("Recruit", "Private"); - - subject.Should().Be(0); - } - - [Theory, InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false), InlineData("Sergeant", "Corporal", false)] - public void ShouldResolveSuperior(string rankName1, string rankName2, bool expected) { - Rank rank1 = new Rank {name = "Private", order = 0}; - Rank rank2 = new Rank {name = "Recruit", order = 1}; - Rank rank3 = new Rank {name = "Candidate", order = 2}; - List mockCollection = new List {rank1, rank2, rank3}; + public void ShouldGetCorrectIndex() { + Rank rank1 = new() { Name = "Private" }; + Rank rank2 = new() { Name = "Recruit" }; + List mockCollection = new() { rank1, rank2 }; - mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.name == x)); + _mockRanksDataService.Setup(x => x.Get()).Returns(mockCollection); + _mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(rank1); - bool subject = ranksService.IsSuperior(rankName1, rankName2); + int subject = _ranksService.GetRankOrder("Private"); - subject.Should().Be(expected); + subject.Should().Be(0); } - [Theory, InlineData("Private", "Private", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] - public void ShouldResolveEqual(string rankName1, string rankName2, bool expected) { - Rank rank1 = new Rank {name = "Private", order = 0}; - Rank rank2 = new Rank {name = "Recruit", order = 1}; - Rank rank3 = new Rank {name = "Candidate", order = 2}; - List mockCollection = new List {rank1, rank2, rank3}; + [Fact] + public void ShouldGetCorrectSortValueByName() { + Rank rank1 = new() { Name = "Private", Order = 0 }; + Rank rank2 = new() { Name = "Recruit", Order = 1 }; + List mockCollection = new() { rank1, rank2 }; - mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.name == x)); + _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); - bool subject = ranksService.IsEqual(rankName1, rankName2); + int subject = _ranksService.Sort("Recruit", "Private"); - subject.Should().Be(expected); + subject.Should().Be(1); } [Fact] public void ShouldReturnEqualWhenBothNull() { - mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); + _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); - bool subject = ranksService.IsEqual("Private", "Recruit"); + bool subject = _ranksService.IsEqual("Private", "Recruit"); subject.Should().Be(true); } + [Fact] + public void ShouldReturnInvalidIndexGetIndexWhenRankNotFound() { + _mockRanksDataService.Setup(x => x.Get()).Returns(new List()); - [Theory, InlineData("Private", "Private", true), InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] - public void ShouldResolveSuperiorOrEqual(string rankName1, string rankName2, bool expected) { - Rank rank1 = new Rank {name = "Private", order = 0}; - Rank rank2 = new Rank {name = "Recruit", order = 1}; - Rank rank3 = new Rank {name = "Candidate", order = 2}; - List mockCollection = new List {rank1, rank2, rank3}; + int subject = _ranksService.GetRankOrder("Private"); + _mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(null); - mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.name == x)); + subject.Should().Be(-1); + } - bool subject = ranksService.IsSuperiorOrEqual(rankName1, rankName2); + [Fact] + public void ShouldReturnZeroForSortWhenRanksAreNull() { + _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); - subject.Should().Be(expected); + int subject = _ranksService.Sort("Recruit", "Private"); + + subject.Should().Be(0); } [Fact] public void ShouldSortCollection() { - Account account1 = new Account {rank = "Private"}; - Account account2 = new Account {rank = "Candidate"}; - Account account3 = new Account {rank = "Recruit"}; - Account account4 = new Account {rank = "Private"}; - List subject = new List {account1, account2, account3, account4}; + Account account1 = new() { Rank = "Private" }; + Account account2 = new() { Rank = "Candidate" }; + Account account3 = new() { Rank = "Recruit" }; + Account account4 = new() { Rank = "Private" }; + List subject = new() { account1, account2, account3, account4 }; - Rank rank1 = new Rank {name = "Private", order = 0}; - Rank rank2 = new Rank {name = "Recruit", order = 1}; - Rank rank3 = new Rank {name = "Candidate", order = 2}; - List mockCollection = new List {rank1, rank2, rank3}; + Rank rank1 = new() { Name = "Private", Order = 0 }; + Rank rank2 = new() { Name = "Recruit", Order = 1 }; + Rank rank3 = new() { Name = "Candidate", Order = 2 }; + List mockCollection = new() { rank1, rank2, rank3 }; - mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.name == x)); + _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); - subject = subject.OrderBy(x => x.rank, new RankComparer(ranksService)).ToList(); + subject = subject.OrderBy(x => x.Rank, new RankComparer(_ranksService)).ToList(); subject.Should().ContainInOrder(account1, account4, account3, account2); } diff --git a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs index 6c59d922..ccea3dae 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs @@ -6,7 +6,7 @@ namespace UKSF.Tests.Unit.Services.Personnel { public class RoleAttributeTests { [Theory, InlineData("ADMIN,PERSONNEL", Permissions.ADMIN, Permissions.PERSONNEL), InlineData("ADMIN", Permissions.ADMIN), InlineData("ADMIN", Permissions.ADMIN, Permissions.ADMIN)] public void ShouldCombineRoles(string expected, params string[] roles) { - PermissionsAttribute permissionsAttribute = new PermissionsAttribute(roles); + PermissionsAttribute permissionsAttribute = new(roles); string subject = permissionsAttribute.Roles; diff --git a/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs index 19a1f653..2fcd0f0b 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs @@ -10,61 +10,61 @@ namespace UKSF.Tests.Unit.Services.Personnel { public class RolesServiceTests { - private readonly Mock mockRolesDataService; - private readonly RolesService rolesService; + private readonly Mock _mockRolesDataService; + private readonly RolesService _rolesService; public RolesServiceTests() { - mockRolesDataService = new Mock(); - rolesService = new RolesService(mockRolesDataService.Object); + _mockRolesDataService = new Mock(); + _rolesService = new RolesService(_mockRolesDataService.Object); } [Theory, InlineData("Trainee", "Rifleman", 1), InlineData("Rifleman", "Trainee", -1), InlineData("Rifleman", "Rifleman", 0)] public void ShouldGetCorrectSortValueByName(string nameA, string nameB, int expected) { - Role role1 = new Role {name = "Rifleman", order = 0}; - Role role2 = new Role {name = "Trainee", order = 1}; - List mockCollection = new List {role1, role2}; + Role role1 = new() { Name = "Rifleman", Order = 0 }; + Role role2 = new() { Name = "Trainee", Order = 1 }; + List mockCollection = new() { role1, role2 }; - mockRolesDataService.Setup(x => x.Get()).Returns(mockCollection); - mockRolesDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.name == x)); + _mockRolesDataService.Setup(x => x.Get()).Returns(mockCollection); + _mockRolesDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); - int subject = rolesService.Sort(nameA, nameB); + int subject = _rolesService.Sort(nameA, nameB); subject.Should().Be(expected); } - [Fact] - public void ShouldReturnZeroForSortWhenRanksAreNull() { - mockRolesDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); - - int subject = rolesService.Sort("Trainee", "Rifleman"); - - subject.Should().Be(0); - } - [Theory, InlineData(3, "Trainee"), InlineData(0, "Marksman")] public void ShouldGetUnitRoleByOrder(int order, string expected) { - Role role1 = new Role {name = "Rifleman", order = 0, roleType = RoleType.INDIVIDUAL}; - Role role2 = new Role {name = "Gunner", order = 3, roleType = RoleType.INDIVIDUAL}; - Role role3 = new Role {name = "Marksman", order = 0, roleType = RoleType.UNIT}; - Role role4 = new Role {name = "Trainee", order = 3, roleType = RoleType.UNIT}; - Role role5 = new Role {name = "Gunner", order = 2, roleType = RoleType.INDIVIDUAL}; - List mockCollection = new List {role1, role2, role3, role4, role5}; + Role role1 = new() { Name = "Rifleman", Order = 0, RoleType = RoleType.INDIVIDUAL }; + Role role2 = new() { Name = "Gunner", Order = 3, RoleType = RoleType.INDIVIDUAL }; + Role role3 = new() { Name = "Marksman", Order = 0, RoleType = RoleType.UNIT }; + Role role4 = new() { Name = "Trainee", Order = 3, RoleType = RoleType.UNIT }; + Role role5 = new() { Name = "Gunner", Order = 2, RoleType = RoleType.INDIVIDUAL }; + List mockCollection = new() { role1, role2, role3, role4, role5 }; - mockRolesDataService.Setup(x => x.Get()).Returns(mockCollection); - mockRolesDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.FirstOrDefault(x)); + _mockRolesDataService.Setup(x => x.Get()).Returns(mockCollection); + _mockRolesDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.FirstOrDefault(x)); - Role subject = rolesService.GetUnitRoleByOrder(order); + Role subject = _rolesService.GetUnitRoleByOrder(order); - subject.name.Should().Be(expected); + subject.Name.Should().Be(expected); } [Fact] public void ShouldReturnNullWhenNoUnitRoleFound() { - mockRolesDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); + _mockRolesDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); - Role subject = rolesService.GetUnitRoleByOrder(2); + Role subject = _rolesService.GetUnitRoleByOrder(2); subject.Should().BeNull(); } + + [Fact] + public void ShouldReturnZeroForSortWhenRanksAreNull() { + _mockRolesDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); + + int subject = _rolesService.Sort("Trainee", "Rifleman"); + + subject.Should().Be(0); + } } } diff --git a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs index b880d497..638420f3 100644 --- a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs @@ -15,64 +15,51 @@ namespace UKSF.Tests.Unit.Services.Utility { public class ConfirmationCodeServiceTests { - private readonly ConfirmationCodeService confirmationCodeService; - private readonly Mock mockConfirmationCodeDataService; - private readonly Mock mockSchedulerService; + private readonly ConfirmationCodeService _confirmationCodeService; + private readonly Mock _mockConfirmationCodeDataService; + private readonly Mock _mockSchedulerService; public ConfirmationCodeServiceTests() { - mockConfirmationCodeDataService = new Mock(); - mockSchedulerService = new Mock(); - confirmationCodeService = new ConfirmationCodeService(mockConfirmationCodeDataService.Object, mockSchedulerService.Object); + _mockConfirmationCodeDataService = new Mock(); + _mockSchedulerService = new Mock(); + _confirmationCodeService = new ConfirmationCodeService(_mockConfirmationCodeDataService.Object, _mockSchedulerService.Object); } [Theory, InlineData(""), InlineData("1"), InlineData(null)] public async Task ShouldReturnEmptyStringWhenBadIdOrNull(string id) { - mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); + _mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); - string subject = await confirmationCodeService.GetConfirmationCode(id); + string subject = await _confirmationCodeService.GetConfirmationCode(id); subject.Should().Be(string.Empty); } - [Fact] - public async Task ShouldSetConfirmationCodeValue() { - ConfirmationCode subject = null; - - mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); - mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); - - await confirmationCodeService.CreateConfirmationCode("test"); - - subject.Should().NotBeNull(); - subject.value.Should().Be("test"); - } - [Theory, InlineData(null), InlineData("")] public async Task ShouldThrowForCreateWhenValueNullOrEmpty(string value) { - mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); - mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + _mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); + _mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); - Func act = async () => await confirmationCodeService.CreateConfirmationCode(value); + Func act = async () => await _confirmationCodeService.CreateConfirmationCode(value); await act.Should().ThrowAsync(); } [Fact] public async Task ShouldCancelScheduledJob() { - ConfirmationCode confirmationCode = new ConfirmationCode {value = "test"}; - List confirmationCodeData = new List {confirmationCode}; - string actionParameters = JsonConvert.SerializeObject(new object[] {confirmationCode.id}); + ConfirmationCode confirmationCode = new() { Value = "test" }; + List confirmationCodeData = new() { confirmationCode }; + string actionParameters = JsonConvert.SerializeObject(new object[] { confirmationCode.Id }); - ScheduledJob scheduledJob = new ScheduledJob {actionParameters = actionParameters}; - List subject = new List {scheduledJob}; + ScheduledJob scheduledJob = new() { ActionParameters = actionParameters }; + List subject = new() { scheduledJob }; - mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => confirmationCodeData.FirstOrDefault(y => y.id == x)); - mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask); - mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())) - .Returns(Task.CompletedTask) - .Callback>(x => subject.Remove(subject.FirstOrDefault(x))); + _mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => confirmationCodeData.FirstOrDefault(y => y.Id == x)); + _mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask); + _mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())) + .Returns(Task.CompletedTask) + .Callback>(x => subject.Remove(subject.FirstOrDefault(x))); - await confirmationCodeService.GetConfirmationCode(confirmationCode.id); + await _confirmationCodeService.GetConfirmationCode(confirmationCode.Id); subject.Should().BeEmpty(); } @@ -81,53 +68,66 @@ public async Task ShouldCancelScheduledJob() { public async Task ShouldCreateConfirmationCode() { ConfirmationCode subject = null; - mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); - mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + _mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); + _mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); - await confirmationCodeService.CreateConfirmationCode("test"); + await _confirmationCodeService.CreateConfirmationCode("test"); subject.Should().NotBeNull(); - subject.value.Should().Be("test"); + subject.Value.Should().Be("test"); } [Fact] public async Task ShouldGetCorrectConfirmationCode() { - ConfirmationCode confirmationCode1 = new ConfirmationCode {value = "test1"}; - ConfirmationCode confirmationCode2 = new ConfirmationCode {value = "test2"}; - List confirmationCodeData = new List {confirmationCode1, confirmationCode2}; + ConfirmationCode confirmationCode1 = new() { Value = "test1" }; + ConfirmationCode confirmationCode2 = new() { Value = "test2" }; + List confirmationCodeData = new() { confirmationCode1, confirmationCode2 }; - mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => confirmationCodeData.FirstOrDefault(y => y.id == x)); - mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.RemoveAll(y => y.id == x)); - mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns>(x => Task.FromResult(new List().FirstOrDefault(x))); + _mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => confirmationCodeData.FirstOrDefault(y => y.Id == x)); + _mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.RemoveAll(y => y.Id == x)); + _mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns>(x => Task.FromResult(new List().FirstOrDefault(x))); - string subject = await confirmationCodeService.GetConfirmationCode(confirmationCode2.id); + string subject = await _confirmationCodeService.GetConfirmationCode(confirmationCode2.Id); subject.Should().Be("test2"); } [Fact] public async Task ShouldReturnCodeValue() { - ConfirmationCode confirmationCode = new ConfirmationCode {value = "test"}; - List confirmationCodeData = new List {confirmationCode}; + ConfirmationCode confirmationCode = new() { Value = "test" }; + List confirmationCodeData = new() { confirmationCode }; - mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => confirmationCodeData.FirstOrDefault(y => y.id == x)); - mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.RemoveAll(y => y.id == x)); - mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns>(x => Task.FromResult(new List().FirstOrDefault(x))); + _mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => confirmationCodeData.FirstOrDefault(y => y.Id == x)); + _mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.RemoveAll(y => y.Id == x)); + _mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns>(x => Task.FromResult(new List().FirstOrDefault(x))); - string subject = await confirmationCodeService.GetConfirmationCode(confirmationCode.id); + string subject = await _confirmationCodeService.GetConfirmationCode(confirmationCode.Id); subject.Should().Be("test"); } [Fact] public async Task ShouldReturnValidCodeId() { - mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); - mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + _mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); + _mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); - string subject = await confirmationCodeService.CreateConfirmationCode("test"); + string subject = await _confirmationCodeService.CreateConfirmationCode("test"); subject.Should().HaveLength(24); ObjectId.TryParse(subject, out ObjectId _).Should().BeTrue(); } + + [Fact] + public async Task ShouldSetConfirmationCodeValue() { + ConfirmationCode subject = null; + + _mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); + _mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + + await _confirmationCodeService.CreateConfirmationCode("test"); + + subject.Should().NotBeNull(); + subject.Value.Should().Be("test"); + } } } diff --git a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs index 7a9a2bd0..6476905a 100644 --- a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs @@ -9,15 +9,15 @@ namespace UKSF.Tests.Unit.Services.Utility { public class DataCacheServiceTests { [Fact] public void When_refreshing_data_caches() { - Mock mockAccountDataService = new Mock(); - Mock mockRanksDataService = new Mock(); - Mock mockRolesDataService = new Mock(); + Mock mockAccountDataService = new(); + Mock mockRanksDataService = new(); + Mock mockRolesDataService = new(); IServiceProvider serviceProvider = new ServiceCollection().AddSingleton(_ => mockAccountDataService.Object) .AddSingleton(_ => mockRanksDataService.Object) .AddSingleton(_ => mockRolesDataService.Object) .BuildServiceProvider(); - DataCacheService dataCacheService = new DataCacheService(serviceProvider); + DataCacheService dataCacheService = new(serviceProvider); dataCacheService.RefreshCachedData(); diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs index 5f233563..cecde4a6 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs @@ -10,32 +10,32 @@ namespace UKSF.Tests.Unit.Services.Utility { public class ScheduledActionServiceTests { [Fact] - public void ShouldRegisterActions() { - Mock mockDeleteExpiredConfirmationCodeAction = new Mock(); - mockDeleteExpiredConfirmationCodeAction.Setup(x => x.Name).Returns("TestAction"); + public void ShouldOverwriteRegisteredActions() { + Mock mockDeleteExpiredConfirmationCodeAction1 = new(); + Mock mockDeleteExpiredConfirmationCodeAction2 = new(); + mockDeleteExpiredConfirmationCodeAction1.Setup(x => x.Name).Returns("TestAction"); + mockDeleteExpiredConfirmationCodeAction2.Setup(x => x.Name).Returns("TestAction"); IScheduledActionFactory scheduledActionFactory = new ScheduledActionFactory(); - scheduledActionFactory.RegisterScheduledActions(new HashSet {mockDeleteExpiredConfirmationCodeAction.Object}); + scheduledActionFactory.RegisterScheduledActions(new HashSet { mockDeleteExpiredConfirmationCodeAction1.Object }); + scheduledActionFactory.RegisterScheduledActions(new HashSet { mockDeleteExpiredConfirmationCodeAction2.Object }); IScheduledAction subject = scheduledActionFactory.GetScheduledAction("TestAction"); - subject.Should().Be(mockDeleteExpiredConfirmationCodeAction.Object); + subject.Should().Be(mockDeleteExpiredConfirmationCodeAction2.Object); } [Fact] - public void ShouldOverwriteRegisteredActions() { - Mock mockDeleteExpiredConfirmationCodeAction1 = new Mock(); - Mock mockDeleteExpiredConfirmationCodeAction2 = new Mock(); - mockDeleteExpiredConfirmationCodeAction1.Setup(x => x.Name).Returns("TestAction"); - mockDeleteExpiredConfirmationCodeAction2.Setup(x => x.Name).Returns("TestAction"); + public void ShouldRegisterActions() { + Mock mockDeleteExpiredConfirmationCodeAction = new(); + mockDeleteExpiredConfirmationCodeAction.Setup(x => x.Name).Returns("TestAction"); IScheduledActionFactory scheduledActionFactory = new ScheduledActionFactory(); - scheduledActionFactory.RegisterScheduledActions(new HashSet {mockDeleteExpiredConfirmationCodeAction1.Object}); - scheduledActionFactory.RegisterScheduledActions(new HashSet {mockDeleteExpiredConfirmationCodeAction2.Object}); + scheduledActionFactory.RegisterScheduledActions(new HashSet { mockDeleteExpiredConfirmationCodeAction.Object }); IScheduledAction subject = scheduledActionFactory.GetScheduledAction("TestAction"); - subject.Should().Be(mockDeleteExpiredConfirmationCodeAction2.Object); + subject.Should().Be(mockDeleteExpiredConfirmationCodeAction.Object); } [Fact] diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs index c5e25eaf..3697d859 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs @@ -4,36 +4,27 @@ using Moq; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.ScheduledActions; -using UKSF.Api.Personnel.Services; using Xunit; namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { public class DeleteExpiredConfirmationCodeActionTests { - private readonly Mock _mockConfirmationCodeDataService; - private readonly Mock _mockConfirmationCodeService; + private readonly Mock _mockConfirmationCodeContext = new(); private IActionDeleteExpiredConfirmationCode _actionDeleteExpiredConfirmationCode; - public DeleteExpiredConfirmationCodeActionTests() { - _mockConfirmationCodeDataService = new Mock(); - _mockConfirmationCodeService = new Mock(); - - _mockConfirmationCodeService.Setup(x => x.Data).Returns(_mockConfirmationCodeDataService.Object); - } - [Fact] public void When_deleting_confirmation_code() { string id = ObjectId.GenerateNewId().ToString(); - _actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(_mockConfirmationCodeService.Object); + _actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(_mockConfirmationCodeContext.Object); _actionDeleteExpiredConfirmationCode.Run(id); - _mockConfirmationCodeDataService.Verify(x => x.Delete(id), Times.Once); + _mockConfirmationCodeContext.Verify(x => x.Delete(id), Times.Once); } [Fact] public void When_deleting_confirmation_code_with_no_id() { - _actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(_mockConfirmationCodeService.Object); + _actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(_mockConfirmationCodeContext.Object); Action act = () => _actionDeleteExpiredConfirmationCode.Run(); @@ -42,7 +33,7 @@ public void When_deleting_confirmation_code_with_no_id() { [Fact] public void When_getting_action_name() { - _actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(_mockConfirmationCodeService.Object); + _actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(_mockConfirmationCodeContext.Object); string subject = _actionDeleteExpiredConfirmationCode.Name; diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs index 1a6ab94b..db29e807 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs @@ -14,27 +14,26 @@ namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { public class PruneDataActionTests { private readonly IActionPruneLogs _actionPruneLogs; - private readonly Mock _mockAuditLogDataService; - private readonly Mock _mockHttpErrorLogDataService; - private readonly Mock _mockLogDataService; + private readonly Mock _mockAuditLogContext = new(); + private readonly Mock _mockHttpErrorLogContext = new(); + private readonly Mock _mockLogContext = new(); + private readonly Mock _mockSchedulerContext = new(); private readonly DateTime _now; public PruneDataActionTests() { - _mockLogDataService = new Mock(); - _mockAuditLogDataService = new Mock(); - _mockHttpErrorLogDataService = new Mock(); - Mock mockClock = new Mock(); - Mock mockHostEnvironment = new Mock(); - Mock mockSchedulerService = new Mock(); + Mock mockClock = new(); + Mock mockHostEnvironment = new(); + Mock mockSchedulerService = new(); _now = new DateTime(2020, 11, 14); mockClock.Setup(x => x.UtcNow()).Returns(_now); _actionPruneLogs = new ActionPruneLogs( - _mockLogDataService.Object, - _mockAuditLogDataService.Object, - _mockHttpErrorLogDataService.Object, + _mockLogContext.Object, + _mockAuditLogContext.Object, + _mockHttpErrorLogContext.Object, mockSchedulerService.Object, + _mockSchedulerContext.Object, mockHostEnvironment.Object, mockClock.Object ); @@ -49,27 +48,27 @@ public void When_getting_action_name() { [Fact] public void When_pruning_logs() { - List basicLogs = new List { new BasicLog("test1") { timestamp = _now.AddDays(-8) }, new BasicLog("test2") { timestamp = _now.AddDays(-6) } }; - List auditLogs = new List { new AuditLog("server", "audit1") { timestamp = _now.AddMonths(-4) }, new AuditLog("server", "audit2") { timestamp = _now.AddMonths(-2) } }; - List httpErrorLogs = new List { - new HttpErrorLog(new Exception("error1")) { timestamp = _now.AddDays(-8) }, new HttpErrorLog(new Exception("error2")) { timestamp = _now.AddDays(-6) } + List basicLogs = new() { new BasicLog("test1") { Timestamp = _now.AddDays(-8) }, new BasicLog("test2") { Timestamp = _now.AddDays(-6) } }; + List auditLogs = new() { new AuditLog("server", "audit1") { Timestamp = _now.AddMonths(-4) }, new AuditLog("server", "audit2") { Timestamp = _now.AddMonths(-2) } }; + List httpErrorLogs = new() { + new HttpErrorLog(new Exception("error1")) { Timestamp = _now.AddDays(-8) }, new HttpErrorLog(new Exception("error2")) { Timestamp = _now.AddDays(-6) } }; - _mockLogDataService.Setup(x => x.DeleteMany(It.IsAny>>())) - .Returns(Task.CompletedTask) - .Callback>>(x => basicLogs.RemoveAll(y => x.Compile()(y))); - _mockAuditLogDataService.Setup(x => x.DeleteMany(It.IsAny>>())) + _mockLogContext.Setup(x => x.DeleteMany(It.IsAny>>())) + .Returns(Task.CompletedTask) + .Callback>>(x => basicLogs.RemoveAll(y => x.Compile()(y))); + _mockAuditLogContext.Setup(x => x.DeleteMany(It.IsAny>>())) + .Returns(Task.CompletedTask) + .Callback>>(x => auditLogs.RemoveAll(y => x.Compile()(y))); + _mockHttpErrorLogContext.Setup(x => x.DeleteMany(It.IsAny>>())) .Returns(Task.CompletedTask) - .Callback>>(x => auditLogs.RemoveAll(y => x.Compile()(y))); - _mockHttpErrorLogDataService.Setup(x => x.DeleteMany(It.IsAny>>())) - .Returns(Task.CompletedTask) - .Callback>>(x => httpErrorLogs.RemoveAll(y => x.Compile()(y))); + .Callback>>(x => httpErrorLogs.RemoveAll(y => x.Compile()(y))); _actionPruneLogs.Run(); - basicLogs.Should().NotContain(x => x.message == "test1"); - auditLogs.Should().NotContain(x => x.message == "audit1"); - httpErrorLogs.Should().NotContain(x => x.message == "error1"); + basicLogs.Should().NotContain(x => x.Message == "test1"); + auditLogs.Should().NotContain(x => x.Message == "audit1"); + httpErrorLogs.Should().NotContain(x => x.Message == "error1"); } } } diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs index 91aebff0..24a1e5a4 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs @@ -1,6 +1,7 @@ using FluentAssertions; using Microsoft.Extensions.Hosting; using Moq; +using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Services; using UKSF.Api.Teamspeak.ScheduledActions; using UKSF.Api.Teamspeak.Services; @@ -13,11 +14,18 @@ public class TeamspeakSnapshotActionTests { public TeamspeakSnapshotActionTests() { _mockTeamspeakService = new Mock(); - Mock mockClock = new Mock(); - Mock mockSchedulerService = new Mock(); - Mock mockHostEnvironment = new Mock(); + Mock mockClock = new(); + Mock mockSchedulerService = new(); + Mock mockHostEnvironment = new(); + Mock mockSchedulerContext = new(); - _actionTeamspeakSnapshot = new ActionTeamspeakSnapshot(_mockTeamspeakService.Object, mockSchedulerService.Object, mockHostEnvironment.Object, mockClock.Object); + _actionTeamspeakSnapshot = new ActionTeamspeakSnapshot( + mockSchedulerContext.Object, + _mockTeamspeakService.Object, + mockSchedulerService.Object, + mockHostEnvironment.Object, + mockClock.Object + ); } [Fact] diff --git a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs index 2814a661..189194d9 100644 --- a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs @@ -10,59 +10,59 @@ namespace UKSF.Tests.Unit.Services.Utility { public class SessionServiceTests { - private readonly HttpContextService httpContextService; - private DefaultHttpContext httpContext; + private readonly HttpContextService _httpContextService; + private DefaultHttpContext _httpContext; public SessionServiceTests() { - Mock mockHttpContextAccessor = new Mock(); + Mock mockHttpContextAccessor = new(); - mockHttpContextAccessor.Setup(x => x.HttpContext).Returns(() => httpContext); + mockHttpContextAccessor.Setup(x => x.HttpContext).Returns(() => _httpContext); - httpContextService = new HttpContextService(mockHttpContextAccessor.Object); + _httpContextService = new HttpContextService(mockHttpContextAccessor.Object); } [Fact] public void ShouldGetContextEmail() { - Account account = new Account { email = "contact.tim.here@gmail.com" }; - List claims = new List { new Claim(ClaimTypes.Email, account.email) }; - ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); - httpContext = new DefaultHttpContext { User = contextUser }; + Account account = new() { Email = "contact.tim.here@gmail.com" }; + List claims = new() { new Claim(ClaimTypes.Email, account.Email) }; + ClaimsPrincipal contextUser = new(new ClaimsIdentity(claims)); + _httpContext = new DefaultHttpContext { User = contextUser }; - string subject = httpContextService.GetUserEmail(); + string subject = _httpContextService.GetUserEmail(); - subject.Should().Be(account.email); + subject.Should().Be(account.Email); } [Fact] public void ShouldGetContextId() { - Account account = new Account(); - List claims = new List { new Claim(ClaimTypes.Sid, account.id, ClaimValueTypes.String) }; - ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); - httpContext = new DefaultHttpContext { User = contextUser }; + Account account = new(); + List claims = new() { new Claim(ClaimTypes.Sid, account.Id, ClaimValueTypes.String) }; + ClaimsPrincipal contextUser = new(new ClaimsIdentity(claims)); + _httpContext = new DefaultHttpContext { User = contextUser }; - string subject = httpContextService.GetUserId(); + string subject = _httpContextService.GetUserId(); - subject.Should().Be(account.id); + subject.Should().Be(account.Id); } [Fact] public void ShouldReturnFalseForInvalidRole() { - List claims = new List { new Claim(ClaimTypes.Role, Permissions.ADMIN) }; - ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); - httpContext = new DefaultHttpContext { User = contextUser }; + List claims = new() { new Claim(ClaimTypes.Role, Permissions.ADMIN) }; + ClaimsPrincipal contextUser = new(new ClaimsIdentity(claims)); + _httpContext = new DefaultHttpContext { User = contextUser }; - bool subject = httpContextService.UserHasPermission(Permissions.COMMAND); + bool subject = _httpContextService.UserHasPermission(Permissions.COMMAND); subject.Should().BeFalse(); } [Fact] public void ShouldReturnTrueForValidRole() { - List claims = new List { new Claim(ClaimTypes.Role, Permissions.ADMIN) }; - ClaimsPrincipal contextUser = new ClaimsPrincipal(new ClaimsIdentity(claims)); - httpContext = new DefaultHttpContext { User = contextUser }; + List claims = new() { new Claim(ClaimTypes.Role, Permissions.ADMIN) }; + ClaimsPrincipal contextUser = new(new ClaimsIdentity(claims)); + _httpContext = new DefaultHttpContext { User = contextUser }; - bool subject = httpContextService.UserHasPermission(Permissions.ADMIN); + bool subject = _httpContextService.UserHasPermission(Permissions.ADMIN); subject.Should().BeTrue(); } From f6052809d3c8d7f23a2f54da380ec0b88802c841 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 22 Nov 2020 19:09:39 +0000 Subject: [PATCH 287/369] Add dependency injection tests --- .../DependencyInjectionTests.cs | 43 +++++++++++ .../UKSF.Api.Admin.Tests.csproj | 6 ++ .../DependencyInjectionTests.cs | 27 +++++++ .../UKSF.Api.ArmaServer.Tests.csproj | 6 ++ .../DependencyInjectionTests.cs | 27 +++++++ .../UKSF.Api.Auth.Tests.csproj | 6 ++ .../DependencyInjectionTests.cs | 23 ------ .../DependencyInjectionTests.cs | 42 +++++++++++ .../UKSF.Api.Command.Tests.csproj | 6 ++ .../DependencyInjectionTests.cs | 35 +++++++++ ...UKSF.Api.Integrations.Discord.Tests.csproj | 6 ++ .../DependencyInjectionTests.cs | 34 +++++++++ ...SF.Api.Integrations.Instagram.Tests.csproj | 6 ++ .../DependencyInjectionTests.cs | 50 +++++++++++++ ...F.Api.Integrations.Teamspeak.Tests.csproj} | 6 ++ .../DependencyInjectionTests.cs | 25 +++++++ .../UKSF.Api.Launcher.Tests.csproj | 6 ++ .../DependencyInjectionTests.cs | 53 +++++++++++++ .../UKSF.Api.Modpack.Tests.csproj | 12 +++ .../DependencyInjectionTests.cs | 75 +++++++++++++++++++ .../UKSF.Api.Personnel.Tests.csproj | 7 ++ .../DependencyInjectionTests.cs | 75 ------------------- .../DependencyInjectionTestsBase.cs | 22 +++++- .../UKSF.Api.Tests.Common.csproj | 2 + Tests/UKSF.Api.Tests.Common/appsettings.json | 2 +- .../DependencyInjectionTests.cs | 43 +++++++++++ Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj | 6 ++ UKSF.Api.Admin/Controllers/DataController.cs | 4 +- UKSF.Api.Admin/Controllers/DebugController.cs | 24 ------ .../ApiArmaMissionsExtensions.cs | 3 +- .../ApiArmaServerExtensions.cs | 2 +- .../Services/GameServerHelpers.cs | 1 - UKSF.Api.Base/ApiBaseExtensions.cs | 12 ++- UKSF.Api.Base/UKSF.Api.Base.csproj | 1 + .../Controllers/CommandRequestsController.cs | 3 - .../Services/ChainOfCommandService.cs | 9 +-- .../Services/OperationReportService.cs | 9 +-- .../Services/DiscordService.cs | 4 +- .../ApiIntegrationTeamspeakExtensions.cs | 2 +- .../EventHandlers/TeamspeakEventHandler.cs | 4 +- .../Signalr/Hubs/TeamspeakHub.cs | 5 +- UKSF.Api.Launcher/ApiLauncherExtensions.cs | 4 +- UKSF.Api.Modpack/ApiModpackExtensions.cs | 1 + UKSF.Api.Personnel/ApiPersonnelExtensions.cs | 33 +++++--- .../Mappers/AutoMapperUnitProfile.cs | 10 +++ UKSF.Api.Personnel/Services/RolesService.cs | 3 + UKSF.Api.Personnel/UKSF.Api.Personnel.csproj | 1 + UKSF.Api.Shared/ApiSharedExtensions.cs | 7 +- UKSF.Api.Shared/Events/SignalrEventBus.cs | 10 --- UKSF.Api.sln | 2 +- .../AutoMapperConfigurationProfile.cs | 10 --- UKSF.Api/AppStart/UksfServiceExtensions.cs | 20 ++--- UKSF.Api/Startup.cs | 3 - UKSF.Api/UKSF.Api.csproj | 4 - .../Handlers/TeamspeakEventHandlerTests.cs | 5 +- 55 files changed, 633 insertions(+), 214 deletions(-) create mode 100644 Tests/UKSF.Api.Admin.Tests/DependencyInjectionTests.cs create mode 100644 Tests/UKSF.Api.ArmaServer.Tests/DependencyInjectionTests.cs create mode 100644 Tests/UKSF.Api.Auth.Tests/DependencyInjectionTests.cs delete mode 100644 Tests/UKSF.Api.Base.Tests/DependencyInjectionTests.cs create mode 100644 Tests/UKSF.Api.Command.Tests/DependencyInjectionTests.cs create mode 100644 Tests/UKSF.Api.Integrations.Discord.Tests/DependencyInjectionTests.cs create mode 100644 Tests/UKSF.Api.Integrations.Instagram.Tests/DependencyInjectionTests.cs create mode 100644 Tests/UKSF.Api.Integrations.Teamspeak.Tests/DependencyInjectionTests.cs rename Tests/{UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj => UKSF.Api.Integrations.Teamspeak.Tests/UKSF.Api.Integrations.Teamspeak.Tests.csproj} (73%) create mode 100644 Tests/UKSF.Api.Launcher.Tests/DependencyInjectionTests.cs create mode 100644 Tests/UKSF.Api.Modpack.Tests/DependencyInjectionTests.cs create mode 100644 Tests/UKSF.Api.Personnel.Tests/DependencyInjectionTests.cs delete mode 100644 Tests/UKSF.Api.Shared.Tests/DependencyInjectionTests.cs create mode 100644 Tests/UKSF.Api.Tests/DependencyInjectionTests.cs delete mode 100644 UKSF.Api.Admin/Controllers/DebugController.cs create mode 100644 UKSF.Api.Personnel/Mappers/AutoMapperUnitProfile.cs delete mode 100644 UKSF.Api.Shared/Events/SignalrEventBus.cs delete mode 100644 UKSF.Api/AppStart/AutoMapperConfigurationProfile.cs diff --git a/Tests/UKSF.Api.Admin.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Admin.Tests/DependencyInjectionTests.cs new file mode 100644 index 00000000..592f7bee --- /dev/null +++ b/Tests/UKSF.Api.Admin.Tests/DependencyInjectionTests.cs @@ -0,0 +1,43 @@ +using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Admin.Controllers; +using UKSF.Api.Admin.EventHandlers; +using UKSF.Api.Admin.ScheduledActions; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.Admin.Tests { + public class DependencyInjectionTests : DependencyInjectionTestsBase { + public DependencyInjectionTests() { + Services.AddUksfAdmin(); + } + + [Fact] + public void When_resolving_controllers() { + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + + [Fact] + public void When_resolving_event_handlers() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + + [Fact] + public void When_resolving_scheduled_actions() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + } +} diff --git a/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj b/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj index 9fc420ef..75d3bc27 100644 --- a/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj +++ b/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj @@ -7,6 +7,7 @@ + @@ -19,4 +20,9 @@ + + + + + diff --git a/Tests/UKSF.Api.ArmaServer.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.ArmaServer.Tests/DependencyInjectionTests.cs new file mode 100644 index 00000000..d8afa8a5 --- /dev/null +++ b/Tests/UKSF.Api.ArmaServer.Tests/DependencyInjectionTests.cs @@ -0,0 +1,27 @@ +using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Admin; +using UKSF.Api.ArmaMissions; +using UKSF.Api.ArmaServer.Controllers; +using UKSF.Api.Personnel; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.ArmaServer.Tests { + public class DependencyInjectionTests : DependencyInjectionTestsBase { + public DependencyInjectionTests() { + Services.AddUksfAdmin(); + Services.AddUksfPersonnel(); + Services.AddUksfArmaMissions(); + Services.AddUksfArmaServer(); + } + + [Fact] + public void When_resolving_controllers() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + } +} diff --git a/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj b/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj index 9fc420ef..548cbc31 100644 --- a/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj +++ b/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj @@ -7,6 +7,7 @@ + @@ -19,4 +20,9 @@ + + + + + diff --git a/Tests/UKSF.Api.Auth.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Auth.Tests/DependencyInjectionTests.cs new file mode 100644 index 00000000..01558686 --- /dev/null +++ b/Tests/UKSF.Api.Auth.Tests/DependencyInjectionTests.cs @@ -0,0 +1,27 @@ +using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Admin; +using UKSF.Api.Auth.Controllers; +using UKSF.Api.Personnel; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.Auth.Tests { + public class DependencyInjectionTests : DependencyInjectionTestsBase { + public DependencyInjectionTests() { + Services.AddUksfAdmin(); + Services.AddUksfPersonnel(); + Services.AddUksfAuth(Configuration); + } + + [Fact] + public void When_resolving_controllers() { + Services.AddTransient(); + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + } +} diff --git a/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj b/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj index 9fc420ef..c74765c8 100644 --- a/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj +++ b/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj @@ -7,6 +7,7 @@ + @@ -19,4 +20,9 @@ + + + + + diff --git a/Tests/UKSF.Api.Base.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Base.Tests/DependencyInjectionTests.cs deleted file mode 100644 index 0c3f9ef1..00000000 --- a/Tests/UKSF.Api.Base.Tests/DependencyInjectionTests.cs +++ /dev/null @@ -1,23 +0,0 @@ -using FluentAssertions; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Base.Context; -using UKSF.Api.Tests.Common; -using Xunit; - -namespace UKSF.Api.Base.Tests { - public class DependencyInjectionTests : DependencyInjectionTestsBase { - public DependencyInjectionTests() { - Services.AddUksfBase(TestConfiguration); - } - - [Fact] - public void When_resolving_MongoCollectionFactory() { - Services.AddTransient(); - ServiceProvider serviceProvider = Services.BuildServiceProvider(); - - IMongoCollectionFactory subject = serviceProvider.GetRequiredService(); - - subject.Should().NotBeNull(); - } - } -} diff --git a/Tests/UKSF.Api.Command.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Command.Tests/DependencyInjectionTests.cs new file mode 100644 index 00000000..6a9a28f7 --- /dev/null +++ b/Tests/UKSF.Api.Command.Tests/DependencyInjectionTests.cs @@ -0,0 +1,42 @@ +using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Admin; +using UKSF.Api.Command.Controllers; +using UKSF.Api.Command.EventHandlers; +using UKSF.Api.Personnel; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.Command.Tests { + public class DependencyInjectionTests : DependencyInjectionTestsBase { + public DependencyInjectionTests() { + Services.AddUksfAdmin(); + Services.AddUksfPersonnel(); + Services.AddUksfCommand(); + } + + [Fact] + public void When_resolving_controllers() { + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + + [Fact] + public void When_resolving_event_handlers() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + } +} diff --git a/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj b/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj index 9fc420ef..2358ac9e 100644 --- a/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj +++ b/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj @@ -7,6 +7,7 @@ + @@ -19,4 +20,9 @@ + + + + + diff --git a/Tests/UKSF.Api.Integrations.Discord.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Integrations.Discord.Tests/DependencyInjectionTests.cs new file mode 100644 index 00000000..429f8d66 --- /dev/null +++ b/Tests/UKSF.Api.Integrations.Discord.Tests/DependencyInjectionTests.cs @@ -0,0 +1,35 @@ +using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Admin; +using UKSF.Api.Discord; +using UKSF.Api.Discord.Controllers; +using UKSF.Api.Discord.EventHandlers; +using UKSF.Api.Personnel; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.Integrations.Discord.Tests { + public class DependencyInjectionTests : DependencyInjectionTestsBase { + public DependencyInjectionTests() { + Services.AddUksfAdmin(); + Services.AddUksfPersonnel(); + Services.AddUksfIntegrationDiscord(); + } + + [Fact] + public void When_resolving_controllers() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + + [Fact] + public void When_resolving_event_handlers() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + } +} diff --git a/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj b/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj index 9fc420ef..038280f4 100644 --- a/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj +++ b/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj @@ -7,6 +7,7 @@ + @@ -19,4 +20,9 @@ + + + + + diff --git a/Tests/UKSF.Api.Integrations.Instagram.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Integrations.Instagram.Tests/DependencyInjectionTests.cs new file mode 100644 index 00000000..1ac2b8e1 --- /dev/null +++ b/Tests/UKSF.Api.Integrations.Instagram.Tests/DependencyInjectionTests.cs @@ -0,0 +1,34 @@ +using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Admin; +using UKSF.Api.Integrations.Instagram.Controllers; +using UKSF.Api.Integrations.Instagram.ScheduledActions; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.Integrations.Instagram.Tests { + public class DependencyInjectionTests : DependencyInjectionTestsBase { + public DependencyInjectionTests() { + Services.AddUksfAdmin(); + Services.AddUksfIntegrationInstagram(); + } + + [Fact] + public void When_resolving_controllers() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + + [Fact] + public void When_resolving_scheduled_actions() { + Services.AddTransient(); + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + } +} diff --git a/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj b/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj index 9fc420ef..e8695bc1 100644 --- a/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj +++ b/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj @@ -7,6 +7,7 @@ + @@ -19,4 +20,9 @@ + + + + + diff --git a/Tests/UKSF.Api.Integrations.Teamspeak.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Integrations.Teamspeak.Tests/DependencyInjectionTests.cs new file mode 100644 index 00000000..7cb49d9f --- /dev/null +++ b/Tests/UKSF.Api.Integrations.Teamspeak.Tests/DependencyInjectionTests.cs @@ -0,0 +1,50 @@ +using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Admin; +using UKSF.Api.Personnel; +using UKSF.Api.Teamspeak; +using UKSF.Api.Teamspeak.Controllers; +using UKSF.Api.Teamspeak.EventHandlers; +using UKSF.Api.Teamspeak.ScheduledActions; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.Integrations.Teamspeak.Tests { + public class DependencyInjectionTests : DependencyInjectionTestsBase { + public DependencyInjectionTests() { + Services.AddUksfAdmin(); + Services.AddUksfPersonnel(); + Services.AddUksfIntegrationTeamspeak(); + } + + [Fact] + public void When_resolving_controllers() { + Services.AddTransient(); + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + + [Fact] + public void When_resolving_event_handlers() { + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + + [Fact] + public void When_resolving_scheduled_actions() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + } +} diff --git a/Tests/UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj b/Tests/UKSF.Api.Integrations.Teamspeak.Tests/UKSF.Api.Integrations.Teamspeak.Tests.csproj similarity index 73% rename from Tests/UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj rename to Tests/UKSF.Api.Integrations.Teamspeak.Tests/UKSF.Api.Integrations.Teamspeak.Tests.csproj index 9fc420ef..ee964b5c 100644 --- a/Tests/UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj +++ b/Tests/UKSF.Api.Integrations.Teamspeak.Tests/UKSF.Api.Integrations.Teamspeak.Tests.csproj @@ -7,6 +7,7 @@ + @@ -19,4 +20,9 @@ + + + + + diff --git a/Tests/UKSF.Api.Launcher.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Launcher.Tests/DependencyInjectionTests.cs new file mode 100644 index 00000000..e492f84e --- /dev/null +++ b/Tests/UKSF.Api.Launcher.Tests/DependencyInjectionTests.cs @@ -0,0 +1,25 @@ +using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Admin; +using UKSF.Api.Launcher.Controllers; +using UKSF.Api.Personnel; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.Launcher.Tests { + public class DependencyInjectionTests : DependencyInjectionTestsBase { + public DependencyInjectionTests() { + Services.AddUksfAdmin(); + Services.AddUksfPersonnel(); + Services.AddUksfLauncher(); + } + + [Fact] + public void When_resolving_controllers() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + } +} diff --git a/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj b/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj index 9fc420ef..493f929b 100644 --- a/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj +++ b/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj @@ -7,6 +7,7 @@ + @@ -19,4 +20,9 @@ + + + + + diff --git a/Tests/UKSF.Api.Modpack.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Modpack.Tests/DependencyInjectionTests.cs new file mode 100644 index 00000000..ed207fe2 --- /dev/null +++ b/Tests/UKSF.Api.Modpack.Tests/DependencyInjectionTests.cs @@ -0,0 +1,53 @@ +using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Admin; +using UKSF.Api.ArmaMissions; +using UKSF.Api.ArmaServer; +using UKSF.Api.Discord; +using UKSF.Api.Modpack.Controllers; +using UKSF.Api.Modpack.EventHandlers; +using UKSF.Api.Modpack.ScheduledActions; +using UKSF.Api.Personnel; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.Modpack.Tests { + public class DependencyInjectionTests : DependencyInjectionTestsBase { + public DependencyInjectionTests() { + Services.AddUksfAdmin(); + Services.AddUksfPersonnel(); + Services.AddUksfArmaMissions(); + Services.AddUksfArmaServer(); + Services.AddUksfIntegrationDiscord(); + Services.AddUksfModpack(); + } + + [Fact] + public void When_resolving_controllers() { + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + + [Fact] + public void When_resolving_event_handlers() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + + [Fact] + public void When_resolving_scheduled_actions() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + } +} diff --git a/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj b/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj index 9fc420ef..f77dcc37 100644 --- a/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj +++ b/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj @@ -7,6 +7,7 @@ + @@ -19,4 +20,15 @@ + + + C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0\ref\net5.0\Microsoft.Extensions.DependencyInjection.dll + + + + + + + + diff --git a/Tests/UKSF.Api.Personnel.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Personnel.Tests/DependencyInjectionTests.cs new file mode 100644 index 00000000..1279f2b5 --- /dev/null +++ b/Tests/UKSF.Api.Personnel.Tests/DependencyInjectionTests.cs @@ -0,0 +1,75 @@ +using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Admin; +using UKSF.Api.Personnel.Controllers; +using UKSF.Api.Personnel.EventHandlers; +using UKSF.Api.Personnel.ScheduledActions; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.Personnel.Tests { + public class DependencyInjectionTests : DependencyInjectionTestsBase { + public DependencyInjectionTests() { + Services.AddUksfAdmin(); + Services.AddUksfPersonnel(); + } + + [Fact] + public void When_resolving_controllers() { + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + + [Fact] + public void When_resolving_event_handlers() { + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + + [Fact] + public void When_resolving_scheduled_actions() { + Services.AddTransient(); + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + } +} diff --git a/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj b/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj index 9fc420ef..f0c74cca 100644 --- a/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj +++ b/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj @@ -7,6 +7,7 @@ + @@ -19,4 +20,10 @@ + + + + + + diff --git a/Tests/UKSF.Api.Shared.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Shared.Tests/DependencyInjectionTests.cs deleted file mode 100644 index d7ed83b1..00000000 --- a/Tests/UKSF.Api.Shared.Tests/DependencyInjectionTests.cs +++ /dev/null @@ -1,75 +0,0 @@ -using FluentAssertions; -using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Base; -using UKSF.Api.Shared.Context; -using UKSF.Api.Tests.Common; -using Xunit; - -namespace UKSF.Api.Shared.Tests { - public class DependencyInjectionTests : DependencyInjectionTestsBase { - public DependencyInjectionTests() { - Services.AddUksfBase(TestConfiguration); - Services.AddUksfShared(); - } - - [Fact] - public void When_resolving_LogContext() { - Services.AddTransient(); - ServiceProvider serviceProvider = Services.BuildServiceProvider(); - - ILogContext subject = serviceProvider.GetRequiredService(); - - subject.Should().NotBeNull(); - } - - [Fact] - public void When_resolving_AuditLogContext() { - Services.AddTransient(); - ServiceProvider serviceProvider = Services.BuildServiceProvider(); - - IAuditLogContext subject = serviceProvider.GetRequiredService(); - - subject.Should().NotBeNull(); - } - - [Fact] - public void When_resolving_HttpErrorLogContext() { - Services.AddTransient(); - ServiceProvider serviceProvider = Services.BuildServiceProvider(); - - IHttpErrorLogContext subject = serviceProvider.GetRequiredService(); - - subject.Should().NotBeNull(); - } - - [Fact] - public void When_resolving_LauncherLogContext() { - Services.AddTransient(); - ServiceProvider serviceProvider = Services.BuildServiceProvider(); - - ILauncherLogContext subject = serviceProvider.GetRequiredService(); - - subject.Should().NotBeNull(); - } - - [Fact] - public void When_resolving_DiscordLogContext() { - Services.AddTransient(); - ServiceProvider serviceProvider = Services.BuildServiceProvider(); - - IDiscordLogContext subject = serviceProvider.GetRequiredService(); - - subject.Should().NotBeNull(); - } - - [Fact] - public void When_resolving_SchedulerContext() { - Services.AddTransient(); - ServiceProvider serviceProvider = Services.BuildServiceProvider(); - - ISchedulerContext subject = serviceProvider.GetRequiredService(); - - subject.Should().NotBeNull(); - } - } -} diff --git a/Tests/UKSF.Api.Tests.Common/DependencyInjectionTestsBase.cs b/Tests/UKSF.Api.Tests.Common/DependencyInjectionTestsBase.cs index 8a897c55..a22004ab 100644 --- a/Tests/UKSF.Api.Tests.Common/DependencyInjectionTestsBase.cs +++ b/Tests/UKSF.Api.Tests.Common/DependencyInjectionTestsBase.cs @@ -1,16 +1,32 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; +using Moq; +using UKSF.Api.Base; +using UKSF.Api.Shared; namespace UKSF.Api.Tests.Common { public class DependencyInjectionTestsBase { protected readonly ServiceCollection Services; - protected readonly IConfigurationRoot TestConfiguration; + protected readonly IConfigurationRoot Configuration; + protected readonly IHostEnvironment HostEnvironment; protected DependencyInjectionTestsBase() { + Mock mockHostEnvironment = new(); + mockHostEnvironment.Setup(x => x.EnvironmentName).Returns(Environments.Development); + Services = new ServiceCollection(); - TestConfiguration = TestConfigurationProvider.GetTestConfiguration(); + Configuration = TestConfigurationProvider.GetTestConfiguration(); + HostEnvironment = mockHostEnvironment.Object; + + Services.TryAddTransient(typeof(ILogger<>), typeof(Logger<>)); + Services.TryAddTransient(typeof(ILoggerFactory), typeof(LoggerFactory)); + Services.AddSingleton(Configuration); - Services.AddSingleton(TestConfiguration); + Services.AddUksfBase(Configuration, HostEnvironment); + Services.AddUksfShared(); } } } diff --git a/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj b/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj index 7c3b4601..04c50197 100644 --- a/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj +++ b/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj @@ -7,8 +7,10 @@ + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Tests/UKSF.Api.Tests.Common/appsettings.json b/Tests/UKSF.Api.Tests.Common/appsettings.json index 790ef383..2a2e8bf9 100644 --- a/Tests/UKSF.Api.Tests.Common/appsettings.json +++ b/Tests/UKSF.Api.Tests.Common/appsettings.json @@ -4,7 +4,7 @@ "discord": "" }, "Secrets": { - "tokenKey": "" + "tokenKey": "123456789" }, "EmailSettings": { "username": "", diff --git a/Tests/UKSF.Api.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Tests/DependencyInjectionTests.cs new file mode 100644 index 00000000..c8c35441 --- /dev/null +++ b/Tests/UKSF.Api.Tests/DependencyInjectionTests.cs @@ -0,0 +1,43 @@ +using FluentAssertions; +using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.AppStart; +using UKSF.Api.Controllers; +using UKSF.Api.EventHandlers; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.Tests { + public class DependencyInjectionTests : DependencyInjectionTestsBase { + public DependencyInjectionTests() { + Services.AddUksf(Configuration, HostEnvironment); + } + + [Fact] + public void When_resolving_controllers() { + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + + [Fact] + public void When_resolving_event_handlers() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + + [Fact] + public void When_resolving_filters() { + Services.AddTransient(); + ServiceProvider serviceProvider = Services.BuildServiceProvider(); + + serviceProvider.GetRequiredService().Should().NotBeNull(); + } + } +} diff --git a/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj b/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj index 9fc420ef..ece55ba6 100644 --- a/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj +++ b/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj @@ -7,6 +7,7 @@ + @@ -19,4 +20,9 @@ + + + + + diff --git a/UKSF.Api.Admin/Controllers/DataController.cs b/UKSF.Api.Admin/Controllers/DataController.cs index 7d81003a..8850be87 100644 --- a/UKSF.Api.Admin/Controllers/DataController.cs +++ b/UKSF.Api.Admin/Controllers/DataController.cs @@ -6,9 +6,9 @@ namespace UKSF.Api.Admin.Controllers { [Route("[controller]"), Permissions(Permissions.ADMIN)] public class DataController : Controller { - private readonly DataCacheService _dataCacheService; + private readonly IDataCacheService _dataCacheService; - public DataController(DataCacheService dataCacheService) => _dataCacheService = dataCacheService; + public DataController(IDataCacheService dataCacheService) => _dataCacheService = dataCacheService; [HttpGet("invalidate"), Authorize] public IActionResult Invalidate() { diff --git a/UKSF.Api.Admin/Controllers/DebugController.cs b/UKSF.Api.Admin/Controllers/DebugController.cs deleted file mode 100644 index f7aadf7b..00000000 --- a/UKSF.Api.Admin/Controllers/DebugController.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Hosting; -using UKSF.Api.Admin.Services; - -namespace UKSF.Api.Admin.Controllers { - [Route("[controller]")] - public class DebugController : Controller { - private readonly IHostEnvironment _currentEnvironment; - private readonly DataCacheService _dataCacheService; - - public DebugController(IHostEnvironment currentEnvironment, DataCacheService dataCacheService) { - _currentEnvironment = currentEnvironment; - _dataCacheService = dataCacheService; - } - - [HttpGet("invalidate-data")] - public IActionResult InvalidateData() { - if (!_currentEnvironment.IsDevelopment()) return Ok(); - - _dataCacheService.RefreshCachedData(); - return Ok(); - } - } -} diff --git a/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs b/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs index 73fd9803..d70c9657 100644 --- a/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs +++ b/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs @@ -11,6 +11,7 @@ public static class ApiArmaMissionsExtensions { private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; - private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddServices(this IServiceCollection services) => + services.AddSingleton().AddSingleton().AddSingleton(); } } diff --git a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs index 2c9b509e..8af6c416 100644 --- a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs +++ b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs @@ -17,7 +17,7 @@ public static class ApiArmaServerExtensions { private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; - private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton().AddSingleton(); public static void AddUksfArmaServerSignalr(this IEndpointRouteBuilder builder) { builder.MapHub($"/hub/{ServersHub.END_POINT}"); diff --git a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs index 5e04c20d..2d30139d 100644 --- a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs +++ b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs @@ -72,7 +72,6 @@ public class GameServerHelpers : IGameServerHelpers { }; private readonly ILogger _logger; - private readonly IVariablesService _variablesService; public GameServerHelpers(IVariablesService variablesService, ILogger logger) { diff --git a/UKSF.Api.Base/ApiBaseExtensions.cs b/UKSF.Api.Base/ApiBaseExtensions.cs index 7dea1b4f..7c2788e1 100644 --- a/UKSF.Api.Base/ApiBaseExtensions.cs +++ b/UKSF.Api.Base/ApiBaseExtensions.cs @@ -1,16 +1,24 @@ -using Microsoft.Extensions.Configuration; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using UKSF.Api.Base.Context; namespace UKSF.Api.Base { public static class ApiBaseExtensions { - public static IServiceCollection AddUksfBase(this IServiceCollection services, IConfiguration configuration) => + public static IServiceCollection AddUksfBase(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { services.AddContexts() .AddEventBuses() .AddEventHandlers() .AddServices() + .AddSingleton(configuration) + .AddSingleton(currentEnvironment) + .AddSingleton() .AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))) .AddTransient(); + services.AddSignalR().AddNewtonsoftJsonProtocol(); + return services; + } private static IServiceCollection AddContexts(this IServiceCollection services) => services; diff --git a/UKSF.Api.Base/UKSF.Api.Base.csproj b/UKSF.Api.Base/UKSF.Api.Base.csproj index afa002b7..19f955c5 100644 --- a/UKSF.Api.Base/UKSF.Api.Base.csproj +++ b/UKSF.Api.Base/UKSF.Api.Base.csproj @@ -7,6 +7,7 @@ + diff --git a/UKSF.Api.Command/Controllers/CommandRequestsController.cs b/UKSF.Api.Command/Controllers/CommandRequestsController.cs index 63a20c2b..750155f4 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsController.cs @@ -32,14 +32,12 @@ public class CommandRequestsController : Controller { private readonly ILogger _logger; private readonly INotificationsService _notificationsService; private readonly IUnitsContext _unitsContext; - private readonly IUnitsService _unitsService; private readonly IVariablesContext _variablesContext; public CommandRequestsController( ICommandRequestService commandRequestService, ICommandRequestCompletionService commandRequestCompletionService, IHttpContextService httpContextService, - IUnitsService unitsService, IUnitsContext unitsContext, ICommandRequestContext commandRequestContext, IDisplayNameService displayNameService, @@ -51,7 +49,6 @@ ILogger logger _commandRequestService = commandRequestService; _commandRequestCompletionService = commandRequestCompletionService; _httpContextService = httpContextService; - _unitsService = unitsService; _unitsContext = unitsContext; _commandRequestContext = commandRequestContext; _displayNameService = displayNameService; diff --git a/UKSF.Api.Command/Services/ChainOfCommandService.cs b/UKSF.Api.Command/Services/ChainOfCommandService.cs index 2bbed7d5..7d2e273d 100644 --- a/UKSF.Api.Command/Services/ChainOfCommandService.cs +++ b/UKSF.Api.Command/Services/ChainOfCommandService.cs @@ -16,18 +16,17 @@ public interface IChainOfCommandService { public class ChainOfCommandService : IChainOfCommandService { private readonly IAccountService _accountService; - private readonly string _commanderRoleName; private readonly IHttpContextService _httpContextService; + private readonly IRolesService _rolesService; private readonly IUnitsContext _unitsContext; private readonly IUnitsService _unitsService; public ChainOfCommandService(IUnitsContext unitsContext, IUnitsService unitsService, IRolesService rolesService, IHttpContextService httpContextService, IAccountService accountService) { _unitsContext = unitsContext; _unitsService = unitsService; + _rolesService = rolesService; _httpContextService = httpContextService; _accountService = accountService; - - _commanderRoleName = rolesService.GetUnitRoleByOrder(0).Name; } public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, Unit start, Unit target) { @@ -157,8 +156,8 @@ private string GetNextUnitCommanderExcludeSelf(Unit unit) { return string.Empty; } - private bool UnitHasCommander(Unit unit) => _unitsService.HasRole(unit, _commanderRoleName); + private bool UnitHasCommander(Unit unit) => _unitsService.HasRole(unit, _rolesService.GetCommanderRoleName()); - private string GetCommander(Unit unit) => unit.Roles.GetValueOrDefault(_commanderRoleName, string.Empty); + private string GetCommander(Unit unit) => unit.Roles.GetValueOrDefault(_rolesService.GetCommanderRoleName(), string.Empty); } } diff --git a/UKSF.Api.Command/Services/OperationReportService.cs b/UKSF.Api.Command/Services/OperationReportService.cs index 0942056a..b6e07abf 100644 --- a/UKSF.Api.Command/Services/OperationReportService.cs +++ b/UKSF.Api.Command/Services/OperationReportService.cs @@ -1,7 +1,6 @@ using System.Threading.Tasks; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; -using UKSF.Api.Personnel.Services; namespace UKSF.Api.Command.Services { public interface IOperationReportService { @@ -9,13 +8,9 @@ public interface IOperationReportService { } public class OperationReportService : IOperationReportService { - private readonly IAttendanceService _attendanceService; private readonly IOperationReportContext _operationReportContext; - public OperationReportService(IOperationReportContext operationReportContext, IAttendanceService attendanceService) { - _operationReportContext = operationReportContext; - _attendanceService = attendanceService; - } + public OperationReportService(IOperationReportContext operationReportContext) => _operationReportContext = operationReportContext; public async Task Create(CreateOperationReportRequest request) { Oprep operation = new() { @@ -26,7 +21,7 @@ public async Task Create(CreateOperationReportRequest request) { Type = request.Type, Result = request.Result }; - operation.AttendanceReport = await _attendanceService.GenerateAttendanceReport(operation.Start, operation.End); + // operation.AttendanceReport = await _attendanceService.GenerateAttendanceReport(operation.Start, operation.End); await _operationReportContext.Add(operation); } } diff --git a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs index c72dbba4..8db4684d 100644 --- a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs +++ b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs @@ -33,7 +33,6 @@ public class DiscordService : IDiscordService, IDisposable { private readonly IDisplayNameService _displayNameService; private readonly ILogger _logger; private readonly IRanksContext _ranksContext; - private readonly ulong _specialUser; private readonly IUnitsContext _unitsContext; private readonly IUnitsService _unitsService; private readonly IVariablesService _variablesService; @@ -60,7 +59,6 @@ ILogger logger _displayNameService = displayNameService; _variablesService = variablesService; _logger = logger; - _specialUser = variablesService.GetVariable("DID_U_OWNER").AsUlong(); } public async Task ConnectDiscord() { @@ -222,7 +220,7 @@ private async Task ClientOnUserJoined(SocketGuildUser user) { private async Task ClientOnMessageReceived(SocketMessage incomingMessage) { if (incomingMessage.Content.Contains("bot", StringComparison.InvariantCultureIgnoreCase) || incomingMessage.MentionedUsers.Any(x => x.IsBot)) { if (TRIGGERS.Any(x => incomingMessage.Content.Contains(x, StringComparison.InvariantCultureIgnoreCase))) { - bool owner = incomingMessage.Author.Id == _specialUser; + bool owner = incomingMessage.Author.Id == _variablesService.GetVariable("DID_U_OWNER").AsUlong(); string message = owner ? OWNER_REPLIES[new Random().Next(0, OWNER_REPLIES.Length)] : REPLIES[new Random().Next(0, REPLIES.Length)]; string[] parts = _guild.GetUser(incomingMessage.Author.Id).Nickname.Split('.'); string nickname = owner ? "Daddy" : parts.Length > 1 ? parts[1] : parts[0]; diff --git a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs index c2779595..8c2aabac 100644 --- a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs +++ b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs @@ -15,7 +15,7 @@ public static IServiceCollection AddUksfIntegrationTeamspeak(this IServiceCollec private static IServiceCollection AddContexts(this IServiceCollection services) => services; - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton>(); + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, EventBus>(); private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton() diff --git a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs index 0ff7482c..637663ee 100644 --- a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs +++ b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs @@ -19,13 +19,13 @@ public interface ITeamspeakEventHandler : IEventHandler { } public class TeamspeakEventHandler : ITeamspeakEventHandler { private readonly IAccountContext _accountContext; - private readonly ISignalrEventBus _eventBus; + private readonly IEventBus _eventBus; private readonly ILogger _logger; private readonly ConcurrentDictionary _serverGroupUpdates = new(); private readonly ITeamspeakGroupService _teamspeakGroupService; private readonly ITeamspeakService _teamspeakService; - public TeamspeakEventHandler(IAccountContext accountContext, ISignalrEventBus eventBus, ITeamspeakService teamspeakService, ITeamspeakGroupService teamspeakGroupService, ILogger logger) { + public TeamspeakEventHandler(IAccountContext accountContext, IEventBus eventBus, ITeamspeakService teamspeakService, ITeamspeakGroupService teamspeakGroupService, ILogger logger) { _accountContext = accountContext; _eventBus = eventBus; _teamspeakService = teamspeakService; diff --git a/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs index 4cf5bc0b..538ed203 100644 --- a/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs +++ b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; +using UKSF.Api.Base.Events; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; using UKSF.Api.Teamspeak.Signalr.Clients; @@ -12,9 +13,9 @@ public static class TeamspeakHubState { public class TeamspeakHub : Hub { public const string END_POINT = "teamspeak"; - private readonly ISignalrEventBus _eventBus; + private readonly IEventBus _eventBus; - public TeamspeakHub(ISignalrEventBus eventBus) => _eventBus = eventBus; + public TeamspeakHub(IEventBus eventBus) => _eventBus = eventBus; // ReSharper disable once UnusedMember.Global public void Invoke(int procedure, object args) { diff --git a/UKSF.Api.Launcher/ApiLauncherExtensions.cs b/UKSF.Api.Launcher/ApiLauncherExtensions.cs index c648cc02..b77d8c91 100644 --- a/UKSF.Api.Launcher/ApiLauncherExtensions.cs +++ b/UKSF.Api.Launcher/ApiLauncherExtensions.cs @@ -2,9 +2,11 @@ using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Launcher.Context; +using UKSF.Api.Launcher.Models; using UKSF.Api.Launcher.Services; using UKSF.Api.Launcher.Signalr.Hubs; using UKSF.Api.Personnel.ScheduledActions; +using UKSF.Api.Shared.Events; namespace UKSF.Api.Launcher { public static class ApiLauncherExtensions { @@ -13,7 +15,7 @@ public static IServiceCollection AddUksfLauncher(this IServiceCollection service private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton(); - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; + private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>(); private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; diff --git a/UKSF.Api.Modpack/ApiModpackExtensions.cs b/UKSF.Api.Modpack/ApiModpackExtensions.cs index e2497129..2b7962b3 100644 --- a/UKSF.Api.Modpack/ApiModpackExtensions.cs +++ b/UKSF.Api.Modpack/ApiModpackExtensions.cs @@ -28,6 +28,7 @@ private static IServiceCollection AddServices(this IServiceCollection services) .AddTransient() .AddTransient() .AddTransient() + .AddSingleton() .AddTransient(); private static IServiceCollection AddActions(this IServiceCollection services) => services.AddSingleton(); diff --git a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs index df89e9a2..729f01a4 100644 --- a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs +++ b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs @@ -1,9 +1,11 @@ -using Microsoft.AspNetCore.Builder; +using AutoMapper; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.EventHandlers; +using UKSF.Api.Personnel.Mappers; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.ScheduledActions; using UKSF.Api.Personnel.Services; @@ -13,11 +15,18 @@ namespace UKSF.Api.Personnel { public static class ApiPersonnelExtensions { public static IServiceCollection AddUksfPersonnel(this IServiceCollection services) => - services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddActions().AddTransient(); + services.AddContexts() + .AddEventBuses() + .AddEventHandlers() + .AddServices() + .AddActions() + .AddTransient() + .AddAutoMapper(typeof(AutoMapperUnitProfile)); private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton() .AddSingleton() + .AddSingleton() .AddSingleton() .AddSingleton() .AddSingleton() @@ -41,14 +50,18 @@ private static IServiceCollection AddEventHandlers(this IServiceCollection servi private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton() - .AddTransient() - .AddTransient() - .AddTransient() - .AddTransient() - .AddTransient() - .AddTransient() - .AddTransient() - .AddTransient(); + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); private static IServiceCollection AddActions(this IServiceCollection services) => services.AddSingleton().AddSingleton(); diff --git a/UKSF.Api.Personnel/Mappers/AutoMapperUnitProfile.cs b/UKSF.Api.Personnel/Mappers/AutoMapperUnitProfile.cs new file mode 100644 index 00000000..dc1d7139 --- /dev/null +++ b/UKSF.Api.Personnel/Mappers/AutoMapperUnitProfile.cs @@ -0,0 +1,10 @@ +using AutoMapper; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Mappers { + public class AutoMapperUnitProfile : Profile { + public AutoMapperUnitProfile() { + CreateMap(); + } + } +} diff --git a/UKSF.Api.Personnel/Services/RolesService.cs b/UKSF.Api.Personnel/Services/RolesService.cs index 91d6af31..fca1282c 100644 --- a/UKSF.Api.Personnel/Services/RolesService.cs +++ b/UKSF.Api.Personnel/Services/RolesService.cs @@ -5,6 +5,7 @@ namespace UKSF.Api.Personnel.Services { public interface IRolesService { int Sort(string nameA, string nameB); Role GetUnitRoleByOrder(int order); + string GetCommanderRoleName(); } public class RolesService : IRolesService { @@ -21,5 +22,7 @@ public int Sort(string nameA, string nameB) { } public Role GetUnitRoleByOrder(int order) => _rolesContext.GetSingle(x => x.RoleType == RoleType.UNIT && x.Order == order); + + public string GetCommanderRoleName() => GetUnitRoleByOrder(0).Name; } } diff --git a/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj b/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj index e96e9f03..0acfa8f8 100644 --- a/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj +++ b/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj @@ -13,6 +13,7 @@ + diff --git a/UKSF.Api.Shared/ApiSharedExtensions.cs b/UKSF.Api.Shared/ApiSharedExtensions.cs index 3467d21c..40563d6b 100644 --- a/UKSF.Api.Shared/ApiSharedExtensions.cs +++ b/UKSF.Api.Shared/ApiSharedExtensions.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; @@ -8,7 +9,8 @@ namespace UKSF.Api.Shared { public static class ApiSharedExtensions { public static IServiceCollection AddUksfShared(this IServiceCollection services) => - services.AddContexts() + services + .AddContexts() .AddEventBuses() .AddEventHandlers() .AddServices() @@ -30,7 +32,8 @@ private static IServiceCollection AddEventBuses(this IServiceCollection services .AddSingleton, DataEventBus>() .AddSingleton, DataEventBus>() .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>(); + .AddSingleton, DataEventBus>() + .AddSingleton, EventBus>(); private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; diff --git a/UKSF.Api.Shared/Events/SignalrEventBus.cs b/UKSF.Api.Shared/Events/SignalrEventBus.cs deleted file mode 100644 index 073483c0..00000000 --- a/UKSF.Api.Shared/Events/SignalrEventBus.cs +++ /dev/null @@ -1,10 +0,0 @@ -using UKSF.Api.Base.Events; -using UKSF.Api.Shared.Models; - -namespace UKSF.Api.Shared.Events { - public interface ISignalrEventBus : IEventBus { } - - public class SignalrEventBus : EventBus, ISignalrEventBus { -// public IObservable AsObservable(string clientName) => Subject.OfType(); - } -} diff --git a/UKSF.Api.sln b/UKSF.Api.sln index a436c7de..9e22683a 100644 --- a/UKSF.Api.sln +++ b/UKSF.Api.sln @@ -60,7 +60,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Integrations.Insta EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Integrations.Discord.Tests", "Tests\UKSF.Api.Integrations.Discord.Tests\UKSF.Api.Integrations.Discord.Tests.csproj", "{31AF7726-44C5-49C3-AD39-F9660B9138B3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Integrations.Teamspeak", "Tests\UKSF.Api.Integrations.Teamspeak\UKSF.Api.Integrations.Teamspeak.csproj", "{22611568-B956-4086-AA66-803C0040EBBC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Integrations.Teamspeak.Tests", "Tests\UKSF.Api.Integrations.Teamspeak.Tests\UKSF.Api.Integrations.Teamspeak.Tests.csproj", "{22611568-B956-4086-AA66-803C0040EBBC}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UKSF.Api.Launcher.Tests", "Tests\UKSF.Api.Launcher.Tests\UKSF.Api.Launcher.Tests.csproj", "{B63BA910-2192-4C26-AFF9-59A995941F83}" EndProject diff --git a/UKSF.Api/AppStart/AutoMapperConfigurationProfile.cs b/UKSF.Api/AppStart/AutoMapperConfigurationProfile.cs deleted file mode 100644 index 9f41feaf..00000000 --- a/UKSF.Api/AppStart/AutoMapperConfigurationProfile.cs +++ /dev/null @@ -1,10 +0,0 @@ -using AutoMapper; -using UKSF.Api.Personnel.Models; - -namespace UKSF.Api.AppStart { - public class AutoMapperConfigurationProfile : Profile { - public AutoMapperConfigurationProfile() { - CreateMap(); - } - } -} diff --git a/UKSF.Api/AppStart/UksfServiceExtensions.cs b/UKSF.Api/AppStart/UksfServiceExtensions.cs index a7f173b2..e9aa2bb7 100644 --- a/UKSF.Api/AppStart/UksfServiceExtensions.cs +++ b/UKSF.Api/AppStart/UksfServiceExtensions.cs @@ -1,5 +1,4 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using UKSF.Api.Admin; @@ -20,17 +19,8 @@ namespace UKSF.Api.AppStart { public static class ServiceExtensions { - public static IServiceCollection AddUksf(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) => - services.AddContexts() - .AddEventBuses() - .AddEventHandlers() - .AddServices() - .AddSingleton(configuration) - .AddSingleton(currentEnvironment) - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddComponents(configuration); + public static void AddUksf(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) => + services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddSingleton().AddSingleton().AddComponents(configuration, currentEnvironment); private static IServiceCollection AddContexts(this IServiceCollection services) => services; @@ -40,8 +30,8 @@ public static IServiceCollection AddUksf(this IServiceCollection services, IConf private static IServiceCollection AddServices(this IServiceCollection services) => services; - private static IServiceCollection AddComponents(this IServiceCollection services, IConfiguration configuration) => - services.AddUksfBase(configuration) + private static void AddComponents(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) => + services.AddUksfBase(configuration, currentEnvironment) .AddUksfShared() .AddUksfAuth(configuration) .AddUksfAdmin() diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index dc950659..c16d2e0c 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -1,6 +1,5 @@ using System; using System.Threading.Tasks; -using AutoMapper; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.HttpOverrides; @@ -43,8 +42,6 @@ public void ConfigureServices(IServiceCollection services) { } ) ); - services.AddSignalR().AddNewtonsoftJsonProtocol(); - services.AddAutoMapper(typeof(AutoMapperConfigurationProfile)); services.AddControllers(); services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo { Title = "UKSF API", Version = "v1" }); }); services.AddMvc(options => { options.Filters.Add(); }).AddNewtonsoftJson(); diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index be1735d5..a9da2c5c 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -52,8 +52,4 @@ - - - - diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs index 6ce0e046..637b44a0 100644 --- a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using FluentAssertions; using Moq; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Events; @@ -19,11 +20,11 @@ public class TeamspeakEventHandlerTests { private readonly Mock _mockLoggingService; private readonly Mock _mockTeamspeakGroupService; private readonly Mock _mockTeamspeakService; - private readonly ISignalrEventBus _signalrEventBus; + private readonly IEventBus _signalrEventBus; private readonly TeamspeakEventHandler _teamspeakEventHandler; public TeamspeakEventHandlerTests() { - _signalrEventBus = new SignalrEventBus(); + _signalrEventBus = new EventBus(); _mockAccountContext = new Mock(); _mockTeamspeakService = new Mock(); _mockTeamspeakGroupService = new Mock(); From b110ef1255c27ff9127cb7d52b0b5fe4d9b3b740 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 5 Dec 2020 17:34:26 +0000 Subject: [PATCH 288/369] Changed event bus to use a single bus with typed data --- .../DependencyInjectionTests.cs | 6 +- .../TestCachedContext.cs | 5 +- Tests/UKSF.Api.Tests.Common/TestContext.cs | 5 +- Tests/UKSF.Api.Tests.Common/TestDataModel.cs | 6 +- UKSF.Api.Admin/ApiAdminExtensions.cs | 4 +- UKSF.Api.Admin/Context/VariablesContext.cs | 4 +- .../EventHandlers/LogEventHandler.cs | 19 ++-- UKSF.Api.Admin/Models/VariableItem.cs | 4 +- .../ApiArmaMissionsExtensions.cs | 4 +- UKSF.Api.ArmaMissions/Models/Mission.cs | 20 ++-- UKSF.Api.ArmaMissions/Models/MissionEntity.cs | 4 +- .../Models/MissionEntityItem.cs | 16 ++-- .../Models/MissionPatchData.cs | 14 +-- .../Models/MissionPatchingReport.cs | 6 +- .../Models/MissionPatchingResult.cs | 6 +- UKSF.Api.ArmaMissions/Models/MissionPlayer.cs | 10 +- UKSF.Api.ArmaMissions/Models/MissionUnit.cs | 8 +- .../Services/MissionDataResolver.cs | 28 ++---- .../Services/MissionPatchDataService.cs | 2 +- .../Services/MissionService.cs | 4 +- .../ApiArmaServerExtensions.cs | 4 +- .../DataContext/GameServersContext.cs | 3 +- UKSF.Api.ArmaServer/Models/GameServer.cs | 50 +++++----- UKSF.Api.ArmaServer/Models/GameServerMod.cs | 8 +- UKSF.Api.ArmaServer/Models/MissionFile.cs | 6 +- UKSF.Api.Auth/ApiAuthExtensions.cs | 4 +- UKSF.Api.Auth/Services/PermissionsService.cs | 7 +- UKSF.Api.Base/ApiBaseExtensions.cs | 5 +- UKSF.Api.Base/Events/EventBus.cs | 20 ++-- UKSF.Api.Base/Models/EventModel.cs | 18 ++++ UKSF.Api.Base/Models/MongoObject.cs | 2 +- UKSF.Api.Command/ApiCommandExtensions.cs | 8 +- .../Context/CommandRequestArchiveContext.cs | 8 +- .../Context/CommandRequestContext.cs | 3 +- UKSF.Api.Command/Context/DischargeContext.cs | 3 +- UKSF.Api.Command/Context/LoaContext.cs | 3 +- .../Context/OperationOrderContext.cs | 3 +- .../Context/OperationReportContext.cs | 3 +- .../CommandRequestEventHandler.cs | 21 ++--- UKSF.Api.Command/Models/CommandRequest.cs | 23 ++--- UKSF.Api.Command/Models/CommandRequestLoa.cs | 8 +- .../Models/CreateOperationOrderRequest.cs | 14 +-- .../Models/CreateOperationReport.cs | 16 ++-- UKSF.Api.Command/Models/Discharge.cs | 22 ++--- UKSF.Api.Command/Models/Opord.cs | 12 +-- UKSF.Api.Command/Models/Oprep.cs | 16 ++-- .../ApiIntegrationDiscordExtensions.cs | 4 +- .../DiscordAccountEventHandler.cs | 11 ++- .../ApiIntegrationInstagramExtensions.cs | 4 +- .../Models/InstagramImage.cs | 12 +-- .../ApiIntegrationTeamspeakExtensions.cs | 7 +- .../TeamspeakAccountEventHandler.cs | 31 ------- .../EventHandlers/TeamspeakEventHandler.cs | 76 +++------------ .../TeamspeakMessageEventHandler.cs | 30 ------ .../TeamspeakServerEventHandler.cs | 92 +++++++++++++++++++ .../Models/Operation.cs | 14 +-- .../Models/TeamspeakClient.cs | 8 +- .../Models/TeamspeakGroupProcedure.cs | 4 +- .../Models/TeamspeakServerGroupUpdate.cs | 6 +- .../Models/TeamspeakServerSnapshot.cs | 4 +- .../Signalr/Hubs/TeamspeakHub.cs | 7 +- UKSF.Api.Launcher/ApiLauncherExtensions.cs | 4 +- .../Context/LauncherFileContext.cs | 3 +- UKSF.Api.Launcher/Models/LauncherFile.cs | 4 +- UKSF.Api.Modpack/ApiModpackExtensions.cs | 5 +- UKSF.Api.Modpack/Context/BuildsContext.cs | 8 +- UKSF.Api.Modpack/Context/ReleasesContext.cs | 3 +- .../EventHandlers/BuildsEventHandler.cs | 55 ++++++----- UKSF.Api.Modpack/Models/GithubCommit.cs | 12 +-- UKSF.Api.Modpack/Models/ModpackBuild.cs | 26 +++--- .../Models/ModpackBuildQueueItem.cs | 4 +- UKSF.Api.Modpack/Models/ModpackBuildStep.cs | 16 ++-- .../Models/ModpackBuildStepEventData.cs | 11 +++ .../Models/ModpackBuildStepLogItem.cs | 8 +- UKSF.Api.Modpack/Models/ModpackRelease.cs | 12 +-- UKSF.Api.Modpack/Models/NewBuild.cs | 8 +- UKSF.Api.Personnel/ApiPersonnelExtensions.cs | 13 +-- UKSF.Api.Personnel/Context/AccountContext.cs | 3 +- .../Context/CommentThreadContext.cs | 28 ++++-- .../Context/ConfirmationCodeContext.cs | 5 +- .../Context/NotificationsContext.cs | 3 +- UKSF.Api.Personnel/Context/RanksContext.cs | 3 +- UKSF.Api.Personnel/Context/RolesContext.cs | 3 +- UKSF.Api.Personnel/Context/UnitsContext.cs | 3 +- .../Controllers/AccountsController.cs | 8 +- .../Controllers/CommentThreadController.cs | 8 +- .../Controllers/CommunicationsController.cs | 8 +- .../Controllers/DiscordCodeController.cs | 8 +- .../Controllers/RanksController.cs | 6 +- .../Controllers/UnitsController.cs | 12 +-- .../EventHandlers/AccountDataEventHandler.cs | 25 +++-- .../CommentThreadEventHandler.cs | 30 +++--- .../NotificationsEventHandler.cs | 15 +-- UKSF.Api.Personnel/Models/Account.cs | 57 ++++++------ .../Models/AccountAttendanceStatus.cs | 12 +-- UKSF.Api.Personnel/Models/Application.cs | 14 +-- UKSF.Api.Personnel/Models/AttendanceReport.cs | 2 +- UKSF.Api.Personnel/Models/Comment.cs | 6 +- UKSF.Api.Personnel/Models/CommentThread.cs | 6 +- .../Models/CommentThreadEventData.cs | 11 +++ UKSF.Api.Personnel/Models/ConfirmationCode.cs | 2 +- UKSF.Api.Personnel/Models/Loa.cs | 16 ++-- UKSF.Api.Personnel/Models/Notification.cs | 12 +-- UKSF.Api.Personnel/Models/Rank.cs | 10 +- UKSF.Api.Personnel/Models/Role.cs | 6 +- UKSF.Api.Personnel/Models/Unit.cs | 62 ++++++------- .../Services/AssignmentService.cs | 8 +- .../Services/CommentThreadService.cs | 25 ++--- .../Services/NotificationsService.cs | 8 +- UKSF.Api.Shared/ApiSharedExtensions.cs | 11 +-- UKSF.Api.Shared/Context/CachedMongoContext.cs | 21 ++--- UKSF.Api.Shared/Context/LogContext.cs | 11 ++- UKSF.Api.Shared/Context/MongoContext.cs | 21 ++--- UKSF.Api.Shared/Context/SchedulerContext.cs | 3 +- UKSF.Api.Shared/Events/DataEventBus.cs | 13 --- UKSF.Api.Shared/Events/EventModelFactory.cs | 8 -- UKSF.Api.Shared/Events/Logger.cs | 12 ++- UKSF.Api.Shared/Extensions/ChangeUtilities.cs | 12 +-- .../Extensions/ObservableExtensions.cs | 7 +- UKSF.Api.Shared/Models/AuditLog.cs | 2 +- UKSF.Api.Shared/Models/ContextEventData.cs | 11 +++ UKSF.Api.Shared/Models/DataEventModel.cs | 16 ---- UKSF.Api.Shared/Models/LauncherLog.cs | 6 +- UKSF.Api.Shared/Models/ScheduledJob.cs | 10 +- UKSF.Api.Shared/Models/SignalrEventData.cs | 6 ++ UKSF.Api.Shared/Models/SignalrEventModel.cs | 6 -- ...tModel.cs => TeamspeakMessageEventData.cs} | 4 +- UKSF.Api/AppStart/UksfServiceExtensions.cs | 4 +- UKSF.Api/EventHandlers/LoggerEventHandler.cs | 10 +- UKSF.Tests/UKSF.Tests.csproj | 1 - .../Unit/Common/EventModelFactoryTests.cs | 23 ----- .../Data/Admin/VariablesDataServiceTests.cs | 5 +- .../Unit/Data/CachedDataServiceTests.cs | 35 +++---- .../Unit/Data/CahcedDataServiceEventTests.cs | 64 ++++++------- UKSF.Tests/Unit/Data/DataServiceEventTests.cs | 73 +++++++-------- UKSF.Tests/Unit/Data/DataServiceTests.cs | 7 +- .../Data/Game/GameServersDataServiceTests.cs | 5 +- .../Message/CommentThreadDataServiceTests.cs | 11 +-- .../Data/Modpack/BuildsDataServiceTests.cs | 18 ++-- .../Data/Modpack/ReleasesDataServiceTests.cs | 5 +- .../OperationOrderDataServiceTests.cs | 5 +- .../OperationReportDataServiceTests.cs | 5 +- .../Personnel/DischargeDataServiceTests.cs | 5 +- .../Data/Personnel/RanksDataServiceTests.cs | 5 +- .../Data/Personnel/RolesDataServiceTests.cs | 5 +- .../Unit/Data/SimpleDataServiceTests.cs | 17 ++-- .../Unit/Data/Units/UnitsDataServiceTests.cs | 9 +- UKSF.Tests/Unit/Events/EventBusTests.cs | 9 +- .../Handlers/AccountEventHandlerTests.cs | 25 ++--- .../CommandRequestEventHandlerTests.cs | 25 ++--- .../CommentThreadEventHandlerTests.cs | 29 ++---- .../Events/Handlers/LogEventHandlerTests.cs | 18 ++-- .../NotificationsEventHandlerTests.cs | 18 ++-- .../Handlers/TeamspeakEventHandlerTests.cs | 64 ++++++------- 154 files changed, 1012 insertions(+), 1060 deletions(-) create mode 100644 UKSF.Api.Base/Models/EventModel.cs delete mode 100644 UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakAccountEventHandler.cs delete mode 100644 UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakMessageEventHandler.cs create mode 100644 UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakServerEventHandler.cs create mode 100644 UKSF.Api.Modpack/Models/ModpackBuildStepEventData.cs create mode 100644 UKSF.Api.Personnel/Models/CommentThreadEventData.cs delete mode 100644 UKSF.Api.Shared/Events/DataEventBus.cs delete mode 100644 UKSF.Api.Shared/Events/EventModelFactory.cs create mode 100644 UKSF.Api.Shared/Models/ContextEventData.cs delete mode 100644 UKSF.Api.Shared/Models/DataEventModel.cs create mode 100644 UKSF.Api.Shared/Models/SignalrEventData.cs delete mode 100644 UKSF.Api.Shared/Models/SignalrEventModel.cs rename UKSF.Api.Shared/Models/{TeamspeakMessageEventModel.cs => TeamspeakMessageEventData.cs} (64%) delete mode 100644 UKSF.Tests/Unit/Common/EventModelFactoryTests.cs diff --git a/Tests/UKSF.Api.Integrations.Teamspeak.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Integrations.Teamspeak.Tests/DependencyInjectionTests.cs index 7cb49d9f..d012e00c 100644 --- a/Tests/UKSF.Api.Integrations.Teamspeak.Tests/DependencyInjectionTests.cs +++ b/Tests/UKSF.Api.Integrations.Teamspeak.Tests/DependencyInjectionTests.cs @@ -29,14 +29,12 @@ public void When_resolving_controllers() { [Fact] public void When_resolving_event_handlers() { - Services.AddTransient(); Services.AddTransient(); - Services.AddTransient(); + Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); - serviceProvider.GetRequiredService().Should().NotBeNull(); serviceProvider.GetRequiredService().Should().NotBeNull(); - serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); } [Fact] diff --git a/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs b/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs index 171490e1..de8cea02 100644 --- a/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs +++ b/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs @@ -1,12 +1,13 @@ using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; namespace UKSF.Api.Tests.Common { public class TestCachedContext : CachedMongoContext, ITestCachedContext { - public TestCachedContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base( + public TestCachedContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base( mongoCollectionFactory, - dataEventBus, + eventBus, collectionName ) { } } diff --git a/Tests/UKSF.Api.Tests.Common/TestContext.cs b/Tests/UKSF.Api.Tests.Common/TestContext.cs index e046bff4..59987bc9 100644 --- a/Tests/UKSF.Api.Tests.Common/TestContext.cs +++ b/Tests/UKSF.Api.Tests.Common/TestContext.cs @@ -1,12 +1,13 @@ using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; namespace UKSF.Api.Tests.Common { public class TestContext : MongoContext, ITestContext { - public TestContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base( + public TestContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base( mongoCollectionFactory, - dataEventBus, + eventBus, collectionName ) { } } diff --git a/Tests/UKSF.Api.Tests.Common/TestDataModel.cs b/Tests/UKSF.Api.Tests.Common/TestDataModel.cs index c3538342..b9bfcff7 100644 --- a/Tests/UKSF.Api.Tests.Common/TestDataModel.cs +++ b/Tests/UKSF.Api.Tests.Common/TestDataModel.cs @@ -3,8 +3,8 @@ namespace UKSF.Api.Tests.Common { public record TestDataModel : MongoObject { - public Dictionary Dictionary = new(); - public string Name; - public List Stuff; + public Dictionary Dictionary { get; set; } = new(); + public string Name { get; set; } + public List Stuff { get; set; } } } diff --git a/UKSF.Api.Admin/ApiAdminExtensions.cs b/UKSF.Api.Admin/ApiAdminExtensions.cs index b323f265..3f640dc7 100644 --- a/UKSF.Api.Admin/ApiAdminExtensions.cs +++ b/UKSF.Api.Admin/ApiAdminExtensions.cs @@ -11,12 +11,10 @@ namespace UKSF.Api.Admin { public static class ApiAdminExtensions { - public static IServiceCollection AddUksfAdmin(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddActions(); + public static IServiceCollection AddUksfAdmin(this IServiceCollection services) => services.AddContexts().AddEventHandlers().AddServices().AddActions(); private static IServiceCollection AddContexts(this IServiceCollection services) => services; - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>(); - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); private static IServiceCollection AddServices(this IServiceCollection services) => diff --git a/UKSF.Api.Admin/Context/VariablesContext.cs b/UKSF.Api.Admin/Context/VariablesContext.cs index 34b764b6..148bb204 100644 --- a/UKSF.Api.Admin/Context/VariablesContext.cs +++ b/UKSF.Api.Admin/Context/VariablesContext.cs @@ -3,8 +3,8 @@ using System.Threading.Tasks; using UKSF.Api.Admin.Models; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Admin.Context { @@ -13,7 +13,7 @@ public interface IVariablesContext : IMongoContext, ICachedMongoCo } public class VariablesContext : CachedMongoContext, IVariablesContext { - public VariablesContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "variables") { } + public VariablesContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "variables") { } public override VariableItem GetSingle(string key) { return base.GetSingle(x => x.Key == key.Keyify()); diff --git a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs b/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs index 97c1097a..9771ff81 100644 --- a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs +++ b/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs @@ -4,6 +4,7 @@ using UKSF.Api.Admin.Signalr.Clients; using UKSF.Api.Admin.Signalr.Hubs; using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Models; @@ -12,32 +13,32 @@ namespace UKSF.Api.Admin.EventHandlers { public interface ILogDataEventHandler : IEventHandler { } public class LogDataEventHandler : ILogDataEventHandler { + private readonly IEventBus _eventBus; private readonly IHubContext _hub; - private readonly IDataEventBus _logDataEventBus; private readonly ILogger _logger; - public LogDataEventHandler(IDataEventBus logDataEventBus, IHubContext hub, ILogger logger) { - _logDataEventBus = logDataEventBus; + public LogDataEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) { + _eventBus = eventBus; _hub = hub; _logger = logger; } public void Init() { - _logDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => _logger.LogError(exception)); + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, _logger.LogError); } - private async Task HandleEvent(DataEventModel dataEventModel) { - if (dataEventModel.Type == DataEventType.ADD) { - await AddedEvent(dataEventModel.Data); + private async Task HandleEvent(EventModel eventModel, BasicLog log) { + if (eventModel.EventType == EventType.ADD) { + await AddedEvent(log); } } - private Task AddedEvent(object log) { + private Task AddedEvent(BasicLog log) { return log switch { AuditLog message => _hub.Clients.All.ReceiveAuditLog(message), LauncherLog message => _hub.Clients.All.ReceiveLauncherLog(message), HttpErrorLog message => _hub.Clients.All.ReceiveErrorLog(message), - BasicLog message => _hub.Clients.All.ReceiveLog(message), + { } message => _hub.Clients.All.ReceiveLog(message), _ => throw new ArgumentOutOfRangeException(nameof(log), "Log type is not valid") }; } diff --git a/UKSF.Api.Admin/Models/VariableItem.cs b/UKSF.Api.Admin/Models/VariableItem.cs index 363c7739..3f228bc6 100644 --- a/UKSF.Api.Admin/Models/VariableItem.cs +++ b/UKSF.Api.Admin/Models/VariableItem.cs @@ -2,7 +2,7 @@ namespace UKSF.Api.Admin.Models { public record VariableItem : MongoObject { - public object Item; - public string Key; + public object Item { get; set; } + public string Key { get; set; } } } diff --git a/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs b/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs index d70c9657..d7573307 100644 --- a/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs +++ b/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs @@ -3,12 +3,10 @@ namespace UKSF.Api.ArmaMissions { public static class ApiArmaMissionsExtensions { - public static IServiceCollection AddUksfArmaMissions(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); + public static IServiceCollection AddUksfArmaMissions(this IServiceCollection services) => services.AddContexts().AddEventHandlers().AddServices(); private static IServiceCollection AddContexts(this IServiceCollection services) => services; - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; private static IServiceCollection AddServices(this IServiceCollection services) => diff --git a/UKSF.Api.ArmaMissions/Models/Mission.cs b/UKSF.Api.ArmaMissions/Models/Mission.cs index 69a90f6c..9ca68bad 100644 --- a/UKSF.Api.ArmaMissions/Models/Mission.cs +++ b/UKSF.Api.ArmaMissions/Models/Mission.cs @@ -2,16 +2,16 @@ namespace UKSF.Api.ArmaMissions.Models { public class Mission { - public static int NextId; - public readonly string DescriptionPath; - public readonly string Path; - public readonly string SqmPath; - public List DescriptionLines; - public int MaxCurators; - public MissionEntity MissionEntity; - public int PlayerCount; - public List RawEntities; - public List SqmLines; + public static int NextId { get; set; } + public string DescriptionPath { get; set; } + public string Path { get; set; } + public string SqmPath { get; set; } + public List DescriptionLines { get; set; } + public int MaxCurators { get; set; } + public MissionEntity MissionEntity { get; set; } + public int PlayerCount { get; set; } + public List RawEntities { get; set; } + public List SqmLines { get; set; } public Mission(string path) { Path = path; diff --git a/UKSF.Api.ArmaMissions/Models/MissionEntity.cs b/UKSF.Api.ArmaMissions/Models/MissionEntity.cs index b9fb0d58..8d673a20 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionEntity.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionEntity.cs @@ -2,7 +2,7 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionEntity { - public readonly List MissionEntityItems = new(); - public int ItemsCount; + public List MissionEntityItems { get; set; } = new(); + public int ItemsCount { get; set; } } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs b/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs index bdc22bc5..a4ec37d6 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs @@ -2,13 +2,13 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionEntityItem { - public static double Position = 10; - public static double CuratorPosition = 0.5; - public string DataType; - public bool IsPlayable; - public MissionEntity MissionEntity; - public List RawMissionEntities = new(); - public List RawMissionEntityItem = new(); - public string Type; + public static double Position { get; set; } = 10; + public static double CuratorPosition { get; set; } = 0.5; + public string DataType { get; set; } + public bool IsPlayable { get; set; } + public MissionEntity MissionEntity { get; set; } + public List RawMissionEntities { get; set; } = new(); + public List RawMissionEntityItem { get; set; } = new(); + public string Type { get; set; } } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs index b1579fe0..3fa5d5c5 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs @@ -3,12 +3,12 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionPatchData { - public static MissionPatchData Instance; - public IEnumerable EngineerIds; - public IEnumerable MedicIds; - public List OrderedUnits; - public List Players; - public List Ranks; - public List Units; + public static MissionPatchData Instance { get; set; } + public IEnumerable EngineerIds { get; set; } + public IEnumerable MedicIds { get; set; } + public List OrderedUnits { get; set; } + public List Players { get; set; } + public List Ranks { get; set; } + public List Units { get; set; } } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs index 84ce6603..8c7c6921 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs @@ -2,9 +2,9 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionPatchingReport { - public string Detail; - public bool Error; - public string Title; + public string Detail { get; set; } + public bool Error { get; set; } + public string Title { get; set; } public MissionPatchingReport(Exception exception) { Title = exception.GetBaseException().Message; diff --git a/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs index 68446506..420c8be5 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs @@ -2,8 +2,8 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionPatchingResult { - public int PlayerCount; - public List Reports = new(); - public bool Success; + public int PlayerCount { get; set; } + public List Reports { get; set; } = new(); + public bool Success { get; set; } } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs b/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs index c2f08904..5100f476 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs @@ -2,10 +2,10 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionPlayer { - public Account Account; - public string Name; - public string ObjectClass; - public Rank Rank; - public MissionUnit Unit; + public Account Account { get; set; } + public string Name { get; set; } + public string ObjectClass { get; set; } + public Rank Rank { get; set; } + public MissionUnit Unit { get; set; } } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionUnit.cs b/UKSF.Api.ArmaMissions/Models/MissionUnit.cs index 05c77127..bbd1e04e 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionUnit.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionUnit.cs @@ -3,9 +3,9 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionUnit { - public string Callsign; - public List Members = new(); - public Dictionary Roles = new(); - public Unit SourceUnit; + public string Callsign { get; set; } + public List Members { get; set; } = new(); + public Dictionary Roles { get; set; } = new(); + public Unit SourceUnit { get; set; } } } diff --git a/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs index 4a749621..891db2de 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs @@ -49,24 +49,16 @@ public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) { }; } - public static void ResolveSpecialUnits(ref List orderedUnits) { - List newOrderedUnits = new(); - foreach (MissionUnit unit in orderedUnits) { - switch (unit.SourceUnit.Id) { - case "5a42835b55d6109bf0b081bd": // "UKSF" - case "5a441619730e9d162834500b": // "7 Squadron" - case "5a441602730e9d162834500a": // "656 Squadron" - case "5a4415d8730e9d1628345007": // "617 Squadron" - case "5a848590eab14d12cc7fa618": // "RAF Cranwell" - case "5c98d7b396dba31f24cdb19c": // "51 Squadron" - continue; - default: - newOrderedUnits.Add(unit); - break; - } - } - - orderedUnits = newOrderedUnits; + public static void ResolveSpecialUnits(List orderedUnits) { + List ids = new() { + "5a42835b55d6109bf0b081bd", // "UKSF" + "5a441619730e9d162834500b", // "7 Squadron" + "5a441602730e9d162834500a", // "656 Squadron" + "5a4415d8730e9d1628345007", // "617 Squadron" + "5a848590eab14d12cc7fa618", // "RAF Cranwell" + "5c98d7b396dba31f24cdb19c" // "51 Squadron" + }; + orderedUnits.RemoveAll(x => ids.Contains(x.SourceUnit.Id)); } public static List ResolveUnitSlots(MissionUnit unit) { diff --git a/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs b/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs index 3dc9212c..8754a198 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs @@ -68,7 +68,7 @@ public void UpdatePatchData() { MissionPatchData.Instance.OrderedUnits.Add(parent); InsertUnitChildren(MissionPatchData.Instance.OrderedUnits, parent); MissionPatchData.Instance.OrderedUnits.RemoveAll(x => !MissionDataResolver.IsUnitPermanent(x) && x.Members.Count == 0 || string.IsNullOrEmpty(x.Callsign)); - MissionDataResolver.ResolveSpecialUnits(ref MissionPatchData.Instance.OrderedUnits); + MissionDataResolver.ResolveSpecialUnits(MissionPatchData.Instance.OrderedUnits); } private static void InsertUnitChildren(List newUnits, MissionUnit parent) { diff --git a/UKSF.Api.ArmaMissions/Services/MissionService.cs b/UKSF.Api.ArmaMissions/Services/MissionService.cs index 616b0298..3caeffd3 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionService.cs @@ -151,7 +151,7 @@ private void ReadSettings() { } string curatorsMaxString = curatorsMaxLine.Split("=")[1].RemoveSpaces().Replace(";", ""); - if (!int.TryParse(curatorsMaxString, out _mission.MaxCurators)) { + if (!int.TryParse(curatorsMaxString, out int maxCurators)) { _reports.Add( new MissionPatchingReport( "Using hardcoded setting 'uksf_curator_curatorsMax'", @@ -160,6 +160,8 @@ private void ReadSettings() { "The hardcoded value (5) will be used instead." ) ); + } else { + _mission.MaxCurators = maxCurators; } } diff --git a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs index 8af6c416..01df201c 100644 --- a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs +++ b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs @@ -9,12 +9,10 @@ namespace UKSF.Api.ArmaServer { public static class ApiArmaServerExtensions { - public static IServiceCollection AddUksfArmaServer(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); + public static IServiceCollection AddUksfArmaServer(this IServiceCollection services) => services.AddContexts().AddEventHandlers().AddServices(); private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton(); - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>(); - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton().AddSingleton(); diff --git a/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs b/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs index 9f95a638..fc9e848a 100644 --- a/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs +++ b/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs @@ -2,6 +2,7 @@ using System.Linq; using UKSF.Api.ArmaServer.Models; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -9,7 +10,7 @@ namespace UKSF.Api.ArmaServer.DataContext { public interface IGameServersContext : IMongoContext, ICachedMongoContext { } public class GameServersContext : CachedMongoContext, IGameServersContext { - public GameServersContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "gameServers") { } + public GameServersContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "gameServers") { } protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { diff --git a/UKSF.Api.ArmaServer/Models/GameServer.cs b/UKSF.Api.ArmaServer/Models/GameServer.cs index bfb0b7b5..6e3b8aa2 100644 --- a/UKSF.Api.ArmaServer/Models/GameServer.cs +++ b/UKSF.Api.ArmaServer/Models/GameServer.cs @@ -10,35 +10,35 @@ public enum GameServerOption { } public record GameServer : MongoObject { - [BsonIgnore] public readonly List HeadlessClientProcessIds = new(); - public string AdminPassword; - public int ApiPort; - [BsonIgnore] public bool CanLaunch; - public GameEnvironment Environment; - public string HostName; - public List Mods = new(); - public string Name; - public int NumberHeadlessClients; - public int Order = 0; - public string Password; - public int Port; - [BsonIgnore] public int? ProcessId; - public string ProfileName; - public List ServerMods = new(); - public GameServerOption ServerOption; - [BsonIgnore] public GameServerStatus Status = new(); + [BsonIgnore] public List HeadlessClientProcessIds { get; set; } = new(); + public string AdminPassword { get; set; } + public int ApiPort { get; set; } + [BsonIgnore] public bool CanLaunch { get; set; } + public GameEnvironment Environment { get; set; } + public string HostName { get; set; } + public List Mods { get; set; } = new(); + public string Name { get; set; } + public int NumberHeadlessClients { get; set; } + public int Order { get; set; } = 0; + public string Password { get; set; } + public int Port { get; set; } + [BsonIgnore] public int? ProcessId { get; set; } + public string ProfileName { get; set; } + public List ServerMods { get; set; } = new(); + public GameServerOption ServerOption { get; set; } + [BsonIgnore] public GameServerStatus Status { get; set; }= new(); public override string ToString() => $"{Name}, {Port}, {ApiPort}, {NumberHeadlessClients}, {ProfileName}, {HostName}, {Password}, {AdminPassword}, {Environment}, {ServerOption}"; } public class GameServerStatus { - public string Map; - public string MaxPlayers; - public string Mission; - public string ParsedUptime; - public int Players; - public bool Running; - public bool Started; - public float Uptime; + public string Map { get; set; } + public string MaxPlayers { get; set; } + public string Mission { get; set; } + public string ParsedUptime { get; set; } + public int Players { get; set; } + public bool Running { get; set; } + public bool Started { get; set; } + public float Uptime { get; set; } } } diff --git a/UKSF.Api.ArmaServer/Models/GameServerMod.cs b/UKSF.Api.ArmaServer/Models/GameServerMod.cs index c12b79fe..31ce7883 100644 --- a/UKSF.Api.ArmaServer/Models/GameServerMod.cs +++ b/UKSF.Api.ArmaServer/Models/GameServerMod.cs @@ -1,9 +1,9 @@ namespace UKSF.Api.ArmaServer.Models { public class GameServerMod { - public bool IsDuplicate; - public string Name; - public string Path; - public string PathRelativeToServerExecutable; + public bool IsDuplicate { get; set; } + public string Name { get; set; } + public string Path { get; set; } + public string PathRelativeToServerExecutable { get; set; } public override string ToString() => Name; } diff --git a/UKSF.Api.ArmaServer/Models/MissionFile.cs b/UKSF.Api.ArmaServer/Models/MissionFile.cs index ae668653..6b466a9d 100644 --- a/UKSF.Api.ArmaServer/Models/MissionFile.cs +++ b/UKSF.Api.ArmaServer/Models/MissionFile.cs @@ -2,9 +2,9 @@ namespace UKSF.Api.ArmaServer.Models { public class MissionFile { - public string Map; - public string Name; - public string Path; + public string Map { get; set; } + public string Name { get; set; } + public string Path { get; set; } public MissionFile(FileSystemInfo fileInfo) { string[] fileNameParts = fileInfo.Name.Split("."); diff --git a/UKSF.Api.Auth/ApiAuthExtensions.cs b/UKSF.Api.Auth/ApiAuthExtensions.cs index f98d43b5..eabb6f54 100644 --- a/UKSF.Api.Auth/ApiAuthExtensions.cs +++ b/UKSF.Api.Auth/ApiAuthExtensions.cs @@ -20,13 +20,11 @@ public static class ApiAuthExtensions { public static IServiceCollection AddUksfAuth(this IServiceCollection services, IConfiguration configuration) { SecurityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetSection("Secrets")["tokenKey"])); - return services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddAuthentication(); + return services.AddContexts().AddEventHandlers().AddServices().AddAuthentication(); } private static IServiceCollection AddContexts(this IServiceCollection services) => services; - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton().AddSingleton(); diff --git a/UKSF.Api.Auth/Services/PermissionsService.cs b/UKSF.Api.Auth/Services/PermissionsService.cs index 1b08c7f3..10fb5692 100644 --- a/UKSF.Api.Auth/Services/PermissionsService.cs +++ b/UKSF.Api.Auth/Services/PermissionsService.cs @@ -13,7 +13,6 @@ public interface IPermissionsService { } public class PermissionsService : IPermissionsService { - private readonly string[] _admins = { "59e38f10594c603b78aa9dbd", "5a1e894463d0f71710089106", "5a1ae0f0b9bcb113a44edada" }; // TODO: Make this an account flag private readonly IRanksService _ranksService; private readonly IRecruitmentService _recruitmentService; private readonly IUnitsContext _unitsContext; @@ -34,7 +33,7 @@ public IEnumerable GrantPermissions(Account account) { switch (account.MembershipState) { case MembershipState.MEMBER: { permissions.Add(Permissions.MEMBER); - bool admin = _admins.Contains(account.Id); + bool admin = account.Admin; if (admin) { permissions.UnionWith(Permissions.ALL); break; @@ -44,8 +43,8 @@ public IEnumerable GrantPermissions(Account account) { permissions.Add(Permissions.COMMAND); } - // TODO: Remove hardcoded rank - if (account.Rank != null && _ranksService.IsSuperiorOrEqual(account.Rank, "Senior Aircraftman")) { + string ncoRank = _variablesService.GetVariable("PERMISSIONS_NCO_RANK").AsString(); + if (account.Rank != null && _ranksService.IsSuperiorOrEqual(account.Rank, ncoRank)) { permissions.Add(Permissions.NCO); } diff --git a/UKSF.Api.Base/ApiBaseExtensions.cs b/UKSF.Api.Base/ApiBaseExtensions.cs index 7c2788e1..58ba45d0 100644 --- a/UKSF.Api.Base/ApiBaseExtensions.cs +++ b/UKSF.Api.Base/ApiBaseExtensions.cs @@ -3,18 +3,19 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; namespace UKSF.Api.Base { public static class ApiBaseExtensions { public static IServiceCollection AddUksfBase(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { services.AddContexts() - .AddEventBuses() .AddEventHandlers() .AddServices() .AddSingleton(configuration) .AddSingleton(currentEnvironment) .AddSingleton() .AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))) + .AddSingleton() .AddTransient(); services.AddSignalR().AddNewtonsoftJsonProtocol(); return services; @@ -22,8 +23,6 @@ public static IServiceCollection AddUksfBase(this IServiceCollection services, I private static IServiceCollection AddContexts(this IServiceCollection services) => services; - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; private static IServiceCollection AddServices(this IServiceCollection services) => services; diff --git a/UKSF.Api.Base/Events/EventBus.cs b/UKSF.Api.Base/Events/EventBus.cs index b6adee62..e486b9a2 100644 --- a/UKSF.Api.Base/Events/EventBus.cs +++ b/UKSF.Api.Base/Events/EventBus.cs @@ -1,20 +1,26 @@ using System; using System.Reactive.Linq; using System.Reactive.Subjects; +using UKSF.Api.Base.Models; namespace UKSF.Api.Base.Events { - public interface IEventBus { - void Send(T message); - IObservable AsObservable(); + public interface IEventBus { + void Send(EventModel eventModel); + void Send(object data); + IObservable AsObservable(); } - public class EventBus : IEventBus { + public class EventBus : IEventBus { protected readonly Subject Subject = new(); - public void Send(T message) { - Subject.OnNext(message); + public void Send(EventModel eventModel) { + Subject.OnNext(eventModel); } - public virtual IObservable AsObservable() => Subject.OfType(); + public void Send(object data) { + Send(new EventModel(EventType.NONE, data)); + } + + public virtual IObservable AsObservable() => Subject.OfType(); } } diff --git a/UKSF.Api.Base/Models/EventModel.cs b/UKSF.Api.Base/Models/EventModel.cs new file mode 100644 index 00000000..8bf8f83e --- /dev/null +++ b/UKSF.Api.Base/Models/EventModel.cs @@ -0,0 +1,18 @@ +namespace UKSF.Api.Base.Models { + public enum EventType { + NONE, + ADD, + UPDATE, + DELETE + } + + public class EventModel { + public EventModel(EventType eventType, object data) { + EventType = eventType; + Data = data; + } + + public object Data { get; } + public EventType EventType { get; } + } +} diff --git a/UKSF.Api.Base/Models/MongoObject.cs b/UKSF.Api.Base/Models/MongoObject.cs index bccbe1ff..0ce12110 100644 --- a/UKSF.Api.Base/Models/MongoObject.cs +++ b/UKSF.Api.Base/Models/MongoObject.cs @@ -3,6 +3,6 @@ namespace UKSF.Api.Base.Models { public record MongoObject { - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string Id = ObjectId.GenerateNewId().ToString(); + [BsonId, BsonRepresentation(BsonType.ObjectId)] public string Id { get; set; } = ObjectId.GenerateNewId().ToString(); } } diff --git a/UKSF.Api.Command/ApiCommandExtensions.cs b/UKSF.Api.Command/ApiCommandExtensions.cs index ce15b062..775d0766 100644 --- a/UKSF.Api.Command/ApiCommandExtensions.cs +++ b/UKSF.Api.Command/ApiCommandExtensions.cs @@ -10,7 +10,7 @@ namespace UKSF.Api.Command { public static class ApiCommandExtensions { - public static IServiceCollection AddUksfCommand(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); + public static IServiceCollection AddUksfCommand(this IServiceCollection services) => services.AddContexts().AddEventHandlers().AddServices(); private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton() @@ -20,12 +20,6 @@ private static IServiceCollection AddContexts(this IServiceCollection services) .AddSingleton() .AddSingleton(); - private static IServiceCollection AddEventBuses(this IServiceCollection services) => - services.AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>(); - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); private static IServiceCollection AddServices(this IServiceCollection services) => diff --git a/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs b/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs index da0284c6..27b71765 100644 --- a/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs +++ b/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs @@ -1,4 +1,6 @@ using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -8,12 +10,12 @@ namespace UKSF.Api.Command.Context { public interface ICommandRequestArchiveContext : IMongoContext { } public class CommandRequestArchiveContext : MongoContext, ICommandRequestArchiveContext { - public CommandRequestArchiveContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base( + public CommandRequestArchiveContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base( mongoCollectionFactory, - dataEventBus, + eventBus, "commandRequestsArchive" ) { } - protected override void DataEvent(DataEventModel dataEvent) { } + protected override void DataEvent(EventModel eventModel) { } } } diff --git a/UKSF.Api.Command/Context/CommandRequestContext.cs b/UKSF.Api.Command/Context/CommandRequestContext.cs index 3f637b66..fb4c05f9 100644 --- a/UKSF.Api.Command/Context/CommandRequestContext.cs +++ b/UKSF.Api.Command/Context/CommandRequestContext.cs @@ -1,4 +1,5 @@ using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -7,6 +8,6 @@ namespace UKSF.Api.Command.Context { public interface ICommandRequestContext : IMongoContext, ICachedMongoContext { } public class CommandRequestContext : CachedMongoContext, ICommandRequestContext { - public CommandRequestContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "commandRequests") { } + public CommandRequestContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "commandRequests") { } } } diff --git a/UKSF.Api.Command/Context/DischargeContext.cs b/UKSF.Api.Command/Context/DischargeContext.cs index 3089797e..c1df4db9 100644 --- a/UKSF.Api.Command/Context/DischargeContext.cs +++ b/UKSF.Api.Command/Context/DischargeContext.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -9,7 +10,7 @@ namespace UKSF.Api.Command.Context { public interface IDischargeContext : IMongoContext, ICachedMongoContext { } public class DischargeContext : CachedMongoContext, IDischargeContext { - public DischargeContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "discharges") { } + public DischargeContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "discharges") { } protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { diff --git a/UKSF.Api.Command/Context/LoaContext.cs b/UKSF.Api.Command/Context/LoaContext.cs index 7cb26488..6b3be3af 100644 --- a/UKSF.Api.Command/Context/LoaContext.cs +++ b/UKSF.Api.Command/Context/LoaContext.cs @@ -1,4 +1,5 @@ using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -7,6 +8,6 @@ namespace UKSF.Api.Command.Context { public interface ILoaContext : IMongoContext, ICachedMongoContext { } public class LoaContext : CachedMongoContext, ILoaContext { - public LoaContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "loas") { } + public LoaContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "loas") { } } } diff --git a/UKSF.Api.Command/Context/OperationOrderContext.cs b/UKSF.Api.Command/Context/OperationOrderContext.cs index f5f15be9..c803b5a0 100644 --- a/UKSF.Api.Command/Context/OperationOrderContext.cs +++ b/UKSF.Api.Command/Context/OperationOrderContext.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -9,7 +10,7 @@ namespace UKSF.Api.Command.Context { public interface IOperationOrderContext : IMongoContext, ICachedMongoContext { } public class OperationOrderContext : CachedMongoContext, IOperationOrderContext { - public OperationOrderContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "opord") { } + public OperationOrderContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "opord") { } protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { diff --git a/UKSF.Api.Command/Context/OperationReportContext.cs b/UKSF.Api.Command/Context/OperationReportContext.cs index e4f2b5e0..b49cd524 100644 --- a/UKSF.Api.Command/Context/OperationReportContext.cs +++ b/UKSF.Api.Command/Context/OperationReportContext.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -9,7 +10,7 @@ namespace UKSF.Api.Command.Context { public interface IOperationReportContext : IMongoContext, ICachedMongoContext { } public class OperationReportContext : CachedMongoContext, IOperationReportContext { - public OperationReportContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "oprep") { } + public OperationReportContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "oprep") { } protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { diff --git a/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs b/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs index a6ff9238..5d96da05 100644 --- a/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs +++ b/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs @@ -1,7 +1,7 @@ -using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Command.Models; using UKSF.Api.Command.Signalr.Clients; using UKSF.Api.Command.Signalr.Hubs; @@ -13,28 +13,27 @@ namespace UKSF.Api.Command.EventHandlers { public interface ICommandRequestEventHandler : IEventHandler { } public class CommandRequestEventHandler : ICommandRequestEventHandler { - private readonly IDataEventBus _commandRequestDataEventBus; + private readonly IEventBus _eventBus; private readonly IHubContext _hub; private readonly ILogger _logger; - public CommandRequestEventHandler(IDataEventBus commandRequestDataEventBus, IHubContext hub, ILogger logger) { - _commandRequestDataEventBus = commandRequestDataEventBus; + public CommandRequestEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) { + _eventBus = eventBus; _hub = hub; _logger = logger; } public void Init() { - _commandRequestDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => _logger.LogError(exception)); + _eventBus.AsObservable().SubscribeWithAsyncNext>(HandleEvent, _logger.LogError); } - private async Task HandleEvent(DataEventModel dataEventModel) { - switch (dataEventModel.Type) { - case DataEventType.ADD: - case DataEventType.UPDATE: + private async Task HandleEvent(EventModel eventModel, ContextEventData _) { + switch (eventModel.EventType) { + case EventType.ADD: + case EventType.UPDATE: await UpdatedEvent(); break; - case DataEventType.DELETE: break; - default: throw new ArgumentOutOfRangeException(nameof(dataEventModel)); + case EventType.DELETE: break; } } diff --git a/UKSF.Api.Command/Models/CommandRequest.cs b/UKSF.Api.Command/Models/CommandRequest.cs index d290621a..bf44c101 100644 --- a/UKSF.Api.Command/Models/CommandRequest.cs +++ b/UKSF.Api.Command/Models/CommandRequest.cs @@ -26,17 +26,18 @@ public static class CommandRequestType { } public record CommandRequest : MongoObject { - public DateTime DateCreated; - public string DisplayFrom; - public string DisplayRecipient; - public string DisplayRequester; - public string DisplayValue; - public string Reason, Type; - [BsonRepresentation(BsonType.ObjectId)] public string Recipient; - [BsonRepresentation(BsonType.ObjectId)] public string Requester; - public Dictionary Reviews = new(); - public string SecondaryValue; - public string Value; + public DateTime DateCreated { get; set; } + public string DisplayFrom { get; set; } + public string DisplayRecipient { get; set; } + public string DisplayRequester { get; set; } + public string DisplayValue { get; set; } + public string Reason { get; set; } + public string Type { get; set; } + [BsonRepresentation(BsonType.ObjectId)] public string Recipient { get; set; } + [BsonRepresentation(BsonType.ObjectId)] public string Requester { get; set; } + public Dictionary Reviews { get; set; } = new(); + public string SecondaryValue { get; set; } + public string Value { get; set; } public CommandRequest() => DateCreated = DateTime.Now; } } diff --git a/UKSF.Api.Command/Models/CommandRequestLoa.cs b/UKSF.Api.Command/Models/CommandRequestLoa.cs index 8b59583f..d0932c9e 100644 --- a/UKSF.Api.Command/Models/CommandRequestLoa.cs +++ b/UKSF.Api.Command/Models/CommandRequestLoa.cs @@ -2,9 +2,9 @@ namespace UKSF.Api.Command.Models { public record CommandRequestLoa : CommandRequest { - public string Emergency; - public DateTime End; - public string Late; - public DateTime Start; + public string Emergency { get; set; } + public DateTime End { get; set; } + public string Late { get; set; } + public DateTime Start { get; set; } } } diff --git a/UKSF.Api.Command/Models/CreateOperationOrderRequest.cs b/UKSF.Api.Command/Models/CreateOperationOrderRequest.cs index 4e1c88dc..785694ee 100644 --- a/UKSF.Api.Command/Models/CreateOperationOrderRequest.cs +++ b/UKSF.Api.Command/Models/CreateOperationOrderRequest.cs @@ -2,12 +2,12 @@ namespace UKSF.Api.Command.Models { public class CreateOperationOrderRequest { - public DateTime End; - public int Endtime; - public string Map; - public string Name; - public DateTime Start; - public int Starttime; - public string Type; + public DateTime End { get; set; } + public int Endtime { get; set; } + public string Map { get; set; } + public string Name { get; set; } + public DateTime Start { get; set; } + public int Starttime { get; set; } + public string Type { get; set; } } } diff --git a/UKSF.Api.Command/Models/CreateOperationReport.cs b/UKSF.Api.Command/Models/CreateOperationReport.cs index 46191437..0d811b69 100644 --- a/UKSF.Api.Command/Models/CreateOperationReport.cs +++ b/UKSF.Api.Command/Models/CreateOperationReport.cs @@ -2,13 +2,13 @@ namespace UKSF.Api.Command.Models { public class CreateOperationReportRequest { - public DateTime End; - public int Endtime; - public string Map; - public string Name; - public string Result; - public DateTime Start; - public int Starttime; - public string Type; + public DateTime End { get; set; } + public int Endtime { get; set; } + public string Map { get; set; } + public string Name { get; set; } + public string Result { get; set; } + public DateTime Start { get; set; } + public int Starttime { get; set; } + public string Type { get; set; } } } diff --git a/UKSF.Api.Command/Models/Discharge.cs b/UKSF.Api.Command/Models/Discharge.cs index 9d26d752..aee7d5a0 100644 --- a/UKSF.Api.Command/Models/Discharge.cs +++ b/UKSF.Api.Command/Models/Discharge.cs @@ -6,19 +6,19 @@ namespace UKSF.Api.Command.Models { public record DischargeCollection : MongoObject { - [BsonRepresentation(BsonType.ObjectId)] public string AccountId; - public List Discharges = new(); - public string Name; - public bool Reinstated; - [BsonIgnore] public bool RequestExists; + [BsonRepresentation(BsonType.ObjectId)] public string AccountId { get; set; } + public List Discharges { get; set; } = new(); + public string Name { get; set; } + public bool Reinstated { get; set; } + [BsonIgnore] public bool RequestExists { get; set; } } public record Discharge : MongoObject { - public string DischargedBy; - public string Rank; - public string Reason; - public string Role; - public DateTime Timestamp = DateTime.Now; - public string Unit; + public string DischargedBy { get; set; } + public string Rank { get; set; } + public string Reason { get; set; } + public string Role { get; set; } + public DateTime Timestamp { get; set; } = DateTime.Now; + public string Unit { get; set; } } } diff --git a/UKSF.Api.Command/Models/Opord.cs b/UKSF.Api.Command/Models/Opord.cs index 1eaf8a69..c3540d34 100644 --- a/UKSF.Api.Command/Models/Opord.cs +++ b/UKSF.Api.Command/Models/Opord.cs @@ -3,11 +3,11 @@ namespace UKSF.Api.Command.Models { public record Opord : MongoObject { - public string Description; - public DateTime End; - public string Map; - public string Name; - public DateTime Start; - public string Type; + public string Description { get; set; } + public DateTime End { get; set; } + public string Map { get; set; } + public string Name { get; set; } + public DateTime Start { get; set; } + public string Type { get; set; } } } diff --git a/UKSF.Api.Command/Models/Oprep.cs b/UKSF.Api.Command/Models/Oprep.cs index 9d08a02b..8c685e0f 100644 --- a/UKSF.Api.Command/Models/Oprep.cs +++ b/UKSF.Api.Command/Models/Oprep.cs @@ -4,13 +4,13 @@ namespace UKSF.Api.Command.Models { public record Oprep : MongoObject { - public AttendanceReport AttendanceReport; - public string Description; - public DateTime End; - public string Map; - public string Name; - public string Result; - public DateTime Start; - public string Type; + public AttendanceReport AttendanceReport { get; set; } + public string Description { get; set; } + public DateTime End { get; set; } + public string Map { get; set; } + public string Name { get; set; } + public string Result { get; set; } + public DateTime Start { get; set; } + public string Type { get; set; } } } diff --git a/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs b/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs index 86f4a1db..d244c210 100644 --- a/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs +++ b/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs @@ -4,12 +4,10 @@ namespace UKSF.Api.Discord { public static class ApiIntegrationDiscordExtensions { - public static IServiceCollection AddUksfIntegrationDiscord(this IServiceCollection services) => services.AddContexts().AddEventBuses().AddEventHandlers().AddServices(); + public static IServiceCollection AddUksfIntegrationDiscord(this IServiceCollection services) => services.AddContexts().AddEventHandlers().AddServices(); private static IServiceCollection AddContexts(this IServiceCollection services) => services; - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton(); diff --git a/UKSF.Api.Integrations.Discord/EventHandlers/DiscordAccountEventHandler.cs b/UKSF.Api.Integrations.Discord/EventHandlers/DiscordAccountEventHandler.cs index 67d79cd7..841789ab 100644 --- a/UKSF.Api.Integrations.Discord/EventHandlers/DiscordAccountEventHandler.cs +++ b/UKSF.Api.Integrations.Discord/EventHandlers/DiscordAccountEventHandler.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Discord.Services; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Events; @@ -9,21 +10,21 @@ namespace UKSF.Api.Discord.EventHandlers { public interface IDiscordAccountEventHandler : IEventHandler { } public class DiscordAccountEventHandler : IDiscordAccountEventHandler { - private readonly IEventBus _accountEventBus; private readonly IDiscordService _discordService; + private readonly IEventBus _eventBus; private readonly ILogger _logger; - public DiscordAccountEventHandler(IEventBus accountEventBus, ILogger logger, IDiscordService discordService) { - _accountEventBus = accountEventBus; + public DiscordAccountEventHandler(IEventBus eventBus, ILogger logger, IDiscordService discordService) { + _eventBus = eventBus; _logger = logger; _discordService = discordService; } public void Init() { - _accountEventBus.AsObservable().SubscribeWithAsyncNext(HandleAccountEvent, exception => _logger.LogError(exception)); + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleAccountEvent, _logger.LogError); } - private async Task HandleAccountEvent(Account account) { + private async Task HandleAccountEvent(EventModel _, Account account) { await _discordService.UpdateAccount(account); } } diff --git a/UKSF.Api.Integrations.Instagram/ApiIntegrationInstagramExtensions.cs b/UKSF.Api.Integrations.Instagram/ApiIntegrationInstagramExtensions.cs index 5aabd131..57734357 100644 --- a/UKSF.Api.Integrations.Instagram/ApiIntegrationInstagramExtensions.cs +++ b/UKSF.Api.Integrations.Instagram/ApiIntegrationInstagramExtensions.cs @@ -6,7 +6,7 @@ namespace UKSF.Api.Integrations.Instagram { public static class ApiIntegrationInstagramExtensions { public static IServiceCollection AddUksfIntegrationInstagram(this IServiceCollection services) => services.AddContexts() - .AddEventBuses() + .AddEventHandlers() .AddServices() .AddTransient() @@ -14,8 +14,6 @@ public static IServiceCollection AddUksfIntegrationInstagram(this IServiceCollec private static IServiceCollection AddContexts(this IServiceCollection services) => services; - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton(); diff --git a/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs b/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs index 1358ee55..41eb3584 100644 --- a/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs +++ b/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs @@ -3,13 +3,13 @@ namespace UKSF.Api.Integrations.Instagram.Models { public class InstagramImage { - public string Base64; - public string Id; + public string Base64 { get; set; } + public string Id { get; set; } - [JsonProperty("media_type")] public string MediaType; - [JsonProperty("media_url")] public string MediaUrl; + [JsonProperty("media_type")] public string MediaType { get; set; } + [JsonProperty("media_url")] public string MediaUrl { get; set; } - public string Permalink; - public DateTime Timestamp; + public string Permalink { get; set; } + public DateTime Timestamp { get; set; } } } diff --git a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs index 8c2aabac..fa3e2480 100644 --- a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs +++ b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs @@ -11,16 +11,13 @@ namespace UKSF.Api.Teamspeak { public static class ApiIntegrationTeamspeakExtensions { public static IServiceCollection AddUksfIntegrationTeamspeak(this IServiceCollection services) => - services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddTransient(); + services.AddContexts().AddEventHandlers().AddServices().AddTransient(); private static IServiceCollection AddContexts(this IServiceCollection services) => services; - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, EventBus>(); - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton() - .AddSingleton() - .AddSingleton(); + .AddSingleton(); private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton() diff --git a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakAccountEventHandler.cs b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakAccountEventHandler.cs deleted file mode 100644 index 1e400897..00000000 --- a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakAccountEventHandler.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Threading.Tasks; -using UKSF.Api.Base.Events; -using UKSF.Api.Personnel.Models; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Extensions; -using UKSF.Api.Teamspeak.Services; - -namespace UKSF.Api.Teamspeak.EventHandlers { - public interface ITeamspeakAccountEventHandler : IEventHandler { } - - // TODO: Come up with better naming and a better structure for event handlers in components (multiple components can consume the same event, can't all be called XHandler) - public class TeamspeakAccountEventHandler : ITeamspeakAccountEventHandler { - private readonly IEventBus _accountEventBus; - private readonly ILogger _logger; - private readonly ITeamspeakService _teamspeakService; - - public TeamspeakAccountEventHandler(IEventBus accountEventBus, ILogger logger, ITeamspeakService teamspeakService) { - _accountEventBus = accountEventBus; - _logger = logger; - _teamspeakService = teamspeakService; - } - - public void Init() { - _accountEventBus.AsObservable().SubscribeWithAsyncNext(HandleAccountEvent, exception => _logger.LogError(exception)); - } - - private async Task HandleAccountEvent(Account account) { - await _teamspeakService.UpdateAccountTeamspeakGroups(account); - } - } -} diff --git a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs index 637663ee..e48b0cba 100644 --- a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs +++ b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs @@ -1,91 +1,37 @@ -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using Newtonsoft.Json.Linq; +using System.Threading.Tasks; using UKSF.Api.Base.Events; -using UKSF.Api.Personnel.Context; +using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Models; -using UKSF.Api.Teamspeak.Models; using UKSF.Api.Teamspeak.Services; namespace UKSF.Api.Teamspeak.EventHandlers { public interface ITeamspeakEventHandler : IEventHandler { } public class TeamspeakEventHandler : ITeamspeakEventHandler { - private readonly IAccountContext _accountContext; - private readonly IEventBus _eventBus; + private readonly IEventBus _eventBus; private readonly ILogger _logger; - private readonly ConcurrentDictionary _serverGroupUpdates = new(); - private readonly ITeamspeakGroupService _teamspeakGroupService; private readonly ITeamspeakService _teamspeakService; - public TeamspeakEventHandler(IAccountContext accountContext, IEventBus eventBus, ITeamspeakService teamspeakService, ITeamspeakGroupService teamspeakGroupService, ILogger logger) { - _accountContext = accountContext; + public TeamspeakEventHandler(IEventBus eventBus, ILogger logger, ITeamspeakService teamspeakService) { _eventBus = eventBus; - _teamspeakService = teamspeakService; - _teamspeakGroupService = teamspeakGroupService; _logger = logger; + _teamspeakService = teamspeakService; } public void Init() { - _eventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => _logger.LogError(exception)); + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleAccountEvent, _logger.LogError); + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleTeamspeakMessageEvent, _logger.LogError); } - private async Task HandleEvent(SignalrEventModel signalrEventModel) { - switch (signalrEventModel.Procedure) { - case TeamspeakEventType.CLIENTS: - await UpdateClients(signalrEventModel.Args.ToString()); - break; - case TeamspeakEventType.CLIENT_SERVER_GROUPS: - await UpdateClientServerGroups(signalrEventModel.Args.ToString()); - break; - case TeamspeakEventType.EMPTY: break; - default: throw new ArgumentException("Invalid teamspeak event type"); - } - } - - private async Task UpdateClients(string args) { - await Console.Out.WriteLineAsync(args); - JArray clientsArray = JArray.Parse(args); - if (clientsArray.Count == 0) return; - - HashSet clients = clientsArray.ToObject>(); - await Console.Out.WriteLineAsync("Updating online clients"); - await _teamspeakService.UpdateClients(clients); + private async Task HandleAccountEvent(EventModel eventModel, Account account) { + await _teamspeakService.UpdateAccountTeamspeakGroups(account); } - private async Task UpdateClientServerGroups(string args) { - JObject updateObject = JObject.Parse(args); - double clientDbid = double.Parse(updateObject["clientDbid"].ToString()); - double serverGroupId = double.Parse(updateObject["serverGroupId"].ToString()); - await Console.Out.WriteLineAsync($"Server group for {clientDbid}: {serverGroupId}"); - - TeamspeakServerGroupUpdate update = _serverGroupUpdates.GetOrAdd(clientDbid, _ => new TeamspeakServerGroupUpdate()); - update.ServerGroups.Add(serverGroupId); - update.CancellationTokenSource?.Cancel(); - update.CancellationTokenSource = new CancellationTokenSource(); - Task unused = TaskUtilities.DelayWithCallback( - TimeSpan.FromMilliseconds(500), - update.CancellationTokenSource.Token, - async () => { - update.CancellationTokenSource.Cancel(); - await ProcessAccountData(clientDbid, update.ServerGroups); - } - ); - } - - private async Task ProcessAccountData(double clientDbId, ICollection serverGroups) { - await Console.Out.WriteLineAsync($"Processing server groups for {clientDbId}"); - Account account = _accountContext.GetSingle(x => x.TeamspeakIdentities != null && x.TeamspeakIdentities.Any(y => y.Equals(clientDbId))); - Task unused = _teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); - - _serverGroupUpdates.TryRemove(clientDbId, out TeamspeakServerGroupUpdate _); + private async Task HandleTeamspeakMessageEvent(EventModel eventModel, TeamspeakMessageEventData messageEvent) { + await _teamspeakService.SendTeamspeakMessageToClient(messageEvent.ClientDbIds, messageEvent.Message); } } } diff --git a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakMessageEventHandler.cs b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakMessageEventHandler.cs deleted file mode 100644 index 9787c4ad..00000000 --- a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakMessageEventHandler.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Threading.Tasks; -using UKSF.Api.Base.Events; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Extensions; -using UKSF.Api.Shared.Models; -using UKSF.Api.Teamspeak.Services; - -namespace UKSF.Api.Teamspeak.EventHandlers { - public interface ITeamspeakMessageEventHandler : IEventHandler { } - - public class TeamspeakMessageEventHandler : ITeamspeakMessageEventHandler { - private readonly IEventBus _accountEventBus; - private readonly ILogger _logger; - private readonly ITeamspeakService _teamspeakService; - - public TeamspeakMessageEventHandler(IEventBus accountEventBus, ILogger logger, ITeamspeakService teamspeakService) { - _accountEventBus = accountEventBus; - _logger = logger; - _teamspeakService = teamspeakService; - } - - public void Init() { - _accountEventBus.AsObservable().SubscribeWithAsyncNext(HandleMessageEvent, exception => _logger.LogError(exception)); - } - - private async Task HandleMessageEvent(TeamspeakMessageEventModel messageEvent) { - await _teamspeakService.SendTeamspeakMessageToClient(messageEvent.ClientDbIds, messageEvent.Message); - } - } -} diff --git a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakServerEventHandler.cs b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakServerEventHandler.cs new file mode 100644 index 00000000..4025050c --- /dev/null +++ b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakServerEventHandler.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using Newtonsoft.Json.Linq; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Models; +using UKSF.Api.Teamspeak.Models; +using UKSF.Api.Teamspeak.Services; + +namespace UKSF.Api.Teamspeak.EventHandlers { + public interface ITeamspeakServerEventHandler : IEventHandler { } + + public class TeamspeakServerEventHandler : ITeamspeakServerEventHandler { + private readonly IAccountContext _accountContext; + private readonly IEventBus _eventBus; + private readonly ILogger _logger; + private readonly ConcurrentDictionary _serverGroupUpdates = new(); + private readonly ITeamspeakGroupService _teamspeakGroupService; + private readonly ITeamspeakService _teamspeakService; + + public TeamspeakServerEventHandler(IAccountContext accountContext, IEventBus eventBus, ITeamspeakService teamspeakService, ITeamspeakGroupService teamspeakGroupService, ILogger logger) { + _accountContext = accountContext; + _eventBus = eventBus; + _teamspeakService = teamspeakService; + _teamspeakGroupService = teamspeakGroupService; + _logger = logger; + } + + public void Init() { + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, _logger.LogError); + } + + private async Task HandleEvent(EventModel eventModel, SignalrEventData signalrEventData) { + switch (signalrEventData.Procedure) { + case TeamspeakEventType.CLIENTS: + await UpdateClients(signalrEventData.Args.ToString()); + break; + case TeamspeakEventType.CLIENT_SERVER_GROUPS: + await UpdateClientServerGroups(signalrEventData.Args.ToString()); + break; + case TeamspeakEventType.EMPTY: break; + default: throw new ArgumentException("Invalid teamspeak event type"); + } + } + + private async Task UpdateClients(string args) { + await Console.Out.WriteLineAsync(args); + JArray clientsArray = JArray.Parse(args); + if (clientsArray.Count == 0) return; + + HashSet clients = clientsArray.ToObject>(); + await Console.Out.WriteLineAsync("Updating online clients"); + await _teamspeakService.UpdateClients(clients); + } + + private async Task UpdateClientServerGroups(string args) { + JObject updateObject = JObject.Parse(args); + double clientDbid = double.Parse(updateObject["clientDbid"].ToString()); + double serverGroupId = double.Parse(updateObject["serverGroupId"].ToString()); + await Console.Out.WriteLineAsync($"Server group for {clientDbid}: {serverGroupId}"); + + TeamspeakServerGroupUpdate update = _serverGroupUpdates.GetOrAdd(clientDbid, _ => new TeamspeakServerGroupUpdate()); + update.ServerGroups.Add(serverGroupId); + update.CancellationTokenSource?.Cancel(); + update.CancellationTokenSource = new CancellationTokenSource(); + Task unused = TaskUtilities.DelayWithCallback( + TimeSpan.FromMilliseconds(500), + update.CancellationTokenSource.Token, + async () => { + update.CancellationTokenSource.Cancel(); + await ProcessAccountData(clientDbid, update.ServerGroups); + } + ); + } + + private async Task ProcessAccountData(double clientDbId, ICollection serverGroups) { + await Console.Out.WriteLineAsync($"Processing server groups for {clientDbId}"); + Account account = _accountContext.GetSingle(x => x.TeamspeakIdentities != null && x.TeamspeakIdentities.Any(y => y.Equals(clientDbId))); + Task unused = _teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); + + _serverGroupUpdates.TryRemove(clientDbId, out TeamspeakServerGroupUpdate _); + } + } +} diff --git a/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs b/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs index 3e659959..57353793 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs @@ -4,12 +4,12 @@ namespace UKSF.Api.Teamspeak.Models { public record Operation : MongoObject { - public AttendanceReport AttendanceReport; - public DateTime End; - public string Map; - public string Name; - public string Result; - public DateTime Start; - public string Type; + public AttendanceReport AttendanceReport { get; set; } + public DateTime End { get; set; } + public string Map { get; set; } + public string Name { get; set; } + public string Result { get; set; } + public DateTime Start { get; set; } + public string Type { get; set; } } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs index 85c71eed..d7b138cb 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs @@ -1,8 +1,8 @@ namespace UKSF.Api.Teamspeak.Models { public class TeamspeakClient { - public double ChannelId; - public string ChannelName; - public double ClientDbId; - public string ClientName; + public double ChannelId { get; set; } + public string ChannelName { get; set; } + public double ClientDbId { get; set; } + public string ClientName { get; set; } } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs index a883e2aa..fd234391 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs @@ -1,6 +1,6 @@ namespace UKSF.Api.Teamspeak.Models { public class TeamspeakGroupProcedure { - public double ClientDbId; - public double ServerGroup; + public double ClientDbId { get; set; } + public double ServerGroup { get; set; } } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs index 85ff8de7..0640ef5d 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs @@ -4,8 +4,8 @@ namespace UKSF.Api.Teamspeak.Models { public class TeamspeakServerGroupUpdate { - public readonly List ServerGroups = new(); - public CancellationTokenSource CancellationTokenSource; - public Task DelayedProcessTask; + public List ServerGroups { get; set; } = new(); + public CancellationTokenSource CancellationTokenSource { get; set; } + public Task DelayedProcessTask { get; set; } } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs index 2767f80e..181696ca 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs @@ -3,7 +3,7 @@ namespace UKSF.Api.Teamspeak.Models { public class TeamspeakServerSnapshot { - public DateTime Timestamp; - public HashSet Users; + public DateTime Timestamp { get; set; } + public HashSet Users { get; set; } } } diff --git a/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs index 538ed203..5c734e2a 100644 --- a/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs +++ b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs @@ -13,13 +13,12 @@ public static class TeamspeakHubState { public class TeamspeakHub : Hub { public const string END_POINT = "teamspeak"; - private readonly IEventBus _eventBus; + private readonly IEventBus _eventBus; - public TeamspeakHub(IEventBus eventBus) => _eventBus = eventBus; + public TeamspeakHub(IEventBus eventBus) => _eventBus = eventBus; - // ReSharper disable once UnusedMember.Global public void Invoke(int procedure, object args) { - _eventBus.Send(new SignalrEventModel { Procedure = (TeamspeakEventType) procedure, Args = args }); + _eventBus.Send(new SignalrEventData { Procedure = (TeamspeakEventType) procedure, Args = args }); } public override Task OnConnectedAsync() { diff --git a/UKSF.Api.Launcher/ApiLauncherExtensions.cs b/UKSF.Api.Launcher/ApiLauncherExtensions.cs index b77d8c91..e2c05b00 100644 --- a/UKSF.Api.Launcher/ApiLauncherExtensions.cs +++ b/UKSF.Api.Launcher/ApiLauncherExtensions.cs @@ -11,12 +11,10 @@ namespace UKSF.Api.Launcher { public static class ApiLauncherExtensions { public static IServiceCollection AddUksfLauncher(this IServiceCollection services) => - services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddTransient(); + services.AddContexts().AddEventHandlers().AddServices().AddTransient(); private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton(); - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services.AddSingleton, DataEventBus>(); - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; private static IServiceCollection AddServices(this IServiceCollection services) => diff --git a/UKSF.Api.Launcher/Context/LauncherFileContext.cs b/UKSF.Api.Launcher/Context/LauncherFileContext.cs index b05b81cf..62a9f16b 100644 --- a/UKSF.Api.Launcher/Context/LauncherFileContext.cs +++ b/UKSF.Api.Launcher/Context/LauncherFileContext.cs @@ -1,4 +1,5 @@ using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Launcher.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -7,6 +8,6 @@ namespace UKSF.Api.Launcher.Context { public interface ILauncherFileContext : IMongoContext, ICachedMongoContext { } public class LauncherFileContext : CachedMongoContext, ILauncherFileContext { - public LauncherFileContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "launcherFiles") { } + public LauncherFileContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "launcherFiles") { } } } diff --git a/UKSF.Api.Launcher/Models/LauncherFile.cs b/UKSF.Api.Launcher/Models/LauncherFile.cs index 97e735ee..a01f982b 100644 --- a/UKSF.Api.Launcher/Models/LauncherFile.cs +++ b/UKSF.Api.Launcher/Models/LauncherFile.cs @@ -2,7 +2,7 @@ namespace UKSF.Api.Launcher.Models { public record LauncherFile : MongoObject { - public string FileName; - public string Version; + public string FileName { get; set; } + public string Version { get; set; } } } diff --git a/UKSF.Api.Modpack/ApiModpackExtensions.cs b/UKSF.Api.Modpack/ApiModpackExtensions.cs index 2b7962b3..7a3f41f9 100644 --- a/UKSF.Api.Modpack/ApiModpackExtensions.cs +++ b/UKSF.Api.Modpack/ApiModpackExtensions.cs @@ -13,13 +13,10 @@ namespace UKSF.Api.Modpack { public static class ApiModpackExtensions { public static IServiceCollection AddUksfModpack(this IServiceCollection services) => - services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddActions().AddTransient(); + services.AddContexts().AddEventHandlers().AddServices().AddActions().AddTransient(); private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton().AddSingleton(); - private static IServiceCollection AddEventBuses(this IServiceCollection services) => - services.AddSingleton, DataEventBus>().AddSingleton, DataEventBus>(); - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); private static IServiceCollection AddServices(this IServiceCollection services) => diff --git a/UKSF.Api.Modpack/Context/BuildsContext.cs b/UKSF.Api.Modpack/Context/BuildsContext.cs index ef77685d..6eb9c99d 100644 --- a/UKSF.Api.Modpack/Context/BuildsContext.cs +++ b/UKSF.Api.Modpack/Context/BuildsContext.cs @@ -3,6 +3,8 @@ using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Modpack.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -15,17 +17,17 @@ public interface IBuildsContext : IMongoContext, ICachedMongoConte } public class BuildsContext : CachedMongoContext, IBuildsContext { - public BuildsContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "modpackBuilds") { } + public BuildsContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "modpackBuilds") { } public async Task Update(ModpackBuild build, ModpackBuildStep buildStep) { UpdateDefinition updateDefinition = Builders.Update.Set(x => x.Steps[buildStep.Index], buildStep); await base.Update(build.Id, updateDefinition); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.Id, buildStep)); + DataEvent(new EventModel(EventType.UPDATE, new ModpackBuildStepEventData(build.Id, buildStep))); } public async Task Update(ModpackBuild build, UpdateDefinition updateDefinition) { await base.Update(build.Id, updateDefinition); - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, build.Id, build)); + DataEvent(new EventModel(EventType.UPDATE, build)); } protected override void SetCache(IEnumerable newCollection) { diff --git a/UKSF.Api.Modpack/Context/ReleasesContext.cs b/UKSF.Api.Modpack/Context/ReleasesContext.cs index 24e86ba1..477a7a33 100644 --- a/UKSF.Api.Modpack/Context/ReleasesContext.cs +++ b/UKSF.Api.Modpack/Context/ReleasesContext.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Modpack.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -9,7 +10,7 @@ namespace UKSF.Api.Modpack.Context { public interface IReleasesContext : IMongoContext, ICachedMongoContext { } public class ReleasesContext : CachedMongoContext, IReleasesContext { - public ReleasesContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "modpackReleases") { } + public ReleasesContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "modpackReleases") { } protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { diff --git a/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs b/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs index 7bb23138..fe265196 100644 --- a/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs +++ b/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs @@ -1,45 +1,50 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSF.Api.ArmaServer.Models; using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Signalr.Clients; using UKSF.Api.Modpack.Signalr.Hubs; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; -using UKSF.Api.Shared.Models; namespace UKSF.Api.Modpack.EventHandlers { public interface IBuildsEventHandler : IEventHandler { } public class BuildsEventHandler : IBuildsEventHandler { + private readonly IEventBus _eventBus; private readonly IHubContext _hub; private readonly ILogger _logger; - private readonly IDataEventBus _modpackBuildEventBus; - public BuildsEventHandler(IDataEventBus modpackBuildEventBus, IHubContext hub, ILogger logger) { - _modpackBuildEventBus = modpackBuildEventBus; + public BuildsEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) { + _eventBus = eventBus; _hub = hub; _logger = logger; } public void Init() { - _modpackBuildEventBus.AsObservable().SubscribeWithAsyncNext(HandleBuildEvent, exception => _logger.LogError(exception)); + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleBuildEvent, _logger.LogError); + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleBuildStepEvent, _logger.LogError); } - private async Task HandleBuildEvent(DataEventModel dataEventModel) { - if (dataEventModel.Data == null) return; + private async Task HandleBuildStepEvent(EventModel eventModel, ModpackBuildStepEventData data) { + if (data.BuildStep == null) return; + if (eventModel.EventType == EventType.UPDATE) { + await _hub.Clients.Group(data.BuildId).ReceiveBuildStep(data.BuildStep); + } + } + + private async Task HandleBuildEvent(EventModel eventModel, ModpackBuild build) { + if (build == null) return; - switch (dataEventModel.Type) { - case DataEventType.ADD: - await AddedEvent(dataEventModel.Data as ModpackBuild); + switch (eventModel.EventType) { + case EventType.ADD: + await AddedEvent(build); break; - case DataEventType.UPDATE: - await UpdatedEvent(dataEventModel.Id, dataEventModel.Data); + case EventType.UPDATE: + await UpdatedEvent(build); break; - case DataEventType.DELETE: break; - default: throw new ArgumentOutOfRangeException(nameof(dataEventModel)); } } @@ -51,19 +56,11 @@ private async Task AddedEvent(ModpackBuild build) { } } - private async Task UpdatedEvent(string id, object data) { - switch (data) { - case ModpackBuild build: - if (build.Environment == GameEnvironment.DEV) { - await _hub.Clients.All.ReceiveBuild(build); - } else { - await _hub.Clients.All.ReceiveReleaseCandidateBuild(build); - } - - break; - case ModpackBuildStep step: - await _hub.Clients.Group(id).ReceiveBuildStep(step); - break; + private async Task UpdatedEvent(ModpackBuild build) { + if (build.Environment == GameEnvironment.DEV) { + await _hub.Clients.All.ReceiveBuild(build); + } else { + await _hub.Clients.All.ReceiveReleaseCandidateBuild(build); } } } diff --git a/UKSF.Api.Modpack/Models/GithubCommit.cs b/UKSF.Api.Modpack/Models/GithubCommit.cs index 63bf86de..271d6e64 100644 --- a/UKSF.Api.Modpack/Models/GithubCommit.cs +++ b/UKSF.Api.Modpack/Models/GithubCommit.cs @@ -1,10 +1,10 @@ namespace UKSF.Api.Modpack.Models { public class GithubCommit { - public string After; - public string Author; - public string BaseBranch; - public string Before; - public string Branch; - public string Message; + public string After { get; set; } + public string Author { get; set; } + public string BaseBranch { get; set; } + public string Before { get; set; } + public string Branch { get; set; } + public string Message { get; set; } } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuild.cs b/UKSF.Api.Modpack/Models/ModpackBuild.cs index 8c9c5c77..6f060d69 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuild.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuild.cs @@ -7,18 +7,18 @@ namespace UKSF.Api.Modpack.Models { public record ModpackBuild : MongoObject { - [BsonRepresentation(BsonType.ObjectId)] public string BuilderId; - public int BuildNumber; - public ModpackBuildResult BuildResult = ModpackBuildResult.NONE; - public GithubCommit Commit; - public DateTime EndTime = DateTime.Now; - public GameEnvironment Environment; - public Dictionary EnvironmentVariables = new(); - public bool Finished; - public bool IsRebuild; - public bool Running; - public DateTime StartTime = DateTime.Now; - public List Steps = new(); - public string Version; + [BsonRepresentation(BsonType.ObjectId)] public string BuilderId { get; set; } + public int BuildNumber { get; set; } + public ModpackBuildResult BuildResult { get; set; } = ModpackBuildResult.NONE; + public GithubCommit Commit { get; set; } + public DateTime EndTime { get; set; } = DateTime.Now; + public GameEnvironment Environment { get; set; } + public Dictionary EnvironmentVariables { get; set; } = new(); + public bool Finished { get; set; } + public bool IsRebuild { get; set; } + public bool Running { get; set; } + public DateTime StartTime { get; set; } = DateTime.Now; + public List Steps { get; set; } = new(); + public string Version { get; set; } } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs b/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs index aae49b0c..ec31e402 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs @@ -1,6 +1,6 @@ namespace UKSF.Api.Modpack.Models { public class ModpackBuildQueueItem { - public ModpackBuild Build; - public string Id; + public ModpackBuild Build { get; set; } + public string Id { get; set; } } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildStep.cs b/UKSF.Api.Modpack/Models/ModpackBuildStep.cs index b29788bd..777e2b14 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildStep.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildStep.cs @@ -4,14 +4,14 @@ namespace UKSF.Api.Modpack.Models { public class ModpackBuildStep { - public ModpackBuildResult BuildResult = ModpackBuildResult.NONE; - public DateTime EndTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); - public bool Finished; - public int Index; - public List Logs = new(); - public string Name; - public bool Running; - public DateTime StartTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); + public ModpackBuildResult BuildResult { get; set; } = ModpackBuildResult.NONE; + public DateTime EndTime { get; set; } = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); + public bool Finished { get; set; } + public int Index { get; set; } + public List Logs { get; set; } = new(); + public string Name { get; set; } + public bool Running { get; set; } + public DateTime StartTime { get; set; } = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); public ModpackBuildStep(string name) => Name = name; } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildStepEventData.cs b/UKSF.Api.Modpack/Models/ModpackBuildStepEventData.cs new file mode 100644 index 00000000..481b6f82 --- /dev/null +++ b/UKSF.Api.Modpack/Models/ModpackBuildStepEventData.cs @@ -0,0 +1,11 @@ +namespace UKSF.Api.Modpack.Models { + public class ModpackBuildStepEventData { + public ModpackBuildStepEventData(string buildId, ModpackBuildStep buildStep) { + BuildId = buildId; + BuildStep = buildStep; + } + + public string BuildId { get; } + public ModpackBuildStep BuildStep { get; } + } +} diff --git a/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs b/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs index 26794b31..d60fe8e5 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs @@ -2,12 +2,12 @@ namespace UKSF.Api.Modpack.Models { public class ModpackBuildStepLogItem { - public string Colour; - public string Text; + public string Colour { get; set; } + public string Text { get; set; } } public class ModpackBuildStepLogItemUpdate { - public bool Inline; - public List Logs; + public bool Inline { get; set; } + public List Logs { get; set; } } } diff --git a/UKSF.Api.Modpack/Models/ModpackRelease.cs b/UKSF.Api.Modpack/Models/ModpackRelease.cs index a90f554f..a4a58a3d 100644 --- a/UKSF.Api.Modpack/Models/ModpackRelease.cs +++ b/UKSF.Api.Modpack/Models/ModpackRelease.cs @@ -5,11 +5,11 @@ namespace UKSF.Api.Modpack.Models { public record ModpackRelease : MongoObject { - public string Changelog; - [BsonRepresentation(BsonType.ObjectId)] public string CreatorId; - public string Description; - public bool IsDraft; - public DateTime Timestamp; - public string Version; + public string Changelog { get; set; } + [BsonRepresentation(BsonType.ObjectId)] public string CreatorId { get; set; } + public string Description { get; set; } + public bool IsDraft { get; set; } + public DateTime Timestamp { get; set; } + public string Version { get; set; } } } diff --git a/UKSF.Api.Modpack/Models/NewBuild.cs b/UKSF.Api.Modpack/Models/NewBuild.cs index bc1e96f6..426852a3 100644 --- a/UKSF.Api.Modpack/Models/NewBuild.cs +++ b/UKSF.Api.Modpack/Models/NewBuild.cs @@ -1,8 +1,8 @@ namespace UKSF.Api.Modpack.Models { public class NewBuild { - public bool Ace; - public bool Acre; - public bool F35; - public string Reference; + public bool Ace { get; set; } + public bool Acre { get; set; } + public bool F35 { get; set; } + public string Reference { get; set; } } } diff --git a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs index 729f01a4..f9aa2b83 100644 --- a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs +++ b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs @@ -16,7 +16,7 @@ namespace UKSF.Api.Personnel { public static class ApiPersonnelExtensions { public static IServiceCollection AddUksfPersonnel(this IServiceCollection services) => services.AddContexts() - .AddEventBuses() + .AddEventHandlers() .AddServices() .AddActions() @@ -32,17 +32,6 @@ private static IServiceCollection AddContexts(this IServiceCollection services) .AddSingleton() .AddSingleton(); - private static IServiceCollection AddEventBuses(this IServiceCollection services) => - services.AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() - .AddSingleton, EventBus>(); - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton() .AddSingleton() diff --git a/UKSF.Api.Personnel/Context/AccountContext.cs b/UKSF.Api.Personnel/Context/AccountContext.cs index b900b468..522af31e 100644 --- a/UKSF.Api.Personnel/Context/AccountContext.cs +++ b/UKSF.Api.Personnel/Context/AccountContext.cs @@ -1,4 +1,5 @@ using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -7,6 +8,6 @@ namespace UKSF.Api.Personnel.Context { public interface IAccountContext : IMongoContext, ICachedMongoContext { } public class AccountContext : CachedMongoContext, IAccountContext { - public AccountContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "accounts") { } + public AccountContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "accounts") { } } } diff --git a/UKSF.Api.Personnel/Context/CommentThreadContext.cs b/UKSF.Api.Personnel/Context/CommentThreadContext.cs index 38874565..615468ca 100644 --- a/UKSF.Api.Personnel/Context/CommentThreadContext.cs +++ b/UKSF.Api.Personnel/Context/CommentThreadContext.cs @@ -1,28 +1,36 @@ using System.Threading.Tasks; using MongoDB.Driver; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; namespace UKSF.Api.Personnel.Context { public interface ICommentThreadContext : IMongoContext, ICachedMongoContext { - Task Update(string id, Comment comment, DataEventType updateType); + Task AddCommentToThread(string commentThreadId, Comment comment); + Task RemoveCommentFromThread(string commentThreadId, Comment comment); } public class CommentThreadContext : CachedMongoContext, ICommentThreadContext { - public CommentThreadContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "commentThreads") { } + public CommentThreadContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "commentThreads") { } - public async Task Update(string id, Comment comment, DataEventType updateType) { - await base.Update(id, updateType == DataEventType.ADD ? Builders.Update.Push(x => x.Comments, comment) : Builders.Update.Pull(x => x.Comments, comment)); - CommentThreadDataEvent(EventModelFactory.CreateDataEvent(updateType, id, comment)); + public async Task AddCommentToThread(string commentThreadId, Comment comment) { + UpdateDefinition updateDefinition = Builders.Update.Push(x => x.Comments, comment); + await base.Update(commentThreadId, updateDefinition); + CommentThreadDataEvent(new EventModel(EventType.ADD, new CommentThreadEventData(commentThreadId, comment))); } - private void CommentThreadDataEvent(DataEventModel dataEvent) { - base.DataEvent(dataEvent); + public async Task RemoveCommentFromThread(string commentThreadId, Comment comment) { + UpdateDefinition updateDefinition = Builders.Update.Pull(x => x.Comments, comment); + await base.Update(commentThreadId, updateDefinition); + CommentThreadDataEvent(new EventModel(EventType.DELETE, new CommentThreadEventData(commentThreadId, comment))); } - protected override void DataEvent(DataEventModel dataEvent) { } + private void CommentThreadDataEvent(EventModel eventModel) { + base.DataEvent(eventModel); + } + + protected override void DataEvent(EventModel eventModel) { } } } diff --git a/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs b/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs index a571fc27..429ff5b3 100644 --- a/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs +++ b/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs @@ -1,4 +1,5 @@ using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -7,7 +8,7 @@ namespace UKSF.Api.Personnel.Context { public interface IConfirmationCodeContext : IMongoContext { } public class ConfirmationCodeContext : MongoContext, IConfirmationCodeContext { - public ConfirmationCodeContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : - base(mongoCollectionFactory, dataEventBus, "confirmationCodes") { } + public ConfirmationCodeContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : + base(mongoCollectionFactory, eventBus, "confirmationCodes") { } } } diff --git a/UKSF.Api.Personnel/Context/NotificationsContext.cs b/UKSF.Api.Personnel/Context/NotificationsContext.cs index 17a12698..80b8d669 100644 --- a/UKSF.Api.Personnel/Context/NotificationsContext.cs +++ b/UKSF.Api.Personnel/Context/NotificationsContext.cs @@ -1,4 +1,5 @@ using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -7,6 +8,6 @@ namespace UKSF.Api.Personnel.Context { public interface INotificationsContext : IMongoContext, ICachedMongoContext { } public class NotificationsContext : CachedMongoContext, INotificationsContext { - public NotificationsContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "notifications") { } + public NotificationsContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "notifications") { } } } diff --git a/UKSF.Api.Personnel/Context/RanksContext.cs b/UKSF.Api.Personnel/Context/RanksContext.cs index fadff056..fd1cca3a 100644 --- a/UKSF.Api.Personnel/Context/RanksContext.cs +++ b/UKSF.Api.Personnel/Context/RanksContext.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -12,7 +13,7 @@ public interface IRanksContext : IMongoContext, ICachedMongoContext { } public class RanksContext : CachedMongoContext, IRanksContext { - public RanksContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "ranks") { } + public RanksContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "ranks") { } public override Rank GetSingle(string name) => GetSingle(x => x.Name == name); diff --git a/UKSF.Api.Personnel/Context/RolesContext.cs b/UKSF.Api.Personnel/Context/RolesContext.cs index 48ee4e03..69fa987f 100644 --- a/UKSF.Api.Personnel/Context/RolesContext.cs +++ b/UKSF.Api.Personnel/Context/RolesContext.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -12,7 +13,7 @@ public interface IRolesContext : IMongoContext, ICachedMongoContext { } public class RolesContext : CachedMongoContext, IRolesContext { - public RolesContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "roles") { } + public RolesContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "roles") { } public override Role GetSingle(string name) => GetSingle(x => x.Name == name); diff --git a/UKSF.Api.Personnel/Context/UnitsContext.cs b/UKSF.Api.Personnel/Context/UnitsContext.cs index 4488cbd4..5cec8210 100644 --- a/UKSF.Api.Personnel/Context/UnitsContext.cs +++ b/UKSF.Api.Personnel/Context/UnitsContext.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; @@ -9,7 +10,7 @@ namespace UKSF.Api.Personnel.Context { public interface IUnitsContext : IMongoContext, ICachedMongoContext { } public class UnitsContext : CachedMongoContext, IUnitsContext { - public UnitsContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "units") { } + public UnitsContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "units") { } protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { diff --git a/UKSF.Api.Personnel/Controllers/AccountsController.cs b/UKSF.Api.Personnel/Controllers/AccountsController.cs index 076a5087..eee5fdc0 100644 --- a/UKSF.Api.Personnel/Controllers/AccountsController.cs +++ b/UKSF.Api.Personnel/Controllers/AccountsController.cs @@ -21,7 +21,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class AccountsController : Controller { private readonly IAccountContext _accountContext; - private readonly IEventBus _accountEventBus; + private readonly IEventBus _eventBus; private readonly IAccountService _accountService; private readonly IConfirmationCodeService _confirmationCodeService; private readonly IDisplayNameService _displayNameService; @@ -38,7 +38,7 @@ public AccountsController( IDisplayNameService displayNameService, IHttpContextService httpContextService, IEmailService emailService, - IEventBus accountEventBus, + IEventBus eventBus, ILogger logger ) { _accountContext = accountContext; @@ -48,7 +48,7 @@ ILogger logger _displayNameService = displayNameService; _httpContextService = httpContextService; _emailService = emailService; - _accountEventBus = accountEventBus; + _eventBus = eventBus; _logger = logger; } @@ -175,7 +175,7 @@ await _accountContext.Update( Builders.Update.Set(x => x.Firstname, changeNameRequest["firstname"].ToString()).Set(x => x.Lastname, changeNameRequest["lastname"].ToString()) ); _logger.LogAudit($"{account.Lastname}, {account.Firstname} changed their name to {changeNameRequest["lastname"]}, {changeNameRequest["firstname"]}"); - _accountEventBus.Send(_accountContext.GetSingle(account.Id)); + _eventBus.Send(_accountContext.GetSingle(account.Id)); return Ok(); } diff --git a/UKSF.Api.Personnel/Controllers/CommentThreadController.cs b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs index fbf5d3c8..954d50be 100644 --- a/UKSF.Api.Personnel/Controllers/CommentThreadController.cs +++ b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs @@ -80,13 +80,13 @@ public IActionResult GetCanPostComment(string id) { return Ok(new { canPost }); } - [HttpPut("{id}"), Authorize] - public async Task AddComment(string id, [FromBody] Comment comment) { + [HttpPut("{commentThreadId}"), Authorize] + public async Task AddComment(string commentThreadId, [FromBody] Comment comment) { comment.Id = ObjectId.GenerateNewId().ToString(); comment.Timestamp = DateTime.Now; comment.Author = _httpContextService.GetUserId(); - await _commentThreadService.InsertComment(id, comment); - CommentThread thread = _commentThreadContext.GetSingle(id); + await _commentThreadService.InsertComment(commentThreadId, comment); + CommentThread thread = _commentThreadContext.GetSingle(commentThreadId); IEnumerable participants = _commentThreadService.GetCommentThreadParticipants(thread.Id); foreach (string objectId in participants.Where(x => x != comment.Author)) { _notificationsService.Add( // TODO: Set correct link when comment thread is between /application and /recruitment/id diff --git a/UKSF.Api.Personnel/Controllers/CommunicationsController.cs b/UKSF.Api.Personnel/Controllers/CommunicationsController.cs index cec6e76b..0874eece 100644 --- a/UKSF.Api.Personnel/Controllers/CommunicationsController.cs +++ b/UKSF.Api.Personnel/Controllers/CommunicationsController.cs @@ -17,7 +17,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class CommunicationsController : Controller { private readonly IAccountContext _accountContext; - private readonly IEventBus _accountEventBus; + private readonly IEventBus _eventBus; private readonly IAccountService _accountService; private readonly IConfirmationCodeService _confirmationCodeService; private readonly ILogger _logger; @@ -29,14 +29,14 @@ public CommunicationsController( IAccountService accountService, INotificationsService notificationsService, ILogger logger, - IEventBus accountEventBus + IEventBus eventBus ) { _accountContext = accountContext; _confirmationCodeService = confirmationCodeService; _accountService = accountService; _notificationsService = notificationsService; _logger = logger; - _accountEventBus = accountEventBus; + _eventBus = eventBus; } [HttpGet, Authorize] @@ -104,7 +104,7 @@ private async Task ReceiveTeamspeakCode(string id, string code, s account.TeamspeakIdentities.Add(double.Parse(teamspeakId)); await _accountContext.Update(account.Id, Builders.Update.Set("teamspeakIdentities", account.TeamspeakIdentities)); account = _accountContext.GetSingle(account.Id); - _accountEventBus.Send(account); + _eventBus.Send(account); _notificationsService.SendTeamspeakNotification( new HashSet { teamspeakId.ToDouble() }, $"This teamspeak identity has been linked to the account with email '{account.Email}'\nIf this was not done by you, please contact an admin" diff --git a/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs b/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs index 0854704d..3204236d 100644 --- a/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs +++ b/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs @@ -14,7 +14,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class DiscordCodeController : Controller { private readonly IAccountContext _accountContext; - private readonly IEventBus _accountEventBus; + private readonly IEventBus _eventBus; private readonly IConfirmationCodeService _confirmationCodeService; private readonly IHttpContextService _httpContextService; private readonly ILogger _logger; @@ -23,13 +23,13 @@ public DiscordCodeController( IAccountContext accountContext, IConfirmationCodeService confirmationCodeService, IHttpContextService httpContextService, - IEventBus accountEventBus, + IEventBus eventBus, ILogger logger ) { _accountContext = accountContext; _confirmationCodeService = confirmationCodeService; _httpContextService = httpContextService; - _accountEventBus = accountEventBus; + _eventBus = eventBus; _logger = logger; } @@ -43,7 +43,7 @@ public async Task DiscordConnect(string discordId, [FromBody] JOb string id = _httpContextService.GetUserId(); await _accountContext.Update(id, Builders.Update.Set(x => x.DiscordId, discordId)); Account account = _accountContext.GetSingle(id); - _accountEventBus.Send(account); + _eventBus.Send(account); _logger.LogAudit($"DiscordID updated for {account.Id} to {discordId}"); return Ok(); } diff --git a/UKSF.Api.Personnel/Controllers/RanksController.cs b/UKSF.Api.Personnel/Controllers/RanksController.cs index 737e0cf0..17e08381 100644 --- a/UKSF.Api.Personnel/Controllers/RanksController.cs +++ b/UKSF.Api.Personnel/Controllers/RanksController.cs @@ -65,11 +65,11 @@ public async Task EditRank([FromBody] Rank rank) { ); await _ranksContext.Update( rank.Id, - Builders.Update.Set("name", rank.Name).Set("abbreviation", rank.Abbreviation).Set("teamspeakGroup", rank.TeamspeakGroup).Set("discordRoleId", rank.DiscordRoleId) + Builders.Update.Set(x => x.Name, rank.Name).Set(x => x.Abbreviation, rank.Abbreviation).Set(x => x.TeamspeakGroup, rank.TeamspeakGroup).Set(x => x.DiscordRoleId, rank.DiscordRoleId) ); foreach (Account account in _accountContext.Get(x => x.Rank == oldRank.Name)) { // TODO: Notify user to update name in TS if rank abbreviate changed - await _accountContext.Update(account.Id, "rank", rank.Name); + await _accountContext.Update(account.Id, x => x.Rank, rank.Name); } return Ok(_ranksContext.Get()); @@ -93,7 +93,7 @@ public async Task UpdateOrder([FromBody] List newRankOrder) for (int index = 0; index < newRankOrder.Count; index++) { Rank rank = newRankOrder[index]; if (_ranksContext.GetSingle(rank.Name).Order != index) { - await _ranksContext.Update(rank.Id, "order", index); + await _ranksContext.Update(rank.Id, x => x.Order, index); } } diff --git a/UKSF.Api.Personnel/Controllers/UnitsController.cs b/UKSF.Api.Personnel/Controllers/UnitsController.cs index 3db6366c..1f912d09 100644 --- a/UKSF.Api.Personnel/Controllers/UnitsController.cs +++ b/UKSF.Api.Personnel/Controllers/UnitsController.cs @@ -18,7 +18,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] public class UnitsController : Controller { private readonly IAccountContext _accountContext; - private readonly IEventBus _accountEventBus; + private readonly IEventBus _eventBus; private readonly IAssignmentService _assignmentService; private readonly IDisplayNameService _displayNameService; private readonly ILogger _logger; @@ -38,7 +38,7 @@ public UnitsController( IRolesService rolesService, IAssignmentService assignmentService, INotificationsService notificationsService, - IEventBus accountEventBus, + IEventBus eventBus, IMapper mapper, ILogger logger ) { @@ -50,7 +50,7 @@ ILogger logger _rolesService = rolesService; _assignmentService = assignmentService; _notificationsService = notificationsService; - _accountEventBus = accountEventBus; + _eventBus = eventBus; _mapper = mapper; _logger = logger; } @@ -131,19 +131,19 @@ public async Task EditUnit([FromRoute] string id, [FromBody] Unit if (unit.Name != oldUnit.Name) { foreach (Account account in _accountContext.Get(x => x.UnitAssignment == oldUnit.Name)) { await _accountContext.Update(account.Id, "unitAssignment", unit.Name); - _accountEventBus.Send(account); + _eventBus.Send(account); } } if (unit.TeamspeakGroup != oldUnit.TeamspeakGroup) { foreach (Account account in unit.Members.Select(x => _accountContext.GetSingle(x))) { - _accountEventBus.Send(account); + _eventBus.Send(account); } } if (unit.DiscordRoleId != oldUnit.DiscordRoleId) { foreach (Account account in unit.Members.Select(x => _accountContext.GetSingle(x))) { - _accountEventBus.Send(account); + _eventBus.Send(account); } } diff --git a/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs index 7263e93c..d290b1bf 100644 --- a/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Signalr.Clients; using UKSF.Api.Personnel.Signalr.Hubs; @@ -12,32 +13,30 @@ namespace UKSF.Api.Personnel.EventHandlers { public interface IAccountDataEventHandler : IEventHandler { } public class AccountDataEventHandler : IAccountDataEventHandler { - private readonly IDataEventBus _accountDataEventBus; + private readonly IEventBus _eventBus; private readonly IHubContext _hub; private readonly ILogger _logger; - private readonly IDataEventBus _unitDataEventBus; - public AccountDataEventHandler(IDataEventBus accountDataEventBus, IDataEventBus unitDataEventBus, IHubContext hub, ILogger logger) { - _accountDataEventBus = accountDataEventBus; - _unitDataEventBus = unitDataEventBus; + public AccountDataEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) { + _eventBus = eventBus; _hub = hub; _logger = logger; } public void Init() { - _accountDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleAccountsEvent, exception => _logger.LogError(exception)); - _unitDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleUnitsEvent, exception => _logger.LogError(exception)); + _eventBus.AsObservable().SubscribeWithAsyncNext>(HandleAccountEvent, _logger.LogError); + _eventBus.AsObservable().SubscribeWithAsyncNext>(HandleUnitEvent, _logger.LogError); } - private async Task HandleAccountsEvent(DataEventModel dataEventModel) { - if (dataEventModel.Type == DataEventType.UPDATE) { - await UpdatedEvent(dataEventModel.Id); + private async Task HandleAccountEvent(EventModel eventModel, ContextEventData contextEventData) { + if (eventModel.EventType == EventType.UPDATE) { + await UpdatedEvent(contextEventData.Id); } } - private async Task HandleUnitsEvent(DataEventModel dataEventModel) { - if (dataEventModel.Type == DataEventType.UPDATE) { - await UpdatedEvent(dataEventModel.Id); + private async Task HandleUnitEvent(EventModel eventModel, ContextEventData contextEventData) { + if (eventModel.EventType == EventType.UPDATE) { + await UpdatedEvent(contextEventData.Id); } } diff --git a/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs index 5f58ef87..66462be9 100644 --- a/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs @@ -1,4 +1,3 @@ -using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Base.Events; @@ -9,43 +8,36 @@ using UKSF.Api.Personnel.Signalr.Hubs; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; -using UKSF.Api.Shared.Models; namespace UKSF.Api.Personnel.EventHandlers { public interface ICommentThreadEventHandler : IEventHandler { } public class CommentThreadEventHandler : ICommentThreadEventHandler { - private readonly IDataEventBus _commentThreadDataEventBus; private readonly ICommentThreadService _commentThreadService; + private readonly IEventBus _eventBus; private readonly IHubContext _hub; private readonly ILogger _logger; - public CommentThreadEventHandler( - IDataEventBus commentThreadDataEventBus, - IHubContext hub, - ICommentThreadService commentThreadService, - ILogger logger - ) { - _commentThreadDataEventBus = commentThreadDataEventBus; + public CommentThreadEventHandler(IEventBus eventBus, IHubContext hub, ICommentThreadService commentThreadService, ILogger logger) { + _eventBus = eventBus; _hub = hub; _commentThreadService = commentThreadService; _logger = logger; } public void Init() { - _commentThreadDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => _logger.LogError(exception)); + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, _logger.LogError); } - private async Task HandleEvent(DataEventModel dataEventModel) { - switch (dataEventModel.Type) { - case DataEventType.ADD: - await AddedEvent(dataEventModel.Id, dataEventModel.Data as Comment); + private async Task HandleEvent(EventModel eventModel, CommentThreadEventData commentThreadEventData) { + switch (eventModel.EventType) { + case EventType.ADD: + await AddedEvent(commentThreadEventData.CommentThreadId, commentThreadEventData.Comment); break; - case DataEventType.DELETE: - await DeletedEvent(dataEventModel.Id, dataEventModel.Data as Comment); + case EventType.DELETE: + await DeletedEvent(commentThreadEventData.CommentThreadId, commentThreadEventData.Comment); break; - case DataEventType.UPDATE: break; - default: throw new ArgumentOutOfRangeException(nameof(dataEventModel)); + case EventType.UPDATE: break; } } diff --git a/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs index 339b861c..1ed15924 100644 --- a/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Signalr.Clients; using UKSF.Api.Personnel.Signalr.Hubs; @@ -14,21 +15,21 @@ public interface INotificationsEventHandler : IEventHandler { } public class NotificationsEventHandler : INotificationsEventHandler { private readonly IHubContext _hub; private readonly ILogger _logger; - private readonly IDataEventBus _notificationDataEventBus; + private readonly IEventBus _eventBus; - public NotificationsEventHandler(IDataEventBus notificationDataEventBus, IHubContext hub, ILogger logger) { - _notificationDataEventBus = notificationDataEventBus; + public NotificationsEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) { + _eventBus = eventBus; _hub = hub; _logger = logger; } public void Init() { - _notificationDataEventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, exception => _logger.LogError(exception)); + _eventBus.AsObservable().SubscribeWithAsyncNext>(HandleEvent, _logger.LogError); } - private async Task HandleEvent(DataEventModel dataEventModel) { - if (dataEventModel.Type == DataEventType.ADD) { - await AddedEvent(dataEventModel.Data as Notification); + private async Task HandleEvent(EventModel eventModel, ContextEventData contextEventData) { + if (eventModel.EventType == EventType.ADD) { + await AddedEvent(contextEventData.Data); } } diff --git a/UKSF.Api.Personnel/Models/Account.cs b/UKSF.Api.Personnel/Models/Account.cs index f9d4c4ef..92d8acd7 100644 --- a/UKSF.Api.Personnel/Models/Account.cs +++ b/UKSF.Api.Personnel/Models/Account.cs @@ -4,39 +4,40 @@ namespace UKSF.Api.Personnel.Models { public record Account : MongoObject { - public Application Application; - public string ArmaExperience; - public string Background; - public string DiscordId; - public DateTime Dob; - public string Email; - public string Firstname; - public string Lastname; - public MembershipState MembershipState = MembershipState.UNCONFIRMED; - public bool MilitaryExperience; - public string Nation; - public string Password; - public string Rank; - public string Reference; - public string RoleAssignment; - public List RolePreferences = new(); - public List ServiceRecord = new(); - public AccountSettings Settings = new(); - public string Steamname; - public HashSet TeamspeakIdentities; - public string UnitAssignment; - public string UnitsExperience; + public AccountSettings Settings { get; } = new(); + public MembershipState MembershipState { get; set; } = MembershipState.UNCONFIRMED; + public List RolePreferences { get; set; } = new(); + public List ServiceRecord { get; set; } = new(); + public bool Admin { get; set; } + public Application Application { get; set; } + public string ArmaExperience { get; set; } + public string Background { get; set; } + public string DiscordId { get; set; } + public DateTime Dob { get; set; } + public string Email { get; set; } + public string Firstname { get; set; } + public string Lastname { get; set; } + public bool MilitaryExperience { get; set; } + public string Nation { get; set; } + public string Password { get; set; } + public string Rank { get; set; } + public string Reference { get; set; } + public string RoleAssignment { get; set; } + public string Steamname { get; set; } + public HashSet TeamspeakIdentities { get; set; } + public string UnitAssignment { get; set; } + public string UnitsExperience { get; set; } } public record RosterAccount : MongoObject { - public string Name; - public string Nation; - public string Rank; - public string RoleAssignment; - public string UnitAssignment; + public string Name { get; set; } + public string Nation { get; set; } + public string Rank { get; set; } + public string RoleAssignment { get; set; } + public string UnitAssignment { get; set; } } public record PublicAccount : Account { - public string DisplayName; + public string DisplayName { get; set; } } } diff --git a/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs b/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs index e92317e4..57dbb9da 100644 --- a/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs +++ b/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs @@ -3,12 +3,12 @@ namespace UKSF.Api.Personnel.Models { public class AccountAttendanceStatus { - [BsonRepresentation(BsonType.ObjectId)] public string AccountId; - public float AttendancePercent; - public AttendanceState AttendanceState; - public string DisplayName; - [BsonRepresentation(BsonType.ObjectId)] public string GroupId; - public string GroupName; + [BsonRepresentation(BsonType.ObjectId)] public string AccountId { get; set; } + public float AttendancePercent { get; set; } + public AttendanceState AttendanceState { get; set; } + public string DisplayName { get; set; } + [BsonRepresentation(BsonType.ObjectId)] public string GroupId { get; set; } + public string GroupName { get; set; } } public enum AttendanceState { diff --git a/UKSF.Api.Personnel/Models/Application.cs b/UKSF.Api.Personnel/Models/Application.cs index 9703b943..dc7d7781 100644 --- a/UKSF.Api.Personnel/Models/Application.cs +++ b/UKSF.Api.Personnel/Models/Application.cs @@ -11,12 +11,12 @@ public enum ApplicationState { } public class Application { - [BsonRepresentation(BsonType.ObjectId)] public string ApplicationCommentThread; - public DateTime DateAccepted; - public DateTime DateCreated; - public Dictionary Ratings = new(); - [BsonRepresentation(BsonType.ObjectId)] public string Recruiter; - [BsonRepresentation(BsonType.ObjectId)] public string RecruiterCommentThread; - public ApplicationState State = ApplicationState.WAITING; + [BsonRepresentation(BsonType.ObjectId)] public string ApplicationCommentThread { get; set; } + public DateTime DateAccepted { get; set; } + public DateTime DateCreated { get; set; } + public Dictionary Ratings { get; set; } = new(); + [BsonRepresentation(BsonType.ObjectId)] public string Recruiter { get; set; } + [BsonRepresentation(BsonType.ObjectId)] public string RecruiterCommentThread { get; set; } + public ApplicationState State { get; set; } = ApplicationState.WAITING; } } diff --git a/UKSF.Api.Personnel/Models/AttendanceReport.cs b/UKSF.Api.Personnel/Models/AttendanceReport.cs index b6f73f62..81b9df4c 100644 --- a/UKSF.Api.Personnel/Models/AttendanceReport.cs +++ b/UKSF.Api.Personnel/Models/AttendanceReport.cs @@ -1,5 +1,5 @@ namespace UKSF.Api.Personnel.Models { public class AttendanceReport { - public AccountAttendanceStatus[] Users; + public AccountAttendanceStatus[] Users { get; set; } } } diff --git a/UKSF.Api.Personnel/Models/Comment.cs b/UKSF.Api.Personnel/Models/Comment.cs index 84e18cc9..f58701b3 100644 --- a/UKSF.Api.Personnel/Models/Comment.cs +++ b/UKSF.Api.Personnel/Models/Comment.cs @@ -5,8 +5,8 @@ namespace UKSF.Api.Personnel.Models { public record Comment : MongoObject { - [BsonRepresentation(BsonType.ObjectId)] public string Author; - public string Content; - public DateTime Timestamp; + [BsonRepresentation(BsonType.ObjectId)] public string Author { get; set; } + public string Content { get; set; } + public DateTime Timestamp { get; set; } } } diff --git a/UKSF.Api.Personnel/Models/CommentThread.cs b/UKSF.Api.Personnel/Models/CommentThread.cs index b59a350b..d981b7bc 100644 --- a/UKSF.Api.Personnel/Models/CommentThread.cs +++ b/UKSF.Api.Personnel/Models/CommentThread.cs @@ -12,8 +12,8 @@ public enum ThreadMode { } public record CommentThread : MongoObject { - [BsonRepresentation(BsonType.ObjectId)] public string[] Authors; - public Comment[] Comments = { }; - public ThreadMode Mode; + [BsonRepresentation(BsonType.ObjectId)] public string[] Authors { get; set; } + public Comment[] Comments { get; set; } = System.Array.Empty(); + public ThreadMode Mode { get; set; } } } diff --git a/UKSF.Api.Personnel/Models/CommentThreadEventData.cs b/UKSF.Api.Personnel/Models/CommentThreadEventData.cs new file mode 100644 index 00000000..c8d2f498 --- /dev/null +++ b/UKSF.Api.Personnel/Models/CommentThreadEventData.cs @@ -0,0 +1,11 @@ +namespace UKSF.Api.Personnel.Models { + public class CommentThreadEventData { + public CommentThreadEventData(string commentThreadId, Comment comment) { + CommentThreadId = commentThreadId; + Comment = comment; + } + + public string CommentThreadId { get; } + public Comment Comment { get; } + } +} diff --git a/UKSF.Api.Personnel/Models/ConfirmationCode.cs b/UKSF.Api.Personnel/Models/ConfirmationCode.cs index 63493ca3..5e9f4c1e 100644 --- a/UKSF.Api.Personnel/Models/ConfirmationCode.cs +++ b/UKSF.Api.Personnel/Models/ConfirmationCode.cs @@ -2,6 +2,6 @@ namespace UKSF.Api.Personnel.Models { public record ConfirmationCode : MongoObject { - public string Value; + public string Value { get; set; } } } diff --git a/UKSF.Api.Personnel/Models/Loa.cs b/UKSF.Api.Personnel/Models/Loa.cs index 157fc47a..829df18b 100644 --- a/UKSF.Api.Personnel/Models/Loa.cs +++ b/UKSF.Api.Personnel/Models/Loa.cs @@ -11,13 +11,13 @@ public enum LoaReviewState { } public record Loa : MongoObject { - public bool Emergency; - public DateTime End; - public bool Late; - public string Reason; - [BsonRepresentation(BsonType.ObjectId)] public string Recipient; - public DateTime Start; - public LoaReviewState State; - public DateTime Submitted; + public bool Emergency { get; set; } + public DateTime End { get; set; } + public bool Late { get; set; } + public string Reason { get; set; } + [BsonRepresentation(BsonType.ObjectId)] public string Recipient { get; set; } + public DateTime Start { get; set; } + public LoaReviewState State { get; set; } + public DateTime Submitted { get; set; } } } diff --git a/UKSF.Api.Personnel/Models/Notification.cs b/UKSF.Api.Personnel/Models/Notification.cs index 0e2dfcdf..abb558fc 100644 --- a/UKSF.Api.Personnel/Models/Notification.cs +++ b/UKSF.Api.Personnel/Models/Notification.cs @@ -5,11 +5,11 @@ namespace UKSF.Api.Personnel.Models { public record Notification : MongoObject { - public string Icon; - public string Link; - public string Message; - [BsonRepresentation(BsonType.ObjectId)] public string Owner; - public bool Read; - public DateTime Timestamp = DateTime.Now; + public string Icon { get; set; } + public string Link { get; set; } + public string Message { get; set; } + [BsonRepresentation(BsonType.ObjectId)] public string Owner { get; set; } + public bool Read { get; set; } + public DateTime Timestamp { get; set; } = DateTime.Now; } } diff --git a/UKSF.Api.Personnel/Models/Rank.cs b/UKSF.Api.Personnel/Models/Rank.cs index 361d16e6..8d61931d 100644 --- a/UKSF.Api.Personnel/Models/Rank.cs +++ b/UKSF.Api.Personnel/Models/Rank.cs @@ -2,10 +2,10 @@ namespace UKSF.Api.Personnel.Models { public record Rank : MongoObject { - public string Abbreviation; - public string DiscordRoleId; - public string Name; - public int Order; - public string TeamspeakGroup; + public string Abbreviation { get; set; } + public string DiscordRoleId { get; set; } + public string Name { get; set; } + public int Order { get; set; } + public string TeamspeakGroup { get; set; } } } diff --git a/UKSF.Api.Personnel/Models/Role.cs b/UKSF.Api.Personnel/Models/Role.cs index 38a9d4eb..b57a7f15 100644 --- a/UKSF.Api.Personnel/Models/Role.cs +++ b/UKSF.Api.Personnel/Models/Role.cs @@ -7,8 +7,8 @@ public enum RoleType { } public record Role : MongoObject { - public string Name; - public int Order = 0; - public RoleType RoleType = RoleType.INDIVIDUAL; + public string Name { get; set; } + public int Order { get; set; } = 0; + public RoleType RoleType { get; set; } = RoleType.INDIVIDUAL; } } diff --git a/UKSF.Api.Personnel/Models/Unit.cs b/UKSF.Api.Personnel/Models/Unit.cs index b2ef527c..b5509a91 100644 --- a/UKSF.Api.Personnel/Models/Unit.cs +++ b/UKSF.Api.Personnel/Models/Unit.cs @@ -5,18 +5,18 @@ namespace UKSF.Api.Personnel.Models { public record Unit : MongoObject { - public UnitBranch Branch = UnitBranch.COMBAT; - public string Callsign; - public string DiscordRoleId; - public string Icon; - [BsonRepresentation(BsonType.ObjectId)] public List Members = new(); - public string Name; - public int Order; - [BsonRepresentation(BsonType.ObjectId)] public string Parent; - public bool PreferShortname; - [BsonRepresentation(BsonType.ObjectId)] public Dictionary Roles = new(); - public string Shortname; - public string TeamspeakGroup; + public UnitBranch Branch { get; set; } = UnitBranch.COMBAT; + public string Callsign { get; set; } + public string DiscordRoleId { get; set; } + public string Icon { get; set; } + [BsonRepresentation(BsonType.ObjectId)] public List Members { get; set; } = new(); + public string Name { get; set; } + public int Order { get; set; } + [BsonRepresentation(BsonType.ObjectId)] public string Parent { get; set; } + public bool PreferShortname { get; set; } + [BsonRepresentation(BsonType.ObjectId)] public Dictionary Roles { get; set; } = new(); + public string Shortname { get; set; } + public string TeamspeakGroup { get; set; } public override string ToString() => $"{Name}, {Shortname}, {Callsign}, {Branch}, {TeamspeakGroup}, {DiscordRoleId}"; } @@ -28,42 +28,42 @@ public enum UnitBranch { // TODO: Cleaner way of doing this? Inside controllers? public record ResponseUnit : Unit { - public string Code; - public string ParentName; - public IEnumerable UnitMembers; + public string Code { get; set; } + public string ParentName { get; set; } + public IEnumerable UnitMembers { get; set; } } public class ResponseUnitMember { - public string Name; - public string Role; - public string UnitRole; + public string Name { get; set; } + public string Role { get; set; } + public string UnitRole { get; set; } } public class ResponseUnitTree { - public IEnumerable Children; - public string Id; - public string Name; + public IEnumerable Children { get; set; } + public string Id { get; set; } + public string Name { get; set; } } public class ResponseUnitTreeDataSet { - public IEnumerable AuxiliaryNodes; - public IEnumerable CombatNodes; + public IEnumerable AuxiliaryNodes { get; set; } + public IEnumerable CombatNodes { get; set; } } public class ResponseUnitChartNode { - public IEnumerable Children; - public string Id; - public IEnumerable Members; - public string Name; - public bool PreferShortname; + public IEnumerable Children { get; set; } + public string Id { get; set; } + public IEnumerable Members { get; set; } + public string Name { get; set; } + public bool PreferShortname { get; set; } } public class RequestUnitUpdateParent { - public int Index; - public string ParentId; + public int Index { get; set; } + public string ParentId { get; set; } } public class RequestUnitUpdateOrder { - public int Index; + public int Index { get; set; } } } diff --git a/UKSF.Api.Personnel/Services/AssignmentService.cs b/UKSF.Api.Personnel/Services/AssignmentService.cs index 1694caa9..839ae18a 100644 --- a/UKSF.Api.Personnel/Services/AssignmentService.cs +++ b/UKSF.Api.Personnel/Services/AssignmentService.cs @@ -24,7 +24,7 @@ public interface IAssignmentService { public class AssignmentService : IAssignmentService { public const string REMOVE_FLAG = "REMOVE"; private readonly IAccountContext _accountContext; - private readonly IEventBus _accountEventBus; + private readonly IEventBus _eventBus; private readonly IHubContext _accountHub; private readonly IDisplayNameService _displayNameService; private readonly IRanksService _ranksService; @@ -40,7 +40,7 @@ public AssignmentService( IUnitsService unitsService, IDisplayNameService displayNameService, IHubContext accountHub, - IEventBus accountEventBus + IEventBus eventBus ) { _accountContext = accountContext; _unitsContext = unitsContext; @@ -49,7 +49,7 @@ IEventBus accountEventBus _unitsService = unitsService; _displayNameService = displayNameService; _accountHub = accountHub; - _accountEventBus = accountEventBus; + _eventBus = eventBus; } public async Task UpdateUnitRankAndRole(string id, string unitString = "", string role = "", string rankString = "", string notes = "", string message = "", string reason = "") { @@ -123,7 +123,7 @@ public async Task UnassignUnit(string id, string unitId) { // TODO: teamspeak and discord should probably be updated for account update events, or a separate assignment event bus could be used public async Task UpdateGroupsAndRoles(string id) { Account account = _accountContext.GetSingle(id); - _accountEventBus.Send(account); + _eventBus.Send(account); await _accountHub.Clients.Group(id).ReceiveAccountUpdate(); } diff --git a/UKSF.Api.Personnel/Services/CommentThreadService.cs b/UKSF.Api.Personnel/Services/CommentThreadService.cs index ef9dbd28..a58c8c31 100644 --- a/UKSF.Api.Personnel/Services/CommentThreadService.cs +++ b/UKSF.Api.Personnel/Services/CommentThreadService.cs @@ -1,16 +1,17 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Models; namespace UKSF.Api.Personnel.Services { public interface ICommentThreadService { - IEnumerable GetCommentThreadComments(string id); - Task InsertComment(string id, Comment comment); - Task RemoveComment(string id, Comment comment); - IEnumerable GetCommentThreadParticipants(string id); + IEnumerable GetCommentThreadComments(string commentThreadId); + Task InsertComment(string commentThreadId, Comment comment); + Task RemoveComment(string commentThreadId, Comment comment); + IEnumerable GetCommentThreadParticipants(string commentThreadId); object FormatComment(Comment comment); } @@ -23,19 +24,19 @@ public CommentThreadService(ICommentThreadContext commentThreadContext, IDisplay _displayNameService = displayNameService; } - public IEnumerable GetCommentThreadComments(string id) => _commentThreadContext.GetSingle(id).Comments.Reverse(); + public IEnumerable GetCommentThreadComments(string commentThreadId) => _commentThreadContext.GetSingle(commentThreadId).Comments.Reverse(); - public async Task InsertComment(string id, Comment comment) { - await _commentThreadContext.Update(id, comment, DataEventType.ADD); + public async Task InsertComment(string commentThreadId, Comment comment) { + await _commentThreadContext.AddCommentToThread(commentThreadId, comment); } - public async Task RemoveComment(string id, Comment comment) { - await _commentThreadContext.Update(id, comment, DataEventType.DELETE); + public async Task RemoveComment(string commentThreadId, Comment comment) { + await _commentThreadContext.RemoveCommentFromThread(commentThreadId, comment); } - public IEnumerable GetCommentThreadParticipants(string id) { - HashSet participants = GetCommentThreadComments(id).Select(x => x.Author).ToHashSet(); - participants.UnionWith(_commentThreadContext.GetSingle(id).Authors); + public IEnumerable GetCommentThreadParticipants(string commentThreadId) { + HashSet participants = GetCommentThreadComments(commentThreadId).Select(x => x.Author).ToHashSet(); + participants.UnionWith(_commentThreadContext.GetSingle(commentThreadId).Authors); return participants; } diff --git a/UKSF.Api.Personnel/Services/NotificationsService.cs b/UKSF.Api.Personnel/Services/NotificationsService.cs index e16868e9..182ca32b 100644 --- a/UKSF.Api.Personnel/Services/NotificationsService.cs +++ b/UKSF.Api.Personnel/Services/NotificationsService.cs @@ -28,7 +28,7 @@ public class NotificationsService : INotificationsService { private readonly INotificationsContext _notificationsContext; private readonly IHubContext _notificationsHub; private readonly IObjectIdConversionService _objectIdConversionService; - private readonly IEventBus _teamspeakMessageEventBus; + private readonly IEventBus _eventBus; public NotificationsService( IAccountContext accountContext, @@ -37,7 +37,7 @@ public NotificationsService( IHubContext notificationsHub, IHttpContextService httpContextService, IObjectIdConversionService objectIdConversionService, - IEventBus teamspeakMessageEventBus + IEventBus eventBus ) { _accountContext = accountContext; _notificationsContext = notificationsContext; @@ -45,7 +45,7 @@ IEventBus teamspeakMessageEventBus _notificationsHub = notificationsHub; _httpContextService = httpContextService; _objectIdConversionService = objectIdConversionService; - _teamspeakMessageEventBus = teamspeakMessageEventBus; + _eventBus = eventBus; } public void SendTeamspeakNotification(Account account, string rawMessage) { @@ -57,7 +57,7 @@ public void SendTeamspeakNotification(Account account, string rawMessage) { public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { rawMessage = rawMessage.Replace("", "[/url]"); - _teamspeakMessageEventBus.Send(new TeamspeakMessageEventModel(clientDbIds, rawMessage)); + _eventBus.Send(new TeamspeakMessageEventData(clientDbIds, rawMessage)); } public IEnumerable GetNotificationsForContext() { diff --git a/UKSF.Api.Shared/ApiSharedExtensions.cs b/UKSF.Api.Shared/ApiSharedExtensions.cs index 40563d6b..7365c9ea 100644 --- a/UKSF.Api.Shared/ApiSharedExtensions.cs +++ b/UKSF.Api.Shared/ApiSharedExtensions.cs @@ -11,7 +11,7 @@ public static class ApiSharedExtensions { public static IServiceCollection AddUksfShared(this IServiceCollection services) => services .AddContexts() - .AddEventBuses() + .AddEventHandlers() .AddServices() .AddTransient() @@ -26,15 +26,6 @@ private static IServiceCollection AddContexts(this IServiceCollection services) .AddSingleton() .AddSingleton(); - private static IServiceCollection AddEventBuses(this IServiceCollection services) => - services.AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() - .AddSingleton, DataEventBus>() - .AddSingleton, EventBus>(); - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; private static IServiceCollection AddServices(this IServiceCollection services) => diff --git a/UKSF.Api.Shared/Context/CachedMongoContext.cs b/UKSF.Api.Shared/Context/CachedMongoContext.cs index 376d468e..dbfed113 100644 --- a/UKSF.Api.Shared/Context/CachedMongoContext.cs +++ b/UKSF.Api.Shared/Context/CachedMongoContext.cs @@ -6,8 +6,8 @@ using MongoDB.Driver; using MoreLinq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; -using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; namespace UKSF.Api.Shared.Context { @@ -16,11 +16,10 @@ public interface ICachedMongoContext { } public class CachedMongoContext : MongoContextBase, IMongoContext, ICachedMongoContext where T : MongoObject { - private readonly IDataEventBus _dataEventBus; + private readonly IEventBus _eventBus; protected readonly object LockObject = new(); - protected CachedMongoContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(mongoCollectionFactory, collectionName) => - _dataEventBus = dataEventBus; + protected CachedMongoContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base(mongoCollectionFactory, collectionName) => _eventBus = eventBus; public List Cache { get; protected set; } @@ -57,7 +56,7 @@ public override async Task Add(T item) { if (Cache == null) Get(); await base.Add(item); SetCache(Cache.Concat(new[] { item })); - DataAddEvent(item.Id, item); + DataAddEvent(item); } public override async Task Update(string id, Expression> fieldSelector, object value) { @@ -125,20 +124,20 @@ protected virtual void SetCache(IEnumerable newCollection) { } } - private void DataAddEvent(string id, T item) { - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, id, item)); + private void DataAddEvent(T item) { + DataEvent(new EventModel(EventType.ADD, new ContextEventData(string.Empty, item))); } private void DataUpdateEvent(string id) { - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + DataEvent(new EventModel(EventType.UPDATE, new ContextEventData(id, null))); } private void DataDeleteEvent(string id) { - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); + DataEvent(new EventModel(EventType.DELETE, new ContextEventData(id, null))); } - protected virtual void DataEvent(DataEventModel dataEvent) { - _dataEventBus.Send(dataEvent); + protected virtual void DataEvent(EventModel eventModel) { + _eventBus.Send(eventModel); } } } diff --git a/UKSF.Api.Shared/Context/LogContext.cs b/UKSF.Api.Shared/Context/LogContext.cs index 84d38fde..69ddb426 100644 --- a/UKSF.Api.Shared/Context/LogContext.cs +++ b/UKSF.Api.Shared/Context/LogContext.cs @@ -1,4 +1,5 @@ using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; @@ -14,22 +15,22 @@ public interface ILauncherLogContext : IMongoContext { } public interface IDiscordLogContext : IMongoContext { } public class LogContext : MongoContext, ILogContext { - public LogContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "logs") { } + public LogContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "logs") { } } public class AuditLogContext : MongoContext, IAuditLogContext { - public AuditLogContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "auditLogs") { } + public AuditLogContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "auditLogs") { } } public class HttpErrorLogContext : MongoContext, IHttpErrorLogContext { - public HttpErrorLogContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "errorLogs") { } + public HttpErrorLogContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "errorLogs") { } } public class LauncherLogContext : MongoContext, ILauncherLogContext { - public LauncherLogContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "launcherLogs") { } + public LauncherLogContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "launcherLogs") { } } public class DiscordLogContext : MongoContext, IDiscordLogContext { - public DiscordLogContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "discordLogs") { } + public DiscordLogContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "discordLogs") { } } } diff --git a/UKSF.Api.Shared/Context/MongoContext.cs b/UKSF.Api.Shared/Context/MongoContext.cs index 976893dd..dd688d01 100644 --- a/UKSF.Api.Shared/Context/MongoContext.cs +++ b/UKSF.Api.Shared/Context/MongoContext.cs @@ -5,8 +5,8 @@ using MongoDB.Driver; using MoreLinq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; -using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; namespace UKSF.Api.Shared.Context { @@ -28,14 +28,13 @@ public interface IMongoContext { } public class MongoContext : MongoContextBase, IMongoContext where T : MongoObject { - private readonly IDataEventBus _dataEventBus; + private readonly IEventBus _eventBus; - protected MongoContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus, string collectionName) : base(mongoCollectionFactory, collectionName) => - _dataEventBus = dataEventBus; + protected MongoContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base(mongoCollectionFactory, collectionName) => _eventBus = eventBus; public override async Task Add(T item) { await base.Add(item); - DataAddEvent(item.Id, item); + DataAddEvent(item); } public override async Task Update(string id, Expression> fieldSelector, object value) { @@ -84,20 +83,20 @@ public override async Task DeleteMany(Expression> filterExpression Get(filterExpression.Compile()).ForEach(x => DataDeleteEvent(x.Id)); } - private void DataAddEvent(string id, T item) { - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.ADD, id, item)); + private void DataAddEvent(T item) { + DataEvent(new EventModel(EventType.ADD, new ContextEventData(string.Empty, item))); } private void DataUpdateEvent(string id) { - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.UPDATE, id)); + DataEvent(new EventModel(EventType.UPDATE, new ContextEventData(id, null))); } private void DataDeleteEvent(string id) { - DataEvent(EventModelFactory.CreateDataEvent(DataEventType.DELETE, id)); + DataEvent(new EventModel(EventType.DELETE, new ContextEventData(id, null))); } - protected virtual void DataEvent(DataEventModel dataEvent) { - _dataEventBus.Send(dataEvent); + protected virtual void DataEvent(EventModel dataModel) { + _eventBus.Send(dataModel); } } } diff --git a/UKSF.Api.Shared/Context/SchedulerContext.cs b/UKSF.Api.Shared/Context/SchedulerContext.cs index 4afef289..81dcea67 100644 --- a/UKSF.Api.Shared/Context/SchedulerContext.cs +++ b/UKSF.Api.Shared/Context/SchedulerContext.cs @@ -1,4 +1,5 @@ using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; @@ -6,6 +7,6 @@ namespace UKSF.Api.Shared.Context { public interface ISchedulerContext : IMongoContext { } public class SchedulerContext : MongoContext, ISchedulerContext { - public SchedulerContext(IMongoCollectionFactory mongoCollectionFactory, IDataEventBus dataEventBus) : base(mongoCollectionFactory, dataEventBus, "scheduledJobs") { } + public SchedulerContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "scheduledJobs") { } } } diff --git a/UKSF.Api.Shared/Events/DataEventBus.cs b/UKSF.Api.Shared/Events/DataEventBus.cs deleted file mode 100644 index fee2fea2..00000000 --- a/UKSF.Api.Shared/Events/DataEventBus.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Reactive.Linq; -using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; -using UKSF.Api.Shared.Models; - -namespace UKSF.Api.Shared.Events { - public interface IDataEventBus : IEventBus> where T : MongoObject { } - - public class DataEventBus : EventBus>, IDataEventBus where T : MongoObject { - public override IObservable> AsObservable() => Subject.OfType>(); - } -} diff --git a/UKSF.Api.Shared/Events/EventModelFactory.cs b/UKSF.Api.Shared/Events/EventModelFactory.cs deleted file mode 100644 index cd5d9e69..00000000 --- a/UKSF.Api.Shared/Events/EventModelFactory.cs +++ /dev/null @@ -1,8 +0,0 @@ -using UKSF.Api.Base.Models; -using UKSF.Api.Shared.Models; - -namespace UKSF.Api.Shared.Events { - public static class EventModelFactory { - public static DataEventModel CreateDataEvent(DataEventType type, string id, object data = null) where T : MongoObject => new() { Type = type, Id = id, Data = data }; - } -} diff --git a/UKSF.Api.Shared/Events/Logger.cs b/UKSF.Api.Shared/Events/Logger.cs index 8ef58198..326111ad 100644 --- a/UKSF.Api.Shared/Events/Logger.cs +++ b/UKSF.Api.Shared/Events/Logger.cs @@ -4,7 +4,7 @@ using UKSF.Api.Shared.Services; namespace UKSF.Api.Shared.Events { - public interface ILogger : IEventBus { + public interface ILogger { void LogInfo(string message); void LogWarning(string message); void LogError(string message); @@ -15,10 +15,14 @@ public interface ILogger : IEventBus { void LogDiscordEvent(DiscordUserEventType discordUserEventType, string name, string userId, string message); } - public class Logger : EventBus, ILogger { + public class Logger : ILogger { private readonly IHttpContextService _httpContextService; + private readonly IEventBus _eventBus; - public Logger(IHttpContextService httpContextService) => _httpContextService = httpContextService; + public Logger(IHttpContextService httpContextService, IEventBus eventBus) { + _httpContextService = httpContextService; + _eventBus = eventBus; + } public void LogInfo(string message) { Log(new BasicLog(message, LogLevel.INFO)); @@ -54,7 +58,7 @@ public void LogDiscordEvent(DiscordUserEventType discordUserEventType, string na } private void Log(BasicLog log) { - Send(log); + _eventBus.Send(log); } } } diff --git a/UKSF.Api.Shared/Extensions/ChangeUtilities.cs b/UKSF.Api.Shared/Extensions/ChangeUtilities.cs index 487c8726..a1a6280a 100644 --- a/UKSF.Api.Shared/Extensions/ChangeUtilities.cs +++ b/UKSF.Api.Shared/Extensions/ChangeUtilities.cs @@ -12,17 +12,17 @@ public static class ChangeUtilities { private static List GetChanges(this T original, T updated) { List changes = new(); Type type = original.GetType(); - foreach (FieldInfo fieldInfo in type.GetFields()) { - string name = fieldInfo.Name; - object originalValue = fieldInfo.GetValue(original); - object updatedValue = fieldInfo.GetValue(updated); + foreach (PropertyInfo propertyInfo in type.GetProperties()) { + string name = propertyInfo.Name; + object originalValue = propertyInfo.GetValue(original); + object updatedValue = propertyInfo.GetValue(updated); if (originalValue == null && updatedValue == null) continue; if (DeepEquals(originalValue, updatedValue)) continue; - if (fieldInfo.FieldType.IsClass && !fieldInfo.FieldType.IsSerializable) { + if (propertyInfo.PropertyType.IsClass && !propertyInfo.PropertyType.IsSerializable) { // Class, recurse changes.Add(new Change { Type = ChangeType.CLASS, Name = name, InnerChanges = GetChanges(originalValue, updatedValue) }); - } else if (fieldInfo.FieldType != typeof(string) && updatedValue is IEnumerable originalListValue && originalValue is IEnumerable updatedListValue) { + } else if (propertyInfo.PropertyType != typeof(string) && updatedValue is IEnumerable originalListValue && originalValue is IEnumerable updatedListValue) { // List, get list changes changes.Add(new Change { Type = ChangeType.LIST, Name = name, InnerChanges = GetListChanges(originalListValue, updatedListValue) }); } else { diff --git a/UKSF.Api.Shared/Extensions/ObservableExtensions.cs b/UKSF.Api.Shared/Extensions/ObservableExtensions.cs index 8878b4a3..2867b13b 100644 --- a/UKSF.Api.Shared/Extensions/ObservableExtensions.cs +++ b/UKSF.Api.Shared/Extensions/ObservableExtensions.cs @@ -2,11 +2,16 @@ using System.Reactive.Linq; using System.Reactive.Threading.Tasks; using System.Threading.Tasks; +using UKSF.Api.Base.Models; namespace UKSF.Api.Shared.Extensions { public static class ObservableExtensions { - public static void SubscribeWithAsyncNext(this IObservable source, Func onNext, Action onError) { + public static void SubscribeWithAsyncNext(this IObservable source, Func onNext, Action onError) { source.Select(x => Observable.Defer(() => onNext(x).ToObservable())).Concat().Subscribe(_ => { }, onError); } + + public static void SubscribeWithAsyncNext(this IObservable source, Func onNext, Action onError) { + source.Select(x => Observable.Defer(() => x.Data is T data ? onNext(x, data).ToObservable() : Task.CompletedTask.ToObservable())).Concat().Subscribe(_ => { }, onError); + } } } diff --git a/UKSF.Api.Shared/Models/AuditLog.cs b/UKSF.Api.Shared/Models/AuditLog.cs index e4d3c580..ab128366 100644 --- a/UKSF.Api.Shared/Models/AuditLog.cs +++ b/UKSF.Api.Shared/Models/AuditLog.cs @@ -1,6 +1,6 @@ namespace UKSF.Api.Shared.Models { public record AuditLog : BasicLog { - public string Who; + public string Who { get; set; } public AuditLog(string who, string message) : base(message) { Who = who; diff --git a/UKSF.Api.Shared/Models/ContextEventData.cs b/UKSF.Api.Shared/Models/ContextEventData.cs new file mode 100644 index 00000000..ec575820 --- /dev/null +++ b/UKSF.Api.Shared/Models/ContextEventData.cs @@ -0,0 +1,11 @@ +namespace UKSF.Api.Shared.Models { + public class ContextEventData { + public ContextEventData(string id, T data) { + Id = id; + Data = data; + } + + public string Id { get; } + public T Data { get; } + } +} diff --git a/UKSF.Api.Shared/Models/DataEventModel.cs b/UKSF.Api.Shared/Models/DataEventModel.cs deleted file mode 100644 index 20452c04..00000000 --- a/UKSF.Api.Shared/Models/DataEventModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using UKSF.Api.Base.Models; - -namespace UKSF.Api.Shared.Models { - public enum DataEventType { - ADD, - UPDATE, - DELETE - } - - // ReSharper disable once UnusedTypeParameter - public class DataEventModel where T : MongoObject { - public object Data; - public string Id; - public DataEventType Type; - } -} diff --git a/UKSF.Api.Shared/Models/LauncherLog.cs b/UKSF.Api.Shared/Models/LauncherLog.cs index 86c969b3..f5cd8404 100644 --- a/UKSF.Api.Shared/Models/LauncherLog.cs +++ b/UKSF.Api.Shared/Models/LauncherLog.cs @@ -1,8 +1,8 @@ namespace UKSF.Api.Shared.Models { public record LauncherLog : BasicLog { - public string Name; - public string UserId; - public string Version; + public string Name { get; set; } + public string UserId { get; set; } + public string Version { get; set; } public LauncherLog(string version, string message) : base(message) => Version = version; } diff --git a/UKSF.Api.Shared/Models/ScheduledJob.cs b/UKSF.Api.Shared/Models/ScheduledJob.cs index 74d62dc7..91cc1f35 100644 --- a/UKSF.Api.Shared/Models/ScheduledJob.cs +++ b/UKSF.Api.Shared/Models/ScheduledJob.cs @@ -3,10 +3,10 @@ namespace UKSF.Api.Shared.Models { public record ScheduledJob : MongoObject { - public string Action; - public string ActionParameters; - public TimeSpan Interval; - public DateTime Next; - public bool Repeat; + public string Action { get; set; } + public string ActionParameters { get; set; } + public TimeSpan Interval { get; set; } + public DateTime Next { get; set; } + public bool Repeat { get; set; } } } diff --git a/UKSF.Api.Shared/Models/SignalrEventData.cs b/UKSF.Api.Shared/Models/SignalrEventData.cs new file mode 100644 index 00000000..d4d609a4 --- /dev/null +++ b/UKSF.Api.Shared/Models/SignalrEventData.cs @@ -0,0 +1,6 @@ +namespace UKSF.Api.Shared.Models { + public class SignalrEventData { + public object Args { get; set; } + public TeamspeakEventType Procedure { get; set; } + } +} diff --git a/UKSF.Api.Shared/Models/SignalrEventModel.cs b/UKSF.Api.Shared/Models/SignalrEventModel.cs deleted file mode 100644 index e3a1e663..00000000 --- a/UKSF.Api.Shared/Models/SignalrEventModel.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace UKSF.Api.Shared.Models { - public class SignalrEventModel { - public object Args; - public TeamspeakEventType Procedure; - } -} diff --git a/UKSF.Api.Shared/Models/TeamspeakMessageEventModel.cs b/UKSF.Api.Shared/Models/TeamspeakMessageEventData.cs similarity index 64% rename from UKSF.Api.Shared/Models/TeamspeakMessageEventModel.cs rename to UKSF.Api.Shared/Models/TeamspeakMessageEventData.cs index e70ef76d..a594eeda 100644 --- a/UKSF.Api.Shared/Models/TeamspeakMessageEventModel.cs +++ b/UKSF.Api.Shared/Models/TeamspeakMessageEventData.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; namespace UKSF.Api.Shared.Models { - public class TeamspeakMessageEventModel { - public TeamspeakMessageEventModel(IEnumerable clientDbIds, string message) { + public class TeamspeakMessageEventData { + public TeamspeakMessageEventData(IEnumerable clientDbIds, string message) { ClientDbIds = clientDbIds; Message = message; } diff --git a/UKSF.Api/AppStart/UksfServiceExtensions.cs b/UKSF.Api/AppStart/UksfServiceExtensions.cs index e9aa2bb7..f6f8e673 100644 --- a/UKSF.Api/AppStart/UksfServiceExtensions.cs +++ b/UKSF.Api/AppStart/UksfServiceExtensions.cs @@ -20,12 +20,10 @@ namespace UKSF.Api.AppStart { public static class ServiceExtensions { public static void AddUksf(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) => - services.AddContexts().AddEventBuses().AddEventHandlers().AddServices().AddSingleton().AddSingleton().AddComponents(configuration, currentEnvironment); + services.AddContexts().AddEventHandlers().AddServices().AddSingleton().AddSingleton().AddComponents(configuration, currentEnvironment); private static IServiceCollection AddContexts(this IServiceCollection services) => services; - private static IServiceCollection AddEventBuses(this IServiceCollection services) => services; - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); private static IServiceCollection AddServices(this IServiceCollection services) => services; diff --git a/UKSF.Api/EventHandlers/LoggerEventHandler.cs b/UKSF.Api/EventHandlers/LoggerEventHandler.cs index 1473fa5b..fa269dbd 100644 --- a/UKSF.Api/EventHandlers/LoggerEventHandler.cs +++ b/UKSF.Api/EventHandlers/LoggerEventHandler.cs @@ -1,9 +1,11 @@ using System; using System.Threading.Tasks; using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Models; namespace UKSF.Api.EventHandlers { @@ -14,11 +16,13 @@ public class LoggerEventHandler : ILoggerEventHandler { private readonly IDiscordLogContext _discordLogContext; private readonly IHttpErrorLogContext _httpErrorLogContext; private readonly ILauncherLogContext _launcherLogContext; + private readonly IEventBus _eventBus; private readonly ILogContext _logContext; private readonly ILogger _logger; private readonly IObjectIdConversionService _objectIdConversionService; public LoggerEventHandler( + IEventBus eventBus, ILogContext logContext, IAuditLogContext auditLogContext, IHttpErrorLogContext httpErrorLogContext, @@ -27,6 +31,7 @@ public LoggerEventHandler( ILogger logger, IObjectIdConversionService objectIdConversionService ) { + _eventBus = eventBus; _logContext = logContext; _auditLogContext = auditLogContext; _httpErrorLogContext = httpErrorLogContext; @@ -37,11 +42,12 @@ IObjectIdConversionService objectIdConversionService } public void Init() { - _logger.AsObservable().Subscribe(HandleLog, _logger.LogError); + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleLog, _logger.LogError); } - private void HandleLog(BasicLog log) { + private Task HandleLog(EventModel eventModel, BasicLog log) { Task _ = HandleLogAsync(log); + return Task.CompletedTask; } private async Task HandleLogAsync(BasicLog log) { diff --git a/UKSF.Tests/UKSF.Tests.csproj b/UKSF.Tests/UKSF.Tests.csproj index d1c676ea..642545e3 100644 --- a/UKSF.Tests/UKSF.Tests.csproj +++ b/UKSF.Tests/UKSF.Tests.csproj @@ -35,7 +35,6 @@ - diff --git a/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs b/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs deleted file mode 100644 index dd9e28e7..00000000 --- a/UKSF.Tests/Unit/Common/EventModelFactoryTests.cs +++ /dev/null @@ -1,23 +0,0 @@ -using FluentAssertions; -using MongoDB.Bson; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; -using UKSF.Api.Tests.Common; -using Xunit; - -namespace UKSF.Tests.Unit.Common { - public class EventModelFactoryTests { - [Fact] - public void Should_create_data_event_correctly() { - string id = ObjectId.GenerateNewId().ToString(); - object data = new[] { "test", "item" }; - - DataEventModel subject = EventModelFactory.CreateDataEvent(DataEventType.ADD, id, data); - - subject.Should().NotBeNull(); - subject.Type.Should().Be(DataEventType.ADD); - subject.Id.Should().Be(id); - subject.Data.Should().Be(data); - } - } -} diff --git a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs index 7edc113a..06931cc1 100644 --- a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs @@ -8,6 +8,7 @@ using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Models; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Shared.Events; using Xunit; @@ -19,13 +20,13 @@ public class VariablesDataServiceTests { public VariablesDataServiceTests() { Mock mockDataCollectionFactory = new(); - Mock> mockDataEventBus = new(); + Mock mockEventBus = new(); _mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); _mockDataCollection.Setup(x => x.Get()).Returns(() => _mockCollection); - _variablesContext = new VariablesContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _variablesContext = new VariablesContext(mockDataCollectionFactory.Object, mockEventBus.Object); } [Theory, InlineData(""), InlineData("game path")] diff --git a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs index 4c1fc6b1..c5ae9bff 100644 --- a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs @@ -7,6 +7,8 @@ using MongoDB.Driver; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; using UKSF.Api.Tests.Common; @@ -16,25 +18,24 @@ namespace UKSF.Tests.Unit.Data { public class CachedDataServiceTests { private readonly Mock> _mockDataCollection; private readonly Mock _mockDataCollectionFactory; - private readonly Mock> _mockDataEventBus; + private readonly Mock _mockEventBus; private List _mockCollection; private TestCachedContext _testCachedContext; public CachedDataServiceTests() { _mockDataCollectionFactory = new Mock(); - _mockDataEventBus = new Mock>(); + _mockEventBus = new Mock(); _mockDataCollection = new Mock>(); _mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); _mockDataCollection.Setup(x => x.Get()).Returns(() => new List(_mockCollection)); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())); } [Fact] public void Should_cache_collection_when_null_for_get() { _mockCollection = new List(); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); _testCachedContext.Cache.Should().BeNull(); @@ -50,7 +51,7 @@ public void Should_cache_collection_when_null_for_get_single_by_id() { TestDataModel item2 = new() { Name = "2" }; _mockCollection = new List { item1, item2 }; - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); TestDataModel subject = _testCachedContext.GetSingle(item2.Id); @@ -65,7 +66,7 @@ public void Should_cache_collection_when_null_for_get_single_by_predicate() { TestDataModel item2 = new() { Name = "2" }; _mockCollection = new List { item1, item2 }; - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); TestDataModel subject = _testCachedContext.GetSingle(x => x.Name == "2"); @@ -80,7 +81,7 @@ public void Should_cache_collection_when_null_for_get_with_predicate() { TestDataModel item2 = new() { Name = "2" }; _mockCollection = new List { item1, item2 }; - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); IEnumerable subject = _testCachedContext.Get(x => x.Name == "1"); @@ -92,7 +93,7 @@ public void Should_cache_collection_when_null_for_get_with_predicate() { public void Should_cache_collection_when_null_for_refresh() { _mockCollection = new List(); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); _testCachedContext.Cache.Should().BeNull(); @@ -106,7 +107,7 @@ public void Should_cache_collection_when_null_for_refresh() { public void Should_return_cached_collection_for_get() { _mockCollection = new List(); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); _testCachedContext.Cache.Should().BeNull(); @@ -128,7 +129,7 @@ public async Task Should_update_cache_for_add() { _mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Callback(x => _mockCollection.Add(x)); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); _testCachedContext.Cache.Should().BeNull(); @@ -146,7 +147,7 @@ public async Task Should_update_cache_for_delete() { _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => _mockCollection.RemoveAll(x => x.Id == id)); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); await _testCachedContext.Delete(item1); @@ -162,7 +163,7 @@ public async Task Should_update_cache_for_delete_by_id() { _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => _mockCollection.RemoveAll(x => x.Id == id)); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); await _testCachedContext.Delete(item1.Id); @@ -181,7 +182,7 @@ public async Task Should_update_cache_for_delete_many() { .Returns(Task.CompletedTask) .Callback((Expression> expression) => _mockCollection.RemoveAll(x => _mockCollection.Where(expression.Compile()).Contains(x))); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); await _testCachedContext.DeleteMany(x => x.Name == "1"); @@ -200,7 +201,7 @@ public async Task ShouldRefreshCollectionForReplace() { .Returns(Task.CompletedTask) .Callback((string id, TestDataModel value) => _mockCollection[_mockCollection.FindIndex(x => x.Id == id)] = value); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); await _testCachedContext.Replace(item2); @@ -217,7 +218,7 @@ public async Task ShouldRefreshCollectionForUpdate() { .Returns(Task.CompletedTask) .Callback((string id, UpdateDefinition _) => _mockCollection.First(x => x.Id == id).Name = "2"); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); await _testCachedContext.Update(item1.Id, "Name", "2"); @@ -234,7 +235,7 @@ public async Task ShouldRefreshCollectionForUpdateByUpdateDefinition() { .Returns(Task.CompletedTask) .Callback((string id, UpdateDefinition _) => _mockCollection.First(x => x.Id == id).Name = "2"); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); await _testCachedContext.Update(item1.Id, Builders.Update.Set(x => x.Name, "2")); @@ -256,7 +257,7 @@ public async Task ShouldRefreshCollectionForUpdateMany() { _mockCollection.Where(expression.Compile()).ToList().ForEach(x => x.Name = "3") ); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); await _testCachedContext.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "3")); diff --git a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs index eb630aa5..a1de3d27 100644 --- a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs @@ -8,6 +8,8 @@ using MongoDB.Driver; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; using UKSF.Api.Tests.Common; @@ -20,12 +22,12 @@ public class CachedDataServiceEventTests { private readonly string _id3; private readonly TestDataModel _item1; private readonly Mock> _mockDataCollection; - private readonly Mock> _mockDataEventBus; + private readonly Mock _mockEventBus; private readonly TestCachedContext _testCachedContext; public CachedDataServiceEventTests() { Mock mockDataCollectionFactory = new(); - _mockDataEventBus = new Mock>(); + _mockEventBus = new Mock(); _mockDataCollection = new Mock>(); _id1 = ObjectId.GenerateNewId().ToString(); _id2 = ObjectId.GenerateNewId().ToString(); @@ -41,100 +43,100 @@ public CachedDataServiceEventTests() { _mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => mockCollection.FirstOrDefault(predicate)); _mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(id => mockCollection.FirstOrDefault(x => x.Id == id)); - _testCachedContext = new TestCachedContext(mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testCachedContext = new TestCachedContext(mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); } [Fact] public async Task Should_create_correct_add_event_for_add() { - DataEventModel subject = null; + EventModel subject = null; _mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subject = dataEventModel); await _testCachedContext.Add(_item1); - _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); - subject.Should().BeEquivalentTo(new DataEventModel { Id = _id1, Type = DataEventType.ADD, Data = _item1 }); + _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Once); + subject.Should().BeEquivalentTo(new EventModel(EventType.ADD, new ContextEventData(string.Empty, _item1))); } [Fact] public async Task Should_create_correct_delete_event_for_delete() { - DataEventModel subject = null; + EventModel subject = null; _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subject = dataEventModel); await _testCachedContext.Delete(_id1); - _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); - subject.Should().BeEquivalentTo(new DataEventModel { Id = _id1, Type = DataEventType.DELETE, Data = null }); + _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Once); + subject.Should().BeEquivalentTo(new EventModel(EventType.DELETE, new ContextEventData(_id1, null))); } [Fact] public async Task Should_create_correct_delete_events_for_delete_many() { - List> subjects = new(); + List subjects = new(); _mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())).Returns(Task.CompletedTask); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subjects.Add(dataEventModel)); await _testCachedContext.DeleteMany(x => x.Name == "1"); - _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); + _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Exactly(2)); subjects.Should() .BeEquivalentTo( - new DataEventModel { Id = _id1, Type = DataEventType.DELETE, Data = null }, - new DataEventModel { Id = _id2, Type = DataEventType.DELETE, Data = null } + new EventModel(EventType.DELETE, new ContextEventData(_id1, null)), + new EventModel(EventType.DELETE, new ContextEventData(_id2, null)) ); } [Fact] public async Task Should_create_correct_update_event_for_replace() { - DataEventModel subject = null; + EventModel subject = null; _mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subject = dataEventModel); await _testCachedContext.Replace(_item1); - _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); - subject.Should().BeEquivalentTo(new DataEventModel { Id = _id1, Type = DataEventType.UPDATE, Data = null }); + _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Once); + subject.Should().BeEquivalentTo(new EventModel(EventType.UPDATE, new ContextEventData(_id1, null))); } [Fact] public async Task Should_create_correct_update_events_for_update_many() { - List> subjects = new(); + List subjects = new(); _mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())).Returns(Task.CompletedTask); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subjects.Add(dataEventModel)); await _testCachedContext.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); - _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); + _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Exactly(2)); subjects.Should() .BeEquivalentTo( - new DataEventModel { Id = _id1, Type = DataEventType.UPDATE, Data = null }, - new DataEventModel { Id = _id2, Type = DataEventType.UPDATE, Data = null } + new EventModel(EventType.UPDATE, new ContextEventData(_id1, null)), + new EventModel(EventType.UPDATE, new ContextEventData(_id2, null)) ); } [Fact] public async Task Should_create_correct_update_events_for_updates() { - List> subjects = new(); + List subjects = new(); _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask); _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())).Returns(Task.CompletedTask); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subjects.Add(dataEventModel)); await _testCachedContext.Update(_id1, "Name", "1"); await _testCachedContext.Update(_id2, Builders.Update.Set(x => x.Name, "2")); await _testCachedContext.Update(x => x.Id == _id3, Builders.Update.Set(x => x.Name, "3")); - _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(3)); + _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Exactly(3)); subjects.Should() .BeEquivalentTo( - new DataEventModel { Id = _id1, Type = DataEventType.UPDATE, Data = null }, - new DataEventModel { Id = _id2, Type = DataEventType.UPDATE, Data = null }, - new DataEventModel { Id = _id3, Type = DataEventType.UPDATE, Data = null } + new EventModel(EventType.UPDATE, new ContextEventData(_id1, null)), + new EventModel(EventType.UPDATE, new ContextEventData(_id2, null)), + new EventModel(EventType.UPDATE, new ContextEventData(_id3, null)) ); } } diff --git a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs index 1c6d661d..dbf01cda 100644 --- a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs @@ -8,7 +8,8 @@ using MongoDB.Driver; using Moq; using UKSF.Api.Base.Context; -using UKSF.Api.Shared.Events; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Shared.Models; using UKSF.Api.Tests.Common; using Xunit; @@ -20,12 +21,12 @@ public class DataServiceEventTests { private readonly string _id3; private readonly TestDataModel _item1; private readonly Mock> _mockDataCollection; - private readonly Mock> _mockDataEventBus; + private readonly Mock _mockEventBus; private readonly TestContext _testContext; public DataServiceEventTests() { Mock mockDataCollectionFactory = new(); - _mockDataEventBus = new Mock>(); + _mockEventBus = new Mock(); _mockDataCollection = new Mock>(); _id1 = ObjectId.GenerateNewId().ToString(); _id2 = ObjectId.GenerateNewId().ToString(); @@ -41,113 +42,113 @@ public DataServiceEventTests() { _mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => mockCollection.FirstOrDefault(predicate)); _mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(id => mockCollection.FirstOrDefault(x => x.Id == id)); - _testContext = new TestContext(mockDataCollectionFactory.Object, _mockDataEventBus.Object, "test"); + _testContext = new TestContext(mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); } [Fact] public async Task Should_create_correct_add_event_for_add() { - DataEventModel subject = null; + EventModel subject = null; _mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subject = dataEventModel); await _testContext.Add(_item1); - _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); - subject.Should().BeEquivalentTo(new DataEventModel { Id = _id1, Type = DataEventType.ADD, Data = _item1 }); + _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Once); + subject.Should().BeEquivalentTo(new EventModel(EventType.ADD, new ContextEventData(string.Empty, _item1))); } [Fact] public async Task Should_create_correct_delete_event_for_delete() { - DataEventModel subject = null; + EventModel subject = null; _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subject = dataEventModel); await _testContext.Delete(new TestDataModel { Id = _id1 }); - _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); - subject.Should().BeEquivalentTo(new DataEventModel { Id = _id1, Type = DataEventType.DELETE, Data = null }); + _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Once); + subject.Should().BeEquivalentTo(new EventModel(EventType.DELETE, new ContextEventData(_id1, null))); } [Fact] public async Task Should_create_correct_delete_event_for_delete_by_id() { - DataEventModel subject = null; + EventModel subject = null; _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subject = dataEventModel); await _testContext.Delete(_id1); - _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); - subject.Should().BeEquivalentTo(new DataEventModel { Id = _id1, Type = DataEventType.DELETE, Data = null }); + _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Once); + subject.Should().BeEquivalentTo(new EventModel(EventType.DELETE, new ContextEventData(_id1, null))); } [Fact] public async Task Should_create_correct_delete_events_for_delete_many() { - List> subjects = new(); + List subjects = new(); _mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())).Returns(Task.CompletedTask); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subjects.Add(dataEventModel)); await _testContext.DeleteMany(x => x.Name == "1"); - _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); + _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Exactly(2)); subjects.Should() .BeEquivalentTo( - new DataEventModel { Id = _id1, Type = DataEventType.DELETE, Data = null }, - new DataEventModel { Id = _id2, Type = DataEventType.DELETE, Data = null } + new EventModel(EventType.DELETE, new ContextEventData(_id1, null)), + new EventModel(EventType.DELETE, new ContextEventData(_id2, null)) ); } [Fact] public async Task Should_create_correct_update_event_for_replace() { - DataEventModel subject = null; + EventModel subject = null; _mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subject = dataEventModel); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subject = dataEventModel); await _testContext.Replace(_item1); - _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Once); - subject.Should().BeEquivalentTo(new DataEventModel { Id = _id1, Type = DataEventType.UPDATE, Data = null }); + _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Once); + subject.Should().BeEquivalentTo(new EventModel(EventType.UPDATE, new ContextEventData(_id1, null))); } [Fact] public async Task Should_create_correct_update_events_for_update_many() { - List> subjects = new(); + List subjects = new(); _mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())).Returns(Task.CompletedTask); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subjects.Add(dataEventModel)); await _testContext.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); - _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(2)); + _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Exactly(2)); subjects.Should() .BeEquivalentTo( - new DataEventModel { Id = _id1, Type = DataEventType.UPDATE, Data = null }, - new DataEventModel { Id = _id2, Type = DataEventType.UPDATE, Data = null } + new EventModel(EventType.UPDATE, new ContextEventData(_id1, null)), + new EventModel(EventType.UPDATE, new ContextEventData(_id2, null)) ); } [Fact] public async Task Should_create_correct_update_events_for_updates() { - List> subjects = new(); + List subjects = new(); _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask); _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())).Returns(Task.CompletedTask); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(dataEventModel => subjects.Add(dataEventModel)); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subjects.Add(dataEventModel)); await _testContext.Update(_id1, "Name", "1"); await _testContext.Update(_id2, Builders.Update.Set(x => x.Name, "2")); await _testContext.Update(x => x.Id == _id3, Builders.Update.Set(x => x.Name, "3")); - _mockDataEventBus.Verify(x => x.Send(It.IsAny>()), Times.Exactly(3)); + _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Exactly(3)); subjects.Should() .BeEquivalentTo( - new DataEventModel { Id = _id1, Type = DataEventType.UPDATE, Data = null }, - new DataEventModel { Id = _id2, Type = DataEventType.UPDATE, Data = null }, - new DataEventModel { Id = _id3, Type = DataEventType.UPDATE, Data = null } + new EventModel(EventType.UPDATE, new ContextEventData(_id1, null)), + new EventModel(EventType.UPDATE, new ContextEventData(_id2, null)), + new EventModel(EventType.UPDATE, new ContextEventData(_id3, null)) ); } } diff --git a/UKSF.Tests/Unit/Data/DataServiceTests.cs b/UKSF.Tests/Unit/Data/DataServiceTests.cs index 1076ba10..b9a5959f 100644 --- a/UKSF.Tests/Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceTests.cs @@ -8,6 +8,8 @@ using MongoDB.Driver; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; using UKSF.Api.Tests.Common; @@ -21,13 +23,12 @@ public class DataServiceTests { public DataServiceTests() { Mock mockDataCollectionFactory = new(); - Mock> mockDataEventBus = new(); + Mock mockEventBus = new(); _mockDataCollection = new Mock>(); - mockDataEventBus.Setup(x => x.Send(It.IsAny>())); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _testContext = new TestContext(mockDataCollectionFactory.Object, mockDataEventBus.Object, "test"); + _testContext = new TestContext(mockDataCollectionFactory.Object, mockEventBus.Object, "test"); } [Theory, InlineData(""), InlineData("1"), InlineData(null)] diff --git a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs index d785e8e0..fb42bc45 100644 --- a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs @@ -4,6 +4,7 @@ using UKSF.Api.ArmaServer.DataContext; using UKSF.Api.ArmaServer.Models; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Shared.Events; using Xunit; @@ -14,12 +15,12 @@ public class GameServersDataServiceTests { public GameServersDataServiceTests() { Mock mockDataCollectionFactory = new(); - Mock> mockDataEventBus = new(); + Mock mockEventBus = new(); _mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _gameServersContext = new GameServersContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _gameServersContext = new GameServersContext(mockDataCollectionFactory.Object, mockEventBus.Object); } [Fact] diff --git a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs index dd21cf8b..d8870fa7 100644 --- a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs @@ -5,10 +5,9 @@ using MongoDB.Driver; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; using UKSF.Api.Tests.Common; using Xunit; @@ -20,13 +19,13 @@ public class CommentThreadDataServiceTests { public CommentThreadDataServiceTests() { Mock mockDataCollectionFactory = new(); - Mock> mockDataEventBus = new(); + Mock mockEventBus = new(); _mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); _mockDataCollection.Setup(x => x.Get()).Returns(() => _mockCollection); - _commentThreadContext = new CommentThreadContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _commentThreadContext = new CommentThreadContext(mockDataCollectionFactory.Object, mockEventBus.Object); } [Fact] @@ -42,7 +41,7 @@ public async Task ShouldCreateCorrectUdpateDefinitionForAdd() { .Returns(Task.CompletedTask) .Callback>((_, update) => subject = update); - await _commentThreadContext.Update(commentThread.Id, comment, DataEventType.ADD); + await _commentThreadContext.AddCommentToThread(commentThread.Id, comment); TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); } @@ -60,7 +59,7 @@ public async Task ShouldCreateCorrectUdpateDefinitionForDelete() { .Returns(Task.CompletedTask) .Callback>((_, update) => subject = update); - await _commentThreadContext.Update(commentThread.Id, comment, DataEventType.DELETE); + await _commentThreadContext.RemoveCommentFromThread(commentThread.Id, comment); TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); } diff --git a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs index b17da761..4dc6e565 100644 --- a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs @@ -5,6 +5,8 @@ using MongoDB.Driver; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Modpack.Context; using UKSF.Api.Modpack.Models; using UKSF.Api.Shared.Events; @@ -15,16 +17,16 @@ namespace UKSF.Tests.Unit.Data.Modpack { public class BuildsDataServiceTests { private readonly BuildsContext _buildsContext; private readonly Mock> _mockDataCollection; - private readonly Mock> _mockDataEventBus; + private readonly Mock _mockEventBus; public BuildsDataServiceTests() { Mock mockDataCollectionFactory = new(); - _mockDataEventBus = new Mock>(); + _mockEventBus = new Mock(); _mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _buildsContext = new BuildsContext(mockDataCollectionFactory.Object, _mockDataEventBus.Object); + _buildsContext = new BuildsContext(mockDataCollectionFactory.Object, _mockEventBus.Object); } [Fact] @@ -45,27 +47,27 @@ public void Should_update_build_step_with_event() { string id = ObjectId.GenerateNewId().ToString(); ModpackBuildStep modpackBuildStep = new("step") { Index = 0, Running = false }; ModpackBuild modpackBuild = new() { Id = id, BuildNumber = 1, Steps = new List { modpackBuildStep } }; - DataEventModel subject = null; + EventModel subject = null; _mockDataCollection.Setup(x => x.Get()).Returns(new List()); _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Callback(() => { modpackBuild.Steps.First().Running = true; }); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(x => subject = x); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(x => subject = x); _buildsContext.Update(modpackBuild, modpackBuildStep); modpackBuildStep.Running.Should().BeTrue(); subject.Data.Should().NotBeNull(); - subject.Data.Should().Be(modpackBuildStep); + subject.Data.Should().BeOfType(); } [Fact] public void Should_update_build_with_event_data() { string id = ObjectId.GenerateNewId().ToString(); - DataEventModel subject = null; + EventModel subject = null; _mockDataCollection.Setup(x => x.Get()).Returns(new List()); _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())); - _mockDataEventBus.Setup(x => x.Send(It.IsAny>())).Callback>(x => subject = x); + _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(x => subject = x); ModpackBuild modpackBuild = new() { Id = id, BuildNumber = 1 }; _buildsContext.Update(modpackBuild, Builders.Update.Set(x => x.Running, true)); diff --git a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs index 36297152..70321491 100644 --- a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs @@ -2,6 +2,7 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Modpack.Context; using UKSF.Api.Modpack.Models; using UKSF.Api.Shared.Events; @@ -14,12 +15,12 @@ public class ReleasesDataServiceTests { public ReleasesDataServiceTests() { Mock mockDataCollectionFactory = new(); - Mock> mockDataEventBus = new(); + Mock mockEventBus = new(); _mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _releasesContext = new ReleasesContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _releasesContext = new ReleasesContext(mockDataCollectionFactory.Object, mockEventBus.Object); } [Fact] diff --git a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs index 7886b0da..ca763737 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs @@ -3,6 +3,7 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Shared.Events; @@ -15,12 +16,12 @@ public class OperationOrderDataServiceTests { public OperationOrderDataServiceTests() { Mock mockDataCollectionFactory = new(); - Mock> mockDataEventBus = new(); + Mock mockEventBus = new(); _mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _operationOrderContext = new OperationOrderContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _operationOrderContext = new OperationOrderContext(mockDataCollectionFactory.Object, mockEventBus.Object); } [Fact] diff --git a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs index bca0fa2f..d4b1b70f 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs @@ -3,6 +3,7 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Shared.Events; @@ -15,12 +16,12 @@ public class OperationReportDataServiceTests { public OperationReportDataServiceTests() { Mock mockDataCollectionFactory = new(); - Mock> mockDataEventBus = new(); + Mock mockEventBus = new(); _mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _operationReportContext = new OperationReportContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _operationReportContext = new OperationReportContext(mockDataCollectionFactory.Object, mockEventBus.Object); } [Fact] diff --git a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs index 1ee5ab00..5d5b06a2 100644 --- a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -3,6 +3,7 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Shared.Events; @@ -13,7 +14,7 @@ public class DischargeDataServiceTests { [Fact] public void Should_get_collection_in_order() { Mock mockDataCollectionFactory = new(); - Mock> mockDataEventBus = new(); + Mock mockEventBus = new(); Mock> mockDataCollection = new(); DischargeCollection item1 = new() { Discharges = new List { new() { Timestamp = DateTime.Now.AddDays(-3) } } }; @@ -23,7 +24,7 @@ public void Should_get_collection_in_order() { mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); - DischargeContext dischargeContext = new(mockDataCollectionFactory.Object, mockDataEventBus.Object); + DischargeContext dischargeContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); IEnumerable subject = dischargeContext.Get(); diff --git a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs index 892ef24f..e0f4f190 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs @@ -2,6 +2,7 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Events; @@ -14,12 +15,12 @@ public class RanksDataServiceTests { public RanksDataServiceTests() { Mock mockDataCollectionFactory = new(); - Mock> mockDataEventBus = new(); + Mock mockEventBus = new(); _mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _ranksContext = new RanksContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _ranksContext = new RanksContext(mockDataCollectionFactory.Object, mockEventBus.Object); } [Theory, InlineData(""), InlineData(null)] diff --git a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs index 9237cb46..56ba3bd7 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs @@ -2,6 +2,7 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Events; @@ -14,12 +15,12 @@ public class RolesDataServiceTests { public RolesDataServiceTests() { Mock mockDataCollectionFactory = new(); - Mock> mockDataEventBus = new(); + Mock mockEventBus = new(); _mockDataCollection = new Mock>(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _rolesContext = new RolesContext(mockDataCollectionFactory.Object, mockDataEventBus.Object); + _rolesContext = new RolesContext(mockDataCollectionFactory.Object, mockEventBus.Object); } [Theory, InlineData(""), InlineData(null)] diff --git a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs index 303b2620..bce84ac2 100644 --- a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs @@ -1,5 +1,6 @@ using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Launcher.Context; @@ -17,14 +18,14 @@ public class SimpleDataServiceTests { public void Should_create_collections() { Mock mockDataCollectionFactory = new(); - AccountContext unused1 = new(mockDataCollectionFactory.Object, new Mock>().Object); - CommandRequestContext unused2 = new(mockDataCollectionFactory.Object, new Mock>().Object); - CommandRequestArchiveContext unused3 = new(mockDataCollectionFactory.Object, new Mock>().Object); - ConfirmationCodeContext unused4 = new(mockDataCollectionFactory.Object, new Mock>().Object); - LauncherFileContext unused5 = new(mockDataCollectionFactory.Object, new Mock>().Object); - LoaContext unused6 = new(mockDataCollectionFactory.Object, new Mock>().Object); - NotificationsContext unused7 = new(mockDataCollectionFactory.Object, new Mock>().Object); - SchedulerContext unused8 = new(mockDataCollectionFactory.Object, new Mock>().Object); + AccountContext unused1 = new(mockDataCollectionFactory.Object, new Mock().Object); + CommandRequestContext unused2 = new(mockDataCollectionFactory.Object, new Mock().Object); + CommandRequestArchiveContext unused3 = new(mockDataCollectionFactory.Object, new Mock().Object); + ConfirmationCodeContext unused4 = new(mockDataCollectionFactory.Object, new Mock().Object); + LauncherFileContext unused5 = new(mockDataCollectionFactory.Object, new Mock().Object); + LoaContext unused6 = new(mockDataCollectionFactory.Object, new Mock().Object); + NotificationsContext unused7 = new(mockDataCollectionFactory.Object, new Mock().Object); + SchedulerContext unused8 = new(mockDataCollectionFactory.Object, new Mock().Object); mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Exactly(2)); diff --git a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index 4c2c19c5..a3adcbb4 100644 --- a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -2,6 +2,7 @@ using FluentAssertions; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Events; @@ -13,7 +14,7 @@ public class UnitsDataServiceTests { [Fact] public void Should_get_collection_in_order() { Mock mockDataCollectionFactory = new(); - Mock> mockDataEventBus = new(); + Mock mockEventBus = new(); Mock> mockDataCollection = new(); UksfUnit rank1 = new() { Name = "Air Troop", Order = 2 }; @@ -23,7 +24,7 @@ public void Should_get_collection_in_order() { mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); - UnitsContext unitsContext = new(mockDataCollectionFactory.Object, mockDataEventBus.Object); + UnitsContext unitsContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); IEnumerable subject = unitsContext.Get(); @@ -33,7 +34,7 @@ public void Should_get_collection_in_order() { [Fact] public void ShouldGetOrderedCollectionFromPredicate() { Mock mockDataCollectionFactory = new(); - Mock> mockDataEventBus = new(); + Mock mockEventBus = new(); Mock> mockDataCollection = new(); UksfUnit rank1 = new() { Name = "Air Troop", Order = 3, Branch = UnitBranch.COMBAT }; @@ -44,7 +45,7 @@ public void ShouldGetOrderedCollectionFromPredicate() { mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3, rank4 }); - UnitsContext unitsContext = new(mockDataCollectionFactory.Object, mockDataEventBus.Object); + UnitsContext unitsContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); IEnumerable subject = unitsContext.Get(x => x.Branch == UnitBranch.COMBAT); diff --git a/UKSF.Tests/Unit/Events/EventBusTests.cs b/UKSF.Tests/Unit/Events/EventBusTests.cs index 5938afc8..8fc1fc5a 100644 --- a/UKSF.Tests/Unit/Events/EventBusTests.cs +++ b/UKSF.Tests/Unit/Events/EventBusTests.cs @@ -1,6 +1,7 @@ using System; using FluentAssertions; using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Shared.Models; using UKSF.Api.Tests.Common; using Xunit; @@ -8,13 +9,13 @@ namespace UKSF.Tests.Unit.Events { public class EventBusTests { [Fact] - public void Should_return_observable() { - EventBus> eventBus = new(); + public void When_getting_event_bus_observable() { + EventBus eventBus = new(); - IObservable> subject = eventBus.AsObservable(); + IObservable subject = eventBus.AsObservable(); subject.Should().NotBeNull(); - subject.Should().BeAssignableTo>>(); + subject.Should().BeAssignableTo>(); } } } diff --git a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs index 9acd17c2..167a0bc0 100644 --- a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs @@ -2,6 +2,8 @@ using Microsoft.AspNetCore.SignalR; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Personnel.EventHandlers; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Signalr.Clients; @@ -12,24 +14,21 @@ namespace UKSF.Tests.Unit.Events.Handlers { public class AccountEventHandlerTests { - private readonly DataEventBus _accountDataEventBus; + private readonly IEventBus _eventBus; private readonly AccountDataEventHandler _accountDataEventHandler; private readonly Mock> _mockAccountHub; private readonly Mock _mockLoggingService; - private readonly DataEventBus _unitsDataEventBus; public AccountEventHandlerTests() { Mock mockDataCollectionFactory = new(); _mockLoggingService = new Mock(); _mockAccountHub = new Mock>(); - - _accountDataEventBus = new DataEventBus(); - _unitsDataEventBus = new DataEventBus(); + _eventBus = new EventBus(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); - _accountDataEventHandler = new AccountDataEventHandler(_accountDataEventBus, _unitsDataEventBus, _mockAccountHub.Object, _mockLoggingService.Object); + _accountDataEventHandler = new AccountDataEventHandler(_eventBus, _mockAccountHub.Object, _mockLoggingService.Object); } [Fact] @@ -44,8 +43,8 @@ public void ShouldLogOnException() { _accountDataEventHandler.Init(); - _accountDataEventBus.Send(new DataEventModel { Type = DataEventType.UPDATE }); - _unitsDataEventBus.Send(new DataEventModel { Type = DataEventType.UPDATE }); + _eventBus.Send(new EventModel(EventType.UPDATE, new ContextEventData(null, null))); + _eventBus.Send(new EventModel(EventType.UPDATE, new ContextEventData(null, null))); _mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Exactly(2)); } @@ -61,8 +60,10 @@ public void ShouldNotRunEvent() { _accountDataEventHandler.Init(); - _accountDataEventBus.Send(new DataEventModel { Type = DataEventType.DELETE }); - _unitsDataEventBus.Send(new DataEventModel { Type = DataEventType.ADD }); + _eventBus.Send(new EventModel(EventType.ADD, new ContextEventData(null, null))); + _eventBus.Send(new EventModel(EventType.DELETE, new ContextEventData(null, null))); + _eventBus.Send(new EventModel(EventType.ADD, new ContextEventData(null, null))); + _eventBus.Send(new EventModel(EventType.DELETE, new ContextEventData(null, null))); mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Never); } @@ -78,8 +79,8 @@ public void ShouldRunEventOnUpdate() { _accountDataEventHandler.Init(); - _accountDataEventBus.Send(new DataEventModel { Type = DataEventType.UPDATE }); - _unitsDataEventBus.Send(new DataEventModel { Type = DataEventType.UPDATE }); + _eventBus.Send(new EventModel(EventType.UPDATE, new ContextEventData("1", null))); + _eventBus.Send(new EventModel(EventType.UPDATE, new ContextEventData("2", null))); mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Exactly(2)); } diff --git a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs index 938c96df..032cfaf0 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs @@ -2,6 +2,8 @@ using Microsoft.AspNetCore.SignalR; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Command.EventHandlers; using UKSF.Api.Command.Models; using UKSF.Api.Command.Signalr.Clients; @@ -13,7 +15,7 @@ namespace UKSF.Tests.Unit.Events.Handlers { public class CommandRequestEventHandlerTests { private readonly CommandRequestEventHandler _commandRequestEventHandler; - private readonly DataEventBus _dataEventBus; + private readonly IEventBus _eventBus; private readonly Mock> _mockHub; private readonly Mock _mockLoggingService; @@ -22,22 +24,11 @@ public CommandRequestEventHandlerTests() { _mockLoggingService = new Mock(); _mockHub = new Mock>(); - _dataEventBus = new DataEventBus(); + _eventBus = new EventBus(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); - _commandRequestEventHandler = new CommandRequestEventHandler(_dataEventBus, _mockHub.Object, _mockLoggingService.Object); - } - - [Fact] - public void ShouldLogOnException() { - _mockLoggingService.Setup(x => x.LogError(It.IsAny())); - - _commandRequestEventHandler.Init(); - - _dataEventBus.Send(new DataEventModel { Type = (DataEventType) 5 }); - - _mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); + _commandRequestEventHandler = new CommandRequestEventHandler(_eventBus, _mockHub.Object, _mockLoggingService.Object); } [Fact] @@ -51,7 +42,7 @@ public void ShouldNotRunEventOnDelete() { _commandRequestEventHandler.Init(); - _dataEventBus.Send(new DataEventModel { Type = DataEventType.DELETE }); + _eventBus.Send(new EventModel(EventType.DELETE, null)); mockClient.Verify(x => x.ReceiveRequestUpdate(), Times.Never); } @@ -67,8 +58,8 @@ public void ShouldRunEventOnUpdateAndAdd() { _commandRequestEventHandler.Init(); - _dataEventBus.Send(new DataEventModel { Type = DataEventType.ADD }); - _dataEventBus.Send(new DataEventModel { Type = DataEventType.UPDATE }); + _eventBus.Send(new EventModel(EventType.ADD, null)); + _eventBus.Send(new EventModel(EventType.UPDATE, null)); mockClient.Verify(x => x.ReceiveRequestUpdate(), Times.Exactly(2)); } diff --git a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs index ba3c1402..7223f3df 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs @@ -2,6 +2,8 @@ using Microsoft.AspNetCore.SignalR; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Personnel.EventHandlers; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; @@ -14,33 +16,20 @@ namespace UKSF.Tests.Unit.Events.Handlers { public class CommentThreadEventHandlerTests { private readonly CommentThreadEventHandler _commentThreadEventHandler; - private readonly DataEventBus _dataEventBus; + private readonly IEventBus _eventBus; private readonly Mock> _mockHub; - private readonly Mock _mockLoggingService; public CommentThreadEventHandlerTests() { Mock mockDataCollectionFactory = new(); Mock mockCommentThreadService = new(); - _mockLoggingService = new Mock(); + Mock mockLoggingService = new(); _mockHub = new Mock>(); - - _dataEventBus = new DataEventBus(); + _eventBus = new EventBus(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); mockCommentThreadService.Setup(x => x.FormatComment(It.IsAny())).Returns(null); - _commentThreadEventHandler = new CommentThreadEventHandler(_dataEventBus, _mockHub.Object, mockCommentThreadService.Object, _mockLoggingService.Object); - } - - [Fact] - public void ShouldLogOnException() { - _mockLoggingService.Setup(x => x.LogError(It.IsAny())); - - _commentThreadEventHandler.Init(); - - _dataEventBus.Send(new DataEventModel { Type = (DataEventType) 5 }); - - _mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); + _commentThreadEventHandler = new CommentThreadEventHandler(_eventBus, _mockHub.Object, mockCommentThreadService.Object, mockLoggingService.Object); } [Fact] @@ -55,7 +44,7 @@ public void ShouldNotRunEventOnUpdate() { _commentThreadEventHandler.Init(); - _dataEventBus.Send(new DataEventModel { Type = DataEventType.UPDATE, Data = new Comment() }); + _eventBus.Send(new EventModel(EventType.UPDATE, new CommentThreadEventData(string.Empty, new Comment()))); mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Never); mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Never); @@ -73,7 +62,7 @@ public void ShouldRunAddedOnAdd() { _commentThreadEventHandler.Init(); - _dataEventBus.Send(new DataEventModel { Type = DataEventType.ADD, Data = new Comment() }); + _eventBus.Send(new EventModel(EventType.ADD, new CommentThreadEventData(string.Empty, new Comment()))); mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Once); mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Never); @@ -91,7 +80,7 @@ public void ShouldRunDeletedOnDelete() { _commentThreadEventHandler.Init(); - _dataEventBus.Send(new DataEventModel { Type = DataEventType.DELETE, Data = new Comment() }); + _eventBus.Send(new EventModel(EventType.DELETE, new CommentThreadEventData(string.Empty, new Comment()))); mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Never); mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Once); diff --git a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs index 8a165e01..637e7bfa 100644 --- a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs @@ -1,6 +1,7 @@ using System; using System.Reactive.Subjects; using Moq; +using UKSF.Api.Base.Events; using UKSF.Api.EventHandlers; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Context; @@ -10,7 +11,7 @@ namespace UKSF.Tests.Unit.Events.Handlers { public class LogEventHandlerTests { - private readonly Subject _loggerSubject = new(); + private readonly IEventBus _eventBus; private readonly Mock _mockAuditLogDataService; private readonly Mock _mockDiscordLogDataService; private readonly Mock _mockHttpErrorLogDataService; @@ -25,12 +26,13 @@ public LogEventHandlerTests() { _mockLauncherLogDataService = new Mock(); _mockDiscordLogDataService = new Mock(); _mockObjectIdConversionService = new Mock(); + Mock mockLogger = new Mock(); + _eventBus = new EventBus(); - Mock mockLogger = new(); - mockLogger.Setup(x => x.AsObservable()).Returns(_loggerSubject); _mockObjectIdConversionService.Setup(x => x.ConvertObjectIds(It.IsAny())).Returns(x => x); LoggerEventHandler logEventHandler = new( + _eventBus, _mockLogDataService.Object, _mockAuditLogDataService.Object, _mockHttpErrorLogDataService.Object, @@ -46,7 +48,7 @@ public LogEventHandlerTests() { public void When_handling_a_basic_log() { BasicLog basicLog = new("test"); - _loggerSubject.OnNext(basicLog); + _eventBus.Send(basicLog); _mockObjectIdConversionService.Verify(x => x.ConvertObjectIds("test"), Times.Once); _mockLogDataService.Verify(x => x.Add(basicLog), Times.Once); @@ -56,7 +58,7 @@ public void When_handling_a_basic_log() { public void When_handling_a_discord_log() { DiscordLog discordLog = new(DiscordUserEventType.JOINED, "SqnLdr.Beswick.T", "12345", "SqnLdr.Beswick.T joined"); - _loggerSubject.OnNext(discordLog); + _eventBus.Send(discordLog); _mockDiscordLogDataService.Verify(x => x.Add(discordLog), Times.Once); } @@ -65,7 +67,7 @@ public void When_handling_a_discord_log() { public void When_handling_a_launcher_log() { LauncherLog launcherLog = new("1.0.0", "test"); - _loggerSubject.OnNext(launcherLog); + _eventBus.Send(launcherLog); _mockObjectIdConversionService.Verify(x => x.ConvertObjectIds("test"), Times.Once); _mockLauncherLogDataService.Verify(x => x.Add(launcherLog), Times.Once); @@ -75,7 +77,7 @@ public void When_handling_a_launcher_log() { public void When_handling_an_audit_log() { AuditLog basicLog = new("server", "test"); - _loggerSubject.OnNext(basicLog); + _eventBus.Send(basicLog); _mockObjectIdConversionService.Verify(x => x.ConvertObjectId("server"), Times.Once); _mockObjectIdConversionService.Verify(x => x.ConvertObjectIds("test"), Times.Once); @@ -86,7 +88,7 @@ public void When_handling_an_audit_log() { public void When_handling_an_http_error_log() { HttpErrorLog httpErrorLog = new(new Exception()); - _loggerSubject.OnNext(httpErrorLog); + _eventBus.Send(httpErrorLog); _mockObjectIdConversionService.Verify(x => x.ConvertObjectIds("Exception of type 'System.Exception' was thrown."), Times.Once); _mockHttpErrorLogDataService.Verify(x => x.Add(httpErrorLog), Times.Once); diff --git a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs index 16f16dbd..e500f119 100644 --- a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs @@ -3,6 +3,8 @@ using Microsoft.AspNetCore.SignalR; using Moq; using UKSF.Api.Base.Context; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; using UKSF.Api.Personnel.EventHandlers; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Signalr.Clients; @@ -13,7 +15,7 @@ namespace UKSF.Tests.Unit.Events.Handlers { public class NotificationsEventHandlerTests { - private readonly DataEventBus _dataEventBus; + private readonly IEventBus _eventBus; private readonly Mock> _mockHub; private readonly Mock _mockLoggingService; private readonly NotificationsEventHandler _notificationsEventHandler; @@ -23,11 +25,11 @@ public NotificationsEventHandlerTests() { _mockLoggingService = new Mock(); _mockHub = new Mock>(); - _dataEventBus = new DataEventBus(); + _eventBus = new EventBus(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); - _notificationsEventHandler = new NotificationsEventHandler(_dataEventBus, _mockHub.Object, _mockLoggingService.Object); + _notificationsEventHandler = new NotificationsEventHandler(_eventBus, _mockHub.Object, _mockLoggingService.Object); } [Fact] @@ -42,7 +44,7 @@ public void ShouldLogOnException() { _notificationsEventHandler.Init(); - _dataEventBus.Send(new DataEventModel { Type = DataEventType.ADD }); + _eventBus.Send(new EventModel(EventType.ADD, new ContextEventData(string.Empty, null))); _mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); } @@ -58,8 +60,8 @@ public void ShouldNotRunEventOnUpdateOrDelete() { _notificationsEventHandler.Init(); - _dataEventBus.Send(new DataEventModel { Type = DataEventType.UPDATE }); - _dataEventBus.Send(new DataEventModel { Type = DataEventType.DELETE }); + _eventBus.Send(new EventModel(EventType.UPDATE, new ContextEventData(string.Empty, null))); + _eventBus.Send(new EventModel(EventType.DELETE, new ContextEventData(string.Empty, null))); mockClient.Verify(x => x.ReceiveNotification(It.IsAny()), Times.Never); } @@ -75,7 +77,7 @@ public void ShouldRunAddedOnAdd() { _notificationsEventHandler.Init(); - _dataEventBus.Send(new DataEventModel { Type = DataEventType.ADD, Data = new Notification() }); + _eventBus.Send(new EventModel(EventType.ADD, new ContextEventData(string.Empty, new Notification()))); mockClient.Verify(x => x.ReceiveNotification(It.IsAny()), Times.Once); } @@ -92,7 +94,7 @@ public void ShouldUseOwnerAsIdInAdded() { _notificationsEventHandler.Init(); - _dataEventBus.Send(new DataEventModel { Type = DataEventType.ADD, Data = new Notification { Owner = "1" } }); + _eventBus.Send(new EventModel(EventType.ADD, new ContextEventData(string.Empty, new Notification() { Owner = "1" }))); subject.Should().Be("1"); } diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs index 637b44a0..e5b52ebc 100644 --- a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -20,19 +20,19 @@ public class TeamspeakEventHandlerTests { private readonly Mock _mockLoggingService; private readonly Mock _mockTeamspeakGroupService; private readonly Mock _mockTeamspeakService; - private readonly IEventBus _signalrEventBus; - private readonly TeamspeakEventHandler _teamspeakEventHandler; + private readonly IEventBus _eventBus; + private readonly TeamspeakServerEventHandler _teamspeakServerEventHandler; public TeamspeakEventHandlerTests() { - _signalrEventBus = new EventBus(); + _eventBus = new EventBus(); _mockAccountContext = new Mock(); _mockTeamspeakService = new Mock(); _mockTeamspeakGroupService = new Mock(); _mockLoggingService = new Mock(); - _teamspeakEventHandler = new TeamspeakEventHandler( + _teamspeakServerEventHandler = new TeamspeakServerEventHandler( _mockAccountContext.Object, - _signalrEventBus, + _eventBus, _mockTeamspeakService.Object, _mockTeamspeakGroupService.Object, _mockLoggingService.Object @@ -47,9 +47,9 @@ public async Task ShouldGetNoAccountForNoMatchingIdsOrNull(double id) { _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockAccountCollection.FirstOrDefault(x)); _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())).Returns(Task.CompletedTask); - _teamspeakEventHandler.Init(); + _teamspeakServerEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); await Task.Delay(TimeSpan.FromSeconds(1)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(null, new List { 5 }, 1), Times.Once); @@ -57,9 +57,9 @@ public async Task ShouldGetNoAccountForNoMatchingIdsOrNull(double id) { [Fact] public void LogOnException() { - _teamspeakEventHandler.Init(); + _teamspeakServerEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { Procedure = (TeamspeakEventType) 9 }); + _eventBus.Send(new SignalrEventData { Procedure = (TeamspeakEventType) 9 }); _mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); } @@ -69,10 +69,10 @@ public void ShouldCorrectlyParseClients() { HashSet subject = new(); _mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())).Callback((HashSet x) => subject = x); - _teamspeakEventHandler.Init(); + _teamspeakServerEventHandler.Init(); - _signalrEventBus.Send( - new SignalrEventModel { + _eventBus.Send( + new SignalrEventData { Procedure = TeamspeakEventType.CLIENTS, Args = "[{\"channelId\": 1, \"channelName\": \"Test Channel 1\", \"clientDbId\": 5, \"clientName\": \"Test Name 1\"}," + "{\"channelId\": 2, \"channelName\": \"Test Channel 2\", \"clientDbId\": 10, \"clientName\": \"Test Name 2\"}]" @@ -98,9 +98,9 @@ public async Task ShouldGetCorrectAccount() { _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockAccountCollection.FirstOrDefault(x)); _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(account1, It.IsAny>(), 1)).Returns(Task.CompletedTask); - _teamspeakEventHandler.Init(); + _teamspeakServerEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); await Task.Delay(TimeSpan.FromSeconds(1)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); @@ -111,9 +111,9 @@ public void ShouldNotRunEventOnEmpty() { _mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); - _teamspeakEventHandler.Init(); + _teamspeakServerEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.EMPTY }); + _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.EMPTY }); _mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Never); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny()), Times.Never); @@ -123,9 +123,9 @@ public void ShouldNotRunEventOnEmpty() { public void ShouldNotRunUpdateClientsForNoClients() { _mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); - _teamspeakEventHandler.Init(); + _teamspeakServerEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENTS, Args = "[]" }); + _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENTS, Args = "[]" }); _mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Never); } @@ -137,9 +137,9 @@ public async Task ShouldRunClientGroupsUpdate() { _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(account, It.IsAny>(), 1)).Returns(Task.CompletedTask); - _teamspeakEventHandler.Init(); + _teamspeakServerEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); await Task.Delay(TimeSpan.FromSeconds(1)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5 }, 1), Times.Once); @@ -152,11 +152,11 @@ public async Task ShouldRunClientGroupsUpdateTwiceForTwoEventsWithDelay() { _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); - _teamspeakEventHandler.Init(); + _teamspeakServerEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); await Task.Delay(TimeSpan.FromSeconds(1)); - _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); + _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); await Task.Delay(TimeSpan.FromSeconds(1)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5 }, 1), Times.Once); @@ -172,10 +172,10 @@ public async Task ShouldRunSingleClientGroupsUpdateForEachClient() { _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.FirstOrDefault(x)); _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); - _teamspeakEventHandler.Init(); + _teamspeakServerEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); - _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 2, \"serverGroupId\": 10}" }); + _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 2, \"serverGroupId\": 10}" }); await Task.Delay(TimeSpan.FromSeconds(2)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); @@ -189,10 +189,10 @@ public async Task ShouldRunSingleClientGroupsUpdateForMultipleEventsWithOneClien _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); - _teamspeakEventHandler.Init(); + _teamspeakServerEventHandler.Init(); - _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); - _signalrEventBus.Send(new SignalrEventModel { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); + _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); await Task.Delay(TimeSpan.FromSeconds(2)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5, 10 }, 1), Times.Once); @@ -202,10 +202,10 @@ public async Task ShouldRunSingleClientGroupsUpdateForMultipleEventsWithOneClien public void ShouldRunUpdateClients() { _mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); - _teamspeakEventHandler.Init(); + _teamspeakServerEventHandler.Init(); - _signalrEventBus.Send( - new SignalrEventModel { Procedure = TeamspeakEventType.CLIENTS, Args = "[{\"channelId\": 1, \"channelName\": \"Test Channel\", \"clientDbId\": 5, \"clientName\": \"Test Name\"}]" } + _eventBus.Send( + new SignalrEventData { Procedure = TeamspeakEventType.CLIENTS, Args = "[{\"channelId\": 1, \"channelName\": \"Test Channel\", \"clientDbId\": 5, \"clientName\": \"Test Name\"}]" } ); _mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Once); From 7865662f3051b0399a83ee8d7be479b8470fb9ab Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 12 Dec 2020 18:48:05 +0000 Subject: [PATCH 289/369] Fixes and tweaks --- .../TestCachedContext.cs | 1 - .../TestComplexDataModel.cs | 2 +- Tests/UKSF.Api.Tests.Common/TestContext.cs | 1 - Tests/UKSF.Api.Tests.Common/TestDataModel.cs | 8 +- UKSF.Api.Admin/ApiAdminExtensions.cs | 2 - UKSF.Api.Admin/Context/VariablesContext.cs | 2 +- .../EventHandlers/LogEventHandler.cs | 19 +- .../Extensions/VariablesExtensions.cs | 9 + UKSF.Api.Admin/Models/VariableItem.cs | 6 +- UKSF.Api.Admin/Services/DataCacheService.cs | 3 +- UKSF.Api.Admin/Services/VariablesService.cs | 4 + .../Signalr/Clients/IAdminClient.cs | 6 +- UKSF.Api.ArmaMissions/Models/Mission.cs | 20 +- UKSF.Api.ArmaMissions/Models/MissionEntity.cs | 4 +- .../Models/MissionEntityItem.cs | 16 +- .../Models/MissionPatchData.cs | 14 +- .../Models/MissionPatchingReport.cs | 6 +- .../Models/MissionPatchingResult.cs | 6 +- UKSF.Api.ArmaMissions/Models/MissionPlayer.cs | 10 +- UKSF.Api.ArmaMissions/Models/MissionUnit.cs | 8 +- .../ApiArmaServerExtensions.cs | 2 - .../Controllers/GameServersController.cs | 2 +- .../DataContext/GameServersContext.cs | 1 - UKSF.Api.ArmaServer/Models/GameServer.cs | 52 ++-- UKSF.Api.ArmaServer/Models/GameServerMod.cs | 8 +- UKSF.Api.ArmaServer/Models/MissionFile.cs | 6 +- .../Controllers/PasswordResetController.cs | 2 +- UKSF.Api.Base/Context/MongoClientFactory.cs | 2 +- UKSF.Api.Base/Context/MongoCollection.cs | 43 ++- UKSF.Api.Base/Context/MongoContextBase.cs | 17 +- UKSF.Api.Base/Models/EventModel.cs | 4 +- UKSF.Api.Base/Models/MongoObject.cs | 4 +- UKSF.Api.Base/Models/PagedResult.cs | 13 + UKSF.Api.Base/Models/SortDirection.cs | 6 + UKSF.Api.Command/ApiCommandExtensions.cs | 2 - .../Context/CommandRequestArchiveContext.cs | 2 - .../Context/CommandRequestContext.cs | 1 - UKSF.Api.Command/Context/DischargeContext.cs | 1 - UKSF.Api.Command/Context/LoaContext.cs | 1 - .../Context/OperationOrderContext.cs | 1 - .../Context/OperationReportContext.cs | 1 - UKSF.Api.Command/Models/CommandRequest.cs | 26 +- UKSF.Api.Command/Models/CommandRequestLoa.cs | 10 +- .../Models/CreateOperationOrderRequest.cs | 14 +- .../Models/CreateOperationReport.cs | 16 +- UKSF.Api.Command/Models/Discharge.cs | 26 +- UKSF.Api.Command/Models/Opord.cs | 14 +- UKSF.Api.Command/Models/Oprep.cs | 18 +- .../Controllers/DiscordController.cs | 14 +- .../Models/DiscordDeletedMessageResult.cs | 15 ++ .../Services/DiscordService.cs | 244 ++++++++++++++++-- .../Models/InstagramImage.cs | 12 +- .../ScheduledActions/ActionInstagramImages.cs | 7 +- .../ScheduledActions/ActionInstagramToken.cs | 7 +- .../ApiIntegrationTeamspeakExtensions.cs | 2 - .../Controllers/TeamspeakController.cs | 7 +- .../Models/Operation.cs | 16 +- .../Models/TeamspeakClient.cs | 8 +- .../Models/TeamspeakGroupProcedure.cs | 4 +- .../Models/TeamspeakServerGroupUpdate.cs | 6 +- .../Models/TeamspeakServerSnapshot.cs | 4 +- .../Services/TeamspeakManagerService.cs | 19 ++ .../Services/TeamspeakService.cs | 32 ++- .../Signalr/Hubs/TeamspeakHub.cs | 1 - UKSF.Api.Launcher/ApiLauncherExtensions.cs | 2 - .../Context/LauncherFileContext.cs | 1 - UKSF.Api.Launcher/Models/LauncherFile.cs | 6 +- UKSF.Api.Modpack/ApiModpackExtensions.cs | 2 - UKSF.Api.Modpack/Context/BuildsContext.cs | 2 - UKSF.Api.Modpack/Context/ReleasesContext.cs | 1 - UKSF.Api.Modpack/Models/GithubCommit.cs | 12 +- UKSF.Api.Modpack/Models/ModpackBuild.cs | 28 +- .../Models/ModpackBuildQueueItem.cs | 4 +- UKSF.Api.Modpack/Models/ModpackBuildStep.cs | 16 +- .../Models/ModpackBuildStepEventData.cs | 4 +- .../Models/ModpackBuildStepLogItem.cs | 8 +- UKSF.Api.Modpack/Models/ModpackRelease.cs | 14 +- UKSF.Api.Modpack/Models/NewBuild.cs | 8 +- UKSF.Api.Personnel/ApiPersonnelExtensions.cs | 4 +- UKSF.Api.Personnel/Context/AccountContext.cs | 1 - .../Context/ConfirmationCodeContext.cs | 1 - .../Context/NotificationsContext.cs | 1 - UKSF.Api.Personnel/Context/RanksContext.cs | 1 - UKSF.Api.Personnel/Context/RolesContext.cs | 1 - UKSF.Api.Personnel/Context/UnitsContext.cs | 1 - .../Controllers/AccountsController.cs | 4 +- .../Controllers/CommentThreadController.cs | 5 +- .../Controllers/RanksController.cs | 4 +- .../Controllers/RecruitmentController.cs | 5 +- .../Controllers/RolesController.cs | 6 +- .../Controllers/SteamCodeController.cs | 2 +- .../Controllers/UnitsController.cs | 10 +- .../EventHandlers/DiscordEventHandler.cs | 54 ++++ .../Extensions/ApplicationExtensions.cs | 9 +- UKSF.Api.Personnel/Models/Account.cs | 64 ++--- .../Models/AccountAttendanceStatus.cs | 12 +- UKSF.Api.Personnel/Models/AccountSettings.cs | 6 +- UKSF.Api.Personnel/Models/Application.cs | 59 ++++- UKSF.Api.Personnel/Models/AttendanceReport.cs | 2 +- UKSF.Api.Personnel/Models/Comment.cs | 8 +- UKSF.Api.Personnel/Models/CommentThread.cs | 8 +- .../Models/CommentThreadEventData.cs | 4 +- UKSF.Api.Personnel/Models/ConfirmationCode.cs | 4 +- UKSF.Api.Personnel/Models/Loa.cs | 18 +- UKSF.Api.Personnel/Models/Notification.cs | 14 +- UKSF.Api.Personnel/Models/Rank.cs | 12 +- UKSF.Api.Personnel/Models/Role.cs | 8 +- UKSF.Api.Personnel/Models/ServiceRecord.cs | 22 +- UKSF.Api.Personnel/Models/Unit.cs | 66 ++--- .../Services/AssignmentService.cs | 12 +- .../Services/CommentThreadService.cs | 2 - .../Services/NotificationsService.cs | 20 +- .../Services/RecruitmentService.cs | 94 +++---- UKSF.Api.Shared/ApiSharedExtensions.cs | 3 - UKSF.Api.Shared/Context/CachedMongoContext.cs | 6 - UKSF.Api.Shared/Context/LogContext.cs | 1 - UKSF.Api.Shared/Context/MongoContext.cs | 11 +- UKSF.Api.Shared/Context/SchedulerContext.cs | 1 - UKSF.Api.Shared/Events/Logger.cs | 8 +- .../Extensions/ObjectExtensions.cs | 4 +- .../Extensions/ServiceExtensions.cs | 35 ++- UKSF.Api.Shared/Models/AuditLog.cs | 4 +- UKSF.Api.Shared/Models/BasicLog.cs | 11 +- UKSF.Api.Shared/Models/ContextEventData.cs | 6 +- UKSF.Api.Shared/Models/DiscordEventData.cs | 11 + UKSF.Api.Shared/Models/DiscordLog.cs | 29 ++- UKSF.Api.Shared/Models/HttpErrorLog.cs | 12 +- UKSF.Api.Shared/Models/LauncherLog.cs | 8 +- UKSF.Api.Shared/Models/LoggerEventData.cs | 7 + UKSF.Api.Shared/Models/OnlineState.cs | 6 + UKSF.Api.Shared/Models/ScheduledJob.cs | 12 +- UKSF.Api.Shared/Models/SignalrEventData.cs | 4 +- .../Models/TeamspeakMessageEventData.cs | 4 +- .../Services/HttpContextService.cs | 4 +- UKSF.Api.Shared/Services/SchedulerService.cs | 2 +- UKSF.Api/AppStart/StartServices.cs | 2 +- UKSF.Api/AppStart/UksfServiceExtensions.cs | 2 +- UKSF.Api/Controllers/LoaController.cs | 1 - UKSF.Api/Controllers/LoggingController.cs | 83 ++++-- UKSF.Api/EventHandlers/LoggerEventHandler.cs | 9 +- UKSF.Api/Fake/FakeCachedDataService.cs | 7 - UKSF.Api/Fake/FakeDataService.cs | 37 --- UKSF.Api/Fake/FakeDiscordService.cs | 25 -- UKSF.Api/Fake/FakeNotificationsDataService.cs | 5 - UKSF.Api/Fake/FakeNotificationsService.cs | 22 -- UKSF.Api/Fake/FakeTeamspeakManagerService.cs | 15 -- UKSF.Api/Global.cs | 7 - UKSF.Api/Services/MigrationUtility.cs | 46 +++- UKSF.Api/Startup.cs | 6 +- UKSF.Tests/Unit/Common/DateUtilitiesTests.cs | 12 +- .../Data/Admin/VariablesDataServiceTests.cs | 1 - .../Unit/Data/CachedDataServiceTests.cs | 5 +- .../Unit/Data/CahcedDataServiceEventTests.cs | 3 +- UKSF.Tests/Unit/Data/DataServiceEventTests.cs | 2 +- UKSF.Tests/Unit/Data/DataServiceTests.cs | 11 +- .../Data/Game/GameServersDataServiceTests.cs | 1 - .../Data/Modpack/BuildsDataServiceTests.cs | 2 - .../Data/Modpack/ReleasesDataServiceTests.cs | 1 - .../OperationOrderDataServiceTests.cs | 1 - .../OperationReportDataServiceTests.cs | 1 - .../Personnel/DischargeDataServiceTests.cs | 1 - .../Data/Personnel/RanksDataServiceTests.cs | 1 - .../Data/Personnel/RolesDataServiceTests.cs | 1 - .../Unit/Data/SimpleDataServiceTests.cs | 1 - .../Unit/Data/Units/UnitsDataServiceTests.cs | 1 - UKSF.Tests/Unit/Events/EventBusTests.cs | 2 - .../CommandRequestEventHandlerTests.cs | 10 +- .../CommentThreadEventHandlerTests.cs | 4 +- .../Events/Handlers/LogEventHandlerTests.cs | 5 +- .../Services/Utility/DataCacheServiceTests.cs | 12 +- 170 files changed, 1158 insertions(+), 868 deletions(-) create mode 100644 UKSF.Api.Base/Models/PagedResult.cs create mode 100644 UKSF.Api.Base/Models/SortDirection.cs create mode 100644 UKSF.Api.Integrations.Discord/Models/DiscordDeletedMessageResult.cs create mode 100644 UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs rename UKSF.Api.Shared/Extensions/DateExtensions.cs => UKSF.Api.Personnel/Extensions/ApplicationExtensions.cs (56%) create mode 100644 UKSF.Api.Shared/Models/DiscordEventData.cs create mode 100644 UKSF.Api.Shared/Models/LoggerEventData.cs create mode 100644 UKSF.Api.Shared/Models/OnlineState.cs delete mode 100644 UKSF.Api/Fake/FakeCachedDataService.cs delete mode 100644 UKSF.Api/Fake/FakeDataService.cs delete mode 100644 UKSF.Api/Fake/FakeDiscordService.cs delete mode 100644 UKSF.Api/Fake/FakeNotificationsDataService.cs delete mode 100644 UKSF.Api/Fake/FakeNotificationsService.cs delete mode 100644 UKSF.Api/Fake/FakeTeamspeakManagerService.cs delete mode 100644 UKSF.Api/Global.cs diff --git a/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs b/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs index de8cea02..1fc1c880 100644 --- a/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs +++ b/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs @@ -1,7 +1,6 @@ using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Tests.Common { public class TestCachedContext : CachedMongoContext, ITestCachedContext { diff --git a/Tests/UKSF.Api.Tests.Common/TestComplexDataModel.cs b/Tests/UKSF.Api.Tests.Common/TestComplexDataModel.cs index cb757837..59536184 100644 --- a/Tests/UKSF.Api.Tests.Common/TestComplexDataModel.cs +++ b/Tests/UKSF.Api.Tests.Common/TestComplexDataModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; namespace UKSF.Api.Tests.Common { - public record TestComplexDataModel : TestDataModel { + public class TestComplexDataModel : TestDataModel { public TestDataModel Data; public List DataList; public List List; diff --git a/Tests/UKSF.Api.Tests.Common/TestContext.cs b/Tests/UKSF.Api.Tests.Common/TestContext.cs index 59987bc9..f214ebf4 100644 --- a/Tests/UKSF.Api.Tests.Common/TestContext.cs +++ b/Tests/UKSF.Api.Tests.Common/TestContext.cs @@ -1,7 +1,6 @@ using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Tests.Common { public class TestContext : MongoContext, ITestContext { diff --git a/Tests/UKSF.Api.Tests.Common/TestDataModel.cs b/Tests/UKSF.Api.Tests.Common/TestDataModel.cs index b9bfcff7..5aff835f 100644 --- a/Tests/UKSF.Api.Tests.Common/TestDataModel.cs +++ b/Tests/UKSF.Api.Tests.Common/TestDataModel.cs @@ -2,9 +2,9 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Tests.Common { - public record TestDataModel : MongoObject { - public Dictionary Dictionary { get; set; } = new(); - public string Name { get; set; } - public List Stuff { get; set; } + public class TestDataModel : MongoObject { + public Dictionary Dictionary = new(); + public string Name; + public List Stuff; } } diff --git a/UKSF.Api.Admin/ApiAdminExtensions.cs b/UKSF.Api.Admin/ApiAdminExtensions.cs index 3f640dc7..4092c2e2 100644 --- a/UKSF.Api.Admin/ApiAdminExtensions.cs +++ b/UKSF.Api.Admin/ApiAdminExtensions.cs @@ -3,11 +3,9 @@ using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Admin.Context; using UKSF.Api.Admin.EventHandlers; -using UKSF.Api.Admin.Models; using UKSF.Api.Admin.ScheduledActions; using UKSF.Api.Admin.Services; using UKSF.Api.Admin.Signalr.Hubs; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Admin { public static class ApiAdminExtensions { diff --git a/UKSF.Api.Admin/Context/VariablesContext.cs b/UKSF.Api.Admin/Context/VariablesContext.cs index 148bb204..4cbf8794 100644 --- a/UKSF.Api.Admin/Context/VariablesContext.cs +++ b/UKSF.Api.Admin/Context/VariablesContext.cs @@ -22,7 +22,7 @@ public override VariableItem GetSingle(string key) { public async Task Update(string key, object value) { VariableItem variableItem = GetSingle(key); if (variableItem == null) throw new KeyNotFoundException($"Variable Item with key '{key}' does not exist"); - await base.Update(variableItem.Id, nameof(variableItem.Item), value); + await base.Update(variableItem.Id, x => x.Item, value); } public override async Task Delete(string key) { diff --git a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs b/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs index 9771ff81..6cb3b70a 100644 --- a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs +++ b/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs @@ -1,4 +1,3 @@ -using System; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Admin.Signalr.Clients; @@ -24,23 +23,11 @@ public LogDataEventHandler(IEventBus eventBus, IHubContext(HandleEvent, _logger.LogError); + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, _logger.LogError); } - private async Task HandleEvent(EventModel eventModel, BasicLog log) { - if (eventModel.EventType == EventType.ADD) { - await AddedEvent(log); - } - } - - private Task AddedEvent(BasicLog log) { - return log switch { - AuditLog message => _hub.Clients.All.ReceiveAuditLog(message), - LauncherLog message => _hub.Clients.All.ReceiveLauncherLog(message), - HttpErrorLog message => _hub.Clients.All.ReceiveErrorLog(message), - { } message => _hub.Clients.All.ReceiveLog(message), - _ => throw new ArgumentOutOfRangeException(nameof(log), "Log type is not valid") - }; + private async Task HandleEvent(EventModel eventModel, LoggerEventData logData) { + await _hub.Clients.All.ReceiveLog(); } } } diff --git a/UKSF.Api.Admin/Extensions/VariablesExtensions.cs b/UKSF.Api.Admin/Extensions/VariablesExtensions.cs index 77638b66..20710c71 100644 --- a/UKSF.Api.Admin/Extensions/VariablesExtensions.cs +++ b/UKSF.Api.Admin/Extensions/VariablesExtensions.cs @@ -35,6 +35,15 @@ public static bool AsBool(this VariableItem variable) { return output; } + public static bool AsBoolWithDefault(this VariableItem variable, bool defaultState) { + if (variable?.Item == null) { + return false; + } + + string item = variable.Item.ToString(); + return !bool.TryParse(item, out bool output) ? defaultState : output; + } + public static ulong AsUlong(this VariableItem variable) { string item = variable.AsString(); if (!ulong.TryParse(item, out ulong output)) { diff --git a/UKSF.Api.Admin/Models/VariableItem.cs b/UKSF.Api.Admin/Models/VariableItem.cs index 3f228bc6..6972b268 100644 --- a/UKSF.Api.Admin/Models/VariableItem.cs +++ b/UKSF.Api.Admin/Models/VariableItem.cs @@ -1,8 +1,8 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Admin.Models { - public record VariableItem : MongoObject { - public object Item { get; set; } - public string Key { get; set; } + public class VariableItem : MongoObject { + public object Item; + public string Key; } } diff --git a/UKSF.Api.Admin/Services/DataCacheService.cs b/UKSF.Api.Admin/Services/DataCacheService.cs index 5ab5199b..c97761af 100644 --- a/UKSF.Api.Admin/Services/DataCacheService.cs +++ b/UKSF.Api.Admin/Services/DataCacheService.cs @@ -1,4 +1,5 @@ using System; +using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Extensions; @@ -10,7 +11,7 @@ public interface IDataCacheService { public class DataCacheService : IDataCacheService { private readonly IServiceProvider _serviceProvider; - public DataCacheService(IServiceProvider serviceProvider) => _serviceProvider = serviceProvider; + public DataCacheService(IServiceCollection serviceCollection) => _serviceProvider = serviceCollection.BuildServiceProvider(); public void RefreshCachedData() { foreach (ICachedMongoContext cachedDataService in _serviceProvider.GetInterfaceServices()) { diff --git a/UKSF.Api.Admin/Services/VariablesService.cs b/UKSF.Api.Admin/Services/VariablesService.cs index e56132a2..7769dc8a 100644 --- a/UKSF.Api.Admin/Services/VariablesService.cs +++ b/UKSF.Api.Admin/Services/VariablesService.cs @@ -1,9 +1,11 @@ using UKSF.Api.Admin.Context; +using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Models; namespace UKSF.Api.Admin.Services { public interface IVariablesService { VariableItem GetVariable(string key); + bool GetFeatureState(string featureKey); } public class VariablesService : IVariablesService { @@ -12,5 +14,7 @@ public class VariablesService : IVariablesService { public VariablesService(IVariablesContext context) => _context = context; public VariableItem GetVariable(string key) => _context.GetSingle(key); + + public bool GetFeatureState(string featureKey) => _context.GetSingle($"FEATURE_{featureKey}").AsBoolWithDefault(false); } } diff --git a/UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs b/UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs index 249f9801..5d0d94ee 100644 --- a/UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs +++ b/UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs @@ -1,11 +1,7 @@ using System.Threading.Tasks; -using UKSF.Api.Shared.Models; namespace UKSF.Api.Admin.Signalr.Clients { public interface IAdminClient { - Task ReceiveAuditLog(AuditLog log); - Task ReceiveErrorLog(HttpErrorLog log); - Task ReceiveLauncherLog(LauncherLog log); - Task ReceiveLog(BasicLog log); + Task ReceiveLog(); } } diff --git a/UKSF.Api.ArmaMissions/Models/Mission.cs b/UKSF.Api.ArmaMissions/Models/Mission.cs index 9ca68bad..6c4ee9cf 100644 --- a/UKSF.Api.ArmaMissions/Models/Mission.cs +++ b/UKSF.Api.ArmaMissions/Models/Mission.cs @@ -2,16 +2,16 @@ namespace UKSF.Api.ArmaMissions.Models { public class Mission { - public static int NextId { get; set; } - public string DescriptionPath { get; set; } - public string Path { get; set; } - public string SqmPath { get; set; } - public List DescriptionLines { get; set; } - public int MaxCurators { get; set; } - public MissionEntity MissionEntity { get; set; } - public int PlayerCount { get; set; } - public List RawEntities { get; set; } - public List SqmLines { get; set; } + public static int NextId; + public string DescriptionPath; + public string Path; + public string SqmPath; + public List DescriptionLines; + public int MaxCurators; + public MissionEntity MissionEntity; + public int PlayerCount; + public List RawEntities; + public List SqmLines; public Mission(string path) { Path = path; diff --git a/UKSF.Api.ArmaMissions/Models/MissionEntity.cs b/UKSF.Api.ArmaMissions/Models/MissionEntity.cs index 8d673a20..a312143e 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionEntity.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionEntity.cs @@ -2,7 +2,7 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionEntity { - public List MissionEntityItems { get; set; } = new(); - public int ItemsCount { get; set; } + public List MissionEntityItems = new(); + public int ItemsCount; } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs b/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs index a4ec37d6..bdc22bc5 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs @@ -2,13 +2,13 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionEntityItem { - public static double Position { get; set; } = 10; - public static double CuratorPosition { get; set; } = 0.5; - public string DataType { get; set; } - public bool IsPlayable { get; set; } - public MissionEntity MissionEntity { get; set; } - public List RawMissionEntities { get; set; } = new(); - public List RawMissionEntityItem { get; set; } = new(); - public string Type { get; set; } + public static double Position = 10; + public static double CuratorPosition = 0.5; + public string DataType; + public bool IsPlayable; + public MissionEntity MissionEntity; + public List RawMissionEntities = new(); + public List RawMissionEntityItem = new(); + public string Type; } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs index 3fa5d5c5..b1579fe0 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs @@ -3,12 +3,12 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionPatchData { - public static MissionPatchData Instance { get; set; } - public IEnumerable EngineerIds { get; set; } - public IEnumerable MedicIds { get; set; } - public List OrderedUnits { get; set; } - public List Players { get; set; } - public List Ranks { get; set; } - public List Units { get; set; } + public static MissionPatchData Instance; + public IEnumerable EngineerIds; + public IEnumerable MedicIds; + public List OrderedUnits; + public List Players; + public List Ranks; + public List Units; } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs index 8c7c6921..84ce6603 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs @@ -2,9 +2,9 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionPatchingReport { - public string Detail { get; set; } - public bool Error { get; set; } - public string Title { get; set; } + public string Detail; + public bool Error; + public string Title; public MissionPatchingReport(Exception exception) { Title = exception.GetBaseException().Message; diff --git a/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs index 420c8be5..68446506 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs @@ -2,8 +2,8 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionPatchingResult { - public int PlayerCount { get; set; } - public List Reports { get; set; } = new(); - public bool Success { get; set; } + public int PlayerCount; + public List Reports = new(); + public bool Success; } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs b/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs index 5100f476..c2f08904 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs @@ -2,10 +2,10 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionPlayer { - public Account Account { get; set; } - public string Name { get; set; } - public string ObjectClass { get; set; } - public Rank Rank { get; set; } - public MissionUnit Unit { get; set; } + public Account Account; + public string Name; + public string ObjectClass; + public Rank Rank; + public MissionUnit Unit; } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionUnit.cs b/UKSF.Api.ArmaMissions/Models/MissionUnit.cs index bbd1e04e..05c77127 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionUnit.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionUnit.cs @@ -3,9 +3,9 @@ namespace UKSF.Api.ArmaMissions.Models { public class MissionUnit { - public string Callsign { get; set; } - public List Members { get; set; } = new(); - public Dictionary Roles { get; set; } = new(); - public Unit SourceUnit { get; set; } + public string Callsign; + public List Members = new(); + public Dictionary Roles = new(); + public Unit SourceUnit; } } diff --git a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs index 01df201c..7e35ecf3 100644 --- a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs +++ b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs @@ -2,10 +2,8 @@ using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using UKSF.Api.ArmaServer.DataContext; -using UKSF.Api.ArmaServer.Models; using UKSF.Api.ArmaServer.Services; using UKSF.Api.ArmaServer.Signalr.Hubs; -using UKSF.Api.Shared.Events; namespace UKSF.Api.ArmaServer { public static class ApiArmaServerExtensions { diff --git a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs index 85c2e778..5edc21f7 100644 --- a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs +++ b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs @@ -122,7 +122,7 @@ public async Task UpdateOrder([FromBody] List newServ for (int index = 0; index < newServerOrder.Count; index++) { GameServer gameServer = newServerOrder[index]; if (_gameServersContext.GetSingle(gameServer.Id).Order != index) { - await _gameServersContext.Update(gameServer.Id, "order", index); + await _gameServersContext.Update(gameServer.Id, x => x.Order, index); } } diff --git a/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs b/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs index fc9e848a..5ff4b7ef 100644 --- a/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs +++ b/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs @@ -4,7 +4,6 @@ using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.ArmaServer.DataContext { public interface IGameServersContext : IMongoContext, ICachedMongoContext { } diff --git a/UKSF.Api.ArmaServer/Models/GameServer.cs b/UKSF.Api.ArmaServer/Models/GameServer.cs index 6e3b8aa2..94209b01 100644 --- a/UKSF.Api.ArmaServer/Models/GameServer.cs +++ b/UKSF.Api.ArmaServer/Models/GameServer.cs @@ -9,36 +9,36 @@ public enum GameServerOption { DCG } - public record GameServer : MongoObject { - [BsonIgnore] public List HeadlessClientProcessIds { get; set; } = new(); - public string AdminPassword { get; set; } - public int ApiPort { get; set; } - [BsonIgnore] public bool CanLaunch { get; set; } - public GameEnvironment Environment { get; set; } - public string HostName { get; set; } - public List Mods { get; set; } = new(); - public string Name { get; set; } - public int NumberHeadlessClients { get; set; } - public int Order { get; set; } = 0; - public string Password { get; set; } - public int Port { get; set; } - [BsonIgnore] public int? ProcessId { get; set; } - public string ProfileName { get; set; } - public List ServerMods { get; set; } = new(); - public GameServerOption ServerOption { get; set; } - [BsonIgnore] public GameServerStatus Status { get; set; }= new(); + public class GameServer : MongoObject { + [BsonIgnore] public List HeadlessClientProcessIds = new(); + public string AdminPassword; + public int ApiPort; + [BsonIgnore] public bool CanLaunch; + public GameEnvironment Environment; + public string HostName; + public List Mods = new(); + public string Name; + public int NumberHeadlessClients; + public int Order = 0; + public string Password; + public int Port; + [BsonIgnore] public int? ProcessId; + public string ProfileName; + public List ServerMods = new(); + public GameServerOption ServerOption; + [BsonIgnore] public GameServerStatus Status = new(); public override string ToString() => $"{Name}, {Port}, {ApiPort}, {NumberHeadlessClients}, {ProfileName}, {HostName}, {Password}, {AdminPassword}, {Environment}, {ServerOption}"; } public class GameServerStatus { - public string Map { get; set; } - public string MaxPlayers { get; set; } - public string Mission { get; set; } - public string ParsedUptime { get; set; } - public int Players { get; set; } - public bool Running { get; set; } - public bool Started { get; set; } - public float Uptime { get; set; } + public string Map; + public string MaxPlayers; + public string Mission; + public string ParsedUptime; + public int Players; + public bool Running; + public bool Started; + public float Uptime; } } diff --git a/UKSF.Api.ArmaServer/Models/GameServerMod.cs b/UKSF.Api.ArmaServer/Models/GameServerMod.cs index 31ce7883..c12b79fe 100644 --- a/UKSF.Api.ArmaServer/Models/GameServerMod.cs +++ b/UKSF.Api.ArmaServer/Models/GameServerMod.cs @@ -1,9 +1,9 @@ namespace UKSF.Api.ArmaServer.Models { public class GameServerMod { - public bool IsDuplicate { get; set; } - public string Name { get; set; } - public string Path { get; set; } - public string PathRelativeToServerExecutable { get; set; } + public bool IsDuplicate; + public string Name; + public string Path; + public string PathRelativeToServerExecutable; public override string ToString() => Name; } diff --git a/UKSF.Api.ArmaServer/Models/MissionFile.cs b/UKSF.Api.ArmaServer/Models/MissionFile.cs index 6b466a9d..ae668653 100644 --- a/UKSF.Api.ArmaServer/Models/MissionFile.cs +++ b/UKSF.Api.ArmaServer/Models/MissionFile.cs @@ -2,9 +2,9 @@ namespace UKSF.Api.ArmaServer.Models { public class MissionFile { - public string Map { get; set; } - public string Name { get; set; } - public string Path { get; set; } + public string Map; + public string Name; + public string Path; public MissionFile(FileSystemInfo fileInfo) { string[] fileNameParts = fileInfo.Name.Split("."); diff --git a/UKSF.Api.Auth/Controllers/PasswordResetController.cs b/UKSF.Api.Auth/Controllers/PasswordResetController.cs index ba390d63..c4406e84 100644 --- a/UKSF.Api.Auth/Controllers/PasswordResetController.cs +++ b/UKSF.Api.Auth/Controllers/PasswordResetController.cs @@ -25,7 +25,7 @@ public PasswordResetController(IConfirmationCodeService confirmationCodeService, } protected override async Task ApplyValidatedPayload(string codePayload, Account account) { - await AccountContext.Update(account.Id, "password", BCrypt.Net.BCrypt.HashPassword(codePayload)); + await AccountContext.Update(account.Id, x => x.Password, BCrypt.Net.BCrypt.HashPassword(codePayload)); _logger.LogAudit($"Password changed for {account.Id}", account.Id); return Ok(LoginService.RegenerateBearerToken(account.Id)); } diff --git a/UKSF.Api.Base/Context/MongoClientFactory.cs b/UKSF.Api.Base/Context/MongoClientFactory.cs index 570bee7b..2555f1db 100644 --- a/UKSF.Api.Base/Context/MongoClientFactory.cs +++ b/UKSF.Api.Base/Context/MongoClientFactory.cs @@ -4,7 +4,7 @@ namespace UKSF.Api.Base.Context { public static class MongoClientFactory { public static IMongoDatabase GetDatabase(string connectionString) { - ConventionPack conventionPack = new() { new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true) }; + ConventionPack conventionPack = new() { new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true), new CamelCaseElementNameConvention() }; ConventionRegistry.Register("DefaultConventions", conventionPack, _ => true); string database = MongoUrl.Create(connectionString).DatabaseName; return new MongoClient(connectionString).GetDatabase(database); diff --git a/UKSF.Api.Base/Context/MongoCollection.cs b/UKSF.Api.Base/Context/MongoCollection.cs index 7e81816a..9011b4b3 100644 --- a/UKSF.Api.Base/Context/MongoCollection.cs +++ b/UKSF.Api.Base/Context/MongoCollection.cs @@ -8,9 +8,10 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Base.Context { - public interface IMongoCollection { + public interface IMongoCollection where T : MongoObject { IEnumerable Get(); IEnumerable Get(Func predicate); + PagedResult GetPaged(int page, int pageSize, SortDefinition sortDefinition, FilterDefinition filterDefinition); T GetSingle(string id); T GetSingle(Func predicate); Task AddAsync(T data); @@ -35,7 +36,29 @@ public MongoCollection(IMongoDatabase database, string collectionName) { public IEnumerable Get(Func predicate) => GetCollection().AsQueryable().Where(predicate); - public T GetSingle(string id) => GetCollection().FindSync(Builders.Filter.Eq("id", id)).FirstOrDefault(); + public PagedResult GetPaged(int page, int pageSize, SortDefinition sortDefinition, FilterDefinition filterDefinition) { + AggregateFacet countFacet = AggregateFacet.Create( + "count", + PipelineDefinition.Create(new[] { PipelineStageDefinitionBuilder.Count() }) + ); + + AggregateFacet dataFacet = AggregateFacet.Create( + "data", + PipelineDefinition.Create( + new[] { PipelineStageDefinitionBuilder.Sort(sortDefinition), PipelineStageDefinitionBuilder.Skip((page - 1) * pageSize), PipelineStageDefinitionBuilder.Limit(pageSize) } + ) + ); + + IAggregateFluent aggregation = GetCollection().Aggregate().Match(filterDefinition).Facet(countFacet, dataFacet); + IReadOnlyList aggregateCountResults = aggregation.First().Facets.First(x => x.Name == "count").Output(); + int count = aggregateCountResults.Count == 0 ? 0 : (int) aggregateCountResults[0].Count; + + IReadOnlyList data = aggregation.First().Facets.First(x => x.Name == "data").Output(); + + return new PagedResult(count, data); + } + + public T GetSingle(string id) => GetCollection().FindSync(Builders.Filter.Eq(x => x.Id, id)).FirstOrDefault(); public T GetSingle(Func predicate) => GetCollection().AsQueryable().FirstOrDefault(predicate); @@ -43,33 +66,33 @@ public async Task AddAsync(T data) { await GetCollection().InsertOneAsync(data); } - public async Task UpdateAsync(string id, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter - await GetCollection().UpdateOneAsync(Builders.Filter.Eq("id", id), update); + public async Task UpdateAsync(string id, UpdateDefinition update) { + await GetCollection().UpdateOneAsync(Builders.Filter.Eq(x => x.Id, id), update); } - public async Task UpdateAsync(FilterDefinition filter, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter + public async Task UpdateAsync(FilterDefinition filter, UpdateDefinition update) { await GetCollection().UpdateOneAsync(filter, update); } - public async Task UpdateManyAsync(Expression> predicate, UpdateDefinition update) { // TODO: Remove strong typing of UpdateDefinition as parameter + public async Task UpdateManyAsync(Expression> predicate, UpdateDefinition update) { // Getting ids by the filter predicate is necessary to cover filtering items by a default model value // (e.g Role order default 0, may not be stored in document, and is thus not filterable) IEnumerable ids = Get(predicate.Compile()).Select(x => x.Id); - await GetCollection().UpdateManyAsync(Builders.Filter.In("id", ids), update); + await GetCollection().UpdateManyAsync(Builders.Filter.In(x => x.Id, ids), update); } public async Task ReplaceAsync(string id, T value) { - await GetCollection().ReplaceOneAsync(Builders.Filter.Eq("id", id), value); + await GetCollection().ReplaceOneAsync(Builders.Filter.Eq(x => x.Id, id), value); } public async Task DeleteAsync(string id) { - await GetCollection().DeleteOneAsync(Builders.Filter.Eq("id", id)); + await GetCollection().DeleteOneAsync(Builders.Filter.Eq(x => x.Id, id)); } public async Task DeleteManyAsync(Expression> predicate) { IEnumerable ids = Get(predicate.Compile()) .Select(x => x.Id); // This is necessary for filtering items by a default model value (e.g Role order default 0, may not be stored in document) - await GetCollection().DeleteManyAsync(Builders.Filter.In("id", ids)); + await GetCollection().DeleteManyAsync(Builders.Filter.In(x => x.Id, ids)); } public async Task AssertCollectionExistsAsync() { diff --git a/UKSF.Api.Base/Context/MongoContextBase.cs b/UKSF.Api.Base/Context/MongoContextBase.cs index 80f2e819..eb7fd9ea 100644 --- a/UKSF.Api.Base/Context/MongoContextBase.cs +++ b/UKSF.Api.Base/Context/MongoContextBase.cs @@ -1,10 +1,13 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Linq.Expressions; +using System.Text.RegularExpressions; using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; using UKSF.Api.Base.Models; +using SortDirection = UKSF.Api.Base.Models.SortDirection; namespace UKSF.Api.Base.Context { public abstract class MongoContextBase where T : MongoObject { @@ -16,6 +19,14 @@ public abstract class MongoContextBase where T : MongoObject { public virtual IEnumerable Get(Func predicate) => _mongoCollection.Get(predicate); + public virtual PagedResult GetPaged(int page, int pageSize, SortDirection sortDirection, string sortField, IEnumerable>> filterPropertSelectors, string filter) { + SortDefinition sortDefinition = sortDirection == SortDirection.ASCENDING ? Builders.Sort.Ascending(sortField) : Builders.Sort.Descending(sortField); + FilterDefinition filterDefinition = string.IsNullOrEmpty(filter) + ? Builders.Filter.Empty + : Builders.Filter.Or(filterPropertSelectors.Select(x => Builders.Filter.Regex(x, new BsonRegularExpression(new Regex(filter, RegexOptions.IgnoreCase))))); + return _mongoCollection.GetPaged(page, pageSize, sortDefinition, filterDefinition); + } + public virtual T GetSingle(string id) { ValidateId(id); return _mongoCollection.GetSingle(id); @@ -34,12 +45,6 @@ public virtual async Task Update(string id, Expression> fieldSel await _mongoCollection.UpdateAsync(id, update); } - public virtual async Task Update(string id, string fieldName, object value) { - ValidateId(id); - UpdateDefinition update = value == null ? Builders.Update.Unset(fieldName) : Builders.Update.Set(fieldName, value); - await _mongoCollection.UpdateAsync(id, update); - } - public virtual async Task Update(string id, UpdateDefinition update) { ValidateId(id); await _mongoCollection.UpdateAsync(id, update); diff --git a/UKSF.Api.Base/Models/EventModel.cs b/UKSF.Api.Base/Models/EventModel.cs index 8bf8f83e..4a439b34 100644 --- a/UKSF.Api.Base/Models/EventModel.cs +++ b/UKSF.Api.Base/Models/EventModel.cs @@ -12,7 +12,7 @@ public EventModel(EventType eventType, object data) { Data = data; } - public object Data { get; } - public EventType EventType { get; } + public object Data; + public EventType EventType; } } diff --git a/UKSF.Api.Base/Models/MongoObject.cs b/UKSF.Api.Base/Models/MongoObject.cs index 0ce12110..c5ab1fd8 100644 --- a/UKSF.Api.Base/Models/MongoObject.cs +++ b/UKSF.Api.Base/Models/MongoObject.cs @@ -2,7 +2,7 @@ using MongoDB.Bson.Serialization.Attributes; namespace UKSF.Api.Base.Models { - public record MongoObject { - [BsonId, BsonRepresentation(BsonType.ObjectId)] public string Id { get; set; } = ObjectId.GenerateNewId().ToString(); + public class MongoObject { + [BsonId, BsonRepresentation(BsonType.ObjectId)] public string Id = ObjectId.GenerateNewId().ToString(); } } diff --git a/UKSF.Api.Base/Models/PagedResult.cs b/UKSF.Api.Base/Models/PagedResult.cs new file mode 100644 index 00000000..eec90882 --- /dev/null +++ b/UKSF.Api.Base/Models/PagedResult.cs @@ -0,0 +1,13 @@ +using System.Collections.Generic; + +namespace UKSF.Api.Base.Models { + public class PagedResult where T : MongoObject { + public IEnumerable Data; + public int TotalCount; + + public PagedResult(int totalCount, IEnumerable data) { + TotalCount = totalCount; + Data = data; + } + } +} diff --git a/UKSF.Api.Base/Models/SortDirection.cs b/UKSF.Api.Base/Models/SortDirection.cs new file mode 100644 index 00000000..ef96ee2d --- /dev/null +++ b/UKSF.Api.Base/Models/SortDirection.cs @@ -0,0 +1,6 @@ +namespace UKSF.Api.Base.Models { + public enum SortDirection { + ASCENDING, + DESCENDING + } +} diff --git a/UKSF.Api.Command/ApiCommandExtensions.cs b/UKSF.Api.Command/ApiCommandExtensions.cs index 775d0766..e13cf2ac 100644 --- a/UKSF.Api.Command/ApiCommandExtensions.cs +++ b/UKSF.Api.Command/ApiCommandExtensions.cs @@ -3,10 +3,8 @@ using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Command.Context; using UKSF.Api.Command.EventHandlers; -using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; using UKSF.Api.Command.Signalr.Hubs; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Command { public static class ApiCommandExtensions { diff --git a/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs b/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs index 27b71765..d019ffd3 100644 --- a/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs +++ b/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs @@ -3,8 +3,6 @@ using UKSF.Api.Base.Models; using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; namespace UKSF.Api.Command.Context { public interface ICommandRequestArchiveContext : IMongoContext { } diff --git a/UKSF.Api.Command/Context/CommandRequestContext.cs b/UKSF.Api.Command/Context/CommandRequestContext.cs index fb4c05f9..9d6b977f 100644 --- a/UKSF.Api.Command/Context/CommandRequestContext.cs +++ b/UKSF.Api.Command/Context/CommandRequestContext.cs @@ -2,7 +2,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Command.Context { public interface ICommandRequestContext : IMongoContext, ICachedMongoContext { } diff --git a/UKSF.Api.Command/Context/DischargeContext.cs b/UKSF.Api.Command/Context/DischargeContext.cs index c1df4db9..0cf1a92a 100644 --- a/UKSF.Api.Command/Context/DischargeContext.cs +++ b/UKSF.Api.Command/Context/DischargeContext.cs @@ -4,7 +4,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Command.Context { public interface IDischargeContext : IMongoContext, ICachedMongoContext { } diff --git a/UKSF.Api.Command/Context/LoaContext.cs b/UKSF.Api.Command/Context/LoaContext.cs index 6b3be3af..ba3f86d5 100644 --- a/UKSF.Api.Command/Context/LoaContext.cs +++ b/UKSF.Api.Command/Context/LoaContext.cs @@ -2,7 +2,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Command.Context { public interface ILoaContext : IMongoContext, ICachedMongoContext { } diff --git a/UKSF.Api.Command/Context/OperationOrderContext.cs b/UKSF.Api.Command/Context/OperationOrderContext.cs index c803b5a0..4fe100ab 100644 --- a/UKSF.Api.Command/Context/OperationOrderContext.cs +++ b/UKSF.Api.Command/Context/OperationOrderContext.cs @@ -4,7 +4,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Command.Context { public interface IOperationOrderContext : IMongoContext, ICachedMongoContext { } diff --git a/UKSF.Api.Command/Context/OperationReportContext.cs b/UKSF.Api.Command/Context/OperationReportContext.cs index b49cd524..5b929187 100644 --- a/UKSF.Api.Command/Context/OperationReportContext.cs +++ b/UKSF.Api.Command/Context/OperationReportContext.cs @@ -4,7 +4,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Command.Context { public interface IOperationReportContext : IMongoContext, ICachedMongoContext { } diff --git a/UKSF.Api.Command/Models/CommandRequest.cs b/UKSF.Api.Command/Models/CommandRequest.cs index bf44c101..091514b2 100644 --- a/UKSF.Api.Command/Models/CommandRequest.cs +++ b/UKSF.Api.Command/Models/CommandRequest.cs @@ -25,19 +25,19 @@ public static class CommandRequestType { public const string UNIT_ROLE = "Unit Role"; } - public record CommandRequest : MongoObject { - public DateTime DateCreated { get; set; } - public string DisplayFrom { get; set; } - public string DisplayRecipient { get; set; } - public string DisplayRequester { get; set; } - public string DisplayValue { get; set; } - public string Reason { get; set; } - public string Type { get; set; } - [BsonRepresentation(BsonType.ObjectId)] public string Recipient { get; set; } - [BsonRepresentation(BsonType.ObjectId)] public string Requester { get; set; } - public Dictionary Reviews { get; set; } = new(); - public string SecondaryValue { get; set; } - public string Value { get; set; } + public class CommandRequest : MongoObject { + public DateTime DateCreated; + public string DisplayFrom; + public string DisplayRecipient; + public string DisplayRequester; + public string DisplayValue; + public string Reason; + public string Type; + [BsonRepresentation(BsonType.ObjectId)] public string Recipient; + [BsonRepresentation(BsonType.ObjectId)] public string Requester; + public Dictionary Reviews = new(); + public string SecondaryValue; + public string Value; public CommandRequest() => DateCreated = DateTime.Now; } } diff --git a/UKSF.Api.Command/Models/CommandRequestLoa.cs b/UKSF.Api.Command/Models/CommandRequestLoa.cs index d0932c9e..dd3b601e 100644 --- a/UKSF.Api.Command/Models/CommandRequestLoa.cs +++ b/UKSF.Api.Command/Models/CommandRequestLoa.cs @@ -1,10 +1,10 @@ using System; namespace UKSF.Api.Command.Models { - public record CommandRequestLoa : CommandRequest { - public string Emergency { get; set; } - public DateTime End { get; set; } - public string Late { get; set; } - public DateTime Start { get; set; } + public class CommandRequestLoa : CommandRequest { + public string Emergency; + public DateTime End; + public string Late; + public DateTime Start; } } diff --git a/UKSF.Api.Command/Models/CreateOperationOrderRequest.cs b/UKSF.Api.Command/Models/CreateOperationOrderRequest.cs index 785694ee..4e1c88dc 100644 --- a/UKSF.Api.Command/Models/CreateOperationOrderRequest.cs +++ b/UKSF.Api.Command/Models/CreateOperationOrderRequest.cs @@ -2,12 +2,12 @@ namespace UKSF.Api.Command.Models { public class CreateOperationOrderRequest { - public DateTime End { get; set; } - public int Endtime { get; set; } - public string Map { get; set; } - public string Name { get; set; } - public DateTime Start { get; set; } - public int Starttime { get; set; } - public string Type { get; set; } + public DateTime End; + public int Endtime; + public string Map; + public string Name; + public DateTime Start; + public int Starttime; + public string Type; } } diff --git a/UKSF.Api.Command/Models/CreateOperationReport.cs b/UKSF.Api.Command/Models/CreateOperationReport.cs index 0d811b69..46191437 100644 --- a/UKSF.Api.Command/Models/CreateOperationReport.cs +++ b/UKSF.Api.Command/Models/CreateOperationReport.cs @@ -2,13 +2,13 @@ namespace UKSF.Api.Command.Models { public class CreateOperationReportRequest { - public DateTime End { get; set; } - public int Endtime { get; set; } - public string Map { get; set; } - public string Name { get; set; } - public string Result { get; set; } - public DateTime Start { get; set; } - public int Starttime { get; set; } - public string Type { get; set; } + public DateTime End; + public int Endtime; + public string Map; + public string Name; + public string Result; + public DateTime Start; + public int Starttime; + public string Type; } } diff --git a/UKSF.Api.Command/Models/Discharge.cs b/UKSF.Api.Command/Models/Discharge.cs index aee7d5a0..41a646ff 100644 --- a/UKSF.Api.Command/Models/Discharge.cs +++ b/UKSF.Api.Command/Models/Discharge.cs @@ -5,20 +5,20 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Command.Models { - public record DischargeCollection : MongoObject { - [BsonRepresentation(BsonType.ObjectId)] public string AccountId { get; set; } - public List Discharges { get; set; } = new(); - public string Name { get; set; } - public bool Reinstated { get; set; } - [BsonIgnore] public bool RequestExists { get; set; } + public class DischargeCollection : MongoObject { + [BsonRepresentation(BsonType.ObjectId)] public string AccountId; + public List Discharges = new(); + public string Name; + public bool Reinstated; + [BsonIgnore] public bool RequestExists; } - public record Discharge : MongoObject { - public string DischargedBy { get; set; } - public string Rank { get; set; } - public string Reason { get; set; } - public string Role { get; set; } - public DateTime Timestamp { get; set; } = DateTime.Now; - public string Unit { get; set; } + public class Discharge : MongoObject { + public string DischargedBy; + public string Rank; + public string Reason; + public string Role; + public DateTime Timestamp = DateTime.Now; + public string Unit; } } diff --git a/UKSF.Api.Command/Models/Opord.cs b/UKSF.Api.Command/Models/Opord.cs index c3540d34..cec334e6 100644 --- a/UKSF.Api.Command/Models/Opord.cs +++ b/UKSF.Api.Command/Models/Opord.cs @@ -2,12 +2,12 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Command.Models { - public record Opord : MongoObject { - public string Description { get; set; } - public DateTime End { get; set; } - public string Map { get; set; } - public string Name { get; set; } - public DateTime Start { get; set; } - public string Type { get; set; } + public class Opord : MongoObject { + public string Description; + public DateTime End; + public string Map; + public string Name; + public DateTime Start; + public string Type; } } diff --git a/UKSF.Api.Command/Models/Oprep.cs b/UKSF.Api.Command/Models/Oprep.cs index 8c685e0f..d90ad695 100644 --- a/UKSF.Api.Command/Models/Oprep.cs +++ b/UKSF.Api.Command/Models/Oprep.cs @@ -3,14 +3,14 @@ using UKSF.Api.Personnel.Models; namespace UKSF.Api.Command.Models { - public record Oprep : MongoObject { - public AttendanceReport AttendanceReport { get; set; } - public string Description { get; set; } - public DateTime End { get; set; } - public string Map { get; set; } - public string Name { get; set; } - public string Result { get; set; } - public DateTime Start { get; set; } - public string Type { get; set; } + public class Oprep : MongoObject { + public AttendanceReport AttendanceReport; + public string Description; + public DateTime End; + public string Map; + public string Name; + public string Result; + public DateTime Start; + public string Type; } } diff --git a/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs b/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs index 5f8ddf8b..76b53dfa 100644 --- a/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs +++ b/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs @@ -4,16 +4,21 @@ using Discord.WebSocket; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Base.Events; using UKSF.Api.Discord.Services; -using UKSF.Api.Personnel.Models; using UKSF.Api.Shared; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Discord.Controllers { [Route("[controller]")] public class DiscordController : Controller { private readonly IDiscordService _discordService; + private readonly IEventBus _eventBus; - public DiscordController(IDiscordService discordService) => _discordService = discordService; + public DiscordController(IDiscordService discordService, IEventBus eventBus) { + _discordService = discordService; + _eventBus = eventBus; + } [HttpGet("roles"), Authorize, Permissions(Permissions.ADMIN)] public async Task GetRoles() { @@ -27,8 +32,7 @@ public async Task UpdateUserRoles() { return Ok(); } - // TODO: Use in frontend. Check return type. Check permissions - [HttpGet("onlineUserDetails"), Authorize] - public (bool discordOnline, string discordNickname) GetOnlineUserDetails(Account account) => _discordService.GetOnlineUserDetails(account); + [HttpGet("{accountId}/onlineUserDetails"), Authorize, Permissions(Permissions.RECRUITER)] + public OnlineState GetOnlineUserDetails([FromRoute] string accountId) => _discordService.GetOnlineUserDetails(accountId); } } diff --git a/UKSF.Api.Integrations.Discord/Models/DiscordDeletedMessageResult.cs b/UKSF.Api.Integrations.Discord/Models/DiscordDeletedMessageResult.cs new file mode 100644 index 00000000..b637ec8f --- /dev/null +++ b/UKSF.Api.Integrations.Discord/Models/DiscordDeletedMessageResult.cs @@ -0,0 +1,15 @@ +namespace UKSF.Api.Discord.Models { + public class DiscordDeletedMessageResult { + public readonly ulong InstigatorId; + public readonly string InstigatorName; + public readonly string Name; + public readonly string Message; + + public DiscordDeletedMessageResult(ulong instigatorId, string instigatorName, string name, string message) { + InstigatorId = instigatorId; + InstigatorName = instigatorName; + Name = name; + Message = message; + } + } +} diff --git a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs index 8db4684d..9aedd057 100644 --- a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs +++ b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs @@ -3,10 +3,13 @@ using System.Linq; using System.Threading.Tasks; using Discord; +using Discord.Rest; using Discord.WebSocket; using Microsoft.Extensions.Configuration; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; +using UKSF.Api.Base.Events; +using UKSF.Api.Discord.Models; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; @@ -16,7 +19,7 @@ namespace UKSF.Api.Discord.Services { public interface IDiscordService { Task ConnectDiscord(); - (bool online, string nickname) GetOnlineUserDetails(Account account); + OnlineState GetOnlineUserDetails(string accountId); Task SendMessageToEveryone(ulong channelId, string message); Task SendMessage(ulong channelId, string message); Task> GetRoles(); @@ -31,6 +34,7 @@ public class DiscordService : IDiscordService, IDisposable { private readonly IAccountContext _accountContext; private readonly IConfiguration _configuration; private readonly IDisplayNameService _displayNameService; + private readonly IEventBus _eventBus; private readonly ILogger _logger; private readonly IRanksContext _ranksContext; private readonly IUnitsContext _unitsContext; @@ -49,7 +53,8 @@ public DiscordService( IUnitsService unitsService, IDisplayNameService displayNameService, IVariablesService variablesService, - ILogger logger + ILogger logger, + IEventBus eventBus ) { _unitsContext = unitsContext; _ranksContext = ranksContext; @@ -59,6 +64,7 @@ ILogger logger _displayNameService = displayNameService; _variablesService = variablesService; _logger = logger; + _eventBus = eventBus; } public async Task ConnectDiscord() { @@ -67,7 +73,7 @@ public async Task ConnectDiscord() { _client = null; } - _client = new DiscordSocketClient(); + _client = new DiscordSocketClient(new DiscordSocketConfig { AlwaysDownloadUsers = true, MessageCacheSize = 1000 }); _client.Ready += OnClientOnReady; _client.Disconnected += ClientOnDisconnected; _client.MessageReceived += ClientOnMessageReceived; @@ -77,9 +83,14 @@ public async Task ConnectDiscord() { await _client.LoginAsync(TokenType.Bot, _configuration.GetConnectionString("discord")); await _client.StartAsync(); + + await Task.Delay(TimeSpan.FromSeconds(5)); + await _guild.GetTextChannel(522851104128499712).SendMessageAsync(Guid.NewGuid().ToString()); } public async Task SendMessage(ulong channelId, string message) { + if (IsDiscordDisabled()) return; + await AssertOnline(); SocketTextChannel channel = _guild.GetTextChannel(channelId); @@ -87,6 +98,8 @@ public async Task SendMessage(ulong channelId, string message) { } public async Task SendMessageToEveryone(ulong channelId, string message) { + if (IsDiscordDisabled()) return; + await SendMessage(channelId, $"{_guild.EveryoneRole} {message}"); } @@ -96,6 +109,8 @@ public async Task> GetRoles() { } public async Task UpdateAllUsers() { + if (IsDiscordDisabled()) return; + await AssertOnline(); await Task.Run( () => { @@ -107,6 +122,8 @@ await Task.Run( } public async Task UpdateAccount(Account account, ulong discordId = 0) { + if (IsDiscordDisabled()) return; + await AssertOnline(); if (discordId == 0 && account != null && !string.IsNullOrEmpty(account.DiscordId)) { discordId = ulong.Parse(account.DiscordId); @@ -125,27 +142,33 @@ public async Task UpdateAccount(Account account, ulong discordId = 0) { await UpdateAccountNickname(user, account); } - public (bool online, string nickname) GetOnlineUserDetails(Account account) { - bool online = IsAccountOnline(account); - string nickname = GetAccountNickname(account); + // TODO: Change to use signalr if events are available + public OnlineState GetOnlineUserDetails(string accountId) { + Account account = _accountContext.GetSingle(accountId); + if (account?.DiscordId == null || !ulong.TryParse(account.DiscordId, out ulong discordId)) { + return null; + } + + bool online = IsAccountOnline(discordId); + string nickname = GetAccountNickname(discordId); - return (online, nickname); + return new OnlineState { Online = online, Nickname = nickname }; } public void Dispose() { - _client.StopAsync().Wait(TimeSpan.FromSeconds(5)); + _client?.StopAsync().Wait(TimeSpan.FromSeconds(5)); } - private bool IsAccountOnline(Account account) => account.DiscordId != null && _guild.GetUser(ulong.Parse(account.DiscordId))?.Status == UserStatus.Online; + private bool IsDiscordDisabled() => !_variablesService.GetFeatureState("DISCORD"); - private string GetAccountNickname(Account account) { - if (account.DiscordId == null) return ""; + private bool IsAccountOnline(ulong discordId) => _guild.GetUser(discordId)?.Status == UserStatus.Online; - SocketGuildUser user = _guild.GetUser(ulong.Parse(account.DiscordId)); + private string GetAccountNickname(ulong discordId) { + SocketGuildUser user = _guild.GetUser(discordId); return GetUserNickname(user); } - private static string GetUserNickname(SocketGuildUser user) => user == null ? "" : string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname; + private static string GetUserNickname(IGuildUser user) => user == null ? "" : string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname; private async Task UpdateAccountRoles(SocketGuildUser user, Account account) { IReadOnlyCollection userRoles = user.Roles; @@ -206,6 +229,8 @@ private async Task AssertOnline() { } private async Task ClientOnGuildMemberUpdated(SocketGuildUser oldUser, SocketGuildUser user) { + if (IsDiscordDisabled()) return; + string oldRoles = oldUser.Roles.OrderBy(x => x.Id).Select(x => $"{x.Id}").Aggregate((x, y) => $"{x},{y}"); string newRoles = user.Roles.OrderBy(x => x.Id).Select(x => $"{x.Id}").Aggregate((x, y) => $"{x},{y}"); if (oldRoles != newRoles || oldUser.Nickname != user.Nickname) { @@ -214,18 +239,38 @@ private async Task ClientOnGuildMemberUpdated(SocketGuildUser oldUser, SocketGui } private async Task ClientOnUserJoined(SocketGuildUser user) { + if (IsDiscordDisabled()) return; + await UpdateAccount(null, user.Id); } private async Task ClientOnMessageReceived(SocketMessage incomingMessage) { + if (IsDiscordDisabled()) return; + + if (incomingMessage.Content.Contains(_variablesService.GetVariable("DISCORD_FILTER_WEEKLY_EVENTS").AsString(), StringComparison.InvariantCultureIgnoreCase)) { + await HandleWeeklyEventsMessageReacts(incomingMessage); + return; + } + if (incomingMessage.Content.Contains("bot", StringComparison.InvariantCultureIgnoreCase) || incomingMessage.MentionedUsers.Any(x => x.IsBot)) { - if (TRIGGERS.Any(x => incomingMessage.Content.Contains(x, StringComparison.InvariantCultureIgnoreCase))) { - bool owner = incomingMessage.Author.Id == _variablesService.GetVariable("DID_U_OWNER").AsUlong(); - string message = owner ? OWNER_REPLIES[new Random().Next(0, OWNER_REPLIES.Length)] : REPLIES[new Random().Next(0, REPLIES.Length)]; - string[] parts = _guild.GetUser(incomingMessage.Author.Id).Nickname.Split('.'); - string nickname = owner ? "Daddy" : parts.Length > 1 ? parts[1] : parts[0]; - await SendMessage(incomingMessage.Channel.Id, string.Format(message, nickname)); - } + await HandleBotMessageResponse(incomingMessage); + } + } + + private static async Task HandleWeeklyEventsMessageReacts(IMessage incomingMessage) { + List reactionCodes = new() { ":Tuesday:", ":Thursday:", ":Friday:", ":Sunday:" }; + foreach (string reactionCode in reactionCodes) { + await incomingMessage.AddReactionAsync(new Emoji(reactionCode)); + } + } + + private async Task HandleBotMessageResponse(SocketMessage incomingMessage) { + if (TRIGGERS.Any(x => incomingMessage.Content.Contains(x, StringComparison.InvariantCultureIgnoreCase))) { + bool owner = incomingMessage.Author.Id == _variablesService.GetVariable("DID_U_OWNER").AsUlong(); + string message = owner ? OWNER_REPLIES[new Random().Next(0, OWNER_REPLIES.Length)] : REPLIES[new Random().Next(0, REPLIES.Length)]; + string[] parts = _guild.GetUser(incomingMessage.Author.Id).Nickname.Split('.'); + string nickname = owner ? "Daddy" : parts.Length > 1 ? parts[1] : parts[0]; + await SendMessage(incomingMessage.Channel.Id, string.Format(message, nickname)); } } @@ -247,25 +292,168 @@ private Task ClientOnDisconnected(Exception arg) { private void AddUserEventLogs() { _client.UserJoined += user => { string name = GetUserNickname(user); - _logger.LogDiscordEvent(DiscordUserEventType.JOINED, name, user.Id.ToString(), $"{name} joined"); + string associatedAccountMessage = GetAssociatedAccountMessage(user.Id); + _logger.LogDiscordEvent(DiscordUserEventType.JOINED, user.Id.ToString(), name, string.Empty, name, $"Joined, {associatedAccountMessage}"); return Task.CompletedTask; }; _client.UserLeft += user => { string name = GetUserNickname(user); - _logger.LogDiscordEvent(DiscordUserEventType.LEFT, name, user.Id.ToString(), $"{name} left"); + string associatedAccountMessage = GetAssociatedAccountMessage(user.Id); + _logger.LogDiscordEvent(DiscordUserEventType.LEFT, user.Id.ToString(), name, string.Empty, name, $"Left, {associatedAccountMessage}"); + Account account = _accountContext.GetSingle(x => x.DiscordId == user.Id.ToString()); + if (account != null) { + _eventBus.Send(new DiscordEventData(DiscordUserEventType.LEFT, account.Id)); + } + return Task.CompletedTask; }; - _client.UserBanned += (user, _) => { - _logger.LogDiscordEvent(DiscordUserEventType.BANNED, user.Username, user.Id.ToString(), $"{user.Username} banned"); - return Task.CompletedTask; + _client.UserBanned += async (user, _) => { + string associatedAccountMessage = GetAssociatedAccountMessage(user.Id); + ulong instigatorId = await GetBannedAuditLogInstigator(user.Id); + string instigatorName = GetUserNickname(_guild.GetUser(instigatorId)); + _logger.LogDiscordEvent(DiscordUserEventType.BANNED, instigatorId.ToString(), instigatorName, string.Empty, user.Username, $"Banned, {associatedAccountMessage}"); }; - _client.UserUnbanned += (user, _) => { - _logger.LogDiscordEvent(DiscordUserEventType.UNBANNED, user.Username, user.Id.ToString(), $"{user.Username} unbanned"); - return Task.CompletedTask; + _client.UserUnbanned += async (user, _) => { + string associatedAccountMessage = GetAssociatedAccountMessage(user.Id); + ulong instigatorId = await GetUnbannedAuditLogInstigator(user.Id); + string instigatorName = GetUserNickname(_guild.GetUser(instigatorId)); + _logger.LogDiscordEvent(DiscordUserEventType.UNBANNED, instigatorId.ToString(), instigatorName, string.Empty, user.Username, $"Unbanned, {associatedAccountMessage}"); }; + + _client.MessagesBulkDeleted += async (cacheables, channel) => { + int irretrievableMessageCount = 0; + List messages = new(); + + foreach (Cacheable cacheable in cacheables) { + DiscordDeletedMessageResult result = await GetDeletedMessageDetails(cacheable, channel); + switch (result.InstigatorId) { + case ulong.MaxValue: continue; + case 0: + irretrievableMessageCount++; + continue; + default: + messages.Add(result); + break; + } + } + + _logger.LogDiscordEvent(DiscordUserEventType.MESSAGE_DELETED, "0", "NO INSTIGATOR", channel.Name, string.Empty, $"{irretrievableMessageCount} irretrievable messages deleted"); + + IEnumerable> groupedMessages = messages.GroupBy(x => x.Name); + foreach (IGrouping groupedMessage in groupedMessages) { + foreach (DiscordDeletedMessageResult result in groupedMessage) { + _logger.LogDiscordEvent( + DiscordUserEventType.MESSAGE_DELETED, + result.InstigatorId.ToString(), + result.InstigatorName, + channel.Name, + result.Name, + result.Message + ); + } + } + }; + + _client.MessageDeleted += async (cacheable, channel) => { + DiscordDeletedMessageResult result = await GetDeletedMessageDetails(cacheable, channel); + switch (result.InstigatorId) { + case ulong.MaxValue: return; + case 0: + _logger.LogDiscordEvent(DiscordUserEventType.MESSAGE_DELETED, "0", "NO INSTIGATOR", channel.Name, string.Empty, $"Irretrievable message {cacheable.Id} deleted"); + return; + default: + _logger.LogDiscordEvent( + DiscordUserEventType.MESSAGE_DELETED, + result.InstigatorId.ToString(), + result.InstigatorName, + channel.Name, + result.Name, + result.Message + ); + break; + } + }; + } + + private string GetAssociatedAccountMessage(ulong userId) { + Account account = _accountContext.GetSingle(x => x.DiscordId == userId.ToString()); + return account == null ? "with no associated account" : $"with associated account ({account.Id}, {_displayNameService.GetDisplayName(account)})"; + } + + private async Task GetDeletedMessageDetails(Cacheable cacheable, ISocketMessageChannel channel) { + IMessage message = await cacheable.GetOrDownloadAsync(); + if (message == null) { + return new DiscordDeletedMessageResult(0, null, null, null); + } + + ulong userId = message.Author.Id; + ulong instigatorId = await GetMessageDeletedAuditLogInstigator(channel.Id, userId); + if (instigatorId == 0 || instigatorId == userId) { + return new DiscordDeletedMessageResult(ulong.MaxValue, null, null, null); + } + + string name = message.Author is SocketGuildUser user ? GetUserNickname(user) : GetUserNickname(_guild.GetUser(userId)); + string instigatorName = GetUserNickname(_guild.GetUser(instigatorId)); + string messageString = message.Content; + + return new DiscordDeletedMessageResult(instigatorId, instigatorName, name, messageString); + } + + private async Task GetMessageDeletedAuditLogInstigator(ulong channelId, ulong authorId) { + IAsyncEnumerator> auditLogsEnumerator = + _guild.GetAuditLogsAsync(10, RequestOptions.Default, null, null, ActionType.MessageDeleted).GetAsyncEnumerator(); + try { + while (await auditLogsEnumerator.MoveNextAsync()) { + IReadOnlyCollection auditLogs = auditLogsEnumerator.Current; + var auditUser = auditLogs.Where(x => x.Data is MessageDeleteAuditLogData) + .Select(x => new { Data = x.Data as MessageDeleteAuditLogData, x.User }) + .FirstOrDefault(x => x.Data.ChannelId == channelId && x.Data.AuthorId == authorId); + if (auditUser != null) return auditUser.User.Id; + } + } finally { + await auditLogsEnumerator.DisposeAsync(); + } + + return 0; + } + + private async Task GetBannedAuditLogInstigator(ulong userId) { + IAsyncEnumerator> auditLogsEnumerator = + _guild.GetAuditLogsAsync(10, RequestOptions.Default, null, null, ActionType.Ban).GetAsyncEnumerator(); + try { + while (await auditLogsEnumerator.MoveNextAsync()) { + IReadOnlyCollection auditLogs = auditLogsEnumerator.Current; + var auditUser = auditLogs.Where(x => x.Data is BanAuditLogData) + .Select(x => new { Data = x.Data as BanAuditLogData, x.User }) + .FirstOrDefault(x => x.Data.Target.Id == userId); + if (auditUser != null) return auditUser.User.Id; + } + } finally { + await auditLogsEnumerator.DisposeAsync(); + } + + return 0; + } + + private async Task GetUnbannedAuditLogInstigator(ulong userId) { + IAsyncEnumerator> auditLogsEnumerator = + _guild.GetAuditLogsAsync(10, RequestOptions.Default, null, null, ActionType.Unban).GetAsyncEnumerator(); + try { + while (await auditLogsEnumerator.MoveNextAsync()) { + IReadOnlyCollection auditLogs = auditLogsEnumerator.Current; + var auditUser = auditLogs.Where(x => x.Data is UnbanAuditLogData) + .Select(x => new { Data = x.Data as UnbanAuditLogData, x.User }) + .FirstOrDefault(x => x.Data.Target.Id == userId); + if (auditUser != null) return auditUser.User.Id; + } + } finally { + await auditLogsEnumerator.DisposeAsync(); + } + + return 0; } } } diff --git a/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs b/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs index 41eb3584..1358ee55 100644 --- a/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs +++ b/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs @@ -3,13 +3,13 @@ namespace UKSF.Api.Integrations.Instagram.Models { public class InstagramImage { - public string Base64 { get; set; } - public string Id { get; set; } + public string Base64; + public string Id; - [JsonProperty("media_type")] public string MediaType { get; set; } - [JsonProperty("media_url")] public string MediaUrl { get; set; } + [JsonProperty("media_type")] public string MediaType; + [JsonProperty("media_url")] public string MediaUrl; - public string Permalink { get; set; } - public DateTime Timestamp { get; set; } + public string Permalink; + public DateTime Timestamp; } } diff --git a/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs index 96e78ecd..1f0ab4d0 100644 --- a/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs +++ b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs @@ -1,6 +1,5 @@ using System; using System.Threading.Tasks; -using Microsoft.Extensions.Hosting; using UKSF.Api.Base.ScheduledActions; using UKSF.Api.Integrations.Instagram.Services; using UKSF.Api.Shared.Context; @@ -13,16 +12,14 @@ public class ActionInstagramImages : IActionInstagramImages { private const string ACTION_NAME = nameof(ActionInstagramImages); private readonly IClock _clock; - private readonly IHostEnvironment _currentEnvironment; private readonly IInstagramService _instagramService; private readonly ISchedulerContext _schedulerContext; private readonly ISchedulerService _schedulerService; - public ActionInstagramImages(ISchedulerContext schedulerContext, IInstagramService instagramService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + public ActionInstagramImages(ISchedulerContext schedulerContext, IInstagramService instagramService, ISchedulerService schedulerService, IClock clock) { _schedulerContext = schedulerContext; _instagramService = instagramService; _schedulerService = schedulerService; - _currentEnvironment = currentEnvironment; _clock = clock; } @@ -33,8 +30,6 @@ public void Run(params object[] parameters) { } public async Task CreateSelf() { - if (_currentEnvironment.IsDevelopment()) return; - if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { await _schedulerService.CreateScheduledJob(_clock.Today(), TimeSpan.FromMinutes(15), ACTION_NAME); } diff --git a/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs index 9c4cbae5..2eaafb18 100644 --- a/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs +++ b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs @@ -1,6 +1,5 @@ using System; using System.Threading.Tasks; -using Microsoft.Extensions.Hosting; using UKSF.Api.Base.ScheduledActions; using UKSF.Api.Integrations.Instagram.Services; using UKSF.Api.Shared.Context; @@ -13,16 +12,14 @@ public class ActionInstagramToken : IActionInstagramToken { private const string ACTION_NAME = nameof(ActionInstagramToken); private readonly IClock _clock; - private readonly IHostEnvironment _currentEnvironment; private readonly IInstagramService _instagramService; private readonly ISchedulerContext _schedulerContext; private readonly ISchedulerService _schedulerService; - public ActionInstagramToken(ISchedulerContext schedulerContext, IInstagramService instagramService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + public ActionInstagramToken(ISchedulerContext schedulerContext, IInstagramService instagramService, ISchedulerService schedulerService, IClock clock) { _schedulerContext = schedulerContext; _instagramService = instagramService; _schedulerService = schedulerService; - _currentEnvironment = currentEnvironment; _clock = clock; } @@ -33,8 +30,6 @@ public void Run(params object[] parameters) { } public async Task CreateSelf() { - if (_currentEnvironment.IsDevelopment()) return; - if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(45), TimeSpan.FromDays(45), ACTION_NAME); } diff --git a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs index fa3e2480..5bc640c2 100644 --- a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs +++ b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs @@ -1,8 +1,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Base.Events; -using UKSF.Api.Shared.Models; using UKSF.Api.Teamspeak.EventHandlers; using UKSF.Api.Teamspeak.ScheduledActions; using UKSF.Api.Teamspeak.Services; diff --git a/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs b/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs index 50c69e1f..d193d52e 100644 --- a/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs +++ b/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs @@ -8,6 +8,7 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; +using UKSF.Api.Shared.Models; using UKSF.Api.Teamspeak.Models; using UKSF.Api.Teamspeak.Services; @@ -47,7 +48,6 @@ public async Task Shutdown() { return Ok(); } - // TODO: Frontend needs reference updating [HttpGet("onlineAccounts")] public IActionResult GetOnlineAccounts() { IEnumerable teamnspeakClients = _teamspeakService.GetOnlineTeamspeakClients(); @@ -86,8 +86,7 @@ public IActionResult GetOnlineAccounts() { return Ok(new { commanders, recruiters, members, guests }); } - // TODO: Use in frontend. Check return type. Check permissions - [HttpGet("onlineUserDetails"), Authorize] - public (bool tsOnline, string tsNickname) GetOnlineUserDetails(Account account) => _teamspeakService.GetOnlineUserDetails(account); + [HttpGet("{accountId}/onlineUserDetails"), Authorize, Permissions(Permissions.RECRUITER)] + public OnlineState GetOnlineUserDetails([FromRoute] string accountId) => _teamspeakService.GetOnlineUserDetails(accountId); } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs b/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs index 57353793..3e2e9318 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs @@ -3,13 +3,13 @@ using UKSF.Api.Personnel.Models; namespace UKSF.Api.Teamspeak.Models { - public record Operation : MongoObject { - public AttendanceReport AttendanceReport { get; set; } - public DateTime End { get; set; } - public string Map { get; set; } - public string Name { get; set; } - public string Result { get; set; } - public DateTime Start { get; set; } - public string Type { get; set; } + public class Operation : MongoObject { + public AttendanceReport AttendanceReport; + public DateTime End; + public string Map; + public string Name; + public string Result; + public DateTime Start; + public string Type; } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs index d7b138cb..85c71eed 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs @@ -1,8 +1,8 @@ namespace UKSF.Api.Teamspeak.Models { public class TeamspeakClient { - public double ChannelId { get; set; } - public string ChannelName { get; set; } - public double ClientDbId { get; set; } - public string ClientName { get; set; } + public double ChannelId; + public string ChannelName; + public double ClientDbId; + public string ClientName; } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs index fd234391..a883e2aa 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs @@ -1,6 +1,6 @@ namespace UKSF.Api.Teamspeak.Models { public class TeamspeakGroupProcedure { - public double ClientDbId { get; set; } - public double ServerGroup { get; set; } + public double ClientDbId; + public double ServerGroup; } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs index 0640ef5d..2ba5a83a 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs @@ -4,8 +4,8 @@ namespace UKSF.Api.Teamspeak.Models { public class TeamspeakServerGroupUpdate { - public List ServerGroups { get; set; } = new(); - public CancellationTokenSource CancellationTokenSource { get; set; } - public Task DelayedProcessTask { get; set; } + public List ServerGroups = new(); + public CancellationTokenSource CancellationTokenSource; + public Task DelayedProcessTask; } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs index 181696ca..2767f80e 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs @@ -3,7 +3,7 @@ namespace UKSF.Api.Teamspeak.Models { public class TeamspeakServerSnapshot { - public DateTime Timestamp { get; set; } - public HashSet Users { get; set; } + public DateTime Timestamp; + public HashSet Users; } } diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs index 55b3abd9..50bd6db9 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs @@ -31,12 +31,16 @@ public TeamspeakManagerService(IHubContext hub, } public void Start() { + if (IsTeamspeakDisabled()) return; + _runTeamspeak = true; _token = new CancellationTokenSource(); Task.Run(KeepOnline); } public void Stop() { + if (IsTeamspeakDisabled()) return; + _runTeamspeak = false; _token.Cancel(); Task.Delay(TimeSpan.FromSeconds(5)).Wait(); @@ -44,16 +48,24 @@ public void Stop() { } public async Task SendGroupProcedure(TeamspeakProcedureType procedure, TeamspeakGroupProcedure groupProcedure) { + if (IsTeamspeakDisabled()) return; + await _hub.Clients.All.Receive(procedure, groupProcedure); } public async Task SendProcedure(TeamspeakProcedureType procedure, object args) { + if (IsTeamspeakDisabled()) return; + await _hub.Clients.All.Receive(procedure, args); } private async void KeepOnline() { await TaskUtilities.Delay(TimeSpan.FromSeconds(5), _token.Token); while (_runTeamspeak) { + if (Process.GetProcessesByName("ts3server").Length == 0) { + await LaunchTeamspeakServer(); + } + if (_variablesService.GetVariable("TEAMSPEAK_RUN").AsBool()) { if (!TeamspeakHubState.Connected) { if (Process.GetProcessesByName("ts3client_win64").Length == 0) { @@ -69,6 +81,10 @@ private async void KeepOnline() { } } + private async Task LaunchTeamspeakServer() { + await ProcessUtilities.LaunchExternalProcess("TeamspeakServer", $"start \"\" \"{_variablesService.GetVariable("TEAMSPEAK_SERVER_PATH").AsString()}\""); + } + private async Task LaunchTeamspeak() { await ProcessUtilities.LaunchExternalProcess("Teamspeak", $"start \"\" \"{_variablesService.GetVariable("TEAMSPEAK_PATH").AsString()}\""); } @@ -76,6 +92,7 @@ private async Task LaunchTeamspeak() { private async Task ShutTeamspeak() { Process process = Process.GetProcesses().FirstOrDefault(x => x.ProcessName == "ts3client_win64"); if (process == null) return; + await process.CloseProcessGracefully(); process.Refresh(); process.WaitForExit(5000); @@ -85,5 +102,7 @@ private async Task ShutTeamspeak() { await TaskUtilities.Delay(TimeSpan.FromMilliseconds(100), _token.Token); } } + + private bool IsTeamspeakDisabled() => !_variablesService.GetFeatureState("TEAMSPEAK"); } } diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs index 9d153214..889b9b7b 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs @@ -6,7 +6,9 @@ using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Hosting; using MongoDB.Driver; +using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Models; using UKSF.Api.Teamspeak.Models; using UKSF.Api.Teamspeak.Signalr.Clients; using UKSF.Api.Teamspeak.Signalr.Hubs; @@ -14,7 +16,7 @@ namespace UKSF.Api.Teamspeak.Services { public interface ITeamspeakService { IEnumerable GetOnlineTeamspeakClients(); - (bool online, string nickname) GetOnlineUserDetails(Account account); + OnlineState GetOnlineUserDetails(string accountId); IEnumerable GetFormattedClients(); Task UpdateClients(HashSet newClients); Task UpdateAccountTeamspeakGroups(Account account); @@ -25,6 +27,7 @@ public interface ITeamspeakService { } public class TeamspeakService : ITeamspeakService { + private readonly IAccountContext _accountContext; private readonly SemaphoreSlim _clientsSemaphore = new(1); private readonly IMongoDatabase _database; private readonly IHostEnvironment _environment; @@ -33,11 +36,13 @@ public class TeamspeakService : ITeamspeakService { private HashSet _clients = new(); public TeamspeakService( + IAccountContext accountContext, IMongoDatabase database, IHubContext teamspeakClientsHub, ITeamspeakManagerService teamspeakManagerService, IHostEnvironment environment ) { + _accountContext = accountContext; _database = database; _teamspeakClientsHub = teamspeakClientsHub; _teamspeakManagerService = teamspeakManagerService; @@ -77,6 +82,7 @@ public async Task StoreTeamspeakServerSnapshot() { return; } + // TODO: Remove direct db call TeamspeakServerSnapshot teamspeakServerSnapshot = new() { Timestamp = DateTime.UtcNow, Users = _clients }; await _database.GetCollection("teamspeakSnapshots").InsertOneAsync(teamspeakServerSnapshot); } @@ -87,20 +93,28 @@ public async Task Shutdown() { public IEnumerable GetFormattedClients() { if (_environment.IsDevelopment()) return new List { new { name = "SqnLdr.Beswick.T", clientDbId = (double) 2 } }; + return _clients.Where(x => x != null).Select(x => new { name = $"{x.ClientName}", clientDbId = x.ClientDbId }); } - public (bool online, string nickname) GetOnlineUserDetails(Account account) { - if (account.TeamspeakIdentities == null) return (false, ""); - if (_clients.Count == 0) return (false, ""); + // TODO: Change to use signalr (or hook into existing _teamspeakClientsHub) + public OnlineState GetOnlineUserDetails(string accountId) { + if (_environment.IsDevelopment()) { + _clients = new HashSet { new() { ClientName = "SqnLdr.Beswick.T", ClientDbId = 2 } }; + } + + if (_clients.Count == 0) return null; + + Account account = _accountContext.GetSingle(accountId); + if (account?.TeamspeakIdentities == null) return null; - foreach (TeamspeakClient client in _clients.Where(x => x != null)) { - if (account.TeamspeakIdentities.Any(y => y.Equals(client.ClientDbId))) { - return (true, client.ClientName); - } + if (_environment.IsDevelopment()) { + _clients.First().ClientDbId = account.TeamspeakIdentities.First(); } - return (false, ""); + return _clients.Where(client => client != null && account.TeamspeakIdentities.Any(clientDbId => clientDbId.Equals(client.ClientDbId))) + .Select(client => new OnlineState { Online = true, Nickname = client.ClientName }) + .FirstOrDefault(); } private static string FormatTeamspeakMessage(string message) => $"\n========== UKSF Server Message ==========\n{message}\n=================================="; diff --git a/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs index 5c734e2a..be2e7414 100644 --- a/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs +++ b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs @@ -2,7 +2,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using UKSF.Api.Base.Events; -using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; using UKSF.Api.Teamspeak.Signalr.Clients; diff --git a/UKSF.Api.Launcher/ApiLauncherExtensions.cs b/UKSF.Api.Launcher/ApiLauncherExtensions.cs index e2c05b00..ce84745b 100644 --- a/UKSF.Api.Launcher/ApiLauncherExtensions.cs +++ b/UKSF.Api.Launcher/ApiLauncherExtensions.cs @@ -2,11 +2,9 @@ using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Launcher.Context; -using UKSF.Api.Launcher.Models; using UKSF.Api.Launcher.Services; using UKSF.Api.Launcher.Signalr.Hubs; using UKSF.Api.Personnel.ScheduledActions; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Launcher { public static class ApiLauncherExtensions { diff --git a/UKSF.Api.Launcher/Context/LauncherFileContext.cs b/UKSF.Api.Launcher/Context/LauncherFileContext.cs index 62a9f16b..87f7b9ab 100644 --- a/UKSF.Api.Launcher/Context/LauncherFileContext.cs +++ b/UKSF.Api.Launcher/Context/LauncherFileContext.cs @@ -2,7 +2,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Launcher.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Launcher.Context { public interface ILauncherFileContext : IMongoContext, ICachedMongoContext { } diff --git a/UKSF.Api.Launcher/Models/LauncherFile.cs b/UKSF.Api.Launcher/Models/LauncherFile.cs index a01f982b..d6f8a6cf 100644 --- a/UKSF.Api.Launcher/Models/LauncherFile.cs +++ b/UKSF.Api.Launcher/Models/LauncherFile.cs @@ -1,8 +1,8 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Launcher.Models { - public record LauncherFile : MongoObject { - public string FileName { get; set; } - public string Version { get; set; } + public class LauncherFile : MongoObject { + public string FileName; + public string Version; } } diff --git a/UKSF.Api.Modpack/ApiModpackExtensions.cs b/UKSF.Api.Modpack/ApiModpackExtensions.cs index 7a3f41f9..dd1de3d2 100644 --- a/UKSF.Api.Modpack/ApiModpackExtensions.cs +++ b/UKSF.Api.Modpack/ApiModpackExtensions.cs @@ -3,12 +3,10 @@ using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Modpack.Context; using UKSF.Api.Modpack.EventHandlers; -using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.ScheduledActions; using UKSF.Api.Modpack.Services; using UKSF.Api.Modpack.Services.BuildProcess; using UKSF.Api.Modpack.Signalr.Hubs; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Modpack { public static class ApiModpackExtensions { diff --git a/UKSF.Api.Modpack/Context/BuildsContext.cs b/UKSF.Api.Modpack/Context/BuildsContext.cs index 6eb9c99d..75f879b1 100644 --- a/UKSF.Api.Modpack/Context/BuildsContext.cs +++ b/UKSF.Api.Modpack/Context/BuildsContext.cs @@ -7,8 +7,6 @@ using UKSF.Api.Base.Models; using UKSF.Api.Modpack.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; namespace UKSF.Api.Modpack.Context { public interface IBuildsContext : IMongoContext, ICachedMongoContext { diff --git a/UKSF.Api.Modpack/Context/ReleasesContext.cs b/UKSF.Api.Modpack/Context/ReleasesContext.cs index 477a7a33..e232d234 100644 --- a/UKSF.Api.Modpack/Context/ReleasesContext.cs +++ b/UKSF.Api.Modpack/Context/ReleasesContext.cs @@ -4,7 +4,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Modpack.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Modpack.Context { public interface IReleasesContext : IMongoContext, ICachedMongoContext { } diff --git a/UKSF.Api.Modpack/Models/GithubCommit.cs b/UKSF.Api.Modpack/Models/GithubCommit.cs index 271d6e64..63bf86de 100644 --- a/UKSF.Api.Modpack/Models/GithubCommit.cs +++ b/UKSF.Api.Modpack/Models/GithubCommit.cs @@ -1,10 +1,10 @@ namespace UKSF.Api.Modpack.Models { public class GithubCommit { - public string After { get; set; } - public string Author { get; set; } - public string BaseBranch { get; set; } - public string Before { get; set; } - public string Branch { get; set; } - public string Message { get; set; } + public string After; + public string Author; + public string BaseBranch; + public string Before; + public string Branch; + public string Message; } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuild.cs b/UKSF.Api.Modpack/Models/ModpackBuild.cs index 6f060d69..e8d34953 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuild.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuild.cs @@ -6,19 +6,19 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Modpack.Models { - public record ModpackBuild : MongoObject { - [BsonRepresentation(BsonType.ObjectId)] public string BuilderId { get; set; } - public int BuildNumber { get; set; } - public ModpackBuildResult BuildResult { get; set; } = ModpackBuildResult.NONE; - public GithubCommit Commit { get; set; } - public DateTime EndTime { get; set; } = DateTime.Now; - public GameEnvironment Environment { get; set; } - public Dictionary EnvironmentVariables { get; set; } = new(); - public bool Finished { get; set; } - public bool IsRebuild { get; set; } - public bool Running { get; set; } - public DateTime StartTime { get; set; } = DateTime.Now; - public List Steps { get; set; } = new(); - public string Version { get; set; } + public class ModpackBuild : MongoObject { + [BsonRepresentation(BsonType.ObjectId)] public string BuilderId; + public int BuildNumber; + public ModpackBuildResult BuildResult = ModpackBuildResult.NONE; + public GithubCommit Commit; + public DateTime EndTime = DateTime.Now; + public GameEnvironment Environment; + public Dictionary EnvironmentVariables = new(); + public bool Finished; + public bool IsRebuild; + public bool Running; + public DateTime StartTime = DateTime.Now; + public List Steps = new(); + public string Version; } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs b/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs index ec31e402..aae49b0c 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs @@ -1,6 +1,6 @@ namespace UKSF.Api.Modpack.Models { public class ModpackBuildQueueItem { - public ModpackBuild Build { get; set; } - public string Id { get; set; } + public ModpackBuild Build; + public string Id; } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildStep.cs b/UKSF.Api.Modpack/Models/ModpackBuildStep.cs index 777e2b14..b29788bd 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildStep.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildStep.cs @@ -4,14 +4,14 @@ namespace UKSF.Api.Modpack.Models { public class ModpackBuildStep { - public ModpackBuildResult BuildResult { get; set; } = ModpackBuildResult.NONE; - public DateTime EndTime { get; set; } = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); - public bool Finished { get; set; } - public int Index { get; set; } - public List Logs { get; set; } = new(); - public string Name { get; set; } - public bool Running { get; set; } - public DateTime StartTime { get; set; } = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); + public ModpackBuildResult BuildResult = ModpackBuildResult.NONE; + public DateTime EndTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); + public bool Finished; + public int Index; + public List Logs = new(); + public string Name; + public bool Running; + public DateTime StartTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); public ModpackBuildStep(string name) => Name = name; } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildStepEventData.cs b/UKSF.Api.Modpack/Models/ModpackBuildStepEventData.cs index 481b6f82..5447be67 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildStepEventData.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildStepEventData.cs @@ -5,7 +5,7 @@ public ModpackBuildStepEventData(string buildId, ModpackBuildStep buildStep) { BuildStep = buildStep; } - public string BuildId { get; } - public ModpackBuildStep BuildStep { get; } + public string BuildId; + public ModpackBuildStep BuildStep; } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs b/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs index d60fe8e5..26794b31 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs @@ -2,12 +2,12 @@ namespace UKSF.Api.Modpack.Models { public class ModpackBuildStepLogItem { - public string Colour { get; set; } - public string Text { get; set; } + public string Colour; + public string Text; } public class ModpackBuildStepLogItemUpdate { - public bool Inline { get; set; } - public List Logs { get; set; } + public bool Inline; + public List Logs; } } diff --git a/UKSF.Api.Modpack/Models/ModpackRelease.cs b/UKSF.Api.Modpack/Models/ModpackRelease.cs index a4a58a3d..74063012 100644 --- a/UKSF.Api.Modpack/Models/ModpackRelease.cs +++ b/UKSF.Api.Modpack/Models/ModpackRelease.cs @@ -4,12 +4,12 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Modpack.Models { - public record ModpackRelease : MongoObject { - public string Changelog { get; set; } - [BsonRepresentation(BsonType.ObjectId)] public string CreatorId { get; set; } - public string Description { get; set; } - public bool IsDraft { get; set; } - public DateTime Timestamp { get; set; } - public string Version { get; set; } + public class ModpackRelease : MongoObject { + public string Changelog; + [BsonRepresentation(BsonType.ObjectId)] public string CreatorId; + public string Description; + public bool IsDraft; + public DateTime Timestamp; + public string Version; } } diff --git a/UKSF.Api.Modpack/Models/NewBuild.cs b/UKSF.Api.Modpack/Models/NewBuild.cs index 426852a3..bc1e96f6 100644 --- a/UKSF.Api.Modpack/Models/NewBuild.cs +++ b/UKSF.Api.Modpack/Models/NewBuild.cs @@ -1,8 +1,8 @@ namespace UKSF.Api.Modpack.Models { public class NewBuild { - public bool Ace { get; set; } - public bool Acre { get; set; } - public bool F35 { get; set; } - public string Reference { get; set; } + public bool Ace; + public bool Acre; + public bool F35; + public string Reference; } } diff --git a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs index f9aa2b83..7b3b0e7e 100644 --- a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs +++ b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs @@ -2,15 +2,12 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.EventHandlers; using UKSF.Api.Personnel.Mappers; -using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.ScheduledActions; using UKSF.Api.Personnel.Services; using UKSF.Api.Personnel.Signalr.Hubs; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel { public static class ApiPersonnelExtensions { @@ -35,6 +32,7 @@ private static IServiceCollection AddContexts(this IServiceCollection services) private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton() .AddSingleton() + .AddSingleton() .AddSingleton(); private static IServiceCollection AddServices(this IServiceCollection services) => diff --git a/UKSF.Api.Personnel/Context/AccountContext.cs b/UKSF.Api.Personnel/Context/AccountContext.cs index 522af31e..53eada06 100644 --- a/UKSF.Api.Personnel/Context/AccountContext.cs +++ b/UKSF.Api.Personnel/Context/AccountContext.cs @@ -2,7 +2,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Context { public interface IAccountContext : IMongoContext, ICachedMongoContext { } diff --git a/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs b/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs index 429ff5b3..ed6d06d3 100644 --- a/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs +++ b/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs @@ -2,7 +2,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Context { public interface IConfirmationCodeContext : IMongoContext { } diff --git a/UKSF.Api.Personnel/Context/NotificationsContext.cs b/UKSF.Api.Personnel/Context/NotificationsContext.cs index 80b8d669..bfeebac5 100644 --- a/UKSF.Api.Personnel/Context/NotificationsContext.cs +++ b/UKSF.Api.Personnel/Context/NotificationsContext.cs @@ -2,7 +2,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Context { public interface INotificationsContext : IMongoContext, ICachedMongoContext { } diff --git a/UKSF.Api.Personnel/Context/RanksContext.cs b/UKSF.Api.Personnel/Context/RanksContext.cs index fd1cca3a..845bac9f 100644 --- a/UKSF.Api.Personnel/Context/RanksContext.cs +++ b/UKSF.Api.Personnel/Context/RanksContext.cs @@ -4,7 +4,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Context { public interface IRanksContext : IMongoContext, ICachedMongoContext { diff --git a/UKSF.Api.Personnel/Context/RolesContext.cs b/UKSF.Api.Personnel/Context/RolesContext.cs index 69fa987f..5af52281 100644 --- a/UKSF.Api.Personnel/Context/RolesContext.cs +++ b/UKSF.Api.Personnel/Context/RolesContext.cs @@ -4,7 +4,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Context { public interface IRolesContext : IMongoContext, ICachedMongoContext { diff --git a/UKSF.Api.Personnel/Context/UnitsContext.cs b/UKSF.Api.Personnel/Context/UnitsContext.cs index 5cec8210..5e6f7a06 100644 --- a/UKSF.Api.Personnel/Context/UnitsContext.cs +++ b/UKSF.Api.Personnel/Context/UnitsContext.cs @@ -4,7 +4,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; namespace UKSF.Api.Personnel.Context { public interface IUnitsContext : IMongoContext, ICachedMongoContext { } diff --git a/UKSF.Api.Personnel/Controllers/AccountsController.cs b/UKSF.Api.Personnel/Controllers/AccountsController.cs index eee5fdc0..fe4667fa 100644 --- a/UKSF.Api.Personnel/Controllers/AccountsController.cs +++ b/UKSF.Api.Personnel/Controllers/AccountsController.cs @@ -105,7 +105,7 @@ public async Task ApplyConfirmationCode([FromBody] JObject body) string value = await _confirmationCodeService.GetConfirmationCode(code); if (value == email) { - await _accountContext.Update(account.Id, "membershipState", MembershipState.CONFIRMED); + await _accountContext.Update(account.Id, x => x.MembershipState, MembershipState.CONFIRMED); _logger.LogAudit($"Email address confirmed for {account.Id}"); return Ok(); } @@ -182,7 +182,7 @@ await _accountContext.Update( [HttpPut("password"), Authorize] public async Task ChangePassword([FromBody] JObject changePasswordRequest) { string contextId = _httpContextService.GetUserId(); - await _accountContext.Update(contextId, "password", BCrypt.Net.BCrypt.HashPassword(changePasswordRequest["password"].ToString())); + await _accountContext.Update(contextId, x => x.Password, BCrypt.Net.BCrypt.HashPassword(changePasswordRequest["password"].ToString())); _logger.LogAudit($"Password changed for {contextId}"); return Ok(); } diff --git a/UKSF.Api.Personnel/Controllers/CommentThreadController.cs b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs index 954d50be..65741a7f 100644 --- a/UKSF.Api.Personnel/Controllers/CommentThreadController.cs +++ b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs @@ -55,7 +55,7 @@ public IActionResult Get(string id) { comment => new { Id = comment.Id.ToString(), Author = comment.Author.ToString(), - DisplayName = _displayNameService.GetDisplayName(_accountContext.GetSingle(comment.Author)), + DisplayName = _displayNameService.GetDisplayName(comment.Author), comment.Content, comment.Timestamp } @@ -89,7 +89,8 @@ public async Task AddComment(string commentThreadId, [FromBody] C CommentThread thread = _commentThreadContext.GetSingle(commentThreadId); IEnumerable participants = _commentThreadService.GetCommentThreadParticipants(thread.Id); foreach (string objectId in participants.Where(x => x != comment.Author)) { - _notificationsService.Add( // TODO: Set correct link when comment thread is between /application and /recruitment/id + // TODO: Set correct link when comment thread is between /application and /recruitment/id + _notificationsService.Add( new Notification { Owner = objectId, Icon = NotificationIcons.COMMENT, diff --git a/UKSF.Api.Personnel/Controllers/RanksController.cs b/UKSF.Api.Personnel/Controllers/RanksController.cs index 17e08381..ada1b48a 100644 --- a/UKSF.Api.Personnel/Controllers/RanksController.cs +++ b/UKSF.Api.Personnel/Controllers/RanksController.cs @@ -68,8 +68,8 @@ await _ranksContext.Update( Builders.Update.Set(x => x.Name, rank.Name).Set(x => x.Abbreviation, rank.Abbreviation).Set(x => x.TeamspeakGroup, rank.TeamspeakGroup).Set(x => x.DiscordRoleId, rank.DiscordRoleId) ); foreach (Account account in _accountContext.Get(x => x.Rank == oldRank.Name)) { - // TODO: Notify user to update name in TS if rank abbreviate changed - await _accountContext.Update(account.Id, x => x.Rank, rank.Name); + Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, rankString: rank.Name, reason: $"the '{rank.Name}' rank was updated"); + _notificationsService.Add(notification); } return Ok(_ranksContext.Get()); diff --git a/UKSF.Api.Personnel/Controllers/RecruitmentController.cs b/UKSF.Api.Personnel/Controllers/RecruitmentController.cs index 5e2bcd61..a15a7886 100644 --- a/UKSF.Api.Personnel/Controllers/RecruitmentController.cs +++ b/UKSF.Api.Personnel/Controllers/RecruitmentController.cs @@ -107,8 +107,9 @@ public async Task UpdateState([FromBody] dynamic body, string id) AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, "", - $"Unfortunately you have not been accepted into our unit, however we thank you for your interest and hope you find a suitable alternative. You can view any comments on your application here: [url]https://uk-sf.co.uk/recruitment/{id}[/url]" + "Unfortunately you have not been accepted into our unit, however we thank you for your interest and hope you find a suitable alternative." ); + notification.Link = "/application"; _notificationsService.Add(notification); break; } @@ -197,6 +198,6 @@ public async Task> Ratings([FromBody] KeyValuePair Ok(_recruitmentService.GetActiveRecruiters()); + public IEnumerable GetRecruiters() => _recruitmentService.GetActiveRecruiters(); } } diff --git a/UKSF.Api.Personnel/Controllers/RolesController.cs b/UKSF.Api.Personnel/Controllers/RolesController.cs index 9e2c779b..92db76e9 100644 --- a/UKSF.Api.Personnel/Controllers/RolesController.cs +++ b/UKSF.Api.Personnel/Controllers/RolesController.cs @@ -77,9 +77,9 @@ public async Task AddRole([FromBody] Role role) { public async Task EditRole([FromBody] Role role) { Role oldRole = _rolesContext.GetSingle(x => x.Id == role.Id); _logger.LogAudit($"Role updated from '{oldRole.Name}' to '{role.Name}'"); - await _rolesContext.Update(role.Id, "name", role.Name); + await _rolesContext.Update(role.Id, x => x.Name, role.Name); foreach (Account account in _accountContext.Get(x => x.RoleAssignment == oldRole.Name)) { - await _accountContext.Update(account.Id, "roleAssignment", role.Name); + await _accountContext.Update(account.Id, x => x.RoleAssignment, role.Name); } await _unitsService.RenameRole(oldRole.Name, role.Name); @@ -105,7 +105,7 @@ public async Task UpdateOrder([FromBody] List newRoleOrder) for (int index = 0; index < newRoleOrder.Count; index++) { Role role = newRoleOrder[index]; if (_rolesContext.GetSingle(role.Name).Order != index) { - await _rolesContext.Update(role.Id, "order", index); + await _rolesContext.Update(role.Id, x => x.Order, index); } } diff --git a/UKSF.Api.Personnel/Controllers/SteamCodeController.cs b/UKSF.Api.Personnel/Controllers/SteamCodeController.cs index 2f5d656b..4924b08d 100644 --- a/UKSF.Api.Personnel/Controllers/SteamCodeController.cs +++ b/UKSF.Api.Personnel/Controllers/SteamCodeController.cs @@ -31,7 +31,7 @@ public async Task SteamConnect(string steamId, [FromBody] JObject } string id = _httpContextService.GetUserId(); - await _accountContext.Update(id, "steamname", steamId); + await _accountContext.Update(id, x => x.Steamname, steamId); Account account = _accountContext.GetSingle(id); _logger.LogAudit($"SteamID updated for {account.Id} to {steamId}"); return Ok(); diff --git a/UKSF.Api.Personnel/Controllers/UnitsController.cs b/UKSF.Api.Personnel/Controllers/UnitsController.cs index 1f912d09..697fae92 100644 --- a/UKSF.Api.Personnel/Controllers/UnitsController.cs +++ b/UKSF.Api.Personnel/Controllers/UnitsController.cs @@ -130,7 +130,7 @@ public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit = _unitsContext.GetSingle(unit.Id); if (unit.Name != oldUnit.Name) { foreach (Account account in _accountContext.Get(x => x.UnitAssignment == oldUnit.Name)) { - await _accountContext.Update(account.Id, "unitAssignment", unit.Name); + await _accountContext.Update(account.Id, x => x.UnitAssignment, unit.Name); _eventBus.Send(account); } } @@ -169,16 +169,16 @@ public async Task UpdateParent([FromRoute] string id, [FromBody] Unit parentUnit = _unitsContext.GetSingle(unitUpdate.ParentId); if (unit.Parent == parentUnit.Id) return Ok(); - await _unitsContext.Update(id, "parent", parentUnit.Id); + await _unitsContext.Update(id, x => x.Parent, parentUnit.Id); if (unit.Branch != parentUnit.Branch) { - await _unitsContext.Update(id, "branch", parentUnit.Branch); + await _unitsContext.Update(id, x => x.Branch, parentUnit.Branch); } List parentChildren = _unitsContext.Get(x => x.Parent == parentUnit.Id).ToList(); parentChildren.Remove(parentChildren.FirstOrDefault(x => x.Id == unit.Id)); parentChildren.Insert(unitUpdate.Index, unit); foreach (Unit child in parentChildren) { - await _unitsContext.Update(child.Id, "order", parentChildren.IndexOf(child)); + await _unitsContext.Update(child.Id, x => x.Order, parentChildren.IndexOf(child)); } unit = _unitsContext.GetSingle(unit.Id); @@ -199,7 +199,7 @@ public IActionResult UpdateSortOrder([FromRoute] string id, [FromBody] RequestUn parentChildren.Remove(parentChildren.FirstOrDefault(x => x.Id == unit.Id)); parentChildren.Insert(unitUpdate.Index, unit); foreach (Unit child in parentChildren) { - _unitsContext.Update(child.Id, "order", parentChildren.IndexOf(child)); + _unitsContext.Update(child.Id, x => x.Order, parentChildren.IndexOf(child)); } return Ok(); diff --git a/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs new file mode 100644 index 00000000..0cf39b76 --- /dev/null +++ b/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs @@ -0,0 +1,54 @@ +using System.Threading.Tasks; +using MongoDB.Bson; +using UKSF.Api.Base.Events; +using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Models; + +namespace UKSF.Api.Personnel.EventHandlers { + public interface IDiscordEventhandler : IEventHandler { } + + public class DiscordEventhandler : IDiscordEventhandler { + private readonly IAccountContext _accountContext; + private readonly ICommentThreadService _commentThreadService; + private readonly IDisplayNameService _displayNameService; + private readonly IEventBus _eventBus; + private readonly ILogger _logger; + + public DiscordEventhandler(IEventBus eventBus, ICommentThreadService commentThreadService, IAccountContext accountContext, IDisplayNameService displayNameService, ILogger logger) { + _eventBus = eventBus; + _commentThreadService = commentThreadService; + _accountContext = accountContext; + _displayNameService = displayNameService; + _logger = logger; + } + + public void Init() { + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, _logger.LogError); + } + + private async Task HandleEvent(EventModel eventModel, DiscordEventData discordEventData) { + switch (discordEventData.EventType) { + case DiscordUserEventType.JOINED: break; + case DiscordUserEventType.LEFT: + await LeftEvent(discordEventData.EventData); + break; + case DiscordUserEventType.BANNED: break; + case DiscordUserEventType.UNBANNED: break; + case DiscordUserEventType.MESSAGE_DELETED: break; + } + } + + private async Task LeftEvent(string accountId) { + Account account = _accountContext.GetSingle(accountId); + // if (account.MembershipState == MembershipState.CONFIRMED) { + string name = _displayNameService.GetDisplayName(account); + await _commentThreadService.InsertComment(account.Application.RecruiterCommentThread, new Comment { Author = ObjectId.Empty.ToString(), Content = $"{name} left the Discord" }); + // } + } + } +} diff --git a/UKSF.Api.Shared/Extensions/DateExtensions.cs b/UKSF.Api.Personnel/Extensions/ApplicationExtensions.cs similarity index 56% rename from UKSF.Api.Shared/Extensions/DateExtensions.cs rename to UKSF.Api.Personnel/Extensions/ApplicationExtensions.cs index f92dc025..69f72041 100644 --- a/UKSF.Api.Shared/Extensions/DateExtensions.cs +++ b/UKSF.Api.Personnel/Extensions/ApplicationExtensions.cs @@ -1,8 +1,9 @@ using System; +using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Shared.Extensions { - public static class DateExtensions { - public static (int years, int months) ToAge(this DateTime dob, DateTime? date = null) { +namespace UKSF.Api.Personnel.Extensions { + public static class ApplicationExtensions { + public static ApplicationAge ToAge(this DateTime dob, DateTime? date = null) { DateTime today = date ?? DateTime.Today; int months = today.Month - dob.Month; int years = today.Year - dob.Year; @@ -16,7 +17,7 @@ public static (int years, int months) ToAge(this DateTime dob, DateTime? date = months += 12; } - return (years, months); + return new ApplicationAge { Years = years, Months = months }; } } } diff --git a/UKSF.Api.Personnel/Models/Account.cs b/UKSF.Api.Personnel/Models/Account.cs index 92d8acd7..5b8424f7 100644 --- a/UKSF.Api.Personnel/Models/Account.cs +++ b/UKSF.Api.Personnel/Models/Account.cs @@ -3,41 +3,41 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Personnel.Models { - public record Account : MongoObject { - public AccountSettings Settings { get; } = new(); - public MembershipState MembershipState { get; set; } = MembershipState.UNCONFIRMED; - public List RolePreferences { get; set; } = new(); - public List ServiceRecord { get; set; } = new(); - public bool Admin { get; set; } - public Application Application { get; set; } - public string ArmaExperience { get; set; } - public string Background { get; set; } - public string DiscordId { get; set; } - public DateTime Dob { get; set; } - public string Email { get; set; } - public string Firstname { get; set; } - public string Lastname { get; set; } - public bool MilitaryExperience { get; set; } - public string Nation { get; set; } - public string Password { get; set; } - public string Rank { get; set; } - public string Reference { get; set; } - public string RoleAssignment { get; set; } - public string Steamname { get; set; } - public HashSet TeamspeakIdentities { get; set; } - public string UnitAssignment { get; set; } - public string UnitsExperience { get; set; } + public class Account : MongoObject { + public AccountSettings Settings = new(); + public MembershipState MembershipState = MembershipState.UNCONFIRMED; + public List RolePreferences = new(); + public List ServiceRecord = new(); + public bool Admin; + public Application Application; + public string ArmaExperience; + public string Background; + public string DiscordId; + public DateTime Dob; + public string Email; + public string Firstname; + public string Lastname; + public bool MilitaryExperience; + public string Nation; + public string Password; + public string Rank; + public string Reference; + public string RoleAssignment; + public string Steamname; + public HashSet TeamspeakIdentities; + public string UnitAssignment; + public string UnitsExperience; } - public record RosterAccount : MongoObject { - public string Name { get; set; } - public string Nation { get; set; } - public string Rank { get; set; } - public string RoleAssignment { get; set; } - public string UnitAssignment { get; set; } + public class RosterAccount : MongoObject { + public string Name; + public string Nation; + public string Rank; + public string RoleAssignment; + public string UnitAssignment; } - public record PublicAccount : Account { - public string DisplayName { get; set; } + public class PublicAccount : Account { + public string DisplayName; } } diff --git a/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs b/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs index 57dbb9da..e92317e4 100644 --- a/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs +++ b/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs @@ -3,12 +3,12 @@ namespace UKSF.Api.Personnel.Models { public class AccountAttendanceStatus { - [BsonRepresentation(BsonType.ObjectId)] public string AccountId { get; set; } - public float AttendancePercent { get; set; } - public AttendanceState AttendanceState { get; set; } - public string DisplayName { get; set; } - [BsonRepresentation(BsonType.ObjectId)] public string GroupId { get; set; } - public string GroupName { get; set; } + [BsonRepresentation(BsonType.ObjectId)] public string AccountId; + public float AttendancePercent; + public AttendanceState AttendanceState; + public string DisplayName; + [BsonRepresentation(BsonType.ObjectId)] public string GroupId; + public string GroupName; } public enum AttendanceState { diff --git a/UKSF.Api.Personnel/Models/AccountSettings.cs b/UKSF.Api.Personnel/Models/AccountSettings.cs index 7e0601d4..43bc72ba 100644 --- a/UKSF.Api.Personnel/Models/AccountSettings.cs +++ b/UKSF.Api.Personnel/Models/AccountSettings.cs @@ -1,7 +1,7 @@ namespace UKSF.Api.Personnel.Models { public class AccountSettings { - public bool NotificationsEmail { get; set; } = true; - public bool NotificationsTeamspeak { get; set; } = true; - public bool Sr1Enabled { get; set; } = true; + public bool NotificationsEmail = true; + public bool NotificationsTeamspeak = true; + public bool Sr1Enabled = true; } } diff --git a/UKSF.Api.Personnel/Models/Application.cs b/UKSF.Api.Personnel/Models/Application.cs index dc7d7781..7b011535 100644 --- a/UKSF.Api.Personnel/Models/Application.cs +++ b/UKSF.Api.Personnel/Models/Application.cs @@ -11,12 +11,57 @@ public enum ApplicationState { } public class Application { - [BsonRepresentation(BsonType.ObjectId)] public string ApplicationCommentThread { get; set; } - public DateTime DateAccepted { get; set; } - public DateTime DateCreated { get; set; } - public Dictionary Ratings { get; set; } = new(); - [BsonRepresentation(BsonType.ObjectId)] public string Recruiter { get; set; } - [BsonRepresentation(BsonType.ObjectId)] public string RecruiterCommentThread { get; set; } - public ApplicationState State { get; set; } = ApplicationState.WAITING; + [BsonRepresentation(BsonType.ObjectId)] public string ApplicationCommentThread; + public DateTime DateAccepted; + public DateTime DateCreated; + public Dictionary Ratings = new(); + [BsonRepresentation(BsonType.ObjectId)] public string Recruiter; + [BsonRepresentation(BsonType.ObjectId)] public string RecruiterCommentThread; + public ApplicationState State = ApplicationState.WAITING; + } + + public class DetailedApplication { + public Account Account; + public string DisplayName; + public ApplicationAge Age; + public double DaysProcessing; + public double DaysProcessed; + public string NextCandidateOp; + public double AverageProcessingTime; + public string SteamProfile; + public string Recruiter; + public string RecruiterId; + } + + public class ApplicationAge { + public int Years; + public int Months; + } + + public class WaitingApplication { + public Account Account; + public string SteamProfile; + public double DaysProcessing; + public double ProcessingDifference; + public string Recruiter; + } + + public class CompletedApplication { + public Account Account; + public string DisplayName; + public double DaysProcessed; + public string Recruiter; + } + + public class ApplicationsOverview { + public List Waiting; + public List AllWaiting; + public List Complete; + public List Recruiters; + } + + public class Recruiter { + public string Id; + public string Name; } } diff --git a/UKSF.Api.Personnel/Models/AttendanceReport.cs b/UKSF.Api.Personnel/Models/AttendanceReport.cs index 81b9df4c..b6f73f62 100644 --- a/UKSF.Api.Personnel/Models/AttendanceReport.cs +++ b/UKSF.Api.Personnel/Models/AttendanceReport.cs @@ -1,5 +1,5 @@ namespace UKSF.Api.Personnel.Models { public class AttendanceReport { - public AccountAttendanceStatus[] Users { get; set; } + public AccountAttendanceStatus[] Users; } } diff --git a/UKSF.Api.Personnel/Models/Comment.cs b/UKSF.Api.Personnel/Models/Comment.cs index f58701b3..d8b83af6 100644 --- a/UKSF.Api.Personnel/Models/Comment.cs +++ b/UKSF.Api.Personnel/Models/Comment.cs @@ -4,9 +4,9 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Personnel.Models { - public record Comment : MongoObject { - [BsonRepresentation(BsonType.ObjectId)] public string Author { get; set; } - public string Content { get; set; } - public DateTime Timestamp { get; set; } + public class Comment : MongoObject { + [BsonRepresentation(BsonType.ObjectId)] public string Author; + public string Content; + public DateTime Timestamp; } } diff --git a/UKSF.Api.Personnel/Models/CommentThread.cs b/UKSF.Api.Personnel/Models/CommentThread.cs index d981b7bc..cda90e96 100644 --- a/UKSF.Api.Personnel/Models/CommentThread.cs +++ b/UKSF.Api.Personnel/Models/CommentThread.cs @@ -11,9 +11,9 @@ public enum ThreadMode { RANKSUPERIOROREQUAL } - public record CommentThread : MongoObject { - [BsonRepresentation(BsonType.ObjectId)] public string[] Authors { get; set; } - public Comment[] Comments { get; set; } = System.Array.Empty(); - public ThreadMode Mode { get; set; } + public class CommentThread : MongoObject { + [BsonRepresentation(BsonType.ObjectId)] public string[] Authors; + public Comment[] Comments = System.Array.Empty(); + public ThreadMode Mode; } } diff --git a/UKSF.Api.Personnel/Models/CommentThreadEventData.cs b/UKSF.Api.Personnel/Models/CommentThreadEventData.cs index c8d2f498..4d4ca3b7 100644 --- a/UKSF.Api.Personnel/Models/CommentThreadEventData.cs +++ b/UKSF.Api.Personnel/Models/CommentThreadEventData.cs @@ -5,7 +5,7 @@ public CommentThreadEventData(string commentThreadId, Comment comment) { Comment = comment; } - public string CommentThreadId { get; } - public Comment Comment { get; } + public string CommentThreadId; + public Comment Comment; } } diff --git a/UKSF.Api.Personnel/Models/ConfirmationCode.cs b/UKSF.Api.Personnel/Models/ConfirmationCode.cs index 5e9f4c1e..89da1d89 100644 --- a/UKSF.Api.Personnel/Models/ConfirmationCode.cs +++ b/UKSF.Api.Personnel/Models/ConfirmationCode.cs @@ -1,7 +1,7 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Personnel.Models { - public record ConfirmationCode : MongoObject { - public string Value { get; set; } + public class ConfirmationCode : MongoObject { + public string Value; } } diff --git a/UKSF.Api.Personnel/Models/Loa.cs b/UKSF.Api.Personnel/Models/Loa.cs index 829df18b..7c32f547 100644 --- a/UKSF.Api.Personnel/Models/Loa.cs +++ b/UKSF.Api.Personnel/Models/Loa.cs @@ -10,14 +10,14 @@ public enum LoaReviewState { REJECTED } - public record Loa : MongoObject { - public bool Emergency { get; set; } - public DateTime End { get; set; } - public bool Late { get; set; } - public string Reason { get; set; } - [BsonRepresentation(BsonType.ObjectId)] public string Recipient { get; set; } - public DateTime Start { get; set; } - public LoaReviewState State { get; set; } - public DateTime Submitted { get; set; } + public class Loa : MongoObject { + public bool Emergency; + public DateTime End; + public bool Late; + public string Reason; + [BsonRepresentation(BsonType.ObjectId)] public string Recipient; + public DateTime Start; + public LoaReviewState State; + public DateTime Submitted; } } diff --git a/UKSF.Api.Personnel/Models/Notification.cs b/UKSF.Api.Personnel/Models/Notification.cs index abb558fc..cd80965e 100644 --- a/UKSF.Api.Personnel/Models/Notification.cs +++ b/UKSF.Api.Personnel/Models/Notification.cs @@ -4,12 +4,12 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Personnel.Models { - public record Notification : MongoObject { - public string Icon { get; set; } - public string Link { get; set; } - public string Message { get; set; } - [BsonRepresentation(BsonType.ObjectId)] public string Owner { get; set; } - public bool Read { get; set; } - public DateTime Timestamp { get; set; } = DateTime.Now; + public class Notification : MongoObject { + public string Icon; + public string Link; + public string Message; + [BsonRepresentation(BsonType.ObjectId)] public string Owner; + public bool Read; + public DateTime Timestamp = DateTime.Now; } } diff --git a/UKSF.Api.Personnel/Models/Rank.cs b/UKSF.Api.Personnel/Models/Rank.cs index 8d61931d..905893c9 100644 --- a/UKSF.Api.Personnel/Models/Rank.cs +++ b/UKSF.Api.Personnel/Models/Rank.cs @@ -1,11 +1,11 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Personnel.Models { - public record Rank : MongoObject { - public string Abbreviation { get; set; } - public string DiscordRoleId { get; set; } - public string Name { get; set; } - public int Order { get; set; } - public string TeamspeakGroup { get; set; } + public class Rank : MongoObject { + public string Abbreviation; + public string DiscordRoleId; + public string Name; + public int Order; + public string TeamspeakGroup; } } diff --git a/UKSF.Api.Personnel/Models/Role.cs b/UKSF.Api.Personnel/Models/Role.cs index b57a7f15..1f1fa7f0 100644 --- a/UKSF.Api.Personnel/Models/Role.cs +++ b/UKSF.Api.Personnel/Models/Role.cs @@ -6,9 +6,9 @@ public enum RoleType { UNIT } - public record Role : MongoObject { - public string Name { get; set; } - public int Order { get; set; } = 0; - public RoleType RoleType { get; set; } = RoleType.INDIVIDUAL; + public class Role : MongoObject { + public string Name; + public int Order = 0; + public RoleType RoleType = RoleType.INDIVIDUAL; } } diff --git a/UKSF.Api.Personnel/Models/ServiceRecord.cs b/UKSF.Api.Personnel/Models/ServiceRecord.cs index beb5207b..5e337baa 100644 --- a/UKSF.Api.Personnel/Models/ServiceRecord.cs +++ b/UKSF.Api.Personnel/Models/ServiceRecord.cs @@ -1,25 +1,11 @@ using System; namespace UKSF.Api.Personnel.Models { - public class ServiceRecordEntry : IEquatable { - public string Notes { get; init; } - public string Occurence { get; init; } - public DateTime Timestamp { get; init; } - - public bool Equals(ServiceRecordEntry other) { - if (ReferenceEquals(null, other)) return false; - if (ReferenceEquals(this, other)) return true; - return Notes == other.Notes && Occurence == other.Occurence && Timestamp.Equals(other.Timestamp); - } + public class ServiceRecordEntry { + public string Notes; + public string Occurence; + public DateTime Timestamp; public override string ToString() => $"{Timestamp:dd/MM/yyyy}: {Occurence}{(string.IsNullOrEmpty(Notes) ? "" : $"({Notes})")}"; - - public override bool Equals(object obj) { - if (ReferenceEquals(null, obj)) return false; - if (ReferenceEquals(this, obj)) return true; - return obj.GetType() == GetType() && Equals((ServiceRecordEntry) obj); - } - - public override int GetHashCode() => HashCode.Combine(Notes, Occurence, Timestamp); } } diff --git a/UKSF.Api.Personnel/Models/Unit.cs b/UKSF.Api.Personnel/Models/Unit.cs index b5509a91..a8ce23c8 100644 --- a/UKSF.Api.Personnel/Models/Unit.cs +++ b/UKSF.Api.Personnel/Models/Unit.cs @@ -4,19 +4,19 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Personnel.Models { - public record Unit : MongoObject { - public UnitBranch Branch { get; set; } = UnitBranch.COMBAT; - public string Callsign { get; set; } - public string DiscordRoleId { get; set; } - public string Icon { get; set; } - [BsonRepresentation(BsonType.ObjectId)] public List Members { get; set; } = new(); - public string Name { get; set; } - public int Order { get; set; } - [BsonRepresentation(BsonType.ObjectId)] public string Parent { get; set; } - public bool PreferShortname { get; set; } - [BsonRepresentation(BsonType.ObjectId)] public Dictionary Roles { get; set; } = new(); - public string Shortname { get; set; } - public string TeamspeakGroup { get; set; } + public class Unit : MongoObject { + public UnitBranch Branch = UnitBranch.COMBAT; + public string Callsign; + public string DiscordRoleId; + public string Icon; + [BsonRepresentation(BsonType.ObjectId)] public List Members = new(); + public string Name; + public int Order; + [BsonRepresentation(BsonType.ObjectId)] public string Parent; + public bool PreferShortname; + [BsonRepresentation(BsonType.ObjectId)] public Dictionary Roles = new(); + public string Shortname; + public string TeamspeakGroup; public override string ToString() => $"{Name}, {Shortname}, {Callsign}, {Branch}, {TeamspeakGroup}, {DiscordRoleId}"; } @@ -27,43 +27,43 @@ public enum UnitBranch { } // TODO: Cleaner way of doing this? Inside controllers? - public record ResponseUnit : Unit { - public string Code { get; set; } - public string ParentName { get; set; } - public IEnumerable UnitMembers { get; set; } + public class ResponseUnit : Unit { + public string Code; + public string ParentName; + public IEnumerable UnitMembers; } public class ResponseUnitMember { - public string Name { get; set; } - public string Role { get; set; } - public string UnitRole { get; set; } + public string Name; + public string Role; + public string UnitRole; } public class ResponseUnitTree { - public IEnumerable Children { get; set; } - public string Id { get; set; } - public string Name { get; set; } + public IEnumerable Children; + public string Id; + public string Name; } public class ResponseUnitTreeDataSet { - public IEnumerable AuxiliaryNodes { get; set; } - public IEnumerable CombatNodes { get; set; } + public IEnumerable AuxiliaryNodes; + public IEnumerable CombatNodes; } public class ResponseUnitChartNode { - public IEnumerable Children { get; set; } - public string Id { get; set; } - public IEnumerable Members { get; set; } - public string Name { get; set; } - public bool PreferShortname { get; set; } + public IEnumerable Children; + public string Id; + public IEnumerable Members; + public string Name; + public bool PreferShortname; } public class RequestUnitUpdateParent { - public int Index { get; set; } - public string ParentId { get; set; } + public int Index; + public string ParentId; } public class RequestUnitUpdateOrder { - public int Index { get; set; } + public int Index; } } diff --git a/UKSF.Api.Personnel/Services/AssignmentService.cs b/UKSF.Api.Personnel/Services/AssignmentService.cs index 839ae18a..4144860e 100644 --- a/UKSF.Api.Personnel/Services/AssignmentService.cs +++ b/UKSF.Api.Personnel/Services/AssignmentService.cs @@ -134,7 +134,7 @@ private async Task> UpdateUnit(string id, string unitString, S if (unit != null) { if (unit.Branch == UnitBranch.COMBAT) { await _unitsService.RemoveMember(id, _accountContext.GetSingle(id).UnitAssignment); - await _accountContext.Update(id, "unitAssignment", unit.Name); + await _accountContext.Update(id, x => x.UnitAssignment, unit.Name); } await _unitsService.AddMember(id, unit.Id); @@ -145,7 +145,7 @@ private async Task> UpdateUnit(string id, string unitString, S if (string.IsNullOrEmpty(currentUnit)) return new Tuple(false, false); unit = _unitsContext.GetSingle(x => x.Name == currentUnit); await _unitsService.RemoveMember(id, currentUnit); - await _accountContext.Update(id, "unitAssignment", null); + await _accountContext.Update(id, x => x.UnitAssignment, null); notificationMessage.Append($"You have been removed from {_unitsService.GetChainString(unit)}"); unitUpdate = true; positive = false; @@ -158,12 +158,12 @@ private async Task> UpdateRole(string id, string role, bool un bool roleUpdate = false; bool positive = true; if (!string.IsNullOrEmpty(role) && role != REMOVE_FLAG) { - await _accountContext.Update(id, "roleAssignment", role); + await _accountContext.Update(id, x => x.RoleAssignment, role); notificationMessage.Append($"{(unitUpdate ? $" as {AvsAn.Query(role).Article} {role}" : $"You have been assigned as {AvsAn.Query(role).Article} {role}")}"); roleUpdate = true; } else if (role == REMOVE_FLAG) { string currentRole = _accountContext.GetSingle(id).RoleAssignment; - await _accountContext.Update(id, "roleAssignment", null); + await _accountContext.Update(id, x => x.RoleAssignment, null); notificationMessage.Append( string.IsNullOrEmpty(currentRole) ? $"{(unitUpdate ? " and unassigned from your role" : "You have been unassigned from your role")}" @@ -183,14 +183,14 @@ private async Task> UpdateRank(string id, string rank, bool un string currentRank = _accountContext.GetSingle(id).Rank; if (!string.IsNullOrEmpty(rank) && rank != REMOVE_FLAG) { if (currentRank == rank) return new Tuple(false, true); - await _accountContext.Update(id, "rank", rank); + await _accountContext.Update(id, x => x.Rank, rank); bool promotion = string.IsNullOrEmpty(currentRank) || _ranksService.IsSuperior(rank, currentRank); notificationMessage.Append( $"{(unitUpdate || roleUpdate ? $" and {(promotion ? "promoted" : "demoted")} to {rank}" : $"You have been {(promotion ? "promoted" : "demoted")} to {rank}")}" ); rankUpdate = true; } else if (rank == REMOVE_FLAG) { - await _accountContext.Update(id, "rank", null); + await _accountContext.Update(id, x => x.Rank, null); notificationMessage.Append($"{(unitUpdate || roleUpdate ? $" and demoted from {currentRank}" : $"You have been demoted from {currentRank}")}"); rankUpdate = true; positive = false; diff --git a/UKSF.Api.Personnel/Services/CommentThreadService.cs b/UKSF.Api.Personnel/Services/CommentThreadService.cs index a58c8c31..a8a9832e 100644 --- a/UKSF.Api.Personnel/Services/CommentThreadService.cs +++ b/UKSF.Api.Personnel/Services/CommentThreadService.cs @@ -1,10 +1,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Shared.Models; namespace UKSF.Api.Personnel.Services { public interface ICommentThreadService { diff --git a/UKSF.Api.Personnel/Services/NotificationsService.cs b/UKSF.Api.Personnel/Services/NotificationsService.cs index 182ca32b..865d775b 100644 --- a/UKSF.Api.Personnel/Services/NotificationsService.cs +++ b/UKSF.Api.Personnel/Services/NotificationsService.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; +using UKSF.Api.Admin.Services; using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; @@ -29,6 +30,7 @@ public class NotificationsService : INotificationsService { private readonly IHubContext _notificationsHub; private readonly IObjectIdConversionService _objectIdConversionService; private readonly IEventBus _eventBus; + private readonly IVariablesService _variablesService; public NotificationsService( IAccountContext accountContext, @@ -37,7 +39,8 @@ public NotificationsService( IHubContext notificationsHub, IHttpContextService httpContextService, IObjectIdConversionService objectIdConversionService, - IEventBus eventBus + IEventBus eventBus, + IVariablesService variablesService ) { _accountContext = accountContext; _notificationsContext = notificationsContext; @@ -46,9 +49,12 @@ IEventBus eventBus _httpContextService = httpContextService; _objectIdConversionService = objectIdConversionService; _eventBus = eventBus; + _variablesService = variablesService; } public void SendTeamspeakNotification(Account account, string rawMessage) { + if (NotificationsDisabled()) return; + if (account.TeamspeakIdentities == null) return; if (account.TeamspeakIdentities.Count == 0) return; @@ -56,6 +62,8 @@ public void SendTeamspeakNotification(Account account, string rawMessage) { } public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { + if (NotificationsDisabled()) return; + rawMessage = rawMessage.Replace("", "[/url]"); _eventBus.Send(new TeamspeakMessageEventData(clientDbIds, rawMessage)); } @@ -85,8 +93,12 @@ public async Task Delete(List ids) { private async Task AddNotificationAsync(Notification notification) { notification.Message = _objectIdConversionService.ConvertObjectIds(notification.Message); - await _notificationsContext.Add(notification); Account account = _accountContext.GetSingle(notification.Owner); + if (account.MembershipState == MembershipState.DISCHARGED) { + return; + } + + await _notificationsContext.Add(notification); if (account.Settings.NotificationsEmail) { SendEmailNotification( account.Email, @@ -100,8 +112,12 @@ private async Task AddNotificationAsync(Notification notification) { } private void SendEmailNotification(string email, string message) { + if (NotificationsDisabled()) return; + message += "

You can opt-out of these emails by unchecking 'Email notifications' in your Profile"; _emailService.SendEmail(email, "UKSF Notification", message); } + + private bool NotificationsDisabled() => !_variablesService.GetFeatureState("NOTIFICATIONS"); } } diff --git a/UKSF.Api.Personnel/Services/RecruitmentService.cs b/UKSF.Api.Personnel/Services/RecruitmentService.cs index 8ce62e0d..acbb2fc9 100644 --- a/UKSF.Api.Personnel/Services/RecruitmentService.cs +++ b/UKSF.Api.Personnel/Services/RecruitmentService.cs @@ -7,15 +7,16 @@ using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Extensions; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Services { public interface IRecruitmentService { - object GetAllApplications(); - JObject GetApplication(Account account); - object GetActiveRecruiters(); + ApplicationsOverview GetAllApplications(); + DetailedApplication GetApplication(Account account); + IEnumerable GetActiveRecruiters(); IEnumerable GetRecruiters(bool skipSort = false); Dictionary GetRecruiterLeads(); object GetStats(string account, bool monthly); @@ -60,11 +61,12 @@ public IEnumerable GetRecruiters(bool skipSort = false) { return accounts.OrderBy(x => x.Rank, new RankComparer(_ranksService)).ThenBy(x => x.Lastname); } - public object GetAllApplications() { - JArray waiting = new(); - JArray allWaiting = new(); - JArray complete = new(); - JArray recruiters = new(); + public ApplicationsOverview GetAllApplications() { + List waiting = new(); + List allWaiting = new(); + List complete = new(); + List recruiters = GetRecruiters(true).Select(account => _displayNameService.GetDisplayName(account)).ToList(); + string me = _httpContextService.GetUserId(); IEnumerable accounts = _accountContext.Get(x => x.Application != null); foreach (Account account in accounts) { @@ -79,35 +81,28 @@ public object GetAllApplications() { } } - foreach (Account account in GetRecruiters(true)) { - recruiters.Add(_displayNameService.GetDisplayName(account)); - } - - return new { waiting, allWaiting, complete, recruiters }; + return new ApplicationsOverview { Waiting = waiting, AllWaiting = allWaiting, Complete = complete, Recruiters = recruiters }; } - // TODO: Make sure frontend calls get online user details for ts and discord - public JObject GetApplication(Account account) { + public DetailedApplication GetApplication(Account account) { Account recruiterAccount = _accountContext.GetSingle(account.Application.Recruiter); - (int years, int months) = account.Dob.ToAge(); - return JObject.FromObject( - new { - account, - displayName = _displayNameService.GetDisplayName(account), - age = new { years, months }, - daysProcessing = Math.Ceiling((DateTime.Now - account.Application.DateCreated).TotalDays), - daysProcessed = Math.Ceiling((account.Application.DateAccepted - account.Application.DateCreated).TotalDays), - nextCandidateOp = GetNextCandidateOp(), - averageProcessingTime = GetAverageProcessingTime(), - steamprofile = "http://steamcommunity.com/profiles/" + account.Steamname, - recruiter = _displayNameService.GetDisplayName(recruiterAccount), - recruiterId = recruiterAccount.Id - } - ); + ApplicationAge age = account.Dob.ToAge(); + return new DetailedApplication { + Account = account, + DisplayName = _displayNameService.GetDisplayName(account), + Age = age, + DaysProcessing = Math.Ceiling((DateTime.Now - account.Application.DateCreated).TotalDays), + DaysProcessed = Math.Ceiling((account.Application.DateAccepted - account.Application.DateCreated).TotalDays), + NextCandidateOp = GetNextCandidateOp(), + AverageProcessingTime = GetAverageProcessingTime(), + SteamProfile = "http://steamcommunity.com/profiles/" + account.Steamname, + Recruiter = _displayNameService.GetDisplayName(recruiterAccount), + RecruiterId = recruiterAccount.Id + }; } - public object GetActiveRecruiters() => - GetRecruiters().Where(x => x.Settings.Sr1Enabled).Select(x => JObject.FromObject(new { value = x.Id, viewValue = _displayNameService.GetDisplayName(x) })); + public IEnumerable GetActiveRecruiters() => + GetRecruiters().Where(x => x.Settings.Sr1Enabled).Select(x => new Recruiter { Id = x.Id, Name = _displayNameService.GetDisplayName(x) }); public bool IsRecruiterLead(Account account = null) => account != null ? GetRecruiterUnit().Roles.ContainsValue(account.Id) : GetRecruiterUnit().Roles.ContainsValue(_httpContextService.GetUserId()); @@ -159,30 +154,25 @@ private Unit GetRecruiterUnit() { return _unitsContext.GetSingle(id); } - private JObject GetCompletedApplication(Account account) => - JObject.FromObject( - new { - account, - displayName = _displayNameService.GetDisplayNameWithoutRank(account), - daysProcessed = Math.Ceiling((account.Application.DateAccepted - account.Application.DateCreated).TotalDays), - recruiter = _displayNameService.GetDisplayName(account.Application.Recruiter) - } - ); + private CompletedApplication GetCompletedApplication(Account account) => + new() { + Account = account, + DisplayName = _displayNameService.GetDisplayNameWithoutRank(account), + DaysProcessed = Math.Ceiling((account.Application.DateAccepted - account.Application.DateCreated).TotalDays), + Recruiter = _displayNameService.GetDisplayName(account.Application.Recruiter) + }; - // TODO: Make sure frontend calls get online user details for ts and discord - private JObject GetWaitingApplication(Account account) { + private WaitingApplication GetWaitingApplication(Account account) { double averageProcessingTime = GetAverageProcessingTime(); double daysProcessing = Math.Ceiling((DateTime.Now - account.Application.DateCreated).TotalDays); double processingDifference = daysProcessing - averageProcessingTime; - return JObject.FromObject( - new { - account, - steamprofile = "http://steamcommunity.com/profiles/" + account.Steamname, - daysProcessing, - processingDifference, - recruiter = _displayNameService.GetDisplayName(account.Application.Recruiter) - } - ); + return new WaitingApplication { + Account = account, + SteamProfile = "http://steamcommunity.com/profiles/" + account.Steamname, + DaysProcessing = daysProcessing, + ProcessingDifference = processingDifference, + Recruiter = _displayNameService.GetDisplayName(account.Application.Recruiter) + }; } private static string GetNextCandidateOp() { diff --git a/UKSF.Api.Shared/ApiSharedExtensions.cs b/UKSF.Api.Shared/ApiSharedExtensions.cs index 7365c9ea..8a7545fe 100644 --- a/UKSF.Api.Shared/ApiSharedExtensions.cs +++ b/UKSF.Api.Shared/ApiSharedExtensions.cs @@ -1,9 +1,6 @@ using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.Base.Context; -using UKSF.Api.Base.Events; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; using UKSF.Api.Shared.Services; namespace UKSF.Api.Shared { diff --git a/UKSF.Api.Shared/Context/CachedMongoContext.cs b/UKSF.Api.Shared/Context/CachedMongoContext.cs index dbfed113..c3edb158 100644 --- a/UKSF.Api.Shared/Context/CachedMongoContext.cs +++ b/UKSF.Api.Shared/Context/CachedMongoContext.cs @@ -65,12 +65,6 @@ public override async Task Update(string id, Expression> fieldSe DataUpdateEvent(id); } - public override async Task Update(string id, string fieldName, object value) { - await base.Update(id, fieldName, value); - Refresh(); // TODO: intelligent refresh - DataUpdateEvent(id); - } - public override async Task Update(string id, UpdateDefinition update) { await base.Update(id, update); Refresh(); // TODO: intelligent refresh diff --git a/UKSF.Api.Shared/Context/LogContext.cs b/UKSF.Api.Shared/Context/LogContext.cs index 69ddb426..495a7791 100644 --- a/UKSF.Api.Shared/Context/LogContext.cs +++ b/UKSF.Api.Shared/Context/LogContext.cs @@ -1,6 +1,5 @@ using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; namespace UKSF.Api.Shared.Context { diff --git a/UKSF.Api.Shared/Context/MongoContext.cs b/UKSF.Api.Shared/Context/MongoContext.cs index dd688d01..d4b2daed 100644 --- a/UKSF.Api.Shared/Context/MongoContext.cs +++ b/UKSF.Api.Shared/Context/MongoContext.cs @@ -8,16 +8,17 @@ using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; using UKSF.Api.Shared.Models; +using SortDirection = UKSF.Api.Base.Models.SortDirection; namespace UKSF.Api.Shared.Context { - public interface IMongoContext { + public interface IMongoContext where T : MongoObject { IEnumerable Get(); IEnumerable Get(Func predicate); + PagedResult GetPaged(int page, int pageSize, SortDirection sortDirection, string sortField, IEnumerable>> filterPropertSelectors, string filter); T GetSingle(string id); T GetSingle(Func predicate); Task Add(T item); Task Update(string id, Expression> fieldSelector, object value); - Task Update(string id, string fieldName, object value); Task Update(string id, UpdateDefinition update); Task Update(Expression> filterExpression, UpdateDefinition update); Task UpdateMany(Expression> filterExpression, UpdateDefinition update); @@ -42,12 +43,6 @@ public override async Task Update(string id, Expression> fieldSe DataUpdateEvent(id); } - // TODO: Deprecate - public override async Task Update(string id, string fieldName, object value) { - await base.Update(id, fieldName, value); - DataUpdateEvent(id); - } - public override async Task Update(string id, UpdateDefinition update) { await base.Update(id, update); DataUpdateEvent(id); diff --git a/UKSF.Api.Shared/Context/SchedulerContext.cs b/UKSF.Api.Shared/Context/SchedulerContext.cs index 81dcea67..c4162722 100644 --- a/UKSF.Api.Shared/Context/SchedulerContext.cs +++ b/UKSF.Api.Shared/Context/SchedulerContext.cs @@ -1,6 +1,5 @@ using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; namespace UKSF.Api.Shared.Context { diff --git a/UKSF.Api.Shared/Events/Logger.cs b/UKSF.Api.Shared/Events/Logger.cs index 326111ad..4e2d948b 100644 --- a/UKSF.Api.Shared/Events/Logger.cs +++ b/UKSF.Api.Shared/Events/Logger.cs @@ -12,7 +12,7 @@ public interface ILogger { void LogHttpError(Exception exception); void LogHttpError(HttpErrorLog log); void LogAudit(string message, string userId = ""); - void LogDiscordEvent(DiscordUserEventType discordUserEventType, string name, string userId, string message); + void LogDiscordEvent(DiscordUserEventType discordUserEventType, string instigatorId, string instigatorName, string channelName, string name, string message); } public class Logger : ILogger { @@ -53,12 +53,12 @@ public void LogAudit(string message, string userId = "") { Log(new AuditLog(userId, message)); } - public void LogDiscordEvent(DiscordUserEventType discordUserEventType, string name, string userId, string message) { - Log(new DiscordLog(discordUserEventType, name, userId, message)); + public void LogDiscordEvent(DiscordUserEventType discordUserEventType, string instigatorId, string instigatorName, string channelName, string name, string message) { + Log(new DiscordLog(discordUserEventType, instigatorId, instigatorName, channelName, name, message)); } private void Log(BasicLog log) { - _eventBus.Send(log); + _eventBus.Send(new LoggerEventData(log)); } } } diff --git a/UKSF.Api.Shared/Extensions/ObjectExtensions.cs b/UKSF.Api.Shared/Extensions/ObjectExtensions.cs index 2bb5cf04..d59749c6 100644 --- a/UKSF.Api.Shared/Extensions/ObjectExtensions.cs +++ b/UKSF.Api.Shared/Extensions/ObjectExtensions.cs @@ -11,7 +11,7 @@ public static object GetFieldValue(this object obj, string fieldName) { return fieldInfo.GetValue(obj); } - private static FieldInfo GetFieldInfo(Type type, string fieldName) { + public static FieldInfo GetFieldInfo(this Type type, string fieldName) { FieldInfo fieldInfo; do { fieldInfo = type.GetField(fieldName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); @@ -29,7 +29,7 @@ public static object GetPropertyValue(this object obj, string propertyName) { return propertyInfo.GetValue(obj, null); } - private static PropertyInfo GetPropertyInfo(Type type, string propertyName) { + public static PropertyInfo GetPropertyInfo(this Type type, string propertyName) { PropertyInfo propertyInfo; do { propertyInfo = type.GetProperty(propertyName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); diff --git a/UKSF.Api.Shared/Extensions/ServiceExtensions.cs b/UKSF.Api.Shared/Extensions/ServiceExtensions.cs index b6077abf..8cf8de45 100644 --- a/UKSF.Api.Shared/Extensions/ServiceExtensions.cs +++ b/UKSF.Api.Shared/Extensions/ServiceExtensions.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; +using System.Reflection; using Microsoft.Extensions.DependencyInjection; // ReSharper disable once ForeachCanBeConvertedToQueryUsingAnotherGetEnumerator @@ -9,24 +10,32 @@ namespace UKSF.Api.Shared.Extensions { public static class ServiceExtensions { public static IEnumerable GetInterfaceServices(this IServiceProvider provider) { - if (provider is ServiceProvider serviceProvider) { - List services = new(); + List services = new(); - object engine = serviceProvider.GetFieldValue("_engine"); - object callSiteFactory = engine.GetPropertyValue("CallSiteFactory"); - object descriptorLookup = callSiteFactory.GetFieldValue("_descriptorLookup"); - if (descriptorLookup is IDictionary dictionary) { - foreach (DictionaryEntry entry in dictionary) { - if (typeof(T).IsAssignableFrom((Type) entry.Key)) { - services.Add((ServiceDescriptor) entry.Value.GetPropertyValue("Last")); - } - } + object engine; + FieldInfo fieldInfo = provider.GetType().GetFieldInfo("_engine"); + if (fieldInfo == null) { + PropertyInfo propertyInfo = provider.GetType().GetPropertyInfo("Engine"); + if (propertyInfo == null) { + throw new Exception($"Could not find Field '_engine' or Property 'Engine' on {provider.GetType()}"); } - return services.Select(x => (T) provider.GetService(x.ServiceType)); + engine = propertyInfo.GetValue(provider); + } else { + engine = fieldInfo.GetValue(provider); + } + + object callSiteFactory = engine.GetPropertyValue("CallSiteFactory"); + object descriptorLookup = callSiteFactory.GetFieldValue("_descriptorLookup"); + if (descriptorLookup is IDictionary dictionary) { + foreach (DictionaryEntry entry in dictionary) { + if (typeof(T).IsAssignableFrom((Type) entry.Key)) { + services.Add((ServiceDescriptor) entry.Value.GetPropertyValue("Last")); + } + } } - throw new Exception(); + return services.Select(x => (T) provider.GetService(x.ServiceType)); } } } diff --git a/UKSF.Api.Shared/Models/AuditLog.cs b/UKSF.Api.Shared/Models/AuditLog.cs index ab128366..7855c33f 100644 --- a/UKSF.Api.Shared/Models/AuditLog.cs +++ b/UKSF.Api.Shared/Models/AuditLog.cs @@ -1,6 +1,6 @@ namespace UKSF.Api.Shared.Models { - public record AuditLog : BasicLog { - public string Who { get; set; } + public class AuditLog : BasicLog { + public string Who; public AuditLog(string who, string message) : base(message) { Who = who; diff --git a/UKSF.Api.Shared/Models/BasicLog.cs b/UKSF.Api.Shared/Models/BasicLog.cs index df60cf05..7a4e6f47 100644 --- a/UKSF.Api.Shared/Models/BasicLog.cs +++ b/UKSF.Api.Shared/Models/BasicLog.cs @@ -1,4 +1,6 @@ using System; +using MongoDB.Bson; +using MongoDB.Bson.Serialization.Attributes; using UKSF.Api.Base.Models; namespace UKSF.Api.Shared.Models { @@ -9,7 +11,7 @@ public enum LogLevel { WARNING } - public record BasicLog : MongoObject { + public class BasicLog : MongoObject { protected BasicLog() { Level = LogLevel.INFO; Timestamp = DateTime.UtcNow; @@ -27,8 +29,9 @@ public BasicLog(Exception exception) : this() { Level = LogLevel.ERROR; } - public LogLevel Level { get; protected init; } - public string Message { get; set; } - public DateTime Timestamp { get; init; } + [BsonRepresentation(BsonType.String)] + public LogLevel Level; + public string Message; + public DateTime Timestamp; } } diff --git a/UKSF.Api.Shared/Models/ContextEventData.cs b/UKSF.Api.Shared/Models/ContextEventData.cs index ec575820..048a58e2 100644 --- a/UKSF.Api.Shared/Models/ContextEventData.cs +++ b/UKSF.Api.Shared/Models/ContextEventData.cs @@ -1,11 +1,11 @@ namespace UKSF.Api.Shared.Models { public class ContextEventData { + public T Data; + public string Id; + public ContextEventData(string id, T data) { Id = id; Data = data; } - - public string Id { get; } - public T Data { get; } } } diff --git a/UKSF.Api.Shared/Models/DiscordEventData.cs b/UKSF.Api.Shared/Models/DiscordEventData.cs new file mode 100644 index 00000000..e751cbf3 --- /dev/null +++ b/UKSF.Api.Shared/Models/DiscordEventData.cs @@ -0,0 +1,11 @@ +namespace UKSF.Api.Shared.Models { + public class DiscordEventData { + public string EventData; + public DiscordUserEventType EventType; + + public DiscordEventData(DiscordUserEventType eventType, string eventData) { + EventType = eventType; + EventData = eventData; + } + } +} diff --git a/UKSF.Api.Shared/Models/DiscordLog.cs b/UKSF.Api.Shared/Models/DiscordLog.cs index 42552207..3872f040 100644 --- a/UKSF.Api.Shared/Models/DiscordLog.cs +++ b/UKSF.Api.Shared/Models/DiscordLog.cs @@ -1,20 +1,29 @@ -namespace UKSF.Api.Shared.Models { +using MongoDB.Bson; +using MongoDB.Bson.Serialization.Attributes; + +namespace UKSF.Api.Shared.Models { public enum DiscordUserEventType { JOINED, LEFT, BANNED, - UNBANNED + UNBANNED, + MESSAGE_DELETED } - public record DiscordLog : BasicLog { - public DiscordLog(DiscordUserEventType discordUserEventType, string name, string userId, string message) : base(message) { - UserId = userId; - Name = name; + public class DiscordLog : BasicLog { + [BsonRepresentation(BsonType.String)] + public DiscordUserEventType DiscordUserEventType; + public string InstigatorName; + public string ChannelName; + public string Name; + public string InstigatorId; + + public DiscordLog(DiscordUserEventType discordUserEventType, string instigatorId, string instigatorName, string channelName, string name, string message) : base(message) { DiscordUserEventType = discordUserEventType; + InstigatorId = instigatorId; + InstigatorName = instigatorName; + ChannelName = channelName; + Name = name; } - - public string UserId { get; } - public string Name { get; } - public DiscordUserEventType DiscordUserEventType { get; } } } diff --git a/UKSF.Api.Shared/Models/HttpErrorLog.cs b/UKSF.Api.Shared/Models/HttpErrorLog.cs index 922bec96..6093c3f7 100644 --- a/UKSF.Api.Shared/Models/HttpErrorLog.cs +++ b/UKSF.Api.Shared/Models/HttpErrorLog.cs @@ -1,7 +1,7 @@ using System; namespace UKSF.Api.Shared.Models { - public record HttpErrorLog : BasicLog { + public class HttpErrorLog : BasicLog { public HttpErrorLog(Exception exception) { Exception = exception.ToString(); Message = exception.GetBaseException().Message; @@ -15,10 +15,10 @@ public HttpErrorLog(Exception exception, string name, string userId, string http Url = url; } - public string Exception { get; } - public string HttpMethod { get; } - public string Name { get; } - public string Url { get; } - public string UserId { get; } + public string Exception; + public string HttpMethod; + public string Name; + public string Url; + public string UserId; } } diff --git a/UKSF.Api.Shared/Models/LauncherLog.cs b/UKSF.Api.Shared/Models/LauncherLog.cs index f5cd8404..14f058a4 100644 --- a/UKSF.Api.Shared/Models/LauncherLog.cs +++ b/UKSF.Api.Shared/Models/LauncherLog.cs @@ -1,8 +1,8 @@ namespace UKSF.Api.Shared.Models { - public record LauncherLog : BasicLog { - public string Name { get; set; } - public string UserId { get; set; } - public string Version { get; set; } + public class LauncherLog : BasicLog { + public string Name; + public string UserId; + public string Version; public LauncherLog(string version, string message) : base(message) => Version = version; } diff --git a/UKSF.Api.Shared/Models/LoggerEventData.cs b/UKSF.Api.Shared/Models/LoggerEventData.cs new file mode 100644 index 00000000..e58cfaa3 --- /dev/null +++ b/UKSF.Api.Shared/Models/LoggerEventData.cs @@ -0,0 +1,7 @@ +namespace UKSF.Api.Shared.Models { + public class LoggerEventData { + public LoggerEventData(BasicLog log) => Log = log; + + public BasicLog Log; + } +} diff --git a/UKSF.Api.Shared/Models/OnlineState.cs b/UKSF.Api.Shared/Models/OnlineState.cs new file mode 100644 index 00000000..ac6881ca --- /dev/null +++ b/UKSF.Api.Shared/Models/OnlineState.cs @@ -0,0 +1,6 @@ +namespace UKSF.Api.Shared.Models { + public class OnlineState { + public bool Online; + public string Nickname; + } +} diff --git a/UKSF.Api.Shared/Models/ScheduledJob.cs b/UKSF.Api.Shared/Models/ScheduledJob.cs index 91cc1f35..dcfb0a25 100644 --- a/UKSF.Api.Shared/Models/ScheduledJob.cs +++ b/UKSF.Api.Shared/Models/ScheduledJob.cs @@ -2,11 +2,11 @@ using UKSF.Api.Base.Models; namespace UKSF.Api.Shared.Models { - public record ScheduledJob : MongoObject { - public string Action { get; set; } - public string ActionParameters { get; set; } - public TimeSpan Interval { get; set; } - public DateTime Next { get; set; } - public bool Repeat { get; set; } + public class ScheduledJob : MongoObject { + public string Action; + public string ActionParameters; + public TimeSpan Interval; + public DateTime Next; + public bool Repeat; } } diff --git a/UKSF.Api.Shared/Models/SignalrEventData.cs b/UKSF.Api.Shared/Models/SignalrEventData.cs index d4d609a4..d11b99e1 100644 --- a/UKSF.Api.Shared/Models/SignalrEventData.cs +++ b/UKSF.Api.Shared/Models/SignalrEventData.cs @@ -1,6 +1,6 @@ namespace UKSF.Api.Shared.Models { public class SignalrEventData { - public object Args { get; set; } - public TeamspeakEventType Procedure { get; set; } + public object Args; + public TeamspeakEventType Procedure; } } diff --git a/UKSF.Api.Shared/Models/TeamspeakMessageEventData.cs b/UKSF.Api.Shared/Models/TeamspeakMessageEventData.cs index a594eeda..5342c626 100644 --- a/UKSF.Api.Shared/Models/TeamspeakMessageEventData.cs +++ b/UKSF.Api.Shared/Models/TeamspeakMessageEventData.cs @@ -7,7 +7,7 @@ public TeamspeakMessageEventData(IEnumerable clientDbIds, string message Message = message; } - public IEnumerable ClientDbIds { get; } - public string Message { get; } + public IEnumerable ClientDbIds; + public string Message; } } diff --git a/UKSF.Api.Shared/Services/HttpContextService.cs b/UKSF.Api.Shared/Services/HttpContextService.cs index 37e2d864..95729e50 100644 --- a/UKSF.Api.Shared/Services/HttpContextService.cs +++ b/UKSF.Api.Shared/Services/HttpContextService.cs @@ -17,9 +17,9 @@ public class HttpContextService : IHttpContextService { public bool IsUserAuthenticated() => _httpContextAccessor.HttpContext?.User.Identity != null && _httpContextAccessor.HttpContext.User.Identity.IsAuthenticated; - public string GetUserId() => _httpContextAccessor.HttpContext?.User.Claims.Single(x => x.Type == ClaimTypes.Sid).Value; + public string GetUserId() => _httpContextAccessor.HttpContext?.User.Claims.SingleOrDefault(x => x.Type == ClaimTypes.Sid)?.Value; - public string GetUserEmail() => _httpContextAccessor.HttpContext?.User.Claims.Single(x => x.Type == ClaimTypes.Email).Value; + public string GetUserEmail() => _httpContextAccessor.HttpContext?.User.Claims.SingleOrDefault(x => x.Type == ClaimTypes.Email)?.Value; public bool UserHasPermission(string permission) => _httpContextAccessor.HttpContext != null && _httpContextAccessor.HttpContext.User.Claims.Any(x => x.Type == ClaimTypes.Role && x.Value == permission); diff --git a/UKSF.Api.Shared/Services/SchedulerService.cs b/UKSF.Api.Shared/Services/SchedulerService.cs index e0cfea21..07efbc25 100644 --- a/UKSF.Api.Shared/Services/SchedulerService.cs +++ b/UKSF.Api.Shared/Services/SchedulerService.cs @@ -104,7 +104,7 @@ private void Schedule(ScheduledJob job) { } private async Task SetNext(ScheduledJob job) { - await _context.Update(job.Id, "next", job.Next); + await _context.Update(job.Id, x => x.Next, job.Next); } private bool IsCancelled(MongoObject job, CancellationTokenSource token) { diff --git a/UKSF.Api/AppStart/StartServices.cs b/UKSF.Api/AppStart/StartServices.cs index 4f761ee5..1405d0da 100644 --- a/UKSF.Api/AppStart/StartServices.cs +++ b/UKSF.Api/AppStart/StartServices.cs @@ -51,7 +51,7 @@ public static void StartUksfServices(this IServiceProvider serviceProvider) { serviceProvider.GetService()?.RunQueuedBuilds(); } - public static void StopUksfSerices(this IServiceProvider serviceProvider) { + public static void StopUksfServices(this IServiceProvider serviceProvider) { // Cancel any running builds serviceProvider.GetService()?.CancelAll(); diff --git a/UKSF.Api/AppStart/UksfServiceExtensions.cs b/UKSF.Api/AppStart/UksfServiceExtensions.cs index f6f8e673..13eb8641 100644 --- a/UKSF.Api/AppStart/UksfServiceExtensions.cs +++ b/UKSF.Api/AppStart/UksfServiceExtensions.cs @@ -20,7 +20,7 @@ namespace UKSF.Api.AppStart { public static class ServiceExtensions { public static void AddUksf(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) => - services.AddContexts().AddEventHandlers().AddServices().AddSingleton().AddSingleton().AddComponents(configuration, currentEnvironment); + services.AddSingleton(services).AddContexts().AddEventHandlers().AddServices().AddSingleton().AddSingleton().AddComponents(configuration, currentEnvironment); private static IServiceCollection AddContexts(this IServiceCollection services) => services; diff --git a/UKSF.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs index 95505d97..5060e4fe 100644 --- a/UKSF.Api/Controllers/LoaController.cs +++ b/UKSF.Api/Controllers/LoaController.cs @@ -28,7 +28,6 @@ public class LoaController : Controller { private readonly ILogger _logger; private readonly INotificationsService _notificationsService; private readonly IUnitsContext _unitsContext; - private readonly IUnitsService _unitsService; public LoaController( diff --git a/UKSF.Api/Controllers/LoggingController.cs b/UKSF.Api/Controllers/LoggingController.cs index 593130eb..c88891da 100644 --- a/UKSF.Api/Controllers/LoggingController.cs +++ b/UKSF.Api/Controllers/LoggingController.cs @@ -1,6 +1,9 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using System.Linq.Expressions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Base.Models; using UKSF.Api.Shared; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Models; @@ -28,41 +31,75 @@ IDiscordLogContext discordLogContext _discordLogContext = discordLogContext; } - // TODO: Pagination - [HttpGet("basic"), Authorize] - public List GetBasicLogs() { - List logs = new(_logContext.Get()); - logs.Reverse(); - return logs; + public PagedResult GetBasicLogs([FromQuery] int page, [FromQuery] int pageSize, [FromQuery] SortDirection sortDirection, [FromQuery] string sortField, [FromQuery] string filter) { + IEnumerable>> filterProperties = GetBasicLogFilterProperties(); + return _logContext.GetPaged(page, pageSize, sortDirection, sortField, filterProperties, filter); } [HttpGet("httpError"), Authorize] - public List GetHttpErrorLogs() { - List logs = new(_httpErrorLogContext.Get()); - logs.Reverse(); - return logs; + public PagedResult GetHttpErrorLogs( + [FromQuery] int page, + [FromQuery] int pageSize, + [FromQuery] SortDirection sortDirection, + [FromQuery] string sortField, + [FromQuery] string filter + ) { + IEnumerable>> filterProperties = GetHttpErrorLogFilterProperties(); + return _httpErrorLogContext.GetPaged(page, pageSize, sortDirection, sortField, filterProperties, filter); } [HttpGet("audit"), Authorize] - public List GetAuditLogs() { - List logs = new(_auditLogContext.Get()); - logs.Reverse(); - return logs; + public PagedResult GetAuditLogs([FromQuery] int page, [FromQuery] int pageSize, [FromQuery] SortDirection sortDirection, [FromQuery] string sortField, [FromQuery] string filter) { + IEnumerable>> filterProperties = GetAuditLogFilterProperties(); + return _auditLogContext.GetPaged(page, pageSize, sortDirection, sortField, filterProperties, filter); } [HttpGet("launcher"), Authorize] - public List GetLauncherLogs() { - List logs = new(_launcherLogContext.Get()); - logs.Reverse(); - return logs; + public PagedResult GetLauncherLogs( + [FromQuery] int page, + [FromQuery] int pageSize, + [FromQuery] SortDirection sortDirection, + [FromQuery] string sortField, + [FromQuery] string filter + ) { + IEnumerable>> filterProperties = GetLauncherLogFilterProperties(); + return _launcherLogContext.GetPaged(page, pageSize, sortDirection, sortField, filterProperties, filter); } [HttpGet("discord"), Authorize] - public List GetDiscordLogs() { - List logs = new(_discordLogContext.Get()); - logs.Reverse(); - return logs; + public PagedResult GetDiscordLogs( + [FromQuery] int page, + [FromQuery] int pageSize, + [FromQuery] SortDirection sortDirection, + [FromQuery] string sortField, + [FromQuery] string filter + ) { + var logs = _discordLogContext.Get(); + IEnumerable>> filterProperties = GetDiscordLogFilterProperties(); + return _discordLogContext.GetPaged(page, pageSize, sortDirection, sortField, filterProperties, filter); + } + + private static IEnumerable>> GetBasicLogFilterProperties() { + return new List>> { x => x.Message, x => x.Level }; + } + + private static IEnumerable>> GetHttpErrorLogFilterProperties() { + return new List>> { x => x.Message, x => x.Url, x => x.Name, x => x.Exception, x => x.UserId, x => x.HttpMethod }; + } + + private static IEnumerable>> GetAuditLogFilterProperties() { + return new List>> { x => x.Message, x => x.Who }; + } + + private static IEnumerable>> GetLauncherLogFilterProperties() { + return new List>> { x => x.Message }; + } + + private static IEnumerable>> GetDiscordLogFilterProperties() { + return new List>> { + x => x.Message, x => x.DiscordUserEventType, x => x.InstigatorId, x => x.InstigatorName, x => x.ChannelName, x => x.Name + }; } } } diff --git a/UKSF.Api/EventHandlers/LoggerEventHandler.cs b/UKSF.Api/EventHandlers/LoggerEventHandler.cs index fa269dbd..ff119e55 100644 --- a/UKSF.Api/EventHandlers/LoggerEventHandler.cs +++ b/UKSF.Api/EventHandlers/LoggerEventHandler.cs @@ -1,5 +1,4 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Services; @@ -42,11 +41,11 @@ IObjectIdConversionService objectIdConversionService } public void Init() { - _eventBus.AsObservable().SubscribeWithAsyncNext(HandleLog, _logger.LogError); + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleLog, _logger.LogError); } - private Task HandleLog(EventModel eventModel, BasicLog log) { - Task _ = HandleLogAsync(log); + private Task HandleLog(EventModel eventModel, LoggerEventData logData) { + Task _ = HandleLogAsync(logData.Log); return Task.CompletedTask; } diff --git a/UKSF.Api/Fake/FakeCachedDataService.cs b/UKSF.Api/Fake/FakeCachedDataService.cs deleted file mode 100644 index a31e5895..00000000 --- a/UKSF.Api/Fake/FakeCachedDataService.cs +++ /dev/null @@ -1,7 +0,0 @@ -// namespace UKSF.Api.Fake { -// public class FakeCachedDataService : FakeDataService where T : DatabaseObject { -// public void Refresh() { } -// } -// } - - diff --git a/UKSF.Api/Fake/FakeDataService.cs b/UKSF.Api/Fake/FakeDataService.cs deleted file mode 100644 index d5737527..00000000 --- a/UKSF.Api/Fake/FakeDataService.cs +++ /dev/null @@ -1,37 +0,0 @@ -// using System; -// using System.Collections.Generic; -// using System.Linq.Expressions; -// using System.Threading.Tasks; -// using MongoDB.Driver; -// -// namespace UKSF.Api.Fake { -// public abstract class FakeDataService : IDataService where T : DatabaseObject { -// public IEnumerable Get() => new List(); -// -// public IEnumerable Get(Func predicate) => new List(); -// -// public T GetSingle(string id) => default; -// -// public T GetSingle(Func predicate) => default; -// -// public Task Add(T item) => Task.CompletedTask; -// -// public Task Update(string id, string fieldName, object value) => Task.CompletedTask; -// -// public Task Update(string id, UpdateDefinition update) => Task.CompletedTask; -// -// public Task Update(Expression> filterExpression, UpdateDefinition update) => Task.CompletedTask; -// -// public Task UpdateMany(Expression> filterExpression, UpdateDefinition update) => Task.CompletedTask; -// -// public Task Replace(T item) => Task.CompletedTask; -// -// public Task Delete(string id) => Task.CompletedTask; -// -// public Task Delete(T item) => Task.CompletedTask; -// -// public Task DeleteMany(Expression> filterExpression) => Task.CompletedTask; -// } -// } - - diff --git a/UKSF.Api/Fake/FakeDiscordService.cs b/UKSF.Api/Fake/FakeDiscordService.cs deleted file mode 100644 index 8c6eeaf0..00000000 --- a/UKSF.Api/Fake/FakeDiscordService.cs +++ /dev/null @@ -1,25 +0,0 @@ -// using System.Threading.Tasks; -// using Microsoft.Extensions.Configuration; -// -// namespace UKSF.Api.Fake { -// public class FakeDiscordService : DiscordService { -// public FakeDiscordService( -// IConfiguration configuration, -// IRanksService ranksService, -// IUnitsService unitsService, -// IAccountService accountService, -// IDisplayNameService displayNameService, -// IVariablesService variablesService -// ) : base(configuration, ranksService, unitsService, accountService, displayNameService, variablesService) { } -// -// public override Task SendMessageToEveryone(ulong channelId, string message) => Task.CompletedTask; -// -// public override Task SendMessage(ulong channelId, string message) => Task.CompletedTask; -// -// public override Task UpdateAllUsers() => Task.CompletedTask; -// -// public override Task UpdateAccount(Account account, ulong discordId = 0) => Task.CompletedTask; -// } -// } - - diff --git a/UKSF.Api/Fake/FakeNotificationsDataService.cs b/UKSF.Api/Fake/FakeNotificationsDataService.cs deleted file mode 100644 index 8ff4efff..00000000 --- a/UKSF.Api/Fake/FakeNotificationsDataService.cs +++ /dev/null @@ -1,5 +0,0 @@ -// namespace UKSF.Api.Fake { -// public class FakeNotificationsDataService : FakeCachedDataService, INotificationsDataService { } -// } - - diff --git a/UKSF.Api/Fake/FakeNotificationsService.cs b/UKSF.Api/Fake/FakeNotificationsService.cs deleted file mode 100644 index c1331f01..00000000 --- a/UKSF.Api/Fake/FakeNotificationsService.cs +++ /dev/null @@ -1,22 +0,0 @@ -// using System.Collections.Generic; -// using System.Threading.Tasks; -// -// namespace UKSF.Api.Fake { -// public class FakeNotificationsService : INotificationsService { -// public FakeNotificationsService(INotificationsDataService data) : base(data) { } -// -// public Task SendTeamspeakNotification(Account account, string rawMessage) => Task.CompletedTask; -// -// public Task SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) => Task.CompletedTask; -// -// public IEnumerable GetNotificationsForContext() => new List(); -// -// public void Add(Notification notification) { } -// -// public Task MarkNotificationsAsRead(List ids) => Task.CompletedTask; -// -// public Task Delete(List ids) => Task.CompletedTask; -// } -// } - - diff --git a/UKSF.Api/Fake/FakeTeamspeakManagerService.cs b/UKSF.Api/Fake/FakeTeamspeakManagerService.cs deleted file mode 100644 index 454e18c2..00000000 --- a/UKSF.Api/Fake/FakeTeamspeakManagerService.cs +++ /dev/null @@ -1,15 +0,0 @@ -// using System.Threading.Tasks; -// -// namespace UKSF.Api.Fake { -// public class FakeTeamspeakManagerService : ITeamspeakManagerService { -// public void Start() { } -// -// public void Stop() { } -// -// public Task SendGroupProcedure(TeamspeakProcedureType procedure, TeamspeakGroupProcedure groupProcedure) => Task.CompletedTask; -// -// public Task SendProcedure(TeamspeakProcedureType procedure, object args) => Task.CompletedTask; -// } -// } - - diff --git a/UKSF.Api/Global.cs b/UKSF.Api/Global.cs deleted file mode 100644 index d3566f1d..00000000 --- a/UKSF.Api/Global.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace UKSF.Api { - public static class Global { - public const string SUPER_ADMIN = "59e38f10594c603b78aa9dbd"; - public const string TOKEN_AUDIENCE = "uksf-audience"; - public const string TOKEN_ISSUER = "uksf-issuer"; - } -} diff --git a/UKSF.Api/Services/MigrationUtility.cs b/UKSF.Api/Services/MigrationUtility.cs index 8f62e16c..ffa4b923 100644 --- a/UKSF.Api/Services/MigrationUtility.cs +++ b/UKSF.Api/Services/MigrationUtility.cs @@ -1,27 +1,47 @@ using System; +using System.Collections.Generic; using Microsoft.Extensions.Hosting; using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; +using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Services { public class MigrationUtility { private const string KEY = "MIGRATED"; + private readonly IAuditLogContext _auditLogContext; private readonly IHostEnvironment _currentEnvironment; + private readonly IHttpErrorLogContext _httpErrorLogContext; + private readonly ILauncherLogContext _launcherLogContext; + private readonly ILogContext _logContext; private readonly ILogger _logger; private readonly IVariablesContext _variablesContext; private readonly IVariablesService _variablesService; - public MigrationUtility(IHostEnvironment currentEnvironment, IVariablesService variablesService, IVariablesContext variablesContext, ILogger logger) { + public MigrationUtility( + IHostEnvironment currentEnvironment, + IVariablesService variablesService, + IVariablesContext variablesContext, + ILogger logger, + ILogContext logContext, + IHttpErrorLogContext httpErrorLogContext, + IAuditLogContext auditLogContext, + ILauncherLogContext launcherLogContext + ) { _currentEnvironment = currentEnvironment; _variablesService = variablesService; _variablesContext = variablesContext; _logger = logger; + _logContext = logContext; + _httpErrorLogContext = httpErrorLogContext; + _auditLogContext = auditLogContext; + _launcherLogContext = launcherLogContext; } public void Migrate() { - bool migrated = true; + bool migrated = false; if (!_currentEnvironment.IsDevelopment()) { string migratedString = _variablesService.GetVariable(KEY).AsString(); migrated = bool.Parse(migratedString); @@ -41,6 +61,26 @@ public void Migrate() { } // TODO: CHECK BEFORE RELEASE - private static void ExecuteMigration() { } + private void ExecuteMigration() { + IEnumerable logs = _logContext.Get(); + foreach (BasicLog log in logs) { + _logContext.Replace(log); + } + + IEnumerable errorLogs = _httpErrorLogContext.Get(); + foreach (HttpErrorLog log in errorLogs) { + _httpErrorLogContext.Replace(log); + } + + IEnumerable auditLogs = _auditLogContext.Get(); + foreach (AuditLog log in auditLogs) { + _auditLogContext.Replace(log); + } + + IEnumerable launcherLogs = _launcherLogContext.Get(); + foreach (LauncherLog log in launcherLogs) { + _launcherLogContext.Replace(log); + } + } } } diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index c16d2e0c..e4c174bb 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -7,6 +7,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.OpenApi.Models; +using Newtonsoft.Json.Serialization; using Swashbuckle.AspNetCore.SwaggerUI; using UKSF.Api.Admin; using UKSF.Api.AppStart; @@ -44,7 +45,8 @@ public void ConfigureServices(IServiceCollection services) { ); services.AddControllers(); services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo { Title = "UKSF API", Version = "v1" }); }); - services.AddMvc(options => { options.Filters.Add(); }).AddNewtonsoftJson(); + services.AddMvc(options => { options.Filters.Add(); }) + .AddNewtonsoftJson(options => { options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); }); } public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostApplicationLifetime, IServiceProvider serviceProvider) { @@ -82,7 +84,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl } private static void OnShutdown(IServiceProvider serviceProvider) { - serviceProvider.StopUksfSerices(); + serviceProvider.StopUksfServices(); } } diff --git a/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs b/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs index ccfa8db1..585aed4a 100644 --- a/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs @@ -1,5 +1,7 @@ using System; using FluentAssertions; +using UKSF.Api.Personnel.Extensions; +using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Extensions; using Xunit; @@ -9,19 +11,19 @@ public class DateUtilitiesTests { public void ShouldGiveCorrectAge(int years, int months, int expectedYears, int expectedMonths) { DateTime dob = DateTime.Today.AddYears(-years).AddMonths(-months); - (int subjectYears, int subjectMonths) = dob.ToAge(); + ApplicationAge age = dob.ToAge(); - subjectYears.Should().Be(expectedYears); - subjectMonths.Should().Be(expectedMonths); + age.Years.Should().Be(expectedYears); + age.Months.Should().Be(expectedMonths); } [Fact] public void ShouldGiveCorrectMonthsForDay() { DateTime dob = new(2019, 1, 20); - (int _, int subjectMonths) = dob.ToAge(new DateTime(2020, 1, 16)); + ApplicationAge age = dob.ToAge(new DateTime(2020, 1, 16)); - subjectMonths.Should().Be(11); + age.Months.Should().Be(11); } } } diff --git a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs index 06931cc1..10455ac2 100644 --- a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs @@ -9,7 +9,6 @@ using UKSF.Api.Admin.Models; using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Admin { diff --git a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs index c5ae9bff..0935336d 100644 --- a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs @@ -8,9 +8,6 @@ using Moq; using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; using UKSF.Api.Tests.Common; using Xunit; @@ -220,7 +217,7 @@ public async Task ShouldRefreshCollectionForUpdate() { _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); - await _testCachedContext.Update(item1.Id, "Name", "2"); + await _testCachedContext.Update(item1.Id, x => x.Name, "2"); _testCachedContext.Cache.Should().BeEquivalentTo(_mockCollection); _testCachedContext.Cache.First().Name.Should().Be("2"); diff --git a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs index a1de3d27..a9db98c7 100644 --- a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs @@ -10,7 +10,6 @@ using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; -using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; using UKSF.Api.Tests.Common; using Xunit; @@ -127,7 +126,7 @@ public async Task Should_create_correct_update_events_for_updates() { _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())).Returns(Task.CompletedTask); _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subjects.Add(dataEventModel)); - await _testCachedContext.Update(_id1, "Name", "1"); + await _testCachedContext.Update(_id1, x => x.Name, "1"); await _testCachedContext.Update(_id2, Builders.Update.Set(x => x.Name, "2")); await _testCachedContext.Update(x => x.Id == _id3, Builders.Update.Set(x => x.Name, "3")); diff --git a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs index dbf01cda..d6950c3d 100644 --- a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs @@ -139,7 +139,7 @@ public async Task Should_create_correct_update_events_for_updates() { _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())).Returns(Task.CompletedTask); _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subjects.Add(dataEventModel)); - await _testContext.Update(_id1, "Name", "1"); + await _testContext.Update(_id1, x => x.Name, "1"); await _testContext.Update(_id2, Builders.Update.Set(x => x.Name, "2")); await _testContext.Update(x => x.Id == _id3, Builders.Update.Set(x => x.Name, "3")); diff --git a/UKSF.Tests/Unit/Data/DataServiceTests.cs b/UKSF.Tests/Unit/Data/DataServiceTests.cs index b9a5959f..e766d2ec 100644 --- a/UKSF.Tests/Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceTests.cs @@ -9,9 +9,6 @@ using Moq; using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; using UKSF.Api.Tests.Common; using Xunit; @@ -47,7 +44,7 @@ public void Should_throw_for_get_single_item_when_key_is_invalid(string id) { [Theory, InlineData(""), InlineData("1"), InlineData(null)] public async Task Should_throw_for_update_by_id_when_key_is_invalid(string id) { - Func act = async () => await _testContext.Update(id, "Name", null); + Func act = async () => await _testContext.Update(id, x => x.Name, null); await act.Should().ThrowAsync(); } @@ -217,7 +214,7 @@ public async Task Should_update_item_by_id() { .Returns(Task.CompletedTask) .Callback((string id, UpdateDefinition _) => _mockCollection.First(x => x.Id == id).Name = "2"); - await _testContext.Update(item1.Id, "Name", "2"); + await _testContext.Update(item1.Id, x => x.Name, "2"); item1.Name.Should().Be("2"); } @@ -247,7 +244,7 @@ public async Task Should_update_item_with_set() { .Returns(Task.CompletedTask) .Callback((string _, UpdateDefinition y) => subject = y); - await _testContext.Update(item1.Id, "Name", "2"); + await _testContext.Update(item1.Id, x => x.Name, "2"); TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); } @@ -263,7 +260,7 @@ public async Task Should_update_item_with_unset() { .Returns(Task.CompletedTask) .Callback((string _, UpdateDefinition y) => subject = y); - await _testContext.Update(item1.Id, "Name", null); + await _testContext.Update(item1.Id, x => x.Name, null); TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); } diff --git a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs index fb42bc45..d753af08 100644 --- a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs @@ -5,7 +5,6 @@ using UKSF.Api.ArmaServer.Models; using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Game { diff --git a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs index 4dc6e565..af714e90 100644 --- a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs @@ -9,8 +9,6 @@ using UKSF.Api.Base.Models; using UKSF.Api.Modpack.Context; using UKSF.Api.Modpack.Models; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Data.Modpack { diff --git a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs index 70321491..ac03f935 100644 --- a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs @@ -5,7 +5,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Modpack.Context; using UKSF.Api.Modpack.Models; -using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Modpack { diff --git a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs index ca763737..0519c3b3 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs @@ -6,7 +6,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; -using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Operations { diff --git a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs index d4b1b70f..37d548f8 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs @@ -6,7 +6,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; -using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Operations { diff --git a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs index 5d5b06a2..57b12553 100644 --- a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -6,7 +6,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; -using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Personnel { diff --git a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs index e0f4f190..6ac81ab5 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs @@ -5,7 +5,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Personnel { diff --git a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs index 56ba3bd7..038abd2e 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs @@ -5,7 +5,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Shared.Events; using Xunit; namespace UKSF.Tests.Unit.Data.Personnel { diff --git a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs index bce84ac2..610a3e55 100644 --- a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs @@ -8,7 +8,6 @@ using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; using Xunit; diff --git a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index a3adcbb4..9a5cb045 100644 --- a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -5,7 +5,6 @@ using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -using UKSF.Api.Shared.Events; using Xunit; using UksfUnit = UKSF.Api.Personnel.Models.Unit; diff --git a/UKSF.Tests/Unit/Events/EventBusTests.cs b/UKSF.Tests/Unit/Events/EventBusTests.cs index 8fc1fc5a..ce7ae698 100644 --- a/UKSF.Tests/Unit/Events/EventBusTests.cs +++ b/UKSF.Tests/Unit/Events/EventBusTests.cs @@ -2,8 +2,6 @@ using FluentAssertions; using UKSF.Api.Base.Events; using UKSF.Api.Base.Models; -using UKSF.Api.Shared.Models; -using UKSF.Api.Tests.Common; using Xunit; namespace UKSF.Tests.Unit.Events { diff --git a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs index 032cfaf0..b6751fde 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs @@ -1,5 +1,4 @@ -using System; -using Microsoft.AspNetCore.SignalR; +using Microsoft.AspNetCore.SignalR; using Moq; using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; @@ -9,7 +8,6 @@ using UKSF.Api.Command.Signalr.Clients; using UKSF.Api.Command.Signalr.Hubs; using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { @@ -17,18 +15,16 @@ public class CommandRequestEventHandlerTests { private readonly CommandRequestEventHandler _commandRequestEventHandler; private readonly IEventBus _eventBus; private readonly Mock> _mockHub; - private readonly Mock _mockLoggingService; public CommandRequestEventHandlerTests() { Mock mockDataCollectionFactory = new(); - _mockLoggingService = new Mock(); + Mock mockLoggingService = new(); _mockHub = new Mock>(); - _eventBus = new EventBus(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); - _commandRequestEventHandler = new CommandRequestEventHandler(_eventBus, _mockHub.Object, _mockLoggingService.Object); + _commandRequestEventHandler = new CommandRequestEventHandler(_eventBus, _mockHub.Object, mockLoggingService.Object); } [Fact] diff --git a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs index 7223f3df..5dbd684e 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs @@ -1,5 +1,4 @@ -using System; -using Microsoft.AspNetCore.SignalR; +using Microsoft.AspNetCore.SignalR; using Moq; using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; @@ -10,7 +9,6 @@ using UKSF.Api.Personnel.Signalr.Clients; using UKSF.Api.Personnel.Signalr.Hubs; using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { diff --git a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs index 637e7bfa..dbdc4a81 100644 --- a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs @@ -1,5 +1,4 @@ using System; -using System.Reactive.Subjects; using Moq; using UKSF.Api.Base.Events; using UKSF.Api.EventHandlers; @@ -26,7 +25,7 @@ public LogEventHandlerTests() { _mockLauncherLogDataService = new Mock(); _mockDiscordLogDataService = new Mock(); _mockObjectIdConversionService = new Mock(); - Mock mockLogger = new Mock(); + Mock mockLogger = new(); _eventBus = new EventBus(); _mockObjectIdConversionService.Setup(x => x.ConvertObjectIds(It.IsAny())).Returns(x => x); @@ -56,7 +55,7 @@ public void When_handling_a_basic_log() { [Fact] public void When_handling_a_discord_log() { - DiscordLog discordLog = new(DiscordUserEventType.JOINED, "SqnLdr.Beswick.T", "12345", "SqnLdr.Beswick.T joined"); + DiscordLog discordLog = new(DiscordUserEventType.JOINED, "12345", "SqnLdr.Beswick.T", "", "", "SqnLdr.Beswick.T joined"); _eventBus.Send(discordLog); diff --git a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs index 6476905a..c0059d57 100644 --- a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs @@ -1,5 +1,4 @@ -using System; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Moq; using UKSF.Api.Admin.Services; using UKSF.Api.Personnel.Context; @@ -13,11 +12,10 @@ public void When_refreshing_data_caches() { Mock mockRanksDataService = new(); Mock mockRolesDataService = new(); - IServiceProvider serviceProvider = new ServiceCollection().AddSingleton(_ => mockAccountDataService.Object) - .AddSingleton(_ => mockRanksDataService.Object) - .AddSingleton(_ => mockRolesDataService.Object) - .BuildServiceProvider(); - DataCacheService dataCacheService = new(serviceProvider); + IServiceCollection serviceCollection = new ServiceCollection().AddSingleton(_ => mockAccountDataService.Object) + .AddSingleton(_ => mockRanksDataService.Object) + .AddSingleton(_ => mockRolesDataService.Object); + DataCacheService dataCacheService = new(serviceCollection); dataCacheService.RefreshCachedData(); From 333562b0725d8b0a991283a0d0ee5701b22a99e0 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 13 Dec 2020 13:58:31 +0000 Subject: [PATCH 290/369] Fixes and tweaks --- UKSF.Api.Admin/Services/DataCacheService.cs | 2 +- UKSF.Api.Personnel/ApiPersonnelExtensions.cs | 1 - UKSF.Api.Personnel/Context/AccountContext.cs | 9 +++++++-- UKSF.Api.Shared/ApiSharedExtensions.cs | 1 - UKSF.Api.Shared/Extensions/ChangeUtilities.cs | 16 ++++++++-------- UKSF.Api/Services/MigrationUtility.cs | 17 ++++------------- .../Unit/Data/CahcedDataServiceEventTests.cs | 3 --- UKSF.Tests/Unit/Data/DataServiceEventTests.cs | 2 -- .../Handlers/CommandRequestEventHandlerTests.cs | 7 ++++--- .../Events/Handlers/LogEventHandlerTests.cs | 10 +++++----- .../Utility/ConfirmationCodeServiceTests.cs | 2 -- .../Services/Utility/DataCacheServiceTests.cs | 9 +++++---- 12 files changed, 34 insertions(+), 45 deletions(-) diff --git a/UKSF.Api.Admin/Services/DataCacheService.cs b/UKSF.Api.Admin/Services/DataCacheService.cs index c97761af..0ae895cf 100644 --- a/UKSF.Api.Admin/Services/DataCacheService.cs +++ b/UKSF.Api.Admin/Services/DataCacheService.cs @@ -11,7 +11,7 @@ public interface IDataCacheService { public class DataCacheService : IDataCacheService { private readonly IServiceProvider _serviceProvider; - public DataCacheService(IServiceCollection serviceCollection) => _serviceProvider = serviceCollection.BuildServiceProvider(); + public DataCacheService(IServiceProvider serviceProvider) => _serviceProvider = serviceProvider; public void RefreshCachedData() { foreach (ICachedMongoContext cachedDataService in _serviceProvider.GetInterfaceServices()) { diff --git a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs index 7b3b0e7e..a264d54b 100644 --- a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs +++ b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs @@ -13,7 +13,6 @@ namespace UKSF.Api.Personnel { public static class ApiPersonnelExtensions { public static IServiceCollection AddUksfPersonnel(this IServiceCollection services) => services.AddContexts() - .AddEventHandlers() .AddServices() .AddActions() diff --git a/UKSF.Api.Personnel/Context/AccountContext.cs b/UKSF.Api.Personnel/Context/AccountContext.cs index 53eada06..618a1e08 100644 --- a/UKSF.Api.Personnel/Context/AccountContext.cs +++ b/UKSF.Api.Personnel/Context/AccountContext.cs @@ -1,4 +1,5 @@ -using UKSF.Api.Base.Context; +using System; +using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; @@ -7,6 +8,10 @@ namespace UKSF.Api.Personnel.Context { public interface IAccountContext : IMongoContext, ICachedMongoContext { } public class AccountContext : CachedMongoContext, IAccountContext { - public AccountContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "accounts") { } + public Guid Id; + + public AccountContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "accounts") { + Id = Guid.NewGuid(); + } } } diff --git a/UKSF.Api.Shared/ApiSharedExtensions.cs b/UKSF.Api.Shared/ApiSharedExtensions.cs index 8a7545fe..31abc693 100644 --- a/UKSF.Api.Shared/ApiSharedExtensions.cs +++ b/UKSF.Api.Shared/ApiSharedExtensions.cs @@ -8,7 +8,6 @@ public static class ApiSharedExtensions { public static IServiceCollection AddUksfShared(this IServiceCollection services) => services .AddContexts() - .AddEventHandlers() .AddServices() .AddTransient() diff --git a/UKSF.Api.Shared/Extensions/ChangeUtilities.cs b/UKSF.Api.Shared/Extensions/ChangeUtilities.cs index a1a6280a..b1c4b362 100644 --- a/UKSF.Api.Shared/Extensions/ChangeUtilities.cs +++ b/UKSF.Api.Shared/Extensions/ChangeUtilities.cs @@ -12,17 +12,17 @@ public static class ChangeUtilities { private static List GetChanges(this T original, T updated) { List changes = new(); Type type = original.GetType(); - foreach (PropertyInfo propertyInfo in type.GetProperties()) { - string name = propertyInfo.Name; - object originalValue = propertyInfo.GetValue(original); - object updatedValue = propertyInfo.GetValue(updated); + foreach (FieldInfo fieldInfo in type.GetFields()) { + string name = fieldInfo.Name; + object originalValue = fieldInfo.GetValue(original); + object updatedValue = fieldInfo.GetValue(updated); if (originalValue == null && updatedValue == null) continue; if (DeepEquals(originalValue, updatedValue)) continue; - if (propertyInfo.PropertyType.IsClass && !propertyInfo.PropertyType.IsSerializable) { + if (fieldInfo.FieldType.IsClass && !fieldInfo.FieldType.IsSerializable) { // Class, recurse changes.Add(new Change { Type = ChangeType.CLASS, Name = name, InnerChanges = GetChanges(originalValue, updatedValue) }); - } else if (propertyInfo.PropertyType != typeof(string) && updatedValue is IEnumerable originalListValue && originalValue is IEnumerable updatedListValue) { + } else if (fieldInfo.FieldType != typeof(string) && updatedValue is IEnumerable originalListValue && originalValue is IEnumerable updatedListValue) { // List, get list changes changes.Add(new Change { Type = ChangeType.LIST, Name = name, InnerChanges = GetListChanges(originalListValue, updatedListValue) }); } else { @@ -43,8 +43,8 @@ private static List GetChanges(this T original, T updated) { private static List GetListChanges(this IEnumerable original, IEnumerable updated) { List originalObjects = original == null ? new List() : original.Cast().ToList(); List updatedObjects = updated == null ? new List() : updated.Cast().ToList(); - List changes = originalObjects.Where(x => !updatedObjects.Contains(x)).Select(x => new Change { Type = ChangeType.ADDITION, Updated = x.ToString() }).ToList(); - changes.AddRange(updatedObjects.Where(x => !originalObjects.Contains(x)).Select(x => new Change { Type = ChangeType.REMOVAL, Original = x.ToString() })); + List changes = originalObjects.Where(originalObject => !updatedObjects.Any(updatedObject => DeepEquals(originalObject, updatedObject))).Select(x => new Change { Type = ChangeType.ADDITION, Updated = x.ToString() }).ToList(); + changes.AddRange(updatedObjects.Where(updatedObject => !originalObjects.Any(originalObject => DeepEquals(originalObject, updatedObject))).Select(x => new Change { Type = ChangeType.REMOVAL, Original = x.ToString() })); return changes; } diff --git a/UKSF.Api/Services/MigrationUtility.cs b/UKSF.Api/Services/MigrationUtility.cs index ffa4b923..0e488c0d 100644 --- a/UKSF.Api/Services/MigrationUtility.cs +++ b/UKSF.Api/Services/MigrationUtility.cs @@ -11,25 +11,16 @@ namespace UKSF.Api.Services { public class MigrationUtility { private const string KEY = "MIGRATED"; - private readonly IAuditLogContext _auditLogContext; private readonly IHostEnvironment _currentEnvironment; + private readonly ILogger _logger; + private readonly ILogContext _logContext; private readonly IHttpErrorLogContext _httpErrorLogContext; + private readonly IAuditLogContext _auditLogContext; private readonly ILauncherLogContext _launcherLogContext; - private readonly ILogContext _logContext; - private readonly ILogger _logger; private readonly IVariablesContext _variablesContext; private readonly IVariablesService _variablesService; - public MigrationUtility( - IHostEnvironment currentEnvironment, - IVariablesService variablesService, - IVariablesContext variablesContext, - ILogger logger, - ILogContext logContext, - IHttpErrorLogContext httpErrorLogContext, - IAuditLogContext auditLogContext, - ILauncherLogContext launcherLogContext - ) { + public MigrationUtility(IHostEnvironment currentEnvironment, IVariablesService variablesService, IVariablesContext variablesContext, ILogger logger, ILogContext logContext, IHttpErrorLogContext httpErrorLogContext, IAuditLogContext auditLogContext, ILauncherLogContext launcherLogContext) { _currentEnvironment = currentEnvironment; _variablesService = variablesService; _variablesContext = variablesContext; diff --git a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs index a9db98c7..d41bc748 100644 --- a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs @@ -38,9 +38,6 @@ public CachedDataServiceEventTests() { mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); _mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - _mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => mockCollection.Where(predicate)); - _mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => mockCollection.FirstOrDefault(predicate)); - _mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(id => mockCollection.FirstOrDefault(x => x.Id == id)); _testCachedContext = new TestCachedContext(mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); } diff --git a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs index d6950c3d..19c3a790 100644 --- a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs @@ -37,10 +37,8 @@ public DataServiceEventTests() { List mockCollection = new() { _item1, item2, item3 }; mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); _mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => mockCollection.Where(predicate)); _mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => mockCollection.FirstOrDefault(predicate)); - _mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(id => mockCollection.FirstOrDefault(x => x.Id == id)); _testContext = new TestContext(mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); } diff --git a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs index b6751fde..313c1455 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs @@ -8,6 +8,7 @@ using UKSF.Api.Command.Signalr.Clients; using UKSF.Api.Command.Signalr.Hubs; using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Models; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers { @@ -38,7 +39,7 @@ public void ShouldNotRunEventOnDelete() { _commandRequestEventHandler.Init(); - _eventBus.Send(new EventModel(EventType.DELETE, null)); + _eventBus.Send(new EventModel(EventType.DELETE, new ContextEventData(null, null))); mockClient.Verify(x => x.ReceiveRequestUpdate(), Times.Never); } @@ -54,8 +55,8 @@ public void ShouldRunEventOnUpdateAndAdd() { _commandRequestEventHandler.Init(); - _eventBus.Send(new EventModel(EventType.ADD, null)); - _eventBus.Send(new EventModel(EventType.UPDATE, null)); + _eventBus.Send(new EventModel(EventType.ADD, new ContextEventData(null, null))); + _eventBus.Send(new EventModel(EventType.UPDATE, new ContextEventData(null, null))); mockClient.Verify(x => x.ReceiveRequestUpdate(), Times.Exactly(2)); } diff --git a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs index dbdc4a81..ed038aaa 100644 --- a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs @@ -47,7 +47,7 @@ public LogEventHandlerTests() { public void When_handling_a_basic_log() { BasicLog basicLog = new("test"); - _eventBus.Send(basicLog); + _eventBus.Send(new LoggerEventData(basicLog)); _mockObjectIdConversionService.Verify(x => x.ConvertObjectIds("test"), Times.Once); _mockLogDataService.Verify(x => x.Add(basicLog), Times.Once); @@ -57,7 +57,7 @@ public void When_handling_a_basic_log() { public void When_handling_a_discord_log() { DiscordLog discordLog = new(DiscordUserEventType.JOINED, "12345", "SqnLdr.Beswick.T", "", "", "SqnLdr.Beswick.T joined"); - _eventBus.Send(discordLog); + _eventBus.Send(new LoggerEventData(discordLog)); _mockDiscordLogDataService.Verify(x => x.Add(discordLog), Times.Once); } @@ -66,7 +66,7 @@ public void When_handling_a_discord_log() { public void When_handling_a_launcher_log() { LauncherLog launcherLog = new("1.0.0", "test"); - _eventBus.Send(launcherLog); + _eventBus.Send(new LoggerEventData(launcherLog)); _mockObjectIdConversionService.Verify(x => x.ConvertObjectIds("test"), Times.Once); _mockLauncherLogDataService.Verify(x => x.Add(launcherLog), Times.Once); @@ -76,7 +76,7 @@ public void When_handling_a_launcher_log() { public void When_handling_an_audit_log() { AuditLog basicLog = new("server", "test"); - _eventBus.Send(basicLog); + _eventBus.Send(new LoggerEventData(basicLog)); _mockObjectIdConversionService.Verify(x => x.ConvertObjectId("server"), Times.Once); _mockObjectIdConversionService.Verify(x => x.ConvertObjectIds("test"), Times.Once); @@ -87,7 +87,7 @@ public void When_handling_an_audit_log() { public void When_handling_an_http_error_log() { HttpErrorLog httpErrorLog = new(new Exception()); - _eventBus.Send(httpErrorLog); + _eventBus.Send(new LoggerEventData(httpErrorLog)); _mockObjectIdConversionService.Verify(x => x.ConvertObjectIds("Exception of type 'System.Exception' was thrown."), Times.Once); _mockHttpErrorLogDataService.Verify(x => x.Add(httpErrorLog), Times.Once); diff --git a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs index 638420f3..e478ea53 100644 --- a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs @@ -84,7 +84,6 @@ public async Task ShouldGetCorrectConfirmationCode() { List confirmationCodeData = new() { confirmationCode1, confirmationCode2 }; _mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => confirmationCodeData.FirstOrDefault(y => y.Id == x)); - _mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.RemoveAll(y => y.Id == x)); _mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns>(x => Task.FromResult(new List().FirstOrDefault(x))); string subject = await _confirmationCodeService.GetConfirmationCode(confirmationCode2.Id); @@ -98,7 +97,6 @@ public async Task ShouldReturnCodeValue() { List confirmationCodeData = new() { confirmationCode }; _mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => confirmationCodeData.FirstOrDefault(y => y.Id == x)); - _mockConfirmationCodeDataService.Setup(x => x.Delete(It.IsAny())).Returns(Task.CompletedTask).Callback(x => confirmationCodeData.RemoveAll(y => y.Id == x)); _mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns>(x => Task.FromResult(new List().FirstOrDefault(x))); string subject = await _confirmationCodeService.GetConfirmationCode(confirmationCode.Id); diff --git a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs index c0059d57..64e1cc4c 100644 --- a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs @@ -12,10 +12,11 @@ public void When_refreshing_data_caches() { Mock mockRanksDataService = new(); Mock mockRolesDataService = new(); - IServiceCollection serviceCollection = new ServiceCollection().AddSingleton(_ => mockAccountDataService.Object) - .AddSingleton(_ => mockRanksDataService.Object) - .AddSingleton(_ => mockRolesDataService.Object); - DataCacheService dataCacheService = new(serviceCollection); + ServiceProvider serviceProvider = new ServiceCollection().AddSingleton(_ => mockAccountDataService.Object) + .AddSingleton(_ => mockRanksDataService.Object) + .AddSingleton(_ => mockRolesDataService.Object) + .BuildServiceProvider(); + DataCacheService dataCacheService = new(serviceProvider); dataCacheService.RefreshCachedData(); From 4ff11be350f92424ff443210cc32ac7391553942 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 13 Dec 2020 14:02:32 +0000 Subject: [PATCH 291/369] Remove discord debug message. Reset migration --- UKSF.Api.Integrations.Discord/Services/DiscordService.cs | 3 --- UKSF.Api/Services/MigrationUtility.cs | 6 ++---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs index 9aedd057..104cc1b0 100644 --- a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs +++ b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs @@ -83,9 +83,6 @@ public async Task ConnectDiscord() { await _client.LoginAsync(TokenType.Bot, _configuration.GetConnectionString("discord")); await _client.StartAsync(); - - await Task.Delay(TimeSpan.FromSeconds(5)); - await _guild.GetTextChannel(522851104128499712).SendMessageAsync(Guid.NewGuid().ToString()); } public async Task SendMessage(ulong channelId, string message) { diff --git a/UKSF.Api/Services/MigrationUtility.cs b/UKSF.Api/Services/MigrationUtility.cs index 0e488c0d..0141b364 100644 --- a/UKSF.Api/Services/MigrationUtility.cs +++ b/UKSF.Api/Services/MigrationUtility.cs @@ -32,13 +32,11 @@ public MigrationUtility(IHostEnvironment currentEnvironment, IVariablesService v } public void Migrate() { - bool migrated = false; + bool migrated = true; if (!_currentEnvironment.IsDevelopment()) { - string migratedString = _variablesService.GetVariable(KEY).AsString(); - migrated = bool.Parse(migratedString); + migrated = _variablesService.GetVariable(KEY).AsBool(); } - // ReSharper disable once ConditionIsAlwaysTrueOrFalse if (!migrated) { try { ExecuteMigration(); From ab18e2eee2c643156ca3719975554f6638451016 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 13 Dec 2020 14:22:47 +0000 Subject: [PATCH 292/369] Update test.yml --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 522d1484..d4efe157 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,13 +14,13 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup .NET Core - uses: actions/setup-dotnet@v1.4.0 + uses: actions/setup-dotnet@v1.7.2 with: - dotnet-version: 5.0.100-rc.1.20452.10 + dotnet-version: 5.x - name: Build with dotnet run: dotnet build -c Release - name: Run tests with coverage - run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info /p:Exclude="[UKSF.Api.Signalr]*%2c[UKSF.PostMessage]*" + run: dotnet test ./UKSF.Api.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../coverage/lcov.info /p:Exclude="[UKSF.PostMessage]*" - name: Coveralls uses: coverallsapp/github-action@master with: From a6c35d33b6c4145df30e361cb97b475e52d12fa4 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 13 Dec 2020 14:40:31 +0000 Subject: [PATCH 293/369] Fix emotes --- UKSF.Api.Base/Context/MongoCollection.cs | 4 +- .../Services/DiscordService.cs | 40 +++++-------------- .../UKSF.Api.Models.csproj.DotSettings | 1 - 3 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings diff --git a/UKSF.Api.Base/Context/MongoCollection.cs b/UKSF.Api.Base/Context/MongoCollection.cs index 9011b4b3..68be6280 100644 --- a/UKSF.Api.Base/Context/MongoCollection.cs +++ b/UKSF.Api.Base/Context/MongoCollection.cs @@ -90,8 +90,8 @@ public async Task DeleteAsync(string id) { } public async Task DeleteManyAsync(Expression> predicate) { - IEnumerable ids = Get(predicate.Compile()) - .Select(x => x.Id); // This is necessary for filtering items by a default model value (e.g Role order default 0, may not be stored in document) + // This is necessary for filtering items by a default model value (e.g Role order default 0, may not be stored in document) + IEnumerable ids = Get(predicate.Compile()).Select(x => x.Id); await GetCollection().DeleteManyAsync(Builders.Filter.In(x => x.Id, ids)); } diff --git a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs index 104cc1b0..9cd915c8 100644 --- a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs +++ b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs @@ -255,9 +255,11 @@ private async Task ClientOnMessageReceived(SocketMessage incomingMessage) { } private static async Task HandleWeeklyEventsMessageReacts(IMessage incomingMessage) { - List reactionCodes = new() { ":Tuesday:", ":Thursday:", ":Friday:", ":Sunday:" }; - foreach (string reactionCode in reactionCodes) { - await incomingMessage.AddReactionAsync(new Emoji(reactionCode)); + List emotes = new() { + Emote.Parse("<:Tuesday:732349730809708564>"), Emote.Parse("<:Thursday:732349755816149062>"), Emote.Parse("<:Friday:732349765060395029>"), Emote.Parse("<:Sunday:732349782541991957>") + }; + foreach (Emote emote in emotes) { + await incomingMessage.AddReactionAsync(emote); } } @@ -342,14 +344,7 @@ private void AddUserEventLogs() { IEnumerable> groupedMessages = messages.GroupBy(x => x.Name); foreach (IGrouping groupedMessage in groupedMessages) { foreach (DiscordDeletedMessageResult result in groupedMessage) { - _logger.LogDiscordEvent( - DiscordUserEventType.MESSAGE_DELETED, - result.InstigatorId.ToString(), - result.InstigatorName, - channel.Name, - result.Name, - result.Message - ); + _logger.LogDiscordEvent(DiscordUserEventType.MESSAGE_DELETED, result.InstigatorId.ToString(), result.InstigatorName, channel.Name, result.Name, result.Message); } } }; @@ -362,14 +357,7 @@ private void AddUserEventLogs() { _logger.LogDiscordEvent(DiscordUserEventType.MESSAGE_DELETED, "0", "NO INSTIGATOR", channel.Name, string.Empty, $"Irretrievable message {cacheable.Id} deleted"); return; default: - _logger.LogDiscordEvent( - DiscordUserEventType.MESSAGE_DELETED, - result.InstigatorId.ToString(), - result.InstigatorName, - channel.Name, - result.Name, - result.Message - ); + _logger.LogDiscordEvent(DiscordUserEventType.MESSAGE_DELETED, result.InstigatorId.ToString(), result.InstigatorName, channel.Name, result.Name, result.Message); break; } }; @@ -418,14 +406,11 @@ private async Task GetMessageDeletedAuditLogInstigator(ulong channelId, u } private async Task GetBannedAuditLogInstigator(ulong userId) { - IAsyncEnumerator> auditLogsEnumerator = - _guild.GetAuditLogsAsync(10, RequestOptions.Default, null, null, ActionType.Ban).GetAsyncEnumerator(); + IAsyncEnumerator> auditLogsEnumerator = _guild.GetAuditLogsAsync(10, RequestOptions.Default, null, null, ActionType.Ban).GetAsyncEnumerator(); try { while (await auditLogsEnumerator.MoveNextAsync()) { IReadOnlyCollection auditLogs = auditLogsEnumerator.Current; - var auditUser = auditLogs.Where(x => x.Data is BanAuditLogData) - .Select(x => new { Data = x.Data as BanAuditLogData, x.User }) - .FirstOrDefault(x => x.Data.Target.Id == userId); + var auditUser = auditLogs.Where(x => x.Data is BanAuditLogData).Select(x => new { Data = x.Data as BanAuditLogData, x.User }).FirstOrDefault(x => x.Data.Target.Id == userId); if (auditUser != null) return auditUser.User.Id; } } finally { @@ -436,14 +421,11 @@ private async Task GetBannedAuditLogInstigator(ulong userId) { } private async Task GetUnbannedAuditLogInstigator(ulong userId) { - IAsyncEnumerator> auditLogsEnumerator = - _guild.GetAuditLogsAsync(10, RequestOptions.Default, null, null, ActionType.Unban).GetAsyncEnumerator(); + IAsyncEnumerator> auditLogsEnumerator = _guild.GetAuditLogsAsync(10, RequestOptions.Default, null, null, ActionType.Unban).GetAsyncEnumerator(); try { while (await auditLogsEnumerator.MoveNextAsync()) { IReadOnlyCollection auditLogs = auditLogsEnumerator.Current; - var auditUser = auditLogs.Where(x => x.Data is UnbanAuditLogData) - .Select(x => new { Data = x.Data as UnbanAuditLogData, x.User }) - .FirstOrDefault(x => x.Data.Target.Id == userId); + var auditUser = auditLogs.Where(x => x.Data is UnbanAuditLogData).Select(x => new { Data = x.Data as UnbanAuditLogData, x.User }).FirstOrDefault(x => x.Data.Target.Id == userId); if (auditUser != null) return auditUser.User.Id; } } finally { diff --git a/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings b/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings deleted file mode 100644 index e7d45a2a..00000000 --- a/UKSF.Api.Models/UKSF.Api.Models.csproj.DotSettings +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From b95654b88a36bc0733663e66cfd0ea2a86552010 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 13 Dec 2020 14:58:13 +0000 Subject: [PATCH 294/369] Fix modpack build prune deleting RC builds --- UKSF.Api.Integrations.Discord/Services/DiscordService.cs | 1 + UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs index 9cd915c8..252b154a 100644 --- a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs +++ b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs @@ -254,6 +254,7 @@ private async Task ClientOnMessageReceived(SocketMessage incomingMessage) { } } + // TODO: Remove reacts once 1 person has reacted for that day private static async Task HandleWeeklyEventsMessageReacts(IMessage incomingMessage) { List emotes = new() { Emote.Parse("<:Tuesday:732349730809708564>"), Emote.Parse("<:Thursday:732349755816149062>"), Emote.Parse("<:Friday:732349765060395029>"), Emote.Parse("<:Sunday:732349782541991957>") diff --git a/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs b/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs index e0ee1b54..01d7bf0d 100644 --- a/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs +++ b/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs @@ -32,7 +32,7 @@ public ActionPruneBuilds(IBuildsContext buildsContext, ISchedulerContext schedul public void Run(params object[] parameters) { int threshold = _buildsContext.Get(x => x.Environment == GameEnvironment.DEV).Select(x => x.BuildNumber).OrderByDescending(x => x).First() - 100; - Task modpackBuildsTask = _buildsContext.DeleteMany(x => x.BuildNumber < threshold); + Task modpackBuildsTask = _buildsContext.DeleteMany(x => x.Environment == GameEnvironment.DEV && x.BuildNumber < threshold); Task.WaitAll(modpackBuildsTask); } From 998fa3ab9045b941b556af35bf24910f71549ca5 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 14 Dec 2020 22:40:56 +0000 Subject: [PATCH 295/369] Add discord weekly announcement reaction handling --- .../Services/DiscordService.cs | 148 +++++++++++------- 1 file changed, 94 insertions(+), 54 deletions(-) diff --git a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs index 252b154a..05704c47 100644 --- a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs +++ b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs @@ -76,10 +76,7 @@ public async Task ConnectDiscord() { _client = new DiscordSocketClient(new DiscordSocketConfig { AlwaysDownloadUsers = true, MessageCacheSize = 1000 }); _client.Ready += OnClientOnReady; _client.Disconnected += ClientOnDisconnected; - _client.MessageReceived += ClientOnMessageReceived; - _client.UserJoined += ClientOnUserJoined; - _client.GuildMemberUpdated += ClientOnGuildMemberUpdated; - AddUserEventLogs(); + AddEventhandlers(); await _client.LoginAsync(TokenType.Bot, _configuration.GetConnectionString("discord")); await _client.StartAsync(); @@ -225,55 +222,6 @@ private async Task AssertOnline() { } } - private async Task ClientOnGuildMemberUpdated(SocketGuildUser oldUser, SocketGuildUser user) { - if (IsDiscordDisabled()) return; - - string oldRoles = oldUser.Roles.OrderBy(x => x.Id).Select(x => $"{x.Id}").Aggregate((x, y) => $"{x},{y}"); - string newRoles = user.Roles.OrderBy(x => x.Id).Select(x => $"{x.Id}").Aggregate((x, y) => $"{x},{y}"); - if (oldRoles != newRoles || oldUser.Nickname != user.Nickname) { - await UpdateAccount(null, user.Id); - } - } - - private async Task ClientOnUserJoined(SocketGuildUser user) { - if (IsDiscordDisabled()) return; - - await UpdateAccount(null, user.Id); - } - - private async Task ClientOnMessageReceived(SocketMessage incomingMessage) { - if (IsDiscordDisabled()) return; - - if (incomingMessage.Content.Contains(_variablesService.GetVariable("DISCORD_FILTER_WEEKLY_EVENTS").AsString(), StringComparison.InvariantCultureIgnoreCase)) { - await HandleWeeklyEventsMessageReacts(incomingMessage); - return; - } - - if (incomingMessage.Content.Contains("bot", StringComparison.InvariantCultureIgnoreCase) || incomingMessage.MentionedUsers.Any(x => x.IsBot)) { - await HandleBotMessageResponse(incomingMessage); - } - } - - // TODO: Remove reacts once 1 person has reacted for that day - private static async Task HandleWeeklyEventsMessageReacts(IMessage incomingMessage) { - List emotes = new() { - Emote.Parse("<:Tuesday:732349730809708564>"), Emote.Parse("<:Thursday:732349755816149062>"), Emote.Parse("<:Friday:732349765060395029>"), Emote.Parse("<:Sunday:732349782541991957>") - }; - foreach (Emote emote in emotes) { - await incomingMessage.AddReactionAsync(emote); - } - } - - private async Task HandleBotMessageResponse(SocketMessage incomingMessage) { - if (TRIGGERS.Any(x => incomingMessage.Content.Contains(x, StringComparison.InvariantCultureIgnoreCase))) { - bool owner = incomingMessage.Author.Id == _variablesService.GetVariable("DID_U_OWNER").AsUlong(); - string message = owner ? OWNER_REPLIES[new Random().Next(0, OWNER_REPLIES.Length)] : REPLIES[new Random().Next(0, REPLIES.Length)]; - string[] parts = _guild.GetUser(incomingMessage.Author.Id).Nickname.Split('.'); - string nickname = owner ? "Daddy" : parts.Length > 1 ? parts[1] : parts[0]; - await SendMessage(incomingMessage.Channel.Id, string.Format(message, nickname)); - } - } - private Task OnClientOnReady() { _guild = _client.GetGuild(_variablesService.GetVariable("DID_SERVER").AsUlong()); _roles = _guild.Roles; @@ -289,11 +237,18 @@ private Task ClientOnDisconnected(Exception arg) { return Task.CompletedTask; } - private void AddUserEventLogs() { + private void AddEventhandlers() { + _client.MessageReceived += ClientOnMessageReceived; + _client.UserJoined += ClientOnUserJoined; + _client.GuildMemberUpdated += ClientOnGuildMemberUpdated; + _client.ReactionAdded += ClientOnReactionAdded; + _client.ReactionRemoved += ClientOnReactionRemoved; + _client.UserJoined += user => { string name = GetUserNickname(user); string associatedAccountMessage = GetAssociatedAccountMessage(user.Id); _logger.LogDiscordEvent(DiscordUserEventType.JOINED, user.Id.ToString(), name, string.Empty, name, $"Joined, {associatedAccountMessage}"); + return Task.CompletedTask; }; @@ -364,6 +319,91 @@ private void AddUserEventLogs() { }; } + private async Task ClientOnGuildMemberUpdated(SocketGuildUser oldUser, SocketGuildUser user) { + if (IsDiscordDisabled()) return; + + string oldRoles = oldUser.Roles.OrderBy(x => x.Id).Select(x => $"{x.Id}").Aggregate((x, y) => $"{x},{y}"); + string newRoles = user.Roles.OrderBy(x => x.Id).Select(x => $"{x.Id}").Aggregate((x, y) => $"{x},{y}"); + if (oldRoles != newRoles || oldUser.Nickname != user.Nickname) { + await UpdateAccount(null, user.Id); + } + } + + private async Task ClientOnUserJoined(SocketGuildUser user) { + if (IsDiscordDisabled()) return; + + await UpdateAccount(null, user.Id); + } + + private async Task ClientOnMessageReceived(SocketMessage message) { + if (IsDiscordDisabled()) return; + + if (MessageIsWeeklyEventsMessage(message)) { + await HandleWeeklyEventsMessageReacts(message); + return; + } + + if (message.Content.Contains("bot", StringComparison.InvariantCultureIgnoreCase) || message.MentionedUsers.Any(x => x.IsBot)) { + await HandleBotMessageResponse(message); + } + } + + private static async Task HandleWeeklyEventsMessageReacts(IMessage incomingMessage) { + List emotes = new() { + Emote.Parse("<:Tuesday:732349730809708564>"), Emote.Parse("<:Thursday:732349755816149062>"), Emote.Parse("<:Friday:732349765060395029>"), Emote.Parse("<:Sunday:732349782541991957>") + }; + + foreach (Emote emote in emotes) { + await incomingMessage.AddReactionAsync(emote); + } + } + + private async Task HandleBotMessageResponse(SocketMessage incomingMessage) { + if (TRIGGERS.Any(x => incomingMessage.Content.Contains(x, StringComparison.InvariantCultureIgnoreCase))) { + bool owner = incomingMessage.Author.Id == _variablesService.GetVariable("DID_U_OWNER").AsUlong(); + string message = owner ? OWNER_REPLIES[new Random().Next(0, OWNER_REPLIES.Length)] : REPLIES[new Random().Next(0, REPLIES.Length)]; + string[] parts = _guild.GetUser(incomingMessage.Author.Id).Nickname.Split('.'); + string nickname = owner ? "Daddy" : parts.Length > 1 ? parts[1] : parts[0]; + await SendMessage(incomingMessage.Channel.Id, string.Format(message, nickname)); + } + } + + private async Task ClientOnReactionAdded(Cacheable cacheable, ISocketMessageChannel channel, SocketReaction reaction) { + if (IsDiscordDisabled()) return; + + IUserMessage message = await cacheable.GetOrDownloadAsync(); + if (!MessageIsWeeklyEventsMessage(message)) { + return; + } + + if (!message.Reactions.TryGetValue(reaction.Emote, out ReactionMetadata metadata)) { + return; + } + + if (!metadata.IsMe) { + return; + } + + if (metadata.ReactionCount > 1) { + await message.RemoveReactionAsync(reaction.Emote, _client.CurrentUser); + } + } + + private async Task ClientOnReactionRemoved(Cacheable cacheable, ISocketMessageChannel channel, SocketReaction reaction) { + if (IsDiscordDisabled()) return; + + IUserMessage message = await cacheable.GetOrDownloadAsync(); + if (!MessageIsWeeklyEventsMessage(message)) { + return; + } + + if (!message.Reactions.TryGetValue(reaction.Emote, out ReactionMetadata _)) { + await message.AddReactionAsync(reaction.Emote); + } + } + + private bool MessageIsWeeklyEventsMessage(IMessage message) => message != null && message.Content.Contains(_variablesService.GetVariable("DISCORD_FILTER_WEEKLY_EVENTS").AsString(), StringComparison.InvariantCultureIgnoreCase); + private string GetAssociatedAccountMessage(ulong userId) { Account account = _accountContext.GetSingle(x => x.DiscordId == userId.ToString()); return account == null ? "with no associated account" : $"with associated account ({account.Id}, {_displayNameService.GetDisplayName(account)})"; From aa60cf57d6d858f97afb5e541078ed3dac55f226 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 17 Dec 2020 22:37:45 +0000 Subject: [PATCH 296/369] Fixed change detection for types without fields --- .../Controllers/GameServersController.cs | 27 ++++++------- .../CommandRequestsCreationController.cs | 10 ++++- .../Services/DiscordService.cs | 2 +- UKSF.Api.Shared/Extensions/ChangeUtilities.cs | 38 ++++++++++++------- .../Unit/Common/ChangeUtilitiesTests.cs | 12 +++++- 5 files changed, 57 insertions(+), 32 deletions(-) diff --git a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs index 5edc21f7..36269116 100644 --- a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs +++ b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs @@ -92,18 +92,18 @@ public async Task EditGameServer([FromBody] GameServer gameServer await _gameServersContext.Update( gameServer.Id, - Builders.Update.Set("name", gameServer.Name) - .Set("port", gameServer.Port) - .Set("apiPort", gameServer.ApiPort) - .Set("numberHeadlessClients", gameServer.NumberHeadlessClients) - .Set("profileName", gameServer.ProfileName) - .Set("hostName", gameServer.HostName) - .Set("password", gameServer.Password) - .Set("adminPassword", gameServer.AdminPassword) - .Set("environment", gameServer.Environment) - .Set("serverOption", gameServer.ServerOption) - .Set("mods", gameServer.Mods) - .Set("serverMods", gameServer.ServerMods) + Builders.Update.Set(x => x.Name, gameServer.Name) + .Set(x => x.Port, gameServer.Port) + .Set(x => x.ApiPort, gameServer.ApiPort) + .Set(x => x.NumberHeadlessClients, gameServer.NumberHeadlessClients) + .Set(x => x.ProfileName, gameServer.ProfileName) + .Set(x => x.HostName, gameServer.HostName) + .Set(x => x.Password, gameServer.Password) + .Set(x => x.AdminPassword, gameServer.AdminPassword) + .Set(x => x.Environment, gameServer.Environment) + .Set(x => x.ServerOption, gameServer.ServerOption) + .Set(x => x.Mods, gameServer.Mods) + .Set(x => x.ServerMods, gameServer.ServerMods) ); return Ok(new { environmentChanged }); } @@ -169,7 +169,6 @@ public async Task LaunchServer(string id, [FromBody] JObject data return BadRequest("Server cannot be launched while another server with the same port is running"); } - // Patch mission string missionSelection = data["missionName"].ToString(); MissionPatchingResult patchingResult = await _gameServersService.PatchMissionFile(missionSelection); if (!patchingResult.Success) { @@ -183,11 +182,9 @@ public async Task LaunchServer(string id, [FromBody] JObject data ); } - // Write config _gameServersService.WriteServerConfig(gameServer, patchingResult.PlayerCount, missionSelection); gameServer.Status.Mission = missionSelection; - // Execute launch await _gameServersService.LaunchGameServer(gameServer); _logger.LogAudit($"Game server launched '{missionSelection}' on '{gameServer.Name}'"); diff --git a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs index fd8728c9..7e038327 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs @@ -49,10 +49,16 @@ public async Task CreateRequestRank([FromBody] CommandRequest req request.Requester = _httpContextService.GetUserId(); request.DisplayValue = request.Value; request.DisplayFrom = _accountContext.GetSingle(request.Recipient).Rank; - if (request.DisplayValue == request.DisplayFrom) return BadRequest("Ranks are equal"); + if (request.DisplayValue == request.DisplayFrom) { + return BadRequest("Ranks are equal"); + } + bool direction = _ranksService.IsSuperior(request.DisplayValue, request.DisplayFrom); request.Type = string.IsNullOrEmpty(request.DisplayFrom) ? CommandRequestType.PROMOTION : direction ? CommandRequestType.PROMOTION : CommandRequestType.DEMOTION; - if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + if (_commandRequestService.DoesEquivalentRequestExist(request)) { + return BadRequest("An equivalent request already exists"); + } + await _commandRequestService.Add(request); return Ok(); } diff --git a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs index 05704c47..bfb4646c 100644 --- a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs +++ b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs @@ -391,7 +391,7 @@ private async Task ClientOnReactionAdded(Cacheable cacheabl private async Task ClientOnReactionRemoved(Cacheable cacheable, ISocketMessageChannel channel, SocketReaction reaction) { if (IsDiscordDisabled()) return; - + IUserMessage message = await cacheable.GetOrDownloadAsync(); if (!MessageIsWeeklyEventsMessage(message)) { return; diff --git a/UKSF.Api.Shared/Extensions/ChangeUtilities.cs b/UKSF.Api.Shared/Extensions/ChangeUtilities.cs index b1c4b362..f07764f9 100644 --- a/UKSF.Api.Shared/Extensions/ChangeUtilities.cs +++ b/UKSF.Api.Shared/Extensions/ChangeUtilities.cs @@ -12,7 +12,14 @@ public static class ChangeUtilities { private static List GetChanges(this T original, T updated) { List changes = new(); Type type = original.GetType(); - foreach (FieldInfo fieldInfo in type.GetFields()) { + IEnumerable fields = type.GetFields(); + + if (!fields.Any()) { + changes.Add(GetChange(type, type.Name.Split('`')[0], original, updated)); + return changes; + } + + foreach (FieldInfo fieldInfo in fields) { string name = fieldInfo.Name; object originalValue = fieldInfo.GetValue(original); object updatedValue = fieldInfo.GetValue(updated); @@ -20,26 +27,31 @@ private static List GetChanges(this T original, T updated) { if (DeepEquals(originalValue, updatedValue)) continue; if (fieldInfo.FieldType.IsClass && !fieldInfo.FieldType.IsSerializable) { - // Class, recurse changes.Add(new Change { Type = ChangeType.CLASS, Name = name, InnerChanges = GetChanges(originalValue, updatedValue) }); - } else if (fieldInfo.FieldType != typeof(string) && updatedValue is IEnumerable originalListValue && originalValue is IEnumerable updatedListValue) { - // List, get list changes - changes.Add(new Change { Type = ChangeType.LIST, Name = name, InnerChanges = GetListChanges(originalListValue, updatedListValue) }); } else { - // Assume otherwise normal field - if (originalValue == null) { - changes.Add(new Change { Type = ChangeType.ADDITION, Name = name, Updated = updatedValue.ToString() }); - } else if (updatedValue == null) { - changes.Add(new Change { Type = ChangeType.REMOVAL, Name = name, Original = originalValue.ToString() }); - } else { - changes.Add(new Change { Type = ChangeType.CHANGE, Name = name, Original = originalValue.ToString(), Updated = updatedValue.ToString() }); - } + changes.Add(GetChange(fieldInfo.FieldType, name, originalValue, updatedValue)); } } return changes; } + private static Change GetChange(Type type, string name, object original, object updated) { + if (type != typeof(string) && updated is IEnumerable originalListValue && original is IEnumerable updatedListValue) { + return new Change { Type = ChangeType.LIST, Name = name == string.Empty ? "List" : name, InnerChanges = GetListChanges(originalListValue, updatedListValue) }; + } + + if (original == null) { + return new Change { Type = ChangeType.ADDITION, Name = name, Updated = updated.ToString() }; + } + + if (updated == null) { + return new Change { Type = ChangeType.REMOVAL, Name = name, Original = original.ToString() }; + } + + return new Change { Type = ChangeType.CHANGE, Name = name, Original = original.ToString(), Updated = updated.ToString() }; + } + private static List GetListChanges(this IEnumerable original, IEnumerable updated) { List originalObjects = original == null ? new List() : original.Cast().ToList(); List updatedObjects = updated == null ? new List() : updated.Cast().ToList(); diff --git a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs index 72640dd9..ea5a8b59 100644 --- a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs @@ -110,7 +110,7 @@ public void Should_detect_changes_for_object_list() { } [Fact] - public void Should_detect_changes_for_simple_list() { + public void Should_detect_changes_for_simple_object_with_list() { string id = ObjectId.GenerateNewId().ToString(); Account original = new() { Id = id, RolePreferences = new List { "Aviatin", "NCO" } }; Account updated = new() { Id = id, RolePreferences = new List { "Aviation", "NCO", "Officer" } }; @@ -159,5 +159,15 @@ public void Should_do_nothing_when_objects_are_equal() { subject.Should().Be("\tNo changes"); } + + [Fact] + public void Should_detect_changes_for_simple_list() { + List original = new() { "Aviatin", "NCO" }; + List updated = new() { "Aviation", "NCO", "Officer" }; + + string subject = original.Changes(updated); + + subject.Should().Be("\n\t'List' changed:" + "\n\t\tadded: 'Aviation'" + "\n\t\tadded: 'Officer'" + "\n\t\tremoved: 'Aviatin'"); + } } } From 9942d1003c351bfc0d2966edc2db19144892cc9a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 18 Dec 2020 13:04:04 +0000 Subject: [PATCH 297/369] Simplify server mods update --- .../Controllers/GameServersController.cs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs index 36269116..43f0398c 100644 --- a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs +++ b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs @@ -81,7 +81,7 @@ public async Task AddServer([FromBody] GameServer gameServer) { [HttpPatch, Authorize] public async Task EditGameServer([FromBody] GameServer gameServer) { - GameServer oldGameServer = _gameServersContext.GetSingle(x => x.Id == gameServer.Id); + GameServer oldGameServer = _gameServersContext.GetSingle(gameServer.Id); _logger.LogAudit($"Game server '{gameServer.Name}' updated:{oldGameServer.Changes(gameServer)}"); bool environmentChanged = false; if (oldGameServer.Environment != gameServer.Environment) { @@ -110,7 +110,7 @@ await _gameServersContext.Update( [HttpDelete("{id}"), Authorize] public async Task DeleteGameServer(string id) { - GameServer gameServer = _gameServersContext.GetSingle(x => x.Id == id); + GameServer gameServer = _gameServersContext.GetSingle(id); _logger.LogAudit($"Game server deleted '{gameServer.Name}'"); await _gameServersContext.Delete(id); @@ -229,14 +229,11 @@ public IActionResult KillAllArmaProcesses() { public IActionResult GetAvailableMods(string id) => Ok(_gameServersService.GetAvailableMods(id)); [HttpPost("{id}/mods"), Authorize] - public async Task SetGameServerMods(string id, [FromBody] JObject body) { - List mods = JsonConvert.DeserializeObject>(body.GetValueFromBody("mods")); - List serverMods = JsonConvert.DeserializeObject>(body.GetValueFromBody("serverMods")); - GameServer gameServer = _gameServersContext.GetSingle(id); - _logger.LogAudit($"Game server '{gameServer.Name}' mods updated:{gameServer.Mods.Select(x => x.Name).Changes(mods.Select(x => x.Name))}"); - _logger.LogAudit($"Game server '{gameServer.Name}' serverMods updated:{gameServer.ServerMods.Select(x => x.Name).Changes(serverMods.Select(x => x.Name))}"); + public async Task SetGameServerMods(string id, [FromBody] GameServer gameServer) { + GameServer oldGameServer = _gameServersContext.GetSingle(id); await _gameServersContext.Update(id, Builders.Update.Unset(x => x.Mods).Unset(x => x.ServerMods)); - await _gameServersContext.Update(id, Builders.Update.Set(x => x.Mods, mods).Set(x => x.ServerMods, serverMods)); + await _gameServersContext.Update(id, Builders.Update.Set(x => x.Mods, gameServer.Mods).Set(x => x.ServerMods, gameServer.ServerMods)); + _logger.LogAudit($"Game server '{gameServer.Name}' updated:{oldGameServer.Changes(gameServer)}"); return Ok(_gameServersService.GetAvailableMods(id)); } From 0ec20b0f3fe0a5c775b609a68177b56a363e5f82 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 20 Dec 2020 11:44:03 +0000 Subject: [PATCH 298/369] Add timestamp to discord left comment --- .../EventHandlers/DiscordEventHandler.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs index 0cf39b76..4c68e8ac 100644 --- a/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs @@ -1,3 +1,4 @@ +using System; using System.Threading.Tasks; using MongoDB.Bson; using UKSF.Api.Base.Events; @@ -45,10 +46,11 @@ private async Task HandleEvent(EventModel eventModel, DiscordEventData discordEv private async Task LeftEvent(string accountId) { Account account = _accountContext.GetSingle(accountId); - // if (account.MembershipState == MembershipState.CONFIRMED) { - string name = _displayNameService.GetDisplayName(account); - await _commentThreadService.InsertComment(account.Application.RecruiterCommentThread, new Comment { Author = ObjectId.Empty.ToString(), Content = $"{name} left the Discord" }); - // } + string name = _displayNameService.GetDisplayName(account); + await _commentThreadService.InsertComment( + account.Application.RecruiterCommentThread, + new Comment { Author = ObjectId.Empty.ToString(), Content = $"{name} left the Discord", Timestamp = DateTime.Now } + ); } } } From ea26a4e8024932295aa2393fe562e0f58426bc43 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 23 Dec 2020 10:41:34 +0000 Subject: [PATCH 299/369] Skip left discord comment if discharged or unconfirmed account --- UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs index 4c68e8ac..6273838a 100644 --- a/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs @@ -46,6 +46,10 @@ private async Task HandleEvent(EventModel eventModel, DiscordEventData discordEv private async Task LeftEvent(string accountId) { Account account = _accountContext.GetSingle(accountId); + if (account.MembershipState == MembershipState.DISCHARGED || account.MembershipState == MembershipState.UNCONFIRMED) { + return; + } + string name = _displayNameService.GetDisplayName(account); await _commentThreadService.InsertComment( account.Application.RecruiterCommentThread, From ac30b1fad2e62e21ce40430cffd76da6d00082f8 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 23 Dec 2020 15:52:57 +0000 Subject: [PATCH 300/369] Fix build processing error handling, and build step service scope --- UKSF.Api.Modpack/ApiModpackExtensions.cs | 4 +- .../BuildProcess/BuildProcessorService.cs | 15 +++- .../BuildProcess/BuildQueueService.cs | 2 +- .../Services/BuildProcess/BuildStepService.cs | 76 +++++++++---------- UKSF.Api.Modpack/Services/BuildsService.cs | 2 +- 5 files changed, 54 insertions(+), 45 deletions(-) diff --git a/UKSF.Api.Modpack/ApiModpackExtensions.cs b/UKSF.Api.Modpack/ApiModpackExtensions.cs index dd1de3d2..b0a61fd8 100644 --- a/UKSF.Api.Modpack/ApiModpackExtensions.cs +++ b/UKSF.Api.Modpack/ApiModpackExtensions.cs @@ -22,9 +22,9 @@ private static IServiceCollection AddServices(this IServiceCollection services) .AddTransient() .AddTransient() .AddTransient() - .AddTransient() + .AddSingleton() .AddSingleton() - .AddTransient(); + .AddSingleton(); private static IServiceCollection AddActions(this IServiceCollection services) => services.AddSingleton(); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs index 0d99be58..34a405de 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs @@ -10,7 +10,7 @@ namespace UKSF.Api.Modpack.Services.BuildProcess { public interface IBuildProcessorService { - Task ProcessBuild(ModpackBuild build, CancellationTokenSource cancellationTokenSource); + Task ProcessBuildWithErrorHandling(ModpackBuild build, CancellationTokenSource cancellationTokenSource); } public class BuildProcessorService : IBuildProcessorService { @@ -26,7 +26,16 @@ public BuildProcessorService(IServiceProvider serviceProvider, IBuildStepService _logger = logger; } - public async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cancellationTokenSource) { + public async Task ProcessBuildWithErrorHandling(ModpackBuild build, CancellationTokenSource cancellationTokenSource) { + try { + await ProcessBuild(build, cancellationTokenSource); + } catch (Exception exception) { + _logger.LogError(exception); + await _buildsService.FailBuild(build); + } + } + + private async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cancellationTokenSource) { await _buildsService.SetBuildRunning(build); foreach (ModpackBuildStep buildStep in build.Steps) { @@ -92,7 +101,7 @@ private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) { restoreStep, async updateDefinition => await _buildsService.UpdateBuild(build, updateDefinition), async () => await _buildsService.UpdateBuildStep(build, restoreStep), - new CancellationTokenSource() + new() ); build.Steps.Add(restoreStep); await _buildsService.UpdateBuildStep(build, restoreStep); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs index 00c1b5a4..e1b34446 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs @@ -95,7 +95,7 @@ private async Task ProcessQueue() { CancellationTokenSource cancellationTokenSource = new(); _cancellationTokenSources.TryAdd(build.Id, cancellationTokenSource); - Task buildTask = _buildProcessorService.ProcessBuild(build, cancellationTokenSource); + Task buildTask = _buildProcessorService.ProcessBuildWithErrorHandling(build, cancellationTokenSource); _buildTasks.TryAdd(build.Id, buildTask); await buildTask; _cancellationTokenSources.TryRemove(build.Id, out CancellationTokenSource _); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs index 2d859fa4..4008bb45 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs @@ -54,52 +54,52 @@ public IBuildStep ResolveBuildStep(string buildStepName) { private static List GetStepsForBuild() => new() { - new ModpackBuildStep(BuildStepPrep.NAME), - new ModpackBuildStep(BuildStepClean.NAME), - new ModpackBuildStep(BuildStepSources.NAME), - new ModpackBuildStep(BuildStepBuildAce.NAME), - new ModpackBuildStep(BuildStepBuildAcre.NAME), - new ModpackBuildStep(BuildStepBuildF35.NAME), - new ModpackBuildStep(BuildStepBuildModpack.NAME), - new ModpackBuildStep(BuildStepIntercept.NAME), - new ModpackBuildStep(BuildStepExtensions.NAME), - new ModpackBuildStep(BuildStepSignDependencies.NAME), - new ModpackBuildStep(BuildStepDeploy.NAME), - new ModpackBuildStep(BuildStepKeys.NAME), - new ModpackBuildStep(BuildStepCbaSettings.NAME), - new ModpackBuildStep(BuildStepBuildRepo.NAME) + new(BuildStepPrep.NAME), + new(BuildStepClean.NAME), + new(BuildStepSources.NAME), + new(BuildStepBuildAce.NAME), + new(BuildStepBuildAcre.NAME), + new(BuildStepBuildF35.NAME), + new(BuildStepBuildModpack.NAME), + new(BuildStepIntercept.NAME), + new(BuildStepExtensions.NAME), + new(BuildStepSignDependencies.NAME), + new(BuildStepDeploy.NAME), + new(BuildStepKeys.NAME), + new(BuildStepCbaSettings.NAME), + new(BuildStepBuildRepo.NAME) }; private static List GetStepsForRc() => new() { - new ModpackBuildStep(BuildStepPrep.NAME), - new ModpackBuildStep(BuildStepClean.NAME), - new ModpackBuildStep(BuildStepSources.NAME), - new ModpackBuildStep(BuildStepBuildAce.NAME), - new ModpackBuildStep(BuildStepBuildAcre.NAME), - new ModpackBuildStep(BuildStepBuildF35.NAME), - new ModpackBuildStep(BuildStepBuildModpack.NAME), - new ModpackBuildStep(BuildStepIntercept.NAME), - new ModpackBuildStep(BuildStepExtensions.NAME), - new ModpackBuildStep(BuildStepSignDependencies.NAME), - new ModpackBuildStep(BuildStepDeploy.NAME), - new ModpackBuildStep(BuildStepKeys.NAME), - new ModpackBuildStep(BuildStepCbaSettings.NAME), - new ModpackBuildStep(BuildStepBuildRepo.NAME), - new ModpackBuildStep(BuildStepNotify.NAME) + new(BuildStepPrep.NAME), + new(BuildStepClean.NAME), + new(BuildStepSources.NAME), + new(BuildStepBuildAce.NAME), + new(BuildStepBuildAcre.NAME), + new(BuildStepBuildF35.NAME), + new(BuildStepBuildModpack.NAME), + new(BuildStepIntercept.NAME), + new(BuildStepExtensions.NAME), + new(BuildStepSignDependencies.NAME), + new(BuildStepDeploy.NAME), + new(BuildStepKeys.NAME), + new(BuildStepCbaSettings.NAME), + new(BuildStepBuildRepo.NAME), + new(BuildStepNotify.NAME) }; private static List GetStepsForRelease() => new() { - new ModpackBuildStep(BuildStepClean.NAME), - new ModpackBuildStep(BuildStepBackup.NAME), - new ModpackBuildStep(BuildStepDeploy.NAME), - new ModpackBuildStep(BuildStepReleaseKeys.NAME), - new ModpackBuildStep(BuildStepCbaSettings.NAME), - new ModpackBuildStep(BuildStepBuildRepo.NAME), - new ModpackBuildStep(BuildStepPublish.NAME), - new ModpackBuildStep(BuildStepNotify.NAME), - new ModpackBuildStep(BuildStepMerge.NAME) + new(BuildStepClean.NAME), + new(BuildStepBackup.NAME), + new(BuildStepDeploy.NAME), + new(BuildStepReleaseKeys.NAME), + new(BuildStepCbaSettings.NAME), + new(BuildStepBuildRepo.NAME), + new(BuildStepPublish.NAME), + new(BuildStepNotify.NAME), + new(BuildStepMerge.NAME) }; private static void ResolveIndices(IReadOnlyList steps) { diff --git a/UKSF.Api.Modpack/Services/BuildsService.cs b/UKSF.Api.Modpack/Services/BuildsService.cs index a31f56f0..542bb369 100644 --- a/UKSF.Api.Modpack/Services/BuildsService.cs +++ b/UKSF.Api.Modpack/Services/BuildsService.cs @@ -174,7 +174,7 @@ public void CancelInterruptedBuilds() { runningStep.Finished = true; runningStep.EndTime = DateTime.Now; runningStep.BuildResult = ModpackBuildResult.CANCELLED; - runningStep.Logs.Add(new ModpackBuildStepLogItem { Text = "\nBuild was interrupted", Colour = "goldenrod" }); + runningStep.Logs.Add(new() { Text = "\nBuild was interrupted", Colour = "goldenrod" }); await _buildsContext.Update(build, runningStep); } From 78f5c08e56faa78e0294f20894350911e69cfe59 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 27 Dec 2020 15:09:38 +0000 Subject: [PATCH 301/369] Update mission patching data resolvers for new jsfaw structure --- .../Services/MissionDataResolver.cs | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs index 891db2de..e1106df9 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs @@ -11,11 +11,8 @@ public static string ResolveObjectClass(MissionPlayer player) { return player.Unit.SourceUnit.Id switch { "5a435eea905d47336442c75a" => "UKSF_B_Pilot", // "Joint Special Forces Aviation Wing" + "5fe39de7815f5f03801134f7" => "UKSF_B_Pilot", // "Combat Ready" "5a848590eab14d12cc7fa618" => "UKSF_B_Pilot", // "RAF Cranwell" - "5c98d7b396dba31f24cdb19c" => "UKSF_B_Pilot", // "51 Squadron" - "5a441619730e9d162834500b" => "UKSF_B_Pilot_7", // "7 Squadron" - "5a441602730e9d162834500a" => "UKSF_B_Pilot_656", // "656 Squadron" - "5a4415d8730e9d1628345007" => "UKSF_B_Pilot_617", // "617 Squadron" "5a68b28e196530164c9b4fed" => "UKSF_B_Sniper", // "Sniper Platoon" "5b9123ca7a6c1f0e9875601c" => "UKSF_B_Medic", // "3 Medical Regiment" // "5a42835b55d6109bf0b081bd" => ResolvePlayerUnitRole(player) == 3 ? "UKSF_B_Officer" : "UKSF_B_Rifleman", // "UKSF" @@ -40,11 +37,8 @@ public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) { return unit.SourceUnit.Id switch { "5a42835b55d6109bf0b081bd" => "JSFAW", // "UKSF" "5a435eea905d47336442c75a" => "JSFAW", // "Joint Special Forces Aviation Wing" - "5a441619730e9d162834500b" => "JSFAW", // "7 Squadron" - "5a441602730e9d162834500a" => "JSFAW", // "656 Squadron" - "5a4415d8730e9d1628345007" => "JSFAW", // "617 Squadron" + "5fe39de7815f5f03801134f7" => "JSFAW", // "Combat Ready" "5a848590eab14d12cc7fa618" => "JSFAW", // "RAF Cranwell" - "5c98d7b396dba31f24cdb19c" => "JSFAW", // "51 Squadron" _ => defaultCallsign }; } @@ -52,11 +46,8 @@ public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) { public static void ResolveSpecialUnits(List orderedUnits) { List ids = new() { "5a42835b55d6109bf0b081bd", // "UKSF" - "5a441619730e9d162834500b", // "7 Squadron" - "5a441602730e9d162834500a", // "656 Squadron" - "5a4415d8730e9d1628345007", // "617 Squadron" - "5a848590eab14d12cc7fa618", // "RAF Cranwell" - "5c98d7b396dba31f24cdb19c" // "51 Squadron" + "5fe39de7815f5f03801134f7", // "Combat Ready" + "5a848590eab14d12cc7fa618" // "RAF Cranwell" }; orderedUnits.RemoveAll(x => ids.Contains(x.SourceUnit.Id)); } @@ -69,11 +60,8 @@ public static List ResolveUnitSlots(MissionUnit unit) { case "5a435eea905d47336442c75a": // "Joint Special Forces Aviation Wing" slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5a42835b55d6109bf0b081bd")?.Members ?? new List()); slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5a435eea905d47336442c75a")?.Members ?? new List()); - slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5a441619730e9d162834500b")?.Members ?? new List()); - slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5a441602730e9d162834500a")?.Members ?? new List()); - slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5a4415d8730e9d1628345007")?.Members ?? new List()); + slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5fe39de7815f5f03801134f7")?.Members ?? new List()); slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5a848590eab14d12cc7fa618")?.Members ?? new List()); - slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5c98d7b396dba31f24cdb19c")?.Members ?? new List()); break; case "5a68b28e196530164c9b4fed": // "Sniper Platoon" max = 3; From f34d6eec0be61066d279fe53e3a3703ec631dcc5 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 10 Jan 2021 12:39:14 +0000 Subject: [PATCH 302/369] Add instagram token job reset --- UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs | 5 ++++- UKSF.Api.Base/ScheduledActions/IScheduledAction.cs | 6 ++++-- .../ISelfCreatingScheduledAction.cs | 1 + .../Controllers/InstagramController.cs | 14 +++++++++++++- .../ScheduledActions/ActionInstagramImages.cs | 8 ++++---- .../ScheduledActions/ActionInstagramToken.cs | 13 ++++++++++--- .../ScheduledActions/ActionTeamspeakSnapshot.cs | 6 +++--- .../ScheduledActions/ActionPruneBuilds.cs | 5 ++++- .../ActionDeleteExpiredConfirmationCode.cs | 10 ++++++++-- .../ScheduledActions/ActionPruneNotifications.cs | 5 ++++- UKSF.Api.Shared/Services/SchedulerService.cs | 2 +- .../DeleteExpiredConfirmationCodeActionTests.cs | 11 ++++++----- .../ScheduledActions/PruneDataActionTests.cs | 12 ++++++------ .../TeamspeakSnapshotActionTests.cs | 7 ++++--- 14 files changed, 72 insertions(+), 33 deletions(-) diff --git a/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs b/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs index fa3c72a5..3e18a916 100644 --- a/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs +++ b/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs @@ -39,13 +39,14 @@ IClock clock public string Name => ACTION_NAME; - public void Run(params object[] parameters) { + public Task Run(params object[] parameters) { DateTime now = _clock.UtcNow(); Task logsTask = _logContext.DeleteMany(x => x.Timestamp < now.AddDays(-7)); Task auditLogsTask = _auditLogContext.DeleteMany(x => x.Timestamp < now.AddMonths(-3)); Task errorLogsTask = _httpErrorLogContext.DeleteMany(x => x.Timestamp < now.AddDays(-7)); Task.WaitAll(logsTask, errorLogsTask, auditLogsTask); + return Task.CompletedTask; } public async Task CreateSelf() { @@ -55,5 +56,7 @@ public async Task CreateSelf() { await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); } } + + public Task Reset() => Task.CompletedTask; } } diff --git a/UKSF.Api.Base/ScheduledActions/IScheduledAction.cs b/UKSF.Api.Base/ScheduledActions/IScheduledAction.cs index a66f8b69..df16ffe4 100644 --- a/UKSF.Api.Base/ScheduledActions/IScheduledAction.cs +++ b/UKSF.Api.Base/ScheduledActions/IScheduledAction.cs @@ -1,6 +1,8 @@ -namespace UKSF.Api.Base.ScheduledActions { +using System.Threading.Tasks; + +namespace UKSF.Api.Base.ScheduledActions { public interface IScheduledAction { string Name { get; } - void Run(params object[] parameters); + Task Run(params object[] parameters); } } diff --git a/UKSF.Api.Base/ScheduledActions/ISelfCreatingScheduledAction.cs b/UKSF.Api.Base/ScheduledActions/ISelfCreatingScheduledAction.cs index 367b5b98..d86919c2 100644 --- a/UKSF.Api.Base/ScheduledActions/ISelfCreatingScheduledAction.cs +++ b/UKSF.Api.Base/ScheduledActions/ISelfCreatingScheduledAction.cs @@ -3,5 +3,6 @@ namespace UKSF.Api.Base.ScheduledActions { public interface ISelfCreatingScheduledAction : IScheduledAction { Task CreateSelf(); + Task Reset(); } } diff --git a/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs b/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs index 64c5fb69..d738fe9b 100644 --- a/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs +++ b/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs @@ -1,16 +1,28 @@ using System.Collections.Generic; +using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using UKSF.Api.Integrations.Instagram.Models; +using UKSF.Api.Integrations.Instagram.ScheduledActions; using UKSF.Api.Integrations.Instagram.Services; +using UKSF.Api.Shared; namespace UKSF.Api.Integrations.Instagram.Controllers { [Route("[controller]")] public class InstagramController : Controller { private readonly IInstagramService _instagramService; + private readonly IActionInstagramToken _actionInstagramToken; - public InstagramController(IInstagramService instagramService) => _instagramService = instagramService; + public InstagramController(IInstagramService instagramService, IActionInstagramToken actionInstagramToken) { + _instagramService = instagramService; + _actionInstagramToken = actionInstagramToken; + } [HttpGet] public IEnumerable GetImages() => _instagramService.GetImages(); + + [HttpGet("refreshToken"), Permissions(Permissions.ADMIN)] + public async Task RefreshToken() { + await _actionInstagramToken.Reset(); + } } } diff --git a/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs index 1f0ab4d0..06522fff 100644 --- a/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs +++ b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs @@ -25,16 +25,16 @@ public ActionInstagramImages(ISchedulerContext schedulerContext, IInstagramServi public string Name => ACTION_NAME; - public void Run(params object[] parameters) { - Task unused = _instagramService.CacheInstagramImages(); - } + public Task Run(params object[] parameters) => _instagramService.CacheInstagramImages(); public async Task CreateSelf() { if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { await _schedulerService.CreateScheduledJob(_clock.Today(), TimeSpan.FromMinutes(15), ACTION_NAME); } - Run(); + await Run(); } + + public Task Reset() => Task.CompletedTask; } } diff --git a/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs index 2eaafb18..a134504b 100644 --- a/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs +++ b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs @@ -3,6 +3,7 @@ using UKSF.Api.Base.ScheduledActions; using UKSF.Api.Integrations.Instagram.Services; using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Models; using UKSF.Api.Shared.Services; namespace UKSF.Api.Integrations.Instagram.ScheduledActions { @@ -25,14 +26,20 @@ public ActionInstagramToken(ISchedulerContext schedulerContext, IInstagramServic public string Name => ACTION_NAME; - public void Run(params object[] parameters) { - Task unused = _instagramService.RefreshAccessToken(); - } + public Task Run(params object[] parameters) => _instagramService.RefreshAccessToken(); public async Task CreateSelf() { if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(45), TimeSpan.FromDays(45), ACTION_NAME); } } + + public async Task Reset() { + ScheduledJob job = _schedulerContext.GetSingle(x => x.Action == ACTION_NAME); + await _schedulerContext.Delete(job.Id); + + await CreateSelf(); + await Run(); + } } } diff --git a/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs b/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs index 875ee944..a139637d 100644 --- a/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs +++ b/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs @@ -28,9 +28,7 @@ public ActionTeamspeakSnapshot(ISchedulerContext schedulerContext, ITeamspeakSer public string Name => ACTION_NAME; - public void Run(params object[] parameters) { - _teamspeakService.StoreTeamspeakServerSnapshot(); - } + public Task Run(params object[] parameters) => _teamspeakService.StoreTeamspeakServerSnapshot(); public async Task CreateSelf() { if (_currentEnvironment.IsDevelopment()) return; @@ -39,5 +37,7 @@ public async Task CreateSelf() { await _schedulerService.CreateScheduledJob(_clock.Today().AddMinutes(5), TimeSpan.FromMinutes(5), ACTION_NAME); } } + + public Task Reset() => Task.CompletedTask; } } diff --git a/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs b/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs index 01d7bf0d..79974ce5 100644 --- a/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs +++ b/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs @@ -30,11 +30,12 @@ public ActionPruneBuilds(IBuildsContext buildsContext, ISchedulerContext schedul public string Name => ACTION_NAME; - public void Run(params object[] parameters) { + public Task Run(params object[] parameters) { int threshold = _buildsContext.Get(x => x.Environment == GameEnvironment.DEV).Select(x => x.BuildNumber).OrderByDescending(x => x).First() - 100; Task modpackBuildsTask = _buildsContext.DeleteMany(x => x.Environment == GameEnvironment.DEV && x.BuildNumber < threshold); Task.WaitAll(modpackBuildsTask); + return Task.CompletedTask; } public async Task CreateSelf() { @@ -44,5 +45,7 @@ public async Task CreateSelf() { await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); } } + + public Task Reset() => Task.CompletedTask; } } diff --git a/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs b/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs index 105e1f95..3474a064 100644 --- a/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs +++ b/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs @@ -1,4 +1,5 @@ using System; +using System.Threading.Tasks; using UKSF.Api.Base.ScheduledActions; using UKSF.Api.Personnel.Context; @@ -14,10 +15,15 @@ public class ActionDeleteExpiredConfirmationCode : IActionDeleteExpiredConfirmat public string Name => ACTION_NAME; - public void Run(params object[] parameters) { - if (parameters.Length == 0) throw new ArgumentException("ActionDeleteExpiredConfirmationCode requires an id to be passed as a parameter, but no paramters were passed"); + public Task Run(params object[] parameters) { + if (parameters.Length == 0) { + throw new ArgumentException("ActionDeleteExpiredConfirmationCode requires an id to be passed as a parameter, but no paramters were passed"); + } + string id = parameters[0].ToString(); _confirmationCodeContext.Delete(id); + + return Task.CompletedTask; } } } diff --git a/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs b/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs index 20f6637f..767613db 100644 --- a/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs +++ b/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs @@ -34,11 +34,12 @@ IClock clock public string Name => ACTION_NAME; - public void Run(params object[] parameters) { + public Task Run(params object[] parameters) { DateTime now = _clock.UtcNow(); Task notificationsTask = _notificationsContext.DeleteMany(x => x.Timestamp < now.AddMonths(-1)); Task.WaitAll(notificationsTask); + return Task.CompletedTask; } public async Task CreateSelf() { @@ -48,5 +49,7 @@ public async Task CreateSelf() { await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); } } + + public Task Reset() => Task.CompletedTask; } } diff --git a/UKSF.Api.Shared/Services/SchedulerService.cs b/UKSF.Api.Shared/Services/SchedulerService.cs index 07efbc25..e2f3da01 100644 --- a/UKSF.Api.Shared/Services/SchedulerService.cs +++ b/UKSF.Api.Shared/Services/SchedulerService.cs @@ -115,7 +115,7 @@ private bool IsCancelled(MongoObject job, CancellationTokenSource token) { private void ExecuteAction(ScheduledJob job) { IScheduledAction action = _scheduledActionFactory.GetScheduledAction(job.Action); object[] parameters = job.ActionParameters == null ? null : JsonConvert.DeserializeObject(job.ActionParameters); - action.Run(parameters); + Task unused = action.Run(parameters); } } } diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs index 3697d859..b55f0af7 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs @@ -1,4 +1,5 @@ using System; +using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; using Moq; @@ -12,23 +13,23 @@ public class DeleteExpiredConfirmationCodeActionTests { private IActionDeleteExpiredConfirmationCode _actionDeleteExpiredConfirmationCode; [Fact] - public void When_deleting_confirmation_code() { + public async Task When_deleting_confirmation_code() { string id = ObjectId.GenerateNewId().ToString(); _actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(_mockConfirmationCodeContext.Object); - _actionDeleteExpiredConfirmationCode.Run(id); + await _actionDeleteExpiredConfirmationCode.Run(id); _mockConfirmationCodeContext.Verify(x => x.Delete(id), Times.Once); } [Fact] - public void When_deleting_confirmation_code_with_no_id() { + public async Task When_deleting_confirmation_code_with_no_id() { _actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(_mockConfirmationCodeContext.Object); - Action act = () => _actionDeleteExpiredConfirmationCode.Run(); + Func act = async () => await _actionDeleteExpiredConfirmationCode.Run(); - act.Should().Throw(); + await act.Should().ThrowAsync(); } [Fact] diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs index db29e807..2cf1765c 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs @@ -25,7 +25,7 @@ public PruneDataActionTests() { Mock mockHostEnvironment = new(); Mock mockSchedulerService = new(); - _now = new DateTime(2020, 11, 14); + _now = new(2020, 11, 14); mockClock.Setup(x => x.UtcNow()).Returns(_now); _actionPruneLogs = new ActionPruneLogs( @@ -47,11 +47,11 @@ public void When_getting_action_name() { } [Fact] - public void When_pruning_logs() { - List basicLogs = new() { new BasicLog("test1") { Timestamp = _now.AddDays(-8) }, new BasicLog("test2") { Timestamp = _now.AddDays(-6) } }; - List auditLogs = new() { new AuditLog("server", "audit1") { Timestamp = _now.AddMonths(-4) }, new AuditLog("server", "audit2") { Timestamp = _now.AddMonths(-2) } }; + public async Task When_pruning_logs() { + List basicLogs = new() { new("test1") { Timestamp = _now.AddDays(-8) }, new("test2") { Timestamp = _now.AddDays(-6) } }; + List auditLogs = new() { new("server", "audit1") { Timestamp = _now.AddMonths(-4) }, new("server", "audit2") { Timestamp = _now.AddMonths(-2) } }; List httpErrorLogs = new() { - new HttpErrorLog(new Exception("error1")) { Timestamp = _now.AddDays(-8) }, new HttpErrorLog(new Exception("error2")) { Timestamp = _now.AddDays(-6) } + new(new("error1")) { Timestamp = _now.AddDays(-8) }, new(new("error2")) { Timestamp = _now.AddDays(-6) } }; _mockLogContext.Setup(x => x.DeleteMany(It.IsAny>>())) @@ -64,7 +64,7 @@ public void When_pruning_logs() { .Returns(Task.CompletedTask) .Callback>>(x => httpErrorLogs.RemoveAll(y => x.Compile()(y))); - _actionPruneLogs.Run(); + await _actionPruneLogs.Run(); basicLogs.Should().NotContain(x => x.Message == "test1"); auditLogs.Should().NotContain(x => x.Message == "audit1"); diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs index 24a1e5a4..b471ba69 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs @@ -1,4 +1,5 @@ -using FluentAssertions; +using System.Threading.Tasks; +using FluentAssertions; using Microsoft.Extensions.Hosting; using Moq; using UKSF.Api.Shared.Context; @@ -36,8 +37,8 @@ public void When_getting_action_name() { } [Fact] - public void When_running_snapshot() { - _actionTeamspeakSnapshot.Run(); + public async Task When_running_snapshot() { + await _actionTeamspeakSnapshot.Run(); _mockTeamspeakService.Verify(x => x.StoreTeamspeakServerSnapshot(), Times.Once); } From 2761282a62c8185b7fc6fd40859d838e52e762a9 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 31 Jan 2021 11:04:08 +0000 Subject: [PATCH 303/369] Add additional logging to debug discord left event not posting application comment --- UKSF.Api.Base/Events/EventBus.cs | 2 +- .../Services/DiscordService.cs | 51 ++++++++++++------- .../EventHandlers/DiscordEventHandler.cs | 5 +- 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/UKSF.Api.Base/Events/EventBus.cs b/UKSF.Api.Base/Events/EventBus.cs index e486b9a2..41d36e53 100644 --- a/UKSF.Api.Base/Events/EventBus.cs +++ b/UKSF.Api.Base/Events/EventBus.cs @@ -18,7 +18,7 @@ public void Send(EventModel eventModel) { } public void Send(object data) { - Send(new EventModel(EventType.NONE, data)); + Send(new(EventType.NONE, data)); } public virtual IObservable AsObservable() => Subject.OfType(); diff --git a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs index bfb4646c..b19fe420 100644 --- a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs +++ b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs @@ -73,7 +73,7 @@ public async Task ConnectDiscord() { _client = null; } - _client = new DiscordSocketClient(new DiscordSocketConfig { AlwaysDownloadUsers = true, MessageCacheSize = 1000 }); + _client = new(new() { AlwaysDownloadUsers = true, MessageCacheSize = 1000 }); _client.Ready += OnClientOnReady; _client.Disconnected += ClientOnDisconnected; AddEventhandlers(); @@ -146,23 +146,29 @@ public OnlineState GetOnlineUserDetails(string accountId) { bool online = IsAccountOnline(discordId); string nickname = GetAccountNickname(discordId); - return new OnlineState { Online = online, Nickname = nickname }; + return new() { Online = online, Nickname = nickname }; } public void Dispose() { _client?.StopAsync().Wait(TimeSpan.FromSeconds(5)); } - private bool IsDiscordDisabled() => !_variablesService.GetFeatureState("DISCORD"); + private bool IsDiscordDisabled() { + return !_variablesService.GetFeatureState("DISCORD"); + } - private bool IsAccountOnline(ulong discordId) => _guild.GetUser(discordId)?.Status == UserStatus.Online; + private bool IsAccountOnline(ulong discordId) { + return _guild.GetUser(discordId)?.Status == UserStatus.Online; + } private string GetAccountNickname(ulong discordId) { SocketGuildUser user = _guild.GetUser(discordId); return GetUserNickname(user); } - private static string GetUserNickname(IGuildUser user) => user == null ? "" : string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname; + private static string GetUserNickname(IGuildUser user) { + return user == null ? "" : string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname; + } private async Task UpdateAccountRoles(SocketGuildUser user, Account account) { IReadOnlyCollection userRoles = user.Roles; @@ -246,7 +252,7 @@ private void AddEventhandlers() { _client.UserJoined += user => { string name = GetUserNickname(user); - string associatedAccountMessage = GetAssociatedAccountMessage(user.Id); + string associatedAccountMessage = GetAssociatedAccountMessageFromUserId(user.Id); _logger.LogDiscordEvent(DiscordUserEventType.JOINED, user.Id.ToString(), name, string.Empty, name, $"Joined, {associatedAccountMessage}"); return Task.CompletedTask; @@ -254,9 +260,10 @@ private void AddEventhandlers() { _client.UserLeft += user => { string name = GetUserNickname(user); - string associatedAccountMessage = GetAssociatedAccountMessage(user.Id); - _logger.LogDiscordEvent(DiscordUserEventType.LEFT, user.Id.ToString(), name, string.Empty, name, $"Left, {associatedAccountMessage}"); Account account = _accountContext.GetSingle(x => x.DiscordId == user.Id.ToString()); + string associatedAccountMessage = GetAssociatedAccountMessage(account); + _logger.LogDiscordEvent(DiscordUserEventType.LEFT, user.Id.ToString(), name, string.Empty, name, $"Left, {associatedAccountMessage}"); + _logger.LogInfo($"Discord user {name} ({user.Id}) left. Found account: {(account == null ? "No account" : _displayNameService.GetDisplayName(account))}"); if (account != null) { _eventBus.Send(new DiscordEventData(DiscordUserEventType.LEFT, account.Id)); } @@ -265,14 +272,14 @@ private void AddEventhandlers() { }; _client.UserBanned += async (user, _) => { - string associatedAccountMessage = GetAssociatedAccountMessage(user.Id); + string associatedAccountMessage = GetAssociatedAccountMessageFromUserId(user.Id); ulong instigatorId = await GetBannedAuditLogInstigator(user.Id); string instigatorName = GetUserNickname(_guild.GetUser(instigatorId)); _logger.LogDiscordEvent(DiscordUserEventType.BANNED, instigatorId.ToString(), instigatorName, string.Empty, user.Username, $"Banned, {associatedAccountMessage}"); }; _client.UserUnbanned += async (user, _) => { - string associatedAccountMessage = GetAssociatedAccountMessage(user.Id); + string associatedAccountMessage = GetAssociatedAccountMessageFromUserId(user.Id); ulong instigatorId = await GetUnbannedAuditLogInstigator(user.Id); string instigatorName = GetUserNickname(_guild.GetUser(instigatorId)); _logger.LogDiscordEvent(DiscordUserEventType.UNBANNED, instigatorId.ToString(), instigatorName, string.Empty, user.Username, $"Unbanned, {associatedAccountMessage}"); @@ -295,7 +302,9 @@ private void AddEventhandlers() { } } - _logger.LogDiscordEvent(DiscordUserEventType.MESSAGE_DELETED, "0", "NO INSTIGATOR", channel.Name, string.Empty, $"{irretrievableMessageCount} irretrievable messages deleted"); + if (irretrievableMessageCount > 0) { + _logger.LogDiscordEvent(DiscordUserEventType.MESSAGE_DELETED, "0", "NO INSTIGATOR", channel.Name, string.Empty, $"{irretrievableMessageCount} irretrievable messages deleted"); + } IEnumerable> groupedMessages = messages.GroupBy(x => x.Name); foreach (IGrouping groupedMessage in groupedMessages) { @@ -402,30 +411,36 @@ private async Task ClientOnReactionRemoved(Cacheable cachea } } - private bool MessageIsWeeklyEventsMessage(IMessage message) => message != null && message.Content.Contains(_variablesService.GetVariable("DISCORD_FILTER_WEEKLY_EVENTS").AsString(), StringComparison.InvariantCultureIgnoreCase); + private bool MessageIsWeeklyEventsMessage(IMessage message) { + return message != null && message.Content.Contains(_variablesService.GetVariable("DISCORD_FILTER_WEEKLY_EVENTS").AsString(), StringComparison.InvariantCultureIgnoreCase); + } - private string GetAssociatedAccountMessage(ulong userId) { + private string GetAssociatedAccountMessageFromUserId(ulong userId) { Account account = _accountContext.GetSingle(x => x.DiscordId == userId.ToString()); + return GetAssociatedAccountMessage(account); + } + + private string GetAssociatedAccountMessage(Account account) { return account == null ? "with no associated account" : $"with associated account ({account.Id}, {_displayNameService.GetDisplayName(account)})"; } private async Task GetDeletedMessageDetails(Cacheable cacheable, ISocketMessageChannel channel) { IMessage message = await cacheable.GetOrDownloadAsync(); if (message == null) { - return new DiscordDeletedMessageResult(0, null, null, null); + return new(0, null, null, null); } ulong userId = message.Author.Id; ulong instigatorId = await GetMessageDeletedAuditLogInstigator(channel.Id, userId); if (instigatorId == 0 || instigatorId == userId) { - return new DiscordDeletedMessageResult(ulong.MaxValue, null, null, null); + return new(ulong.MaxValue, null, null, null); } string name = message.Author is SocketGuildUser user ? GetUserNickname(user) : GetUserNickname(_guild.GetUser(userId)); string instigatorName = GetUserNickname(_guild.GetUser(instigatorId)); string messageString = message.Content; - return new DiscordDeletedMessageResult(instigatorId, instigatorName, name, messageString); + return new(instigatorId, instigatorName, name, messageString); } private async Task GetMessageDeletedAuditLogInstigator(ulong channelId, ulong authorId) { @@ -437,7 +452,9 @@ private async Task GetMessageDeletedAuditLogInstigator(ulong channelId, u var auditUser = auditLogs.Where(x => x.Data is MessageDeleteAuditLogData) .Select(x => new { Data = x.Data as MessageDeleteAuditLogData, x.User }) .FirstOrDefault(x => x.Data.ChannelId == channelId && x.Data.AuthorId == authorId); - if (auditUser != null) return auditUser.User.Id; + if (auditUser != null) { + return auditUser.User.Id; + } } } finally { await auditLogsEnumerator.DisposeAsync(); diff --git a/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs index 6273838a..a1ca6278 100644 --- a/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs @@ -46,14 +46,15 @@ private async Task HandleEvent(EventModel eventModel, DiscordEventData discordEv private async Task LeftEvent(string accountId) { Account account = _accountContext.GetSingle(accountId); + _logger.LogInfo($"Handling Discord user left event. Account ID: {account.Id}, State: {account.MembershipState.ToString()}"); if (account.MembershipState == MembershipState.DISCHARGED || account.MembershipState == MembershipState.UNCONFIRMED) { return; } - + string name = _displayNameService.GetDisplayName(account); await _commentThreadService.InsertComment( account.Application.RecruiterCommentThread, - new Comment { Author = ObjectId.Empty.ToString(), Content = $"{name} left the Discord", Timestamp = DateTime.Now } + new() { Author = ObjectId.Empty.ToString(), Content = $"{name} left Discord", Timestamp = DateTime.Now } ); } } From 3ea9e5af8c6b579498e129476c65afab953d42c5 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 21 Feb 2021 22:42:30 +0000 Subject: [PATCH 304/369] Don't skip source update if forced --- .../Steps/BuildSteps/BuildStepSources.cs | 52 +++++++++---------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index f5d76465..722f83e3 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -19,37 +19,35 @@ protected override async Task ProcessExecute() { private Task CheckoutStaticSource(string displayName, string modName, string releaseName, string repoName, string branchName) { StepLogger.LogSurround($"\nChecking out latest {displayName}..."); + string path = Path.Join(GetBuildSourcesPath(), modName); + DirectoryInfo directory = new(path); + if (!directory.Exists) { + throw new($"{displayName} source directory does not exist. {displayName} should be cloned before running a build."); + } + + string releasePath = Path.Join(GetBuildSourcesPath(), modName, "release", releaseName); + string repoPath = Path.Join(GetBuildEnvironmentPath(), "Repo", repoName); + DirectoryInfo release = new(releasePath); + DirectoryInfo repo = new(repoPath); + + GitCommand(path, "git reset --hard HEAD && git clean -d -f && git fetch"); + GitCommand(path, $"git checkout -t origin/{branchName}"); + GitCommand(path, $"git checkout {branchName}"); + string before = GitCommand(path, "git rev-parse HEAD"); + GitCommand(path, "git pull"); + string after = GitCommand(path, "git rev-parse HEAD"); + bool forceBuild = GetEnvironmentVariable($"{modName}_updated"); bool updated; - if (forceBuild) { + if (!release.Exists || !repo.Exists) { + StepLogger.Log("No release or repo directory, will build"); + updated = true; + } else if (forceBuild) { StepLogger.Log("Force build"); updated = true; } else { - string path = Path.Join(GetBuildSourcesPath(), modName); - DirectoryInfo directory = new(path); - if (!directory.Exists) { - throw new Exception($"{displayName} source directory does not exist. {displayName} should be cloned before running a build."); - } - - string releasePath = Path.Join(GetBuildSourcesPath(), modName, "release", releaseName); - string repoPath = Path.Join(GetBuildEnvironmentPath(), "Repo", repoName); - DirectoryInfo release = new(releasePath); - DirectoryInfo repo = new(repoPath); - - GitCommand(path, "git reset --hard HEAD && git clean -d -f && git fetch"); - GitCommand(path, $"git checkout -t origin/{branchName}"); - GitCommand(path, $"git checkout {branchName}"); - string before = GitCommand(path, "git rev-parse HEAD"); - GitCommand(path, "git pull"); - string after = GitCommand(path, "git rev-parse HEAD"); - - if (release.Exists && repo.Exists) { - StepLogger.Log($"{before?.Substring(0, 7)} vs {after?.Substring(0, 7)}"); - updated = !string.Equals(before, after); - } else { - StepLogger.Log("No release or repo directory, will build"); - updated = true; - } + StepLogger.Log($"{before[..7]} vs {after[..7]}"); + updated = !string.Equals(before, after); } SetEnvironmentVariable($"{modName}_updated", updated); @@ -65,7 +63,7 @@ private Task CheckoutModpack() { string modpackPath = Path.Join(GetBuildSourcesPath(), "modpack"); DirectoryInfo modpack = new(modpackPath); if (!modpack.Exists) { - throw new Exception("Modpack source directory does not exist. Modpack should be cloned before running a build."); + throw new("Modpack source directory does not exist. Modpack should be cloned before running a build."); } StepLogger.Log($"Checking out {referenceName}"); From 745018726f1f3340ec6cb673f49a4c36686e20b5 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 21 Feb 2021 22:58:53 +0000 Subject: [PATCH 305/369] Don't log build restore attempt if not release --- UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs index 34a405de..7e614bc9 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs @@ -82,11 +82,11 @@ private async Task ProcessBuild(ModpackBuild build, CancellationTokenSource canc } private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) { - _logger.LogInfo($"Attempting to restore repo prior to {build.Version}"); if (build.Environment != GameEnvironment.RELEASE || runningStep is BuildStepClean || runningStep is BuildStepBackup) { return; } + _logger.LogInfo($"Attempting to restore repo prior to {build.Version}"); ModpackBuildStep restoreStep = _buildStepService.GetRestoreStepForRelease(); if (restoreStep == null) { _logger.LogError("Restore step expected but not found. Won't restore"); From 7aaff35265c85c68d24f477b3da53002f9a8a82b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 23 Feb 2021 17:45:49 +0000 Subject: [PATCH 306/369] Disable arma server logging object not found spam --- .../Services/GameServerHelpers.cs | 93 ++++++++++++------- 1 file changed, 60 insertions(+), 33 deletions(-) diff --git a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs index 2d30139d..418dc24e 100644 --- a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs +++ b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs @@ -52,7 +52,7 @@ public class GameServerHelpers : IGameServerHelpers { "onUnsignedData = \"kick (_this select 0)\";", "onHackedData = \"kick (_this select 0)\";", "onDifferentData = \"kick (_this select 0)\";", - "regularCheck = \"{{}}\";", + "regularCheck = \"\";", "briefingTimeOut = -1;", "roleTimeOut = -1;", "votingTimeOut = -1;", @@ -68,6 +68,9 @@ public class GameServerHelpers : IGameServerHelpers { " template = \"{4}\";", " difficulty = \"Custom\";", " }};", + "}};", + "class AdvancedOptions {{", + " LogObjectNotFound = false;", "}};" }; @@ -89,11 +92,17 @@ public string GetGameServerExecutablePath(GameServer gameServer) { return Path.Join(_variablesService.GetVariable(variableKey).AsString(), "arma3server_x64.exe"); } - public string GetGameServerSettingsPath() => Path.Join(_variablesService.GetVariable("SERVER_PATH_RELEASE").AsString(), "userconfig", "cba_settings.sqf"); + public string GetGameServerSettingsPath() { + return Path.Join(_variablesService.GetVariable("SERVER_PATH_RELEASE").AsString(), "userconfig", "cba_settings.sqf"); + } - public string GetGameServerMissionsPath() => _variablesService.GetVariable("MISSIONS_PATH").AsString(); + public string GetGameServerMissionsPath() { + return _variablesService.GetVariable("MISSIONS_PATH").AsString(); + } - public string GetGameServerConfigPath(GameServer gameServer) => Path.Combine(_variablesService.GetVariable("SERVER_PATH_CONFIGS").AsString(), $"{gameServer.ProfileName}.cfg"); + public string GetGameServerConfigPath(GameServer gameServer) { + return Path.Combine(_variablesService.GetVariable("SERVER_PATH_CONFIGS").AsString(), $"{gameServer.ProfileName}.cfg"); + } public string GetGameServerModsPaths(GameEnvironment environment) { string variableKey = environment switch { @@ -105,30 +114,35 @@ public string GetGameServerModsPaths(GameEnvironment environment) { return Path.Join(_variablesService.GetVariable(variableKey).AsString(), "Repo"); } - public IEnumerable GetGameServerExtraModsPaths() => _variablesService.GetVariable("SERVER_PATH_MODS").AsArray(x => x.RemoveQuotes()); + public IEnumerable GetGameServerExtraModsPaths() { + return _variablesService.GetVariable("SERVER_PATH_MODS").AsArray(x => x.RemoveQuotes()); + } - public string FormatGameServerConfig(GameServer gameServer, int playerCount, string missionSelection) => - string.Format(string.Join("\n", BASE_CONFIG), gameServer.HostName, gameServer.Password, gameServer.AdminPassword, playerCount, missionSelection.Replace(".pbo", "")); + public string FormatGameServerConfig(GameServer gameServer, int playerCount, string missionSelection) { + return string.Format(string.Join("\n", BASE_CONFIG), gameServer.HostName, gameServer.Password, gameServer.AdminPassword, playerCount, missionSelection.Replace(".pbo", "")); + } - public string FormatGameServerLaunchArguments(GameServer gameServer) => - $"-config={GetGameServerConfigPath(gameServer)}" + - $" -profiles={GetGameServerProfilesPath()}" + - $" -cfg={GetGameServerPerfConfigPath()}" + - $" -name={gameServer.Name}" + - $" -port={gameServer.Port}" + - $" -apiport=\"{gameServer.ApiPort}\"" + - $" {(string.IsNullOrEmpty(FormatGameServerServerMods(gameServer)) ? "" : $"\"-serverMod={FormatGameServerServerMods(gameServer)}\"")}" + - $" {(string.IsNullOrEmpty(FormatGameServerMods(gameServer)) ? "" : $"\"-mod={FormatGameServerMods(gameServer)}\"")}" + - " -bandwidthAlg=2 -hugepages -loadMissionToMemory -filePatching -limitFPS=200"; + public string FormatGameServerLaunchArguments(GameServer gameServer) { + return $"-config={GetGameServerConfigPath(gameServer)}" + + $" -profiles={GetGameServerProfilesPath()}" + + $" -cfg={GetGameServerPerfConfigPath()}" + + $" -name={gameServer.Name}" + + $" -port={gameServer.Port}" + + $" -apiport=\"{gameServer.ApiPort}\"" + + $" {(string.IsNullOrEmpty(FormatGameServerServerMods(gameServer)) ? "" : $"\"-serverMod={FormatGameServerServerMods(gameServer)}\"")}" + + $" {(string.IsNullOrEmpty(FormatGameServerMods(gameServer)) ? "" : $"\"-mod={FormatGameServerMods(gameServer)}\"")}" + + " -bandwidthAlg=2 -hugepages -loadMissionToMemory -filePatching -limitFPS=200"; + } - public string FormatHeadlessClientLaunchArguments(GameServer gameServer, int index) => - $"-profiles={GetGameServerProfilesPath()}" + - $" -name={GetHeadlessClientName(index)}" + - $" -port={gameServer.Port}" + - $" -apiport=\"{gameServer.ApiPort + index + 1}\"" + - $" {(string.IsNullOrEmpty(FormatGameServerMods(gameServer)) ? "" : $"\"-mod={FormatGameServerMods(gameServer)}\"")}" + - $" -password={gameServer.Password}" + - " -localhost=127.0.0.1 -connect=localhost -client -hugepages -filePatching -limitFPS=200"; + public string FormatHeadlessClientLaunchArguments(GameServer gameServer, int index) { + return $"-profiles={GetGameServerProfilesPath()}" + + $" -name={GetHeadlessClientName(index)}" + + $" -port={gameServer.Port}" + + $" -apiport=\"{gameServer.ApiPort + index + 1}\"" + + $" {(string.IsNullOrEmpty(FormatGameServerMods(gameServer)) ? "" : $"\"-mod={FormatGameServerMods(gameServer)}\"")}" + + $" -password={gameServer.Password}" + + " -localhost=127.0.0.1 -connect=localhost -client -hugepages -filePatching -limitFPS=200"; + } public string GetMaxPlayerCountFromConfig(GameServer gameServer) { string maxPlayers = File.ReadAllLines(GetGameServerConfigPath(gameServer)).First(x => x.Contains("maxPlayers")); @@ -148,24 +162,37 @@ public int GetMaxCuratorCountFromSettings() { return int.Parse(curatorsMaxString); } - public TimeSpan StripMilliseconds(TimeSpan time) => new(time.Hours, time.Minutes, time.Seconds); + public TimeSpan StripMilliseconds(TimeSpan time) { + return new(time.Hours, time.Minutes, time.Seconds); + } - public IEnumerable GetArmaProcesses() => Process.GetProcesses().Where(x => x.ProcessName.StartsWith("arma3")); + public IEnumerable GetArmaProcesses() { + return Process.GetProcesses().Where(x => x.ProcessName.StartsWith("arma3")); + } public bool IsMainOpTime() { DateTime now = DateTime.UtcNow; return now.DayOfWeek == DayOfWeek.Saturday && now.Hour >= 19 && now.Minute >= 30; } - private string FormatGameServerMods(GameServer gameServer) => - gameServer.Mods.Count > 0 ? $"{string.Join(";", gameServer.Mods.Select(x => x.PathRelativeToServerExecutable ?? x.Path))};" : string.Empty; + private string FormatGameServerMods(GameServer gameServer) { + return gameServer.Mods.Count > 0 ? $"{string.Join(";", gameServer.Mods.Select(x => x.PathRelativeToServerExecutable ?? x.Path))};" : string.Empty; + } - private string FormatGameServerServerMods(GameServer gameServer) => gameServer.ServerMods.Count > 0 ? $"{string.Join(";", gameServer.ServerMods.Select(x => x.Name))};" : string.Empty; + private string FormatGameServerServerMods(GameServer gameServer) { + return gameServer.ServerMods.Count > 0 ? $"{string.Join(";", gameServer.ServerMods.Select(x => x.Name))};" : string.Empty; + } - private string GetGameServerProfilesPath() => _variablesService.GetVariable("SERVER_PATH_PROFILES").AsString(); + private string GetGameServerProfilesPath() { + return _variablesService.GetVariable("SERVER_PATH_PROFILES").AsString(); + } - private string GetGameServerPerfConfigPath() => _variablesService.GetVariable("SERVER_PATH_PERF").AsString(); + private string GetGameServerPerfConfigPath() { + return _variablesService.GetVariable("SERVER_PATH_PERF").AsString(); + } - private string GetHeadlessClientName(int index) => _variablesService.GetVariable("SERVER_HEADLESS_NAMES").AsArray()[index]; + private string GetHeadlessClientName(int index) { + return _variablesService.GetVariable("SERVER_HEADLESS_NAMES").AsArray()[index]; + } } } From f0a307430d24be0126d3d856ca76a761c74a0607 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 26 Feb 2021 17:22:44 +0000 Subject: [PATCH 307/369] Restore previous regularCheck setting --- UKSF.Api.ArmaServer/Services/GameServerHelpers.cs | 2 +- UKSF.Api.sln.DotSettings | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs index 418dc24e..d477312b 100644 --- a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs +++ b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs @@ -52,7 +52,7 @@ public class GameServerHelpers : IGameServerHelpers { "onUnsignedData = \"kick (_this select 0)\";", "onHackedData = \"kick (_this select 0)\";", "onDifferentData = \"kick (_this select 0)\";", - "regularCheck = \"\";", + "regularCheck = \"{{}}\";", "briefingTimeOut = -1;", "roleTimeOut = -1;", "votingTimeOut = -1;", diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index 3fb8d6aa..f62eb7e4 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -449,6 +449,7 @@ LIVE_MONITOR DO_NOTHING LIVE_MONITOR + True True True True From 7cb54ea604a40066e774ecc095587d443c7bb8ee Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 1 Mar 2021 21:20:13 +0000 Subject: [PATCH 308/369] Added more reserve slots --- UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs index e1106df9..ccbedb81 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs @@ -87,7 +87,7 @@ public static List ResolveUnitSlots(MissionUnit unit) { break; case "5ad748e0de5d414f4c4055e0": // "Guardian 1-R" - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 10; i++) { MissionPlayer player = new() { Name = "Reserve", Unit = unit, Rank = MissionPatchData.Instance.Ranks.Find(x => x.Name == "Recruit") }; player.ObjectClass = ResolveObjectClass(player); slots.Add(player); From cde8adbefd429f1ed5c09d928257508470e0c144 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 1 Mar 2021 21:21:25 +0000 Subject: [PATCH 309/369] Up max troop size to 12 --- UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs index ccbedb81..305dd75a 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs @@ -54,7 +54,7 @@ public static void ResolveSpecialUnits(List orderedUnits) { public static List ResolveUnitSlots(MissionUnit unit) { List slots = new(); - int max = 8; + int max = 12; int fillerCount; switch (unit.SourceUnit.Id) { case "5a435eea905d47336442c75a": // "Joint Special Forces Aviation Wing" From 66bed0a769c0171b9186b49f45a8e2d60a241667 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 28 Mar 2021 22:19:07 +0100 Subject: [PATCH 310/369] Change F-35 to Air --- UKSF.Api.Modpack/Models/NewBuild.cs | 2 +- .../Services/BuildProcess/BuildStepService.cs | 4 ++-- .../Steps/BuildSteps/BuildStepSources.cs | 2 +- .../{BuildStepBuildF35.cs => BuildStepBuildAir.cs} | 14 +++++++------- UKSF.Api.Modpack/Services/BuildsService.cs | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) rename UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/{BuildStepBuildF35.cs => BuildStepBuildAir.cs} (74%) diff --git a/UKSF.Api.Modpack/Models/NewBuild.cs b/UKSF.Api.Modpack/Models/NewBuild.cs index bc1e96f6..526f9e3f 100644 --- a/UKSF.Api.Modpack/Models/NewBuild.cs +++ b/UKSF.Api.Modpack/Models/NewBuild.cs @@ -2,7 +2,7 @@ public class NewBuild { public bool Ace; public bool Acre; - public bool F35; + public bool Air; public string Reference; } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs index 4008bb45..4a9791b6 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs @@ -59,7 +59,7 @@ private static List GetStepsForBuild() => new(BuildStepSources.NAME), new(BuildStepBuildAce.NAME), new(BuildStepBuildAcre.NAME), - new(BuildStepBuildF35.NAME), + new(BuildStepBuildAir.NAME), new(BuildStepBuildModpack.NAME), new(BuildStepIntercept.NAME), new(BuildStepExtensions.NAME), @@ -77,7 +77,7 @@ private static List GetStepsForRc() => new(BuildStepSources.NAME), new(BuildStepBuildAce.NAME), new(BuildStepBuildAcre.NAME), - new(BuildStepBuildF35.NAME), + new(BuildStepBuildAir.NAME), new(BuildStepBuildModpack.NAME), new(BuildStepIntercept.NAME), new(BuildStepExtensions.NAME), diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 722f83e3..50e67bc3 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -12,7 +12,7 @@ protected override async Task ProcessExecute() { await CheckoutStaticSource("ACE", "ace", "@ace", "@uksf_ace", "uksfcustom"); await CheckoutStaticSource("ACRE", "acre", "@acre2", "@acre2", "customrelease"); - await CheckoutStaticSource("UKSF F-35", "f35", "@uksf_f35", "@uksf", "master"); + await CheckoutStaticSource("UKSF Air", "uksf_air", "@uksf_air", "@uksf", "main"); await CheckoutModpack(); } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs similarity index 74% rename from UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs rename to UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs index 3691e0b5..6d9670e4 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildF35.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs @@ -5,15 +5,15 @@ namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods { [BuildStep(NAME)] - public class BuildStepBuildF35 : ModBuildStep { - public const string NAME = "Build F-35"; - private const string MOD_NAME = "f35"; + public class BuildStepBuildAir : ModBuildStep { + public const string NAME = "Build Air"; + private const string MOD_NAME = "uksf_air"; protected override async Task ProcessExecute() { - StepLogger.Log("Running build for F-35"); + StepLogger.Log("Running build for Air"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); - string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@uksf_f35", "addons"); + string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@uksf_air", "addons"); string dependenciesPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies", "addons"); DirectoryInfo release = new(releasePath); DirectoryInfo dependencies = new(dependenciesPath); @@ -25,10 +25,10 @@ protected override async Task ProcessExecute() { StepLogger.LogSurround("Make.py complete"); } - StepLogger.LogSurround("\nMoving F-35 pbos to uksf dependencies..."); + StepLogger.LogSurround("\nMoving Air pbos to uksf dependencies..."); List files = GetDirectoryContents(release, "*.pbo"); await CopyFiles(release, dependencies, files); - StepLogger.LogSurround("Moved F-35 pbos to uksf dependencies"); + StepLogger.LogSurround("Moved Air pbos to uksf dependencies"); } } } diff --git a/UKSF.Api.Modpack/Services/BuildsService.cs b/UKSF.Api.Modpack/Services/BuildsService.cs index 542bb369..760c74f8 100644 --- a/UKSF.Api.Modpack/Services/BuildsService.cs +++ b/UKSF.Api.Modpack/Services/BuildsService.cs @@ -196,7 +196,7 @@ private async Task FinishBuild(ModpackBuild build, ModpackBuildResult result) { private static void SetEnvironmentVariables(ModpackBuild build, ModpackBuild previousBuild, NewBuild newBuild = null) { CheckEnvironmentVariable(build, previousBuild, "ace_updated", "Build ACE", newBuild?.Ace ?? false); CheckEnvironmentVariable(build, previousBuild, "acre_updated", "Build ACRE", newBuild?.Acre ?? false); - CheckEnvironmentVariable(build, previousBuild, "f35_updated", "Build F-35", newBuild?.F35 ?? false); + CheckEnvironmentVariable(build, previousBuild, "air_updated", "Build Air", newBuild?.Air ?? false); } private static void CheckEnvironmentVariable(ModpackBuild build, ModpackBuild previousBuild, string key, string stepName, bool force) { From 2200c118e66a61d88e16deac49e170fe4efe3cb9 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 28 Mar 2021 22:24:11 +0100 Subject: [PATCH 311/369] Release UKSF Air as its own mod --- .../Steps/BuildSteps/BuildStepSources.cs | 2 +- .../Steps/BuildSteps/Mods/BuildStepBuildAir.cs | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index 50e67bc3..f7d0761b 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -12,7 +12,7 @@ protected override async Task ProcessExecute() { await CheckoutStaticSource("ACE", "ace", "@ace", "@uksf_ace", "uksfcustom"); await CheckoutStaticSource("ACRE", "acre", "@acre2", "@acre2", "customrelease"); - await CheckoutStaticSource("UKSF Air", "uksf_air", "@uksf_air", "@uksf", "main"); + await CheckoutStaticSource("UKSF Air", "uksf_air", "@uksf_air", "@uksf_air", "main"); await CheckoutModpack(); } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs index 6d9670e4..eff77693 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs @@ -13,10 +13,8 @@ protected override async Task ProcessExecute() { StepLogger.Log("Running build for Air"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); - string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@uksf_air", "addons"); - string dependenciesPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies", "addons"); - DirectoryInfo release = new(releasePath); - DirectoryInfo dependencies = new(dependenciesPath); + string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@uksf_air"); + string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf"); if (IsBuildNeeded(MOD_NAME)) { StepLogger.LogSurround("\nRunning make.py..."); @@ -25,10 +23,9 @@ protected override async Task ProcessExecute() { StepLogger.LogSurround("Make.py complete"); } - StepLogger.LogSurround("\nMoving Air pbos to uksf dependencies..."); - List files = GetDirectoryContents(release, "*.pbo"); - await CopyFiles(release, dependencies, files); - StepLogger.LogSurround("Moved Air pbos to uksf dependencies"); + StepLogger.LogSurround("\nMoving Air release to build..."); + await CopyDirectory(releasePath, buildPath); + StepLogger.LogSurround("Moved Air release to build"); } } } From 19375410ed964e4afc8e7dcbdb3481397fbdf6ce Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 28 Mar 2021 22:32:26 +0100 Subject: [PATCH 312/369] Fix air build path --- .../BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs index eff77693..6539c46f 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs @@ -14,7 +14,7 @@ protected override async Task ProcessExecute() { string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@uksf_air"); - string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf"); + string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf_air"); if (IsBuildNeeded(MOD_NAME)) { StepLogger.LogSurround("\nRunning make.py..."); From ed19450f9b2df2565b409906990b3038240fe84f Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 27 Apr 2021 15:04:08 +0100 Subject: [PATCH 313/369] Add allow glasses false to description verification --- .../Services/MissionService.cs | 86 +++++++------------ 1 file changed, 30 insertions(+), 56 deletions(-) diff --git a/UKSF.Api.ArmaMissions/Services/MissionService.cs b/UKSF.Api.ArmaMissions/Services/MissionService.cs index 3caeffd3..258b34cb 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionService.cs @@ -22,7 +22,7 @@ public List ProcessMission(Mission tempMission, string ar _armaServerDefaultMaxCurators = armaServerDefaultMaxCurators; _armaServerModsPath = armaServerModsPath; _mission = tempMission; - _reports = new List(); + _reports = new(); if (!AssertRequiredFiles()) return _reports; if (CheckBinned()) { @@ -33,16 +33,13 @@ public List ProcessMission(Mission tempMission, string ar if (CheckIgnoreKey("missionPatchingIgnore")) { _reports.Add( - new MissionPatchingReport( - "Mission Patching Ignored", - "Mission patching for this mission was ignored.\nThis means no changes to the mission.sqm were made." + - "This is not an error, however errors may occur in the mission as a result of this.\n" + - "Ensure ALL the steps below have been done to the mission.sqm before reporting any errors:\n\n\n" + - "1: Remove raw newline characters. Any newline characters (\\n) in code will result in compile errors and that code will NOT run.\n" + - "For example, a line: init = \"myTestVariable = 10; \\n myOtherTestVariable = 20;\" should be replaced with: init = \"myTestVariable = 10; myOtherTestVariable = 20;\"\n\n" + - "2: Replace embedded quotes. Any embedded quotes (\"\") in code will result in compile errors and that code will NOT run. They should be replaced with a single quote character (').\n" + - "For example, a line: init = \"myTestVariable = \"\"hello\"\";\" should be replaced with: init = \"myTestVariable = 'hello';\"" - ) + new("Mission Patching Ignored", "Mission patching for this mission was ignored.\nThis means no changes to the mission.sqm were made." + + "This is not an error, however errors may occur in the mission as a result of this.\n" + + "Ensure ALL the steps below have been done to the mission.sqm before reporting any errors:\n\n\n" + + "1: Remove raw newline characters. Any newline characters (\\n) in code will result in compile errors and that code will NOT run.\n" + + "For example, a line: init = \"myTestVariable = 10; \\n myOtherTestVariable = 20;\" should be replaced with: init = \"myTestVariable = 10; myOtherTestVariable = 20;\"\n\n" + + "2: Replace embedded quotes. Any embedded quotes (\"\") in code will result in compile errors and that code will NOT run. They should be replaced with a single quote character (').\n" + + "For example, a line: init = \"myTestVariable = \"\"hello\"\";\" should be replaced with: init = \"myTestVariable = 'hello';\"") ); PatchDescription(); return _reports; @@ -58,25 +55,17 @@ public List ProcessMission(Mission tempMission, string ar private bool AssertRequiredFiles() { if (!File.Exists(_mission.DescriptionPath)) { _reports.Add( - new MissionPatchingReport( - "Missing file: description.ext", - "The mission is missing a required file:\ndescription.ext\n\n" + - "It is advised to copy this file directly from the template mission to your mission\nUKSFTemplate.VR is located in the modpack files", - true - ) + new("Missing file: description.ext", "The mission is missing a required file:\ndescription.ext\n\n" + + "It is advised to copy this file directly from the template mission to your mission\nUKSFTemplate.VR is located in the modpack files", true) ); return false; } if (!File.Exists(Path.Combine(_mission.Path, "cba_settings.sqf"))) { _reports.Add( - new MissionPatchingReport( - "Missing file: cba_settings.sqf", - "The mission is missing a required file:\ncba_settings.sqf\n\n" + - "It is advised to copy this file directly from the template mission to your mission\n" + - "UKSFTemplate.VR is located in the modpack files and make changes according to the needs of the mission", - true - ) + new("Missing file: cba_settings.sqf", "The mission is missing a required file:\ncba_settings.sqf\n\n" + + "It is advised to copy this file directly from the template mission to your mission\n" + + "UKSFTemplate.VR is located in the modpack files and make changes according to the needs of the mission", true) ); return false; } @@ -140,12 +129,9 @@ private void ReadSettings() { if (string.IsNullOrEmpty(curatorsMaxLine)) { _mission.MaxCurators = _armaServerDefaultMaxCurators; _reports.Add( - new MissionPatchingReport( - "Using server setting 'uksf_curator_curatorsMax'", - "Could not find setting 'uksf_curator_curatorsMax' in cba_settings.sqf" + - "This is required to add the correct nubmer of pre-defined curator objects." + - $"The server setting value ({_mission.MaxCurators}) for this will be used instead." - ) + new("Using server setting 'uksf_curator_curatorsMax'", "Could not find setting 'uksf_curator_curatorsMax' in cba_settings.sqf" + + "This is required to add the correct nubmer of pre-defined curator objects." + + $"The server setting value ({_mission.MaxCurators}) for this will be used instead.") ); return; } @@ -153,12 +139,9 @@ private void ReadSettings() { string curatorsMaxString = curatorsMaxLine.Split("=")[1].RemoveSpaces().Replace(";", ""); if (!int.TryParse(curatorsMaxString, out int maxCurators)) { _reports.Add( - new MissionPatchingReport( - "Using hardcoded setting 'uksf_curator_curatorsMax'", - $"Could not read malformed setting: '{curatorsMaxLine}' in cba_settings.sqf" + - "This is required to add the correct nubmer of pre-defined curator objects." + - "The hardcoded value (5) will be used instead." - ) + new("Using hardcoded setting 'uksf_curator_curatorsMax'", $"Could not read malformed setting: '{curatorsMaxLine}' in cba_settings.sqf" + + "This is required to add the correct nubmer of pre-defined curator objects." + + "The hardcoded value (5) will be used instead.") ); } else { _mission.MaxCurators = maxCurators; @@ -174,12 +157,9 @@ private void Patch() { if (File.Exists(modpackImagePath)) { if (File.Exists(imagePath) && new FileInfo(imagePath).Length != new FileInfo(modpackImagePath).Length) { _reports.Add( - new MissionPatchingReport( - "Loading image was different", - "The mission loading image `uksf.paa` was found to be different from the default." + - "It has been replaced with the default UKSF image.\n\n" + - "If you wish this to be a custom image, see this page for details on how to configure this" - ) + new("Loading image was different", "The mission loading image `uksf.paa` was found to be different from the default." + + "It has been replaced with the default UKSF image.\n\n" + + "If you wish this to be a custom image, see this page for details on how to configure this") ); } @@ -231,6 +211,7 @@ private void CheckRequiredDescriptionItems() { CheckDescriptionItem("aiKills", "0"); CheckDescriptionItem("disableChannels[]", "{ 0,2,6 }"); CheckDescriptionItem("cba_settings_hasSettingsFile", "1"); + CheckDescriptionItem("allowProfileGlasses", "0"); } private void CheckDescriptionItem(string key, string defaultValue, bool required = true) { @@ -241,17 +222,13 @@ private void CheckDescriptionItem(string key, string defaultValue, bool required bool equal = string.Equals(itemValue, defaultValue, StringComparison.InvariantCultureIgnoreCase); if (!equal && required) { _reports.Add( - new MissionPatchingReport( - $"Required description.ext item {key} value is not default", - $"{key} in description.ext is '{itemValue}'\nThe default value is '{defaultValue}'\n\nYou should only change this if you know what you're doing" - ) + new($"Required description.ext item {key} value is not default", + $"{key} in description.ext is '{itemValue}'\nThe default value is '{defaultValue}'\n\nYou should only change this if you know what you're doing") ); } else if (equal && !required) { _reports.Add( - new MissionPatchingReport( - $"Configurable description.ext item {key} value is default", - $"{key} in description.ext is the same as the default value '{itemValue}'\n\nThis should be changed based on your mission" - ) + new($"Configurable description.ext item {key} value is default", + $"{key} in description.ext is the same as the default value '{itemValue}'\n\nThis should be changed based on your mission") ); } @@ -262,12 +239,9 @@ private void CheckDescriptionItem(string key, string defaultValue, bool required _mission.DescriptionLines.Add($"{key} = {defaultValue};"); } else { _reports.Add( - new MissionPatchingReport( - $"Configurable description.ext item {key} is missing", - $"{key} in description.ext is missing\nThis is required for the mission\n\n" + - "It is advised to copy the description.ext file directly from the template mission to your mission\nUKSFTemplate.VR is located in the modpack files", - true - ) + new($"Configurable description.ext item {key} is missing", $"{key} in description.ext is missing\nThis is required for the mission\n\n" + + "It is advised to copy the description.ext file directly from the template mission to your mission\nUKSFTemplate.VR is located in the modpack files" + , true) ); } } From db38dfd2b0372712dbefc978f4c8eec1ac857022 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 12 May 2021 18:49:15 +0100 Subject: [PATCH 314/369] Disable modpack build block when servers are running --- .../Services/BuildProcess/BuildQueueService.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs index e1b34446..73eaec76 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs @@ -40,7 +40,7 @@ public void QueueBuild(ModpackBuild build) { public bool CancelQueued(string id) { if (_queue.Any(x => x.Id == id)) { - _queue = new ConcurrentQueue(_queue.Where(x => x.Id != id)); + _queue = new(_queue.Where(x => x.Id != id)); return true; } @@ -87,11 +87,11 @@ private async Task ProcessQueue() { while (_queue.TryDequeue(out ModpackBuild build)) { // TODO: Expand this to check if a server is running using the repo for this build. If no servers are running but there are processes, don't build at all. // Will require better game <-> api interaction to communicate with servers and headless clients properly - if (_gameServersService.GetGameInstanceCount() > 0) { - _queue.Enqueue(build); - await Task.Delay(TimeSpan.FromMinutes(5)); - continue; - } + // if (_gameServersService.GetGameInstanceCount() > 0) { + // _queue.Enqueue(build); + // await Task.Delay(TimeSpan.FromMinutes(5)); + // continue; + // } CancellationTokenSource cancellationTokenSource = new(); _cancellationTokenSources.TryAdd(build.Id, cancellationTokenSource); From c3eb980f0069d9c66cd236ff35f11cd9774e3e4e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 14 May 2021 18:39:49 +0100 Subject: [PATCH 315/369] Support creator dlc mod paths in server mods search --- .../Services/GameServersService.cs | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/UKSF.Api.ArmaServer/Services/GameServersService.cs b/UKSF.Api.ArmaServer/Services/GameServersService.cs index c6d6952d..6abe669d 100644 --- a/UKSF.Api.ArmaServer/Services/GameServersService.cs +++ b/UKSF.Api.ArmaServer/Services/GameServersService.cs @@ -42,7 +42,9 @@ public GameServersService(IGameServersContext gameServersContext, IMissionPatchi _gameServerHelpers = gameServerHelpers; } - public int GetGameInstanceCount() => _gameServerHelpers.GetArmaProcesses().Count(); + public int GetGameInstanceCount() { + return _gameServerHelpers.GetArmaProcesses().Count(); + } public async Task UploadMissionFile(IFormFile file) { string fileName = ContentDispositionHeaderValue.Parse(file.ContentDisposition).FileName.Trim('"'); @@ -65,7 +67,7 @@ public async Task GetGameServerStatus(GameServer gameServer) { } using HttpClient client = new(); - client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + client.DefaultRequestHeaders.Accept.Add(new("application/json")); try { HttpResponseMessage response = await client.GetAsync($"http://localhost:{gameServer.ApiPort}/server"); if (!response.IsSuccessStatusCode) { @@ -106,8 +108,9 @@ public async Task PatchMissionFile(string missionName) { return result; } - public void WriteServerConfig(GameServer gameServer, int playerCount, string missionSelection) => + public void WriteServerConfig(GameServer gameServer, int playerCount, string missionSelection) { File.WriteAllText(_gameServerHelpers.GetGameServerConfigPath(gameServer), _gameServerHelpers.FormatGameServerConfig(gameServer, playerCount, missionSelection)); + } public async Task LaunchGameServer(GameServer gameServer) { string launchArguments = _gameServerHelpers.FormatGameServerLaunchArguments(gameServer); @@ -129,7 +132,7 @@ public async Task LaunchGameServer(GameServer gameServer) { public async Task StopGameServer(GameServer gameServer) { try { using HttpClient client = new(); - client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + client.DefaultRequestHeaders.Accept.Add(new("application/json")); await client.GetAsync($"http://localhost:{gameServer.ApiPort}/server/stop"); } catch (Exception) { // ignored @@ -139,7 +142,7 @@ public async Task StopGameServer(GameServer gameServer) { for (int index = 0; index < gameServer.NumberHeadlessClients; index++) { try { using HttpClient client = new(); - client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + client.DefaultRequestHeaders.Accept.Add(new("application/json")); await client.GetAsync($"http://localhost:{gameServer.ApiPort + index + 1}/server/stop"); } catch (Exception) { // ignored @@ -191,12 +194,13 @@ public int KillAllArmaProcesses() { public List GetAvailableMods(string id) { GameServer gameServer = _gameServersContext.GetSingle(id); Uri serverExecutable = new(_gameServerHelpers.GetGameServerExecutablePath(gameServer)); - List mods = new(); + IEnumerable availableModsFolders = new[] { _gameServerHelpers.GetGameServerModsPaths(gameServer.Environment) }; - IEnumerable extraModsFolders = _gameServerHelpers.GetGameServerExtraModsPaths(); - availableModsFolders = availableModsFolders.Concat(extraModsFolders); + availableModsFolders = availableModsFolders.Concat(_gameServerHelpers.GetGameServerExtraModsPaths()); + + List mods = new(); foreach (string modsPath in availableModsFolders) { - IEnumerable modFolders = new DirectoryInfo(modsPath).EnumerateDirectories("@*", SearchOption.TopDirectoryOnly); + IEnumerable modFolders = GetModFolders(modsPath); foreach (DirectoryInfo modFolder in modFolders) { if (mods.Any(x => x.Path == modFolder.FullName)) continue; @@ -234,5 +238,21 @@ public List GetEnvironmentMods(GameEnvironment environment) { .Select(x => new GameServerMod { Name = x.modFolder.Name, Path = x.modFolder.FullName }) .ToList(); } + + private static IEnumerable GetModFolders(string modsPath) { + List modFolders = new DirectoryInfo(modsPath).EnumerateDirectories("@*", SearchOption.TopDirectoryOnly).ToList(); + + DirectoryInfo vnPath = new(Path.Join(modsPath, "vn")); + if (vnPath.Exists) { + modFolders.Add(vnPath); + } + + DirectoryInfo gmPath = new(Path.Join(modsPath, "gm")); + if (gmPath.Exists) { + modFolders.Add(gmPath); + } + + return modFolders; + } } } From a36c71dd284a8d72b38e11565c1c24e7937f2eed Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Fri, 14 May 2021 19:15:01 +0100 Subject: [PATCH 316/369] Use regex --- .../Services/GameServersService.cs | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/UKSF.Api.ArmaServer/Services/GameServersService.cs b/UKSF.Api.ArmaServer/Services/GameServersService.cs index 6abe669d..458903c8 100644 --- a/UKSF.Api.ArmaServer/Services/GameServersService.cs +++ b/UKSF.Api.ArmaServer/Services/GameServersService.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Net.Http; using System.Net.Http.Headers; +using System.Text.RegularExpressions; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Newtonsoft.Json; @@ -200,12 +201,14 @@ public List GetAvailableMods(string id) { List mods = new(); foreach (string modsPath in availableModsFolders) { - IEnumerable modFolders = GetModFolders(modsPath); + Regex allowedPaths = new("@.*|(? modFolders = new DirectoryInfo(modsPath).EnumerateDirectories("*.*", SearchOption.TopDirectoryOnly).Where(x => allowedPaths.IsMatch(x.Name)); foreach (DirectoryInfo modFolder in modFolders) { if (mods.Any(x => x.Path == modFolder.FullName)) continue; - IEnumerable modFiles = new DirectoryInfo(modFolder.FullName).EnumerateFiles("*.pbo", SearchOption.AllDirectories); - if (!modFiles.Any()) continue; + Regex allowedExtensions = new("[ep]bo", RegexOptions.Compiled | RegexOptions.IgnoreCase); + bool hasModFiles = new DirectoryInfo(modFolder.FullName).EnumerateFiles("*.*", SearchOption.AllDirectories).Any(x => allowedExtensions.IsMatch(x.Extension)); + if (!hasModFiles) continue; GameServerMod mod = new() { Name = modFolder.Name, Path = modFolder.FullName }; Uri modFolderUri = new(mod.Path); @@ -238,21 +241,5 @@ public List GetEnvironmentMods(GameEnvironment environment) { .Select(x => new GameServerMod { Name = x.modFolder.Name, Path = x.modFolder.FullName }) .ToList(); } - - private static IEnumerable GetModFolders(string modsPath) { - List modFolders = new DirectoryInfo(modsPath).EnumerateDirectories("@*", SearchOption.TopDirectoryOnly).ToList(); - - DirectoryInfo vnPath = new(Path.Join(modsPath, "vn")); - if (vnPath.Exists) { - modFolders.Add(vnPath); - } - - DirectoryInfo gmPath = new(Path.Join(modsPath, "gm")); - if (gmPath.Exists) { - modFolders.Add(gmPath); - } - - return modFolders; - } } } From e4a476f337d8e8e80b7e85638b595c00785eda48 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 15 May 2021 21:56:42 +0100 Subject: [PATCH 317/369] Implement exception handling middleware for consistent error responses --- .../UKSF.Api.Admin.Tests.csproj | 4 +- .../UKSF.Api.ArmaMissions.Tests.csproj | 4 +- .../UKSF.Api.ArmaServer.Tests.csproj | 4 +- .../UKSF.Api.Auth.Tests.csproj | 4 +- .../UKSF.Api.Base.Tests.csproj | 12 +- .../UKSF.Api.Command.Tests.csproj | 4 +- ...UKSF.Api.Integrations.Discord.Tests.csproj | 4 +- ...SF.Api.Integrations.Instagram.Tests.csproj | 4 +- ...SF.Api.Integrations.Teamspeak.Tests.csproj | 4 +- .../UKSF.Api.Launcher.Tests.csproj | 4 +- .../UKSF.Api.Modpack.Tests.csproj | 4 +- .../UKSF.Api.Personnel.Tests.csproj | 4 +- .../UKSF.Api.Shared.Tests.csproj | 4 +- .../TestConfigurationProvider.cs | 11 +- Tests/UKSF.Api.Tests.Common/TestUtilities.cs | 18 +- .../UKSF.Api.Tests.Common.csproj | 12 +- .../DependencyInjectionTests.cs | 20 +- Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj | 4 +- UKSF.Api.Admin/ApiAdminExtensions.cs | 35 +- UKSF.Api.Admin/Context/VariablesContext.cs | 36 +- UKSF.Api.Admin/Controllers/DataController.cs | 14 +- .../Controllers/VariablesController.cs | 40 +- .../Controllers/VersionController.cs | 17 +- .../Extensions/VariablesExtensions.cs | 58 ++- .../ScheduledActions/ActionPruneLogs.cs | 36 +- UKSF.Api.Admin/Services/DataCacheService.cs | 21 +- UKSF.Api.Admin/Services/VariablesService.cs | 24 +- UKSF.Api.Admin/UKSF.Api.Admin.csproj | 4 +- .../ApiArmaMissionsExtensions.cs | 27 +- .../Services/MissionDataResolver.cs | 95 +++-- .../Services/MissionEntityItemHelper.cs | 63 ++- .../Services/MissionPatchDataService.cs | 52 ++- .../Services/MissionPatchingService.cs | 79 ++-- .../Services/MissionService.cs | 124 ++++-- .../Services/MissionUtilities.cs | 59 ++- .../UKSF.Api.ArmaMissions.csproj | 2 +- .../ApiArmaServerExtensions.cs | 29 +- .../Controllers/GameServersController.cs | 138 +++++-- UKSF.Api.ArmaServer/Models/GameServer.cs | 19 +- UKSF.Api.ArmaServer/Models/GameServerMod.cs | 11 +- .../Services/GameServersService.cs | 139 ++++--- .../UKSF.Api.ArmaServer.csproj | 2 +- UKSF.Api.Auth/ApiAuthExtensions.cs | 60 ++- UKSF.Api.Auth/Controllers/LoginController.cs | 36 +- .../Controllers/PasswordResetController.cs | 23 +- UKSF.Api.Auth/Services/LoginService.cs | 36 +- UKSF.Api.Auth/UKSF.Api.Auth.csproj | 12 +- UKSF.Api.Base/ApiBaseExtensions.cs | 24 +- UKSF.Api.Base/Context/MongoCollection.cs | 74 +++- .../Context/MongoCollectionFactory.cs | 17 +- UKSF.Api.Base/Context/MongoContextBase.cs | 81 ++-- UKSF.Api.Base/Events/EventBus.cs | 20 +- UKSF.Api.Base/UKSF.Api.Base.csproj | 18 +- UKSF.Api.Command/ApiCommandExtensions.cs | 51 ++- .../Controllers/CommandRequestsController.cs | 102 +++-- .../CommandRequestsCreationController.cs | 119 ++++-- .../Controllers/OperationOrderController.cs | 25 +- .../Controllers/OperationReportController.cs | 23 +- UKSF.Api.Command/Models/CommandRequest.cs | 20 +- .../Services/ChainOfCommandService.cs | 125 ++++-- .../Services/CommandRequestService.cs | 62 ++- UKSF.Api.Command/Services/LoaService.cs | 29 +- .../Services/OperationOrderService.cs | 20 +- .../Services/OperationReportService.cs | 20 +- .../ApiIntegrationDiscordExtensions.cs | 26 +- .../Controllers/DiscordController.cs | 23 +- .../Services/DiscordService.cs | 366 ++++++++++++------ .../UKSF.Api.Integrations.Discord.csproj | 4 +- .../ApiIntegrationInstagramExtensions.cs | 32 +- .../Controllers/InstagramController.cs | 19 +- .../ScheduledActions/ActionInstagramImages.cs | 25 +- .../ScheduledActions/ActionInstagramToken.cs | 23 +- .../Services/InstagramService.cs | 58 ++- .../UKSF.Api.Integrations.Instagram.csproj | 4 +- .../ApiIntegrationTeamspeakExtensions.cs | 39 +- .../Controllers/OperationsController.cs | 49 ++- .../Controllers/TeamspeakController.cs | 45 ++- .../TeamspeakServerEventHandler.cs | 40 +- .../ActionTeamspeakSnapshot.cs | 30 +- .../Services/TeamspeakManagerService.cs | 90 +++-- .../Services/TeamspeakMetricsService.cs | 14 +- .../Services/TeamspeakService.cs | 84 ++-- .../Signalr/Hubs/TeamspeakHub.cs | 23 +- .../UKSF.Api.Integrations.Teamspeak.csproj | 2 +- UKSF.Api.Launcher/ApiLauncherExtensions.cs | 31 +- .../Controllers/LauncherController.cs | 38 +- UKSF.Api.Launcher/Services/LauncherService.cs | 11 +- UKSF.Api.Launcher/UKSF.Api.Launcher.csproj | 4 +- UKSF.Api.Modpack/ApiModpackExtensions.cs | 48 ++- .../Controllers/GithubController.cs | 36 +- .../Controllers/ModpackController.cs | 68 +++- .../EventHandlers/BuildsEventHandler.cs | 55 ++- UKSF.Api.Modpack/Models/ModpackBuildStep.cs | 11 +- .../ScheduledActions/ActionPruneBuilds.cs | 28 +- .../BuildProcess/BuildProcessHelper.cs | 126 ++++-- .../Services/BuildProcess/BuildStepService.cs | 56 ++- .../Services/BuildProcess/StepLogger.cs | 59 ++- .../Services/BuildProcess/Steps/BuildStep.cs | 132 +++++-- .../BuildProcess/Steps/BuildStepAttribute.cs | 11 +- .../Steps/BuildSteps/BuildStepSources.cs | 35 +- .../BuildSteps/Mods/BuildStepBuildAir.cs | 13 +- .../Steps/Common/BuildStepNotify.cs | 34 +- .../BuildProcess/Steps/FileBuildStep.cs | 157 +++++--- .../BuildProcess/Steps/ModBuildStep.cs | 20 +- UKSF.Api.Modpack/Services/BuildsService.cs | 121 ++++-- UKSF.Api.Modpack/Services/ModpackService.cs | 95 +++-- UKSF.Api.Modpack/UKSF.Api.Modpack.csproj | 8 +- UKSF.Api.Personnel/ApiPersonnelExtensions.cs | 94 +++-- UKSF.Api.Personnel/Context/RanksContext.cs | 20 +- UKSF.Api.Personnel/Context/RolesContext.cs | 20 +- .../Controllers/CommunicationsController.cs | 53 ++- .../DiscordConnectionController.cs | 55 ++- .../Controllers/DisplayNameController.cs | 16 +- .../Controllers/NotificationsController.cs | 20 +- .../Controllers/RanksController.cs | 63 ++- .../Controllers/RecruitmentController.cs | 99 +++-- .../Controllers/RolesController.cs | 54 ++- .../Controllers/SteamConnectionController.cs | 35 +- .../Controllers/UnitsController.cs | 141 ++++--- .../CommentThreadEventHandler.cs | 28 +- .../EventHandlers/DiscordEventHandler.cs | 25 +- UKSF.Api.Personnel/Models/ServiceRecord.cs | 11 +- UKSF.Api.Personnel/Models/Unit.cs | 35 +- .../ActionDeleteExpiredConfirmationCode.cs | 17 +- .../ActionPruneNotifications.cs | 28 +- UKSF.Api.Personnel/Services/AccountService.cs | 17 +- .../Services/AssignmentService.cs | 117 ++++-- .../Services/CommentThreadService.cs | 31 +- .../Services/ConfirmationCodeService.cs | 36 +- .../Services/DisplayNameService.cs | 23 +- UKSF.Api.Personnel/Services/EmailService.cs | 23 +- .../Services/NotificationsService.cs | 84 ++-- .../Services/ObjectIdConversionService.cs | 34 +- UKSF.Api.Personnel/Services/RanksService.cs | 50 ++- .../Services/RecruitmentService.cs | 174 +++++---- UKSF.Api.Personnel/Services/RolesService.cs | 30 +- .../Services/ServiceRecordService.cs | 17 +- UKSF.Api.Personnel/Services/UnitsService.cs | 166 +++++--- UKSF.Api.Personnel/UKSF.Api.Personnel.csproj | 4 +- UKSF.Api.Shared/ApiSharedExtensions.cs | 45 ++- UKSF.Api.Shared/Context/CachedMongoContext.cs | 113 ++++-- UKSF.Api.Shared/Context/LogContext.cs | 22 +- UKSF.Api.Shared/Context/MongoContext.cs | 59 ++- UKSF.Api.Shared/Events/Logger.cs | 63 +-- .../Exceptions/NotFoundException.cs | 10 + UKSF.Api.Shared/Exceptions/UksfException.cs | 15 + UKSF.Api.Shared/Extensions/ChangeUtilities.cs | 120 ++++-- UKSF.Api.Shared/Extensions/GuardUtilites.cs | 65 +++- UKSF.Api.Shared/Extensions/JsonExtensions.cs | 19 +- .../Extensions/ObjectExtensions.cs | 54 ++- .../Extensions/StringExtensions.cs | 53 ++- UKSF.Api.Shared/Models/BasicLog.cs | 33 +- UKSF.Api.Shared/Models/ErrorLog.cs | 35 ++ UKSF.Api.Shared/Models/HttpErrorLog.cs | 24 -- UKSF.Api.Shared/Models/LauncherLog.cs | 11 +- UKSF.Api.Shared/Models/LoggerEventData.cs | 13 +- UKSF.Api.Shared/Models/UksfErrorMessage.cs | 15 + UKSF.Api.Shared/Permissions.cs | 14 +- UKSF.Api.Shared/Services/Clock.cs | 26 +- .../Services/HttpContextService.cs | 35 +- UKSF.Api.Shared/Services/SchedulerService.cs | 92 +++-- UKSF.Api.sln.DotSettings | 56 +-- UKSF.Api/Controllers/LoaController.cs | 81 ++-- UKSF.Api/Controllers/LoggingController.cs | 68 ++-- UKSF.Api/Controllers/ModsController.cs | 11 +- UKSF.Api/EventHandlers/LoggerEventHandler.cs | 45 ++- UKSF.Api/ExceptionHandler.cs | 53 --- .../Exceptions/InvalidLoaScopeException.cs | 11 + UKSF.Api/Middleware/CorsMiddleware.cs | 19 + UKSF.Api/Middleware/ExceptionHandler.cs | 58 +++ UKSF.Api/Middleware/ExceptionMiddleware.cs | 80 ++++ UKSF.Api/Models/LoaReportDataset.cs | 27 ++ UKSF.Api/Program.cs | 70 ++-- ...viceExtensions.cs => ServiceExtensions.cs} | 37 +- UKSF.Api/Services/MigrationUtility.cs | 67 +++- UKSF.Api/Startup.cs | 124 +++--- UKSF.Api/UKSF.Api.csproj | 37 +- UKSF.PostMessage/Program.cs | 15 +- UKSF.PostMessage/UKSF.PostMessage.csproj | 2 +- UKSF.Tests/UKSF.Tests.csproj | 28 +- UKSF.Tests/Unit/Common/DateUtilitiesTests.cs | 29 +- .../Unit/Data/CahcedDataServiceEventTests.cs | 36 +- .../Events/Handlers/LogEventHandlerTests.cs | 60 +-- .../Message/Logging/WebLogMessageTests.cs | 20 +- .../ScheduledActions/PruneDataActionTests.cs | 27 +- 185 files changed, 5491 insertions(+), 2565 deletions(-) create mode 100644 UKSF.Api.Shared/Exceptions/NotFoundException.cs create mode 100644 UKSF.Api.Shared/Exceptions/UksfException.cs create mode 100644 UKSF.Api.Shared/Models/ErrorLog.cs delete mode 100644 UKSF.Api.Shared/Models/HttpErrorLog.cs create mode 100644 UKSF.Api.Shared/Models/UksfErrorMessage.cs delete mode 100644 UKSF.Api/ExceptionHandler.cs create mode 100644 UKSF.Api/Exceptions/InvalidLoaScopeException.cs create mode 100644 UKSF.Api/Middleware/CorsMiddleware.cs create mode 100644 UKSF.Api/Middleware/ExceptionHandler.cs create mode 100644 UKSF.Api/Middleware/ExceptionMiddleware.cs create mode 100644 UKSF.Api/Models/LoaReportDataset.cs rename UKSF.Api/{AppStart/UksfServiceExtensions.cs => ServiceExtensions.cs} (66%) diff --git a/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj b/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj index 75d3bc27..83bef804 100644 --- a/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj +++ b/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj @@ -8,13 +8,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.ArmaMissions.Tests/UKSF.Api.ArmaMissions.Tests.csproj b/Tests/UKSF.Api.ArmaMissions.Tests/UKSF.Api.ArmaMissions.Tests.csproj index 9fc420ef..c06568d9 100644 --- a/Tests/UKSF.Api.ArmaMissions.Tests/UKSF.Api.ArmaMissions.Tests.csproj +++ b/Tests/UKSF.Api.ArmaMissions.Tests/UKSF.Api.ArmaMissions.Tests.csproj @@ -7,13 +7,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj b/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj index 548cbc31..7fc5e002 100644 --- a/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj +++ b/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj @@ -8,13 +8,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj b/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj index c74765c8..84c10203 100644 --- a/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj +++ b/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj @@ -8,13 +8,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Base.Tests/UKSF.Api.Base.Tests.csproj b/Tests/UKSF.Api.Base.Tests/UKSF.Api.Base.Tests.csproj index f57e1c60..f004e7e4 100644 --- a/Tests/UKSF.Api.Base.Tests/UKSF.Api.Base.Tests.csproj +++ b/Tests/UKSF.Api.Base.Tests/UKSF.Api.Base.Tests.csproj @@ -7,16 +7,16 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj b/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj index 2358ac9e..3340cca1 100644 --- a/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj +++ b/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj @@ -8,13 +8,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj b/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj index 038280f4..733090b8 100644 --- a/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj +++ b/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj @@ -8,13 +8,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj b/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj index e8695bc1..292020a8 100644 --- a/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj +++ b/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj @@ -8,13 +8,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Integrations.Teamspeak.Tests/UKSF.Api.Integrations.Teamspeak.Tests.csproj b/Tests/UKSF.Api.Integrations.Teamspeak.Tests/UKSF.Api.Integrations.Teamspeak.Tests.csproj index ee964b5c..dfde85e5 100644 --- a/Tests/UKSF.Api.Integrations.Teamspeak.Tests/UKSF.Api.Integrations.Teamspeak.Tests.csproj +++ b/Tests/UKSF.Api.Integrations.Teamspeak.Tests/UKSF.Api.Integrations.Teamspeak.Tests.csproj @@ -8,13 +8,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj b/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj index 493f929b..76c3d2e4 100644 --- a/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj +++ b/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj @@ -8,13 +8,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj b/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj index f77dcc37..86d3c920 100644 --- a/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj +++ b/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj @@ -8,13 +8,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj b/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj index f0c74cca..875007ac 100644 --- a/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj +++ b/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj @@ -8,13 +8,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Shared.Tests/UKSF.Api.Shared.Tests.csproj b/Tests/UKSF.Api.Shared.Tests/UKSF.Api.Shared.Tests.csproj index 06abb5c8..716edaa2 100644 --- a/Tests/UKSF.Api.Shared.Tests/UKSF.Api.Shared.Tests.csproj +++ b/Tests/UKSF.Api.Shared.Tests/UKSF.Api.Shared.Tests.csproj @@ -8,13 +8,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Tests.Common/TestConfigurationProvider.cs b/Tests/UKSF.Api.Tests.Common/TestConfigurationProvider.cs index e837fa3c..c1539179 100644 --- a/Tests/UKSF.Api.Tests.Common/TestConfigurationProvider.cs +++ b/Tests/UKSF.Api.Tests.Common/TestConfigurationProvider.cs @@ -1,7 +1,12 @@ using Microsoft.Extensions.Configuration; -namespace UKSF.Api.Tests.Common { - public static class TestConfigurationProvider { - public static IConfigurationRoot GetTestConfiguration() => new ConfigurationBuilder().AddJsonFile("appsettings.json").Build(); +namespace UKSF.Api.Tests.Common +{ + public static class TestConfigurationProvider + { + public static IConfigurationRoot GetTestConfiguration() + { + return new ConfigurationBuilder().AddJsonFile("appsettings.json").Build(); + } } } diff --git a/Tests/UKSF.Api.Tests.Common/TestUtilities.cs b/Tests/UKSF.Api.Tests.Common/TestUtilities.cs index c11958b8..0a66585e 100644 --- a/Tests/UKSF.Api.Tests.Common/TestUtilities.cs +++ b/Tests/UKSF.Api.Tests.Common/TestUtilities.cs @@ -2,12 +2,18 @@ using MongoDB.Bson.Serialization; using MongoDB.Driver; -namespace UKSF.Api.Tests.Common { - public static class TestUtilities { - public static BsonValue RenderUpdate(UpdateDefinition updateDefinition) => - updateDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); +namespace UKSF.Api.Tests.Common +{ + public static class TestUtilities + { + public static BsonValue RenderUpdate(UpdateDefinition updateDefinition) + { + return updateDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); + } - public static BsonValue RenderFilter(FilterDefinition filterDefinition) => - filterDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); + public static BsonValue RenderFilter(FilterDefinition filterDefinition) + { + return filterDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); + } } } diff --git a/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj b/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj index 04c50197..8abc4a34 100644 --- a/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj +++ b/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj @@ -7,16 +7,16 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Tests/DependencyInjectionTests.cs index c8c35441..4eb00761 100644 --- a/Tests/UKSF.Api.Tests/DependencyInjectionTests.cs +++ b/Tests/UKSF.Api.Tests/DependencyInjectionTests.cs @@ -1,19 +1,23 @@ using FluentAssertions; using Microsoft.Extensions.DependencyInjection; -using UKSF.Api.AppStart; using UKSF.Api.Controllers; using UKSF.Api.EventHandlers; +using UKSF.Api.Middleware; using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Api.Tests { - public class DependencyInjectionTests : DependencyInjectionTestsBase { - public DependencyInjectionTests() { +namespace UKSF.Api.Tests +{ + public class DependencyInjectionTests : DependencyInjectionTestsBase + { + public DependencyInjectionTests() + { Services.AddUksf(Configuration, HostEnvironment); } [Fact] - public void When_resolving_controllers() { + public void When_resolving_controllers() + { Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); @@ -25,7 +29,8 @@ public void When_resolving_controllers() { } [Fact] - public void When_resolving_event_handlers() { + public void When_resolving_event_handlers() + { Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); @@ -33,7 +38,8 @@ public void When_resolving_event_handlers() { } [Fact] - public void When_resolving_filters() { + public void When_resolving_filters() + { Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); diff --git a/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj b/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj index ece55ba6..1ffd5b2d 100644 --- a/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj +++ b/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj @@ -8,13 +8,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/UKSF.Api.Admin/ApiAdminExtensions.cs b/UKSF.Api.Admin/ApiAdminExtensions.cs index 4092c2e2..ad8433aa 100644 --- a/UKSF.Api.Admin/ApiAdminExtensions.cs +++ b/UKSF.Api.Admin/ApiAdminExtensions.cs @@ -7,20 +7,37 @@ using UKSF.Api.Admin.Services; using UKSF.Api.Admin.Signalr.Hubs; -namespace UKSF.Api.Admin { - public static class ApiAdminExtensions { - public static IServiceCollection AddUksfAdmin(this IServiceCollection services) => services.AddContexts().AddEventHandlers().AddServices().AddActions(); +namespace UKSF.Api.Admin +{ + public static class ApiAdminExtensions + { + public static IServiceCollection AddUksfAdmin(this IServiceCollection services) + { + return services.AddContexts().AddEventHandlers().AddServices().AddActions(); + } - private static IServiceCollection AddContexts(this IServiceCollection services) => services; + private static IServiceCollection AddContexts(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddEventHandlers(this IServiceCollection services) + { + return services.AddSingleton(); + } - private static IServiceCollection AddServices(this IServiceCollection services) => - services.AddSingleton().AddTransient().AddTransient(); + private static IServiceCollection AddServices(this IServiceCollection services) + { + return services.AddSingleton().AddTransient().AddTransient(); + } - private static IServiceCollection AddActions(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddActions(this IServiceCollection services) + { + return services.AddSingleton(); + } - public static void AddUksfAdminSignalr(this IEndpointRouteBuilder builder) { + public static void AddUksfAdminSignalr(this IEndpointRouteBuilder builder) + { builder.MapHub($"/hub/{AdminHub.END_POINT}"); builder.MapHub($"/hub/{UtilityHub.END_POINT}"); } diff --git a/UKSF.Api.Admin/Context/VariablesContext.cs b/UKSF.Api.Admin/Context/VariablesContext.cs index 4cbf8794..145dad2e 100644 --- a/UKSF.Api.Admin/Context/VariablesContext.cs +++ b/UKSF.Api.Admin/Context/VariablesContext.cs @@ -7,32 +7,48 @@ using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.Admin.Context { - public interface IVariablesContext : IMongoContext, ICachedMongoContext { +namespace UKSF.Api.Admin.Context +{ + public interface IVariablesContext : IMongoContext, ICachedMongoContext + { Task Update(string key, object value); } - public class VariablesContext : CachedMongoContext, IVariablesContext { + public class VariablesContext : CachedMongoContext, IVariablesContext + { public VariablesContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "variables") { } - public override VariableItem GetSingle(string key) { + public override VariableItem GetSingle(string key) + { return base.GetSingle(x => x.Key == key.Keyify()); } - public async Task Update(string key, object value) { + public async Task Update(string key, object value) + { VariableItem variableItem = GetSingle(key); - if (variableItem == null) throw new KeyNotFoundException($"Variable Item with key '{key}' does not exist"); + if (variableItem == null) + { + throw new KeyNotFoundException($"VariableItem with key '{key}' does not exist"); + } + await base.Update(variableItem.Id, x => x.Item, value); } - public override async Task Delete(string key) { + public override async Task Delete(string key) + { VariableItem variableItem = GetSingle(key); - if (variableItem == null) throw new KeyNotFoundException($"Variable Item with key '{key}' does not exist"); + if (variableItem == null) + { + throw new KeyNotFoundException($"VariableItem with key '{key}' does not exist"); + } + await base.Delete(variableItem); } - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { + protected override void SetCache(IEnumerable newCollection) + { + lock (LockObject) + { Cache = newCollection?.OrderBy(x => x.Key).ToList(); } } diff --git a/UKSF.Api.Admin/Controllers/DataController.cs b/UKSF.Api.Admin/Controllers/DataController.cs index 8850be87..5e727022 100644 --- a/UKSF.Api.Admin/Controllers/DataController.cs +++ b/UKSF.Api.Admin/Controllers/DataController.cs @@ -3,15 +3,21 @@ using UKSF.Api.Admin.Services; using UKSF.Api.Shared; -namespace UKSF.Api.Admin.Controllers { +namespace UKSF.Api.Admin.Controllers +{ [Route("[controller]"), Permissions(Permissions.ADMIN)] - public class DataController : Controller { + public class DataController : Controller + { private readonly IDataCacheService _dataCacheService; - public DataController(IDataCacheService dataCacheService) => _dataCacheService = dataCacheService; + public DataController(IDataCacheService dataCacheService) + { + _dataCacheService = dataCacheService; + } [HttpGet("invalidate"), Authorize] - public IActionResult Invalidate() { + public IActionResult Invalidate() + { _dataCacheService.RefreshCachedData(); return Ok(); } diff --git a/UKSF.Api.Admin/Controllers/VariablesController.cs b/UKSF.Api.Admin/Controllers/VariablesController.cs index 3074e2e7..4dea6c1e 100644 --- a/UKSF.Api.Admin/Controllers/VariablesController.cs +++ b/UKSF.Api.Admin/Controllers/VariablesController.cs @@ -7,27 +7,42 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.Admin.Controllers { +namespace UKSF.Api.Admin.Controllers +{ [Route("[controller]"), Permissions(Permissions.ADMIN)] - public class VariablesController : Controller { + public class VariablesController : Controller + { private readonly ILogger _logger; private readonly IVariablesContext _variablesContext; - public VariablesController(IVariablesContext variablesContext, ILogger logger) { + public VariablesController(IVariablesContext variablesContext, ILogger logger) + { _variablesContext = variablesContext; _logger = logger; } [HttpGet, Authorize] - public IActionResult GetAll() => Ok(_variablesContext.Get()); + public IActionResult GetAll() + { + return Ok(_variablesContext.Get()); + } [HttpGet("{key}"), Authorize] - public IActionResult GetVariableItems(string key) => Ok(_variablesContext.GetSingle(key)); + public IActionResult GetVariableItems(string key) + { + return Ok(_variablesContext.GetSingle(key)); + } [HttpPost("{key}"), Authorize] - public IActionResult CheckVariableItem(string key, [FromBody] VariableItem variableItem = null) { - if (string.IsNullOrEmpty(key)) return Ok(); - if (variableItem != null) { + public IActionResult CheckVariableItem(string key, [FromBody] VariableItem variableItem = null) + { + if (string.IsNullOrEmpty(key)) + { + return Ok(); + } + + if (variableItem != null) + { VariableItem safeVariableItem = variableItem; return Ok(_variablesContext.GetSingle(x => x.Id != safeVariableItem.Id && x.Key == key.Keyify())); } @@ -36,7 +51,8 @@ public IActionResult CheckVariableItem(string key, [FromBody] VariableItem varia } [HttpPut, Authorize] - public async Task AddVariableItem([FromBody] VariableItem variableItem) { + public async Task AddVariableItem([FromBody] VariableItem variableItem) + { variableItem.Key = variableItem.Key.Keyify(); await _variablesContext.Add(variableItem); _logger.LogAudit($"VariableItem added '{variableItem.Key}, {variableItem.Item}'"); @@ -44,7 +60,8 @@ public async Task AddVariableItem([FromBody] VariableItem variabl } [HttpPatch, Authorize] - public async Task EditVariableItem([FromBody] VariableItem variableItem) { + public async Task EditVariableItem([FromBody] VariableItem variableItem) + { VariableItem oldVariableItem = _variablesContext.GetSingle(variableItem.Key); _logger.LogAudit($"VariableItem '{oldVariableItem.Key}' updated from '{oldVariableItem.Item}' to '{variableItem.Item}'"); await _variablesContext.Update(variableItem.Key, variableItem.Item); @@ -52,7 +69,8 @@ public async Task EditVariableItem([FromBody] VariableItem variab } [HttpDelete("{key}"), Authorize] - public async Task DeleteVariableItem(string key) { + public async Task DeleteVariableItem(string key) + { VariableItem variableItem = _variablesContext.GetSingle(key); _logger.LogAudit($"VariableItem deleted '{variableItem.Key}, {variableItem.Item}'"); await _variablesContext.Delete(key); diff --git a/UKSF.Api.Admin/Controllers/VersionController.cs b/UKSF.Api.Admin/Controllers/VersionController.cs index 0d29bdf4..d3d91639 100644 --- a/UKSF.Api.Admin/Controllers/VersionController.cs +++ b/UKSF.Api.Admin/Controllers/VersionController.cs @@ -8,22 +8,29 @@ using UKSF.Api.Admin.Signalr.Clients; using UKSF.Api.Admin.Signalr.Hubs; -namespace UKSF.Api.Admin.Controllers { +namespace UKSF.Api.Admin.Controllers +{ [Route("[controller]")] - public class VersionController : Controller { + public class VersionController : Controller + { private readonly IHubContext _utilityHub; private readonly IVariablesContext _variablesContext; - public VersionController(IVariablesContext variablesContext, IHubContext utilityHub) { + public VersionController(IVariablesContext variablesContext, IHubContext utilityHub) + { _variablesContext = variablesContext; _utilityHub = utilityHub; } [HttpGet] - public IActionResult GetFrontendVersion() => Ok(_variablesContext.GetSingle("FRONTEND_VERSION").AsString()); + public IActionResult GetFrontendVersion() + { + return Ok(_variablesContext.GetSingle("FRONTEND_VERSION").AsString()); + } [HttpPost("update"), Authorize] - public async Task UpdateFrontendVersion([FromBody] JObject body) { + public async Task UpdateFrontendVersion([FromBody] JObject body) + { string version = body["version"].ToString(); await _variablesContext.Update("FRONTEND_VERSION", version); await _utilityHub.Clients.All.ReceiveFrontendUpdate(version); diff --git a/UKSF.Api.Admin/Extensions/VariablesExtensions.cs b/UKSF.Api.Admin/Extensions/VariablesExtensions.cs index 20710c71..8d0c2232 100644 --- a/UKSF.Api.Admin/Extensions/VariablesExtensions.cs +++ b/UKSF.Api.Admin/Extensions/VariablesExtensions.cs @@ -5,38 +5,51 @@ using UKSF.Api.Admin.Models; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.Admin.Extensions { - public static class VariablesExtensions { - public static VariableItem AssertHasItem(this VariableItem variableItem) { - if (variableItem.Item == null) { - throw new Exception($"Variable {variableItem.Key} has no item"); +namespace UKSF.Api.Admin.Extensions +{ + public static class VariablesExtensions + { + public static VariableItem AssertHasItem(this VariableItem variableItem) + { + if (variableItem.Item == null) + { + throw new($"Variable {variableItem.Key} has no item"); } return variableItem; } - public static string AsString(this VariableItem variable) => variable.AssertHasItem().Item.ToString(); + public static string AsString(this VariableItem variable) + { + return variable.AssertHasItem().Item.ToString(); + } - public static double AsDouble(this VariableItem variable) { + public static double AsDouble(this VariableItem variable) + { string item = variable.AsString(); - if (!double.TryParse(item, out double output)) { - throw new InvalidCastException($"Variable item {item} cannot be converted to a double"); + if (!double.TryParse(item, out double output)) + { + throw new InvalidCastException($"VariableItem {item} cannot be converted to a double"); } return output; } - public static bool AsBool(this VariableItem variable) { + public static bool AsBool(this VariableItem variable) + { string item = variable.AsString(); - if (!bool.TryParse(item, out bool output)) { - throw new InvalidCastException($"Variable item {item} cannot be converted to a bool"); + if (!bool.TryParse(item, out bool output)) + { + throw new InvalidCastException($"VariableItem {item} cannot be converted to a bool"); } return output; } - public static bool AsBoolWithDefault(this VariableItem variable, bool defaultState) { - if (variable?.Item == null) { + public static bool AsBoolWithDefault(this VariableItem variable, bool defaultState) + { + if (variable?.Item == null) + { return false; } @@ -44,30 +57,35 @@ public static bool AsBoolWithDefault(this VariableItem variable, bool defaultSta return !bool.TryParse(item, out bool output) ? defaultState : output; } - public static ulong AsUlong(this VariableItem variable) { + public static ulong AsUlong(this VariableItem variable) + { string item = variable.AsString(); - if (!ulong.TryParse(item, out ulong output)) { - throw new InvalidCastException($"Variable item {item} cannot be converted to a ulong"); + if (!ulong.TryParse(item, out ulong output)) + { + throw new InvalidCastException($"VariableItem {item} cannot be converted to a ulong"); } return output; } - public static string[] AsArray(this VariableItem variable, Func predicate = null) { + public static string[] AsArray(this VariableItem variable, Func predicate = null) + { string itemString = variable.AsString(); itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); string[] items = itemString.Split(","); return predicate != null ? items.Select(predicate).ToArray() : items; } - public static IEnumerable AsEnumerable(this VariableItem variable, Func predicate = null) { + public static IEnumerable AsEnumerable(this VariableItem variable, Func predicate = null) + { string itemString = variable.AsString(); itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); IEnumerable items = itemString.Split(",").AsEnumerable(); return predicate != null ? items.Select(predicate) : items; } - public static IEnumerable AsDoublesArray(this VariableItem variable) { + public static IEnumerable AsDoublesArray(this VariableItem variable) + { string itemString = variable.AsString(); itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); IEnumerable items = itemString.Split(",").Select(x => x.ToDouble()); diff --git a/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs b/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs index 3e18a916..0a275206 100644 --- a/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs +++ b/UKSF.Api.Admin/ScheduledActions/ActionPruneLogs.cs @@ -5,16 +5,18 @@ using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Admin.ScheduledActions { +namespace UKSF.Api.Admin.ScheduledActions +{ public interface IActionPruneLogs : ISelfCreatingScheduledAction { } - public class ActionPruneLogs : IActionPruneLogs { + public class ActionPruneLogs : IActionPruneLogs + { private const string ACTION_NAME = nameof(ActionPruneLogs); private readonly IAuditLogContext _auditLogContext; private readonly IClock _clock; private readonly IHostEnvironment _currentEnvironment; - private readonly IHttpErrorLogContext _httpErrorLogContext; + private readonly IErrorLogContext _errorLogContext; private readonly ILogContext _logContext; private readonly ISchedulerContext _schedulerContext; private readonly ISchedulerService _schedulerService; @@ -22,15 +24,16 @@ public class ActionPruneLogs : IActionPruneLogs { public ActionPruneLogs( ILogContext logContext, IAuditLogContext auditLogContext, - IHttpErrorLogContext httpErrorLogContext, + IErrorLogContext errorLogContext, ISchedulerService schedulerService, ISchedulerContext schedulerContext, IHostEnvironment currentEnvironment, IClock clock - ) { + ) + { _logContext = logContext; _auditLogContext = auditLogContext; - _httpErrorLogContext = httpErrorLogContext; + _errorLogContext = errorLogContext; _schedulerService = schedulerService; _schedulerContext = schedulerContext; _currentEnvironment = currentEnvironment; @@ -39,24 +42,33 @@ IClock clock public string Name => ACTION_NAME; - public Task Run(params object[] parameters) { + public Task Run(params object[] parameters) + { DateTime now = _clock.UtcNow(); Task logsTask = _logContext.DeleteMany(x => x.Timestamp < now.AddDays(-7)); Task auditLogsTask = _auditLogContext.DeleteMany(x => x.Timestamp < now.AddMonths(-3)); - Task errorLogsTask = _httpErrorLogContext.DeleteMany(x => x.Timestamp < now.AddDays(-7)); + Task errorLogsTask = _errorLogContext.DeleteMany(x => x.Timestamp < now.AddDays(-7)); Task.WaitAll(logsTask, errorLogsTask, auditLogsTask); return Task.CompletedTask; } - public async Task CreateSelf() { - if (_currentEnvironment.IsDevelopment()) return; + public async Task CreateSelf() + { + if (_currentEnvironment.IsDevelopment()) + { + return; + } - if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { + if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) + { await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); } } - public Task Reset() => Task.CompletedTask; + public Task Reset() + { + return Task.CompletedTask; + } } } diff --git a/UKSF.Api.Admin/Services/DataCacheService.cs b/UKSF.Api.Admin/Services/DataCacheService.cs index 0ae895cf..3f8c9f27 100644 --- a/UKSF.Api.Admin/Services/DataCacheService.cs +++ b/UKSF.Api.Admin/Services/DataCacheService.cs @@ -1,20 +1,27 @@ using System; -using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.Admin.Services { - public interface IDataCacheService { +namespace UKSF.Api.Admin.Services +{ + public interface IDataCacheService + { void RefreshCachedData(); } - public class DataCacheService : IDataCacheService { + public class DataCacheService : IDataCacheService + { private readonly IServiceProvider _serviceProvider; - public DataCacheService(IServiceProvider serviceProvider) => _serviceProvider = serviceProvider; + public DataCacheService(IServiceProvider serviceProvider) + { + _serviceProvider = serviceProvider; + } - public void RefreshCachedData() { - foreach (ICachedMongoContext cachedDataService in _serviceProvider.GetInterfaceServices()) { + public void RefreshCachedData() + { + foreach (ICachedMongoContext cachedDataService in _serviceProvider.GetInterfaceServices()) + { cachedDataService.Refresh(); } } diff --git a/UKSF.Api.Admin/Services/VariablesService.cs b/UKSF.Api.Admin/Services/VariablesService.cs index 7769dc8a..cb4b623c 100644 --- a/UKSF.Api.Admin/Services/VariablesService.cs +++ b/UKSF.Api.Admin/Services/VariablesService.cs @@ -2,19 +2,31 @@ using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Models; -namespace UKSF.Api.Admin.Services { - public interface IVariablesService { +namespace UKSF.Api.Admin.Services +{ + public interface IVariablesService + { VariableItem GetVariable(string key); bool GetFeatureState(string featureKey); } - public class VariablesService : IVariablesService { + public class VariablesService : IVariablesService + { private readonly IVariablesContext _context; - public VariablesService(IVariablesContext context) => _context = context; + public VariablesService(IVariablesContext context) + { + _context = context; + } - public VariableItem GetVariable(string key) => _context.GetSingle(key); + public VariableItem GetVariable(string key) + { + return _context.GetSingle(key); + } - public bool GetFeatureState(string featureKey) => _context.GetSingle($"FEATURE_{featureKey}").AsBoolWithDefault(false); + public bool GetFeatureState(string featureKey) + { + return _context.GetSingle($"FEATURE_{featureKey}").AsBoolWithDefault(false); + } } } diff --git a/UKSF.Api.Admin/UKSF.Api.Admin.csproj b/UKSF.Api.Admin/UKSF.Api.Admin.csproj index 13cbe51e..ed8de1e3 100644 --- a/UKSF.Api.Admin/UKSF.Api.Admin.csproj +++ b/UKSF.Api.Admin/UKSF.Api.Admin.csproj @@ -1,7 +1,7 @@ - netcoreapp5.0 + net5.0 Library @@ -11,7 +11,7 @@ - + diff --git a/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs b/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs index d7573307..eab7e876 100644 --- a/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs +++ b/UKSF.Api.ArmaMissions/ApiArmaMissionsExtensions.cs @@ -1,15 +1,28 @@ using Microsoft.Extensions.DependencyInjection; using UKSF.Api.ArmaMissions.Services; -namespace UKSF.Api.ArmaMissions { - public static class ApiArmaMissionsExtensions { - public static IServiceCollection AddUksfArmaMissions(this IServiceCollection services) => services.AddContexts().AddEventHandlers().AddServices(); +namespace UKSF.Api.ArmaMissions +{ + public static class ApiArmaMissionsExtensions + { + public static IServiceCollection AddUksfArmaMissions(this IServiceCollection services) + { + return services.AddContexts().AddEventHandlers().AddServices(); + } - private static IServiceCollection AddContexts(this IServiceCollection services) => services; + private static IServiceCollection AddContexts(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + private static IServiceCollection AddEventHandlers(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddServices(this IServiceCollection services) => - services.AddSingleton().AddSingleton().AddSingleton(); + private static IServiceCollection AddServices(this IServiceCollection services) + { + return services.AddSingleton().AddSingleton().AddSingleton(); + } } } diff --git a/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs index 305dd75a..bedd2c65 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs @@ -2,14 +2,21 @@ using System.Linq; using UKSF.Api.ArmaMissions.Models; -namespace UKSF.Api.ArmaMissions.Services { - public static class MissionDataResolver { +namespace UKSF.Api.ArmaMissions.Services +{ + public static class MissionDataResolver + { // TODO: Add special display to variables area that resolves IDs as display names, unit names, ranks, roles, etc - public static string ResolveObjectClass(MissionPlayer player) { - if (IsMedic(player)) return "UKSF_B_Medic"; // Team Medic + public static string ResolveObjectClass(MissionPlayer player) + { + if (IsMedic(player)) + { + return "UKSF_B_Medic"; // Team Medic + } - return player.Unit.SourceUnit.Id switch { + return player.Unit.SourceUnit.Id switch + { "5a435eea905d47336442c75a" => "UKSF_B_Pilot", // "Joint Special Forces Aviation Wing" "5fe39de7815f5f03801134f7" => "UKSF_B_Pilot", // "Combat Ready" "5a848590eab14d12cc7fa618" => "UKSF_B_Pilot", // "RAF Cranwell" @@ -21,20 +28,45 @@ public static string ResolveObjectClass(MissionPlayer player) { }; } - private static int ResolvePlayerUnitRole(MissionPlayer player) { - if (player.Unit.Roles.ContainsKey("1iC") && player.Unit.Roles["1iC"] == player) return 3; - if (player.Unit.Roles.ContainsKey("2iC") && player.Unit.Roles["2iC"] == player) return 2; - if (player.Unit.Roles.ContainsKey("3iC") && player.Unit.Roles["3iC"] == player) return 1; - if (player.Unit.Roles.ContainsKey("NCOiC") && player.Unit.Roles["NCOiC"] == player) return 0; + private static int ResolvePlayerUnitRole(MissionPlayer player) + { + if (player.Unit.Roles.ContainsKey("1iC") && player.Unit.Roles["1iC"] == player) + { + return 3; + } + + if (player.Unit.Roles.ContainsKey("2iC") && player.Unit.Roles["2iC"] == player) + { + return 2; + } + + if (player.Unit.Roles.ContainsKey("3iC") && player.Unit.Roles["3iC"] == player) + { + return 1; + } + + if (player.Unit.Roles.ContainsKey("NCOiC") && player.Unit.Roles["NCOiC"] == player) + { + return 0; + } + return -1; } - private static bool IsMedic(MissionPlayer player) => MissionPatchData.Instance.MedicIds.Contains(player.Account?.Id); + private static bool IsMedic(MissionPlayer player) + { + return MissionPatchData.Instance.MedicIds.Contains(player.Account?.Id); + } - public static bool IsEngineer(MissionPlayer player) => MissionPatchData.Instance.EngineerIds.Contains(player.Account?.Id); + public static bool IsEngineer(MissionPlayer player) + { + return MissionPatchData.Instance.EngineerIds.Contains(player.Account?.Id); + } - public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) { - return unit.SourceUnit.Id switch { + public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) + { + return unit.SourceUnit.Id switch + { "5a42835b55d6109bf0b081bd" => "JSFAW", // "UKSF" "5a435eea905d47336442c75a" => "JSFAW", // "Joint Special Forces Aviation Wing" "5fe39de7815f5f03801134f7" => "JSFAW", // "Combat Ready" @@ -43,8 +75,10 @@ public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) { }; } - public static void ResolveSpecialUnits(List orderedUnits) { - List ids = new() { + public static void ResolveSpecialUnits(List orderedUnits) + { + List ids = new() + { "5a42835b55d6109bf0b081bd", // "UKSF" "5fe39de7815f5f03801134f7", // "Combat Ready" "5a848590eab14d12cc7fa618" // "RAF Cranwell" @@ -52,11 +86,13 @@ public static void ResolveSpecialUnits(List orderedUnits) { orderedUnits.RemoveAll(x => ids.Contains(x.SourceUnit.Id)); } - public static List ResolveUnitSlots(MissionUnit unit) { + public static List ResolveUnitSlots(MissionUnit unit) + { List slots = new(); int max = 12; int fillerCount; - switch (unit.SourceUnit.Id) { + switch (unit.SourceUnit.Id) + { case "5a435eea905d47336442c75a": // "Joint Special Forces Aviation Wing" slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5a42835b55d6109bf0b081bd")?.Members ?? new List()); slots.AddRange(MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Id == "5a435eea905d47336442c75a")?.Members ?? new List()); @@ -67,7 +103,8 @@ public static List ResolveUnitSlots(MissionUnit unit) { max = 3; slots.AddRange(unit.Members); fillerCount = max - slots.Count; - for (int i = 0; i < fillerCount; i++) { + for (int i = 0; i < fillerCount; i++) + { MissionPlayer player = new() { Name = "Sniper", Unit = unit, Rank = MissionPatchData.Instance.Ranks.Find(x => x.Name == "Private") }; player.ObjectClass = ResolveObjectClass(player); slots.Add(player); @@ -79,7 +116,8 @@ public static List ResolveUnitSlots(MissionUnit unit) { case "5bbbbe365eb3a4170c488f30": // "Guardian 1-3" slots.AddRange(unit.Members); fillerCount = max - slots.Count; - for (int i = 0; i < fillerCount; i++) { + for (int i = 0; i < fillerCount; i++) + { MissionPlayer player = new() { Name = "Reserve", Unit = unit, Rank = MissionPatchData.Instance.Ranks.Find(x => x.Name == "Recruit") }; player.ObjectClass = ResolveObjectClass(player); slots.Add(player); @@ -87,7 +125,8 @@ public static List ResolveUnitSlots(MissionUnit unit) { break; case "5ad748e0de5d414f4c4055e0": // "Guardian 1-R" - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 10; i++) + { MissionPlayer player = new() { Name = "Reserve", Unit = unit, Rank = MissionPatchData.Instance.Ranks.Find(x => x.Name == "Recruit") }; player.ObjectClass = ResolveObjectClass(player); slots.Add(player); @@ -100,19 +139,25 @@ public static List ResolveUnitSlots(MissionUnit unit) { } slots.Sort( - (a, b) => { + (a, b) => + { int roleA = ResolvePlayerUnitRole(a); int roleB = ResolvePlayerUnitRole(b); int rankA = MissionPatchData.Instance.Ranks.IndexOf(a.Rank); int rankB = MissionPatchData.Instance.Ranks.IndexOf(b.Rank); - return roleA < roleB ? 1 : roleA > roleB ? -1 : rankA < rankB ? -1 : rankA > rankB ? 1 : string.CompareOrdinal(a.Name, b.Name); + return roleA < roleB ? 1 : + roleA > roleB ? -1 : + rankA < rankB ? -1 : + rankA > rankB ? 1 : string.CompareOrdinal(a.Name, b.Name); } ); return slots; } - public static bool IsUnitPermanent(MissionUnit unit) { - return unit.SourceUnit.Id switch { + public static bool IsUnitPermanent(MissionUnit unit) + { + return unit.SourceUnit.Id switch + { "5bbbb9645eb3a4170c488b36" => true, // "Guardian 1-1" "5bbbbdab5eb3a4170c488f2e" => true, // "Guardian 1-2" "5bbbbe365eb3a4170c488f30" => true, // "Guardian 1-3" diff --git a/UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs b/UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs index 67cf249c..0524d2c2 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs @@ -2,27 +2,40 @@ using System.Linq; using UKSF.Api.ArmaMissions.Models; -namespace UKSF.Api.ArmaMissions.Services { - public static class MissionEntityItemHelper { - public static MissionEntityItem CreateFromList(List rawItem) { +namespace UKSF.Api.ArmaMissions.Services +{ + public static class MissionEntityItemHelper + { + public static MissionEntityItem CreateFromList(List rawItem) + { MissionEntityItem missionEntityItem = new() { RawMissionEntityItem = rawItem }; missionEntityItem.DataType = MissionUtilities.ReadSingleDataByKey(missionEntityItem.RawMissionEntityItem, "dataType").ToString(); - if (missionEntityItem.DataType.Equals("Group")) { + if (missionEntityItem.DataType.Equals("Group")) + { missionEntityItem.RawMissionEntities = MissionUtilities.ReadDataByKey(missionEntityItem.RawMissionEntityItem, "Entities"); - if (missionEntityItem.RawMissionEntities.Count > 0) { + if (missionEntityItem.RawMissionEntities.Count > 0) + { missionEntityItem.MissionEntity = MissionEntityHelper.CreateFromItems(missionEntityItem.RawMissionEntities); } - } else if (missionEntityItem.DataType.Equals("Object")) { + } + else if (missionEntityItem.DataType.Equals("Object")) + { string isPlayable = MissionUtilities.ReadSingleDataByKey(missionEntityItem.RawMissionEntityItem, "isPlayable").ToString(); string isPlayer = MissionUtilities.ReadSingleDataByKey(missionEntityItem.RawMissionEntityItem, "isPlayer").ToString(); - if (!string.IsNullOrEmpty(isPlayable)) { + if (!string.IsNullOrEmpty(isPlayable)) + { missionEntityItem.IsPlayable = isPlayable == "1"; - } else if (!string.IsNullOrEmpty(isPlayer)) { + } + else if (!string.IsNullOrEmpty(isPlayer)) + { missionEntityItem.IsPlayable = isPlayer == "1"; } - } else if (missionEntityItem.DataType.Equals("Logic")) { + } + else if (missionEntityItem.DataType.Equals("Logic")) + { string type = MissionUtilities.ReadSingleDataByKey(missionEntityItem.RawMissionEntityItem, "type").ToString(); - if (!string.IsNullOrEmpty(type)) { + if (!string.IsNullOrEmpty(type)) + { missionEntityItem.Type = type; } } @@ -30,7 +43,8 @@ public static MissionEntityItem CreateFromList(List rawItem) { return missionEntityItem; } - public static MissionEntityItem CreateFromPlayer(MissionPlayer missionPlayer, int index) { + public static MissionEntityItem CreateFromPlayer(MissionPlayer missionPlayer, int index) + { MissionEntityItem missionEntityItem = new(); missionEntityItem.RawMissionEntityItem.Add($"class Item{index}"); missionEntityItem.RawMissionEntityItem.Add("{"); @@ -50,12 +64,17 @@ public static MissionEntityItem CreateFromPlayer(MissionPlayer missionPlayer, in $"description=\"{missionPlayer.Name}{(string.IsNullOrEmpty(missionPlayer.Account?.RoleAssignment) ? "" : $" - {missionPlayer.Account?.RoleAssignment}")}@{MissionDataResolver.ResolveCallsign(missionPlayer.Unit, missionPlayer.Unit.SourceUnit?.Callsign)}\";" ); missionEntityItem.RawMissionEntityItem.Add("};"); - if (MissionDataResolver.IsEngineer(missionPlayer)) missionEntityItem.RawMissionEntityItem.AddEngineerTrait(); + if (MissionDataResolver.IsEngineer(missionPlayer)) + { + missionEntityItem.RawMissionEntityItem.AddEngineerTrait(); + } + missionEntityItem.RawMissionEntityItem.Add("};"); return missionEntityItem; } - public static MissionEntityItem CreateFromMissionEntity(MissionEntity entities, string callsign) { + public static MissionEntityItem CreateFromMissionEntity(MissionEntity entities, string callsign) + { MissionEntityItem missionEntityItem = new() { MissionEntity = entities }; missionEntityItem.RawMissionEntityItem.Add("class Item"); missionEntityItem.RawMissionEntityItem.Add("{"); @@ -93,7 +112,8 @@ public static MissionEntityItem CreateFromMissionEntity(MissionEntity entities, return missionEntityItem; } - public static MissionEntityItem CreateCuratorEntity() { + public static MissionEntityItem CreateCuratorEntity() + { MissionEntityItem missionEntityItem = new(); missionEntityItem.RawMissionEntityItem.Add("class Item"); missionEntityItem.RawMissionEntityItem.Add("{"); @@ -111,16 +131,20 @@ public static MissionEntityItem CreateCuratorEntity() { return missionEntityItem; } - public static bool Ignored(this MissionEntityItem missionEntityItem) { + public static bool Ignored(this MissionEntityItem missionEntityItem) + { return missionEntityItem.RawMissionEntityItem.Any(x => x.ToLower().Contains("@ignore")); } - public static void Patch(this MissionEntityItem missionEntityItem, int index) { + public static void Patch(this MissionEntityItem missionEntityItem, int index) + { missionEntityItem.RawMissionEntityItem[0] = $"class Item{index}"; } - public static IEnumerable Serialize(this MissionEntityItem missionEntityItem) { - if (missionEntityItem.RawMissionEntities.Count > 0) { + public static IEnumerable Serialize(this MissionEntityItem missionEntityItem) + { + if (missionEntityItem.RawMissionEntities.Count > 0) + { int start = MissionUtilities.GetIndexByKey(missionEntityItem.RawMissionEntityItem, "Entities"); int count = missionEntityItem.RawMissionEntities.Count; missionEntityItem.RawMissionEntityItem.RemoveRange(start, count); @@ -130,7 +154,8 @@ public static IEnumerable Serialize(this MissionEntityItem missionEntity return missionEntityItem.RawMissionEntityItem.ToList(); } - private static void AddEngineerTrait(this ICollection entity) { + private static void AddEngineerTrait(this ICollection entity) + { entity.Add("class CustomAttributes"); entity.Add("{"); entity.Add("class Attribute0"); diff --git a/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs b/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs index 8754a198..465cd664 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs @@ -8,8 +8,10 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; -namespace UKSF.Api.ArmaMissions.Services { - public class MissionPatchDataService { +namespace UKSF.Api.ArmaMissions.Services +{ + public class MissionPatchDataService + { private readonly IAccountContext _accountContext; private readonly IDisplayNameService _displayNameService; private readonly IRanksContext _ranksContext; @@ -24,7 +26,8 @@ public MissionPatchDataService( IRanksService ranksService, IDisplayNameService displayNameService, IVariablesService variablesService - ) { + ) + { _ranksContext = ranksContext; _accountContext = accountContext; _unitContext = unitContext; @@ -33,33 +36,40 @@ IVariablesService variablesService _variablesService = variablesService; } - public void UpdatePatchData() { - MissionPatchData.Instance = new MissionPatchData { - Units = new List(), + public void UpdatePatchData() + { + MissionPatchData.Instance = new() + { + Units = new(), Ranks = _ranksContext.Get().ToList(), - Players = new List(), - OrderedUnits = new List(), + Players = new(), + OrderedUnits = new(), MedicIds = _variablesService.GetVariable("MISSIONS_MEDIC_IDS").AsEnumerable(), EngineerIds = _variablesService.GetVariable("MISSIONS_ENGINEER_IDS").AsEnumerable() }; - foreach (Unit unit in _unitContext.Get(x => x.Branch == UnitBranch.COMBAT).ToList()) { - MissionPatchData.Instance.Units.Add(new MissionUnit { SourceUnit = unit }); + foreach (Unit unit in _unitContext.Get(x => x.Branch == UnitBranch.COMBAT).ToList()) + { + MissionPatchData.Instance.Units.Add(new() { SourceUnit = unit }); } - foreach (Account account in _accountContext.Get().Where(x => !string.IsNullOrEmpty(x.Rank) && _ranksService.IsSuperiorOrEqual(x.Rank, "Recruit"))) { - MissionPatchData.Instance.Players.Add(new MissionPlayer { Account = account, Rank = _ranksContext.GetSingle(account.Rank), Name = _displayNameService.GetDisplayName(account) }); + foreach (Account account in _accountContext.Get().Where(x => !string.IsNullOrEmpty(x.Rank) && _ranksService.IsSuperiorOrEqual(x.Rank, "Recruit"))) + { + MissionPatchData.Instance.Players.Add(new() { Account = account, Rank = _ranksContext.GetSingle(account.Rank), Name = _displayNameService.GetDisplayName(account) }); } - foreach (MissionUnit missionUnit in MissionPatchData.Instance.Units) { + foreach (MissionUnit missionUnit in MissionPatchData.Instance.Units) + { missionUnit.Callsign = MissionDataResolver.ResolveCallsign(missionUnit, missionUnit.SourceUnit.Callsign); missionUnit.Members = missionUnit.SourceUnit.Members.Select(x => MissionPatchData.Instance.Players.FirstOrDefault(y => y.Account.Id == x)).ToList(); - if (missionUnit.SourceUnit.Roles.Count > 0) { + if (missionUnit.SourceUnit.Roles.Count > 0) + { missionUnit.Roles = missionUnit.SourceUnit.Roles.ToDictionary(pair => pair.Key, pair => MissionPatchData.Instance.Players.FirstOrDefault(y => y.Account.Id == pair.Value)); } } - foreach (MissionPlayer missionPlayer in MissionPatchData.Instance.Players) { + foreach (MissionPlayer missionPlayer in MissionPatchData.Instance.Players) + { missionPlayer.Unit = MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Name == missionPlayer.Account.UnitAssignment); missionPlayer.ObjectClass = MissionDataResolver.ResolveObjectClass(missionPlayer); } @@ -71,12 +81,18 @@ public void UpdatePatchData() { MissionDataResolver.ResolveSpecialUnits(MissionPatchData.Instance.OrderedUnits); } - private static void InsertUnitChildren(List newUnits, MissionUnit parent) { + private static void InsertUnitChildren(List newUnits, MissionUnit parent) + { List children = MissionPatchData.Instance.Units.Where(x => x.SourceUnit.Parent == parent.SourceUnit.Id).OrderBy(x => x.SourceUnit.Order).ToList(); - if (children.Count == 0) return; + if (children.Count == 0) + { + return; + } + int index = newUnits.IndexOf(parent); newUnits.InsertRange(index + 1, children); - foreach (MissionUnit child in children) { + foreach (MissionUnit child in children) + { InsertUnitChildren(newUnits, child); } } diff --git a/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs b/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs index 04e23ae9..6d7881a9 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionPatchingService.cs @@ -11,12 +11,15 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.ArmaMissions.Services { - public interface IMissionPatchingService { +namespace UKSF.Api.ArmaMissions.Services +{ + public interface IMissionPatchingService + { Task PatchMission(string path, string armaServerModsPath, int armaServerDefaultMaxCurators); } - public class MissionPatchingService : IMissionPatchingService { + public class MissionPatchingService : IMissionPatchingService + { private const string EXTRACT_PBO = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\ExtractPboDos.exe"; private const string MAKE_PBO = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\MakePbo.exe"; private readonly ILogger _logger; @@ -27,19 +30,23 @@ public class MissionPatchingService : IMissionPatchingService { private string _folderPath; private string _parentFolderPath; - public MissionPatchingService(MissionService missionService, IVariablesService variablesService, ILogger logger) { + public MissionPatchingService(MissionService missionService, IVariablesService variablesService, ILogger logger) + { _missionService = missionService; _variablesService = variablesService; _logger = logger; } - public Task PatchMission(string path, string armaServerModsPath, int armaServerDefaultMaxCurators) { + public Task PatchMission(string path, string armaServerModsPath, int armaServerDefaultMaxCurators) + { return Task.Run( - async () => { + async () => + { _filePath = path; _parentFolderPath = Path.GetDirectoryName(_filePath); MissionPatchingResult result = new(); - try { + try + { CreateBackup(); UnpackPbo(); Mission mission = new(_folderPath); @@ -48,11 +55,15 @@ public Task PatchMission(string path, string armaServerMo await PackPbo(); result.PlayerCount = mission.PlayerCount; result.Success = result.Reports.All(x => !x.Error); - } catch (Exception exception) { + } + catch (Exception exception) + { _logger.LogError(exception); - result.Reports = new List { new(exception) }; + result.Reports = new() { new(exception) }; result.Success = false; - } finally { + } + finally + { Cleanup(); } @@ -61,23 +72,28 @@ public Task PatchMission(string path, string armaServerMo ); } - private void CreateBackup() { + private void CreateBackup() + { string backupPath = Path.Combine(_variablesService.GetVariable("MISSIONS_BACKUPS").AsString(), Path.GetFileName(_filePath) ?? throw new FileNotFoundException()); Directory.CreateDirectory(Path.GetDirectoryName(backupPath) ?? throw new DirectoryNotFoundException()); File.Copy(_filePath, backupPath, true); - if (!File.Exists(backupPath)) { + if (!File.Exists(backupPath)) + { throw new FileNotFoundException(); } } - private void UnpackPbo() { - if (Path.GetExtension(_filePath) != ".pbo") { + private void UnpackPbo() + { + if (Path.GetExtension(_filePath) != ".pbo") + { throw new FileLoadException("File is not a pbo"); } _folderPath = Path.Combine(_parentFolderPath, Path.GetFileNameWithoutExtension(_filePath) ?? throw new FileNotFoundException()); - if (Directory.Exists(_folderPath)) { + if (Directory.Exists(_folderPath)) + { Directory.Delete(_folderPath, true); } @@ -85,18 +101,23 @@ private void UnpackPbo() { process.Start(); process.WaitForExit(); - if (!Directory.Exists(_folderPath)) { + if (!Directory.Exists(_folderPath)) + { throw new DirectoryNotFoundException("Could not find unpacked pbo"); } } - private async Task PackPbo() { - if (Directory.Exists(_filePath)) { + private async Task PackPbo() + { + if (Directory.Exists(_filePath)) + { _filePath += ".pbo"; } - Process process = new() { - StartInfo = { + Process process = new() + { + StartInfo = + { FileName = MAKE_PBO, WorkingDirectory = _variablesService.GetVariable("MISSIONS_WORKING_DIR").AsString(), Arguments = $"-Z -BD -P -X=\"thumbs.db,*.txt,*.h,*.dep,*.cpp,*.bak,*.png,*.log,*.pew\" \"{_folderPath}\"", @@ -111,16 +132,24 @@ private async Task PackPbo() { string errorOutput = await process.StandardError.ReadToEndAsync(); process.WaitForExit(); - if (File.Exists(_filePath)) return; + if (File.Exists(_filePath)) + { + return; + } + List outputLines = Regex.Split($"{output}\n{errorOutput}", "\r\n|\r|\n").ToList(); output = outputLines.Where(x => !string.IsNullOrEmpty(x) && !x.ContainsIgnoreCase("compressing")).Aggregate((x, y) => $"{x}\n{y}"); - throw new Exception(output); + throw new(output); } - private void Cleanup() { - try { + private void Cleanup() + { + try + { Directory.Delete(_folderPath, true); - } catch (Exception) { + } + catch (Exception) + { // ignore } } diff --git a/UKSF.Api.ArmaMissions/Services/MissionService.cs b/UKSF.Api.ArmaMissions/Services/MissionService.cs index 258b34cb..52e9409c 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionService.cs @@ -6,8 +6,10 @@ using UKSF.Api.ArmaMissions.Models; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.ArmaMissions.Services { - public class MissionService { +namespace UKSF.Api.ArmaMissions.Services +{ + public class MissionService + { private const string UNBIN = "C:\\Program Files (x86)\\Mikero\\DePboTools\\bin\\DeRapDos.exe"; private readonly MissionPatchDataService _missionPatchDataService; @@ -16,22 +18,31 @@ public class MissionService { private Mission _mission; private List _reports; - public MissionService(MissionPatchDataService missionPatchDataService) => _missionPatchDataService = missionPatchDataService; + public MissionService(MissionPatchDataService missionPatchDataService) + { + _missionPatchDataService = missionPatchDataService; + } - public List ProcessMission(Mission tempMission, string armaServerModsPath, int armaServerDefaultMaxCurators) { + public List ProcessMission(Mission tempMission, string armaServerModsPath, int armaServerDefaultMaxCurators) + { _armaServerDefaultMaxCurators = armaServerDefaultMaxCurators; _armaServerModsPath = armaServerModsPath; _mission = tempMission; _reports = new(); - if (!AssertRequiredFiles()) return _reports; + if (!AssertRequiredFiles()) + { + return _reports; + } - if (CheckBinned()) { + if (CheckBinned()) + { UnBin(); } Read(); - if (CheckIgnoreKey("missionPatchingIgnore")) { + if (CheckIgnoreKey("missionPatchingIgnore")) + { _reports.Add( new("Mission Patching Ignored", "Mission patching for this mission was ignored.\nThis means no changes to the mission.sqm were made." + "This is not an error, however errors may occur in the mission as a result of this.\n" + @@ -52,8 +63,10 @@ public List ProcessMission(Mission tempMission, string ar return _reports; } - private bool AssertRequiredFiles() { - if (!File.Exists(_mission.DescriptionPath)) { + private bool AssertRequiredFiles() + { + if (!File.Exists(_mission.DescriptionPath)) + { _reports.Add( new("Missing file: description.ext", "The mission is missing a required file:\ndescription.ext\n\n" + "It is advised to copy this file directly from the template mission to your mission\nUKSFTemplate.VR is located in the modpack files", true) @@ -61,7 +74,8 @@ private bool AssertRequiredFiles() { return false; } - if (!File.Exists(Path.Combine(_mission.Path, "cba_settings.sqf"))) { + if (!File.Exists(Path.Combine(_mission.Path, "cba_settings.sqf"))) + { _reports.Add( new("Missing file: cba_settings.sqf", "The mission is missing a required file:\ncba_settings.sqf\n\n" + "It is advised to copy this file directly from the template mission to your mission\n" + @@ -70,39 +84,47 @@ private bool AssertRequiredFiles() { return false; } - if (File.Exists(Path.Combine(_mission.Path, "README.txt"))) { + if (File.Exists(Path.Combine(_mission.Path, "README.txt"))) + { File.Delete(Path.Combine(_mission.Path, "README.txt")); } return true; } - private bool CheckIgnoreKey(string key) { + private bool CheckIgnoreKey(string key) + { _mission.DescriptionLines = File.ReadAllLines(_mission.DescriptionPath).ToList(); return _mission.DescriptionLines.Any(x => x.ContainsIgnoreCase(key)); } - private bool CheckBinned() { + private bool CheckBinned() + { Process process = new() { StartInfo = { FileName = UNBIN, Arguments = $"-p -q \"{_mission.SqmPath}\"", UseShellExecute = false, CreateNoWindow = true } }; process.Start(); process.WaitForExit(); return process.ExitCode == 0; } - private void UnBin() { + private void UnBin() + { Process process = new() { StartInfo = { FileName = UNBIN, Arguments = $"-p \"{_mission.SqmPath}\"", UseShellExecute = false, CreateNoWindow = true } }; process.Start(); process.WaitForExit(); - if (File.Exists($"{_mission.SqmPath}.txt")) { + if (File.Exists($"{_mission.SqmPath}.txt")) + { File.Delete(_mission.SqmPath); File.Move($"{_mission.SqmPath}.txt", _mission.SqmPath); - } else { + } + else + { throw new FileNotFoundException(); } } - private void Read() { + private void Read() + { _mission.SqmLines = File.ReadAllLines(_mission.SqmPath).Select(x => x.Trim()).ToList(); _mission.SqmLines.RemoveAll(string.IsNullOrEmpty); RemoveUnbinText(); @@ -110,23 +132,30 @@ private void Read() { ReadSettings(); } - private void RemoveUnbinText() { - if (_mission.SqmLines.First() != "////////////////////////////////////////////////////////////////////") return; + private void RemoveUnbinText() + { + if (_mission.SqmLines.First() != "////////////////////////////////////////////////////////////////////") + { + return; + } _mission.SqmLines = _mission.SqmLines.Skip(7).ToList(); // mission.sqmLines = mission.sqmLines.Take(mission.sqmLines.Count - 1).ToList(); } - private void ReadAllData() { + private void ReadAllData() + { Mission.NextId = Convert.ToInt32(MissionUtilities.ReadSingleDataByKey(MissionUtilities.ReadDataByKey(_mission.SqmLines, "ItemIDProvider"), "nextID")); _mission.RawEntities = MissionUtilities.ReadDataByKey(_mission.SqmLines, "Entities"); _mission.MissionEntity = MissionEntityHelper.CreateFromItems(_mission.RawEntities); } - private void ReadSettings() { + private void ReadSettings() + { _mission.MaxCurators = 5; string curatorsMaxLine = File.ReadAllLines(Path.Combine(_mission.Path, "cba_settings.sqf")).FirstOrDefault(x => x.Contains("uksf_curator_curatorsMax")); - if (string.IsNullOrEmpty(curatorsMaxLine)) { + if (string.IsNullOrEmpty(curatorsMaxLine)) + { _mission.MaxCurators = _armaServerDefaultMaxCurators; _reports.Add( new("Using server setting 'uksf_curator_curatorsMax'", "Could not find setting 'uksf_curator_curatorsMax' in cba_settings.sqf" + @@ -137,25 +166,32 @@ private void ReadSettings() { } string curatorsMaxString = curatorsMaxLine.Split("=")[1].RemoveSpaces().Replace(";", ""); - if (!int.TryParse(curatorsMaxString, out int maxCurators)) { + if (!int.TryParse(curatorsMaxString, out int maxCurators)) + { _reports.Add( new("Using hardcoded setting 'uksf_curator_curatorsMax'", $"Could not read malformed setting: '{curatorsMaxLine}' in cba_settings.sqf" + "This is required to add the correct nubmer of pre-defined curator objects." + "The hardcoded value (5) will be used instead.") ); - } else { + } + else + { _mission.MaxCurators = maxCurators; } } - private void Patch() { + private void Patch() + { _mission.MissionEntity.Patch(_mission.MaxCurators); - if (!CheckIgnoreKey("missionImageIgnore")) { + if (!CheckIgnoreKey("missionImageIgnore")) + { string imagePath = Path.Combine(_mission.Path, "uksf.paa"); string modpackImagePath = Path.Combine(_armaServerModsPath, "@uksf", "UKSFTemplate.VR", "uksf.paa"); - if (File.Exists(modpackImagePath)) { - if (File.Exists(imagePath) && new FileInfo(imagePath).Length != new FileInfo(modpackImagePath).Length) { + if (File.Exists(modpackImagePath)) + { + if (File.Exists(imagePath) && new FileInfo(imagePath).Length != new FileInfo(modpackImagePath).Length) + { _reports.Add( new("Loading image was different", "The mission loading image `uksf.paa` was found to be different from the default." + "It has been replaced with the default UKSF image.\n\n" + @@ -168,7 +204,8 @@ private void Patch() { } } - private void Write() { + private void Write() + { int start = MissionUtilities.GetIndexByKey(_mission.SqmLines, "Entities"); int count = _mission.RawEntities.Count; _mission.SqmLines.RemoveRange(start, count); @@ -178,7 +215,8 @@ private void Write() { File.WriteAllLines(_mission.SqmPath, _mission.SqmLines); } - private void PatchDescription() { + private void PatchDescription() + { int playable = _mission.SqmLines.Select(x => x.RemoveSpaces()).Count(x => x.ContainsIgnoreCase("isPlayable=1") || x.ContainsIgnoreCase("isPlayer=1")); _mission.PlayerCount = playable; @@ -192,13 +230,15 @@ private void PatchDescription() { File.WriteAllLines(_mission.DescriptionPath, _mission.DescriptionLines); } - private void CheckConfigurableDescriptionItems() { + private void CheckConfigurableDescriptionItems() + { CheckDescriptionItem("onLoadName", "\"UKSF: Operation\"", false); CheckDescriptionItem("onLoadMission", "\"UKSF: Operation\"", false); CheckDescriptionItem("overviewText", "\"UKSF: Operation\"", false); } - private void CheckRequiredDescriptionItems() { + private void CheckRequiredDescriptionItems() + { CheckDescriptionItem("author", "\"UKSF\""); CheckDescriptionItem("loadScreen", "\"uksf.paa\""); CheckDescriptionItem("respawn", "\"BASE\""); @@ -214,18 +254,23 @@ private void CheckRequiredDescriptionItems() { CheckDescriptionItem("allowProfileGlasses", "0"); } - private void CheckDescriptionItem(string key, string defaultValue, bool required = true) { + private void CheckDescriptionItem(string key, string defaultValue, bool required = true) + { int index = _mission.DescriptionLines.FindIndex(x => x.Contains($"{key} = ") || x.Contains($"{key}=") || x.Contains($"{key}= ") || x.Contains($"{key} =")); - if (index != -1) { + if (index != -1) + { string itemValue = _mission.DescriptionLines[index].Split("=")[1].Trim(); itemValue = itemValue.Remove(itemValue.Length - 1); bool equal = string.Equals(itemValue, defaultValue, StringComparison.InvariantCultureIgnoreCase); - if (!equal && required) { + if (!equal && required) + { _reports.Add( new($"Required description.ext item {key} value is not default", $"{key} in description.ext is '{itemValue}'\nThe default value is '{defaultValue}'\n\nYou should only change this if you know what you're doing") ); - } else if (equal && !required) { + } + else if (equal && !required) + { _reports.Add( new($"Configurable description.ext item {key} value is default", $"{key} in description.ext is the same as the default value '{itemValue}'\n\nThis should be changed based on your mission") @@ -235,9 +280,12 @@ private void CheckDescriptionItem(string key, string defaultValue, bool required return; } - if (required) { + if (required) + { _mission.DescriptionLines.Add($"{key} = {defaultValue};"); - } else { + } + else + { _reports.Add( new($"Configurable description.ext item {key} is missing", $"{key} in description.ext is missing\nThis is required for the mission\n\n" + "It is advised to copy the description.ext file directly from the template mission to your mission\nUKSFTemplate.VR is located in the modpack files" diff --git a/UKSF.Api.ArmaMissions/Services/MissionUtilities.cs b/UKSF.Api.ArmaMissions/Services/MissionUtilities.cs index e2d0469a..d49a72d6 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionUtilities.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionUtilities.cs @@ -1,9 +1,12 @@ using System.Collections.Generic; using System.Linq; -namespace UKSF.Api.ArmaMissions.Services { - public static class MissionUtilities { - public static List ReadDataFromIndex(List source, ref int index) { +namespace UKSF.Api.ArmaMissions.Services +{ + public static class MissionUtilities + { + public static List ReadDataFromIndex(List source, ref int index) + { List data = new() { source[index] }; index += 1; string opening = source[index]; @@ -11,14 +14,21 @@ public static List ReadDataFromIndex(List source, ref int index) stack.Push(opening); data.Add(opening); index += 1; - while (stack.Count != 0) { - if (index >= source.Count) return new List(); + while (stack.Count != 0) + { + if (index >= source.Count) + { + return new(); + } + string line = source[index]; - if (line.Equals("{")) { + if (line.Equals("{")) + { stack.Push(line); } - if (line.Equals("};")) { + if (line.Equals("};")) + { stack.Pop(); } @@ -29,12 +39,19 @@ public static List ReadDataFromIndex(List source, ref int index) return data; } - public static int GetIndexByKey(List source, string key) { + public static int GetIndexByKey(List source, string key) + { int index = 0; - while (true) { - if (index >= source.Count) return -1; + while (true) + { + if (index >= source.Count) + { + return -1; + } + string line = source[index]; - if (line.ToLower().Contains(key.ToLower())) { + if (line.ToLower().Contains(key.ToLower())) + { return index; } @@ -42,18 +59,26 @@ public static int GetIndexByKey(List source, string key) { } } - public static List ReadDataByKey(List source, string key) { + public static List ReadDataByKey(List source, string key) + { int index = GetIndexByKey(source, key); - return index == -1 ? new List() : ReadDataFromIndex(source, ref index); + return index == -1 ? new() : ReadDataFromIndex(source, ref index); } - public static object ReadSingleDataByKey(List source, string key) { + public static object ReadSingleDataByKey(List source, string key) + { int index = 0; - while (true) { - if (index >= source.Count) return ""; + while (true) + { + if (index >= source.Count) + { + return ""; + } + string line = source[index]; string[] parts = line.Split('='); - if (parts.Length == 2 && parts.First().Trim().ToLower().Equals(key.ToLower())) { + if (parts.Length == 2 && parts.First().Trim().ToLower().Equals(key.ToLower())) + { return parts.Last().Replace(";", "").Replace("\"", "").Trim(); } diff --git a/UKSF.Api.ArmaMissions/UKSF.Api.ArmaMissions.csproj b/UKSF.Api.ArmaMissions/UKSF.Api.ArmaMissions.csproj index 1e733064..fa08c2ba 100644 --- a/UKSF.Api.ArmaMissions/UKSF.Api.ArmaMissions.csproj +++ b/UKSF.Api.ArmaMissions/UKSF.Api.ArmaMissions.csproj @@ -1,7 +1,7 @@ - netcoreapp5.0 + net5.0 Library diff --git a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs index 7e35ecf3..fc3b4f27 100644 --- a/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs +++ b/UKSF.Api.ArmaServer/ApiArmaServerExtensions.cs @@ -5,17 +5,32 @@ using UKSF.Api.ArmaServer.Services; using UKSF.Api.ArmaServer.Signalr.Hubs; -namespace UKSF.Api.ArmaServer { - public static class ApiArmaServerExtensions { - public static IServiceCollection AddUksfArmaServer(this IServiceCollection services) => services.AddContexts().AddEventHandlers().AddServices(); +namespace UKSF.Api.ArmaServer +{ + public static class ApiArmaServerExtensions + { + public static IServiceCollection AddUksfArmaServer(this IServiceCollection services) + { + return services.AddContexts().AddEventHandlers().AddServices(); + } - private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddContexts(this IServiceCollection services) + { + return services.AddSingleton(); + } - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + private static IServiceCollection AddEventHandlers(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton().AddSingleton(); + private static IServiceCollection AddServices(this IServiceCollection services) + { + return services.AddSingleton().AddSingleton(); + } - public static void AddUksfArmaServerSignalr(this IEndpointRouteBuilder builder) { + public static void AddUksfArmaServerSignalr(this IEndpointRouteBuilder builder) + { builder.MapHub($"/hub/{ServersHub.END_POINT}"); } } diff --git a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs index 43f0398c..2cf26611 100644 --- a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs +++ b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs @@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; -using Newtonsoft.Json; using Newtonsoft.Json.Linq; using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; @@ -22,9 +21,11 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.ArmaServer.Controllers { +namespace UKSF.Api.ArmaServer.Controllers +{ [Route("[controller]"), Permissions(Permissions.NCO, Permissions.SERVERS, Permissions.COMMAND)] - public class GameServersController : Controller { + public class GameServersController : Controller + { private readonly IGameServerHelpers _gameServerHelpers; private readonly IGameServersContext _gameServersContext; private readonly IGameServersService _gameServersService; @@ -41,7 +42,8 @@ public GameServersController( IVariablesService variablesService, IGameServerHelpers gameServerHelpers, ILogger logger - ) { + ) + { _gameServersContext = gameServersContext; _variablesContext = variablesContext; _gameServersService = gameServersService; @@ -52,19 +54,24 @@ ILogger logger } [HttpGet, Authorize] - public IActionResult GetGameServers() => - Ok(new { servers = _gameServersContext.Get(), missions = _gameServersService.GetMissionFiles(), instanceCount = _gameServersService.GetGameInstanceCount() }); + public IActionResult GetGameServers() + { + return Ok(new { servers = _gameServersContext.Get(), missions = _gameServersService.GetMissionFiles(), instanceCount = _gameServersService.GetGameInstanceCount() }); + } [HttpGet("status/{id}"), Authorize] - public async Task GetGameServerStatus(string id) { + public async Task GetGameServerStatus(string id) + { GameServer gameServer = _gameServersContext.GetSingle(id); await _gameServersService.GetGameServerStatus(gameServer); return Ok(new { gameServer, instanceCount = _gameServersService.GetGameInstanceCount() }); } [HttpPost("{check}"), Authorize] - public IActionResult CheckGameServers(string check, [FromBody] GameServer gameServer = null) { - if (gameServer != null) { + public IActionResult CheckGameServers(string check, [FromBody] GameServer gameServer = null) + { + if (gameServer != null) + { GameServer safeGameServer = gameServer; return Ok(_gameServersContext.GetSingle(x => x.Id != safeGameServer.Id && (x.Name == check || x.ApiPort.ToString() == check))); } @@ -73,21 +80,24 @@ public IActionResult CheckGameServers(string check, [FromBody] GameServer gameSe } [HttpPut, Authorize] - public async Task AddServer([FromBody] GameServer gameServer) { + public async Task AddServer([FromBody] GameServer gameServer) + { await _gameServersContext.Add(gameServer); _logger.LogAudit($"Server added '{gameServer}'"); return Ok(); } [HttpPatch, Authorize] - public async Task EditGameServer([FromBody] GameServer gameServer) { + public async Task EditGameServer([FromBody] GameServer gameServer) + { GameServer oldGameServer = _gameServersContext.GetSingle(gameServer.Id); _logger.LogAudit($"Game server '{gameServer.Name}' updated:{oldGameServer.Changes(gameServer)}"); bool environmentChanged = false; - if (oldGameServer.Environment != gameServer.Environment) { + if (oldGameServer.Environment != gameServer.Environment) + { environmentChanged = true; gameServer.Mods = _gameServersService.GetEnvironmentMods(gameServer.Environment); - gameServer.ServerMods = new List(); + gameServer.ServerMods = new(); } await _gameServersContext.Update( @@ -109,7 +119,8 @@ await _gameServersContext.Update( } [HttpDelete("{id}"), Authorize] - public async Task DeleteGameServer(string id) { + public async Task DeleteGameServer(string id) + { GameServer gameServer = _gameServersContext.GetSingle(id); _logger.LogAudit($"Game server deleted '{gameServer.Name}'"); await _gameServersContext.Delete(id); @@ -118,10 +129,13 @@ public async Task DeleteGameServer(string id) { } [HttpPost("order"), Authorize] - public async Task UpdateOrder([FromBody] List newServerOrder) { - for (int index = 0; index < newServerOrder.Count; index++) { + public async Task UpdateOrder([FromBody] List newServerOrder) + { + for (int index = 0; index < newServerOrder.Count; index++) + { GameServer gameServer = newServerOrder[index]; - if (_gameServersContext.GetSingle(gameServer.Id).Order != index) { + if (_gameServersContext.GetSingle(gameServer.Id).Order != index) + { await _gameServersContext.Update(gameServer.Id, x => x.Order, index); } } @@ -130,17 +144,22 @@ public async Task UpdateOrder([FromBody] List newServ } [HttpPost("mission"), Authorize, RequestSizeLimit(10485760), RequestFormLimits(MultipartBodyLengthLimit = 10485760)] - public async Task UploadMissionFile() { + public async Task UploadMissionFile() + { List missionReports = new(); - try { - foreach (IFormFile file in Request.Form.Files.Where(x => x.Length > 0)) { + try + { + foreach (IFormFile file in Request.Form.Files.Where(x => x.Length > 0)) + { await _gameServersService.UploadMissionFile(file); MissionPatchingResult missionPatchingResult = await _gameServersService.PatchMissionFile(file.Name); missionPatchingResult.Reports = missionPatchingResult.Reports.OrderByDescending(x => x.Error).ToList(); missionReports.Add(new { mission = file.Name, reports = missionPatchingResult.Reports }); _logger.LogAudit($"Uploaded mission '{file.Name}'"); } - } catch (Exception exception) { + } + catch (Exception exception) + { _logger.LogError(exception); return BadRequest(exception); } @@ -149,32 +168,44 @@ public async Task UploadMissionFile() { } [HttpPost("launch/{id}"), Authorize] - public async Task LaunchServer(string id, [FromBody] JObject data) { + public async Task LaunchServer(string id, [FromBody] JObject data) + { Task.WaitAll(_gameServersContext.Get().Select(x => _gameServersService.GetGameServerStatus(x)).ToArray()); GameServer gameServer = _gameServersContext.GetSingle(id); - if (gameServer.Status.Running) return BadRequest("Server is already running. This shouldn't happen so please contact an admin"); - if (_gameServerHelpers.IsMainOpTime()) { - if (gameServer.ServerOption == GameServerOption.SINGLETON) { - if (_gameServersContext.Get(x => x.ServerOption != GameServerOption.SINGLETON).Any(x => x.Status.Started || x.Status.Running)) { + if (gameServer.Status.Running) + { + return BadRequest("Server is already running. This shouldn't happen so please contact an admin"); + } + + if (_gameServerHelpers.IsMainOpTime()) + { + if (gameServer.ServerOption == GameServerOption.SINGLETON) + { + if (_gameServersContext.Get(x => x.ServerOption != GameServerOption.SINGLETON).Any(x => x.Status.Started || x.Status.Running)) + { return BadRequest("Server must be launched on its own. Stop the other running servers first"); } } - if (_gameServersContext.Get(x => x.ServerOption == GameServerOption.SINGLETON).Any(x => x.Status.Started || x.Status.Running)) { + if (_gameServersContext.Get(x => x.ServerOption == GameServerOption.SINGLETON).Any(x => x.Status.Started || x.Status.Running)) + { return BadRequest("Server cannot be launched whilst main server is running at this time"); } } - if (_gameServersContext.Get(x => x.Port == gameServer.Port).Any(x => x.Status.Started || x.Status.Running)) { + if (_gameServersContext.Get(x => x.Port == gameServer.Port).Any(x => x.Status.Started || x.Status.Running)) + { return BadRequest("Server cannot be launched while another server with the same port is running"); } string missionSelection = data["missionName"].ToString(); MissionPatchingResult patchingResult = await _gameServersService.PatchMissionFile(missionSelection); - if (!patchingResult.Success) { + if (!patchingResult.Success) + { patchingResult.Reports = patchingResult.Reports.OrderByDescending(x => x.Error).ToList(); return BadRequest( - new { + new + { reports = patchingResult.Reports, message = $"{(patchingResult.Reports.Count > 0 ? "Failed to patch mission for the reasons detailed below" : "Failed to patch mission for an unknown reason")}.\n\nContact an admin for help" @@ -192,25 +223,38 @@ public async Task LaunchServer(string id, [FromBody] JObject data } [HttpGet("stop/{id}"), Authorize] - public async Task StopServer(string id) { + public async Task StopServer(string id) + { GameServer gameServer = _gameServersContext.GetSingle(id); _logger.LogAudit($"Game server stopped '{gameServer.Name}'"); await _gameServersService.GetGameServerStatus(gameServer); - if (!gameServer.Status.Started && !gameServer.Status.Running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); + if (!gameServer.Status.Started && !gameServer.Status.Running) + { + return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); + } + await _gameServersService.StopGameServer(gameServer); await _gameServersService.GetGameServerStatus(gameServer); return Ok(new { gameServer, instanceCount = _gameServersService.GetGameInstanceCount() }); } [HttpGet("kill/{id}"), Authorize] - public async Task KillServer(string id) { + public async Task KillServer(string id) + { GameServer gameServer = _gameServersContext.GetSingle(id); _logger.LogAudit($"Game server killed '{gameServer.Name}'"); await _gameServersService.GetGameServerStatus(gameServer); - if (!gameServer.Status.Started && !gameServer.Status.Running) return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); - try { + if (!gameServer.Status.Started && !gameServer.Status.Running) + { + return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); + } + + try + { _gameServersService.KillGameServer(gameServer); - } catch (Exception) { + } + catch (Exception) + { return BadRequest("Failed to stop server. Contact an admin"); } @@ -219,17 +263,22 @@ public async Task KillServer(string id) { } [HttpGet("killall"), Authorize] - public IActionResult KillAllArmaProcesses() { + public IActionResult KillAllArmaProcesses() + { int killed = _gameServersService.KillAllArmaProcesses(); _logger.LogAudit($"Killed {killed} Arma instances"); return Ok(); } [HttpGet("{id}/mods"), Authorize] - public IActionResult GetAvailableMods(string id) => Ok(_gameServersService.GetAvailableMods(id)); + public IActionResult GetAvailableMods(string id) + { + return Ok(_gameServersService.GetAvailableMods(id)); + } [HttpPost("{id}/mods"), Authorize] - public async Task SetGameServerMods(string id, [FromBody] GameServer gameServer) { + public async Task SetGameServerMods(string id, [FromBody] GameServer gameServer) + { GameServer oldGameServer = _gameServersContext.GetSingle(id); await _gameServersContext.Update(id, Builders.Update.Unset(x => x.Mods).Unset(x => x.ServerMods)); await _gameServersContext.Update(id, Builders.Update.Set(x => x.Mods, gameServer.Mods).Set(x => x.ServerMods, gameServer.ServerMods)); @@ -238,16 +287,21 @@ public async Task SetGameServerMods(string id, [FromBody] GameSer } [HttpGet("{id}/mods/reset"), Authorize] - public IActionResult ResetGameServerMods(string id) { + public IActionResult ResetGameServerMods(string id) + { GameServer gameServer = _gameServersContext.GetSingle(id); return Ok(new { availableMods = _gameServersService.GetAvailableMods(id), mods = _gameServersService.GetEnvironmentMods(gameServer.Environment), serverMods = new List() }); } [HttpGet("disabled"), Authorize] - public IActionResult GetDisabledState() => Ok(new { state = _variablesService.GetVariable("SERVER_CONTROL_DISABLED").AsBool() }); + public IActionResult GetDisabledState() + { + return Ok(new { state = _variablesService.GetVariable("SERVER_CONTROL_DISABLED").AsBool() }); + } [HttpPost("disabled"), Authorize] - public async Task SetDisabledState([FromBody] JObject body) { + public async Task SetDisabledState([FromBody] JObject body) + { bool state = bool.Parse(body["state"].ToString()); await _variablesContext.Update("SERVER_CONTROL_DISABLED", state); await _serversHub.Clients.All.ReceiveDisabledState(state); diff --git a/UKSF.Api.ArmaServer/Models/GameServer.cs b/UKSF.Api.ArmaServer/Models/GameServer.cs index 94209b01..287f1373 100644 --- a/UKSF.Api.ArmaServer/Models/GameServer.cs +++ b/UKSF.Api.ArmaServer/Models/GameServer.cs @@ -2,19 +2,22 @@ using MongoDB.Bson.Serialization.Attributes; using UKSF.Api.Base.Models; -namespace UKSF.Api.ArmaServer.Models { - public enum GameServerOption { +namespace UKSF.Api.ArmaServer.Models +{ + public enum GameServerOption + { NONE, SINGLETON, DCG } - public class GameServer : MongoObject { - [BsonIgnore] public List HeadlessClientProcessIds = new(); + public class GameServer : MongoObject + { public string AdminPassword; public int ApiPort; [BsonIgnore] public bool CanLaunch; public GameEnvironment Environment; + [BsonIgnore] public List HeadlessClientProcessIds = new(); public string HostName; public List Mods = new(); public string Name; @@ -28,10 +31,14 @@ public class GameServer : MongoObject { public GameServerOption ServerOption; [BsonIgnore] public GameServerStatus Status = new(); - public override string ToString() => $"{Name}, {Port}, {ApiPort}, {NumberHeadlessClients}, {ProfileName}, {HostName}, {Password}, {AdminPassword}, {Environment}, {ServerOption}"; + public override string ToString() + { + return $"{Name}, {Port}, {ApiPort}, {NumberHeadlessClients}, {ProfileName}, {HostName}, {Password}, {AdminPassword}, {Environment}, {ServerOption}"; + } } - public class GameServerStatus { + public class GameServerStatus + { public string Map; public string MaxPlayers; public string Mission; diff --git a/UKSF.Api.ArmaServer/Models/GameServerMod.cs b/UKSF.Api.ArmaServer/Models/GameServerMod.cs index c12b79fe..f023311f 100644 --- a/UKSF.Api.ArmaServer/Models/GameServerMod.cs +++ b/UKSF.Api.ArmaServer/Models/GameServerMod.cs @@ -1,10 +1,15 @@ -namespace UKSF.Api.ArmaServer.Models { - public class GameServerMod { +namespace UKSF.Api.ArmaServer.Models +{ + public class GameServerMod + { public bool IsDuplicate; public string Name; public string Path; public string PathRelativeToServerExecutable; - public override string ToString() => Name; + public override string ToString() + { + return Name; + } } } diff --git a/UKSF.Api.ArmaServer/Services/GameServersService.cs b/UKSF.Api.ArmaServer/Services/GameServersService.cs index 458903c8..75b835fb 100644 --- a/UKSF.Api.ArmaServer/Services/GameServersService.cs +++ b/UKSF.Api.ArmaServer/Services/GameServersService.cs @@ -15,8 +15,10 @@ using UKSF.Api.ArmaServer.Models; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.ArmaServer.Services { - public interface IGameServersService { +namespace UKSF.Api.ArmaServer.Services +{ + public interface IGameServersService + { int GetGameInstanceCount(); Task UploadMissionFile(IFormFile file); List GetMissionFiles(); @@ -32,46 +34,56 @@ public interface IGameServersService { List GetEnvironmentMods(GameEnvironment environment); } - public class GameServersService : IGameServersService { + public class GameServersService : IGameServersService + { private readonly IGameServerHelpers _gameServerHelpers; private readonly IGameServersContext _gameServersContext; private readonly IMissionPatchingService _missionPatchingService; - public GameServersService(IGameServersContext gameServersContext, IMissionPatchingService missionPatchingService, IGameServerHelpers gameServerHelpers) { + public GameServersService(IGameServersContext gameServersContext, IMissionPatchingService missionPatchingService, IGameServerHelpers gameServerHelpers) + { _gameServersContext = gameServersContext; _missionPatchingService = missionPatchingService; _gameServerHelpers = gameServerHelpers; } - public int GetGameInstanceCount() { + public int GetGameInstanceCount() + { return _gameServerHelpers.GetArmaProcesses().Count(); } - public async Task UploadMissionFile(IFormFile file) { + public async Task UploadMissionFile(IFormFile file) + { string fileName = ContentDispositionHeaderValue.Parse(file.ContentDisposition).FileName.Trim('"'); string filePath = Path.Combine(_gameServerHelpers.GetGameServerMissionsPath(), fileName); await using FileStream stream = new(filePath, FileMode.Create); await file.CopyToAsync(stream); } - public List GetMissionFiles() { + public List GetMissionFiles() + { IEnumerable files = new DirectoryInfo(_gameServerHelpers.GetGameServerMissionsPath()).EnumerateFiles("*.pbo", SearchOption.TopDirectoryOnly); return files.Select(fileInfo => new MissionFile(fileInfo)).OrderBy(x => x.Map).ThenBy(x => x.Name).ToList(); } - public async Task GetGameServerStatus(GameServer gameServer) { - if (gameServer.ProcessId != 0) { + public async Task GetGameServerStatus(GameServer gameServer) + { + if (gameServer.ProcessId != 0) + { gameServer.Status.Started = Process.GetProcesses().Any(x => x.Id == gameServer.ProcessId); - if (!gameServer.Status.Started) { + if (!gameServer.Status.Started) + { gameServer.ProcessId = 0; } } using HttpClient client = new(); client.DefaultRequestHeaders.Accept.Add(new("application/json")); - try { + try + { HttpResponseMessage response = await client.GetAsync($"http://localhost:{gameServer.ApiPort}/server"); - if (!response.IsSuccessStatusCode) { + if (!response.IsSuccessStatusCode) + { gameServer.Status.Running = false; } @@ -81,18 +93,22 @@ public async Task GetGameServerStatus(GameServer gameServer) { gameServer.Status.MaxPlayers = _gameServerHelpers.GetMaxPlayerCountFromConfig(gameServer); gameServer.Status.Running = true; gameServer.Status.Started = false; - } catch (Exception) { + } + catch (Exception) + { gameServer.Status.Running = false; } } - public async Task> GetAllGameServerStatuses() { + public async Task> GetAllGameServerStatuses() + { List gameServers = _gameServersContext.Get().ToList(); await Task.WhenAll(gameServers.Select(GetGameServerStatus)); return gameServers; } - public async Task PatchMissionFile(string missionName) { + public async Task PatchMissionFile(string missionName) + { // if (Data.GetSingle(x => x.status.mission == missionName) != null) { // TODO: Needs better server <-> api interaction to properly get running missions // return new MissionPatchingResult { // success = true, @@ -109,19 +125,23 @@ public async Task PatchMissionFile(string missionName) { return result; } - public void WriteServerConfig(GameServer gameServer, int playerCount, string missionSelection) { + public void WriteServerConfig(GameServer gameServer, int playerCount, string missionSelection) + { File.WriteAllText(_gameServerHelpers.GetGameServerConfigPath(gameServer), _gameServerHelpers.FormatGameServerConfig(gameServer, playerCount, missionSelection)); } - public async Task LaunchGameServer(GameServer gameServer) { + public async Task LaunchGameServer(GameServer gameServer) + { string launchArguments = _gameServerHelpers.FormatGameServerLaunchArguments(gameServer); gameServer.ProcessId = ProcessUtilities.LaunchManagedProcess(_gameServerHelpers.GetGameServerExecutablePath(gameServer), launchArguments); await Task.Delay(TimeSpan.FromSeconds(1)); // launch headless clients - if (gameServer.NumberHeadlessClients > 0) { - for (int index = 0; index < gameServer.NumberHeadlessClients; index++) { + if (gameServer.NumberHeadlessClients > 0) + { + for (int index = 0; index < gameServer.NumberHeadlessClients; index++) + { launchArguments = _gameServerHelpers.FormatHeadlessClientLaunchArguments(gameServer, index); gameServer.HeadlessClientProcessIds.Add(ProcessUtilities.LaunchManagedProcess(_gameServerHelpers.GetGameServerExecutablePath(gameServer), launchArguments)); @@ -130,44 +150,58 @@ public async Task LaunchGameServer(GameServer gameServer) { } } - public async Task StopGameServer(GameServer gameServer) { - try { + public async Task StopGameServer(GameServer gameServer) + { + try + { using HttpClient client = new(); client.DefaultRequestHeaders.Accept.Add(new("application/json")); await client.GetAsync($"http://localhost:{gameServer.ApiPort}/server/stop"); - } catch (Exception) { + } + catch (Exception) + { // ignored } - if (gameServer.NumberHeadlessClients > 0) { - for (int index = 0; index < gameServer.NumberHeadlessClients; index++) { - try { + if (gameServer.NumberHeadlessClients > 0) + { + for (int index = 0; index < gameServer.NumberHeadlessClients; index++) + { + try + { using HttpClient client = new(); client.DefaultRequestHeaders.Accept.Add(new("application/json")); await client.GetAsync($"http://localhost:{gameServer.ApiPort + index + 1}/server/stop"); - } catch (Exception) { + } + catch (Exception) + { // ignored } } } } - public void KillGameServer(GameServer gameServer) { - if (!gameServer.ProcessId.HasValue) { + public void KillGameServer(GameServer gameServer) + { + if (!gameServer.ProcessId.HasValue) + { throw new NullReferenceException(); } Process process = Process.GetProcesses().FirstOrDefault(x => x.Id == gameServer.ProcessId.Value); - if (process != null && !process.HasExited) { + if (process != null && !process.HasExited) + { process.Kill(); } gameServer.ProcessId = null; gameServer.HeadlessClientProcessIds.ForEach( - x => { + x => + { process = Process.GetProcesses().FirstOrDefault(y => y.Id == x); - if (process != null && !process.HasExited) { + if (process != null && !process.HasExited) + { process.Kill(); } } @@ -175,16 +209,19 @@ public void KillGameServer(GameServer gameServer) { gameServer.HeadlessClientProcessIds.Clear(); } - public int KillAllArmaProcesses() { + public int KillAllArmaProcesses() + { List processes = _gameServerHelpers.GetArmaProcesses().ToList(); - foreach (Process process in processes) { + foreach (Process process in processes) + { process.Kill(); } _gameServersContext.Get() .ToList() .ForEach( - x => { + x => + { x.ProcessId = null; x.HeadlessClientProcessIds.Clear(); } @@ -192,7 +229,8 @@ public int KillAllArmaProcesses() { return processes.Count; } - public List GetAvailableMods(string id) { + public List GetAvailableMods(string id) + { GameServer gameServer = _gameServersContext.GetSingle(id); Uri serverExecutable = new(_gameServerHelpers.GetGameServerExecutablePath(gameServer)); @@ -200,19 +238,28 @@ public List GetAvailableMods(string id) { availableModsFolders = availableModsFolders.Concat(_gameServerHelpers.GetGameServerExtraModsPaths()); List mods = new(); - foreach (string modsPath in availableModsFolders) { + foreach (string modsPath in availableModsFolders) + { Regex allowedPaths = new("@.*|(? modFolders = new DirectoryInfo(modsPath).EnumerateDirectories("*.*", SearchOption.TopDirectoryOnly).Where(x => allowedPaths.IsMatch(x.Name)); - foreach (DirectoryInfo modFolder in modFolders) { - if (mods.Any(x => x.Path == modFolder.FullName)) continue; + foreach (DirectoryInfo modFolder in modFolders) + { + if (mods.Any(x => x.Path == modFolder.FullName)) + { + continue; + } Regex allowedExtensions = new("[ep]bo", RegexOptions.Compiled | RegexOptions.IgnoreCase); bool hasModFiles = new DirectoryInfo(modFolder.FullName).EnumerateFiles("*.*", SearchOption.AllDirectories).Any(x => allowedExtensions.IsMatch(x.Extension)); - if (!hasModFiles) continue; + if (!hasModFiles) + { + continue; + } GameServerMod mod = new() { Name = modFolder.Name, Path = modFolder.FullName }; Uri modFolderUri = new(mod.Path); - if (serverExecutable.IsBaseOf(modFolderUri)) { + if (serverExecutable.IsBaseOf(modFolderUri)) + { mod.PathRelativeToServerExecutable = Uri.UnescapeDataString(serverExecutable.MakeRelativeUri(modFolderUri).ToString()); } @@ -220,12 +267,15 @@ public List GetAvailableMods(string id) { } } - foreach (GameServerMod mod in mods) { - if (mods.Any(x => x.Name == mod.Name && x.Path != mod.Path)) { + foreach (GameServerMod mod in mods) + { + if (mods.Any(x => x.Name == mod.Name && x.Path != mod.Path)) + { mod.IsDuplicate = true; } - foreach (GameServerMod duplicate in mods.Where(x => x.Name == mod.Name && x.Path != mod.Path)) { + foreach (GameServerMod duplicate in mods.Where(x => x.Name == mod.Name && x.Path != mod.Path)) + { duplicate.IsDuplicate = true; } } @@ -233,7 +283,8 @@ public List GetAvailableMods(string id) { return mods; } - public List GetEnvironmentMods(GameEnvironment environment) { + public List GetEnvironmentMods(GameEnvironment environment) + { string repoModsFolder = _gameServerHelpers.GetGameServerModsPaths(environment); IEnumerable modFolders = new DirectoryInfo(repoModsFolder).EnumerateDirectories("@*", SearchOption.TopDirectoryOnly); return modFolders.Select(modFolder => new { modFolder, modFiles = new DirectoryInfo(modFolder.FullName).EnumerateFiles("*.pbo", SearchOption.AllDirectories) }) diff --git a/UKSF.Api.ArmaServer/UKSF.Api.ArmaServer.csproj b/UKSF.Api.ArmaServer/UKSF.Api.ArmaServer.csproj index 5f125b6e..13fd3d41 100644 --- a/UKSF.Api.ArmaServer/UKSF.Api.ArmaServer.csproj +++ b/UKSF.Api.ArmaServer/UKSF.Api.ArmaServer.csproj @@ -1,7 +1,7 @@ - netcoreapp5.0 + net5.0 Library diff --git a/UKSF.Api.Auth/ApiAuthExtensions.cs b/UKSF.Api.Auth/ApiAuthExtensions.cs index eabb6f54..4cfb1ee6 100644 --- a/UKSF.Api.Auth/ApiAuthExtensions.cs +++ b/UKSF.Api.Auth/ApiAuthExtensions.cs @@ -2,7 +2,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using AspNet.Security.OpenId; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.Extensions.Configuration; @@ -11,35 +10,51 @@ using Microsoft.IdentityModel.Tokens; using UKSF.Api.Auth.Services; -namespace UKSF.Api.Auth { - public static class ApiAuthExtensions { +namespace UKSF.Api.Auth +{ + public static class ApiAuthExtensions + { public static string TokenAudience => "uksf-audience"; public static string TokenIssuer => "uksf-issuer"; public static SymmetricSecurityKey SecurityKey { get; private set; } - public static IServiceCollection AddUksfAuth(this IServiceCollection services, IConfiguration configuration) { - SecurityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetSection("Secrets")["tokenKey"])); + public static IServiceCollection AddUksfAuth(this IServiceCollection services, IConfiguration configuration) + { + SecurityKey = new(Encoding.UTF8.GetBytes(configuration.GetSection("Secrets")["tokenKey"])); return services.AddContexts().AddEventHandlers().AddServices().AddAuthentication(); } - private static IServiceCollection AddContexts(this IServiceCollection services) => services; + private static IServiceCollection AddContexts(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + private static IServiceCollection AddEventHandlers(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton().AddSingleton(); + private static IServiceCollection AddServices(this IServiceCollection services) + { + return services.AddSingleton().AddSingleton(); + } - private static IServiceCollection AddAuthentication(this IServiceCollection services) { + private static IServiceCollection AddAuthentication(this IServiceCollection services) + { services.AddAuthentication( - options => { + options => + { options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; options.DefaultSignInScheme = CookieAuthenticationDefaults.AuthenticationScheme; } ) .AddJwtBearer( - options => { - options.TokenValidationParameters = new TokenValidationParameters { + options => + { + options.TokenValidationParameters = new() + { RequireExpirationTime = true, RequireSignedTokens = true, ValidateIssuerSigningKey = true, @@ -54,10 +69,13 @@ private static IServiceCollection AddAuthentication(this IServiceCollection serv options.Audience = TokenAudience; options.ClaimsIssuer = TokenIssuer; options.SaveToken = true; - options.Events = new JwtBearerEvents { - OnMessageReceived = context => { + options.Events = new() + { + OnMessageReceived = context => + { StringValues accessToken = context.Request.Query["access_token"]; - if (!string.IsNullOrEmpty(accessToken) && context.Request.Path.StartsWithSegments("/hub")) { + if (!string.IsNullOrEmpty(accessToken) && context.Request.Path.StartsWithSegments("/hub")) + { context.Token = accessToken; } @@ -68,14 +86,18 @@ private static IServiceCollection AddAuthentication(this IServiceCollection serv ) .AddCookie() .AddSteam( - options => { + options => + { options.ForwardAuthenticate = JwtBearerDefaults.AuthenticationScheme; - options.Events = new OpenIdAuthenticationEvents { - OnAccessDenied = context => { + options.Events = new() + { + OnAccessDenied = context => + { context.Response.StatusCode = 401; return Task.CompletedTask; }, - OnTicketReceived = context => { + OnTicketReceived = context => + { string[] idParts = context.Principal?.Claims.First(claim => claim.Type == "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier").Value.Split('/'); string id = idParts?[^1]; context.ReturnUri = $"{context.ReturnUri}?id={id}"; diff --git a/UKSF.Api.Auth/Controllers/LoginController.cs b/UKSF.Api.Auth/Controllers/LoginController.cs index 4d1d4a0c..ea3f105d 100644 --- a/UKSF.Api.Auth/Controllers/LoginController.cs +++ b/UKSF.Api.Auth/Controllers/LoginController.cs @@ -6,41 +6,55 @@ using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Auth.Controllers { +namespace UKSF.Api.Auth.Controllers +{ [Route("[controller]")] - public class LoginController : Controller { + public class LoginController : Controller + { private readonly IHttpContextService _httpContextService; private readonly ILoginService _loginService; - public LoginController(ILoginService loginService, IHttpContextService httpContextService) { + public LoginController(ILoginService loginService, IHttpContextService httpContextService) + { _loginService = loginService; _httpContextService = httpContextService; } [HttpGet] - public bool IsUserAuthenticated() => _httpContextService.IsUserAuthenticated(); + public bool IsUserAuthenticated() + { + return _httpContextService.IsUserAuthenticated(); + } [HttpGet("refresh"), Authorize] - public IActionResult RefreshToken() { + public IActionResult RefreshToken() + { string loginToken = _loginService.RegenerateBearerToken(_httpContextService.GetUserId()); - return loginToken != null ? (IActionResult) Ok(loginToken) : BadRequest(); + return loginToken != null ? Ok(loginToken) : BadRequest(); } [HttpPost] - public IActionResult Login([FromBody] JObject body) { + public IActionResult Login([FromBody] JObject body) + { string email = body.GetValueFromBody("email"); string password = body.GetValueFromBody("password"); - try { + try + { GuardUtilites.ValidateString(email, _ => throw new ArgumentException("Email is invalid. Please try again")); GuardUtilites.ValidateString(password, _ => throw new ArgumentException("Password is invalid. Please try again")); - } catch (ArgumentException exception) { + } + catch (ArgumentException exception) + { return BadRequest(new { error = exception.Message }); } - try { + try + { return Ok(_loginService.Login(email, password)); - } catch (LoginFailedException e) { + } + catch (LoginFailedException e) + { return BadRequest(new { message = e.Message }); } } diff --git a/UKSF.Api.Auth/Controllers/PasswordResetController.cs b/UKSF.Api.Auth/Controllers/PasswordResetController.cs index c4406e84..c36c1b90 100644 --- a/UKSF.Api.Auth/Controllers/PasswordResetController.cs +++ b/UKSF.Api.Auth/Controllers/PasswordResetController.cs @@ -9,9 +9,11 @@ using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; -namespace UKSF.Api.Auth.Controllers { +namespace UKSF.Api.Auth.Controllers +{ [Route("[controller]")] - public class PasswordResetController : ConfirmationCodeReceiver { + public class PasswordResetController : ConfirmationCodeReceiver + { private readonly IEmailService _emailService; private readonly ILogger _logger; @@ -19,24 +21,31 @@ public PasswordResetController(IConfirmationCodeService confirmationCodeService, confirmationCodeService, loginService, accountContext - ) { + ) + { _emailService = emailService; _logger = logger; } - protected override async Task ApplyValidatedPayload(string codePayload, Account account) { + protected override async Task ApplyValidatedPayload(string codePayload, Account account) + { await AccountContext.Update(account.Id, x => x.Password, BCrypt.Net.BCrypt.HashPassword(codePayload)); _logger.LogAudit($"Password changed for {account.Id}", account.Id); return Ok(LoginService.RegenerateBearerToken(account.Id)); } [HttpPost] - public async Task Post([FromBody] JObject loginForm) => await AttemptLoginValidatedAction(loginForm, "passwordreset"); + public async Task Post([FromBody] JObject loginForm) + { + return await AttemptLoginValidatedAction(loginForm, "passwordreset"); + } [HttpPut] - public async Task ResetPassword([FromBody] JObject body) { + public async Task ResetPassword([FromBody] JObject body) + { Account account = AccountContext.GetSingle(x => string.Equals(x.Email, body["email"]?.ToString(), StringComparison.InvariantCultureIgnoreCase)); - if (account == null) { + if (account == null) + { return BadRequest(); } diff --git a/UKSF.Api.Auth/Services/LoginService.cs b/UKSF.Api.Auth/Services/LoginService.cs index b2660a4e..1f7dc0ce 100644 --- a/UKSF.Api.Auth/Services/LoginService.cs +++ b/UKSF.Api.Auth/Services/LoginService.cs @@ -8,45 +8,57 @@ using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Auth.Services { - public interface ILoginService { +namespace UKSF.Api.Auth.Services +{ + public interface ILoginService + { string Login(string email, string password); string LoginForPasswordReset(string email); string RegenerateBearerToken(string accountId); } - public class LoginService : ILoginService { + public class LoginService : ILoginService + { private readonly IAccountContext _accountContext; private readonly IPermissionsService _permissionsService; - public LoginService(IAccountContext accountContext, IPermissionsService permissionsService) { + public LoginService(IAccountContext accountContext, IPermissionsService permissionsService) + { _accountContext = accountContext; _permissionsService = permissionsService; } - public string Login(string email, string password) { + public string Login(string email, string password) + { Account account = AuthenticateAccount(email, password); return GenerateBearerToken(account); } - public string LoginForPasswordReset(string email) { + public string LoginForPasswordReset(string email) + { Account account = AuthenticateAccount(email, "", true); return GenerateBearerToken(account); } - public string RegenerateBearerToken(string accountId) => GenerateBearerToken(_accountContext.GetSingle(accountId)); + public string RegenerateBearerToken(string accountId) + { + return GenerateBearerToken(_accountContext.GetSingle(accountId)); + } - private Account AuthenticateAccount(string email, string password, bool passwordReset = false) { + private Account AuthenticateAccount(string email, string password, bool passwordReset = false) + { Account account = _accountContext.GetSingle(x => string.Equals(x.Email, email, StringComparison.InvariantCultureIgnoreCase)); - if (account != null && (passwordReset || BCrypt.Net.BCrypt.Verify(password, account.Password))) { + if (account != null && (passwordReset || BCrypt.Net.BCrypt.Verify(password, account.Password))) + { return account; } throw new LoginFailedException(); } - private string GenerateBearerToken(Account account) { - List claims = new() { new Claim(ClaimTypes.Email, account.Email, ClaimValueTypes.String), new Claim(ClaimTypes.Sid, account.Id, ClaimValueTypes.String) }; + private string GenerateBearerToken(Account account) + { + List claims = new() { new(ClaimTypes.Email, account.Email, ClaimValueTypes.String), new(ClaimTypes.Sid, account.Id, ClaimValueTypes.String) }; claims.AddRange(_permissionsService.GrantPermissions(account).Select(x => new Claim(ClaimTypes.Role, x))); return JsonConvert.ToString( @@ -57,7 +69,7 @@ private string GenerateBearerToken(Account account) { claims, DateTime.UtcNow, DateTime.UtcNow.AddDays(15), - new SigningCredentials(ApiAuthExtensions.SecurityKey, SecurityAlgorithms.HmacSha256) + new(ApiAuthExtensions.SecurityKey, SecurityAlgorithms.HmacSha256) ) ) ); diff --git a/UKSF.Api.Auth/UKSF.Api.Auth.csproj b/UKSF.Api.Auth/UKSF.Api.Auth.csproj index 2051ba3b..4cf9a193 100644 --- a/UKSF.Api.Auth/UKSF.Api.Auth.csproj +++ b/UKSF.Api.Auth/UKSF.Api.Auth.csproj @@ -1,16 +1,16 @@ - netcoreapp5.0 + net5.0 Library - - - - - + + + + + diff --git a/UKSF.Api.Base/ApiBaseExtensions.cs b/UKSF.Api.Base/ApiBaseExtensions.cs index 58ba45d0..52291c73 100644 --- a/UKSF.Api.Base/ApiBaseExtensions.cs +++ b/UKSF.Api.Base/ApiBaseExtensions.cs @@ -5,9 +5,12 @@ using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -namespace UKSF.Api.Base { - public static class ApiBaseExtensions { - public static IServiceCollection AddUksfBase(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { +namespace UKSF.Api.Base +{ + public static class ApiBaseExtensions + { + public static IServiceCollection AddUksfBase(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) + { services.AddContexts() .AddEventHandlers() .AddServices() @@ -21,10 +24,19 @@ public static IServiceCollection AddUksfBase(this IServiceCollection services, I return services; } - private static IServiceCollection AddContexts(this IServiceCollection services) => services; + private static IServiceCollection AddContexts(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + private static IServiceCollection AddEventHandlers(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddServices(this IServiceCollection services) => services; + private static IServiceCollection AddServices(this IServiceCollection services) + { + return services; + } } } diff --git a/UKSF.Api.Base/Context/MongoCollection.cs b/UKSF.Api.Base/Context/MongoCollection.cs index 68be6280..f5e9360c 100644 --- a/UKSF.Api.Base/Context/MongoCollection.cs +++ b/UKSF.Api.Base/Context/MongoCollection.cs @@ -7,8 +7,10 @@ using MongoDB.Driver; using UKSF.Api.Base.Models; -namespace UKSF.Api.Base.Context { - public interface IMongoCollection where T : MongoObject { +namespace UKSF.Api.Base.Context +{ + public interface IMongoCollection where T : MongoObject + { IEnumerable Get(); IEnumerable Get(Func predicate); PagedResult GetPaged(int page, int pageSize, SortDefinition sortDefinition, FilterDefinition filterDefinition); @@ -23,20 +25,29 @@ public interface IMongoCollection where T : MongoObject { Task DeleteManyAsync(Expression> predicate); } - public class MongoCollection : IMongoCollection where T : MongoObject { + public class MongoCollection : IMongoCollection where T : MongoObject + { private readonly string _collectionName; private readonly IMongoDatabase _database; - public MongoCollection(IMongoDatabase database, string collectionName) { + public MongoCollection(IMongoDatabase database, string collectionName) + { _database = database; _collectionName = collectionName; } - public IEnumerable Get() => GetCollection().AsQueryable(); + public IEnumerable Get() + { + return GetCollection().AsQueryable(); + } - public IEnumerable Get(Func predicate) => GetCollection().AsQueryable().Where(predicate); + public IEnumerable Get(Func predicate) + { + return GetCollection().AsQueryable().Where(predicate); + } - public PagedResult GetPaged(int page, int pageSize, SortDefinition sortDefinition, FilterDefinition filterDefinition) { + public PagedResult GetPaged(int page, int pageSize, SortDefinition sortDefinition, FilterDefinition filterDefinition) + { AggregateFacet countFacet = AggregateFacet.Create( "count", PipelineDefinition.Create(new[] { PipelineStageDefinitionBuilder.Count() }) @@ -55,54 +66,75 @@ public PagedResult GetPaged(int page, int pageSize, SortDefinition sortDef IReadOnlyList data = aggregation.First().Facets.First(x => x.Name == "data").Output(); - return new PagedResult(count, data); + return new(count, data); } - public T GetSingle(string id) => GetCollection().FindSync(Builders.Filter.Eq(x => x.Id, id)).FirstOrDefault(); + public T GetSingle(string id) + { + return GetCollection().FindSync(Builders.Filter.Eq(x => x.Id, id)).FirstOrDefault(); + } - public T GetSingle(Func predicate) => GetCollection().AsQueryable().FirstOrDefault(predicate); + public T GetSingle(Func predicate) + { + return GetCollection().AsQueryable().FirstOrDefault(predicate); + } - public async Task AddAsync(T data) { + public async Task AddAsync(T data) + { await GetCollection().InsertOneAsync(data); } - public async Task UpdateAsync(string id, UpdateDefinition update) { + public async Task UpdateAsync(string id, UpdateDefinition update) + { await GetCollection().UpdateOneAsync(Builders.Filter.Eq(x => x.Id, id), update); } - public async Task UpdateAsync(FilterDefinition filter, UpdateDefinition update) { + public async Task UpdateAsync(FilterDefinition filter, UpdateDefinition update) + { await GetCollection().UpdateOneAsync(filter, update); } - public async Task UpdateManyAsync(Expression> predicate, UpdateDefinition update) { + public async Task UpdateManyAsync(Expression> predicate, UpdateDefinition update) + { // Getting ids by the filter predicate is necessary to cover filtering items by a default model value // (e.g Role order default 0, may not be stored in document, and is thus not filterable) IEnumerable ids = Get(predicate.Compile()).Select(x => x.Id); await GetCollection().UpdateManyAsync(Builders.Filter.In(x => x.Id, ids), update); } - public async Task ReplaceAsync(string id, T value) { + public async Task ReplaceAsync(string id, T value) + { await GetCollection().ReplaceOneAsync(Builders.Filter.Eq(x => x.Id, id), value); } - public async Task DeleteAsync(string id) { + public async Task DeleteAsync(string id) + { await GetCollection().DeleteOneAsync(Builders.Filter.Eq(x => x.Id, id)); } - public async Task DeleteManyAsync(Expression> predicate) { + public async Task DeleteManyAsync(Expression> predicate) + { // This is necessary for filtering items by a default model value (e.g Role order default 0, may not be stored in document) IEnumerable ids = Get(predicate.Compile()).Select(x => x.Id); await GetCollection().DeleteManyAsync(Builders.Filter.In(x => x.Id, ids)); } - public async Task AssertCollectionExistsAsync() { - if (!await CollectionExistsAsync()) { + public async Task AssertCollectionExistsAsync() + { + if (!await CollectionExistsAsync()) + { await _database.CreateCollectionAsync(_collectionName); } } - private MongoDB.Driver.IMongoCollection GetCollection() => _database.GetCollection(_collectionName); + private MongoDB.Driver.IMongoCollection GetCollection() + { + return _database.GetCollection(_collectionName); + } - private async Task CollectionExistsAsync() => await (await _database.ListCollectionsAsync(new ListCollectionsOptions { Filter = new BsonDocument("name", _collectionName) })).AnyAsync(); + private async Task CollectionExistsAsync() + { + return await (await _database.ListCollectionsAsync(new ListCollectionsOptions { Filter = new BsonDocument("name", _collectionName) })).AnyAsync(); + } } } diff --git a/UKSF.Api.Base/Context/MongoCollectionFactory.cs b/UKSF.Api.Base/Context/MongoCollectionFactory.cs index 149b2fd2..ebf5c0c8 100644 --- a/UKSF.Api.Base/Context/MongoCollectionFactory.cs +++ b/UKSF.Api.Base/Context/MongoCollectionFactory.cs @@ -1,17 +1,24 @@ using MongoDB.Driver; using UKSF.Api.Base.Models; -namespace UKSF.Api.Base.Context { - public interface IMongoCollectionFactory { +namespace UKSF.Api.Base.Context +{ + public interface IMongoCollectionFactory + { IMongoCollection CreateMongoCollection(string collectionName) where T : MongoObject; } - public class MongoCollectionFactory : IMongoCollectionFactory { + public class MongoCollectionFactory : IMongoCollectionFactory + { private readonly IMongoDatabase _database; - public MongoCollectionFactory(IMongoDatabase database) => _database = database; + public MongoCollectionFactory(IMongoDatabase database) + { + _database = database; + } - public IMongoCollection CreateMongoCollection(string collectionName) where T : MongoObject { + public IMongoCollection CreateMongoCollection(string collectionName) where T : MongoObject + { IMongoCollection mongoCollection = new MongoCollection(_database, collectionName); return mongoCollection; } diff --git a/UKSF.Api.Base/Context/MongoContextBase.cs b/UKSF.Api.Base/Context/MongoContextBase.cs index eb7fd9ea..73f5f68b 100644 --- a/UKSF.Api.Base/Context/MongoContextBase.cs +++ b/UKSF.Api.Base/Context/MongoContextBase.cs @@ -9,75 +9,112 @@ using UKSF.Api.Base.Models; using SortDirection = UKSF.Api.Base.Models.SortDirection; -namespace UKSF.Api.Base.Context { - public abstract class MongoContextBase where T : MongoObject { +namespace UKSF.Api.Base.Context +{ + public abstract class MongoContextBase where T : MongoObject + { private readonly IMongoCollection _mongoCollection; - protected MongoContextBase(IMongoCollectionFactory mongoCollectionFactory, string collectionName) => _mongoCollection = mongoCollectionFactory.CreateMongoCollection(collectionName); + protected MongoContextBase(IMongoCollectionFactory mongoCollectionFactory, string collectionName) + { + _mongoCollection = mongoCollectionFactory.CreateMongoCollection(collectionName); + } - public virtual IEnumerable Get() => _mongoCollection.Get(); + public virtual IEnumerable Get() + { + return _mongoCollection.Get(); + } - public virtual IEnumerable Get(Func predicate) => _mongoCollection.Get(predicate); + public virtual IEnumerable Get(Func predicate) + { + return _mongoCollection.Get(predicate); + } - public virtual PagedResult GetPaged(int page, int pageSize, SortDirection sortDirection, string sortField, IEnumerable>> filterPropertSelectors, string filter) { + public virtual PagedResult GetPaged(int page, int pageSize, SortDirection sortDirection, string sortField, IEnumerable>> filterPropertSelectors, string filter) + { SortDefinition sortDefinition = sortDirection == SortDirection.ASCENDING ? Builders.Sort.Ascending(sortField) : Builders.Sort.Descending(sortField); FilterDefinition filterDefinition = string.IsNullOrEmpty(filter) ? Builders.Filter.Empty - : Builders.Filter.Or(filterPropertSelectors.Select(x => Builders.Filter.Regex(x, new BsonRegularExpression(new Regex(filter, RegexOptions.IgnoreCase))))); + : Builders.Filter.Or(filterPropertSelectors.Select(x => Builders.Filter.Regex(x, new(new Regex(filter, RegexOptions.IgnoreCase))))); return _mongoCollection.GetPaged(page, pageSize, sortDefinition, filterDefinition); } - public virtual T GetSingle(string id) { + public virtual T GetSingle(string id) + { ValidateId(id); return _mongoCollection.GetSingle(id); } - public virtual T GetSingle(Func predicate) => _mongoCollection.GetSingle(predicate); + public virtual T GetSingle(Func predicate) + { + return _mongoCollection.GetSingle(predicate); + } + + public virtual async Task Add(T item) + { + if (item == null) + { + throw new ArgumentNullException(nameof(item)); + } - public virtual async Task Add(T item) { - if (item == null) throw new ArgumentNullException(nameof(item)); await _mongoCollection.AddAsync(item); } - public virtual async Task Update(string id, Expression> fieldSelector, object value) { + public virtual async Task Update(string id, Expression> fieldSelector, object value) + { ValidateId(id); UpdateDefinition update = value == null ? Builders.Update.Unset(fieldSelector) : Builders.Update.Set(fieldSelector, value); await _mongoCollection.UpdateAsync(id, update); } - public virtual async Task Update(string id, UpdateDefinition update) { + public virtual async Task Update(string id, UpdateDefinition update) + { ValidateId(id); await _mongoCollection.UpdateAsync(id, update); } - public virtual async Task Update(Expression> filterExpression, UpdateDefinition update) { + public virtual async Task Update(Expression> filterExpression, UpdateDefinition update) + { await _mongoCollection.UpdateAsync(Builders.Filter.Where(filterExpression), update); } - public virtual async Task UpdateMany(Expression> filterExpression, UpdateDefinition update) { + public virtual async Task UpdateMany(Expression> filterExpression, UpdateDefinition update) + { await _mongoCollection.UpdateManyAsync(filterExpression, update); } - public virtual async Task Replace(T item) { + public virtual async Task Replace(T item) + { await _mongoCollection.ReplaceAsync(item.Id, item); } - public virtual async Task Delete(string id) { + public virtual async Task Delete(string id) + { ValidateId(id); await _mongoCollection.DeleteAsync(id); } - public virtual async Task Delete(T item) { + public virtual async Task Delete(T item) + { await _mongoCollection.DeleteAsync(item.Id); } - public virtual async Task DeleteMany(Expression> filterExpression) { + public virtual async Task DeleteMany(Expression> filterExpression) + { await _mongoCollection.DeleteManyAsync(filterExpression); } - private static void ValidateId(string id) { - if (string.IsNullOrEmpty(id)) throw new KeyNotFoundException("Id cannot be empty"); - if (!ObjectId.TryParse(id, out ObjectId _)) throw new KeyNotFoundException("Id must be a valid ObjectId"); + private static void ValidateId(string id) + { + if (string.IsNullOrEmpty(id)) + { + throw new KeyNotFoundException("Id cannot be empty"); + } + + if (!ObjectId.TryParse(id, out ObjectId _)) + { + throw new KeyNotFoundException("Id must be a valid ObjectId"); + } } } } diff --git a/UKSF.Api.Base/Events/EventBus.cs b/UKSF.Api.Base/Events/EventBus.cs index 41d36e53..d8753b46 100644 --- a/UKSF.Api.Base/Events/EventBus.cs +++ b/UKSF.Api.Base/Events/EventBus.cs @@ -3,24 +3,32 @@ using System.Reactive.Subjects; using UKSF.Api.Base.Models; -namespace UKSF.Api.Base.Events { - public interface IEventBus { +namespace UKSF.Api.Base.Events +{ + public interface IEventBus + { void Send(EventModel eventModel); void Send(object data); IObservable AsObservable(); } - public class EventBus : IEventBus { + public class EventBus : IEventBus + { protected readonly Subject Subject = new(); - public void Send(EventModel eventModel) { + public void Send(EventModel eventModel) + { Subject.OnNext(eventModel); } - public void Send(object data) { + public void Send(object data) + { Send(new(EventType.NONE, data)); } - public virtual IObservable AsObservable() => Subject.OfType(); + public virtual IObservable AsObservable() + { + return Subject.OfType(); + } } } diff --git a/UKSF.Api.Base/UKSF.Api.Base.csproj b/UKSF.Api.Base/UKSF.Api.Base.csproj index 19f955c5..dae9b445 100644 --- a/UKSF.Api.Base/UKSF.Api.Base.csproj +++ b/UKSF.Api.Base/UKSF.Api.Base.csproj @@ -1,20 +1,20 @@ - netcoreapp5.0 + net5.0 Library default - - - - - - - - + + + + + + + + diff --git a/UKSF.Api.Command/ApiCommandExtensions.cs b/UKSF.Api.Command/ApiCommandExtensions.cs index e13cf2ac..01cb0823 100644 --- a/UKSF.Api.Command/ApiCommandExtensions.cs +++ b/UKSF.Api.Command/ApiCommandExtensions.cs @@ -6,29 +6,42 @@ using UKSF.Api.Command.Services; using UKSF.Api.Command.Signalr.Hubs; -namespace UKSF.Api.Command { - public static class ApiCommandExtensions { - public static IServiceCollection AddUksfCommand(this IServiceCollection services) => services.AddContexts().AddEventHandlers().AddServices(); +namespace UKSF.Api.Command +{ + public static class ApiCommandExtensions + { + public static IServiceCollection AddUksfCommand(this IServiceCollection services) + { + return services.AddContexts().AddEventHandlers().AddServices(); + } - private static IServiceCollection AddContexts(this IServiceCollection services) => - services.AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton(); + private static IServiceCollection AddContexts(this IServiceCollection services) + { + return services.AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); + } - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddEventHandlers(this IServiceCollection services) + { + return services.AddSingleton(); + } - private static IServiceCollection AddServices(this IServiceCollection services) => - services.AddSingleton() - .AddTransient() - .AddTransient() - .AddTransient() - .AddTransient() - .AddTransient(); + private static IServiceCollection AddServices(this IServiceCollection services) + { + return services.AddSingleton() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient(); + } - public static void AddUksfCommandSignalr(this IEndpointRouteBuilder builder) { + public static void AddUksfCommandSignalr(this IEndpointRouteBuilder builder) + { builder.MapHub($"/hub/{CommandRequestsHub.END_POINT}"); } } diff --git a/UKSF.Api.Command/Controllers/CommandRequestsController.cs b/UKSF.Api.Command/Controllers/CommandRequestsController.cs index 750155f4..2730f2ce 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsController.cs @@ -19,9 +19,11 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Command.Controllers { +namespace UKSF.Api.Command.Controllers +{ [Route("[controller]"), Permissions(Permissions.COMMAND)] - public class CommandRequestsController : Controller { + public class CommandRequestsController : Controller + { private const string SUPER_ADMIN = "59e38f10594c603b78aa9dbd"; private readonly IAccountService _accountService; private readonly ICommandRequestCompletionService _commandRequestCompletionService; @@ -45,7 +47,8 @@ public CommandRequestsController( IVariablesContext variablesContext, IAccountService accountService, ILogger logger - ) { + ) + { _commandRequestService = commandRequestService; _commandRequestCompletionService = commandRequestCompletionService; _httpContextService = httpContextService; @@ -59,7 +62,8 @@ ILogger logger } [HttpGet, Authorize] - public IActionResult Get() { + public IActionResult Get() + { IEnumerable allRequests = _commandRequestContext.Get(); List myRequests = new(); List otherRequests = new(); @@ -68,11 +72,15 @@ public IActionResult Get() { bool canOverride = _unitsContext.GetSingle(id).Members.Any(x => x == contextId); bool superAdmin = contextId == SUPER_ADMIN; DateTime now = DateTime.Now; - foreach (CommandRequest commandRequest in allRequests) { + foreach (CommandRequest commandRequest in allRequests) + { Dictionary.KeyCollection reviewers = commandRequest.Reviews.Keys; - if (reviewers.Any(k => k == contextId)) { + if (reviewers.Any(k => k == contextId)) + { myRequests.Add(commandRequest); - } else { + } + else + { otherRequests.Add(commandRequest); } } @@ -80,26 +88,41 @@ public IActionResult Get() { return Ok(new { myRequests = GetMyRequests(myRequests, contextId, canOverride, superAdmin, now), otherRequests = GetOtherRequests(otherRequests, canOverride, superAdmin, now) }); } - private object GetMyRequests(IEnumerable myRequests, string contextId, bool canOverride, bool superAdmin, DateTime now) { + private object GetMyRequests(IEnumerable myRequests, string contextId, bool canOverride, bool superAdmin, DateTime now) + { return myRequests.Select( - x => { - if (string.IsNullOrEmpty(x.Reason)) x.Reason = "None given"; + x => + { + if (string.IsNullOrEmpty(x.Reason)) + { + x.Reason = "None given"; + } + x.Type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.Type.ToLower()); - return new { + return new + { data = x, - canOverride = superAdmin || canOverride && x.Reviews.Count > 1 && x.DateCreated.AddDays(1) < now && x.Reviews.Any(y => y.Value == ReviewState.PENDING && y.Key != contextId), + canOverride = + superAdmin || canOverride && x.Reviews.Count > 1 && x.DateCreated.AddDays(1) < now && x.Reviews.Any(y => y.Value == ReviewState.PENDING && y.Key != contextId), reviews = x.Reviews.Select(y => new { id = y.Key, name = _displayNameService.GetDisplayName(y.Key), state = y.Value }) }; } ); } - private object GetOtherRequests(IEnumerable otherRequests, bool canOverride, bool superAdmin, DateTime now) { + private object GetOtherRequests(IEnumerable otherRequests, bool canOverride, bool superAdmin, DateTime now) + { return otherRequests.Select( - x => { - if (string.IsNullOrEmpty(x.Reason)) x.Reason = "None given"; + x => + { + if (string.IsNullOrEmpty(x.Reason)) + { + x.Reason = "None given"; + } + x.Type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.Type.ToLower()); - return new { + return new + { data = x, canOverride = superAdmin || canOverride && x.DateCreated.AddDays(1) < now, reviews = x.Reviews.Select(y => new { name = _displayNameService.GetDisplayName(y.Key), state = y.Value }) @@ -109,47 +132,65 @@ private object GetOtherRequests(IEnumerable otherRequests, bool } [HttpPatch("{id}"), Authorize] - public async Task UpdateRequestReview(string id, [FromBody] JObject body) { + public async Task UpdateRequestReview(string id, [FromBody] JObject body) + { bool overriden = bool.Parse(body["overriden"].ToString()); ReviewState state = Enum.Parse(body["reviewState"].ToString()); Account sessionAccount = _accountService.GetUserAccount(); CommandRequest request = _commandRequestContext.GetSingle(id); - if (request == null) { + if (request == null) + { throw new NullReferenceException($"Failed to get request with id {id}, does not exist"); } - if (overriden) { + if (overriden) + { _logger.LogAudit($"Review state of {request.Type.ToLower()} request for {request.DisplayRecipient} overriden to {state}"); await _commandRequestService.SetRequestAllReviewStates(request, state); - foreach (string reviewerId in request.Reviews.Select(x => x.Key).Where(x => x != sessionAccount.Id)) { + foreach (string reviewerId in request.Reviews.Select(x => x.Key).Where(x => x != sessionAccount.Id)) + { _notificationsService.Add( - new Notification { + new() + { Owner = reviewerId, Icon = NotificationIcons.REQUEST, Message = $"Your review on {AvsAn.Query(request.Type).Article} {request.Type.ToLower()} request for {request.DisplayRecipient} was overriden by {sessionAccount.Id}" } ); } - } else { + } + else + { ReviewState currentState = _commandRequestService.GetReviewState(request.Id, sessionAccount.Id); - if (currentState == ReviewState.ERROR) { + if (currentState == ReviewState.ERROR) + { throw new ArgumentOutOfRangeException( $"Getting review state for {sessionAccount} from {request.Id} failed. Reviews: \n{request.Reviews.Select(x => $"{x.Key}: {x.Value}").Aggregate((x, y) => $"{x}\n{y}")}" ); } - if (currentState == state) return Ok(); + if (currentState == state) + { + return Ok(); + } + _logger.LogAudit($"Review state of {_displayNameService.GetDisplayName(sessionAccount)} for {request.Type.ToLower()} request for {request.DisplayRecipient} updated to {state}"); await _commandRequestService.SetRequestReviewState(request, sessionAccount.Id, state); } - try { + try + { await _commandRequestCompletionService.Resolve(request.Id); - } catch (Exception) { - if (overriden) { + } + catch (Exception) + { + if (overriden) + { await _commandRequestService.SetRequestAllReviewStates(request, ReviewState.PENDING); - } else { + } + else + { await _commandRequestService.SetRequestReviewState(request, sessionAccount.Id, ReviewState.PENDING); } @@ -160,6 +201,9 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje } [HttpPost("exists"), Authorize] - public IActionResult RequestExists([FromBody] CommandRequest request) => Ok(_commandRequestService.DoesEquivalentRequestExist(request)); + public IActionResult RequestExists([FromBody] CommandRequest request) + { + return Ok(_commandRequestService.DoesEquivalentRequestExist(request)); + } } } diff --git a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs index 7e038327..014be643 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs @@ -12,9 +12,11 @@ using UKSF.Api.Shared; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Command.Controllers { +namespace UKSF.Api.Command.Controllers +{ [Route("CommandRequests/Create")] - public class CommandRequestsCreationController : Controller { + public class CommandRequestsCreationController : Controller + { private readonly IAccountContext _accountContext; private readonly ICommandRequestService _commandRequestService; private readonly IDisplayNameService _displayNameService; @@ -33,7 +35,8 @@ public CommandRequestsCreationController( IUnitsService unitsService, IDisplayNameService displayNameService, IHttpContextService httpContextService - ) { + ) + { _accountContext = accountContext; _unitsContext = unitsContext; _commandRequestService = commandRequestService; @@ -45,17 +48,21 @@ IHttpContextService httpContextService } [HttpPut("rank"), Authorize, Permissions(Permissions.COMMAND)] - public async Task CreateRequestRank([FromBody] CommandRequest request) { + public async Task CreateRequestRank([FromBody] CommandRequest request) + { request.Requester = _httpContextService.GetUserId(); request.DisplayValue = request.Value; request.DisplayFrom = _accountContext.GetSingle(request.Recipient).Rank; - if (request.DisplayValue == request.DisplayFrom) { + if (request.DisplayValue == request.DisplayFrom) + { return BadRequest("Ranks are equal"); } bool direction = _ranksService.IsSuperior(request.DisplayValue, request.DisplayFrom); - request.Type = string.IsNullOrEmpty(request.DisplayFrom) ? CommandRequestType.PROMOTION : direction ? CommandRequestType.PROMOTION : CommandRequestType.DEMOTION; - if (_commandRequestService.DoesEquivalentRequestExist(request)) { + request.Type = string.IsNullOrEmpty(request.DisplayFrom) ? CommandRequestType.PROMOTION : + direction ? CommandRequestType.PROMOTION : CommandRequestType.DEMOTION; + if (_commandRequestService.DoesEquivalentRequestExist(request)) + { return BadRequest("An equivalent request already exists"); } @@ -64,17 +71,21 @@ public async Task CreateRequestRank([FromBody] CommandRequest req } [HttpPut("loa"), Authorize, Permissions(Permissions.MEMBER)] - public async Task CreateRequestLoa([FromBody] CommandRequestLoa request) { + public async Task CreateRequestLoa([FromBody] CommandRequestLoa request) + { DateTime now = DateTime.UtcNow; - if (request.Start <= now.AddDays(-1)) { + if (request.Start <= now.AddDays(-1)) + { return BadRequest("Start date cannot be in the past"); } - if (request.End <= now) { + if (request.End <= now) + { return BadRequest("End date cannot be in the past"); } - if (request.End <= request.Start) { + if (request.End <= request.Start) + { return BadRequest("End date cannot be before start date"); } @@ -83,39 +94,55 @@ public async Task CreateRequestLoa([FromBody] CommandRequestLoa r request.DisplayValue = request.End.ToString(CultureInfo.InvariantCulture); request.DisplayFrom = request.Start.ToString(CultureInfo.InvariantCulture); request.Type = CommandRequestType.LOA; - if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + if (_commandRequestService.DoesEquivalentRequestExist(request)) + { + return BadRequest("An equivalent request already exists"); + } + request.Value = await _loaService.Add(request); await _commandRequestService.Add(request, ChainOfCommandMode.NEXT_COMMANDER_EXCLUDE_SELF); return Ok(); } [HttpPut("discharge"), Authorize, Permissions(Permissions.COMMAND)] - public async Task CreateRequestDischarge([FromBody] CommandRequest request) { + public async Task CreateRequestDischarge([FromBody] CommandRequest request) + { request.Requester = _httpContextService.GetUserId(); request.DisplayValue = "Discharged"; request.DisplayFrom = "Member"; request.Type = CommandRequestType.DISCHARGE; - if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + if (_commandRequestService.DoesEquivalentRequestExist(request)) + { + return BadRequest("An equivalent request already exists"); + } + await _commandRequestService.Add(request, ChainOfCommandMode.COMMANDER_AND_PERSONNEL); return Ok(); } [HttpPut("role"), Authorize, Permissions(Permissions.COMMAND)] - public async Task CreateRequestIndividualRole([FromBody] CommandRequest request) { + public async Task CreateRequestIndividualRole([FromBody] CommandRequest request) + { request.Requester = _httpContextService.GetUserId(); request.DisplayValue = request.Value; request.DisplayFrom = _accountContext.GetSingle(request.Recipient).RoleAssignment; request.Type = CommandRequestType.INDIVIDUAL_ROLE; - if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + if (_commandRequestService.DoesEquivalentRequestExist(request)) + { + return BadRequest("An equivalent request already exists"); + } + await _commandRequestService.Add(request, ChainOfCommandMode.NEXT_COMMANDER); return Ok(); } [HttpPut("unitrole"), Authorize, Permissions(Permissions.COMMAND)] - public async Task CreateRequestUnitRole([FromBody] CommandRequest request) { + public async Task CreateRequestUnitRole([FromBody] CommandRequest request) + { Unit unit = _unitsContext.GetSingle(request.Value); bool recipientHasUnitRole = _unitsService.RolesHasMember(unit, request.Recipient); - if (!recipientHasUnitRole && request.SecondaryValue == "None") { + if (!recipientHasUnitRole && request.SecondaryValue == "None") + { return BadRequest( $"{_displayNameService.GetDisplayName(request.Recipient)} has no unit role in {unit.Name}. If you are trying to remove them from the unit, use a Unit Removal request" ); @@ -123,23 +150,32 @@ public async Task CreateRequestUnitRole([FromBody] CommandRequest request.Requester = _httpContextService.GetUserId(); request.DisplayValue = request.SecondaryValue == "None" ? $"Remove role from {unit.Name}" : $"{request.SecondaryValue} of {unit.Name}"; - if (recipientHasUnitRole) { + if (recipientHasUnitRole) + { string role = unit.Roles.FirstOrDefault(x => x.Value == request.Recipient).Key; request.DisplayFrom = $"{role} of {unit.Name}"; - } else { + } + else + { request.DisplayFrom = $"Member of {unit.Name}"; } request.Type = CommandRequestType.UNIT_ROLE; - if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + if (_commandRequestService.DoesEquivalentRequestExist(request)) + { + return BadRequest("An equivalent request already exists"); + } + await _commandRequestService.Add(request); return Ok(); } [HttpPut("unitremoval"), Authorize, Permissions(Permissions.COMMAND)] - public async Task CreateRequestUnitRemoval([FromBody] CommandRequest request) { + public async Task CreateRequestUnitRemoval([FromBody] CommandRequest request) + { Unit removeUnit = _unitsContext.GetSingle(request.Value); - if (removeUnit.Branch == UnitBranch.COMBAT) { + if (removeUnit.Branch == UnitBranch.COMBAT) + { return BadRequest("To remove from a combat unit, use a Transfer request"); } @@ -147,25 +183,41 @@ public async Task CreateRequestUnitRemoval([FromBody] CommandRequ request.DisplayValue = "N/A"; request.DisplayFrom = removeUnit.Name; request.Type = CommandRequestType.UNIT_REMOVAL; - if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + if (_commandRequestService.DoesEquivalentRequestExist(request)) + { + return BadRequest("An equivalent request already exists"); + } + await _commandRequestService.Add(request, ChainOfCommandMode.TARGET_COMMANDER); return Ok(); } [HttpPut("transfer"), Authorize, Permissions(Permissions.COMMAND)] - public async Task CreateRequestTransfer([FromBody] CommandRequest request) { + public async Task CreateRequestTransfer([FromBody] CommandRequest request) + { Unit toUnit = _unitsContext.GetSingle(request.Value); request.Requester = _httpContextService.GetUserId(); request.DisplayValue = toUnit.Name; - if (toUnit.Branch == UnitBranch.AUXILIARY) { + if (toUnit.Branch == UnitBranch.AUXILIARY) + { request.DisplayFrom = "N/A"; request.Type = CommandRequestType.AUXILIARY_TRANSFER; - if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + if (_commandRequestService.DoesEquivalentRequestExist(request)) + { + return BadRequest("An equivalent request already exists"); + } + await _commandRequestService.Add(request, ChainOfCommandMode.TARGET_COMMANDER); - } else { + } + else + { request.DisplayFrom = _accountContext.GetSingle(request.Recipient).UnitAssignment; request.Type = CommandRequestType.TRANSFER; - if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + if (_commandRequestService.DoesEquivalentRequestExist(request)) + { + return BadRequest("An equivalent request already exists"); + } + await _commandRequestService.Add(request, ChainOfCommandMode.COMMANDER_AND_TARGET_COMMANDER); } @@ -173,12 +225,17 @@ public async Task CreateRequestTransfer([FromBody] CommandRequest } [HttpPut("reinstate"), Authorize, Permissions(Permissions.COMMAND, Permissions.RECRUITER, Permissions.NCO)] - public async Task CreateRequestReinstateMember([FromBody] CommandRequest request) { + public async Task CreateRequestReinstateMember([FromBody] CommandRequest request) + { request.Requester = _httpContextService.GetUserId(); request.DisplayValue = "Member"; request.DisplayFrom = "Discharged"; request.Type = CommandRequestType.REINSTATE_MEMBER; - if (_commandRequestService.DoesEquivalentRequestExist(request)) return BadRequest("An equivalent request already exists"); + if (_commandRequestService.DoesEquivalentRequestExist(request)) + { + return BadRequest("An equivalent request already exists"); + } + await _commandRequestService.Add(request, ChainOfCommandMode.PERSONNEL); return Ok(); } diff --git a/UKSF.Api.Command/Controllers/OperationOrderController.cs b/UKSF.Api.Command/Controllers/OperationOrderController.cs index bae60f6e..d20c1da3 100644 --- a/UKSF.Api.Command/Controllers/OperationOrderController.cs +++ b/UKSF.Api.Command/Controllers/OperationOrderController.cs @@ -6,31 +6,42 @@ using UKSF.Api.Command.Services; using UKSF.Api.Shared; -namespace UKSF.Api.Command.Controllers { +namespace UKSF.Api.Command.Controllers +{ [Route("[controller]"), Permissions(Permissions.MEMBER)] - public class OperationOrderController : Controller { + public class OperationOrderController : Controller + { private readonly IOperationOrderContext _operationOrderContext; private readonly IOperationOrderService _operationOrderService; - public OperationOrderController(IOperationOrderService operationOrderService, IOperationOrderContext operationOrderContext) { + public OperationOrderController(IOperationOrderService operationOrderService, IOperationOrderContext operationOrderContext) + { _operationOrderService = operationOrderService; _operationOrderContext = operationOrderContext; } [HttpGet, Authorize] - public IActionResult Get() => Ok(_operationOrderContext.Get()); + public IActionResult Get() + { + return Ok(_operationOrderContext.Get()); + } [HttpGet("{id}"), Authorize] - public IActionResult Get(string id) => Ok(new { result = _operationOrderContext.GetSingle(id) }); + public IActionResult Get(string id) + { + return Ok(new { result = _operationOrderContext.GetSingle(id) }); + } [HttpPost, Authorize] - public async Task Post([FromBody] CreateOperationOrderRequest request) { + public async Task Post([FromBody] CreateOperationOrderRequest request) + { await _operationOrderService.Add(request); return Ok(); } [HttpPut, Authorize] - public async Task Put([FromBody] Opord request) { + public async Task Put([FromBody] Opord request) + { await _operationOrderContext.Replace(request); return Ok(); } diff --git a/UKSF.Api.Command/Controllers/OperationReportController.cs b/UKSF.Api.Command/Controllers/OperationReportController.cs index 455d79ef..000a03db 100644 --- a/UKSF.Api.Command/Controllers/OperationReportController.cs +++ b/UKSF.Api.Command/Controllers/OperationReportController.cs @@ -7,36 +7,45 @@ using UKSF.Api.Command.Services; using UKSF.Api.Shared; -namespace UKSF.Api.Command.Controllers { +namespace UKSF.Api.Command.Controllers +{ [Route("[controller]"), Permissions(Permissions.MEMBER)] - public class OperationReportController : Controller { + public class OperationReportController : Controller + { private readonly IOperationReportContext _operationReportContext; private readonly IOperationReportService _operationReportService; - public OperationReportController(IOperationReportService operationReportService, IOperationReportContext operationReportContext) { + public OperationReportController(IOperationReportService operationReportService, IOperationReportContext operationReportContext) + { _operationReportService = operationReportService; _operationReportContext = operationReportContext; } [HttpGet("{id}"), Authorize] - public IActionResult Get(string id) { + public IActionResult Get(string id) + { Oprep oprep = _operationReportContext.GetSingle(id); return Ok(new { operationEntity = oprep, groupedAttendance = oprep.AttendanceReport.Users.GroupBy(x => x.GroupName) }); } [HttpPost, Authorize] - public async Task Post([FromBody] CreateOperationReportRequest request) { + public async Task Post([FromBody] CreateOperationReportRequest request) + { await _operationReportService.Create(request); return Ok(); } [HttpPut, Authorize] - public async Task Put([FromBody] Oprep request) { + public async Task Put([FromBody] Oprep request) + { await _operationReportContext.Replace(request); return Ok(); } [HttpGet, Authorize] - public IActionResult Get() => Ok(_operationReportContext.Get()); + public IActionResult Get() + { + return Ok(_operationReportContext.Get()); + } } } diff --git a/UKSF.Api.Command/Models/CommandRequest.cs b/UKSF.Api.Command/Models/CommandRequest.cs index 091514b2..5f062779 100644 --- a/UKSF.Api.Command/Models/CommandRequest.cs +++ b/UKSF.Api.Command/Models/CommandRequest.cs @@ -4,15 +4,18 @@ using MongoDB.Bson.Serialization.Attributes; using UKSF.Api.Base.Models; -namespace UKSF.Api.Command.Models { - public enum ReviewState { +namespace UKSF.Api.Command.Models +{ + public enum ReviewState + { APPROVED, REJECTED, PENDING, ERROR } - public static class CommandRequestType { + public static class CommandRequestType + { public const string AUXILIARY_TRANSFER = "Axuiliary Transfer"; public const string DEMOTION = "Demotion"; public const string DISCHARGE = "Discharge"; @@ -25,19 +28,24 @@ public static class CommandRequestType { public const string UNIT_ROLE = "Unit Role"; } - public class CommandRequest : MongoObject { + public class CommandRequest : MongoObject + { public DateTime DateCreated; public string DisplayFrom; public string DisplayRecipient; public string DisplayRequester; public string DisplayValue; public string Reason; - public string Type; [BsonRepresentation(BsonType.ObjectId)] public string Recipient; [BsonRepresentation(BsonType.ObjectId)] public string Requester; public Dictionary Reviews = new(); public string SecondaryValue; + public string Type; public string Value; - public CommandRequest() => DateCreated = DateTime.Now; + + public CommandRequest() + { + DateCreated = DateTime.Now; + } } } diff --git a/UKSF.Api.Command/Services/ChainOfCommandService.cs b/UKSF.Api.Command/Services/ChainOfCommandService.cs index 7d2e273d..e2315797 100644 --- a/UKSF.Api.Command/Services/ChainOfCommandService.cs +++ b/UKSF.Api.Command/Services/ChainOfCommandService.cs @@ -8,20 +8,24 @@ using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Command.Services { - public interface IChainOfCommandService { +namespace UKSF.Api.Command.Services +{ + public interface IChainOfCommandService + { HashSet ResolveChain(ChainOfCommandMode mode, string recipient, Unit start, Unit target); bool InContextChainOfCommand(string id); } - public class ChainOfCommandService : IChainOfCommandService { + public class ChainOfCommandService : IChainOfCommandService + { private readonly IAccountService _accountService; private readonly IHttpContextService _httpContextService; private readonly IRolesService _rolesService; private readonly IUnitsContext _unitsContext; private readonly IUnitsService _unitsService; - public ChainOfCommandService(IUnitsContext unitsContext, IUnitsService unitsService, IRolesService rolesService, IHttpContextService httpContextService, IAccountService accountService) { + public ChainOfCommandService(IUnitsContext unitsContext, IUnitsService unitsService, IRolesService rolesService, IHttpContextService httpContextService, IAccountService accountService) + { _unitsContext = unitsContext; _unitsService = unitsService; _rolesService = rolesService; @@ -29,25 +33,30 @@ public ChainOfCommandService(IUnitsContext unitsContext, IUnitsService unitsServ _accountService = accountService; } - public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, Unit start, Unit target) { + public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, Unit start, Unit target) + { HashSet chain = ResolveMode(mode, start, target).Where(x => x != recipient).ToHashSet(); chain.CleanHashset(); // If no chain, and mode is not next commander, get next commander - if (chain.Count == 0 && mode != ChainOfCommandMode.NEXT_COMMANDER && mode != ChainOfCommandMode.NEXT_COMMANDER_EXCLUDE_SELF) { + if (chain.Count == 0 && mode != ChainOfCommandMode.NEXT_COMMANDER && mode != ChainOfCommandMode.NEXT_COMMANDER_EXCLUDE_SELF) + { chain = GetNextCommander(start).Where(x => x != recipient).ToHashSet(); chain.CleanHashset(); } // If no chain, get root unit commander - if (chain.Count == 0) { + if (chain.Count == 0) + { chain.Add(GetCommander(_unitsService.GetRoot())); chain.CleanHashset(); } // If no chain, get root unit child commanders - if (chain.Count == 0) { - foreach (Unit unit in _unitsContext.Get(x => x.Parent == _unitsService.GetRoot().Id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) { + if (chain.Count == 0) + { + foreach (Unit unit in _unitsContext.Get(x => x.Parent == _unitsService.GetRoot().Id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) + { chain.Add(GetCommander(unit)); } @@ -55,7 +64,8 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U } // If no chain, get personnel - if (chain.Count == 0) { + if (chain.Count == 0) + { chain.UnionWith(GetPersonnel()); chain.CleanHashset(); } @@ -63,15 +73,22 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U return chain; } - public bool InContextChainOfCommand(string id) { + public bool InContextChainOfCommand(string id) + { Account contextAccount = _accountService.GetUserAccount(); - if (id == contextAccount.Id) return true; + if (id == contextAccount.Id) + { + return true; + } + Unit unit = _unitsContext.GetSingle(x => x.Name == contextAccount.UnitAssignment); return _unitsService.RolesHasMember(unit, contextAccount.Id) && (unit.Members.Contains(id) || _unitsService.GetAllChildren(unit, true).Any(unitChild => unitChild.Members.Contains(id))); } - private IEnumerable ResolveMode(ChainOfCommandMode mode, Unit start, Unit target) { - return mode switch { + private IEnumerable ResolveMode(ChainOfCommandMode mode, Unit start, Unit target) + { + return mode switch + { ChainOfCommandMode.FULL => Full(start), ChainOfCommandMode.NEXT_COMMANDER => GetNextCommander(start), ChainOfCommandMode.NEXT_COMMANDER_EXCLUDE_SELF => GetNextCommanderExcludeSelf(start), @@ -84,10 +101,13 @@ private IEnumerable ResolveMode(ChainOfCommandMode mode, Unit start, Uni }; } - private IEnumerable Full(Unit unit) { + private IEnumerable Full(Unit unit) + { HashSet chain = new(); - while (unit != null) { - if (UnitHasCommander(unit)) { + while (unit != null) + { + if (UnitHasCommander(unit)) + { chain.Add(GetCommander(unit)); } @@ -97,19 +117,29 @@ private IEnumerable Full(Unit unit) { return chain; } - private IEnumerable GetNextCommander(Unit unit) => new HashSet { GetNextUnitCommander(unit) }; + private IEnumerable GetNextCommander(Unit unit) + { + return new HashSet { GetNextUnitCommander(unit) }; + } - private IEnumerable GetNextCommanderExcludeSelf(Unit unit) => new HashSet { GetNextUnitCommanderExcludeSelf(unit) }; + private IEnumerable GetNextCommanderExcludeSelf(Unit unit) + { + return new HashSet { GetNextUnitCommanderExcludeSelf(unit) }; + } - private IEnumerable CommanderAndOneAbove(Unit unit) { + private IEnumerable CommanderAndOneAbove(Unit unit) + { HashSet chain = new(); - if (unit != null) { - if (UnitHasCommander(unit)) { + if (unit != null) + { + if (UnitHasCommander(unit)) + { chain.Add(GetCommander(unit)); } Unit parentUnit = _unitsService.GetParent(unit); - if (parentUnit != null && UnitHasCommander(parentUnit)) { + if (parentUnit != null && UnitHasCommander(parentUnit)) + { chain.Add(GetCommander(parentUnit)); } } @@ -117,9 +147,11 @@ private IEnumerable CommanderAndOneAbove(Unit unit) { return chain; } - private IEnumerable GetCommanderAndPersonnel(Unit unit) { + private IEnumerable GetCommanderAndPersonnel(Unit unit) + { HashSet chain = new(); - if (UnitHasCommander(unit)) { + if (UnitHasCommander(unit)) + { chain.Add(GetCommander(unit)); } @@ -127,13 +159,22 @@ private IEnumerable GetCommanderAndPersonnel(Unit unit) { return chain; } - private IEnumerable GetPersonnel() => _unitsContext.GetSingle(x => x.Shortname == "SR7").Members.ToHashSet(); + private IEnumerable GetPersonnel() + { + return _unitsContext.GetSingle(x => x.Shortname == "SR7").Members.ToHashSet(); + } - private IEnumerable GetCommanderAndTargetCommander(Unit unit, Unit targetUnit) => new HashSet { GetNextUnitCommander(unit), GetNextUnitCommander(targetUnit) }; + private IEnumerable GetCommanderAndTargetCommander(Unit unit, Unit targetUnit) + { + return new HashSet { GetNextUnitCommander(unit), GetNextUnitCommander(targetUnit) }; + } - private string GetNextUnitCommander(Unit unit) { - while (unit != null) { - if (UnitHasCommander(unit)) { + private string GetNextUnitCommander(Unit unit) + { + while (unit != null) + { + if (UnitHasCommander(unit)) + { return GetCommander(unit); } @@ -143,11 +184,17 @@ private string GetNextUnitCommander(Unit unit) { return string.Empty; } - private string GetNextUnitCommanderExcludeSelf(Unit unit) { - while (unit != null) { - if (UnitHasCommander(unit)) { + private string GetNextUnitCommanderExcludeSelf(Unit unit) + { + while (unit != null) + { + if (UnitHasCommander(unit)) + { string commander = GetCommander(unit); - if (commander != _httpContextService.GetUserId()) return commander; + if (commander != _httpContextService.GetUserId()) + { + return commander; + } } unit = _unitsService.GetParent(unit); @@ -156,8 +203,14 @@ private string GetNextUnitCommanderExcludeSelf(Unit unit) { return string.Empty; } - private bool UnitHasCommander(Unit unit) => _unitsService.HasRole(unit, _rolesService.GetCommanderRoleName()); + private bool UnitHasCommander(Unit unit) + { + return _unitsService.HasRole(unit, _rolesService.GetCommanderRoleName()); + } - private string GetCommander(Unit unit) => unit.Roles.GetValueOrDefault(_rolesService.GetCommanderRoleName(), string.Empty); + private string GetCommander(Unit unit) + { + return unit.Roles.GetValueOrDefault(_rolesService.GetCommanderRoleName(), string.Empty); + } } } diff --git a/UKSF.Api.Command/Services/CommandRequestService.cs b/UKSF.Api.Command/Services/CommandRequestService.cs index 81a11696..096f4761 100644 --- a/UKSF.Api.Command/Services/CommandRequestService.cs +++ b/UKSF.Api.Command/Services/CommandRequestService.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using AvsAnLib; @@ -11,8 +10,10 @@ using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; -namespace UKSF.Api.Command.Services { - public interface ICommandRequestService { +namespace UKSF.Api.Command.Services +{ + public interface ICommandRequestService + { Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE); Task ArchiveRequest(string id); Task SetRequestReviewState(CommandRequest request, string reviewerId, ReviewState newState); @@ -23,7 +24,8 @@ public interface ICommandRequestService { bool DoesEquivalentRequestExist(CommandRequest request); } - public class CommandRequestService : ICommandRequestService { + public class CommandRequestService : ICommandRequestService + { private readonly IAccountContext _accountContext; private readonly IAccountService _accountService; private readonly IChainOfCommandService _chainOfCommandService; @@ -46,7 +48,8 @@ public CommandRequestService( IChainOfCommandService chainOfCommandService, IRanksService ranksService, ILogger logger - ) { + ) + { _accountContext = accountContext; _unitsContext = unitsContext; _commandRequestContext = commandRequestContext; @@ -59,7 +62,8 @@ ILogger logger _logger = logger; } - public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE) { + public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE) + { Account requesterAccount = _accountService.GetUserAccount(); Account recipientAccount = _accountContext.GetSingle(request.Recipient); request.DisplayRequester = _displayNameService.GetDisplayName(requesterAccount); @@ -70,10 +74,14 @@ public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfC _unitsContext.GetSingle(x => x.Name == recipientAccount.UnitAssignment), _unitsContext.GetSingle(request.Value) ); - if (ids.Count == 0) throw new Exception($"Failed to get any commanders for review for {request.Type.ToLower()} request for {request.DisplayRecipient}.\nContact an admin"); + if (ids.Count == 0) + { + throw new($"Failed to get any commanders for review for {request.Type.ToLower()} request for {request.DisplayRecipient}.\nContact an admin"); + } List accounts = ids.Select(x => _accountContext.GetSingle(x)).OrderBy(x => x.Rank, new RankComparer(_ranksService)).ThenBy(x => x.Lastname).ThenBy(x => x.Firstname).ToList(); - foreach (Account account in accounts) { + foreach (Account account in accounts) + { request.Reviews.Add(account.Id, ReviewState.PENDING); } @@ -82,40 +90,54 @@ public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfC bool selfRequest = request.DisplayRequester == request.DisplayRecipient; string notificationMessage = $"{request.DisplayRequester} requires your review on {(selfRequest ? "their" : AvsAn.Query(request.Type).Article)} {request.Type.ToLower()} request{(selfRequest ? "" : $" for {request.DisplayRecipient}")}"; - foreach (Account account in accounts.Where(x => x.Id != requesterAccount.Id)) { - _notificationsService.Add(new Notification { Owner = account.Id, Icon = NotificationIcons.REQUEST, Message = notificationMessage, Link = "/command/requests" }); + foreach (Account account in accounts.Where(x => x.Id != requesterAccount.Id)) + { + _notificationsService.Add(new() { Owner = account.Id, Icon = NotificationIcons.REQUEST, Message = notificationMessage, Link = "/command/requests" }); } } - public async Task ArchiveRequest(string id) { + public async Task ArchiveRequest(string id) + { CommandRequest request = _commandRequestContext.GetSingle(id); await _dataArchive.Add(request); await _commandRequestContext.Delete(id); } - public async Task SetRequestReviewState(CommandRequest request, string reviewerId, ReviewState newState) { + public async Task SetRequestReviewState(CommandRequest request, string reviewerId, ReviewState newState) + { await _commandRequestContext.Update(request.Id, Builders.Update.Set($"reviews.{reviewerId}", newState)); } - public async Task SetRequestAllReviewStates(CommandRequest request, ReviewState newState) { + public async Task SetRequestAllReviewStates(CommandRequest request, ReviewState newState) + { List keys = new(request.Reviews.Keys); - foreach (string key in keys) { + foreach (string key in keys) + { request.Reviews[key] = newState; } await _commandRequestContext.Update(request.Id, Builders.Update.Set("reviews", request.Reviews)); } - public ReviewState GetReviewState(string id, string reviewer) { + public ReviewState GetReviewState(string id, string reviewer) + { CommandRequest request = _commandRequestContext.GetSingle(id); - return request == null ? ReviewState.ERROR : !request.Reviews.ContainsKey(reviewer) ? ReviewState.ERROR : request.Reviews[reviewer]; + return request == null ? ReviewState.ERROR : + !request.Reviews.ContainsKey(reviewer) ? ReviewState.ERROR : request.Reviews[reviewer]; } - public bool IsRequestApproved(string id) => _commandRequestContext.GetSingle(id).Reviews.All(x => x.Value == ReviewState.APPROVED); + public bool IsRequestApproved(string id) + { + return _commandRequestContext.GetSingle(id).Reviews.All(x => x.Value == ReviewState.APPROVED); + } - public bool IsRequestRejected(string id) => _commandRequestContext.GetSingle(id).Reviews.Any(x => x.Value == ReviewState.REJECTED); + public bool IsRequestRejected(string id) + { + return _commandRequestContext.GetSingle(id).Reviews.Any(x => x.Value == ReviewState.REJECTED); + } - public bool DoesEquivalentRequestExist(CommandRequest request) { + public bool DoesEquivalentRequestExist(CommandRequest request) + { return _commandRequestContext.Get().Any(x => x.Recipient == request.Recipient && x.Type == request.Type && x.DisplayValue == request.DisplayValue && x.DisplayFrom == request.DisplayFrom); } } diff --git a/UKSF.Api.Command/Services/LoaService.cs b/UKSF.Api.Command/Services/LoaService.cs index 3c40ae3c..223f17c5 100644 --- a/UKSF.Api.Command/Services/LoaService.cs +++ b/UKSF.Api.Command/Services/LoaService.cs @@ -7,25 +7,34 @@ using UKSF.Api.Command.Models; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Command.Services { - public interface ILoaService { +namespace UKSF.Api.Command.Services +{ + public interface ILoaService + { IEnumerable Get(List ids); Task Add(CommandRequestLoa requestBase); Task SetLoaState(string id, LoaReviewState state); bool IsLoaCovered(string id, DateTime eventStart); } - public class LoaService : ILoaService { + public class LoaService : ILoaService + { private readonly ILoaContext _loaContext; - public LoaService(ILoaContext loaContext) => _loaContext = loaContext; + public LoaService(ILoaContext loaContext) + { + _loaContext = loaContext; + } - public IEnumerable Get(List ids) { + public IEnumerable Get(List ids) + { return _loaContext.Get(x => ids.Contains(x.Recipient) && x.End > DateTime.Now.AddDays(-30)); } - public async Task Add(CommandRequestLoa requestBase) { - Loa loa = new() { + public async Task Add(CommandRequestLoa requestBase) + { + Loa loa = new() + { Submitted = DateTime.Now, Recipient = requestBase.Recipient, Start = requestBase.Start, @@ -38,11 +47,13 @@ public async Task Add(CommandRequestLoa requestBase) { return loa.Id; } - public async Task SetLoaState(string id, LoaReviewState state) { + public async Task SetLoaState(string id, LoaReviewState state) + { await _loaContext.Update(id, Builders.Update.Set(x => x.State, state)); } - public bool IsLoaCovered(string id, DateTime eventStart) { + public bool IsLoaCovered(string id, DateTime eventStart) + { return _loaContext.Get(loa => loa.Recipient == id && loa.Start < eventStart && loa.End > eventStart).Any(); } } diff --git a/UKSF.Api.Command/Services/OperationOrderService.cs b/UKSF.Api.Command/Services/OperationOrderService.cs index 4d4555b8..77cda84e 100644 --- a/UKSF.Api.Command/Services/OperationOrderService.cs +++ b/UKSF.Api.Command/Services/OperationOrderService.cs @@ -2,18 +2,26 @@ using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; -namespace UKSF.Api.Command.Services { - public interface IOperationOrderService { +namespace UKSF.Api.Command.Services +{ + public interface IOperationOrderService + { Task Add(CreateOperationOrderRequest request); } - public class OperationOrderService : IOperationOrderService { + public class OperationOrderService : IOperationOrderService + { private readonly IOperationOrderContext _operationOrderContext; - public OperationOrderService(IOperationOrderContext operationOrderContext) => _operationOrderContext = operationOrderContext; + public OperationOrderService(IOperationOrderContext operationOrderContext) + { + _operationOrderContext = operationOrderContext; + } - public async Task Add(CreateOperationOrderRequest request) { - Opord operation = new() { + public async Task Add(CreateOperationOrderRequest request) + { + Opord operation = new() + { Name = request.Name, Map = request.Map, Start = request.Start.AddHours((double) request.Starttime / 100), diff --git a/UKSF.Api.Command/Services/OperationReportService.cs b/UKSF.Api.Command/Services/OperationReportService.cs index b6e07abf..359b21b9 100644 --- a/UKSF.Api.Command/Services/OperationReportService.cs +++ b/UKSF.Api.Command/Services/OperationReportService.cs @@ -2,18 +2,26 @@ using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; -namespace UKSF.Api.Command.Services { - public interface IOperationReportService { +namespace UKSF.Api.Command.Services +{ + public interface IOperationReportService + { Task Create(CreateOperationReportRequest request); } - public class OperationReportService : IOperationReportService { + public class OperationReportService : IOperationReportService + { private readonly IOperationReportContext _operationReportContext; - public OperationReportService(IOperationReportContext operationReportContext) => _operationReportContext = operationReportContext; + public OperationReportService(IOperationReportContext operationReportContext) + { + _operationReportContext = operationReportContext; + } - public async Task Create(CreateOperationReportRequest request) { - Oprep operation = new() { + public async Task Create(CreateOperationReportRequest request) + { + Oprep operation = new() + { Name = request.Name, Map = request.Map, Start = request.Start.AddHours((double) request.Starttime / 100), diff --git a/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs b/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs index d244c210..d3e6238f 100644 --- a/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs +++ b/UKSF.Api.Integrations.Discord/ApiIntegrationDiscordExtensions.cs @@ -2,14 +2,28 @@ using UKSF.Api.Discord.EventHandlers; using UKSF.Api.Discord.Services; -namespace UKSF.Api.Discord { - public static class ApiIntegrationDiscordExtensions { - public static IServiceCollection AddUksfIntegrationDiscord(this IServiceCollection services) => services.AddContexts().AddEventHandlers().AddServices(); +namespace UKSF.Api.Discord +{ + public static class ApiIntegrationDiscordExtensions + { + public static IServiceCollection AddUksfIntegrationDiscord(this IServiceCollection services) + { + return services.AddContexts().AddEventHandlers().AddServices(); + } - private static IServiceCollection AddContexts(this IServiceCollection services) => services; + private static IServiceCollection AddContexts(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddEventHandlers(this IServiceCollection services) + { + return services.AddSingleton(); + } - private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddServices(this IServiceCollection services) + { + return services.AddSingleton(); + } } } diff --git a/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs b/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs index 76b53dfa..72ecf283 100644 --- a/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs +++ b/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs @@ -4,35 +4,40 @@ using Discord.WebSocket; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Base.Events; using UKSF.Api.Discord.Services; using UKSF.Api.Shared; using UKSF.Api.Shared.Models; -namespace UKSF.Api.Discord.Controllers { +namespace UKSF.Api.Discord.Controllers +{ [Route("[controller]")] - public class DiscordController : Controller { + public class DiscordController : Controller + { private readonly IDiscordService _discordService; - private readonly IEventBus _eventBus; - public DiscordController(IDiscordService discordService, IEventBus eventBus) { + public DiscordController(IDiscordService discordService) + { _discordService = discordService; - _eventBus = eventBus; } [HttpGet("roles"), Authorize, Permissions(Permissions.ADMIN)] - public async Task GetRoles() { + public async Task GetRoles() + { IReadOnlyCollection roles = await _discordService.GetRoles(); return Ok(roles.OrderBy(x => x.Name).Select(x => $"{x.Name}: {x.Id}").Aggregate((x, y) => $"{x}\n{y}")); } [HttpGet("updateuserroles"), Authorize, Permissions(Permissions.ADMIN)] - public async Task UpdateUserRoles() { + public async Task UpdateUserRoles() + { await _discordService.UpdateAllUsers(); return Ok(); } [HttpGet("{accountId}/onlineUserDetails"), Authorize, Permissions(Permissions.RECRUITER)] - public OnlineState GetOnlineUserDetails([FromRoute] string accountId) => _discordService.GetOnlineUserDetails(accountId); + public OnlineState GetOnlineUserDetails([FromRoute] string accountId) + { + return _discordService.GetOnlineUserDetails(accountId); + } } } diff --git a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs index b19fe420..ca1c61b7 100644 --- a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs +++ b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs @@ -16,8 +16,10 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; -namespace UKSF.Api.Discord.Services { - public interface IDiscordService { +namespace UKSF.Api.Discord.Services +{ + public interface IDiscordService + { Task ConnectDiscord(); OnlineState GetOnlineUserDetails(string accountId); Task SendMessageToEveryone(ulong channelId, string message); @@ -27,7 +29,8 @@ public interface IDiscordService { Task UpdateAccount(Account account, ulong discordId = 0); } - public class DiscordService : IDiscordService, IDisposable { + public class DiscordService : IDiscordService, IDisposable + { private static readonly string[] OWNER_REPLIES = { "Why thank you {0} owo", "Thank you {0}, you're too kind", "Thank you so much {0} uwu", "Aw shucks {0} you're embarrassing me" }; private static readonly string[] REPLIES = { "Why thank you {0}", "Thank you {0}, you're too kind", "Thank you so much {0}", "Aw shucks {0} you're embarrassing me" }; private static readonly string[] TRIGGERS = { "thank you", "thank", "best", "mvp", "love you", "appreciate you", "good" }; @@ -55,7 +58,8 @@ public DiscordService( IVariablesService variablesService, ILogger logger, IEventBus eventBus - ) { + ) + { _unitsContext = unitsContext; _ranksContext = ranksContext; _accountContext = accountContext; @@ -67,8 +71,10 @@ IEventBus eventBus _eventBus = eventBus; } - public async Task ConnectDiscord() { - if (_client != null) { + public async Task ConnectDiscord() + { + if (_client != null) + { _client.StopAsync().Wait(TimeSpan.FromSeconds(5)); _client = null; } @@ -82,8 +88,12 @@ public async Task ConnectDiscord() { await _client.StartAsync(); } - public async Task SendMessage(ulong channelId, string message) { - if (IsDiscordDisabled()) return; + public async Task SendMessage(ulong channelId, string message) + { + if (IsDiscordDisabled()) + { + return; + } await AssertOnline(); @@ -91,55 +101,85 @@ public async Task SendMessage(ulong channelId, string message) { await channel.SendMessageAsync(message); } - public async Task SendMessageToEveryone(ulong channelId, string message) { - if (IsDiscordDisabled()) return; + public async Task SendMessageToEveryone(ulong channelId, string message) + { + if (IsDiscordDisabled()) + { + return; + } await SendMessage(channelId, $"{_guild.EveryoneRole} {message}"); } - public async Task> GetRoles() { + public async Task> GetRoles() + { await AssertOnline(); return _roles; } - public async Task UpdateAllUsers() { - if (IsDiscordDisabled()) return; + public async Task UpdateAllUsers() + { + if (IsDiscordDisabled()) + { + return; + } await AssertOnline(); await Task.Run( - () => { - foreach (SocketGuildUser user in _guild.Users) { + () => + { + foreach (SocketGuildUser user in _guild.Users) + { Task unused = UpdateAccount(null, user.Id); } } ); } - public async Task UpdateAccount(Account account, ulong discordId = 0) { - if (IsDiscordDisabled()) return; + public async Task UpdateAccount(Account account, ulong discordId = 0) + { + if (IsDiscordDisabled()) + { + return; + } await AssertOnline(); - if (discordId == 0 && account != null && !string.IsNullOrEmpty(account.DiscordId)) { + if (discordId == 0 && account != null && !string.IsNullOrEmpty(account.DiscordId)) + { discordId = ulong.Parse(account.DiscordId); } - if (discordId != 0 && account == null) { + if (discordId != 0 && account == null) + { account = _accountContext.GetSingle(x => !string.IsNullOrEmpty(x.DiscordId) && x.DiscordId == discordId.ToString()); } - if (discordId == 0) return; - if (_variablesService.GetVariable("DID_U_BLACKLIST").AsArray().Contains(discordId.ToString())) return; + if (discordId == 0) + { + return; + } + + if (_variablesService.GetVariable("DID_U_BLACKLIST").AsArray().Contains(discordId.ToString())) + { + return; + } SocketGuildUser user = _guild.GetUser(discordId); - if (user == null) return; + if (user == null) + { + return; + } + await UpdateAccountRoles(user, account); await UpdateAccountNickname(user, account); } // TODO: Change to use signalr if events are available - public OnlineState GetOnlineUserDetails(string accountId) { + public OnlineState GetOnlineUserDetails(string accountId) + { Account account = _accountContext.GetSingle(accountId); - if (account?.DiscordId == null || !ulong.TryParse(account.DiscordId, out ulong discordId)) { + if (account?.DiscordId == null || !ulong.TryParse(account.DiscordId, out ulong discordId)) + { return null; } @@ -149,69 +189,89 @@ public OnlineState GetOnlineUserDetails(string accountId) { return new() { Online = online, Nickname = nickname }; } - public void Dispose() { + public void Dispose() + { _client?.StopAsync().Wait(TimeSpan.FromSeconds(5)); } - private bool IsDiscordDisabled() { + private bool IsDiscordDisabled() + { return !_variablesService.GetFeatureState("DISCORD"); } - private bool IsAccountOnline(ulong discordId) { + private bool IsAccountOnline(ulong discordId) + { return _guild.GetUser(discordId)?.Status == UserStatus.Online; } - private string GetAccountNickname(ulong discordId) { + private string GetAccountNickname(ulong discordId) + { SocketGuildUser user = _guild.GetUser(discordId); return GetUserNickname(user); } - private static string GetUserNickname(IGuildUser user) { - return user == null ? "" : string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname; + private static string GetUserNickname(IGuildUser user) + { + return user == null ? "" : + string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname; } - private async Task UpdateAccountRoles(SocketGuildUser user, Account account) { + private async Task UpdateAccountRoles(SocketGuildUser user, Account account) + { IReadOnlyCollection userRoles = user.Roles; HashSet allowedRoles = new(); - if (account != null) { + if (account != null) + { UpdateAccountRanks(account, allowedRoles); UpdateAccountUnits(account, allowedRoles); } string[] rolesBlacklist = _variablesService.GetVariable("DID_R_BLACKLIST").AsArray(); - foreach (SocketRole role in userRoles) { - if (!allowedRoles.Contains(role.Id.ToString()) && !rolesBlacklist.Contains(role.Id.ToString())) { + foreach (SocketRole role in userRoles) + { + if (!allowedRoles.Contains(role.Id.ToString()) && !rolesBlacklist.Contains(role.Id.ToString())) + { await user.RemoveRoleAsync(role); } } - foreach (string role in allowedRoles.Where(role => userRoles.All(x => x.Id.ToString() != role))) { - if (ulong.TryParse(role, out ulong roleId)) { + foreach (string role in allowedRoles.Where(role => userRoles.All(x => x.Id.ToString() != role))) + { + if (ulong.TryParse(role, out ulong roleId)) + { await user.AddRoleAsync(_roles.First(x => x.Id == roleId)); } } } - private async Task UpdateAccountNickname(IGuildUser user, Account account) { + private async Task UpdateAccountNickname(IGuildUser user, Account account) + { string name = _displayNameService.GetDisplayName(account); - if (user.Nickname != name) { - try { + if (user.Nickname != name) + { + try + { await user.ModifyAsync(x => x.Nickname = name); - } catch (Exception) { + } + catch (Exception) + { _logger.LogError($"Failed to update nickname for {(string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname)}. Must manually be changed to: {name}"); } } } - private void UpdateAccountRanks(Account account, ISet allowedRoles) { + private void UpdateAccountRanks(Account account, ISet allowedRoles) + { string rank = account.Rank; - foreach (Rank x in _ranksContext.Get().Where(x => rank == x.Name)) { + foreach (Rank x in _ranksContext.Get().Where(x => rank == x.Name)) + { allowedRoles.Add(x.DiscordRoleId); } } - private void UpdateAccountUnits(Account account, ISet allowedRoles) { + private void UpdateAccountUnits(Account account, ISet allowedRoles) + { Unit accountUnit = _unitsContext.GetSingle(x => x.Name == account.UnitAssignment); List accountUnits = _unitsContext.Get(x => x.Members.Contains(account.Id)).Where(x => !string.IsNullOrEmpty(x.DiscordRoleId)).ToList(); List accountUnitParents = _unitsService.GetParents(accountUnit).Where(x => !string.IsNullOrEmpty(x.DiscordRoleId)).ToList(); @@ -219,23 +279,28 @@ private void UpdateAccountUnits(Account account, ISet allowedRoles) { accountUnitParents.ForEach(x => allowedRoles.Add(x.DiscordRoleId)); } - private async Task AssertOnline() { - if (!_connected) { + private async Task AssertOnline() + { + if (!_connected) + { await ConnectDiscord(); - while (!_connected) { + while (!_connected) + { await Task.Delay(50); } } } - private Task OnClientOnReady() { + private Task OnClientOnReady() + { _guild = _client.GetGuild(_variablesService.GetVariable("DID_SERVER").AsUlong()); _roles = _guild.Roles; _connected = true; return Task.CompletedTask; } - private Task ClientOnDisconnected(Exception arg) { + private Task ClientOnDisconnected(Exception arg) + { _connected = false; _client.StopAsync().Wait(TimeSpan.FromSeconds(5)); _client = null; @@ -243,14 +308,16 @@ private Task ClientOnDisconnected(Exception arg) { return Task.CompletedTask; } - private void AddEventhandlers() { + private void AddEventhandlers() + { _client.MessageReceived += ClientOnMessageReceived; _client.UserJoined += ClientOnUserJoined; _client.GuildMemberUpdated += ClientOnGuildMemberUpdated; _client.ReactionAdded += ClientOnReactionAdded; _client.ReactionRemoved += ClientOnReactionRemoved; - _client.UserJoined += user => { + _client.UserJoined += user => + { string name = GetUserNickname(user); string associatedAccountMessage = GetAssociatedAccountMessageFromUserId(user.Id); _logger.LogDiscordEvent(DiscordUserEventType.JOINED, user.Id.ToString(), name, string.Empty, name, $"Joined, {associatedAccountMessage}"); @@ -258,40 +325,46 @@ private void AddEventhandlers() { return Task.CompletedTask; }; - _client.UserLeft += user => { + _client.UserLeft += user => + { string name = GetUserNickname(user); Account account = _accountContext.GetSingle(x => x.DiscordId == user.Id.ToString()); string associatedAccountMessage = GetAssociatedAccountMessage(account); _logger.LogDiscordEvent(DiscordUserEventType.LEFT, user.Id.ToString(), name, string.Empty, name, $"Left, {associatedAccountMessage}"); - _logger.LogInfo($"Discord user {name} ({user.Id}) left. Found account: {(account == null ? "No account" : _displayNameService.GetDisplayName(account))}"); - if (account != null) { + if (account != null) + { _eventBus.Send(new DiscordEventData(DiscordUserEventType.LEFT, account.Id)); } return Task.CompletedTask; }; - _client.UserBanned += async (user, _) => { + _client.UserBanned += async (user, _) => + { string associatedAccountMessage = GetAssociatedAccountMessageFromUserId(user.Id); ulong instigatorId = await GetBannedAuditLogInstigator(user.Id); string instigatorName = GetUserNickname(_guild.GetUser(instigatorId)); _logger.LogDiscordEvent(DiscordUserEventType.BANNED, instigatorId.ToString(), instigatorName, string.Empty, user.Username, $"Banned, {associatedAccountMessage}"); }; - _client.UserUnbanned += async (user, _) => { + _client.UserUnbanned += async (user, _) => + { string associatedAccountMessage = GetAssociatedAccountMessageFromUserId(user.Id); ulong instigatorId = await GetUnbannedAuditLogInstigator(user.Id); string instigatorName = GetUserNickname(_guild.GetUser(instigatorId)); _logger.LogDiscordEvent(DiscordUserEventType.UNBANNED, instigatorId.ToString(), instigatorName, string.Empty, user.Username, $"Unbanned, {associatedAccountMessage}"); }; - _client.MessagesBulkDeleted += async (cacheables, channel) => { + _client.MessagesBulkDeleted += async (cacheables, channel) => + { int irretrievableMessageCount = 0; List messages = new(); - foreach (Cacheable cacheable in cacheables) { + foreach (Cacheable cacheable in cacheables) + { DiscordDeletedMessageResult result = await GetDeletedMessageDetails(cacheable, channel); - switch (result.InstigatorId) { + switch (result.InstigatorId) + { case ulong.MaxValue: continue; case 0: irretrievableMessageCount++; @@ -302,21 +375,26 @@ private void AddEventhandlers() { } } - if (irretrievableMessageCount > 0) { + if (irretrievableMessageCount > 0) + { _logger.LogDiscordEvent(DiscordUserEventType.MESSAGE_DELETED, "0", "NO INSTIGATOR", channel.Name, string.Empty, $"{irretrievableMessageCount} irretrievable messages deleted"); } IEnumerable> groupedMessages = messages.GroupBy(x => x.Name); - foreach (IGrouping groupedMessage in groupedMessages) { - foreach (DiscordDeletedMessageResult result in groupedMessage) { + foreach (IGrouping groupedMessage in groupedMessages) + { + foreach (DiscordDeletedMessageResult result in groupedMessage) + { _logger.LogDiscordEvent(DiscordUserEventType.MESSAGE_DELETED, result.InstigatorId.ToString(), result.InstigatorName, channel.Name, result.Name, result.Message); } } }; - _client.MessageDeleted += async (cacheable, channel) => { + _client.MessageDeleted += async (cacheable, channel) => + { DiscordDeletedMessageResult result = await GetDeletedMessageDetails(cacheable, channel); - switch (result.InstigatorId) { + switch (result.InstigatorId) + { case ulong.MaxValue: return; case 0: _logger.LogDiscordEvent(DiscordUserEventType.MESSAGE_DELETED, "0", "NO INSTIGATOR", channel.Name, string.Empty, $"Irretrievable message {cacheable.Id} deleted"); @@ -328,111 +406,155 @@ private void AddEventhandlers() { }; } - private async Task ClientOnGuildMemberUpdated(SocketGuildUser oldUser, SocketGuildUser user) { - if (IsDiscordDisabled()) return; + private async Task ClientOnGuildMemberUpdated(SocketGuildUser oldUser, SocketGuildUser user) + { + if (IsDiscordDisabled()) + { + return; + } string oldRoles = oldUser.Roles.OrderBy(x => x.Id).Select(x => $"{x.Id}").Aggregate((x, y) => $"{x},{y}"); string newRoles = user.Roles.OrderBy(x => x.Id).Select(x => $"{x.Id}").Aggregate((x, y) => $"{x},{y}"); - if (oldRoles != newRoles || oldUser.Nickname != user.Nickname) { + if (oldRoles != newRoles || oldUser.Nickname != user.Nickname) + { await UpdateAccount(null, user.Id); } } - private async Task ClientOnUserJoined(SocketGuildUser user) { - if (IsDiscordDisabled()) return; + private async Task ClientOnUserJoined(SocketGuildUser user) + { + if (IsDiscordDisabled()) + { + return; + } await UpdateAccount(null, user.Id); } - private async Task ClientOnMessageReceived(SocketMessage message) { - if (IsDiscordDisabled()) return; + private async Task ClientOnMessageReceived(SocketMessage message) + { + if (IsDiscordDisabled()) + { + return; + } - if (MessageIsWeeklyEventsMessage(message)) { + if (MessageIsWeeklyEventsMessage(message)) + { await HandleWeeklyEventsMessageReacts(message); return; } - if (message.Content.Contains("bot", StringComparison.InvariantCultureIgnoreCase) || message.MentionedUsers.Any(x => x.IsBot)) { + if (message.Content.Contains("bot", StringComparison.InvariantCultureIgnoreCase) || message.MentionedUsers.Any(x => x.IsBot)) + { await HandleBotMessageResponse(message); } } - private static async Task HandleWeeklyEventsMessageReacts(IMessage incomingMessage) { - List emotes = new() { - Emote.Parse("<:Tuesday:732349730809708564>"), Emote.Parse("<:Thursday:732349755816149062>"), Emote.Parse("<:Friday:732349765060395029>"), Emote.Parse("<:Sunday:732349782541991957>") + private static async Task HandleWeeklyEventsMessageReacts(IMessage incomingMessage) + { + List emotes = new() + { + Emote.Parse("<:Tuesday:732349730809708564>"), + Emote.Parse("<:Thursday:732349755816149062>"), + Emote.Parse("<:Friday:732349765060395029>"), + Emote.Parse("<:Sunday:732349782541991957>") }; - foreach (Emote emote in emotes) { + foreach (Emote emote in emotes) + { await incomingMessage.AddReactionAsync(emote); } } - private async Task HandleBotMessageResponse(SocketMessage incomingMessage) { - if (TRIGGERS.Any(x => incomingMessage.Content.Contains(x, StringComparison.InvariantCultureIgnoreCase))) { + private async Task HandleBotMessageResponse(SocketMessage incomingMessage) + { + if (TRIGGERS.Any(x => incomingMessage.Content.Contains(x, StringComparison.InvariantCultureIgnoreCase))) + { bool owner = incomingMessage.Author.Id == _variablesService.GetVariable("DID_U_OWNER").AsUlong(); string message = owner ? OWNER_REPLIES[new Random().Next(0, OWNER_REPLIES.Length)] : REPLIES[new Random().Next(0, REPLIES.Length)]; string[] parts = _guild.GetUser(incomingMessage.Author.Id).Nickname.Split('.'); - string nickname = owner ? "Daddy" : parts.Length > 1 ? parts[1] : parts[0]; + string nickname = owner ? "Daddy" : + parts.Length > 1 ? parts[1] : parts[0]; await SendMessage(incomingMessage.Channel.Id, string.Format(message, nickname)); } } - private async Task ClientOnReactionAdded(Cacheable cacheable, ISocketMessageChannel channel, SocketReaction reaction) { - if (IsDiscordDisabled()) return; + private async Task ClientOnReactionAdded(Cacheable cacheable, ISocketMessageChannel channel, SocketReaction reaction) + { + if (IsDiscordDisabled()) + { + return; + } IUserMessage message = await cacheable.GetOrDownloadAsync(); - if (!MessageIsWeeklyEventsMessage(message)) { + if (!MessageIsWeeklyEventsMessage(message)) + { return; } - if (!message.Reactions.TryGetValue(reaction.Emote, out ReactionMetadata metadata)) { + if (!message.Reactions.TryGetValue(reaction.Emote, out ReactionMetadata metadata)) + { return; } - if (!metadata.IsMe) { + if (!metadata.IsMe) + { return; } - if (metadata.ReactionCount > 1) { + if (metadata.ReactionCount > 1) + { await message.RemoveReactionAsync(reaction.Emote, _client.CurrentUser); } } - private async Task ClientOnReactionRemoved(Cacheable cacheable, ISocketMessageChannel channel, SocketReaction reaction) { - if (IsDiscordDisabled()) return; + private async Task ClientOnReactionRemoved(Cacheable cacheable, ISocketMessageChannel channel, SocketReaction reaction) + { + if (IsDiscordDisabled()) + { + return; + } IUserMessage message = await cacheable.GetOrDownloadAsync(); - if (!MessageIsWeeklyEventsMessage(message)) { + if (!MessageIsWeeklyEventsMessage(message)) + { return; } - if (!message.Reactions.TryGetValue(reaction.Emote, out ReactionMetadata _)) { + if (!message.Reactions.TryGetValue(reaction.Emote, out ReactionMetadata _)) + { await message.AddReactionAsync(reaction.Emote); } } - private bool MessageIsWeeklyEventsMessage(IMessage message) { + private bool MessageIsWeeklyEventsMessage(IMessage message) + { return message != null && message.Content.Contains(_variablesService.GetVariable("DISCORD_FILTER_WEEKLY_EVENTS").AsString(), StringComparison.InvariantCultureIgnoreCase); } - private string GetAssociatedAccountMessageFromUserId(ulong userId) { + private string GetAssociatedAccountMessageFromUserId(ulong userId) + { Account account = _accountContext.GetSingle(x => x.DiscordId == userId.ToString()); return GetAssociatedAccountMessage(account); } - private string GetAssociatedAccountMessage(Account account) { + private string GetAssociatedAccountMessage(Account account) + { return account == null ? "with no associated account" : $"with associated account ({account.Id}, {_displayNameService.GetDisplayName(account)})"; } - private async Task GetDeletedMessageDetails(Cacheable cacheable, ISocketMessageChannel channel) { + private async Task GetDeletedMessageDetails(Cacheable cacheable, ISocketMessageChannel channel) + { IMessage message = await cacheable.GetOrDownloadAsync(); - if (message == null) { + if (message == null) + { return new(0, null, null, null); } ulong userId = message.Author.Id; ulong instigatorId = await GetMessageDeletedAuditLogInstigator(channel.Id, userId); - if (instigatorId == 0 || instigatorId == userId) { + if (instigatorId == 0 || instigatorId == userId) + { return new(ulong.MaxValue, null, null, null); } @@ -443,50 +565,72 @@ private async Task GetDeletedMessageDetails(Cacheab return new(instigatorId, instigatorName, name, messageString); } - private async Task GetMessageDeletedAuditLogInstigator(ulong channelId, ulong authorId) { + private async Task GetMessageDeletedAuditLogInstigator(ulong channelId, ulong authorId) + { IAsyncEnumerator> auditLogsEnumerator = _guild.GetAuditLogsAsync(10, RequestOptions.Default, null, null, ActionType.MessageDeleted).GetAsyncEnumerator(); - try { - while (await auditLogsEnumerator.MoveNextAsync()) { + try + { + while (await auditLogsEnumerator.MoveNextAsync()) + { IReadOnlyCollection auditLogs = auditLogsEnumerator.Current; var auditUser = auditLogs.Where(x => x.Data is MessageDeleteAuditLogData) .Select(x => new { Data = x.Data as MessageDeleteAuditLogData, x.User }) - .FirstOrDefault(x => x.Data.ChannelId == channelId && x.Data.AuthorId == authorId); - if (auditUser != null) { + .FirstOrDefault(x => x.Data.ChannelId == channelId && x.Data.Target.Id == authorId); + if (auditUser != null) + { return auditUser.User.Id; } } - } finally { + } + finally + { await auditLogsEnumerator.DisposeAsync(); } return 0; } - private async Task GetBannedAuditLogInstigator(ulong userId) { + private async Task GetBannedAuditLogInstigator(ulong userId) + { IAsyncEnumerator> auditLogsEnumerator = _guild.GetAuditLogsAsync(10, RequestOptions.Default, null, null, ActionType.Ban).GetAsyncEnumerator(); - try { - while (await auditLogsEnumerator.MoveNextAsync()) { + try + { + while (await auditLogsEnumerator.MoveNextAsync()) + { IReadOnlyCollection auditLogs = auditLogsEnumerator.Current; var auditUser = auditLogs.Where(x => x.Data is BanAuditLogData).Select(x => new { Data = x.Data as BanAuditLogData, x.User }).FirstOrDefault(x => x.Data.Target.Id == userId); - if (auditUser != null) return auditUser.User.Id; + if (auditUser != null) + { + return auditUser.User.Id; + } } - } finally { + } + finally + { await auditLogsEnumerator.DisposeAsync(); } return 0; } - private async Task GetUnbannedAuditLogInstigator(ulong userId) { + private async Task GetUnbannedAuditLogInstigator(ulong userId) + { IAsyncEnumerator> auditLogsEnumerator = _guild.GetAuditLogsAsync(10, RequestOptions.Default, null, null, ActionType.Unban).GetAsyncEnumerator(); - try { - while (await auditLogsEnumerator.MoveNextAsync()) { + try + { + while (await auditLogsEnumerator.MoveNextAsync()) + { IReadOnlyCollection auditLogs = auditLogsEnumerator.Current; var auditUser = auditLogs.Where(x => x.Data is UnbanAuditLogData).Select(x => new { Data = x.Data as UnbanAuditLogData, x.User }).FirstOrDefault(x => x.Data.Target.Id == userId); - if (auditUser != null) return auditUser.User.Id; + if (auditUser != null) + { + return auditUser.User.Id; + } } - } finally { + } + finally + { await auditLogsEnumerator.DisposeAsync(); } diff --git a/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj b/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj index 1490be48..a2c612d8 100644 --- a/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj +++ b/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj @@ -1,7 +1,7 @@ - netcoreapp5.0 + net5.0 Library UKSF.Api.Discord @@ -12,7 +12,7 @@ - + diff --git a/UKSF.Api.Integrations.Instagram/ApiIntegrationInstagramExtensions.cs b/UKSF.Api.Integrations.Instagram/ApiIntegrationInstagramExtensions.cs index 57734357..a7eb10dd 100644 --- a/UKSF.Api.Integrations.Instagram/ApiIntegrationInstagramExtensions.cs +++ b/UKSF.Api.Integrations.Instagram/ApiIntegrationInstagramExtensions.cs @@ -2,20 +2,28 @@ using UKSF.Api.Integrations.Instagram.ScheduledActions; using UKSF.Api.Integrations.Instagram.Services; -namespace UKSF.Api.Integrations.Instagram { - public static class ApiIntegrationInstagramExtensions { - public static IServiceCollection AddUksfIntegrationInstagram(this IServiceCollection services) => - services.AddContexts() +namespace UKSF.Api.Integrations.Instagram +{ + public static class ApiIntegrationInstagramExtensions + { + public static IServiceCollection AddUksfIntegrationInstagram(this IServiceCollection services) + { + return services.AddContexts().AddEventHandlers().AddServices().AddTransient().AddTransient(); + } - .AddEventHandlers() - .AddServices() - .AddTransient() - .AddTransient(); + private static IServiceCollection AddContexts(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddContexts(this IServiceCollection services) => services; + private static IServiceCollection AddEventHandlers(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; - - private static IServiceCollection AddServices(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddServices(this IServiceCollection services) + { + return services.AddSingleton(); + } } } diff --git a/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs b/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs index d738fe9b..08824d9e 100644 --- a/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs +++ b/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs @@ -6,22 +6,29 @@ using UKSF.Api.Integrations.Instagram.Services; using UKSF.Api.Shared; -namespace UKSF.Api.Integrations.Instagram.Controllers { +namespace UKSF.Api.Integrations.Instagram.Controllers +{ [Route("[controller]")] - public class InstagramController : Controller { - private readonly IInstagramService _instagramService; + public class InstagramController : Controller + { private readonly IActionInstagramToken _actionInstagramToken; + private readonly IInstagramService _instagramService; - public InstagramController(IInstagramService instagramService, IActionInstagramToken actionInstagramToken) { + public InstagramController(IInstagramService instagramService, IActionInstagramToken actionInstagramToken) + { _instagramService = instagramService; _actionInstagramToken = actionInstagramToken; } [HttpGet] - public IEnumerable GetImages() => _instagramService.GetImages(); + public IEnumerable GetImages() + { + return _instagramService.GetImages(); + } [HttpGet("refreshToken"), Permissions(Permissions.ADMIN)] - public async Task RefreshToken() { + public async Task RefreshToken() + { await _actionInstagramToken.Reset(); } } diff --git a/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs index 06522fff..f19f7353 100644 --- a/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs +++ b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramImages.cs @@ -5,10 +5,12 @@ using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Integrations.Instagram.ScheduledActions { +namespace UKSF.Api.Integrations.Instagram.ScheduledActions +{ public interface IActionInstagramImages : ISelfCreatingScheduledAction { } - public class ActionInstagramImages : IActionInstagramImages { + public class ActionInstagramImages : IActionInstagramImages + { private const string ACTION_NAME = nameof(ActionInstagramImages); private readonly IClock _clock; @@ -16,7 +18,8 @@ public class ActionInstagramImages : IActionInstagramImages { private readonly ISchedulerContext _schedulerContext; private readonly ISchedulerService _schedulerService; - public ActionInstagramImages(ISchedulerContext schedulerContext, IInstagramService instagramService, ISchedulerService schedulerService, IClock clock) { + public ActionInstagramImages(ISchedulerContext schedulerContext, IInstagramService instagramService, ISchedulerService schedulerService, IClock clock) + { _schedulerContext = schedulerContext; _instagramService = instagramService; _schedulerService = schedulerService; @@ -25,16 +28,24 @@ public ActionInstagramImages(ISchedulerContext schedulerContext, IInstagramServi public string Name => ACTION_NAME; - public Task Run(params object[] parameters) => _instagramService.CacheInstagramImages(); + public Task Run(params object[] parameters) + { + return _instagramService.CacheInstagramImages(); + } - public async Task CreateSelf() { - if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { + public async Task CreateSelf() + { + if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) + { await _schedulerService.CreateScheduledJob(_clock.Today(), TimeSpan.FromMinutes(15), ACTION_NAME); } await Run(); } - public Task Reset() => Task.CompletedTask; + public Task Reset() + { + return Task.CompletedTask; + } } } diff --git a/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs index a134504b..c12ce49b 100644 --- a/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs +++ b/UKSF.Api.Integrations.Instagram/ScheduledActions/ActionInstagramToken.cs @@ -6,10 +6,12 @@ using UKSF.Api.Shared.Models; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Integrations.Instagram.ScheduledActions { +namespace UKSF.Api.Integrations.Instagram.ScheduledActions +{ public interface IActionInstagramToken : ISelfCreatingScheduledAction { } - public class ActionInstagramToken : IActionInstagramToken { + public class ActionInstagramToken : IActionInstagramToken + { private const string ACTION_NAME = nameof(ActionInstagramToken); private readonly IClock _clock; @@ -17,7 +19,8 @@ public class ActionInstagramToken : IActionInstagramToken { private readonly ISchedulerContext _schedulerContext; private readonly ISchedulerService _schedulerService; - public ActionInstagramToken(ISchedulerContext schedulerContext, IInstagramService instagramService, ISchedulerService schedulerService, IClock clock) { + public ActionInstagramToken(ISchedulerContext schedulerContext, IInstagramService instagramService, ISchedulerService schedulerService, IClock clock) + { _schedulerContext = schedulerContext; _instagramService = instagramService; _schedulerService = schedulerService; @@ -26,15 +29,21 @@ public ActionInstagramToken(ISchedulerContext schedulerContext, IInstagramServic public string Name => ACTION_NAME; - public Task Run(params object[] parameters) => _instagramService.RefreshAccessToken(); + public Task Run(params object[] parameters) + { + return _instagramService.RefreshAccessToken(); + } - public async Task CreateSelf() { - if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { + public async Task CreateSelf() + { + if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) + { await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(45), TimeSpan.FromDays(45), ACTION_NAME); } } - public async Task Reset() { + public async Task Reset() + { ScheduledJob job = _schedulerContext.GetSingle(x => x.Action == ACTION_NAME); await _schedulerContext.Delete(job.Id); diff --git a/UKSF.Api.Integrations.Instagram/Services/InstagramService.cs b/UKSF.Api.Integrations.Instagram/Services/InstagramService.cs index b601b0d1..8fd93021 100644 --- a/UKSF.Api.Integrations.Instagram/Services/InstagramService.cs +++ b/UKSF.Api.Integrations.Instagram/Services/InstagramService.cs @@ -11,32 +11,39 @@ using UKSF.Api.Integrations.Instagram.Models; using UKSF.Api.Shared.Events; -namespace UKSF.Api.Integrations.Instagram.Services { - public interface IInstagramService { +namespace UKSF.Api.Integrations.Instagram.Services +{ + public interface IInstagramService + { Task RefreshAccessToken(); Task CacheInstagramImages(); IEnumerable GetImages(); } - public class InstagramService : IInstagramService { + public class InstagramService : IInstagramService + { private readonly ILogger _logger; private readonly IVariablesContext _variablesContext; private readonly IVariablesService _variablesService; private List _images = new(); - public InstagramService(IVariablesContext variablesContext, IVariablesService variablesService, ILogger logger) { + public InstagramService(IVariablesContext variablesContext, IVariablesService variablesService, ILogger logger) + { _variablesContext = variablesContext; _variablesService = variablesService; _logger = logger; } - public async Task RefreshAccessToken() { - try { + public async Task RefreshAccessToken() + { + try + { string accessToken = _variablesService.GetVariable("INSTAGRAM_ACCESS_TOKEN").AsString(); using HttpClient client = new(); HttpResponseMessage response = await client.GetAsync($"https://graph.instagram.com/refresh_access_token?access_token={accessToken}&grant_type=ig_refresh_token"); - if (!response.IsSuccessStatusCode) { + if (!response.IsSuccessStatusCode) + { _logger.LogError($"Failed to get instagram access token, error: {response}"); return; } @@ -45,26 +52,32 @@ public async Task RefreshAccessToken() { _logger.LogInfo($"Instagram response: {contentString}"); string newAccessToken = JObject.Parse(contentString)["access_token"]?.ToString(); - if (string.IsNullOrEmpty(newAccessToken)) { + if (string.IsNullOrEmpty(newAccessToken)) + { _logger.LogError($"Failed to get instagram access token from response: {contentString}"); return; } await _variablesContext.Update("INSTAGRAM_ACCESS_TOKEN", newAccessToken); _logger.LogInfo("Updated Instagram access token"); - } catch (Exception exception) { + } + catch (Exception exception) + { _logger.LogError(exception); } } - public async Task CacheInstagramImages() { - try { + public async Task CacheInstagramImages() + { + try + { string userId = _variablesService.GetVariable("INSTAGRAM_USER_ID").AsString(); string accessToken = _variablesService.GetVariable("INSTAGRAM_ACCESS_TOKEN").AsString(); using HttpClient client = new(); HttpResponseMessage response = await client.GetAsync($"https://graph.instagram.com/{userId}/media?access_token={accessToken}&fields=id,timestamp,media_type,media_url,permalink"); - if (!response.IsSuccessStatusCode) { + if (!response.IsSuccessStatusCode) + { _logger.LogError($"Failed to get instagram images, error: {response}"); return; } @@ -74,12 +87,14 @@ public async Task CacheInstagramImages() { List allMedia = JsonConvert.DeserializeObject>(contentObject["data"]?.ToString() ?? ""); allMedia = allMedia.OrderByDescending(x => x.Timestamp).ToList(); - if (allMedia.Count == 0) { + if (allMedia.Count == 0) + { _logger.LogWarning($"Instagram response contains no images: {contentObject}"); return; } - if (_images.Count > 0 && allMedia.First().Id == _images.First().Id) { + if (_images.Count > 0 && allMedia.First().Id == _images.First().Id) + { return; } @@ -94,17 +109,24 @@ public async Task CacheInstagramImages() { _images = newImages.Take(12).ToList(); - foreach (InstagramImage instagramImage in _images) { + foreach (InstagramImage instagramImage in _images) + { instagramImage.Base64 = await GetBase64(instagramImage); } - } catch (Exception exception) { + } + catch (Exception exception) + { _logger.LogError(exception); } } - public IEnumerable GetImages() => _images; + public IEnumerable GetImages() + { + return _images; + } - private static async Task GetBase64(InstagramImage image) { + private static async Task GetBase64(InstagramImage image) + { using HttpClient client = new(); byte[] bytes = await client.GetByteArrayAsync(image.MediaUrl); return "data:image/jpeg;base64," + Convert.ToBase64String(bytes); diff --git a/UKSF.Api.Integrations.Instagram/UKSF.Api.Integrations.Instagram.csproj b/UKSF.Api.Integrations.Instagram/UKSF.Api.Integrations.Instagram.csproj index 0fb77d50..4e14a128 100644 --- a/UKSF.Api.Integrations.Instagram/UKSF.Api.Integrations.Instagram.csproj +++ b/UKSF.Api.Integrations.Instagram/UKSF.Api.Integrations.Instagram.csproj @@ -1,12 +1,12 @@ - netcoreapp5.0 + net5.0 Library - + diff --git a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs index 5bc640c2..0094e553 100644 --- a/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs +++ b/UKSF.Api.Integrations.Teamspeak/ApiIntegrationTeamspeakExtensions.cs @@ -6,24 +6,35 @@ using UKSF.Api.Teamspeak.Services; using UKSF.Api.Teamspeak.Signalr.Hubs; -namespace UKSF.Api.Teamspeak { - public static class ApiIntegrationTeamspeakExtensions { - public static IServiceCollection AddUksfIntegrationTeamspeak(this IServiceCollection services) => - services.AddContexts().AddEventHandlers().AddServices().AddTransient(); +namespace UKSF.Api.Teamspeak +{ + public static class ApiIntegrationTeamspeakExtensions + { + public static IServiceCollection AddUksfIntegrationTeamspeak(this IServiceCollection services) + { + return services.AddContexts().AddEventHandlers().AddServices().AddTransient(); + } - private static IServiceCollection AddContexts(this IServiceCollection services) => services; + private static IServiceCollection AddContexts(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => - services.AddSingleton() - .AddSingleton(); + private static IServiceCollection AddEventHandlers(this IServiceCollection services) + { + return services.AddSingleton().AddSingleton(); + } - private static IServiceCollection AddServices(this IServiceCollection services) => - services.AddSingleton() - .AddTransient() - .AddTransient() - .AddTransient(); + private static IServiceCollection AddServices(this IServiceCollection services) + { + return services.AddSingleton() + .AddTransient() + .AddTransient() + .AddTransient(); + } - public static void AddUksfIntegrationTeamspeakSignalr(this IEndpointRouteBuilder builder) { + public static void AddUksfIntegrationTeamspeakSignalr(this IEndpointRouteBuilder builder) + { builder.MapHub($"/hub/{TeamspeakHub.END_POINT}").RequireHost("localhost"); builder.MapHub($"/hub/{TeamspeakClientsHub.END_POINT}"); } diff --git a/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs b/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs index 04f7c357..086e822d 100644 --- a/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs +++ b/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs @@ -7,35 +7,49 @@ using UKSF.Api.Shared; using UKSF.Api.Teamspeak.Models; -namespace UKSF.Api.Teamspeak.Controllers { +namespace UKSF.Api.Teamspeak.Controllers +{ [Route("[controller]"), Permissions(Permissions.MEMBER)] - public class OperationsController : Controller { + public class OperationsController : Controller + { private readonly IMongoDatabase _database; - public OperationsController(IMongoDatabase database) => _database = database; + public OperationsController(IMongoDatabase database) + { + _database = database; + } [HttpGet, Authorize] - public IActionResult Get() { + public IActionResult Get() + { List tsServerSnapshots = _database.GetCollection("teamspeakSnapshots").Find(x => x.Timestamp > DateTime.Now.AddDays(-7)).ToList(); var acreData = new { labels = GetLabels(), datasets = GetDataSets(tsServerSnapshots, true) }; var data = new { labels = GetLabels(), datasets = GetDataSets(tsServerSnapshots, false) }; return Ok(new { acreData, data }); } - private static int[] GetData(IReadOnlyCollection serverSnapshots, DateTime day, bool acre) { + private static int[] GetData(IReadOnlyCollection serverSnapshots, DateTime day, bool acre) + { List dataset = new(); - for (int i = 0; i < 48; i++) { + for (int i = 0; i < 48; i++) + { DateTime startdate = DateTime.Today.AddMinutes(30 * i); DateTime enddate = DateTime.Today.AddMinutes(30 * (i + 1)); - try { + try + { TeamspeakServerSnapshot serverSnapshot = serverSnapshots.FirstOrDefault(x => x.Timestamp.TimeOfDay > startdate.TimeOfDay && x.Timestamp.TimeOfDay < enddate.TimeOfDay && x.Timestamp.Date == day); - if (serverSnapshot != null) { + if (serverSnapshot != null) + { dataset.Add(acre ? serverSnapshot.Users.Where(x => x.ChannelName == "ACRE").ToArray().Length : serverSnapshot.Users.Count); - } else { + } + else + { dataset.Add(0); } - } catch (Exception) { + } + catch (Exception) + { dataset.Add(0); } } @@ -43,10 +57,12 @@ private static int[] GetData(IReadOnlyCollection server return dataset.ToArray(); } - private static List GetLabels() { + private static List GetLabels() + { List labels = new(); - for (int i = 0; i < 48; i++) { + for (int i = 0; i < 48; i++) + { DateTime startdate = DateTime.Today.AddMinutes(30 * i); DateTime enddate = DateTime.Today.AddMinutes(30 * (i + 1)); labels.Add(startdate.TimeOfDay + " - " + enddate.TimeOfDay); @@ -55,13 +71,16 @@ private static List GetLabels() { return labels; } - private static List GetDataSets(IReadOnlyCollection tsServerSnapshots, bool acre) { + private static List GetDataSets(IReadOnlyCollection tsServerSnapshots, bool acre) + { List datasets = new(); string[] colors = { "#4bc0c0", "#3992e6", "#a539e6", "#42e639", "#aae639", "#e6d239", "#e63939" }; - for (int i = 0; i < 7; i++) { + for (int i = 0; i < 7; i++) + { datasets.Add( - new { + new + { label = $"{DateTime.Now.AddDays(-i).DayOfWeek} - {DateTime.Now.AddDays(-i).ToShortDateString()}", data = GetData(tsServerSnapshots, DateTime.Now.AddDays(-i).Date, acre), fill = true, diff --git a/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs b/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs index d193d52e..dd0fedbb 100644 --- a/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs +++ b/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs @@ -12,9 +12,11 @@ using UKSF.Api.Teamspeak.Models; using UKSF.Api.Teamspeak.Services; -namespace UKSF.Api.Teamspeak.Controllers { +namespace UKSF.Api.Teamspeak.Controllers +{ [Route("[controller]")] - public class TeamspeakController : Controller { + public class TeamspeakController : Controller + { private readonly IAccountContext _accountContext; private readonly IDisplayNameService _displayNameService; private readonly IRanksService _ranksService; @@ -29,7 +31,8 @@ public TeamspeakController( IUnitsService unitsService, IRecruitmentService recruitmentService, IDisplayNameService displayNameService - ) { + ) + { _accountContext = accountContext; _teamspeakService = teamspeakService; _ranksService = ranksService; @@ -39,22 +42,28 @@ IDisplayNameService displayNameService } [HttpGet("online"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER, Permissions.DISCHARGED)] - public IEnumerable GetOnlineClients() => _teamspeakService.GetFormattedClients(); + public IEnumerable GetOnlineClients() + { + return _teamspeakService.GetFormattedClients(); + } [HttpGet("shutdown"), Authorize, Permissions(Permissions.ADMIN)] - public async Task Shutdown() { + public async Task Shutdown() + { await _teamspeakService.Shutdown(); await Task.Delay(TimeSpan.FromSeconds(3)); return Ok(); } [HttpGet("onlineAccounts")] - public IActionResult GetOnlineAccounts() { + public IActionResult GetOnlineAccounts() + { IEnumerable teamnspeakClients = _teamspeakService.GetOnlineTeamspeakClients(); IEnumerable allAccounts = _accountContext.Get(); var clients = teamnspeakClients.Where(x => x != null) .Select( - x => new { + x => new + { account = allAccounts.FirstOrDefault(y => y.TeamspeakIdentities != null && y.TeamspeakIdentities.Any(z => z.Equals(x.ClientDbId))), client = x } ) @@ -69,17 +78,24 @@ public IActionResult GetOnlineAccounts() { List recruiters = new(); List members = new(); List guests = new(); - foreach (var onlineClient in clientAccounts) { - if (commandAccounts.Contains(onlineClient.account.Id)) { + foreach (var onlineClient in clientAccounts) + { + if (commandAccounts.Contains(onlineClient.account.Id)) + { commanders.Add(new { displayName = _displayNameService.GetDisplayName(onlineClient.account) }); - } else if (_recruitmentService.IsRecruiter(onlineClient.account)) { + } + else if (_recruitmentService.IsRecruiter(onlineClient.account)) + { recruiters.Add(new { displayName = _displayNameService.GetDisplayName(onlineClient.account) }); - } else { + } + else + { members.Add(new { displayName = _displayNameService.GetDisplayName(onlineClient.account) }); } } - foreach (var client in clients.Where(x => x.account == null || x.account.MembershipState != MembershipState.MEMBER)) { + foreach (var client in clients.Where(x => x.account == null || x.account.MembershipState != MembershipState.MEMBER)) + { guests.Add(new { displayName = client.client.ClientName }); } @@ -87,6 +103,9 @@ public IActionResult GetOnlineAccounts() { } [HttpGet("{accountId}/onlineUserDetails"), Authorize, Permissions(Permissions.RECRUITER)] - public OnlineState GetOnlineUserDetails([FromRoute] string accountId) => _teamspeakService.GetOnlineUserDetails(accountId); + public OnlineState GetOnlineUserDetails([FromRoute] string accountId) + { + return _teamspeakService.GetOnlineUserDetails(accountId); + } } } diff --git a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakServerEventHandler.cs b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakServerEventHandler.cs index 4025050c..987a1c95 100644 --- a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakServerEventHandler.cs +++ b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakServerEventHandler.cs @@ -2,7 +2,6 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using System.Threading; using System.Threading.Tasks; using Newtonsoft.Json.Linq; using UKSF.Api.Base.Events; @@ -15,10 +14,12 @@ using UKSF.Api.Teamspeak.Models; using UKSF.Api.Teamspeak.Services; -namespace UKSF.Api.Teamspeak.EventHandlers { +namespace UKSF.Api.Teamspeak.EventHandlers +{ public interface ITeamspeakServerEventHandler : IEventHandler { } - public class TeamspeakServerEventHandler : ITeamspeakServerEventHandler { + public class TeamspeakServerEventHandler : ITeamspeakServerEventHandler + { private readonly IAccountContext _accountContext; private readonly IEventBus _eventBus; private readonly ILogger _logger; @@ -26,7 +27,8 @@ public class TeamspeakServerEventHandler : ITeamspeakServerEventHandler { private readonly ITeamspeakGroupService _teamspeakGroupService; private readonly ITeamspeakService _teamspeakService; - public TeamspeakServerEventHandler(IAccountContext accountContext, IEventBus eventBus, ITeamspeakService teamspeakService, ITeamspeakGroupService teamspeakGroupService, ILogger logger) { + public TeamspeakServerEventHandler(IAccountContext accountContext, IEventBus eventBus, ITeamspeakService teamspeakService, ITeamspeakGroupService teamspeakGroupService, ILogger logger) + { _accountContext = accountContext; _eventBus = eventBus; _teamspeakService = teamspeakService; @@ -34,12 +36,15 @@ public TeamspeakServerEventHandler(IAccountContext accountContext, IEventBus eve _logger = logger; } - public void Init() { + public void Init() + { _eventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, _logger.LogError); } - private async Task HandleEvent(EventModel eventModel, SignalrEventData signalrEventData) { - switch (signalrEventData.Procedure) { + private async Task HandleEvent(EventModel eventModel, SignalrEventData signalrEventData) + { + switch (signalrEventData.Procedure) + { case TeamspeakEventType.CLIENTS: await UpdateClients(signalrEventData.Args.ToString()); break; @@ -51,37 +56,44 @@ private async Task HandleEvent(EventModel eventModel, SignalrEventData signalrEv } } - private async Task UpdateClients(string args) { + private async Task UpdateClients(string args) + { await Console.Out.WriteLineAsync(args); JArray clientsArray = JArray.Parse(args); - if (clientsArray.Count == 0) return; + if (clientsArray.Count == 0) + { + return; + } HashSet clients = clientsArray.ToObject>(); await Console.Out.WriteLineAsync("Updating online clients"); await _teamspeakService.UpdateClients(clients); } - private async Task UpdateClientServerGroups(string args) { + private async Task UpdateClientServerGroups(string args) + { JObject updateObject = JObject.Parse(args); double clientDbid = double.Parse(updateObject["clientDbid"].ToString()); double serverGroupId = double.Parse(updateObject["serverGroupId"].ToString()); await Console.Out.WriteLineAsync($"Server group for {clientDbid}: {serverGroupId}"); - TeamspeakServerGroupUpdate update = _serverGroupUpdates.GetOrAdd(clientDbid, _ => new TeamspeakServerGroupUpdate()); + TeamspeakServerGroupUpdate update = _serverGroupUpdates.GetOrAdd(clientDbid, _ => new()); update.ServerGroups.Add(serverGroupId); update.CancellationTokenSource?.Cancel(); - update.CancellationTokenSource = new CancellationTokenSource(); + update.CancellationTokenSource = new(); Task unused = TaskUtilities.DelayWithCallback( TimeSpan.FromMilliseconds(500), update.CancellationTokenSource.Token, - async () => { + async () => + { update.CancellationTokenSource.Cancel(); await ProcessAccountData(clientDbid, update.ServerGroups); } ); } - private async Task ProcessAccountData(double clientDbId, ICollection serverGroups) { + private async Task ProcessAccountData(double clientDbId, ICollection serverGroups) + { await Console.Out.WriteLineAsync($"Processing server groups for {clientDbId}"); Account account = _accountContext.GetSingle(x => x.TeamspeakIdentities != null && x.TeamspeakIdentities.Any(y => y.Equals(clientDbId))); Task unused = _teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); diff --git a/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs b/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs index a139637d..d8388023 100644 --- a/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs +++ b/UKSF.Api.Integrations.Teamspeak/ScheduledActions/ActionTeamspeakSnapshot.cs @@ -6,10 +6,12 @@ using UKSF.Api.Shared.Services; using UKSF.Api.Teamspeak.Services; -namespace UKSF.Api.Teamspeak.ScheduledActions { +namespace UKSF.Api.Teamspeak.ScheduledActions +{ public interface IActionTeamspeakSnapshot : ISelfCreatingScheduledAction { } - public class ActionTeamspeakSnapshot : IActionTeamspeakSnapshot { + public class ActionTeamspeakSnapshot : IActionTeamspeakSnapshot + { private const string ACTION_NAME = nameof(ActionTeamspeakSnapshot); private readonly IClock _clock; @@ -18,7 +20,8 @@ public class ActionTeamspeakSnapshot : IActionTeamspeakSnapshot { private readonly ISchedulerService _schedulerService; private readonly ITeamspeakService _teamspeakService; - public ActionTeamspeakSnapshot(ISchedulerContext schedulerContext, ITeamspeakService teamspeakService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + public ActionTeamspeakSnapshot(ISchedulerContext schedulerContext, ITeamspeakService teamspeakService, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) + { _schedulerContext = schedulerContext; _teamspeakService = teamspeakService; _schedulerService = schedulerService; @@ -28,16 +31,27 @@ public ActionTeamspeakSnapshot(ISchedulerContext schedulerContext, ITeamspeakSer public string Name => ACTION_NAME; - public Task Run(params object[] parameters) => _teamspeakService.StoreTeamspeakServerSnapshot(); + public Task Run(params object[] parameters) + { + return _teamspeakService.StoreTeamspeakServerSnapshot(); + } - public async Task CreateSelf() { - if (_currentEnvironment.IsDevelopment()) return; + public async Task CreateSelf() + { + if (_currentEnvironment.IsDevelopment()) + { + return; + } - if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { + if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) + { await _schedulerService.CreateScheduledJob(_clock.Today().AddMinutes(5), TimeSpan.FromMinutes(5), ACTION_NAME); } } - public Task Reset() => Task.CompletedTask; + public Task Reset() + { + return Task.CompletedTask; + } } } diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs index 50bd6db9..2fd7740f 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakManagerService.cs @@ -11,35 +11,47 @@ using UKSF.Api.Teamspeak.Signalr.Clients; using UKSF.Api.Teamspeak.Signalr.Hubs; -namespace UKSF.Api.Teamspeak.Services { - public interface ITeamspeakManagerService { +namespace UKSF.Api.Teamspeak.Services +{ + public interface ITeamspeakManagerService + { void Start(); void Stop(); Task SendGroupProcedure(TeamspeakProcedureType procedure, TeamspeakGroupProcedure groupProcedure); Task SendProcedure(TeamspeakProcedureType procedure, object args); } - public class TeamspeakManagerService : ITeamspeakManagerService { + public class TeamspeakManagerService : ITeamspeakManagerService + { private readonly IHubContext _hub; private readonly IVariablesService _variablesService; private bool _runTeamspeak; private CancellationTokenSource _token; - public TeamspeakManagerService(IHubContext hub, IVariablesService variablesService) { + public TeamspeakManagerService(IHubContext hub, IVariablesService variablesService) + { _hub = hub; _variablesService = variablesService; } - public void Start() { - if (IsTeamspeakDisabled()) return; + public void Start() + { + if (IsTeamspeakDisabled()) + { + return; + } _runTeamspeak = true; - _token = new CancellationTokenSource(); + _token = new(); Task.Run(KeepOnline); } - public void Stop() { - if (IsTeamspeakDisabled()) return; + public void Stop() + { + if (IsTeamspeakDisabled()) + { + return; + } _runTeamspeak = false; _token.Cancel(); @@ -47,30 +59,46 @@ public void Stop() { ShutTeamspeak().Wait(); } - public async Task SendGroupProcedure(TeamspeakProcedureType procedure, TeamspeakGroupProcedure groupProcedure) { - if (IsTeamspeakDisabled()) return; + public async Task SendGroupProcedure(TeamspeakProcedureType procedure, TeamspeakGroupProcedure groupProcedure) + { + if (IsTeamspeakDisabled()) + { + return; + } await _hub.Clients.All.Receive(procedure, groupProcedure); } - public async Task SendProcedure(TeamspeakProcedureType procedure, object args) { - if (IsTeamspeakDisabled()) return; + public async Task SendProcedure(TeamspeakProcedureType procedure, object args) + { + if (IsTeamspeakDisabled()) + { + return; + } await _hub.Clients.All.Receive(procedure, args); } - private async void KeepOnline() { + private async void KeepOnline() + { await TaskUtilities.Delay(TimeSpan.FromSeconds(5), _token.Token); - while (_runTeamspeak) { - if (Process.GetProcessesByName("ts3server").Length == 0) { + while (_runTeamspeak) + { + if (Process.GetProcessesByName("ts3server").Length == 0) + { await LaunchTeamspeakServer(); } - if (_variablesService.GetVariable("TEAMSPEAK_RUN").AsBool()) { - if (!TeamspeakHubState.Connected) { - if (Process.GetProcessesByName("ts3client_win64").Length == 0) { + if (_variablesService.GetVariable("TEAMSPEAK_RUN").AsBool()) + { + if (!TeamspeakHubState.Connected) + { + if (Process.GetProcessesByName("ts3client_win64").Length == 0) + { await LaunchTeamspeak(); - } else { + } + else + { await ShutTeamspeak(); continue; } @@ -81,28 +109,38 @@ private async void KeepOnline() { } } - private async Task LaunchTeamspeakServer() { + private async Task LaunchTeamspeakServer() + { await ProcessUtilities.LaunchExternalProcess("TeamspeakServer", $"start \"\" \"{_variablesService.GetVariable("TEAMSPEAK_SERVER_PATH").AsString()}\""); } - private async Task LaunchTeamspeak() { + private async Task LaunchTeamspeak() + { await ProcessUtilities.LaunchExternalProcess("Teamspeak", $"start \"\" \"{_variablesService.GetVariable("TEAMSPEAK_PATH").AsString()}\""); } - private async Task ShutTeamspeak() { + private async Task ShutTeamspeak() + { Process process = Process.GetProcesses().FirstOrDefault(x => x.ProcessName == "ts3client_win64"); - if (process == null) return; + if (process == null) + { + return; + } await process.CloseProcessGracefully(); process.Refresh(); process.WaitForExit(5000); process.Refresh(); - if (!process.HasExited) { + if (!process.HasExited) + { process.Kill(); await TaskUtilities.Delay(TimeSpan.FromMilliseconds(100), _token.Token); } } - private bool IsTeamspeakDisabled() => !_variablesService.GetFeatureState("TEAMSPEAK"); + private bool IsTeamspeakDisabled() + { + return !_variablesService.GetFeatureState("TEAMSPEAK"); + } } } diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakMetricsService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakMetricsService.cs index 0088357c..68678f2c 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakMetricsService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakMetricsService.cs @@ -1,11 +1,17 @@ using System.Collections.Generic; -namespace UKSF.Api.Teamspeak.Services { - public interface ITeamspeakMetricsService { +namespace UKSF.Api.Teamspeak.Services +{ + public interface ITeamspeakMetricsService + { float GetWeeklyParticipationTrend(HashSet teamspeakIdentities); } - public class TeamspeakMetricsService : ITeamspeakMetricsService { - public float GetWeeklyParticipationTrend(HashSet teamspeakIdentities) => 3; + public class TeamspeakMetricsService : ITeamspeakMetricsService + { + public float GetWeeklyParticipationTrend(HashSet teamspeakIdentities) + { + return 3; + } } } diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs index 889b9b7b..83ba240f 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs @@ -13,8 +13,10 @@ using UKSF.Api.Teamspeak.Signalr.Clients; using UKSF.Api.Teamspeak.Signalr.Hubs; -namespace UKSF.Api.Teamspeak.Services { - public interface ITeamspeakService { +namespace UKSF.Api.Teamspeak.Services +{ + public interface ITeamspeakService + { IEnumerable GetOnlineTeamspeakClients(); OnlineState GetOnlineUserDetails(string accountId); IEnumerable GetFormattedClients(); @@ -26,7 +28,8 @@ public interface ITeamspeakService { Task StoreTeamspeakServerSnapshot(); } - public class TeamspeakService : ITeamspeakService { + public class TeamspeakService : ITeamspeakService + { private readonly IAccountContext _accountContext; private readonly SemaphoreSlim _clientsSemaphore = new(1); private readonly IMongoDatabase _database; @@ -41,7 +44,8 @@ public TeamspeakService( IHubContext teamspeakClientsHub, ITeamspeakManagerService teamspeakManagerService, IHostEnvironment environment - ) { + ) + { _accountContext = accountContext; _database = database; _teamspeakClientsHub = teamspeakClientsHub; @@ -49,35 +53,50 @@ IHostEnvironment environment _environment = environment; } - public IEnumerable GetOnlineTeamspeakClients() => _clients; + public IEnumerable GetOnlineTeamspeakClients() + { + return _clients; + } - public async Task UpdateClients(HashSet newClients) { + public async Task UpdateClients(HashSet newClients) + { await _clientsSemaphore.WaitAsync(); _clients = newClients; _clientsSemaphore.Release(); await _teamspeakClientsHub.Clients.All.ReceiveClients(GetFormattedClients()); } - public async Task UpdateAccountTeamspeakGroups(Account account) { - if (account?.TeamspeakIdentities == null) return; - foreach (double clientDbId in account.TeamspeakIdentities) { + public async Task UpdateAccountTeamspeakGroups(Account account) + { + if (account?.TeamspeakIdentities == null) + { + return; + } + + foreach (double clientDbId in account.TeamspeakIdentities) + { await _teamspeakManagerService.SendProcedure(TeamspeakProcedureType.GROUPS, new { clientDbId }); } } - public async Task SendTeamspeakMessageToClient(Account account, string message) { + public async Task SendTeamspeakMessageToClient(Account account, string message) + { await SendTeamspeakMessageToClient(account.TeamspeakIdentities, message); } - public async Task SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message) { + public async Task SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message) + { message = FormatTeamspeakMessage(message); - foreach (double clientDbId in clientDbIds) { + foreach (double clientDbId in clientDbIds) + { await _teamspeakManagerService.SendProcedure(TeamspeakProcedureType.MESSAGE, new { clientDbId, message }); } } - public async Task StoreTeamspeakServerSnapshot() { - if (_clients.Count == 0) { + public async Task StoreTeamspeakServerSnapshot() + { + if (_clients.Count == 0) + { await Console.Out.WriteLineAsync("No client data for snapshot"); return; } @@ -87,28 +106,42 @@ public async Task StoreTeamspeakServerSnapshot() { await _database.GetCollection("teamspeakSnapshots").InsertOneAsync(teamspeakServerSnapshot); } - public async Task Shutdown() { + public async Task Shutdown() + { await _teamspeakManagerService.SendProcedure(TeamspeakProcedureType.SHUTDOWN, new { }); } - public IEnumerable GetFormattedClients() { - if (_environment.IsDevelopment()) return new List { new { name = "SqnLdr.Beswick.T", clientDbId = (double) 2 } }; + public IEnumerable GetFormattedClients() + { + if (_environment.IsDevelopment()) + { + return new List { new { name = "SqnLdr.Beswick.T", clientDbId = (double) 2 } }; + } return _clients.Where(x => x != null).Select(x => new { name = $"{x.ClientName}", clientDbId = x.ClientDbId }); } // TODO: Change to use signalr (or hook into existing _teamspeakClientsHub) - public OnlineState GetOnlineUserDetails(string accountId) { - if (_environment.IsDevelopment()) { - _clients = new HashSet { new() { ClientName = "SqnLdr.Beswick.T", ClientDbId = 2 } }; + public OnlineState GetOnlineUserDetails(string accountId) + { + if (_environment.IsDevelopment()) + { + _clients = new() { new() { ClientName = "SqnLdr.Beswick.T", ClientDbId = 2 } }; } - if (_clients.Count == 0) return null; + if (_clients.Count == 0) + { + return null; + } Account account = _accountContext.GetSingle(accountId); - if (account?.TeamspeakIdentities == null) return null; + if (account?.TeamspeakIdentities == null) + { + return null; + } - if (_environment.IsDevelopment()) { + if (_environment.IsDevelopment()) + { _clients.First().ClientDbId = account.TeamspeakIdentities.First(); } @@ -117,6 +150,9 @@ public OnlineState GetOnlineUserDetails(string accountId) { .FirstOrDefault(); } - private static string FormatTeamspeakMessage(string message) => $"\n========== UKSF Server Message ==========\n{message}\n=================================="; + private static string FormatTeamspeakMessage(string message) + { + return $"\n========== UKSF Server Message ==========\n{message}\n=================================="; + } } } diff --git a/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs index be2e7414..15f3acae 100644 --- a/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs +++ b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakHub.cs @@ -5,27 +5,36 @@ using UKSF.Api.Shared.Models; using UKSF.Api.Teamspeak.Signalr.Clients; -namespace UKSF.Api.Teamspeak.Signalr.Hubs { - public static class TeamspeakHubState { +namespace UKSF.Api.Teamspeak.Signalr.Hubs +{ + public static class TeamspeakHubState + { public static bool Connected; } - public class TeamspeakHub : Hub { + public class TeamspeakHub : Hub + { public const string END_POINT = "teamspeak"; private readonly IEventBus _eventBus; - public TeamspeakHub(IEventBus eventBus) => _eventBus = eventBus; + public TeamspeakHub(IEventBus eventBus) + { + _eventBus = eventBus; + } - public void Invoke(int procedure, object args) { + public void Invoke(int procedure, object args) + { _eventBus.Send(new SignalrEventData { Procedure = (TeamspeakEventType) procedure, Args = args }); } - public override Task OnConnectedAsync() { + public override Task OnConnectedAsync() + { TeamspeakHubState.Connected = true; return base.OnConnectedAsync(); } - public override async Task OnDisconnectedAsync(Exception exception) { + public override async Task OnDisconnectedAsync(Exception exception) + { TeamspeakHubState.Connected = false; await base.OnDisconnectedAsync(exception); } diff --git a/UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj b/UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj index abdfa35a..e0d5b505 100644 --- a/UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj +++ b/UKSF.Api.Integrations.Teamspeak/UKSF.Api.Integrations.Teamspeak.csproj @@ -1,7 +1,7 @@ - netcoreapp5.0 + net5.0 Library UKSF.Api.Teamspeak diff --git a/UKSF.Api.Launcher/ApiLauncherExtensions.cs b/UKSF.Api.Launcher/ApiLauncherExtensions.cs index ce84745b..b06cc856 100644 --- a/UKSF.Api.Launcher/ApiLauncherExtensions.cs +++ b/UKSF.Api.Launcher/ApiLauncherExtensions.cs @@ -6,19 +6,32 @@ using UKSF.Api.Launcher.Signalr.Hubs; using UKSF.Api.Personnel.ScheduledActions; -namespace UKSF.Api.Launcher { - public static class ApiLauncherExtensions { - public static IServiceCollection AddUksfLauncher(this IServiceCollection services) => - services.AddContexts().AddEventHandlers().AddServices().AddTransient(); +namespace UKSF.Api.Launcher +{ + public static class ApiLauncherExtensions + { + public static IServiceCollection AddUksfLauncher(this IServiceCollection services) + { + return services.AddContexts().AddEventHandlers().AddServices().AddTransient(); + } - private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddContexts(this IServiceCollection services) + { + return services.AddSingleton(); + } - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + private static IServiceCollection AddEventHandlers(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddServices(this IServiceCollection services) => - services.AddSingleton().AddTransient(); + private static IServiceCollection AddServices(this IServiceCollection services) + { + return services.AddSingleton().AddTransient(); + } - public static void AddUksfLauncherSignalr(this IEndpointRouteBuilder builder) { + public static void AddUksfLauncherSignalr(this IEndpointRouteBuilder builder) + { builder.MapHub($"/hub/{LauncherHub.END_POINT}"); } } diff --git a/UKSF.Api.Launcher/Controllers/LauncherController.cs b/UKSF.Api.Launcher/Controllers/LauncherController.cs index c5e11927..36bcc539 100644 --- a/UKSF.Api.Launcher/Controllers/LauncherController.cs +++ b/UKSF.Api.Launcher/Controllers/LauncherController.cs @@ -21,9 +21,11 @@ // ReSharper disable UnusedParameter.Global // ReSharper disable NotAccessedField.Local -namespace UKSF.Api.Launcher.Controllers { +namespace UKSF.Api.Launcher.Controllers +{ [Route("[controller]"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER)] - public class LauncherController : Controller { + public class LauncherController : Controller + { private readonly IDisplayNameService _displayNameService; private readonly IHttpContextService _httpContextService; private readonly ILauncherFileService _launcherFileService; @@ -40,7 +42,8 @@ public LauncherController( IHttpContextService httpContextService, IDisplayNameService displayNameService, IVariablesService variablesService - ) { + ) + { _variablesContext = variablesContext; _launcherHub = launcherHub; _launcherService = launcherService; @@ -51,13 +54,20 @@ IVariablesService variablesService } [HttpGet("update/{platform}/{version}")] - public IActionResult GetUpdate(string platform, string version) => Ok(); + public IActionResult GetUpdate(string platform, string version) + { + return Ok(); + } [HttpGet("version")] - public IActionResult GetVersion() => Ok(_variablesContext.GetSingle("LAUNCHER_VERSION").AsString()); + public IActionResult GetVersion() + { + return Ok(_variablesContext.GetSingle("LAUNCHER_VERSION").AsString()); + } [HttpPost("version"), Permissions(Permissions.ADMIN)] - public async Task UpdateVersion([FromBody] JObject body) { + public async Task UpdateVersion([FromBody] JObject body) + { string version = body["version"].ToString(); await _variablesContext.Update("LAUNCHER_VERSION", version); await _launcherFileService.UpdateAllVersions(); @@ -66,13 +76,20 @@ public async Task UpdateVersion([FromBody] JObject body) { } [HttpGet("download/setup")] - public IActionResult GetLauncher() => _launcherFileService.GetLauncherFile("UKSF Launcher Setup.msi"); + public IActionResult GetLauncher() + { + return _launcherFileService.GetLauncherFile("UKSF Launcher Setup.msi"); + } [HttpGet("download/updater")] - public IActionResult GetUpdater() => _launcherFileService.GetLauncherFile("Updater", "UKSF.Launcher.Updater.exe"); + public IActionResult GetUpdater() + { + return _launcherFileService.GetLauncherFile("Updater", "UKSF.Launcher.Updater.exe"); + } [HttpPost("download/update")] - public async Task GetUpdatedFiles([FromBody] JObject body) { + public async Task GetUpdatedFiles([FromBody] JObject body) + { List files = JsonConvert.DeserializeObject>(body["files"].ToString()); Stream updatedFiles = await _launcherFileService.GetUpdatedFiles(files); FileStreamResult stream = new(updatedFiles, "application/octet-stream"); @@ -80,7 +97,8 @@ public async Task GetUpdatedFiles([FromBody] JObject body) { } [HttpPost("error")] - public IActionResult ReportError([FromBody] JObject body) { + public IActionResult ReportError([FromBody] JObject body) + { string version = body["version"].ToString(); string message = body["message"].ToString(); // logger.Log(new LauncherLog(version, message) { userId = httpContextService.GetUserId(), name = displayNameService.GetDisplayName(accountService.GetUserAccount()) }); diff --git a/UKSF.Api.Launcher/Services/LauncherService.cs b/UKSF.Api.Launcher/Services/LauncherService.cs index b4df1fbf..47fac4ec 100644 --- a/UKSF.Api.Launcher/Services/LauncherService.cs +++ b/UKSF.Api.Launcher/Services/LauncherService.cs @@ -4,12 +4,17 @@ // ReSharper disable NotAccessedField.Local -namespace UKSF.Api.Launcher.Services { +namespace UKSF.Api.Launcher.Services +{ public interface ILauncherService { } - public class LauncherService : ILauncherService { + public class LauncherService : ILauncherService + { private readonly IHubContext _launcherHub; - public LauncherService(IHubContext launcherHub) => _launcherHub = launcherHub; + public LauncherService(IHubContext launcherHub) + { + _launcherHub = launcherHub; + } } } diff --git a/UKSF.Api.Launcher/UKSF.Api.Launcher.csproj b/UKSF.Api.Launcher/UKSF.Api.Launcher.csproj index b2f78fee..44f4702e 100644 --- a/UKSF.Api.Launcher/UKSF.Api.Launcher.csproj +++ b/UKSF.Api.Launcher/UKSF.Api.Launcher.csproj @@ -1,7 +1,7 @@ - netcoreapp5.0 + net5.0 Library @@ -11,7 +11,7 @@ - + diff --git a/UKSF.Api.Modpack/ApiModpackExtensions.cs b/UKSF.Api.Modpack/ApiModpackExtensions.cs index b0a61fd8..64123041 100644 --- a/UKSF.Api.Modpack/ApiModpackExtensions.cs +++ b/UKSF.Api.Modpack/ApiModpackExtensions.cs @@ -8,27 +8,43 @@ using UKSF.Api.Modpack.Services.BuildProcess; using UKSF.Api.Modpack.Signalr.Hubs; -namespace UKSF.Api.Modpack { - public static class ApiModpackExtensions { - public static IServiceCollection AddUksfModpack(this IServiceCollection services) => - services.AddContexts().AddEventHandlers().AddServices().AddActions().AddTransient(); +namespace UKSF.Api.Modpack +{ + public static class ApiModpackExtensions + { + public static IServiceCollection AddUksfModpack(this IServiceCollection services) + { + return services.AddContexts().AddEventHandlers().AddServices().AddActions().AddTransient(); + } - private static IServiceCollection AddContexts(this IServiceCollection services) => services.AddSingleton().AddSingleton(); + private static IServiceCollection AddContexts(this IServiceCollection services) + { + return services.AddSingleton().AddSingleton(); + } - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddEventHandlers(this IServiceCollection services) + { + return services.AddSingleton(); + } - private static IServiceCollection AddServices(this IServiceCollection services) => - services.AddSingleton() - .AddTransient() - .AddTransient() - .AddTransient() - .AddSingleton() - .AddSingleton() - .AddSingleton(); + private static IServiceCollection AddServices(this IServiceCollection services) + { + return services.AddSingleton() + .AddTransient() + .AddTransient() + .AddTransient() + .AddSingleton() + .AddSingleton() + .AddSingleton(); + } - private static IServiceCollection AddActions(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddActions(this IServiceCollection services) + { + return services.AddSingleton(); + } - public static void AddUksfModpackSignalr(this IEndpointRouteBuilder builder) { + public static void AddUksfModpackSignalr(this IEndpointRouteBuilder builder) + { builder.MapHub($"/hub/{BuildsHub.END_POINT}"); } } diff --git a/UKSF.Api.Modpack/Controllers/GithubController.cs b/UKSF.Api.Modpack/Controllers/GithubController.cs index 512f619e..79438601 100644 --- a/UKSF.Api.Modpack/Controllers/GithubController.cs +++ b/UKSF.Api.Modpack/Controllers/GithubController.cs @@ -10,9 +10,11 @@ using UKSF.Api.Modpack.Services; using UKSF.Api.Shared; -namespace UKSF.Api.Modpack.Controllers { +namespace UKSF.Api.Modpack.Controllers +{ [Route("[controller]")] - public class GithubController : Controller { + public class GithubController : Controller + { private const string PUSH_EVENT = "push"; private const string REPO_NAME = "modpack"; private const string MASTER = "refs/heads/master"; @@ -22,29 +24,31 @@ public class GithubController : Controller { private readonly IModpackService _modpackService; private readonly IReleaseService _releaseService; - public GithubController(IModpackService modpackService, IGithubService githubService, IReleaseService releaseService) { + public GithubController(IModpackService modpackService, IGithubService githubService, IReleaseService releaseService) + { _modpackService = modpackService; _githubService = githubService; _releaseService = releaseService; } [HttpPost] - public async Task GithubWebhook( - [FromHeader(Name = "x-hub-signature")] string githubSignature, - [FromHeader(Name = "x-github-event")] string githubEvent, - [FromBody] JObject body - ) { - if (!_githubService.VerifySignature(githubSignature, body.ToString(Formatting.None))) { + public async Task GithubWebhook([FromHeader(Name = "x-hub-signature")] string githubSignature, [FromHeader(Name = "x-github-event")] string githubEvent, [FromBody] JObject body) + { + if (!_githubService.VerifySignature(githubSignature, body.ToString(Formatting.None))) + { return Unauthorized(); } PushWebhookPayload payload = new SimpleJsonSerializer().Deserialize(body.ToString()); - if (payload.Repository.Name != REPO_NAME || githubEvent != PUSH_EVENT) { + if (payload.Repository.Name != REPO_NAME || githubEvent != PUSH_EVENT) + { return Ok(); } - switch (payload.Ref) { - case MASTER when payload.BaseRef != RELEASE: { + switch (payload.Ref) + { + case MASTER when payload.BaseRef != RELEASE: + { await _modpackService.CreateDevBuildFromPush(payload); return Ok(); } @@ -56,10 +60,14 @@ [FromBody] JObject body } [HttpGet("branches"), Authorize, Permissions(Permissions.TESTER)] - public async Task GetBranches() => Ok(await _githubService.GetBranches()); + public async Task GetBranches() + { + return Ok(await _githubService.GetBranches()); + } [HttpGet("populatereleases"), Authorize, Permissions(Permissions.ADMIN)] - public async Task Release() { + public async Task Release() + { List releases = await _githubService.GetHistoricReleases(); await _releaseService.AddHistoricReleases(releases); return Ok(); diff --git a/UKSF.Api.Modpack/Controllers/ModpackController.cs b/UKSF.Api.Modpack/Controllers/ModpackController.cs index 332c5a1a..fbcfd3e1 100644 --- a/UKSF.Api.Modpack/Controllers/ModpackController.cs +++ b/UKSF.Api.Modpack/Controllers/ModpackController.cs @@ -6,40 +6,56 @@ using UKSF.Api.Modpack.Services; using UKSF.Api.Shared; -namespace UKSF.Api.Modpack.Controllers { +namespace UKSF.Api.Modpack.Controllers +{ [Route("[controller]")] - public class ModpackController : Controller { + public class ModpackController : Controller + { private readonly IGithubService _githubService; private readonly IModpackService _modpackService; - public ModpackController(IModpackService modpackService, IGithubService githubService) { + public ModpackController(IModpackService modpackService, IGithubService githubService) + { _modpackService = modpackService; _githubService = githubService; } [HttpGet("releases"), Authorize, Permissions(Permissions.MEMBER)] - public IEnumerable GetReleases() => _modpackService.GetReleases(); + public IEnumerable GetReleases() + { + return _modpackService.GetReleases(); + } [HttpGet("rcs"), Authorize, Permissions(Permissions.MEMBER)] - public IEnumerable GetReleaseCandidates() => _modpackService.GetRcBuilds(); + public IEnumerable GetReleaseCandidates() + { + return _modpackService.GetRcBuilds(); + } [HttpGet("builds"), Authorize, Permissions(Permissions.MEMBER)] - public IEnumerable GetBuilds() => _modpackService.GetDevBuilds(); + public IEnumerable GetBuilds() + { + return _modpackService.GetDevBuilds(); + } [HttpGet("builds/{id}"), Authorize, Permissions(Permissions.MEMBER)] - public IActionResult GetBuild(string id) { + public IActionResult GetBuild(string id) + { ModpackBuild build = _modpackService.GetBuild(id); - return build == null ? (IActionResult) BadRequest("Build does not exist") : Ok(build); + return build == null ? BadRequest("Build does not exist") : Ok(build); } [HttpGet("builds/{id}/step/{index}"), Authorize, Permissions(Permissions.MEMBER)] - public IActionResult GetBuildStep(string id, int index) { + public IActionResult GetBuildStep(string id, int index) + { ModpackBuild build = _modpackService.GetBuild(id); - if (build == null) { + if (build == null) + { return BadRequest("Build does not exist"); } - if (build.Steps.Count > index) { + if (build.Steps.Count > index) + { return Ok(build.Steps[index]); } @@ -47,9 +63,11 @@ public IActionResult GetBuildStep(string id, int index) { } [HttpGet("builds/{id}/rebuild"), Authorize, Permissions(Permissions.ADMIN)] - public async Task Rebuild(string id) { + public async Task Rebuild(string id) + { ModpackBuild build = _modpackService.GetBuild(id); - if (build == null) { + if (build == null) + { return BadRequest("Build does not exist"); } @@ -58,9 +76,11 @@ public async Task Rebuild(string id) { } [HttpGet("builds/{id}/cancel"), Authorize, Permissions(Permissions.ADMIN)] - public async Task CancelBuild(string id) { + public async Task CancelBuild(string id) + { ModpackBuild build = _modpackService.GetBuild(id); - if (build == null) { + if (build == null) + { return BadRequest("Build does not exist"); } @@ -69,8 +89,10 @@ public async Task CancelBuild(string id) { } [HttpPatch("release/{version}"), Authorize, Permissions(Permissions.ADMIN)] - public async Task UpdateRelease(string version, [FromBody] ModpackRelease release) { - if (!release.IsDraft) { + public async Task UpdateRelease(string version, [FromBody] ModpackRelease release) + { + if (!release.IsDraft) + { return BadRequest($"Release {version} is not a draft"); } @@ -79,20 +101,24 @@ public async Task UpdateRelease(string version, [FromBody] Modpac } [HttpGet("release/{version}"), Authorize, Permissions(Permissions.ADMIN)] - public async Task Release(string version) { + public async Task Release(string version) + { await _modpackService.Release(version); return Ok(); } [HttpGet("release/{version}/changelog"), Authorize, Permissions(Permissions.ADMIN)] - public async Task RegenerateChangelog(string version) { + public async Task RegenerateChangelog(string version) + { await _modpackService.RegnerateReleaseDraftChangelog(version); return Ok(_modpackService.GetRelease(version)); } [HttpPost("newbuild"), Authorize, Permissions(Permissions.TESTER)] - public async Task NewBuild([FromBody] NewBuild newBuild) { - if (!await _githubService.IsReferenceValid(newBuild.Reference)) { + public async Task NewBuild([FromBody] NewBuild newBuild) + { + if (!await _githubService.IsReferenceValid(newBuild.Reference)) + { return BadRequest($"{newBuild.Reference} cannot be built as its version does not have the required make files"); } diff --git a/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs b/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs index fe265196..66ae8251 100644 --- a/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs +++ b/UKSF.Api.Modpack/EventHandlers/BuildsEventHandler.cs @@ -9,36 +9,51 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.Modpack.EventHandlers { +namespace UKSF.Api.Modpack.EventHandlers +{ public interface IBuildsEventHandler : IEventHandler { } - public class BuildsEventHandler : IBuildsEventHandler { + public class BuildsEventHandler : IBuildsEventHandler + { private readonly IEventBus _eventBus; private readonly IHubContext _hub; private readonly ILogger _logger; - public BuildsEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) { + public BuildsEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) + { _eventBus = eventBus; _hub = hub; _logger = logger; } - public void Init() { + public void Init() + { _eventBus.AsObservable().SubscribeWithAsyncNext(HandleBuildEvent, _logger.LogError); _eventBus.AsObservable().SubscribeWithAsyncNext(HandleBuildStepEvent, _logger.LogError); } - private async Task HandleBuildStepEvent(EventModel eventModel, ModpackBuildStepEventData data) { - if (data.BuildStep == null) return; - if (eventModel.EventType == EventType.UPDATE) { + private async Task HandleBuildStepEvent(EventModel eventModel, ModpackBuildStepEventData data) + { + if (data.BuildStep == null) + { + return; + } + + if (eventModel.EventType == EventType.UPDATE) + { await _hub.Clients.Group(data.BuildId).ReceiveBuildStep(data.BuildStep); } } - private async Task HandleBuildEvent(EventModel eventModel, ModpackBuild build) { - if (build == null) return; + private async Task HandleBuildEvent(EventModel eventModel, ModpackBuild build) + { + if (build == null) + { + return; + } - switch (eventModel.EventType) { + switch (eventModel.EventType) + { case EventType.ADD: await AddedEvent(build); break; @@ -48,18 +63,26 @@ private async Task HandleBuildEvent(EventModel eventModel, ModpackBuild build) { } } - private async Task AddedEvent(ModpackBuild build) { - if (build.Environment == GameEnvironment.DEV) { + private async Task AddedEvent(ModpackBuild build) + { + if (build.Environment == GameEnvironment.DEV) + { await _hub.Clients.All.ReceiveBuild(build); - } else { + } + else + { await _hub.Clients.All.ReceiveReleaseCandidateBuild(build); } } - private async Task UpdatedEvent(ModpackBuild build) { - if (build.Environment == GameEnvironment.DEV) { + private async Task UpdatedEvent(ModpackBuild build) + { + if (build.Environment == GameEnvironment.DEV) + { await _hub.Clients.All.ReceiveBuild(build); - } else { + } + else + { await _hub.Clients.All.ReceiveReleaseCandidateBuild(build); } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildStep.cs b/UKSF.Api.Modpack/Models/ModpackBuildStep.cs index b29788bd..cbbc47b2 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildStep.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildStep.cs @@ -2,8 +2,10 @@ using System.Collections.Generic; using System.Globalization; -namespace UKSF.Api.Modpack.Models { - public class ModpackBuildStep { +namespace UKSF.Api.Modpack.Models +{ + public class ModpackBuildStep + { public ModpackBuildResult BuildResult = ModpackBuildResult.NONE; public DateTime EndTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); public bool Finished; @@ -13,6 +15,9 @@ public class ModpackBuildStep { public bool Running; public DateTime StartTime = DateTime.ParseExact("20000101", "yyyyMMdd", CultureInfo.InvariantCulture); - public ModpackBuildStep(string name) => Name = name; + public ModpackBuildStep(string name) + { + Name = name; + } } } diff --git a/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs b/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs index 79974ce5..f4a7ed04 100644 --- a/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs +++ b/UKSF.Api.Modpack/ScheduledActions/ActionPruneBuilds.cs @@ -8,10 +8,12 @@ using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Modpack.ScheduledActions { +namespace UKSF.Api.Modpack.ScheduledActions +{ public interface IActionPruneBuilds : ISelfCreatingScheduledAction { } - public class ActionPruneBuilds : IActionPruneBuilds { + public class ActionPruneBuilds : IActionPruneBuilds + { private const string ACTION_NAME = nameof(ActionPruneBuilds); private readonly IBuildsContext _buildsContext; @@ -20,7 +22,8 @@ public class ActionPruneBuilds : IActionPruneBuilds { private readonly ISchedulerContext _schedulerContext; private readonly ISchedulerService _schedulerService; - public ActionPruneBuilds(IBuildsContext buildsContext, ISchedulerContext schedulerContext, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) { + public ActionPruneBuilds(IBuildsContext buildsContext, ISchedulerContext schedulerContext, ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock) + { _buildsContext = buildsContext; _schedulerContext = schedulerContext; _schedulerService = schedulerService; @@ -30,7 +33,8 @@ public ActionPruneBuilds(IBuildsContext buildsContext, ISchedulerContext schedul public string Name => ACTION_NAME; - public Task Run(params object[] parameters) { + public Task Run(params object[] parameters) + { int threshold = _buildsContext.Get(x => x.Environment == GameEnvironment.DEV).Select(x => x.BuildNumber).OrderByDescending(x => x).First() - 100; Task modpackBuildsTask = _buildsContext.DeleteMany(x => x.Environment == GameEnvironment.DEV && x.BuildNumber < threshold); @@ -38,14 +42,22 @@ public Task Run(params object[] parameters) { return Task.CompletedTask; } - public async Task CreateSelf() { - if (_currentEnvironment.IsDevelopment()) return; + public async Task CreateSelf() + { + if (_currentEnvironment.IsDevelopment()) + { + return; + } - if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { + if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) + { await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); } } - public Task Reset() => Task.CompletedTask; + public Task Reset() + { + return Task.CompletedTask; + } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs index 0bed3578..356492cc 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessHelper.cs @@ -6,8 +6,10 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.Modpack.Services.BuildProcess { - public class BuildProcessHelper { +namespace UKSF.Api.Modpack.Services.BuildProcess +{ + public class BuildProcessHelper + { private readonly CancellationTokenSource _cancellationTokenSource; private readonly CancellationTokenSource _errorCancellationTokenSource = new(); private readonly List _errorExclusions; @@ -33,7 +35,8 @@ public BuildProcessHelper( List errorExclusions = null, string ignoreErrorGateClose = "", string ignoreErrorGateOpen = "" - ) { + ) + { _logger = logger; _cancellationTokenSource = cancellationTokenSource; _suppressOutput = suppressOutput; @@ -44,9 +47,12 @@ public BuildProcessHelper( _ignoreErrorGateOpen = ignoreErrorGateOpen; } - public List Run(string workingDirectory, string executable, string args, int timeout) { - _process = new Process { - StartInfo = { + public List Run(string workingDirectory, string executable, string args, int timeout) + { + _process = new() + { + StartInfo = + { FileName = executable, WorkingDirectory = workingDirectory, Arguments = args, @@ -68,39 +74,51 @@ public List Run(string workingDirectory, string executable, string args, _process.BeginOutputReadLine(); _process.BeginErrorReadLine(); - if (_process.WaitForExit(timeout) && _outputWaitHandle.WaitOne(timeout) && _errorWaitHandle.WaitOne(timeout)) { - if (_cancellationTokenSource.IsCancellationRequested) { + if (_process.WaitForExit(timeout) && _outputWaitHandle.WaitOne(timeout) && _errorWaitHandle.WaitOne(timeout)) + { + if (_cancellationTokenSource.IsCancellationRequested) + { return _results; } - if (_capturedException != null) { - if (_raiseErrors) { + if (_capturedException != null) + { + if (_raiseErrors) + { throw _capturedException; } - if (!_errorSilently) { + if (!_errorSilently) + { _logger.LogError(_capturedException); } } - if (_raiseErrors && _process.ExitCode != 0) { + if (_raiseErrors && _process.ExitCode != 0) + { string json = ""; List> messages = ExtractMessages(_results.Last(), ref json); - if (messages.Any()) { - throw new Exception(messages.First().Item1); + if (messages.Any()) + { + throw new(messages.First().Item1); } - throw new Exception(); + throw new(); } - } else { + } + else + { // Timeout or cancelled - if (!_cancellationTokenSource.IsCancellationRequested) { + if (!_cancellationTokenSource.IsCancellationRequested) + { Exception exception = new($"Process exited with non-zero code ({_process.ExitCode})"); - if (_raiseErrors) { + if (_raiseErrors) + { throw exception; } - if (!_errorSilently) { + if (!_errorSilently) + { _logger.LogError(exception); } } @@ -109,55 +127,77 @@ public List Run(string workingDirectory, string executable, string args, return _results; } - private void OnOutputDataReceived(object sender, DataReceivedEventArgs receivedEventArgs) { - if (receivedEventArgs.Data == null) { + private void OnOutputDataReceived(object sender, DataReceivedEventArgs receivedEventArgs) + { + if (receivedEventArgs.Data == null) + { _outputWaitHandle.Set(); return; } string message = receivedEventArgs.Data; - if (!string.IsNullOrEmpty(message)) { + if (!string.IsNullOrEmpty(message)) + { _results.Add(message); } - if (!_suppressOutput) { + if (!_suppressOutput) + { string json = ""; - try { + try + { List> messages = ExtractMessages(message, ref json); - foreach ((string text, string colour) in messages) { + foreach ((string text, string colour) in messages) + { _logger.Log(text, colour); } - } catch (Exception exception) { - _capturedException = new Exception($"Json failed: {json}\n\n{exception}"); + } + catch (Exception exception) + { + _capturedException = new($"Json failed: {json}\n\n{exception}"); _errorCancellationTokenSource.Cancel(); } } } - private void OnErrorDataReceived(object sender, DataReceivedEventArgs receivedEventArgs) { - if (receivedEventArgs.Data == null) { + private void OnErrorDataReceived(object sender, DataReceivedEventArgs receivedEventArgs) + { + if (receivedEventArgs.Data == null) + { _errorWaitHandle.Set(); return; } string message = receivedEventArgs.Data; - if (string.IsNullOrEmpty(message) || CheckIgnoreErrorGates(message)) return; + if (string.IsNullOrEmpty(message) || CheckIgnoreErrorGates(message)) + { + return; + } - if (_errorExclusions != null && _errorExclusions.Any(x => message.ContainsIgnoreCase(x))) return; + if (_errorExclusions != null && _errorExclusions.Any(x => message.ContainsIgnoreCase(x))) + { + return; + } - _capturedException = new Exception(message); + _capturedException = new(message); _errorCancellationTokenSource.Cancel(); } - private bool CheckIgnoreErrorGates(string message) { - if (message.ContainsIgnoreCase(_ignoreErrorGateClose)) { + private bool CheckIgnoreErrorGates(string message) + { + if (message.ContainsIgnoreCase(_ignoreErrorGateClose)) + { _ignoreErrors = false; return true; } - if (_ignoreErrors) return true; + if (_ignoreErrors) + { + return true; + } - if (message.ContainsIgnoreCase(_ignoreErrorGateOpen)) { + if (message.ContainsIgnoreCase(_ignoreErrorGateOpen)) + { _ignoreErrors = true; return true; } @@ -165,16 +205,20 @@ private bool CheckIgnoreErrorGates(string message) { return false; } - private static List> ExtractMessages(string message, ref string json) { + private static List> ExtractMessages(string message, ref string json) + { List> messages = new(); - if (message.Length > 5 && message.Substring(0, 4) == "JSON") { + if (message.Length > 5 && message.Substring(0, 4) == "JSON") + { string[] parts = message.Split('{', '}'); // covers cases where buffer gets extra data flushed to it after the closing brace json = $"{{{parts[1].Escape().Replace("\\\\n", "\\n")}}}"; JObject jsonObject = JObject.Parse(json); - messages.Add(new Tuple(jsonObject.GetValueFromBody("message"), jsonObject.GetValueFromBody("colour"))); + messages.Add(new(jsonObject.GetValueFromBody("message"), jsonObject.GetValueFromBody("colour"))); messages.AddRange(parts.Skip(2).Where(x => !string.IsNullOrEmpty(x)).Select(extra => new Tuple(extra, ""))); - } else { - messages.Add(new Tuple(message, "")); + } + else + { + messages.Add(new(message, "")); } return messages; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs index 4a9791b6..3260b45d 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildStepService.cs @@ -9,18 +9,22 @@ using UKSF.Api.Modpack.Services.BuildProcess.Steps.Common; using UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps; -namespace UKSF.Api.Modpack.Services.BuildProcess { - public interface IBuildStepService { +namespace UKSF.Api.Modpack.Services.BuildProcess +{ + public interface IBuildStepService + { void RegisterBuildSteps(); List GetSteps(GameEnvironment environment); ModpackBuildStep GetRestoreStepForRelease(); IBuildStep ResolveBuildStep(string buildStepName); } - public class BuildStepService : IBuildStepService { + public class BuildStepService : IBuildStepService + { private Dictionary _buildStepDictionary = new(); - public void RegisterBuildSteps() { + public void RegisterBuildSteps() + { _buildStepDictionary = AppDomain.CurrentDomain.GetAssemblies() .SelectMany(x => x.GetTypes(), (_, type) => new { type }) .Select(x => new { x.type, attributes = x.type.GetCustomAttributes(typeof(BuildStepAttribute), true) }) @@ -29,8 +33,10 @@ public void RegisterBuildSteps() { .ToDictionary(x => x.Key, x => x.Value); } - public List GetSteps(GameEnvironment environment) { - List steps = environment switch { + public List GetSteps(GameEnvironment environment) + { + List steps = environment switch + { GameEnvironment.RELEASE => GetStepsForRelease(), GameEnvironment.RC => GetStepsForRc(), GameEnvironment.DEV => GetStepsForBuild(), @@ -40,10 +46,15 @@ public List GetSteps(GameEnvironment environment) { return steps; } - public ModpackBuildStep GetRestoreStepForRelease() => new(BuildStepRestore.NAME); + public ModpackBuildStep GetRestoreStepForRelease() + { + return new(BuildStepRestore.NAME); + } - public IBuildStep ResolveBuildStep(string buildStepName) { - if (!_buildStepDictionary.ContainsKey(buildStepName)) { + public IBuildStep ResolveBuildStep(string buildStepName) + { + if (!_buildStepDictionary.ContainsKey(buildStepName)) + { throw new NullReferenceException($"Build step '{buildStepName}' does not exist in build step dictionary"); } @@ -52,8 +63,10 @@ public IBuildStep ResolveBuildStep(string buildStepName) { return step; } - private static List GetStepsForBuild() => - new() { + private static List GetStepsForBuild() + { + return new() + { new(BuildStepPrep.NAME), new(BuildStepClean.NAME), new(BuildStepSources.NAME), @@ -69,9 +82,12 @@ private static List GetStepsForBuild() => new(BuildStepCbaSettings.NAME), new(BuildStepBuildRepo.NAME) }; + } - private static List GetStepsForRc() => - new() { + private static List GetStepsForRc() + { + return new() + { new(BuildStepPrep.NAME), new(BuildStepClean.NAME), new(BuildStepSources.NAME), @@ -88,9 +104,12 @@ private static List GetStepsForRc() => new(BuildStepBuildRepo.NAME), new(BuildStepNotify.NAME) }; + } - private static List GetStepsForRelease() => - new() { + private static List GetStepsForRelease() + { + return new() + { new(BuildStepClean.NAME), new(BuildStepBackup.NAME), new(BuildStepDeploy.NAME), @@ -101,9 +120,12 @@ private static List GetStepsForRelease() => new(BuildStepNotify.NAME), new(BuildStepMerge.NAME) }; + } - private static void ResolveIndices(IReadOnlyList steps) { - for (int i = 0; i < steps.Count; i++) { + private static void ResolveIndices(IReadOnlyList steps) + { + for (int i = 0; i < steps.Count; i++) + { steps[i].Index = i; } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs b/UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs index 174afe34..52e88f13 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/StepLogger.cs @@ -3,8 +3,10 @@ using System.Linq; using UKSF.Api.Modpack.Models; -namespace UKSF.Api.Modpack.Services.BuildProcess { - public interface IStepLogger { +namespace UKSF.Api.Modpack.Services.BuildProcess +{ + public interface IStepLogger + { void LogStart(); void LogSuccess(); void LogCancelled(); @@ -16,61 +18,82 @@ public interface IStepLogger { void LogInline(string log); } - public class StepLogger : IStepLogger { + public class StepLogger : IStepLogger + { private readonly ModpackBuildStep _buildStep; - public StepLogger(ModpackBuildStep buildStep) => _buildStep = buildStep; + public StepLogger(ModpackBuildStep buildStep) + { + _buildStep = buildStep; + } - public void LogStart() { + public void LogStart() + { LogLines($"Starting: {_buildStep.Name}", string.Empty); } - public void LogSuccess() { + public void LogSuccess() + { LogLines( $"\nFinished{(_buildStep.BuildResult == ModpackBuildResult.WARNING ? " with warning" : "")}: {_buildStep.Name}", _buildStep.BuildResult == ModpackBuildResult.WARNING ? "orangered" : "green" ); } - public void LogCancelled() { + public void LogCancelled() + { LogLines("\nBuild cancelled", "goldenrod"); } - public void LogSkipped() { + public void LogSkipped() + { LogLines($"\nSkipped: {_buildStep.Name}", "gray"); } - public void LogWarning(string message) { + public void LogWarning(string message) + { LogLines($"Warning\n{message}", "orangered"); } - public void LogError(Exception exception) { + public void LogError(Exception exception) + { LogLines($"Error\n{exception.Message}\n{exception.StackTrace}\n\nFailed: {_buildStep.Name}", "red"); } - public void LogSurround(string log) { + public void LogSurround(string log) + { LogLines(log, "cadetblue"); } - public void Log(string log, string colour = "") { + public void Log(string log, string colour = "") + { LogLines(log, colour); } - public void LogInline(string log) { + public void LogInline(string log) + { PushLogUpdate(new List { new() { Text = log } }, true); } - private void LogLines(string log, string colour = "") { + private void LogLines(string log, string colour = "") + { List logs = log.Split("\n").Select(x => new ModpackBuildStepLogItem { Text = x, Colour = string.IsNullOrEmpty(x) ? "" : colour }).ToList(); - if (logs.Count == 0) return; + if (logs.Count == 0) + { + return; + } PushLogUpdate(logs); } - private void PushLogUpdate(IEnumerable logs, bool inline = false) { - if (inline) { + private void PushLogUpdate(IEnumerable logs, bool inline = false) + { + if (inline) + { _buildStep.Logs[^1] = logs.First(); - } else { + } + else + { _buildStep.Logs.AddRange(logs); } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs index b542feb3..d524a00d 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs @@ -9,8 +9,10 @@ using UKSF.Api.ArmaServer.Models; using UKSF.Api.Modpack.Models; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps { - public interface IBuildStep { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps +{ + public interface IBuildStep + { void Init( IServiceProvider serviceProvider, ModpackBuild modpackBuild, @@ -31,7 +33,8 @@ CancellationTokenSource cancellationTokenSource Task Skip(); } - public class BuildStep : IBuildStep { + public class BuildStep : IBuildStep + { private const string COLOUR_BLUE = "#0c78ff"; private readonly TimeSpan _updateInterval = TimeSpan.FromSeconds(2); private readonly CancellationTokenSource _updatePusherCancellationTokenSource = new(); @@ -52,7 +55,8 @@ public void Init( Func, Task> buildUpdateCallback, Func stepUpdateCallback, CancellationTokenSource newCancellationTokenSource - ) { + ) + { ServiceProvider = newServiceProvider; VariablesService = ServiceProvider.GetService(); Build = modpackBuild; @@ -63,7 +67,8 @@ CancellationTokenSource newCancellationTokenSource StepLogger = new StepLogger(_buildStep); } - public async Task Start() { + public async Task Start() + { CancellationTokenSource.Token.ThrowIfCancellationRequested(); StartUpdatePusher(); _buildStep.Running = true; @@ -72,104 +77,138 @@ public async Task Start() { await Update(); } - public virtual bool CheckGuards() => true; + public virtual bool CheckGuards() + { + return true; + } - public async Task Setup() { + public async Task Setup() + { CancellationTokenSource.Token.ThrowIfCancellationRequested(); StepLogger.Log("\nSetup", COLOUR_BLUE); await SetupExecute(); await Update(); } - public async Task Process() { + public async Task Process() + { CancellationTokenSource.Token.ThrowIfCancellationRequested(); StepLogger.Log("\nProcess", COLOUR_BLUE); await ProcessExecute(); await Update(); } - public async Task Succeed() { + public async Task Succeed() + { StepLogger.LogSuccess(); - if (_buildStep.BuildResult != ModpackBuildResult.WARNING) { + if (_buildStep.BuildResult != ModpackBuildResult.WARNING) + { _buildStep.BuildResult = ModpackBuildResult.SUCCESS; } await Stop(); } - public async Task Fail(Exception exception) { + public async Task Fail(Exception exception) + { StepLogger.LogError(exception); _buildStep.BuildResult = ModpackBuildResult.FAILED; await Stop(); } - public async Task Cancel() { + public async Task Cancel() + { StepLogger.LogCancelled(); _buildStep.BuildResult = ModpackBuildResult.CANCELLED; await Stop(); } - public void Warning(string message) { + public void Warning(string message) + { StepLogger.LogWarning(message); _buildStep.BuildResult = ModpackBuildResult.WARNING; } - public async Task Skip() { + public async Task Skip() + { StepLogger.LogSkipped(); _buildStep.BuildResult = ModpackBuildResult.SKIPPED; await Stop(); } - protected virtual Task SetupExecute() { + protected virtual Task SetupExecute() + { StepLogger.Log("---"); return Task.CompletedTask; } - protected virtual Task ProcessExecute() { + protected virtual Task ProcessExecute() + { StepLogger.Log("---"); return Task.CompletedTask; } - internal string GetBuildEnvironmentPath() => GetEnvironmentPath(Build.Environment); + internal string GetBuildEnvironmentPath() + { + return GetEnvironmentPath(Build.Environment); + } - internal string GetEnvironmentPath(GameEnvironment environment) => - environment switch { + internal string GetEnvironmentPath(GameEnvironment environment) + { + return environment switch + { GameEnvironment.RELEASE => VariablesService.GetVariable("MODPACK_PATH_RELEASE").AsString(), GameEnvironment.RC => VariablesService.GetVariable("MODPACK_PATH_RC").AsString(), GameEnvironment.DEV => VariablesService.GetVariable("MODPACK_PATH_DEV").AsString(), _ => throw new ArgumentException("Invalid build environment") }; + } - internal string GetServerEnvironmentPath(GameEnvironment environment) => - environment switch { + internal string GetServerEnvironmentPath(GameEnvironment environment) + { + return environment switch + { GameEnvironment.RELEASE => VariablesService.GetVariable("SERVER_PATH_RELEASE").AsString(), GameEnvironment.RC => VariablesService.GetVariable("SERVER_PATH_RC").AsString(), GameEnvironment.DEV => VariablesService.GetVariable("SERVER_PATH_DEV").AsString(), _ => throw new ArgumentException("Invalid build environment") }; + } - internal string GetEnvironmentRepoName() => - Build.Environment switch { + internal string GetEnvironmentRepoName() + { + return Build.Environment switch + { GameEnvironment.RELEASE => "UKSF", GameEnvironment.RC => "UKSF-Rc", GameEnvironment.DEV => "UKSF-Dev", _ => throw new ArgumentException("Invalid build environment") }; + } - internal string GetBuildSourcesPath() => VariablesService.GetVariable("BUILD_PATH_SOURCES").AsString(); + internal string GetBuildSourcesPath() + { + return VariablesService.GetVariable("BUILD_PATH_SOURCES").AsString(); + } - internal void SetEnvironmentVariable(string key, object value) { - if (Build.EnvironmentVariables.ContainsKey(key)) { + internal void SetEnvironmentVariable(string key, object value) + { + if (Build.EnvironmentVariables.ContainsKey(key)) + { Build.EnvironmentVariables[key] = value; - } else { + } + else + { Build.EnvironmentVariables.Add(key, value); } _updateBuildCallback(Builders.Update.Set(x => x.EnvironmentVariables, Build.EnvironmentVariables)); } - internal T GetEnvironmentVariable(string key) { - if (Build.EnvironmentVariables.ContainsKey(key)) { + internal T GetEnvironmentVariable(string key) + { + if (Build.EnvironmentVariables.ContainsKey(key)) + { object value = Build.EnvironmentVariables[key]; return (T) value; } @@ -177,42 +216,55 @@ internal T GetEnvironmentVariable(string key) { return default; } - private void StartUpdatePusher() { - try { + private void StartUpdatePusher() + { + try + { _ = Task.Run( - async () => { + async () => + { string previousBuildStepState = JsonConvert.SerializeObject(_buildStep); - do { + do + { await Task.Delay(_updateInterval, _updatePusherCancellationTokenSource.Token); string newBuildStepState = JsonConvert.SerializeObject(_buildStep); - if (newBuildStepState != previousBuildStepState) { + if (newBuildStepState != previousBuildStepState) + { await Update(); previousBuildStepState = newBuildStepState; } - } while (!_updatePusherCancellationTokenSource.IsCancellationRequested); + } + while (!_updatePusherCancellationTokenSource.IsCancellationRequested); }, _updatePusherCancellationTokenSource.Token ); - } catch (OperationCanceledException) { + } + catch (OperationCanceledException) + { Console.Out.WriteLine("cancelled"); - } catch (Exception exception) { + } + catch (Exception exception) + { Console.Out.WriteLine(exception); } } - private void StopUpdatePusher() { + private void StopUpdatePusher() + { _updatePusherCancellationTokenSource.Cancel(); } - private async Task Update() { + private async Task Update() + { await _updateSemaphore.WaitAsync(); await _updateStepCallback(); _updateSemaphore.Release(); } - private async Task Stop() { + private async Task Stop() + { _buildStep.Running = false; _buildStep.Finished = true; _buildStep.EndTime = DateTime.Now; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStepAttribute.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStepAttribute.cs index f77e69b6..6a7364d6 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStepAttribute.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStepAttribute.cs @@ -1,9 +1,14 @@ using System; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps { - public class BuildStepAttribute : Attribute { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps +{ + public class BuildStepAttribute : Attribute + { public readonly string Name; - public BuildStepAttribute(string name) => Name = name; + public BuildStepAttribute(string name) + { + Name = name; + } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs index f7d0761b..f462c440 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSources.cs @@ -1,13 +1,15 @@ -using System; -using System.IO; +using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps +{ [BuildStep(NAME)] - public class BuildStepSources : GitBuildStep { + public class BuildStepSources : GitBuildStep + { public const string NAME = "Sources"; - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { StepLogger.Log("Checking out latest sources"); await CheckoutStaticSource("ACE", "ace", "@ace", "@uksf_ace", "uksfcustom"); @@ -16,12 +18,14 @@ protected override async Task ProcessExecute() { await CheckoutModpack(); } - private Task CheckoutStaticSource(string displayName, string modName, string releaseName, string repoName, string branchName) { + private Task CheckoutStaticSource(string displayName, string modName, string releaseName, string repoName, string branchName) + { StepLogger.LogSurround($"\nChecking out latest {displayName}..."); string path = Path.Join(GetBuildSourcesPath(), modName); DirectoryInfo directory = new(path); - if (!directory.Exists) { + if (!directory.Exists) + { throw new($"{displayName} source directory does not exist. {displayName} should be cloned before running a build."); } @@ -39,13 +43,18 @@ private Task CheckoutStaticSource(string displayName, string modName, string rel bool forceBuild = GetEnvironmentVariable($"{modName}_updated"); bool updated; - if (!release.Exists || !repo.Exists) { + if (!release.Exists || !repo.Exists) + { StepLogger.Log("No release or repo directory, will build"); updated = true; - } else if (forceBuild) { + } + else if (forceBuild) + { StepLogger.Log("Force build"); updated = true; - } else { + } + else + { StepLogger.Log($"{before[..7]} vs {after[..7]}"); updated = !string.Equals(before, after); } @@ -56,13 +65,15 @@ private Task CheckoutStaticSource(string displayName, string modName, string rel return Task.CompletedTask; } - private Task CheckoutModpack() { + private Task CheckoutModpack() + { string reference = string.Equals(Build.Commit.Branch, "None") ? Build.Commit.After : Build.Commit.Branch.Replace("refs/heads/", ""); string referenceName = string.Equals(Build.Commit.Branch, "None") ? reference : $"latest {reference}"; StepLogger.LogSurround("\nChecking out modpack..."); string modpackPath = Path.Join(GetBuildSourcesPath(), "modpack"); DirectoryInfo modpack = new(modpackPath); - if (!modpack.Exists) { + if (!modpack.Exists) + { throw new("Modpack source directory does not exist. Modpack should be cloned before running a build."); } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs index 6539c46f..544b7587 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAir.cs @@ -1,22 +1,25 @@ using System; -using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods +{ [BuildStep(NAME)] - public class BuildStepBuildAir : ModBuildStep { + public class BuildStepBuildAir : ModBuildStep + { public const string NAME = "Build Air"; private const string MOD_NAME = "uksf_air"; - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { StepLogger.Log("Running build for Air"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@uksf_air"); string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf_air"); - if (IsBuildNeeded(MOD_NAME)) { + if (IsBuildNeeded(MOD_NAME)) + { StepLogger.LogSurround("\nRunning make.py..."); BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource); processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(1).TotalMilliseconds); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs index 2cdc2552..c06b21dd 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepNotify.cs @@ -6,23 +6,29 @@ using UKSF.Api.Discord.Services; using UKSF.Api.Modpack.Models; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common +{ [BuildStep(NAME)] - public class BuildStepNotify : BuildStep { + public class BuildStepNotify : BuildStep + { public const string NAME = "Notify"; private IDiscordService _discordService; private IReleaseService _releaseService; - protected override Task SetupExecute() { + protected override Task SetupExecute() + { _discordService = ServiceProvider.GetService(); _releaseService = ServiceProvider.GetService(); StepLogger.Log("Retrieved services"); return Task.CompletedTask; } - protected override async Task ProcessExecute() { - switch (Build.Environment) { - case GameEnvironment.RELEASE: { + protected override async Task ProcessExecute() + { + switch (Build.Environment) + { + case GameEnvironment.RELEASE: + { ModpackRelease release = _releaseService.GetRelease(Build.Version); await _discordService.SendMessageToEveryone(VariablesService.GetVariable("DID_C_MODPACK_RELEASE").AsUlong(), GetDiscordMessage(release)); break; @@ -37,13 +43,21 @@ protected override async Task ProcessExecute() { StepLogger.Log("Notifications sent"); } - private string GetBuildMessage() => $"New release candidate available for {Build.Version} on the rc repository"; + private string GetBuildMessage() + { + return $"New release candidate available for {Build.Version} on the rc repository"; + } - private string GetBuildLink() => $"https://uk-sf.co.uk/modpack/builds-rc?version={Build.Version}&build={Build.Id}"; + private string GetBuildLink() + { + return $"https://uk-sf.co.uk/modpack/builds-rc?version={Build.Version}&build={Build.Id}"; + } - private string GetDiscordMessage(ModpackRelease release = null) => - release == null + private string GetDiscordMessage(ModpackRelease release = null) + { + return release == null ? $"Modpack RC Build - {Build.Version} RC# {Build.BuildNumber}\n{GetBuildMessage()}\n<{GetBuildLink()}>" : $"Modpack Update - {release.Version}\nFull Changelog: \n\nSummary:\n```{release.Description}```"; + } } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs index b5f9fc23..a023e933 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/FileBuildStep.cs @@ -7,15 +7,21 @@ using Humanizer; using MoreLinq; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps { - public class FileBuildStep : BuildStep { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps +{ + public class FileBuildStep : BuildStep + { private const double FILE_COPY_TASK_SIZE_THRESHOLD = 5_000_000_000; private const double FILE_COPY_TASK_COUNT_THRESHOLD = 50; private const double FILE_DELETE_TASK_COUNT_THRESHOLD = 50; - internal static List GetDirectoryContents(DirectoryInfo source, string searchPattern = "*") => source.GetFiles(searchPattern, SearchOption.AllDirectories).ToList(); + internal static List GetDirectoryContents(DirectoryInfo source, string searchPattern = "*") + { + return source.GetFiles(searchPattern, SearchOption.AllDirectories).ToList(); + } - internal async Task AddFiles(string sourcePath, string targetPath) { + internal async Task AddFiles(string sourcePath, string targetPath) + { DirectoryInfo source = new(sourcePath); DirectoryInfo target = new(targetPath); IEnumerable sourceFiles = GetDirectoryContents(source); @@ -26,7 +32,8 @@ internal async Task AddFiles(string sourcePath, string targetPath) { await CopyFiles(source, target, addedFiles); } - internal async Task UpdateFiles(string sourcePath, string targetPath) { + internal async Task UpdateFiles(string sourcePath, string targetPath) + { DirectoryInfo source = new(sourcePath); DirectoryInfo target = new(targetPath); IEnumerable sourceFiles = GetDirectoryContents(source); @@ -37,15 +44,24 @@ internal async Task UpdateFiles(string sourcePath, string targetPath) { await CopyFiles(source, target, updatedFiles); } - internal async Task DeleteFiles(string sourcePath, string targetPath, bool matchSubdirectories = false) { + internal async Task DeleteFiles(string sourcePath, string targetPath, bool matchSubdirectories = false) + { DirectoryInfo source = new(sourcePath); DirectoryInfo target = new(targetPath); IEnumerable targetFiles = GetDirectoryContents(target); List deletedFiles = targetFiles.Select(targetFile => new { targetFile, sourceFile = new FileInfo(targetFile.FullName.Replace(target.FullName, source.FullName)) }) .Where( - x => { - if (x.sourceFile.Exists) return false; - if (!matchSubdirectories) return true; + x => + { + if (x.sourceFile.Exists) + { + return false; + } + + if (!matchSubdirectories) + { + return true; + } string sourceSubdirectoryPath = x.sourceFile.FullName.Replace(sourcePath, "") .Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries) @@ -60,31 +76,39 @@ internal async Task DeleteFiles(string sourcePath, string targetPath, bool match await DeleteEmptyDirectories(target); } - internal async Task CopyDirectory(string sourceDirectory, string targetDirectory) { + internal async Task CopyDirectory(string sourceDirectory, string targetDirectory) + { DirectoryInfo source = new(sourceDirectory); DirectoryInfo target = new(targetDirectory); List files = GetDirectoryContents(source); await CopyFiles(source, target, files); } - internal async Task CopyFiles(FileSystemInfo source, FileSystemInfo target, List files, bool flatten = false) { + internal async Task CopyFiles(FileSystemInfo source, FileSystemInfo target, List files, bool flatten = false) + { Directory.CreateDirectory(target.FullName); - if (files.Count == 0) { + if (files.Count == 0) + { StepLogger.Log("No files to copy"); return; } long totalSize = files.Select(x => x.Length).Sum(); - if (files.Count > FILE_COPY_TASK_COUNT_THRESHOLD || totalSize > FILE_COPY_TASK_SIZE_THRESHOLD) { + if (files.Count > FILE_COPY_TASK_COUNT_THRESHOLD || totalSize > FILE_COPY_TASK_SIZE_THRESHOLD) + { await ParallelCopyFiles(source, target, files, totalSize, flatten); - } else { + } + else + { SimpleCopyFiles(source, target, files, flatten); } } - internal async Task DeleteDirectoryContents(string path) { + internal async Task DeleteDirectoryContents(string path) + { DirectoryInfo directory = new(path); - if (!directory.Exists) { + if (!directory.Exists) + { StepLogger.Log("Directory does not exist"); return; } @@ -93,61 +117,82 @@ internal async Task DeleteDirectoryContents(string path) { await DeleteFiles(directory.GetFiles("*", SearchOption.AllDirectories).ToList()); } - internal void DeleteDirectories(List directories) { - if (directories.Count == 0) { + internal void DeleteDirectories(List directories) + { + if (directories.Count == 0) + { StepLogger.Log("No directories to delete"); return; } - foreach (DirectoryInfo directory in directories) { + foreach (DirectoryInfo directory in directories) + { CancellationTokenSource.Token.ThrowIfCancellationRequested(); StepLogger.Log($"Deleting directory: {directory}"); directory.Delete(true); } } - internal async Task DeleteFiles(List files) { - if (files.Count == 0) { + internal async Task DeleteFiles(List files) + { + if (files.Count == 0) + { StepLogger.Log("No files to delete"); return; } - if (files.Count > FILE_DELETE_TASK_COUNT_THRESHOLD) { + if (files.Count > FILE_DELETE_TASK_COUNT_THRESHOLD) + { await ParallelDeleteFiles(files); - } else { + } + else + { SimpleDeleteFiles(files); } } - internal async Task DeleteEmptyDirectories(DirectoryInfo directory) { - foreach (DirectoryInfo subDirectory in directory.GetDirectories()) { + internal async Task DeleteEmptyDirectories(DirectoryInfo directory) + { + foreach (DirectoryInfo subDirectory in directory.GetDirectories()) + { await DeleteEmptyDirectories(subDirectory); - if (subDirectory.GetFiles().Length == 0 && subDirectory.GetDirectories().Length == 0) { + if (subDirectory.GetFiles().Length == 0 && subDirectory.GetDirectories().Length == 0) + { StepLogger.Log($"Deleting directory: {subDirectory}"); subDirectory.Delete(false); } } } - internal async Task ParallelProcessFiles(IEnumerable files, int taskLimit, Func process, Func getLog, string error) { + internal async Task ParallelProcessFiles(IEnumerable files, int taskLimit, Func process, Func getLog, string error) + { SemaphoreSlim taskLimiter = new(taskLimit); IEnumerable tasks = files.Select( - file => { + file => + { return Task.Run( - async () => { + async () => + { CancellationTokenSource.Token.ThrowIfCancellationRequested(); - try { + try + { await taskLimiter.WaitAsync(CancellationTokenSource.Token); CancellationTokenSource.Token.ThrowIfCancellationRequested(); await process(file); StepLogger.LogInline(getLog()); - } catch (OperationCanceledException) { + } + catch (OperationCanceledException) + { throw; - } catch (Exception exception) { + } + catch (Exception exception) + { throw new Exception($"{error} '{file}'\n{exception.Message}{(exception.InnerException != null ? $"\n{exception.InnerException.Message}" : "")}", exception); - } finally { + } + finally + { taskLimiter.Release(); } }, @@ -160,20 +205,28 @@ internal async Task ParallelProcessFiles(IEnumerable files, int taskLi await Task.WhenAll(tasks); } - internal async Task BatchProcessFiles(IEnumerable files, int batchSize, Func process, Func getLog, string error) { + internal async Task BatchProcessFiles(IEnumerable files, int batchSize, Func process, Func getLog, string error) + { StepLogger.Log(getLog()); IEnumerable> fileBatches = files.Batch(batchSize); - foreach (IEnumerable fileBatch in fileBatches) { + foreach (IEnumerable fileBatch in fileBatches) + { List fileList = fileBatch.ToList(); IEnumerable tasks = fileList.Select( - async file => { - try { + async file => + { + try + { CancellationTokenSource.Token.ThrowIfCancellationRequested(); await process(file); - } catch (OperationCanceledException) { + } + catch (OperationCanceledException) + { throw; - } catch (Exception exception) { - throw new Exception($"{error} '{file}'\n{exception.Message}{(exception.InnerException != null ? $"\n{exception.InnerException.Message}" : "")}", exception); + } + catch (Exception exception) + { + throw new($"{error} '{file}'\n{exception.Message}{(exception.InnerException != null ? $"\n{exception.InnerException.Message}" : "")}", exception); } } ); @@ -182,8 +235,10 @@ internal async Task BatchProcessFiles(IEnumerable files, int batchSize } } - private void SimpleCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, bool flatten = false) { - foreach (FileInfo file in files) { + private void SimpleCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, bool flatten = false) + { + foreach (FileInfo file in files) + { CancellationTokenSource.Token.ThrowIfCancellationRequested(); string targetFile = flatten ? Path.Join(target.FullName, file.Name) : file.FullName.Replace(source.FullName, target.FullName); StepLogger.Log($"Copying '{file}' to '{target.FullName}'"); @@ -192,13 +247,15 @@ private void SimpleCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnum } } - private async Task ParallelCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, long totalSize, bool flatten = false) { + private async Task ParallelCopyFiles(FileSystemInfo source, FileSystemInfo target, IEnumerable files, long totalSize, bool flatten = false) + { long copiedSize = 0; string totalSizeString = totalSize.Bytes().ToString("#.#"); await BatchProcessFiles( files, 10, - file => { + file => + { string targetFile = flatten ? Path.Join(target.FullName, file.Name) : file.FullName.Replace(source.FullName, target.FullName); Directory.CreateDirectory(Path.GetDirectoryName(targetFile)); file.CopyTo(targetFile, true); @@ -210,21 +267,25 @@ await BatchProcessFiles( ); } - private void SimpleDeleteFiles(IEnumerable files) { - foreach (FileInfo file in files) { + private void SimpleDeleteFiles(IEnumerable files) + { + foreach (FileInfo file in files) + { CancellationTokenSource.Token.ThrowIfCancellationRequested(); StepLogger.Log($"Deleting file: {file}"); file.Delete(); } } - private async Task ParallelDeleteFiles(IReadOnlyCollection files) { + private async Task ParallelDeleteFiles(IReadOnlyCollection files) + { int deleted = 0; int total = files.Count; await BatchProcessFiles( files, 10, - file => { + file => + { file.Delete(); Interlocked.Increment(ref deleted); return Task.CompletedTask; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ModBuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ModBuildStep.cs index 8a932f7c..3db5c607 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ModBuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ModBuildStep.cs @@ -1,18 +1,23 @@ using System.Threading.Tasks; using UKSF.Api.Admin.Extensions; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps { - public class ModBuildStep : FileBuildStep { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps +{ + public class ModBuildStep : FileBuildStep + { protected string PythonPath; - protected override Task SetupExecute() { + protected override Task SetupExecute() + { PythonPath = VariablesService.GetVariable("BUILD_PATH_PYTHON").AsString(); StepLogger.Log("Retrieved python path"); return Task.CompletedTask; } - internal bool IsBuildNeeded(string key) { - if (!GetEnvironmentVariable($"{key}_updated")) { + internal bool IsBuildNeeded(string key) + { + if (!GetEnvironmentVariable($"{key}_updated")) + { StepLogger.Log("\nBuild is not needed"); return false; } @@ -20,6 +25,9 @@ internal bool IsBuildNeeded(string key) { return true; } - internal static string MakeCommand(string arguments = "") => $"make.py {arguments}"; + internal static string MakeCommand(string arguments = "") + { + return $"make.py {arguments}"; + } } } diff --git a/UKSF.Api.Modpack/Services/BuildsService.cs b/UKSF.Api.Modpack/Services/BuildsService.cs index 760c74f8..81347bbc 100644 --- a/UKSF.Api.Modpack/Services/BuildsService.cs +++ b/UKSF.Api.Modpack/Services/BuildsService.cs @@ -11,8 +11,10 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Modpack.Services { - public interface IBuildsService { +namespace UKSF.Api.Modpack.Services +{ + public interface IBuildsService + { IEnumerable GetDevBuilds(); IEnumerable GetRcBuilds(); ModpackBuild GetLatestDevBuild(); @@ -30,14 +32,16 @@ public interface IBuildsService { void CancelInterruptedBuilds(); } - public class BuildsService : IBuildsService { + public class BuildsService : IBuildsService + { private readonly IAccountContext _accountContext; private readonly IBuildsContext _buildsContext; private readonly IBuildStepService _buildStepService; private readonly IHttpContextService _httpContextService; private readonly ILogger _logger; - public BuildsService(IBuildsContext buildsContext, IBuildStepService buildStepService, IAccountContext accountContext, IHttpContextService httpContextService, ILogger logger) { + public BuildsService(IBuildsContext buildsContext, IBuildStepService buildStepService, IAccountContext accountContext, IHttpContextService httpContextService, ILogger logger) + { _buildsContext = buildsContext; _buildStepService = buildStepService; _accountContext = accountContext; @@ -45,26 +49,42 @@ public BuildsService(IBuildsContext buildsContext, IBuildStepService buildStepSe _logger = logger; } - public async Task UpdateBuild(ModpackBuild build, UpdateDefinition updateDefinition) { + public async Task UpdateBuild(ModpackBuild build, UpdateDefinition updateDefinition) + { await _buildsContext.Update(build, updateDefinition); } - public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep) { + public async Task UpdateBuildStep(ModpackBuild build, ModpackBuildStep buildStep) + { await _buildsContext.Update(build, buildStep); } - public IEnumerable GetDevBuilds() => _buildsContext.Get(x => x.Environment == GameEnvironment.DEV); + public IEnumerable GetDevBuilds() + { + return _buildsContext.Get(x => x.Environment == GameEnvironment.DEV); + } - public IEnumerable GetRcBuilds() => _buildsContext.Get(x => x.Environment != GameEnvironment.DEV); + public IEnumerable GetRcBuilds() + { + return _buildsContext.Get(x => x.Environment != GameEnvironment.DEV); + } - public ModpackBuild GetLatestDevBuild() => GetDevBuilds().FirstOrDefault(); + public ModpackBuild GetLatestDevBuild() + { + return GetDevBuilds().FirstOrDefault(); + } - public ModpackBuild GetLatestRcBuild(string version) => GetRcBuilds().FirstOrDefault(x => x.Version == version); + public ModpackBuild GetLatestRcBuild(string version) + { + return GetRcBuilds().FirstOrDefault(x => x.Version == version); + } - public async Task CreateDevBuild(string version, GithubCommit commit, NewBuild newBuild = null) { + public async Task CreateDevBuild(string version, GithubCommit commit, NewBuild newBuild = null) + { ModpackBuild previousBuild = GetLatestDevBuild(); string builderId = _accountContext.GetSingle(x => x.Email == commit.Author)?.Id; - ModpackBuild build = new() { + ModpackBuild build = new() + { Version = version, BuildNumber = previousBuild?.BuildNumber + 1 ?? 1, Environment = GameEnvironment.DEV, @@ -73,7 +93,8 @@ public async Task CreateDevBuild(string version, GithubCommit comm Steps = _buildStepService.GetSteps(GameEnvironment.DEV) }; - if (previousBuild != null) { + if (previousBuild != null) + { SetEnvironmentVariables(build, previousBuild, newBuild); } @@ -81,10 +102,12 @@ public async Task CreateDevBuild(string version, GithubCommit comm return build; } - public async Task CreateRcBuild(string version, GithubCommit commit) { + public async Task CreateRcBuild(string version, GithubCommit commit) + { ModpackBuild previousBuild = GetLatestRcBuild(version); string builderId = _accountContext.GetSingle(x => x.Email == commit.Author)?.Id; - ModpackBuild build = new() { + ModpackBuild build = new() + { Version = version, BuildNumber = previousBuild?.BuildNumber + 1 ?? 1, Environment = GameEnvironment.RC, @@ -93,7 +116,8 @@ public async Task CreateRcBuild(string version, GithubCommit commi Steps = _buildStepService.GetSteps(GameEnvironment.RC) }; - if (previousBuild != null) { + if (previousBuild != null) + { SetEnvironmentVariables(build, previousBuild); } @@ -101,14 +125,17 @@ public async Task CreateRcBuild(string version, GithubCommit commi return build; } - public async Task CreateReleaseBuild(string version) { + public async Task CreateReleaseBuild(string version) + { // There must be at least one RC build to release ModpackBuild previousBuild = GetRcBuilds().FirstOrDefault(x => x.Version == version); - if (previousBuild == null) { + if (previousBuild == null) + { throw new InvalidOperationException("Release build requires at leaste one RC build"); } - ModpackBuild build = new() { + ModpackBuild build = new() + { Version = version, BuildNumber = previousBuild.BuildNumber + 1, Environment = GameEnvironment.RELEASE, @@ -121,9 +148,11 @@ public async Task CreateReleaseBuild(string version) { return build; } - public async Task CreateRebuild(ModpackBuild build, string newSha = "") { + public async Task CreateRebuild(ModpackBuild build, string newSha = "") + { ModpackBuild latestBuild = build.Environment == GameEnvironment.DEV ? GetLatestDevBuild() : GetLatestRcBuild(build.Version); - ModpackBuild rebuild = new() { + ModpackBuild rebuild = new() + { Version = latestBuild.Environment == GameEnvironment.DEV ? null : latestBuild.Version, BuildNumber = latestBuild.BuildNumber + 1, IsRebuild = true, @@ -133,7 +162,8 @@ public async Task CreateRebuild(ModpackBuild build, string newSha BuilderId = _httpContextService.GetUserId(), EnvironmentVariables = latestBuild.EnvironmentVariables }; - if (!string.IsNullOrEmpty(newSha)) { + if (!string.IsNullOrEmpty(newSha)) + { rebuild.Commit.After = newSha; } @@ -144,32 +174,42 @@ public async Task CreateRebuild(ModpackBuild build, string newSha return rebuild; } - public async Task SetBuildRunning(ModpackBuild build) { + public async Task SetBuildRunning(ModpackBuild build) + { build.Running = true; build.StartTime = DateTime.Now; await _buildsContext.Update(build, Builders.Update.Set(x => x.Running, true).Set(x => x.StartTime, DateTime.Now)); } - public async Task SucceedBuild(ModpackBuild build) { + public async Task SucceedBuild(ModpackBuild build) + { await FinishBuild(build, build.Steps.Any(x => x.BuildResult == ModpackBuildResult.WARNING) ? ModpackBuildResult.WARNING : ModpackBuildResult.SUCCESS); } - public async Task FailBuild(ModpackBuild build) { + public async Task FailBuild(ModpackBuild build) + { await FinishBuild(build, ModpackBuildResult.FAILED); } - public async Task CancelBuild(ModpackBuild build) { + public async Task CancelBuild(ModpackBuild build) + { await FinishBuild(build, build.Steps.Any(x => x.BuildResult == ModpackBuildResult.WARNING) ? ModpackBuildResult.WARNING : ModpackBuildResult.CANCELLED); } - public void CancelInterruptedBuilds() { + public void CancelInterruptedBuilds() + { List builds = _buildsContext.Get(x => x.Running || x.Steps.Any(y => y.Running)).ToList(); - if (!builds.Any()) return; + if (!builds.Any()) + { + return; + } IEnumerable tasks = builds.Select( - async build => { + async build => + { ModpackBuildStep runningStep = build.Steps.FirstOrDefault(x => x.Running); - if (runningStep != null) { + if (runningStep != null) + { runningStep.Running = false; runningStep.Finished = true; runningStep.EndTime = DateTime.Now; @@ -185,7 +225,8 @@ public void CancelInterruptedBuilds() { _logger.LogAudit($"Marked {builds.Count} interrupted builds as cancelled", "SERVER"); } - private async Task FinishBuild(ModpackBuild build, ModpackBuildResult result) { + private async Task FinishBuild(ModpackBuild build, ModpackBuildResult result) + { build.Running = false; build.Finished = true; build.BuildResult = result; @@ -193,23 +234,29 @@ private async Task FinishBuild(ModpackBuild build, ModpackBuildResult result) { await _buildsContext.Update(build, Builders.Update.Set(x => x.Running, false).Set(x => x.Finished, true).Set(x => x.BuildResult, result).Set(x => x.EndTime, DateTime.Now)); } - private static void SetEnvironmentVariables(ModpackBuild build, ModpackBuild previousBuild, NewBuild newBuild = null) { + private static void SetEnvironmentVariables(ModpackBuild build, ModpackBuild previousBuild, NewBuild newBuild = null) + { CheckEnvironmentVariable(build, previousBuild, "ace_updated", "Build ACE", newBuild?.Ace ?? false); CheckEnvironmentVariable(build, previousBuild, "acre_updated", "Build ACRE", newBuild?.Acre ?? false); CheckEnvironmentVariable(build, previousBuild, "air_updated", "Build Air", newBuild?.Air ?? false); } - private static void CheckEnvironmentVariable(ModpackBuild build, ModpackBuild previousBuild, string key, string stepName, bool force) { - if (force) { + private static void CheckEnvironmentVariable(ModpackBuild build, ModpackBuild previousBuild, string key, string stepName, bool force) + { + if (force) + { build.EnvironmentVariables[key] = true; return; } - if (previousBuild.EnvironmentVariables.ContainsKey(key)) { + if (previousBuild.EnvironmentVariables.ContainsKey(key)) + { bool updated = (bool) previousBuild.EnvironmentVariables[key]; - if (updated) { + if (updated) + { ModpackBuildStep step = previousBuild.Steps.FirstOrDefault(x => x.Name == stepName); - if (step != null && (!step.Finished || step.BuildResult == ModpackBuildResult.FAILED || step.BuildResult == ModpackBuildResult.CANCELLED)) { + if (step != null && (!step.Finished || step.BuildResult == ModpackBuildResult.FAILED || step.BuildResult == ModpackBuildResult.CANCELLED)) + { build.EnvironmentVariables[key] = true; } } diff --git a/UKSF.Api.Modpack/Services/ModpackService.cs b/UKSF.Api.Modpack/Services/ModpackService.cs index 085c42be..78901876 100644 --- a/UKSF.Api.Modpack/Services/ModpackService.cs +++ b/UKSF.Api.Modpack/Services/ModpackService.cs @@ -10,8 +10,10 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Modpack.Services { - public interface IModpackService { +namespace UKSF.Api.Modpack.Services +{ + public interface IModpackService + { IEnumerable GetReleases(); IEnumerable GetRcBuilds(); IEnumerable GetDevBuilds(); @@ -28,7 +30,8 @@ public interface IModpackService { void RunQueuedBuilds(); } - public class ModpackService : IModpackService { + public class ModpackService : IModpackService + { private readonly IBuildQueueService _buildQueueService; private readonly IBuildsContext _buildsContext; private readonly IBuildsService _buildsService; @@ -47,7 +50,8 @@ public ModpackService( IGithubService githubService, IHttpContextService httpContextService, ILogger logger - ) { + ) + { _releasesContext = releasesContext; _buildsContext = buildsContext; _releaseService = releaseService; @@ -58,19 +62,36 @@ ILogger logger _logger = logger; } - public IEnumerable GetReleases() => _releasesContext.Get(); + public IEnumerable GetReleases() + { + return _releasesContext.Get(); + } - public IEnumerable GetRcBuilds() => _buildsService.GetRcBuilds(); + public IEnumerable GetRcBuilds() + { + return _buildsService.GetRcBuilds(); + } - public IEnumerable GetDevBuilds() => _buildsService.GetDevBuilds(); + public IEnumerable GetDevBuilds() + { + return _buildsService.GetDevBuilds(); + } - public ModpackRelease GetRelease(string version) => _releaseService.GetRelease(version); + public ModpackRelease GetRelease(string version) + { + return _releaseService.GetRelease(version); + } - public ModpackBuild GetBuild(string id) => _buildsContext.GetSingle(x => x.Id == id); + public ModpackBuild GetBuild(string id) + { + return _buildsContext.GetSingle(x => x.Id == id); + } - public async Task NewBuild(NewBuild newBuild) { + public async Task NewBuild(NewBuild newBuild) + { GithubCommit commit = await _githubService.GetLatestReferenceCommit(newBuild.Reference); - if (!string.IsNullOrEmpty(_httpContextService.GetUserId())) { + if (!string.IsNullOrEmpty(_httpContextService.GetUserId())) + { commit.Author = _httpContextService.GetUserEmail(); } @@ -80,36 +101,44 @@ public async Task NewBuild(NewBuild newBuild) { _buildQueueService.QueueBuild(build); } - public async Task Rebuild(ModpackBuild build) { + public async Task Rebuild(ModpackBuild build) + { _logger.LogAudit($"Rebuild triggered for {GetBuildName(build)}."); ModpackBuild rebuild = await _buildsService.CreateRebuild(build, build.Commit.Branch == "None" ? string.Empty : (await _githubService.GetLatestReferenceCommit(build.Commit.Branch)).After); _buildQueueService.QueueBuild(rebuild); } - public async Task CancelBuild(ModpackBuild build) { + public async Task CancelBuild(ModpackBuild build) + { _logger.LogAudit($"Build {GetBuildName(build)} cancelled"); - if (_buildQueueService.CancelQueued(build.Id)) { + if (_buildQueueService.CancelQueued(build.Id)) + { await _buildsService.CancelBuild(build); - } else { + } + else + { _buildQueueService.Cancel(build.Id); } } - public async Task UpdateReleaseDraft(ModpackRelease release) { + public async Task UpdateReleaseDraft(ModpackRelease release) + { _logger.LogAudit($"Release {release.Version} draft updated"); await _releaseService.UpdateDraft(release); } - public async Task Release(string version) { + public async Task Release(string version) + { ModpackBuild releaseBuild = await _buildsService.CreateReleaseBuild(version); _buildQueueService.QueueBuild(releaseBuild); _logger.LogAudit($"{version} released"); } - public async Task RegnerateReleaseDraftChangelog(string version) { + public async Task RegnerateReleaseDraftChangelog(string version) + { ModpackRelease release = _releaseService.GetRelease(version); string newChangelog = await _githubService.GenerateChangelog(version); release.Changelog = newChangelog; @@ -118,24 +147,28 @@ public async Task RegnerateReleaseDraftChangelog(string version) { await _releaseService.UpdateDraft(release); } - public async Task CreateDevBuildFromPush(PushWebhookPayload payload) { + public async Task CreateDevBuildFromPush(PushWebhookPayload payload) + { GithubCommit devCommit = await _githubService.GetPushEvent(payload); string version = await _githubService.GetReferenceVersion(payload.Ref); ModpackBuild devBuild = await _buildsService.CreateDevBuild(version, devCommit); _buildQueueService.QueueBuild(devBuild); } - public async Task CreateRcBuildFromPush(PushWebhookPayload payload) { + public async Task CreateRcBuildFromPush(PushWebhookPayload payload) + { string rcVersion = await _githubService.GetReferenceVersion(payload.Ref); ModpackRelease release = _releaseService.GetRelease(rcVersion); - if (release != null && !release.IsDraft) { + if (release != null && !release.IsDraft) + { _logger.LogWarning($"An attempt to build a release candidate for version {rcVersion} failed because the version has already been released."); return; } ModpackBuild previousBuild = _buildsService.GetLatestRcBuild(rcVersion); GithubCommit rcCommit = await _githubService.GetPushEvent(payload, previousBuild != null ? previousBuild.Commit.After : string.Empty); - if (previousBuild == null) { + if (previousBuild == null) + { await _releaseService.MakeDraftRelease(rcVersion, rcCommit); } @@ -143,22 +176,30 @@ public async Task CreateRcBuildFromPush(PushWebhookPayload payload) { _buildQueueService.QueueBuild(rcBuild); } - public void RunQueuedBuilds() { + public void RunQueuedBuilds() + { List builds = _buildsService.GetDevBuilds().Where(x => !x.Finished && !x.Running).ToList(); builds = builds.Concat(_buildsService.GetRcBuilds().Where(x => !x.Finished && !x.Running)).ToList(); - if (!builds.Any()) return; + if (!builds.Any()) + { + return; + } - foreach (ModpackBuild build in builds) { + foreach (ModpackBuild build in builds) + { _buildQueueService.QueueBuild(build); } } - private static string GetBuildName(ModpackBuild build) => - build.Environment switch { + private static string GetBuildName(ModpackBuild build) + { + return build.Environment switch + { GameEnvironment.RELEASE => $"release {build.Version}", GameEnvironment.RC => $"{build.Version} RC# {build.BuildNumber}", GameEnvironment.DEV => $"#{build.BuildNumber}", _ => throw new ArgumentException("Invalid build environment") }; + } } } diff --git a/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj b/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj index 99e56cb5..d5333392 100644 --- a/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj +++ b/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj @@ -1,7 +1,7 @@ - netcoreapp5.0 + net5.0 Library @@ -13,9 +13,9 @@ - - - + + + diff --git a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs index a264d54b..cb2ce76c 100644 --- a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs +++ b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs @@ -1,5 +1,4 @@ -using AutoMapper; -using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Personnel.Context; @@ -9,50 +8,63 @@ using UKSF.Api.Personnel.Services; using UKSF.Api.Personnel.Signalr.Hubs; -namespace UKSF.Api.Personnel { - public static class ApiPersonnelExtensions { - public static IServiceCollection AddUksfPersonnel(this IServiceCollection services) => - services.AddContexts() - .AddEventHandlers() - .AddServices() - .AddActions() - .AddTransient() - .AddAutoMapper(typeof(AutoMapperUnitProfile)); +namespace UKSF.Api.Personnel +{ + public static class ApiPersonnelExtensions + { + public static IServiceCollection AddUksfPersonnel(this IServiceCollection services) + { + return services.AddContexts() + .AddEventHandlers() + .AddServices() + .AddActions() + .AddTransient() + .AddAutoMapper(typeof(AutoMapperUnitProfile)); + } - private static IServiceCollection AddContexts(this IServiceCollection services) => - services.AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton(); + private static IServiceCollection AddContexts(this IServiceCollection services) + { + return services.AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); + } - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => - services.AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton(); + private static IServiceCollection AddEventHandlers(this IServiceCollection services) + { + return services.AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); + } - private static IServiceCollection AddServices(this IServiceCollection services) => - services.AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton(); + private static IServiceCollection AddServices(this IServiceCollection services) + { + return services.AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); + } - private static IServiceCollection AddActions(this IServiceCollection services) => - services.AddSingleton().AddSingleton(); + private static IServiceCollection AddActions(this IServiceCollection services) + { + return services.AddSingleton().AddSingleton(); + } - public static void AddUksfPersonnelSignalr(this IEndpointRouteBuilder builder) { + public static void AddUksfPersonnelSignalr(this IEndpointRouteBuilder builder) + { builder.MapHub($"/hub/{AccountHub.END_POINT}"); builder.MapHub($"/hub/{CommentThreadHub.END_POINT}"); builder.MapHub($"/hub/{NotificationHub.END_POINT}"); diff --git a/UKSF.Api.Personnel/Context/RanksContext.cs b/UKSF.Api.Personnel/Context/RanksContext.cs index 845bac9f..66250540 100644 --- a/UKSF.Api.Personnel/Context/RanksContext.cs +++ b/UKSF.Api.Personnel/Context/RanksContext.cs @@ -5,19 +5,27 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Personnel.Context { - public interface IRanksContext : IMongoContext, ICachedMongoContext { +namespace UKSF.Api.Personnel.Context +{ + public interface IRanksContext : IMongoContext, ICachedMongoContext + { new IEnumerable Get(); new Rank GetSingle(string name); } - public class RanksContext : CachedMongoContext, IRanksContext { + public class RanksContext : CachedMongoContext, IRanksContext + { public RanksContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "ranks") { } - public override Rank GetSingle(string name) => GetSingle(x => x.Name == name); + public override Rank GetSingle(string name) + { + return GetSingle(x => x.Name == name); + } - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { + protected override void SetCache(IEnumerable newCollection) + { + lock (LockObject) + { Cache = newCollection?.OrderBy(x => x.Order).ToList(); } } diff --git a/UKSF.Api.Personnel/Context/RolesContext.cs b/UKSF.Api.Personnel/Context/RolesContext.cs index 5af52281..c127e5de 100644 --- a/UKSF.Api.Personnel/Context/RolesContext.cs +++ b/UKSF.Api.Personnel/Context/RolesContext.cs @@ -5,19 +5,27 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Personnel.Context { - public interface IRolesContext : IMongoContext, ICachedMongoContext { +namespace UKSF.Api.Personnel.Context +{ + public interface IRolesContext : IMongoContext, ICachedMongoContext + { new IEnumerable Get(); new Role GetSingle(string name); } - public class RolesContext : CachedMongoContext, IRolesContext { + public class RolesContext : CachedMongoContext, IRolesContext + { public RolesContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "roles") { } - public override Role GetSingle(string name) => GetSingle(x => x.Name == name); + public override Role GetSingle(string name) + { + return GetSingle(x => x.Name == name); + } - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { + protected override void SetCache(IEnumerable newCollection) + { + lock (LockObject) + { Cache = newCollection?.OrderBy(x => x.Name).ToList(); } } diff --git a/UKSF.Api.Personnel/Controllers/CommunicationsController.cs b/UKSF.Api.Personnel/Controllers/CommunicationsController.cs index 0874eece..12652f14 100644 --- a/UKSF.Api.Personnel/Controllers/CommunicationsController.cs +++ b/UKSF.Api.Personnel/Controllers/CommunicationsController.cs @@ -12,14 +12,16 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ // TODO: Needs to be renamed and singled out. Won't be any other communication connections to add [Route("[controller]")] - public class CommunicationsController : Controller { + public class CommunicationsController : Controller + { private readonly IAccountContext _accountContext; - private readonly IEventBus _eventBus; private readonly IAccountService _accountService; private readonly IConfirmationCodeService _confirmationCodeService; + private readonly IEventBus _eventBus; private readonly ILogger _logger; private readonly INotificationsService _notificationsService; @@ -30,7 +32,8 @@ public CommunicationsController( INotificationsService notificationsService, ILogger logger, IEventBus eventBus - ) { + ) + { _accountContext = accountContext; _confirmationCodeService = confirmationCodeService; _accountService = accountService; @@ -40,51 +43,65 @@ IEventBus eventBus } [HttpGet, Authorize] - public IActionResult GetTeamspeakStatus() => Ok(new { isConnected = _accountService.GetUserAccount().TeamspeakIdentities?.Count > 0 }); + public IActionResult GetTeamspeakStatus() + { + return Ok(new { isConnected = _accountService.GetUserAccount().TeamspeakIdentities?.Count > 0 }); + } [HttpPost("send"), Authorize] - public async Task SendCode([FromBody] JObject body) { + public async Task SendCode([FromBody] JObject body) + { string mode = body.GetValueFromBody("mode"); string data = body.GetValueFromBody("data"); - try { + try + { GuardUtilites.ValidateString(mode, _ => throw new ArgumentException("Mode is invalid")); GuardUtilites.ValidateString(data, _ => throw new ArgumentException("Data is invalid")); - } catch (ArgumentException exception) { + } + catch (ArgumentException exception) + { return BadRequest(new { error = exception.Message }); } - return mode switch { + return mode switch + { "teamspeak" => await SendTeamspeakCode(data), _ => BadRequest(new { error = $"Mode '{mode}' not recognized" }) }; } [HttpPost("receive"), Authorize] - public async Task ReceiveCode([FromBody] JObject body) { + public async Task ReceiveCode([FromBody] JObject body) + { string id = body.GetValueFromBody("id"); string code = body.GetValueFromBody("code"); string mode = body.GetValueFromBody("mode"); string data = body.GetValueFromBody("data"); string[] dataArray = data.Split(','); - try { + try + { GuardUtilites.ValidateId(id, _ => throw new ArgumentException($"Id '{id}' is invalid")); GuardUtilites.ValidateId(code, _ => throw new ArgumentException($"Code '{code}' is invalid. Please try again")); GuardUtilites.ValidateString(mode, _ => throw new ArgumentException("Mode is invalid")); GuardUtilites.ValidateString(data, _ => throw new ArgumentException("Data is invalid")); GuardUtilites.ValidateArray(dataArray, x => x.Length > 0, _ => true, () => throw new ArgumentException("Data array is empty")); - } catch (ArgumentException exception) { + } + catch (ArgumentException exception) + { return BadRequest(new { error = exception.Message }); } - return mode switch { + return mode switch + { "teamspeak" => await ReceiveTeamspeakCode(id, code, dataArray[0]), _ => BadRequest(new { error = $"Mode '{mode}' not recognized" }) }; } - private async Task SendTeamspeakCode(string teamspeakDbId) { + private async Task SendTeamspeakCode(string teamspeakDbId) + { string code = await _confirmationCodeService.CreateConfirmationCode(teamspeakDbId); _notificationsService.SendTeamspeakNotification( new HashSet { teamspeakDbId.ToDouble() }, @@ -93,14 +110,16 @@ private async Task SendTeamspeakCode(string teamspeakDbId) { return Ok(); } - private async Task ReceiveTeamspeakCode(string id, string code, string checkId) { + private async Task ReceiveTeamspeakCode(string id, string code, string checkId) + { Account account = _accountContext.GetSingle(id); string teamspeakId = await _confirmationCodeService.GetConfirmationCode(code); - if (string.IsNullOrWhiteSpace(teamspeakId) || teamspeakId != checkId) { + if (string.IsNullOrWhiteSpace(teamspeakId) || teamspeakId != checkId) + { return BadRequest(new { error = "The confirmation code has expired or is invalid. Please try again" }); } - account.TeamspeakIdentities ??= new HashSet(); + account.TeamspeakIdentities ??= new(); account.TeamspeakIdentities.Add(double.Parse(teamspeakId)); await _accountContext.Update(account.Id, Builders.Update.Set("teamspeakIdentities", account.TeamspeakIdentities)); account = _accountContext.GetSingle(account.Id); diff --git a/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs b/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs index 13d2a6e4..b4960a8b 100644 --- a/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs +++ b/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Net.Http; -using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; using System.Web; @@ -13,9 +12,11 @@ using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ [Route("[controller]")] - public class DiscordConnectionController : Controller { + public class DiscordConnectionController : Controller + { private readonly string _botToken; private readonly string _clientId; private readonly string _clientSecret; @@ -32,7 +33,8 @@ public DiscordConnectionController( IHostEnvironment currentEnvironment, IVariablesService variablesService, ILogger logger - ) { + ) + { _confirmationCodeService = confirmationCodeService; _variablesService = variablesService; _logger = logger; @@ -45,30 +47,41 @@ ILogger logger } [HttpGet] - public IActionResult Get() => - Redirect( + public IActionResult Get() + { + return Redirect( $"https://discord.com/api/oauth2/authorize?client_id={_clientId}&redirect_uri={HttpUtility.UrlEncode($"{_url}/discordconnection/success")}&response_type=code&scope=identify%20guilds.join" ); + } [HttpGet("application")] - public IActionResult GetFromApplication() => - Redirect( + public IActionResult GetFromApplication() + { + return Redirect( $"https://discord.com/api/oauth2/authorize?client_id={_clientId}&redirect_uri={HttpUtility.UrlEncode($"{_url}/discordconnection/success/application")}&response_type=code&scope=identify%20guilds.join" ); + } [HttpGet("success")] - public async Task Success([FromQuery] string code) => Redirect($"{_urlReturn}/profile?{await GetUrlParameters(code, $"{_url}/discordconnection/success")}"); + public async Task Success([FromQuery] string code) + { + return Redirect($"{_urlReturn}/profile?{await GetUrlParameters(code, $"{_url}/discordconnection/success")}"); + } [HttpGet("success/application")] - public async Task SuccessFromApplication([FromQuery] string code) => - Redirect($"{_urlReturn}/application?{await GetUrlParameters(code, $"{_url}/discordconnection/success/application")}"); + public async Task SuccessFromApplication([FromQuery] string code) + { + return Redirect($"{_urlReturn}/application?{await GetUrlParameters(code, $"{_url}/discordconnection/success/application")}"); + } - private async Task GetUrlParameters(string code, string redirectUrl) { + private async Task GetUrlParameters(string code, string redirectUrl) + { using HttpClient client = new(); HttpResponseMessage response = await client.PostAsync( "https://discord.com/api/oauth2/token", new FormUrlEncodedContent( - new Dictionary { + new Dictionary + { { "client_id", _clientId }, { "client_secret", _clientSecret }, { "grant_type", "authorization_code" }, @@ -79,34 +92,38 @@ private async Task GetUrlParameters(string code, string redirectUrl) { ) ); string result = await response.Content.ReadAsStringAsync(); - if (!response.IsSuccessStatusCode) { + if (!response.IsSuccessStatusCode) + { _logger.LogWarning($"A discord connection request was denied by the user, or an error occurred: {result}"); return "discordid=fail"; } string token = JObject.Parse(result)["access_token"]?.ToString(); - if (string.IsNullOrEmpty(token)) { + if (string.IsNullOrEmpty(token)) + { _logger.LogWarning("A discord connection request failed. Could not get access token"); return "discordid=fail"; } - client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token); + client.DefaultRequestHeaders.Authorization = new("Bearer", token); response = await client.GetAsync("https://discord.com/api/users/@me"); result = await response.Content.ReadAsStringAsync(); string id = JObject.Parse(result)["id"]?.ToString(); string username = JObject.Parse(result)["username"]?.ToString(); - if (string.IsNullOrEmpty(id) || string.IsNullOrEmpty(username)) { + if (string.IsNullOrEmpty(id) || string.IsNullOrEmpty(username)) + { _logger.LogWarning($"A discord connection request failed. Could not get username ({username}) or id ({id}) or an error occurred: {result}"); return "discordid=fail"; } - client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bot", _botToken); + client.DefaultRequestHeaders.Authorization = new("Bot", _botToken); response = await client.PutAsync( $"https://discord.com/api/guilds/{_variablesService.GetVariable("DID_SERVER").AsUlong()}/members/{id}", new StringContent($"{{\"access_token\":\"{token}\"}}", Encoding.UTF8, "application/json") ); string added = "true"; - if (!response.IsSuccessStatusCode) { + if (!response.IsSuccessStatusCode) + { _logger.LogWarning($"Failed to add '{username}' to guild: {response.StatusCode}, {response.Content.ReadAsStringAsync().Result}"); added = "false"; } diff --git a/UKSF.Api.Personnel/Controllers/DisplayNameController.cs b/UKSF.Api.Personnel/Controllers/DisplayNameController.cs index 18a12f40..25c0381f 100644 --- a/UKSF.Api.Personnel/Controllers/DisplayNameController.cs +++ b/UKSF.Api.Personnel/Controllers/DisplayNameController.cs @@ -1,14 +1,22 @@ using Microsoft.AspNetCore.Mvc; using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ [Route("[controller]")] - public class DisplayNameController : Controller { + public class DisplayNameController : Controller + { private readonly IDisplayNameService _displayNameService; - public DisplayNameController(IDisplayNameService displayNameService) => _displayNameService = displayNameService; + public DisplayNameController(IDisplayNameService displayNameService) + { + _displayNameService = displayNameService; + } [HttpGet("{id}")] - public IActionResult GetName(string id) => Ok(new { name = _displayNameService.GetDisplayName(id) }); + public IActionResult GetName(string id) + { + return Ok(new { name = _displayNameService.GetDisplayName(id) }); + } } } diff --git a/UKSF.Api.Personnel/Controllers/NotificationsController.cs b/UKSF.Api.Personnel/Controllers/NotificationsController.cs index 4d5a2135..5b8a9532 100644 --- a/UKSF.Api.Personnel/Controllers/NotificationsController.cs +++ b/UKSF.Api.Personnel/Controllers/NotificationsController.cs @@ -6,27 +6,35 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ [Route("[controller]")] - public class NotificationsController : Controller { + public class NotificationsController : Controller + { private readonly INotificationsService _notificationsService; - public NotificationsController(INotificationsService notificationsService) => _notificationsService = notificationsService; + public NotificationsController(INotificationsService notificationsService) + { + _notificationsService = notificationsService; + } [HttpGet, Authorize] - public IActionResult Get() { + public IActionResult Get() + { return Ok(_notificationsService.GetNotificationsForContext().OrderByDescending(x => x.Timestamp)); } [HttpPost("read"), Authorize] - public async Task MarkAsRead([FromBody] JObject jObject) { + public async Task MarkAsRead([FromBody] JObject jObject) + { List ids = JArray.Parse(jObject["notifications"].ToString()).Select(notification => notification["id"].ToString()).ToList(); await _notificationsService.MarkNotificationsAsRead(ids); return Ok(); } [HttpPost("clear"), Authorize] - public async Task Clear([FromBody] JObject jObject) { + public async Task Clear([FromBody] JObject jObject) + { JArray clear = JArray.Parse(jObject["clear"].ToString()); List ids = clear.Select(notification => notification["id"].ToString()).ToList(); await _notificationsService.Delete(ids); diff --git a/UKSF.Api.Personnel/Controllers/RanksController.cs b/UKSF.Api.Personnel/Controllers/RanksController.cs index ada1b48a..eee2bcf4 100644 --- a/UKSF.Api.Personnel/Controllers/RanksController.cs +++ b/UKSF.Api.Personnel/Controllers/RanksController.cs @@ -8,16 +8,19 @@ using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ [Route("[controller]")] - public class RanksController : Controller { + public class RanksController : Controller + { private readonly IAccountContext _accountContext; private readonly IAssignmentService _assignmentService; private readonly ILogger _logger; private readonly INotificationsService _notificationsService; private readonly IRanksContext _ranksContext; - public RanksController(IAccountContext accountContext, IRanksContext ranksContext, IAssignmentService assignmentService, INotificationsService notificationsService, ILogger logger) { + public RanksController(IAccountContext accountContext, IRanksContext ranksContext, IAssignmentService assignmentService, INotificationsService notificationsService, ILogger logger) + { _accountContext = accountContext; _ranksContext = ranksContext; _assignmentService = assignmentService; @@ -26,18 +29,28 @@ public RanksController(IAccountContext accountContext, IRanksContext ranksContex } [HttpGet, Authorize] - public IActionResult GetRanks() => Ok(_ranksContext.Get()); + public IActionResult GetRanks() + { + return Ok(_ranksContext.Get()); + } [HttpGet("{id}"), Authorize] - public IActionResult GetRanks(string id) { + public IActionResult GetRanks(string id) + { Account account = _accountContext.GetSingle(id); return Ok(_ranksContext.Get(x => x.Name != account.Rank)); } [HttpPost("{check}"), Authorize] - public IActionResult CheckRank(string check, [FromBody] Rank rank = null) { - if (string.IsNullOrEmpty(check)) return Ok(); - if (rank != null) { + public IActionResult CheckRank(string check, [FromBody] Rank rank = null) + { + if (string.IsNullOrEmpty(check)) + { + return Ok(); + } + + if (rank != null) + { Rank safeRank = rank; return Ok(_ranksContext.GetSingle(x => x.Id != safeRank.Id && (x.Name == check || x.TeamspeakGroup == check))); } @@ -46,28 +59,35 @@ public IActionResult CheckRank(string check, [FromBody] Rank rank = null) { } [HttpPost, Authorize] - public IActionResult CheckRank([FromBody] Rank rank) { - return rank != null ? (IActionResult) Ok(_ranksContext.GetSingle(x => x.Id != rank.Id && (x.Name == rank.Name || x.TeamspeakGroup == rank.TeamspeakGroup))) : Ok(); + public IActionResult CheckRank([FromBody] Rank rank) + { + return rank != null ? Ok(_ranksContext.GetSingle(x => x.Id != rank.Id && (x.Name == rank.Name || x.TeamspeakGroup == rank.TeamspeakGroup))) : Ok(); } [HttpPut, Authorize] - public async Task AddRank([FromBody] Rank rank) { + public async Task AddRank([FromBody] Rank rank) + { await _ranksContext.Add(rank); _logger.LogAudit($"Rank added '{rank.Name}, {rank.Abbreviation}, {rank.TeamspeakGroup}'"); return Ok(); } [HttpPatch, Authorize] - public async Task EditRank([FromBody] Rank rank) { + public async Task EditRank([FromBody] Rank rank) + { Rank oldRank = _ranksContext.GetSingle(x => x.Id == rank.Id); _logger.LogAudit( $"Rank updated from '{oldRank.Name}, {oldRank.Abbreviation}, {oldRank.TeamspeakGroup}, {oldRank.DiscordRoleId}' to '{rank.Name}, {rank.Abbreviation}, {rank.TeamspeakGroup}, {rank.DiscordRoleId}'" ); await _ranksContext.Update( rank.Id, - Builders.Update.Set(x => x.Name, rank.Name).Set(x => x.Abbreviation, rank.Abbreviation).Set(x => x.TeamspeakGroup, rank.TeamspeakGroup).Set(x => x.DiscordRoleId, rank.DiscordRoleId) + Builders.Update.Set(x => x.Name, rank.Name) + .Set(x => x.Abbreviation, rank.Abbreviation) + .Set(x => x.TeamspeakGroup, rank.TeamspeakGroup) + .Set(x => x.DiscordRoleId, rank.DiscordRoleId) ); - foreach (Account account in _accountContext.Get(x => x.Rank == oldRank.Name)) { + foreach (Account account in _accountContext.Get(x => x.Rank == oldRank.Name)) + { Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, rankString: rank.Name, reason: $"the '{rank.Name}' rank was updated"); _notificationsService.Add(notification); } @@ -76,11 +96,13 @@ await _ranksContext.Update( } [HttpDelete("{id}"), Authorize] - public async Task DeleteRank(string id) { + public async Task DeleteRank(string id) + { Rank rank = _ranksContext.GetSingle(x => x.Id == id); _logger.LogAudit($"Rank deleted '{rank.Name}'"); await _ranksContext.Delete(id); - foreach (Account account in _accountContext.Get(x => x.Rank == rank.Name)) { + foreach (Account account in _accountContext.Get(x => x.Rank == rank.Name)) + { Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, rankString: AssignmentService.REMOVE_FLAG, reason: $"the '{rank.Name}' rank was deleted"); _notificationsService.Add(notification); } @@ -89,10 +111,13 @@ public async Task DeleteRank(string id) { } [HttpPost("order"), Authorize] - public async Task UpdateOrder([FromBody] List newRankOrder) { - for (int index = 0; index < newRankOrder.Count; index++) { + public async Task UpdateOrder([FromBody] List newRankOrder) + { + for (int index = 0; index < newRankOrder.Count; index++) + { Rank rank = newRankOrder[index]; - if (_ranksContext.GetSingle(rank.Name).Order != index) { + if (_ranksContext.GetSingle(rank.Name).Order != index) + { await _ranksContext.Update(rank.Id, x => x.Order, index); } } diff --git a/UKSF.Api.Personnel/Controllers/RecruitmentController.cs b/UKSF.Api.Personnel/Controllers/RecruitmentController.cs index a15a7886..5312f7c0 100644 --- a/UKSF.Api.Personnel/Controllers/RecruitmentController.cs +++ b/UKSF.Api.Personnel/Controllers/RecruitmentController.cs @@ -13,9 +13,11 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ [Route("[controller]")] - public class RecruitmentController : Controller { + public class RecruitmentController : Controller + { private readonly IAccountContext _accountContext; private readonly IAccountService _accountService; private readonly IAssignmentService _assignmentService; @@ -34,7 +36,8 @@ public RecruitmentController( INotificationsService notificationsService, IHttpContextService httpContextService, ILogger logger - ) { + ) + { _accountContext = accountContext; _accountService = accountService; _recruitmentService = recruitmentService; @@ -46,25 +49,35 @@ ILogger logger } [HttpGet, Authorize, Permissions(Permissions.RECRUITER)] - public IActionResult GetAll() => Ok(_recruitmentService.GetAllApplications()); + public IActionResult GetAll() + { + return Ok(_recruitmentService.GetAllApplications()); + } [HttpGet("{id}"), Authorize] - public IActionResult GetSingle(string id) { + public IActionResult GetSingle(string id) + { Account account = _accountContext.GetSingle(id); return Ok(_recruitmentService.GetApplication(account)); } [HttpGet("isrecruiter"), Authorize, Permissions(Permissions.RECRUITER)] - public IActionResult GetIsRecruiter() => Ok(new { recruiter = _recruitmentService.IsRecruiter(_accountService.GetUserAccount()) }); + public IActionResult GetIsRecruiter() + { + return Ok(new { recruiter = _recruitmentService.IsRecruiter(_accountService.GetUserAccount()) }); + } [HttpGet("stats"), Authorize, Permissions(Permissions.RECRUITER)] - public IActionResult GetRecruitmentStats() { + public IActionResult GetRecruitmentStats() + { string account = _httpContextService.GetUserId(); List activity = new(); - foreach (Account recruiterAccount in _recruitmentService.GetRecruiters()) { + foreach (Account recruiterAccount in _recruitmentService.GetRecruiters()) + { List recruiterApplications = _accountContext.Get(x => x.Application != null && x.Application.Recruiter == recruiterAccount.Id).ToList(); activity.Add( - new { + new + { account = new { id = recruiterAccount.Id, settings = recruiterAccount.Settings }, name = _displayNameService.GetDisplayName(recruiterAccount), active = recruiterApplications.Count(x => x.Application.State == ApplicationState.WAITING), @@ -75,7 +88,8 @@ public IActionResult GetRecruitmentStats() { } return Ok( - new { + new + { activity, yourStats = new { lastMonth = _recruitmentService.GetStats(account, true), overall = _recruitmentService.GetStats(account, false) }, sr1Stats = new { lastMonth = _recruitmentService.GetStats("", true), overall = _recruitmentService.GetStats("", false) } @@ -84,22 +98,30 @@ public IActionResult GetRecruitmentStats() { } [HttpPost("{id}"), Authorize, Permissions(Permissions.RECRUITER)] - public async Task UpdateState([FromBody] dynamic body, string id) { + public async Task UpdateState([FromBody] dynamic body, string id) + { ApplicationState updatedState = body.updatedState; Account account = _accountContext.GetSingle(id); - if (updatedState == account.Application.State) return Ok(); + if (updatedState == account.Application.State) + { + return Ok(); + } + string sessionId = _httpContextService.GetUserId(); await _accountContext.Update(id, Builders.Update.Set(x => x.Application.State, updatedState)); _logger.LogAudit($"Application state changed for {id} from {account.Application.State} to {updatedState}"); - switch (updatedState) { - case ApplicationState.ACCEPTED: { + switch (updatedState) + { + case ApplicationState.ACCEPTED: + { await _accountContext.Update(id, Builders.Update.Set(x => x.Application.DateAccepted, DateTime.Now).Set(x => x.MembershipState, MembershipState.MEMBER)); Notification notification = await _assignmentService.UpdateUnitRankAndRole(id, "Basic Training Unit", "Trainee", "Recruit", reason: "your application was accepted"); _notificationsService.Add(notification); break; } - case ApplicationState.REJECTED: { + case ApplicationState.REJECTED: + { await _accountContext.Update(id, Builders.Update.Set(x => x.Application.DateAccepted, DateTime.Now).Set(x => x.MembershipState, MembershipState.CONFIRMED)); Notification notification = await _assignmentService.UpdateUnitRankAndRole( id, @@ -113,14 +135,16 @@ public async Task UpdateState([FromBody] dynamic body, string id) _notificationsService.Add(notification); break; } - case ApplicationState.WAITING: { + case ApplicationState.WAITING: + { await _accountContext.Update( id, Builders.Update.Set(x => x.Application.DateCreated, DateTime.Now).Unset(x => x.Application.DateAccepted).Set(x => x.MembershipState, MembershipState.CONFIRMED) ); Notification notification = await _assignmentService.UpdateUnitRankAndRole(id, AssignmentService.REMOVE_FLAG, "Applicant", "Candidate", reason: "your application was reactivated"); _notificationsService.Add(notification); - if (_recruitmentService.GetRecruiters().All(x => x.Id != account.Application.Recruiter)) { + if (_recruitmentService.GetRecruiters().All(x => x.Id != account.Application.Recruiter)) + { string newRecruiterId = _recruitmentService.GetRecruiter(); _logger.LogAudit($"Application recruiter for {id} is no longer SR1, reassigning from {account.Application.Recruiter} to {newRecruiterId}"); await _accountContext.Update(id, Builders.Update.Set(x => x.Application.Recruiter, newRecruiterId)); @@ -133,9 +157,11 @@ await _accountContext.Update( account = _accountContext.GetSingle(id); string message = updatedState == ApplicationState.WAITING ? "was reactivated" : $"was {updatedState}"; - if (sessionId != account.Application.Recruiter) { + if (sessionId != account.Application.Recruiter) + { _notificationsService.Add( - new Notification { + new() + { Owner = account.Application.Recruiter, Icon = NotificationIcons.APPLICATION, Message = $"{account.Firstname} {account.Lastname}'s application {message} by {_displayNameService.GetDisplayName(_accountService.GetUserAccount())}", @@ -144,9 +170,11 @@ await _accountContext.Update( ); } - foreach (string value in _recruitmentService.GetRecruiterLeads().Values.Where(value => sessionId != value && account.Application.Recruiter != value)) { + foreach (string value in _recruitmentService.GetRecruiterLeads().Values.Where(value => sessionId != value && account.Application.Recruiter != value)) + { _notificationsService.Add( - new Notification { + new() + { Owner = value, Icon = NotificationIcons.APPLICATION, Message = $"{account.Firstname} {account.Lastname}'s application {message} by {_displayNameService.GetDisplayName(_accountService.GetUserAccount())}", @@ -159,17 +187,21 @@ await _accountContext.Update( } [HttpPost("recruiter/{id}"), Authorize, Permissions(Permissions.RECRUITER_LEAD)] - public async Task PostReassignment([FromBody] JObject newRecruiter, string id) { - if (!_httpContextService.UserHasPermission(Permissions.ADMIN) && !_recruitmentService.IsRecruiterLead()) { - throw new Exception($"attempted to assign recruiter to {newRecruiter}. Context is not recruitment lead."); + public async Task PostReassignment([FromBody] JObject newRecruiter, string id) + { + if (!_httpContextService.UserHasPermission(Permissions.ADMIN) && !_recruitmentService.IsRecruiterLead()) + { + throw new($"attempted to assign recruiter to {newRecruiter}. Context is not recruitment lead."); } string recruiter = newRecruiter["newRecruiter"].ToString(); await _recruitmentService.SetRecruiter(id, recruiter); Account account = _accountContext.GetSingle(id); - if (account.Application.State == ApplicationState.WAITING) { + if (account.Application.State == ApplicationState.WAITING) + { _notificationsService.Add( - new Notification { + new() + { Owner = recruiter, Icon = NotificationIcons.APPLICATION, Message = $"{account.Firstname} {account.Lastname}'s application has been transferred to you", @@ -183,13 +215,17 @@ public async Task PostReassignment([FromBody] JObject newRecruite } [HttpPost("ratings/{id}"), Authorize, Permissions(Permissions.RECRUITER)] - public async Task> Ratings([FromBody] KeyValuePair value, string id) { + public async Task> Ratings([FromBody] KeyValuePair value, string id) + { Dictionary ratings = _accountContext.GetSingle(id).Application.Ratings; (string key, uint rating) = value; - if (ratings.ContainsKey(key)) { + if (ratings.ContainsKey(key)) + { ratings[key] = rating; - } else { + } + else + { ratings.Add(key, rating); } @@ -198,6 +234,9 @@ public async Task> Ratings([FromBody] KeyValuePair GetRecruiters() => _recruitmentService.GetActiveRecruiters(); + public IEnumerable GetRecruiters() + { + return _recruitmentService.GetActiveRecruiters(); + } } } diff --git a/UKSF.Api.Personnel/Controllers/RolesController.cs b/UKSF.Api.Personnel/Controllers/RolesController.cs index 92db76e9..2d183f79 100644 --- a/UKSF.Api.Personnel/Controllers/RolesController.cs +++ b/UKSF.Api.Personnel/Controllers/RolesController.cs @@ -8,9 +8,11 @@ using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ [Route("[controller]")] - public class RolesController : Controller { + public class RolesController : Controller + { private readonly IAccountContext _accountContext; private readonly IAssignmentService _assignmentService; private readonly ILogger _logger; @@ -27,7 +29,8 @@ public RolesController( IUnitsService unitsService, INotificationsService notificationsService, ILogger logger - ) { + ) + { _unitsContext = unitsContext; _rolesContext = rolesContext; _accountContext = accountContext; @@ -38,8 +41,10 @@ ILogger logger } [HttpGet, Authorize] - public IActionResult GetRoles([FromQuery] string id = "", [FromQuery] string unitId = "") { - if (!string.IsNullOrEmpty(id) && !string.IsNullOrEmpty(unitId)) { + public IActionResult GetRoles([FromQuery] string id = "", [FromQuery] string unitId = "") + { + if (!string.IsNullOrEmpty(id) && !string.IsNullOrEmpty(unitId)) + { Unit unit = _unitsContext.GetSingle(unitId); IOrderedEnumerable unitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order); IEnumerable> existingPairs = unit.Roles.Where(x => x.Value == id); @@ -47,7 +52,8 @@ public IActionResult GetRoles([FromQuery] string id = "", [FromQuery] string uni return Ok(filteredRoles); } - if (!string.IsNullOrEmpty(id)) { + if (!string.IsNullOrEmpty(id)) + { Account account = _accountContext.GetSingle(id); return Ok(_rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL && x.Name != account.RoleAssignment).OrderBy(x => x.Order)); } @@ -56,9 +62,15 @@ public IActionResult GetRoles([FromQuery] string id = "", [FromQuery] string uni } [HttpPost("{roleType}/{check}"), Authorize] - public IActionResult CheckRole(RoleType roleType, string check, [FromBody] Role role = null) { - if (string.IsNullOrEmpty(check)) return Ok(); - if (role != null) { + public IActionResult CheckRole(RoleType roleType, string check, [FromBody] Role role = null) + { + if (string.IsNullOrEmpty(check)) + { + return Ok(); + } + + if (role != null) + { Role safeRole = role; return Ok(_rolesContext.GetSingle(x => x.Id != safeRole.Id && x.RoleType == roleType && x.Name == check)); } @@ -67,18 +79,21 @@ public IActionResult CheckRole(RoleType roleType, string check, [FromBody] Role } [HttpPut, Authorize] - public async Task AddRole([FromBody] Role role) { + public async Task AddRole([FromBody] Role role) + { await _rolesContext.Add(role); _logger.LogAudit($"Role added '{role.Name}'"); return Ok(new { individualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), unitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }); } [HttpPatch, Authorize] - public async Task EditRole([FromBody] Role role) { + public async Task EditRole([FromBody] Role role) + { Role oldRole = _rolesContext.GetSingle(x => x.Id == role.Id); _logger.LogAudit($"Role updated from '{oldRole.Name}' to '{role.Name}'"); await _rolesContext.Update(role.Id, x => x.Name, role.Name); - foreach (Account account in _accountContext.Get(x => x.RoleAssignment == oldRole.Name)) { + foreach (Account account in _accountContext.Get(x => x.RoleAssignment == oldRole.Name)) + { await _accountContext.Update(account.Id, x => x.RoleAssignment, role.Name); } @@ -87,11 +102,13 @@ public async Task EditRole([FromBody] Role role) { } [HttpDelete("{id}"), Authorize] - public async Task DeleteRole(string id) { + public async Task DeleteRole(string id) + { Role role = _rolesContext.GetSingle(x => x.Id == id); _logger.LogAudit($"Role deleted '{role.Name}'"); await _rolesContext.Delete(id); - foreach (Account account in _accountContext.Get(x => x.RoleAssignment == role.Name)) { + foreach (Account account in _accountContext.Get(x => x.RoleAssignment == role.Name)) + { Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, role: AssignmentService.REMOVE_FLAG, reason: $"the '{role.Name}' role was deleted"); _notificationsService.Add(notification); } @@ -101,10 +118,13 @@ public async Task DeleteRole(string id) { } [HttpPost("order"), Authorize] - public async Task UpdateOrder([FromBody] List newRoleOrder) { - for (int index = 0; index < newRoleOrder.Count; index++) { + public async Task UpdateOrder([FromBody] List newRoleOrder) + { + for (int index = 0; index < newRoleOrder.Count; index++) + { Role role = newRoleOrder[index]; - if (_rolesContext.GetSingle(role.Name).Order != index) { + if (_rolesContext.GetSingle(role.Name).Order != index) + { await _rolesContext.Update(role.Id, x => x.Order, index); } } diff --git a/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs b/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs index 580a2faf..c8fc0745 100644 --- a/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs +++ b/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs @@ -4,14 +4,17 @@ using Microsoft.Extensions.Hosting; using UKSF.Api.Personnel.Services; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ [Route("[controller]")] - public class SteamConnectionController : Controller { + public class SteamConnectionController : Controller + { private readonly IConfirmationCodeService _confirmationCodeService; private readonly string _url; private readonly string _urlReturn; - public SteamConnectionController(IConfirmationCodeService confirmationCodeService, IHostEnvironment currentEnvironment) { + public SteamConnectionController(IConfirmationCodeService confirmationCodeService, IHostEnvironment currentEnvironment) + { _confirmationCodeService = confirmationCodeService; _url = currentEnvironment.IsDevelopment() ? "http://localhost:5000" : "https://api.uk-sf.co.uk"; @@ -19,19 +22,33 @@ public SteamConnectionController(IConfirmationCodeService confirmationCodeServic } [HttpGet] - public IActionResult Get() => Challenge(new AuthenticationProperties { RedirectUri = $"{_url}/steamconnection/success" }, "Steam"); + public IActionResult Get() + { + return Challenge(new AuthenticationProperties { RedirectUri = $"{_url}/steamconnection/success" }, "Steam"); + } [HttpGet("application")] - public IActionResult GetFromApplication() => Challenge(new AuthenticationProperties { RedirectUri = $"{_url}/steamconnection/success/application" }, "Steam"); + public IActionResult GetFromApplication() + { + return Challenge(new AuthenticationProperties { RedirectUri = $"{_url}/steamconnection/success/application" }, "Steam"); + } [HttpGet("success")] - public async Task Success([FromQuery] string id) => Redirect($"{_urlReturn}/profile?{await GetUrlParameters(id)}"); + public async Task Success([FromQuery] string id) + { + return Redirect($"{_urlReturn}/profile?{await GetUrlParameters(id)}"); + } [HttpGet("success/application")] - public async Task SuccessFromApplication([FromQuery] string id) => Redirect($"{_urlReturn}/application?{await GetUrlParameters(id)}"); + public async Task SuccessFromApplication([FromQuery] string id) + { + return Redirect($"{_urlReturn}/application?{await GetUrlParameters(id)}"); + } - private async Task GetUrlParameters(string id) { - if (string.IsNullOrEmpty(id)) { + private async Task GetUrlParameters(string id) + { + if (string.IsNullOrEmpty(id)) + { return "steamid=fail"; } diff --git a/UKSF.Api.Personnel/Controllers/UnitsController.cs b/UKSF.Api.Personnel/Controllers/UnitsController.cs index 697fae92..98594700 100644 --- a/UKSF.Api.Personnel/Controllers/UnitsController.cs +++ b/UKSF.Api.Personnel/Controllers/UnitsController.cs @@ -14,13 +14,15 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ [Route("[controller]")] - public class UnitsController : Controller { + public class UnitsController : Controller + { private readonly IAccountContext _accountContext; - private readonly IEventBus _eventBus; private readonly IAssignmentService _assignmentService; private readonly IDisplayNameService _displayNameService; + private readonly IEventBus _eventBus; private readonly ILogger _logger; private readonly IMapper _mapper; private readonly INotificationsService _notificationsService; @@ -41,7 +43,8 @@ public UnitsController( IEventBus eventBus, IMapper mapper, ILogger logger - ) { + ) + { _accountContext = accountContext; _unitsContext = unitsContext; _displayNameService = displayNameService; @@ -56,9 +59,12 @@ ILogger logger } [HttpGet, Authorize] - public IActionResult Get([FromQuery] string filter = "", [FromQuery] string accountId = "") { - if (!string.IsNullOrEmpty(accountId)) { - IEnumerable response = filter switch { + public IActionResult Get([FromQuery] string filter = "", [FromQuery] string accountId = "") + { + if (!string.IsNullOrEmpty(accountId)) + { + IEnumerable response = filter switch + { "auxiliary" => _unitsService.GetSortedUnits(x => x.Branch == UnitBranch.AUXILIARY && x.Members.Contains(accountId)), "available" => _unitsService.GetSortedUnits(x => !x.Members.Contains(accountId)), _ => _unitsService.GetSortedUnits(x => x.Members.Contains(accountId)) @@ -70,7 +76,8 @@ public IActionResult Get([FromQuery] string filter = "", [FromQuery] string acco } [HttpGet("{id}"), Authorize] - public IActionResult GetSingle([FromRoute] string id) { + public IActionResult GetSingle([FromRoute] string id) + { Unit unit = _unitsContext.GetSingle(id); Unit parent = _unitsService.GetParent(unit); // TODO: Use a factory or mapper @@ -82,8 +89,12 @@ public IActionResult GetSingle([FromRoute] string id) { } [HttpGet("exists/{check}"), Authorize] - public IActionResult GetUnitExists([FromRoute] string check, [FromQuery] string id = "") { - if (string.IsNullOrEmpty(check)) Ok(false); + public IActionResult GetUnitExists([FromRoute] string check, [FromQuery] string id = "") + { + if (string.IsNullOrEmpty(check)) + { + Ok(false); + } bool exists = _unitsContext.GetSingle( x => (string.IsNullOrEmpty(id) || x.Id != id) && @@ -98,10 +109,12 @@ public IActionResult GetUnitExists([FromRoute] string check, [FromQuery] string } [HttpGet("tree"), Authorize] - public IActionResult GetTree() { + public IActionResult GetTree() + { Unit combatRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); Unit auxiliaryRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); - ResponseUnitTreeDataSet dataSet = new() { + ResponseUnitTreeDataSet dataSet = new() + { CombatNodes = new List { new() { Id = combatRoot.Id, Name = combatRoot.Name, Children = GetUnitTreeChildren(combatRoot) } }, AuxiliaryNodes = new List { new() { Id = auxiliaryRoot.Id, Name = auxiliaryRoot.Name, Children = GetUnitTreeChildren(auxiliaryRoot) } } }; @@ -109,40 +122,49 @@ public IActionResult GetTree() { } // TODO: Use a mapper - private IEnumerable GetUnitTreeChildren(MongoObject parentUnit) { + private IEnumerable GetUnitTreeChildren(MongoObject parentUnit) + { return _unitsContext.Get(x => x.Parent == parentUnit.Id).Select(unit => new ResponseUnitTree { Id = unit.Id, Name = unit.Name, Children = GetUnitTreeChildren(unit) }); } [HttpPost, Authorize] - public async Task AddUnit([FromBody] Unit unit) { + public async Task AddUnit([FromBody] Unit unit) + { await _unitsContext.Add(unit); _logger.LogAudit($"New unit added: '{unit}'"); return Ok(); } [HttpPut("{id}"), Authorize] - public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit) { + public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit) + { Unit oldUnit = _unitsContext.GetSingle(x => x.Id == id); await _unitsContext.Replace(unit); _logger.LogAudit($"Unit '{unit.Shortname}' updated: {oldUnit.Changes(unit)}"); // TODO: Move this elsewhere unit = _unitsContext.GetSingle(unit.Id); - if (unit.Name != oldUnit.Name) { - foreach (Account account in _accountContext.Get(x => x.UnitAssignment == oldUnit.Name)) { + if (unit.Name != oldUnit.Name) + { + foreach (Account account in _accountContext.Get(x => x.UnitAssignment == oldUnit.Name)) + { await _accountContext.Update(account.Id, x => x.UnitAssignment, unit.Name); _eventBus.Send(account); } } - if (unit.TeamspeakGroup != oldUnit.TeamspeakGroup) { - foreach (Account account in unit.Members.Select(x => _accountContext.GetSingle(x))) { + if (unit.TeamspeakGroup != oldUnit.TeamspeakGroup) + { + foreach (Account account in unit.Members.Select(x => _accountContext.GetSingle(x))) + { _eventBus.Send(account); } } - if (unit.DiscordRoleId != oldUnit.DiscordRoleId) { - foreach (Account account in unit.Members.Select(x => _accountContext.GetSingle(x))) { + if (unit.DiscordRoleId != oldUnit.DiscordRoleId) + { + foreach (Account account in unit.Members.Select(x => _accountContext.GetSingle(x))) + { _eventBus.Send(account); } } @@ -151,10 +173,12 @@ public async Task EditUnit([FromRoute] string id, [FromBody] Unit } [HttpDelete("{id}"), Authorize] - public async Task DeleteUnit([FromRoute] string id) { + public async Task DeleteUnit([FromRoute] string id) + { Unit unit = _unitsContext.GetSingle(id); _logger.LogAudit($"Unit deleted '{unit.Name}'"); - foreach (Account account in _accountContext.Get(x => x.UnitAssignment == unit.Name)) { + foreach (Account account in _accountContext.Get(x => x.UnitAssignment == unit.Name)) + { Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, "Reserves", reason: $"{unit.Name} was deleted"); _notificationsService.Add(notification); } @@ -164,26 +188,34 @@ public async Task DeleteUnit([FromRoute] string id) { } [HttpPatch("{id}/parent"), Authorize] - public async Task UpdateParent([FromRoute] string id, [FromBody] RequestUnitUpdateParent unitUpdate) { + public async Task UpdateParent([FromRoute] string id, [FromBody] RequestUnitUpdateParent unitUpdate) + { Unit unit = _unitsContext.GetSingle(id); Unit parentUnit = _unitsContext.GetSingle(unitUpdate.ParentId); - if (unit.Parent == parentUnit.Id) return Ok(); + if (unit.Parent == parentUnit.Id) + { + return Ok(); + } await _unitsContext.Update(id, x => x.Parent, parentUnit.Id); - if (unit.Branch != parentUnit.Branch) { + if (unit.Branch != parentUnit.Branch) + { await _unitsContext.Update(id, x => x.Branch, parentUnit.Branch); } List parentChildren = _unitsContext.Get(x => x.Parent == parentUnit.Id).ToList(); parentChildren.Remove(parentChildren.FirstOrDefault(x => x.Id == unit.Id)); parentChildren.Insert(unitUpdate.Index, unit); - foreach (Unit child in parentChildren) { + foreach (Unit child in parentChildren) + { await _unitsContext.Update(child.Id, x => x.Order, parentChildren.IndexOf(child)); } unit = _unitsContext.GetSingle(unit.Id); - foreach (Unit child in _unitsService.GetAllChildren(unit, true)) { - foreach (string accountId in child.Members) { + foreach (Unit child in _unitsService.GetAllChildren(unit, true)) + { + foreach (string accountId in child.Members) + { await _assignmentService.UpdateGroupsAndRoles(accountId); } } @@ -192,13 +224,15 @@ public async Task UpdateParent([FromRoute] string id, [FromBody] } [HttpPatch("{id}/order"), Authorize] - public IActionResult UpdateSortOrder([FromRoute] string id, [FromBody] RequestUnitUpdateOrder unitUpdate) { + public IActionResult UpdateSortOrder([FromRoute] string id, [FromBody] RequestUnitUpdateOrder unitUpdate) + { Unit unit = _unitsContext.GetSingle(id); Unit parentUnit = _unitsContext.GetSingle(x => x.Id == unit.Parent); List parentChildren = _unitsContext.Get(x => x.Parent == parentUnit.Id).ToList(); parentChildren.Remove(parentChildren.FirstOrDefault(x => x.Id == unit.Id)); parentChildren.Insert(unitUpdate.Index, unit); - foreach (Unit child in parentChildren) { + foreach (Unit child in parentChildren) + { _unitsContext.Update(child.Id, x => x.Order, parentChildren.IndexOf(child)); } @@ -207,12 +241,15 @@ public IActionResult UpdateSortOrder([FromRoute] string id, [FromBody] RequestUn // TODO: Use mappers/factories [HttpGet("chart/{type}"), Authorize] - public IActionResult GetUnitsChart([FromRoute] string type) { - switch (type) { + public IActionResult GetUnitsChart([FromRoute] string type) + { + switch (type) + { case "combat": Unit combatRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); return Ok( - new ResponseUnitChartNode { + new ResponseUnitChartNode + { Id = combatRoot.Id, Name = combatRoot.PreferShortname ? combatRoot.Shortname : combatRoot.Name, Members = MapUnitMembers(combatRoot), @@ -222,7 +259,8 @@ public IActionResult GetUnitsChart([FromRoute] string type) { case "auxiliary": Unit auxiliaryRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); return Ok( - new ResponseUnitChartNode { + new ResponseUnitChartNode + { Id = auxiliaryRoot.Id, Name = auxiliaryRoot.PreferShortname ? auxiliaryRoot.Shortname : auxiliaryRoot.Name, Members = MapUnitMembers(auxiliaryRoot), @@ -233,26 +271,33 @@ public IActionResult GetUnitsChart([FromRoute] string type) { } } - private IEnumerable GetUnitChartChildren(string parent) { + private IEnumerable GetUnitChartChildren(string parent) + { return _unitsContext.Get(x => x.Parent == parent) .Select( - unit => new ResponseUnitChartNode { + unit => new ResponseUnitChartNode + { Id = unit.Id, Name = unit.PreferShortname ? unit.Shortname : unit.Name, Members = MapUnitMembers(unit), Children = GetUnitChartChildren(unit.Id) } ); } - private IEnumerable MapUnitMembers(Unit unit) { + private IEnumerable MapUnitMembers(Unit unit) + { return SortMembers(unit.Members, unit).Select(x => MapUnitMember(x, unit)); } - private ResponseUnitMember MapUnitMember(Account member, Unit unit) => - new() { Name = _displayNameService.GetDisplayName(member), Role = member.RoleAssignment, UnitRole = GetRole(unit, member.Id) }; + private ResponseUnitMember MapUnitMember(Account member, Unit unit) + { + return new() { Name = _displayNameService.GetDisplayName(member), Role = member.RoleAssignment, UnitRole = GetRole(unit, member.Id) }; + } // TODO: Move somewhere else - private IEnumerable SortMembers(IEnumerable members, Unit unit) { + private IEnumerable SortMembers(IEnumerable members, Unit unit) + { return members.Select( - x => { + x => + { Account account = _accountContext.GetSingle(x); return new { account, rankIndex = _ranksService.GetRankOrder(account.Rank), roleIndex = _unitsService.GetMemberRoleOrder(account, unit) }; } @@ -264,10 +309,12 @@ private IEnumerable SortMembers(IEnumerable members, Unit unit) .Select(x => x.account); } - private string GetRole(Unit unit, string accountId) => - _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(0).Name) ? "1" : - _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(1).Name) ? "2" : - _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(2).Name) ? "3" : - _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(3).Name) ? "N" : ""; + private string GetRole(Unit unit, string accountId) + { + return _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(0).Name) ? "1" : + _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(1).Name) ? "2" : + _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(2).Name) ? "3" : + _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(3).Name) ? "N" : ""; + } } } diff --git a/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs index 66462be9..a008816a 100644 --- a/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/CommentThreadEventHandler.cs @@ -9,28 +9,34 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.Personnel.EventHandlers { +namespace UKSF.Api.Personnel.EventHandlers +{ public interface ICommentThreadEventHandler : IEventHandler { } - public class CommentThreadEventHandler : ICommentThreadEventHandler { + public class CommentThreadEventHandler : ICommentThreadEventHandler + { private readonly ICommentThreadService _commentThreadService; private readonly IEventBus _eventBus; private readonly IHubContext _hub; private readonly ILogger _logger; - public CommentThreadEventHandler(IEventBus eventBus, IHubContext hub, ICommentThreadService commentThreadService, ILogger logger) { + public CommentThreadEventHandler(IEventBus eventBus, IHubContext hub, ICommentThreadService commentThreadService, ILogger logger) + { _eventBus = eventBus; _hub = hub; _commentThreadService = commentThreadService; _logger = logger; } - public void Init() { + public void Init() + { _eventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, _logger.LogError); } - private async Task HandleEvent(EventModel eventModel, CommentThreadEventData commentThreadEventData) { - switch (eventModel.EventType) { + private async Task HandleEvent(EventModel eventModel, CommentThreadEventData commentThreadEventData) + { + switch (eventModel.EventType) + { case EventType.ADD: await AddedEvent(commentThreadEventData.CommentThreadId, commentThreadEventData.Comment); break; @@ -41,8 +47,14 @@ private async Task HandleEvent(EventModel eventModel, CommentThreadEventData com } } - private Task AddedEvent(string id, Comment comment) => _hub.Clients.Group(id).ReceiveComment(_commentThreadService.FormatComment(comment)); + private Task AddedEvent(string id, Comment comment) + { + return _hub.Clients.Group(id).ReceiveComment(_commentThreadService.FormatComment(comment)); + } - private Task DeletedEvent(string id, MongoObject comment) => _hub.Clients.Group(id).DeleteComment(comment.Id); + private Task DeletedEvent(string id, MongoObject comment) + { + return _hub.Clients.Group(id).DeleteComment(comment.Id); + } } } diff --git a/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs index a1ca6278..b95e238e 100644 --- a/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs @@ -10,17 +10,20 @@ using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Models; -namespace UKSF.Api.Personnel.EventHandlers { +namespace UKSF.Api.Personnel.EventHandlers +{ public interface IDiscordEventhandler : IEventHandler { } - public class DiscordEventhandler : IDiscordEventhandler { + public class DiscordEventhandler : IDiscordEventhandler + { private readonly IAccountContext _accountContext; private readonly ICommentThreadService _commentThreadService; private readonly IDisplayNameService _displayNameService; private readonly IEventBus _eventBus; private readonly ILogger _logger; - public DiscordEventhandler(IEventBus eventBus, ICommentThreadService commentThreadService, IAccountContext accountContext, IDisplayNameService displayNameService, ILogger logger) { + public DiscordEventhandler(IEventBus eventBus, ICommentThreadService commentThreadService, IAccountContext accountContext, IDisplayNameService displayNameService, ILogger logger) + { _eventBus = eventBus; _commentThreadService = commentThreadService; _accountContext = accountContext; @@ -28,12 +31,15 @@ public DiscordEventhandler(IEventBus eventBus, ICommentThreadService commentThre _logger = logger; } - public void Init() { + public void Init() + { _eventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, _logger.LogError); } - private async Task HandleEvent(EventModel eventModel, DiscordEventData discordEventData) { - switch (discordEventData.EventType) { + private async Task HandleEvent(EventModel eventModel, DiscordEventData discordEventData) + { + switch (discordEventData.EventType) + { case DiscordUserEventType.JOINED: break; case DiscordUserEventType.LEFT: await LeftEvent(discordEventData.EventData); @@ -44,10 +50,11 @@ private async Task HandleEvent(EventModel eventModel, DiscordEventData discordEv } } - private async Task LeftEvent(string accountId) { + private async Task LeftEvent(string accountId) + { Account account = _accountContext.GetSingle(accountId); - _logger.LogInfo($"Handling Discord user left event. Account ID: {account.Id}, State: {account.MembershipState.ToString()}"); - if (account.MembershipState == MembershipState.DISCHARGED || account.MembershipState == MembershipState.UNCONFIRMED) { + if (account.MembershipState is MembershipState.DISCHARGED or MembershipState.UNCONFIRMED) + { return; } diff --git a/UKSF.Api.Personnel/Models/ServiceRecord.cs b/UKSF.Api.Personnel/Models/ServiceRecord.cs index 5e337baa..55980695 100644 --- a/UKSF.Api.Personnel/Models/ServiceRecord.cs +++ b/UKSF.Api.Personnel/Models/ServiceRecord.cs @@ -1,11 +1,16 @@ using System; -namespace UKSF.Api.Personnel.Models { - public class ServiceRecordEntry { +namespace UKSF.Api.Personnel.Models +{ + public class ServiceRecordEntry + { public string Notes; public string Occurence; public DateTime Timestamp; - public override string ToString() => $"{Timestamp:dd/MM/yyyy}: {Occurence}{(string.IsNullOrEmpty(Notes) ? "" : $"({Notes})")}"; + public override string ToString() + { + return $"{Timestamp:dd/MM/yyyy}: {Occurence}{(string.IsNullOrEmpty(Notes) ? "" : $"({Notes})")}"; + } } } diff --git a/UKSF.Api.Personnel/Models/Unit.cs b/UKSF.Api.Personnel/Models/Unit.cs index a8ce23c8..e98e7bc8 100644 --- a/UKSF.Api.Personnel/Models/Unit.cs +++ b/UKSF.Api.Personnel/Models/Unit.cs @@ -3,8 +3,10 @@ using MongoDB.Bson.Serialization.Attributes; using UKSF.Api.Base.Models; -namespace UKSF.Api.Personnel.Models { - public class Unit : MongoObject { +namespace UKSF.Api.Personnel.Models +{ + public class Unit : MongoObject + { public UnitBranch Branch = UnitBranch.COMBAT; public string Callsign; public string DiscordRoleId; @@ -18,39 +20,48 @@ public class Unit : MongoObject { public string Shortname; public string TeamspeakGroup; - public override string ToString() => $"{Name}, {Shortname}, {Callsign}, {Branch}, {TeamspeakGroup}, {DiscordRoleId}"; + public override string ToString() + { + return $"{Name}, {Shortname}, {Callsign}, {Branch}, {TeamspeakGroup}, {DiscordRoleId}"; + } } - public enum UnitBranch { + public enum UnitBranch + { COMBAT, AUXILIARY } // TODO: Cleaner way of doing this? Inside controllers? - public class ResponseUnit : Unit { + public class ResponseUnit : Unit + { public string Code; public string ParentName; public IEnumerable UnitMembers; } - public class ResponseUnitMember { + public class ResponseUnitMember + { public string Name; public string Role; public string UnitRole; } - public class ResponseUnitTree { + public class ResponseUnitTree + { public IEnumerable Children; public string Id; public string Name; } - public class ResponseUnitTreeDataSet { + public class ResponseUnitTreeDataSet + { public IEnumerable AuxiliaryNodes; public IEnumerable CombatNodes; } - public class ResponseUnitChartNode { + public class ResponseUnitChartNode + { public IEnumerable Children; public string Id; public IEnumerable Members; @@ -58,12 +69,14 @@ public class ResponseUnitChartNode { public bool PreferShortname; } - public class RequestUnitUpdateParent { + public class RequestUnitUpdateParent + { public int Index; public string ParentId; } - public class RequestUnitUpdateOrder { + public class RequestUnitUpdateOrder + { public int Index; } } diff --git a/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs b/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs index 3474a064..3887111a 100644 --- a/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs +++ b/UKSF.Api.Personnel/ScheduledActions/ActionDeleteExpiredConfirmationCode.cs @@ -3,20 +3,27 @@ using UKSF.Api.Base.ScheduledActions; using UKSF.Api.Personnel.Context; -namespace UKSF.Api.Personnel.ScheduledActions { +namespace UKSF.Api.Personnel.ScheduledActions +{ public interface IActionDeleteExpiredConfirmationCode : IScheduledAction { } - public class ActionDeleteExpiredConfirmationCode : IActionDeleteExpiredConfirmationCode { + public class ActionDeleteExpiredConfirmationCode : IActionDeleteExpiredConfirmationCode + { public const string ACTION_NAME = nameof(ActionDeleteExpiredConfirmationCode); private readonly IConfirmationCodeContext _confirmationCodeContext; - public ActionDeleteExpiredConfirmationCode(IConfirmationCodeContext confirmationCodeContext) => _confirmationCodeContext = confirmationCodeContext; + public ActionDeleteExpiredConfirmationCode(IConfirmationCodeContext confirmationCodeContext) + { + _confirmationCodeContext = confirmationCodeContext; + } public string Name => ACTION_NAME; - public Task Run(params object[] parameters) { - if (parameters.Length == 0) { + public Task Run(params object[] parameters) + { + if (parameters.Length == 0) + { throw new ArgumentException("ActionDeleteExpiredConfirmationCode requires an id to be passed as a parameter, but no paramters were passed"); } diff --git a/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs b/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs index 767613db..155d4641 100644 --- a/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs +++ b/UKSF.Api.Personnel/ScheduledActions/ActionPruneNotifications.cs @@ -6,10 +6,12 @@ using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Personnel.ScheduledActions { +namespace UKSF.Api.Personnel.ScheduledActions +{ public interface IActionPruneNotifications : ISelfCreatingScheduledAction { } - public class ActionPruneNotifications : IActionPruneNotifications { + public class ActionPruneNotifications : IActionPruneNotifications + { private const string ACTION_NAME = nameof(ActionPruneNotifications); private readonly IClock _clock; @@ -24,7 +26,8 @@ public ActionPruneNotifications( ISchedulerService schedulerService, IHostEnvironment currentEnvironment, IClock clock - ) { + ) + { _schedulerContext = schedulerContext; _notificationsContext = notificationsContext; _schedulerService = schedulerService; @@ -34,7 +37,8 @@ IClock clock public string Name => ACTION_NAME; - public Task Run(params object[] parameters) { + public Task Run(params object[] parameters) + { DateTime now = _clock.UtcNow(); Task notificationsTask = _notificationsContext.DeleteMany(x => x.Timestamp < now.AddMonths(-1)); @@ -42,14 +46,22 @@ public Task Run(params object[] parameters) { return Task.CompletedTask; } - public async Task CreateSelf() { - if (_currentEnvironment.IsDevelopment()) return; + public async Task CreateSelf() + { + if (_currentEnvironment.IsDevelopment()) + { + return; + } - if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) { + if (_schedulerContext.GetSingle(x => x.Action == ACTION_NAME) == null) + { await _schedulerService.CreateScheduledJob(_clock.Today().AddDays(1), TimeSpan.FromDays(1), ACTION_NAME); } } - public Task Reset() => Task.CompletedTask; + public Task Reset() + { + return Task.CompletedTask; + } } } diff --git a/UKSF.Api.Personnel/Services/AccountService.cs b/UKSF.Api.Personnel/Services/AccountService.cs index 655af9d3..cdafe9f0 100644 --- a/UKSF.Api.Personnel/Services/AccountService.cs +++ b/UKSF.Api.Personnel/Services/AccountService.cs @@ -2,20 +2,27 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Personnel.Services { - public interface IAccountService { +namespace UKSF.Api.Personnel.Services +{ + public interface IAccountService + { Account GetUserAccount(); } - public class AccountService : IAccountService { + public class AccountService : IAccountService + { private readonly IAccountContext _accountContext; private readonly IHttpContextService _httpContextService; - public AccountService(IAccountContext accountContext, IHttpContextService httpContextService) { + public AccountService(IAccountContext accountContext, IHttpContextService httpContextService) + { _accountContext = accountContext; _httpContextService = httpContextService; } - public Account GetUserAccount() => _accountContext.GetSingle(_httpContextService.GetUserId()); + public Account GetUserAccount() + { + return _accountContext.GetSingle(_httpContextService.GetUserId()); + } } } diff --git a/UKSF.Api.Personnel/Services/AssignmentService.cs b/UKSF.Api.Personnel/Services/AssignmentService.cs index 4144860e..ad07167c 100644 --- a/UKSF.Api.Personnel/Services/AssignmentService.cs +++ b/UKSF.Api.Personnel/Services/AssignmentService.cs @@ -10,8 +10,10 @@ using UKSF.Api.Personnel.Signalr.Clients; using UKSF.Api.Personnel.Signalr.Hubs; -namespace UKSF.Api.Personnel.Services { - public interface IAssignmentService { +namespace UKSF.Api.Personnel.Services +{ + public interface IAssignmentService + { Task AssignUnitRole(string id, string unitId, string role); Task UnassignAllUnits(string id); Task UnassignAllUnitRoles(string id); @@ -21,12 +23,13 @@ public interface IAssignmentService { Task UpdateGroupsAndRoles(string id); } - public class AssignmentService : IAssignmentService { + public class AssignmentService : IAssignmentService + { public const string REMOVE_FLAG = "REMOVE"; private readonly IAccountContext _accountContext; - private readonly IEventBus _eventBus; private readonly IHubContext _accountHub; private readonly IDisplayNameService _displayNameService; + private readonly IEventBus _eventBus; private readonly IRanksService _ranksService; private readonly IServiceRecordService _serviceRecordService; private readonly IUnitsContext _unitsContext; @@ -41,7 +44,8 @@ public AssignmentService( IDisplayNameService displayNameService, IHubContext accountHub, IEventBus eventBus - ) { + ) + { _accountContext = accountContext; _unitsContext = unitsContext; _serviceRecordService = serviceRecordService; @@ -52,27 +56,38 @@ IEventBus eventBus _eventBus = eventBus; } - public async Task UpdateUnitRankAndRole(string id, string unitString = "", string role = "", string rankString = "", string notes = "", string message = "", string reason = "") { + public async Task UpdateUnitRankAndRole(string id, string unitString = "", string role = "", string rankString = "", string notes = "", string message = "", string reason = "") + { StringBuilder notificationBuilder = new(); (bool unitUpdate, bool unitPositive) = await UpdateUnit(id, unitString, notificationBuilder); (bool roleUpdate, bool rolePositive) = await UpdateRole(id, role, unitUpdate, notificationBuilder); (bool rankUpdate, bool rankPositive) = await UpdateRank(id, rankString, unitUpdate, roleUpdate, notificationBuilder); bool positive; - if (rankPositive) { + if (rankPositive) + { positive = true; - } else { + } + else + { positive = unitPositive || rolePositive; } - if (!unitUpdate && !roleUpdate && !rankUpdate) return null; - if (string.IsNullOrEmpty(message)) { + if (!unitUpdate && !roleUpdate && !rankUpdate) + { + return null; + } + + if (string.IsNullOrEmpty(message)) + { message = notificationBuilder.ToString(); - if (!string.IsNullOrEmpty(reason)) { + if (!string.IsNullOrEmpty(reason)) + { message = $"{message} because {reason}"; } - if (rankUpdate) { + if (rankUpdate) + { message = $"{message}. Please change your name to {_displayNameService.GetDisplayName(id)}"; } } @@ -82,31 +97,38 @@ public async Task UpdateUnitRankAndRole(string id, string unitStri return message != REMOVE_FLAG ? new Notification { Owner = id, Message = message, Icon = positive ? NotificationIcons.PROMOTION : NotificationIcons.DEMOTION } : null; } - public async Task AssignUnitRole(string id, string unitId, string role) { + public async Task AssignUnitRole(string id, string unitId, string role) + { await _unitsService.SetMemberRole(id, unitId, role); await UpdateGroupsAndRoles(id); } - public async Task UnassignAllUnits(string id) { - foreach (Unit unit in _unitsContext.Get()) { + public async Task UnassignAllUnits(string id) + { + foreach (Unit unit in _unitsContext.Get()) + { await _unitsService.RemoveMember(id, unit); } await UpdateGroupsAndRoles(id); } - public async Task UnassignAllUnitRoles(string id) { - foreach (Unit unit in _unitsContext.Get()) { + public async Task UnassignAllUnitRoles(string id) + { + foreach (Unit unit in _unitsContext.Get()) + { await _unitsService.SetMemberRole(id, unit); } await UpdateGroupsAndRoles(id); } - public async Task UnassignUnitRole(string id, string unitId) { + public async Task UnassignUnitRole(string id, string unitId) + { Unit unit = _unitsContext.GetSingle(unitId); string role = unit.Roles.FirstOrDefault(x => x.Value == id).Key; - if (_unitsService.RolesHasMember(unit, id)) { + if (_unitsService.RolesHasMember(unit, id)) + { await _unitsService.SetMemberRole(id, unitId); await UpdateGroupsAndRoles(id); } @@ -114,25 +136,30 @@ public async Task UnassignUnitRole(string id, string unitId) { return role; } - public async Task UnassignUnit(string id, string unitId) { + public async Task UnassignUnit(string id, string unitId) + { Unit unit = _unitsContext.GetSingle(unitId); await _unitsService.RemoveMember(id, unit); await UpdateGroupsAndRoles(unitId); } // TODO: teamspeak and discord should probably be updated for account update events, or a separate assignment event bus could be used - public async Task UpdateGroupsAndRoles(string id) { + public async Task UpdateGroupsAndRoles(string id) + { Account account = _accountContext.GetSingle(id); _eventBus.Send(account); await _accountHub.Clients.Group(id).ReceiveAccountUpdate(); } - private async Task> UpdateUnit(string id, string unitString, StringBuilder notificationMessage) { + private async Task> UpdateUnit(string id, string unitString, StringBuilder notificationMessage) + { bool unitUpdate = false; bool positive = true; Unit unit = _unitsContext.GetSingle(x => x.Name == unitString); - if (unit != null) { - if (unit.Branch == UnitBranch.COMBAT) { + if (unit != null) + { + if (unit.Branch == UnitBranch.COMBAT) + { await _unitsService.RemoveMember(id, _accountContext.GetSingle(id).UnitAssignment); await _accountContext.Update(id, x => x.UnitAssignment, unit.Name); } @@ -140,9 +167,15 @@ private async Task> UpdateUnit(string id, string unitString, S await _unitsService.AddMember(id, unit.Id); notificationMessage.Append($"You have been transfered to {_unitsService.GetChainString(unit)}"); unitUpdate = true; - } else if (unitString == REMOVE_FLAG) { + } + else if (unitString == REMOVE_FLAG) + { string currentUnit = _accountContext.GetSingle(id).UnitAssignment; - if (string.IsNullOrEmpty(currentUnit)) return new Tuple(false, false); + if (string.IsNullOrEmpty(currentUnit)) + { + return new(false, false); + } + unit = _unitsContext.GetSingle(x => x.Name == currentUnit); await _unitsService.RemoveMember(id, currentUnit); await _accountContext.Update(id, x => x.UnitAssignment, null); @@ -151,17 +184,21 @@ private async Task> UpdateUnit(string id, string unitString, S positive = false; } - return new Tuple(unitUpdate, positive); + return new(unitUpdate, positive); } - private async Task> UpdateRole(string id, string role, bool unitUpdate, StringBuilder notificationMessage) { + private async Task> UpdateRole(string id, string role, bool unitUpdate, StringBuilder notificationMessage) + { bool roleUpdate = false; bool positive = true; - if (!string.IsNullOrEmpty(role) && role != REMOVE_FLAG) { + if (!string.IsNullOrEmpty(role) && role != REMOVE_FLAG) + { await _accountContext.Update(id, x => x.RoleAssignment, role); notificationMessage.Append($"{(unitUpdate ? $" as {AvsAn.Query(role).Article} {role}" : $"You have been assigned as {AvsAn.Query(role).Article} {role}")}"); roleUpdate = true; - } else if (role == REMOVE_FLAG) { + } + else if (role == REMOVE_FLAG) + { string currentRole = _accountContext.GetSingle(id).RoleAssignment; await _accountContext.Update(id, x => x.RoleAssignment, null); notificationMessage.Append( @@ -174,29 +211,37 @@ private async Task> UpdateRole(string id, string role, bool un positive = false; } - return new Tuple(roleUpdate, positive); + return new(roleUpdate, positive); } - private async Task> UpdateRank(string id, string rank, bool unitUpdate, bool roleUpdate, StringBuilder notificationMessage) { + private async Task> UpdateRank(string id, string rank, bool unitUpdate, bool roleUpdate, StringBuilder notificationMessage) + { bool rankUpdate = false; bool positive = true; string currentRank = _accountContext.GetSingle(id).Rank; - if (!string.IsNullOrEmpty(rank) && rank != REMOVE_FLAG) { - if (currentRank == rank) return new Tuple(false, true); + if (!string.IsNullOrEmpty(rank) && rank != REMOVE_FLAG) + { + if (currentRank == rank) + { + return new(false, true); + } + await _accountContext.Update(id, x => x.Rank, rank); bool promotion = string.IsNullOrEmpty(currentRank) || _ranksService.IsSuperior(rank, currentRank); notificationMessage.Append( $"{(unitUpdate || roleUpdate ? $" and {(promotion ? "promoted" : "demoted")} to {rank}" : $"You have been {(promotion ? "promoted" : "demoted")} to {rank}")}" ); rankUpdate = true; - } else if (rank == REMOVE_FLAG) { + } + else if (rank == REMOVE_FLAG) + { await _accountContext.Update(id, x => x.Rank, null); notificationMessage.Append($"{(unitUpdate || roleUpdate ? $" and demoted from {currentRank}" : $"You have been demoted from {currentRank}")}"); rankUpdate = true; positive = false; } - return new Tuple(rankUpdate, positive); + return new(rankUpdate, positive); } } } diff --git a/UKSF.Api.Personnel/Services/CommentThreadService.cs b/UKSF.Api.Personnel/Services/CommentThreadService.cs index a8a9832e..3a381bf9 100644 --- a/UKSF.Api.Personnel/Services/CommentThreadService.cs +++ b/UKSF.Api.Personnel/Services/CommentThreadService.cs @@ -4,8 +4,10 @@ using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services { - public interface ICommentThreadService { +namespace UKSF.Api.Personnel.Services +{ + public interface ICommentThreadService + { IEnumerable GetCommentThreadComments(string commentThreadId); Task InsertComment(string commentThreadId, Comment comment); Task RemoveComment(string commentThreadId, Comment comment); @@ -13,31 +15,42 @@ public interface ICommentThreadService { object FormatComment(Comment comment); } - public class CommentThreadService : ICommentThreadService { + public class CommentThreadService : ICommentThreadService + { private readonly ICommentThreadContext _commentThreadContext; private readonly IDisplayNameService _displayNameService; - public CommentThreadService(ICommentThreadContext commentThreadContext, IDisplayNameService displayNameService) { + public CommentThreadService(ICommentThreadContext commentThreadContext, IDisplayNameService displayNameService) + { _commentThreadContext = commentThreadContext; _displayNameService = displayNameService; } - public IEnumerable GetCommentThreadComments(string commentThreadId) => _commentThreadContext.GetSingle(commentThreadId).Comments.Reverse(); + public IEnumerable GetCommentThreadComments(string commentThreadId) + { + return _commentThreadContext.GetSingle(commentThreadId).Comments.Reverse(); + } - public async Task InsertComment(string commentThreadId, Comment comment) { + public async Task InsertComment(string commentThreadId, Comment comment) + { await _commentThreadContext.AddCommentToThread(commentThreadId, comment); } - public async Task RemoveComment(string commentThreadId, Comment comment) { + public async Task RemoveComment(string commentThreadId, Comment comment) + { await _commentThreadContext.RemoveCommentFromThread(commentThreadId, comment); } - public IEnumerable GetCommentThreadParticipants(string commentThreadId) { + public IEnumerable GetCommentThreadParticipants(string commentThreadId) + { HashSet participants = GetCommentThreadComments(commentThreadId).Select(x => x.Author).ToHashSet(); participants.UnionWith(_commentThreadContext.GetSingle(commentThreadId).Authors); return participants; } - public object FormatComment(Comment comment) => new { comment.Id, comment.Author, comment.Content, DisplayName = _displayNameService.GetDisplayName(comment.Author), comment.Timestamp }; + public object FormatComment(Comment comment) + { + return new { comment.Id, comment.Author, comment.Content, DisplayName = _displayNameService.GetDisplayName(comment.Author), comment.Timestamp }; + } } } diff --git a/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs b/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs index 11bca57a..438fd06c 100644 --- a/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs +++ b/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs @@ -7,42 +7,58 @@ using UKSF.Api.Personnel.ScheduledActions; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Personnel.Services { - public interface IConfirmationCodeService { +namespace UKSF.Api.Personnel.Services +{ + public interface IConfirmationCodeService + { Task CreateConfirmationCode(string value); Task GetConfirmationCode(string id); Task ClearConfirmationCodes(Func predicate); } - public class ConfirmationCodeService : IConfirmationCodeService { + public class ConfirmationCodeService : IConfirmationCodeService + { private readonly IConfirmationCodeContext _confirmationCodeContext; private readonly ISchedulerService _schedulerService; - public ConfirmationCodeService(IConfirmationCodeContext confirmationCodeContext, ISchedulerService schedulerService) { + public ConfirmationCodeService(IConfirmationCodeContext confirmationCodeContext, ISchedulerService schedulerService) + { _confirmationCodeContext = confirmationCodeContext; _schedulerService = schedulerService; } - public async Task CreateConfirmationCode(string value) { - if (string.IsNullOrEmpty(value)) throw new ArgumentNullException(nameof(value), "Value for confirmation code cannot be null or empty"); + public async Task CreateConfirmationCode(string value) + { + if (string.IsNullOrEmpty(value)) + { + throw new ArgumentNullException(nameof(value), "Value for confirmation code cannot be null or empty"); + } + ConfirmationCode code = new() { Value = value }; await _confirmationCodeContext.Add(code); await _schedulerService.CreateAndScheduleJob(DateTime.Now.AddMinutes(30), TimeSpan.Zero, ActionDeleteExpiredConfirmationCode.ACTION_NAME, code.Id); return code.Id; } - public async Task GetConfirmationCode(string id) { + public async Task GetConfirmationCode(string id) + { ConfirmationCode confirmationCode = _confirmationCodeContext.GetSingle(id); - if (confirmationCode == null) return string.Empty; + if (confirmationCode == null) + { + return string.Empty; + } + await _confirmationCodeContext.Delete(confirmationCode); string actionParameters = JsonConvert.SerializeObject(new object[] { confirmationCode.Id }); await _schedulerService.Cancel(x => x.ActionParameters == actionParameters); return confirmationCode.Value; } - public async Task ClearConfirmationCodes(Func predicate) { + public async Task ClearConfirmationCodes(Func predicate) + { IEnumerable codes = _confirmationCodeContext.Get(predicate); - foreach (ConfirmationCode confirmationCode in codes) { + foreach (ConfirmationCode confirmationCode in codes) + { string actionParameters = JsonConvert.SerializeObject(new object[] { confirmationCode.Id }); await _schedulerService.Cancel(x => x.ActionParameters == actionParameters); } diff --git a/UKSF.Api.Personnel/Services/DisplayNameService.cs b/UKSF.Api.Personnel/Services/DisplayNameService.cs index b5a496b0..370a7dee 100644 --- a/UKSF.Api.Personnel/Services/DisplayNameService.cs +++ b/UKSF.Api.Personnel/Services/DisplayNameService.cs @@ -1,32 +1,41 @@ using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services { - public interface IDisplayNameService { +namespace UKSF.Api.Personnel.Services +{ + public interface IDisplayNameService + { string GetDisplayName(Account account); string GetDisplayName(string id); string GetDisplayNameWithoutRank(Account account); } - public class DisplayNameService : IDisplayNameService { + public class DisplayNameService : IDisplayNameService + { private readonly IAccountContext _accountContext; private readonly IRanksContext _ranksContext; - public DisplayNameService(IAccountContext accountContext, IRanksContext ranksContext) { + public DisplayNameService(IAccountContext accountContext, IRanksContext ranksContext) + { _accountContext = accountContext; _ranksContext = ranksContext; } - public string GetDisplayName(Account account) { + public string GetDisplayName(Account account) + { Rank rank = account.Rank != null ? _ranksContext.GetSingle(account.Rank) : null; return rank == null ? $"{account.Lastname}.{account.Firstname[0]}" : $"{rank.Abbreviation}.{account.Lastname}.{account.Firstname[0]}"; } - public string GetDisplayName(string id) { + public string GetDisplayName(string id) + { Account account = _accountContext.GetSingle(id); return account != null ? GetDisplayName(account) : id; } - public string GetDisplayNameWithoutRank(Account account) => string.IsNullOrEmpty(account?.Lastname) ? "Guest" : $"{account.Lastname}.{account.Firstname[0]}"; + public string GetDisplayNameWithoutRank(Account account) + { + return string.IsNullOrEmpty(account?.Lastname) ? "Guest" : $"{account.Lastname}.{account.Firstname[0]}"; + } } } diff --git a/UKSF.Api.Personnel/Services/EmailService.cs b/UKSF.Api.Personnel/Services/EmailService.cs index 4feaa89f..4d2897a0 100644 --- a/UKSF.Api.Personnel/Services/EmailService.cs +++ b/UKSF.Api.Personnel/Services/EmailService.cs @@ -2,23 +2,32 @@ using System.Net.Mail; using Microsoft.Extensions.Configuration; -namespace UKSF.Api.Personnel.Services { - public interface IEmailService { +namespace UKSF.Api.Personnel.Services +{ + public interface IEmailService + { void SendEmail(string targetEmail, string subject, string htmlEmail); } - public class EmailService : IEmailService { + public class EmailService : IEmailService + { private readonly string _password; private readonly string _username; - public EmailService(IConfiguration configuration) { + public EmailService(IConfiguration configuration) + { _username = configuration.GetSection("EmailSettings")["username"]; _password = configuration.GetSection("EmailSettings")["password"]; } - public void SendEmail(string targetEmail, string subject, string htmlEmail) { - if (string.IsNullOrEmpty(_username) || string.IsNullOrEmpty(_password)) return; - using MailMessage mail = new() { From = new MailAddress(_username, "UKSF") }; + public void SendEmail(string targetEmail, string subject, string htmlEmail) + { + if (string.IsNullOrEmpty(_username) || string.IsNullOrEmpty(_password)) + { + return; + } + + using MailMessage mail = new() { From = new(_username, "UKSF") }; mail.To.Add(targetEmail); mail.Subject = subject; mail.Body = htmlEmail; diff --git a/UKSF.Api.Personnel/Services/NotificationsService.cs b/UKSF.Api.Personnel/Services/NotificationsService.cs index 865d775b..68b972e8 100644 --- a/UKSF.Api.Personnel/Services/NotificationsService.cs +++ b/UKSF.Api.Personnel/Services/NotificationsService.cs @@ -12,8 +12,10 @@ using UKSF.Api.Shared.Models; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Personnel.Services { - public interface INotificationsService { +namespace UKSF.Api.Personnel.Services +{ + public interface INotificationsService + { void Add(Notification notification); void SendTeamspeakNotification(Account account, string rawMessage); void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage); @@ -22,14 +24,15 @@ public interface INotificationsService { Task Delete(List ids); } - public class NotificationsService : INotificationsService { + public class NotificationsService : INotificationsService + { private readonly IAccountContext _accountContext; private readonly IEmailService _emailService; + private readonly IEventBus _eventBus; private readonly IHttpContextService _httpContextService; private readonly INotificationsContext _notificationsContext; private readonly IHubContext _notificationsHub; private readonly IObjectIdConversionService _objectIdConversionService; - private readonly IEventBus _eventBus; private readonly IVariablesService _variablesService; public NotificationsService( @@ -41,7 +44,8 @@ public NotificationsService( IObjectIdConversionService objectIdConversionService, IEventBus eventBus, IVariablesService variablesService - ) { + ) + { _accountContext = accountContext; _notificationsContext = notificationsContext; _emailService = emailService; @@ -52,72 +56,106 @@ IVariablesService variablesService _variablesService = variablesService; } - public void SendTeamspeakNotification(Account account, string rawMessage) { - if (NotificationsDisabled()) return; + public void SendTeamspeakNotification(Account account, string rawMessage) + { + if (NotificationsDisabled()) + { + return; + } - if (account.TeamspeakIdentities == null) return; - if (account.TeamspeakIdentities.Count == 0) return; + if (account.TeamspeakIdentities == null) + { + return; + } + + if (account.TeamspeakIdentities.Count == 0) + { + return; + } SendTeamspeakNotification(account.TeamspeakIdentities, rawMessage); } - public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { - if (NotificationsDisabled()) return; + public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) + { + if (NotificationsDisabled()) + { + return; + } rawMessage = rawMessage.Replace("", "[/url]"); _eventBus.Send(new TeamspeakMessageEventData(clientDbIds, rawMessage)); } - public IEnumerable GetNotificationsForContext() { + public IEnumerable GetNotificationsForContext() + { string contextId = _httpContextService.GetUserId(); return _notificationsContext.Get(x => x.Owner == contextId); } - public void Add(Notification notification) { - if (notification == null) return; + public void Add(Notification notification) + { + if (notification == null) + { + return; + } + Task unused = AddNotificationAsync(notification); } - public async Task MarkNotificationsAsRead(List ids) { + public async Task MarkNotificationsAsRead(List ids) + { string contextId = _httpContextService.GetUserId(); await _notificationsContext.UpdateMany(x => x.Owner == contextId && ids.Contains(x.Id), Builders.Update.Set(x => x.Read, true)); await _notificationsHub.Clients.Group(contextId).ReceiveRead(ids); } - public async Task Delete(List ids) { + public async Task Delete(List ids) + { ids = ids.ToList(); string contextId = _httpContextService.GetUserId(); await _notificationsContext.DeleteMany(x => x.Owner == contextId && ids.Contains(x.Id)); await _notificationsHub.Clients.Group(contextId).ReceiveClear(ids); } - private async Task AddNotificationAsync(Notification notification) { + private async Task AddNotificationAsync(Notification notification) + { notification.Message = _objectIdConversionService.ConvertObjectIds(notification.Message); Account account = _accountContext.GetSingle(notification.Owner); - if (account.MembershipState == MembershipState.DISCHARGED) { + if (account.MembershipState == MembershipState.DISCHARGED) + { return; } await _notificationsContext.Add(notification); - if (account.Settings.NotificationsEmail) { + if (account.Settings.NotificationsEmail) + { SendEmailNotification( account.Email, $"{notification.Message}{(notification.Link != null ? $"
https://uk-sf.co.uk{notification.Link}" : "")}" ); } - if (account.Settings.NotificationsTeamspeak) { + if (account.Settings.NotificationsTeamspeak) + { SendTeamspeakNotification(account, $"{notification.Message}{(notification.Link != null ? $"\n[url]https://uk-sf.co.uk{notification.Link}[/url]" : "")}"); } } - private void SendEmailNotification(string email, string message) { - if (NotificationsDisabled()) return; + private void SendEmailNotification(string email, string message) + { + if (NotificationsDisabled()) + { + return; + } message += "

You can opt-out of these emails by unchecking 'Email notifications' in your Profile"; _emailService.SendEmail(email, "UKSF Notification", message); } - private bool NotificationsDisabled() => !_variablesService.GetFeatureState("NOTIFICATIONS"); + private bool NotificationsDisabled() + { + return !_variablesService.GetFeatureState("NOTIFICATIONS"); + } } } diff --git a/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs b/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs index 34ba6fc4..134336bd 100644 --- a/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs +++ b/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs @@ -2,29 +2,40 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.Personnel.Services { - public interface IObjectIdConversionService { +namespace UKSF.Api.Personnel.Services +{ + public interface IObjectIdConversionService + { string ConvertObjectIds(string text); string ConvertObjectId(string id); } - public class ObjectIdConversionService : IObjectIdConversionService { + public class ObjectIdConversionService : IObjectIdConversionService + { private readonly IDisplayNameService _displayNameService; private readonly IUnitsContext _unitsContext; - public ObjectIdConversionService(IUnitsContext unitsContext, IDisplayNameService displayNameService) { + public ObjectIdConversionService(IUnitsContext unitsContext, IDisplayNameService displayNameService) + { _unitsContext = unitsContext; _displayNameService = displayNameService; } - public string ConvertObjectIds(string text) { - if (string.IsNullOrEmpty(text)) return text; + public string ConvertObjectIds(string text) + { + if (string.IsNullOrEmpty(text)) + { + return text; + } - foreach (string objectId in text.ExtractObjectIds()) { + foreach (string objectId in text.ExtractObjectIds()) + { string displayString = _displayNameService.GetDisplayName(objectId); - if (displayString == objectId) { + if (displayString == objectId) + { Unit unit = _unitsContext.GetSingle(x => x.Id == objectId); - if (unit != null) { + if (unit != null) + { displayString = unit.Name; } } @@ -35,6 +46,9 @@ public string ConvertObjectIds(string text) { return text; } - public string ConvertObjectId(string id) => string.IsNullOrEmpty(id) ? id : _displayNameService.GetDisplayName(id); + public string ConvertObjectId(string id) + { + return string.IsNullOrEmpty(id) ? id : _displayNameService.GetDisplayName(id); + } } } diff --git a/UKSF.Api.Personnel/Services/RanksService.cs b/UKSF.Api.Personnel/Services/RanksService.cs index 5828b979..ea18370d 100644 --- a/UKSF.Api.Personnel/Services/RanksService.cs +++ b/UKSF.Api.Personnel/Services/RanksService.cs @@ -2,8 +2,10 @@ using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services { - public interface IRanksService { +namespace UKSF.Api.Personnel.Services +{ + public interface IRanksService + { int GetRankOrder(string rankName); int Sort(string nameA, string nameB); bool IsEqual(string nameA, string nameB); @@ -11,22 +13,32 @@ public interface IRanksService { bool IsSuperiorOrEqual(string nameA, string nameB); } - public class RanksService : IRanksService { + public class RanksService : IRanksService + { private readonly IRanksContext _ranksContext; - public RanksService(IRanksContext ranksContext) => _ranksContext = ranksContext; + public RanksService(IRanksContext ranksContext) + { + _ranksContext = ranksContext; + } - public int GetRankOrder(string rankName) => _ranksContext.GetSingle(rankName)?.Order ?? -1; + public int GetRankOrder(string rankName) + { + return _ranksContext.GetSingle(rankName)?.Order ?? -1; + } - public int Sort(string nameA, string nameB) { + public int Sort(string nameA, string nameB) + { Rank rankA = _ranksContext.GetSingle(nameA); Rank rankB = _ranksContext.GetSingle(nameB); int rankOrderA = rankA?.Order ?? int.MaxValue; int rankOrderB = rankB?.Order ?? int.MaxValue; - return rankOrderA < rankOrderB ? -1 : rankOrderA > rankOrderB ? 1 : 0; + return rankOrderA < rankOrderB ? -1 : + rankOrderA > rankOrderB ? 1 : 0; } - public bool IsSuperior(string nameA, string nameB) { + public bool IsSuperior(string nameA, string nameB) + { Rank rankA = _ranksContext.GetSingle(nameA); Rank rankB = _ranksContext.GetSingle(nameB); int rankOrderA = rankA?.Order ?? int.MaxValue; @@ -34,7 +46,8 @@ public bool IsSuperior(string nameA, string nameB) { return rankOrderA < rankOrderB; } - public bool IsEqual(string nameA, string nameB) { + public bool IsEqual(string nameA, string nameB) + { Rank rankA = _ranksContext.GetSingle(nameA); Rank rankB = _ranksContext.GetSingle(nameB); int rankOrderA = rankA?.Order ?? int.MinValue; @@ -42,13 +55,24 @@ public bool IsEqual(string nameA, string nameB) { return rankOrderA == rankOrderB; } - public bool IsSuperiorOrEqual(string nameA, string nameB) => IsSuperior(nameA, nameB) || IsEqual(nameA, nameB); + public bool IsSuperiorOrEqual(string nameA, string nameB) + { + return IsSuperior(nameA, nameB) || IsEqual(nameA, nameB); + } } - public class RankComparer : IComparer { + public class RankComparer : IComparer + { private readonly IRanksService _ranksService; - public RankComparer(IRanksService ranksService) => _ranksService = ranksService; - public int Compare(string rankA, string rankB) => _ranksService.Sort(rankA, rankB); + public RankComparer(IRanksService ranksService) + { + _ranksService = ranksService; + } + + public int Compare(string rankA, string rankB) + { + return _ranksService.Sort(rankA, rankB); + } } } diff --git a/UKSF.Api.Personnel/Services/RecruitmentService.cs b/UKSF.Api.Personnel/Services/RecruitmentService.cs index acbb2fc9..83056e94 100644 --- a/UKSF.Api.Personnel/Services/RecruitmentService.cs +++ b/UKSF.Api.Personnel/Services/RecruitmentService.cs @@ -3,17 +3,17 @@ using System.Linq; using System.Threading.Tasks; using MongoDB.Driver; -using Newtonsoft.Json.Linq; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Services; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Extensions; using UKSF.Api.Personnel.Models; -using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Personnel.Services { - public interface IRecruitmentService { +namespace UKSF.Api.Personnel.Services +{ + public interface IRecruitmentService + { ApplicationsOverview GetAllApplications(); DetailedApplication GetApplication(Account account); IEnumerable GetActiveRecruiters(); @@ -26,7 +26,8 @@ public interface IRecruitmentService { Task SetRecruiter(string id, string newRecruiter); } - public class RecruitmentService : IRecruitmentService { + public class RecruitmentService : IRecruitmentService + { private readonly IAccountContext _accountContext; private readonly IDisplayNameService _displayNameService; private readonly IHttpContextService _httpContextService; @@ -41,7 +42,8 @@ public RecruitmentService( IDisplayNameService displayNameService, IRanksService ranksService, IVariablesService variablesService - ) { + ) + { _accountContext = accountContext; _unitsContext = unitsContext; _httpContextService = httpContextService; @@ -50,18 +52,30 @@ IVariablesService variablesService _variablesService = variablesService; } - public bool IsRecruiter(Account account) => GetRecruiters(true).Any(x => x.Id == account.Id); + public bool IsRecruiter(Account account) + { + return GetRecruiters(true).Any(x => x.Id == account.Id); + } - public Dictionary GetRecruiterLeads() => GetRecruiterUnit().Roles; + public Dictionary GetRecruiterLeads() + { + return GetRecruiterUnit().Roles; + } - public IEnumerable GetRecruiters(bool skipSort = false) { + public IEnumerable GetRecruiters(bool skipSort = false) + { IEnumerable members = GetRecruiterUnit().Members; List accounts = members.Select(x => _accountContext.GetSingle(x)).ToList(); - if (skipSort) return accounts; + if (skipSort) + { + return accounts; + } + return accounts.OrderBy(x => x.Rank, new RankComparer(_ranksService)).ThenBy(x => x.Lastname); } - public ApplicationsOverview GetAllApplications() { + public ApplicationsOverview GetAllApplications() + { List waiting = new(); List allWaiting = new(); List complete = new(); @@ -69,55 +83,72 @@ public ApplicationsOverview GetAllApplications() { string me = _httpContextService.GetUserId(); IEnumerable accounts = _accountContext.Get(x => x.Application != null); - foreach (Account account in accounts) { - if (account.Application.State == ApplicationState.WAITING) { - if (account.Application.Recruiter == me) { + foreach (Account account in accounts) + { + if (account.Application.State == ApplicationState.WAITING) + { + if (account.Application.Recruiter == me) + { waiting.Add(GetWaitingApplication(account)); - } else { + } + else + { allWaiting.Add(GetWaitingApplication(account)); } - } else { + } + else + { complete.Add(GetCompletedApplication(account)); } } - return new ApplicationsOverview { Waiting = waiting, AllWaiting = allWaiting, Complete = complete, Recruiters = recruiters }; + return new() { Waiting = waiting, AllWaiting = allWaiting, Complete = complete, Recruiters = recruiters }; } - public DetailedApplication GetApplication(Account account) { + public DetailedApplication GetApplication(Account account) + { Account recruiterAccount = _accountContext.GetSingle(account.Application.Recruiter); ApplicationAge age = account.Dob.ToAge(); - return new DetailedApplication { - Account = account, - DisplayName = _displayNameService.GetDisplayName(account), - Age = age, - DaysProcessing = Math.Ceiling((DateTime.Now - account.Application.DateCreated).TotalDays), - DaysProcessed = Math.Ceiling((account.Application.DateAccepted - account.Application.DateCreated).TotalDays), - NextCandidateOp = GetNextCandidateOp(), - AverageProcessingTime = GetAverageProcessingTime(), - SteamProfile = "http://steamcommunity.com/profiles/" + account.Steamname, - Recruiter = _displayNameService.GetDisplayName(recruiterAccount), - RecruiterId = recruiterAccount.Id - }; - } - - public IEnumerable GetActiveRecruiters() => - GetRecruiters().Where(x => x.Settings.Sr1Enabled).Select(x => new Recruiter { Id = x.Id, Name = _displayNameService.GetDisplayName(x) }); - - public bool IsRecruiterLead(Account account = null) => - account != null ? GetRecruiterUnit().Roles.ContainsValue(account.Id) : GetRecruiterUnit().Roles.ContainsValue(_httpContextService.GetUserId()); - - public async Task SetRecruiter(string id, string newRecruiter) { + return new() + { + Account = account, + DisplayName = _displayNameService.GetDisplayName(account), + Age = age, + DaysProcessing = Math.Ceiling((DateTime.Now - account.Application.DateCreated).TotalDays), + DaysProcessed = Math.Ceiling((account.Application.DateAccepted - account.Application.DateCreated).TotalDays), + NextCandidateOp = GetNextCandidateOp(), + AverageProcessingTime = GetAverageProcessingTime(), + SteamProfile = "http://steamcommunity.com/profiles/" + account.Steamname, + Recruiter = _displayNameService.GetDisplayName(recruiterAccount), + RecruiterId = recruiterAccount.Id + }; + } + + public IEnumerable GetActiveRecruiters() + { + return GetRecruiters().Where(x => x.Settings.Sr1Enabled).Select(x => new Recruiter { Id = x.Id, Name = _displayNameService.GetDisplayName(x) }); + } + + public bool IsRecruiterLead(Account account = null) + { + return account != null ? GetRecruiterUnit().Roles.ContainsValue(account.Id) : GetRecruiterUnit().Roles.ContainsValue(_httpContextService.GetUserId()); + } + + public async Task SetRecruiter(string id, string newRecruiter) + { await _accountContext.Update(id, Builders.Update.Set(x => x.Application.Recruiter, newRecruiter)); } - public object GetStats(string account, bool monthly) { + public object GetStats(string account, bool monthly) + { IEnumerable accounts = _accountContext.Get(x => x.Application != null); - if (account != string.Empty) { + if (account != string.Empty) + { accounts = accounts.Where(x => x.Application.Recruiter == account); } - if (monthly) { + if (monthly) + { accounts = accounts.Where(x => x.Application.DateAccepted < DateTime.Now && x.Application.DateAccepted > DateTime.Now.AddMonths(-1)); } @@ -131,7 +162,8 @@ public object GetStats(string account, bool monthly) { double averageProcessingTime = totalProcessingTime > 0 ? Math.Round(totalProcessingTime / processedApplications.Count, 1) : 0; double enlistmentRate = acceptedApps != 0 || rejectedApps != 0 ? Math.Round((double) acceptedApps / (acceptedApps + rejectedApps) * 100, 1) : 0; - return new[] { + return new[] + { new { fieldName = "Accepted applications", fieldValue = acceptedApps.ToString() }, new { fieldName = "Rejected applications", fieldValue = rejectedApps.ToString() }, new { fieldName = "Waiting applications", fieldValue = waitingApps.ToString() }, @@ -140,7 +172,8 @@ public object GetStats(string account, bool monthly) { }; } - public string GetRecruiter() { + public string GetRecruiter() + { IEnumerable recruiters = GetRecruiters().Where(x => x.Settings.Sr1Enabled); List waiting = _accountContext.Get(x => x.Application != null && x.Application.State == ApplicationState.WAITING).ToList(); List complete = _accountContext.Get(x => x.Application != null && x.Application.State != ApplicationState.WAITING).ToList(); @@ -149,46 +182,57 @@ public string GetRecruiter() { return sorted.First().id; } - private Unit GetRecruiterUnit() { + private Unit GetRecruiterUnit() + { string id = _variablesService.GetVariable("UNIT_ID_RECRUITMENT").AsString(); return _unitsContext.GetSingle(id); } - private CompletedApplication GetCompletedApplication(Account account) => - new() { - Account = account, - DisplayName = _displayNameService.GetDisplayNameWithoutRank(account), - DaysProcessed = Math.Ceiling((account.Application.DateAccepted - account.Application.DateCreated).TotalDays), - Recruiter = _displayNameService.GetDisplayName(account.Application.Recruiter) - }; + private CompletedApplication GetCompletedApplication(Account account) + { + return new() + { + Account = account, + DisplayName = _displayNameService.GetDisplayNameWithoutRank(account), + DaysProcessed = Math.Ceiling((account.Application.DateAccepted - account.Application.DateCreated).TotalDays), + Recruiter = _displayNameService.GetDisplayName(account.Application.Recruiter) + }; + } - private WaitingApplication GetWaitingApplication(Account account) { + private WaitingApplication GetWaitingApplication(Account account) + { double averageProcessingTime = GetAverageProcessingTime(); double daysProcessing = Math.Ceiling((DateTime.Now - account.Application.DateCreated).TotalDays); double processingDifference = daysProcessing - averageProcessingTime; - return new WaitingApplication { - Account = account, - SteamProfile = "http://steamcommunity.com/profiles/" + account.Steamname, - DaysProcessing = daysProcessing, - ProcessingDifference = processingDifference, - Recruiter = _displayNameService.GetDisplayName(account.Application.Recruiter) - }; + return new() + { + Account = account, + SteamProfile = "http://steamcommunity.com/profiles/" + account.Steamname, + DaysProcessing = daysProcessing, + ProcessingDifference = processingDifference, + Recruiter = _displayNameService.GetDisplayName(account.Application.Recruiter) + }; } - private static string GetNextCandidateOp() { + private static string GetNextCandidateOp() + { DateTime nextDate = DateTime.Now; - while (nextDate.DayOfWeek == DayOfWeek.Monday || nextDate.DayOfWeek == DayOfWeek.Wednesday || nextDate.DayOfWeek == DayOfWeek.Saturday) { + while (nextDate.DayOfWeek == DayOfWeek.Monday || nextDate.DayOfWeek == DayOfWeek.Wednesday || nextDate.DayOfWeek == DayOfWeek.Saturday) + { nextDate = nextDate.AddDays(1); } - if (nextDate.Hour > 18) { + if (nextDate.Hour > 18) + { nextDate = nextDate.AddDays(1); } - return nextDate.Day == DateTime.Today.Day ? "Today" : nextDate.Day == DateTime.Today.AddDays(1).Day ? "Tomorrow" : nextDate.ToString("dddd"); + return nextDate.Day == DateTime.Today.Day ? "Today" : + nextDate.Day == DateTime.Today.AddDays(1).Day ? "Tomorrow" : nextDate.ToString("dddd"); } - private double GetAverageProcessingTime() { + private double GetAverageProcessingTime() + { List waitingApplications = _accountContext.Get(x => x.Application != null && x.Application.State != ApplicationState.WAITING).ToList(); double days = waitingApplications.Sum(x => (x.Application.DateAccepted - x.Application.DateCreated).TotalDays); double time = Math.Round(days / waitingApplications.Count, 1); diff --git a/UKSF.Api.Personnel/Services/RolesService.cs b/UKSF.Api.Personnel/Services/RolesService.cs index fca1282c..b334c5ac 100644 --- a/UKSF.Api.Personnel/Services/RolesService.cs +++ b/UKSF.Api.Personnel/Services/RolesService.cs @@ -1,28 +1,42 @@ using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services { - public interface IRolesService { +namespace UKSF.Api.Personnel.Services +{ + public interface IRolesService + { int Sort(string nameA, string nameB); Role GetUnitRoleByOrder(int order); string GetCommanderRoleName(); } - public class RolesService : IRolesService { + public class RolesService : IRolesService + { private readonly IRolesContext _rolesContext; - public RolesService(IRolesContext rolesContext) => _rolesContext = rolesContext; + public RolesService(IRolesContext rolesContext) + { + _rolesContext = rolesContext; + } - public int Sort(string nameA, string nameB) { + public int Sort(string nameA, string nameB) + { Role roleA = _rolesContext.GetSingle(nameA); Role roleB = _rolesContext.GetSingle(nameB); int roleOrderA = roleA?.Order ?? 0; int roleOrderB = roleB?.Order ?? 0; - return roleOrderA < roleOrderB ? -1 : roleOrderA > roleOrderB ? 1 : 0; + return roleOrderA < roleOrderB ? -1 : + roleOrderA > roleOrderB ? 1 : 0; } - public Role GetUnitRoleByOrder(int order) => _rolesContext.GetSingle(x => x.RoleType == RoleType.UNIT && x.Order == order); + public Role GetUnitRoleByOrder(int order) + { + return _rolesContext.GetSingle(x => x.RoleType == RoleType.UNIT && x.Order == order); + } - public string GetCommanderRoleName() => GetUnitRoleByOrder(0).Name; + public string GetCommanderRoleName() + { + return GetUnitRoleByOrder(0).Name; + } } } diff --git a/UKSF.Api.Personnel/Services/ServiceRecordService.cs b/UKSF.Api.Personnel/Services/ServiceRecordService.cs index 82f7dfec..24e29a05 100644 --- a/UKSF.Api.Personnel/Services/ServiceRecordService.cs +++ b/UKSF.Api.Personnel/Services/ServiceRecordService.cs @@ -3,17 +3,24 @@ using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services { - public interface IServiceRecordService { +namespace UKSF.Api.Personnel.Services +{ + public interface IServiceRecordService + { void AddServiceRecord(string id, string occurence, string notes); } - public class ServiceRecordService : IServiceRecordService { + public class ServiceRecordService : IServiceRecordService + { private readonly IAccountContext _accountContext; - public ServiceRecordService(IAccountContext accountContext) => _accountContext = accountContext; + public ServiceRecordService(IAccountContext accountContext) + { + _accountContext = accountContext; + } - public void AddServiceRecord(string id, string occurence, string notes) { + public void AddServiceRecord(string id, string occurence, string notes) + { _accountContext.Update(id, Builders.Update.Push("serviceRecord", new ServiceRecordEntry { Timestamp = DateTime.Now, Occurence = occurence, Notes = notes })); } } diff --git a/UKSF.Api.Personnel/Services/UnitsService.cs b/UKSF.Api.Personnel/Services/UnitsService.cs index 44108137..647f8e9a 100644 --- a/UKSF.Api.Personnel/Services/UnitsService.cs +++ b/UKSF.Api.Personnel/Services/UnitsService.cs @@ -7,8 +7,10 @@ using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services { - public interface IUnitsService { +namespace UKSF.Api.Personnel.Services +{ + public interface IUnitsService + { IEnumerable GetSortedUnits(Func predicate = null); Task AddMember(string id, string unitId); Task RemoveMember(string id, string unitName); @@ -38,16 +40,19 @@ public interface IUnitsService { string GetChainString(Unit unit); } - public class UnitsService : IUnitsService { + public class UnitsService : IUnitsService + { private readonly IRolesContext _rolesContext; private readonly IUnitsContext _unitsContext; - public UnitsService(IUnitsContext unitsContext, IRolesContext rolesContext) { + public UnitsService(IUnitsContext unitsContext, IRolesContext rolesContext) + { _unitsContext = unitsContext; _rolesContext = rolesContext; } - public IEnumerable GetSortedUnits(Func predicate = null) { + public IEnumerable GetSortedUnits(Func predicate = null) + { List sortedUnits = new(); Unit combatRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); Unit auxiliaryRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); @@ -59,112 +64,172 @@ public IEnumerable GetSortedUnits(Func predicate = null) { return predicate != null ? sortedUnits.Where(predicate) : sortedUnits; } - public async Task AddMember(string id, string unitId) { - if (_unitsContext.GetSingle(x => x.Id == unitId && x.Members.Contains(id)) != null) return; + public async Task AddMember(string id, string unitId) + { + if (_unitsContext.GetSingle(x => x.Id == unitId && x.Members.Contains(id)) != null) + { + return; + } + await _unitsContext.Update(unitId, Builders.Update.Push(x => x.Members, id)); } - public async Task RemoveMember(string id, string unitName) { + public async Task RemoveMember(string id, string unitName) + { Unit unit = _unitsContext.GetSingle(x => x.Name == unitName); - if (unit == null) return; + if (unit == null) + { + return; + } await RemoveMember(id, unit); } - public async Task RemoveMember(string id, Unit unit) { - if (unit.Members.Contains(id)) { + public async Task RemoveMember(string id, Unit unit) + { + if (unit.Members.Contains(id)) + { await _unitsContext.Update(unit.Id, Builders.Update.Pull(x => x.Members, id)); } await RemoveMemberRoles(id, unit); } - public async Task SetMemberRole(string id, string unitId, string role = "") { + public async Task SetMemberRole(string id, string unitId, string role = "") + { Unit unit = _unitsContext.GetSingle(x => x.Id == unitId); - if (unit == null) return; + if (unit == null) + { + return; + } await SetMemberRole(id, unit, role); } - public async Task SetMemberRole(string id, Unit unit, string role = "") { + public async Task SetMemberRole(string id, Unit unit, string role = "") + { await RemoveMemberRoles(id, unit); - if (!string.IsNullOrEmpty(role)) { + if (!string.IsNullOrEmpty(role)) + { await _unitsContext.Update(unit.Id, Builders.Update.Set($"roles.{role}", id)); } } - public async Task RenameRole(string oldName, string newName) { - foreach (Unit unit in _unitsContext.Get(x => x.Roles.ContainsKey(oldName))) { + public async Task RenameRole(string oldName, string newName) + { + foreach (Unit unit in _unitsContext.Get(x => x.Roles.ContainsKey(oldName))) + { string id = unit.Roles[oldName]; await _unitsContext.Update(unit.Id, Builders.Update.Unset($"roles.{oldName}")); await _unitsContext.Update(unit.Id, Builders.Update.Set($"roles.{newName}", id)); } } - public async Task DeleteRole(string role) { - foreach (Unit unit in from unit in _unitsContext.Get(x => x.Roles.ContainsKey(role)) let id = unit.Roles[role] select unit) { + public async Task DeleteRole(string role) + { + foreach (Unit unit in from unit in _unitsContext.Get(x => x.Roles.ContainsKey(role)) let id = unit.Roles[role] select unit) + { await _unitsContext.Update(unit.Id, Builders.Update.Unset($"roles.{role}")); } } - public bool HasRole(string unitId, string role) { + public bool HasRole(string unitId, string role) + { Unit unit = _unitsContext.GetSingle(x => x.Id == unitId); return HasRole(unit, role); } - public bool HasRole(Unit unit, string role) => unit.Roles.ContainsKey(role); + public bool HasRole(Unit unit, string role) + { + return unit.Roles.ContainsKey(role); + } - public bool RolesHasMember(string unitId, string id) { + public bool RolesHasMember(string unitId, string id) + { Unit unit = _unitsContext.GetSingle(x => x.Id == unitId); return RolesHasMember(unit, id); } - public bool RolesHasMember(Unit unit, string id) => unit.Roles.ContainsValue(id); + public bool RolesHasMember(Unit unit, string id) + { + return unit.Roles.ContainsValue(id); + } - public bool MemberHasRole(string id, string unitId, string role) { + public bool MemberHasRole(string id, string unitId, string role) + { Unit unit = _unitsContext.GetSingle(x => x.Id == unitId); return MemberHasRole(id, unit, role); } - public bool MemberHasRole(string id, Unit unit, string role) => unit.Roles.GetValueOrDefault(role, string.Empty) == id; + public bool MemberHasRole(string id, Unit unit, string role) + { + return unit.Roles.GetValueOrDefault(role, string.Empty) == id; + } - public bool MemberHasAnyRole(string id) => _unitsContext.Get().Any(x => RolesHasMember(x, id)); + public bool MemberHasAnyRole(string id) + { + return _unitsContext.Get().Any(x => RolesHasMember(x, id)); + } - public int GetMemberRoleOrder(Account account, Unit unit) { - if (RolesHasMember(unit, account.Id)) { + public int GetMemberRoleOrder(Account account, Unit unit) + { + if (RolesHasMember(unit, account.Id)) + { return int.MaxValue - _rolesContext.GetSingle(x => x.Name == unit.Roles.FirstOrDefault(y => y.Value == account.Id).Key).Order; } return -1; } - public Unit GetRoot() => _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); + public Unit GetRoot() + { + return _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); + } - public Unit GetAuxilliaryRoot() => _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); + public Unit GetAuxilliaryRoot() + { + return _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); + } - public Unit GetParent(Unit unit) { + public Unit GetParent(Unit unit) + { return unit.Parent != string.Empty ? _unitsContext.GetSingle(x => x.Id == unit.Parent) : null; } // TODO: Change this to not add the child unit to the return - public IEnumerable GetParents(Unit unit) { - if (unit == null) return new List(); + public IEnumerable GetParents(Unit unit) + { + if (unit == null) + { + return new List(); + } + List parentUnits = new(); - do { + do + { parentUnits.Add(unit); Unit child = unit; unit = !string.IsNullOrEmpty(unit.Parent) ? _unitsContext.GetSingle(x => x.Id == child.Parent) : null; - if (unit == child) break; - } while (unit != null); + if (unit == child) + { + break; + } + } + while (unit != null); return parentUnits; } - public IEnumerable GetChildren(Unit parent) => _unitsContext.Get(x => x.Parent == parent.Id).ToList(); + public IEnumerable GetChildren(Unit parent) + { + return _unitsContext.Get(x => x.Parent == parent.Id).ToList(); + } - public IEnumerable GetAllChildren(Unit parent, bool includeParent = false) { - List children = includeParent ? new List { parent } : new List(); - foreach (Unit unit in _unitsContext.Get(x => x.Parent == parent.Id)) { + public IEnumerable GetAllChildren(Unit parent, bool includeParent = false) + { + List children = includeParent ? new() { parent } : new List(); + foreach (Unit unit in _unitsContext.Get(x => x.Parent == parent.Id)) + { children.Add(unit); children.AddRange(GetAllChildren(unit)); } @@ -172,14 +237,17 @@ public IEnumerable GetAllChildren(Unit parent, bool includeParent = false) return children; } - public int GetUnitDepth(Unit unit) { - if (unit.Parent == ObjectId.Empty.ToString()) { + public int GetUnitDepth(Unit unit) + { + if (unit.Parent == ObjectId.Empty.ToString()) + { return 0; } int depth = 0; Unit parent = _unitsContext.GetSingle(unit.Parent); - while (parent != null) { + while (parent != null) + { depth++; parent = _unitsContext.GetSingle(parent.Parent); } @@ -187,21 +255,25 @@ public int GetUnitDepth(Unit unit) { return depth; } - public string GetChainString(Unit unit) { + public string GetChainString(Unit unit) + { List parentUnits = GetParents(unit).Skip(1).ToList(); string unitNames = unit.Name; parentUnits.ForEach(x => unitNames += $", {x.Name}"); return unitNames; } - private async Task RemoveMemberRoles(string id, Unit unit) { + private async Task RemoveMemberRoles(string id, Unit unit) + { Dictionary roles = unit.Roles; int originalCount = unit.Roles.Count; - foreach ((string key, string _) in roles.Where(x => x.Value == id).ToList()) { + foreach ((string key, string _) in roles.Where(x => x.Value == id).ToList()) + { roles.Remove(key); } - if (roles.Count != originalCount) { + if (roles.Count != originalCount) + { await _unitsContext.Update(unit.Id, Builders.Update.Set(x => x.Roles, roles)); } } diff --git a/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj b/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj index 0acfa8f8..79003a2d 100644 --- a/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj +++ b/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj @@ -1,7 +1,7 @@ - netcoreapp5.0 + net5.0 Library @@ -13,7 +13,7 @@ - + diff --git a/UKSF.Api.Shared/ApiSharedExtensions.cs b/UKSF.Api.Shared/ApiSharedExtensions.cs index 31abc693..92c65aea 100644 --- a/UKSF.Api.Shared/ApiSharedExtensions.cs +++ b/UKSF.Api.Shared/ApiSharedExtensions.cs @@ -3,28 +3,33 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Shared { - public static class ApiSharedExtensions { - public static IServiceCollection AddUksfShared(this IServiceCollection services) => - services - .AddContexts() - .AddEventHandlers() - .AddServices() - .AddTransient() - .AddSingleton() - .AddSingleton(); +namespace UKSF.Api.Shared +{ + public static class ApiSharedExtensions + { + public static IServiceCollection AddUksfShared(this IServiceCollection services) + { + return services.AddContexts().AddEventHandlers().AddServices().AddTransient().AddSingleton().AddSingleton(); + } - private static IServiceCollection AddContexts(this IServiceCollection services) => - services.AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton(); + private static IServiceCollection AddContexts(this IServiceCollection services) + { + return services.AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); + } - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services; + private static IServiceCollection AddEventHandlers(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddServices(this IServiceCollection services) => - services.AddSingleton().AddTransient(); + private static IServiceCollection AddServices(this IServiceCollection services) + { + return services.AddSingleton().AddTransient(); + } } } diff --git a/UKSF.Api.Shared/Context/CachedMongoContext.cs b/UKSF.Api.Shared/Context/CachedMongoContext.cs index c3edb158..11eedc4f 100644 --- a/UKSF.Api.Shared/Context/CachedMongoContext.cs +++ b/UKSF.Api.Shared/Context/CachedMongoContext.cs @@ -10,26 +10,35 @@ using UKSF.Api.Base.Models; using UKSF.Api.Shared.Models; -namespace UKSF.Api.Shared.Context { - public interface ICachedMongoContext { +namespace UKSF.Api.Shared.Context +{ + public interface ICachedMongoContext + { void Refresh(); } - public class CachedMongoContext : MongoContextBase, IMongoContext, ICachedMongoContext where T : MongoObject { + public class CachedMongoContext : MongoContextBase, IMongoContext, ICachedMongoContext where T : MongoObject + { private readonly IEventBus _eventBus; protected readonly object LockObject = new(); - protected CachedMongoContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base(mongoCollectionFactory, collectionName) => _eventBus = eventBus; + protected CachedMongoContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base(mongoCollectionFactory, collectionName) + { + _eventBus = eventBus; + } public List Cache { get; protected set; } - public void Refresh() { + public void Refresh() + { SetCache(null); Get(); } - public sealed override IEnumerable Get() { - if (Cache != null) { + public sealed override IEnumerable Get() + { + if (Cache != null) + { return Cache; } @@ -37,53 +46,78 @@ public sealed override IEnumerable Get() { return Cache; } - public override IEnumerable Get(Func predicate) { - if (Cache == null) Get(); + public override IEnumerable Get(Func predicate) + { + if (Cache == null) + { + Get(); + } + return Cache.Where(predicate); } - public override T GetSingle(string id) { - if (Cache == null) Get(); + public override T GetSingle(string id) + { + if (Cache == null) + { + Get(); + } + return Cache.FirstOrDefault(x => x.Id == id); } - public override T GetSingle(Func predicate) { - if (Cache == null) Get(); + public override T GetSingle(Func predicate) + { + if (Cache == null) + { + Get(); + } + return Cache.FirstOrDefault(predicate); } - public override async Task Add(T item) { - if (Cache == null) Get(); + public override async Task Add(T item) + { + if (Cache == null) + { + Get(); + } + await base.Add(item); SetCache(Cache.Concat(new[] { item })); DataAddEvent(item); } - public override async Task Update(string id, Expression> fieldSelector, object value) { + public override async Task Update(string id, Expression> fieldSelector, object value) + { await base.Update(id, fieldSelector, value); Refresh(); // TODO: intelligent refresh DataUpdateEvent(id); } - public override async Task Update(string id, UpdateDefinition update) { + public override async Task Update(string id, UpdateDefinition update) + { await base.Update(id, update); Refresh(); // TODO: intelligent refresh DataUpdateEvent(id); } - public override async Task Update(Expression> filterExpression, UpdateDefinition update) { + public override async Task Update(Expression> filterExpression, UpdateDefinition update) + { await base.Update(filterExpression, update); Refresh(); // TODO: intelligent refresh DataUpdateEvent(GetSingle(filterExpression.Compile()).Id); } - public override async Task UpdateMany(Expression> filterExpression, UpdateDefinition update) { + public override async Task UpdateMany(Expression> filterExpression, UpdateDefinition update) + { await base.UpdateMany(filterExpression, update); Refresh(); // TODO: intelligent refresh Get(filterExpression.Compile()).ForEach(x => DataUpdateEvent(x.Id)); } - public override async Task Replace(T item) { + public override async Task Replace(T item) + { string id = item.Id; T cacheItem = GetSingle(id); await base.Replace(item); @@ -91,46 +125,59 @@ public override async Task Replace(T item) { DataUpdateEvent(item.Id); } - public override async Task Delete(string id) { + public override async Task Delete(string id) + { T cacheItem = GetSingle(id); await base.Delete(id); SetCache(Cache.Except(new[] { cacheItem })); DataDeleteEvent(id); } - public override async Task Delete(T item) { - if (Cache == null) Get(); + public override async Task Delete(T item) + { + if (Cache == null) + { + Get(); + } + await base.Delete(item); SetCache(Cache.Except(new[] { item })); DataDeleteEvent(item.Id); } - public override async Task DeleteMany(Expression> filterExpression) { + public override async Task DeleteMany(Expression> filterExpression) + { List ids = Get(filterExpression.Compile()).ToList(); await base.DeleteMany(filterExpression); SetCache(Cache.Except(ids)); ids.ForEach(x => DataDeleteEvent(x.Id)); } - protected virtual void SetCache(IEnumerable newCollection) { - lock (LockObject) { + protected virtual void SetCache(IEnumerable newCollection) + { + lock (LockObject) + { Cache = newCollection?.ToList(); } } - private void DataAddEvent(T item) { - DataEvent(new EventModel(EventType.ADD, new ContextEventData(string.Empty, item))); + private void DataAddEvent(T item) + { + DataEvent(new(EventType.ADD, new ContextEventData(string.Empty, item))); } - private void DataUpdateEvent(string id) { - DataEvent(new EventModel(EventType.UPDATE, new ContextEventData(id, null))); + private void DataUpdateEvent(string id) + { + DataEvent(new(EventType.UPDATE, new ContextEventData(id, null))); } - private void DataDeleteEvent(string id) { - DataEvent(new EventModel(EventType.DELETE, new ContextEventData(id, null))); + private void DataDeleteEvent(string id) + { + DataEvent(new(EventType.DELETE, new ContextEventData(id, null))); } - protected virtual void DataEvent(EventModel eventModel) { + protected virtual void DataEvent(EventModel eventModel) + { _eventBus.Send(eventModel); } } diff --git a/UKSF.Api.Shared/Context/LogContext.cs b/UKSF.Api.Shared/Context/LogContext.cs index 495a7791..f56f6e96 100644 --- a/UKSF.Api.Shared/Context/LogContext.cs +++ b/UKSF.Api.Shared/Context/LogContext.cs @@ -2,34 +2,40 @@ using UKSF.Api.Base.Events; using UKSF.Api.Shared.Models; -namespace UKSF.Api.Shared.Context { +namespace UKSF.Api.Shared.Context +{ public interface ILogContext : IMongoContext { } public interface IAuditLogContext : IMongoContext { } - public interface IHttpErrorLogContext : IMongoContext { } + public interface IErrorLogContext : IMongoContext { } public interface ILauncherLogContext : IMongoContext { } public interface IDiscordLogContext : IMongoContext { } - public class LogContext : MongoContext, ILogContext { + public class LogContext : MongoContext, ILogContext + { public LogContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "logs") { } } - public class AuditLogContext : MongoContext, IAuditLogContext { + public class AuditLogContext : MongoContext, IAuditLogContext + { public AuditLogContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "auditLogs") { } } - public class HttpErrorLogContext : MongoContext, IHttpErrorLogContext { - public HttpErrorLogContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "errorLogs") { } + public class ErrorLogContext : MongoContext, IErrorLogContext + { + public ErrorLogContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "errorLogs") { } } - public class LauncherLogContext : MongoContext, ILauncherLogContext { + public class LauncherLogContext : MongoContext, ILauncherLogContext + { public LauncherLogContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "launcherLogs") { } } - public class DiscordLogContext : MongoContext, IDiscordLogContext { + public class DiscordLogContext : MongoContext, IDiscordLogContext + { public DiscordLogContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "discordLogs") { } } } diff --git a/UKSF.Api.Shared/Context/MongoContext.cs b/UKSF.Api.Shared/Context/MongoContext.cs index d4b2daed..21d2905a 100644 --- a/UKSF.Api.Shared/Context/MongoContext.cs +++ b/UKSF.Api.Shared/Context/MongoContext.cs @@ -10,8 +10,10 @@ using UKSF.Api.Shared.Models; using SortDirection = UKSF.Api.Base.Models.SortDirection; -namespace UKSF.Api.Shared.Context { - public interface IMongoContext where T : MongoObject { +namespace UKSF.Api.Shared.Context +{ + public interface IMongoContext where T : MongoObject + { IEnumerable Get(); IEnumerable Get(Func predicate); PagedResult GetPaged(int page, int pageSize, SortDirection sortDirection, string sortField, IEnumerable>> filterPropertSelectors, string filter); @@ -28,69 +30,86 @@ public interface IMongoContext where T : MongoObject { Task DeleteMany(Expression> filterExpression); } - public class MongoContext : MongoContextBase, IMongoContext where T : MongoObject { + public class MongoContext : MongoContextBase, IMongoContext where T : MongoObject + { private readonly IEventBus _eventBus; - protected MongoContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base(mongoCollectionFactory, collectionName) => _eventBus = eventBus; + protected MongoContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base(mongoCollectionFactory, collectionName) + { + _eventBus = eventBus; + } - public override async Task Add(T item) { + public override async Task Add(T item) + { await base.Add(item); DataAddEvent(item); } - public override async Task Update(string id, Expression> fieldSelector, object value) { + public override async Task Update(string id, Expression> fieldSelector, object value) + { await base.Update(id, fieldSelector, value); DataUpdateEvent(id); } - public override async Task Update(string id, UpdateDefinition update) { + public override async Task Update(string id, UpdateDefinition update) + { await base.Update(id, update); DataUpdateEvent(id); } - public override async Task Update(Expression> filterExpression, UpdateDefinition update) { + public override async Task Update(Expression> filterExpression, UpdateDefinition update) + { await base.Update(filterExpression, update); DataUpdateEvent(GetSingle(filterExpression.Compile()).Id); } - public override async Task UpdateMany(Expression> filterExpression, UpdateDefinition update) { + public override async Task UpdateMany(Expression> filterExpression, UpdateDefinition update) + { await base.UpdateMany(filterExpression, update); Get(filterExpression.Compile()).ForEach(x => DataUpdateEvent(x.Id)); } - public override async Task Replace(T item) { + public override async Task Replace(T item) + { await base.Replace(item); DataUpdateEvent(item.Id); } - public override async Task Delete(string id) { + public override async Task Delete(string id) + { await base.Delete(id); DataDeleteEvent(id); } - public override async Task Delete(T item) { + public override async Task Delete(T item) + { await base.Delete(item); DataDeleteEvent(item.Id); } - public override async Task DeleteMany(Expression> filterExpression) { + public override async Task DeleteMany(Expression> filterExpression) + { await base.DeleteMany(filterExpression); Get(filterExpression.Compile()).ForEach(x => DataDeleteEvent(x.Id)); } - private void DataAddEvent(T item) { - DataEvent(new EventModel(EventType.ADD, new ContextEventData(string.Empty, item))); + private void DataAddEvent(T item) + { + DataEvent(new(EventType.ADD, new ContextEventData(string.Empty, item))); } - private void DataUpdateEvent(string id) { - DataEvent(new EventModel(EventType.UPDATE, new ContextEventData(id, null))); + private void DataUpdateEvent(string id) + { + DataEvent(new(EventType.UPDATE, new ContextEventData(id, null))); } - private void DataDeleteEvent(string id) { - DataEvent(new EventModel(EventType.DELETE, new ContextEventData(id, null))); + private void DataDeleteEvent(string id) + { + DataEvent(new(EventType.DELETE, new ContextEventData(id, null))); } - protected virtual void DataEvent(EventModel dataModel) { + protected virtual void DataEvent(EventModel dataModel) + { _eventBus.Send(dataModel); } } diff --git a/UKSF.Api.Shared/Events/Logger.cs b/UKSF.Api.Shared/Events/Logger.cs index 4e2d948b..799d8fa4 100644 --- a/UKSF.Api.Shared/Events/Logger.cs +++ b/UKSF.Api.Shared/Events/Logger.cs @@ -1,63 +1,74 @@ using System; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Controllers; using UKSF.Api.Base.Events; using UKSF.Api.Shared.Models; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Shared.Events { - public interface ILogger { +namespace UKSF.Api.Shared.Events +{ + public interface ILogger + { void LogInfo(string message); void LogWarning(string message); void LogError(string message); void LogError(Exception exception); - void LogHttpError(Exception exception); - void LogHttpError(HttpErrorLog log); + void LogError(Exception exception, HttpContext context, HttpResponse response, string userId, string userDisplayName); void LogAudit(string message, string userId = ""); void LogDiscordEvent(DiscordUserEventType discordUserEventType, string instigatorId, string instigatorName, string channelName, string name, string message); } - public class Logger : ILogger { - private readonly IHttpContextService _httpContextService; + public class Logger : ILogger + { private readonly IEventBus _eventBus; + private readonly IHttpContextService _httpContextService; - public Logger(IHttpContextService httpContextService, IEventBus eventBus) { + public Logger(IHttpContextService httpContextService, IEventBus eventBus) + { _httpContextService = httpContextService; _eventBus = eventBus; } - public void LogInfo(string message) { - Log(new BasicLog(message, LogLevel.INFO)); - } - - public void LogWarning(string message) { - Log(new BasicLog(message, LogLevel.WARNING)); + public void LogInfo(string message) + { + Log(new(message, LogLevel.INFO)); } - public void LogError(string message) { - Log(new BasicLog(message, LogLevel.ERROR)); + public void LogWarning(string message) + { + Log(new(message, LogLevel.WARNING)); } - public void LogError(Exception exception) { - Log(new BasicLog(exception)); + public void LogError(string message) + { + Log(new(message, LogLevel.ERROR)); } - public void LogHttpError(Exception exception) { - Log(new HttpErrorLog(exception)); + public void LogError(Exception exception) + { + Log(new(exception)); } - public void LogHttpError(HttpErrorLog log) { - Log(log); - } - - public void LogAudit(string message, string userId = "") { + public void LogAudit(string message, string userId = "") + { userId = string.IsNullOrEmpty(userId) ? _httpContextService.GetUserId() ?? "Server" : userId; Log(new AuditLog(userId, message)); } - public void LogDiscordEvent(DiscordUserEventType discordUserEventType, string instigatorId, string instigatorName, string channelName, string name, string message) { + public void LogDiscordEvent(DiscordUserEventType discordUserEventType, string instigatorId, string instigatorName, string channelName, string name, string message) + { Log(new DiscordLog(discordUserEventType, instigatorId, instigatorName, channelName, name, message)); } - private void Log(BasicLog log) { + public void LogError(Exception exception, HttpContext context, HttpResponse response, string userId, string userDisplayName) + { + ControllerActionDescriptor controllerActionDescriptor = context.GetEndpoint()?.Metadata.GetMetadata(); + string endpointName = controllerActionDescriptor == null ? null : controllerActionDescriptor.ControllerName + "." + controllerActionDescriptor.ActionName; + Log(new ErrorLog(exception, context.Request.Path + context.Request.QueryString, context.Request.Method, endpointName, response?.StatusCode ?? 500, userId, userDisplayName)); + } + + private void Log(BasicLog log) + { _eventBus.Send(new LoggerEventData(log)); } } diff --git a/UKSF.Api.Shared/Exceptions/NotFoundException.cs b/UKSF.Api.Shared/Exceptions/NotFoundException.cs new file mode 100644 index 00000000..45171048 --- /dev/null +++ b/UKSF.Api.Shared/Exceptions/NotFoundException.cs @@ -0,0 +1,10 @@ +using System; + +namespace UKSF.Api.Shared.Exceptions +{ + [Serializable] + public class NotFoundException : UksfException + { + protected NotFoundException(string message) : base(message, 404) { } + } +} diff --git a/UKSF.Api.Shared/Exceptions/UksfException.cs b/UKSF.Api.Shared/Exceptions/UksfException.cs new file mode 100644 index 00000000..ea8724cd --- /dev/null +++ b/UKSF.Api.Shared/Exceptions/UksfException.cs @@ -0,0 +1,15 @@ +using System; + +namespace UKSF.Api.Shared.Exceptions +{ + [Serializable] + public class UksfException : Exception + { + protected UksfException(string message, int statusCode, Exception inner = null) : base(message, inner) + { + StatusCode = statusCode; + } + + public int StatusCode { get; } + } +} diff --git a/UKSF.Api.Shared/Extensions/ChangeUtilities.cs b/UKSF.Api.Shared/Extensions/ChangeUtilities.cs index f07764f9..2a78767d 100644 --- a/UKSF.Api.Shared/Extensions/ChangeUtilities.cs +++ b/UKSF.Api.Shared/Extensions/ChangeUtilities.cs @@ -5,30 +5,48 @@ using System.Reflection; using Newtonsoft.Json.Linq; -namespace UKSF.Api.Shared.Extensions { - public static class ChangeUtilities { - public static string Changes(this T original, T updated) => DeepEquals(original, updated) ? "\tNo changes" : FormatChanges(GetChanges(original, updated)); +namespace UKSF.Api.Shared.Extensions +{ + public static class ChangeUtilities + { + public static string Changes(this T original, T updated) + { + return DeepEquals(original, updated) ? "\tNo changes" : FormatChanges(GetChanges(original, updated)); + } - private static List GetChanges(this T original, T updated) { + private static List GetChanges(this T original, T updated) + { List changes = new(); Type type = original.GetType(); IEnumerable fields = type.GetFields(); - if (!fields.Any()) { + if (!fields.Any()) + { changes.Add(GetChange(type, type.Name.Split('`')[0], original, updated)); return changes; } - foreach (FieldInfo fieldInfo in fields) { + foreach (FieldInfo fieldInfo in fields) + { string name = fieldInfo.Name; object originalValue = fieldInfo.GetValue(original); object updatedValue = fieldInfo.GetValue(updated); - if (originalValue == null && updatedValue == null) continue; - if (DeepEquals(originalValue, updatedValue)) continue; + if (originalValue == null && updatedValue == null) + { + continue; + } - if (fieldInfo.FieldType.IsClass && !fieldInfo.FieldType.IsSerializable) { - changes.Add(new Change { Type = ChangeType.CLASS, Name = name, InnerChanges = GetChanges(originalValue, updatedValue) }); - } else { + if (DeepEquals(originalValue, updatedValue)) + { + continue; + } + + if (fieldInfo.FieldType.IsClass && !fieldInfo.FieldType.IsSerializable) + { + changes.Add(new() { Type = ChangeType.CLASS, Name = name, InnerChanges = GetChanges(originalValue, updatedValue) }); + } + else + { changes.Add(GetChange(fieldInfo.FieldType, name, originalValue, updatedValue)); } } @@ -36,41 +54,63 @@ private static List GetChanges(this T original, T updated) { return changes; } - private static Change GetChange(Type type, string name, object original, object updated) { - if (type != typeof(string) && updated is IEnumerable originalListValue && original is IEnumerable updatedListValue) { - return new Change { Type = ChangeType.LIST, Name = name == string.Empty ? "List" : name, InnerChanges = GetListChanges(originalListValue, updatedListValue) }; + private static Change GetChange(Type type, string name, object original, object updated) + { + if (type != typeof(string) && updated is IEnumerable originalListValue && original is IEnumerable updatedListValue) + { + return new() { Type = ChangeType.LIST, Name = name == string.Empty ? "List" : name, InnerChanges = GetListChanges(originalListValue, updatedListValue) }; } - if (original == null) { - return new Change { Type = ChangeType.ADDITION, Name = name, Updated = updated.ToString() }; + if (original == null) + { + return new() { Type = ChangeType.ADDITION, Name = name, Updated = updated.ToString() }; } - if (updated == null) { - return new Change { Type = ChangeType.REMOVAL, Name = name, Original = original.ToString() }; + if (updated == null) + { + return new() { Type = ChangeType.REMOVAL, Name = name, Original = original.ToString() }; } - return new Change { Type = ChangeType.CHANGE, Name = name, Original = original.ToString(), Updated = updated.ToString() }; + return new() { Type = ChangeType.CHANGE, Name = name, Original = original.ToString(), Updated = updated.ToString() }; } - private static List GetListChanges(this IEnumerable original, IEnumerable updated) { - List originalObjects = original == null ? new List() : original.Cast().ToList(); - List updatedObjects = updated == null ? new List() : updated.Cast().ToList(); - List changes = originalObjects.Where(originalObject => !updatedObjects.Any(updatedObject => DeepEquals(originalObject, updatedObject))).Select(x => new Change { Type = ChangeType.ADDITION, Updated = x.ToString() }).ToList(); - changes.AddRange(updatedObjects.Where(updatedObject => !originalObjects.Any(originalObject => DeepEquals(originalObject, updatedObject))).Select(x => new Change { Type = ChangeType.REMOVAL, Original = x.ToString() })); + private static List GetListChanges(this IEnumerable original, IEnumerable updated) + { + List originalObjects = original == null ? new() : original.Cast().ToList(); + List updatedObjects = updated == null ? new() : updated.Cast().ToList(); + List changes = originalObjects.Where(originalObject => !updatedObjects.Any(updatedObject => DeepEquals(originalObject, updatedObject))) + .Select(x => new Change { Type = ChangeType.ADDITION, Updated = x.ToString() }) + .ToList(); + changes.AddRange( + updatedObjects.Where(updatedObject => !originalObjects.Any(originalObject => DeepEquals(originalObject, updatedObject))) + .Select(x => new Change { Type = ChangeType.REMOVAL, Original = x.ToString() }) + ); return changes; } - private static bool DeepEquals(object original, object updated) { - if (original == null && updated == null) return true; - if (original == null || updated == null) return false; + private static bool DeepEquals(object original, object updated) + { + if (original == null && updated == null) + { + return true; + } + + if (original == null || updated == null) + { + return false; + } JToken originalObject = JToken.FromObject(original); JToken updatedObject = JToken.FromObject(updated); return JToken.DeepEquals(originalObject, updatedObject); } - private static string FormatChanges(IReadOnlyCollection changes, string indentation = "") { - if (!changes.Any()) return "\tNo changes"; + private static string FormatChanges(IReadOnlyCollection changes, string indentation = "") + { + if (!changes.Any()) + { + return "\tNo changes"; + } return changes.OrderBy(x => x.Type) .ThenBy(x => x.Name) @@ -79,7 +119,8 @@ private static string FormatChanges(IReadOnlyCollection changes, string (current, change) => current + $"\n\t{indentation}'{change.Name}'" + " " + - change.Type switch { + change.Type switch + { ChangeType.ADDITION => $"added as '{change.Updated}'", ChangeType.REMOVAL => $"as '{change.Original}' removed", ChangeType.CLASS => $"changed:{FormatChanges(change.InnerChanges, indentation + "\t")}", @@ -89,12 +130,17 @@ private static string FormatChanges(IReadOnlyCollection changes, string ); } - private static string FormatListChanges(IEnumerable changes, string indentation = "") { + private static string FormatListChanges(IEnumerable changes, string indentation = "") + { string changesString = ""; - foreach (Change change in changes.OrderBy(x => x.Type).ThenBy(x => x.Name)) { - if (change.Type == ChangeType.ADDITION) { + foreach (Change change in changes.OrderBy(x => x.Type).ThenBy(x => x.Name)) + { + if (change.Type == ChangeType.ADDITION) + { changesString += $"\n\t{indentation}added: '{change.Updated}'"; - } else if (change.Type == ChangeType.REMOVAL) { + } + else if (change.Type == ChangeType.REMOVAL) + { changesString += $"\n\t{indentation}removed: '{change.Original}'"; } } @@ -103,7 +149,8 @@ private static string FormatListChanges(IEnumerable changes, string inde } } - public class Change { + public class Change + { public List InnerChanges = new(); public string Name; public string Original; @@ -111,7 +158,8 @@ public class Change { public string Updated; } - public enum ChangeType { + public enum ChangeType + { ADDITION, CHANGE, LIST, diff --git a/UKSF.Api.Shared/Extensions/GuardUtilites.cs b/UKSF.Api.Shared/Extensions/GuardUtilites.cs index a3311510..ecb0106a 100644 --- a/UKSF.Api.Shared/Extensions/GuardUtilites.cs +++ b/UKSF.Api.Shared/Extensions/GuardUtilites.cs @@ -2,30 +2,65 @@ using System.Linq; using MongoDB.Bson; -namespace UKSF.Api.Shared.Extensions { - public static class GuardUtilites { - public static void ValidateString(string text, Action onInvalid) { - if (string.IsNullOrEmpty(text)) onInvalid(text); +namespace UKSF.Api.Shared.Extensions +{ + public static class GuardUtilites + { + public static void ValidateString(string text, Action onInvalid) + { + if (string.IsNullOrEmpty(text)) + { + onInvalid(text); + } } - public static void ValidateId(string id, Action onInvalid) { - if (string.IsNullOrEmpty(id)) onInvalid(id); - if (!ObjectId.TryParse(id, out ObjectId _)) onInvalid(id); + public static void ValidateId(string id, Action onInvalid) + { + if (string.IsNullOrEmpty(id)) + { + onInvalid(id); + } + + if (!ObjectId.TryParse(id, out ObjectId _)) + { + onInvalid(id); + } } - public static void ValidateArray(T[] array, Func validate, Func elementValidate, Action onInvalid) { - if (!validate(array)) onInvalid(); - if (array.Any(x => !elementValidate(x))) onInvalid(); + public static void ValidateArray(T[] array, Func validate, Func elementValidate, Action onInvalid) + { + if (!validate(array)) + { + onInvalid(); + } + + if (array.Any(x => !elementValidate(x))) + { + onInvalid(); + } } - public static void ValidateIdArray(string[] array, Func validate, Action onInvalid, Action onIdInvalid) { - if (!validate(array)) onInvalid(); + public static void ValidateIdArray(string[] array, Func validate, Action onInvalid, Action onIdInvalid) + { + if (!validate(array)) + { + onInvalid(); + } + Array.ForEach(array, x => ValidateId(x, onIdInvalid)); } - public static void ValidateTwoStrings(string first, string second, Action onInvalid) { - if (string.IsNullOrEmpty(first)) onInvalid(first); - if (string.IsNullOrEmpty(second)) onInvalid(second); + public static void ValidateTwoStrings(string first, string second, Action onInvalid) + { + if (string.IsNullOrEmpty(first)) + { + onInvalid(first); + } + + if (string.IsNullOrEmpty(second)) + { + onInvalid(second); + } } } } diff --git a/UKSF.Api.Shared/Extensions/JsonExtensions.cs b/UKSF.Api.Shared/Extensions/JsonExtensions.cs index 720c78c2..07a2ef3f 100644 --- a/UKSF.Api.Shared/Extensions/JsonExtensions.cs +++ b/UKSF.Api.Shared/Extensions/JsonExtensions.cs @@ -1,15 +1,24 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace UKSF.Api.Shared.Extensions { - public static class JsonExtensions { - public static T Copy(this object source) { +namespace UKSF.Api.Shared.Extensions +{ + public static class JsonExtensions + { + public static T Copy(this object source) + { JsonSerializerSettings deserializeSettings = new() { ObjectCreationHandling = ObjectCreationHandling.Replace }; return JsonConvert.DeserializeObject(JsonConvert.SerializeObject(source), deserializeSettings); } - public static string Escape(this string jsonString) => jsonString.Replace("\\", "\\\\"); + public static string Escape(this string jsonString) + { + return jsonString.Replace("\\", "\\\\"); + } - public static string GetValueFromBody(this JObject body, string key) => body[key] != null ? body[key].ToString() : string.Empty; + public static string GetValueFromBody(this JObject body, string key) + { + return body[key] != null ? body[key].ToString() : string.Empty; + } } } diff --git a/UKSF.Api.Shared/Extensions/ObjectExtensions.cs b/UKSF.Api.Shared/Extensions/ObjectExtensions.cs index d59749c6..114cea11 100644 --- a/UKSF.Api.Shared/Extensions/ObjectExtensions.cs +++ b/UKSF.Api.Shared/Extensions/ObjectExtensions.cs @@ -1,40 +1,66 @@ using System; using System.Reflection; -namespace UKSF.Api.Shared.Extensions { - public static class ObjectExtensions { - public static object GetFieldValue(this object obj, string fieldName) { - if (obj == null) throw new ArgumentNullException(nameof(obj)); +namespace UKSF.Api.Shared.Extensions +{ + public static class ObjectExtensions + { + public static object GetFieldValue(this object obj, string fieldName) + { + if (obj == null) + { + throw new ArgumentNullException(nameof(obj)); + } + Type objType = obj.GetType(); FieldInfo fieldInfo = GetFieldInfo(objType, fieldName); - if (fieldInfo == null) throw new ArgumentOutOfRangeException(fieldName, $"Couldn't find field {fieldName} in type {objType.FullName}"); + if (fieldInfo == null) + { + throw new ArgumentOutOfRangeException(fieldName, $"Couldn't find field {fieldName} in type {objType.FullName}"); + } + return fieldInfo.GetValue(obj); } - public static FieldInfo GetFieldInfo(this Type type, string fieldName) { + public static FieldInfo GetFieldInfo(this Type type, string fieldName) + { FieldInfo fieldInfo; - do { + do + { fieldInfo = type.GetField(fieldName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); type = type.BaseType; - } while (fieldInfo == null && type != null); + } + while (fieldInfo == null && type != null); return fieldInfo; } - public static object GetPropertyValue(this object obj, string propertyName) { - if (obj == null) throw new ArgumentNullException(nameof(obj)); + public static object GetPropertyValue(this object obj, string propertyName) + { + if (obj == null) + { + throw new ArgumentNullException(nameof(obj)); + } + Type objType = obj.GetType(); PropertyInfo propertyInfo = GetPropertyInfo(objType, propertyName); - if (propertyInfo == null) throw new ArgumentOutOfRangeException(propertyName, $"Couldn't find property {propertyName} in type {objType.FullName}"); + if (propertyInfo == null) + { + throw new ArgumentOutOfRangeException(propertyName, $"Couldn't find property {propertyName} in type {objType.FullName}"); + } + return propertyInfo.GetValue(obj, null); } - public static PropertyInfo GetPropertyInfo(this Type type, string propertyName) { + public static PropertyInfo GetPropertyInfo(this Type type, string propertyName) + { PropertyInfo propertyInfo; - do { + do + { propertyInfo = type.GetProperty(propertyName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); type = type.BaseType; - } while (propertyInfo == null && type != null); + } + while (propertyInfo == null && type != null); return propertyInfo; } diff --git a/UKSF.Api.Shared/Extensions/StringExtensions.cs b/UKSF.Api.Shared/Extensions/StringExtensions.cs index e99290f4..e13b9c11 100644 --- a/UKSF.Api.Shared/Extensions/StringExtensions.cs +++ b/UKSF.Api.Shared/Extensions/StringExtensions.cs @@ -4,33 +4,60 @@ using System.Text.RegularExpressions; using MongoDB.Bson; -namespace UKSF.Api.Shared.Extensions { - public static class StringExtensions { - public static bool ContainsIgnoreCase(this string text, string searchElement) => - !string.IsNullOrEmpty(text) && !string.IsNullOrEmpty(searchElement) && text.ToUpper().Contains(searchElement.ToUpper()); +namespace UKSF.Api.Shared.Extensions +{ + public static class StringExtensions + { + public static bool ContainsIgnoreCase(this string text, string searchElement) + { + return !string.IsNullOrEmpty(text) && !string.IsNullOrEmpty(searchElement) && text.ToUpper().Contains(searchElement.ToUpper()); + } - public static double ToDouble(this string text) => double.TryParse(text, out double number) ? number : 0d; + public static double ToDouble(this string text) + { + return double.TryParse(text, out double number) ? number : 0d; + } - public static string ToTitleCase(this string text) => CultureInfo.CurrentCulture.TextInfo.ToTitleCase(text); + public static string ToTitleCase(this string text) + { + return CultureInfo.CurrentCulture.TextInfo.ToTitleCase(text); + } - public static string Keyify(this string key) => key.Trim().ToUpper().Replace(" ", "_"); + public static string Keyify(this string key) + { + return key.Trim().ToUpper().Replace(" ", "_"); + } - public static string RemoveSpaces(this string item) => item.Replace(" ", string.Empty); + public static string RemoveSpaces(this string item) + { + return item.Replace(" ", string.Empty); + } - public static string RemoveNewLines(this string item) => item.Replace("\\n", string.Empty); + public static string RemoveNewLines(this string item) + { + return item.Replace("\\n", string.Empty); + } - public static string RemoveQuotes(this string item) => item.Replace("\"", string.Empty); + public static string RemoveQuotes(this string item) + { + return item.Replace("\"", string.Empty); + } - public static string RemoveEmbeddedQuotes(this string item) { + public static string RemoveEmbeddedQuotes(this string item) + { Match match = new Regex("(\\\".*).+(.*?\\\")").Match(item); item = item.Remove(match.Index, match.Length).Insert(match.Index, match.ToString().Replace("\"\"", "'")); return Regex.Replace(item, "\\\"\\s+\\\"", string.Empty); } - public static IEnumerable ExtractObjectIds(this string text) { + public static IEnumerable ExtractObjectIds(this string text) + { return Regex.Matches(text, @"[{(]?[0-9a-fA-F]{24}[)}]?").Where(x => IsObjectId(x.Value)).Select(x => x.Value); } - public static bool IsObjectId(this string text) => ObjectId.TryParse(text, out ObjectId unused); + public static bool IsObjectId(this string text) + { + return ObjectId.TryParse(text, out ObjectId unused); + } } } diff --git a/UKSF.Api.Shared/Models/BasicLog.cs b/UKSF.Api.Shared/Models/BasicLog.cs index 7a4e6f47..1b615156 100644 --- a/UKSF.Api.Shared/Models/BasicLog.cs +++ b/UKSF.Api.Shared/Models/BasicLog.cs @@ -3,35 +3,44 @@ using MongoDB.Bson.Serialization.Attributes; using UKSF.Api.Base.Models; -namespace UKSF.Api.Shared.Models { - public enum LogLevel { +namespace UKSF.Api.Shared.Models +{ + public enum LogLevel + { DEBUG, INFO, ERROR, WARNING } - public class BasicLog : MongoObject { - protected BasicLog() { + public class BasicLog : MongoObject + { + [BsonRepresentation(BsonType.String)] public LogLevel Level; + + public string Message; + public DateTime Timestamp; + + protected BasicLog() + { Level = LogLevel.INFO; Timestamp = DateTime.UtcNow; } - public BasicLog(string text) : this() => Message = text; + public BasicLog(string text) : this() + { + Message = text; + } - public BasicLog(string text, LogLevel logLevel) : this() { + public BasicLog(string text, LogLevel logLevel) : this() + { Message = text; Level = logLevel; } - public BasicLog(Exception exception) : this() { + public BasicLog(Exception exception) : this() + { Message = exception.GetBaseException().ToString(); Level = LogLevel.ERROR; } - - [BsonRepresentation(BsonType.String)] - public LogLevel Level; - public string Message; - public DateTime Timestamp; } } diff --git a/UKSF.Api.Shared/Models/ErrorLog.cs b/UKSF.Api.Shared/Models/ErrorLog.cs new file mode 100644 index 00000000..d2e79928 --- /dev/null +++ b/UKSF.Api.Shared/Models/ErrorLog.cs @@ -0,0 +1,35 @@ +using System; + +namespace UKSF.Api.Shared.Models +{ + public class ErrorLog : BasicLog + { + public string EndpointName; + public string Exception; + public string Method; + public string Name; + public int StatusCode; + public string Url; + public string UserId; + + public ErrorLog(Exception exception, string url, string method, string endpointName, int statusCode, string userId, string name) + { + Level = LogLevel.ERROR; + Exception = exception.ToString(); + Message = exception.GetBaseException().Message; + Url = url; + Method = method; + EndpointName = endpointName; + StatusCode = statusCode; + UserId = userId; + Name = name; + } + + public ErrorLog(Exception exception) + { + Level = LogLevel.ERROR; + Exception = exception.ToString(); + Message = exception.GetBaseException().Message; + } + } +} diff --git a/UKSF.Api.Shared/Models/HttpErrorLog.cs b/UKSF.Api.Shared/Models/HttpErrorLog.cs deleted file mode 100644 index 6093c3f7..00000000 --- a/UKSF.Api.Shared/Models/HttpErrorLog.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; - -namespace UKSF.Api.Shared.Models { - public class HttpErrorLog : BasicLog { - public HttpErrorLog(Exception exception) { - Exception = exception.ToString(); - Message = exception.GetBaseException().Message; - Level = LogLevel.ERROR; - } - - public HttpErrorLog(Exception exception, string name, string userId, string httpMethod, string url) : this(exception) { - Name = name; - UserId = userId; - HttpMethod = httpMethod; - Url = url; - } - - public string Exception; - public string HttpMethod; - public string Name; - public string Url; - public string UserId; - } -} diff --git a/UKSF.Api.Shared/Models/LauncherLog.cs b/UKSF.Api.Shared/Models/LauncherLog.cs index 14f058a4..09c37327 100644 --- a/UKSF.Api.Shared/Models/LauncherLog.cs +++ b/UKSF.Api.Shared/Models/LauncherLog.cs @@ -1,9 +1,14 @@ -namespace UKSF.Api.Shared.Models { - public class LauncherLog : BasicLog { +namespace UKSF.Api.Shared.Models +{ + public class LauncherLog : BasicLog + { public string Name; public string UserId; public string Version; - public LauncherLog(string version, string message) : base(message) => Version = version; + public LauncherLog(string version, string message) : base(message) + { + Version = version; + } } } diff --git a/UKSF.Api.Shared/Models/LoggerEventData.cs b/UKSF.Api.Shared/Models/LoggerEventData.cs index e58cfaa3..4cde80ca 100644 --- a/UKSF.Api.Shared/Models/LoggerEventData.cs +++ b/UKSF.Api.Shared/Models/LoggerEventData.cs @@ -1,7 +1,12 @@ -namespace UKSF.Api.Shared.Models { - public class LoggerEventData { - public LoggerEventData(BasicLog log) => Log = log; - +namespace UKSF.Api.Shared.Models +{ + public class LoggerEventData + { public BasicLog Log; + + public LoggerEventData(BasicLog log) + { + Log = log; + } } } diff --git a/UKSF.Api.Shared/Models/UksfErrorMessage.cs b/UKSF.Api.Shared/Models/UksfErrorMessage.cs new file mode 100644 index 00000000..b7fe733f --- /dev/null +++ b/UKSF.Api.Shared/Models/UksfErrorMessage.cs @@ -0,0 +1,15 @@ +namespace UKSF.Api.Shared.Models +{ + public class UksfErrorMessage + { + public string Error; + + public int StatusCode; + + public UksfErrorMessage(int statusCode, string error) + { + StatusCode = statusCode; + Error = error; + } + } +} diff --git a/UKSF.Api.Shared/Permissions.cs b/UKSF.Api.Shared/Permissions.cs index 290c60b9..e0ca77da 100644 --- a/UKSF.Api.Shared/Permissions.cs +++ b/UKSF.Api.Shared/Permissions.cs @@ -2,8 +2,10 @@ using System.Linq; using Microsoft.AspNetCore.Authorization; -namespace UKSF.Api.Shared { - public static class Permissions { +namespace UKSF.Api.Shared +{ + public static class Permissions + { public static readonly HashSet ALL = new() { MEMBER, ADMIN, COMMAND, NCO, RECRUITER, RECRUITER_LEAD, PERSONNEL, SERVERS, TESTER }; #region MemberStates @@ -29,7 +31,11 @@ public static class Permissions { #endregion } - public class PermissionsAttribute : AuthorizeAttribute { - public PermissionsAttribute(params string[] roles) => Roles = string.Join(",", roles.Distinct()); + public class PermissionsAttribute : AuthorizeAttribute + { + public PermissionsAttribute(params string[] roles) + { + Roles = string.Join(",", roles.Distinct()); + } } } diff --git a/UKSF.Api.Shared/Services/Clock.cs b/UKSF.Api.Shared/Services/Clock.cs index a72e1816..02896964 100644 --- a/UKSF.Api.Shared/Services/Clock.cs +++ b/UKSF.Api.Shared/Services/Clock.cs @@ -1,15 +1,29 @@ using System; -namespace UKSF.Api.Shared.Services { - public interface IClock { +namespace UKSF.Api.Shared.Services +{ + public interface IClock + { public DateTime Now(); public DateTime Today(); public DateTime UtcNow(); } - public class Clock : IClock { - public DateTime Now() => DateTime.Now; - public DateTime Today() => DateTime.Today; - public DateTime UtcNow() => DateTime.UtcNow; + public class Clock : IClock + { + public DateTime Now() + { + return DateTime.Now; + } + + public DateTime Today() + { + return DateTime.Today; + } + + public DateTime UtcNow() + { + return DateTime.UtcNow; + } } } diff --git a/UKSF.Api.Shared/Services/HttpContextService.cs b/UKSF.Api.Shared/Services/HttpContextService.cs index 95729e50..2928ab84 100644 --- a/UKSF.Api.Shared/Services/HttpContextService.cs +++ b/UKSF.Api.Shared/Services/HttpContextService.cs @@ -2,26 +2,43 @@ using System.Security.Claims; using Microsoft.AspNetCore.Http; -namespace UKSF.Api.Shared.Services { - public interface IHttpContextService { +namespace UKSF.Api.Shared.Services +{ + public interface IHttpContextService + { bool IsUserAuthenticated(); public string GetUserId(); public string GetUserEmail(); bool UserHasPermission(string permission); } - public class HttpContextService : IHttpContextService { + public class HttpContextService : IHttpContextService + { private readonly IHttpContextAccessor _httpContextAccessor; - public HttpContextService(IHttpContextAccessor httpContextAccessor) => _httpContextAccessor = httpContextAccessor; + public HttpContextService(IHttpContextAccessor httpContextAccessor) + { + _httpContextAccessor = httpContextAccessor; + } - public bool IsUserAuthenticated() => _httpContextAccessor.HttpContext?.User.Identity != null && _httpContextAccessor.HttpContext.User.Identity.IsAuthenticated; + public bool IsUserAuthenticated() + { + return _httpContextAccessor.HttpContext?.User.Identity != null && _httpContextAccessor.HttpContext.User.Identity.IsAuthenticated; + } - public string GetUserId() => _httpContextAccessor.HttpContext?.User.Claims.SingleOrDefault(x => x.Type == ClaimTypes.Sid)?.Value; + public string GetUserId() + { + return _httpContextAccessor.HttpContext?.User.Claims.SingleOrDefault(x => x.Type == ClaimTypes.Sid)?.Value; + } - public string GetUserEmail() => _httpContextAccessor.HttpContext?.User.Claims.SingleOrDefault(x => x.Type == ClaimTypes.Email)?.Value; + public string GetUserEmail() + { + return _httpContextAccessor.HttpContext?.User.Claims.SingleOrDefault(x => x.Type == ClaimTypes.Email)?.Value; + } - public bool UserHasPermission(string permission) => - _httpContextAccessor.HttpContext != null && _httpContextAccessor.HttpContext.User.Claims.Any(x => x.Type == ClaimTypes.Role && x.Value == permission); + public bool UserHasPermission(string permission) + { + return _httpContextAccessor.HttpContext != null && _httpContextAccessor.HttpContext.User.Claims.Any(x => x.Type == ClaimTypes.Role && x.Value == permission); + } } } diff --git a/UKSF.Api.Shared/Services/SchedulerService.cs b/UKSF.Api.Shared/Services/SchedulerService.cs index e2f3da01..6fd78cb7 100644 --- a/UKSF.Api.Shared/Services/SchedulerService.cs +++ b/UKSF.Api.Shared/Services/SchedulerService.cs @@ -10,39 +10,51 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; -namespace UKSF.Api.Shared.Services { - public interface ISchedulerService { +namespace UKSF.Api.Shared.Services +{ + public interface ISchedulerService + { void Load(); Task CreateAndScheduleJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters); Task CreateScheduledJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters); Task Cancel(Func predicate); } - public class SchedulerService : ISchedulerService { + public class SchedulerService : ISchedulerService + { private static readonly ConcurrentDictionary ACTIVE_TASKS = new(); private readonly ISchedulerContext _context; private readonly ILogger _logger; private readonly IScheduledActionFactory _scheduledActionFactory; - public SchedulerService(ISchedulerContext context, IScheduledActionFactory scheduledActionFactory, ILogger logger) { + public SchedulerService(ISchedulerContext context, IScheduledActionFactory scheduledActionFactory, ILogger logger) + { _context = context; _scheduledActionFactory = scheduledActionFactory; _logger = logger; } - public void Load() { + public void Load() + { _context.Get().ToList().ForEach(Schedule); } - public async Task CreateAndScheduleJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { + public async Task CreateAndScheduleJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters) + { ScheduledJob job = await CreateScheduledJob(next, interval, action, actionParameters); Schedule(job); } - public async Task Cancel(Func predicate) { + public async Task Cancel(Func predicate) + { ScheduledJob job = _context.GetSingle(predicate); - if (job == null) return; - if (ACTIVE_TASKS.TryGetValue(job.Id, out CancellationTokenSource token)) { + if (job == null) + { + return; + } + + if (ACTIVE_TASKS.TryGetValue(job.Id, out CancellationTokenSource token)) + { token.Cancel(); ACTIVE_TASKS.TryRemove(job.Id, out CancellationTokenSource _); } @@ -50,13 +62,16 @@ public async Task Cancel(Func predicate) { await _context.Delete(job); } - public async Task CreateScheduledJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters) { + public async Task CreateScheduledJob(DateTime next, TimeSpan interval, string action, params object[] actionParameters) + { ScheduledJob job = new() { Next = next, Action = action }; - if (actionParameters.Length > 0) { + if (actionParameters.Length > 0) + { job.ActionParameters = JsonConvert.SerializeObject(actionParameters); } - if (interval != TimeSpan.Zero) { + if (interval != TimeSpan.Zero) + { job.Interval = interval; job.Repeat = true; } @@ -65,35 +80,51 @@ public async Task CreateScheduledJob(DateTime next, TimeSpan inter return job; } - private void Schedule(ScheduledJob job) { + private void Schedule(ScheduledJob job) + { CancellationTokenSource token = new(); Task unused = Task.Run( - async () => { + async () => + { DateTime now = DateTime.Now; - if (now < job.Next) { + if (now < job.Next) + { TimeSpan delay = job.Next - now; await Task.Delay(delay, token.Token); - if (IsCancelled(job, token)) return; - } else { - if (job.Repeat) { + if (IsCancelled(job, token)) + { + return; + } + } + else + { + if (job.Repeat) + { DateTime nowLessInterval = now - job.Interval; - while (job.Next < nowLessInterval) { + while (job.Next < nowLessInterval) + { job.Next += job.Interval; } } } - try { + try + { ExecuteAction(job); - } catch (Exception exception) { + } + catch (Exception exception) + { _logger.LogError(exception); } - if (job.Repeat) { + if (job.Repeat) + { job.Next += job.Interval; await SetNext(job); Schedule(job); - } else { + } + else + { await _context.Delete(job); ACTIVE_TASKS.TryRemove(job.Id, out CancellationTokenSource _); } @@ -103,16 +134,23 @@ private void Schedule(ScheduledJob job) { ACTIVE_TASKS[job.Id] = token; } - private async Task SetNext(ScheduledJob job) { + private async Task SetNext(ScheduledJob job) + { await _context.Update(job.Id, x => x.Next, job.Next); } - private bool IsCancelled(MongoObject job, CancellationTokenSource token) { - if (token.IsCancellationRequested) return true; + private bool IsCancelled(MongoObject job, CancellationTokenSource token) + { + if (token.IsCancellationRequested) + { + return true; + } + return _context.GetSingle(job.Id) == null; } - private void ExecuteAction(ScheduledJob job) { + private void ExecuteAction(ScheduledJob job) + { IScheduledAction action = _scheduledActionFactory.GetScheduledAction(job.Action); object[] parameters = job.ActionParameters == null ? null : JsonConvert.DeserializeObject(job.ActionParameters); Task unused = action.Run(parameters); diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index f62eb7e4..d0ae415c 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -14,6 +14,8 @@ WARNING WARNING WARNING + ERROR + ERROR HINT DO_NOT_SHOW WARNING @@ -31,28 +33,28 @@ SUGGESTION HINT WARNING - WARNING - WARNING - WARNING + ERROR + ERROR + ERROR WARNING ShowAndRun Built-in: Full Cleanup - RequiredForMultilineStatement - RequiredForMultilineStatement - RequiredForMultilineStatement - RequiredForMultilineStatement - RequiredForMultilineStatement - RequiredForMultilineStatement - RequiredForMultilineStatement - RequiredForMultilineStatement - ExpressionBody + Required + Required + Required + Required + Required + Required + Required + Required + BlockBody Join - ExpressionBody + BlockBody ExpressionBody None True - END_OF_LINE - END_OF_LINE + NEXT_LINE + NEXT_LINE @@ -69,10 +71,10 @@ True True True - True - END_OF_LINE + False + NEXT_LINE 0 - END_OF_LINE + NEXT_LINE @@ -84,11 +86,11 @@ True True True - END_OF_LINE + NEXT_LINE True True True - END_OF_LINE + NEXT_LINE 1 1 @@ -97,30 +99,34 @@ False False False + False + False False True 80 10 - END_OF_LINE + COMPACT + NEXT_LINE NEVER NEVER - False - False + True + True False IF_OWNER_IS_SINGLE_LINE - False + True True ALWAYS ALWAYS + True ON_SINGLE_LINE ON_SINGLE_LINE True True - END_OF_LINE + NEXT_LINE False diff --git a/UKSF.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs index 5060e4fe..e20626be 100644 --- a/UKSF.Api/Controllers/LoaController.cs +++ b/UKSF.Api/Controllers/LoaController.cs @@ -7,6 +7,8 @@ using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; +using UKSF.Api.Exceptions; +using UKSF.Api.Models; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; @@ -14,9 +16,11 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Controllers +{ [Route("[controller]"), Permissions(Permissions.MEMBER)] - public class LoaController : Controller { + public class LoaController : Controller + { private readonly IAccountContext _accountContext; private readonly IAccountService _accountService; private readonly IChainOfCommandService _chainOfCommandService; @@ -43,7 +47,8 @@ public LoaController( IChainOfCommandService chainOfCommandService, INotificationsService notificationsService, ILogger logger - ) { + ) + { _loaContext = loaContext; _accountContext = accountContext; _commandRequestContext = commandRequestContext; @@ -59,9 +64,11 @@ ILogger logger } [HttpGet, Authorize] - public IActionResult Get([FromQuery] string scope = "you") { + public LoaReportDataset Get([FromQuery] string scope = "you") + { List objectIds; - switch (scope) { + switch (scope) + { case "all": objectIds = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER).Select(x => x.Id).ToList(); break; @@ -72,45 +79,49 @@ public IActionResult Get([FromQuery] string scope = "you") { objectIds = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER && members.Contains(x.Id)).Select(x => x.Id).ToList(); break; case "you": - objectIds = new List { _httpContextService.GetUserId() }; + objectIds = new() { _httpContextService.GetUserId() }; break; - default: return BadRequest(); + default: throw new InvalidLoaScopeException(scope); } - IEnumerable loaReports = _loaService.Get(objectIds) - .Select( - x => new { - id = x.Id, - start = x.Start, - end = x.End, - state = x.State, - emergency = x.Emergency, - late = x.Late, - reason = x.Reason, - name = _displayNameService.GetDisplayName(_accountContext.GetSingle(x.Recipient)), - inChainOfCommand = _chainOfCommandService.InContextChainOfCommand(x.Recipient), - longTerm = (x.End - x.Start).Days > 21 - } - ) - .ToList(); - return Ok( - new { - activeLoas = loaReports.Where(x => x.start <= DateTime.Now && x.end > DateTime.Now).OrderBy(x => x.end).ThenBy(x => x.start), - upcomingLoas = loaReports.Where(x => x.start >= DateTime.Now).OrderBy(x => x.start).ThenBy(x => x.end), - pastLoas = loaReports.Where(x => x.end < DateTime.Now).OrderByDescending(x => x.end).ThenByDescending(x => x.start) - } - ); + IEnumerable loaReports = _loaService.Get(objectIds) + .Select( + x => new LoaReport + { + Id = x.Id, + Start = x.Start, + End = x.End, + State = x.State.ToString(), + Emergency = x.Emergency, + Late = x.Late, + Reason = x.Reason, + Name = _displayNameService.GetDisplayName(_accountContext.GetSingle(x.Recipient)), + InChainOfCommand = _chainOfCommandService.InContextChainOfCommand(x.Recipient), + LongTerm = (x.End - x.Start).Days > 21 + } + ) + .ToList(); + return new() + { + ActiveLoas = loaReports.Where(x => x.Start <= DateTime.Now && x.End > DateTime.Now).OrderBy(x => x.End).ThenBy(x => x.Start).ToList(), + UpcomingLoas = loaReports.Where(x => x.Start >= DateTime.Now).OrderBy(x => x.Start).ThenBy(x => x.End).ToList(), + PastLoas = loaReports.Where(x => x.End < DateTime.Now).OrderByDescending(x => x.End).ThenByDescending(x => x.Start).ToList() + }; } [HttpDelete("{id}"), Authorize] - public async Task DeleteLoa(string id) { + public async Task DeleteLoa(string id) + { Loa loa = _loaContext.GetSingle(id); CommandRequest request = _commandRequestContext.GetSingle(x => x.Value == id); - if (request != null) { + if (request != null) + { await _commandRequestContext.Delete(request); - foreach (string reviewerId in request.Reviews.Keys.Where(x => x != request.Requester)) { + foreach (string reviewerId in request.Reviews.Keys.Where(x => x != request.Requester)) + { _notificationsService.Add( - new Notification { + new() + { Owner = reviewerId, Icon = NotificationIcons.REQUEST, Message = $"Your review for {request.DisplayRequester}'s LOA is no longer required as they deleted their LOA", @@ -124,8 +135,6 @@ public async Task DeleteLoa(string id) { _logger.LogAudit($"Loa deleted for '{_displayNameService.GetDisplayName(_accountContext.GetSingle(loa.Recipient))}' from '{loa.Start}' to '{loa.End}'"); await _loaContext.Delete(loa); - - return Ok(); } } } diff --git a/UKSF.Api/Controllers/LoggingController.cs b/UKSF.Api/Controllers/LoggingController.cs index c88891da..9c0827d2 100644 --- a/UKSF.Api/Controllers/LoggingController.cs +++ b/UKSF.Api/Controllers/LoggingController.cs @@ -8,49 +8,49 @@ using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Models; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Controllers +{ [Route("[controller]"), Permissions(Permissions.ADMIN)] - public class LoggingController : Controller { + public class LoggingController : Controller + { private readonly IAuditLogContext _auditLogContext; private readonly IDiscordLogContext _discordLogContext; - private readonly IHttpErrorLogContext _httpErrorLogContext; + private readonly IErrorLogContext _errorLogContext; private readonly ILauncherLogContext _launcherLogContext; private readonly ILogContext _logContext; public LoggingController( ILogContext logContext, IAuditLogContext auditLogContext, - IHttpErrorLogContext httpErrorLogContext, + IErrorLogContext errorLogContext, ILauncherLogContext launcherLogContext, IDiscordLogContext discordLogContext - ) { + ) + { _logContext = logContext; _auditLogContext = auditLogContext; - _httpErrorLogContext = httpErrorLogContext; + _errorLogContext = errorLogContext; _launcherLogContext = launcherLogContext; _discordLogContext = discordLogContext; } [HttpGet("basic"), Authorize] - public PagedResult GetBasicLogs([FromQuery] int page, [FromQuery] int pageSize, [FromQuery] SortDirection sortDirection, [FromQuery] string sortField, [FromQuery] string filter) { + public PagedResult GetBasicLogs([FromQuery] int page, [FromQuery] int pageSize, [FromQuery] SortDirection sortDirection, [FromQuery] string sortField, [FromQuery] string filter) + { IEnumerable>> filterProperties = GetBasicLogFilterProperties(); return _logContext.GetPaged(page, pageSize, sortDirection, sortField, filterProperties, filter); } [HttpGet("httpError"), Authorize] - public PagedResult GetHttpErrorLogs( - [FromQuery] int page, - [FromQuery] int pageSize, - [FromQuery] SortDirection sortDirection, - [FromQuery] string sortField, - [FromQuery] string filter - ) { - IEnumerable>> filterProperties = GetHttpErrorLogFilterProperties(); - return _httpErrorLogContext.GetPaged(page, pageSize, sortDirection, sortField, filterProperties, filter); + public PagedResult GetHttpErrorLogs([FromQuery] int page, [FromQuery] int pageSize, [FromQuery] SortDirection sortDirection, [FromQuery] string sortField, [FromQuery] string filter) + { + IEnumerable>> filterProperties = GetErrorLogFilterProperties(); + return _errorLogContext.GetPaged(page, pageSize, sortDirection, sortField, filterProperties, filter); } [HttpGet("audit"), Authorize] - public PagedResult GetAuditLogs([FromQuery] int page, [FromQuery] int pageSize, [FromQuery] SortDirection sortDirection, [FromQuery] string sortField, [FromQuery] string filter) { + public PagedResult GetAuditLogs([FromQuery] int page, [FromQuery] int pageSize, [FromQuery] SortDirection sortDirection, [FromQuery] string sortField, [FromQuery] string filter) + { IEnumerable>> filterProperties = GetAuditLogFilterProperties(); return _auditLogContext.GetPaged(page, pageSize, sortDirection, sortField, filterProperties, filter); } @@ -62,44 +62,42 @@ public PagedResult GetLauncherLogs( [FromQuery] SortDirection sortDirection, [FromQuery] string sortField, [FromQuery] string filter - ) { + ) + { IEnumerable>> filterProperties = GetLauncherLogFilterProperties(); return _launcherLogContext.GetPaged(page, pageSize, sortDirection, sortField, filterProperties, filter); } [HttpGet("discord"), Authorize] - public PagedResult GetDiscordLogs( - [FromQuery] int page, - [FromQuery] int pageSize, - [FromQuery] SortDirection sortDirection, - [FromQuery] string sortField, - [FromQuery] string filter - ) { - var logs = _discordLogContext.Get(); + public PagedResult GetDiscordLogs([FromQuery] int page, [FromQuery] int pageSize, [FromQuery] SortDirection sortDirection, [FromQuery] string sortField, [FromQuery] string filter) + { IEnumerable>> filterProperties = GetDiscordLogFilterProperties(); return _discordLogContext.GetPaged(page, pageSize, sortDirection, sortField, filterProperties, filter); } - private static IEnumerable>> GetBasicLogFilterProperties() { + private static IEnumerable>> GetBasicLogFilterProperties() + { return new List>> { x => x.Message, x => x.Level }; } - private static IEnumerable>> GetHttpErrorLogFilterProperties() { - return new List>> { x => x.Message, x => x.Url, x => x.Name, x => x.Exception, x => x.UserId, x => x.HttpMethod }; + private static IEnumerable>> GetErrorLogFilterProperties() + { + return new List>> { x => x.Message, x => x.StatusCode, x => x.Url, x => x.Name, x => x.Exception, x => x.UserId, x => x.Method, x => x.EndpointName }; } - private static IEnumerable>> GetAuditLogFilterProperties() { + private static IEnumerable>> GetAuditLogFilterProperties() + { return new List>> { x => x.Message, x => x.Who }; } - private static IEnumerable>> GetLauncherLogFilterProperties() { + private static IEnumerable>> GetLauncherLogFilterProperties() + { return new List>> { x => x.Message }; } - private static IEnumerable>> GetDiscordLogFilterProperties() { - return new List>> { - x => x.Message, x => x.DiscordUserEventType, x => x.InstigatorId, x => x.InstigatorName, x => x.ChannelName, x => x.Name - }; + private static IEnumerable>> GetDiscordLogFilterProperties() + { + return new List>> { x => x.Message, x => x.DiscordUserEventType, x => x.InstigatorId, x => x.InstigatorName, x => x.ChannelName, x => x.Name }; } } } diff --git a/UKSF.Api/Controllers/ModsController.cs b/UKSF.Api/Controllers/ModsController.cs index 5a83b926..636252cc 100644 --- a/UKSF.Api/Controllers/ModsController.cs +++ b/UKSF.Api/Controllers/ModsController.cs @@ -2,11 +2,16 @@ using Microsoft.AspNetCore.Mvc; using UKSF.Api.Shared; -namespace UKSF.Api.Controllers { +namespace UKSF.Api.Controllers +{ [Route("[controller]"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER)] - public class ModsController : Controller { + public class ModsController : Controller + { // TODO: Return size of modpack folder [HttpGet("size")] - public IActionResult Index() => Ok("37580963840"); + public IActionResult Index() + { + return Ok("37580963840"); + } } } diff --git a/UKSF.Api/EventHandlers/LoggerEventHandler.cs b/UKSF.Api/EventHandlers/LoggerEventHandler.cs index ff119e55..b84c60b1 100644 --- a/UKSF.Api/EventHandlers/LoggerEventHandler.cs +++ b/UKSF.Api/EventHandlers/LoggerEventHandler.cs @@ -7,15 +7,17 @@ using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Models; -namespace UKSF.Api.EventHandlers { +namespace UKSF.Api.EventHandlers +{ public interface ILoggerEventHandler : IEventHandler { } - public class LoggerEventHandler : ILoggerEventHandler { + public class LoggerEventHandler : ILoggerEventHandler + { private readonly IAuditLogContext _auditLogContext; private readonly IDiscordLogContext _discordLogContext; - private readonly IHttpErrorLogContext _httpErrorLogContext; - private readonly ILauncherLogContext _launcherLogContext; + private readonly IErrorLogContext _errorLogContext; private readonly IEventBus _eventBus; + private readonly ILauncherLogContext _launcherLogContext; private readonly ILogContext _logContext; private readonly ILogger _logger; private readonly IObjectIdConversionService _objectIdConversionService; @@ -24,33 +26,38 @@ public LoggerEventHandler( IEventBus eventBus, ILogContext logContext, IAuditLogContext auditLogContext, - IHttpErrorLogContext httpErrorLogContext, + IErrorLogContext errorLogContext, ILauncherLogContext launcherLogContext, IDiscordLogContext discordLogContext, ILogger logger, IObjectIdConversionService objectIdConversionService - ) { + ) + { _eventBus = eventBus; _logContext = logContext; _auditLogContext = auditLogContext; - _httpErrorLogContext = httpErrorLogContext; + _errorLogContext = errorLogContext; _launcherLogContext = launcherLogContext; _discordLogContext = discordLogContext; _logger = logger; _objectIdConversionService = objectIdConversionService; } - public void Init() { + public void Init() + { _eventBus.AsObservable().SubscribeWithAsyncNext(HandleLog, _logger.LogError); } - private Task HandleLog(EventModel eventModel, LoggerEventData logData) { + private Task HandleLog(EventModel eventModel, LoggerEventData logData) + { Task _ = HandleLogAsync(logData.Log); return Task.CompletedTask; } - private async Task HandleLogAsync(BasicLog log) { - if (log is AuditLog auditLog) { + private async Task HandleLogAsync(BasicLog log) + { + if (log is AuditLog auditLog) + { auditLog.Who = _objectIdConversionService.ConvertObjectId(auditLog.Who); log = auditLog; } @@ -59,13 +66,15 @@ private async Task HandleLogAsync(BasicLog log) { await LogToStorageAsync(log); } - private Task LogToStorageAsync(BasicLog log) { - return log switch { - AuditLog auditLog => _auditLogContext.Add(auditLog), - LauncherLog launcherLog => _launcherLogContext.Add(launcherLog), - HttpErrorLog httpErrorLog => _httpErrorLogContext.Add(httpErrorLog), - DiscordLog discordLog => _discordLogContext.Add(discordLog), - _ => _logContext.Add(log) + private Task LogToStorageAsync(BasicLog log) + { + return log switch + { + AuditLog auditLog => _auditLogContext.Add(auditLog), + LauncherLog launcherLog => _launcherLogContext.Add(launcherLog), + ErrorLog errorLog => _errorLogContext.Add(errorLog), + DiscordLog discordLog => _discordLogContext.Add(discordLog), + _ => _logContext.Add(log) }; } } diff --git a/UKSF.Api/ExceptionHandler.cs b/UKSF.Api/ExceptionHandler.cs deleted file mode 100644 index 69aab29e..00000000 --- a/UKSF.Api/ExceptionHandler.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Net; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Extensions; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Filters; -using UKSF.Api.Personnel.Services; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Models; -using UKSF.Api.Shared.Services; - -namespace UKSF.Api { - public class ExceptionHandler : IExceptionFilter { - private readonly IDisplayNameService _displayNameService; - private readonly IHttpContextService _httpContextService; - private readonly ILogger _logger; - - public ExceptionHandler(IDisplayNameService displayNameService, IHttpContextService httpContextService, ILogger logger) { - _displayNameService = displayNameService; - _httpContextService = httpContextService; - _logger = logger; - } - - public void OnException(ExceptionContext filterContext) { - if (filterContext == null) throw new ArgumentNullException(nameof(filterContext)); - - if (filterContext.Exception is NotImplementedException) { - // not implemented exception - not logged - filterContext.Result = new OkObjectResult(null); - filterContext.ExceptionHandled = true; - } else { - // unhandled/unexpected exception - log always - HttpContext context = filterContext.HttpContext; - LogError(context, filterContext.Exception); - filterContext.ExceptionHandled = true; - filterContext.Result = new ContentResult { Content = $"{filterContext.Exception.Message}", ContentType = "text/plain", StatusCode = (int?) HttpStatusCode.BadRequest }; - } - } - - private void LogError(HttpContext context, Exception exception) { - bool authenticated = _httpContextService.IsUserAuthenticated(); - string userId = _httpContextService.GetUserId(); - HttpErrorLog log = new( - exception, - authenticated ? _displayNameService.GetDisplayName(userId) : "Guest", - authenticated ? userId : "Guest", - context?.Request.Method ?? string.Empty, - context?.Request.GetDisplayUrl() - ); - _logger.LogHttpError(log); - } - } -} diff --git a/UKSF.Api/Exceptions/InvalidLoaScopeException.cs b/UKSF.Api/Exceptions/InvalidLoaScopeException.cs new file mode 100644 index 00000000..b1bc390d --- /dev/null +++ b/UKSF.Api/Exceptions/InvalidLoaScopeException.cs @@ -0,0 +1,11 @@ +using System; +using UKSF.Api.Shared.Exceptions; + +namespace UKSF.Api.Exceptions +{ + [Serializable] + public class InvalidLoaScopeException : UksfException + { + public InvalidLoaScopeException(string scope) : base($"'{scope}' is an invalid LOA scope", 400) { } + } +} diff --git a/UKSF.Api/Middleware/CorsMiddleware.cs b/UKSF.Api/Middleware/CorsMiddleware.cs new file mode 100644 index 00000000..991707d6 --- /dev/null +++ b/UKSF.Api/Middleware/CorsMiddleware.cs @@ -0,0 +1,19 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; + +namespace UKSF.Api.Middleware +{ + public class CorsMiddleware : IMiddleware + { + public async Task InvokeAsync(HttpContext context, RequestDelegate next) + { + if (context.Request.Path.Value != null && context.Request.Path.Value.Contains("hub")) + { + context.Response.Headers["Access-Control-Allow-Origin"] = context.Request.Headers["Origin"]; + context.Response.Headers["Access-Control-Allow-Credentials"] = "true"; + } + + await next(context); + } + } +} diff --git a/UKSF.Api/Middleware/ExceptionHandler.cs b/UKSF.Api/Middleware/ExceptionHandler.cs new file mode 100644 index 00000000..b8b096d6 --- /dev/null +++ b/UKSF.Api/Middleware/ExceptionHandler.cs @@ -0,0 +1,58 @@ +using System; +using System.IO.Pipelines; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using UKSF.Api.Shared.Exceptions; +using UKSF.Api.Shared.Models; +using Utf8Json; +using Utf8Json.Resolvers; + +namespace UKSF.Api.Middleware +{ + public interface IExceptionHandler + { + ValueTask Handle(Exception exception, HttpContext context); + } + + public class ExceptionHandler : IExceptionHandler + { + public async ValueTask Handle(Exception exception, HttpContext context) + { + switch (exception) + { + case UksfException uksfException: + await HandleUksfException(uksfException, context); + break; + default: + await HandleUnhandledException(exception, context); + break; + } + + await context.Response.BodyWriter.FlushAsync(); + } + + private static ValueTask HandleUnhandledException(Exception exception, HttpContext context) + { + if (context.Response.StatusCode < 300) + { + context.Response.StatusCode = 500; + } + + context.Response.ContentType = "application/json"; + return SerializeToStream(context.Response.BodyWriter, new(context.Response.StatusCode, exception?.Message)); + } + + private static ValueTask HandleUksfException(UksfException uksfException, HttpContext context) + { + context.Response.StatusCode = uksfException.StatusCode; + context.Response.ContentType = "application/json"; + + return SerializeToStream(context.Response.BodyWriter, new(uksfException.StatusCode, uksfException.Message)); + } + + private static ValueTask SerializeToStream(PipeWriter output, UksfErrorMessage error) + { + return output.WriteAsync(JsonSerializer.Serialize(error, StandardResolver.AllowPrivateExcludeNullCamelCase)); + } + } +} diff --git a/UKSF.Api/Middleware/ExceptionMiddleware.cs b/UKSF.Api/Middleware/ExceptionMiddleware.cs new file mode 100644 index 00000000..19bb4015 --- /dev/null +++ b/UKSF.Api/Middleware/ExceptionMiddleware.cs @@ -0,0 +1,80 @@ +using System; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Exceptions; +using UKSF.Api.Shared.Services; + +namespace UKSF.Api.Middleware +{ + public class ExceptionMiddleware : IMiddleware + { + private readonly IDisplayNameService _displayNameService; + private readonly IExceptionHandler _exceptionHandler; + private readonly IHttpContextService _httpContextService; + private readonly ILogger _logger; + + public ExceptionMiddleware(ILogger logger, IDisplayNameService displayNameService, IHttpContextService httpContextService, IExceptionHandler exceptionHandler) + { + _logger = logger; + _displayNameService = displayNameService; + _httpContextService = httpContextService; + _exceptionHandler = exceptionHandler; + } + + public async Task InvokeAsync(HttpContext context, RequestDelegate next) + { + if (context == null) + { + return; + } + + if (context.Request.Method == HttpMethod.Options.Method) + { + await next(context); + return; + } + + Exception exception = null; + try + { + await next(context); + } + catch (Exception ex) + { + exception = ex; + } + finally + { + if (exception is UksfException uksfException) + { + await HandleError(context, uksfException); + } + else if (IsError(context.Response) || exception != null) + { + await HandleError(context, exception); + } + } + } + + private async Task HandleError(HttpContext context, Exception exception) + { + if (!context.Response.HasStarted) + { + await _exceptionHandler.Handle(exception, context); + } + + bool authenticated = _httpContextService.IsUserAuthenticated(); + string userId = _httpContextService.GetUserId(); + string userDisplayName = authenticated ? _displayNameService.GetDisplayName(userId) : "Guest"; + _logger.LogError(exception, context, context.Response, authenticated ? userId : "Guest", userDisplayName); + } + + private static bool IsError(HttpResponse response) + { + return response is { StatusCode: >= 400 }; + } + } +} diff --git a/UKSF.Api/Models/LoaReportDataset.cs b/UKSF.Api/Models/LoaReportDataset.cs new file mode 100644 index 00000000..b2f4035d --- /dev/null +++ b/UKSF.Api/Models/LoaReportDataset.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; + +namespace UKSF.Api.Models +{ + [Serializable] + public class LoaReportDataset + { + public List ActiveLoas; + public List PastLoas; + public List UpcomingLoas; + } + + public class LoaReport + { + public bool Emergency; + public DateTime End; + public string Id; + public bool InChainOfCommand; + public bool Late; + public bool LongTerm; + public string Name; + public string Reason; + public DateTime Start; + public string State; + } +} diff --git a/UKSF.Api/Program.cs b/UKSF.Api/Program.cs index 88696be8..99da5b1c 100644 --- a/UKSF.Api/Program.cs +++ b/UKSF.Api/Program.cs @@ -8,9 +8,12 @@ using Microsoft.AspNetCore.Hosting.WindowsServices; using Microsoft.Extensions.Hosting; -namespace UKSF.Api { - public static class Program { - public static void Main(string[] args) { +namespace UKSF.Api +{ + public static class Program + { + public static void Main(string[] args) + { AppDomain.CurrentDomain.GetAssemblies() .ToList() .SelectMany(x => x.GetReferencedAssemblies()) @@ -22,46 +25,59 @@ public static void Main(string[] args) { string environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); bool isDevelopment = environment == Environments.Development; - if (isDevelopment) { + if (isDevelopment) + { BuildDebugWebHost(args).Run(); - } else { + } + else + { InitLogging(); BuildProductionWebHost(args).RunAsService(); } } - private static IWebHost BuildDebugWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel().UseContentRoot(Directory.GetCurrentDirectory()).UseUrls("http://*:5000").UseIISIntegration().Build(); + private static IWebHost BuildDebugWebHost(string[] args) + { + return WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel().UseContentRoot(Directory.GetCurrentDirectory()).UseUrls("http://*:5000").UseIISIntegration().Build(); + } - private static IWebHost BuildProductionWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup() - .UseKestrel( - options => { - options.Listen(IPAddress.Loopback, 5000); - options.Listen( - IPAddress.Loopback, - 5001, - listenOptions => { listenOptions.UseHttps("C:\\ProgramData\\win-acme\\acme-v02.api.letsencrypt.org\\Certificates\\uk-sf.co.uk.pfx"); } - ); - } - ) - .UseContentRoot(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule?.FileName)) - .UseIISIntegration() - .Build(); + private static IWebHost BuildProductionWebHost(string[] args) + { + return WebHost.CreateDefaultBuilder(args) + .UseStartup() + .UseKestrel( + options => + { + options.Listen(IPAddress.Loopback, 5000); + options.Listen( + IPAddress.Loopback, + 5001, + listenOptions => { listenOptions.UseHttps("C:\\ProgramData\\win-acme\\acme-v02.api.letsencrypt.org\\Certificates\\uk-sf.co.uk.pfx"); } + ); + } + ) + .UseContentRoot(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule?.FileName)) + .UseIISIntegration() + .Build(); + } - private static void InitLogging() { + private static void InitLogging() + { string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSF.Api"); Directory.CreateDirectory(appData); string[] logFiles = new DirectoryInfo(appData).EnumerateFiles("*.log").OrderByDescending(file => file.LastWriteTime).Select(file => file.Name).ToArray(); - if (logFiles.Length > 9) { + if (logFiles.Length > 9) + { File.Delete(Path.Combine(appData, logFiles.Last())); } string logFile = Path.Combine(appData, $"LOG__{DateTime.Now:yyyy-MM-dd__HH-mm}.log"); - try { + try + { File.Create(logFile).Close(); - } catch (Exception e) { + } + catch (Exception e) + { Console.Out.WriteLine($"Log file not created: {logFile}. {e.Message}"); } diff --git a/UKSF.Api/AppStart/UksfServiceExtensions.cs b/UKSF.Api/ServiceExtensions.cs similarity index 66% rename from UKSF.Api/AppStart/UksfServiceExtensions.cs rename to UKSF.Api/ServiceExtensions.cs index 13eb8641..aa6682fd 100644 --- a/UKSF.Api/AppStart/UksfServiceExtensions.cs +++ b/UKSF.Api/ServiceExtensions.cs @@ -11,24 +11,44 @@ using UKSF.Api.EventHandlers; using UKSF.Api.Integrations.Instagram; using UKSF.Api.Launcher; +using UKSF.Api.Middleware; using UKSF.Api.Modpack; using UKSF.Api.Personnel; using UKSF.Api.Services; using UKSF.Api.Shared; using UKSF.Api.Teamspeak; -namespace UKSF.Api.AppStart { - public static class ServiceExtensions { - public static void AddUksf(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) => - services.AddSingleton(services).AddContexts().AddEventHandlers().AddServices().AddSingleton().AddSingleton().AddComponents(configuration, currentEnvironment); +namespace UKSF.Api +{ + public static class ServiceExtensions + { + public static void AddUksf(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) + { + services.AddSingleton(services).AddContexts().AddEventHandlers().AddServices().AddMiddlewares().AddSingleton().AddComponents(configuration, currentEnvironment); + } - private static IServiceCollection AddContexts(this IServiceCollection services) => services; + private static IServiceCollection AddContexts(this IServiceCollection services) + { + return services; + } - private static IServiceCollection AddEventHandlers(this IServiceCollection services) => services.AddSingleton(); + private static IServiceCollection AddEventHandlers(this IServiceCollection services) + { + return services.AddSingleton(); + } - private static IServiceCollection AddServices(this IServiceCollection services) => services; + private static IServiceCollection AddServices(this IServiceCollection services) + { + return services; + } - private static void AddComponents(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) => + private static IServiceCollection AddMiddlewares(this IServiceCollection services) + { + return services.AddSingleton().AddSingleton().AddSingleton(); + } + + private static void AddComponents(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) + { services.AddUksfBase(configuration, currentEnvironment) .AddUksfShared() .AddUksfAuth(configuration) @@ -42,5 +62,6 @@ private static void AddComponents(this IServiceCollection services, IConfigurati .AddUksfIntegrationDiscord() .AddUksfIntegrationInstagram() .AddUksfIntegrationTeamspeak(); + } } } diff --git a/UKSF.Api/Services/MigrationUtility.cs b/UKSF.Api/Services/MigrationUtility.cs index 0141b364..b31b7ee7 100644 --- a/UKSF.Api/Services/MigrationUtility.cs +++ b/UKSF.Api/Services/MigrationUtility.cs @@ -8,66 +8,91 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; -namespace UKSF.Api.Services { - public class MigrationUtility { +namespace UKSF.Api.Services +{ + public class MigrationUtility + { private const string KEY = "MIGRATED"; - private readonly IHostEnvironment _currentEnvironment; - private readonly ILogger _logger; - private readonly ILogContext _logContext; - private readonly IHttpErrorLogContext _httpErrorLogContext; private readonly IAuditLogContext _auditLogContext; + private readonly IHostEnvironment _currentEnvironment; + private readonly IErrorLogContext _errorLogContext; private readonly ILauncherLogContext _launcherLogContext; + private readonly ILogContext _logContext; + private readonly ILogger _logger; private readonly IVariablesContext _variablesContext; private readonly IVariablesService _variablesService; - public MigrationUtility(IHostEnvironment currentEnvironment, IVariablesService variablesService, IVariablesContext variablesContext, ILogger logger, ILogContext logContext, IHttpErrorLogContext httpErrorLogContext, IAuditLogContext auditLogContext, ILauncherLogContext launcherLogContext) { + public MigrationUtility( + IHostEnvironment currentEnvironment, + IVariablesService variablesService, + IVariablesContext variablesContext, + ILogger logger, + ILogContext logContext, + IErrorLogContext errorLogContext, + IAuditLogContext auditLogContext, + ILauncherLogContext launcherLogContext + ) + { _currentEnvironment = currentEnvironment; _variablesService = variablesService; _variablesContext = variablesContext; _logger = logger; _logContext = logContext; - _httpErrorLogContext = httpErrorLogContext; + _errorLogContext = errorLogContext; _auditLogContext = auditLogContext; _launcherLogContext = launcherLogContext; } - public void Migrate() { + public void Migrate() + { bool migrated = true; - if (!_currentEnvironment.IsDevelopment()) { + if (!_currentEnvironment.IsDevelopment()) + { migrated = _variablesService.GetVariable(KEY).AsBool(); } - if (!migrated) { - try { + if (!migrated) + { + try + { ExecuteMigration(); _logger.LogAudit("Migration utility successfully ran"); - } catch (Exception e) { + } + catch (Exception e) + { _logger.LogError(e); - } finally { + } + finally + { _variablesContext.Update(KEY, "true"); } } } // TODO: CHECK BEFORE RELEASE - private void ExecuteMigration() { + private void ExecuteMigration() + { IEnumerable logs = _logContext.Get(); - foreach (BasicLog log in logs) { + foreach (BasicLog log in logs) + { _logContext.Replace(log); } - IEnumerable errorLogs = _httpErrorLogContext.Get(); - foreach (HttpErrorLog log in errorLogs) { - _httpErrorLogContext.Replace(log); + IEnumerable errorLogs = _errorLogContext.Get(); + foreach (ErrorLog log in errorLogs) + { + _errorLogContext.Replace(log); } IEnumerable auditLogs = _auditLogContext.Get(); - foreach (AuditLog log in auditLogs) { + foreach (AuditLog log in auditLogs) + { _auditLogContext.Replace(log); } IEnumerable launcherLogs = _launcherLogContext.Get(); - foreach (LauncherLog log in launcherLogs) { + foreach (LauncherLog log in launcherLogs) + { _launcherLogContext.Replace(log); } } diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index e4c174bb..3939867c 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -1,109 +1,99 @@ using System; -using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Microsoft.OpenApi.Models; using Newtonsoft.Json.Serialization; using Swashbuckle.AspNetCore.SwaggerUI; using UKSF.Api.Admin; using UKSF.Api.AppStart; using UKSF.Api.ArmaServer; using UKSF.Api.Command; +using UKSF.Api.Middleware; using UKSF.Api.Modpack; using UKSF.Api.Personnel; using UKSF.Api.Teamspeak; -namespace UKSF.Api { - public class Startup { +namespace UKSF.Api +{ + public class Startup + { private readonly IConfiguration _configuration; private readonly IHostEnvironment _currentEnvironment; - public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration) { + public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration) + { _configuration = configuration; _currentEnvironment = currentEnvironment; IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); builder.Build(); } - public void ConfigureServices(IServiceCollection services) { + public void ConfigureServices(IServiceCollection services) + { services.AddUksf(_configuration, _currentEnvironment); - services.AddCors( - options => options.AddPolicy( - "CorsPolicy", - builder => { - builder.AllowAnyMethod() - .AllowAnyHeader() - .WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://uk-sf.co.uk") - .AllowCredentials(); - } - ) - ); services.AddControllers(); - services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo { Title = "UKSF API", Version = "v1" }); }); - services.AddMvc(options => { options.Filters.Add(); }) + services.AddCors( + options => options.AddPolicy( + "CorsPolicy", + builder => + { + builder.AllowAnyMethod() + .AllowAnyHeader() + .WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://uk-sf.co.uk") + .AllowCredentials(); + } + ) + ) + .AddSwaggerGen(options => { options.SwaggerDoc("v1", new() { Title = "UKSF API", Version = "v1" }); }) + .AddMvc() .AddNewtonsoftJson(options => { options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); }); } - public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostApplicationLifetime, IServiceProvider serviceProvider) { + public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostApplicationLifetime, IServiceProvider serviceProvider) + { hostApplicationLifetime.ApplicationStopping.Register(() => OnShutdown(serviceProvider)); - app.UseStaticFiles(); - app.UseCookiePolicy(new CookiePolicyOptions { MinimumSameSitePolicy = SameSiteMode.Lax }); - app.UseSwagger(); - app.UseSwaggerUI( - options => { - options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF API v1"); - options.DocExpansion(DocExpansion.None); - } - ); - app.UseRouting(); - app.UseCors("CorsPolicy"); - app.UseCorsMiddleware(); - app.UseAuthentication(); - app.UseAuthorization(); - app.UseHsts(); - app.UseForwardedHeaders(new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto }); - app.UseEndpoints( - endpoints => { - endpoints.MapControllers().RequireCors("CorsPolicy"); - endpoints.AddUksfAdminSignalr(); - endpoints.AddUksfArmaServerSignalr(); - endpoints.AddUksfCommandSignalr(); - endpoints.AddUksfIntegrationTeamspeakSignalr(); - endpoints.AddUksfModpackSignalr(); - endpoints.AddUksfPersonnelSignalr(); - } - ); + app.UseStaticFiles() + .UseCookiePolicy(new() { MinimumSameSitePolicy = SameSiteMode.Lax }) + .UseRouting() + .UseCors("CorsPolicy") + .UseMiddleware() + .UseMiddleware() + .UseAuthentication() + .UseAuthorization() + .UseHsts() + .UseForwardedHeaders(new() { ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto }) + .UseEndpoints( + endpoints => + { + endpoints.MapControllers().RequireCors("CorsPolicy"); + endpoints.AddUksfAdminSignalr(); + endpoints.AddUksfArmaServerSignalr(); + endpoints.AddUksfCommandSignalr(); + endpoints.AddUksfIntegrationTeamspeakSignalr(); + endpoints.AddUksfModpackSignalr(); + endpoints.AddUksfPersonnelSignalr(); + } + ) + .UseSwagger() + .UseSwaggerUI( + options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF API v1"); + options.DocExpansion(DocExpansion.None); + } + ); serviceProvider.StartUksfServices(); } - private static void OnShutdown(IServiceProvider serviceProvider) { + private static void OnShutdown(IServiceProvider serviceProvider) + { serviceProvider.StopUksfServices(); } } - - public class CorsMiddleware { - private readonly RequestDelegate _next; - - public CorsMiddleware(RequestDelegate next) => _next = next; - - public Task Invoke(HttpContext httpContext) { - if (httpContext.Request.Path.Value != null && httpContext.Request.Path.Value.Contains("hub")) { - httpContext.Response.Headers["Access-Control-Allow-Origin"] = httpContext.Request.Headers["Origin"]; - httpContext.Response.Headers["Access-Control-Allow-Credentials"] = "true"; - } - - return _next(httpContext); - } - } - - public static class CorsMiddlewareExtensions { - public static void UseCorsMiddleware(this IApplicationBuilder builder) => builder.UseMiddleware(); - } } diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index a9da2c5c..1d0f52ac 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -1,7 +1,7 @@  - netcoreapp5.0 + net5.0 win7-x64 UKSF.Api Exe @@ -17,23 +17,24 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/UKSF.PostMessage/Program.cs b/UKSF.PostMessage/Program.cs index 2d9dde34..8d4209b4 100644 --- a/UKSF.PostMessage/Program.cs +++ b/UKSF.PostMessage/Program.cs @@ -3,14 +3,21 @@ using System.Linq; using System.Runtime.InteropServices; -namespace UKSF.PostMessage { - internal static class Program { +namespace UKSF.PostMessage +{ + internal static class Program + { [DllImport("user32.dll", CharSet = CharSet.Auto)] private static extern int PostMessage(IntPtr hwnd, int msg, int wparam, int lparam); - public static void Main(string[] args) { + public static void Main(string[] args) + { Process process = Process.GetProcesses().FirstOrDefault(x => x.ProcessName == args[0]); - if (process == null) return; + if (process == null) + { + return; + } + PostMessage(process.MainWindowHandle, int.Parse(args[1]), int.Parse(args[2]), int.Parse(args[3])); } } diff --git a/UKSF.PostMessage/UKSF.PostMessage.csproj b/UKSF.PostMessage/UKSF.PostMessage.csproj index 887a7885..8fdd0bb2 100644 --- a/UKSF.PostMessage/UKSF.PostMessage.csproj +++ b/UKSF.PostMessage/UKSF.PostMessage.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp5.0 + net5.0 UKSF.PostMessage diff --git a/UKSF.Tests/UKSF.Tests.csproj b/UKSF.Tests/UKSF.Tests.csproj index 642545e3..d6eba02f 100644 --- a/UKSF.Tests/UKSF.Tests.csproj +++ b/UKSF.Tests/UKSF.Tests.csproj @@ -1,27 +1,27 @@  - netcoreapp5.0 + net5.0 false - - runtime; build; native; contentfiles; analyzers; buildtransitive - all + + runtime; build; native; contentfiles; analyzers; buildtransitive + all - - - - - + + + + + - all - runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive - - all - runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs b/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs index 585aed4a..5b60b27d 100644 --- a/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/DateUtilitiesTests.cs @@ -2,13 +2,25 @@ using FluentAssertions; using UKSF.Api.Personnel.Extensions; using UKSF.Api.Personnel.Models; -using UKSF.Api.Shared.Extensions; using Xunit; -namespace UKSF.Tests.Unit.Common { - public class DateUtilitiesTests { +namespace UKSF.Tests.Unit.Common +{ + public class DateUtilitiesTests + { + [Fact] + public void ShouldGiveCorrectMonthsForDay() + { + DateTime dob = new(2019, 1, 20); + + ApplicationAge age = dob.ToAge(new DateTime(2020, 1, 16)); + + age.Months.Should().Be(11); + } + [Theory, InlineData(25, 4, 25, 4), InlineData(25, 13, 26, 1)] - public void ShouldGiveCorrectAge(int years, int months, int expectedYears, int expectedMonths) { + public void ShouldGiveCorrectAge(int years, int months, int expectedYears, int expectedMonths) + { DateTime dob = DateTime.Today.AddYears(-years).AddMonths(-months); ApplicationAge age = dob.ToAge(); @@ -16,14 +28,5 @@ public void ShouldGiveCorrectAge(int years, int months, int expectedYears, int e age.Years.Should().Be(expectedYears); age.Months.Should().Be(expectedMonths); } - - [Fact] - public void ShouldGiveCorrectMonthsForDay() { - DateTime dob = new(2019, 1, 20); - - ApplicationAge age = dob.ToAge(new DateTime(2020, 1, 16)); - - age.Months.Should().Be(11); - } } } diff --git a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs index d41bc748..f71ec9ca 100644 --- a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; using FluentAssertions; @@ -14,8 +13,10 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Data { - public class CachedDataServiceEventTests { +namespace UKSF.Tests.Unit.Data +{ + public class CachedDataServiceEventTests + { private readonly string _id1; private readonly string _id2; private readonly string _id3; @@ -24,14 +25,15 @@ public class CachedDataServiceEventTests { private readonly Mock _mockEventBus; private readonly TestCachedContext _testCachedContext; - public CachedDataServiceEventTests() { + public CachedDataServiceEventTests() + { Mock mockDataCollectionFactory = new(); - _mockEventBus = new Mock(); - _mockDataCollection = new Mock>(); + _mockEventBus = new(); + _mockDataCollection = new(); _id1 = ObjectId.GenerateNewId().ToString(); _id2 = ObjectId.GenerateNewId().ToString(); _id3 = ObjectId.GenerateNewId().ToString(); - _item1 = new TestDataModel { Id = _id1, Name = "1" }; + _item1 = new() { Id = _id1, Name = "1" }; TestDataModel item2 = new() { Id = _id2, Name = "1" }; TestDataModel item3 = new() { Id = _id3, Name = "3" }; List mockCollection = new() { _item1, item2, item3 }; @@ -39,11 +41,12 @@ public CachedDataServiceEventTests() { mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); _mockDataCollection.Setup(x => x.Get()).Returns(() => mockCollection); - _testCachedContext = new TestCachedContext(mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); } [Fact] - public async Task Should_create_correct_add_event_for_add() { + public async Task Should_create_correct_add_event_for_add() + { EventModel subject = null; _mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask); @@ -56,7 +59,8 @@ public async Task Should_create_correct_add_event_for_add() { } [Fact] - public async Task Should_create_correct_delete_event_for_delete() { + public async Task Should_create_correct_delete_event_for_delete() + { EventModel subject = null; _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); @@ -69,7 +73,8 @@ public async Task Should_create_correct_delete_event_for_delete() { } [Fact] - public async Task Should_create_correct_delete_events_for_delete_many() { + public async Task Should_create_correct_delete_events_for_delete_many() + { List subjects = new(); _mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())).Returns(Task.CompletedTask); @@ -86,7 +91,8 @@ public async Task Should_create_correct_delete_events_for_delete_many() { } [Fact] - public async Task Should_create_correct_update_event_for_replace() { + public async Task Should_create_correct_update_event_for_replace() + { EventModel subject = null; _mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); @@ -99,7 +105,8 @@ public async Task Should_create_correct_update_event_for_replace() { } [Fact] - public async Task Should_create_correct_update_events_for_update_many() { + public async Task Should_create_correct_update_events_for_update_many() + { List subjects = new(); _mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())).Returns(Task.CompletedTask); @@ -116,7 +123,8 @@ public async Task Should_create_correct_update_events_for_update_many() { } [Fact] - public async Task Should_create_correct_update_events_for_updates() { + public async Task Should_create_correct_update_events_for_updates() + { List subjects = new(); _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask); diff --git a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs index ed038aaa..40097022 100644 --- a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs @@ -1,5 +1,4 @@ -using System; -using Moq; +using Moq; using UKSF.Api.Base.Events; using UKSF.Api.EventHandlers; using UKSF.Api.Personnel.Services; @@ -8,43 +7,40 @@ using UKSF.Api.Shared.Models; using Xunit; -namespace UKSF.Tests.Unit.Events.Handlers { - public class LogEventHandlerTests { +namespace UKSF.Tests.Unit.Events.Handlers +{ + public class LogEventHandlerTests + { private readonly IEventBus _eventBus; private readonly Mock _mockAuditLogDataService; private readonly Mock _mockDiscordLogDataService; - private readonly Mock _mockHttpErrorLogDataService; + private readonly Mock _mockHttpErrorLogDataService; private readonly Mock _mockLauncherLogDataService; private readonly Mock _mockLogDataService; private readonly Mock _mockObjectIdConversionService; - public LogEventHandlerTests() { - _mockLogDataService = new Mock(); - _mockAuditLogDataService = new Mock(); - _mockHttpErrorLogDataService = new Mock(); - _mockLauncherLogDataService = new Mock(); - _mockDiscordLogDataService = new Mock(); - _mockObjectIdConversionService = new Mock(); + public LogEventHandlerTests() + { + _mockLogDataService = new(); + _mockAuditLogDataService = new(); + _mockHttpErrorLogDataService = new(); + _mockLauncherLogDataService = new(); + _mockDiscordLogDataService = new(); + _mockObjectIdConversionService = new(); Mock mockLogger = new(); _eventBus = new EventBus(); _mockObjectIdConversionService.Setup(x => x.ConvertObjectIds(It.IsAny())).Returns(x => x); - LoggerEventHandler logEventHandler = new( - _eventBus, - _mockLogDataService.Object, - _mockAuditLogDataService.Object, - _mockHttpErrorLogDataService.Object, - _mockLauncherLogDataService.Object, - _mockDiscordLogDataService.Object, - mockLogger.Object, - _mockObjectIdConversionService.Object - ); + LoggerEventHandler logEventHandler = + new(_eventBus, _mockLogDataService.Object, _mockAuditLogDataService.Object, _mockHttpErrorLogDataService.Object, _mockLauncherLogDataService.Object, _mockDiscordLogDataService.Object, + mockLogger.Object, _mockObjectIdConversionService.Object); logEventHandler.Init(); } [Fact] - public void When_handling_a_basic_log() { + public void When_handling_a_basic_log() + { BasicLog basicLog = new("test"); _eventBus.Send(new LoggerEventData(basicLog)); @@ -54,7 +50,8 @@ public void When_handling_a_basic_log() { } [Fact] - public void When_handling_a_discord_log() { + public void When_handling_a_discord_log() + { DiscordLog discordLog = new(DiscordUserEventType.JOINED, "12345", "SqnLdr.Beswick.T", "", "", "SqnLdr.Beswick.T joined"); _eventBus.Send(new LoggerEventData(discordLog)); @@ -63,7 +60,8 @@ public void When_handling_a_discord_log() { } [Fact] - public void When_handling_a_launcher_log() { + public void When_handling_a_launcher_log() + { LauncherLog launcherLog = new("1.0.0", "test"); _eventBus.Send(new LoggerEventData(launcherLog)); @@ -73,7 +71,8 @@ public void When_handling_a_launcher_log() { } [Fact] - public void When_handling_an_audit_log() { + public void When_handling_an_audit_log() + { AuditLog basicLog = new("server", "test"); _eventBus.Send(new LoggerEventData(basicLog)); @@ -84,13 +83,14 @@ public void When_handling_an_audit_log() { } [Fact] - public void When_handling_an_http_error_log() { - HttpErrorLog httpErrorLog = new(new Exception()); + public void When_handling_an_error_log() + { + ErrorLog errorLog = new(new(), "url", "method", "endpoint", 500, "userId", "userName"); - _eventBus.Send(new LoggerEventData(httpErrorLog)); + _eventBus.Send(new LoggerEventData(errorLog)); _mockObjectIdConversionService.Verify(x => x.ConvertObjectIds("Exception of type 'System.Exception' was thrown."), Times.Once); - _mockHttpErrorLogDataService.Verify(x => x.Add(httpErrorLog), Times.Once); + _mockHttpErrorLogDataService.Verify(x => x.Add(errorLog), Times.Once); } } } diff --git a/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs index a36fadf9..cca9ce9e 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/WebLogMessageTests.cs @@ -1,17 +1,25 @@ -using System; -using FluentAssertions; +using FluentAssertions; using UKSF.Api.Shared.Models; using Xunit; -namespace UKSF.Tests.Unit.Models.Message.Logging { - public class WebLogMessageTests { +namespace UKSF.Tests.Unit.Models.Message.Logging +{ + public class WebLogMessageTests + { [Fact] - public void ShouldCreateFromException() { - HttpErrorLog subject = new(new Exception("test")); + public void ShouldCreateFromException() + { + ErrorLog subject = new(new("test"), "url", "method", "endpoint", 500, "userId", "userName"); subject.Message.Should().Be("test"); subject.Exception.Should().Be("System.Exception: test"); subject.Level.Should().Be(LogLevel.ERROR); + subject.Url.Should().Be("url"); + subject.Method.Should().Be("method"); + subject.EndpointName.Should().Be("endpoint"); + subject.StatusCode.Should().Be(500); + subject.UserId.Should().Be("userId"); + subject.Name.Should().Be("userName"); } } } diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs index 2cf1765c..6c77af30 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs @@ -11,16 +11,19 @@ using UKSF.Api.Shared.Services; using Xunit; -namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { - public class PruneDataActionTests { +namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions +{ + public class PruneDataActionTests + { private readonly IActionPruneLogs _actionPruneLogs; private readonly Mock _mockAuditLogContext = new(); - private readonly Mock _mockHttpErrorLogContext = new(); + private readonly Mock _mockHttpErrorLogContext = new(); private readonly Mock _mockLogContext = new(); private readonly Mock _mockSchedulerContext = new(); private readonly DateTime _now; - public PruneDataActionTests() { + public PruneDataActionTests() + { Mock mockClock = new(); Mock mockHostEnvironment = new(); Mock mockSchedulerService = new(); @@ -40,19 +43,19 @@ public PruneDataActionTests() { } [Fact] - public void When_getting_action_name() { + public void When_getting_action_name() + { string subject = _actionPruneLogs.Name; subject.Should().Be("ActionPruneLogs"); } [Fact] - public async Task When_pruning_logs() { + public async Task When_pruning_logs() + { List basicLogs = new() { new("test1") { Timestamp = _now.AddDays(-8) }, new("test2") { Timestamp = _now.AddDays(-6) } }; List auditLogs = new() { new("server", "audit1") { Timestamp = _now.AddMonths(-4) }, new("server", "audit2") { Timestamp = _now.AddMonths(-2) } }; - List httpErrorLogs = new() { - new(new("error1")) { Timestamp = _now.AddDays(-8) }, new(new("error2")) { Timestamp = _now.AddDays(-6) } - }; + List errorLogs = new() { new(new("error1")) { Timestamp = _now.AddDays(-8) }, new(new("error2")) { Timestamp = _now.AddDays(-6) } }; _mockLogContext.Setup(x => x.DeleteMany(It.IsAny>>())) .Returns(Task.CompletedTask) @@ -60,15 +63,15 @@ public async Task When_pruning_logs() { _mockAuditLogContext.Setup(x => x.DeleteMany(It.IsAny>>())) .Returns(Task.CompletedTask) .Callback>>(x => auditLogs.RemoveAll(y => x.Compile()(y))); - _mockHttpErrorLogContext.Setup(x => x.DeleteMany(It.IsAny>>())) + _mockHttpErrorLogContext.Setup(x => x.DeleteMany(It.IsAny>>())) .Returns(Task.CompletedTask) - .Callback>>(x => httpErrorLogs.RemoveAll(y => x.Compile()(y))); + .Callback>>(x => errorLogs.RemoveAll(y => x.Compile()(y))); await _actionPruneLogs.Run(); basicLogs.Should().NotContain(x => x.Message == "test1"); auditLogs.Should().NotContain(x => x.Message == "audit1"); - httpErrorLogs.Should().NotContain(x => x.Message == "error1"); + errorLogs.Should().NotContain(x => x.Message == "error1"); } } } From 7636f28fc3428baa47a0869f84ccff654bb1cb09 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 15 May 2021 21:58:16 +0100 Subject: [PATCH 318/369] Allow duplicate player connections --- .../Services/GameServerHelpers.cs | 83 ++++++++++++------- 1 file changed, 55 insertions(+), 28 deletions(-) diff --git a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs index d477312b..0b1f10c5 100644 --- a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs +++ b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs @@ -9,8 +9,10 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.ArmaServer.Services { - public interface IGameServerHelpers { +namespace UKSF.Api.ArmaServer.Services +{ + public interface IGameServerHelpers + { string GetGameServerExecutablePath(GameServer gameServer); string GetGameServerSettingsPath(); string GetGameServerMissionsPath(); @@ -27,8 +29,10 @@ public interface IGameServerHelpers { bool IsMainOpTime(); } - public class GameServerHelpers : IGameServerHelpers { - private static readonly string[] BASE_CONFIG = { + public class GameServerHelpers : IGameServerHelpers + { + private static readonly string[] BASE_CONFIG = + { "hostname = \"{0}\";", "password = \"{1}\";", "passwordAdmin = \"{2}\";", @@ -37,7 +41,7 @@ public class GameServerHelpers : IGameServerHelpers { "motd[] = {{\"\"}};", "motdInterval = 999999;", "maxPlayers = {3};", - "kickDuplicate = 1;", + "kickDuplicate = 0;", "verifySignatures = 2;", "allowedFilePatching = 1;", "unsafeCVL = 1;", @@ -77,13 +81,16 @@ public class GameServerHelpers : IGameServerHelpers { private readonly ILogger _logger; private readonly IVariablesService _variablesService; - public GameServerHelpers(IVariablesService variablesService, ILogger logger) { + public GameServerHelpers(IVariablesService variablesService, ILogger logger) + { _variablesService = variablesService; _logger = logger; } - public string GetGameServerExecutablePath(GameServer gameServer) { - string variableKey = gameServer.Environment switch { + public string GetGameServerExecutablePath(GameServer gameServer) + { + string variableKey = gameServer.Environment switch + { GameEnvironment.RELEASE => "SERVER_PATH_RELEASE", GameEnvironment.RC => "SERVER_PATH_RC", GameEnvironment.DEV => "SERVER_PATH_DEV", @@ -92,20 +99,25 @@ public string GetGameServerExecutablePath(GameServer gameServer) { return Path.Join(_variablesService.GetVariable(variableKey).AsString(), "arma3server_x64.exe"); } - public string GetGameServerSettingsPath() { + public string GetGameServerSettingsPath() + { return Path.Join(_variablesService.GetVariable("SERVER_PATH_RELEASE").AsString(), "userconfig", "cba_settings.sqf"); } - public string GetGameServerMissionsPath() { + public string GetGameServerMissionsPath() + { return _variablesService.GetVariable("MISSIONS_PATH").AsString(); } - public string GetGameServerConfigPath(GameServer gameServer) { + public string GetGameServerConfigPath(GameServer gameServer) + { return Path.Combine(_variablesService.GetVariable("SERVER_PATH_CONFIGS").AsString(), $"{gameServer.ProfileName}.cfg"); } - public string GetGameServerModsPaths(GameEnvironment environment) { - string variableKey = environment switch { + public string GetGameServerModsPaths(GameEnvironment environment) + { + string variableKey = environment switch + { GameEnvironment.RELEASE => "MODPACK_PATH_RELEASE", GameEnvironment.RC => "MODPACK_PATH_RC", GameEnvironment.DEV => "MODPACK_PATH_DEV", @@ -114,15 +126,18 @@ public string GetGameServerModsPaths(GameEnvironment environment) { return Path.Join(_variablesService.GetVariable(variableKey).AsString(), "Repo"); } - public IEnumerable GetGameServerExtraModsPaths() { + public IEnumerable GetGameServerExtraModsPaths() + { return _variablesService.GetVariable("SERVER_PATH_MODS").AsArray(x => x.RemoveQuotes()); } - public string FormatGameServerConfig(GameServer gameServer, int playerCount, string missionSelection) { + public string FormatGameServerConfig(GameServer gameServer, int playerCount, string missionSelection) + { return string.Format(string.Join("\n", BASE_CONFIG), gameServer.HostName, gameServer.Password, gameServer.AdminPassword, playerCount, missionSelection.Replace(".pbo", "")); } - public string FormatGameServerLaunchArguments(GameServer gameServer) { + public string FormatGameServerLaunchArguments(GameServer gameServer) + { return $"-config={GetGameServerConfigPath(gameServer)}" + $" -profiles={GetGameServerProfilesPath()}" + $" -cfg={GetGameServerPerfConfigPath()}" + @@ -134,7 +149,8 @@ public string FormatGameServerLaunchArguments(GameServer gameServer) { " -bandwidthAlg=2 -hugepages -loadMissionToMemory -filePatching -limitFPS=200"; } - public string FormatHeadlessClientLaunchArguments(GameServer gameServer, int index) { + public string FormatHeadlessClientLaunchArguments(GameServer gameServer, int index) + { return $"-profiles={GetGameServerProfilesPath()}" + $" -name={GetHeadlessClientName(index)}" + $" -port={gameServer.Port}" + @@ -144,16 +160,19 @@ public string FormatHeadlessClientLaunchArguments(GameServer gameServer, int ind " -localhost=127.0.0.1 -connect=localhost -client -hugepages -filePatching -limitFPS=200"; } - public string GetMaxPlayerCountFromConfig(GameServer gameServer) { + public string GetMaxPlayerCountFromConfig(GameServer gameServer) + { string maxPlayers = File.ReadAllLines(GetGameServerConfigPath(gameServer)).First(x => x.Contains("maxPlayers")); maxPlayers = maxPlayers.RemoveSpaces().Replace(";", ""); return maxPlayers.Split("=")[1]; } - public int GetMaxCuratorCountFromSettings() { + public int GetMaxCuratorCountFromSettings() + { string[] lines = File.ReadAllLines(GetGameServerSettingsPath()); string curatorsMaxString = lines.FirstOrDefault(x => x.Contains("uksf_curator_curatorsMax")); - if (string.IsNullOrEmpty(curatorsMaxString)) { + if (string.IsNullOrEmpty(curatorsMaxString)) + { _logger.LogWarning("Could not find max curators in server settings file. Loading hardcoded deault '5'"); return 5; } @@ -162,36 +181,44 @@ public int GetMaxCuratorCountFromSettings() { return int.Parse(curatorsMaxString); } - public TimeSpan StripMilliseconds(TimeSpan time) { + public TimeSpan StripMilliseconds(TimeSpan time) + { return new(time.Hours, time.Minutes, time.Seconds); } - public IEnumerable GetArmaProcesses() { + public IEnumerable GetArmaProcesses() + { return Process.GetProcesses().Where(x => x.ProcessName.StartsWith("arma3")); } - public bool IsMainOpTime() { + public bool IsMainOpTime() + { DateTime now = DateTime.UtcNow; return now.DayOfWeek == DayOfWeek.Saturday && now.Hour >= 19 && now.Minute >= 30; } - private string FormatGameServerMods(GameServer gameServer) { + private string FormatGameServerMods(GameServer gameServer) + { return gameServer.Mods.Count > 0 ? $"{string.Join(";", gameServer.Mods.Select(x => x.PathRelativeToServerExecutable ?? x.Path))};" : string.Empty; } - private string FormatGameServerServerMods(GameServer gameServer) { + private string FormatGameServerServerMods(GameServer gameServer) + { return gameServer.ServerMods.Count > 0 ? $"{string.Join(";", gameServer.ServerMods.Select(x => x.Name))};" : string.Empty; } - private string GetGameServerProfilesPath() { + private string GetGameServerProfilesPath() + { return _variablesService.GetVariable("SERVER_PATH_PROFILES").AsString(); } - private string GetGameServerPerfConfigPath() { + private string GetGameServerPerfConfigPath() + { return _variablesService.GetVariable("SERVER_PATH_PERF").AsString(); } - private string GetHeadlessClientName(int index) { + private string GetHeadlessClientName(int index) + { return _variablesService.GetVariable("SERVER_HEADLESS_NAMES").AsArray()[index]; } } From 7690cd6a2902a5edb5d2ac5cc5766b6dd7dcdcba Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 15 May 2021 22:11:17 +0100 Subject: [PATCH 319/369] Allow duplicate steam player --- UKSF.Api.ArmaServer/Services/GameServerHelpers.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs index d477312b..10bbc116 100644 --- a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs +++ b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs @@ -37,8 +37,8 @@ public class GameServerHelpers : IGameServerHelpers { "motd[] = {{\"\"}};", "motdInterval = 999999;", "maxPlayers = {3};", - "kickDuplicate = 1;", - "verifySignatures = 2;", + "kickDuplicate = 0;", + "verifySignatures = 0;", "allowedFilePatching = 1;", "unsafeCVL = 1;", "disableVoN = 1;", From e000ed5c4ddf55421785dcc463554bd4b2185a79 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 15 May 2021 22:52:47 +0100 Subject: [PATCH 320/369] Revert --- UKSF.Api.ArmaServer/Services/GameServerHelpers.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs index 10bbc116..4613c730 100644 --- a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs +++ b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs @@ -37,8 +37,8 @@ public class GameServerHelpers : IGameServerHelpers { "motd[] = {{\"\"}};", "motdInterval = 999999;", "maxPlayers = {3};", - "kickDuplicate = 0;", - "verifySignatures = 0;", + "kickDuplicate = 1;", + "verifySignatures = 2;", "allowedFilePatching = 1;", "unsafeCVL = 1;", "disableVoN = 1;", @@ -50,8 +50,8 @@ public class GameServerHelpers : IGameServerHelpers { "onUserDisconnected = \"\";", "doubleIdDetected = \"\";", "onUnsignedData = \"kick (_this select 0)\";", - "onHackedData = \"kick (_this select 0)\";", - "onDifferentData = \"kick (_this select 0)\";", + "onHackedData = \"\";", + "onDifferentData = \"\";", "regularCheck = \"{{}}\";", "briefingTimeOut = -1;", "roleTimeOut = -1;", From 1c4172e33241b4dc9684452db03b02c31fd5e0de Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 15 May 2021 22:52:47 +0100 Subject: [PATCH 321/369] Fix server config --- UKSF.Api.ArmaServer/Services/GameServerHelpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs index 4634fe5b..9c4a296c 100644 --- a/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs +++ b/UKSF.Api.ArmaServer/Services/GameServerHelpers.cs @@ -41,7 +41,7 @@ public class GameServerHelpers : IGameServerHelpers "motd[] = {{\"\"}};", "motdInterval = 999999;", "maxPlayers = {3};", - "kickDuplicate = 0;", + "kickDuplicate = 1;", "verifySignatures = 2;", "allowedFilePatching = 1;", "unsafeCVL = 1;", From 91ae5a54e889a8d69d9c01dcbc8ead0b8c95e8ec Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 24 May 2021 09:18:15 +0100 Subject: [PATCH 322/369] Add common exception handling, return concrete types as preference --- .../DependencyInjectionTests.cs | 12 +- .../Controllers/AuthControllerTests.cs | 105 ++++++ .../DependencyInjectionTests.cs | 18 +- ...ConnectTeamspeakIdToAccountCommandTests.cs | 97 +++++ .../DependencyInjectionTests.cs | 26 +- .../Mappers/AccountMapperTests.cs | 49 +-- .../AssertionExtensions.cs | 20 + Tests/UKSF.Api.Tests.Common/TestUtilities.cs | 4 +- .../UKSF.Api.Tests.Common.csproj | 1 + UKSF.Api.Admin/Controllers/DataController.cs | 3 +- .../Controllers/VariablesController.cs | 31 +- .../Controllers/VersionController.cs | 7 +- .../Extensions/VariablesExtensions.cs | 19 + .../Models/MissionPatchingReport.cs | 21 -- .../Models/MissionPatchingResult.cs | 9 +- UKSF.Api.ArmaMissions/Models/MissionPlayer.cs | 8 +- .../Services/MissionDataResolver.cs | 4 +- .../Services/MissionEntityItemHelper.cs | 2 +- .../Services/MissionPatchDataService.cs | 10 +- .../Services/MissionService.cs | 5 +- .../Controllers/GameServersController.cs | 101 +++-- .../MissionPatchingFailedException.cs | 12 + .../Models/GameServerModsDataset.cs | 11 + .../Models/GameServersDataset.cs | 17 + UKSF.Api.ArmaServer/Models/MissionsDataset.cs | 17 + UKSF.Api.Auth/ApiAuthExtensions.cs | 13 +- .../Commands/RequestPasswordResetCommand.cs | 71 ++++ .../Commands/ResetPasswordCommand.cs | 62 ++++ UKSF.Api.Auth/Controllers/AuthController.cs | 71 ++++ .../Controllers/ConfirmationCodeReceiver.cs | 49 --- UKSF.Api.Auth/Controllers/LoginController.cs | 62 ---- .../Controllers/PasswordResetController.cs | 61 --- .../Exceptions/LoginFailedException.cs | 11 + .../Exceptions/TokenRefreshFailedException.cs | 11 + .../Models/Parameters/LoginCredentials.cs | 8 + .../Models/Parameters/RequestPasswordReset.cs | 7 + UKSF.Api.Auth/Services/LoginService.cs | 45 ++- UKSF.Api.Auth/Services/PermissionsService.cs | 49 ++- UKSF.Api.Base/Context/MongoCollection.cs | 1 + UKSF.Api.Base/Context/MongoContextBase.cs | 18 - .../Controllers/CommandRequestsController.cs | 128 +++---- .../CommandRequestsCreationController.cs | 56 ++- .../Controllers/DischargesController.cs | 31 +- .../Controllers/OperationOrderController.cs | 17 +- .../Controllers/OperationReportController.cs | 25 +- .../Models/CommandRequestsDataset.cs | 24 ++ UKSF.Api.Command/Models/OprepDataset.cs | 12 + .../Services/ChainOfCommandService.cs | 9 +- .../CommandRequestCompletionService.cs | 166 ++++++--- .../Services/CommandRequestService.cs | 22 +- .../Controllers/DiscordController.cs | 7 +- .../DiscordAccountEventHandler.cs | 19 +- .../Services/DiscordService.cs | 60 +-- .../Controllers/OperationsController.cs | 24 +- .../Controllers/TeamspeakController.cs | 52 ++- .../EventHandlers/TeamspeakEventHandler.cs | 22 +- .../TeamspeakServerEventHandler.cs | 12 +- .../Models/TeampseakReportsDataset.cs | 24 ++ .../Models/TeamspeakAccountsDataset.cs | 17 + .../Models/TeamspeakClient.cs | 10 +- .../Models/TeamspeakGroupProcedure.cs | 10 +- .../Models/TeamspeakServerGroupUpdate.cs | 8 +- .../Services/TeamspeakGroupService.cs | 120 +++--- .../Services/TeamspeakMetricsService.cs | 4 +- .../Services/TeamspeakService.cs | 30 +- .../Controllers/LauncherController.cs | 22 +- .../Controllers/GithubController.cs | 20 +- .../Controllers/IssueController.cs | 40 +- .../Controllers/ModpackController.cs | 45 +-- UKSF.Api.Personnel/ApiPersonnelExtensions.cs | 14 +- .../ConnectTeamspeakIdToAccountCommand.cs | 81 ++++ UKSF.Api.Personnel/Context/AccountContext.cs | 11 +- .../Controllers/AccountsController.cs | 204 +++++----- .../Controllers/ApplicationsController.cs | 85 +++-- .../Controllers/CommentThreadController.cs | 69 ++-- .../Controllers/CommunicationsController.cs | 135 ------- .../Controllers/DiscordCodeController.cs | 37 +- .../Controllers/DisplayNameController.cs | 4 +- .../Controllers/NotificationsController.cs | 11 +- .../Controllers/RanksController.cs | 41 +- .../Controllers/RecruitmentController.cs | 102 +++-- .../Controllers/RolesController.cs | 38 +- .../Controllers/SteamCodeController.cs | 25 +- .../TeamspeakConnectionController.cs | 30 ++ .../Controllers/UnitsController.cs | 93 ++--- .../EventHandlers/AccountDataEventHandler.cs | 29 +- .../EventHandlers/DiscordEventHandler.cs | 8 +- .../AccountAlreadyConfirmedException.cs | 11 + .../AccountAlreadyExistsException.cs | 11 + .../DiscordConnectFailedException.cs | 11 + .../InvalidConfirmationCodeException.cs | 11 + .../Extensions/AccountExtensions.cs | 13 - UKSF.Api.Personnel/Mappers/AccountMapper.cs | 51 +++ UKSF.Api.Personnel/Models/Application.cs | 43 ++- .../Models/CommentThreadsDataset.cs | 19 + .../Models/{Account.cs => DomainAccount.cs} | 45 ++- .../Models/Parameters/ChangeName.cs | 8 + .../Models/Parameters/CreateAccount.cs | 14 + .../Models/Parameters/TeamspeakCode.cs | 7 + .../Models/RecruitmentStatsDataset.cs | 32 ++ UKSF.Api.Personnel/Models/RolesDataset.cs | 10 + UKSF.Api.Personnel/Services/AccountService.cs | 4 +- .../Services/AssignmentService.cs | 4 +- .../Services/ConfirmationCodeService.cs | 5 +- .../Services/DisplayNameService.cs | 18 +- .../Services/NotificationsService.cs | 73 ++-- .../Services/RecruitmentService.cs | 98 ++--- .../Services/ServiceRecordService.cs | 2 +- UKSF.Api.Personnel/Services/UnitsService.cs | 8 +- UKSF.Api.Personnel/UKSF.Api.Personnel.csproj | 1 + UKSF.Api.Shared/ApiSharedExtensions.cs | 25 +- .../Commands/SendBasicEmailCommand.cs | 46 +++ .../Commands/SendTemplatedEmailCommand.cs | 52 +++ UKSF.Api.Shared/Context/CachedMongoContext.cs | 1 + UKSF.Api.Shared/Context/FileContext.cs | 28 ++ .../Context/SmtpClientContext.cs | 21 +- .../AccountConfirmationTemplate.html | 320 ++++++++++++++++ .../NotificationTemplate.html | 302 +++++++++++++++ .../ResetPasswordTemplate.html | 351 ++++++++++++++++++ UKSF.Api.Shared/Events/Logger.cs | 4 +- .../Exceptions/BadRequestException.cs | 12 + .../Exceptions/NotFoundException.cs | 2 +- UKSF.Api.Shared/Exceptions/UksfException.cs | 7 +- .../Exceptions/UnauthorizedException.cs | 11 + .../Extensions/CollectionExtensions.cs | 20 +- .../Extensions/ProcessUtilities.cs | 23 +- .../Extensions/StringExtensions.cs | 5 + .../Models/TeamspeakMessageEventData.cs | 15 +- UKSF.Api.Shared/Models/UksfErrorMessage.cs | 7 +- UKSF.Api.Shared/Models/ValidationReport.cs | 31 ++ .../Queries/GetEmailTemplateQuery.cs | 70 ++++ UKSF.Api.Shared/UKSF.Api.Shared.csproj | 8 +- UKSF.Api/Controllers/LoaController.cs | 6 +- UKSF.Api/Controllers/LoggingController.cs | 4 +- UKSF.Api/Controllers/ModsController.cs | 4 +- UKSF.Api/Middleware/ExceptionHandler.cs | 4 +- UKSF.Api/Models/LoaReportDataset.cs | 3 +- UKSF.Api/Program.cs | 6 + UKSF.Api/ServiceExtensions.cs | 2 +- .../Unit/Common/ChangeUtilitiesTests.cs | 103 ++--- .../Unit/Data/SimpleDataServiceTests.cs | 11 +- .../Handlers/AccountEventHandlerTests.cs | 46 ++- .../Events/Handlers/LogEventHandlerTests.cs | 8 +- .../Handlers/TeamspeakEventHandlerTests.cs | 152 ++++---- .../Mission/MissionPatchingReportTests.cs | 26 +- .../Teamspeak/TeamspeakGroupServiceTests.cs | 123 +++--- .../Personnel/DisplayNameServiceTests.cs | 60 +-- .../Services/Personnel/RanksServiceTests.cs | 128 ++++--- .../Utility/ConfirmationCodeServiceTests.cs | 79 ++-- .../ScheduledActions/PruneDataActionTests.cs | 10 +- .../Services/Utility/SessionServiceTests.cs | 47 ++- 151 files changed, 4040 insertions(+), 1843 deletions(-) create mode 100644 Tests/UKSF.Api.Auth.Tests/Controllers/AuthControllerTests.cs create mode 100644 Tests/UKSF.Api.Personnel.Tests/Commands/ConnectTeamspeakIdToAccountCommandTests.cs rename UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs => Tests/UKSF.Api.Personnel.Tests/Mappers/AccountMapperTests.cs (51%) create mode 100644 Tests/UKSF.Api.Tests.Common/AssertionExtensions.cs delete mode 100644 UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs create mode 100644 UKSF.Api.ArmaServer/Exceptions/MissionPatchingFailedException.cs create mode 100644 UKSF.Api.ArmaServer/Models/GameServerModsDataset.cs create mode 100644 UKSF.Api.ArmaServer/Models/GameServersDataset.cs create mode 100644 UKSF.Api.ArmaServer/Models/MissionsDataset.cs create mode 100644 UKSF.Api.Auth/Commands/RequestPasswordResetCommand.cs create mode 100644 UKSF.Api.Auth/Commands/ResetPasswordCommand.cs create mode 100644 UKSF.Api.Auth/Controllers/AuthController.cs delete mode 100644 UKSF.Api.Auth/Controllers/ConfirmationCodeReceiver.cs delete mode 100644 UKSF.Api.Auth/Controllers/LoginController.cs delete mode 100644 UKSF.Api.Auth/Controllers/PasswordResetController.cs create mode 100644 UKSF.Api.Auth/Exceptions/LoginFailedException.cs create mode 100644 UKSF.Api.Auth/Exceptions/TokenRefreshFailedException.cs create mode 100644 UKSF.Api.Auth/Models/Parameters/LoginCredentials.cs create mode 100644 UKSF.Api.Auth/Models/Parameters/RequestPasswordReset.cs create mode 100644 UKSF.Api.Command/Models/CommandRequestsDataset.cs create mode 100644 UKSF.Api.Command/Models/OprepDataset.cs create mode 100644 UKSF.Api.Integrations.Teamspeak/Models/TeampseakReportsDataset.cs create mode 100644 UKSF.Api.Integrations.Teamspeak/Models/TeamspeakAccountsDataset.cs create mode 100644 UKSF.Api.Personnel/Commands/ConnectTeamspeakIdToAccountCommand.cs delete mode 100644 UKSF.Api.Personnel/Controllers/CommunicationsController.cs create mode 100644 UKSF.Api.Personnel/Controllers/TeamspeakConnectionController.cs create mode 100644 UKSF.Api.Personnel/Exceptions/AccountAlreadyConfirmedException.cs create mode 100644 UKSF.Api.Personnel/Exceptions/AccountAlreadyExistsException.cs create mode 100644 UKSF.Api.Personnel/Exceptions/DiscordConnectFailedException.cs create mode 100644 UKSF.Api.Personnel/Exceptions/InvalidConfirmationCodeException.cs delete mode 100644 UKSF.Api.Personnel/Extensions/AccountExtensions.cs create mode 100644 UKSF.Api.Personnel/Mappers/AccountMapper.cs create mode 100644 UKSF.Api.Personnel/Models/CommentThreadsDataset.cs rename UKSF.Api.Personnel/Models/{Account.cs => DomainAccount.cs} (52%) create mode 100644 UKSF.Api.Personnel/Models/Parameters/ChangeName.cs create mode 100644 UKSF.Api.Personnel/Models/Parameters/CreateAccount.cs create mode 100644 UKSF.Api.Personnel/Models/Parameters/TeamspeakCode.cs create mode 100644 UKSF.Api.Personnel/Models/RecruitmentStatsDataset.cs create mode 100644 UKSF.Api.Personnel/Models/RolesDataset.cs create mode 100644 UKSF.Api.Shared/Commands/SendBasicEmailCommand.cs create mode 100644 UKSF.Api.Shared/Commands/SendTemplatedEmailCommand.cs create mode 100644 UKSF.Api.Shared/Context/FileContext.cs rename UKSF.Api.Personnel/Services/EmailService.cs => UKSF.Api.Shared/Context/SmtpClientContext.cs (53%) create mode 100644 UKSF.Api.Shared/EmailHtmlTemplates/AccountConfirmationTemplate.html create mode 100644 UKSF.Api.Shared/EmailHtmlTemplates/NotificationTemplate.html create mode 100644 UKSF.Api.Shared/EmailHtmlTemplates/ResetPasswordTemplate.html create mode 100644 UKSF.Api.Shared/Exceptions/BadRequestException.cs create mode 100644 UKSF.Api.Shared/Exceptions/UnauthorizedException.cs create mode 100644 UKSF.Api.Shared/Models/ValidationReport.cs create mode 100644 UKSF.Api.Shared/Queries/GetEmailTemplateQuery.cs diff --git a/Tests/UKSF.Api.ArmaServer.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.ArmaServer.Tests/DependencyInjectionTests.cs index d8afa8a5..4d71c1a5 100644 --- a/Tests/UKSF.Api.ArmaServer.Tests/DependencyInjectionTests.cs +++ b/Tests/UKSF.Api.ArmaServer.Tests/DependencyInjectionTests.cs @@ -7,9 +7,12 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Api.ArmaServer.Tests { - public class DependencyInjectionTests : DependencyInjectionTestsBase { - public DependencyInjectionTests() { +namespace UKSF.Api.ArmaServer.Tests +{ + public class DependencyInjectionTests : DependencyInjectionTestsBase + { + public DependencyInjectionTests() + { Services.AddUksfAdmin(); Services.AddUksfPersonnel(); Services.AddUksfArmaMissions(); @@ -17,7 +20,8 @@ public DependencyInjectionTests() { } [Fact] - public void When_resolving_controllers() { + public void When_resolving_controllers() + { Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); diff --git a/Tests/UKSF.Api.Auth.Tests/Controllers/AuthControllerTests.cs b/Tests/UKSF.Api.Auth.Tests/Controllers/AuthControllerTests.cs new file mode 100644 index 00000000..97ee3183 --- /dev/null +++ b/Tests/UKSF.Api.Auth.Tests/Controllers/AuthControllerTests.cs @@ -0,0 +1,105 @@ +using System; +using System.Threading.Tasks; +using FluentAssertions; +using MongoDB.Bson; +using Moq; +using UKSF.Api.Auth.Commands; +using UKSF.Api.Auth.Controllers; +using UKSF.Api.Auth.Exceptions; +using UKSF.Api.Auth.Services; +using UKSF.Api.Shared.Exceptions; +using UKSF.Api.Shared.Services; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.Auth.Tests.Controllers +{ + public class AuthControllerTests + { + private readonly Mock _mockHttpContextService; + private readonly Mock _mockLoginService; + private readonly Mock _mockRequestPasswordResetCommand; + private readonly Mock _mockResetPasswordCommand; + private readonly AuthController _subject; + private readonly string _userId = ObjectId.GenerateNewId().ToString(); + + public AuthControllerTests() + { + _mockLoginService = new(); + _mockHttpContextService = new(); + _mockRequestPasswordResetCommand = new(); + _mockResetPasswordCommand = new(); + + _subject = new(_mockLoginService.Object, _mockHttpContextService.Object, _mockRequestPasswordResetCommand.Object, _mockResetPasswordCommand.Object); + } + + [Fact] + public void When_getting_is_user_authed() + { + _mockHttpContextService.Setup(x => x.IsUserAuthenticated()).Returns(true); + + bool result = _subject.IsUserAuthenticated(); + + result.Should().BeTrue(); + } + + [Fact] + public void When_logging_in() + { + _mockLoginService.Setup(x => x.Login("email", "password")).Returns("token"); + + string result = _subject.Login(new() { Email = "email", Password = "password" }); + + result.Should().Be("token"); + } + + [Fact] + public void When_refreshing_token() + { + _mockHttpContextService.Setup(x => x.GetUserId()).Returns(_userId); + _mockLoginService.Setup(x => x.RegenerateBearerToken(_userId)).Returns("token"); + + string result = _subject.RefreshToken(); + + result.Should().Be("token"); + } + + [Fact] + public void When_refreshing_token_fails() + { + _mockHttpContextService.Setup(x => x.GetUserId()).Returns(_userId); + _mockLoginService.Setup(x => x.RegenerateBearerToken(_userId)).Returns((string) null); + + Action act = () => _subject.RefreshToken(); + + act.Should().Throw().WithMessageAndStatusCode("Failed to refresh token", 401); + } + + [Fact] + public void When_requesting_password_reset() + { + _subject.RequestPasswordReset(new() { Email = "email" }); + + _mockRequestPasswordResetCommand.Verify(x => x.ExecuteAsync(It.Is(m => m.Email == "email")), Times.Once); + } + + [Fact] + public async Task When_resetting_password() + { + _mockResetPasswordCommand.Setup(x => x.ExecuteAsync(It.Is(m => m.Email == "email" && m.Password == "password" && m.Code == "code"))); + _mockLoginService.Setup(x => x.LoginForPasswordReset("email")).Returns("token"); + + string result = await _subject.ResetPassword("code", new() { Email = "email", Password = "password" }); + + result.Should().Be("token"); + } + + [Theory, InlineData(null, "password"), InlineData("email", null)] + public void When_logging_in_with_invalid_credentials(string email, string password) + { + Action act = () => _subject.Login(new() { Email = email, Password = password }); + + act.Should().Throw().WithMessageAndStatusCode("Bad request", 400); + } + } +} diff --git a/Tests/UKSF.Api.Auth.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Auth.Tests/DependencyInjectionTests.cs index 01558686..f15304fb 100644 --- a/Tests/UKSF.Api.Auth.Tests/DependencyInjectionTests.cs +++ b/Tests/UKSF.Api.Auth.Tests/DependencyInjectionTests.cs @@ -6,22 +6,24 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Api.Auth.Tests { - public class DependencyInjectionTests : DependencyInjectionTestsBase { - public DependencyInjectionTests() { +namespace UKSF.Api.Auth.Tests +{ + public class DependencyInjectionTests : DependencyInjectionTestsBase + { + public DependencyInjectionTests() + { Services.AddUksfAdmin(); Services.AddUksfPersonnel(); Services.AddUksfAuth(Configuration); } [Fact] - public void When_resolving_controllers() { - Services.AddTransient(); - Services.AddTransient(); + public void When_resolving_controllers() + { + Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); - serviceProvider.GetRequiredService().Should().NotBeNull(); - serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); } } } diff --git a/Tests/UKSF.Api.Personnel.Tests/Commands/ConnectTeamspeakIdToAccountCommandTests.cs b/Tests/UKSF.Api.Personnel.Tests/Commands/ConnectTeamspeakIdToAccountCommandTests.cs new file mode 100644 index 00000000..dadddf24 --- /dev/null +++ b/Tests/UKSF.Api.Personnel.Tests/Commands/ConnectTeamspeakIdToAccountCommandTests.cs @@ -0,0 +1,97 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using FluentAssertions; +using MongoDB.Bson; +using MongoDB.Driver; +using Moq; +using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Commands; +using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Exceptions; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; +using UKSF.Api.Tests.Common; +using Xunit; + +namespace UKSF.Api.Personnel.Tests.Commands +{ + public class ConnectTeamspeakIdToAccountCommandTests + { + private readonly string _accountId = ObjectId.GenerateNewId().ToString(); + private readonly string _confirmationCode = ObjectId.GenerateNewId().ToString(); + private readonly Mock _mockAccountContext; + private readonly Mock _mockConfirmationCodeService; + private readonly Mock _mockEventBus; + private readonly Mock _mockLogger; + private readonly Mock _mockNotificationsService; + private readonly ConnectTeamspeakIdToAccountCommand _subject; + private readonly string _teamspeakId = "2"; + + public ConnectTeamspeakIdToAccountCommandTests() + { + _mockEventBus = new(); + _mockLogger = new(); + _mockAccountContext = new(); + _mockConfirmationCodeService = new(); + _mockNotificationsService = new(); + + _subject = new(_mockEventBus.Object, _mockLogger.Object, _mockAccountContext.Object, _mockConfirmationCodeService.Object, _mockNotificationsService.Object); + } + + [Fact] + public async Task When_connecting_teamspeak_id() + { + _mockConfirmationCodeService.Setup(x => x.GetConfirmationCodeValue(_confirmationCode)).ReturnsAsync(_teamspeakId); + + BsonValue expectedUpdate = Builders.Update.Set(x => x.TeamspeakIdentities, new() { 2 }).RenderUpdate(); + BsonValue createdUpdate = null; + _mockAccountContext.Setup(x => x.Update(_accountId, It.IsAny>())) + .Callback((string _, UpdateDefinition update) => createdUpdate = update.RenderUpdate()); + _mockAccountContext.Setup(x => x.GetSingle(_accountId)) + .Returns( + () => + { + DomainAccount domainAccount = new() { Id = _accountId }; + if (createdUpdate != null) + { + domainAccount.TeamspeakIdentities = new() { 2 }; + domainAccount.Email = "test@test.com"; + } + + return domainAccount; + } + ); + + DomainAccount result = await _subject.ExecuteAsync(new(_accountId, _teamspeakId, _confirmationCode)); + + result.TeamspeakIdentities.Single().Should().Be(2); + createdUpdate.Should().BeEquivalentTo(expectedUpdate); + + _mockConfirmationCodeService.Verify(x => x.ClearConfirmationCodes(It.IsAny>()), Times.Never); + _mockEventBus.Verify(x => x.Send(It.Is(m => m.TeamspeakIdentities.Single() == 2)), Times.Once); + _mockNotificationsService.Verify( + x => x.SendTeamspeakNotification( + It.Is>(m => m.Single() == 2), + "This teamspeak identity has been linked to the account with email 'test@test.com'\nIf this was not done by you, please contact an admin" + ), + Times.Once + ); + _mockLogger.Verify(x => x.LogAudit($"Teamspeak ID {_teamspeakId} added for {_accountId}", null), Times.Once); + } + + [Fact] + public void When_connecting_teamspeak_id_and_code_is_null() + { + _mockAccountContext.Setup(x => x.GetSingle(_accountId)).Returns(new DomainAccount()); + _mockConfirmationCodeService.Setup(x => x.GetConfirmationCodeValue(_confirmationCode)).ReturnsAsync((string) null); + + Func act = async () => await _subject.ExecuteAsync(new(_accountId, _teamspeakId, _confirmationCode)); + + act.Should().ThrowAsync().WithMessageAndStatusCode("Confirmation code was invalid or expired. Please try again", 400); + _mockConfirmationCodeService.Verify(x => x.ClearConfirmationCodes(It.Is>(m => m(new() { Value = _teamspeakId }))), Times.Once); + } + } +} diff --git a/Tests/UKSF.Api.Personnel.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Personnel.Tests/DependencyInjectionTests.cs index 1279f2b5..172475de 100644 --- a/Tests/UKSF.Api.Personnel.Tests/DependencyInjectionTests.cs +++ b/Tests/UKSF.Api.Personnel.Tests/DependencyInjectionTests.cs @@ -7,19 +7,23 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Api.Personnel.Tests { - public class DependencyInjectionTests : DependencyInjectionTestsBase { - public DependencyInjectionTests() { +namespace UKSF.Api.Personnel.Tests +{ + public class DependencyInjectionTests : DependencyInjectionTestsBase + { + public DependencyInjectionTests() + { Services.AddUksfAdmin(); Services.AddUksfPersonnel(); } [Fact] - public void When_resolving_controllers() { + public void When_resolving_controllers() + { Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); - Services.AddTransient(); + Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); @@ -36,7 +40,7 @@ public void When_resolving_controllers() { serviceProvider.GetRequiredService().Should().NotBeNull(); serviceProvider.GetRequiredService().Should().NotBeNull(); serviceProvider.GetRequiredService().Should().NotBeNull(); - serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); serviceProvider.GetRequiredService().Should().NotBeNull(); serviceProvider.GetRequiredService().Should().NotBeNull(); serviceProvider.GetRequiredService().Should().NotBeNull(); @@ -46,12 +50,13 @@ public void When_resolving_controllers() { serviceProvider.GetRequiredService().Should().NotBeNull(); serviceProvider.GetRequiredService().Should().NotBeNull(); serviceProvider.GetRequiredService().Should().NotBeNull(); - serviceProvider.GetRequiredService().Should().NotBeNull(); - serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); + serviceProvider.GetRequiredService().Should().NotBeNull(); } [Fact] - public void When_resolving_event_handlers() { + public void When_resolving_event_handlers() + { Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); @@ -63,7 +68,8 @@ public void When_resolving_event_handlers() { } [Fact] - public void When_resolving_scheduled_actions() { + public void When_resolving_scheduled_actions() + { Services.AddTransient(); Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); diff --git a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs b/Tests/UKSF.Api.Personnel.Tests/Mappers/AccountMapperTests.cs similarity index 51% rename from UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs rename to Tests/UKSF.Api.Personnel.Tests/Mappers/AccountMapperTests.cs index bc3bcb9e..f02ec4cc 100644 --- a/UKSF.Tests/Unit/Services/Common/AccountUtilitiesTests.cs +++ b/Tests/UKSF.Api.Personnel.Tests/Mappers/AccountMapperTests.cs @@ -1,31 +1,49 @@ using System; -using System.Collections.Generic; using FluentAssertions; using MongoDB.Bson; -using UKSF.Api.Personnel.Extensions; +using Moq; +using UKSF.Api.Personnel.Mappers; using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; using Xunit; -namespace UKSF.Tests.Unit.Services.Common { - public class AccountUtilitiesTests { +namespace UKSF.Api.Personnel.Tests.Mappers +{ + public class AccountMapperTests + { + private readonly Mock _mockDisplayNameService; + private readonly AccountMapper _subject; + + public AccountMapperTests() + { + _mockDisplayNameService = new(); + + _subject = new(_mockDisplayNameService.Object); + } + [Fact] - public void ShouldCopyAccountCorrectly() { + public void ShouldCopyAccountCorrectly() + { string id = ObjectId.GenerateNewId().ToString(); DateTime timestamp = DateTime.Now.AddDays(-1); - Account account = new() { + DomainAccount domainAccount = new() + { Id = id, Firstname = "Bob", Lastname = "McTest", MembershipState = MembershipState.MEMBER, - TeamspeakIdentities = new HashSet { 4, 4 }, - ServiceRecord = new List { new() { Occurence = "Test", Timestamp = timestamp } }, - RolePreferences = new List { "Aviation" }, + TeamspeakIdentities = new() { 4, 4 }, + ServiceRecord = new() { new() { Occurence = "Test", Timestamp = timestamp } }, + RolePreferences = new() { "Aviation" }, MilitaryExperience = false }; - PublicAccount subject = account.ToPublicAccount(); + _mockDisplayNameService.Setup(x => x.GetDisplayName(domainAccount)).Returns("Cdt.McTest.B"); + + Account subject = _subject.MapToAccount(domainAccount); subject.Id.Should().Be(id); + subject.DisplayName.Should().Be("Cdt.McTest.B"); subject.Firstname.Should().Be("Bob"); subject.Lastname.Should().Be("McTest"); subject.MembershipState.Should().Be(MembershipState.MEMBER); @@ -34,16 +52,5 @@ public void ShouldCopyAccountCorrectly() { subject.RolePreferences.Should().Contain("Aviation"); subject.MilitaryExperience.Should().BeFalse(); } - - [Fact] - public void ShouldNotCopyPassword() { - string id = ObjectId.GenerateNewId().ToString(); - Account account = new() { Id = id, Password = "thiswontappear" }; - - PublicAccount subject = account.ToPublicAccount(); - - subject.Id.Should().Be(id); - subject.Password.Should().BeNull(); - } } } diff --git a/Tests/UKSF.Api.Tests.Common/AssertionExtensions.cs b/Tests/UKSF.Api.Tests.Common/AssertionExtensions.cs new file mode 100644 index 00000000..8f3149eb --- /dev/null +++ b/Tests/UKSF.Api.Tests.Common/AssertionExtensions.cs @@ -0,0 +1,20 @@ +using System.Threading.Tasks; +using FluentAssertions; +using FluentAssertions.Specialized; +using UKSF.Api.Shared.Exceptions; + +namespace UKSF.Api.Tests.Common +{ + public static class AssertionExtensions + { + public static async Task WithMessageAndStatusCode(this Task> task, string expectedWildcardPattern, int statusCode) where T : UksfException + { + (await task).WithMessage(expectedWildcardPattern).And.StatusCode.Should().Be(statusCode); + } + + public static void WithMessageAndStatusCode(this ExceptionAssertions assertion, string expectedWildcardPattern, int statusCode) where T : UksfException + { + assertion.WithMessage(expectedWildcardPattern).And.StatusCode.Should().Be(statusCode); + } + } +} diff --git a/Tests/UKSF.Api.Tests.Common/TestUtilities.cs b/Tests/UKSF.Api.Tests.Common/TestUtilities.cs index 0a66585e..c13df89a 100644 --- a/Tests/UKSF.Api.Tests.Common/TestUtilities.cs +++ b/Tests/UKSF.Api.Tests.Common/TestUtilities.cs @@ -6,12 +6,12 @@ namespace UKSF.Api.Tests.Common { public static class TestUtilities { - public static BsonValue RenderUpdate(UpdateDefinition updateDefinition) + public static BsonValue RenderUpdate(this UpdateDefinition updateDefinition) { return updateDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); } - public static BsonValue RenderFilter(FilterDefinition filterDefinition) + public static BsonValue RenderFilter(this FilterDefinition filterDefinition) { return filterDefinition.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry); } diff --git a/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj b/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj index 8abc4a34..d61a50c9 100644 --- a/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj +++ b/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj @@ -7,6 +7,7 @@ + diff --git a/UKSF.Api.Admin/Controllers/DataController.cs b/UKSF.Api.Admin/Controllers/DataController.cs index 5e727022..8e818480 100644 --- a/UKSF.Api.Admin/Controllers/DataController.cs +++ b/UKSF.Api.Admin/Controllers/DataController.cs @@ -16,10 +16,9 @@ public DataController(IDataCacheService dataCacheService) } [HttpGet("invalidate"), Authorize] - public IActionResult Invalidate() + public void Invalidate() { _dataCacheService.RefreshCachedData(); - return Ok(); } } } diff --git a/UKSF.Api.Admin/Controllers/VariablesController.cs b/UKSF.Api.Admin/Controllers/VariablesController.cs index 4dea6c1e..17a6946b 100644 --- a/UKSF.Api.Admin/Controllers/VariablesController.cs +++ b/UKSF.Api.Admin/Controllers/VariablesController.cs @@ -1,10 +1,12 @@ -using System.Threading.Tasks; +using System.Collections.Generic; +using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Models; using UKSF.Api.Shared; using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Exceptions; using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Admin.Controllers @@ -22,59 +24,58 @@ public VariablesController(IVariablesContext variablesContext, ILogger logger) } [HttpGet, Authorize] - public IActionResult GetAll() + public IEnumerable GetAll() { - return Ok(_variablesContext.Get()); + return _variablesContext.Get(); } [HttpGet("{key}"), Authorize] - public IActionResult GetVariableItems(string key) + public VariableItem GetVariableItems(string key) { - return Ok(_variablesContext.GetSingle(key)); + return _variablesContext.GetSingle(key); } [HttpPost("{key}"), Authorize] - public IActionResult CheckVariableItem(string key, [FromBody] VariableItem variableItem = null) + public VariableItem CheckVariableItem(string key, [FromBody] VariableItem variableItem = null) { if (string.IsNullOrEmpty(key)) { - return Ok(); + throw new BadRequestException("No key given"); } if (variableItem != null) { VariableItem safeVariableItem = variableItem; - return Ok(_variablesContext.GetSingle(x => x.Id != safeVariableItem.Id && x.Key == key.Keyify())); + return _variablesContext.GetSingle(x => x.Id != safeVariableItem.Id && x.Key == key.Keyify()); } - return Ok(_variablesContext.GetSingle(x => x.Key == key.Keyify())); + return _variablesContext.GetSingle(x => x.Key == key.Keyify()); } [HttpPut, Authorize] - public async Task AddVariableItem([FromBody] VariableItem variableItem) + public async Task AddVariableItem([FromBody] VariableItem variableItem) { variableItem.Key = variableItem.Key.Keyify(); await _variablesContext.Add(variableItem); _logger.LogAudit($"VariableItem added '{variableItem.Key}, {variableItem.Item}'"); - return Ok(); } [HttpPatch, Authorize] - public async Task EditVariableItem([FromBody] VariableItem variableItem) + public async Task> EditVariableItem([FromBody] VariableItem variableItem) { VariableItem oldVariableItem = _variablesContext.GetSingle(variableItem.Key); _logger.LogAudit($"VariableItem '{oldVariableItem.Key}' updated from '{oldVariableItem.Item}' to '{variableItem.Item}'"); await _variablesContext.Update(variableItem.Key, variableItem.Item); - return Ok(_variablesContext.Get()); + return _variablesContext.Get(); } [HttpDelete("{key}"), Authorize] - public async Task DeleteVariableItem(string key) + public async Task> DeleteVariableItem(string key) { VariableItem variableItem = _variablesContext.GetSingle(key); _logger.LogAudit($"VariableItem deleted '{variableItem.Key}, {variableItem.Item}'"); await _variablesContext.Delete(key); - return Ok(_variablesContext.Get()); + return _variablesContext.Get(); } } } diff --git a/UKSF.Api.Admin/Controllers/VersionController.cs b/UKSF.Api.Admin/Controllers/VersionController.cs index d3d91639..4dd82bba 100644 --- a/UKSF.Api.Admin/Controllers/VersionController.cs +++ b/UKSF.Api.Admin/Controllers/VersionController.cs @@ -23,18 +23,17 @@ public VersionController(IVariablesContext variablesContext, IHubContext UpdateFrontendVersion([FromBody] JObject body) + public async Task UpdateFrontendVersion([FromBody] JObject body) { string version = body["version"].ToString(); await _variablesContext.Update("FRONTEND_VERSION", version); await _utilityHub.Clients.All.ReceiveFrontendUpdate(version); - return Ok(); } } } diff --git a/UKSF.Api.Admin/Extensions/VariablesExtensions.cs b/UKSF.Api.Admin/Extensions/VariablesExtensions.cs index 8d0c2232..799b2de2 100644 --- a/UKSF.Api.Admin/Extensions/VariablesExtensions.cs +++ b/UKSF.Api.Admin/Extensions/VariablesExtensions.cs @@ -24,6 +24,17 @@ public static string AsString(this VariableItem variable) return variable.AssertHasItem().Item.ToString(); } + public static int AsInt(this VariableItem variable) + { + string item = variable.AsString(); + if (!int.TryParse(item, out int output)) + { + throw new InvalidCastException($"VariableItem {item} cannot be converted to an int"); + } + + return output; + } + public static double AsDouble(this VariableItem variable) { string item = variable.AsString(); @@ -84,6 +95,14 @@ public static IEnumerable AsEnumerable(this VariableItem variable, Func< return predicate != null ? items.Select(predicate) : items; } + public static IEnumerable AsIntArray(this VariableItem variable) + { + string itemString = variable.AsString(); + itemString = Regex.Replace(itemString, "\\s*,\\s*", ","); + IEnumerable items = itemString.Split(",").Select(x => x.ToInt()); + return items; + } + public static IEnumerable AsDoublesArray(this VariableItem variable) { string itemString = variable.AsString(); diff --git a/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs deleted file mode 100644 index 84ce6603..00000000 --- a/UKSF.Api.ArmaMissions/Models/MissionPatchingReport.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; - -namespace UKSF.Api.ArmaMissions.Models { - public class MissionPatchingReport { - public string Detail; - public bool Error; - public string Title; - - public MissionPatchingReport(Exception exception) { - Title = exception.GetBaseException().Message; - Detail = exception.ToString(); - Error = true; - } - - public MissionPatchingReport(string title, string detail, bool error = false) { - Title = error ? $"Error: {title}" : $"Warning: {title}"; - Detail = detail; - Error = error; - } - } -} diff --git a/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs index 68446506..2e52bcca 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchingResult.cs @@ -1,9 +1,12 @@ using System.Collections.Generic; +using UKSF.Api.Shared.Models; -namespace UKSF.Api.ArmaMissions.Models { - public class MissionPatchingResult { +namespace UKSF.Api.ArmaMissions.Models +{ + public class MissionPatchingResult + { public int PlayerCount; - public List Reports = new(); + public List Reports = new(); public bool Success; } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs b/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs index c2f08904..d3c2f5a0 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs @@ -1,8 +1,10 @@ using UKSF.Api.Personnel.Models; -namespace UKSF.Api.ArmaMissions.Models { - public class MissionPlayer { - public Account Account; +namespace UKSF.Api.ArmaMissions.Models +{ + public class MissionPlayer + { + public DomainAccount DomainAccount; public string Name; public string ObjectClass; public Rank Rank; diff --git a/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs index bedd2c65..019de06f 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionDataResolver.cs @@ -55,12 +55,12 @@ private static int ResolvePlayerUnitRole(MissionPlayer player) private static bool IsMedic(MissionPlayer player) { - return MissionPatchData.Instance.MedicIds.Contains(player.Account?.Id); + return MissionPatchData.Instance.MedicIds.Contains(player.DomainAccount?.Id); } public static bool IsEngineer(MissionPlayer player) { - return MissionPatchData.Instance.EngineerIds.Contains(player.Account?.Id); + return MissionPatchData.Instance.EngineerIds.Contains(player.DomainAccount?.Id); } public static string ResolveCallsign(MissionUnit unit, string defaultCallsign) diff --git a/UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs b/UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs index 0524d2c2..7aa34592 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionEntityItemHelper.cs @@ -61,7 +61,7 @@ public static MissionEntityItem CreateFromPlayer(MissionPlayer missionPlayer, in missionEntityItem.RawMissionEntityItem.Add("{"); missionEntityItem.RawMissionEntityItem.Add("isPlayable=1;"); missionEntityItem.RawMissionEntityItem.Add( - $"description=\"{missionPlayer.Name}{(string.IsNullOrEmpty(missionPlayer.Account?.RoleAssignment) ? "" : $" - {missionPlayer.Account?.RoleAssignment}")}@{MissionDataResolver.ResolveCallsign(missionPlayer.Unit, missionPlayer.Unit.SourceUnit?.Callsign)}\";" + $"description=\"{missionPlayer.Name}{(string.IsNullOrEmpty(missionPlayer.DomainAccount?.RoleAssignment) ? "" : $" - {missionPlayer.DomainAccount?.RoleAssignment}")}@{MissionDataResolver.ResolveCallsign(missionPlayer.Unit, missionPlayer.Unit.SourceUnit?.Callsign)}\";" ); missionEntityItem.RawMissionEntityItem.Add("};"); if (MissionDataResolver.IsEngineer(missionPlayer)) diff --git a/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs b/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs index 465cd664..f2ef4c65 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs @@ -53,24 +53,24 @@ public void UpdatePatchData() MissionPatchData.Instance.Units.Add(new() { SourceUnit = unit }); } - foreach (Account account in _accountContext.Get().Where(x => !string.IsNullOrEmpty(x.Rank) && _ranksService.IsSuperiorOrEqual(x.Rank, "Recruit"))) + foreach (DomainAccount account in _accountContext.Get().Where(x => !string.IsNullOrEmpty(x.Rank) && _ranksService.IsSuperiorOrEqual(x.Rank, "Recruit"))) { - MissionPatchData.Instance.Players.Add(new() { Account = account, Rank = _ranksContext.GetSingle(account.Rank), Name = _displayNameService.GetDisplayName(account) }); + MissionPatchData.Instance.Players.Add(new() { DomainAccount = account, Rank = _ranksContext.GetSingle(account.Rank), Name = _displayNameService.GetDisplayName(account) }); } foreach (MissionUnit missionUnit in MissionPatchData.Instance.Units) { missionUnit.Callsign = MissionDataResolver.ResolveCallsign(missionUnit, missionUnit.SourceUnit.Callsign); - missionUnit.Members = missionUnit.SourceUnit.Members.Select(x => MissionPatchData.Instance.Players.FirstOrDefault(y => y.Account.Id == x)).ToList(); + missionUnit.Members = missionUnit.SourceUnit.Members.Select(x => MissionPatchData.Instance.Players.FirstOrDefault(y => y.DomainAccount.Id == x)).ToList(); if (missionUnit.SourceUnit.Roles.Count > 0) { - missionUnit.Roles = missionUnit.SourceUnit.Roles.ToDictionary(pair => pair.Key, pair => MissionPatchData.Instance.Players.FirstOrDefault(y => y.Account.Id == pair.Value)); + missionUnit.Roles = missionUnit.SourceUnit.Roles.ToDictionary(pair => pair.Key, pair => MissionPatchData.Instance.Players.FirstOrDefault(y => y.DomainAccount.Id == pair.Value)); } } foreach (MissionPlayer missionPlayer in MissionPatchData.Instance.Players) { - missionPlayer.Unit = MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Name == missionPlayer.Account.UnitAssignment); + missionPlayer.Unit = MissionPatchData.Instance.Units.Find(x => x.SourceUnit.Name == missionPlayer.DomainAccount.UnitAssignment); missionPlayer.ObjectClass = MissionDataResolver.ResolveObjectClass(missionPlayer); } diff --git a/UKSF.Api.ArmaMissions/Services/MissionService.cs b/UKSF.Api.ArmaMissions/Services/MissionService.cs index 52e9409c..b0f58b03 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionService.cs @@ -5,6 +5,7 @@ using System.Linq; using UKSF.Api.ArmaMissions.Models; using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Models; namespace UKSF.Api.ArmaMissions.Services { @@ -16,14 +17,14 @@ public class MissionService private int _armaServerDefaultMaxCurators; private string _armaServerModsPath; private Mission _mission; - private List _reports; + private List _reports; public MissionService(MissionPatchDataService missionPatchDataService) { _missionPatchDataService = missionPatchDataService; } - public List ProcessMission(Mission tempMission, string armaServerModsPath, int armaServerDefaultMaxCurators) + public List ProcessMission(Mission tempMission, string armaServerModsPath, int armaServerDefaultMaxCurators) { _armaServerDefaultMaxCurators = armaServerDefaultMaxCurators; _armaServerModsPath = armaServerModsPath; diff --git a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs index 2cf26611..a5d1edae 100644 --- a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs +++ b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs @@ -13,13 +13,16 @@ using UKSF.Api.Admin.Services; using UKSF.Api.ArmaMissions.Models; using UKSF.Api.ArmaServer.DataContext; +using UKSF.Api.ArmaServer.Exceptions; using UKSF.Api.ArmaServer.Models; using UKSF.Api.ArmaServer.Services; using UKSF.Api.ArmaServer.Signalr.Clients; using UKSF.Api.ArmaServer.Signalr.Hubs; using UKSF.Api.Shared; using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Exceptions; using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Models; namespace UKSF.Api.ArmaServer.Controllers { @@ -54,41 +57,40 @@ ILogger logger } [HttpGet, Authorize] - public IActionResult GetGameServers() + public GameServersDataset GetGameServers() { - return Ok(new { servers = _gameServersContext.Get(), missions = _gameServersService.GetMissionFiles(), instanceCount = _gameServersService.GetGameInstanceCount() }); + return new() { Servers = _gameServersContext.Get(), Missions = _gameServersService.GetMissionFiles(), InstanceCount = _gameServersService.GetGameInstanceCount() }; } [HttpGet("status/{id}"), Authorize] - public async Task GetGameServerStatus(string id) + public async Task GetGameServerStatus(string id) { GameServer gameServer = _gameServersContext.GetSingle(id); await _gameServersService.GetGameServerStatus(gameServer); - return Ok(new { gameServer, instanceCount = _gameServersService.GetGameInstanceCount() }); + return new() { GameServer = gameServer, InstanceCount = _gameServersService.GetGameInstanceCount() }; } [HttpPost("{check}"), Authorize] - public IActionResult CheckGameServers(string check, [FromBody] GameServer gameServer = null) + public GameServer CheckGameServers(string check, [FromBody] GameServer gameServer = null) { if (gameServer != null) { GameServer safeGameServer = gameServer; - return Ok(_gameServersContext.GetSingle(x => x.Id != safeGameServer.Id && (x.Name == check || x.ApiPort.ToString() == check))); + return _gameServersContext.GetSingle(x => x.Id != safeGameServer.Id && (x.Name == check || x.ApiPort.ToString() == check)); } - return Ok(_gameServersContext.GetSingle(x => x.Name == check || x.ApiPort.ToString() == check)); + return _gameServersContext.GetSingle(x => x.Name == check || x.ApiPort.ToString() == check); } [HttpPut, Authorize] - public async Task AddServer([FromBody] GameServer gameServer) + public async Task AddServer([FromBody] GameServer gameServer) { await _gameServersContext.Add(gameServer); _logger.LogAudit($"Server added '{gameServer}'"); - return Ok(); } [HttpPatch, Authorize] - public async Task EditGameServer([FromBody] GameServer gameServer) + public async Task EditGameServer([FromBody] GameServer gameServer) { GameServer oldGameServer = _gameServersContext.GetSingle(gameServer.Id); _logger.LogAudit($"Game server '{gameServer.Name}' updated:{oldGameServer.Changes(gameServer)}"); @@ -115,21 +117,21 @@ await _gameServersContext.Update( .Set(x => x.Mods, gameServer.Mods) .Set(x => x.ServerMods, gameServer.ServerMods) ); - return Ok(new { environmentChanged }); + return environmentChanged; } [HttpDelete("{id}"), Authorize] - public async Task DeleteGameServer(string id) + public async Task> DeleteGameServer(string id) { GameServer gameServer = _gameServersContext.GetSingle(id); _logger.LogAudit($"Game server deleted '{gameServer.Name}'"); await _gameServersContext.Delete(id); - return Ok(_gameServersContext.Get()); + return _gameServersContext.Get(); } [HttpPost("order"), Authorize] - public async Task UpdateOrder([FromBody] List newServerOrder) + public async Task> UpdateOrder([FromBody] List newServerOrder) { for (int index = 0; index < newServerOrder.Count; index++) { @@ -140,13 +142,13 @@ public async Task UpdateOrder([FromBody] List newServ } } - return Ok(_gameServersContext.Get()); + return _gameServersContext.Get(); } [HttpPost("mission"), Authorize, RequestSizeLimit(10485760), RequestFormLimits(MultipartBodyLengthLimit = 10485760)] - public async Task UploadMissionFile() + public async Task UploadMissionFile() { - List missionReports = new(); + List missionReports = new(); try { foreach (IFormFile file in Request.Form.Files.Where(x => x.Length > 0)) @@ -154,27 +156,27 @@ public async Task UploadMissionFile() await _gameServersService.UploadMissionFile(file); MissionPatchingResult missionPatchingResult = await _gameServersService.PatchMissionFile(file.Name); missionPatchingResult.Reports = missionPatchingResult.Reports.OrderByDescending(x => x.Error).ToList(); - missionReports.Add(new { mission = file.Name, reports = missionPatchingResult.Reports }); + missionReports.Add(new() { Mission = file.Name, Reports = missionPatchingResult.Reports }); _logger.LogAudit($"Uploaded mission '{file.Name}'"); } } catch (Exception exception) { _logger.LogError(exception); - return BadRequest(exception); + throw new BadRequestException(exception.Message); // TODO: Needs better error handling } - return Ok(new { missions = _gameServersService.GetMissionFiles(), missionReports }); + return new() { Missions = _gameServersService.GetMissionFiles(), MissionReports = missionReports }; } [HttpPost("launch/{id}"), Authorize] - public async Task LaunchServer(string id, [FromBody] JObject data) + public async Task> LaunchServer(string id, [FromBody] JObject data) { Task.WaitAll(_gameServersContext.Get().Select(x => _gameServersService.GetGameServerStatus(x)).ToArray()); GameServer gameServer = _gameServersContext.GetSingle(id); if (gameServer.Status.Running) { - return BadRequest("Server is already running. This shouldn't happen so please contact an admin"); + throw new BadRequestException("Server is already running. This shouldn't happen so please contact an admin"); } if (_gameServerHelpers.IsMainOpTime()) @@ -183,19 +185,19 @@ public async Task LaunchServer(string id, [FromBody] JObject data { if (_gameServersContext.Get(x => x.ServerOption != GameServerOption.SINGLETON).Any(x => x.Status.Started || x.Status.Running)) { - return BadRequest("Server must be launched on its own. Stop the other running servers first"); + throw new BadRequestException("Server must be launched on its own. Stop the other running servers first"); } } if (_gameServersContext.Get(x => x.ServerOption == GameServerOption.SINGLETON).Any(x => x.Status.Started || x.Status.Running)) { - return BadRequest("Server cannot be launched whilst main server is running at this time"); + throw new BadRequestException("Server cannot be launched whilst main server is running at this time"); } } if (_gameServersContext.Get(x => x.Port == gameServer.Port).Any(x => x.Status.Started || x.Status.Running)) { - return BadRequest("Server cannot be launched while another server with the same port is running"); + throw new BadRequestException("Server cannot be launched while another server with the same port is running"); } string missionSelection = data["missionName"].ToString(); @@ -203,14 +205,9 @@ public async Task LaunchServer(string id, [FromBody] JObject data if (!patchingResult.Success) { patchingResult.Reports = patchingResult.Reports.OrderByDescending(x => x.Error).ToList(); - return BadRequest( - new - { - reports = patchingResult.Reports, - message = - $"{(patchingResult.Reports.Count > 0 ? "Failed to patch mission for the reasons detailed below" : "Failed to patch mission for an unknown reason")}.\n\nContact an admin for help" - } - ); + string error = + $"{(patchingResult.Reports.Count > 0 ? "Failed to patch mission for the reasons detailed below" : "Failed to patch mission for an unknown reason")}.\n\nContact an admin for help"; + throw new MissionPatchingFailedException(error, new() { Reports = patchingResult.Reports }); } _gameServersService.WriteServerConfig(gameServer, patchingResult.PlayerCount, missionSelection); @@ -219,34 +216,34 @@ public async Task LaunchServer(string id, [FromBody] JObject data await _gameServersService.LaunchGameServer(gameServer); _logger.LogAudit($"Game server launched '{missionSelection}' on '{gameServer.Name}'"); - return Ok(patchingResult.Reports); + return patchingResult.Reports; } [HttpGet("stop/{id}"), Authorize] - public async Task StopServer(string id) + public async Task StopServer(string id) { GameServer gameServer = _gameServersContext.GetSingle(id); _logger.LogAudit($"Game server stopped '{gameServer.Name}'"); await _gameServersService.GetGameServerStatus(gameServer); if (!gameServer.Status.Started && !gameServer.Status.Running) { - return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); + throw new BadRequestException("Server is not running. This shouldn't happen so please contact an admin"); } await _gameServersService.StopGameServer(gameServer); await _gameServersService.GetGameServerStatus(gameServer); - return Ok(new { gameServer, instanceCount = _gameServersService.GetGameInstanceCount() }); + return new() { GameServer = gameServer, InstanceCount = _gameServersService.GetGameInstanceCount() }; } [HttpGet("kill/{id}"), Authorize] - public async Task KillServer(string id) + public async Task KillServer(string id) { GameServer gameServer = _gameServersContext.GetSingle(id); _logger.LogAudit($"Game server killed '{gameServer.Name}'"); await _gameServersService.GetGameServerStatus(gameServer); if (!gameServer.Status.Started && !gameServer.Status.Running) { - return BadRequest("Server is not running. This shouldn't happen so please contact an admin"); + throw new BadRequestException("Server is not running. This shouldn't happen so please contact an admin"); } try @@ -255,57 +252,55 @@ public async Task KillServer(string id) } catch (Exception) { - return BadRequest("Failed to stop server. Contact an admin"); + throw new BadRequestException("Failed to stop server. Contact an admin"); } await _gameServersService.GetGameServerStatus(gameServer); - return Ok(new { gameServer, instanceCount = _gameServersService.GetGameInstanceCount() }); + return new() { GameServer = gameServer, InstanceCount = _gameServersService.GetGameInstanceCount() }; } [HttpGet("killall"), Authorize] - public IActionResult KillAllArmaProcesses() + public void KillAllArmaProcesses() { int killed = _gameServersService.KillAllArmaProcesses(); _logger.LogAudit($"Killed {killed} Arma instances"); - return Ok(); } [HttpGet("{id}/mods"), Authorize] - public IActionResult GetAvailableMods(string id) + public List GetAvailableMods(string id) { - return Ok(_gameServersService.GetAvailableMods(id)); + return _gameServersService.GetAvailableMods(id); } [HttpPost("{id}/mods"), Authorize] - public async Task SetGameServerMods(string id, [FromBody] GameServer gameServer) + public async Task> SetGameServerMods(string id, [FromBody] GameServer gameServer) { GameServer oldGameServer = _gameServersContext.GetSingle(id); await _gameServersContext.Update(id, Builders.Update.Unset(x => x.Mods).Unset(x => x.ServerMods)); await _gameServersContext.Update(id, Builders.Update.Set(x => x.Mods, gameServer.Mods).Set(x => x.ServerMods, gameServer.ServerMods)); _logger.LogAudit($"Game server '{gameServer.Name}' updated:{oldGameServer.Changes(gameServer)}"); - return Ok(_gameServersService.GetAvailableMods(id)); + return _gameServersService.GetAvailableMods(id); } [HttpGet("{id}/mods/reset"), Authorize] - public IActionResult ResetGameServerMods(string id) + public GameServerModsDataset ResetGameServerMods(string id) { GameServer gameServer = _gameServersContext.GetSingle(id); - return Ok(new { availableMods = _gameServersService.GetAvailableMods(id), mods = _gameServersService.GetEnvironmentMods(gameServer.Environment), serverMods = new List() }); + return new() { AvailableMods = _gameServersService.GetAvailableMods(id), Mods = _gameServersService.GetEnvironmentMods(gameServer.Environment), ServerMods = new() }; } [HttpGet("disabled"), Authorize] - public IActionResult GetDisabledState() + public bool GetDisabledState() { - return Ok(new { state = _variablesService.GetVariable("SERVER_CONTROL_DISABLED").AsBool() }); + return _variablesService.GetVariable("SERVER_CONTROL_DISABLED").AsBool(); } [HttpPost("disabled"), Authorize] - public async Task SetDisabledState([FromBody] JObject body) + public async Task SetDisabledState([FromBody] JObject body) { bool state = bool.Parse(body["state"].ToString()); await _variablesContext.Update("SERVER_CONTROL_DISABLED", state); await _serversHub.Clients.All.ReceiveDisabledState(state); - return Ok(); } } } diff --git a/UKSF.Api.ArmaServer/Exceptions/MissionPatchingFailedException.cs b/UKSF.Api.ArmaServer/Exceptions/MissionPatchingFailedException.cs new file mode 100644 index 00000000..de15a999 --- /dev/null +++ b/UKSF.Api.ArmaServer/Exceptions/MissionPatchingFailedException.cs @@ -0,0 +1,12 @@ +using System; +using UKSF.Api.Shared.Exceptions; +using UKSF.Api.Shared.Models; + +namespace UKSF.Api.ArmaServer.Exceptions +{ + [Serializable] + public class MissionPatchingFailedException : UksfException + { + public MissionPatchingFailedException(string message, ValidationReportDataset validation) : base(message, 400, 1, validation) { } + } +} diff --git a/UKSF.Api.ArmaServer/Models/GameServerModsDataset.cs b/UKSF.Api.ArmaServer/Models/GameServerModsDataset.cs new file mode 100644 index 00000000..fc2c75b9 --- /dev/null +++ b/UKSF.Api.ArmaServer/Models/GameServerModsDataset.cs @@ -0,0 +1,11 @@ +using System.Collections.Generic; + +namespace UKSF.Api.ArmaServer.Models +{ + public class GameServerModsDataset + { + public List AvailableMods; + public List Mods; + public List ServerMods; + } +} diff --git a/UKSF.Api.ArmaServer/Models/GameServersDataset.cs b/UKSF.Api.ArmaServer/Models/GameServersDataset.cs new file mode 100644 index 00000000..bade34be --- /dev/null +++ b/UKSF.Api.ArmaServer/Models/GameServersDataset.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; + +namespace UKSF.Api.ArmaServer.Models +{ + public class GameServersDataset + { + public int InstanceCount; + public List Missions; + public IEnumerable Servers; + } + + public class GameServerDataset + { + public GameServer GameServer; + public int InstanceCount; + } +} diff --git a/UKSF.Api.ArmaServer/Models/MissionsDataset.cs b/UKSF.Api.ArmaServer/Models/MissionsDataset.cs new file mode 100644 index 00000000..fdb8ef34 --- /dev/null +++ b/UKSF.Api.ArmaServer/Models/MissionsDataset.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; +using UKSF.Api.Shared.Models; + +namespace UKSF.Api.ArmaServer.Models +{ + public class MissionsDataset + { + public List MissionReports; + public List Missions; + } + + public class MissionReportDataset + { + public string Mission; + public List Reports; + } +} diff --git a/UKSF.Api.Auth/ApiAuthExtensions.cs b/UKSF.Api.Auth/ApiAuthExtensions.cs index 4cfb1ee6..c6c73882 100644 --- a/UKSF.Api.Auth/ApiAuthExtensions.cs +++ b/UKSF.Api.Auth/ApiAuthExtensions.cs @@ -8,6 +8,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Primitives; using Microsoft.IdentityModel.Tokens; +using UKSF.Api.Auth.Commands; using UKSF.Api.Auth.Services; namespace UKSF.Api.Auth @@ -22,7 +23,7 @@ public static IServiceCollection AddUksfAuth(this IServiceCollection services, I { SecurityKey = new(Encoding.UTF8.GetBytes(configuration.GetSection("Secrets")["tokenKey"])); - return services.AddContexts().AddEventHandlers().AddServices().AddAuthentication(); + return services.AddContexts().AddEventHandlers().AddServices().AddCommands().AddQueries().AddAuthentication(); } private static IServiceCollection AddContexts(this IServiceCollection services) @@ -40,6 +41,16 @@ private static IServiceCollection AddServices(this IServiceCollection services) return services.AddSingleton().AddSingleton(); } + private static IServiceCollection AddCommands(this IServiceCollection services) + { + return services.AddSingleton().AddSingleton(); + } + + private static IServiceCollection AddQueries(this IServiceCollection services) + { + return services; + } + private static IServiceCollection AddAuthentication(this IServiceCollection services) { services.AddAuthentication( diff --git a/UKSF.Api.Auth/Commands/RequestPasswordResetCommand.cs b/UKSF.Api.Auth/Commands/RequestPasswordResetCommand.cs new file mode 100644 index 00000000..b6cefea4 --- /dev/null +++ b/UKSF.Api.Auth/Commands/RequestPasswordResetCommand.cs @@ -0,0 +1,71 @@ +using System; +using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; +using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Commands; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Queries; + +namespace UKSF.Api.Auth.Commands +{ + public interface IRequestPasswordResetCommand + { + Task ExecuteAsync(RequestPasswordResetCommandArgs args); + } + + public class RequestPasswordResetCommandArgs + { + public RequestPasswordResetCommandArgs(string email) + { + Email = email; + } + + public string Email { get; } + } + + public class RequestPasswordResetCommand : IRequestPasswordResetCommand + { + private readonly IAccountContext _accountContext; + private readonly IConfirmationCodeService _confirmationCodeService; + private readonly IHostEnvironment _currentEnvironment; + private readonly ILogger _logger; + private readonly ISendTemplatedEmailCommand _sendTemplatedEmailCommand; + + public RequestPasswordResetCommand( + IAccountContext accountContext, + IConfirmationCodeService confirmationCodeService, + ISendTemplatedEmailCommand sendTemplatedEmailCommand, + ILogger logger, + IHostEnvironment currentEnvironment + ) + { + _accountContext = accountContext; + _confirmationCodeService = confirmationCodeService; + _sendTemplatedEmailCommand = sendTemplatedEmailCommand; + _logger = logger; + _currentEnvironment = currentEnvironment; + } + + public async Task ExecuteAsync(RequestPasswordResetCommandArgs args) + { + DomainAccount domainAccount = _accountContext.GetSingle(x => string.Equals(x.Email, args.Email, StringComparison.InvariantCultureIgnoreCase)); + if (domainAccount == null) + { + return; + } + + string code = await _confirmationCodeService.CreateConfirmationCode(domainAccount.Id); + string url = BuildResetUrl(code); + await _sendTemplatedEmailCommand.ExecuteAsync(new(domainAccount.Email, "UKSF Password Reset", TemplatedEmailNames.ResetPasswordTemplate, new() { { "reset", url } })); + + _logger.LogAudit($"Password reset request made for {domainAccount.Id}", domainAccount.Id); + } + + private string BuildResetUrl(string code) + { + return _currentEnvironment.IsDevelopment() ? $"http://localhost:4200/login?reset={code}" : $"https://uk-sf.co.uk/login?reset={code}"; + } + } +} diff --git a/UKSF.Api.Auth/Commands/ResetPasswordCommand.cs b/UKSF.Api.Auth/Commands/ResetPasswordCommand.cs new file mode 100644 index 00000000..46afe545 --- /dev/null +++ b/UKSF.Api.Auth/Commands/ResetPasswordCommand.cs @@ -0,0 +1,62 @@ +using System; +using System.Threading.Tasks; +using UKSF.Api.Auth.Exceptions; +using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; + +namespace UKSF.Api.Auth.Commands +{ + public interface IResetPasswordCommand + { + Task ExecuteAsync(ResetPasswordCommandArgs args); + } + + public class ResetPasswordCommandArgs + { + public ResetPasswordCommandArgs(string email, string password, string code) + { + Email = email; + Password = password; + Code = code; + } + + public string Email { get; } + public string Password { get; } + public string Code { get; } + } + + public class ResetPasswordCommand : IResetPasswordCommand + { + private readonly IAccountContext _accountContext; + private readonly IConfirmationCodeService _confirmationCodeService; + private readonly ILogger _logger; + + public ResetPasswordCommand(IAccountContext accountContext, IConfirmationCodeService confirmationCodeService, ILogger logger) + { + _accountContext = accountContext; + _confirmationCodeService = confirmationCodeService; + _logger = logger; + } + + public async Task ExecuteAsync(ResetPasswordCommandArgs args) + { + DomainAccount domainAccount = _accountContext.GetSingle(x => string.Equals(x.Email, args.Email, StringComparison.InvariantCultureIgnoreCase)); + if (domainAccount == null) + { + throw new LoginFailedException("Password reset failed. No user found with that email"); + } + + string codeValue = await _confirmationCodeService.GetConfirmationCodeValue(args.Code); + if (codeValue != domainAccount.Id) + { + throw new LoginFailedException("Password reset failed. Invalid code"); + } + + await _accountContext.Update(domainAccount.Id, x => x.Password, BCrypt.Net.BCrypt.HashPassword(args.Password)); + + _logger.LogAudit($"Password changed for {domainAccount.Id}", domainAccount.Id); + } + } +} diff --git a/UKSF.Api.Auth/Controllers/AuthController.cs b/UKSF.Api.Auth/Controllers/AuthController.cs new file mode 100644 index 00000000..d4bb1dba --- /dev/null +++ b/UKSF.Api.Auth/Controllers/AuthController.cs @@ -0,0 +1,71 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Auth.Commands; +using UKSF.Api.Auth.Exceptions; +using UKSF.Api.Auth.Models.Parameters; +using UKSF.Api.Auth.Services; +using UKSF.Api.Shared.Exceptions; +using UKSF.Api.Shared.Services; + +namespace UKSF.Api.Auth.Controllers +{ + [Route("auth")] + public class AuthController : Controller + { + private readonly IHttpContextService _httpContextService; + private readonly ILoginService _loginService; + private readonly IRequestPasswordResetCommand _requestPasswordResetCommand; + private readonly IResetPasswordCommand _resetPasswordCommand; + + public AuthController(ILoginService loginService, IHttpContextService httpContextService, IRequestPasswordResetCommand requestPasswordResetCommand, IResetPasswordCommand resetPasswordCommand) + { + _loginService = loginService; + _httpContextService = httpContextService; + _requestPasswordResetCommand = requestPasswordResetCommand; + _resetPasswordCommand = resetPasswordCommand; + } + + [HttpGet] + public bool IsUserAuthenticated() + { + return _httpContextService.IsUserAuthenticated(); + } + + [HttpGet("refresh"), Authorize] + public string RefreshToken() + { + string loginToken = _loginService.RegenerateBearerToken(_httpContextService.GetUserId()); + if (loginToken == null) + { + throw new TokenRefreshFailedException(); + } + + return loginToken; + } + + [HttpPost("login")] + public string Login([FromBody] LoginCredentials credentials) + { + if (string.IsNullOrEmpty(credentials.Email) || string.IsNullOrEmpty(credentials.Password)) + { + throw new BadRequestException(); + } + + return _loginService.Login(credentials.Email, credentials.Password); + } + + [HttpPost("passwordReset")] + public async Task RequestPasswordReset([FromBody] RequestPasswordReset requestPasswordReset) + { + await _requestPasswordResetCommand.ExecuteAsync(new(requestPasswordReset.Email)); + } + + [HttpPost("passwordReset/{code}")] + public async Task ResetPassword([FromRoute] string code, [FromBody] LoginCredentials credentials) + { + await _resetPasswordCommand.ExecuteAsync(new(credentials.Email, credentials.Password, code)); + return _loginService.LoginForPasswordReset(credentials.Email); + } + } +} diff --git a/UKSF.Api.Auth/Controllers/ConfirmationCodeReceiver.cs b/UKSF.Api.Auth/Controllers/ConfirmationCodeReceiver.cs deleted file mode 100644 index c51cf8a0..00000000 --- a/UKSF.Api.Auth/Controllers/ConfirmationCodeReceiver.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Newtonsoft.Json.Linq; -using UKSF.Api.Auth.Services; -using UKSF.Api.Personnel.Context; -using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services; - -namespace UKSF.Api.Auth.Controllers { - public abstract class ConfirmationCodeReceiver : Controller { - protected readonly IAccountContext AccountContext; - protected readonly IConfirmationCodeService ConfirmationCodeService; - internal readonly ILoginService LoginService; - protected string LoginToken; - - protected ConfirmationCodeReceiver(IConfirmationCodeService confirmationCodeService, ILoginService loginService, IAccountContext accountContext) { - LoginService = loginService; - ConfirmationCodeService = confirmationCodeService; - AccountContext = accountContext; - } - - protected abstract Task ApplyValidatedPayload(string codePayload, Account account1); - - protected async Task AttemptLoginValidatedAction(JObject loginForm, string codeType) { - try { - string validateCode = loginForm["code"].ToString(); - if (codeType == "passwordreset") { - LoginToken = LoginService.LoginForPasswordReset(loginForm["email"].ToString()); - Account account = AccountContext.GetSingle(x => string.Equals(x.Email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); - if (await ConfirmationCodeService.GetConfirmationCode(validateCode) == account.Id && LoginToken != null) { - return await ApplyValidatedPayload(loginForm["password"].ToString(), account); - } - } else { - LoginToken = LoginService.Login(loginForm["email"].ToString(), loginForm["password"].ToString()); - Account account = AccountContext.GetSingle(x => string.Equals(x.Email, loginForm["email"].ToString(), StringComparison.InvariantCultureIgnoreCase)); - string codeValue = await ConfirmationCodeService.GetConfirmationCode(validateCode); - if (!string.IsNullOrWhiteSpace(codeValue)) { - return await ApplyValidatedPayload(codeValue, account); - } - } - - return BadRequest(new { message = "Code may have timed out or bad login" }); - } catch (LoginFailedException e) { - return BadRequest(new { message = e.Message }); - } - } - } -} diff --git a/UKSF.Api.Auth/Controllers/LoginController.cs b/UKSF.Api.Auth/Controllers/LoginController.cs deleted file mode 100644 index ea3f105d..00000000 --- a/UKSF.Api.Auth/Controllers/LoginController.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Newtonsoft.Json.Linq; -using UKSF.Api.Auth.Services; -using UKSF.Api.Shared.Extensions; -using UKSF.Api.Shared.Services; - -namespace UKSF.Api.Auth.Controllers -{ - [Route("[controller]")] - public class LoginController : Controller - { - private readonly IHttpContextService _httpContextService; - private readonly ILoginService _loginService; - - public LoginController(ILoginService loginService, IHttpContextService httpContextService) - { - _loginService = loginService; - _httpContextService = httpContextService; - } - - [HttpGet] - public bool IsUserAuthenticated() - { - return _httpContextService.IsUserAuthenticated(); - } - - [HttpGet("refresh"), Authorize] - public IActionResult RefreshToken() - { - string loginToken = _loginService.RegenerateBearerToken(_httpContextService.GetUserId()); - return loginToken != null ? Ok(loginToken) : BadRequest(); - } - - [HttpPost] - public IActionResult Login([FromBody] JObject body) - { - string email = body.GetValueFromBody("email"); - string password = body.GetValueFromBody("password"); - - try - { - GuardUtilites.ValidateString(email, _ => throw new ArgumentException("Email is invalid. Please try again")); - GuardUtilites.ValidateString(password, _ => throw new ArgumentException("Password is invalid. Please try again")); - } - catch (ArgumentException exception) - { - return BadRequest(new { error = exception.Message }); - } - - try - { - return Ok(_loginService.Login(email, password)); - } - catch (LoginFailedException e) - { - return BadRequest(new { message = e.Message }); - } - } - } -} diff --git a/UKSF.Api.Auth/Controllers/PasswordResetController.cs b/UKSF.Api.Auth/Controllers/PasswordResetController.cs deleted file mode 100644 index c36c1b90..00000000 --- a/UKSF.Api.Auth/Controllers/PasswordResetController.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using System.Net; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Newtonsoft.Json.Linq; -using UKSF.Api.Auth.Services; -using UKSF.Api.Personnel.Context; -using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services; -using UKSF.Api.Shared.Events; - -namespace UKSF.Api.Auth.Controllers -{ - [Route("[controller]")] - public class PasswordResetController : ConfirmationCodeReceiver - { - private readonly IEmailService _emailService; - private readonly ILogger _logger; - - public PasswordResetController(IConfirmationCodeService confirmationCodeService, ILoginService loginService, IEmailService emailService, IAccountContext accountContext, ILogger logger) : base( - confirmationCodeService, - loginService, - accountContext - ) - { - _emailService = emailService; - _logger = logger; - } - - protected override async Task ApplyValidatedPayload(string codePayload, Account account) - { - await AccountContext.Update(account.Id, x => x.Password, BCrypt.Net.BCrypt.HashPassword(codePayload)); - _logger.LogAudit($"Password changed for {account.Id}", account.Id); - return Ok(LoginService.RegenerateBearerToken(account.Id)); - } - - [HttpPost] - public async Task Post([FromBody] JObject loginForm) - { - return await AttemptLoginValidatedAction(loginForm, "passwordreset"); - } - - [HttpPut] - public async Task ResetPassword([FromBody] JObject body) - { - Account account = AccountContext.GetSingle(x => string.Equals(x.Email, body["email"]?.ToString(), StringComparison.InvariantCultureIgnoreCase)); - if (account == null) - { - return BadRequest(); - } - - string code = await ConfirmationCodeService.CreateConfirmationCode(account.Id); - string url = $"https://uk-sf.co.uk/login?validatecode={code}&validatetype={WebUtility.UrlEncode("password reset")}&validateurl={WebUtility.UrlEncode("passwordreset")}"; - string html = $"

UKSF Password Reset


Please reset your password by clicking here." + - "

If this request was not made by you seek assistance from UKSF staff.

"; - _emailService.SendEmail(account.Email, "UKSF Password Reset", html); - _logger.LogAudit($"Password reset request made for {account.Id}", account.Id); - return Ok(LoginToken); - } - } -} diff --git a/UKSF.Api.Auth/Exceptions/LoginFailedException.cs b/UKSF.Api.Auth/Exceptions/LoginFailedException.cs new file mode 100644 index 00000000..cbc91d8c --- /dev/null +++ b/UKSF.Api.Auth/Exceptions/LoginFailedException.cs @@ -0,0 +1,11 @@ +using System; +using UKSF.Api.Shared.Exceptions; + +namespace UKSF.Api.Auth.Exceptions +{ + [Serializable] + public class LoginFailedException : UksfException + { + public LoginFailedException(string message) : base(message, 401) { } + } +} diff --git a/UKSF.Api.Auth/Exceptions/TokenRefreshFailedException.cs b/UKSF.Api.Auth/Exceptions/TokenRefreshFailedException.cs new file mode 100644 index 00000000..df398385 --- /dev/null +++ b/UKSF.Api.Auth/Exceptions/TokenRefreshFailedException.cs @@ -0,0 +1,11 @@ +using System; +using UKSF.Api.Shared.Exceptions; + +namespace UKSF.Api.Auth.Exceptions +{ + [Serializable] + public class TokenRefreshFailedException : UksfException + { + public TokenRefreshFailedException() : base("Failed to refresh token", 401) { } + } +} diff --git a/UKSF.Api.Auth/Models/Parameters/LoginCredentials.cs b/UKSF.Api.Auth/Models/Parameters/LoginCredentials.cs new file mode 100644 index 00000000..34b6d6bd --- /dev/null +++ b/UKSF.Api.Auth/Models/Parameters/LoginCredentials.cs @@ -0,0 +1,8 @@ +namespace UKSF.Api.Auth.Models.Parameters +{ + public class LoginCredentials + { + public string Email; + public string Password; + } +} diff --git a/UKSF.Api.Auth/Models/Parameters/RequestPasswordReset.cs b/UKSF.Api.Auth/Models/Parameters/RequestPasswordReset.cs new file mode 100644 index 00000000..d1ab7df3 --- /dev/null +++ b/UKSF.Api.Auth/Models/Parameters/RequestPasswordReset.cs @@ -0,0 +1,7 @@ +namespace UKSF.Api.Auth.Models.Parameters +{ + public class RequestPasswordReset + { + public string Email; + } +} diff --git a/UKSF.Api.Auth/Services/LoginService.cs b/UKSF.Api.Auth/Services/LoginService.cs index 1f7dc0ce..543dcf82 100644 --- a/UKSF.Api.Auth/Services/LoginService.cs +++ b/UKSF.Api.Auth/Services/LoginService.cs @@ -5,6 +5,7 @@ using System.Security.Claims; using Microsoft.IdentityModel.Tokens; using Newtonsoft.Json; +using UKSF.Api.Auth.Exceptions; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; @@ -30,36 +31,52 @@ public LoginService(IAccountContext accountContext, IPermissionsService permissi public string Login(string email, string password) { - Account account = AuthenticateAccount(email, password); - return GenerateBearerToken(account); + DomainAccount domainAccount = AuthenticateAccount(email, password); + return GenerateBearerToken(domainAccount); } public string LoginForPasswordReset(string email) { - Account account = AuthenticateAccount(email, "", true); - return GenerateBearerToken(account); + DomainAccount domainAccount = AuthenticateAccount(email, "", true); + return GenerateBearerToken(domainAccount); } public string RegenerateBearerToken(string accountId) { - return GenerateBearerToken(_accountContext.GetSingle(accountId)); + DomainAccount domainAccount = _accountContext.GetSingle(accountId); + if (domainAccount == null) + { + throw new LoginFailedException("Login failed. No user found with that email"); + } + + return GenerateBearerToken(domainAccount); } - private Account AuthenticateAccount(string email, string password, bool passwordReset = false) + private DomainAccount AuthenticateAccount(string email, string password, bool passwordReset = false) { - Account account = _accountContext.GetSingle(x => string.Equals(x.Email, email, StringComparison.InvariantCultureIgnoreCase)); - if (account != null && (passwordReset || BCrypt.Net.BCrypt.Verify(password, account.Password))) + DomainAccount domainAccount = _accountContext.GetSingle(x => string.Equals(x.Email, email, StringComparison.InvariantCultureIgnoreCase)); + if (domainAccount == null) + { + throw new LoginFailedException("Login failed. No user found with that email"); + } + + if (passwordReset) { - return account; + return domainAccount; } - throw new LoginFailedException(); + if (!BCrypt.Net.BCrypt.Verify(password, domainAccount.Password)) + { + throw new LoginFailedException("Login failed. Incorrect password"); + } + + return domainAccount; } - private string GenerateBearerToken(Account account) + private string GenerateBearerToken(DomainAccount domainAccount) { - List claims = new() { new(ClaimTypes.Email, account.Email, ClaimValueTypes.String), new(ClaimTypes.Sid, account.Id, ClaimValueTypes.String) }; - claims.AddRange(_permissionsService.GrantPermissions(account).Select(x => new Claim(ClaimTypes.Role, x))); + List claims = new() { new(ClaimTypes.Email, domainAccount.Email, ClaimValueTypes.String), new(ClaimTypes.Sid, domainAccount.Id, ClaimValueTypes.String) }; + claims.AddRange(_permissionsService.GrantPermissions(domainAccount).Select(x => new Claim(ClaimTypes.Role, x))); return JsonConvert.ToString( new JwtSecurityTokenHandler().WriteToken( @@ -75,6 +92,4 @@ private string GenerateBearerToken(Account account) ); } } - - public class LoginFailedException : Exception { } } diff --git a/UKSF.Api.Auth/Services/PermissionsService.cs b/UKSF.Api.Auth/Services/PermissionsService.cs index 10fb5692..9ea89256 100644 --- a/UKSF.Api.Auth/Services/PermissionsService.cs +++ b/UKSF.Api.Auth/Services/PermissionsService.cs @@ -7,19 +7,23 @@ using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; -namespace UKSF.Api.Auth.Services { - public interface IPermissionsService { - IEnumerable GrantPermissions(Account account); +namespace UKSF.Api.Auth.Services +{ + public interface IPermissionsService + { + IEnumerable GrantPermissions(DomainAccount domainAccount); } - public class PermissionsService : IPermissionsService { + public class PermissionsService : IPermissionsService + { private readonly IRanksService _ranksService; private readonly IRecruitmentService _recruitmentService; private readonly IUnitsContext _unitsContext; private readonly IUnitsService _unitsService; private readonly IVariablesService _variablesService; - public PermissionsService(IRanksService ranksService, IUnitsContext unitsContext, IUnitsService unitsService, IRecruitmentService recruitmentService, IVariablesService variablesService) { + public PermissionsService(IRanksService ranksService, IUnitsContext unitsContext, IUnitsService unitsService, IRecruitmentService recruitmentService, IVariablesService variablesService) + { _ranksService = ranksService; _unitsContext = unitsContext; _unitsService = unitsService; @@ -27,47 +31,58 @@ public PermissionsService(IRanksService ranksService, IUnitsContext unitsContext _variablesService = variablesService; } - public IEnumerable GrantPermissions(Account account) { + public IEnumerable GrantPermissions(DomainAccount domainAccount) + { HashSet permissions = new(); - switch (account.MembershipState) { - case MembershipState.MEMBER: { + switch (domainAccount.MembershipState) + { + case MembershipState.MEMBER: + { permissions.Add(Permissions.MEMBER); - bool admin = account.Admin; - if (admin) { + bool admin = domainAccount.Admin; + if (admin) + { permissions.UnionWith(Permissions.ALL); break; } - if (_unitsService.MemberHasAnyRole(account.Id)) { + if (_unitsService.MemberHasAnyRole(domainAccount.Id)) + { permissions.Add(Permissions.COMMAND); } string ncoRank = _variablesService.GetVariable("PERMISSIONS_NCO_RANK").AsString(); - if (account.Rank != null && _ranksService.IsSuperiorOrEqual(account.Rank, ncoRank)) { + if (domainAccount.Rank != null && _ranksService.IsSuperiorOrEqual(domainAccount.Rank, ncoRank)) + { permissions.Add(Permissions.NCO); } - if (_recruitmentService.IsRecruiterLead(account)) { + if (_recruitmentService.IsRecruiterLead(domainAccount)) + { permissions.Add(Permissions.RECRUITER_LEAD); } - if (_recruitmentService.IsRecruiter(account)) { + if (_recruitmentService.IsRecruiter(domainAccount)) + { permissions.Add(Permissions.RECRUITER); } string personnelId = _variablesService.GetVariable("UNIT_ID_PERSONNEL").AsString(); - if (_unitsContext.GetSingle(personnelId).Members.Contains(account.Id)) { + if (_unitsContext.GetSingle(personnelId).Members.Contains(domainAccount.Id)) + { permissions.Add(Permissions.PERSONNEL); } string[] missionsId = _variablesService.GetVariable("UNIT_ID_MISSIONS").AsArray(); - if (_unitsContext.GetSingle(x => missionsId.Contains(x.Id)).Members.Contains(account.Id)) { + if (_unitsContext.GetSingle(x => missionsId.Contains(x.Id)).Members.Contains(domainAccount.Id)) + { permissions.Add(Permissions.SERVERS); } string testersId = _variablesService.GetVariable("UNIT_ID_TESTERS").AsString(); - if (_unitsContext.GetSingle(testersId).Members.Contains(account.Id)) { + if (_unitsContext.GetSingle(testersId).Members.Contains(domainAccount.Id)) + { permissions.Add(Permissions.TESTER); } diff --git a/UKSF.Api.Base/Context/MongoCollection.cs b/UKSF.Api.Base/Context/MongoCollection.cs index f5e9360c..302ed617 100644 --- a/UKSF.Api.Base/Context/MongoCollection.cs +++ b/UKSF.Api.Base/Context/MongoCollection.cs @@ -71,6 +71,7 @@ public PagedResult GetPaged(int page, int pageSize, SortDefinition sortDef public T GetSingle(string id) { + // TODO: Make all this async return GetCollection().FindSync(Builders.Filter.Eq(x => x.Id, id)).FirstOrDefault(); } diff --git a/UKSF.Api.Base/Context/MongoContextBase.cs b/UKSF.Api.Base/Context/MongoContextBase.cs index 73f5f68b..7a35cd75 100644 --- a/UKSF.Api.Base/Context/MongoContextBase.cs +++ b/UKSF.Api.Base/Context/MongoContextBase.cs @@ -4,7 +4,6 @@ using System.Linq.Expressions; using System.Text.RegularExpressions; using System.Threading.Tasks; -using MongoDB.Bson; using MongoDB.Driver; using UKSF.Api.Base.Models; using SortDirection = UKSF.Api.Base.Models.SortDirection; @@ -41,7 +40,6 @@ public virtual PagedResult GetPaged(int page, int pageSize, SortDirection sor public virtual T GetSingle(string id) { - ValidateId(id); return _mongoCollection.GetSingle(id); } @@ -62,14 +60,12 @@ public virtual async Task Add(T item) public virtual async Task Update(string id, Expression> fieldSelector, object value) { - ValidateId(id); UpdateDefinition update = value == null ? Builders.Update.Unset(fieldSelector) : Builders.Update.Set(fieldSelector, value); await _mongoCollection.UpdateAsync(id, update); } public virtual async Task Update(string id, UpdateDefinition update) { - ValidateId(id); await _mongoCollection.UpdateAsync(id, update); } @@ -90,7 +86,6 @@ public virtual async Task Replace(T item) public virtual async Task Delete(string id) { - ValidateId(id); await _mongoCollection.DeleteAsync(id); } @@ -103,18 +98,5 @@ public virtual async Task DeleteMany(Expression> filterExpression) { await _mongoCollection.DeleteManyAsync(filterExpression); } - - private static void ValidateId(string id) - { - if (string.IsNullOrEmpty(id)) - { - throw new KeyNotFoundException("Id cannot be empty"); - } - - if (!ObjectId.TryParse(id, out ObjectId _)) - { - throw new KeyNotFoundException("Id must be a valid ObjectId"); - } - } } } diff --git a/UKSF.Api.Command/Controllers/CommandRequestsController.cs b/UKSF.Api.Command/Controllers/CommandRequestsController.cs index 2730f2ce..5297112b 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsController.cs @@ -17,6 +17,7 @@ using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Exceptions; using UKSF.Api.Shared.Services; namespace UKSF.Api.Command.Controllers @@ -62,7 +63,7 @@ ILogger logger } [HttpGet, Authorize] - public IActionResult Get() + public CommandRequestsDataset Get() { IEnumerable allRequests = _commandRequestContext.Get(); List myRequests = new(); @@ -75,7 +76,7 @@ public IActionResult Get() foreach (CommandRequest commandRequest in allRequests) { Dictionary.KeyCollection reviewers = commandRequest.Reviews.Keys; - if (reviewers.Any(k => k == contextId)) + if (reviewers.Any(x => x == contextId)) { myRequests.Add(commandRequest); } @@ -85,62 +86,19 @@ public IActionResult Get() } } - return Ok(new { myRequests = GetMyRequests(myRequests, contextId, canOverride, superAdmin, now), otherRequests = GetOtherRequests(otherRequests, canOverride, superAdmin, now) }); - } - - private object GetMyRequests(IEnumerable myRequests, string contextId, bool canOverride, bool superAdmin, DateTime now) - { - return myRequests.Select( - x => - { - if (string.IsNullOrEmpty(x.Reason)) - { - x.Reason = "None given"; - } - - x.Type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.Type.ToLower()); - return new - { - data = x, - canOverride = - superAdmin || canOverride && x.Reviews.Count > 1 && x.DateCreated.AddDays(1) < now && x.Reviews.Any(y => y.Value == ReviewState.PENDING && y.Key != contextId), - reviews = x.Reviews.Select(y => new { id = y.Key, name = _displayNameService.GetDisplayName(y.Key), state = y.Value }) - }; - } - ); - } - - private object GetOtherRequests(IEnumerable otherRequests, bool canOverride, bool superAdmin, DateTime now) - { - return otherRequests.Select( - x => - { - if (string.IsNullOrEmpty(x.Reason)) - { - x.Reason = "None given"; - } - - x.Type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.Type.ToLower()); - return new - { - data = x, - canOverride = superAdmin || canOverride && x.DateCreated.AddDays(1) < now, - reviews = x.Reviews.Select(y => new { name = _displayNameService.GetDisplayName(y.Key), state = y.Value }) - }; - } - ); + return new() { MyRequests = GetMyRequests(myRequests, contextId, canOverride, superAdmin, now), OtherRequests = GetOtherRequests(otherRequests, canOverride, superAdmin, now) }; } [HttpPatch("{id}"), Authorize] - public async Task UpdateRequestReview(string id, [FromBody] JObject body) + public async Task UpdateRequestReview(string id, [FromBody] JObject body) { bool overriden = bool.Parse(body["overriden"].ToString()); ReviewState state = Enum.Parse(body["reviewState"].ToString()); - Account sessionAccount = _accountService.GetUserAccount(); + DomainAccount sessionDomainAccount = _accountService.GetUserAccount(); CommandRequest request = _commandRequestContext.GetSingle(id); if (request == null) { - throw new NullReferenceException($"Failed to get request with id {id}, does not exist"); + throw new NotFoundException($"Request with id {id} not found"); } if (overriden) @@ -148,42 +106,43 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje _logger.LogAudit($"Review state of {request.Type.ToLower()} request for {request.DisplayRecipient} overriden to {state}"); await _commandRequestService.SetRequestAllReviewStates(request, state); - foreach (string reviewerId in request.Reviews.Select(x => x.Key).Where(x => x != sessionAccount.Id)) + foreach (string reviewerId in request.Reviews.Select(x => x.Key).Where(x => x != sessionDomainAccount.Id)) { _notificationsService.Add( new() { Owner = reviewerId, Icon = NotificationIcons.REQUEST, - Message = $"Your review on {AvsAn.Query(request.Type).Article} {request.Type.ToLower()} request for {request.DisplayRecipient} was overriden by {sessionAccount.Id}" + Message = + $"Your review on {AvsAn.Query(request.Type).Article} {request.Type.ToLower()} request for {request.DisplayRecipient} was overriden by {sessionDomainAccount.Id}" } ); } } else { - ReviewState currentState = _commandRequestService.GetReviewState(request.Id, sessionAccount.Id); + ReviewState currentState = _commandRequestService.GetReviewState(request.Id, sessionDomainAccount.Id); if (currentState == ReviewState.ERROR) { - throw new ArgumentOutOfRangeException( - $"Getting review state for {sessionAccount} from {request.Id} failed. Reviews: \n{request.Reviews.Select(x => $"{x.Key}: {x.Value}").Aggregate((x, y) => $"{x}\n{y}")}" + throw new BadRequestException( + $"Getting review state for {sessionDomainAccount} from {request.Id} failed. Reviews: \n{request.Reviews.Select(x => $"{x.Key}: {x.Value}").Aggregate((x, y) => $"{x}\n{y}")}" ); } if (currentState == state) { - return Ok(); + return; } - _logger.LogAudit($"Review state of {_displayNameService.GetDisplayName(sessionAccount)} for {request.Type.ToLower()} request for {request.DisplayRecipient} updated to {state}"); - await _commandRequestService.SetRequestReviewState(request, sessionAccount.Id, state); + _logger.LogAudit($"Review state of {_displayNameService.GetDisplayName(sessionDomainAccount)} for {request.Type.ToLower()} request for {request.DisplayRecipient} updated to {state}"); + await _commandRequestService.SetRequestReviewState(request, sessionDomainAccount.Id, state); } try { await _commandRequestCompletionService.Resolve(request.Id); } - catch (Exception) + catch (Exception exception) { if (overriden) { @@ -191,19 +150,60 @@ public async Task UpdateRequestReview(string id, [FromBody] JObje } else { - await _commandRequestService.SetRequestReviewState(request, sessionAccount.Id, ReviewState.PENDING); + await _commandRequestService.SetRequestReviewState(request, sessionDomainAccount.Id, ReviewState.PENDING); } - throw; + throw new BadRequestException(exception.Message); } - - return Ok(); } [HttpPost("exists"), Authorize] - public IActionResult RequestExists([FromBody] CommandRequest request) + public bool RequestExists([FromBody] CommandRequest request) { - return Ok(_commandRequestService.DoesEquivalentRequestExist(request)); + return _commandRequestService.DoesEquivalentRequestExist(request); + } + + private IEnumerable GetMyRequests(IEnumerable myRequests, string contextId, bool canOverride, bool superAdmin, DateTime now) + { + return myRequests.Select( + x => + { + if (string.IsNullOrEmpty(x.Reason)) + { + x.Reason = "None given"; + } + + x.Type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.Type.ToLower()); + return new CommandRequestDataset + { + Data = x, + CanOverride = + superAdmin || canOverride && x.Reviews.Count > 1 && x.DateCreated.AddDays(1) < now && x.Reviews.Any(y => y.Value == ReviewState.PENDING && y.Key != contextId), + Reviews = x.Reviews.Select(y => new CommandRequestReviewDataset { Id = y.Key, Name = _displayNameService.GetDisplayName(y.Key), State = y.Value }) + }; + } + ); + } + + private IEnumerable GetOtherRequests(IEnumerable otherRequests, bool canOverride, bool superAdmin, DateTime now) + { + return otherRequests.Select( + x => + { + if (string.IsNullOrEmpty(x.Reason)) + { + x.Reason = "None given"; + } + + x.Type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(x.Type.ToLower()); + return new CommandRequestDataset + { + Data = x, + CanOverride = superAdmin || canOverride && x.DateCreated.AddDays(1) < now, + Reviews = x.Reviews.Select(y => new CommandRequestReviewDataset { Id = y.Key, Name = _displayNameService.GetDisplayName(y.Key), State = y.Value }) + }; + } + ); } } } diff --git a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs index 014be643..25bb6078 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs @@ -10,6 +10,7 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; +using UKSF.Api.Shared.Exceptions; using UKSF.Api.Shared.Services; namespace UKSF.Api.Command.Controllers @@ -48,14 +49,14 @@ IHttpContextService httpContextService } [HttpPut("rank"), Authorize, Permissions(Permissions.COMMAND)] - public async Task CreateRequestRank([FromBody] CommandRequest request) + public async Task CreateRequestRank([FromBody] CommandRequest request) { request.Requester = _httpContextService.GetUserId(); request.DisplayValue = request.Value; request.DisplayFrom = _accountContext.GetSingle(request.Recipient).Rank; if (request.DisplayValue == request.DisplayFrom) { - return BadRequest("Ranks are equal"); + throw new BadRequestException("Ranks are equal"); } bool direction = _ranksService.IsSuperior(request.DisplayValue, request.DisplayFrom); @@ -63,30 +64,29 @@ public async Task CreateRequestRank([FromBody] CommandRequest req direction ? CommandRequestType.PROMOTION : CommandRequestType.DEMOTION; if (_commandRequestService.DoesEquivalentRequestExist(request)) { - return BadRequest("An equivalent request already exists"); + throw new BadRequestException("An equivalent request already exists"); } await _commandRequestService.Add(request); - return Ok(); } [HttpPut("loa"), Authorize, Permissions(Permissions.MEMBER)] - public async Task CreateRequestLoa([FromBody] CommandRequestLoa request) + public async Task CreateRequestLoa([FromBody] CommandRequestLoa request) { DateTime now = DateTime.UtcNow; if (request.Start <= now.AddDays(-1)) { - return BadRequest("Start date cannot be in the past"); + throw new BadRequestException("Start date cannot be in the past"); } if (request.End <= now) { - return BadRequest("End date cannot be in the past"); + throw new BadRequestException("End date cannot be in the past"); } if (request.End <= request.Start) { - return BadRequest("End date cannot be before start date"); + throw new BadRequestException("End date cannot be before start date"); } request.Recipient = _httpContextService.GetUserId(); @@ -96,16 +96,15 @@ public async Task CreateRequestLoa([FromBody] CommandRequestLoa r request.Type = CommandRequestType.LOA; if (_commandRequestService.DoesEquivalentRequestExist(request)) { - return BadRequest("An equivalent request already exists"); + throw new BadRequestException("An equivalent request already exists"); } request.Value = await _loaService.Add(request); await _commandRequestService.Add(request, ChainOfCommandMode.NEXT_COMMANDER_EXCLUDE_SELF); - return Ok(); } [HttpPut("discharge"), Authorize, Permissions(Permissions.COMMAND)] - public async Task CreateRequestDischarge([FromBody] CommandRequest request) + public async Task CreateRequestDischarge([FromBody] CommandRequest request) { request.Requester = _httpContextService.GetUserId(); request.DisplayValue = "Discharged"; @@ -113,15 +112,14 @@ public async Task CreateRequestDischarge([FromBody] CommandReques request.Type = CommandRequestType.DISCHARGE; if (_commandRequestService.DoesEquivalentRequestExist(request)) { - return BadRequest("An equivalent request already exists"); + throw new BadRequestException("An equivalent request already exists"); } await _commandRequestService.Add(request, ChainOfCommandMode.COMMANDER_AND_PERSONNEL); - return Ok(); } [HttpPut("role"), Authorize, Permissions(Permissions.COMMAND)] - public async Task CreateRequestIndividualRole([FromBody] CommandRequest request) + public async Task CreateRequestIndividualRole([FromBody] CommandRequest request) { request.Requester = _httpContextService.GetUserId(); request.DisplayValue = request.Value; @@ -129,21 +127,20 @@ public async Task CreateRequestIndividualRole([FromBody] CommandR request.Type = CommandRequestType.INDIVIDUAL_ROLE; if (_commandRequestService.DoesEquivalentRequestExist(request)) { - return BadRequest("An equivalent request already exists"); + throw new BadRequestException("An equivalent request already exists"); } await _commandRequestService.Add(request, ChainOfCommandMode.NEXT_COMMANDER); - return Ok(); } [HttpPut("unitrole"), Authorize, Permissions(Permissions.COMMAND)] - public async Task CreateRequestUnitRole([FromBody] CommandRequest request) + public async Task CreateRequestUnitRole([FromBody] CommandRequest request) { Unit unit = _unitsContext.GetSingle(request.Value); bool recipientHasUnitRole = _unitsService.RolesHasMember(unit, request.Recipient); if (!recipientHasUnitRole && request.SecondaryValue == "None") { - return BadRequest( + throw new BadRequestException( $"{_displayNameService.GetDisplayName(request.Recipient)} has no unit role in {unit.Name}. If you are trying to remove them from the unit, use a Unit Removal request" ); } @@ -163,20 +160,19 @@ public async Task CreateRequestUnitRole([FromBody] CommandRequest request.Type = CommandRequestType.UNIT_ROLE; if (_commandRequestService.DoesEquivalentRequestExist(request)) { - return BadRequest("An equivalent request already exists"); + throw new BadRequestException("An equivalent request already exists"); } await _commandRequestService.Add(request); - return Ok(); } [HttpPut("unitremoval"), Authorize, Permissions(Permissions.COMMAND)] - public async Task CreateRequestUnitRemoval([FromBody] CommandRequest request) + public async Task CreateRequestUnitRemoval([FromBody] CommandRequest request) { Unit removeUnit = _unitsContext.GetSingle(request.Value); if (removeUnit.Branch == UnitBranch.COMBAT) { - return BadRequest("To remove from a combat unit, use a Transfer request"); + throw new BadRequestException("To remove from a combat unit, use a Transfer request"); } request.Requester = _httpContextService.GetUserId(); @@ -185,15 +181,14 @@ public async Task CreateRequestUnitRemoval([FromBody] CommandRequ request.Type = CommandRequestType.UNIT_REMOVAL; if (_commandRequestService.DoesEquivalentRequestExist(request)) { - return BadRequest("An equivalent request already exists"); + throw new BadRequestException("An equivalent request already exists"); } await _commandRequestService.Add(request, ChainOfCommandMode.TARGET_COMMANDER); - return Ok(); } [HttpPut("transfer"), Authorize, Permissions(Permissions.COMMAND)] - public async Task CreateRequestTransfer([FromBody] CommandRequest request) + public async Task CreateRequestTransfer([FromBody] CommandRequest request) { Unit toUnit = _unitsContext.GetSingle(request.Value); request.Requester = _httpContextService.GetUserId(); @@ -204,7 +199,7 @@ public async Task CreateRequestTransfer([FromBody] CommandRequest request.Type = CommandRequestType.AUXILIARY_TRANSFER; if (_commandRequestService.DoesEquivalentRequestExist(request)) { - return BadRequest("An equivalent request already exists"); + throw new BadRequestException("An equivalent request already exists"); } await _commandRequestService.Add(request, ChainOfCommandMode.TARGET_COMMANDER); @@ -215,17 +210,15 @@ public async Task CreateRequestTransfer([FromBody] CommandRequest request.Type = CommandRequestType.TRANSFER; if (_commandRequestService.DoesEquivalentRequestExist(request)) { - return BadRequest("An equivalent request already exists"); + throw new BadRequestException("An equivalent request already exists"); } await _commandRequestService.Add(request, ChainOfCommandMode.COMMANDER_AND_TARGET_COMMANDER); } - - return Ok(); } [HttpPut("reinstate"), Authorize, Permissions(Permissions.COMMAND, Permissions.RECRUITER, Permissions.NCO)] - public async Task CreateRequestReinstateMember([FromBody] CommandRequest request) + public async Task CreateRequestReinstateMember([FromBody] CommandRequest request) { request.Requester = _httpContextService.GetUserId(); request.DisplayValue = "Member"; @@ -233,11 +226,10 @@ public async Task CreateRequestReinstateMember([FromBody] Command request.Type = CommandRequestType.REINSTATE_MEMBER; if (_commandRequestService.DoesEquivalentRequestExist(request)) { - return BadRequest("An equivalent request already exists"); + throw new BadRequestException("An equivalent request already exists"); } await _commandRequestService.Add(request, ChainOfCommandMode.PERSONNEL); - return Ok(); } } } diff --git a/UKSF.Api.Command/Controllers/DischargesController.cs b/UKSF.Api.Command/Controllers/DischargesController.cs index ec4b4cc1..4c0b58b6 100644 --- a/UKSF.Api.Command/Controllers/DischargesController.cs +++ b/UKSF.Api.Command/Controllers/DischargesController.cs @@ -15,9 +15,11 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Command.Controllers { +namespace UKSF.Api.Command.Controllers +{ [Route("[controller]"), Permissions(Permissions.PERSONNEL, Permissions.NCO, Permissions.RECRUITER)] - public class DischargesController : Controller { + public class DischargesController : Controller + { private readonly IAccountContext _accountContext; private readonly IAssignmentService _assignmentService; private readonly ICommandRequestService _commandRequestService; @@ -38,7 +40,8 @@ public DischargesController( IHttpContextService httpContextService, IVariablesContext variablesContext, ILogger logger - ) { + ) + { _dischargeContext = dischargeContext; _accountContext = accountContext; _unitsContext = unitsContext; @@ -51,19 +54,22 @@ ILogger logger } [HttpGet] - public IActionResult Get() { - IEnumerable discharges = _dischargeContext.Get(); - foreach (DischargeCollection discharge in discharges) { + public IEnumerable Get() + { + IEnumerable discharges = _dischargeContext.Get().ToList(); + foreach (DischargeCollection discharge in discharges) + { discharge.RequestExists = _commandRequestService.DoesEquivalentRequestExist( - new CommandRequest { Recipient = discharge.AccountId, Type = CommandRequestType.REINSTATE_MEMBER, DisplayValue = "Member", DisplayFrom = "Discharged" } + new() { Recipient = discharge.AccountId, Type = CommandRequestType.REINSTATE_MEMBER, DisplayValue = "Member", DisplayFrom = "Discharged" } ); } - return Ok(discharges); + return discharges; } [HttpGet("reinstate/{id}")] - public async Task Reinstate(string id) { + public async Task> Reinstate(string id) + { DischargeCollection dischargeCollection = _dischargeContext.GetSingle(id); await _dischargeContext.Update(dischargeCollection.Id, Builders.Update.Set(x => x.Reinstated, true)); await _accountContext.Update(dischargeCollection.AccountId, x => x.MembershipState, MembershipState.MEMBER); @@ -80,13 +86,14 @@ public async Task Reinstate(string id) { _logger.LogAudit($"{_httpContextService.GetUserId()} reinstated {dischargeCollection.Name}'s membership", _httpContextService.GetUserId()); string personnelId = _variablesContext.GetSingle("UNIT_ID_PERSONNEL").AsString(); - foreach (string member in _unitsContext.GetSingle(personnelId).Members.Where(x => x != _httpContextService.GetUserId())) { + foreach (string member in _unitsContext.GetSingle(personnelId).Members.Where(x => x != _httpContextService.GetUserId())) + { _notificationsService.Add( - new Notification { Owner = member, Icon = NotificationIcons.PROMOTION, Message = $"{dischargeCollection.Name}'s membership was reinstated by {_httpContextService.GetUserId()}" } + new() { Owner = member, Icon = NotificationIcons.PROMOTION, Message = $"{dischargeCollection.Name}'s membership was reinstated by {_httpContextService.GetUserId()}" } ); } - return Ok(_dischargeContext.Get()); + return _dischargeContext.Get(); } } } diff --git a/UKSF.Api.Command/Controllers/OperationOrderController.cs b/UKSF.Api.Command/Controllers/OperationOrderController.cs index d20c1da3..c8497ddb 100644 --- a/UKSF.Api.Command/Controllers/OperationOrderController.cs +++ b/UKSF.Api.Command/Controllers/OperationOrderController.cs @@ -1,4 +1,5 @@ -using System.Threading.Tasks; +using System.Collections.Generic; +using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using UKSF.Api.Command.Context; @@ -21,29 +22,27 @@ public OperationOrderController(IOperationOrderService operationOrderService, IO } [HttpGet, Authorize] - public IActionResult Get() + public IEnumerable Get() { - return Ok(_operationOrderContext.Get()); + return _operationOrderContext.Get(); } [HttpGet("{id}"), Authorize] - public IActionResult Get(string id) + public Opord Get(string id) { - return Ok(new { result = _operationOrderContext.GetSingle(id) }); + return _operationOrderContext.GetSingle(id); } [HttpPost, Authorize] - public async Task Post([FromBody] CreateOperationOrderRequest request) + public async Task Post([FromBody] CreateOperationOrderRequest request) { await _operationOrderService.Add(request); - return Ok(); } [HttpPut, Authorize] - public async Task Put([FromBody] Opord request) + public async Task Put([FromBody] Opord request) { await _operationOrderContext.Replace(request); - return Ok(); } } } diff --git a/UKSF.Api.Command/Controllers/OperationReportController.cs b/UKSF.Api.Command/Controllers/OperationReportController.cs index 000a03db..e15d78b4 100644 --- a/UKSF.Api.Command/Controllers/OperationReportController.cs +++ b/UKSF.Api.Command/Controllers/OperationReportController.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -21,31 +22,29 @@ public OperationReportController(IOperationReportService operationReportService, _operationReportContext = operationReportContext; } + [HttpGet, Authorize] + public IEnumerable Get() + { + return _operationReportContext.Get(); + } + [HttpGet("{id}"), Authorize] - public IActionResult Get(string id) + public OprepDataset Get(string id) { Oprep oprep = _operationReportContext.GetSingle(id); - return Ok(new { operationEntity = oprep, groupedAttendance = oprep.AttendanceReport.Users.GroupBy(x => x.GroupName) }); + return new() { OperationEntity = oprep, GroupedAttendance = oprep.AttendanceReport.Users.GroupBy(x => x.GroupName) }; } [HttpPost, Authorize] - public async Task Post([FromBody] CreateOperationReportRequest request) + public async Task Post([FromBody] CreateOperationReportRequest request) { await _operationReportService.Create(request); - return Ok(); } [HttpPut, Authorize] - public async Task Put([FromBody] Oprep request) + public async Task Put([FromBody] Oprep request) { await _operationReportContext.Replace(request); - return Ok(); - } - - [HttpGet, Authorize] - public IActionResult Get() - { - return Ok(_operationReportContext.Get()); } } } diff --git a/UKSF.Api.Command/Models/CommandRequestsDataset.cs b/UKSF.Api.Command/Models/CommandRequestsDataset.cs new file mode 100644 index 00000000..b75aabeb --- /dev/null +++ b/UKSF.Api.Command/Models/CommandRequestsDataset.cs @@ -0,0 +1,24 @@ +using System.Collections.Generic; + +namespace UKSF.Api.Command.Models +{ + public class CommandRequestsDataset + { + public IEnumerable MyRequests; + public IEnumerable OtherRequests; + } + + public class CommandRequestDataset + { + public bool CanOverride; + public CommandRequest Data; + public IEnumerable Reviews; + } + + public class CommandRequestReviewDataset + { + public string Id; + public string Name; + public ReviewState State; + } +} diff --git a/UKSF.Api.Command/Models/OprepDataset.cs b/UKSF.Api.Command/Models/OprepDataset.cs new file mode 100644 index 00000000..bcdec077 --- /dev/null +++ b/UKSF.Api.Command/Models/OprepDataset.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; +using System.Linq; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Command.Models +{ + public class OprepDataset + { + public IEnumerable> GroupedAttendance; + public Oprep OperationEntity; + } +} diff --git a/UKSF.Api.Command/Services/ChainOfCommandService.cs b/UKSF.Api.Command/Services/ChainOfCommandService.cs index e2315797..9ad67451 100644 --- a/UKSF.Api.Command/Services/ChainOfCommandService.cs +++ b/UKSF.Api.Command/Services/ChainOfCommandService.cs @@ -75,14 +75,15 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U public bool InContextChainOfCommand(string id) { - Account contextAccount = _accountService.GetUserAccount(); - if (id == contextAccount.Id) + DomainAccount contextDomainAccount = _accountService.GetUserAccount(); + if (id == contextDomainAccount.Id) { return true; } - Unit unit = _unitsContext.GetSingle(x => x.Name == contextAccount.UnitAssignment); - return _unitsService.RolesHasMember(unit, contextAccount.Id) && (unit.Members.Contains(id) || _unitsService.GetAllChildren(unit, true).Any(unitChild => unitChild.Members.Contains(id))); + Unit unit = _unitsContext.GetSingle(x => x.Name == contextDomainAccount.UnitAssignment); + return _unitsService.RolesHasMember(unit, contextDomainAccount.Id) && + (unit.Members.Contains(id) || _unitsService.GetAllChildren(unit, true).Any(unitChild => unitChild.Members.Contains(id))); } private IEnumerable ResolveMode(ChainOfCommandMode mode, Unit start, Unit target) diff --git a/UKSF.Api.Command/Services/CommandRequestCompletionService.cs b/UKSF.Api.Command/Services/CommandRequestCompletionService.cs index 561eef0b..3c92d448 100644 --- a/UKSF.Api.Command/Services/CommandRequestCompletionService.cs +++ b/UKSF.Api.Command/Services/CommandRequestCompletionService.cs @@ -1,5 +1,4 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using AvsAnLib; using Microsoft.AspNetCore.SignalR; using MongoDB.Driver; @@ -11,14 +10,18 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Exceptions; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Command.Services { - public interface ICommandRequestCompletionService { +namespace UKSF.Api.Command.Services +{ + public interface ICommandRequestCompletionService + { Task Resolve(string id); } - public class CommandRequestCompletionService : ICommandRequestCompletionService { + public class CommandRequestCompletionService : ICommandRequestCompletionService + { private readonly IAccountContext _accountContext; private readonly IAssignmentService _assignmentService; private readonly ICommandRequestContext _commandRequestContext; @@ -46,7 +49,8 @@ public CommandRequestCompletionService( IHubContext commandRequestsHub, INotificationsService notificationsService, ILogger logger - ) { + ) + { _dischargeContext = dischargeContext; _commandRequestContext = commandRequestContext; _accountContext = accountContext; @@ -61,10 +65,13 @@ ILogger logger _logger = logger; } - public async Task Resolve(string id) { - if (_commandRequestService.IsRequestApproved(id) || _commandRequestService.IsRequestRejected(id)) { + public async Task Resolve(string id) + { + if (_commandRequestService.IsRequestApproved(id) || _commandRequestService.IsRequestRejected(id)) + { CommandRequest request = _commandRequestContext.GetSingle(id); - switch (request.Type) { + switch (request.Type) + { case CommandRequestType.PROMOTION: case CommandRequestType.DEMOTION: await Rank(request); @@ -91,61 +98,77 @@ public async Task Resolve(string id) { case CommandRequestType.REINSTATE_MEMBER: await Reinstate(request); break; - default: throw new InvalidOperationException($"Request type not recognized: '{request.Type}'"); + default: throw new BadRequestException($"Request type not recognized: '{request.Type}'"); } } await _commandRequestsHub.Clients.All.ReceiveRequestUpdate(); } - private async Task Rank(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.Id)) { + private async Task Rank(CommandRequest request) + { + if (_commandRequestService.IsRequestApproved(request.Id)) + { string role = HandleRecruitToPrivate(request.Recipient, request.Value); Notification notification = await _assignmentService.UpdateUnitRankAndRole(request.Recipient, rankString: request.Value, role: role, reason: request.Reason); _notificationsService.Add(notification); await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.Id)) { + } + else if (_commandRequestService.IsRequestRejected(request.Id)) + { await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } - private async Task Loa(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.Id)) { + private async Task Loa(CommandRequest request) + { + if (_commandRequestService.IsRequestApproved(request.Id)) + { await _loaService.SetLoaState(request.Value, LoaReviewState.APPROVED); await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.Id)) { + } + else if (_commandRequestService.IsRequestRejected(request.Id)) + { await _loaService.SetLoaState(request.Value, LoaReviewState.REJECTED); await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } - private async Task Discharge(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.Id)) { - Account account = _accountContext.GetSingle(request.Recipient); - Discharge discharge = new() { Rank = account.Rank, Unit = account.UnitAssignment, Role = account.RoleAssignment, DischargedBy = request.DisplayRequester, Reason = request.Reason }; - DischargeCollection dischargeCollection = _dischargeContext.GetSingle(x => x.AccountId == account.Id); - if (dischargeCollection == null) { - dischargeCollection = new DischargeCollection { AccountId = account.Id, Name = $"{account.Lastname}.{account.Firstname[0]}" }; + private async Task Discharge(CommandRequest request) + { + if (_commandRequestService.IsRequestApproved(request.Id)) + { + DomainAccount domainAccount = _accountContext.GetSingle(request.Recipient); + Discharge discharge = new() + { + Rank = domainAccount.Rank, Unit = domainAccount.UnitAssignment, Role = domainAccount.RoleAssignment, DischargedBy = request.DisplayRequester, Reason = request.Reason + }; + DischargeCollection dischargeCollection = _dischargeContext.GetSingle(x => x.AccountId == domainAccount.Id); + if (dischargeCollection == null) + { + dischargeCollection = new() { AccountId = domainAccount.Id, Name = $"{domainAccount.Lastname}.{domainAccount.Firstname[0]}" }; dischargeCollection.Discharges.Add(discharge); await _dischargeContext.Add(dischargeCollection); - } else { + } + else + { dischargeCollection.Discharges.Add(discharge); await _dischargeContext.Update( dischargeCollection.Id, Builders.Update.Set(x => x.Reinstated, false) - .Set(x => x.Name, $"{account.Lastname}.{account.Firstname[0]}") + .Set(x => x.Name, $"{domainAccount.Lastname}.{domainAccount.Firstname[0]}") .Set(x => x.Discharges, dischargeCollection.Discharges) ); } - await _accountContext.Update(account.Id, x => x.MembershipState, MembershipState.DISCHARGED); + await _accountContext.Update(domainAccount.Id, x => x.MembershipState, MembershipState.DISCHARGED); Notification notification = await _assignmentService.UpdateUnitRankAndRole( - account.Id, + domainAccount.Id, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, AssignmentService.REMOVE_FLAG, @@ -154,17 +177,21 @@ await _dischargeContext.Update( AssignmentService.REMOVE_FLAG ); _notificationsService.Add(notification); - await _assignmentService.UnassignAllUnits(account.Id); + await _assignmentService.UnassignAllUnits(domainAccount.Id); await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.Id)) { + } + else if (_commandRequestService.IsRequestRejected(request.Id)) + { await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } - private async Task IndividualRole(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.Id)) { + private async Task IndividualRole(CommandRequest request) + { + if (_commandRequestService.IsRequestApproved(request.Id)) + { Notification notification = await _assignmentService.UpdateUnitRankAndRole( request.Recipient, role: request.Value == "None" ? AssignmentService.REMOVE_FLAG : request.Value, @@ -173,32 +200,44 @@ private async Task IndividualRole(CommandRequest request) { _notificationsService.Add(notification); await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.Id)) { + } + else if (_commandRequestService.IsRequestRejected(request.Id)) + { await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } - private async Task UnitRole(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.Id)) { - if (request.SecondaryValue == "None") { - if (string.IsNullOrEmpty(request.Value)) { + private async Task UnitRole(CommandRequest request) + { + if (_commandRequestService.IsRequestApproved(request.Id)) + { + if (request.SecondaryValue == "None") + { + if (string.IsNullOrEmpty(request.Value)) + { await _assignmentService.UnassignAllUnitRoles(request.Recipient); - _notificationsService.Add(new Notification { Owner = request.Recipient, Message = "You have been unassigned from all roles in all units", Icon = NotificationIcons.DEMOTION }); - } else { + _notificationsService.Add(new() { Owner = request.Recipient, Message = "You have been unassigned from all roles in all units", Icon = NotificationIcons.DEMOTION }); + } + else + { string role = await _assignmentService.UnassignUnitRole(request.Recipient, request.Value); _notificationsService.Add( - new Notification { + new() + { Owner = request.Recipient, Message = $"You have been unassigned as {AvsAn.Query(role).Article} {role} in {_unitsService.GetChainString(_unitsContext.GetSingle(request.Value))}", Icon = NotificationIcons.DEMOTION } ); } - } else { + } + else + { await _assignmentService.AssignUnitRole(request.Recipient, request.Value, request.SecondaryValue); _notificationsService.Add( - new Notification { + new() + { Owner = request.Recipient, Message = $"You have been assigned as {AvsAn.Query(request.SecondaryValue).Article} {request.SecondaryValue} in {_unitsService.GetChainString(_unitsContext.GetSingle(request.Value))}", @@ -209,42 +248,52 @@ private async Task UnitRole(CommandRequest request) { await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} as {request.DisplayValue} in {request.Value} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.Id)) { + } + else if (_commandRequestService.IsRequestRejected(request.Id)) + { await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} as {request.DisplayValue} in {request.Value}"); } } - private async Task UnitRemoval(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.Id)) { + private async Task UnitRemoval(CommandRequest request) + { + if (_commandRequestService.IsRequestApproved(request.Id)) + { Unit unit = _unitsContext.GetSingle(request.Value); await _assignmentService.UnassignUnit(request.Recipient, unit.Id); - _notificationsService.Add( - new Notification { Owner = request.Recipient, Message = $"You have been removed from {_unitsService.GetChainString(unit)}", Icon = NotificationIcons.DEMOTION } - ); + _notificationsService.Add(new() { Owner = request.Recipient, Message = $"You have been removed from {_unitsService.GetChainString(unit)}", Icon = NotificationIcons.DEMOTION }); await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.Id)) { + } + else if (_commandRequestService.IsRequestRejected(request.Id)) + { await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom}"); } } - private async Task Transfer(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.Id)) { + private async Task Transfer(CommandRequest request) + { + if (_commandRequestService.IsRequestApproved(request.Id)) + { Unit unit = _unitsContext.GetSingle(request.Value); Notification notification = await _assignmentService.UpdateUnitRankAndRole(request.Recipient, unit.Name, reason: request.Reason); _notificationsService.Add(notification); await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.Id)) { + } + else if (_commandRequestService.IsRequestRejected(request.Id)) + { await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } - private async Task Reinstate(CommandRequest request) { - if (_commandRequestService.IsRequestApproved(request.Id)) { + private async Task Reinstate(CommandRequest request) + { + if (_commandRequestService.IsRequestApproved(request.Id)) + { DischargeCollection dischargeCollection = _dischargeContext.GetSingle(x => x.AccountId == request.Recipient); await _dischargeContext.Update(dischargeCollection.Id, x => x.Reinstated, true); await _accountContext.Update(dischargeCollection.AccountId, x => x.MembershipState, MembershipState.MEMBER); @@ -262,15 +311,18 @@ private async Task Reinstate(CommandRequest request) { _logger.LogAudit($"{_httpContextService.GetUserId()} reinstated {dischargeCollection.Name}'s membership"); await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); - } else if (_commandRequestService.IsRequestRejected(request.Id)) { + } + else if (_commandRequestService.IsRequestRejected(request.Id)) + { await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request rejected for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue}"); } } - private string HandleRecruitToPrivate(string id, string targetRank) { - Account account = _accountContext.GetSingle(id); - return account.Rank == "Recruit" && targetRank == "Private" ? "Rifleman" : account.RoleAssignment; + private string HandleRecruitToPrivate(string id, string targetRank) + { + DomainAccount domainAccount = _accountContext.GetSingle(id); + return domainAccount.Rank == "Recruit" && targetRank == "Private" ? "Rifleman" : domainAccount.RoleAssignment; } } } diff --git a/UKSF.Api.Command/Services/CommandRequestService.cs b/UKSF.Api.Command/Services/CommandRequestService.cs index 096f4761..f56ebd1f 100644 --- a/UKSF.Api.Command/Services/CommandRequestService.cs +++ b/UKSF.Api.Command/Services/CommandRequestService.cs @@ -64,14 +64,14 @@ ILogger logger public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfCommandMode.COMMANDER_AND_ONE_ABOVE) { - Account requesterAccount = _accountService.GetUserAccount(); - Account recipientAccount = _accountContext.GetSingle(request.Recipient); - request.DisplayRequester = _displayNameService.GetDisplayName(requesterAccount); - request.DisplayRecipient = _displayNameService.GetDisplayName(recipientAccount); + DomainAccount requesterDomainAccount = _accountService.GetUserAccount(); + DomainAccount recipientDomainAccount = _accountContext.GetSingle(request.Recipient); + request.DisplayRequester = _displayNameService.GetDisplayName(requesterDomainAccount); + request.DisplayRecipient = _displayNameService.GetDisplayName(recipientDomainAccount); HashSet ids = _chainOfCommandService.ResolveChain( mode, - recipientAccount.Id, - _unitsContext.GetSingle(x => x.Name == recipientAccount.UnitAssignment), + recipientDomainAccount.Id, + _unitsContext.GetSingle(x => x.Name == recipientDomainAccount.UnitAssignment), _unitsContext.GetSingle(request.Value) ); if (ids.Count == 0) @@ -79,8 +79,12 @@ public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfC throw new($"Failed to get any commanders for review for {request.Type.ToLower()} request for {request.DisplayRecipient}.\nContact an admin"); } - List accounts = ids.Select(x => _accountContext.GetSingle(x)).OrderBy(x => x.Rank, new RankComparer(_ranksService)).ThenBy(x => x.Lastname).ThenBy(x => x.Firstname).ToList(); - foreach (Account account in accounts) + List accounts = ids.Select(x => _accountContext.GetSingle(x)) + .OrderBy(x => x.Rank, new RankComparer(_ranksService)) + .ThenBy(x => x.Lastname) + .ThenBy(x => x.Firstname) + .ToList(); + foreach (DomainAccount account in accounts) { request.Reviews.Add(account.Id, ReviewState.PENDING); } @@ -90,7 +94,7 @@ public async Task Add(CommandRequest request, ChainOfCommandMode mode = ChainOfC bool selfRequest = request.DisplayRequester == request.DisplayRecipient; string notificationMessage = $"{request.DisplayRequester} requires your review on {(selfRequest ? "their" : AvsAn.Query(request.Type).Article)} {request.Type.ToLower()} request{(selfRequest ? "" : $" for {request.DisplayRecipient}")}"; - foreach (Account account in accounts.Where(x => x.Id != requesterAccount.Id)) + foreach (DomainAccount account in accounts.Where(x => x.Id != requesterDomainAccount.Id)) { _notificationsService.Add(new() { Owner = account.Id, Icon = NotificationIcons.REQUEST, Message = notificationMessage, Link = "/command/requests" }); } diff --git a/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs b/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs index 72ecf283..cd1ebd08 100644 --- a/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs +++ b/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs @@ -21,17 +21,16 @@ public DiscordController(IDiscordService discordService) } [HttpGet("roles"), Authorize, Permissions(Permissions.ADMIN)] - public async Task GetRoles() + public async Task GetRoles() { IReadOnlyCollection roles = await _discordService.GetRoles(); - return Ok(roles.OrderBy(x => x.Name).Select(x => $"{x.Name}: {x.Id}").Aggregate((x, y) => $"{x}\n{y}")); + return roles.OrderBy(x => x.Name).Select(x => $"{x.Name}: {x.Id}").Aggregate((x, y) => $"{x}\n{y}"); } [HttpGet("updateuserroles"), Authorize, Permissions(Permissions.ADMIN)] - public async Task UpdateUserRoles() + public async Task UpdateUserRoles() { await _discordService.UpdateAllUsers(); - return Ok(); } [HttpGet("{accountId}/onlineUserDetails"), Authorize, Permissions(Permissions.RECRUITER)] diff --git a/UKSF.Api.Integrations.Discord/EventHandlers/DiscordAccountEventHandler.cs b/UKSF.Api.Integrations.Discord/EventHandlers/DiscordAccountEventHandler.cs index 841789ab..04e4e16b 100644 --- a/UKSF.Api.Integrations.Discord/EventHandlers/DiscordAccountEventHandler.cs +++ b/UKSF.Api.Integrations.Discord/EventHandlers/DiscordAccountEventHandler.cs @@ -6,26 +6,31 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.Discord.EventHandlers { +namespace UKSF.Api.Discord.EventHandlers +{ public interface IDiscordAccountEventHandler : IEventHandler { } - public class DiscordAccountEventHandler : IDiscordAccountEventHandler { + public class DiscordAccountEventHandler : IDiscordAccountEventHandler + { private readonly IDiscordService _discordService; private readonly IEventBus _eventBus; private readonly ILogger _logger; - public DiscordAccountEventHandler(IEventBus eventBus, ILogger logger, IDiscordService discordService) { + public DiscordAccountEventHandler(IEventBus eventBus, ILogger logger, IDiscordService discordService) + { _eventBus = eventBus; _logger = logger; _discordService = discordService; } - public void Init() { - _eventBus.AsObservable().SubscribeWithAsyncNext(HandleAccountEvent, _logger.LogError); + public void Init() + { + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleAccountEvent, _logger.LogError); } - private async Task HandleAccountEvent(EventModel _, Account account) { - await _discordService.UpdateAccount(account); + private async Task HandleAccountEvent(EventModel _, DomainAccount domainAccount) + { + await _discordService.UpdateAccount(domainAccount); } } } diff --git a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs index ca1c61b7..265eecdf 100644 --- a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs +++ b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs @@ -26,7 +26,7 @@ public interface IDiscordService Task SendMessage(ulong channelId, string message); Task> GetRoles(); Task UpdateAllUsers(); - Task UpdateAccount(Account account, ulong discordId = 0); + Task UpdateAccount(DomainAccount domainAccount, ulong discordId = 0); } public class DiscordService : IDiscordService, IDisposable @@ -136,7 +136,7 @@ await Task.Run( ); } - public async Task UpdateAccount(Account account, ulong discordId = 0) + public async Task UpdateAccount(DomainAccount domainAccount, ulong discordId = 0) { if (IsDiscordDisabled()) { @@ -144,14 +144,14 @@ public async Task UpdateAccount(Account account, ulong discordId = 0) } await AssertOnline(); - if (discordId == 0 && account != null && !string.IsNullOrEmpty(account.DiscordId)) + if (discordId == 0 && domainAccount != null && !string.IsNullOrEmpty(domainAccount.DiscordId)) { - discordId = ulong.Parse(account.DiscordId); + discordId = ulong.Parse(domainAccount.DiscordId); } - if (discordId != 0 && account == null) + if (discordId != 0 && domainAccount == null) { - account = _accountContext.GetSingle(x => !string.IsNullOrEmpty(x.DiscordId) && x.DiscordId == discordId.ToString()); + domainAccount = _accountContext.GetSingle(x => !string.IsNullOrEmpty(x.DiscordId) && x.DiscordId == discordId.ToString()); } if (discordId == 0) @@ -170,15 +170,15 @@ public async Task UpdateAccount(Account account, ulong discordId = 0) return; } - await UpdateAccountRoles(user, account); - await UpdateAccountNickname(user, account); + await UpdateAccountRoles(user, domainAccount); + await UpdateAccountNickname(user, domainAccount); } // TODO: Change to use signalr if events are available public OnlineState GetOnlineUserDetails(string accountId) { - Account account = _accountContext.GetSingle(accountId); - if (account?.DiscordId == null || !ulong.TryParse(account.DiscordId, out ulong discordId)) + DomainAccount domainAccount = _accountContext.GetSingle(accountId); + if (domainAccount?.DiscordId == null || !ulong.TryParse(domainAccount.DiscordId, out ulong discordId)) { return null; } @@ -216,15 +216,15 @@ private static string GetUserNickname(IGuildUser user) string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname; } - private async Task UpdateAccountRoles(SocketGuildUser user, Account account) + private async Task UpdateAccountRoles(SocketGuildUser user, DomainAccount domainAccount) { IReadOnlyCollection userRoles = user.Roles; HashSet allowedRoles = new(); - if (account != null) + if (domainAccount != null) { - UpdateAccountRanks(account, allowedRoles); - UpdateAccountUnits(account, allowedRoles); + UpdateAccountRanks(domainAccount, allowedRoles); + UpdateAccountUnits(domainAccount, allowedRoles); } string[] rolesBlacklist = _variablesService.GetVariable("DID_R_BLACKLIST").AsArray(); @@ -245,9 +245,9 @@ private async Task UpdateAccountRoles(SocketGuildUser user, Account account) } } - private async Task UpdateAccountNickname(IGuildUser user, Account account) + private async Task UpdateAccountNickname(IGuildUser user, DomainAccount domainAccount) { - string name = _displayNameService.GetDisplayName(account); + string name = _displayNameService.GetDisplayName(domainAccount); if (user.Nickname != name) { try @@ -261,19 +261,19 @@ private async Task UpdateAccountNickname(IGuildUser user, Account account) } } - private void UpdateAccountRanks(Account account, ISet allowedRoles) + private void UpdateAccountRanks(DomainAccount domainAccount, ISet allowedRoles) { - string rank = account.Rank; + string rank = domainAccount.Rank; foreach (Rank x in _ranksContext.Get().Where(x => rank == x.Name)) { allowedRoles.Add(x.DiscordRoleId); } } - private void UpdateAccountUnits(Account account, ISet allowedRoles) + private void UpdateAccountUnits(DomainAccount domainAccount, ISet allowedRoles) { - Unit accountUnit = _unitsContext.GetSingle(x => x.Name == account.UnitAssignment); - List accountUnits = _unitsContext.Get(x => x.Members.Contains(account.Id)).Where(x => !string.IsNullOrEmpty(x.DiscordRoleId)).ToList(); + Unit accountUnit = _unitsContext.GetSingle(x => x.Name == domainAccount.UnitAssignment); + List accountUnits = _unitsContext.Get(x => x.Members.Contains(domainAccount.Id)).Where(x => !string.IsNullOrEmpty(x.DiscordRoleId)).ToList(); List accountUnitParents = _unitsService.GetParents(accountUnit).Where(x => !string.IsNullOrEmpty(x.DiscordRoleId)).ToList(); accountUnits.ForEach(x => allowedRoles.Add(x.DiscordRoleId)); accountUnitParents.ForEach(x => allowedRoles.Add(x.DiscordRoleId)); @@ -328,12 +328,12 @@ private void AddEventhandlers() _client.UserLeft += user => { string name = GetUserNickname(user); - Account account = _accountContext.GetSingle(x => x.DiscordId == user.Id.ToString()); - string associatedAccountMessage = GetAssociatedAccountMessage(account); + DomainAccount domainAccount = _accountContext.GetSingle(x => x.DiscordId == user.Id.ToString()); + string associatedAccountMessage = GetAssociatedAccountMessage(domainAccount); _logger.LogDiscordEvent(DiscordUserEventType.LEFT, user.Id.ToString(), name, string.Empty, name, $"Left, {associatedAccountMessage}"); - if (account != null) + if (domainAccount != null) { - _eventBus.Send(new DiscordEventData(DiscordUserEventType.LEFT, account.Id)); + _eventBus.Send(new DiscordEventData(DiscordUserEventType.LEFT, domainAccount.Id)); } return Task.CompletedTask; @@ -534,13 +534,15 @@ private bool MessageIsWeeklyEventsMessage(IMessage message) private string GetAssociatedAccountMessageFromUserId(ulong userId) { - Account account = _accountContext.GetSingle(x => x.DiscordId == userId.ToString()); - return GetAssociatedAccountMessage(account); + DomainAccount domainAccount = _accountContext.GetSingle(x => x.DiscordId == userId.ToString()); + return GetAssociatedAccountMessage(domainAccount); } - private string GetAssociatedAccountMessage(Account account) + private string GetAssociatedAccountMessage(DomainAccount domainAccount) { - return account == null ? "with no associated account" : $"with associated account ({account.Id}, {_displayNameService.GetDisplayName(account)})"; + return domainAccount == null + ? "with no associated account" + : $"with associated account ({domainAccount.Id}, {_displayNameService.GetDisplayName(domainAccount)}, {domainAccount.MembershipState.ToString()})"; } private async Task GetDeletedMessageDetails(Cacheable cacheable, ISocketMessageChannel channel) diff --git a/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs b/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs index 086e822d..4914dc6f 100644 --- a/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs +++ b/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs @@ -20,15 +20,15 @@ public OperationsController(IMongoDatabase database) } [HttpGet, Authorize] - public IActionResult Get() + public TeampseakReportsDataset Get() { List tsServerSnapshots = _database.GetCollection("teamspeakSnapshots").Find(x => x.Timestamp > DateTime.Now.AddDays(-7)).ToList(); - var acreData = new { labels = GetLabels(), datasets = GetDataSets(tsServerSnapshots, true) }; - var data = new { labels = GetLabels(), datasets = GetDataSets(tsServerSnapshots, false) }; - return Ok(new { acreData, data }); + TeampseakReportDataset acreData = new() { Labels = GetLabels(), Datasets = GetReports(tsServerSnapshots, true) }; + TeampseakReportDataset data = new() { Labels = GetLabels(), Datasets = GetReports(tsServerSnapshots, false) }; + return new() { AcreData = acreData, Data = data }; } - private static int[] GetData(IReadOnlyCollection serverSnapshots, DateTime day, bool acre) + private static int[] GetReportData(IReadOnlyCollection serverSnapshots, DateTime day, bool acre) { List dataset = new(); for (int i = 0; i < 48; i++) @@ -71,20 +71,20 @@ private static List GetLabels() return labels; } - private static List GetDataSets(IReadOnlyCollection tsServerSnapshots, bool acre) + private static List GetReports(IReadOnlyCollection tsServerSnapshots, bool acre) { - List datasets = new(); + List datasets = new(); string[] colors = { "#4bc0c0", "#3992e6", "#a539e6", "#42e639", "#aae639", "#e6d239", "#e63939" }; for (int i = 0; i < 7; i++) { datasets.Add( - new + new() { - label = $"{DateTime.Now.AddDays(-i).DayOfWeek} - {DateTime.Now.AddDays(-i).ToShortDateString()}", - data = GetData(tsServerSnapshots, DateTime.Now.AddDays(-i).Date, acre), - fill = true, - borderColor = colors[i] + Label = $"{DateTime.Now.AddDays(-i).DayOfWeek} - {DateTime.Now.AddDays(-i).ToShortDateString()}", + Data = GetReportData(tsServerSnapshots, DateTime.Now.AddDays(-i).Date, acre), + Fill = true, + BorderColor = colors[i] } ); } diff --git a/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs b/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs index dd0fedbb..84e77b39 100644 --- a/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs +++ b/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs @@ -8,17 +8,20 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; +using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Models; using UKSF.Api.Teamspeak.Models; using UKSF.Api.Teamspeak.Services; namespace UKSF.Api.Teamspeak.Controllers { - [Route("[controller]")] + [Route("teamspeak")] public class TeamspeakController : Controller { private readonly IAccountContext _accountContext; + private readonly IConfirmationCodeService _confirmationCodeService; private readonly IDisplayNameService _displayNameService; + private readonly INotificationsService _notificationsService; private readonly IRanksService _ranksService; private readonly IRecruitmentService _recruitmentService; private readonly ITeamspeakService _teamspeakService; @@ -30,7 +33,9 @@ public TeamspeakController( IRanksService ranksService, IUnitsService unitsService, IRecruitmentService recruitmentService, - IDisplayNameService displayNameService + IDisplayNameService displayNameService, + IConfirmationCodeService confirmationCodeService, + INotificationsService notificationsService ) { _accountContext = accountContext; @@ -39,6 +44,18 @@ IDisplayNameService displayNameService _unitsService = unitsService; _recruitmentService = recruitmentService; _displayNameService = displayNameService; + _confirmationCodeService = confirmationCodeService; + _notificationsService = notificationsService; + } + + [HttpGet("{teamspeakId}"), Authorize] + public async Task RequestTeamspeakCode([FromRoute] string teamspeakId) + { + string code = await _confirmationCodeService.CreateConfirmationCode(teamspeakId); + _notificationsService.SendTeamspeakNotification( + new HashSet { teamspeakId.ToInt() }, + $"This Teamspeak ID was selected for connection to the website. Copy this code to your clipboard and return to the UKSF website application page to enter the code:\n{code}\nIf this request was not made by you, please contact an admin" + ); } [HttpGet("online"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER, Permissions.DISCHARGED)] @@ -48,18 +65,17 @@ public IEnumerable GetOnlineClients() } [HttpGet("shutdown"), Authorize, Permissions(Permissions.ADMIN)] - public async Task Shutdown() + public async Task Shutdown() { await _teamspeakService.Shutdown(); await Task.Delay(TimeSpan.FromSeconds(3)); - return Ok(); } [HttpGet("onlineAccounts")] - public IActionResult GetOnlineAccounts() + public TeamspeakAccountsDataset GetOnlineAccounts() { IEnumerable teamnspeakClients = _teamspeakService.GetOnlineTeamspeakClients(); - IEnumerable allAccounts = _accountContext.Get(); + IEnumerable allAccounts = _accountContext.Get(); var clients = teamnspeakClients.Where(x => x != null) .Select( x => new @@ -68,38 +84,36 @@ public IActionResult GetOnlineAccounts() } ) .ToList(); - var clientAccounts = clients.Where(x => x.account != null && x.account.MembershipState == MembershipState.MEMBER) + var clientAccounts = clients.Where(x => x.account is { MembershipState: MembershipState.MEMBER }) .OrderBy(x => x.account.Rank, new RankComparer(_ranksService)) .ThenBy(x => x.account.Lastname) .ThenBy(x => x.account.Firstname); List commandAccounts = _unitsService.GetAuxilliaryRoot().Members; - List commanders = new(); - List recruiters = new(); - List members = new(); - List guests = new(); + List commanders = new(); + List recruiters = new(); + List members = new(); foreach (var onlineClient in clientAccounts) { if (commandAccounts.Contains(onlineClient.account.Id)) { - commanders.Add(new { displayName = _displayNameService.GetDisplayName(onlineClient.account) }); + commanders.Add(new() { DisplayName = _displayNameService.GetDisplayName(onlineClient.account) }); } else if (_recruitmentService.IsRecruiter(onlineClient.account)) { - recruiters.Add(new { displayName = _displayNameService.GetDisplayName(onlineClient.account) }); + recruiters.Add(new() { DisplayName = _displayNameService.GetDisplayName(onlineClient.account) }); } else { - members.Add(new { displayName = _displayNameService.GetDisplayName(onlineClient.account) }); + members.Add(new() { DisplayName = _displayNameService.GetDisplayName(onlineClient.account) }); } } - foreach (var client in clients.Where(x => x.account == null || x.account.MembershipState != MembershipState.MEMBER)) - { - guests.Add(new { displayName = client.client.ClientName }); - } + List guests = clients.Where(x => x.account is not { MembershipState: MembershipState.MEMBER }) + .Select(client => (TeamspeakAccountDataset) new() { DisplayName = client.client.ClientName }) + .ToList(); - return Ok(new { commanders, recruiters, members, guests }); + return new() { Commanders = commanders, Recruiters = recruiters, Members = members, Guests = guests }; } [HttpGet("{accountId}/onlineUserDetails"), Authorize, Permissions(Permissions.RECRUITER)] diff --git a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs index e48b0cba..1becd5ba 100644 --- a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs +++ b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakEventHandler.cs @@ -7,30 +7,36 @@ using UKSF.Api.Shared.Models; using UKSF.Api.Teamspeak.Services; -namespace UKSF.Api.Teamspeak.EventHandlers { +namespace UKSF.Api.Teamspeak.EventHandlers +{ public interface ITeamspeakEventHandler : IEventHandler { } - public class TeamspeakEventHandler : ITeamspeakEventHandler { + public class TeamspeakEventHandler : ITeamspeakEventHandler + { private readonly IEventBus _eventBus; private readonly ILogger _logger; private readonly ITeamspeakService _teamspeakService; - public TeamspeakEventHandler(IEventBus eventBus, ILogger logger, ITeamspeakService teamspeakService) { + public TeamspeakEventHandler(IEventBus eventBus, ILogger logger, ITeamspeakService teamspeakService) + { _eventBus = eventBus; _logger = logger; _teamspeakService = teamspeakService; } - public void Init() { - _eventBus.AsObservable().SubscribeWithAsyncNext(HandleAccountEvent, _logger.LogError); + public void Init() + { + _eventBus.AsObservable().SubscribeWithAsyncNext(HandleAccountEvent, _logger.LogError); _eventBus.AsObservable().SubscribeWithAsyncNext(HandleTeamspeakMessageEvent, _logger.LogError); } - private async Task HandleAccountEvent(EventModel eventModel, Account account) { - await _teamspeakService.UpdateAccountTeamspeakGroups(account); + private async Task HandleAccountEvent(EventModel eventModel, DomainAccount domainAccount) + { + await _teamspeakService.UpdateAccountTeamspeakGroups(domainAccount); } - private async Task HandleTeamspeakMessageEvent(EventModel eventModel, TeamspeakMessageEventData messageEvent) { + private async Task HandleTeamspeakMessageEvent(EventModel eventModel, TeamspeakMessageEventData messageEvent) + { await _teamspeakService.SendTeamspeakMessageToClient(messageEvent.ClientDbIds, messageEvent.Message); } } diff --git a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakServerEventHandler.cs b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakServerEventHandler.cs index 987a1c95..c5bb3f27 100644 --- a/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakServerEventHandler.cs +++ b/UKSF.Api.Integrations.Teamspeak/EventHandlers/TeamspeakServerEventHandler.cs @@ -23,7 +23,7 @@ public class TeamspeakServerEventHandler : ITeamspeakServerEventHandler private readonly IAccountContext _accountContext; private readonly IEventBus _eventBus; private readonly ILogger _logger; - private readonly ConcurrentDictionary _serverGroupUpdates = new(); + private readonly ConcurrentDictionary _serverGroupUpdates = new(); private readonly ITeamspeakGroupService _teamspeakGroupService; private readonly ITeamspeakService _teamspeakService; @@ -73,8 +73,8 @@ private async Task UpdateClients(string args) private async Task UpdateClientServerGroups(string args) { JObject updateObject = JObject.Parse(args); - double clientDbid = double.Parse(updateObject["clientDbid"].ToString()); - double serverGroupId = double.Parse(updateObject["serverGroupId"].ToString()); + int clientDbid = int.Parse(updateObject["clientDbid"].ToString()); + int serverGroupId = int.Parse(updateObject["serverGroupId"].ToString()); await Console.Out.WriteLineAsync($"Server group for {clientDbid}: {serverGroupId}"); TeamspeakServerGroupUpdate update = _serverGroupUpdates.GetOrAdd(clientDbid, _ => new()); @@ -92,11 +92,11 @@ private async Task UpdateClientServerGroups(string args) ); } - private async Task ProcessAccountData(double clientDbId, ICollection serverGroups) + private async Task ProcessAccountData(int clientDbId, ICollection serverGroups) { await Console.Out.WriteLineAsync($"Processing server groups for {clientDbId}"); - Account account = _accountContext.GetSingle(x => x.TeamspeakIdentities != null && x.TeamspeakIdentities.Any(y => y.Equals(clientDbId))); - Task unused = _teamspeakGroupService.UpdateAccountGroups(account, serverGroups, clientDbId); + DomainAccount domainAccount = _accountContext.GetSingle(x => x.TeamspeakIdentities != null && x.TeamspeakIdentities.Any(y => y.Equals(clientDbId))); + Task unused = _teamspeakGroupService.UpdateAccountGroups(domainAccount, serverGroups, clientDbId); _serverGroupUpdates.TryRemove(clientDbId, out TeamspeakServerGroupUpdate _); } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeampseakReportsDataset.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeampseakReportsDataset.cs new file mode 100644 index 00000000..a3a5d021 --- /dev/null +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeampseakReportsDataset.cs @@ -0,0 +1,24 @@ +using System.Collections.Generic; + +namespace UKSF.Api.Teamspeak.Models +{ + public class TeampseakReportsDataset + { + public TeampseakReportDataset AcreData; + public TeampseakReportDataset Data; + } + + public class TeampseakReportDataset + { + public List Datasets; + public List Labels; + } + + public class TeampseakReport + { + public string BorderColor; + public int[] Data; + public bool Fill; + public string Label; + } +} diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakAccountsDataset.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakAccountsDataset.cs new file mode 100644 index 00000000..d5a6fc9f --- /dev/null +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakAccountsDataset.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; + +namespace UKSF.Api.Teamspeak.Models +{ + public class TeamspeakAccountsDataset + { + public List Commanders; + public List Guests; + public List Members; + public List Recruiters; + } + + public class TeamspeakAccountDataset + { + public string DisplayName; + } +} diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs index 85c71eed..53b0e9b5 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakClient.cs @@ -1,8 +1,10 @@ -namespace UKSF.Api.Teamspeak.Models { - public class TeamspeakClient { - public double ChannelId; +namespace UKSF.Api.Teamspeak.Models +{ + public class TeamspeakClient + { + public int ChannelId; public string ChannelName; - public double ClientDbId; + public int ClientDbId; public string ClientName; } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs index a883e2aa..132c4085 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakGroupProcedure.cs @@ -1,6 +1,8 @@ -namespace UKSF.Api.Teamspeak.Models { - public class TeamspeakGroupProcedure { - public double ClientDbId; - public double ServerGroup; +namespace UKSF.Api.Teamspeak.Models +{ + public class TeamspeakGroupProcedure + { + public int ClientDbId; + public int ServerGroup; } } diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs index 2ba5a83a..74f22987 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerGroupUpdate.cs @@ -2,10 +2,12 @@ using System.Threading; using System.Threading.Tasks; -namespace UKSF.Api.Teamspeak.Models { - public class TeamspeakServerGroupUpdate { - public List ServerGroups = new(); +namespace UKSF.Api.Teamspeak.Models +{ + public class TeamspeakServerGroupUpdate + { public CancellationTokenSource CancellationTokenSource; public Task DelayedProcessTask; + public List ServerGroups = new(); } } diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs index 2c85e1a6..717bfb53 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs @@ -11,12 +11,15 @@ using UKSF.Api.Shared.Extensions; using UKSF.Api.Teamspeak.Models; -namespace UKSF.Api.Teamspeak.Services { - public interface ITeamspeakGroupService { - Task UpdateAccountGroups(Account account, ICollection serverGroups, double clientDbId); +namespace UKSF.Api.Teamspeak.Services +{ + public interface ITeamspeakGroupService + { + Task UpdateAccountGroups(DomainAccount domainAccount, ICollection serverGroups, int clientDbId); } - public class TeamspeakGroupService : ITeamspeakGroupService { + public class TeamspeakGroupService : ITeamspeakGroupService + { private readonly IRanksContext _ranksContext; private readonly ITeamspeakManagerService _teamspeakManagerService; private readonly IUnitsContext _unitsContext; @@ -29,7 +32,8 @@ public TeamspeakGroupService( IUnitsService unitsService, ITeamspeakManagerService teamspeakManagerService, IVariablesService variablesService - ) { + ) + { _ranksContext = ranksContext; _unitsContext = unitsContext; _unitsService = unitsService; @@ -37,88 +41,110 @@ IVariablesService variablesService _variablesService = variablesService; } - public async Task UpdateAccountGroups(Account account, ICollection serverGroups, double clientDbId) { - HashSet memberGroups = new(); + public async Task UpdateAccountGroups(DomainAccount domainAccount, ICollection serverGroups, int clientDbId) + { + HashSet memberGroups = new(); - if (account == null) { - memberGroups.Add(_variablesService.GetVariable("TEAMSPEAK_GID_UNVERIFIED").AsDouble()); - } else { - switch (account.MembershipState) { + if (domainAccount == null) + { + memberGroups.Add(_variablesService.GetVariable("TEAMSPEAK_GID_UNVERIFIED").AsInt()); + } + else + { + switch (domainAccount.MembershipState) + { case MembershipState.UNCONFIRMED: - memberGroups.Add(_variablesService.GetVariable("TEAMSPEAK_GID_UNVERIFIED").AsDouble()); + memberGroups.Add(_variablesService.GetVariable("TEAMSPEAK_GID_UNVERIFIED").AsInt()); break; case MembershipState.DISCHARGED: - memberGroups.Add(_variablesService.GetVariable("TEAMSPEAK_GID_DISCHARGED").AsDouble()); + memberGroups.Add(_variablesService.GetVariable("TEAMSPEAK_GID_DISCHARGED").AsInt()); break; case MembershipState.CONFIRMED: - ResolveRankGroup(account, memberGroups); + ResolveRankGroup(domainAccount, memberGroups); break; case MembershipState.MEMBER: - ResolveRankGroup(account, memberGroups); - ResolveUnitGroup(account, memberGroups); - ResolveParentUnitGroup(account, memberGroups); - ResolveAuxiliaryUnitGroups(account, memberGroups); - memberGroups.Add(_variablesService.GetVariable("TEAMSPEAK_GID_ROOT").AsDouble()); + ResolveRankGroup(domainAccount, memberGroups); + ResolveUnitGroup(domainAccount, memberGroups); + ResolveParentUnitGroup(domainAccount, memberGroups); + ResolveAuxiliaryUnitGroups(domainAccount, memberGroups); + memberGroups.Add(_variablesService.GetVariable("TEAMSPEAK_GID_ROOT").AsInt()); break; } } - List groupsBlacklist = _variablesService.GetVariable("TEAMSPEAK_GID_BLACKLIST").AsDoublesArray().ToList(); - foreach (double serverGroup in serverGroups) { - if (!memberGroups.Contains(serverGroup) && !groupsBlacklist.Contains(serverGroup)) { + List groupsBlacklist = _variablesService.GetVariable("TEAMSPEAK_GID_BLACKLIST").AsIntArray().ToList(); + foreach (int serverGroup in serverGroups) + { + if (!memberGroups.Contains(serverGroup) && !groupsBlacklist.Contains(serverGroup)) + { await RemoveServerGroup(clientDbId, serverGroup); } } - foreach (double serverGroup in memberGroups.Where(serverGroup => !serverGroups.Contains(serverGroup))) { + foreach (int serverGroup in memberGroups.Where(serverGroup => !serverGroups.Contains(serverGroup))) + { await AddServerGroup(clientDbId, serverGroup); } } - private void ResolveRankGroup(Account account, ISet memberGroups) { - memberGroups.Add(_ranksContext.GetSingle(account.Rank).TeamspeakGroup.ToDouble()); + private void ResolveRankGroup(DomainAccount domainAccount, ISet memberGroups) + { + memberGroups.Add(_ranksContext.GetSingle(domainAccount.Rank).TeamspeakGroup.ToInt()); } - private void ResolveUnitGroup(Account account, ISet memberGroups) { - Unit accountUnit = _unitsContext.GetSingle(x => x.Name == account.UnitAssignment); + private void ResolveUnitGroup(DomainAccount domainAccount, ISet memberGroups) + { + Unit accountUnit = _unitsContext.GetSingle(x => x.Name == domainAccount.UnitAssignment); Unit elcom = _unitsService.GetAuxilliaryRoot(); - if (accountUnit.Parent == ObjectId.Empty.ToString()) { - memberGroups.Add(accountUnit.TeamspeakGroup.ToDouble()); + if (accountUnit.Parent == ObjectId.Empty.ToString()) + { + memberGroups.Add(accountUnit.TeamspeakGroup.ToInt()); } - double group = elcom.Members.Contains(account.Id) ? _variablesService.GetVariable("TEAMSPEAK_GID_ELCOM").AsDouble() : accountUnit.TeamspeakGroup.ToDouble(); - if (group == 0) { - ResolveParentUnitGroup(account, memberGroups); - } else { + int group = elcom.Members.Contains(domainAccount.Id) ? _variablesService.GetVariable("TEAMSPEAK_GID_ELCOM").AsInt() : accountUnit.TeamspeakGroup.ToInt(); + if (group == 0) + { + ResolveParentUnitGroup(domainAccount, memberGroups); + } + else + { memberGroups.Add(group); } } - private void ResolveParentUnitGroup(Account account, ISet memberGroups) { - Unit accountUnit = _unitsContext.GetSingle(x => x.Name == account.UnitAssignment); - Unit parentUnit = _unitsService.GetParents(accountUnit).Skip(1).FirstOrDefault(x => !string.IsNullOrEmpty(x.TeamspeakGroup) && !memberGroups.Contains(x.TeamspeakGroup.ToDouble())); - if (parentUnit != null && parentUnit.Parent != ObjectId.Empty.ToString()) { - memberGroups.Add(parentUnit.TeamspeakGroup.ToDouble()); - } else { - memberGroups.Add(accountUnit.TeamspeakGroup.ToDouble()); + private void ResolveParentUnitGroup(DomainAccount domainAccount, ISet memberGroups) + { + Unit accountUnit = _unitsContext.GetSingle(x => x.Name == domainAccount.UnitAssignment); + Unit parentUnit = _unitsService.GetParents(accountUnit).Skip(1).FirstOrDefault(x => !string.IsNullOrEmpty(x.TeamspeakGroup) && !memberGroups.Contains(x.TeamspeakGroup.ToInt())); + if (parentUnit != null && parentUnit.Parent != ObjectId.Empty.ToString()) + { + memberGroups.Add(parentUnit.TeamspeakGroup.ToInt()); + } + else + { + memberGroups.Add(accountUnit.TeamspeakGroup.ToInt()); } } - private void ResolveAuxiliaryUnitGroups(MongoObject account, ISet memberGroups) { + private void ResolveAuxiliaryUnitGroups(MongoObject account, ISet memberGroups) + { IEnumerable accountUnits = _unitsContext.Get(x => x.Parent != ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY && x.Members.Contains(account.Id)) .Where(x => !string.IsNullOrEmpty(x.TeamspeakGroup)); - foreach (Unit unit in accountUnits) { - memberGroups.Add(unit.TeamspeakGroup.ToDouble()); + foreach (Unit unit in accountUnits) + { + memberGroups.Add(unit.TeamspeakGroup.ToInt()); } } - private async Task AddServerGroup(double clientDbId, double serverGroup) { - await _teamspeakManagerService.SendGroupProcedure(TeamspeakProcedureType.ASSIGN, new TeamspeakGroupProcedure { ClientDbId = clientDbId, ServerGroup = serverGroup }); + private async Task AddServerGroup(int clientDbId, int serverGroup) + { + await _teamspeakManagerService.SendGroupProcedure(TeamspeakProcedureType.ASSIGN, new() { ClientDbId = clientDbId, ServerGroup = serverGroup }); } - private async Task RemoveServerGroup(double clientDbId, double serverGroup) { - await _teamspeakManagerService.SendGroupProcedure(TeamspeakProcedureType.UNASSIGN, new TeamspeakGroupProcedure { ClientDbId = clientDbId, ServerGroup = serverGroup }); + private async Task RemoveServerGroup(int clientDbId, int serverGroup) + { + await _teamspeakManagerService.SendGroupProcedure(TeamspeakProcedureType.UNASSIGN, new() { ClientDbId = clientDbId, ServerGroup = serverGroup }); } } } diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakMetricsService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakMetricsService.cs index 68678f2c..399be598 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakMetricsService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakMetricsService.cs @@ -4,12 +4,12 @@ namespace UKSF.Api.Teamspeak.Services { public interface ITeamspeakMetricsService { - float GetWeeklyParticipationTrend(HashSet teamspeakIdentities); + float GetWeeklyParticipationTrend(HashSet teamspeakIdentities); } public class TeamspeakMetricsService : ITeamspeakMetricsService { - public float GetWeeklyParticipationTrend(HashSet teamspeakIdentities) + public float GetWeeklyParticipationTrend(HashSet teamspeakIdentities) { return 3; } diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs index 83ba240f..0923fbd1 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakService.cs @@ -21,9 +21,9 @@ public interface ITeamspeakService OnlineState GetOnlineUserDetails(string accountId); IEnumerable GetFormattedClients(); Task UpdateClients(HashSet newClients); - Task UpdateAccountTeamspeakGroups(Account account); - Task SendTeamspeakMessageToClient(Account account, string message); - Task SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message); + Task UpdateAccountTeamspeakGroups(DomainAccount domainAccount); + Task SendTeamspeakMessageToClient(DomainAccount domainAccount, string message); + Task SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message); Task Shutdown(); Task StoreTeamspeakServerSnapshot(); } @@ -66,28 +66,28 @@ public async Task UpdateClients(HashSet newClients) await _teamspeakClientsHub.Clients.All.ReceiveClients(GetFormattedClients()); } - public async Task UpdateAccountTeamspeakGroups(Account account) + public async Task UpdateAccountTeamspeakGroups(DomainAccount domainAccount) { - if (account?.TeamspeakIdentities == null) + if (domainAccount?.TeamspeakIdentities == null) { return; } - foreach (double clientDbId in account.TeamspeakIdentities) + foreach (int clientDbId in domainAccount.TeamspeakIdentities) { await _teamspeakManagerService.SendProcedure(TeamspeakProcedureType.GROUPS, new { clientDbId }); } } - public async Task SendTeamspeakMessageToClient(Account account, string message) + public async Task SendTeamspeakMessageToClient(DomainAccount domainAccount, string message) { - await SendTeamspeakMessageToClient(account.TeamspeakIdentities, message); + await SendTeamspeakMessageToClient(domainAccount.TeamspeakIdentities, message); } - public async Task SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message) + public async Task SendTeamspeakMessageToClient(IEnumerable clientDbIds, string message) { message = FormatTeamspeakMessage(message); - foreach (double clientDbId in clientDbIds) + foreach (int clientDbId in clientDbIds) { await _teamspeakManagerService.SendProcedure(TeamspeakProcedureType.MESSAGE, new { clientDbId, message }); } @@ -115,7 +115,7 @@ public IEnumerable GetFormattedClients() { if (_environment.IsDevelopment()) { - return new List { new { name = "SqnLdr.Beswick.T", clientDbId = (double) 2 } }; + return new List { new { name = "SqnLdr.Beswick.T", clientDbId = 2 } }; } return _clients.Where(x => x != null).Select(x => new { name = $"{x.ClientName}", clientDbId = x.ClientDbId }); @@ -134,18 +134,18 @@ public OnlineState GetOnlineUserDetails(string accountId) return null; } - Account account = _accountContext.GetSingle(accountId); - if (account?.TeamspeakIdentities == null) + DomainAccount domainAccount = _accountContext.GetSingle(accountId); + if (domainAccount?.TeamspeakIdentities == null) { return null; } if (_environment.IsDevelopment()) { - _clients.First().ClientDbId = account.TeamspeakIdentities.First(); + _clients.First().ClientDbId = domainAccount.TeamspeakIdentities.First(); } - return _clients.Where(client => client != null && account.TeamspeakIdentities.Any(clientDbId => clientDbId.Equals(client.ClientDbId))) + return _clients.Where(client => client != null && domainAccount.TeamspeakIdentities.Any(clientDbId => clientDbId.Equals(client.ClientDbId))) .Select(client => new OnlineState { Online = true, Nickname = client.ClientName }) .FirstOrDefault(); } diff --git a/UKSF.Api.Launcher/Controllers/LauncherController.cs b/UKSF.Api.Launcher/Controllers/LauncherController.cs index 36bcc539..eefe0619 100644 --- a/UKSF.Api.Launcher/Controllers/LauncherController.cs +++ b/UKSF.Api.Launcher/Controllers/LauncherController.cs @@ -54,41 +54,37 @@ IVariablesService variablesService } [HttpGet("update/{platform}/{version}")] - public IActionResult GetUpdate(string platform, string version) - { - return Ok(); - } + public void GetUpdate(string platform, string version) { } [HttpGet("version")] - public IActionResult GetVersion() + public string GetVersion() { - return Ok(_variablesContext.GetSingle("LAUNCHER_VERSION").AsString()); + return _variablesContext.GetSingle("LAUNCHER_VERSION").AsString(); } [HttpPost("version"), Permissions(Permissions.ADMIN)] - public async Task UpdateVersion([FromBody] JObject body) + public async Task UpdateVersion([FromBody] JObject body) { string version = body["version"].ToString(); await _variablesContext.Update("LAUNCHER_VERSION", version); await _launcherFileService.UpdateAllVersions(); await _launcherHub.Clients.All.ReceiveLauncherVersion(version); - return Ok(); } [HttpGet("download/setup")] - public IActionResult GetLauncher() + public FileStreamResult GetLauncher() { return _launcherFileService.GetLauncherFile("UKSF Launcher Setup.msi"); } [HttpGet("download/updater")] - public IActionResult GetUpdater() + public FileStreamResult GetUpdater() { return _launcherFileService.GetLauncherFile("Updater", "UKSF.Launcher.Updater.exe"); } [HttpPost("download/update")] - public async Task GetUpdatedFiles([FromBody] JObject body) + public async Task GetUpdatedFiles([FromBody] JObject body) { List files = JsonConvert.DeserializeObject>(body["files"].ToString()); Stream updatedFiles = await _launcherFileService.GetUpdatedFiles(files); @@ -97,13 +93,11 @@ public async Task GetUpdatedFiles([FromBody] JObject body) } [HttpPost("error")] - public IActionResult ReportError([FromBody] JObject body) + public void ReportError([FromBody] JObject body) { string version = body["version"].ToString(); string message = body["message"].ToString(); // logger.Log(new LauncherLog(version, message) { userId = httpContextService.GetUserId(), name = displayNameService.GetDisplayName(accountService.GetUserAccount()) }); - - return Ok(); } } } diff --git a/UKSF.Api.Modpack/Controllers/GithubController.cs b/UKSF.Api.Modpack/Controllers/GithubController.cs index 79438601..b9bf8f8e 100644 --- a/UKSF.Api.Modpack/Controllers/GithubController.cs +++ b/UKSF.Api.Modpack/Controllers/GithubController.cs @@ -9,6 +9,7 @@ using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services; using UKSF.Api.Shared; +using UKSF.Api.Shared.Exceptions; namespace UKSF.Api.Modpack.Controllers { @@ -32,17 +33,17 @@ public GithubController(IModpackService modpackService, IGithubService githubSer } [HttpPost] - public async Task GithubWebhook([FromHeader(Name = "x-hub-signature")] string githubSignature, [FromHeader(Name = "x-github-event")] string githubEvent, [FromBody] JObject body) + public async Task GithubWebhook([FromHeader(Name = "x-hub-signature")] string githubSignature, [FromHeader(Name = "x-github-event")] string githubEvent, [FromBody] JObject body) { if (!_githubService.VerifySignature(githubSignature, body.ToString(Formatting.None))) { - return Unauthorized(); + throw new UnauthorizedException(); } PushWebhookPayload payload = new SimpleJsonSerializer().Deserialize(body.ToString()); if (payload.Repository.Name != REPO_NAME || githubEvent != PUSH_EVENT) { - return Ok(); + return; } switch (payload.Ref) @@ -50,27 +51,26 @@ public async Task GithubWebhook([FromHeader(Name = "x-hub-signatu case MASTER when payload.BaseRef != RELEASE: { await _modpackService.CreateDevBuildFromPush(payload); - return Ok(); + return; } case RELEASE: await _modpackService.CreateRcBuildFromPush(payload); - return Ok(); - default: return Ok(); + return; + default: return; } } [HttpGet("branches"), Authorize, Permissions(Permissions.TESTER)] - public async Task GetBranches() + public async Task> GetBranches() { - return Ok(await _githubService.GetBranches()); + return await _githubService.GetBranches(); } [HttpGet("populatereleases"), Authorize, Permissions(Permissions.ADMIN)] - public async Task Release() + public async Task Release() { List releases = await _githubService.GetHistoricReleases(); await _releaseService.AddHistoricReleases(releases); - return Ok(); } } } diff --git a/UKSF.Api.Modpack/Controllers/IssueController.cs b/UKSF.Api.Modpack/Controllers/IssueController.cs index 3aefd84c..27b48e0a 100644 --- a/UKSF.Api.Modpack/Controllers/IssueController.cs +++ b/UKSF.Api.Modpack/Controllers/IssueController.cs @@ -1,6 +1,5 @@ using System; using System.Net.Http; -using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; @@ -10,46 +9,57 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; +using UKSF.Api.Shared.Commands; +using UKSF.Api.Shared.Exceptions; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Modpack.Controllers { - [Route("[controller]"), Permissions(Permissions.MEMBER)] - public class IssueController : Controller { +namespace UKSF.Api.Modpack.Controllers +{ + [Route("issue"), Permissions(Permissions.MEMBER)] + public class IssueController : Controller + { private readonly IDisplayNameService _displayNameService; - private readonly IEmailService _emailService; private readonly string _githubToken; private readonly IHttpContextService _httpContextService; + private readonly ISendBasicEmailCommand _sendBasicEmailCommand; - public IssueController(IDisplayNameService displayNameService, IEmailService emailService, IConfiguration configuration, IHttpContextService httpContextService) { + public IssueController(IDisplayNameService displayNameService, ISendBasicEmailCommand sendBasicEmailCommand, IConfiguration configuration, IHttpContextService httpContextService) + { _displayNameService = displayNameService; - _emailService = emailService; + _sendBasicEmailCommand = sendBasicEmailCommand; _httpContextService = httpContextService; _githubToken = configuration.GetSection("Github")["token"]; } [HttpPut, Authorize] - public async Task CreateIssue([FromQuery] int type, [FromBody] JObject data) { + public async Task CreateIssue([FromQuery] int type, [FromBody] JObject data) + { string title = data["title"].ToString(); string body = data["body"].ToString(); string user = _displayNameService.GetDisplayName(_httpContextService.GetUserId()); body += $"\n\n---\n_**Submitted by:** {user}_"; string issueUrl; - try { + try + { using HttpClient client = new(); StringContent content = new(JsonConvert.SerializeObject(new { title, body }), Encoding.UTF8, "application/vnd.github.v3.full+json"); string url = type == 0 ? "https://api.github.com/repos/uksf/website-issues/issues" : "https://api.github.com/repos/uksf/modpack/issues"; - client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("token", _githubToken); + client.DefaultRequestHeaders.Authorization = new("token", _githubToken); client.DefaultRequestHeaders.UserAgent.ParseAdd(user); + HttpResponseMessage response = await client.PostAsync(url, content); + string result = await response.Content.ReadAsStringAsync(); - issueUrl = JObject.Parse(result)["html_url"].ToString(); - _emailService.SendEmail("contact.tim.here@gmail.com", "New Issue Created", $"New {(type == 0 ? "website" : "modpack")} issue reported by {user}\n\n{issueUrl}"); - } catch (Exception) { - return BadRequest(); + issueUrl = JObject.Parse(result)["html_url"]?.ToString(); + await _sendBasicEmailCommand.ExecuteAsync(new("contact.tim.here@gmail.com", "New Issue Created", $"New {(type == 0 ? "website" : "modpack")} issue reported by {user}\n\n{issueUrl}")); + } + catch (Exception exception) + { + throw new BadRequestException(exception.Message); } - return Ok(new { issueUrl }); + return issueUrl; } } } diff --git a/UKSF.Api.Modpack/Controllers/ModpackController.cs b/UKSF.Api.Modpack/Controllers/ModpackController.cs index fbcfd3e1..5ffa205f 100644 --- a/UKSF.Api.Modpack/Controllers/ModpackController.cs +++ b/UKSF.Api.Modpack/Controllers/ModpackController.cs @@ -5,6 +5,7 @@ using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services; using UKSF.Api.Shared; +using UKSF.Api.Shared.Exceptions; namespace UKSF.Api.Modpack.Controllers { @@ -39,91 +40,91 @@ public IEnumerable GetBuilds() } [HttpGet("builds/{id}"), Authorize, Permissions(Permissions.MEMBER)] - public IActionResult GetBuild(string id) + public ModpackBuild GetBuild(string id) { ModpackBuild build = _modpackService.GetBuild(id); - return build == null ? BadRequest("Build does not exist") : Ok(build); + if (build == null) + { + throw new NotFoundException("Build does not exist"); + } + + return build; } [HttpGet("builds/{id}/step/{index}"), Authorize, Permissions(Permissions.MEMBER)] - public IActionResult GetBuildStep(string id, int index) + public ModpackBuildStep GetBuildStep(string id, int index) { ModpackBuild build = _modpackService.GetBuild(id); if (build == null) { - return BadRequest("Build does not exist"); + throw new NotFoundException("Build does not exist"); } if (build.Steps.Count > index) { - return Ok(build.Steps[index]); + return build.Steps[index]; } - return BadRequest("Build step does not exist"); + throw new NotFoundException("Build step does not exist"); } [HttpGet("builds/{id}/rebuild"), Authorize, Permissions(Permissions.ADMIN)] - public async Task Rebuild(string id) + public async Task Rebuild(string id) { ModpackBuild build = _modpackService.GetBuild(id); if (build == null) { - return BadRequest("Build does not exist"); + throw new NotFoundException("Build does not exist"); } await _modpackService.Rebuild(build); - return Ok(); } [HttpGet("builds/{id}/cancel"), Authorize, Permissions(Permissions.ADMIN)] - public async Task CancelBuild(string id) + public async Task CancelBuild(string id) { ModpackBuild build = _modpackService.GetBuild(id); if (build == null) { - return BadRequest("Build does not exist"); + throw new NotFoundException("Build does not exist"); } await _modpackService.CancelBuild(build); - return Ok(); } [HttpPatch("release/{version}"), Authorize, Permissions(Permissions.ADMIN)] - public async Task UpdateRelease(string version, [FromBody] ModpackRelease release) + public async Task UpdateRelease(string version, [FromBody] ModpackRelease release) { if (!release.IsDraft) { - return BadRequest($"Release {version} is not a draft"); + throw new BadRequestException($"Release {version} is not a draft"); } await _modpackService.UpdateReleaseDraft(release); - return Ok(); } [HttpGet("release/{version}"), Authorize, Permissions(Permissions.ADMIN)] - public async Task Release(string version) + public async Task Release(string version) { await _modpackService.Release(version); - return Ok(); } [HttpGet("release/{version}/changelog"), Authorize, Permissions(Permissions.ADMIN)] - public async Task RegenerateChangelog(string version) + public async Task RegenerateChangelog(string version) { await _modpackService.RegnerateReleaseDraftChangelog(version); - return Ok(_modpackService.GetRelease(version)); + return _modpackService.GetRelease(version); } [HttpPost("newbuild"), Authorize, Permissions(Permissions.TESTER)] - public async Task NewBuild([FromBody] NewBuild newBuild) + public async Task NewBuild([FromBody] NewBuild newBuild) { if (!await _githubService.IsReferenceValid(newBuild.Reference)) { - return BadRequest($"{newBuild.Reference} cannot be built as its version does not have the required make files"); + throw new BadRequestException($"{newBuild.Reference} cannot be built as its version does not have the required make files"); } await _modpackService.NewBuild(newBuild); - return Ok(); } } } diff --git a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs index cb2ce76c..e2d1a5cc 100644 --- a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs +++ b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Personnel.Commands; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.EventHandlers; using UKSF.Api.Personnel.Mappers; @@ -17,6 +18,8 @@ public static IServiceCollection AddUksfPersonnel(this IServiceCollection servic return services.AddContexts() .AddEventHandlers() .AddServices() + .AddCommands() + .AddMappers() .AddActions() .AddTransient() .AddAutoMapper(typeof(AutoMapperUnitProfile)); @@ -48,7 +51,6 @@ private static IServiceCollection AddServices(this IServiceCollection services) .AddSingleton() .AddSingleton() .AddSingleton() - .AddSingleton() .AddSingleton() .AddSingleton() .AddSingleton() @@ -58,6 +60,16 @@ private static IServiceCollection AddServices(this IServiceCollection services) .AddSingleton(); } + private static IServiceCollection AddCommands(this IServiceCollection services) + { + return services.AddSingleton(); + } + + private static IServiceCollection AddMappers(this IServiceCollection services) + { + return services.AddSingleton(); + } + private static IServiceCollection AddActions(this IServiceCollection services) { return services.AddSingleton().AddSingleton(); diff --git a/UKSF.Api.Personnel/Commands/ConnectTeamspeakIdToAccountCommand.cs b/UKSF.Api.Personnel/Commands/ConnectTeamspeakIdToAccountCommand.cs new file mode 100644 index 00000000..9b5f5f21 --- /dev/null +++ b/UKSF.Api.Personnel/Commands/ConnectTeamspeakIdToAccountCommand.cs @@ -0,0 +1,81 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using MongoDB.Driver; +using UKSF.Api.Base.Events; +using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Exceptions; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Extensions; + +namespace UKSF.Api.Personnel.Commands +{ + public interface IConnectTeamspeakIdToAccountCommand + { + Task ExecuteAsync(ConnectTeamspeakIdToAccountCommandArgs args); + } + + public class ConnectTeamspeakIdToAccountCommandArgs + { + public ConnectTeamspeakIdToAccountCommandArgs(string accountId, string teamspeakId, string code) + { + AccountId = accountId; + TeamspeakId = teamspeakId; + Code = code; + } + + public string AccountId { get; } + public string TeamspeakId { get; } + public string Code { get; } + } + + public class ConnectTeamspeakIdToAccountCommand : IConnectTeamspeakIdToAccountCommand + { + private readonly IAccountContext _accountContext; + private readonly IConfirmationCodeService _confirmationCodeService; + private readonly IEventBus _eventBus; + private readonly ILogger _logger; + private readonly INotificationsService _notificationsService; + + public ConnectTeamspeakIdToAccountCommand( + IEventBus eventBus, + ILogger logger, + IAccountContext accountContext, + IConfirmationCodeService confirmationCodeService, + INotificationsService notificationsService + ) + { + _eventBus = eventBus; + _logger = logger; + _accountContext = accountContext; + _confirmationCodeService = confirmationCodeService; + _notificationsService = notificationsService; + } + + public async Task ExecuteAsync(ConnectTeamspeakIdToAccountCommandArgs args) + { + DomainAccount domainAccount = _accountContext.GetSingle(args.AccountId); + string teamspeakId = await _confirmationCodeService.GetConfirmationCodeValue(args.Code); + if (string.IsNullOrWhiteSpace(teamspeakId) || teamspeakId != args.TeamspeakId) + { + await _confirmationCodeService.ClearConfirmationCodes(x => x.Value == args.TeamspeakId); + throw new InvalidConfirmationCodeException(); + } + + domainAccount.TeamspeakIdentities ??= new(); + domainAccount.TeamspeakIdentities.Add(int.Parse(teamspeakId)); + await _accountContext.Update(domainAccount.Id, Builders.Update.Set(x => x.TeamspeakIdentities, domainAccount.TeamspeakIdentities)); + + DomainAccount updatedAccount = _accountContext.GetSingle(domainAccount.Id); + _eventBus.Send(updatedAccount); + _notificationsService.SendTeamspeakNotification( + new HashSet { teamspeakId.ToInt() }, + $"This teamspeak identity has been linked to the account with email '{updatedAccount.Email}'\nIf this was not done by you, please contact an admin" + ); + _logger.LogAudit($"Teamspeak ID {teamspeakId} added for {updatedAccount.Id}"); + + return updatedAccount; + } + } +} diff --git a/UKSF.Api.Personnel/Context/AccountContext.cs b/UKSF.Api.Personnel/Context/AccountContext.cs index 618a1e08..6d37ae77 100644 --- a/UKSF.Api.Personnel/Context/AccountContext.cs +++ b/UKSF.Api.Personnel/Context/AccountContext.cs @@ -4,13 +4,16 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Personnel.Context { - public interface IAccountContext : IMongoContext, ICachedMongoContext { } +namespace UKSF.Api.Personnel.Context +{ + public interface IAccountContext : IMongoContext, ICachedMongoContext { } - public class AccountContext : CachedMongoContext, IAccountContext { + public class AccountContext : CachedMongoContext, IAccountContext + { public Guid Id; - public AccountContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "accounts") { + public AccountContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "accounts") + { Id = Guid.NewGuid(); } } diff --git a/UKSF.Api.Personnel/Controllers/AccountsController.cs b/UKSF.Api.Personnel/Controllers/AccountsController.cs index fe4667fa..3c61f990 100644 --- a/UKSF.Api.Personnel/Controllers/AccountsController.cs +++ b/UKSF.Api.Personnel/Controllers/AccountsController.cs @@ -6,29 +6,38 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MongoDB.Driver; +using NameCase; using Newtonsoft.Json.Linq; using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; -using UKSF.Api.Personnel.Extensions; +using UKSF.Api.Personnel.Exceptions; +using UKSF.Api.Personnel.Mappers; using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Models.Parameters; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; +using UKSF.Api.Shared.Commands; using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Exceptions; using UKSF.Api.Shared.Extensions; +using UKSF.Api.Shared.Queries; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ [Route("[controller]")] - public class AccountsController : Controller { + public class AccountsController : Controller + { private readonly IAccountContext _accountContext; - private readonly IEventBus _eventBus; + private readonly IAccountMapper _accountMapper; private readonly IAccountService _accountService; private readonly IConfirmationCodeService _confirmationCodeService; private readonly IDisplayNameService _displayNameService; - private readonly IEmailService _emailService; + private readonly IEventBus _eventBus; private readonly IHttpContextService _httpContextService; private readonly ILogger _logger; private readonly IRanksService _ranksService; + private readonly ISendTemplatedEmailCommand _sendTemplatedEmailCommand; public AccountsController( IAccountContext accountContext, @@ -37,120 +46,142 @@ public AccountsController( IAccountService accountService, IDisplayNameService displayNameService, IHttpContextService httpContextService, - IEmailService emailService, + ISendTemplatedEmailCommand sendTemplatedEmailCommand, IEventBus eventBus, - ILogger logger - ) { + ILogger logger, + IAccountMapper accountMapper + ) + { _accountContext = accountContext; _confirmationCodeService = confirmationCodeService; _ranksService = ranksService; _accountService = accountService; _displayNameService = displayNameService; _httpContextService = httpContextService; - _emailService = emailService; + _sendTemplatedEmailCommand = sendTemplatedEmailCommand; _eventBus = eventBus; _logger = logger; + _accountMapper = accountMapper; } [HttpGet, Authorize] - public IActionResult Get() { - Account account = _accountService.GetUserAccount(); - return Ok(PubliciseAccount(account)); + public Account Get() + { + DomainAccount domainAccount = _accountService.GetUserAccount(); + return _accountMapper.MapToAccount(domainAccount); } [HttpGet("{id}"), Authorize] - public IActionResult GetById(string id) { - Account account = _accountContext.GetSingle(id); - return Ok(PubliciseAccount(account)); + public Account GetById(string id) + { + DomainAccount domainAccount = _accountContext.GetSingle(id); + return _accountMapper.MapToAccount(domainAccount); } [HttpPut] - public async Task Put([FromBody] JObject body) { - string email = body["email"].ToString(); - if (_accountContext.Get(x => string.Equals(x.Email, email, StringComparison.InvariantCultureIgnoreCase)).Any()) { - return BadRequest(new { error = "an account with this email or username exists" }); + public async Task Put([FromBody] CreateAccount createAccount) + { + if (_accountContext.Get(x => string.Equals(x.Email, createAccount.Email, StringComparison.InvariantCultureIgnoreCase)).Any()) + { + throw new AccountAlreadyExistsException(); } - Account account = new() { - Email = email, - Password = BCrypt.Net.BCrypt.HashPassword(body["password"].ToString()), - Firstname = body["firstname"].ToString().ToTitleCase(), - Lastname = body["lastname"].ToString().ToTitleCase(), - Dob = DateTime.ParseExact($"{body["dobGroup"]["year"]}-{body["dobGroup"]["month"]}-{body["dobGroup"]["day"]}", "yyyy-M-d", CultureInfo.InvariantCulture), - Nation = body["nation"].ToString(), + DomainAccount domainAccount = new() + { + Email = createAccount.Email, + Password = BCrypt.Net.BCrypt.HashPassword(createAccount.Password), + Firstname = createAccount.FirstName.Trim().ToTitleCase(), + Lastname = createAccount.LastName.Trim().ToNameCase(), + Dob = DateTime.ParseExact($"{createAccount.DobYear}-{createAccount.DobMonth}-{createAccount.DobDay}", "yyyy-M-d", CultureInfo.InvariantCulture), + Nation = createAccount.Nation, MembershipState = MembershipState.UNCONFIRMED }; - await _accountContext.Add(account); - await SendConfirmationCode(account); - _logger.LogAudit($"New account created: '{account.Firstname} {account.Lastname}, {account.Email}'", _accountContext.GetSingle(x => x.Email == account.Email).Id); - return Ok(new { email = account.Email }); + await _accountContext.Add(domainAccount); + await SendConfirmationCode(domainAccount); + + DomainAccount createdAccount = _accountContext.GetSingle(x => x.Email == domainAccount.Email); + _logger.LogAudit($"New account created: '{domainAccount.Firstname} {domainAccount.Lastname}, {domainAccount.Email}'", createdAccount.Id); + + return _accountMapper.MapToAccount(createdAccount); } [HttpPost, Authorize] - public async Task ApplyConfirmationCode([FromBody] JObject body) { + public async Task ApplyConfirmationCode([FromBody] JObject body) + { string email = body.GetValueFromBody("email"); string code = body.GetValueFromBody("code"); - try { + try + { GuardUtilites.ValidateString(email, _ => throw new ArgumentException($"Email '{email}' is invalid. Please refresh the page.")); GuardUtilites.ValidateId(code, _ => throw new ArgumentException($"Code '{code}' is invalid. Please try again")); - } catch (ArgumentException exception) { - return BadRequest(new { error = exception.Message }); + } + catch (ArgumentException exception) + { + throw new BadRequestException(exception.Message); } - Account account = _accountContext.GetSingle(x => x.Email == email); - if (account == null) { - return BadRequest(new { error = $"An account with the email '{email}' doesn't exist. This should be impossible so please contact an admin for help" }); + DomainAccount domainAccount = _accountContext.GetSingle(x => x.Email == email); + if (domainAccount == null) + { + throw new BadRequestException($"An account with the email '{email}' doesn't exist. This should be impossible so please contact an admin for help"); } - string value = await _confirmationCodeService.GetConfirmationCode(code); - if (value == email) { - await _accountContext.Update(account.Id, x => x.MembershipState, MembershipState.CONFIRMED); - _logger.LogAudit($"Email address confirmed for {account.Id}"); - return Ok(); + string value = await _confirmationCodeService.GetConfirmationCodeValue(code); + if (value == email) + { + await _accountContext.Update(domainAccount.Id, x => x.MembershipState, MembershipState.CONFIRMED); + _logger.LogAudit($"Email address confirmed for {domainAccount.Id}"); + return; } await _confirmationCodeService.ClearConfirmationCodes(x => x.Value == email); - await SendConfirmationCode(account); - return BadRequest(new { error = $"The confirmation code was invalid or expired. A new code has been sent to '{account.Email}'" }); + await SendConfirmationCode(domainAccount); + throw new BadRequestException($"The confirmation code was invalid or expired. A new code has been sent to '{domainAccount.Email}'"); } [HttpPost("resend-email-code"), Authorize] - public async Task ResendConfirmationCode() { - Account account = _accountService.GetUserAccount(); + public async Task ResendConfirmationCode() + { + DomainAccount domainAccount = _accountService.GetUserAccount(); - if (account.MembershipState != MembershipState.UNCONFIRMED) { - return BadRequest(new { error = "Account email has already been confirmed" }); + if (domainAccount.MembershipState != MembershipState.UNCONFIRMED) + { + throw new AccountAlreadyConfirmedException(); } - await _confirmationCodeService.ClearConfirmationCodes(x => x.Value == account.Email); - await SendConfirmationCode(account); - return Ok(PubliciseAccount(account)); + await _confirmationCodeService.ClearConfirmationCodes(x => x.Value == domainAccount.Email); + await SendConfirmationCode(domainAccount); + return _accountMapper.MapToAccount(domainAccount); } [HttpGet("under"), Authorize(Roles = Permissions.COMMAND)] - public IActionResult GetAccountsUnder([FromQuery] bool reverse = false) { + public List GetAccountsUnder([FromQuery] bool reverse = false) + { List accounts = new(); - List memberAccounts = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER).ToList(); + List memberAccounts = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER).ToList(); memberAccounts = memberAccounts.OrderBy(x => x.Rank, new RankComparer(_ranksService)).ThenBy(x => x.Lastname).ThenBy(x => x.Firstname).ToList(); - if (reverse) { + if (reverse) + { memberAccounts.Reverse(); } accounts.AddRange(memberAccounts.Select(x => new { value = x.Id, displayValue = _displayNameService.GetDisplayName(x) })); - return Ok(accounts); + return accounts; } [HttpGet("roster"), Authorize] - public IEnumerable GetRosterAccounts() { - IEnumerable accounts = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER); + public IEnumerable GetRosterAccounts() + { + IEnumerable accounts = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER); IEnumerable accountObjects = accounts.OrderBy(x => x.Rank, new RankComparer(_ranksService)) .ThenBy(x => x.Lastname) .ThenBy(x => x.Firstname) .Select( - x => new RosterAccount { + x => new RosterAccount + { Id = x.Id, Nation = x.Nation, Rank = x.Rank, @@ -163,55 +194,50 @@ public IEnumerable GetRosterAccounts() { } [HttpGet("exists")] - public IActionResult CheckUsernameOrEmailExists([FromQuery] string check) { - return Ok(_accountContext.Get().Any(x => string.Equals(x.Email, check, StringComparison.InvariantCultureIgnoreCase)) ? new { exists = true } : new { exists = false }); + public bool CheckUsernameOrEmailExists([FromQuery] string check) + { + return _accountContext.Get().Any(x => string.Equals(x.Email, check, StringComparison.InvariantCultureIgnoreCase)); } [HttpPut("name"), Authorize] - public async Task ChangeName([FromBody] JObject changeNameRequest) { - Account account = _accountService.GetUserAccount(); - await _accountContext.Update( - account.Id, - Builders.Update.Set(x => x.Firstname, changeNameRequest["firstname"].ToString()).Set(x => x.Lastname, changeNameRequest["lastname"].ToString()) - ); - _logger.LogAudit($"{account.Lastname}, {account.Firstname} changed their name to {changeNameRequest["lastname"]}, {changeNameRequest["firstname"]}"); - _eventBus.Send(_accountContext.GetSingle(account.Id)); - return Ok(); + public async Task ChangeName([FromBody] ChangeName changeName) + { + DomainAccount domainAccount = _accountService.GetUserAccount(); + string firstName = changeName.FirstName.Trim().ToTitleCase(); + string lastName = changeName.LastName.Trim().ToNameCase(); + + await _accountContext.Update(domainAccount.Id, Builders.Update.Set(x => x.Firstname, firstName).Set(x => x.Lastname, lastName)); + _logger.LogAudit($"{domainAccount.Lastname}, {domainAccount.Firstname} changed their name to {lastName}, {firstName}"); + _eventBus.Send(_accountContext.GetSingle(domainAccount.Id)); } [HttpPut("password"), Authorize] - public async Task ChangePassword([FromBody] JObject changePasswordRequest) { + public async Task ChangePassword([FromBody] JObject changePasswordRequest) + { string contextId = _httpContextService.GetUserId(); await _accountContext.Update(contextId, x => x.Password, BCrypt.Net.BCrypt.HashPassword(changePasswordRequest["password"].ToString())); _logger.LogAudit($"Password changed for {contextId}"); - return Ok(); } [HttpPost("updatesetting/{id}"), Authorize] - public async Task UpdateSetting(string id, [FromBody] AccountSettings settings) { - Account account = string.IsNullOrEmpty(id) ? _accountService.GetUserAccount() : _accountContext.GetSingle(id); - await _accountContext.Update(account.Id, Builders.Update.Set(x => x.Settings, settings)); - _logger.LogAudit($"Account settings updated: {account.Settings.Changes(settings)}"); - return Ok(); + public async Task UpdateSetting(string id, [FromBody] AccountSettings settings) + { + DomainAccount domainAccount = string.IsNullOrEmpty(id) ? _accountService.GetUserAccount() : _accountContext.GetSingle(id); + await _accountContext.Update(domainAccount.Id, Builders.Update.Set(x => x.Settings, settings)); + _logger.LogAudit($"Account settings updated: {domainAccount.Settings.Changes(settings)}"); } [HttpGet("test")] - public IActionResult Test() { + public string Test() + { _logger.LogInfo("This is a test"); - return Ok(new { value = DateTime.Now.ToLongTimeString() }); - } - - private PublicAccount PubliciseAccount(Account account) { - PublicAccount publicAccount = account.ToPublicAccount(); - publicAccount.DisplayName = _displayNameService.GetDisplayName(account); - return publicAccount; + return DateTime.Now.ToLongTimeString(); } - private async Task SendConfirmationCode(Account account) { - string code = await _confirmationCodeService.CreateConfirmationCode(account.Email); - string htmlContent = - $"Your email was given for an application to join UKSF
Copy this code to your clipboard and return to the UKSF website application page to enter the code:

{code}


If this request was not made by you, please contact an admin

"; - _emailService.SendEmail(account.Email, "UKSF Email Confirmation", htmlContent); + private async Task SendConfirmationCode(DomainAccount domainAccount) + { + string code = await _confirmationCodeService.CreateConfirmationCode(domainAccount.Email); + await _sendTemplatedEmailCommand.ExecuteAsync(new(domainAccount.Email, "UKSF Account Confirmation", TemplatedEmailNames.AccountConfirmationTemplate, new() { { "code", code } })); } } } diff --git a/UKSF.Api.Personnel/Controllers/ApplicationsController.cs b/UKSF.Api.Personnel/Controllers/ApplicationsController.cs index 69708203..c42bf98f 100644 --- a/UKSF.Api.Personnel/Controllers/ApplicationsController.cs +++ b/UKSF.Api.Personnel/Controllers/ApplicationsController.cs @@ -13,9 +13,11 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ [Route("[controller]")] - public class ApplicationsController : Controller { + public class ApplicationsController : Controller + { private readonly IAccountContext _accountContext; private readonly IAccountService _accountService; private readonly IAssignmentService _assignmentService; @@ -34,7 +36,8 @@ public ApplicationsController( INotificationsService notificationsService, IDisplayNameService displayNameService, ILogger logger - ) { + ) + { _accountContext = accountContext; _commentThreadContext = commentThreadContext; _assignmentService = assignmentService; @@ -46,73 +49,79 @@ ILogger logger } [HttpPost, Authorize, Permissions(Permissions.CONFIRMED)] - public async Task Post([FromBody] JObject body) { - Account account = _accountService.GetUserAccount(); - await Update(body, account); + public async Task Post([FromBody] JObject body) + { + DomainAccount domainAccount = _accountService.GetUserAccount(); + await Update(body, domainAccount); CommentThread recruiterCommentThread = new() { Authors = _recruitmentService.GetRecruiterLeads().Values.ToArray(), Mode = ThreadMode.RECRUITER }; - CommentThread applicationCommentThread = new() { Authors = new[] { account.Id }, Mode = ThreadMode.RECRUITER }; + CommentThread applicationCommentThread = new() { Authors = new[] { domainAccount.Id }, Mode = ThreadMode.RECRUITER }; await _commentThreadContext.Add(recruiterCommentThread); await _commentThreadContext.Add(applicationCommentThread); - Application application = new() { + Application application = new() + { DateCreated = DateTime.Now, State = ApplicationState.WAITING, Recruiter = _recruitmentService.GetRecruiter(), RecruiterCommentThread = recruiterCommentThread.Id, ApplicationCommentThread = applicationCommentThread.Id }; - await _accountContext.Update(account.Id, Builders.Update.Set(x => x.Application, application)); - account = _accountContext.GetSingle(account.Id); - Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, "", "Applicant", "Candidate", reason: "you were entered into the recruitment process"); + await _accountContext.Update(domainAccount.Id, Builders.Update.Set(x => x.Application, application)); + domainAccount = _accountContext.GetSingle(domainAccount.Id); + Notification notification = await _assignmentService.UpdateUnitRankAndRole(domainAccount.Id, "", "Applicant", "Candidate", reason: "you were entered into the recruitment process"); _notificationsService.Add(notification); _notificationsService.Add( - new Notification { + new() + { Owner = application.Recruiter, Icon = NotificationIcons.APPLICATION, - Message = $"You have been assigned {account.Firstname} {account.Lastname}'s application", - Link = $"/recruitment/{account.Id}" + Message = $"You have been assigned {domainAccount.Firstname} {domainAccount.Lastname}'s application", + Link = $"/recruitment/{domainAccount.Id}" } ); - foreach (string id in _recruitmentService.GetRecruiterLeads().Values.Where(x => account.Application.Recruiter != x)) { + foreach (string id in _recruitmentService.GetRecruiterLeads().Values.Where(x => domainAccount.Application.Recruiter != x)) + { _notificationsService.Add( - new Notification { + new() + { Owner = id, Icon = NotificationIcons.APPLICATION, - Message = $"{_displayNameService.GetDisplayName(account.Application.Recruiter)} has been assigned {account.Firstname} {account.Lastname}'s application", - Link = $"/recruitment/{account.Id}" + Message = $"{_displayNameService.GetDisplayName(domainAccount.Application.Recruiter)} has been assigned {domainAccount.Firstname} {domainAccount.Lastname}'s application", + Link = $"/recruitment/{domainAccount.Id}" } ); } - _logger.LogAudit($"Application submitted for {account.Id}. Assigned to {_displayNameService.GetDisplayName(account.Application.Recruiter)}"); - return Ok(); + _logger.LogAudit($"Application submitted for {domainAccount.Id}. Assigned to {_displayNameService.GetDisplayName(domainAccount.Application.Recruiter)}"); } [HttpPost("update"), Authorize, Permissions(Permissions.CONFIRMED)] - public async Task PostUpdate([FromBody] JObject body) { - Account account = _accountService.GetUserAccount(); - await Update(body, account); + public async Task PostUpdate([FromBody] JObject body) + { + DomainAccount domainAccount = _accountService.GetUserAccount(); + await Update(body, domainAccount); _notificationsService.Add( - new Notification { - Owner = account.Application.Recruiter, + new() + { + Owner = domainAccount.Application.Recruiter, Icon = NotificationIcons.APPLICATION, - Message = $"{account.Firstname} {account.Lastname} updated their application", - Link = $"/recruitment/{account.Id}" + Message = $"{domainAccount.Firstname} {domainAccount.Lastname} updated their application", + Link = $"/recruitment/{domainAccount.Id}" } ); - string difference = account.Changes(_accountContext.GetSingle(account.Id)); - _logger.LogAudit($"Application updated for {account.Id}: {difference}"); - return Ok(); + string difference = domainAccount.Changes(_accountContext.GetSingle(domainAccount.Id)); + _logger.LogAudit($"Application updated for {domainAccount.Id}: {difference}"); } - private async Task Update(JObject body, Account account) { + private async Task Update(JObject body, DomainAccount domainAccount) + { await _accountContext.Update( - account.Id, - Builders.Update.Set(x => x.ArmaExperience, body["armaExperience"].ToString()) - .Set(x => x.UnitsExperience, body["unitsExperience"].ToString()) - .Set(x => x.Background, body["background"].ToString()) - .Set(x => x.MilitaryExperience, string.Equals(body["militaryExperience"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) - .Set(x => x.RolePreferences, body["rolePreferences"].ToObject>()) - .Set(x => x.Reference, body["reference"].ToString()) + domainAccount.Id, + Builders.Update.Set(x => x.ArmaExperience, body["armaExperience"].ToString()) + .Set(x => x.UnitsExperience, body["unitsExperience"].ToString()) + .Set(x => x.Background, body["background"].ToString()) + .Set(x => x.MilitaryExperience, string.Equals(body["militaryExperience"].ToString(), "true", StringComparison.InvariantCultureIgnoreCase)) + .Set(x => x.RolePreferences, body["rolePreferences"].ToObject>()) + .Set(x => x.Reference, body["reference"].ToString()) ); } } diff --git a/UKSF.Api.Personnel/Controllers/CommentThreadController.cs b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs index 65741a7f..f39a9662 100644 --- a/UKSF.Api.Personnel/Controllers/CommentThreadController.cs +++ b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs @@ -11,9 +11,11 @@ using UKSF.Api.Shared; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ [Route("commentthread"), Permissions(Permissions.CONFIRMED, Permissions.MEMBER, Permissions.DISCHARGED)] - public class CommentThreadController : Controller { + public class CommentThreadController : Controller + { private readonly IAccountContext _accountContext; private readonly IAccountService _accountService; private readonly ICommentThreadContext _commentThreadContext; @@ -34,7 +36,8 @@ public CommentThreadController( IRecruitmentService recruitmentService, INotificationsService notificationsService, IHttpContextService httpContextService - ) { + ) + { _accountContext = accountContext; _commentThreadContext = commentThreadContext; _commentThreadService = commentThreadService; @@ -47,51 +50,57 @@ IHttpContextService httpContextService } [HttpGet("{id}"), Authorize] - public IActionResult Get(string id) { + public CommentThreadsDataset Get(string id) + { IEnumerable comments = _commentThreadService.GetCommentThreadComments(id); - return Ok( - new { - comments = comments.Select( - comment => new { - Id = comment.Id.ToString(), - Author = comment.Author.ToString(), - DisplayName = _displayNameService.GetDisplayName(comment.Author), - comment.Content, - comment.Timestamp - } - ) - } - ); + return new() + { + Comments = comments.Select( + comment => new CommentThreadDataset + { + Id = comment.Id.ToString(), + Author = comment.Author.ToString(), + DisplayName = _displayNameService.GetDisplayName(comment.Author), + Content = comment.Content, + Timestamp = comment.Timestamp + } + ) + }; } [HttpGet("canpost/{id}"), Authorize] - public IActionResult GetCanPostComment(string id) { + public bool GetCanPostComment(string id) + { CommentThread commentThread = _commentThreadContext.GetSingle(id); - Account account = _accountService.GetUserAccount(); + DomainAccount domainAccount = _accountService.GetUserAccount(); bool admin = _httpContextService.UserHasPermission(Permissions.ADMIN); - bool canPost = commentThread.Mode switch { + bool canPost = commentThread.Mode switch + { ThreadMode.RECRUITER => commentThread.Authors.Any(x => x == _httpContextService.GetUserId()) || admin || _recruitmentService.IsRecruiter(_accountService.GetUserAccount()), - ThreadMode.RANKSUPERIOR => commentThread.Authors.Any(x => admin || _ranksService.IsSuperior(account.Rank, _accountContext.GetSingle(x).Rank)), - ThreadMode.RANKEQUAL => commentThread.Authors.Any(x => admin || _ranksService.IsEqual(account.Rank, _accountContext.GetSingle(x).Rank)), - ThreadMode.RANKSUPERIOROREQUAL => commentThread.Authors.Any(x => admin || _ranksService.IsSuperiorOrEqual(account.Rank, _accountContext.GetSingle(x).Rank)), + ThreadMode.RANKSUPERIOR => commentThread.Authors.Any(x => admin || _ranksService.IsSuperior(domainAccount.Rank, _accountContext.GetSingle(x).Rank)), + ThreadMode.RANKEQUAL => commentThread.Authors.Any(x => admin || _ranksService.IsEqual(domainAccount.Rank, _accountContext.GetSingle(x).Rank)), + ThreadMode.RANKSUPERIOROREQUAL => commentThread.Authors.Any(x => admin || _ranksService.IsSuperiorOrEqual(domainAccount.Rank, _accountContext.GetSingle(x).Rank)), _ => true }; - return Ok(new { canPost }); + return canPost; } [HttpPut("{commentThreadId}"), Authorize] - public async Task AddComment(string commentThreadId, [FromBody] Comment comment) { + public async Task AddComment(string commentThreadId, [FromBody] Comment comment) + { comment.Id = ObjectId.GenerateNewId().ToString(); comment.Timestamp = DateTime.Now; comment.Author = _httpContextService.GetUserId(); await _commentThreadService.InsertComment(commentThreadId, comment); CommentThread thread = _commentThreadContext.GetSingle(commentThreadId); IEnumerable participants = _commentThreadService.GetCommentThreadParticipants(thread.Id); - foreach (string objectId in participants.Where(x => x != comment.Author)) { + foreach (string objectId in participants.Where(x => x != comment.Author)) + { // TODO: Set correct link when comment thread is between /application and /recruitment/id _notificationsService.Add( - new Notification { + new() + { Owner = objectId, Icon = NotificationIcons.COMMENT, Message = $"{_displayNameService.GetDisplayName(comment.Author)} replied to a comment:\n\"{comment.Content}\"", @@ -99,16 +108,14 @@ public async Task AddComment(string commentThreadId, [FromBody] C } ); } - - return Ok(); } [HttpPost("{id}/{commentId}"), Authorize] - public async Task DeleteComment(string id, string commentId) { + public async Task DeleteComment(string id, string commentId) + { List comments = _commentThreadService.GetCommentThreadComments(id).ToList(); Comment comment = comments.FirstOrDefault(x => x.Id == commentId); await _commentThreadService.RemoveComment(id, comment); - return Ok(); } } } diff --git a/UKSF.Api.Personnel/Controllers/CommunicationsController.cs b/UKSF.Api.Personnel/Controllers/CommunicationsController.cs deleted file mode 100644 index 12652f14..00000000 --- a/UKSF.Api.Personnel/Controllers/CommunicationsController.cs +++ /dev/null @@ -1,135 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using MongoDB.Driver; -using Newtonsoft.Json.Linq; -using UKSF.Api.Base.Events; -using UKSF.Api.Personnel.Context; -using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Extensions; - -namespace UKSF.Api.Personnel.Controllers -{ - // TODO: Needs to be renamed and singled out. Won't be any other communication connections to add - [Route("[controller]")] - public class CommunicationsController : Controller - { - private readonly IAccountContext _accountContext; - private readonly IAccountService _accountService; - private readonly IConfirmationCodeService _confirmationCodeService; - private readonly IEventBus _eventBus; - private readonly ILogger _logger; - private readonly INotificationsService _notificationsService; - - public CommunicationsController( - IAccountContext accountContext, - IConfirmationCodeService confirmationCodeService, - IAccountService accountService, - INotificationsService notificationsService, - ILogger logger, - IEventBus eventBus - ) - { - _accountContext = accountContext; - _confirmationCodeService = confirmationCodeService; - _accountService = accountService; - _notificationsService = notificationsService; - _logger = logger; - _eventBus = eventBus; - } - - [HttpGet, Authorize] - public IActionResult GetTeamspeakStatus() - { - return Ok(new { isConnected = _accountService.GetUserAccount().TeamspeakIdentities?.Count > 0 }); - } - - [HttpPost("send"), Authorize] - public async Task SendCode([FromBody] JObject body) - { - string mode = body.GetValueFromBody("mode"); - string data = body.GetValueFromBody("data"); - - try - { - GuardUtilites.ValidateString(mode, _ => throw new ArgumentException("Mode is invalid")); - GuardUtilites.ValidateString(data, _ => throw new ArgumentException("Data is invalid")); - } - catch (ArgumentException exception) - { - return BadRequest(new { error = exception.Message }); - } - - return mode switch - { - "teamspeak" => await SendTeamspeakCode(data), - _ => BadRequest(new { error = $"Mode '{mode}' not recognized" }) - }; - } - - [HttpPost("receive"), Authorize] - public async Task ReceiveCode([FromBody] JObject body) - { - string id = body.GetValueFromBody("id"); - string code = body.GetValueFromBody("code"); - string mode = body.GetValueFromBody("mode"); - string data = body.GetValueFromBody("data"); - string[] dataArray = data.Split(','); - - try - { - GuardUtilites.ValidateId(id, _ => throw new ArgumentException($"Id '{id}' is invalid")); - GuardUtilites.ValidateId(code, _ => throw new ArgumentException($"Code '{code}' is invalid. Please try again")); - GuardUtilites.ValidateString(mode, _ => throw new ArgumentException("Mode is invalid")); - GuardUtilites.ValidateString(data, _ => throw new ArgumentException("Data is invalid")); - GuardUtilites.ValidateArray(dataArray, x => x.Length > 0, _ => true, () => throw new ArgumentException("Data array is empty")); - } - catch (ArgumentException exception) - { - return BadRequest(new { error = exception.Message }); - } - - return mode switch - { - "teamspeak" => await ReceiveTeamspeakCode(id, code, dataArray[0]), - _ => BadRequest(new { error = $"Mode '{mode}' not recognized" }) - }; - } - - private async Task SendTeamspeakCode(string teamspeakDbId) - { - string code = await _confirmationCodeService.CreateConfirmationCode(teamspeakDbId); - _notificationsService.SendTeamspeakNotification( - new HashSet { teamspeakDbId.ToDouble() }, - $"This Teamspeak ID was selected for connection to the website. Copy this code to your clipboard and return to the UKSF website application page to enter the code:\n{code}\nIf this request was not made by you, please contact an admin" - ); - return Ok(); - } - - private async Task ReceiveTeamspeakCode(string id, string code, string checkId) - { - Account account = _accountContext.GetSingle(id); - string teamspeakId = await _confirmationCodeService.GetConfirmationCode(code); - if (string.IsNullOrWhiteSpace(teamspeakId) || teamspeakId != checkId) - { - return BadRequest(new { error = "The confirmation code has expired or is invalid. Please try again" }); - } - - account.TeamspeakIdentities ??= new(); - account.TeamspeakIdentities.Add(double.Parse(teamspeakId)); - await _accountContext.Update(account.Id, Builders.Update.Set("teamspeakIdentities", account.TeamspeakIdentities)); - account = _accountContext.GetSingle(account.Id); - _eventBus.Send(account); - _notificationsService.SendTeamspeakNotification( - new HashSet { teamspeakId.ToDouble() }, - $"This teamspeak identity has been linked to the account with email '{account.Email}'\nIf this was not done by you, please contact an admin" - ); - _logger.LogAudit($"Teamspeak ID {teamspeakId} added for {account.Id}"); - return Ok(); - } - } -} diff --git a/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs b/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs index 3204236d..da68fad2 100644 --- a/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs +++ b/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs @@ -5,27 +5,25 @@ using Newtonsoft.Json.Linq; using UKSF.Api.Base.Events; using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Exceptions; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ [Route("[controller]")] - public class DiscordCodeController : Controller { + public class DiscordCodeController : Controller + { private readonly IAccountContext _accountContext; - private readonly IEventBus _eventBus; private readonly IConfirmationCodeService _confirmationCodeService; + private readonly IEventBus _eventBus; private readonly IHttpContextService _httpContextService; private readonly ILogger _logger; - public DiscordCodeController( - IAccountContext accountContext, - IConfirmationCodeService confirmationCodeService, - IHttpContextService httpContextService, - IEventBus eventBus, - ILogger logger - ) { + public DiscordCodeController(IAccountContext accountContext, IConfirmationCodeService confirmationCodeService, IHttpContextService httpContextService, IEventBus eventBus, ILogger logger) + { _accountContext = accountContext; _confirmationCodeService = confirmationCodeService; _httpContextService = httpContextService; @@ -34,18 +32,19 @@ ILogger logger } [HttpPost("{discordId}"), Authorize] - public async Task DiscordConnect(string discordId, [FromBody] JObject body) { - string value = await _confirmationCodeService.GetConfirmationCode(body["code"].ToString()); - if (string.IsNullOrEmpty(value) || value != discordId) { - return BadRequest(new { error = "Code was invalid or expired. Please try again" }); + public async Task DiscordConnect(string discordId, [FromBody] JObject body) + { + string value = await _confirmationCodeService.GetConfirmationCodeValue(body["code"].ToString()); + if (string.IsNullOrEmpty(value) || value != discordId) + { + throw new DiscordConnectFailedException(); } string id = _httpContextService.GetUserId(); - await _accountContext.Update(id, Builders.Update.Set(x => x.DiscordId, discordId)); - Account account = _accountContext.GetSingle(id); - _eventBus.Send(account); - _logger.LogAudit($"DiscordID updated for {account.Id} to {discordId}"); - return Ok(); + await _accountContext.Update(id, Builders.Update.Set(x => x.DiscordId, discordId)); + DomainAccount domainAccount = _accountContext.GetSingle(id); + _eventBus.Send(domainAccount); + _logger.LogAudit($"DiscordID updated for {domainAccount.Id} to {discordId}"); } } } diff --git a/UKSF.Api.Personnel/Controllers/DisplayNameController.cs b/UKSF.Api.Personnel/Controllers/DisplayNameController.cs index 25c0381f..b78d9ce5 100644 --- a/UKSF.Api.Personnel/Controllers/DisplayNameController.cs +++ b/UKSF.Api.Personnel/Controllers/DisplayNameController.cs @@ -14,9 +14,9 @@ public DisplayNameController(IDisplayNameService displayNameService) } [HttpGet("{id}")] - public IActionResult GetName(string id) + public string GetName(string id) { - return Ok(new { name = _displayNameService.GetDisplayName(id) }); + return _displayNameService.GetDisplayName(id); } } } diff --git a/UKSF.Api.Personnel/Controllers/NotificationsController.cs b/UKSF.Api.Personnel/Controllers/NotificationsController.cs index 5b8a9532..0cdd1a4f 100644 --- a/UKSF.Api.Personnel/Controllers/NotificationsController.cs +++ b/UKSF.Api.Personnel/Controllers/NotificationsController.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; +using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; namespace UKSF.Api.Personnel.Controllers @@ -19,26 +20,24 @@ public NotificationsController(INotificationsService notificationsService) } [HttpGet, Authorize] - public IActionResult Get() + public IOrderedEnumerable Get() { - return Ok(_notificationsService.GetNotificationsForContext().OrderByDescending(x => x.Timestamp)); + return _notificationsService.GetNotificationsForContext().OrderByDescending(x => x.Timestamp); } [HttpPost("read"), Authorize] - public async Task MarkAsRead([FromBody] JObject jObject) + public async Task MarkAsRead([FromBody] JObject jObject) { List ids = JArray.Parse(jObject["notifications"].ToString()).Select(notification => notification["id"].ToString()).ToList(); await _notificationsService.MarkNotificationsAsRead(ids); - return Ok(); } [HttpPost("clear"), Authorize] - public async Task Clear([FromBody] JObject jObject) + public async Task Clear([FromBody] JObject jObject) { JArray clear = JArray.Parse(jObject["clear"].ToString()); List ids = clear.Select(notification => notification["id"].ToString()).ToList(); await _notificationsService.Delete(ids); - return Ok(); } } } diff --git a/UKSF.Api.Personnel/Controllers/RanksController.cs b/UKSF.Api.Personnel/Controllers/RanksController.cs index eee2bcf4..971c0a1a 100644 --- a/UKSF.Api.Personnel/Controllers/RanksController.cs +++ b/UKSF.Api.Personnel/Controllers/RanksController.cs @@ -29,51 +29,50 @@ public RanksController(IAccountContext accountContext, IRanksContext ranksContex } [HttpGet, Authorize] - public IActionResult GetRanks() + public IEnumerable GetRanks() { - return Ok(_ranksContext.Get()); + return _ranksContext.Get(); } [HttpGet("{id}"), Authorize] - public IActionResult GetRanks(string id) + public IEnumerable GetRanks(string id) { - Account account = _accountContext.GetSingle(id); - return Ok(_ranksContext.Get(x => x.Name != account.Rank)); + DomainAccount domainAccount = _accountContext.GetSingle(id); + return _ranksContext.Get(x => x.Name != domainAccount.Rank); } [HttpPost("{check}"), Authorize] - public IActionResult CheckRank(string check, [FromBody] Rank rank = null) + public Rank CheckRank(string check, [FromBody] Rank rank = null) { if (string.IsNullOrEmpty(check)) { - return Ok(); + return null; } if (rank != null) { Rank safeRank = rank; - return Ok(_ranksContext.GetSingle(x => x.Id != safeRank.Id && (x.Name == check || x.TeamspeakGroup == check))); + return _ranksContext.GetSingle(x => x.Id != safeRank.Id && (x.Name == check || x.TeamspeakGroup == check)); } - return Ok(_ranksContext.GetSingle(x => x.Name == check || x.TeamspeakGroup == check)); + return _ranksContext.GetSingle(x => x.Name == check || x.TeamspeakGroup == check); } [HttpPost, Authorize] - public IActionResult CheckRank([FromBody] Rank rank) + public Rank CheckRank([FromBody] Rank rank) { - return rank != null ? Ok(_ranksContext.GetSingle(x => x.Id != rank.Id && (x.Name == rank.Name || x.TeamspeakGroup == rank.TeamspeakGroup))) : Ok(); + return rank == null ? null : _ranksContext.GetSingle(x => x.Id != rank.Id && (x.Name == rank.Name || x.TeamspeakGroup == rank.TeamspeakGroup)); } [HttpPut, Authorize] - public async Task AddRank([FromBody] Rank rank) + public async Task AddRank([FromBody] Rank rank) { await _ranksContext.Add(rank); _logger.LogAudit($"Rank added '{rank.Name}, {rank.Abbreviation}, {rank.TeamspeakGroup}'"); - return Ok(); } [HttpPatch, Authorize] - public async Task EditRank([FromBody] Rank rank) + public async Task> EditRank([FromBody] Rank rank) { Rank oldRank = _ranksContext.GetSingle(x => x.Id == rank.Id); _logger.LogAudit( @@ -86,32 +85,32 @@ await _ranksContext.Update( .Set(x => x.TeamspeakGroup, rank.TeamspeakGroup) .Set(x => x.DiscordRoleId, rank.DiscordRoleId) ); - foreach (Account account in _accountContext.Get(x => x.Rank == oldRank.Name)) + foreach (DomainAccount account in _accountContext.Get(x => x.Rank == oldRank.Name)) { Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, rankString: rank.Name, reason: $"the '{rank.Name}' rank was updated"); _notificationsService.Add(notification); } - return Ok(_ranksContext.Get()); + return _ranksContext.Get(); } [HttpDelete("{id}"), Authorize] - public async Task DeleteRank(string id) + public async Task> DeleteRank(string id) { Rank rank = _ranksContext.GetSingle(x => x.Id == id); _logger.LogAudit($"Rank deleted '{rank.Name}'"); await _ranksContext.Delete(id); - foreach (Account account in _accountContext.Get(x => x.Rank == rank.Name)) + foreach (DomainAccount account in _accountContext.Get(x => x.Rank == rank.Name)) { Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, rankString: AssignmentService.REMOVE_FLAG, reason: $"the '{rank.Name}' rank was deleted"); _notificationsService.Add(notification); } - return Ok(_ranksContext.Get()); + return _ranksContext.Get(); } [HttpPost("order"), Authorize] - public async Task UpdateOrder([FromBody] List newRankOrder) + public async Task> UpdateOrder([FromBody] List newRankOrder) { for (int index = 0; index < newRankOrder.Count; index++) { @@ -122,7 +121,7 @@ public async Task UpdateOrder([FromBody] List newRankOrder) } } - return Ok(_ranksContext.Get()); + return _ranksContext.Get(); } } } diff --git a/UKSF.Api.Personnel/Controllers/RecruitmentController.cs b/UKSF.Api.Personnel/Controllers/RecruitmentController.cs index 5312f7c0..8616445a 100644 --- a/UKSF.Api.Personnel/Controllers/RecruitmentController.cs +++ b/UKSF.Api.Personnel/Controllers/RecruitmentController.cs @@ -11,6 +11,7 @@ using UKSF.Api.Personnel.Services; using UKSF.Api.Shared; using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Exceptions; using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Controllers @@ -49,80 +50,78 @@ ILogger logger } [HttpGet, Authorize, Permissions(Permissions.RECRUITER)] - public IActionResult GetAll() + public ApplicationsOverview GetAll() { - return Ok(_recruitmentService.GetAllApplications()); + return _recruitmentService.GetAllApplications(); } [HttpGet("{id}"), Authorize] - public IActionResult GetSingle(string id) + public DetailedApplication GetSingle(string id) { - Account account = _accountContext.GetSingle(id); - return Ok(_recruitmentService.GetApplication(account)); + DomainAccount domainAccount = _accountContext.GetSingle(id); + return _recruitmentService.GetApplication(domainAccount); } [HttpGet("isrecruiter"), Authorize, Permissions(Permissions.RECRUITER)] - public IActionResult GetIsRecruiter() + public bool GetIsRecruiter() { - return Ok(new { recruiter = _recruitmentService.IsRecruiter(_accountService.GetUserAccount()) }); + return _recruitmentService.IsRecruiter(_accountService.GetUserAccount()); } [HttpGet("stats"), Authorize, Permissions(Permissions.RECRUITER)] - public IActionResult GetRecruitmentStats() + public RecruitmentStatsDataset GetRecruitmentStats() { string account = _httpContextService.GetUserId(); - List activity = new(); - foreach (Account recruiterAccount in _recruitmentService.GetRecruiters()) + List activity = new(); + foreach (DomainAccount recruiterAccount in _recruitmentService.GetRecruiters()) { - List recruiterApplications = _accountContext.Get(x => x.Application != null && x.Application.Recruiter == recruiterAccount.Id).ToList(); + List recruiterApplications = _accountContext.Get(x => x.Application != null && x.Application.Recruiter == recruiterAccount.Id).ToList(); activity.Add( - new + new() { - account = new { id = recruiterAccount.Id, settings = recruiterAccount.Settings }, - name = _displayNameService.GetDisplayName(recruiterAccount), - active = recruiterApplications.Count(x => x.Application.State == ApplicationState.WAITING), - accepted = recruiterApplications.Count(x => x.Application.State == ApplicationState.ACCEPTED), - rejected = recruiterApplications.Count(x => x.Application.State == ApplicationState.REJECTED) + Account = new { id = recruiterAccount.Id, settings = recruiterAccount.Settings }, + Name = _displayNameService.GetDisplayName(recruiterAccount), + Active = recruiterApplications.Count(x => x.Application.State == ApplicationState.WAITING), + Accepted = recruiterApplications.Count(x => x.Application.State == ApplicationState.ACCEPTED), + Rejected = recruiterApplications.Count(x => x.Application.State == ApplicationState.REJECTED) } ); } - return Ok( - new - { - activity, - yourStats = new { lastMonth = _recruitmentService.GetStats(account, true), overall = _recruitmentService.GetStats(account, false) }, - sr1Stats = new { lastMonth = _recruitmentService.GetStats("", true), overall = _recruitmentService.GetStats("", false) } - } - ); + return new() + { + Activity = activity, + YourStats = new() { LastMonth = _recruitmentService.GetStats(account, true), Overall = _recruitmentService.GetStats(account, false) }, + Sr1Stats = new() { LastMonth = _recruitmentService.GetStats("", true), Overall = _recruitmentService.GetStats("", false) } + }; } [HttpPost("{id}"), Authorize, Permissions(Permissions.RECRUITER)] - public async Task UpdateState([FromBody] dynamic body, string id) + public async Task UpdateState([FromBody] dynamic body, string id) { ApplicationState updatedState = body.updatedState; - Account account = _accountContext.GetSingle(id); - if (updatedState == account.Application.State) + DomainAccount domainAccount = _accountContext.GetSingle(id); + if (updatedState == domainAccount.Application.State) { - return Ok(); + return; } string sessionId = _httpContextService.GetUserId(); - await _accountContext.Update(id, Builders.Update.Set(x => x.Application.State, updatedState)); - _logger.LogAudit($"Application state changed for {id} from {account.Application.State} to {updatedState}"); + await _accountContext.Update(id, Builders.Update.Set(x => x.Application.State, updatedState)); + _logger.LogAudit($"Application state changed for {id} from {domainAccount.Application.State} to {updatedState}"); switch (updatedState) { case ApplicationState.ACCEPTED: { - await _accountContext.Update(id, Builders.Update.Set(x => x.Application.DateAccepted, DateTime.Now).Set(x => x.MembershipState, MembershipState.MEMBER)); + await _accountContext.Update(id, Builders.Update.Set(x => x.Application.DateAccepted, DateTime.Now).Set(x => x.MembershipState, MembershipState.MEMBER)); Notification notification = await _assignmentService.UpdateUnitRankAndRole(id, "Basic Training Unit", "Trainee", "Recruit", reason: "your application was accepted"); _notificationsService.Add(notification); break; } case ApplicationState.REJECTED: { - await _accountContext.Update(id, Builders.Update.Set(x => x.Application.DateAccepted, DateTime.Now).Set(x => x.MembershipState, MembershipState.CONFIRMED)); + await _accountContext.Update(id, Builders.Update.Set(x => x.Application.DateAccepted, DateTime.Now).Set(x => x.MembershipState, MembershipState.CONFIRMED)); Notification notification = await _assignmentService.UpdateUnitRankAndRole( id, AssignmentService.REMOVE_FLAG, @@ -139,55 +138,53 @@ public async Task UpdateState([FromBody] dynamic body, string id) { await _accountContext.Update( id, - Builders.Update.Set(x => x.Application.DateCreated, DateTime.Now).Unset(x => x.Application.DateAccepted).Set(x => x.MembershipState, MembershipState.CONFIRMED) + Builders.Update.Set(x => x.Application.DateCreated, DateTime.Now).Unset(x => x.Application.DateAccepted).Set(x => x.MembershipState, MembershipState.CONFIRMED) ); Notification notification = await _assignmentService.UpdateUnitRankAndRole(id, AssignmentService.REMOVE_FLAG, "Applicant", "Candidate", reason: "your application was reactivated"); _notificationsService.Add(notification); - if (_recruitmentService.GetRecruiters().All(x => x.Id != account.Application.Recruiter)) + if (_recruitmentService.GetRecruiters().All(x => x.Id != domainAccount.Application.Recruiter)) { string newRecruiterId = _recruitmentService.GetRecruiter(); - _logger.LogAudit($"Application recruiter for {id} is no longer SR1, reassigning from {account.Application.Recruiter} to {newRecruiterId}"); - await _accountContext.Update(id, Builders.Update.Set(x => x.Application.Recruiter, newRecruiterId)); + _logger.LogAudit($"Application recruiter for {id} is no longer SR1, reassigning from {domainAccount.Application.Recruiter} to {newRecruiterId}"); + await _accountContext.Update(id, Builders.Update.Set(x => x.Application.Recruiter, newRecruiterId)); } break; } - default: throw new ArgumentOutOfRangeException(); + default: throw new BadRequestException($"New state {updatedState} is invalid"); } - account = _accountContext.GetSingle(id); + domainAccount = _accountContext.GetSingle(id); string message = updatedState == ApplicationState.WAITING ? "was reactivated" : $"was {updatedState}"; - if (sessionId != account.Application.Recruiter) + if (sessionId != domainAccount.Application.Recruiter) { _notificationsService.Add( new() { - Owner = account.Application.Recruiter, + Owner = domainAccount.Application.Recruiter, Icon = NotificationIcons.APPLICATION, - Message = $"{account.Firstname} {account.Lastname}'s application {message} by {_displayNameService.GetDisplayName(_accountService.GetUserAccount())}", + Message = $"{domainAccount.Firstname} {domainAccount.Lastname}'s application {message} by {_displayNameService.GetDisplayName(_accountService.GetUserAccount())}", Link = $"/recruitment/{id}" } ); } - foreach (string value in _recruitmentService.GetRecruiterLeads().Values.Where(value => sessionId != value && account.Application.Recruiter != value)) + foreach (string value in _recruitmentService.GetRecruiterLeads().Values.Where(value => sessionId != value && domainAccount.Application.Recruiter != value)) { _notificationsService.Add( new() { Owner = value, Icon = NotificationIcons.APPLICATION, - Message = $"{account.Firstname} {account.Lastname}'s application {message} by {_displayNameService.GetDisplayName(_accountService.GetUserAccount())}", + Message = $"{domainAccount.Firstname} {domainAccount.Lastname}'s application {message} by {_displayNameService.GetDisplayName(_accountService.GetUserAccount())}", Link = $"/recruitment/{id}" } ); } - - return Ok(); } [HttpPost("recruiter/{id}"), Authorize, Permissions(Permissions.RECRUITER_LEAD)] - public async Task PostReassignment([FromBody] JObject newRecruiter, string id) + public async Task PostReassignment([FromBody] JObject newRecruiter, string id) { if (!_httpContextService.UserHasPermission(Permissions.ADMIN) && !_recruitmentService.IsRecruiterLead()) { @@ -196,22 +193,21 @@ public async Task PostReassignment([FromBody] JObject newRecruite string recruiter = newRecruiter["newRecruiter"].ToString(); await _recruitmentService.SetRecruiter(id, recruiter); - Account account = _accountContext.GetSingle(id); - if (account.Application.State == ApplicationState.WAITING) + DomainAccount domainAccount = _accountContext.GetSingle(id); + if (domainAccount.Application.State == ApplicationState.WAITING) { _notificationsService.Add( new() { Owner = recruiter, Icon = NotificationIcons.APPLICATION, - Message = $"{account.Firstname} {account.Lastname}'s application has been transferred to you", - Link = $"/recruitment/{account.Id}" + Message = $"{domainAccount.Firstname} {domainAccount.Lastname}'s application has been transferred to you", + Link = $"/recruitment/{domainAccount.Id}" } ); } _logger.LogAudit($"Application recruiter changed for {id} to {newRecruiter["newRecruiter"]}"); - return Ok(); } [HttpPost("ratings/{id}"), Authorize, Permissions(Permissions.RECRUITER)] @@ -229,7 +225,7 @@ public async Task> Ratings([FromBody] KeyValuePair.Update.Set(x => x.Application.Ratings, ratings)); + await _accountContext.Update(id, Builders.Update.Set(x => x.Application.Ratings, ratings)); return ratings; } diff --git a/UKSF.Api.Personnel/Controllers/RolesController.cs b/UKSF.Api.Personnel/Controllers/RolesController.cs index 2d183f79..c5000774 100644 --- a/UKSF.Api.Personnel/Controllers/RolesController.cs +++ b/UKSF.Api.Personnel/Controllers/RolesController.cs @@ -41,7 +41,7 @@ ILogger logger } [HttpGet, Authorize] - public IActionResult GetRoles([FromQuery] string id = "", [FromQuery] string unitId = "") + public RolesDataset GetRoles([FromQuery] string id = "", [FromQuery] string unitId = "") { if (!string.IsNullOrEmpty(id) && !string.IsNullOrEmpty(unitId)) { @@ -49,76 +49,76 @@ public IActionResult GetRoles([FromQuery] string id = "", [FromQuery] string uni IOrderedEnumerable unitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order); IEnumerable> existingPairs = unit.Roles.Where(x => x.Value == id); IEnumerable filteredRoles = unitRoles.Where(x => existingPairs.All(y => y.Key != x.Name)); - return Ok(filteredRoles); + return new() { UnitRoles = filteredRoles }; } if (!string.IsNullOrEmpty(id)) { - Account account = _accountContext.GetSingle(id); - return Ok(_rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL && x.Name != account.RoleAssignment).OrderBy(x => x.Order)); + DomainAccount domainAccount = _accountContext.GetSingle(id); + return new() { IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL && x.Name != domainAccount.RoleAssignment).OrderBy(x => x.Order) }; } - return Ok(new { individualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), unitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }); + return new() { IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), UnitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }; } [HttpPost("{roleType}/{check}"), Authorize] - public IActionResult CheckRole(RoleType roleType, string check, [FromBody] Role role = null) + public Role CheckRole(RoleType roleType, string check, [FromBody] Role role = null) { if (string.IsNullOrEmpty(check)) { - return Ok(); + return null; } if (role != null) { Role safeRole = role; - return Ok(_rolesContext.GetSingle(x => x.Id != safeRole.Id && x.RoleType == roleType && x.Name == check)); + return _rolesContext.GetSingle(x => x.Id != safeRole.Id && x.RoleType == roleType && x.Name == check); } - return Ok(_rolesContext.GetSingle(x => x.RoleType == roleType && x.Name == check)); + return _rolesContext.GetSingle(x => x.RoleType == roleType && x.Name == check); } [HttpPut, Authorize] - public async Task AddRole([FromBody] Role role) + public async Task AddRole([FromBody] Role role) { await _rolesContext.Add(role); _logger.LogAudit($"Role added '{role.Name}'"); - return Ok(new { individualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), unitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }); + return new() { IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), UnitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }; } [HttpPatch, Authorize] - public async Task EditRole([FromBody] Role role) + public async Task EditRole([FromBody] Role role) { Role oldRole = _rolesContext.GetSingle(x => x.Id == role.Id); _logger.LogAudit($"Role updated from '{oldRole.Name}' to '{role.Name}'"); await _rolesContext.Update(role.Id, x => x.Name, role.Name); - foreach (Account account in _accountContext.Get(x => x.RoleAssignment == oldRole.Name)) + foreach (DomainAccount account in _accountContext.Get(x => x.RoleAssignment == oldRole.Name)) { await _accountContext.Update(account.Id, x => x.RoleAssignment, role.Name); } await _unitsService.RenameRole(oldRole.Name, role.Name); - return Ok(new { individualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), unitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }); + return new() { IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), UnitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }; } [HttpDelete("{id}"), Authorize] - public async Task DeleteRole(string id) + public async Task DeleteRole(string id) { Role role = _rolesContext.GetSingle(x => x.Id == id); _logger.LogAudit($"Role deleted '{role.Name}'"); await _rolesContext.Delete(id); - foreach (Account account in _accountContext.Get(x => x.RoleAssignment == role.Name)) + foreach (DomainAccount account in _accountContext.Get(x => x.RoleAssignment == role.Name)) { Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, role: AssignmentService.REMOVE_FLAG, reason: $"the '{role.Name}' role was deleted"); _notificationsService.Add(notification); } await _unitsService.DeleteRole(role.Name); - return Ok(new { individualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), unitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }); + return new() { IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), UnitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }; } [HttpPost("order"), Authorize] - public async Task UpdateOrder([FromBody] List newRoleOrder) + public async Task> UpdateOrder([FromBody] List newRoleOrder) { for (int index = 0; index < newRoleOrder.Count; index++) { @@ -129,7 +129,7 @@ public async Task UpdateOrder([FromBody] List newRoleOrder) } } - return Ok(_rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order)); + return _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order); } } } diff --git a/UKSF.Api.Personnel/Controllers/SteamCodeController.cs b/UKSF.Api.Personnel/Controllers/SteamCodeController.cs index 4924b08d..ca8f6c5e 100644 --- a/UKSF.Api.Personnel/Controllers/SteamCodeController.cs +++ b/UKSF.Api.Personnel/Controllers/SteamCodeController.cs @@ -3,20 +3,24 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Exceptions; using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Services; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ [Route("[controller]")] - public class SteamCodeController : Controller { + public class SteamCodeController : Controller + { private readonly IAccountContext _accountContext; private readonly IConfirmationCodeService _confirmationCodeService; private readonly IHttpContextService _httpContextService; private readonly ILogger _logger; - public SteamCodeController(IAccountContext accountContext, IConfirmationCodeService confirmationCodeService, IHttpContextService httpContextService, ILogger logger) { + public SteamCodeController(IAccountContext accountContext, IConfirmationCodeService confirmationCodeService, IHttpContextService httpContextService, ILogger logger) + { _accountContext = accountContext; _confirmationCodeService = confirmationCodeService; _httpContextService = httpContextService; @@ -24,17 +28,18 @@ public SteamCodeController(IAccountContext accountContext, IConfirmationCodeServ } [HttpPost("{steamId}"), Authorize] - public async Task SteamConnect(string steamId, [FromBody] JObject body) { - string value = await _confirmationCodeService.GetConfirmationCode(body["code"].ToString()); - if (string.IsNullOrEmpty(value) || value != steamId) { - return BadRequest(new { error = "Code was invalid or expired. Please try again" }); + public async Task SteamConnect(string steamId, [FromBody] JObject body) + { + string value = await _confirmationCodeService.GetConfirmationCodeValue(body["code"].ToString()); + if (string.IsNullOrEmpty(value) || value != steamId) + { + throw new InvalidConfirmationCodeException(); } string id = _httpContextService.GetUserId(); await _accountContext.Update(id, x => x.Steamname, steamId); - Account account = _accountContext.GetSingle(id); - _logger.LogAudit($"SteamID updated for {account.Id} to {steamId}"); - return Ok(); + DomainAccount domainAccount = _accountContext.GetSingle(id); + _logger.LogAudit($"SteamID updated for {domainAccount.Id} to {steamId}"); } } } diff --git a/UKSF.Api.Personnel/Controllers/TeamspeakConnectionController.cs b/UKSF.Api.Personnel/Controllers/TeamspeakConnectionController.cs new file mode 100644 index 00000000..6cade470 --- /dev/null +++ b/UKSF.Api.Personnel/Controllers/TeamspeakConnectionController.cs @@ -0,0 +1,30 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Personnel.Commands; +using UKSF.Api.Personnel.Mappers; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Models.Parameters; + +namespace UKSF.Api.Personnel.Controllers +{ + [Route("accounts/{accountId}")] + public class TeamspeakConnectionController : Controller + { + private readonly IAccountMapper _accountMapper; + private readonly IConnectTeamspeakIdToAccountCommand _connectTeamspeakIdToAccountCommand; + + public TeamspeakConnectionController(IConnectTeamspeakIdToAccountCommand connectTeamspeakIdToAccountCommand, IAccountMapper accountMapper) + { + _connectTeamspeakIdToAccountCommand = connectTeamspeakIdToAccountCommand; + _accountMapper = accountMapper; + } + + [HttpPost("teamspeak/{teamspeakId}"), Authorize] + public async Task ConnectTeamspeakCode([FromRoute] string accountId, [FromRoute] string teamspeakId, [FromBody] TeamspeakCode teamspeakCode) + { + DomainAccount updatedAccount = await _connectTeamspeakIdToAccountCommand.ExecuteAsync(new(accountId, teamspeakId, teamspeakCode.Code)); + return _accountMapper.MapToAccount(updatedAccount); + } + } +} diff --git a/UKSF.Api.Personnel/Controllers/UnitsController.cs b/UKSF.Api.Personnel/Controllers/UnitsController.cs index 98594700..771df85e 100644 --- a/UKSF.Api.Personnel/Controllers/UnitsController.cs +++ b/UKSF.Api.Personnel/Controllers/UnitsController.cs @@ -12,6 +12,7 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Exceptions; using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Personnel.Controllers @@ -59,7 +60,7 @@ ILogger logger } [HttpGet, Authorize] - public IActionResult Get([FromQuery] string filter = "", [FromQuery] string accountId = "") + public IEnumerable Get([FromQuery] string filter = "", [FromQuery] string accountId = "") { if (!string.IsNullOrEmpty(accountId)) { @@ -69,14 +70,14 @@ public IActionResult Get([FromQuery] string filter = "", [FromQuery] string acco "available" => _unitsService.GetSortedUnits(x => !x.Members.Contains(accountId)), _ => _unitsService.GetSortedUnits(x => x.Members.Contains(accountId)) }; - return Ok(response); + return response; } - return Ok(_unitsService.GetSortedUnits()); + return _unitsService.GetSortedUnits(); } [HttpGet("{id}"), Authorize] - public IActionResult GetSingle([FromRoute] string id) + public ResponseUnit GetSingle([FromRoute] string id) { Unit unit = _unitsContext.GetSingle(id); Unit parent = _unitsService.GetParent(unit); @@ -85,15 +86,15 @@ public IActionResult GetSingle([FromRoute] string id) response.Code = _unitsService.GetChainString(unit); response.ParentName = parent?.Name; response.UnitMembers = MapUnitMembers(unit); - return Ok(response); + return response; } [HttpGet("exists/{check}"), Authorize] - public IActionResult GetUnitExists([FromRoute] string check, [FromQuery] string id = "") + public bool GetUnitExists([FromRoute] string check, [FromQuery] string id = "") { if (string.IsNullOrEmpty(check)) { - Ok(false); + return false; } bool exists = _unitsContext.GetSingle( @@ -105,11 +106,11 @@ public IActionResult GetUnitExists([FromRoute] string check, [FromQuery] string string.Equals(x.Callsign, check, StringComparison.InvariantCultureIgnoreCase)) ) != null; - return Ok(exists); + return exists; } [HttpGet("tree"), Authorize] - public IActionResult GetTree() + public ResponseUnitTreeDataSet GetTree() { Unit combatRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); Unit auxiliaryRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); @@ -118,7 +119,7 @@ public IActionResult GetTree() CombatNodes = new List { new() { Id = combatRoot.Id, Name = combatRoot.Name, Children = GetUnitTreeChildren(combatRoot) } }, AuxiliaryNodes = new List { new() { Id = auxiliaryRoot.Id, Name = auxiliaryRoot.Name, Children = GetUnitTreeChildren(auxiliaryRoot) } } }; - return Ok(dataSet); + return dataSet; } // TODO: Use a mapper @@ -128,15 +129,14 @@ private IEnumerable GetUnitTreeChildren(MongoObject parentUnit } [HttpPost, Authorize] - public async Task AddUnit([FromBody] Unit unit) + public async Task AddUnit([FromBody] Unit unit) { await _unitsContext.Add(unit); _logger.LogAudit($"New unit added: '{unit}'"); - return Ok(); } [HttpPut("{id}"), Authorize] - public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit) + public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit) { Unit oldUnit = _unitsContext.GetSingle(x => x.Id == id); await _unitsContext.Replace(unit); @@ -146,7 +146,7 @@ public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit = _unitsContext.GetSingle(unit.Id); if (unit.Name != oldUnit.Name) { - foreach (Account account in _accountContext.Get(x => x.UnitAssignment == oldUnit.Name)) + foreach (DomainAccount account in _accountContext.Get(x => x.UnitAssignment == oldUnit.Name)) { await _accountContext.Update(account.Id, x => x.UnitAssignment, unit.Name); _eventBus.Send(account); @@ -155,7 +155,7 @@ public async Task EditUnit([FromRoute] string id, [FromBody] Unit if (unit.TeamspeakGroup != oldUnit.TeamspeakGroup) { - foreach (Account account in unit.Members.Select(x => _accountContext.GetSingle(x))) + foreach (DomainAccount account in unit.Members.Select(x => _accountContext.GetSingle(x))) { _eventBus.Send(account); } @@ -163,38 +163,35 @@ public async Task EditUnit([FromRoute] string id, [FromBody] Unit if (unit.DiscordRoleId != oldUnit.DiscordRoleId) { - foreach (Account account in unit.Members.Select(x => _accountContext.GetSingle(x))) + foreach (DomainAccount account in unit.Members.Select(x => _accountContext.GetSingle(x))) { _eventBus.Send(account); } } - - return Ok(); } [HttpDelete("{id}"), Authorize] - public async Task DeleteUnit([FromRoute] string id) + public async Task DeleteUnit([FromRoute] string id) { Unit unit = _unitsContext.GetSingle(id); _logger.LogAudit($"Unit deleted '{unit.Name}'"); - foreach (Account account in _accountContext.Get(x => x.UnitAssignment == unit.Name)) + foreach (DomainAccount account in _accountContext.Get(x => x.UnitAssignment == unit.Name)) { Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, "Reserves", reason: $"{unit.Name} was deleted"); _notificationsService.Add(notification); } await _unitsContext.Delete(id); - return Ok(); } [HttpPatch("{id}/parent"), Authorize] - public async Task UpdateParent([FromRoute] string id, [FromBody] RequestUnitUpdateParent unitUpdate) + public async Task UpdateParent([FromRoute] string id, [FromBody] RequestUnitUpdateParent unitUpdate) { Unit unit = _unitsContext.GetSingle(id); Unit parentUnit = _unitsContext.GetSingle(unitUpdate.ParentId); if (unit.Parent == parentUnit.Id) { - return Ok(); + return; } await _unitsContext.Update(id, x => x.Parent, parentUnit.Id); @@ -219,12 +216,10 @@ public async Task UpdateParent([FromRoute] string id, [FromBody] await _assignmentService.UpdateGroupsAndRoles(accountId); } } - - return Ok(); } [HttpPatch("{id}/order"), Authorize] - public IActionResult UpdateSortOrder([FromRoute] string id, [FromBody] RequestUnitUpdateOrder unitUpdate) + public void UpdateSortOrder([FromRoute] string id, [FromBody] RequestUnitUpdateOrder unitUpdate) { Unit unit = _unitsContext.GetSingle(id); Unit parentUnit = _unitsContext.GetSingle(x => x.Id == unit.Parent); @@ -235,39 +230,33 @@ public IActionResult UpdateSortOrder([FromRoute] string id, [FromBody] RequestUn { _unitsContext.Update(child.Id, x => x.Order, parentChildren.IndexOf(child)); } - - return Ok(); } // TODO: Use mappers/factories [HttpGet("chart/{type}"), Authorize] - public IActionResult GetUnitsChart([FromRoute] string type) + public ResponseUnitChartNode GetUnitsChart([FromRoute] string type) { switch (type) { case "combat": Unit combatRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); - return Ok( - new ResponseUnitChartNode - { - Id = combatRoot.Id, - Name = combatRoot.PreferShortname ? combatRoot.Shortname : combatRoot.Name, - Members = MapUnitMembers(combatRoot), - Children = GetUnitChartChildren(combatRoot.Id) - } - ); + return new() + { + Id = combatRoot.Id, + Name = combatRoot.PreferShortname ? combatRoot.Shortname : combatRoot.Name, + Members = MapUnitMembers(combatRoot), + Children = GetUnitChartChildren(combatRoot.Id) + }; case "auxiliary": Unit auxiliaryRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); - return Ok( - new ResponseUnitChartNode - { - Id = auxiliaryRoot.Id, - Name = auxiliaryRoot.PreferShortname ? auxiliaryRoot.Shortname : auxiliaryRoot.Name, - Members = MapUnitMembers(auxiliaryRoot), - Children = GetUnitChartChildren(auxiliaryRoot.Id) - } - ); - default: return Ok(); + return new() + { + Id = auxiliaryRoot.Id, + Name = auxiliaryRoot.PreferShortname ? auxiliaryRoot.Shortname : auxiliaryRoot.Name, + Members = MapUnitMembers(auxiliaryRoot), + Children = GetUnitChartChildren(auxiliaryRoot.Id) + }; + default: throw new BadRequestException("Invalid chart type"); } } @@ -287,19 +276,19 @@ private IEnumerable MapUnitMembers(Unit unit) return SortMembers(unit.Members, unit).Select(x => MapUnitMember(x, unit)); } - private ResponseUnitMember MapUnitMember(Account member, Unit unit) + private ResponseUnitMember MapUnitMember(DomainAccount member, Unit unit) { return new() { Name = _displayNameService.GetDisplayName(member), Role = member.RoleAssignment, UnitRole = GetRole(unit, member.Id) }; } // TODO: Move somewhere else - private IEnumerable SortMembers(IEnumerable members, Unit unit) + private IEnumerable SortMembers(IEnumerable members, Unit unit) { return members.Select( x => { - Account account = _accountContext.GetSingle(x); - return new { account, rankIndex = _ranksService.GetRankOrder(account.Rank), roleIndex = _unitsService.GetMemberRoleOrder(account, unit) }; + DomainAccount domainAccount = _accountContext.GetSingle(x); + return new { account = domainAccount, rankIndex = _ranksService.GetRankOrder(domainAccount.Rank), roleIndex = _unitsService.GetMemberRoleOrder(domainAccount, unit) }; } ) .OrderByDescending(x => x.roleIndex) diff --git a/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs index d290b1bf..31be5ac7 100644 --- a/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs @@ -9,38 +9,47 @@ using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Models; -namespace UKSF.Api.Personnel.EventHandlers { +namespace UKSF.Api.Personnel.EventHandlers +{ public interface IAccountDataEventHandler : IEventHandler { } - public class AccountDataEventHandler : IAccountDataEventHandler { + public class AccountDataEventHandler : IAccountDataEventHandler + { private readonly IEventBus _eventBus; private readonly IHubContext _hub; private readonly ILogger _logger; - public AccountDataEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) { + public AccountDataEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) + { _eventBus = eventBus; _hub = hub; _logger = logger; } - public void Init() { - _eventBus.AsObservable().SubscribeWithAsyncNext>(HandleAccountEvent, _logger.LogError); + public void Init() + { + _eventBus.AsObservable().SubscribeWithAsyncNext>(HandleAccountEvent, _logger.LogError); _eventBus.AsObservable().SubscribeWithAsyncNext>(HandleUnitEvent, _logger.LogError); } - private async Task HandleAccountEvent(EventModel eventModel, ContextEventData contextEventData) { - if (eventModel.EventType == EventType.UPDATE) { + private async Task HandleAccountEvent(EventModel eventModel, ContextEventData contextEventData) + { + if (eventModel.EventType == EventType.UPDATE) + { await UpdatedEvent(contextEventData.Id); } } - private async Task HandleUnitEvent(EventModel eventModel, ContextEventData contextEventData) { - if (eventModel.EventType == EventType.UPDATE) { + private async Task HandleUnitEvent(EventModel eventModel, ContextEventData contextEventData) + { + if (eventModel.EventType == EventType.UPDATE) + { await UpdatedEvent(contextEventData.Id); } } - private async Task UpdatedEvent(string id) { + private async Task UpdatedEvent(string id) + { await _hub.Clients.Group(id).ReceiveAccountUpdate(); } } diff --git a/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs index b95e238e..3282679d 100644 --- a/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/DiscordEventHandler.cs @@ -52,15 +52,15 @@ private async Task HandleEvent(EventModel eventModel, DiscordEventData discordEv private async Task LeftEvent(string accountId) { - Account account = _accountContext.GetSingle(accountId); - if (account.MembershipState is MembershipState.DISCHARGED or MembershipState.UNCONFIRMED) + DomainAccount domainAccount = _accountContext.GetSingle(accountId); + if (domainAccount.MembershipState is MembershipState.DISCHARGED or MembershipState.UNCONFIRMED) { return; } - string name = _displayNameService.GetDisplayName(account); + string name = _displayNameService.GetDisplayName(domainAccount); await _commentThreadService.InsertComment( - account.Application.RecruiterCommentThread, + domainAccount.Application.RecruiterCommentThread, new() { Author = ObjectId.Empty.ToString(), Content = $"{name} left Discord", Timestamp = DateTime.Now } ); } diff --git a/UKSF.Api.Personnel/Exceptions/AccountAlreadyConfirmedException.cs b/UKSF.Api.Personnel/Exceptions/AccountAlreadyConfirmedException.cs new file mode 100644 index 00000000..2299c3e8 --- /dev/null +++ b/UKSF.Api.Personnel/Exceptions/AccountAlreadyConfirmedException.cs @@ -0,0 +1,11 @@ +using System; +using UKSF.Api.Shared.Exceptions; + +namespace UKSF.Api.Personnel.Exceptions +{ + [Serializable] + public class AccountAlreadyConfirmedException : UksfException + { + public AccountAlreadyConfirmedException() : base("Account email has already been confirmed", 400) { } + } +} diff --git a/UKSF.Api.Personnel/Exceptions/AccountAlreadyExistsException.cs b/UKSF.Api.Personnel/Exceptions/AccountAlreadyExistsException.cs new file mode 100644 index 00000000..99241dcf --- /dev/null +++ b/UKSF.Api.Personnel/Exceptions/AccountAlreadyExistsException.cs @@ -0,0 +1,11 @@ +using System; +using UKSF.Api.Shared.Exceptions; + +namespace UKSF.Api.Personnel.Exceptions +{ + [Serializable] + public class AccountAlreadyExistsException : UksfException + { + public AccountAlreadyExistsException() : base("An account with that email already exists", 409) { } + } +} diff --git a/UKSF.Api.Personnel/Exceptions/DiscordConnectFailedException.cs b/UKSF.Api.Personnel/Exceptions/DiscordConnectFailedException.cs new file mode 100644 index 00000000..80a07a8c --- /dev/null +++ b/UKSF.Api.Personnel/Exceptions/DiscordConnectFailedException.cs @@ -0,0 +1,11 @@ +using System; +using UKSF.Api.Shared.Exceptions; + +namespace UKSF.Api.Personnel.Exceptions +{ + [Serializable] + public class DiscordConnectFailedException : UksfException + { + public DiscordConnectFailedException() : base("Failed to connect to Discord. Please try again", 400) { } + } +} diff --git a/UKSF.Api.Personnel/Exceptions/InvalidConfirmationCodeException.cs b/UKSF.Api.Personnel/Exceptions/InvalidConfirmationCodeException.cs new file mode 100644 index 00000000..4bfc7956 --- /dev/null +++ b/UKSF.Api.Personnel/Exceptions/InvalidConfirmationCodeException.cs @@ -0,0 +1,11 @@ +using System; +using UKSF.Api.Shared.Exceptions; + +namespace UKSF.Api.Personnel.Exceptions +{ + [Serializable] + public class InvalidConfirmationCodeException : UksfException + { + public InvalidConfirmationCodeException() : base("Confirmation code was invalid or expired. Please try again", 400) { } + } +} diff --git a/UKSF.Api.Personnel/Extensions/AccountExtensions.cs b/UKSF.Api.Personnel/Extensions/AccountExtensions.cs deleted file mode 100644 index 4f9e1d90..00000000 --- a/UKSF.Api.Personnel/Extensions/AccountExtensions.cs +++ /dev/null @@ -1,13 +0,0 @@ -using UKSF.Api.Personnel.Models; -using UKSF.Api.Shared.Extensions; - -namespace UKSF.Api.Personnel.Extensions { - public static class AccountExtensions { - // TODO: Use automapper - public static PublicAccount ToPublicAccount(this Account account) { - PublicAccount publicAccount = account.Copy(); - publicAccount.Password = null; - return publicAccount; - } - } -} diff --git a/UKSF.Api.Personnel/Mappers/AccountMapper.cs b/UKSF.Api.Personnel/Mappers/AccountMapper.cs new file mode 100644 index 00000000..46f4ae27 --- /dev/null +++ b/UKSF.Api.Personnel/Mappers/AccountMapper.cs @@ -0,0 +1,51 @@ +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; + +namespace UKSF.Api.Personnel.Mappers +{ + public interface IAccountMapper + { + Account MapToAccount(DomainAccount domainAccount); + } + + public class AccountMapper : IAccountMapper + { + private readonly IDisplayNameService _displayNameService; + + public AccountMapper(IDisplayNameService displayNameService) + { + _displayNameService = displayNameService; + } + + public Account MapToAccount(DomainAccount domainAccount) + { + return new() + { + Id = domainAccount.Id, + DisplayName = _displayNameService.GetDisplayName(domainAccount), + Settings = domainAccount.Settings, + MembershipState = domainAccount.MembershipState, + RolePreferences = domainAccount.RolePreferences, + ServiceRecord = domainAccount.ServiceRecord, + Admin = domainAccount.Admin, + Application = domainAccount.Application, + ArmaExperience = domainAccount.ArmaExperience, + Background = domainAccount.Background, + DiscordId = domainAccount.DiscordId, + Dob = domainAccount.Dob, + Email = domainAccount.Email, + Firstname = domainAccount.Firstname, + Lastname = domainAccount.Lastname, + MilitaryExperience = domainAccount.MilitaryExperience, + Nation = domainAccount.Nation, + Rank = domainAccount.Rank, + Reference = domainAccount.Reference, + RoleAssignment = domainAccount.RoleAssignment, + Steamname = domainAccount.Steamname, + TeamspeakIdentities = domainAccount.TeamspeakIdentities, + UnitAssignment = domainAccount.UnitAssignment, + UnitsExperience = domainAccount.UnitsExperience + }; + } + } +} diff --git a/UKSF.Api.Personnel/Models/Application.cs b/UKSF.Api.Personnel/Models/Application.cs index 7b011535..9e1cdd14 100644 --- a/UKSF.Api.Personnel/Models/Application.cs +++ b/UKSF.Api.Personnel/Models/Application.cs @@ -3,14 +3,17 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSF.Api.Personnel.Models { - public enum ApplicationState { +namespace UKSF.Api.Personnel.Models +{ + public enum ApplicationState + { ACCEPTED, REJECTED, WAITING } - public class Application { + public class Application + { [BsonRepresentation(BsonType.ObjectId)] public string ApplicationCommentThread; public DateTime DateAccepted; public DateTime DateCreated; @@ -20,47 +23,53 @@ public class Application { public ApplicationState State = ApplicationState.WAITING; } - public class DetailedApplication { + public class DetailedApplication + { public Account Account; - public string DisplayName; public ApplicationAge Age; - public double DaysProcessing; + public double AverageProcessingTime; public double DaysProcessed; + public double DaysProcessing; + public string DisplayName; public string NextCandidateOp; - public double AverageProcessingTime; - public string SteamProfile; public string Recruiter; public string RecruiterId; + public string SteamProfile; } - public class ApplicationAge { - public int Years; + public class ApplicationAge + { public int Months; + public int Years; } - public class WaitingApplication { + public class WaitingApplication + { public Account Account; - public string SteamProfile; public double DaysProcessing; public double ProcessingDifference; public string Recruiter; + public string SteamProfile; } - public class CompletedApplication { + public class CompletedApplication + { public Account Account; - public string DisplayName; public double DaysProcessed; + public string DisplayName; public string Recruiter; } - public class ApplicationsOverview { - public List Waiting; + public class ApplicationsOverview + { public List AllWaiting; public List Complete; public List Recruiters; + public List Waiting; } - public class Recruiter { + public class Recruiter + { public string Id; public string Name; } diff --git a/UKSF.Api.Personnel/Models/CommentThreadsDataset.cs b/UKSF.Api.Personnel/Models/CommentThreadsDataset.cs new file mode 100644 index 00000000..cc336a9b --- /dev/null +++ b/UKSF.Api.Personnel/Models/CommentThreadsDataset.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +namespace UKSF.Api.Personnel.Models +{ + public class CommentThreadsDataset + { + public IEnumerable Comments; + } + + public class CommentThreadDataset + { + public string Author; + public string Content; + public string DisplayName; + public string Id; + public DateTime Timestamp; + } +} diff --git a/UKSF.Api.Personnel/Models/Account.cs b/UKSF.Api.Personnel/Models/DomainAccount.cs similarity index 52% rename from UKSF.Api.Personnel/Models/Account.cs rename to UKSF.Api.Personnel/Models/DomainAccount.cs index 5b8424f7..aa2c168d 100644 --- a/UKSF.Api.Personnel/Models/Account.cs +++ b/UKSF.Api.Personnel/Models/DomainAccount.cs @@ -2,12 +2,10 @@ using System.Collections.Generic; using UKSF.Api.Base.Models; -namespace UKSF.Api.Personnel.Models { - public class Account : MongoObject { - public AccountSettings Settings = new(); - public MembershipState MembershipState = MembershipState.UNCONFIRMED; - public List RolePreferences = new(); - public List ServiceRecord = new(); +namespace UKSF.Api.Personnel.Models +{ + public class DomainAccount : MongoObject + { public bool Admin; public Application Application; public string ArmaExperience; @@ -17,19 +15,24 @@ public class Account : MongoObject { public string Email; public string Firstname; public string Lastname; + public MembershipState MembershipState = MembershipState.UNCONFIRMED; public bool MilitaryExperience; public string Nation; public string Password; public string Rank; public string Reference; public string RoleAssignment; + public List RolePreferences = new(); + public List ServiceRecord = new(); + public AccountSettings Settings = new(); public string Steamname; - public HashSet TeamspeakIdentities; + public HashSet TeamspeakIdentities; public string UnitAssignment; public string UnitsExperience; } - public class RosterAccount : MongoObject { + public class RosterAccount : MongoObject + { public string Name; public string Nation; public string Rank; @@ -37,7 +40,31 @@ public class RosterAccount : MongoObject { public string UnitAssignment; } - public class PublicAccount : Account { + public class Account + { + public bool Admin; + public Application Application; + public string ArmaExperience; + public string Background; + public string DiscordId; public string DisplayName; + public DateTime Dob; + public string Email; + public string Firstname; + public string Id; + public string Lastname; + public MembershipState MembershipState; + public bool MilitaryExperience; + public string Nation; + public string Rank; + public string Reference; + public string RoleAssignment; + public List RolePreferences; + public List ServiceRecord; + public AccountSettings Settings; + public string Steamname; + public HashSet TeamspeakIdentities; + public string UnitAssignment; + public string UnitsExperience; } } diff --git a/UKSF.Api.Personnel/Models/Parameters/ChangeName.cs b/UKSF.Api.Personnel/Models/Parameters/ChangeName.cs new file mode 100644 index 00000000..20680ffc --- /dev/null +++ b/UKSF.Api.Personnel/Models/Parameters/ChangeName.cs @@ -0,0 +1,8 @@ +namespace UKSF.Api.Personnel.Models.Parameters +{ + public class ChangeName + { + public string FirstName; + public string LastName; + } +} diff --git a/UKSF.Api.Personnel/Models/Parameters/CreateAccount.cs b/UKSF.Api.Personnel/Models/Parameters/CreateAccount.cs new file mode 100644 index 00000000..ec77bf97 --- /dev/null +++ b/UKSF.Api.Personnel/Models/Parameters/CreateAccount.cs @@ -0,0 +1,14 @@ +namespace UKSF.Api.Personnel.Models.Parameters +{ + public class CreateAccount + { + public string DobDay; + public string DobMonth; + public string DobYear; + public string Email; + public string FirstName; + public string LastName; + public string Nation; + public string Password; + } +} diff --git a/UKSF.Api.Personnel/Models/Parameters/TeamspeakCode.cs b/UKSF.Api.Personnel/Models/Parameters/TeamspeakCode.cs new file mode 100644 index 00000000..10583d19 --- /dev/null +++ b/UKSF.Api.Personnel/Models/Parameters/TeamspeakCode.cs @@ -0,0 +1,7 @@ +namespace UKSF.Api.Personnel.Models.Parameters +{ + public class TeamspeakCode + { + public string Code; + } +} diff --git a/UKSF.Api.Personnel/Models/RecruitmentStatsDataset.cs b/UKSF.Api.Personnel/Models/RecruitmentStatsDataset.cs new file mode 100644 index 00000000..adcc942f --- /dev/null +++ b/UKSF.Api.Personnel/Models/RecruitmentStatsDataset.cs @@ -0,0 +1,32 @@ +using System.Collections.Generic; + +namespace UKSF.Api.Personnel.Models +{ + public class RecruitmentStatsDataset + { + public IEnumerable Activity; + public RecruitmentStats Sr1Stats; + public RecruitmentStats YourStats; + } + + public class RecruitmentActivityDataset + { + public int Accepted; + public object Account; + public int Active; + public string Name; + public int Rejected; + } + + public class RecruitmentStats + { + public IEnumerable LastMonth; + public IEnumerable Overall; + } + + public class RecruitmentStat + { + public string FieldName; + public string FieldValue; + } +} diff --git a/UKSF.Api.Personnel/Models/RolesDataset.cs b/UKSF.Api.Personnel/Models/RolesDataset.cs new file mode 100644 index 00000000..ce6c8215 --- /dev/null +++ b/UKSF.Api.Personnel/Models/RolesDataset.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; + +namespace UKSF.Api.Personnel.Models +{ + public class RolesDataset + { + public IEnumerable IndividualRoles; + public IEnumerable UnitRoles; + } +} diff --git a/UKSF.Api.Personnel/Services/AccountService.cs b/UKSF.Api.Personnel/Services/AccountService.cs index cdafe9f0..3897e34b 100644 --- a/UKSF.Api.Personnel/Services/AccountService.cs +++ b/UKSF.Api.Personnel/Services/AccountService.cs @@ -6,7 +6,7 @@ namespace UKSF.Api.Personnel.Services { public interface IAccountService { - Account GetUserAccount(); + DomainAccount GetUserAccount(); } public class AccountService : IAccountService @@ -20,7 +20,7 @@ public AccountService(IAccountContext accountContext, IHttpContextService httpCo _httpContextService = httpContextService; } - public Account GetUserAccount() + public DomainAccount GetUserAccount() { return _accountContext.GetSingle(_httpContextService.GetUserId()); } diff --git a/UKSF.Api.Personnel/Services/AssignmentService.cs b/UKSF.Api.Personnel/Services/AssignmentService.cs index ad07167c..8f5b5d77 100644 --- a/UKSF.Api.Personnel/Services/AssignmentService.cs +++ b/UKSF.Api.Personnel/Services/AssignmentService.cs @@ -146,8 +146,8 @@ public async Task UnassignUnit(string id, string unitId) // TODO: teamspeak and discord should probably be updated for account update events, or a separate assignment event bus could be used public async Task UpdateGroupsAndRoles(string id) { - Account account = _accountContext.GetSingle(id); - _eventBus.Send(account); + DomainAccount domainAccount = _accountContext.GetSingle(id); + _eventBus.Send(domainAccount); await _accountHub.Clients.Group(id).ReceiveAccountUpdate(); } diff --git a/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs b/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs index 438fd06c..7e8f3fd9 100644 --- a/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs +++ b/UKSF.Api.Personnel/Services/ConfirmationCodeService.cs @@ -12,7 +12,7 @@ namespace UKSF.Api.Personnel.Services public interface IConfirmationCodeService { Task CreateConfirmationCode(string value); - Task GetConfirmationCode(string id); + Task GetConfirmationCodeValue(string id); Task ClearConfirmationCodes(Func predicate); } @@ -40,7 +40,7 @@ public async Task CreateConfirmationCode(string value) return code.Id; } - public async Task GetConfirmationCode(string id) + public async Task GetConfirmationCodeValue(string id) { ConfirmationCode confirmationCode = _confirmationCodeContext.GetSingle(id); if (confirmationCode == null) @@ -51,6 +51,7 @@ public async Task GetConfirmationCode(string id) await _confirmationCodeContext.Delete(confirmationCode); string actionParameters = JsonConvert.SerializeObject(new object[] { confirmationCode.Id }); await _schedulerService.Cancel(x => x.ActionParameters == actionParameters); + return confirmationCode.Value; } diff --git a/UKSF.Api.Personnel/Services/DisplayNameService.cs b/UKSF.Api.Personnel/Services/DisplayNameService.cs index 370a7dee..865571a6 100644 --- a/UKSF.Api.Personnel/Services/DisplayNameService.cs +++ b/UKSF.Api.Personnel/Services/DisplayNameService.cs @@ -5,9 +5,9 @@ namespace UKSF.Api.Personnel.Services { public interface IDisplayNameService { - string GetDisplayName(Account account); + string GetDisplayName(DomainAccount domainAccount); string GetDisplayName(string id); - string GetDisplayNameWithoutRank(Account account); + string GetDisplayNameWithoutRank(DomainAccount domainAccount); } public class DisplayNameService : IDisplayNameService @@ -21,21 +21,21 @@ public DisplayNameService(IAccountContext accountContext, IRanksContext ranksCon _ranksContext = ranksContext; } - public string GetDisplayName(Account account) + public string GetDisplayName(DomainAccount domainAccount) { - Rank rank = account.Rank != null ? _ranksContext.GetSingle(account.Rank) : null; - return rank == null ? $"{account.Lastname}.{account.Firstname[0]}" : $"{rank.Abbreviation}.{account.Lastname}.{account.Firstname[0]}"; + Rank rank = domainAccount.Rank != null ? _ranksContext.GetSingle(domainAccount.Rank) : null; + return rank == null ? $"{domainAccount.Lastname}.{domainAccount.Firstname[0]}" : $"{rank.Abbreviation}.{domainAccount.Lastname}.{domainAccount.Firstname[0]}"; } public string GetDisplayName(string id) { - Account account = _accountContext.GetSingle(id); - return account != null ? GetDisplayName(account) : id; + DomainAccount domainAccount = _accountContext.GetSingle(id); + return domainAccount != null ? GetDisplayName(domainAccount) : id; } - public string GetDisplayNameWithoutRank(Account account) + public string GetDisplayNameWithoutRank(DomainAccount domainAccount) { - return string.IsNullOrEmpty(account?.Lastname) ? "Guest" : $"{account.Lastname}.{account.Firstname[0]}"; + return string.IsNullOrEmpty(domainAccount?.Lastname) ? "Guest" : $"{domainAccount.Lastname}.{domainAccount.Firstname[0]}"; } } } diff --git a/UKSF.Api.Personnel/Services/NotificationsService.cs b/UKSF.Api.Personnel/Services/NotificationsService.cs index 68b972e8..6a2ce106 100644 --- a/UKSF.Api.Personnel/Services/NotificationsService.cs +++ b/UKSF.Api.Personnel/Services/NotificationsService.cs @@ -9,7 +9,10 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Signalr.Clients; using UKSF.Api.Personnel.Signalr.Hubs; +using UKSF.Api.Shared.Commands; +using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Models; +using UKSF.Api.Shared.Queries; using UKSF.Api.Shared.Services; namespace UKSF.Api.Personnel.Services @@ -17,8 +20,7 @@ namespace UKSF.Api.Personnel.Services public interface INotificationsService { void Add(Notification notification); - void SendTeamspeakNotification(Account account, string rawMessage); - void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage); + void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage); IEnumerable GetNotificationsForContext(); Task MarkNotificationsAsRead(List ids); Task Delete(List ids); @@ -27,18 +29,18 @@ public interface INotificationsService public class NotificationsService : INotificationsService { private readonly IAccountContext _accountContext; - private readonly IEmailService _emailService; private readonly IEventBus _eventBus; private readonly IHttpContextService _httpContextService; private readonly INotificationsContext _notificationsContext; private readonly IHubContext _notificationsHub; private readonly IObjectIdConversionService _objectIdConversionService; + private readonly ISendTemplatedEmailCommand _sendTemplatedEmailCommand; private readonly IVariablesService _variablesService; public NotificationsService( IAccountContext accountContext, INotificationsContext notificationsContext, - IEmailService emailService, + ISendTemplatedEmailCommand sendTemplatedEmailCommand, IHubContext notificationsHub, IHttpContextService httpContextService, IObjectIdConversionService objectIdConversionService, @@ -48,7 +50,7 @@ IVariablesService variablesService { _accountContext = accountContext; _notificationsContext = notificationsContext; - _emailService = emailService; + _sendTemplatedEmailCommand = sendTemplatedEmailCommand; _notificationsHub = notificationsHub; _httpContextService = httpContextService; _objectIdConversionService = objectIdConversionService; @@ -56,29 +58,9 @@ IVariablesService variablesService _variablesService = variablesService; } - public void SendTeamspeakNotification(Account account, string rawMessage) + public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) { - if (NotificationsDisabled()) - { - return; - } - - if (account.TeamspeakIdentities == null) - { - return; - } - - if (account.TeamspeakIdentities.Count == 0) - { - return; - } - - SendTeamspeakNotification(account.TeamspeakIdentities, rawMessage); - } - - public void SendTeamspeakNotification(IEnumerable clientDbIds, string rawMessage) - { - if (NotificationsDisabled()) + if (NotificationsGloballyDisabled()) { return; } @@ -121,41 +103,44 @@ public async Task Delete(List ids) private async Task AddNotificationAsync(Notification notification) { notification.Message = _objectIdConversionService.ConvertObjectIds(notification.Message); - Account account = _accountContext.GetSingle(notification.Owner); - if (account.MembershipState == MembershipState.DISCHARGED) + DomainAccount domainAccount = _accountContext.GetSingle(notification.Owner); + if (domainAccount.MembershipState == MembershipState.DISCHARGED) { return; } await _notificationsContext.Add(notification); - if (account.Settings.NotificationsEmail) - { - SendEmailNotification( - account.Email, - $"{notification.Message}{(notification.Link != null ? $"
https://uk-sf.co.uk{notification.Link}" : "")}" - ); - } + await SendEmailNotification( + domainAccount, + $"{notification.Message}{(notification.Link != null ? $"
https://uk-sf.co.uk{notification.Link}" : "")}" + ); - if (account.Settings.NotificationsTeamspeak) + SendTeamspeakNotification(domainAccount, $"{notification.Message}{(notification.Link != null ? $"\n[url]https://uk-sf.co.uk{notification.Link}[/url]" : "")}"); + } + + private async Task SendEmailNotification(DomainAccount domainAccount, string message) + { + if (NotificationsGloballyDisabled() || !domainAccount.Settings.NotificationsEmail) { - SendTeamspeakNotification(account, $"{notification.Message}{(notification.Link != null ? $"\n[url]https://uk-sf.co.uk{notification.Link}[/url]" : "")}"); + return; } + + await _sendTemplatedEmailCommand.ExecuteAsync(new(domainAccount.Email, "UKSF Notification", TemplatedEmailNames.NotificationTemplate, new() { { "message", message } })); } - private void SendEmailNotification(string email, string message) + private void SendTeamspeakNotification(DomainAccount domainAccount, string rawMessage) { - if (NotificationsDisabled()) + if (NotificationsGloballyDisabled() || !domainAccount.Settings.NotificationsTeamspeak || domainAccount.TeamspeakIdentities.IsNullOrEmpty()) { return; } - message += "

You can opt-out of these emails by unchecking 'Email notifications' in your Profile"; - _emailService.SendEmail(email, "UKSF Notification", message); + SendTeamspeakNotification(domainAccount.TeamspeakIdentities, rawMessage); } - private bool NotificationsDisabled() + private bool NotificationsGloballyDisabled() { - return !_variablesService.GetFeatureState("NOTIFICATIONS"); + return _variablesService.GetFeatureState("NOTIFICATIONS"); } } } diff --git a/UKSF.Api.Personnel/Services/RecruitmentService.cs b/UKSF.Api.Personnel/Services/RecruitmentService.cs index 83056e94..416dbb37 100644 --- a/UKSF.Api.Personnel/Services/RecruitmentService.cs +++ b/UKSF.Api.Personnel/Services/RecruitmentService.cs @@ -7,6 +7,7 @@ using UKSF.Api.Admin.Services; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Extensions; +using UKSF.Api.Personnel.Mappers; using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Services; @@ -15,20 +16,21 @@ namespace UKSF.Api.Personnel.Services public interface IRecruitmentService { ApplicationsOverview GetAllApplications(); - DetailedApplication GetApplication(Account account); + DetailedApplication GetApplication(DomainAccount domainAccount); IEnumerable GetActiveRecruiters(); - IEnumerable GetRecruiters(bool skipSort = false); + IEnumerable GetRecruiters(bool skipSort = false); Dictionary GetRecruiterLeads(); - object GetStats(string account, bool monthly); + IEnumerable GetStats(string account, bool monthly); string GetRecruiter(); - bool IsRecruiterLead(Account account = null); - bool IsRecruiter(Account account); + bool IsRecruiterLead(DomainAccount domainAccount = null); + bool IsRecruiter(DomainAccount domainAccount); Task SetRecruiter(string id, string newRecruiter); } public class RecruitmentService : IRecruitmentService { private readonly IAccountContext _accountContext; + private readonly IAccountMapper _accountMapper; private readonly IDisplayNameService _displayNameService; private readonly IHttpContextService _httpContextService; private readonly IRanksService _ranksService; @@ -41,7 +43,8 @@ public RecruitmentService( IHttpContextService httpContextService, IDisplayNameService displayNameService, IRanksService ranksService, - IVariablesService variablesService + IVariablesService variablesService, + IAccountMapper accountMapper ) { _accountContext = accountContext; @@ -50,11 +53,12 @@ IVariablesService variablesService _displayNameService = displayNameService; _ranksService = ranksService; _variablesService = variablesService; + _accountMapper = accountMapper; } - public bool IsRecruiter(Account account) + public bool IsRecruiter(DomainAccount domainAccount) { - return GetRecruiters(true).Any(x => x.Id == account.Id); + return GetRecruiters(true).Any(x => x.Id == domainAccount.Id); } public Dictionary GetRecruiterLeads() @@ -62,10 +66,10 @@ public Dictionary GetRecruiterLeads() return GetRecruiterUnit().Roles; } - public IEnumerable GetRecruiters(bool skipSort = false) + public IEnumerable GetRecruiters(bool skipSort = false) { IEnumerable members = GetRecruiterUnit().Members; - List accounts = members.Select(x => _accountContext.GetSingle(x)).ToList(); + List accounts = members.Select(x => _accountContext.GetSingle(x)).ToList(); if (skipSort) { return accounts; @@ -82,8 +86,8 @@ public ApplicationsOverview GetAllApplications() List recruiters = GetRecruiters(true).Select(account => _displayNameService.GetDisplayName(account)).ToList(); string me = _httpContextService.GetUserId(); - IEnumerable accounts = _accountContext.Get(x => x.Application != null); - foreach (Account account in accounts) + IEnumerable accounts = _accountContext.Get(x => x.Application != null); + foreach (DomainAccount account in accounts) { if (account.Application.State == ApplicationState.WAITING) { @@ -105,20 +109,20 @@ public ApplicationsOverview GetAllApplications() return new() { Waiting = waiting, AllWaiting = allWaiting, Complete = complete, Recruiters = recruiters }; } - public DetailedApplication GetApplication(Account account) + public DetailedApplication GetApplication(DomainAccount domainAccount) { - Account recruiterAccount = _accountContext.GetSingle(account.Application.Recruiter); - ApplicationAge age = account.Dob.ToAge(); + DomainAccount recruiterAccount = _accountContext.GetSingle(domainAccount.Application.Recruiter); + ApplicationAge age = domainAccount.Dob.ToAge(); return new() { - Account = account, - DisplayName = _displayNameService.GetDisplayName(account), + Account = _accountMapper.MapToAccount(domainAccount), + DisplayName = _displayNameService.GetDisplayName(domainAccount), Age = age, - DaysProcessing = Math.Ceiling((DateTime.Now - account.Application.DateCreated).TotalDays), - DaysProcessed = Math.Ceiling((account.Application.DateAccepted - account.Application.DateCreated).TotalDays), + DaysProcessing = Math.Ceiling((DateTime.Now - domainAccount.Application.DateCreated).TotalDays), + DaysProcessed = Math.Ceiling((domainAccount.Application.DateAccepted - domainAccount.Application.DateCreated).TotalDays), NextCandidateOp = GetNextCandidateOp(), AverageProcessingTime = GetAverageProcessingTime(), - SteamProfile = "http://steamcommunity.com/profiles/" + account.Steamname, + SteamProfile = "http://steamcommunity.com/profiles/" + domainAccount.Steamname, Recruiter = _displayNameService.GetDisplayName(recruiterAccount), RecruiterId = recruiterAccount.Id }; @@ -129,19 +133,19 @@ public IEnumerable GetActiveRecruiters() return GetRecruiters().Where(x => x.Settings.Sr1Enabled).Select(x => new Recruiter { Id = x.Id, Name = _displayNameService.GetDisplayName(x) }); } - public bool IsRecruiterLead(Account account = null) + public bool IsRecruiterLead(DomainAccount domainAccount = null) { - return account != null ? GetRecruiterUnit().Roles.ContainsValue(account.Id) : GetRecruiterUnit().Roles.ContainsValue(_httpContextService.GetUserId()); + return domainAccount != null ? GetRecruiterUnit().Roles.ContainsValue(domainAccount.Id) : GetRecruiterUnit().Roles.ContainsValue(_httpContextService.GetUserId()); } public async Task SetRecruiter(string id, string newRecruiter) { - await _accountContext.Update(id, Builders.Update.Set(x => x.Application.Recruiter, newRecruiter)); + await _accountContext.Update(id, Builders.Update.Set(x => x.Application.Recruiter, newRecruiter)); } - public object GetStats(string account, bool monthly) + public IEnumerable GetStats(string account, bool monthly) { - IEnumerable accounts = _accountContext.Get(x => x.Application != null); + IEnumerable accounts = _accountContext.Get(x => x.Application != null); if (account != string.Empty) { accounts = accounts.Where(x => x.Application.Recruiter == account); @@ -152,31 +156,31 @@ public object GetStats(string account, bool monthly) accounts = accounts.Where(x => x.Application.DateAccepted < DateTime.Now && x.Application.DateAccepted > DateTime.Now.AddMonths(-1)); } - List accountsList = accounts.ToList(); + List accountsList = accounts.ToList(); int acceptedApps = accountsList.Count(x => x.Application.State == ApplicationState.ACCEPTED); int rejectedApps = accountsList.Count(x => x.Application.State == ApplicationState.REJECTED); int waitingApps = accountsList.Count(x => x.Application.State == ApplicationState.WAITING); - List processedApplications = accountsList.Where(x => x.Application.State != ApplicationState.WAITING).ToList(); + List processedApplications = accountsList.Where(x => x.Application.State != ApplicationState.WAITING).ToList(); double totalProcessingTime = processedApplications.Sum(x => (x.Application.DateAccepted - x.Application.DateCreated).TotalDays); double averageProcessingTime = totalProcessingTime > 0 ? Math.Round(totalProcessingTime / processedApplications.Count, 1) : 0; double enlistmentRate = acceptedApps != 0 || rejectedApps != 0 ? Math.Round((double) acceptedApps / (acceptedApps + rejectedApps) * 100, 1) : 0; - return new[] + return new RecruitmentStat[] { - new { fieldName = "Accepted applications", fieldValue = acceptedApps.ToString() }, - new { fieldName = "Rejected applications", fieldValue = rejectedApps.ToString() }, - new { fieldName = "Waiting applications", fieldValue = waitingApps.ToString() }, - new { fieldName = "Average processing time", fieldValue = averageProcessingTime + " Days" }, - new { fieldName = "Enlistment Rate", fieldValue = enlistmentRate + "%" } + new() { FieldName = "Accepted applications", FieldValue = acceptedApps.ToString() }, + new() { FieldName = "Rejected applications", FieldValue = rejectedApps.ToString() }, + new() { FieldName = "Waiting applications", FieldValue = waitingApps.ToString() }, + new() { FieldName = "Average processing time", FieldValue = averageProcessingTime + " Days" }, + new() { FieldName = "Enlistment Rate", FieldValue = enlistmentRate + "%" } }; } public string GetRecruiter() { - IEnumerable recruiters = GetRecruiters().Where(x => x.Settings.Sr1Enabled); - List waiting = _accountContext.Get(x => x.Application != null && x.Application.State == ApplicationState.WAITING).ToList(); - List complete = _accountContext.Get(x => x.Application != null && x.Application.State != ApplicationState.WAITING).ToList(); + IEnumerable recruiters = GetRecruiters().Where(x => x.Settings.Sr1Enabled); + List waiting = _accountContext.Get(x => x.Application != null && x.Application.State == ApplicationState.WAITING).ToList(); + List complete = _accountContext.Get(x => x.Application != null && x.Application.State != ApplicationState.WAITING).ToList(); var unsorted = recruiters.Select(x => new { id = x.Id, complete = complete.Count(y => y.Application.Recruiter == x.Id), waiting = waiting.Count(y => y.Application.Recruiter == x.Id) }); var sorted = unsorted.OrderBy(x => x.waiting).ThenBy(x => x.complete); return sorted.First().id; @@ -188,29 +192,29 @@ private Unit GetRecruiterUnit() return _unitsContext.GetSingle(id); } - private CompletedApplication GetCompletedApplication(Account account) + private CompletedApplication GetCompletedApplication(DomainAccount domainAccount) { return new() { - Account = account, - DisplayName = _displayNameService.GetDisplayNameWithoutRank(account), - DaysProcessed = Math.Ceiling((account.Application.DateAccepted - account.Application.DateCreated).TotalDays), - Recruiter = _displayNameService.GetDisplayName(account.Application.Recruiter) + Account = _accountMapper.MapToAccount(domainAccount), + DisplayName = _displayNameService.GetDisplayNameWithoutRank(domainAccount), + DaysProcessed = Math.Ceiling((domainAccount.Application.DateAccepted - domainAccount.Application.DateCreated).TotalDays), + Recruiter = _displayNameService.GetDisplayName(domainAccount.Application.Recruiter) }; } - private WaitingApplication GetWaitingApplication(Account account) + private WaitingApplication GetWaitingApplication(DomainAccount domainAccount) { double averageProcessingTime = GetAverageProcessingTime(); - double daysProcessing = Math.Ceiling((DateTime.Now - account.Application.DateCreated).TotalDays); + double daysProcessing = Math.Ceiling((DateTime.Now - domainAccount.Application.DateCreated).TotalDays); double processingDifference = daysProcessing - averageProcessingTime; return new() { - Account = account, - SteamProfile = "http://steamcommunity.com/profiles/" + account.Steamname, + Account = _accountMapper.MapToAccount(domainAccount), + SteamProfile = "http://steamcommunity.com/profiles/" + domainAccount.Steamname, DaysProcessing = daysProcessing, ProcessingDifference = processingDifference, - Recruiter = _displayNameService.GetDisplayName(account.Application.Recruiter) + Recruiter = _displayNameService.GetDisplayName(domainAccount.Application.Recruiter) }; } @@ -233,7 +237,7 @@ private static string GetNextCandidateOp() private double GetAverageProcessingTime() { - List waitingApplications = _accountContext.Get(x => x.Application != null && x.Application.State != ApplicationState.WAITING).ToList(); + List waitingApplications = _accountContext.Get(x => x.Application != null && x.Application.State != ApplicationState.WAITING).ToList(); double days = waitingApplications.Sum(x => (x.Application.DateAccepted - x.Application.DateCreated).TotalDays); double time = Math.Round(days / waitingApplications.Count, 1); return time; diff --git a/UKSF.Api.Personnel/Services/ServiceRecordService.cs b/UKSF.Api.Personnel/Services/ServiceRecordService.cs index 24e29a05..89d4a1c1 100644 --- a/UKSF.Api.Personnel/Services/ServiceRecordService.cs +++ b/UKSF.Api.Personnel/Services/ServiceRecordService.cs @@ -21,7 +21,7 @@ public ServiceRecordService(IAccountContext accountContext) public void AddServiceRecord(string id, string occurence, string notes) { - _accountContext.Update(id, Builders.Update.Push("serviceRecord", new ServiceRecordEntry { Timestamp = DateTime.Now, Occurence = occurence, Notes = notes })); + _accountContext.Update(id, Builders.Update.Push("serviceRecord", new ServiceRecordEntry { Timestamp = DateTime.Now, Occurence = occurence, Notes = notes })); } } } diff --git a/UKSF.Api.Personnel/Services/UnitsService.cs b/UKSF.Api.Personnel/Services/UnitsService.cs index 647f8e9a..7b010c48 100644 --- a/UKSF.Api.Personnel/Services/UnitsService.cs +++ b/UKSF.Api.Personnel/Services/UnitsService.cs @@ -27,7 +27,7 @@ public interface IUnitsService bool MemberHasRole(string id, string unitId, string role); bool MemberHasRole(string id, Unit unit, string role); bool MemberHasAnyRole(string id); - int GetMemberRoleOrder(Account account, Unit unit); + int GetMemberRoleOrder(DomainAccount domainAccount, Unit unit); Unit GetRoot(); Unit GetAuxilliaryRoot(); @@ -171,11 +171,11 @@ public bool MemberHasAnyRole(string id) return _unitsContext.Get().Any(x => RolesHasMember(x, id)); } - public int GetMemberRoleOrder(Account account, Unit unit) + public int GetMemberRoleOrder(DomainAccount domainAccount, Unit unit) { - if (RolesHasMember(unit, account.Id)) + if (RolesHasMember(unit, domainAccount.Id)) { - return int.MaxValue - _rolesContext.GetSingle(x => x.Name == unit.Roles.FirstOrDefault(y => y.Value == account.Id).Key).Order; + return int.MaxValue - _rolesContext.GetSingle(x => x.Name == unit.Roles.FirstOrDefault(y => y.Value == domainAccount.Id).Key).Order; } return -1; diff --git a/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj b/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj index 79003a2d..b3bb61d5 100644 --- a/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj +++ b/UKSF.Api.Personnel/UKSF.Api.Personnel.csproj @@ -16,6 +16,7 @@ + diff --git a/UKSF.Api.Shared/ApiSharedExtensions.cs b/UKSF.Api.Shared/ApiSharedExtensions.cs index 92c65aea..003bae0a 100644 --- a/UKSF.Api.Shared/ApiSharedExtensions.cs +++ b/UKSF.Api.Shared/ApiSharedExtensions.cs @@ -1,6 +1,8 @@ using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Shared.Commands; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Queries; using UKSF.Api.Shared.Services; namespace UKSF.Api.Shared @@ -9,7 +11,14 @@ public static class ApiSharedExtensions { public static IServiceCollection AddUksfShared(this IServiceCollection services) { - return services.AddContexts().AddEventHandlers().AddServices().AddTransient().AddSingleton().AddSingleton(); + return services.AddContexts() + .AddEventHandlers() + .AddServices() + .AddCommands() + .AddQueries() + .AddTransient() + .AddSingleton() + .AddSingleton(); } private static IServiceCollection AddContexts(this IServiceCollection services) @@ -19,7 +28,9 @@ private static IServiceCollection AddContexts(this IServiceCollection services) .AddSingleton() .AddSingleton() .AddSingleton() - .AddSingleton(); + .AddSingleton() + .AddSingleton() + .AddSingleton(); } private static IServiceCollection AddEventHandlers(this IServiceCollection services) @@ -31,5 +42,15 @@ private static IServiceCollection AddServices(this IServiceCollection services) { return services.AddSingleton().AddTransient(); } + + private static IServiceCollection AddCommands(this IServiceCollection services) + { + return services.AddSingleton().AddSingleton(); + } + + private static IServiceCollection AddQueries(this IServiceCollection services) + { + return services.AddSingleton(); + } } } diff --git a/UKSF.Api.Shared/Commands/SendBasicEmailCommand.cs b/UKSF.Api.Shared/Commands/SendBasicEmailCommand.cs new file mode 100644 index 00000000..379347dc --- /dev/null +++ b/UKSF.Api.Shared/Commands/SendBasicEmailCommand.cs @@ -0,0 +1,46 @@ +using System.Net.Mail; +using System.Threading.Tasks; +using UKSF.Api.Shared.Context; + +namespace UKSF.Api.Shared.Commands +{ + public interface ISendBasicEmailCommand + { + Task ExecuteAsync(SendBasicEmailCommandArgs args); + } + + public class SendBasicEmailCommandArgs + { + public SendBasicEmailCommandArgs(string recipient, string subject, string body) + { + Recipient = recipient; + Subject = subject; + Body = body; + } + + public string Recipient { get; } + public string Subject { get; } + public string Body { get; } + } + + public class SendBasicEmailCommand : ISendBasicEmailCommand + { + private readonly ISmtpClientContext _smtpClientContext; + + public SendBasicEmailCommand(ISmtpClientContext smtpClientContext) + { + _smtpClientContext = smtpClientContext; + } + + public async Task ExecuteAsync(SendBasicEmailCommandArgs args) + { + using MailMessage mail = new(); + mail.To.Add(args.Recipient); + mail.Subject = args.Subject; + mail.Body = args.Body; + mail.IsBodyHtml = true; + + await _smtpClientContext.SendEmailAsync(mail); + } + } +} diff --git a/UKSF.Api.Shared/Commands/SendTemplatedEmailCommand.cs b/UKSF.Api.Shared/Commands/SendTemplatedEmailCommand.cs new file mode 100644 index 00000000..a148a039 --- /dev/null +++ b/UKSF.Api.Shared/Commands/SendTemplatedEmailCommand.cs @@ -0,0 +1,52 @@ +using System.Collections.Generic; +using System.Net.Mail; +using System.Threading.Tasks; +using UKSF.Api.Shared.Context; +using UKSF.Api.Shared.Queries; + +namespace UKSF.Api.Shared.Commands +{ + public interface ISendTemplatedEmailCommand + { + Task ExecuteAsync(SendTemplatedEmailCommandArgs args); + } + + public class SendTemplatedEmailCommandArgs + { + public SendTemplatedEmailCommandArgs(string recipient, string subject, string templateName, Dictionary substitutions) + { + Recipient = recipient; + Subject = subject; + TemplateName = templateName; + Substitutions = substitutions; + } + + public string Recipient { get; } + public string Subject { get; } + public string TemplateName { get; } + public Dictionary Substitutions { get; } + } + + public class SendTemplatedEmailCommand : ISendTemplatedEmailCommand + { + private readonly IGetEmailTemplateQuery _getEmailTemplateQuery; + private readonly ISmtpClientContext _smtpClientContext; + + public SendTemplatedEmailCommand(IGetEmailTemplateQuery getEmailTemplateQuery, ISmtpClientContext smtpClientContext) + { + _getEmailTemplateQuery = getEmailTemplateQuery; + _smtpClientContext = smtpClientContext; + } + + public async Task ExecuteAsync(SendTemplatedEmailCommandArgs args) + { + using MailMessage mail = new(); + mail.To.Add(args.Recipient); + mail.Subject = args.Subject; + mail.Body = await _getEmailTemplateQuery.ExecuteAsync(new(args.TemplateName, args.Substitutions)); + mail.IsBodyHtml = true; + + await _smtpClientContext.SendEmailAsync(mail); + } + } +} diff --git a/UKSF.Api.Shared/Context/CachedMongoContext.cs b/UKSF.Api.Shared/Context/CachedMongoContext.cs index 11eedc4f..97fba4d7 100644 --- a/UKSF.Api.Shared/Context/CachedMongoContext.cs +++ b/UKSF.Api.Shared/Context/CachedMongoContext.cs @@ -95,6 +95,7 @@ public override async Task Update(string id, Expression> fieldSe DataUpdateEvent(id); } + // TODO: Should this return the updated object? Probably public override async Task Update(string id, UpdateDefinition update) { await base.Update(id, update); diff --git a/UKSF.Api.Shared/Context/FileContext.cs b/UKSF.Api.Shared/Context/FileContext.cs new file mode 100644 index 00000000..644dfa29 --- /dev/null +++ b/UKSF.Api.Shared/Context/FileContext.cs @@ -0,0 +1,28 @@ +using System; +using System.IO; +using System.Threading.Tasks; + +namespace UKSF.Api.Shared.Context +{ + public interface IFileContext + { + string AppDirectory { get; } + Task ReadAllText(string path); + bool Exists(string path); + } + + public class FileContext : IFileContext + { + public string AppDirectory => AppDomain.CurrentDomain.BaseDirectory; + + public Task ReadAllText(string path) + { + return File.ReadAllTextAsync(path); + } + + public bool Exists(string path) + { + return File.Exists(path); + } + } +} diff --git a/UKSF.Api.Personnel/Services/EmailService.cs b/UKSF.Api.Shared/Context/SmtpClientContext.cs similarity index 53% rename from UKSF.Api.Personnel/Services/EmailService.cs rename to UKSF.Api.Shared/Context/SmtpClientContext.cs index 4d2897a0..ed7622b0 100644 --- a/UKSF.Api.Personnel/Services/EmailService.cs +++ b/UKSF.Api.Shared/Context/SmtpClientContext.cs @@ -1,40 +1,37 @@ using System.Net; using System.Net.Mail; +using System.Threading.Tasks; using Microsoft.Extensions.Configuration; -namespace UKSF.Api.Personnel.Services +namespace UKSF.Api.Shared.Context { - public interface IEmailService + public interface ISmtpClientContext { - void SendEmail(string targetEmail, string subject, string htmlEmail); + Task SendEmailAsync(MailMessage mailMessage); } - public class EmailService : IEmailService + public class SmtpClientContext : ISmtpClientContext { private readonly string _password; private readonly string _username; - public EmailService(IConfiguration configuration) + public SmtpClientContext(IConfiguration configuration) { _username = configuration.GetSection("EmailSettings")["username"]; _password = configuration.GetSection("EmailSettings")["password"]; } - public void SendEmail(string targetEmail, string subject, string htmlEmail) + public async Task SendEmailAsync(MailMessage mailMessage) { if (string.IsNullOrEmpty(_username) || string.IsNullOrEmpty(_password)) { return; } - using MailMessage mail = new() { From = new(_username, "UKSF") }; - mail.To.Add(targetEmail); - mail.Subject = subject; - mail.Body = htmlEmail; - mail.IsBodyHtml = true; + mailMessage.From = new(_username, "UKSF"); using SmtpClient smtp = new("smtp.gmail.com", 587) { Credentials = new NetworkCredential(_username, _password), EnableSsl = true }; - smtp.Send(mail); + await smtp.SendMailAsync(mailMessage); } } } diff --git a/UKSF.Api.Shared/EmailHtmlTemplates/AccountConfirmationTemplate.html b/UKSF.Api.Shared/EmailHtmlTemplates/AccountConfirmationTemplate.html new file mode 100644 index 00000000..8e32445b --- /dev/null +++ b/UKSF.Api.Shared/EmailHtmlTemplates/AccountConfirmationTemplate.html @@ -0,0 +1,320 @@ + + + + + + + UKSF Password Reset + + + + + + + + + + + + + +
+ + UKSF Logo + +
+ + + + + + + + + + + + + +
+

+ UKSF Account Confirmation +

+
+

This email was given during the creation of a UKSF account. To confirm your UKSF account, + enter the code below into the prompt on the UKSF website:

+
+ + + + +
+

$code$

+
+
+

+ If this request was not made by you, it is safe to ignore +

+
+
+ + + + + + + + + + +
+ + Teamspeak + Teamspeak + + + Discord + Discord + + + Facebook + Facebook + + + Instagram + Instagram + + + Youtube + Youtube + +
+

+ Need help? Contact an admin on our Discord +

+
+

© Copyright UKSF 2021

+ $randomness$ +
+
+ + + diff --git a/UKSF.Api.Shared/EmailHtmlTemplates/NotificationTemplate.html b/UKSF.Api.Shared/EmailHtmlTemplates/NotificationTemplate.html new file mode 100644 index 00000000..07adffea --- /dev/null +++ b/UKSF.Api.Shared/EmailHtmlTemplates/NotificationTemplate.html @@ -0,0 +1,302 @@ + + + + + + + UKSF Notification + + + + + + + + + + + + + +
+ + UKSF Logo + +
+ + + + + + + + + + +
+

+ UKSF Notification +

+
+ + + + +
+

$message$

+
+
+

+ You can opt-out of these emails by unchecking 'Email notifications' in your Profile +

+
+
+ + + + + + + + + + +
+ + Teamspeak + Teamspeak + + + Discord + Discord + + + Facebook + Facebook + + + Instagram + Instagram + + + Youtube + Youtube + +
+

+ Need help? Contact an admin on our Discord +

+
+

© Copyright UKSF 2021

+ $randomness$ +
+
+ + diff --git a/UKSF.Api.Shared/EmailHtmlTemplates/ResetPasswordTemplate.html b/UKSF.Api.Shared/EmailHtmlTemplates/ResetPasswordTemplate.html new file mode 100644 index 00000000..cf349ae2 --- /dev/null +++ b/UKSF.Api.Shared/EmailHtmlTemplates/ResetPasswordTemplate.html @@ -0,0 +1,351 @@ + + + + + + + UKSF Password Reset + + + + + + + + + + + + + +
+ + UKSF Logo + +
+ + + + + + + + + + + + + +
+

+ UKSF Password Reset +

+
+

+ A request was made to reset the password for the account associated with this email. Click + the button below to continue resetting your password. +

+
+ + + + +
+ Reset Password +
+
+

+ If this request was not made by you, it is safe to ignore +

+
+
+ + + + + + + + + + +
+ + Teamspeak + Teamspeak + + + Discord + Discord + + + Facebook + Facebook + + + Instagram + Instagram + + + Youtube + Youtube + +
+

+ Need help? Contact an admin on our Discord +

+
+

© Copyright UKSF 2021

+ $randomness$ +
+
+ + diff --git a/UKSF.Api.Shared/Events/Logger.cs b/UKSF.Api.Shared/Events/Logger.cs index 799d8fa4..36ceb92c 100644 --- a/UKSF.Api.Shared/Events/Logger.cs +++ b/UKSF.Api.Shared/Events/Logger.cs @@ -14,7 +14,7 @@ public interface ILogger void LogError(string message); void LogError(Exception exception); void LogError(Exception exception, HttpContext context, HttpResponse response, string userId, string userDisplayName); - void LogAudit(string message, string userId = ""); + void LogAudit(string message, string userId = null); void LogDiscordEvent(DiscordUserEventType discordUserEventType, string instigatorId, string instigatorName, string channelName, string name, string message); } @@ -49,7 +49,7 @@ public void LogError(Exception exception) Log(new(exception)); } - public void LogAudit(string message, string userId = "") + public void LogAudit(string message, string userId = null) { userId = string.IsNullOrEmpty(userId) ? _httpContextService.GetUserId() ?? "Server" : userId; Log(new AuditLog(userId, message)); diff --git a/UKSF.Api.Shared/Exceptions/BadRequestException.cs b/UKSF.Api.Shared/Exceptions/BadRequestException.cs new file mode 100644 index 00000000..9d0fa691 --- /dev/null +++ b/UKSF.Api.Shared/Exceptions/BadRequestException.cs @@ -0,0 +1,12 @@ +using System; + +namespace UKSF.Api.Shared.Exceptions +{ + [Serializable] + public class BadRequestException : UksfException + { + public BadRequestException(string message) : base(message, 400) { } + + public BadRequestException() : this("Bad request") { } + } +} diff --git a/UKSF.Api.Shared/Exceptions/NotFoundException.cs b/UKSF.Api.Shared/Exceptions/NotFoundException.cs index 45171048..1e1c5190 100644 --- a/UKSF.Api.Shared/Exceptions/NotFoundException.cs +++ b/UKSF.Api.Shared/Exceptions/NotFoundException.cs @@ -5,6 +5,6 @@ namespace UKSF.Api.Shared.Exceptions [Serializable] public class NotFoundException : UksfException { - protected NotFoundException(string message) : base(message, 404) { } + public NotFoundException(string message) : base(message, 404) { } } } diff --git a/UKSF.Api.Shared/Exceptions/UksfException.cs b/UKSF.Api.Shared/Exceptions/UksfException.cs index ea8724cd..1ced7dd7 100644 --- a/UKSF.Api.Shared/Exceptions/UksfException.cs +++ b/UKSF.Api.Shared/Exceptions/UksfException.cs @@ -1,15 +1,20 @@ using System; +using UKSF.Api.Shared.Models; namespace UKSF.Api.Shared.Exceptions { [Serializable] public class UksfException : Exception { - protected UksfException(string message, int statusCode, Exception inner = null) : base(message, inner) + public UksfException(string message, int statusCode, int detailCode = 0, ValidationReportDataset validation = null) : base(message) { StatusCode = statusCode; + DetailCode = detailCode; + Validation = validation; } public int StatusCode { get; } + public int DetailCode { get; } + public ValidationReportDataset Validation { get; } } } diff --git a/UKSF.Api.Shared/Exceptions/UnauthorizedException.cs b/UKSF.Api.Shared/Exceptions/UnauthorizedException.cs new file mode 100644 index 00000000..fdf64055 --- /dev/null +++ b/UKSF.Api.Shared/Exceptions/UnauthorizedException.cs @@ -0,0 +1,11 @@ +using System; + +namespace UKSF.Api.Shared.Exceptions +{ + [Serializable] + public class UnauthorizedException : UksfException + { + public UnauthorizedException() : base("Unauthorized", 401) { } + public UnauthorizedException(string message) : base(message, 401) { } + } +} diff --git a/UKSF.Api.Shared/Extensions/CollectionExtensions.cs b/UKSF.Api.Shared/Extensions/CollectionExtensions.cs index 00ad4780..185f8657 100644 --- a/UKSF.Api.Shared/Extensions/CollectionExtensions.cs +++ b/UKSF.Api.Shared/Extensions/CollectionExtensions.cs @@ -1,9 +1,23 @@ using System.Collections.Generic; +using System.Linq; -namespace UKSF.Api.Shared.Extensions { - public static class CollectionExtensions { - public static void CleanHashset(this HashSet collection) { +namespace UKSF.Api.Shared.Extensions +{ + public static class CollectionExtensions + { + public static void CleanHashset(this HashSet collection) + { collection.RemoveWhere(string.IsNullOrEmpty); } + + public static bool IsNullOrEmpty(this IEnumerable collection) + { + return collection == null || collection.IsEmpty(); + } + + public static bool IsEmpty(this IEnumerable collection) + { + return !collection.Any(); + } } } diff --git a/UKSF.Api.Shared/Extensions/ProcessUtilities.cs b/UKSF.Api.Shared/Extensions/ProcessUtilities.cs index 557b5401..824c85c8 100644 --- a/UKSF.Api.Shared/Extensions/ProcessUtilities.cs +++ b/UKSF.Api.Shared/Extensions/ProcessUtilities.cs @@ -5,13 +5,21 @@ using Microsoft.Win32.TaskScheduler; using Task = System.Threading.Tasks.Task; -namespace UKSF.Api.Shared.Extensions { +namespace UKSF.Api.Shared.Extensions +{ [ExcludeFromCodeCoverage] - public static class ProcessUtilities { + public static class ProcessUtilities + { private const int SC_CLOSE = 0xF060; private const int WM_SYSCOMMAND = 0x0112; - public static int LaunchManagedProcess(string executable, string arguments = null) { + public static int LaunchManagedProcess(string executable, string arguments = null) + { + if (!OperatingSystem.IsWindows()) + { + throw new InvalidOperationException("Not running on windows, stopping"); + } + int processId = default; using ManagementClass managementClass = new("Win32_Process"); ManagementClass processInfo = new("Win32_ProcessStartup"); @@ -22,14 +30,16 @@ public static int LaunchManagedProcess(string executable, string arguments = nul inParameters["ProcessStartupInformation"] = processInfo; ManagementBaseObject result = managementClass.InvokeMethod("Create", inParameters, null); - if (result != null && (uint) result.Properties["ReturnValue"].Value == 0) { + if (result != null && (uint) result.Properties["ReturnValue"].Value == 0) + { processId = Convert.ToInt32(result.Properties["ProcessId"].Value.ToString()); } return processId; } - public static async Task LaunchExternalProcess(string name, string command) { + public static async Task LaunchExternalProcess(string name, string command) + { TaskService.Instance.RootFolder.DeleteTask(name, false); using TaskDefinition taskDefinition = TaskService.Instance.NewTask(); taskDefinition.Actions.Add(new ExecAction("cmd", $"/C {command}")); @@ -38,7 +48,8 @@ public static async Task LaunchExternalProcess(string name, string command) { await Task.Delay(TimeSpan.FromSeconds(1)); } - public static async Task CloseProcessGracefully(this Process process) { + public static async Task CloseProcessGracefully(this Process process) + { // UKSF.PostMessage exe location should be set as a PATH variable await LaunchExternalProcess("CloseProcess", $"start \"\" \"UKSF.PostMessage\" {process.ProcessName} {WM_SYSCOMMAND} {SC_CLOSE} 0"); } diff --git a/UKSF.Api.Shared/Extensions/StringExtensions.cs b/UKSF.Api.Shared/Extensions/StringExtensions.cs index e13b9c11..d386e7f7 100644 --- a/UKSF.Api.Shared/Extensions/StringExtensions.cs +++ b/UKSF.Api.Shared/Extensions/StringExtensions.cs @@ -18,6 +18,11 @@ public static double ToDouble(this string text) return double.TryParse(text, out double number) ? number : 0d; } + public static int ToInt(this string text) + { + return int.TryParse(text, out int number) ? number : 0; + } + public static string ToTitleCase(this string text) { return CultureInfo.CurrentCulture.TextInfo.ToTitleCase(text); diff --git a/UKSF.Api.Shared/Models/TeamspeakMessageEventData.cs b/UKSF.Api.Shared/Models/TeamspeakMessageEventData.cs index 5342c626..525106e8 100644 --- a/UKSF.Api.Shared/Models/TeamspeakMessageEventData.cs +++ b/UKSF.Api.Shared/Models/TeamspeakMessageEventData.cs @@ -1,13 +1,16 @@ using System.Collections.Generic; -namespace UKSF.Api.Shared.Models { - public class TeamspeakMessageEventData { - public TeamspeakMessageEventData(IEnumerable clientDbIds, string message) { +namespace UKSF.Api.Shared.Models +{ + public class TeamspeakMessageEventData + { + public IEnumerable ClientDbIds; + public string Message; + + public TeamspeakMessageEventData(IEnumerable clientDbIds, string message) + { ClientDbIds = clientDbIds; Message = message; } - - public IEnumerable ClientDbIds; - public string Message; } } diff --git a/UKSF.Api.Shared/Models/UksfErrorMessage.cs b/UKSF.Api.Shared/Models/UksfErrorMessage.cs index b7fe733f..e22c0b11 100644 --- a/UKSF.Api.Shared/Models/UksfErrorMessage.cs +++ b/UKSF.Api.Shared/Models/UksfErrorMessage.cs @@ -2,14 +2,17 @@ { public class UksfErrorMessage { + public int DetailCode; public string Error; - public int StatusCode; + public ValidationReportDataset Validation; - public UksfErrorMessage(int statusCode, string error) + public UksfErrorMessage(int statusCode, int detailCode, string error, ValidationReportDataset validation) { StatusCode = statusCode; + DetailCode = detailCode; Error = error; + Validation = validation; } } } diff --git a/UKSF.Api.Shared/Models/ValidationReport.cs b/UKSF.Api.Shared/Models/ValidationReport.cs new file mode 100644 index 00000000..9ec4b670 --- /dev/null +++ b/UKSF.Api.Shared/Models/ValidationReport.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; + +namespace UKSF.Api.Shared.Models +{ + public class ValidationReport + { + public ValidationReport(Exception exception) + { + Title = exception.GetBaseException().Message; + Detail = exception.ToString(); + Error = true; + } + + public ValidationReport(string title, string detail, bool error = false) + { + Title = error ? $"Error: {title}" : $"Warning: {title}"; + Detail = detail; + Error = error; + } + + public string Detail { get; } + public bool Error { get; } + public string Title { get; } + } + + public class ValidationReportDataset + { + public List Reports; + } +} diff --git a/UKSF.Api.Shared/Queries/GetEmailTemplateQuery.cs b/UKSF.Api.Shared/Queries/GetEmailTemplateQuery.cs new file mode 100644 index 00000000..da7f5e91 --- /dev/null +++ b/UKSF.Api.Shared/Queries/GetEmailTemplateQuery.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Threading.Tasks; +using UKSF.Api.Shared.Context; + +namespace UKSF.Api.Shared.Queries +{ + public interface IGetEmailTemplateQuery + { + Task ExecuteAsync(GetEmailTemplateQueryArgs args); + } + + public class GetEmailTemplateQueryArgs + { + public GetEmailTemplateQueryArgs(string templateName, Dictionary substitutions) + { + TemplateName = templateName; + Substitutions = substitutions; + } + + public string TemplateName { get; } + public Dictionary Substitutions { get; } + } + + public class GetEmailTemplateQuery : IGetEmailTemplateQuery + { + private readonly IFileContext _fileContext; + private readonly ConcurrentDictionary _templateCache = new(); + + public GetEmailTemplateQuery(IFileContext fileContext) + { + _fileContext = fileContext; + } + + public async Task ExecuteAsync(GetEmailTemplateQueryArgs args) + { + if (!_templateCache.TryGetValue(args.TemplateName, out string templateContent)) + { + templateContent = await GetTemplateContent(args.TemplateName); + _templateCache[args.TemplateName] = templateContent; + } + + args.Substitutions.Add("randomness", DateTime.UtcNow.ToString(CultureInfo.InvariantCulture)); + + return args.Substitutions.Aggregate(templateContent, (current, substitution) => current.Replace($"${substitution.Key}$", substitution.Value)); + } + + private async Task GetTemplateContent(string templateName) + { + string templatePath = _fileContext.AppDirectory + $"/EmailHtmlTemplates/{templateName}Template.html"; + + if (!_fileContext.Exists(templatePath)) + { + throw new ArgumentException($"Cannot find an email template named {templateName}"); + } + + return await _fileContext.ReadAllText(templatePath); + } + } + + public class TemplatedEmailNames + { + public static string ResetPasswordTemplate = "ResetPassword"; + public static string AccountConfirmationTemplate = "AccountConfirmation"; + public static string NotificationTemplate = "Notification"; + } +} diff --git a/UKSF.Api.Shared/UKSF.Api.Shared.csproj b/UKSF.Api.Shared/UKSF.Api.Shared.csproj index 04b5c1ea..fc4a5b23 100644 --- a/UKSF.Api.Shared/UKSF.Api.Shared.csproj +++ b/UKSF.Api.Shared/UKSF.Api.Shared.csproj @@ -5,7 +5,13 @@ - + + + + + + Always + diff --git a/UKSF.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs index e20626be..70b69cfa 100644 --- a/UKSF.Api/Controllers/LoaController.cs +++ b/UKSF.Api/Controllers/LoaController.cs @@ -73,8 +73,8 @@ public LoaReportDataset Get([FromQuery] string scope = "you") objectIds = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER).Select(x => x.Id).ToList(); break; case "unit": - Account account = _accountService.GetUserAccount(); - IEnumerable groups = _unitsService.GetAllChildren(_unitsContext.GetSingle(x => x.Name == account.UnitAssignment), true); + DomainAccount domainAccount = _accountService.GetUserAccount(); + IEnumerable groups = _unitsService.GetAllChildren(_unitsContext.GetSingle(x => x.Name == domainAccount.UnitAssignment), true); List members = groups.SelectMany(x => x.Members.ToList()).ToList(); objectIds = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER && members.Contains(x.Id)).Select(x => x.Id).ToList(); break; @@ -91,7 +91,7 @@ public LoaReportDataset Get([FromQuery] string scope = "you") Id = x.Id, Start = x.Start, End = x.End, - State = x.State.ToString(), + State = x.State, Emergency = x.Emergency, Late = x.Late, Reason = x.Reason, diff --git a/UKSF.Api/Controllers/LoggingController.cs b/UKSF.Api/Controllers/LoggingController.cs index 9c0827d2..75052606 100644 --- a/UKSF.Api/Controllers/LoggingController.cs +++ b/UKSF.Api/Controllers/LoggingController.cs @@ -41,8 +41,8 @@ public PagedResult GetBasicLogs([FromQuery] int page, [FromQuery] int return _logContext.GetPaged(page, pageSize, sortDirection, sortField, filterProperties, filter); } - [HttpGet("httpError"), Authorize] - public PagedResult GetHttpErrorLogs([FromQuery] int page, [FromQuery] int pageSize, [FromQuery] SortDirection sortDirection, [FromQuery] string sortField, [FromQuery] string filter) + [HttpGet("error"), Authorize] + public PagedResult GetErrorLogs([FromQuery] int page, [FromQuery] int pageSize, [FromQuery] SortDirection sortDirection, [FromQuery] string sortField, [FromQuery] string filter) { IEnumerable>> filterProperties = GetErrorLogFilterProperties(); return _errorLogContext.GetPaged(page, pageSize, sortDirection, sortField, filterProperties, filter); diff --git a/UKSF.Api/Controllers/ModsController.cs b/UKSF.Api/Controllers/ModsController.cs index 636252cc..5c70fcc3 100644 --- a/UKSF.Api/Controllers/ModsController.cs +++ b/UKSF.Api/Controllers/ModsController.cs @@ -9,9 +9,9 @@ public class ModsController : Controller { // TODO: Return size of modpack folder [HttpGet("size")] - public IActionResult Index() + public string Index() { - return Ok("37580963840"); + return "37580963840"; } } } diff --git a/UKSF.Api/Middleware/ExceptionHandler.cs b/UKSF.Api/Middleware/ExceptionHandler.cs index b8b096d6..889eec27 100644 --- a/UKSF.Api/Middleware/ExceptionHandler.cs +++ b/UKSF.Api/Middleware/ExceptionHandler.cs @@ -39,7 +39,7 @@ private static ValueTask HandleUnhandledException(Exception excepti } context.Response.ContentType = "application/json"; - return SerializeToStream(context.Response.BodyWriter, new(context.Response.StatusCode, exception?.Message)); + return SerializeToStream(context.Response.BodyWriter, new(context.Response.StatusCode, 0, exception?.Message, null)); } private static ValueTask HandleUksfException(UksfException uksfException, HttpContext context) @@ -47,7 +47,7 @@ private static ValueTask HandleUksfException(UksfException uksfExce context.Response.StatusCode = uksfException.StatusCode; context.Response.ContentType = "application/json"; - return SerializeToStream(context.Response.BodyWriter, new(uksfException.StatusCode, uksfException.Message)); + return SerializeToStream(context.Response.BodyWriter, new(uksfException.StatusCode, uksfException.DetailCode, uksfException.Message, uksfException.Validation)); } private static ValueTask SerializeToStream(PipeWriter output, UksfErrorMessage error) diff --git a/UKSF.Api/Models/LoaReportDataset.cs b/UKSF.Api/Models/LoaReportDataset.cs index b2f4035d..0b5cedec 100644 --- a/UKSF.Api/Models/LoaReportDataset.cs +++ b/UKSF.Api/Models/LoaReportDataset.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using UKSF.Api.Personnel.Models; namespace UKSF.Api.Models { @@ -22,6 +23,6 @@ public class LoaReport public string Name; public string Reason; public DateTime Start; - public string State; + public LoaReviewState State; } } diff --git a/UKSF.Api/Program.cs b/UKSF.Api/Program.cs index 99da5b1c..964734d7 100644 --- a/UKSF.Api/Program.cs +++ b/UKSF.Api/Program.cs @@ -14,6 +14,12 @@ public static class Program { public static void Main(string[] args) { + if (!OperatingSystem.IsWindows()) + { + Console.Out.WriteLine("Not running on windows, shutting down."); + return; + } + AppDomain.CurrentDomain.GetAssemblies() .ToList() .SelectMany(x => x.GetReferencedAssemblies()) diff --git a/UKSF.Api/ServiceExtensions.cs b/UKSF.Api/ServiceExtensions.cs index aa6682fd..36ed8491 100644 --- a/UKSF.Api/ServiceExtensions.cs +++ b/UKSF.Api/ServiceExtensions.cs @@ -44,7 +44,7 @@ private static IServiceCollection AddServices(this IServiceCollection services) private static IServiceCollection AddMiddlewares(this IServiceCollection services) { - return services.AddSingleton().AddSingleton().AddSingleton(); + return services.AddSingleton().AddSingleton().AddSingleton(); } private static void AddComponents(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) diff --git a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs index ea5a8b59..483bb25a 100644 --- a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs @@ -7,30 +7,36 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Common { - public class ChangeUtilitiesTests { +namespace UKSF.Tests.Unit.Common +{ + public class ChangeUtilitiesTests + { [Fact] - public void Should_detect_changes_for_complex_object() { + public void Should_detect_changes_for_complex_object() + { string id = ObjectId.GenerateNewId().ToString(); - Account original = new() { + DomainAccount original = new() + { Id = id, Firstname = "Tim", Background = "I like trains", Dob = DateTime.Parse("2018-08-09T05:00:00.307"), Rank = "Private", - Application = new Application { State = ApplicationState.WAITING, Recruiter = "Bob", ApplicationCommentThread = "thread1", DateCreated = DateTime.Parse("2020-05-02T10:34:39.786") }, - RolePreferences = new List { "Aviatin", "NCO" } + Application = new() { State = ApplicationState.WAITING, Recruiter = "Bob", ApplicationCommentThread = "thread1", DateCreated = DateTime.Parse("2020-05-02T10:34:39.786") }, + RolePreferences = new() { "Aviatin", "NCO" } }; - Account updated = new() { + DomainAccount updated = new() + { Id = id, Firstname = "Timmy", Lastname = "Bob", Background = "I like planes", Dob = DateTime.Parse("2020-10-03T05:00:34.307"), - Application = new Application { + Application = new() + { State = ApplicationState.ACCEPTED, Recruiter = "Bob", DateCreated = DateTime.Parse("2020-05-02T10:34:39.786"), DateAccepted = DateTime.Parse("2020-07-02T10:34:39.786") }, - RolePreferences = new List { "Aviation", "Officer" } + RolePreferences = new() { "Aviation", "Officer" } }; string subject = original.Changes(updated); @@ -55,10 +61,11 @@ public void Should_detect_changes_for_complex_object() { } [Fact] - public void Should_detect_changes_for_date() { + public void Should_detect_changes_for_date() + { string id = ObjectId.GenerateNewId().ToString(); - Account original = new() { Id = id, Dob = DateTime.Parse("2020-10-03T05:00:34.307") }; - Account updated = new() { Id = id, Dob = DateTime.Parse("2020-11-03T00:00:00.000") }; + DomainAccount original = new() { Id = id, Dob = DateTime.Parse("2020-10-03T05:00:34.307") }; + DomainAccount updated = new() { Id = id, Dob = DateTime.Parse("2020-11-03T00:00:00.000") }; string subject = original.Changes(updated); @@ -66,10 +73,11 @@ public void Should_detect_changes_for_date() { } [Fact] - public void Should_detect_changes_for_dictionary() { + public void Should_detect_changes_for_dictionary() + { string id = ObjectId.GenerateNewId().ToString(); - TestDataModel original = new() { Id = id, Dictionary = new Dictionary { { "0", "variable0" }, { "1", "variable0" } } }; - TestDataModel updated = new() { Id = id, Dictionary = new Dictionary { { "0", "variable0" }, { "1", "variable1" }, { "2", "variable2" } } }; + TestDataModel original = new() { Id = id, Dictionary = new() { { "0", "variable0" }, { "1", "variable0" } } }; + TestDataModel updated = new() { Id = id, Dictionary = new() { { "0", "variable0" }, { "1", "variable1" }, { "2", "variable2" } } }; string subject = original.Changes(updated); @@ -77,10 +85,11 @@ public void Should_detect_changes_for_dictionary() { } [Fact] - public void Should_detect_changes_for_enum() { + public void Should_detect_changes_for_enum() + { string id = ObjectId.GenerateNewId().ToString(); - Account original = new() { Id = id, MembershipState = MembershipState.UNCONFIRMED }; - Account updated = new() { Id = id, MembershipState = MembershipState.MEMBER }; + DomainAccount original = new() { Id = id, MembershipState = MembershipState.UNCONFIRMED }; + DomainAccount updated = new() { Id = id, MembershipState = MembershipState.MEMBER }; string subject = original.Changes(updated); @@ -88,10 +97,11 @@ public void Should_detect_changes_for_enum() { } [Fact] - public void Should_detect_changes_for_hashset() { + public void Should_detect_changes_for_hashset() + { string id = ObjectId.GenerateNewId().ToString(); - Account original = new() { Id = id, TeamspeakIdentities = new HashSet { 0 } }; - Account updated = new() { Id = id, TeamspeakIdentities = new HashSet { 0, 1, 2, 2 } }; + DomainAccount original = new() { Id = id, TeamspeakIdentities = new() { 0 } }; + DomainAccount updated = new() { Id = id, TeamspeakIdentities = new() { 0, 1, 2, 2 } }; string subject = original.Changes(updated); @@ -99,10 +109,11 @@ public void Should_detect_changes_for_hashset() { } [Fact] - public void Should_detect_changes_for_object_list() { + public void Should_detect_changes_for_object_list() + { string id = ObjectId.GenerateNewId().ToString(); - Account original = new() { Id = id, ServiceRecord = new List { new() { Occurence = "Event" } } }; - Account updated = new() { Id = id, ServiceRecord = new List { new() { Occurence = "Event" }, new() { Occurence = "Another Event" } } }; + DomainAccount original = new() { Id = id, ServiceRecord = new() { new() { Occurence = "Event" } } }; + DomainAccount updated = new() { Id = id, ServiceRecord = new() { new() { Occurence = "Event" }, new() { Occurence = "Another Event" } } }; string subject = original.Changes(updated); @@ -110,18 +121,19 @@ public void Should_detect_changes_for_object_list() { } [Fact] - public void Should_detect_changes_for_simple_object_with_list() { - string id = ObjectId.GenerateNewId().ToString(); - Account original = new() { Id = id, RolePreferences = new List { "Aviatin", "NCO" } }; - Account updated = new() { Id = id, RolePreferences = new List { "Aviation", "NCO", "Officer" } }; + public void Should_detect_changes_for_simple_list() + { + List original = new() { "Aviatin", "NCO" }; + List updated = new() { "Aviation", "NCO", "Officer" }; string subject = original.Changes(updated); - subject.Should().Be("\n\t'RolePreferences' changed:" + "\n\t\tadded: 'Aviation'" + "\n\t\tadded: 'Officer'" + "\n\t\tremoved: 'Aviatin'"); + subject.Should().Be("\n\t'List' changed:" + "\n\t\tadded: 'Aviation'" + "\n\t\tadded: 'Officer'" + "\n\t\tremoved: 'Aviatin'"); } [Fact] - public void Should_detect_changes_for_simple_object() { + public void Should_detect_changes_for_simple_object() + { string id = ObjectId.GenerateNewId().ToString(); Rank original = new() { Id = id, Abbreviation = "Pte", Name = "Privte", Order = 1 }; Rank updated = new() { Id = id, Name = "Private", Order = 5, TeamspeakGroup = "4" }; @@ -132,7 +144,20 @@ public void Should_detect_changes_for_simple_object() { } [Fact] - public void Should_do_nothing_when_field_is_null() { + public void Should_detect_changes_for_simple_object_with_list() + { + string id = ObjectId.GenerateNewId().ToString(); + DomainAccount original = new() { Id = id, RolePreferences = new() { "Aviatin", "NCO" } }; + DomainAccount updated = new() { Id = id, RolePreferences = new() { "Aviation", "NCO", "Officer" } }; + + string subject = original.Changes(updated); + + subject.Should().Be("\n\t'RolePreferences' changed:" + "\n\t\tadded: 'Aviation'" + "\n\t\tadded: 'Officer'" + "\n\t\tremoved: 'Aviatin'"); + } + + [Fact] + public void Should_do_nothing_when_field_is_null() + { string id = ObjectId.GenerateNewId().ToString(); Rank original = new() { Id = id, Abbreviation = null }; Rank updated = new() { Id = id, Abbreviation = null }; @@ -143,14 +168,16 @@ public void Should_do_nothing_when_field_is_null() { } [Fact] - public void Should_do_nothing_when_null() { + public void Should_do_nothing_when_null() + { string subject = ((Rank) null).Changes(null); subject.Should().Be("\tNo changes"); } [Fact] - public void Should_do_nothing_when_objects_are_equal() { + public void Should_do_nothing_when_objects_are_equal() + { string id = ObjectId.GenerateNewId().ToString(); Rank original = new() { Id = id, Abbreviation = "Pte" }; Rank updated = new() { Id = id, Abbreviation = "Pte" }; @@ -159,15 +186,5 @@ public void Should_do_nothing_when_objects_are_equal() { subject.Should().Be("\tNo changes"); } - - [Fact] - public void Should_detect_changes_for_simple_list() { - List original = new() { "Aviatin", "NCO" }; - List updated = new() { "Aviation", "NCO", "Officer" }; - - string subject = original.Changes(updated); - - subject.Should().Be("\n\t'List' changed:" + "\n\t\tadded: 'Aviation'" + "\n\t\tadded: 'Officer'" + "\n\t\tremoved: 'Aviatin'"); - } } } diff --git a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs index 610a3e55..9342c23a 100644 --- a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs @@ -11,10 +11,13 @@ using UKSF.Api.Shared.Models; using Xunit; -namespace UKSF.Tests.Unit.Data { - public class SimpleDataServiceTests { +namespace UKSF.Tests.Unit.Data +{ + public class SimpleDataServiceTests + { [Fact] - public void Should_create_collections() { + public void Should_create_collections() + { Mock mockDataCollectionFactory = new(); AccountContext unused1 = new(mockDataCollectionFactory.Object, new Mock().Object); @@ -26,7 +29,7 @@ public void Should_create_collections() { NotificationsContext unused7 = new(mockDataCollectionFactory.Object, new Mock().Object); SchedulerContext unused8 = new(mockDataCollectionFactory.Object, new Mock().Object); - mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); + mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Exactly(2)); mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); diff --git a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs index 167a0bc0..af7532b7 100644 --- a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs @@ -12,45 +12,50 @@ using UKSF.Api.Shared.Models; using Xunit; -namespace UKSF.Tests.Unit.Events.Handlers { - public class AccountEventHandlerTests { - private readonly IEventBus _eventBus; +namespace UKSF.Tests.Unit.Events.Handlers +{ + public class AccountEventHandlerTests + { private readonly AccountDataEventHandler _accountDataEventHandler; + private readonly IEventBus _eventBus; private readonly Mock> _mockAccountHub; private readonly Mock _mockLoggingService; - public AccountEventHandlerTests() { + public AccountEventHandlerTests() + { Mock mockDataCollectionFactory = new(); - _mockLoggingService = new Mock(); - _mockAccountHub = new Mock>(); + _mockLoggingService = new(); + _mockAccountHub = new(); _eventBus = new EventBus(); - mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); - _accountDataEventHandler = new AccountDataEventHandler(_eventBus, _mockAccountHub.Object, _mockLoggingService.Object); + _accountDataEventHandler = new(_eventBus, _mockAccountHub.Object, _mockLoggingService.Object); } [Fact] - public void ShouldLogOnException() { + public void ShouldLogOnException() + { Mock> mockHubClients = new(); Mock mockAccountClient = new(); _mockAccountHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockAccountClient.Object); - mockAccountClient.Setup(x => x.ReceiveAccountUpdate()).Throws(new Exception()); + mockAccountClient.Setup(x => x.ReceiveAccountUpdate()).Throws(new()); _mockLoggingService.Setup(x => x.LogError(It.IsAny())); _accountDataEventHandler.Init(); - _eventBus.Send(new EventModel(EventType.UPDATE, new ContextEventData(null, null))); - _eventBus.Send(new EventModel(EventType.UPDATE, new ContextEventData(null, null))); + _eventBus.Send(new(EventType.UPDATE, new ContextEventData(null, null))); + _eventBus.Send(new(EventType.UPDATE, new ContextEventData(null, null))); _mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Exactly(2)); } [Fact] - public void ShouldNotRunEvent() { + public void ShouldNotRunEvent() + { Mock> mockHubClients = new(); Mock mockAccountClient = new(); @@ -60,16 +65,17 @@ public void ShouldNotRunEvent() { _accountDataEventHandler.Init(); - _eventBus.Send(new EventModel(EventType.ADD, new ContextEventData(null, null))); - _eventBus.Send(new EventModel(EventType.DELETE, new ContextEventData(null, null))); - _eventBus.Send(new EventModel(EventType.ADD, new ContextEventData(null, null))); - _eventBus.Send(new EventModel(EventType.DELETE, new ContextEventData(null, null))); + _eventBus.Send(new(EventType.ADD, new ContextEventData(null, null))); + _eventBus.Send(new(EventType.DELETE, new ContextEventData(null, null))); + _eventBus.Send(new(EventType.ADD, new ContextEventData(null, null))); + _eventBus.Send(new(EventType.DELETE, new ContextEventData(null, null))); mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Never); } [Fact] - public void ShouldRunEventOnUpdate() { + public void ShouldRunEventOnUpdate() + { Mock> mockHubClients = new(); Mock mockAccountClient = new(); @@ -79,8 +85,8 @@ public void ShouldRunEventOnUpdate() { _accountDataEventHandler.Init(); - _eventBus.Send(new EventModel(EventType.UPDATE, new ContextEventData("1", null))); - _eventBus.Send(new EventModel(EventType.UPDATE, new ContextEventData("2", null))); + _eventBus.Send(new(EventType.UPDATE, new ContextEventData("1", null))); + _eventBus.Send(new(EventType.UPDATE, new ContextEventData("2", null))); mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Exactly(2)); } diff --git a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs index 40097022..30a72378 100644 --- a/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/LogEventHandlerTests.cs @@ -14,7 +14,7 @@ public class LogEventHandlerTests private readonly IEventBus _eventBus; private readonly Mock _mockAuditLogDataService; private readonly Mock _mockDiscordLogDataService; - private readonly Mock _mockHttpErrorLogDataService; + private readonly Mock _mockErrorLogDataService; private readonly Mock _mockLauncherLogDataService; private readonly Mock _mockLogDataService; private readonly Mock _mockObjectIdConversionService; @@ -23,7 +23,7 @@ public LogEventHandlerTests() { _mockLogDataService = new(); _mockAuditLogDataService = new(); - _mockHttpErrorLogDataService = new(); + _mockErrorLogDataService = new(); _mockLauncherLogDataService = new(); _mockDiscordLogDataService = new(); _mockObjectIdConversionService = new(); @@ -33,7 +33,7 @@ public LogEventHandlerTests() _mockObjectIdConversionService.Setup(x => x.ConvertObjectIds(It.IsAny())).Returns(x => x); LoggerEventHandler logEventHandler = - new(_eventBus, _mockLogDataService.Object, _mockAuditLogDataService.Object, _mockHttpErrorLogDataService.Object, _mockLauncherLogDataService.Object, _mockDiscordLogDataService.Object, + new(_eventBus, _mockLogDataService.Object, _mockAuditLogDataService.Object, _mockErrorLogDataService.Object, _mockLauncherLogDataService.Object, _mockDiscordLogDataService.Object, mockLogger.Object, _mockObjectIdConversionService.Object); logEventHandler.Init(); } @@ -90,7 +90,7 @@ public void When_handling_an_error_log() _eventBus.Send(new LoggerEventData(errorLog)); _mockObjectIdConversionService.Verify(x => x.ConvertObjectIds("Exception of type 'System.Exception' was thrown."), Times.Once); - _mockHttpErrorLogDataService.Verify(x => x.Add(errorLog), Times.Once); + _mockErrorLogDataService.Verify(x => x.Add(errorLog), Times.Once); } } } diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs index e5b52ebc..b8939527 100644 --- a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -14,49 +14,31 @@ using UKSF.Api.Teamspeak.Services; using Xunit; -namespace UKSF.Tests.Unit.Events.Handlers { - public class TeamspeakEventHandlerTests { +namespace UKSF.Tests.Unit.Events.Handlers +{ + public class TeamspeakEventHandlerTests + { + private readonly IEventBus _eventBus; private readonly Mock _mockAccountContext; private readonly Mock _mockLoggingService; private readonly Mock _mockTeamspeakGroupService; private readonly Mock _mockTeamspeakService; - private readonly IEventBus _eventBus; private readonly TeamspeakServerEventHandler _teamspeakServerEventHandler; - public TeamspeakEventHandlerTests() { + public TeamspeakEventHandlerTests() + { _eventBus = new EventBus(); - _mockAccountContext = new Mock(); - _mockTeamspeakService = new Mock(); - _mockTeamspeakGroupService = new Mock(); - _mockLoggingService = new Mock(); - - _teamspeakServerEventHandler = new TeamspeakServerEventHandler( - _mockAccountContext.Object, - _eventBus, - _mockTeamspeakService.Object, - _mockTeamspeakGroupService.Object, - _mockLoggingService.Object - ); - } - - [Theory, InlineData(2), InlineData(-1)] - public async Task ShouldGetNoAccountForNoMatchingIdsOrNull(double id) { - Account account = new() { TeamspeakIdentities = Math.Abs(id - -1) < 0.01 ? null : new HashSet { id } }; - List mockAccountCollection = new() { account }; - - _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockAccountCollection.FirstOrDefault(x)); - _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())).Returns(Task.CompletedTask); - - _teamspeakServerEventHandler.Init(); - - _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); - await Task.Delay(TimeSpan.FromSeconds(1)); + _mockAccountContext = new(); + _mockTeamspeakService = new(); + _mockTeamspeakGroupService = new(); + _mockLoggingService = new(); - _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(null, new List { 5 }, 1), Times.Once); + _teamspeakServerEventHandler = new(_mockAccountContext.Object, _eventBus, _mockTeamspeakService.Object, _mockTeamspeakGroupService.Object, _mockLoggingService.Object); } [Fact] - public void LogOnException() { + public void LogOnException() + { _teamspeakServerEventHandler.Init(); _eventBus.Send(new SignalrEventData { Procedure = (TeamspeakEventType) 9 }); @@ -65,14 +47,16 @@ public void LogOnException() { } [Fact] - public void ShouldCorrectlyParseClients() { + public void ShouldCorrectlyParseClients() + { HashSet subject = new(); _mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())).Callback((HashSet x) => subject = x); _teamspeakServerEventHandler.Init(); _eventBus.Send( - new SignalrEventData { + new SignalrEventData + { Procedure = TeamspeakEventType.CLIENTS, Args = "[{\"channelId\": 1, \"channelName\": \"Test Channel 1\", \"clientDbId\": 5, \"clientName\": \"Test Name 1\"}," + "{\"channelId\": 2, \"channelName\": \"Test Channel 2\", \"clientDbId\": 10, \"clientName\": \"Test Name 2\"}]" @@ -82,7 +66,8 @@ public void ShouldCorrectlyParseClients() { subject.Should().HaveCount(2); subject.Should() .BeEquivalentTo( - new HashSet { + new HashSet + { new() { ChannelId = 1, ChannelName = "Test Channel 1", ClientDbId = 5, ClientName = "Test Name 1" }, new() { ChannelId = 2, ChannelName = "Test Channel 2", ClientDbId = 10, ClientName = "Test Name 2" } } @@ -90,37 +75,40 @@ public void ShouldCorrectlyParseClients() { } [Fact] - public async Task ShouldGetCorrectAccount() { - Account account1 = new() { TeamspeakIdentities = new HashSet { 1 } }; - Account account2 = new() { TeamspeakIdentities = new HashSet { 2 } }; - List mockAccountCollection = new() { account1, account2 }; + public async Task ShouldGetCorrectAccount() + { + DomainAccount account1 = new() { TeamspeakIdentities = new() { 1 } }; + DomainAccount account2 = new() { TeamspeakIdentities = new() { 2 } }; + List mockAccountCollection = new() { account1, account2 }; - _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockAccountCollection.FirstOrDefault(x)); - _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(account1, It.IsAny>(), 1)).Returns(Task.CompletedTask); + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockAccountCollection.FirstOrDefault(x)); + _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(account1, It.IsAny>(), 1)).Returns(Task.CompletedTask); _teamspeakServerEventHandler.Init(); _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); await Task.Delay(TimeSpan.FromSeconds(1)); - _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); } [Fact] - public void ShouldNotRunEventOnEmpty() { + public void ShouldNotRunEventOnEmpty() + { _mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); - _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); + _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); _teamspeakServerEventHandler.Init(); _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.EMPTY }); _mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Never); - _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny()), Times.Never); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny()), Times.Never); } [Fact] - public void ShouldNotRunUpdateClientsForNoClients() { + public void ShouldNotRunUpdateClientsForNoClients() + { _mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); _teamspeakServerEventHandler.Init(); @@ -131,26 +119,28 @@ public void ShouldNotRunUpdateClientsForNoClients() { } [Fact] - public async Task ShouldRunClientGroupsUpdate() { - Account account = new() { TeamspeakIdentities = new HashSet { 1 } }; + public async Task ShouldRunClientGroupsUpdate() + { + DomainAccount domainAccount = new() { TeamspeakIdentities = new() { 1 } }; - _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); - _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(account, It.IsAny>(), 1)).Returns(Task.CompletedTask); + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(domainAccount); + _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(domainAccount, It.IsAny>(), 1)).Returns(Task.CompletedTask); _teamspeakServerEventHandler.Init(); _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); await Task.Delay(TimeSpan.FromSeconds(1)); - _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5 }, 1), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(domainAccount, new List { 5 }, 1), Times.Once); } [Fact] - public async Task ShouldRunClientGroupsUpdateTwiceForTwoEventsWithDelay() { - Account account = new() { TeamspeakIdentities = new HashSet { 1 } }; + public async Task ShouldRunClientGroupsUpdateTwiceForTwoEventsWithDelay() + { + DomainAccount domainAccount = new() { TeamspeakIdentities = new() { 1 } }; - _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); - _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(domainAccount); + _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); _teamspeakServerEventHandler.Init(); @@ -159,18 +149,19 @@ public async Task ShouldRunClientGroupsUpdateTwiceForTwoEventsWithDelay() { _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); await Task.Delay(TimeSpan.FromSeconds(1)); - _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5 }, 1), Times.Once); - _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 10 }, 1), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(domainAccount, new List { 5 }, 1), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(domainAccount, new List { 10 }, 1), Times.Once); } [Fact] - public async Task ShouldRunSingleClientGroupsUpdateForEachClient() { - Account account1 = new() { TeamspeakIdentities = new HashSet { 1 } }; - Account account2 = new() { TeamspeakIdentities = new HashSet { 2 } }; - List mockCollection = new() { account1, account2 }; + public async Task ShouldRunSingleClientGroupsUpdateForEachClient() + { + DomainAccount account1 = new() { TeamspeakIdentities = new() { 1 } }; + DomainAccount account2 = new() { TeamspeakIdentities = new() { 2 } }; + List mockCollection = new() { account1, account2 }; - _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.FirstOrDefault(x)); - _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.FirstOrDefault(x)); + _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); _teamspeakServerEventHandler.Init(); @@ -178,16 +169,17 @@ public async Task ShouldRunSingleClientGroupsUpdateForEachClient() { _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 2, \"serverGroupId\": 10}" }); await Task.Delay(TimeSpan.FromSeconds(2)); - _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); - _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account2, new List { 10 }, 2), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account2, new List { 10 }, 2), Times.Once); } [Fact] - public async Task ShouldRunSingleClientGroupsUpdateForMultipleEventsWithOneClient() { - Account account = new() { TeamspeakIdentities = new HashSet { 1 } }; + public async Task ShouldRunSingleClientGroupsUpdateForMultipleEventsWithOneClient() + { + DomainAccount domainAccount = new() { TeamspeakIdentities = new() { 1 } }; - _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(account); - _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(domainAccount); + _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())); _teamspeakServerEventHandler.Init(); @@ -195,11 +187,12 @@ public async Task ShouldRunSingleClientGroupsUpdateForMultipleEventsWithOneClien _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); await Task.Delay(TimeSpan.FromSeconds(2)); - _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account, new List { 5, 10 }, 1), Times.Once); + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(domainAccount, new List { 5, 10 }, 1), Times.Once); } [Fact] - public void ShouldRunUpdateClients() { + public void ShouldRunUpdateClients() + { _mockTeamspeakService.Setup(x => x.UpdateClients(It.IsAny>())); _teamspeakServerEventHandler.Init(); @@ -210,5 +203,22 @@ public void ShouldRunUpdateClients() { _mockTeamspeakService.Verify(x => x.UpdateClients(It.IsAny>()), Times.Once); } + + [Theory, InlineData(2), InlineData(-1)] + public async Task ShouldGetNoAccountForNoMatchingIdsOrNull(int id) + { + DomainAccount domainAccount = new() { TeamspeakIdentities = Math.Abs(id - -1) < 0.01 ? null : new HashSet { id } }; + List mockAccountCollection = new() { domainAccount }; + + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockAccountCollection.FirstOrDefault(x)); + _mockTeamspeakGroupService.Setup(x => x.UpdateAccountGroups(It.IsAny(), It.IsAny>(), It.IsAny())).Returns(Task.CompletedTask); + + _teamspeakServerEventHandler.Init(); + + _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); + await Task.Delay(TimeSpan.FromSeconds(1)); + + _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(null, new List { 5 }, 1), Times.Once); + } } } diff --git a/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs b/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs index 8998be76..a5a211b9 100644 --- a/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs +++ b/UKSF.Tests/Unit/Models/Mission/MissionPatchingReportTests.cs @@ -1,13 +1,15 @@ -using System; -using FluentAssertions; -using UKSF.Api.ArmaMissions.Models; +using FluentAssertions; +using UKSF.Api.Shared.Models; using Xunit; -namespace UKSF.Tests.Unit.Models.Mission { - public class MissionPatchingReportTests { +namespace UKSF.Tests.Unit.Models.Mission +{ + public class MissionPatchingReportTests + { [Fact] - public void ShouldSetFieldsAsError() { - MissionPatchingReport subject = new("Test Title", "Test details, like what went wrong, what needs to be done to fix it", true); + public void ShouldSetFieldsAsError() + { + ValidationReport subject = new("Test Title", "Test details, like what went wrong, what needs to be done to fix it", true); subject.Title.Should().Be("Error: Test Title"); subject.Detail.Should().Be("Test details, like what went wrong, what needs to be done to fix it"); @@ -15,8 +17,9 @@ public void ShouldSetFieldsAsError() { } [Fact] - public void ShouldSetFieldsAsWarning() { - MissionPatchingReport subject = new("Test Title", "Test details, like what went wrong, what needs to be done to fix it"); + public void ShouldSetFieldsAsWarning() + { + ValidationReport subject = new("Test Title", "Test details, like what went wrong, what needs to be done to fix it"); subject.Title.Should().Be("Warning: Test Title"); subject.Detail.Should().Be("Test details, like what went wrong, what needs to be done to fix it"); @@ -24,8 +27,9 @@ public void ShouldSetFieldsAsWarning() { } [Fact] - public void ShouldSetFieldsFromException() { - MissionPatchingReport subject = new(new Exception("An error occured")); + public void ShouldSetFieldsFromException() + { + ValidationReport subject = new(new("An error occured")); subject.Title.Should().Be("An error occured"); subject.Detail.Should().Be("System.Exception: An error occured"); diff --git a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs index fa3aec72..b88d5bb1 100644 --- a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs @@ -15,25 +15,28 @@ using Xunit; using UksfUnit = UKSF.Api.Personnel.Models.Unit; -namespace UKSF.Tests.Unit.Services.Integrations.Teamspeak { - public class TeamspeakGroupServiceTests { +namespace UKSF.Tests.Unit.Services.Integrations.Teamspeak +{ + public class TeamspeakGroupServiceTests + { private static readonly VariableItem TEAMSPEAK_GID_UNVERIFIED = new() { Key = "TEAMSPEAK_GID_UNVERIFIED", Item = "1" }; private static readonly VariableItem TEAMSPEAK_GID_DISCHARGED = new() { Key = "TEAMSPEAK_GID_DISCHARGED", Item = "2" }; private static readonly VariableItem TEAMSPEAK_GID_ROOT = new() { Key = "TEAMSPEAK_GID_ROOT", Item = "3" }; private static readonly VariableItem TEAMSPEAK_GID_ELCOM = new() { Key = "TEAMSPEAK_GID_ELCOM", Item = "4" }; private static readonly VariableItem TEAMSPEAK_GID_BLACKLIST = new() { Key = "TEAMSPEAK_GID_BLACKLIST", Item = "99,100" }; - private readonly List _addedGroups = new(); + private readonly List _addedGroups = new(); private readonly UksfUnit _elcomUnit = new() { Id = ObjectId.GenerateNewId().ToString(), Name = "ELCOM", Branch = UnitBranch.AUXILIARY, Parent = ObjectId.Empty.ToString() }; private readonly Mock _mockRanksContext = new(); private readonly Mock _mockRolesContext = new(); private readonly Mock _mockTeampeakManagerService = new(); private readonly Mock _mockUnitsContext = new(); private readonly Mock _mockVariablesService = new(); - private readonly List _removedGroups = new(); + private readonly List _removedGroups = new(); private readonly TeamspeakGroupService _teamspeakGroupService; - public TeamspeakGroupServiceTests() { + public TeamspeakGroupServiceTests() + { _mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_UNVERIFIED")).Returns(TEAMSPEAK_GID_UNVERIFIED); _mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_DISCHARGED")).Returns(TEAMSPEAK_GID_DISCHARGED); _mockVariablesService.Setup(x => x.GetVariable("TEAMSPEAK_GID_ROOT")).Returns(TEAMSPEAK_GID_ROOT); @@ -48,38 +51,41 @@ public TeamspeakGroupServiceTests() { .Callback((TeamspeakProcedureType _, TeamspeakGroupProcedure groupProcedure) => _removedGroups.Add(groupProcedure.ServerGroup)); IUnitsService unitsService = new UnitsService(_mockUnitsContext.Object, _mockRolesContext.Object); - _teamspeakGroupService = new TeamspeakGroupService(_mockRanksContext.Object, _mockUnitsContext.Object, unitsService, _mockTeampeakManagerService.Object, _mockVariablesService.Object); + _teamspeakGroupService = new(_mockRanksContext.Object, _mockUnitsContext.Object, unitsService, _mockTeampeakManagerService.Object, _mockVariablesService.Object); } [Fact] - public async Task Should_add_correct_groups_for_candidate() { + public async Task Should_add_correct_groups_for_candidate() + { string id = ObjectId.GenerateNewId().ToString(); _mockRanksContext.Setup(x => x.GetSingle("Candidate")).Returns(new Rank { Name = "Candidate", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new Account { Id = id, MembershipState = MembershipState.CONFIRMED, Rank = "Candidate" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.CONFIRMED, Rank = "Candidate" }, new List(), 2); _addedGroups.Should().BeEquivalentTo(5); _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_discharged() { - await _teamspeakGroupService.UpdateAccountGroups(new Account { MembershipState = MembershipState.DISCHARGED }, new List(), 2); + public async Task Should_add_correct_groups_for_discharged() + { + await _teamspeakGroupService.UpdateAccountGroups(new() { MembershipState = MembershipState.DISCHARGED }, new List(), 2); _addedGroups.Should().BeEquivalentTo(2); _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_elcom() { + public async Task Should_add_correct_groups_for_elcom() + { string id = ObjectId.GenerateNewId().ToString(); string parentId = ObjectId.GenerateNewId().ToString(); string parentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new List { id }, Parent = parentId }; + UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; UksfUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; UksfUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; - UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new List { id } }; + UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } }; List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; _elcomUnit.Members.Add(id); @@ -88,19 +94,20 @@ public async Task Should_add_correct_groups_for_elcom() { _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List(), 2); _addedGroups.Should().BeEquivalentTo(3, 4, 5, 7, 9); _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_first_root_child() { + public async Task Should_add_correct_groups_for_first_root_child() + { string id = ObjectId.GenerateNewId().ToString(); string rootId = ObjectId.GenerateNewId().ToString(); UksfUnit rootUnit = new() { Id = rootId, Name = "UKSF", TeamspeakGroup = "10", Parent = ObjectId.Empty.ToString() }; - UksfUnit unit = new() { Name = "JSFAW", TeamspeakGroup = "6", Members = new List { id }, Parent = rootId }; - UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new List { id } }; + UksfUnit unit = new() { Name = "JSFAW", TeamspeakGroup = "6", Members = new() { id }, Parent = rootId }; + UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } }; List units = new() { rootUnit, unit, _elcomUnit, auxiliaryUnit }; _mockUnitsContext.Setup(x => x.Get()).Returns(units); @@ -108,19 +115,20 @@ public async Task Should_add_correct_groups_for_first_root_child() { _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "JSFAW" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "JSFAW" }, new List(), 2); _addedGroups.Should().BeEquivalentTo(3, 5, 6, 9); _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_first_root_child_in_elcom() { + public async Task Should_add_correct_groups_for_first_root_child_in_elcom() + { string id = ObjectId.GenerateNewId().ToString(); string rootId = ObjectId.GenerateNewId().ToString(); UksfUnit rootUnit = new() { Id = rootId, Name = "UKSF", TeamspeakGroup = "10", Parent = ObjectId.Empty.ToString() }; - UksfUnit unit = new() { Name = "JSFAW", TeamspeakGroup = "6", Members = new List { id }, Parent = rootId }; - UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new List { id } }; + UksfUnit unit = new() { Name = "JSFAW", TeamspeakGroup = "6", Members = new() { id }, Parent = rootId }; + UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } }; List units = new() { rootUnit, unit, _elcomUnit, auxiliaryUnit }; _elcomUnit.Members.Add(id); @@ -129,21 +137,22 @@ public async Task Should_add_correct_groups_for_first_root_child_in_elcom() { _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "JSFAW" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "JSFAW" }, new List(), 2); _addedGroups.Should().BeEquivalentTo(3, 5, 4, 6, 9); _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_member() { + public async Task Should_add_correct_groups_for_member() + { string id = ObjectId.GenerateNewId().ToString(); string parentId = ObjectId.GenerateNewId().ToString(); string parentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new List { id }, Parent = parentId }; + UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; UksfUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; UksfUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; - UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new List { id } }; + UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } }; List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; _mockUnitsContext.Setup(x => x.Get()).Returns(units); @@ -151,19 +160,20 @@ public async Task Should_add_correct_groups_for_member() { _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List(), 2); _addedGroups.Should().BeEquivalentTo(3, 5, 6, 7, 9); _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_member_with_gaps_in_parents() { + public async Task Should_add_correct_groups_for_member_with_gaps_in_parents() + { string id = ObjectId.GenerateNewId().ToString(); string parentId = ObjectId.GenerateNewId().ToString(); string parentParentId = ObjectId.GenerateNewId().ToString(); string parentParentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new() { Name = "1 Section", Members = new List { id }, Parent = parentId }; + UksfUnit unit = new() { Name = "1 Section", Members = new() { id }, Parent = parentId }; UksfUnit unitParent = new() { Id = parentId, Name = "1 Platoon", TeamspeakGroup = "7", Parent = parentParentId }; UksfUnit unitParentParent = new() { Id = parentParentId, Name = "A Company", Parent = parentParentParentId }; UksfUnit unitParentParentParent = new() { Id = parentParentParentId, Name = "SFSG", TeamspeakGroup = "8" }; @@ -174,33 +184,36 @@ public async Task Should_add_correct_groups_for_member_with_gaps_in_parents() { _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List(), 2); _addedGroups.Should().BeEquivalentTo(3, 5, 7, 8); _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_non_member() { - await _teamspeakGroupService.UpdateAccountGroups(new Account { MembershipState = MembershipState.UNCONFIRMED }, new List(), 2); + public async Task Should_add_correct_groups_for_non_member() + { + await _teamspeakGroupService.UpdateAccountGroups(new() { MembershipState = MembershipState.UNCONFIRMED }, new List(), 2); _addedGroups.Should().BeEquivalentTo(1); _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_non_member_with_no_account() { - await _teamspeakGroupService.UpdateAccountGroups(null, new List(), 2); + public async Task Should_add_correct_groups_for_non_member_with_no_account() + { + await _teamspeakGroupService.UpdateAccountGroups(null, new List(), 2); _addedGroups.Should().BeEquivalentTo(1); _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_add_correct_groups_for_stratcom() { + public async Task Should_add_correct_groups_for_stratcom() + { string id = ObjectId.GenerateNewId().ToString(); - UksfUnit rootUnit = new() { Name = "UKSF", TeamspeakGroup = "10", Members = new List { id }, Parent = ObjectId.Empty.ToString() }; - UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new List { id } }; + UksfUnit rootUnit = new() { Name = "UKSF", TeamspeakGroup = "10", Members = new() { id }, Parent = ObjectId.Empty.ToString() }; + UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } }; List units = new() { rootUnit, _elcomUnit, auxiliaryUnit }; _elcomUnit.Members.Add(id); @@ -209,21 +222,22 @@ public async Task Should_add_correct_groups_for_stratcom() { _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "UKSF" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "UKSF" }, new List(), 2); _addedGroups.Should().BeEquivalentTo(3, 4, 5, 10, 9); _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_only_add_groups_if_not_set() { + public async Task Should_only_add_groups_if_not_set() + { string id = ObjectId.GenerateNewId().ToString(); string parentId = ObjectId.GenerateNewId().ToString(); string parentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new List { id }, Parent = parentId }; + UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; UksfUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; UksfUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; - UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new List { id } }; + UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } }; List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; _mockUnitsContext.Setup(x => x.Get()).Returns(units); @@ -231,25 +245,22 @@ public async Task Should_only_add_groups_if_not_set() { _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups( - new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, - new List { 3, 5 }, - 2 - ); + await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List { 3, 5 }, 2); _addedGroups.Should().BeEquivalentTo(6, 7, 9); _removedGroups.Should().BeEmpty(); } [Fact] - public async Task Should_remove_correct_groups() { + public async Task Should_remove_correct_groups() + { string id = ObjectId.GenerateNewId().ToString(); string parentId = ObjectId.GenerateNewId().ToString(); string parentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new List { id }, Parent = parentId }; + UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; UksfUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; UksfUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; - UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new List { id } }; + UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } }; List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; _mockUnitsContext.Setup(x => x.Get()).Returns(units); @@ -257,27 +268,25 @@ public async Task Should_remove_correct_groups() { _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups( - new Account { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, - new List { 1, 10 }, - 2 - ); + await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List { 1, 10 }, 2); _addedGroups.Should().BeEquivalentTo(3, 5, 6, 7, 9); _removedGroups.Should().BeEquivalentTo(1, 10); } [Fact] - public async Task Should_remove_groups() { - await _teamspeakGroupService.UpdateAccountGroups(null, new List { 1, 3, 4 }, 2); + public async Task Should_remove_groups() + { + await _teamspeakGroupService.UpdateAccountGroups(null, new List { 1, 3, 4 }, 2); _addedGroups.Should().BeEmpty(); _removedGroups.Should().BeEquivalentTo(3, 4); } [Fact] - public async Task Should_remove_groups_except_blacklisted() { - await _teamspeakGroupService.UpdateAccountGroups(null, new List { 1, 3, 4, 99, 100 }, 2); + public async Task Should_remove_groups_except_blacklisted() + { + await _teamspeakGroupService.UpdateAccountGroups(null, new List { 1, 3, 4, 99, 100 }, 2); _addedGroups.Should().BeEmpty(); _removedGroups.Should().BeEquivalentTo(3, 4); diff --git a/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs index b1358363..eafa60ab 100644 --- a/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs @@ -5,79 +5,89 @@ using UKSF.Api.Personnel.Services; using Xunit; -namespace UKSF.Tests.Unit.Services.Personnel { - public class DisplayNameServiceTests { +namespace UKSF.Tests.Unit.Services.Personnel +{ + public class DisplayNameServiceTests + { private readonly DisplayNameService _displayNameService; private readonly Mock _mockAccountContext; private readonly Mock _mockRanksContext; - public DisplayNameServiceTests() { - _mockRanksContext = new Mock(); - _mockAccountContext = new Mock(); + public DisplayNameServiceTests() + { + _mockRanksContext = new(); + _mockAccountContext = new(); - _displayNameService = new DisplayNameService(_mockAccountContext.Object, _mockRanksContext.Object); + _displayNameService = new(_mockAccountContext.Object, _mockRanksContext.Object); } [Fact] - public void ShouldGetDisplayNameByAccount() { - Account account = new() { Lastname = "Beswick", Firstname = "Tim" }; + public void ShouldGetDisplayNameByAccount() + { + DomainAccount domainAccount = new() { Lastname = "Beswick", Firstname = "Tim" }; - string subject = _displayNameService.GetDisplayName(account); + string subject = _displayNameService.GetDisplayName(domainAccount); subject.Should().Be("Beswick.T"); } [Fact] - public void ShouldGetDisplayNameById() { - Account account = new() { Lastname = "Beswick", Firstname = "Tim" }; + public void ShouldGetDisplayNameById() + { + DomainAccount domainAccount = new() { Lastname = "Beswick", Firstname = "Tim" }; - _mockAccountContext.Setup(x => x.GetSingle(It.IsAny())).Returns(account); + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny())).Returns(domainAccount); - string subject = _displayNameService.GetDisplayName(account.Id); + string subject = _displayNameService.GetDisplayName(domainAccount.Id); subject.Should().Be("Beswick.T"); } [Fact] - public void ShouldGetDisplayNameWithoutRank() { - Account account = new() { Lastname = "Beswick", Firstname = "Tim" }; + public void ShouldGetDisplayNameWithoutRank() + { + DomainAccount domainAccount = new() { Lastname = "Beswick", Firstname = "Tim" }; - string subject = _displayNameService.GetDisplayNameWithoutRank(account); + string subject = _displayNameService.GetDisplayNameWithoutRank(domainAccount); subject.Should().Be("Beswick.T"); } [Fact] - public void ShouldGetDisplayNameWithRank() { - Account account = new() { Lastname = "Beswick", Firstname = "Tim", Rank = "Squadron Leader" }; + public void ShouldGetDisplayNameWithRank() + { + DomainAccount domainAccount = new() { Lastname = "Beswick", Firstname = "Tim", Rank = "Squadron Leader" }; Rank rank = new() { Abbreviation = "SqnLdr" }; _mockRanksContext.Setup(x => x.GetSingle(It.IsAny())).Returns(rank); - string subject = _displayNameService.GetDisplayName(account); + string subject = _displayNameService.GetDisplayName(domainAccount); subject.Should().Be("SqnLdr.Beswick.T"); } [Fact] - public void ShouldGetGuestWhenAccountHasNoName() { - Account account = new(); + public void ShouldGetGuestWhenAccountHasNoName() + { + DomainAccount domainAccount = new(); - string subject = _displayNameService.GetDisplayNameWithoutRank(account); + string subject = _displayNameService.GetDisplayNameWithoutRank(domainAccount); subject.Should().Be("Guest"); } [Fact] - public void ShouldGetGuestWhenAccountIsNull() { + public void ShouldGetGuestWhenAccountIsNull() + { string subject = _displayNameService.GetDisplayNameWithoutRank(null); subject.Should().Be("Guest"); } [Fact] - public void ShouldGetNoDisplayNameWhenAccountNotFound() { - _mockAccountContext.Setup(x => x.GetSingle(It.IsAny())).Returns(null); + public void ShouldGetNoDisplayNameWhenAccountNotFound() + { + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny())).Returns(null); string subject = _displayNameService.GetDisplayName("5e39336e1b92ee2d14b7fe08"); diff --git a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs index b3c9f371..e252aa1e 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs @@ -7,60 +7,22 @@ using UKSF.Api.Personnel.Services; using Xunit; -namespace UKSF.Tests.Unit.Services.Personnel { - public class RanksServiceTests { +namespace UKSF.Tests.Unit.Services.Personnel +{ + public class RanksServiceTests + { private readonly Mock _mockRanksDataService; private readonly RanksService _ranksService; - public RanksServiceTests() { - _mockRanksDataService = new Mock(); - _ranksService = new RanksService(_mockRanksDataService.Object); - } - - [Theory, InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false), InlineData("Sergeant", "Corporal", false)] - public void ShouldResolveSuperior(string rankName1, string rankName2, bool expected) { - Rank rank1 = new() { Name = "Private", Order = 0 }; - Rank rank2 = new() { Name = "Recruit", Order = 1 }; - Rank rank3 = new() { Name = "Candidate", Order = 2 }; - List mockCollection = new() { rank1, rank2, rank3 }; - - _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); - - bool subject = _ranksService.IsSuperior(rankName1, rankName2); - - subject.Should().Be(expected); - } - - [Theory, InlineData("Private", "Private", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] - public void ShouldResolveEqual(string rankName1, string rankName2, bool expected) { - Rank rank1 = new() { Name = "Private", Order = 0 }; - Rank rank2 = new() { Name = "Recruit", Order = 1 }; - Rank rank3 = new() { Name = "Candidate", Order = 2 }; - List mockCollection = new() { rank1, rank2, rank3 }; - - _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); - - bool subject = _ranksService.IsEqual(rankName1, rankName2); - - subject.Should().Be(expected); - } - - [Theory, InlineData("Private", "Private", true), InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] - public void ShouldResolveSuperiorOrEqual(string rankName1, string rankName2, bool expected) { - Rank rank1 = new() { Name = "Private", Order = 0 }; - Rank rank2 = new() { Name = "Recruit", Order = 1 }; - Rank rank3 = new() { Name = "Candidate", Order = 2 }; - List mockCollection = new() { rank1, rank2, rank3 }; - - _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); - - bool subject = _ranksService.IsSuperiorOrEqual(rankName1, rankName2); - - subject.Should().Be(expected); + public RanksServiceTests() + { + _mockRanksDataService = new(); + _ranksService = new(_mockRanksDataService.Object); } [Fact] - public void ShouldGetCorrectIndex() { + public void ShouldGetCorrectIndex() + { Rank rank1 = new() { Name = "Private" }; Rank rank2 = new() { Name = "Recruit" }; List mockCollection = new() { rank1, rank2 }; @@ -74,7 +36,8 @@ public void ShouldGetCorrectIndex() { } [Fact] - public void ShouldGetCorrectSortValueByName() { + public void ShouldGetCorrectSortValueByName() + { Rank rank1 = new() { Name = "Private", Order = 0 }; Rank rank2 = new() { Name = "Recruit", Order = 1 }; List mockCollection = new() { rank1, rank2 }; @@ -87,7 +50,8 @@ public void ShouldGetCorrectSortValueByName() { } [Fact] - public void ShouldReturnEqualWhenBothNull() { + public void ShouldReturnEqualWhenBothNull() + { _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); bool subject = _ranksService.IsEqual("Private", "Recruit"); @@ -96,7 +60,8 @@ public void ShouldReturnEqualWhenBothNull() { } [Fact] - public void ShouldReturnInvalidIndexGetIndexWhenRankNotFound() { + public void ShouldReturnInvalidIndexGetIndexWhenRankNotFound() + { _mockRanksDataService.Setup(x => x.Get()).Returns(new List()); int subject = _ranksService.GetRankOrder("Private"); @@ -106,7 +71,8 @@ public void ShouldReturnInvalidIndexGetIndexWhenRankNotFound() { } [Fact] - public void ShouldReturnZeroForSortWhenRanksAreNull() { + public void ShouldReturnZeroForSortWhenRanksAreNull() + { _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); int subject = _ranksService.Sort("Recruit", "Private"); @@ -115,12 +81,13 @@ public void ShouldReturnZeroForSortWhenRanksAreNull() { } [Fact] - public void ShouldSortCollection() { - Account account1 = new() { Rank = "Private" }; - Account account2 = new() { Rank = "Candidate" }; - Account account3 = new() { Rank = "Recruit" }; - Account account4 = new() { Rank = "Private" }; - List subject = new() { account1, account2, account3, account4 }; + public void ShouldSortCollection() + { + DomainAccount account1 = new() { Rank = "Private" }; + DomainAccount account2 = new() { Rank = "Candidate" }; + DomainAccount account3 = new() { Rank = "Recruit" }; + DomainAccount account4 = new() { Rank = "Private" }; + List subject = new() { account1, account2, account3, account4 }; Rank rank1 = new() { Name = "Private", Order = 0 }; Rank rank2 = new() { Name = "Recruit", Order = 1 }; @@ -133,5 +100,50 @@ public void ShouldSortCollection() { subject.Should().ContainInOrder(account1, account4, account3, account2); } + + [Theory, InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false), InlineData("Sergeant", "Corporal", false)] + public void ShouldResolveSuperior(string rankName1, string rankName2, bool expected) + { + Rank rank1 = new() { Name = "Private", Order = 0 }; + Rank rank2 = new() { Name = "Recruit", Order = 1 }; + Rank rank3 = new() { Name = "Candidate", Order = 2 }; + List mockCollection = new() { rank1, rank2, rank3 }; + + _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); + + bool subject = _ranksService.IsSuperior(rankName1, rankName2); + + subject.Should().Be(expected); + } + + [Theory, InlineData("Private", "Private", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] + public void ShouldResolveEqual(string rankName1, string rankName2, bool expected) + { + Rank rank1 = new() { Name = "Private", Order = 0 }; + Rank rank2 = new() { Name = "Recruit", Order = 1 }; + Rank rank3 = new() { Name = "Candidate", Order = 2 }; + List mockCollection = new() { rank1, rank2, rank3 }; + + _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); + + bool subject = _ranksService.IsEqual(rankName1, rankName2); + + subject.Should().Be(expected); + } + + [Theory, InlineData("Private", "Private", true), InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] + public void ShouldResolveSuperiorOrEqual(string rankName1, string rankName2, bool expected) + { + Rank rank1 = new() { Name = "Private", Order = 0 }; + Rank rank2 = new() { Name = "Recruit", Order = 1 }; + Rank rank3 = new() { Name = "Candidate", Order = 2 }; + List mockCollection = new() { rank1, rank2, rank3 }; + + _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); + + bool subject = _ranksService.IsSuperiorOrEqual(rankName1, rankName2); + + subject.Should().Be(expected); + } } } diff --git a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs index e478ea53..c5bf84ba 100644 --- a/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ConfirmationCodeServiceTests.cs @@ -13,39 +13,24 @@ using UKSF.Api.Shared.Services; using Xunit; -namespace UKSF.Tests.Unit.Services.Utility { - public class ConfirmationCodeServiceTests { +namespace UKSF.Tests.Unit.Services.Utility +{ + public class ConfirmationCodeServiceTests + { private readonly ConfirmationCodeService _confirmationCodeService; private readonly Mock _mockConfirmationCodeDataService; private readonly Mock _mockSchedulerService; - public ConfirmationCodeServiceTests() { - _mockConfirmationCodeDataService = new Mock(); - _mockSchedulerService = new Mock(); - _confirmationCodeService = new ConfirmationCodeService(_mockConfirmationCodeDataService.Object, _mockSchedulerService.Object); - } - - [Theory, InlineData(""), InlineData("1"), InlineData(null)] - public async Task ShouldReturnEmptyStringWhenBadIdOrNull(string id) { - _mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); - - string subject = await _confirmationCodeService.GetConfirmationCode(id); - - subject.Should().Be(string.Empty); - } - - [Theory, InlineData(null), InlineData("")] - public async Task ShouldThrowForCreateWhenValueNullOrEmpty(string value) { - _mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); - _mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); - - Func act = async () => await _confirmationCodeService.CreateConfirmationCode(value); - - await act.Should().ThrowAsync(); + public ConfirmationCodeServiceTests() + { + _mockConfirmationCodeDataService = new(); + _mockSchedulerService = new(); + _confirmationCodeService = new(_mockConfirmationCodeDataService.Object, _mockSchedulerService.Object); } [Fact] - public async Task ShouldCancelScheduledJob() { + public async Task ShouldCancelScheduledJob() + { ConfirmationCode confirmationCode = new() { Value = "test" }; List confirmationCodeData = new() { confirmationCode }; string actionParameters = JsonConvert.SerializeObject(new object[] { confirmationCode.Id }); @@ -59,13 +44,14 @@ public async Task ShouldCancelScheduledJob() { .Returns(Task.CompletedTask) .Callback>(x => subject.Remove(subject.FirstOrDefault(x))); - await _confirmationCodeService.GetConfirmationCode(confirmationCode.Id); + await _confirmationCodeService.GetConfirmationCodeValue(confirmationCode.Id); subject.Should().BeEmpty(); } [Fact] - public async Task ShouldCreateConfirmationCode() { + public async Task ShouldCreateConfirmationCode() + { ConfirmationCode subject = null; _mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); @@ -78,7 +64,8 @@ public async Task ShouldCreateConfirmationCode() { } [Fact] - public async Task ShouldGetCorrectConfirmationCode() { + public async Task ShouldGetCorrectConfirmationCode() + { ConfirmationCode confirmationCode1 = new() { Value = "test1" }; ConfirmationCode confirmationCode2 = new() { Value = "test2" }; List confirmationCodeData = new() { confirmationCode1, confirmationCode2 }; @@ -86,26 +73,28 @@ public async Task ShouldGetCorrectConfirmationCode() { _mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => confirmationCodeData.FirstOrDefault(y => y.Id == x)); _mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns>(x => Task.FromResult(new List().FirstOrDefault(x))); - string subject = await _confirmationCodeService.GetConfirmationCode(confirmationCode2.Id); + string subject = await _confirmationCodeService.GetConfirmationCodeValue(confirmationCode2.Id); subject.Should().Be("test2"); } [Fact] - public async Task ShouldReturnCodeValue() { + public async Task ShouldReturnCodeValue() + { ConfirmationCode confirmationCode = new() { Value = "test" }; List confirmationCodeData = new() { confirmationCode }; _mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => confirmationCodeData.FirstOrDefault(y => y.Id == x)); _mockSchedulerService.Setup(x => x.Cancel(It.IsAny>())).Returns>(x => Task.FromResult(new List().FirstOrDefault(x))); - string subject = await _confirmationCodeService.GetConfirmationCode(confirmationCode.Id); + string subject = await _confirmationCodeService.GetConfirmationCodeValue(confirmationCode.Id); subject.Should().Be("test"); } [Fact] - public async Task ShouldReturnValidCodeId() { + public async Task ShouldReturnValidCodeId() + { _mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); _mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); @@ -116,7 +105,8 @@ public async Task ShouldReturnValidCodeId() { } [Fact] - public async Task ShouldSetConfirmationCodeValue() { + public async Task ShouldSetConfirmationCodeValue() + { ConfirmationCode subject = null; _mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask).Callback(x => subject = x); @@ -127,5 +117,26 @@ public async Task ShouldSetConfirmationCodeValue() { subject.Should().NotBeNull(); subject.Value.Should().Be("test"); } + + [Theory, InlineData(""), InlineData("1"), InlineData(null)] + public async Task ShouldReturnEmptyStringWhenBadIdOrNull(string id) + { + _mockConfirmationCodeDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); + + string subject = await _confirmationCodeService.GetConfirmationCodeValue(id); + + subject.Should().Be(string.Empty); + } + + [Theory, InlineData(null), InlineData("")] + public async Task ShouldThrowForCreateWhenValueNullOrEmpty(string value) + { + _mockConfirmationCodeDataService.Setup(x => x.Add(It.IsAny())).Returns(Task.CompletedTask); + _mockSchedulerService.Setup(x => x.CreateAndScheduleJob(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); + + Func act = async () => await _confirmationCodeService.CreateConfirmationCode(value); + + await act.Should().ThrowAsync(); + } } } diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs index 6c77af30..9f45eb4a 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/PruneDataActionTests.cs @@ -17,7 +17,7 @@ public class PruneDataActionTests { private readonly IActionPruneLogs _actionPruneLogs; private readonly Mock _mockAuditLogContext = new(); - private readonly Mock _mockHttpErrorLogContext = new(); + private readonly Mock _mockErrorLogContext = new(); private readonly Mock _mockLogContext = new(); private readonly Mock _mockSchedulerContext = new(); private readonly DateTime _now; @@ -34,7 +34,7 @@ public PruneDataActionTests() _actionPruneLogs = new ActionPruneLogs( _mockLogContext.Object, _mockAuditLogContext.Object, - _mockHttpErrorLogContext.Object, + _mockErrorLogContext.Object, mockSchedulerService.Object, _mockSchedulerContext.Object, mockHostEnvironment.Object, @@ -63,9 +63,9 @@ public async Task When_pruning_logs() _mockAuditLogContext.Setup(x => x.DeleteMany(It.IsAny>>())) .Returns(Task.CompletedTask) .Callback>>(x => auditLogs.RemoveAll(y => x.Compile()(y))); - _mockHttpErrorLogContext.Setup(x => x.DeleteMany(It.IsAny>>())) - .Returns(Task.CompletedTask) - .Callback>>(x => errorLogs.RemoveAll(y => x.Compile()(y))); + _mockErrorLogContext.Setup(x => x.DeleteMany(It.IsAny>>())) + .Returns(Task.CompletedTask) + .Callback>>(x => errorLogs.RemoveAll(y => x.Compile()(y))); await _actionPruneLogs.Run(); diff --git a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs index 189194d9..83a8e934 100644 --- a/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/SessionServiceTests.cs @@ -8,48 +8,54 @@ using UKSF.Api.Shared.Services; using Xunit; -namespace UKSF.Tests.Unit.Services.Utility { - public class SessionServiceTests { +namespace UKSF.Tests.Unit.Services.Utility +{ + public class SessionServiceTests + { private readonly HttpContextService _httpContextService; private DefaultHttpContext _httpContext; - public SessionServiceTests() { + public SessionServiceTests() + { Mock mockHttpContextAccessor = new(); mockHttpContextAccessor.Setup(x => x.HttpContext).Returns(() => _httpContext); - _httpContextService = new HttpContextService(mockHttpContextAccessor.Object); + _httpContextService = new(mockHttpContextAccessor.Object); } [Fact] - public void ShouldGetContextEmail() { - Account account = new() { Email = "contact.tim.here@gmail.com" }; - List claims = new() { new Claim(ClaimTypes.Email, account.Email) }; + public void ShouldGetContextEmail() + { + DomainAccount domainAccount = new() { Email = "contact.tim.here@gmail.com" }; + List claims = new() { new(ClaimTypes.Email, domainAccount.Email) }; ClaimsPrincipal contextUser = new(new ClaimsIdentity(claims)); - _httpContext = new DefaultHttpContext { User = contextUser }; + _httpContext = new() { User = contextUser }; string subject = _httpContextService.GetUserEmail(); - subject.Should().Be(account.Email); + subject.Should().Be(domainAccount.Email); } [Fact] - public void ShouldGetContextId() { - Account account = new(); - List claims = new() { new Claim(ClaimTypes.Sid, account.Id, ClaimValueTypes.String) }; + public void ShouldGetContextId() + { + DomainAccount domainAccount = new(); + List claims = new() { new(ClaimTypes.Sid, domainAccount.Id, ClaimValueTypes.String) }; ClaimsPrincipal contextUser = new(new ClaimsIdentity(claims)); - _httpContext = new DefaultHttpContext { User = contextUser }; + _httpContext = new() { User = contextUser }; string subject = _httpContextService.GetUserId(); - subject.Should().Be(account.Id); + subject.Should().Be(domainAccount.Id); } [Fact] - public void ShouldReturnFalseForInvalidRole() { - List claims = new() { new Claim(ClaimTypes.Role, Permissions.ADMIN) }; + public void ShouldReturnFalseForInvalidRole() + { + List claims = new() { new(ClaimTypes.Role, Permissions.ADMIN) }; ClaimsPrincipal contextUser = new(new ClaimsIdentity(claims)); - _httpContext = new DefaultHttpContext { User = contextUser }; + _httpContext = new() { User = contextUser }; bool subject = _httpContextService.UserHasPermission(Permissions.COMMAND); @@ -57,10 +63,11 @@ public void ShouldReturnFalseForInvalidRole() { } [Fact] - public void ShouldReturnTrueForValidRole() { - List claims = new() { new Claim(ClaimTypes.Role, Permissions.ADMIN) }; + public void ShouldReturnTrueForValidRole() + { + List claims = new() { new(ClaimTypes.Role, Permissions.ADMIN) }; ClaimsPrincipal contextUser = new(new ClaimsIdentity(claims)); - _httpContext = new DefaultHttpContext { User = contextUser }; + _httpContext = new() { User = contextUser }; bool subject = _httpContextService.UserHasPermission(Permissions.ADMIN); From 176c0df2705f33ec5d19e4d202937f504d5be670 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 24 May 2021 19:47:40 +0100 Subject: [PATCH 323/369] Cleanup --- .../DependencyInjectionTests.cs | 18 +- .../DependencyInjectionTests.cs | 15 +- .../DependencyInjectionTests.cs | 15 +- .../DependencyInjectionTests.cs | 15 +- .../DependencyInjectionTests.cs | 18 +- .../DependencyInjectionTests.cs | 12 +- .../DependencyInjectionTests.cs | 18 +- .../DependencyInjectionTestsBase.cs | 13 +- .../ITestCachedDataService.cs | 3 +- .../UKSF.Api.Tests.Common/ITestDataService.cs | 3 +- .../TestCachedContext.cs | 12 +- .../TestComplexDataModel.cs | 6 +- Tests/UKSF.Api.Tests.Common/TestContext.cs | 12 +- Tests/UKSF.Api.Tests.Common/TestDataModel.cs | 6 +- .../EventHandlers/LogEventHandler.cs | 15 +- UKSF.Api.Admin/Models/VariableItem.cs | 6 +- .../Signalr/Clients/IAdminClient.cs | 6 +- .../Signalr/Clients/IUtilityClient.cs | 6 +- UKSF.Api.Admin/Signalr/Hubs/AdminHub.cs | 6 +- UKSF.Api.Admin/Signalr/Hubs/UtilityHub.cs | 6 +- UKSF.Api.ArmaMissions/Models/Mission.cs | 15 +- UKSF.Api.ArmaMissions/Models/MissionEntity.cs | 8 +- .../Models/MissionEntityItem.cs | 6 +- .../Models/MissionPatchData.cs | 6 +- UKSF.Api.ArmaMissions/Models/MissionUnit.cs | 6 +- .../Services/MissionEntityHelper.cs | 36 +- .../DataContext/GameServersContext.cs | 12 +- UKSF.Api.ArmaServer/Models/GameEnvironment.cs | 6 +- UKSF.Api.ArmaServer/Models/MissionFile.cs | 9 +- .../Signalr/Clients/IServersClient.cs | 6 +- .../Signalr/Hubs/ServersHub.cs | 6 +- UKSF.Api.Base/Context/MongoClientFactory.cs | 9 +- UKSF.Api.Base/Events/IEventHandler.cs | 6 +- UKSF.Api.Base/Models/EventModel.cs | 18 +- UKSF.Api.Base/Models/MongoObject.cs | 6 +- UKSF.Api.Base/Models/PagedResult.cs | 9 +- UKSF.Api.Base/Models/SortDirection.cs | 6 +- .../ScheduledActions/IScheduledAction.cs | 6 +- .../ISelfCreatingScheduledAction.cs | 6 +- .../Context/CommandRequestArchiveContext.cs | 12 +- .../Context/CommandRequestContext.cs | 6 +- UKSF.Api.Command/Context/DischargeContext.cs | 12 +- UKSF.Api.Command/Context/LoaContext.cs | 6 +- .../Context/OperationOrderContext.cs | 12 +- .../Context/OperationReportContext.cs | 12 +- .../CommandRequestEventHandler.cs | 21 +- UKSF.Api.Command/Models/ChainOfCommandMode.cs | 6 +- UKSF.Api.Command/Models/CommandRequestLoa.cs | 6 +- .../Models/CreateOperationOrderRequest.cs | 6 +- .../Models/CreateOperationReport.cs | 6 +- UKSF.Api.Command/Models/Discharge.cs | 9 +- UKSF.Api.Command/Models/Opord.cs | 6 +- UKSF.Api.Command/Models/Oprep.cs | 6 +- .../Signalr/Clients/ICommandRequestsClient.cs | 6 +- .../Signalr/Hubs/CommandRequestsHub.cs | 6 +- .../Models/DiscordDeletedMessageResult.cs | 11 +- .../Models/InstagramImage.cs | 6 +- .../Models/Operation.cs | 6 +- .../Models/TeamspeakProcedureType.cs | 6 +- .../Models/TeamspeakServerSnapshot.cs | 6 +- .../Signalr/Clients/ITeamspeakClient.cs | 6 +- .../Clients/ITeamspeakClientsClient.cs | 6 +- .../Signalr/Hubs/TeamspeakClientsHub.cs | 6 +- .../Context/LauncherFileContext.cs | 6 +- UKSF.Api.Launcher/Models/LauncherFile.cs | 6 +- .../Services/LauncherFileService.cs | 51 +- .../Signalr/Clients/ILauncherClient.cs | 6 +- UKSF.Api.Launcher/Signalr/Hubs/LauncherHub.cs | 6 +- UKSF.Api.Modpack/Context/BuildsContext.cs | 25 +- UKSF.Api.Modpack/Context/ReleasesContext.cs | 15 +- UKSF.Api.Modpack/Models/GithubCommit.cs | 6 +- UKSF.Api.Modpack/Models/ModpackBuild.cs | 6 +- .../Models/ModpackBuildQueueItem.cs | 6 +- UKSF.Api.Modpack/Models/ModpackBuildResult.cs | 6 +- .../Models/ModpackBuildStepEventData.cs | 15 +- .../Models/ModpackBuildStepLogItem.cs | 9 +- UKSF.Api.Modpack/Models/ModpackRelease.cs | 6 +- UKSF.Api.Modpack/Models/NewBuild.cs | 6 +- .../BuildProcess/BuildProcessorService.cs | 68 ++- .../BuildProcess/BuildQueueService.cs | 58 ++- .../Steps/BuildSteps/BuildStepExtensions.cs | 15 +- .../Steps/BuildSteps/BuildStepIntercept.cs | 9 +- .../Steps/BuildSteps/BuildStepKeys.cs | 12 +- .../Steps/BuildSteps/BuildStepPrep.cs | 11 +- .../BuildSteps/BuildStepSignDependencies.cs | 26 +- .../BuildSteps/Mods/BuildStepBuildAce.cs | 18 +- .../BuildSteps/Mods/BuildStepBuildAcre.cs | 21 +- .../BuildSteps/Mods/BuildStepBuildModpack.cs | 9 +- .../Steps/Common/BuildStepBuildRepo.cs | 9 +- .../Steps/Common/BuildStepCbaSettings.cs | 21 +- .../Steps/Common/BuildStepClean.cs | 16 +- .../Steps/Common/BuildStepDeploy.cs | 16 +- .../BuildProcess/Steps/GitBuildStep.cs | 9 +- .../Steps/ReleaseSteps/BuildStepBackup.cs | 9 +- .../Steps/ReleaseSteps/BuildStepMerge.cs | 16 +- .../Steps/ReleaseSteps/BuildStepPublish.cs | 12 +- .../ReleaseSteps/BuildStepReleaseKeys.cs | 12 +- .../Steps/ReleaseSteps/BuildStepRestore.cs | 9 +- UKSF.Api.Modpack/Services/GithubService.cs | 133 +++-- UKSF.Api.Modpack/Services/ReleaseService.cs | 38 +- .../Signalr/Clients/IModpackClient.cs | 6 +- UKSF.Api.Modpack/Signalr/Hubs/BuildsHub.cs | 18 +- .../Context/CommentThreadContext.cs | 22 +- .../Context/ConfirmationCodeContext.cs | 9 +- .../Context/NotificationsContext.cs | 6 +- UKSF.Api.Personnel/Context/UnitsContext.cs | 12 +- .../Controllers/ServiceRecordsController.cs | 3 +- .../NotificationsEventHandler.cs | 23 +- .../Extensions/ApplicationExtensions.cs | 17 +- .../Mappers/AutoMapperUnitProfile.cs | 9 +- .../Models/AccountAttendanceStatus.cs | 9 +- UKSF.Api.Personnel/Models/AccountSettings.cs | 6 +- UKSF.Api.Personnel/Models/AttendanceReport.cs | 6 +- UKSF.Api.Personnel/Models/Comment.cs | 6 +- UKSF.Api.Personnel/Models/CommentThread.cs | 14 +- .../Models/CommentThreadEventData.cs | 16 +- UKSF.Api.Personnel/Models/ConfirmationCode.cs | 6 +- UKSF.Api.Personnel/Models/Loa.cs | 9 +- UKSF.Api.Personnel/Models/MembershipState.cs | 6 +- UKSF.Api.Personnel/Models/Notification.cs | 6 +- .../Models/NotificationIcons.cs | 6 +- UKSF.Api.Personnel/Models/Rank.cs | 6 +- UKSF.Api.Personnel/Models/Role.cs | 9 +- .../Services/AttendanceService.cs | 6 +- .../Signalr/Clients/IAccountClient.cs | 6 +- .../Signalr/Clients/ICommentThreadClient.cs | 6 +- .../Signalr/Clients/INotificationsClient.cs | 6 +- UKSF.Api.Personnel/Signalr/Hubs/AccountHub.cs | 12 +- .../Signalr/Hubs/CommentThreadHub.cs | 12 +- .../Signalr/Hubs/NotificationsHub.cs | 12 +- UKSF.Api.Shared/Context/SchedulerContext.cs | 6 +- .../Extensions/ObservableExtensions.cs | 12 +- .../Extensions/ServiceExtensions.cs | 30 +- UKSF.Api.Shared/Extensions/TaskUtilities.cs | 26 +- UKSF.Api.Shared/Models/AuditLog.cs | 9 +- UKSF.Api.Shared/Models/ContextEventData.cs | 9 +- UKSF.Api.Shared/Models/DiscordEventData.cs | 9 +- UKSF.Api.Shared/Models/DiscordLog.cs | 21 +- UKSF.Api.Shared/Models/OnlineState.cs | 8 +- UKSF.Api.Shared/Models/ScheduledJob.cs | 6 +- UKSF.Api.Shared/Models/SignalrEventData.cs | 6 +- UKSF.Api.Shared/Models/TeamspeakEventType.cs | 6 +- .../Services/ScheduledActionFactory.cs | 21 +- UKSF.Api/AppStart/StartServices.cs | 15 +- .../Integration/Data/DataCollectionTests.cs | 456 +++++++++--------- .../Integration/Data/DataPerformanceTests.cs | 2 + UKSF.Tests/Unit/Common/ClockTests.cs | 15 +- .../Unit/Common/CollectionUtilitiesTests.cs | 9 +- UKSF.Tests/Unit/Common/DataUtilitiesTests.cs | 15 +- UKSF.Tests/Unit/Common/GuardUtilitesTests.cs | 18 +- UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs | 20 +- .../Unit/Common/StringUtilitiesTests.cs | 36 +- UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs | 27 +- .../Data/Admin/VariablesDataServiceTests.cs | 96 ++-- .../Unit/Data/CachedDataServiceTests.cs | 113 +++-- .../Unit/Data/DataCollectionFactoryTests.cs | 9 +- UKSF.Tests/Unit/Data/DataServiceEventTests.cs | 38 +- UKSF.Tests/Unit/Data/DataServiceTests.cs | 134 +++-- .../Data/Game/GameServersDataServiceTests.cs | 16 +- .../Message/CommentThreadDataServiceTests.cs | 31 +- .../Data/Modpack/BuildsDataServiceTests.cs | 26 +- .../Data/Modpack/ReleasesDataServiceTests.cs | 16 +- .../OperationOrderDataServiceTests.cs | 19 +- .../OperationReportDataServiceTests.cs | 19 +- .../Personnel/DischargeDataServiceTests.cs | 15 +- .../Data/Personnel/RanksDataServiceTests.cs | 38 +- .../Data/Personnel/RolesDataServiceTests.cs | 38 +- .../Unit/Data/Units/UnitsDataServiceTests.cs | 12 +- UKSF.Tests/Unit/Events/EventBusTests.cs | 9 +- .../CommandRequestEventHandlerTests.cs | 25 +- .../CommentThreadEventHandlerTests.cs | 28 +- .../NotificationsEventHandlerTests.cs | 39 +- .../Unit/Models/Game/MissionFileTests.cs | 9 +- .../Message/Logging/BasicLogMessageTests.cs | 15 +- .../Logging/LauncherLogMessageTests.cs | 9 +- .../Unit/Models/Mission/MissionTests.cs | 9 +- .../Services/Admin/VariablesServiceTests.cs | 45 +- .../Common/ObjectIdConversionServiceTests.cs | 54 ++- .../Services/Personnel/LoaServiceTests.cs | 16 +- .../Services/Personnel/RoleAttributeTests.cs | 9 +- .../Services/Personnel/RolesServiceTests.cs | 57 ++- .../Services/Utility/DataCacheServiceTests.cs | 15 +- .../Utility/ScheduledActionServiceTests.cs | 15 +- ...eleteExpiredConfirmationCodeActionTests.cs | 15 +- .../TeamspeakSnapshotActionTests.cs | 17 +- 185 files changed, 2075 insertions(+), 1309 deletions(-) diff --git a/Tests/UKSF.Api.Admin.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Admin.Tests/DependencyInjectionTests.cs index 592f7bee..c86bf7cf 100644 --- a/Tests/UKSF.Api.Admin.Tests/DependencyInjectionTests.cs +++ b/Tests/UKSF.Api.Admin.Tests/DependencyInjectionTests.cs @@ -6,14 +6,18 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Api.Admin.Tests { - public class DependencyInjectionTests : DependencyInjectionTestsBase { - public DependencyInjectionTests() { +namespace UKSF.Api.Admin.Tests +{ + public class DependencyInjectionTests : DependencyInjectionTestsBase + { + public DependencyInjectionTests() + { Services.AddUksfAdmin(); } [Fact] - public void When_resolving_controllers() { + public void When_resolving_controllers() + { Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); @@ -25,7 +29,8 @@ public void When_resolving_controllers() { } [Fact] - public void When_resolving_event_handlers() { + public void When_resolving_event_handlers() + { Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); @@ -33,7 +38,8 @@ public void When_resolving_event_handlers() { } [Fact] - public void When_resolving_scheduled_actions() { + public void When_resolving_scheduled_actions() + { Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); diff --git a/Tests/UKSF.Api.Command.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Command.Tests/DependencyInjectionTests.cs index 6a9a28f7..d8bd1ae1 100644 --- a/Tests/UKSF.Api.Command.Tests/DependencyInjectionTests.cs +++ b/Tests/UKSF.Api.Command.Tests/DependencyInjectionTests.cs @@ -7,16 +7,20 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Api.Command.Tests { - public class DependencyInjectionTests : DependencyInjectionTestsBase { - public DependencyInjectionTests() { +namespace UKSF.Api.Command.Tests +{ + public class DependencyInjectionTests : DependencyInjectionTestsBase + { + public DependencyInjectionTests() + { Services.AddUksfAdmin(); Services.AddUksfPersonnel(); Services.AddUksfCommand(); } [Fact] - public void When_resolving_controllers() { + public void When_resolving_controllers() + { Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); @@ -32,7 +36,8 @@ public void When_resolving_controllers() { } [Fact] - public void When_resolving_event_handlers() { + public void When_resolving_event_handlers() + { Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); diff --git a/Tests/UKSF.Api.Integrations.Discord.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Integrations.Discord.Tests/DependencyInjectionTests.cs index 429f8d66..97a4d5e3 100644 --- a/Tests/UKSF.Api.Integrations.Discord.Tests/DependencyInjectionTests.cs +++ b/Tests/UKSF.Api.Integrations.Discord.Tests/DependencyInjectionTests.cs @@ -8,16 +8,20 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Api.Integrations.Discord.Tests { - public class DependencyInjectionTests : DependencyInjectionTestsBase { - public DependencyInjectionTests() { +namespace UKSF.Api.Integrations.Discord.Tests +{ + public class DependencyInjectionTests : DependencyInjectionTestsBase + { + public DependencyInjectionTests() + { Services.AddUksfAdmin(); Services.AddUksfPersonnel(); Services.AddUksfIntegrationDiscord(); } [Fact] - public void When_resolving_controllers() { + public void When_resolving_controllers() + { Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); @@ -25,7 +29,8 @@ public void When_resolving_controllers() { } [Fact] - public void When_resolving_event_handlers() { + public void When_resolving_event_handlers() + { Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); diff --git a/Tests/UKSF.Api.Integrations.Instagram.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Integrations.Instagram.Tests/DependencyInjectionTests.cs index 1ac2b8e1..b457e628 100644 --- a/Tests/UKSF.Api.Integrations.Instagram.Tests/DependencyInjectionTests.cs +++ b/Tests/UKSF.Api.Integrations.Instagram.Tests/DependencyInjectionTests.cs @@ -6,15 +6,19 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Api.Integrations.Instagram.Tests { - public class DependencyInjectionTests : DependencyInjectionTestsBase { - public DependencyInjectionTests() { +namespace UKSF.Api.Integrations.Instagram.Tests +{ + public class DependencyInjectionTests : DependencyInjectionTestsBase + { + public DependencyInjectionTests() + { Services.AddUksfAdmin(); Services.AddUksfIntegrationInstagram(); } [Fact] - public void When_resolving_controllers() { + public void When_resolving_controllers() + { Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); @@ -22,7 +26,8 @@ public void When_resolving_controllers() { } [Fact] - public void When_resolving_scheduled_actions() { + public void When_resolving_scheduled_actions() + { Services.AddTransient(); Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); diff --git a/Tests/UKSF.Api.Integrations.Teamspeak.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Integrations.Teamspeak.Tests/DependencyInjectionTests.cs index d012e00c..7aefdcd2 100644 --- a/Tests/UKSF.Api.Integrations.Teamspeak.Tests/DependencyInjectionTests.cs +++ b/Tests/UKSF.Api.Integrations.Teamspeak.Tests/DependencyInjectionTests.cs @@ -9,16 +9,20 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Api.Integrations.Teamspeak.Tests { - public class DependencyInjectionTests : DependencyInjectionTestsBase { - public DependencyInjectionTests() { +namespace UKSF.Api.Integrations.Teamspeak.Tests +{ + public class DependencyInjectionTests : DependencyInjectionTestsBase + { + public DependencyInjectionTests() + { Services.AddUksfAdmin(); Services.AddUksfPersonnel(); Services.AddUksfIntegrationTeamspeak(); } [Fact] - public void When_resolving_controllers() { + public void When_resolving_controllers() + { Services.AddTransient(); Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); @@ -28,7 +32,8 @@ public void When_resolving_controllers() { } [Fact] - public void When_resolving_event_handlers() { + public void When_resolving_event_handlers() + { Services.AddTransient(); Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); @@ -38,7 +43,8 @@ public void When_resolving_event_handlers() { } [Fact] - public void When_resolving_scheduled_actions() { + public void When_resolving_scheduled_actions() + { Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); diff --git a/Tests/UKSF.Api.Launcher.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Launcher.Tests/DependencyInjectionTests.cs index e492f84e..a53fcdfb 100644 --- a/Tests/UKSF.Api.Launcher.Tests/DependencyInjectionTests.cs +++ b/Tests/UKSF.Api.Launcher.Tests/DependencyInjectionTests.cs @@ -6,16 +6,20 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Api.Launcher.Tests { - public class DependencyInjectionTests : DependencyInjectionTestsBase { - public DependencyInjectionTests() { +namespace UKSF.Api.Launcher.Tests +{ + public class DependencyInjectionTests : DependencyInjectionTestsBase + { + public DependencyInjectionTests() + { Services.AddUksfAdmin(); Services.AddUksfPersonnel(); Services.AddUksfLauncher(); } [Fact] - public void When_resolving_controllers() { + public void When_resolving_controllers() + { Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); diff --git a/Tests/UKSF.Api.Modpack.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Modpack.Tests/DependencyInjectionTests.cs index ed207fe2..7e9ccb61 100644 --- a/Tests/UKSF.Api.Modpack.Tests/DependencyInjectionTests.cs +++ b/Tests/UKSF.Api.Modpack.Tests/DependencyInjectionTests.cs @@ -11,9 +11,12 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Api.Modpack.Tests { - public class DependencyInjectionTests : DependencyInjectionTestsBase { - public DependencyInjectionTests() { +namespace UKSF.Api.Modpack.Tests +{ + public class DependencyInjectionTests : DependencyInjectionTestsBase + { + public DependencyInjectionTests() + { Services.AddUksfAdmin(); Services.AddUksfPersonnel(); Services.AddUksfArmaMissions(); @@ -23,7 +26,8 @@ public DependencyInjectionTests() { } [Fact] - public void When_resolving_controllers() { + public void When_resolving_controllers() + { Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); @@ -35,7 +39,8 @@ public void When_resolving_controllers() { } [Fact] - public void When_resolving_event_handlers() { + public void When_resolving_event_handlers() + { Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); @@ -43,7 +48,8 @@ public void When_resolving_event_handlers() { } [Fact] - public void When_resolving_scheduled_actions() { + public void When_resolving_scheduled_actions() + { Services.AddTransient(); ServiceProvider serviceProvider = Services.BuildServiceProvider(); diff --git a/Tests/UKSF.Api.Tests.Common/DependencyInjectionTestsBase.cs b/Tests/UKSF.Api.Tests.Common/DependencyInjectionTestsBase.cs index a22004ab..e3031e3a 100644 --- a/Tests/UKSF.Api.Tests.Common/DependencyInjectionTestsBase.cs +++ b/Tests/UKSF.Api.Tests.Common/DependencyInjectionTestsBase.cs @@ -7,17 +7,20 @@ using UKSF.Api.Base; using UKSF.Api.Shared; -namespace UKSF.Api.Tests.Common { - public class DependencyInjectionTestsBase { - protected readonly ServiceCollection Services; +namespace UKSF.Api.Tests.Common +{ + public class DependencyInjectionTestsBase + { protected readonly IConfigurationRoot Configuration; protected readonly IHostEnvironment HostEnvironment; + protected readonly ServiceCollection Services; - protected DependencyInjectionTestsBase() { + protected DependencyInjectionTestsBase() + { Mock mockHostEnvironment = new(); mockHostEnvironment.Setup(x => x.EnvironmentName).Returns(Environments.Development); - Services = new ServiceCollection(); + Services = new(); Configuration = TestConfigurationProvider.GetTestConfiguration(); HostEnvironment = mockHostEnvironment.Object; diff --git a/Tests/UKSF.Api.Tests.Common/ITestCachedDataService.cs b/Tests/UKSF.Api.Tests.Common/ITestCachedDataService.cs index 06c96a94..79fd7dc9 100644 --- a/Tests/UKSF.Api.Tests.Common/ITestCachedDataService.cs +++ b/Tests/UKSF.Api.Tests.Common/ITestCachedDataService.cs @@ -1,5 +1,6 @@ using UKSF.Api.Shared.Context; -namespace UKSF.Api.Tests.Common { +namespace UKSF.Api.Tests.Common +{ public interface ITestCachedContext : IMongoContext { } } diff --git a/Tests/UKSF.Api.Tests.Common/ITestDataService.cs b/Tests/UKSF.Api.Tests.Common/ITestDataService.cs index 26f9e4e2..43832a7c 100644 --- a/Tests/UKSF.Api.Tests.Common/ITestDataService.cs +++ b/Tests/UKSF.Api.Tests.Common/ITestDataService.cs @@ -1,5 +1,6 @@ using UKSF.Api.Shared.Context; -namespace UKSF.Api.Tests.Common { +namespace UKSF.Api.Tests.Common +{ public interface ITestContext : IMongoContext { } } diff --git a/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs b/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs index 1fc1c880..27dd213f 100644 --- a/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs +++ b/Tests/UKSF.Api.Tests.Common/TestCachedContext.cs @@ -2,12 +2,10 @@ using UKSF.Api.Base.Events; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Tests.Common { - public class TestCachedContext : CachedMongoContext, ITestCachedContext { - public TestCachedContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base( - mongoCollectionFactory, - eventBus, - collectionName - ) { } +namespace UKSF.Api.Tests.Common +{ + public class TestCachedContext : CachedMongoContext, ITestCachedContext + { + public TestCachedContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base(mongoCollectionFactory, eventBus, collectionName) { } } } diff --git a/Tests/UKSF.Api.Tests.Common/TestComplexDataModel.cs b/Tests/UKSF.Api.Tests.Common/TestComplexDataModel.cs index 59536184..2b0e63e4 100644 --- a/Tests/UKSF.Api.Tests.Common/TestComplexDataModel.cs +++ b/Tests/UKSF.Api.Tests.Common/TestComplexDataModel.cs @@ -1,7 +1,9 @@ using System.Collections.Generic; -namespace UKSF.Api.Tests.Common { - public class TestComplexDataModel : TestDataModel { +namespace UKSF.Api.Tests.Common +{ + public class TestComplexDataModel : TestDataModel + { public TestDataModel Data; public List DataList; public List List; diff --git a/Tests/UKSF.Api.Tests.Common/TestContext.cs b/Tests/UKSF.Api.Tests.Common/TestContext.cs index f214ebf4..d628c26c 100644 --- a/Tests/UKSF.Api.Tests.Common/TestContext.cs +++ b/Tests/UKSF.Api.Tests.Common/TestContext.cs @@ -2,12 +2,10 @@ using UKSF.Api.Base.Events; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Tests.Common { - public class TestContext : MongoContext, ITestContext { - public TestContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base( - mongoCollectionFactory, - eventBus, - collectionName - ) { } +namespace UKSF.Api.Tests.Common +{ + public class TestContext : MongoContext, ITestContext + { + public TestContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base(mongoCollectionFactory, eventBus, collectionName) { } } } diff --git a/Tests/UKSF.Api.Tests.Common/TestDataModel.cs b/Tests/UKSF.Api.Tests.Common/TestDataModel.cs index 5aff835f..bb60a587 100644 --- a/Tests/UKSF.Api.Tests.Common/TestDataModel.cs +++ b/Tests/UKSF.Api.Tests.Common/TestDataModel.cs @@ -1,8 +1,10 @@ using System.Collections.Generic; using UKSF.Api.Base.Models; -namespace UKSF.Api.Tests.Common { - public class TestDataModel : MongoObject { +namespace UKSF.Api.Tests.Common +{ + public class TestDataModel : MongoObject + { public Dictionary Dictionary = new(); public string Name; public List Stuff; diff --git a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs b/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs index 6cb3b70a..54cbe8c6 100644 --- a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs +++ b/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs @@ -8,25 +8,30 @@ using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Models; -namespace UKSF.Api.Admin.EventHandlers { +namespace UKSF.Api.Admin.EventHandlers +{ public interface ILogDataEventHandler : IEventHandler { } - public class LogDataEventHandler : ILogDataEventHandler { + public class LogDataEventHandler : ILogDataEventHandler + { private readonly IEventBus _eventBus; private readonly IHubContext _hub; private readonly ILogger _logger; - public LogDataEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) { + public LogDataEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) + { _eventBus = eventBus; _hub = hub; _logger = logger; } - public void Init() { + public void Init() + { _eventBus.AsObservable().SubscribeWithAsyncNext(HandleEvent, _logger.LogError); } - private async Task HandleEvent(EventModel eventModel, LoggerEventData logData) { + private async Task HandleEvent(EventModel eventModel, LoggerEventData logData) + { await _hub.Clients.All.ReceiveLog(); } } diff --git a/UKSF.Api.Admin/Models/VariableItem.cs b/UKSF.Api.Admin/Models/VariableItem.cs index 6972b268..fce377e6 100644 --- a/UKSF.Api.Admin/Models/VariableItem.cs +++ b/UKSF.Api.Admin/Models/VariableItem.cs @@ -1,7 +1,9 @@ using UKSF.Api.Base.Models; -namespace UKSF.Api.Admin.Models { - public class VariableItem : MongoObject { +namespace UKSF.Api.Admin.Models +{ + public class VariableItem : MongoObject + { public object Item; public string Key; } diff --git a/UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs b/UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs index 5d0d94ee..a363c7f0 100644 --- a/UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs +++ b/UKSF.Api.Admin/Signalr/Clients/IAdminClient.cs @@ -1,7 +1,9 @@ using System.Threading.Tasks; -namespace UKSF.Api.Admin.Signalr.Clients { - public interface IAdminClient { +namespace UKSF.Api.Admin.Signalr.Clients +{ + public interface IAdminClient + { Task ReceiveLog(); } } diff --git a/UKSF.Api.Admin/Signalr/Clients/IUtilityClient.cs b/UKSF.Api.Admin/Signalr/Clients/IUtilityClient.cs index a7c15013..94c5ee9e 100644 --- a/UKSF.Api.Admin/Signalr/Clients/IUtilityClient.cs +++ b/UKSF.Api.Admin/Signalr/Clients/IUtilityClient.cs @@ -1,7 +1,9 @@ using System.Threading.Tasks; -namespace UKSF.Api.Admin.Signalr.Clients { - public interface IUtilityClient { +namespace UKSF.Api.Admin.Signalr.Clients +{ + public interface IUtilityClient + { Task ReceiveFrontendUpdate(string version); } } diff --git a/UKSF.Api.Admin/Signalr/Hubs/AdminHub.cs b/UKSF.Api.Admin/Signalr/Hubs/AdminHub.cs index 8018c872..7dd746b4 100644 --- a/UKSF.Api.Admin/Signalr/Hubs/AdminHub.cs +++ b/UKSF.Api.Admin/Signalr/Hubs/AdminHub.cs @@ -2,9 +2,11 @@ using Microsoft.AspNetCore.SignalR; using UKSF.Api.Admin.Signalr.Clients; -namespace UKSF.Api.Admin.Signalr.Hubs { +namespace UKSF.Api.Admin.Signalr.Hubs +{ [Authorize] - public class AdminHub : Hub { + public class AdminHub : Hub + { public const string END_POINT = "admin"; } } diff --git a/UKSF.Api.Admin/Signalr/Hubs/UtilityHub.cs b/UKSF.Api.Admin/Signalr/Hubs/UtilityHub.cs index 0da88174..caa6b5ba 100644 --- a/UKSF.Api.Admin/Signalr/Hubs/UtilityHub.cs +++ b/UKSF.Api.Admin/Signalr/Hubs/UtilityHub.cs @@ -1,8 +1,10 @@ using Microsoft.AspNetCore.SignalR; using UKSF.Api.Admin.Signalr.Clients; -namespace UKSF.Api.Admin.Signalr.Hubs { - public class UtilityHub : Hub { +namespace UKSF.Api.Admin.Signalr.Hubs +{ + public class UtilityHub : Hub + { public const string END_POINT = "utility"; } } diff --git a/UKSF.Api.ArmaMissions/Models/Mission.cs b/UKSF.Api.ArmaMissions/Models/Mission.cs index 6c4ee9cf..75a8c732 100644 --- a/UKSF.Api.ArmaMissions/Models/Mission.cs +++ b/UKSF.Api.ArmaMissions/Models/Mission.cs @@ -1,19 +1,22 @@ using System.Collections.Generic; -namespace UKSF.Api.ArmaMissions.Models { - public class Mission { +namespace UKSF.Api.ArmaMissions.Models +{ + public class Mission + { public static int NextId; - public string DescriptionPath; - public string Path; - public string SqmPath; public List DescriptionLines; + public string DescriptionPath; public int MaxCurators; public MissionEntity MissionEntity; + public string Path; public int PlayerCount; public List RawEntities; public List SqmLines; + public string SqmPath; - public Mission(string path) { + public Mission(string path) + { Path = path; DescriptionPath = $"{Path}/description.ext"; SqmPath = $"{Path}/mission.sqm"; diff --git a/UKSF.Api.ArmaMissions/Models/MissionEntity.cs b/UKSF.Api.ArmaMissions/Models/MissionEntity.cs index a312143e..c0450c17 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionEntity.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionEntity.cs @@ -1,8 +1,10 @@ using System.Collections.Generic; -namespace UKSF.Api.ArmaMissions.Models { - public class MissionEntity { - public List MissionEntityItems = new(); +namespace UKSF.Api.ArmaMissions.Models +{ + public class MissionEntity + { public int ItemsCount; + public List MissionEntityItems = new(); } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs b/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs index bdc22bc5..4776054a 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionEntityItem.cs @@ -1,7 +1,9 @@ using System.Collections.Generic; -namespace UKSF.Api.ArmaMissions.Models { - public class MissionEntityItem { +namespace UKSF.Api.ArmaMissions.Models +{ + public class MissionEntityItem + { public static double Position = 10; public static double CuratorPosition = 0.5; public string DataType; diff --git a/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs index b1579fe0..ce86bb31 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs @@ -1,8 +1,10 @@ using System.Collections.Generic; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.ArmaMissions.Models { - public class MissionPatchData { +namespace UKSF.Api.ArmaMissions.Models +{ + public class MissionPatchData + { public static MissionPatchData Instance; public IEnumerable EngineerIds; public IEnumerable MedicIds; diff --git a/UKSF.Api.ArmaMissions/Models/MissionUnit.cs b/UKSF.Api.ArmaMissions/Models/MissionUnit.cs index 05c77127..efe1f1ff 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionUnit.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionUnit.cs @@ -1,8 +1,10 @@ using System.Collections.Generic; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.ArmaMissions.Models { - public class MissionUnit { +namespace UKSF.Api.ArmaMissions.Models +{ + public class MissionUnit + { public string Callsign; public List Members = new(); public Dictionary Roles = new(); diff --git a/UKSF.Api.ArmaMissions/Services/MissionEntityHelper.cs b/UKSF.Api.ArmaMissions/Services/MissionEntityHelper.cs index ae0b222f..8f6037fe 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionEntityHelper.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionEntityHelper.cs @@ -3,51 +3,63 @@ using System.Linq; using UKSF.Api.ArmaMissions.Models; -namespace UKSF.Api.ArmaMissions.Services { - public static class MissionEntityHelper { - public static MissionEntity CreateFromItems(List rawEntities) { +namespace UKSF.Api.ArmaMissions.Services +{ + public static class MissionEntityHelper + { + public static MissionEntity CreateFromItems(List rawEntities) + { MissionEntity missionEntity = new() { ItemsCount = Convert.ToInt32(MissionUtilities.ReadSingleDataByKey(rawEntities, "items")) }; int index = rawEntities.FindIndex(x => x.Contains("class Item")); - while (missionEntity.MissionEntityItems.Count != missionEntity.ItemsCount) { + while (missionEntity.MissionEntityItems.Count != missionEntity.ItemsCount) + { missionEntity.MissionEntityItems.Add(MissionEntityItemHelper.CreateFromList(MissionUtilities.ReadDataFromIndex(rawEntities, ref index))); } return missionEntity; } - private static MissionEntity CreateFromUnit(MissionUnit unit) { + private static MissionEntity CreateFromUnit(MissionUnit unit) + { MissionEntity missionEntity = new(); List slots = MissionDataResolver.ResolveUnitSlots(unit); - for (int i = 0; i < slots.Count; i++) { + for (int i = 0; i < slots.Count; i++) + { missionEntity.MissionEntityItems.Add(MissionEntityItemHelper.CreateFromPlayer(slots[i], i)); } return missionEntity; } - public static void Patch(this MissionEntity missionEntity, int maxCurators) { + public static void Patch(this MissionEntity missionEntity, int maxCurators) + { MissionEntityItem.Position = 10; missionEntity.MissionEntityItems.RemoveAll(x => x.DataType.Equals("Group") && x.MissionEntity != null && x.MissionEntity.MissionEntityItems.All(y => y.IsPlayable && !y.Ignored())); - foreach (MissionUnit unit in MissionPatchData.Instance.OrderedUnits) { + foreach (MissionUnit unit in MissionPatchData.Instance.OrderedUnits) + { missionEntity.MissionEntityItems.Add(MissionEntityItemHelper.CreateFromMissionEntity(CreateFromUnit(unit), unit.Callsign)); } MissionEntityItem.CuratorPosition = 0.5; missionEntity.MissionEntityItems.RemoveAll(x => x.DataType == "Logic" && x.Type == "ModuleCurator_F"); - for (int index = 0; index < maxCurators; index++) { + for (int index = 0; index < maxCurators; index++) + { missionEntity.MissionEntityItems.Add(MissionEntityItemHelper.CreateCuratorEntity()); } missionEntity.ItemsCount = missionEntity.MissionEntityItems.Count; - for (int index = 0; index < missionEntity.MissionEntityItems.Count; index++) { + for (int index = 0; index < missionEntity.MissionEntityItems.Count; index++) + { missionEntity.MissionEntityItems[index].Patch(index); } } - public static IEnumerable Serialize(this MissionEntity missionEntity) { + public static IEnumerable Serialize(this MissionEntity missionEntity) + { missionEntity.ItemsCount = missionEntity.MissionEntityItems.Count; List serialized = new() { "class Entities", "{", $"items = {missionEntity.ItemsCount};" }; - foreach (MissionEntityItem item in missionEntity.MissionEntityItems) { + foreach (MissionEntityItem item in missionEntity.MissionEntityItems) + { serialized.AddRange(item.Serialize()); } diff --git a/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs b/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs index 5ff4b7ef..22ff2b0b 100644 --- a/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs +++ b/UKSF.Api.ArmaServer/DataContext/GameServersContext.cs @@ -5,14 +5,18 @@ using UKSF.Api.Base.Events; using UKSF.Api.Shared.Context; -namespace UKSF.Api.ArmaServer.DataContext { +namespace UKSF.Api.ArmaServer.DataContext +{ public interface IGameServersContext : IMongoContext, ICachedMongoContext { } - public class GameServersContext : CachedMongoContext, IGameServersContext { + public class GameServersContext : CachedMongoContext, IGameServersContext + { public GameServersContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "gameServers") { } - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { + protected override void SetCache(IEnumerable newCollection) + { + lock (LockObject) + { Cache = newCollection?.OrderBy(x => x.Order).ToList(); } } diff --git a/UKSF.Api.ArmaServer/Models/GameEnvironment.cs b/UKSF.Api.ArmaServer/Models/GameEnvironment.cs index b92fa685..a6cc7b9b 100644 --- a/UKSF.Api.ArmaServer/Models/GameEnvironment.cs +++ b/UKSF.Api.ArmaServer/Models/GameEnvironment.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.ArmaServer.Models { - public enum GameEnvironment { +namespace UKSF.Api.ArmaServer.Models +{ + public enum GameEnvironment + { RELEASE, RC, DEV diff --git a/UKSF.Api.ArmaServer/Models/MissionFile.cs b/UKSF.Api.ArmaServer/Models/MissionFile.cs index ae668653..58b6a513 100644 --- a/UKSF.Api.ArmaServer/Models/MissionFile.cs +++ b/UKSF.Api.ArmaServer/Models/MissionFile.cs @@ -1,12 +1,15 @@ using System.IO; -namespace UKSF.Api.ArmaServer.Models { - public class MissionFile { +namespace UKSF.Api.ArmaServer.Models +{ + public class MissionFile + { public string Map; public string Name; public string Path; - public MissionFile(FileSystemInfo fileInfo) { + public MissionFile(FileSystemInfo fileInfo) + { string[] fileNameParts = fileInfo.Name.Split("."); Path = fileInfo.Name; Name = fileNameParts[0]; diff --git a/UKSF.Api.ArmaServer/Signalr/Clients/IServersClient.cs b/UKSF.Api.ArmaServer/Signalr/Clients/IServersClient.cs index dd8ab183..ec66cf7b 100644 --- a/UKSF.Api.ArmaServer/Signalr/Clients/IServersClient.cs +++ b/UKSF.Api.ArmaServer/Signalr/Clients/IServersClient.cs @@ -1,7 +1,9 @@ using System.Threading.Tasks; -namespace UKSF.Api.ArmaServer.Signalr.Clients { - public interface IServersClient { +namespace UKSF.Api.ArmaServer.Signalr.Clients +{ + public interface IServersClient + { Task ReceiveDisabledState(bool state); } } diff --git a/UKSF.Api.ArmaServer/Signalr/Hubs/ServersHub.cs b/UKSF.Api.ArmaServer/Signalr/Hubs/ServersHub.cs index 90cca47e..7b941c01 100644 --- a/UKSF.Api.ArmaServer/Signalr/Hubs/ServersHub.cs +++ b/UKSF.Api.ArmaServer/Signalr/Hubs/ServersHub.cs @@ -1,8 +1,10 @@ using Microsoft.AspNetCore.SignalR; using UKSF.Api.ArmaServer.Signalr.Clients; -namespace UKSF.Api.ArmaServer.Signalr.Hubs { - public class ServersHub : Hub { +namespace UKSF.Api.ArmaServer.Signalr.Hubs +{ + public class ServersHub : Hub + { public const string END_POINT = "servers"; } } diff --git a/UKSF.Api.Base/Context/MongoClientFactory.cs b/UKSF.Api.Base/Context/MongoClientFactory.cs index 2555f1db..34afad30 100644 --- a/UKSF.Api.Base/Context/MongoClientFactory.cs +++ b/UKSF.Api.Base/Context/MongoClientFactory.cs @@ -1,9 +1,12 @@ using MongoDB.Bson.Serialization.Conventions; using MongoDB.Driver; -namespace UKSF.Api.Base.Context { - public static class MongoClientFactory { - public static IMongoDatabase GetDatabase(string connectionString) { +namespace UKSF.Api.Base.Context +{ + public static class MongoClientFactory + { + public static IMongoDatabase GetDatabase(string connectionString) + { ConventionPack conventionPack = new() { new IgnoreExtraElementsConvention(true), new IgnoreIfNullConvention(true), new CamelCaseElementNameConvention() }; ConventionRegistry.Register("DefaultConventions", conventionPack, _ => true); string database = MongoUrl.Create(connectionString).DatabaseName; diff --git a/UKSF.Api.Base/Events/IEventHandler.cs b/UKSF.Api.Base/Events/IEventHandler.cs index 51b2ca91..c07acd39 100644 --- a/UKSF.Api.Base/Events/IEventHandler.cs +++ b/UKSF.Api.Base/Events/IEventHandler.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.Base.Events { - public interface IEventHandler { +namespace UKSF.Api.Base.Events +{ + public interface IEventHandler + { void Init(); } } diff --git a/UKSF.Api.Base/Models/EventModel.cs b/UKSF.Api.Base/Models/EventModel.cs index 4a439b34..2838fee9 100644 --- a/UKSF.Api.Base/Models/EventModel.cs +++ b/UKSF.Api.Base/Models/EventModel.cs @@ -1,18 +1,22 @@ -namespace UKSF.Api.Base.Models { - public enum EventType { +namespace UKSF.Api.Base.Models +{ + public enum EventType + { NONE, ADD, UPDATE, DELETE } - public class EventModel { - public EventModel(EventType eventType, object data) { + public class EventModel + { + public object Data; + public EventType EventType; + + public EventModel(EventType eventType, object data) + { EventType = eventType; Data = data; } - - public object Data; - public EventType EventType; } } diff --git a/UKSF.Api.Base/Models/MongoObject.cs b/UKSF.Api.Base/Models/MongoObject.cs index c5ab1fd8..9beb5d15 100644 --- a/UKSF.Api.Base/Models/MongoObject.cs +++ b/UKSF.Api.Base/Models/MongoObject.cs @@ -1,8 +1,10 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSF.Api.Base.Models { - public class MongoObject { +namespace UKSF.Api.Base.Models +{ + public class MongoObject + { [BsonId, BsonRepresentation(BsonType.ObjectId)] public string Id = ObjectId.GenerateNewId().ToString(); } } diff --git a/UKSF.Api.Base/Models/PagedResult.cs b/UKSF.Api.Base/Models/PagedResult.cs index eec90882..cfc772eb 100644 --- a/UKSF.Api.Base/Models/PagedResult.cs +++ b/UKSF.Api.Base/Models/PagedResult.cs @@ -1,11 +1,14 @@ using System.Collections.Generic; -namespace UKSF.Api.Base.Models { - public class PagedResult where T : MongoObject { +namespace UKSF.Api.Base.Models +{ + public class PagedResult where T : MongoObject + { public IEnumerable Data; public int TotalCount; - public PagedResult(int totalCount, IEnumerable data) { + public PagedResult(int totalCount, IEnumerable data) + { TotalCount = totalCount; Data = data; } diff --git a/UKSF.Api.Base/Models/SortDirection.cs b/UKSF.Api.Base/Models/SortDirection.cs index ef96ee2d..87d0a0c4 100644 --- a/UKSF.Api.Base/Models/SortDirection.cs +++ b/UKSF.Api.Base/Models/SortDirection.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.Base.Models { - public enum SortDirection { +namespace UKSF.Api.Base.Models +{ + public enum SortDirection + { ASCENDING, DESCENDING } diff --git a/UKSF.Api.Base/ScheduledActions/IScheduledAction.cs b/UKSF.Api.Base/ScheduledActions/IScheduledAction.cs index df16ffe4..a07e6a47 100644 --- a/UKSF.Api.Base/ScheduledActions/IScheduledAction.cs +++ b/UKSF.Api.Base/ScheduledActions/IScheduledAction.cs @@ -1,7 +1,9 @@ using System.Threading.Tasks; -namespace UKSF.Api.Base.ScheduledActions { - public interface IScheduledAction { +namespace UKSF.Api.Base.ScheduledActions +{ + public interface IScheduledAction + { string Name { get; } Task Run(params object[] parameters); } diff --git a/UKSF.Api.Base/ScheduledActions/ISelfCreatingScheduledAction.cs b/UKSF.Api.Base/ScheduledActions/ISelfCreatingScheduledAction.cs index d86919c2..ff5a461f 100644 --- a/UKSF.Api.Base/ScheduledActions/ISelfCreatingScheduledAction.cs +++ b/UKSF.Api.Base/ScheduledActions/ISelfCreatingScheduledAction.cs @@ -1,7 +1,9 @@ using System.Threading.Tasks; -namespace UKSF.Api.Base.ScheduledActions { - public interface ISelfCreatingScheduledAction : IScheduledAction { +namespace UKSF.Api.Base.ScheduledActions +{ + public interface ISelfCreatingScheduledAction : IScheduledAction + { Task CreateSelf(); Task Reset(); } diff --git a/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs b/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs index d019ffd3..24260f3f 100644 --- a/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs +++ b/UKSF.Api.Command/Context/CommandRequestArchiveContext.cs @@ -4,15 +4,13 @@ using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Command.Context { +namespace UKSF.Api.Command.Context +{ public interface ICommandRequestArchiveContext : IMongoContext { } - public class CommandRequestArchiveContext : MongoContext, ICommandRequestArchiveContext { - public CommandRequestArchiveContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base( - mongoCollectionFactory, - eventBus, - "commandRequestsArchive" - ) { } + public class CommandRequestArchiveContext : MongoContext, ICommandRequestArchiveContext + { + public CommandRequestArchiveContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "commandRequestsArchive") { } protected override void DataEvent(EventModel eventModel) { } } diff --git a/UKSF.Api.Command/Context/CommandRequestContext.cs b/UKSF.Api.Command/Context/CommandRequestContext.cs index 9d6b977f..9bb7b88d 100644 --- a/UKSF.Api.Command/Context/CommandRequestContext.cs +++ b/UKSF.Api.Command/Context/CommandRequestContext.cs @@ -3,10 +3,12 @@ using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Command.Context { +namespace UKSF.Api.Command.Context +{ public interface ICommandRequestContext : IMongoContext, ICachedMongoContext { } - public class CommandRequestContext : CachedMongoContext, ICommandRequestContext { + public class CommandRequestContext : CachedMongoContext, ICommandRequestContext + { public CommandRequestContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "commandRequests") { } } } diff --git a/UKSF.Api.Command/Context/DischargeContext.cs b/UKSF.Api.Command/Context/DischargeContext.cs index 0cf1a92a..206ad457 100644 --- a/UKSF.Api.Command/Context/DischargeContext.cs +++ b/UKSF.Api.Command/Context/DischargeContext.cs @@ -5,14 +5,18 @@ using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Command.Context { +namespace UKSF.Api.Command.Context +{ public interface IDischargeContext : IMongoContext, ICachedMongoContext { } - public class DischargeContext : CachedMongoContext, IDischargeContext { + public class DischargeContext : CachedMongoContext, IDischargeContext + { public DischargeContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "discharges") { } - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { + protected override void SetCache(IEnumerable newCollection) + { + lock (LockObject) + { Cache = newCollection?.OrderByDescending(x => x.Discharges.Last().Timestamp).ToList(); } } diff --git a/UKSF.Api.Command/Context/LoaContext.cs b/UKSF.Api.Command/Context/LoaContext.cs index ba3f86d5..86c17da3 100644 --- a/UKSF.Api.Command/Context/LoaContext.cs +++ b/UKSF.Api.Command/Context/LoaContext.cs @@ -3,10 +3,12 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Command.Context { +namespace UKSF.Api.Command.Context +{ public interface ILoaContext : IMongoContext, ICachedMongoContext { } - public class LoaContext : CachedMongoContext, ILoaContext { + public class LoaContext : CachedMongoContext, ILoaContext + { public LoaContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "loas") { } } } diff --git a/UKSF.Api.Command/Context/OperationOrderContext.cs b/UKSF.Api.Command/Context/OperationOrderContext.cs index 4fe100ab..dc1880f6 100644 --- a/UKSF.Api.Command/Context/OperationOrderContext.cs +++ b/UKSF.Api.Command/Context/OperationOrderContext.cs @@ -5,14 +5,18 @@ using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Command.Context { +namespace UKSF.Api.Command.Context +{ public interface IOperationOrderContext : IMongoContext, ICachedMongoContext { } - public class OperationOrderContext : CachedMongoContext, IOperationOrderContext { + public class OperationOrderContext : CachedMongoContext, IOperationOrderContext + { public OperationOrderContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "opord") { } - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { + protected override void SetCache(IEnumerable newCollection) + { + lock (LockObject) + { Cache = newCollection?.OrderBy(x => x.Start).ToList(); } } diff --git a/UKSF.Api.Command/Context/OperationReportContext.cs b/UKSF.Api.Command/Context/OperationReportContext.cs index 5b929187..2e506e42 100644 --- a/UKSF.Api.Command/Context/OperationReportContext.cs +++ b/UKSF.Api.Command/Context/OperationReportContext.cs @@ -5,14 +5,18 @@ using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Command.Context { +namespace UKSF.Api.Command.Context +{ public interface IOperationReportContext : IMongoContext, ICachedMongoContext { } - public class OperationReportContext : CachedMongoContext, IOperationReportContext { + public class OperationReportContext : CachedMongoContext, IOperationReportContext + { public OperationReportContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "oprep") { } - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { + protected override void SetCache(IEnumerable newCollection) + { + lock (LockObject) + { Cache = newCollection?.OrderBy(x => x.Start).ToList(); } } diff --git a/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs b/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs index 5d96da05..c7510c62 100644 --- a/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs +++ b/UKSF.Api.Command/EventHandlers/CommandRequestEventHandler.cs @@ -9,26 +9,32 @@ using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Models; -namespace UKSF.Api.Command.EventHandlers { +namespace UKSF.Api.Command.EventHandlers +{ public interface ICommandRequestEventHandler : IEventHandler { } - public class CommandRequestEventHandler : ICommandRequestEventHandler { + public class CommandRequestEventHandler : ICommandRequestEventHandler + { private readonly IEventBus _eventBus; private readonly IHubContext _hub; private readonly ILogger _logger; - public CommandRequestEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) { + public CommandRequestEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) + { _eventBus = eventBus; _hub = hub; _logger = logger; } - public void Init() { + public void Init() + { _eventBus.AsObservable().SubscribeWithAsyncNext>(HandleEvent, _logger.LogError); } - private async Task HandleEvent(EventModel eventModel, ContextEventData _) { - switch (eventModel.EventType) { + private async Task HandleEvent(EventModel eventModel, ContextEventData _) + { + switch (eventModel.EventType) + { case EventType.ADD: case EventType.UPDATE: await UpdatedEvent(); @@ -37,7 +43,8 @@ private async Task HandleEvent(EventModel eventModel, ContextEventData Discharges = new(); public string Name; @@ -13,7 +15,8 @@ public class DischargeCollection : MongoObject { [BsonIgnore] public bool RequestExists; } - public class Discharge : MongoObject { + public class Discharge : MongoObject + { public string DischargedBy; public string Rank; public string Reason; diff --git a/UKSF.Api.Command/Models/Opord.cs b/UKSF.Api.Command/Models/Opord.cs index cec334e6..de740aae 100644 --- a/UKSF.Api.Command/Models/Opord.cs +++ b/UKSF.Api.Command/Models/Opord.cs @@ -1,8 +1,10 @@ using System; using UKSF.Api.Base.Models; -namespace UKSF.Api.Command.Models { - public class Opord : MongoObject { +namespace UKSF.Api.Command.Models +{ + public class Opord : MongoObject + { public string Description; public DateTime End; public string Map; diff --git a/UKSF.Api.Command/Models/Oprep.cs b/UKSF.Api.Command/Models/Oprep.cs index d90ad695..6928ccca 100644 --- a/UKSF.Api.Command/Models/Oprep.cs +++ b/UKSF.Api.Command/Models/Oprep.cs @@ -2,8 +2,10 @@ using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Command.Models { - public class Oprep : MongoObject { +namespace UKSF.Api.Command.Models +{ + public class Oprep : MongoObject + { public AttendanceReport AttendanceReport; public string Description; public DateTime End; diff --git a/UKSF.Api.Command/Signalr/Clients/ICommandRequestsClient.cs b/UKSF.Api.Command/Signalr/Clients/ICommandRequestsClient.cs index aaa53ab7..b6c3f2ea 100644 --- a/UKSF.Api.Command/Signalr/Clients/ICommandRequestsClient.cs +++ b/UKSF.Api.Command/Signalr/Clients/ICommandRequestsClient.cs @@ -1,7 +1,9 @@ using System.Threading.Tasks; -namespace UKSF.Api.Command.Signalr.Clients { - public interface ICommandRequestsClient { +namespace UKSF.Api.Command.Signalr.Clients +{ + public interface ICommandRequestsClient + { Task ReceiveRequestUpdate(); } } diff --git a/UKSF.Api.Command/Signalr/Hubs/CommandRequestsHub.cs b/UKSF.Api.Command/Signalr/Hubs/CommandRequestsHub.cs index d7159a91..d8305282 100644 --- a/UKSF.Api.Command/Signalr/Hubs/CommandRequestsHub.cs +++ b/UKSF.Api.Command/Signalr/Hubs/CommandRequestsHub.cs @@ -2,9 +2,11 @@ using Microsoft.AspNetCore.SignalR; using UKSF.Api.Command.Signalr.Clients; -namespace UKSF.Api.Command.Signalr.Hubs { +namespace UKSF.Api.Command.Signalr.Hubs +{ [Authorize] - public class CommandRequestsHub : Hub { + public class CommandRequestsHub : Hub + { public const string END_POINT = "commandRequests"; } } diff --git a/UKSF.Api.Integrations.Discord/Models/DiscordDeletedMessageResult.cs b/UKSF.Api.Integrations.Discord/Models/DiscordDeletedMessageResult.cs index b637ec8f..3daeefd1 100644 --- a/UKSF.Api.Integrations.Discord/Models/DiscordDeletedMessageResult.cs +++ b/UKSF.Api.Integrations.Discord/Models/DiscordDeletedMessageResult.cs @@ -1,11 +1,14 @@ -namespace UKSF.Api.Discord.Models { - public class DiscordDeletedMessageResult { +namespace UKSF.Api.Discord.Models +{ + public class DiscordDeletedMessageResult + { public readonly ulong InstigatorId; public readonly string InstigatorName; - public readonly string Name; public readonly string Message; + public readonly string Name; - public DiscordDeletedMessageResult(ulong instigatorId, string instigatorName, string name, string message) { + public DiscordDeletedMessageResult(ulong instigatorId, string instigatorName, string name, string message) + { InstigatorId = instigatorId; InstigatorName = instigatorName; Name = name; diff --git a/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs b/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs index 1358ee55..8d9a2ae3 100644 --- a/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs +++ b/UKSF.Api.Integrations.Instagram/Models/InstagramImage.cs @@ -1,8 +1,10 @@ using System; using Newtonsoft.Json; -namespace UKSF.Api.Integrations.Instagram.Models { - public class InstagramImage { +namespace UKSF.Api.Integrations.Instagram.Models +{ + public class InstagramImage + { public string Base64; public string Id; diff --git a/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs b/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs index 3e2e9318..28e77d9b 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/Operation.cs @@ -2,8 +2,10 @@ using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Teamspeak.Models { - public class Operation : MongoObject { +namespace UKSF.Api.Teamspeak.Models +{ + public class Operation : MongoObject + { public AttendanceReport AttendanceReport; public DateTime End; public string Map; diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakProcedureType.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakProcedureType.cs index 5711772a..a4635f33 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakProcedureType.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakProcedureType.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.Teamspeak.Models { - public enum TeamspeakProcedureType { +namespace UKSF.Api.Teamspeak.Models +{ + public enum TeamspeakProcedureType + { EMPTY, ASSIGN, UNASSIGN, diff --git a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs index 2767f80e..00044f2b 100644 --- a/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs +++ b/UKSF.Api.Integrations.Teamspeak/Models/TeamspeakServerSnapshot.cs @@ -1,8 +1,10 @@ using System; using System.Collections.Generic; -namespace UKSF.Api.Teamspeak.Models { - public class TeamspeakServerSnapshot { +namespace UKSF.Api.Teamspeak.Models +{ + public class TeamspeakServerSnapshot + { public DateTime Timestamp; public HashSet Users; } diff --git a/UKSF.Api.Integrations.Teamspeak/Signalr/Clients/ITeamspeakClient.cs b/UKSF.Api.Integrations.Teamspeak/Signalr/Clients/ITeamspeakClient.cs index 5f3d9b64..fa8d06ca 100644 --- a/UKSF.Api.Integrations.Teamspeak/Signalr/Clients/ITeamspeakClient.cs +++ b/UKSF.Api.Integrations.Teamspeak/Signalr/Clients/ITeamspeakClient.cs @@ -1,8 +1,10 @@ using System.Threading.Tasks; using UKSF.Api.Teamspeak.Models; -namespace UKSF.Api.Teamspeak.Signalr.Clients { - public interface ITeamspeakClient { +namespace UKSF.Api.Teamspeak.Signalr.Clients +{ + public interface ITeamspeakClient + { Task Receive(TeamspeakProcedureType procedure, object args); } } diff --git a/UKSF.Api.Integrations.Teamspeak/Signalr/Clients/ITeamspeakClientsClient.cs b/UKSF.Api.Integrations.Teamspeak/Signalr/Clients/ITeamspeakClientsClient.cs index 9e3cdd1c..379f8ba0 100644 --- a/UKSF.Api.Integrations.Teamspeak/Signalr/Clients/ITeamspeakClientsClient.cs +++ b/UKSF.Api.Integrations.Teamspeak/Signalr/Clients/ITeamspeakClientsClient.cs @@ -1,7 +1,9 @@ using System.Threading.Tasks; -namespace UKSF.Api.Teamspeak.Signalr.Clients { - public interface ITeamspeakClientsClient { +namespace UKSF.Api.Teamspeak.Signalr.Clients +{ + public interface ITeamspeakClientsClient + { Task ReceiveClients(object clients); } } diff --git a/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakClientsHub.cs b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakClientsHub.cs index 44f81e66..02626936 100644 --- a/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakClientsHub.cs +++ b/UKSF.Api.Integrations.Teamspeak/Signalr/Hubs/TeamspeakClientsHub.cs @@ -1,8 +1,10 @@ using Microsoft.AspNetCore.SignalR; using UKSF.Api.Teamspeak.Signalr.Clients; -namespace UKSF.Api.Teamspeak.Signalr.Hubs { - public class TeamspeakClientsHub : Hub { +namespace UKSF.Api.Teamspeak.Signalr.Hubs +{ + public class TeamspeakClientsHub : Hub + { public const string END_POINT = "teamspeakClients"; } } diff --git a/UKSF.Api.Launcher/Context/LauncherFileContext.cs b/UKSF.Api.Launcher/Context/LauncherFileContext.cs index 87f7b9ab..a1e5595f 100644 --- a/UKSF.Api.Launcher/Context/LauncherFileContext.cs +++ b/UKSF.Api.Launcher/Context/LauncherFileContext.cs @@ -3,10 +3,12 @@ using UKSF.Api.Launcher.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Launcher.Context { +namespace UKSF.Api.Launcher.Context +{ public interface ILauncherFileContext : IMongoContext, ICachedMongoContext { } - public class LauncherFileContext : CachedMongoContext, ILauncherFileContext { + public class LauncherFileContext : CachedMongoContext, ILauncherFileContext + { public LauncherFileContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "launcherFiles") { } } } diff --git a/UKSF.Api.Launcher/Models/LauncherFile.cs b/UKSF.Api.Launcher/Models/LauncherFile.cs index d6f8a6cf..f497a054 100644 --- a/UKSF.Api.Launcher/Models/LauncherFile.cs +++ b/UKSF.Api.Launcher/Models/LauncherFile.cs @@ -1,7 +1,9 @@ using UKSF.Api.Base.Models; -namespace UKSF.Api.Launcher.Models { - public class LauncherFile : MongoObject { +namespace UKSF.Api.Launcher.Models +{ + public class LauncherFile : MongoObject + { public string FileName; public string Version; } diff --git a/UKSF.Api.Launcher/Services/LauncherFileService.cs b/UKSF.Api.Launcher/Services/LauncherFileService.cs index 067f1848..3b0faa49 100644 --- a/UKSF.Api.Launcher/Services/LauncherFileService.cs +++ b/UKSF.Api.Launcher/Services/LauncherFileService.cs @@ -13,66 +13,81 @@ using UKSF.Api.Launcher.Context; using UKSF.Api.Launcher.Models; -namespace UKSF.Api.Launcher.Services { - public interface ILauncherFileService { +namespace UKSF.Api.Launcher.Services +{ + public interface ILauncherFileService + { Task UpdateAllVersions(); FileStreamResult GetLauncherFile(params string[] file); Task GetUpdatedFiles(IEnumerable files); } - public class LauncherFileService : ILauncherFileService { + public class LauncherFileService : ILauncherFileService + { private readonly ILauncherFileContext _launcherFileContext; private readonly IVariablesService _variablesService; - public LauncherFileService(ILauncherFileContext launcherFileContext, IVariablesService variablesService) { + public LauncherFileService(ILauncherFileContext launcherFileContext, IVariablesService variablesService) + { _launcherFileContext = launcherFileContext; _variablesService = variablesService; } - public async Task UpdateAllVersions() { + public async Task UpdateAllVersions() + { List storedVersions = _launcherFileContext.Get().ToList(); string launcherDirectory = Path.Combine(_variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), "Launcher"); List fileNames = new(); - foreach (string filePath in Directory.EnumerateFiles(launcherDirectory)) { + foreach (string filePath in Directory.EnumerateFiles(launcherDirectory)) + { string fileName = Path.GetFileName(filePath); string version = FileVersionInfo.GetVersionInfo(filePath).FileVersion; fileNames.Add(fileName); LauncherFile storedFile = storedVersions.FirstOrDefault(x => x.FileName == fileName); - if (storedFile == null) { - await _launcherFileContext.Add(new LauncherFile { FileName = fileName, Version = version }); + if (storedFile == null) + { + await _launcherFileContext.Add(new() { FileName = fileName, Version = version }); continue; } - if (storedFile.Version != version) { + if (storedFile.Version != version) + { await _launcherFileContext.Update(storedFile.Id, Builders.Update.Set(x => x.Version, version)); } } - foreach (LauncherFile storedVersion in storedVersions.Where(storedVersion => fileNames.All(x => x != storedVersion.FileName))) { + foreach (LauncherFile storedVersion in storedVersions.Where(storedVersion => fileNames.All(x => x != storedVersion.FileName))) + { await _launcherFileContext.Delete(storedVersion); } } - public FileStreamResult GetLauncherFile(params string[] file) { + public FileStreamResult GetLauncherFile(params string[] file) + { string[] paths = file.Prepend(_variablesService.GetVariable("LAUNCHER_LOCATION").AsString()).ToArray(); string path = Path.Combine(paths); FileStreamResult fileStreamResult = new(new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read), MimeUtility.GetMimeMapping(path)); return fileStreamResult; } - public async Task GetUpdatedFiles(IEnumerable files) { + public async Task GetUpdatedFiles(IEnumerable files) + { string launcherDirectory = Path.Combine(_variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), "Launcher"); List storedVersions = _launcherFileContext.Get().ToList(); List updatedFiles = new(); List deletedFiles = new(); - foreach (LauncherFile launcherFile in files) { + foreach (LauncherFile launcherFile in files) + { LauncherFile storedFile = storedVersions.FirstOrDefault(x => x.FileName == launcherFile.FileName); - if (storedFile == null) { + if (storedFile == null) + { deletedFiles.Add(launcherFile.FileName); continue; } - if (storedFile.Version != launcherFile.Version || new Random().Next(0, 100) > 80) { //TODO: remove before release + if (storedFile.Version != launcherFile.Version || new Random().Next(0, 100) > 80) + { + //TODO: remove before release updatedFiles.Add(launcherFile.FileName); } } @@ -84,14 +99,16 @@ public async Task GetUpdatedFiles(IEnumerable files) { string deletedFilesPath = Path.Combine(updateFolder, "deleted"); await File.WriteAllLinesAsync(deletedFilesPath, deletedFiles); - foreach (string file in updatedFiles) { + foreach (string file in updatedFiles) + { File.Copy(Path.Combine(launcherDirectory, file), Path.Combine(updateFolder, file), true); } string updateZipPath = Path.Combine(_variablesService.GetVariable("LAUNCHER_LOCATION").AsString(), $"{updateFolderName}.zip"); ZipFile.CreateFromDirectory(updateFolder, updateZipPath); MemoryStream stream = new(); - await using (FileStream fileStream = new(updateZipPath, FileMode.Open, FileAccess.Read, FileShare.None)) { + await using (FileStream fileStream = new(updateZipPath, FileMode.Open, FileAccess.Read, FileShare.None)) + { await fileStream.CopyToAsync(stream); } diff --git a/UKSF.Api.Launcher/Signalr/Clients/ILauncherClient.cs b/UKSF.Api.Launcher/Signalr/Clients/ILauncherClient.cs index cff8a9af..cec6ad8c 100644 --- a/UKSF.Api.Launcher/Signalr/Clients/ILauncherClient.cs +++ b/UKSF.Api.Launcher/Signalr/Clients/ILauncherClient.cs @@ -1,7 +1,9 @@ using System.Threading.Tasks; -namespace UKSF.Api.Launcher.Signalr.Clients { - public interface ILauncherClient { +namespace UKSF.Api.Launcher.Signalr.Clients +{ + public interface ILauncherClient + { Task ReceiveLauncherVersion(string version); } } diff --git a/UKSF.Api.Launcher/Signalr/Hubs/LauncherHub.cs b/UKSF.Api.Launcher/Signalr/Hubs/LauncherHub.cs index d8024dbc..b2b552b2 100644 --- a/UKSF.Api.Launcher/Signalr/Hubs/LauncherHub.cs +++ b/UKSF.Api.Launcher/Signalr/Hubs/LauncherHub.cs @@ -2,9 +2,11 @@ using Microsoft.AspNetCore.SignalR; using UKSF.Api.Launcher.Signalr.Clients; -namespace UKSF.Api.Launcher.Signalr.Hubs { +namespace UKSF.Api.Launcher.Signalr.Hubs +{ [Authorize] - public class LauncherHub : Hub { + public class LauncherHub : Hub + { public const string END_POINT = "launcher"; } } diff --git a/UKSF.Api.Modpack/Context/BuildsContext.cs b/UKSF.Api.Modpack/Context/BuildsContext.cs index 75f879b1..f15d4feb 100644 --- a/UKSF.Api.Modpack/Context/BuildsContext.cs +++ b/UKSF.Api.Modpack/Context/BuildsContext.cs @@ -8,28 +8,35 @@ using UKSF.Api.Modpack.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Modpack.Context { - public interface IBuildsContext : IMongoContext, ICachedMongoContext { +namespace UKSF.Api.Modpack.Context +{ + public interface IBuildsContext : IMongoContext, ICachedMongoContext + { Task Update(ModpackBuild build, ModpackBuildStep buildStep); Task Update(ModpackBuild build, UpdateDefinition updateDefinition); } - public class BuildsContext : CachedMongoContext, IBuildsContext { + public class BuildsContext : CachedMongoContext, IBuildsContext + { public BuildsContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "modpackBuilds") { } - public async Task Update(ModpackBuild build, ModpackBuildStep buildStep) { + public async Task Update(ModpackBuild build, ModpackBuildStep buildStep) + { UpdateDefinition updateDefinition = Builders.Update.Set(x => x.Steps[buildStep.Index], buildStep); await base.Update(build.Id, updateDefinition); - DataEvent(new EventModel(EventType.UPDATE, new ModpackBuildStepEventData(build.Id, buildStep))); + DataEvent(new(EventType.UPDATE, new ModpackBuildStepEventData(build.Id, buildStep))); } - public async Task Update(ModpackBuild build, UpdateDefinition updateDefinition) { + public async Task Update(ModpackBuild build, UpdateDefinition updateDefinition) + { await base.Update(build.Id, updateDefinition); - DataEvent(new EventModel(EventType.UPDATE, build)); + DataEvent(new(EventType.UPDATE, build)); } - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { + protected override void SetCache(IEnumerable newCollection) + { + lock (LockObject) + { Cache = newCollection?.OrderByDescending(x => x.BuildNumber).ToList(); } } diff --git a/UKSF.Api.Modpack/Context/ReleasesContext.cs b/UKSF.Api.Modpack/Context/ReleasesContext.cs index e232d234..af01854a 100644 --- a/UKSF.Api.Modpack/Context/ReleasesContext.cs +++ b/UKSF.Api.Modpack/Context/ReleasesContext.cs @@ -5,16 +5,21 @@ using UKSF.Api.Modpack.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Modpack.Context { +namespace UKSF.Api.Modpack.Context +{ public interface IReleasesContext : IMongoContext, ICachedMongoContext { } - public class ReleasesContext : CachedMongoContext, IReleasesContext { + public class ReleasesContext : CachedMongoContext, IReleasesContext + { public ReleasesContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "modpackReleases") { } - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { + protected override void SetCache(IEnumerable newCollection) + { + lock (LockObject) + { Cache = newCollection?.Select( - x => { + x => + { int[] parts = x.Version.Split('.').Select(int.Parse).ToArray(); return new { release = x, major = parts[0], minor = parts[1], patch = parts[2] }; } diff --git a/UKSF.Api.Modpack/Models/GithubCommit.cs b/UKSF.Api.Modpack/Models/GithubCommit.cs index 63bf86de..3441cfd4 100644 --- a/UKSF.Api.Modpack/Models/GithubCommit.cs +++ b/UKSF.Api.Modpack/Models/GithubCommit.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.Modpack.Models { - public class GithubCommit { +namespace UKSF.Api.Modpack.Models +{ + public class GithubCommit + { public string After; public string Author; public string BaseBranch; diff --git a/UKSF.Api.Modpack/Models/ModpackBuild.cs b/UKSF.Api.Modpack/Models/ModpackBuild.cs index e8d34953..85ab8b1a 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuild.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuild.cs @@ -5,8 +5,10 @@ using UKSF.Api.ArmaServer.Models; using UKSF.Api.Base.Models; -namespace UKSF.Api.Modpack.Models { - public class ModpackBuild : MongoObject { +namespace UKSF.Api.Modpack.Models +{ + public class ModpackBuild : MongoObject + { [BsonRepresentation(BsonType.ObjectId)] public string BuilderId; public int BuildNumber; public ModpackBuildResult BuildResult = ModpackBuildResult.NONE; diff --git a/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs b/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs index aae49b0c..05c0b5e3 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildQueueItem.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.Modpack.Models { - public class ModpackBuildQueueItem { +namespace UKSF.Api.Modpack.Models +{ + public class ModpackBuildQueueItem + { public ModpackBuild Build; public string Id; } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildResult.cs b/UKSF.Api.Modpack/Models/ModpackBuildResult.cs index 137b42b9..720b5a88 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildResult.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildResult.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.Modpack.Models { - public enum ModpackBuildResult { +namespace UKSF.Api.Modpack.Models +{ + public enum ModpackBuildResult + { NONE, SUCCESS, FAILED, diff --git a/UKSF.Api.Modpack/Models/ModpackBuildStepEventData.cs b/UKSF.Api.Modpack/Models/ModpackBuildStepEventData.cs index 5447be67..27cdaba1 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildStepEventData.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildStepEventData.cs @@ -1,11 +1,14 @@ -namespace UKSF.Api.Modpack.Models { - public class ModpackBuildStepEventData { - public ModpackBuildStepEventData(string buildId, ModpackBuildStep buildStep) { +namespace UKSF.Api.Modpack.Models +{ + public class ModpackBuildStepEventData + { + public string BuildId; + public ModpackBuildStep BuildStep; + + public ModpackBuildStepEventData(string buildId, ModpackBuildStep buildStep) + { BuildId = buildId; BuildStep = buildStep; } - - public string BuildId; - public ModpackBuildStep BuildStep; } } diff --git a/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs b/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs index 26794b31..b2dfc900 100644 --- a/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs +++ b/UKSF.Api.Modpack/Models/ModpackBuildStepLogItem.cs @@ -1,12 +1,15 @@ using System.Collections.Generic; -namespace UKSF.Api.Modpack.Models { - public class ModpackBuildStepLogItem { +namespace UKSF.Api.Modpack.Models +{ + public class ModpackBuildStepLogItem + { public string Colour; public string Text; } - public class ModpackBuildStepLogItemUpdate { + public class ModpackBuildStepLogItemUpdate + { public bool Inline; public List Logs; } diff --git a/UKSF.Api.Modpack/Models/ModpackRelease.cs b/UKSF.Api.Modpack/Models/ModpackRelease.cs index 74063012..2116c45f 100644 --- a/UKSF.Api.Modpack/Models/ModpackRelease.cs +++ b/UKSF.Api.Modpack/Models/ModpackRelease.cs @@ -3,8 +3,10 @@ using MongoDB.Bson.Serialization.Attributes; using UKSF.Api.Base.Models; -namespace UKSF.Api.Modpack.Models { - public class ModpackRelease : MongoObject { +namespace UKSF.Api.Modpack.Models +{ + public class ModpackRelease : MongoObject + { public string Changelog; [BsonRepresentation(BsonType.ObjectId)] public string CreatorId; public string Description; diff --git a/UKSF.Api.Modpack/Models/NewBuild.cs b/UKSF.Api.Modpack/Models/NewBuild.cs index 526f9e3f..e2d04371 100644 --- a/UKSF.Api.Modpack/Models/NewBuild.cs +++ b/UKSF.Api.Modpack/Models/NewBuild.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.Modpack.Models { - public class NewBuild { +namespace UKSF.Api.Modpack.Models +{ + public class NewBuild + { public bool Ace; public bool Acre; public bool Air; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs index 7e614bc9..19d77fbc 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildProcessorService.cs @@ -8,37 +8,47 @@ using UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps; using UKSF.Api.Shared.Events; -namespace UKSF.Api.Modpack.Services.BuildProcess { - public interface IBuildProcessorService { +namespace UKSF.Api.Modpack.Services.BuildProcess +{ + public interface IBuildProcessorService + { Task ProcessBuildWithErrorHandling(ModpackBuild build, CancellationTokenSource cancellationTokenSource); } - public class BuildProcessorService : IBuildProcessorService { + public class BuildProcessorService : IBuildProcessorService + { private readonly IBuildsService _buildsService; private readonly IBuildStepService _buildStepService; private readonly ILogger _logger; private readonly IServiceProvider _serviceProvider; - public BuildProcessorService(IServiceProvider serviceProvider, IBuildStepService buildStepService, IBuildsService buildsService, ILogger logger) { + public BuildProcessorService(IServiceProvider serviceProvider, IBuildStepService buildStepService, IBuildsService buildsService, ILogger logger) + { _serviceProvider = serviceProvider; _buildStepService = buildStepService; _buildsService = buildsService; _logger = logger; } - public async Task ProcessBuildWithErrorHandling(ModpackBuild build, CancellationTokenSource cancellationTokenSource) { - try { + public async Task ProcessBuildWithErrorHandling(ModpackBuild build, CancellationTokenSource cancellationTokenSource) + { + try + { await ProcessBuild(build, cancellationTokenSource); - } catch (Exception exception) { + } + catch (Exception exception) + { _logger.LogError(exception); await _buildsService.FailBuild(build); } } - private async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cancellationTokenSource) { + private async Task ProcessBuild(ModpackBuild build, CancellationTokenSource cancellationTokenSource) + { await _buildsService.SetBuildRunning(build); - foreach (ModpackBuildStep buildStep in build.Steps) { + foreach (ModpackBuildStep buildStep in build.Steps) + { IBuildStep step = _buildStepService.ResolveBuildStep(buildStep.Name); step.Init( _serviceProvider, @@ -49,15 +59,18 @@ private async Task ProcessBuild(ModpackBuild build, CancellationTokenSource canc cancellationTokenSource ); - if (cancellationTokenSource.IsCancellationRequested) { + if (cancellationTokenSource.IsCancellationRequested) + { await step.Cancel(); await _buildsService.CancelBuild(build); return; } - try { + try + { await step.Start(); - if (!step.CheckGuards()) { + if (!step.CheckGuards()) + { await step.Skip(); continue; } @@ -65,12 +78,16 @@ private async Task ProcessBuild(ModpackBuild build, CancellationTokenSource canc await step.Setup(); await step.Process(); await step.Succeed(); - } catch (OperationCanceledException) { + } + catch (OperationCanceledException) + { await step.Cancel(); await ProcessRestore(step, build); await _buildsService.CancelBuild(build); return; - } catch (Exception exception) { + } + catch (Exception exception) + { await step.Fail(exception); await ProcessRestore(step, build); await _buildsService.FailBuild(build); @@ -81,14 +98,17 @@ private async Task ProcessBuild(ModpackBuild build, CancellationTokenSource canc await _buildsService.SucceedBuild(build); } - private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) { - if (build.Environment != GameEnvironment.RELEASE || runningStep is BuildStepClean || runningStep is BuildStepBackup) { + private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) + { + if (build.Environment != GameEnvironment.RELEASE || runningStep is BuildStepClean || runningStep is BuildStepBackup) + { return; } _logger.LogInfo($"Attempting to restore repo prior to {build.Version}"); ModpackBuildStep restoreStep = _buildStepService.GetRestoreStepForRelease(); - if (restoreStep == null) { + if (restoreStep == null) + { _logger.LogError("Restore step expected but not found. Won't restore"); return; } @@ -106,16 +126,22 @@ private async Task ProcessRestore(IBuildStep runningStep, ModpackBuild build) { build.Steps.Add(restoreStep); await _buildsService.UpdateBuildStep(build, restoreStep); - try { + try + { await step.Start(); - if (!step.CheckGuards()) { + if (!step.CheckGuards()) + { await step.Skip(); - } else { + } + else + { await step.Setup(); await step.Process(); await step.Succeed(); } - } catch (Exception exception) { + } + catch (Exception exception) + { await step.Fail(exception); } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs b/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs index 73eaec76..8acdd078 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/BuildQueueService.cs @@ -7,15 +7,18 @@ using UKSF.Api.Modpack.Models; using UKSF.Api.Shared.Events; -namespace UKSF.Api.Modpack.Services.BuildProcess { - public interface IBuildQueueService { +namespace UKSF.Api.Modpack.Services.BuildProcess +{ + public interface IBuildQueueService + { void QueueBuild(ModpackBuild build); bool CancelQueued(string id); void Cancel(string id); void CancelAll(); } - public class BuildQueueService : IBuildQueueService { + public class BuildQueueService : IBuildQueueService + { private readonly IBuildProcessorService _buildProcessorService; private readonly ConcurrentDictionary _buildTasks = new(); private readonly ConcurrentDictionary _cancellationTokenSources = new(); @@ -24,22 +27,27 @@ public class BuildQueueService : IBuildQueueService { private bool _processing; private ConcurrentQueue _queue = new(); - public BuildQueueService(IBuildProcessorService buildProcessorService, IGameServersService gameServersService, ILogger logger) { + public BuildQueueService(IBuildProcessorService buildProcessorService, IGameServersService gameServersService, ILogger logger) + { _buildProcessorService = buildProcessorService; _gameServersService = gameServersService; _logger = logger; } - public void QueueBuild(ModpackBuild build) { + public void QueueBuild(ModpackBuild build) + { _queue.Enqueue(build); - if (!_processing) { + if (!_processing) + { // Processor not running, process as separate task _ = ProcessQueue(); } } - public bool CancelQueued(string id) { - if (_queue.Any(x => x.Id == id)) { + public bool CancelQueued(string id) + { + if (_queue.Any(x => x.Id == id)) + { _queue = new(_queue.Where(x => x.Id != id)); return true; } @@ -47,23 +55,31 @@ public bool CancelQueued(string id) { return false; } - public void Cancel(string id) { - if (_cancellationTokenSources.ContainsKey(id)) { + public void Cancel(string id) + { + if (_cancellationTokenSources.ContainsKey(id)) + { CancellationTokenSource cancellationTokenSource = _cancellationTokenSources[id]; cancellationTokenSource.Cancel(); _cancellationTokenSources.TryRemove(id, out CancellationTokenSource _); } - if (_buildTasks.ContainsKey(id)) { + if (_buildTasks.ContainsKey(id)) + { _ = Task.Run( - async () => { + async () => + { await Task.Delay(TimeSpan.FromMinutes(1)); - if (_buildTasks.ContainsKey(id)) { + if (_buildTasks.ContainsKey(id)) + { Task buildTask = _buildTasks[id]; - if (buildTask.IsCompleted) { + if (buildTask.IsCompleted) + { _buildTasks.TryRemove(id, out Task _); - } else { + } + else + { _logger.LogWarning($"Build {id} was cancelled but has not completed within 1 minute of cancelling"); } } @@ -72,19 +88,23 @@ public void Cancel(string id) { } } - public void CancelAll() { + public void CancelAll() + { _queue.Clear(); - foreach ((string _, CancellationTokenSource cancellationTokenSource) in _cancellationTokenSources) { + foreach ((string _, CancellationTokenSource cancellationTokenSource) in _cancellationTokenSources) + { cancellationTokenSource.Cancel(); } _cancellationTokenSources.Clear(); } - private async Task ProcessQueue() { + private async Task ProcessQueue() + { _processing = true; - while (_queue.TryDequeue(out ModpackBuild build)) { + while (_queue.TryDequeue(out ModpackBuild build)) + { // TODO: Expand this to check if a server is running using the repo for this build. If no servers are running but there are processes, don't build at all. // Will require better game <-> api interaction to communicate with servers and headless clients properly // if (_gameServersService.GetGameInstanceCount() > 0) { diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs index a48dce35..17b5c927 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepExtensions.cs @@ -6,12 +6,15 @@ using System.Threading.Tasks; using UKSF.Api.Admin.Extensions; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps +{ [BuildStep(NAME)] - public class BuildStepExtensions : FileBuildStep { + public class BuildStepExtensions : FileBuildStep + { public const string NAME = "Extensions"; - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { string uksfPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf", "intercept"); string interceptPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@intercept"); DirectoryInfo uksf = new(uksfPath); @@ -23,7 +26,8 @@ protected override async Task ProcessExecute() { StepLogger.LogSurround("Signed extensions"); } - private async Task SignExtensions(IReadOnlyCollection files) { + private async Task SignExtensions(IReadOnlyCollection files) + { string certPath = Path.Join(VariablesService.GetVariable("BUILD_PATH_CERTS").AsString(), "UKSFCert.pfx"); string signTool = VariablesService.GetVariable("BUILD_PATH_SIGNTOOL").AsString(); int signed = 0; @@ -31,7 +35,8 @@ private async Task SignExtensions(IReadOnlyCollection files) { await BatchProcessFiles( files, 2, - file => { + file => + { BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource, true, false, true); processHelper.Run(file.DirectoryName, signTool, $"sign /f \"{certPath}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); Interlocked.Increment(ref signed); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs index b312e5b8..a6023395 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepIntercept.cs @@ -1,12 +1,15 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps +{ [BuildStep(NAME)] - public class BuildStepIntercept : FileBuildStep { + public class BuildStepIntercept : FileBuildStep + { public const string NAME = "Intercept"; - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { string sourcePath = Path.Join(GetBuildSourcesPath(), "modpack", "@intercept"); string targetPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@intercept"); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs index 7272d77e..4643a3ff 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepKeys.cs @@ -2,19 +2,23 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps +{ [BuildStep(NAME)] - public class BuildStepKeys : FileBuildStep { + public class BuildStepKeys : FileBuildStep + { public const string NAME = "Keys"; - protected override async Task SetupExecute() { + protected override async Task SetupExecute() + { StepLogger.LogSurround("\nWiping server keys folder"); string keysPath = Path.Join(GetBuildEnvironmentPath(), "Keys"); await DeleteDirectoryContents(keysPath); StepLogger.LogSurround("Server keys folder wiped"); } - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { StepLogger.Log("Updating keys"); string sourceBasePath = Path.Join(GetBuildEnvironmentPath(), "BaseKeys"); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs index 7b953ffd..6f9dbf9e 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepPrep.cs @@ -2,19 +2,22 @@ using System.Threading.Tasks; using UKSF.Api.Admin.Extensions; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps +{ [BuildStep(NAME)] - public class BuildStepPrep : BuildStep { + public class BuildStepPrep : BuildStep + { public const string NAME = "Prep"; - protected override Task ProcessExecute() { + protected override Task ProcessExecute() + { StepLogger.Log("Mounting build environment"); string projectsPath = VariablesService.GetVariable("BUILD_PATH_PROJECTS").AsString(); BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource, raiseErrors: false); processHelper.Run("C:/", "cmd.exe", $"/c \"subst P: \"{projectsPath}\"\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); - processHelper = new BuildProcessHelper(StepLogger, CancellationTokenSource, raiseErrors: false); + processHelper = new(StepLogger, CancellationTokenSource, raiseErrors: false); processHelper.Run("C:/", "cmd.exe", "/c \"subst\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); return Task.CompletedTask; diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs index 1602911a..8987e5eb 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/BuildStepSignDependencies.cs @@ -6,15 +6,18 @@ using UKSF.Api.Admin.Extensions; using UKSF.Api.ArmaServer.Models; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps +{ [BuildStep(NAME)] - public class BuildStepSignDependencies : FileBuildStep { + public class BuildStepSignDependencies : FileBuildStep + { public const string NAME = "Signatures"; private string _dsCreateKey; private string _dsSignFile; private string _keyName; - protected override async Task SetupExecute() { + protected override async Task SetupExecute() + { _dsSignFile = Path.Join(VariablesService.GetVariable("BUILD_PATH_DSSIGN").AsString(), "DSSignFile.exe"); _dsCreateKey = Path.Join(VariablesService.GetVariable("BUILD_PATH_DSSIGN").AsString(), "DSCreateKey.exe"); _keyName = GetKeyname(); @@ -35,11 +38,12 @@ protected override async Task SetupExecute() { BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource, true); processHelper.Run(keygenPath, _dsCreateKey, _keyName, (int) TimeSpan.FromSeconds(10).TotalMilliseconds); StepLogger.Log($"Created {_keyName}"); - await CopyFiles(keygen, keys, new List { new(Path.Join(keygenPath, $"{_keyName}.bikey")) }); + await CopyFiles(keygen, keys, new() { new(Path.Join(keygenPath, $"{_keyName}.bikey")) }); StepLogger.LogSurround("Created key"); } - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { string addonsPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf_dependencies", "addons"); string interceptPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@intercept", "addons"); string keygenPath = Path.Join(GetBuildEnvironmentPath(), "PrivateKeys"); @@ -61,8 +65,10 @@ protected override async Task ProcessExecute() { StepLogger.LogSurround("Signed intercept"); } - private string GetKeyname() { - return Build.Environment switch { + private string GetKeyname() + { + return Build.Environment switch + { GameEnvironment.RELEASE => $"uksf_dependencies_{Build.Version}", GameEnvironment.RC => $"uksf_dependencies_{Build.Version}_rc{Build.BuildNumber}", GameEnvironment.DEV => $"uksf_dependencies_dev_{Build.BuildNumber}", @@ -70,7 +76,8 @@ private string GetKeyname() { }; } - private Task SignFiles(string keygenPath, string addonsPath, IReadOnlyCollection files) { + private Task SignFiles(string keygenPath, string addonsPath, IReadOnlyCollection files) + { string privateKey = Path.Join(keygenPath, $"{_keyName}.biprivatekey"); int signed = 0; int total = files.Count; @@ -78,7 +85,8 @@ private Task SignFiles(string keygenPath, string addonsPath, IReadOnlyCollection return BatchProcessFiles( files, 10, - file => { + file => + { BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource, true); processHelper.Run(addonsPath, _dsSignFile, $"\"{privateKey}\" \"{file.FullName}\"", (int) TimeSpan.FromSeconds(10).TotalMilliseconds); Interlocked.Increment(ref signed); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs index 8d0a75d0..260f8cf1 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAce.cs @@ -3,21 +3,25 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods +{ [BuildStep(NAME)] - public class BuildStepBuildAce : ModBuildStep { + public class BuildStepBuildAce : ModBuildStep + { public const string NAME = "Build ACE"; private const string MOD_NAME = "ace"; private readonly List _allowedOptionals = new() { "ace_compat_rksl_pm_ii", "ace_nouniformrestrictions" }; - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { StepLogger.Log("Running build for ACE"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@ace"); string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@uksf_ace"); - if (IsBuildNeeded(MOD_NAME)) { + if (IsBuildNeeded(MOD_NAME)) + { StepLogger.LogSurround("\nRunning make.py..."); BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version"); processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); @@ -33,11 +37,13 @@ protected override async Task ProcessExecute() { StepLogger.LogSurround("Moved optionals"); } - private async Task MoveOptionals(string buildPath) { + private async Task MoveOptionals(string buildPath) + { string optionalsPath = Path.Join(buildPath, "optionals"); string addonsPath = Path.Join(buildPath, "addons"); DirectoryInfo addons = new(addonsPath); - foreach (string optionalName in _allowedOptionals) { + foreach (string optionalName in _allowedOptionals) + { DirectoryInfo optional = new(Path.Join(optionalsPath, $"@{optionalName}", "addons")); List files = GetDirectoryContents(optional); await CopyFiles(optional, addons, files); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index 77328a11..bb7bfc0c 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -3,30 +3,29 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods +{ [BuildStep(NAME)] - public class BuildStepBuildAcre : ModBuildStep { + public class BuildStepBuildAcre : ModBuildStep + { public const string NAME = "Build ACRE"; private const string MOD_NAME = "acre"; private readonly List _errorExclusions = new() { "Found DirectX", "Linking statically", "Visual Studio 16", "INFO: Building", "Build Type" }; - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { StepLogger.Log("Running build for ACRE"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); string releasePath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "release", "@acre2"); string buildPath = Path.Join(GetBuildEnvironmentPath(), "Build", "@acre2"); - if (IsBuildNeeded(MOD_NAME)) { + if (IsBuildNeeded(MOD_NAME)) + { StepLogger.LogSurround("\nRunning make.py..."); - BuildProcessHelper processHelper = new( - StepLogger, - CancellationTokenSource, - errorExclusions: _errorExclusions, - ignoreErrorGateClose: "File written to", - ignoreErrorGateOpen: "MakePbo Version" - ); + BuildProcessHelper processHelper = + new(StepLogger, CancellationTokenSource, errorExclusions: _errorExclusions, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version"); processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect compile"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); StepLogger.LogSurround("Make.py complete"); } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs index c9bb43f6..ddda8b2b 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildModpack.cs @@ -2,13 +2,16 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.BuildSteps.Mods +{ [BuildStep(NAME)] - public class BuildStepBuildModpack : ModBuildStep { + public class BuildStepBuildModpack : ModBuildStep + { public const string NAME = "Build UKSF"; private const string MOD_NAME = "modpack"; - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { StepLogger.Log("Running build for UKSF"); string toolsPath = Path.Join(GetBuildSourcesPath(), MOD_NAME, "tools"); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs index 2f86159f..6dfd5157 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepBuildRepo.cs @@ -2,12 +2,15 @@ using System.Threading.Tasks; using UKSF.Api.Admin.Extensions; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common +{ [BuildStep(NAME)] - public class BuildStepBuildRepo : BuildStep { + public class BuildStepBuildRepo : BuildStep + { public const string NAME = "Build Repo"; - protected override Task ProcessExecute() { + protected override Task ProcessExecute() + { string repoName = GetEnvironmentRepoName(); StepLogger.Log($"Building {repoName} repo"); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs index 135764eb..18a9f522 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepCbaSettings.cs @@ -1,22 +1,27 @@ -using System.Collections.Generic; -using System.IO; +using System.IO; using System.Threading.Tasks; using UKSF.Api.ArmaServer.Models; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common +{ [BuildStep(NAME)] - public class BuildStepCbaSettings : FileBuildStep { + public class BuildStepCbaSettings : FileBuildStep + { public const string NAME = "CBA Settings"; - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { StepLogger.Log("Updating CBA settings"); string sourceUserconfigPath; string targetUserconfigPath; - if (Build.Environment == GameEnvironment.RELEASE) { + if (Build.Environment == GameEnvironment.RELEASE) + { sourceUserconfigPath = Path.Join(GetServerEnvironmentPath(GameEnvironment.RC), "userconfig"); targetUserconfigPath = Path.Join(GetServerEnvironmentPath(GameEnvironment.RELEASE), "userconfig"); - } else { + } + else + { sourceUserconfigPath = Path.Join(GetBuildEnvironmentPath(), "Repo", "@uksf"); targetUserconfigPath = Path.Join(GetServerEnvironmentPath(Build.Environment), "userconfig"); } @@ -24,7 +29,7 @@ protected override async Task ProcessExecute() { FileInfo cbaSettingsFile = new(Path.Join(sourceUserconfigPath, "cba_settings.sqf")); StepLogger.LogSurround("\nCopying cba_settings.sqf..."); - await CopyFiles(new DirectoryInfo(sourceUserconfigPath), new DirectoryInfo(targetUserconfigPath), new List { cbaSettingsFile }); + await CopyFiles(new DirectoryInfo(sourceUserconfigPath), new DirectoryInfo(targetUserconfigPath), new() { cbaSettingsFile }); StepLogger.LogSurround("Copied cba_settings.sqf"); } } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs index b7ed1e23..ae133b70 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepClean.cs @@ -4,20 +4,26 @@ using System.Threading.Tasks; using UKSF.Api.ArmaServer.Models; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common +{ [BuildStep(NAME)] - public class BuildStepClean : FileBuildStep { + public class BuildStepClean : FileBuildStep + { public const string NAME = "Clean folders"; - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { string environmentPath = GetBuildEnvironmentPath(); - if (Build.Environment == GameEnvironment.RELEASE) { + if (Build.Environment == GameEnvironment.RELEASE) + { string keysPath = Path.Join(environmentPath, "Backup", "Keys"); StepLogger.LogSurround("\nCleaning keys backup..."); await DeleteDirectoryContents(keysPath); StepLogger.LogSurround("Cleaned keys backup"); - } else { + } + else + { string path = Path.Join(environmentPath, "Build"); string repoPath = Path.Join(environmentPath, "Repo"); DirectoryInfo repo = new(repoPath); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepDeploy.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepDeploy.cs index 3c60f646..fde9d536 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepDeploy.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/Common/BuildStepDeploy.cs @@ -2,19 +2,25 @@ using System.Threading.Tasks; using UKSF.Api.ArmaServer.Models; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.Common +{ [BuildStep(NAME)] - public class BuildStepDeploy : FileBuildStep { + public class BuildStepDeploy : FileBuildStep + { public const string NAME = "Deploy"; - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { string sourcePath; string targetPath; - if (Build.Environment == GameEnvironment.RELEASE) { + if (Build.Environment == GameEnvironment.RELEASE) + { StepLogger.Log("Deploying files from RC to release"); sourcePath = Path.Join(GetEnvironmentPath(GameEnvironment.RC), "Repo"); targetPath = Path.Join(GetBuildEnvironmentPath(), "Repo"); - } else { + } + else + { StepLogger.Log("Deploying files from build to repo"); sourcePath = Path.Join(GetBuildEnvironmentPath(), "Build"); targetPath = Path.Join(GetBuildEnvironmentPath(), "Repo"); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/GitBuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/GitBuildStep.cs index d6427e2c..c830a346 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/GitBuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/GitBuildStep.cs @@ -2,9 +2,12 @@ using System.Collections.Generic; using System.Linq; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps { - public class GitBuildStep : BuildStep { - internal string GitCommand(string workingDirectory, string command) { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps +{ + public class GitBuildStep : BuildStep + { + internal string GitCommand(string workingDirectory, string command) + { List results = new BuildProcessHelper(StepLogger, CancellationTokenSource, false, false, true).Run( workingDirectory, "cmd.exe", diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs index ef4ba9cb..0536bdac 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepBackup.cs @@ -1,12 +1,15 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps +{ [BuildStep(NAME)] - public class BuildStepBackup : FileBuildStep { + public class BuildStepBackup : FileBuildStep + { public const string NAME = "Backup"; - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { StepLogger.Log("Backing up current release"); string environmentPath = GetBuildEnvironmentPath(); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs index 51e7a8ac..733c1fc4 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepMerge.cs @@ -2,13 +2,17 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps +{ [BuildStep(NAME)] - public class BuildStepMerge : GitBuildStep { + public class BuildStepMerge : GitBuildStep + { public const string NAME = "Merge"; - protected override Task ProcessExecute() { - try { + protected override Task ProcessExecute() + { + try + { // Necessary to get around branch protection rules for master. Runs locally on server using user stored login as credentials string modpackPath = Path.Join(GetBuildSourcesPath(), "modpack"); GitCommand(modpackPath, "git fetch"); @@ -21,7 +25,9 @@ protected override Task ProcessExecute() { GitCommand(modpackPath, "git merge release"); GitCommand(modpackPath, "git push -u origin master"); StepLogger.Log("Release branch merge to master complete"); - } catch (Exception exception) { + } + catch (Exception exception) + { Warning($"Release branch merge to master failed:\n{exception}"); } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs index fe938c32..04904f0e 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepPublish.cs @@ -1,19 +1,23 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps +{ [BuildStep(NAME)] - public class BuildStepPublish : BuildStep { + public class BuildStepPublish : BuildStep + { public const string NAME = "Publish"; private IReleaseService _releaseService; - protected override Task SetupExecute() { + protected override Task SetupExecute() + { _releaseService = ServiceProvider.GetService(); StepLogger.Log("Retrieved services"); return Task.CompletedTask; } - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { await _releaseService.PublishRelease(Build.Version); StepLogger.Log("Release published"); } diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs index 6feec5c5..44f9d584 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepReleaseKeys.cs @@ -2,12 +2,15 @@ using System.Threading.Tasks; using UKSF.Api.ArmaServer.Models; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps +{ [BuildStep(NAME)] - public class BuildStepReleaseKeys : FileBuildStep { + public class BuildStepReleaseKeys : FileBuildStep + { public const string NAME = "Copy Keys"; - protected override async Task SetupExecute() { + protected override async Task SetupExecute() + { string keysPath = Path.Join(GetBuildEnvironmentPath(), "Keys"); StepLogger.LogSurround("Wiping release server keys folder"); @@ -15,7 +18,8 @@ protected override async Task SetupExecute() { StepLogger.LogSurround("Release server keys folder wiped"); } - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { StepLogger.Log("Copy RC keys to release keys folder"); string keysPath = Path.Join(GetBuildEnvironmentPath(), "Keys"); diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs index 168b0c05..92923959 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/ReleaseSteps/BuildStepRestore.cs @@ -1,12 +1,15 @@ using System.IO; using System.Threading.Tasks; -namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps { +namespace UKSF.Api.Modpack.Services.BuildProcess.Steps.ReleaseSteps +{ [BuildStep(NAME)] - public class BuildStepRestore : FileBuildStep { + public class BuildStepRestore : FileBuildStep + { public const string NAME = "Restore"; - protected override async Task ProcessExecute() { + protected override async Task ProcessExecute() + { StepLogger.Log("Restoring previous release"); string environmentPath = GetBuildEnvironmentPath(); string repoPath = Path.Join(environmentPath, "Repo"); diff --git a/UKSF.Api.Modpack/Services/GithubService.cs b/UKSF.Api.Modpack/Services/GithubService.cs index afe7a6c8..ec4c30b9 100644 --- a/UKSF.Api.Modpack/Services/GithubService.cs +++ b/UKSF.Api.Modpack/Services/GithubService.cs @@ -12,8 +12,10 @@ using UKSF.Api.Modpack.Models; using UKSF.Api.Shared.Events; -namespace UKSF.Api.Modpack.Services { - public interface IGithubService { +namespace UKSF.Api.Modpack.Services +{ + public interface IGithubService + { Task> GetBranches(); Task> GetHistoricReleases(); Task GetReferenceVersion(string reference); @@ -25,7 +27,8 @@ public interface IGithubService { Task PublishRelease(ModpackRelease release); } - public class GithubService : IGithubService { + public class GithubService : IGithubService + { private const string REPO_ORG = "uksf"; private const string REPO_NAME = "modpack"; private const string VERSION_FILE = "addons/main/script_version.hpp"; @@ -42,12 +45,14 @@ public class GithubService : IGithubService { private readonly IConfiguration _configuration; private readonly ILogger _logger; - public GithubService(IConfiguration configuration, ILogger logger) { + public GithubService(IConfiguration configuration, ILogger logger) + { _configuration = configuration; _logger = logger; } - public bool VerifySignature(string signature, string body) { + public bool VerifySignature(string signature, string body) + { string secret = _configuration.GetSection("Github")["webhookSecret"]; byte[] data = Encoding.UTF8.GetBytes(body); byte[] secretData = Encoding.UTF8.GetBytes(secret); @@ -57,11 +62,13 @@ public bool VerifySignature(string signature, string body) { return string.Equals(sha1, signature); } - public async Task GetReferenceVersion(string reference) { + public async Task GetReferenceVersion(string reference) + { reference = reference.Split('/')[^1]; GitHubClient client = await GetAuthenticatedClient(); byte[] contentBytes = await client.Repository.Content.GetRawContentByRef(REPO_ORG, REPO_NAME, VERSION_FILE, reference); - if (contentBytes.Length == 0) { + if (contentBytes.Length == 0) + { return "0.0.0"; } @@ -71,35 +78,41 @@ public async Task GetReferenceVersion(string reference) { return version; } - public async Task IsReferenceValid(string reference) { + public async Task IsReferenceValid(string reference) + { string version = await GetReferenceVersion(reference); int[] versionParts = version.Split('.').Select(int.Parse).ToArray(); // Version when make.py was changed to accommodate this system return versionParts[0] == 5 ? versionParts[1] == 17 ? versionParts[2] >= 19 : versionParts[1] > 17 : versionParts[0] > 5; } - public async Task GetLatestReferenceCommit(string reference) { + public async Task GetLatestReferenceCommit(string reference) + { GitHubClient client = await GetAuthenticatedClient(); GitHubCommit commit = await client.Repository.Commit.Get(REPO_ORG, REPO_NAME, reference); string branch = Regex.Match(reference, @"^[a-fA-F0-9]{40}$").Success ? "None" : reference; - return new GithubCommit { Branch = branch, Before = commit.Parents.FirstOrDefault()?.Sha, After = commit.Sha, Message = commit.Commit.Message, Author = commit.Commit.Author.Email }; + return new() { Branch = branch, Before = commit.Parents.FirstOrDefault()?.Sha, After = commit.Sha, Message = commit.Commit.Message, Author = commit.Commit.Author.Email }; } - public async Task GetPushEvent(PushWebhookPayload payload, string latestCommit = "") { - if (string.IsNullOrEmpty(latestCommit)) { + public async Task GetPushEvent(PushWebhookPayload payload, string latestCommit = "") + { + if (string.IsNullOrEmpty(latestCommit)) + { latestCommit = payload.Before; } GitHubClient client = await GetAuthenticatedClient(); CompareResult result = await client.Repository.Commit.Compare(REPO_ORG, REPO_NAME, latestCommit, payload.After); string message = result.Commits.Count > 0 ? CombineCommitMessages(result.Commits) : result.BaseCommit.Commit.Message; - return new GithubCommit { Branch = payload.Ref, BaseBranch = payload.BaseRef, Before = payload.Before, After = payload.After, Message = message, Author = payload.HeadCommit.Author.Email }; + return new() { Branch = payload.Ref, BaseBranch = payload.BaseRef, Before = payload.Before, After = payload.After, Message = message, Author = payload.HeadCommit.Author.Email }; } - public async Task GenerateChangelog(string version) { + public async Task GenerateChangelog(string version) + { GitHubClient client = await GetAuthenticatedClient(); Milestone milestone = await GetOpenMilestone(version); - if (milestone == null) { + if (milestone == null) + { return "No milestone found"; } @@ -126,32 +139,40 @@ public async Task GenerateChangelog(string version) { return changelog; } - public async Task PublishRelease(ModpackRelease release) { + public async Task PublishRelease(ModpackRelease release) + { GitHubClient client = await GetAuthenticatedClient(); - try { + try + { await client.Repository.Release.Create( REPO_ORG, REPO_NAME, - new NewRelease(release.Version) { Name = $"Modpack Version {release.Version}", Body = $"{release.Description}\n\n## Changelog\n{release.Changelog.Replace("
", "\n")}" } + new(release.Version) { Name = $"Modpack Version {release.Version}", Body = $"{release.Description}\n\n## Changelog\n{release.Changelog.Replace("
", "\n")}" } ); Milestone milestone = await GetOpenMilestone(release.Version); - if (milestone != null) { - await client.Issue.Milestone.Update(REPO_ORG, REPO_NAME, milestone.Number, new MilestoneUpdate { State = ItemState.Closed }); + if (milestone != null) + { + await client.Issue.Milestone.Update(REPO_ORG, REPO_NAME, milestone.Number, new() { State = ItemState.Closed }); } - } catch (Exception exception) { + } + catch (Exception exception) + { _logger.LogError(exception); } } - public async Task> GetBranches() { + public async Task> GetBranches() + { GitHubClient client = await GetAuthenticatedClient(); IReadOnlyList branches = await client.Repository.Branch.GetAll(REPO_ORG, REPO_NAME); ConcurrentBag validBranchesBag = new(); IEnumerable task = branches.Select( - async branch => { - if (await IsReferenceValid(branch.Name)) { + async branch => + { + if (await IsReferenceValid(branch.Name)) + { validBranchesBag.Add(branch.Name); } } @@ -159,12 +180,14 @@ public async Task> GetBranches() { await Task.WhenAll(task); List validBranches = validBranchesBag.OrderBy(x => x).ToList(); - if (validBranches.Contains("release")) { + if (validBranches.Contains("release")) + { validBranches.Remove("release"); validBranches.Insert(0, "release"); } - if (validBranches.Contains("master")) { + if (validBranches.Contains("master")) + { validBranches.Remove("master"); validBranches.Insert(0, "master"); } @@ -172,42 +195,51 @@ public async Task> GetBranches() { return validBranches; } - public async Task> GetHistoricReleases() { + public async Task> GetHistoricReleases() + { GitHubClient client = await GetAuthenticatedClient(); IReadOnlyList releases = await client.Repository.Release.GetAll(REPO_ORG, "modpack"); return releases.Select(x => new ModpackRelease { Version = x.Name.Split(" ")[^1], Timestamp = x.CreatedAt.DateTime, Changelog = FormatChangelog(x.Body) }).ToList(); } - private static string CombineCommitMessages(IReadOnlyCollection commits) { + private static string CombineCommitMessages(IReadOnlyCollection commits) + { List filteredCommitMessages = commits.Select(x => x.Commit.Message).Reverse().Where(x => !x.Contains("Merge branch") && !Regex.IsMatch(x, "Release \\d*\\.\\d*\\.\\d*")).ToList(); return filteredCommitMessages.Count == 0 ? commits.First().Commit.Message : filteredCommitMessages.Aggregate((a, b) => $"{a}\n\n{b}"); } - private async Task GetOpenMilestone(string version) { + private async Task GetOpenMilestone(string version) + { GitHubClient client = await GetAuthenticatedClient(); IReadOnlyList milestones = await client.Issue.Milestone.GetAllForRepository(REPO_ORG, REPO_NAME, new MilestoneRequest { State = ItemStateFilter.Open }); Milestone milestone = milestones.FirstOrDefault(x => x.Title == version); - if (milestone == null) { + if (milestone == null) + { _logger.LogWarning($"Could not find open milestone for version {version}"); } return milestone; } - private static void AddChangelogSection(ref string changelog, IReadOnlyCollection issues, string header) { - if (issues.Any()) { + private static void AddChangelogSection(ref string changelog, IReadOnlyCollection issues, string header) + { + if (issues.Any()) + { changelog += $"#### {header}"; changelog += issues.Select(x => $"\n- {x.Title} [(#{x.Number})]({x.HtmlUrl})").Aggregate((a, b) => a + b); changelog += "\n\n"; } } - private static void AddChangelogUpdated(ref string changelog, IReadOnlyCollection issues, string header) { - if (issues.Any()) { + private static void AddChangelogUpdated(ref string changelog, IReadOnlyCollection issues, string header) + { + if (issues.Any()) + { changelog += $"#### {header}"; changelog += issues.Select( - x => { + x => + { string[] titleParts = x.Title.Split(" "); return $"\n- {titleParts[0]} to [{titleParts[1]}]({x.HtmlUrl})"; } @@ -217,23 +249,30 @@ private static void AddChangelogUpdated(ref string changelog, IReadOnlyCollectio } } - private static string FormatChangelog(string body) { + private static string FormatChangelog(string body) + { string changelog = body.Replace("\r\n", "\n").Replace("\n[Report", "
[Report"); string[] lines = changelog.Split("\n"); - for (int i = 0; i < lines.Length; i++) { + for (int i = 0; i < lines.Length; i++) + { string line = lines[i]; - if (line.StartsWith(" ") && !Regex.Match(line, @"( {2,})-").Success) { + if (line.StartsWith(" ") && !Regex.Match(line, @"( {2,})-").Success) + { lines[i] = $"
{line}"; } Match match = Regex.Match(line, @"]\(#\d+\)"); - if (match.Success) { + if (match.Success) + { string number = match.Value.Replace("]", "").Replace("(", "").Replace(")", "").Replace("#", ""); lines[i] = line.Replace(match.Value, $"](https://github.com/uksf/modpack/issues/{number})"); - } else { + } + else + { match = Regex.Match(line, @"\(#\d+\)"); - if (match.Success) { + if (match.Success) + { string number = match.Value.Replace("(", "").Replace(")", "").Replace("#", ""); lines[i] = line.Replace(match.Value, $"[{match.Value}](https://github.com/uksf/modpack/issues/{number})"); } @@ -243,16 +282,18 @@ private static string FormatChangelog(string body) { return string.Join("\n", lines); } - private async Task GetAuthenticatedClient() { - GitHubClient client = new(new ProductHeaderValue(APP_NAME)) { Credentials = new Credentials(GetJwtToken(), AuthenticationType.Bearer) }; + private async Task GetAuthenticatedClient() + { + GitHubClient client = new(new ProductHeaderValue(APP_NAME)) { Credentials = new(GetJwtToken(), AuthenticationType.Bearer) }; AccessToken response = await client.GitHubApps.CreateInstallationToken(APP_INSTALLATION); - GitHubClient installationClient = new(new ProductHeaderValue(APP_NAME)) { Credentials = new Credentials(response.Token) }; + GitHubClient installationClient = new(new ProductHeaderValue(APP_NAME)) { Credentials = new(response.Token) }; return installationClient; } - private string GetJwtToken() { + private string GetJwtToken() + { string privateKey = _configuration.GetSection("Github")["appPrivateKey"].Replace("\n", Environment.NewLine, StringComparison.Ordinal); - GitHubJwtFactory generator = new(new StringPrivateKeySource(privateKey), new GitHubJwtFactoryOptions { AppIntegrationId = APP_ID, ExpirationSeconds = 540 }); + GitHubJwtFactory generator = new(new StringPrivateKeySource(privateKey), new() { AppIntegrationId = APP_ID, ExpirationSeconds = 540 }); return generator.CreateEncodedJwtToken(); } } diff --git a/UKSF.Api.Modpack/Services/ReleaseService.cs b/UKSF.Api.Modpack/Services/ReleaseService.cs index c4be48af..f1e1fb9c 100644 --- a/UKSF.Api.Modpack/Services/ReleaseService.cs +++ b/UKSF.Api.Modpack/Services/ReleaseService.cs @@ -8,8 +8,10 @@ using UKSF.Api.Personnel.Context; using UKSF.Api.Shared.Events; -namespace UKSF.Api.Modpack.Services { - public interface IReleaseService { +namespace UKSF.Api.Modpack.Services +{ + public interface IReleaseService + { Task MakeDraftRelease(string version, GithubCommit commit); Task UpdateDraft(ModpackRelease release); Task PublishRelease(string version); @@ -17,40 +19,48 @@ public interface IReleaseService { Task AddHistoricReleases(IEnumerable releases); } - public class ReleaseService : IReleaseService { + public class ReleaseService : IReleaseService + { private readonly IAccountContext _accountContext; private readonly IGithubService _githubService; private readonly ILogger _logger; private readonly IReleasesContext _releasesContext; - public ReleaseService(IReleasesContext releasesContext, IAccountContext accountContext, IGithubService githubService, ILogger logger) { + public ReleaseService(IReleasesContext releasesContext, IAccountContext accountContext, IGithubService githubService, ILogger logger) + { _releasesContext = releasesContext; _accountContext = accountContext; _githubService = githubService; _logger = logger; } - public ModpackRelease GetRelease(string version) { + public ModpackRelease GetRelease(string version) + { return _releasesContext.GetSingle(x => x.Version == version); } - public async Task MakeDraftRelease(string version, GithubCommit commit) { + public async Task MakeDraftRelease(string version, GithubCommit commit) + { string changelog = await _githubService.GenerateChangelog(version); string creatorId = _accountContext.GetSingle(x => x.Email == commit.Author)?.Id; - await _releasesContext.Add(new ModpackRelease { Timestamp = DateTime.Now, Version = version, Changelog = changelog, IsDraft = true, CreatorId = creatorId }); + await _releasesContext.Add(new() { Timestamp = DateTime.Now, Version = version, Changelog = changelog, IsDraft = true, CreatorId = creatorId }); } - public async Task UpdateDraft(ModpackRelease release) { + public async Task UpdateDraft(ModpackRelease release) + { await _releasesContext.Update(release.Id, Builders.Update.Set(x => x.Description, release.Description).Set(x => x.Changelog, release.Changelog)); } - public async Task PublishRelease(string version) { + public async Task PublishRelease(string version) + { ModpackRelease release = GetRelease(version); - if (release == null) { + if (release == null) + { throw new NullReferenceException($"Could not find release {version}"); } - if (!release.IsDraft) { + if (!release.IsDraft) + { _logger.LogWarning($"Attempted to release {version} again. Halting publish"); } @@ -61,9 +71,11 @@ public async Task PublishRelease(string version) { await _githubService.PublishRelease(release); } - public async Task AddHistoricReleases(IEnumerable releases) { + public async Task AddHistoricReleases(IEnumerable releases) + { IEnumerable existingReleases = _releasesContext.Get(); - foreach (ModpackRelease release in releases.Where(x => existingReleases.All(y => y.Version != x.Version))) { + foreach (ModpackRelease release in releases.Where(x => existingReleases.All(y => y.Version != x.Version))) + { await _releasesContext.Add(release); } } diff --git a/UKSF.Api.Modpack/Signalr/Clients/IModpackClient.cs b/UKSF.Api.Modpack/Signalr/Clients/IModpackClient.cs index 6f82bbe8..3e14c4b7 100644 --- a/UKSF.Api.Modpack/Signalr/Clients/IModpackClient.cs +++ b/UKSF.Api.Modpack/Signalr/Clients/IModpackClient.cs @@ -1,8 +1,10 @@ using System.Threading.Tasks; using UKSF.Api.Modpack.Models; -namespace UKSF.Api.Modpack.Signalr.Clients { - public interface IModpackClient { +namespace UKSF.Api.Modpack.Signalr.Clients +{ + public interface IModpackClient + { Task ReceiveReleaseCandidateBuild(ModpackBuild build); Task ReceiveBuild(ModpackBuild build); Task ReceiveBuildStep(ModpackBuildStep step); diff --git a/UKSF.Api.Modpack/Signalr/Hubs/BuildsHub.cs b/UKSF.Api.Modpack/Signalr/Hubs/BuildsHub.cs index 5ba70ab1..12013ee9 100644 --- a/UKSF.Api.Modpack/Signalr/Hubs/BuildsHub.cs +++ b/UKSF.Api.Modpack/Signalr/Hubs/BuildsHub.cs @@ -5,23 +5,29 @@ using Microsoft.Extensions.Primitives; using UKSF.Api.Modpack.Signalr.Clients; -namespace UKSF.Api.Modpack.Signalr.Hubs { +namespace UKSF.Api.Modpack.Signalr.Hubs +{ [Authorize] - public class BuildsHub : Hub { + public class BuildsHub : Hub + { public const string END_POINT = "builds"; - public override async Task OnConnectedAsync() { + public override async Task OnConnectedAsync() + { StringValues buildId = Context.GetHttpContext().Request.Query["buildId"]; - if (!string.IsNullOrEmpty(buildId)) { + if (!string.IsNullOrEmpty(buildId)) + { await Groups.AddToGroupAsync(Context.ConnectionId, buildId); } await base.OnConnectedAsync(); } - public override async Task OnDisconnectedAsync(Exception exception) { + public override async Task OnDisconnectedAsync(Exception exception) + { StringValues buildId = Context.GetHttpContext().Request.Query["buildId"]; - if (!string.IsNullOrEmpty(buildId)) { + if (!string.IsNullOrEmpty(buildId)) + { await Groups.RemoveFromGroupAsync(Context.ConnectionId, buildId); } diff --git a/UKSF.Api.Personnel/Context/CommentThreadContext.cs b/UKSF.Api.Personnel/Context/CommentThreadContext.cs index 615468ca..12e51ec5 100644 --- a/UKSF.Api.Personnel/Context/CommentThreadContext.cs +++ b/UKSF.Api.Personnel/Context/CommentThreadContext.cs @@ -6,28 +6,34 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Personnel.Context { - public interface ICommentThreadContext : IMongoContext, ICachedMongoContext { +namespace UKSF.Api.Personnel.Context +{ + public interface ICommentThreadContext : IMongoContext, ICachedMongoContext + { Task AddCommentToThread(string commentThreadId, Comment comment); Task RemoveCommentFromThread(string commentThreadId, Comment comment); } - public class CommentThreadContext : CachedMongoContext, ICommentThreadContext { + public class CommentThreadContext : CachedMongoContext, ICommentThreadContext + { public CommentThreadContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "commentThreads") { } - public async Task AddCommentToThread(string commentThreadId, Comment comment) { + public async Task AddCommentToThread(string commentThreadId, Comment comment) + { UpdateDefinition updateDefinition = Builders.Update.Push(x => x.Comments, comment); await base.Update(commentThreadId, updateDefinition); - CommentThreadDataEvent(new EventModel(EventType.ADD, new CommentThreadEventData(commentThreadId, comment))); + CommentThreadDataEvent(new(EventType.ADD, new CommentThreadEventData(commentThreadId, comment))); } - public async Task RemoveCommentFromThread(string commentThreadId, Comment comment) { + public async Task RemoveCommentFromThread(string commentThreadId, Comment comment) + { UpdateDefinition updateDefinition = Builders.Update.Pull(x => x.Comments, comment); await base.Update(commentThreadId, updateDefinition); - CommentThreadDataEvent(new EventModel(EventType.DELETE, new CommentThreadEventData(commentThreadId, comment))); + CommentThreadDataEvent(new(EventType.DELETE, new CommentThreadEventData(commentThreadId, comment))); } - private void CommentThreadDataEvent(EventModel eventModel) { + private void CommentThreadDataEvent(EventModel eventModel) + { base.DataEvent(eventModel); } diff --git a/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs b/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs index ed6d06d3..322605e6 100644 --- a/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs +++ b/UKSF.Api.Personnel/Context/ConfirmationCodeContext.cs @@ -3,11 +3,12 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Personnel.Context { +namespace UKSF.Api.Personnel.Context +{ public interface IConfirmationCodeContext : IMongoContext { } - public class ConfirmationCodeContext : MongoContext, IConfirmationCodeContext { - public ConfirmationCodeContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : - base(mongoCollectionFactory, eventBus, "confirmationCodes") { } + public class ConfirmationCodeContext : MongoContext, IConfirmationCodeContext + { + public ConfirmationCodeContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "confirmationCodes") { } } } diff --git a/UKSF.Api.Personnel/Context/NotificationsContext.cs b/UKSF.Api.Personnel/Context/NotificationsContext.cs index bfeebac5..7bf69dae 100644 --- a/UKSF.Api.Personnel/Context/NotificationsContext.cs +++ b/UKSF.Api.Personnel/Context/NotificationsContext.cs @@ -3,10 +3,12 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Personnel.Context { +namespace UKSF.Api.Personnel.Context +{ public interface INotificationsContext : IMongoContext, ICachedMongoContext { } - public class NotificationsContext : CachedMongoContext, INotificationsContext { + public class NotificationsContext : CachedMongoContext, INotificationsContext + { public NotificationsContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "notifications") { } } } diff --git a/UKSF.Api.Personnel/Context/UnitsContext.cs b/UKSF.Api.Personnel/Context/UnitsContext.cs index 5e6f7a06..2e558da1 100644 --- a/UKSF.Api.Personnel/Context/UnitsContext.cs +++ b/UKSF.Api.Personnel/Context/UnitsContext.cs @@ -5,14 +5,18 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Context; -namespace UKSF.Api.Personnel.Context { +namespace UKSF.Api.Personnel.Context +{ public interface IUnitsContext : IMongoContext, ICachedMongoContext { } - public class UnitsContext : CachedMongoContext, IUnitsContext { + public class UnitsContext : CachedMongoContext, IUnitsContext + { public UnitsContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "units") { } - protected override void SetCache(IEnumerable newCollection) { - lock (LockObject) { + protected override void SetCache(IEnumerable newCollection) + { + lock (LockObject) + { Cache = newCollection?.OrderBy(x => x.Order).ToList(); } } diff --git a/UKSF.Api.Personnel/Controllers/ServiceRecordsController.cs b/UKSF.Api.Personnel/Controllers/ServiceRecordsController.cs index 1f99ad59..3daa674e 100644 --- a/UKSF.Api.Personnel/Controllers/ServiceRecordsController.cs +++ b/UKSF.Api.Personnel/Controllers/ServiceRecordsController.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Mvc; -namespace UKSF.Api.Personnel.Controllers { +namespace UKSF.Api.Personnel.Controllers +{ [Route("users/{userid}/[controller]")] public class ServiceRecordsController : Controller { } } diff --git a/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs index 1ed15924..4ee982b1 100644 --- a/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/NotificationsEventHandler.cs @@ -9,31 +9,38 @@ using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Models; -namespace UKSF.Api.Personnel.EventHandlers { +namespace UKSF.Api.Personnel.EventHandlers +{ public interface INotificationsEventHandler : IEventHandler { } - public class NotificationsEventHandler : INotificationsEventHandler { + public class NotificationsEventHandler : INotificationsEventHandler + { + private readonly IEventBus _eventBus; private readonly IHubContext _hub; private readonly ILogger _logger; - private readonly IEventBus _eventBus; - public NotificationsEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) { + public NotificationsEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) + { _eventBus = eventBus; _hub = hub; _logger = logger; } - public void Init() { + public void Init() + { _eventBus.AsObservable().SubscribeWithAsyncNext>(HandleEvent, _logger.LogError); } - private async Task HandleEvent(EventModel eventModel, ContextEventData contextEventData) { - if (eventModel.EventType == EventType.ADD) { + private async Task HandleEvent(EventModel eventModel, ContextEventData contextEventData) + { + if (eventModel.EventType == EventType.ADD) + { await AddedEvent(contextEventData.Data); } } - private async Task AddedEvent(Notification notification) { + private async Task AddedEvent(Notification notification) + { await _hub.Clients.Group(notification.Owner).ReceiveNotification(notification); } } diff --git a/UKSF.Api.Personnel/Extensions/ApplicationExtensions.cs b/UKSF.Api.Personnel/Extensions/ApplicationExtensions.cs index 69f72041..6533f74b 100644 --- a/UKSF.Api.Personnel/Extensions/ApplicationExtensions.cs +++ b/UKSF.Api.Personnel/Extensions/ApplicationExtensions.cs @@ -1,23 +1,28 @@ using System; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Extensions { - public static class ApplicationExtensions { - public static ApplicationAge ToAge(this DateTime dob, DateTime? date = null) { +namespace UKSF.Api.Personnel.Extensions +{ + public static class ApplicationExtensions + { + public static ApplicationAge ToAge(this DateTime dob, DateTime? date = null) + { DateTime today = date ?? DateTime.Today; int months = today.Month - dob.Month; int years = today.Year - dob.Year; - if (today.Day < dob.Day) { + if (today.Day < dob.Day) + { months--; } - if (months < 0) { + if (months < 0) + { years--; months += 12; } - return new ApplicationAge { Years = years, Months = months }; + return new() { Years = years, Months = months }; } } } diff --git a/UKSF.Api.Personnel/Mappers/AutoMapperUnitProfile.cs b/UKSF.Api.Personnel/Mappers/AutoMapperUnitProfile.cs index dc1d7139..b0cfb6bb 100644 --- a/UKSF.Api.Personnel/Mappers/AutoMapperUnitProfile.cs +++ b/UKSF.Api.Personnel/Mappers/AutoMapperUnitProfile.cs @@ -1,9 +1,12 @@ using AutoMapper; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Mappers { - public class AutoMapperUnitProfile : Profile { - public AutoMapperUnitProfile() { +namespace UKSF.Api.Personnel.Mappers +{ + public class AutoMapperUnitProfile : Profile + { + public AutoMapperUnitProfile() + { CreateMap(); } } diff --git a/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs b/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs index e92317e4..89e189d1 100644 --- a/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs +++ b/UKSF.Api.Personnel/Models/AccountAttendanceStatus.cs @@ -1,8 +1,10 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSF.Api.Personnel.Models { - public class AccountAttendanceStatus { +namespace UKSF.Api.Personnel.Models +{ + public class AccountAttendanceStatus + { [BsonRepresentation(BsonType.ObjectId)] public string AccountId; public float AttendancePercent; public AttendanceState AttendanceState; @@ -11,7 +13,8 @@ public class AccountAttendanceStatus { public string GroupName; } - public enum AttendanceState { + public enum AttendanceState + { FULL, PARTIAL, MIA, diff --git a/UKSF.Api.Personnel/Models/AccountSettings.cs b/UKSF.Api.Personnel/Models/AccountSettings.cs index 43bc72ba..81b4b07d 100644 --- a/UKSF.Api.Personnel/Models/AccountSettings.cs +++ b/UKSF.Api.Personnel/Models/AccountSettings.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.Personnel.Models { - public class AccountSettings { +namespace UKSF.Api.Personnel.Models +{ + public class AccountSettings + { public bool NotificationsEmail = true; public bool NotificationsTeamspeak = true; public bool Sr1Enabled = true; diff --git a/UKSF.Api.Personnel/Models/AttendanceReport.cs b/UKSF.Api.Personnel/Models/AttendanceReport.cs index b6f73f62..01da0595 100644 --- a/UKSF.Api.Personnel/Models/AttendanceReport.cs +++ b/UKSF.Api.Personnel/Models/AttendanceReport.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.Personnel.Models { - public class AttendanceReport { +namespace UKSF.Api.Personnel.Models +{ + public class AttendanceReport + { public AccountAttendanceStatus[] Users; } } diff --git a/UKSF.Api.Personnel/Models/Comment.cs b/UKSF.Api.Personnel/Models/Comment.cs index d8b83af6..c727fbf0 100644 --- a/UKSF.Api.Personnel/Models/Comment.cs +++ b/UKSF.Api.Personnel/Models/Comment.cs @@ -3,8 +3,10 @@ using MongoDB.Bson.Serialization.Attributes; using UKSF.Api.Base.Models; -namespace UKSF.Api.Personnel.Models { - public class Comment : MongoObject { +namespace UKSF.Api.Personnel.Models +{ + public class Comment : MongoObject + { [BsonRepresentation(BsonType.ObjectId)] public string Author; public string Content; public DateTime Timestamp; diff --git a/UKSF.Api.Personnel/Models/CommentThread.cs b/UKSF.Api.Personnel/Models/CommentThread.cs index cda90e96..420acf3b 100644 --- a/UKSF.Api.Personnel/Models/CommentThread.cs +++ b/UKSF.Api.Personnel/Models/CommentThread.cs @@ -1,9 +1,12 @@ -using MongoDB.Bson; +using System; +using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; using UKSF.Api.Base.Models; -namespace UKSF.Api.Personnel.Models { - public enum ThreadMode { +namespace UKSF.Api.Personnel.Models +{ + public enum ThreadMode + { ALL, RECRUITER, RANKSUPERIOR, @@ -11,9 +14,10 @@ public enum ThreadMode { RANKSUPERIOROREQUAL } - public class CommentThread : MongoObject { + public class CommentThread : MongoObject + { [BsonRepresentation(BsonType.ObjectId)] public string[] Authors; - public Comment[] Comments = System.Array.Empty(); + public Comment[] Comments = Array.Empty(); public ThreadMode Mode; } } diff --git a/UKSF.Api.Personnel/Models/CommentThreadEventData.cs b/UKSF.Api.Personnel/Models/CommentThreadEventData.cs index 4d4ca3b7..7ad99afc 100644 --- a/UKSF.Api.Personnel/Models/CommentThreadEventData.cs +++ b/UKSF.Api.Personnel/Models/CommentThreadEventData.cs @@ -1,11 +1,15 @@ -namespace UKSF.Api.Personnel.Models { - public class CommentThreadEventData { - public CommentThreadEventData(string commentThreadId, Comment comment) { +namespace UKSF.Api.Personnel.Models +{ + public class CommentThreadEventData + { + public Comment Comment; + + public string CommentThreadId; + + public CommentThreadEventData(string commentThreadId, Comment comment) + { CommentThreadId = commentThreadId; Comment = comment; } - - public string CommentThreadId; - public Comment Comment; } } diff --git a/UKSF.Api.Personnel/Models/ConfirmationCode.cs b/UKSF.Api.Personnel/Models/ConfirmationCode.cs index 89da1d89..af891d6a 100644 --- a/UKSF.Api.Personnel/Models/ConfirmationCode.cs +++ b/UKSF.Api.Personnel/Models/ConfirmationCode.cs @@ -1,7 +1,9 @@ using UKSF.Api.Base.Models; -namespace UKSF.Api.Personnel.Models { - public class ConfirmationCode : MongoObject { +namespace UKSF.Api.Personnel.Models +{ + public class ConfirmationCode : MongoObject + { public string Value; } } diff --git a/UKSF.Api.Personnel/Models/Loa.cs b/UKSF.Api.Personnel/Models/Loa.cs index 7c32f547..550a0928 100644 --- a/UKSF.Api.Personnel/Models/Loa.cs +++ b/UKSF.Api.Personnel/Models/Loa.cs @@ -3,14 +3,17 @@ using MongoDB.Bson.Serialization.Attributes; using UKSF.Api.Base.Models; -namespace UKSF.Api.Personnel.Models { - public enum LoaReviewState { +namespace UKSF.Api.Personnel.Models +{ + public enum LoaReviewState + { PENDING, APPROVED, REJECTED } - public class Loa : MongoObject { + public class Loa : MongoObject + { public bool Emergency; public DateTime End; public bool Late; diff --git a/UKSF.Api.Personnel/Models/MembershipState.cs b/UKSF.Api.Personnel/Models/MembershipState.cs index 6f4b8afd..73c227c0 100644 --- a/UKSF.Api.Personnel/Models/MembershipState.cs +++ b/UKSF.Api.Personnel/Models/MembershipState.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.Personnel.Models { - public enum MembershipState { +namespace UKSF.Api.Personnel.Models +{ + public enum MembershipState + { UNCONFIRMED, CONFIRMED, MEMBER, diff --git a/UKSF.Api.Personnel/Models/Notification.cs b/UKSF.Api.Personnel/Models/Notification.cs index cd80965e..fe51a2ac 100644 --- a/UKSF.Api.Personnel/Models/Notification.cs +++ b/UKSF.Api.Personnel/Models/Notification.cs @@ -3,8 +3,10 @@ using MongoDB.Bson.Serialization.Attributes; using UKSF.Api.Base.Models; -namespace UKSF.Api.Personnel.Models { - public class Notification : MongoObject { +namespace UKSF.Api.Personnel.Models +{ + public class Notification : MongoObject + { public string Icon; public string Link; public string Message; diff --git a/UKSF.Api.Personnel/Models/NotificationIcons.cs b/UKSF.Api.Personnel/Models/NotificationIcons.cs index 0b8478f3..da481705 100644 --- a/UKSF.Api.Personnel/Models/NotificationIcons.cs +++ b/UKSF.Api.Personnel/Models/NotificationIcons.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.Personnel.Models { - public static class NotificationIcons { +namespace UKSF.Api.Personnel.Models +{ + public static class NotificationIcons + { public const string APPLICATION = "group_add"; public const string BUILD = "build"; public const string COMMENT = "comment"; diff --git a/UKSF.Api.Personnel/Models/Rank.cs b/UKSF.Api.Personnel/Models/Rank.cs index 905893c9..4dd97f34 100644 --- a/UKSF.Api.Personnel/Models/Rank.cs +++ b/UKSF.Api.Personnel/Models/Rank.cs @@ -1,7 +1,9 @@ using UKSF.Api.Base.Models; -namespace UKSF.Api.Personnel.Models { - public class Rank : MongoObject { +namespace UKSF.Api.Personnel.Models +{ + public class Rank : MongoObject + { public string Abbreviation; public string DiscordRoleId; public string Name; diff --git a/UKSF.Api.Personnel/Models/Role.cs b/UKSF.Api.Personnel/Models/Role.cs index 1f1fa7f0..9cd1ee4e 100644 --- a/UKSF.Api.Personnel/Models/Role.cs +++ b/UKSF.Api.Personnel/Models/Role.cs @@ -1,12 +1,15 @@ using UKSF.Api.Base.Models; -namespace UKSF.Api.Personnel.Models { - public enum RoleType { +namespace UKSF.Api.Personnel.Models +{ + public enum RoleType + { INDIVIDUAL, UNIT } - public class Role : MongoObject { + public class Role : MongoObject + { public string Name; public int Order = 0; public RoleType RoleType = RoleType.INDIVIDUAL; diff --git a/UKSF.Api.Personnel/Services/AttendanceService.cs b/UKSF.Api.Personnel/Services/AttendanceService.cs index 9ee43d81..e4f4a9da 100644 --- a/UKSF.Api.Personnel/Services/AttendanceService.cs +++ b/UKSF.Api.Personnel/Services/AttendanceService.cs @@ -2,8 +2,10 @@ using System.Threading.Tasks; using UKSF.Api.Personnel.Models; -namespace UKSF.Api.Personnel.Services { - public interface IAttendanceService { +namespace UKSF.Api.Personnel.Services +{ + public interface IAttendanceService + { Task GenerateAttendanceReport(DateTime start, DateTime end); } diff --git a/UKSF.Api.Personnel/Signalr/Clients/IAccountClient.cs b/UKSF.Api.Personnel/Signalr/Clients/IAccountClient.cs index 5f8bdf97..49b1e8cb 100644 --- a/UKSF.Api.Personnel/Signalr/Clients/IAccountClient.cs +++ b/UKSF.Api.Personnel/Signalr/Clients/IAccountClient.cs @@ -1,7 +1,9 @@ using System.Threading.Tasks; -namespace UKSF.Api.Personnel.Signalr.Clients { - public interface IAccountClient { +namespace UKSF.Api.Personnel.Signalr.Clients +{ + public interface IAccountClient + { Task ReceiveAccountUpdate(); } } diff --git a/UKSF.Api.Personnel/Signalr/Clients/ICommentThreadClient.cs b/UKSF.Api.Personnel/Signalr/Clients/ICommentThreadClient.cs index 02a94329..a24e6d7f 100644 --- a/UKSF.Api.Personnel/Signalr/Clients/ICommentThreadClient.cs +++ b/UKSF.Api.Personnel/Signalr/Clients/ICommentThreadClient.cs @@ -1,7 +1,9 @@ using System.Threading.Tasks; -namespace UKSF.Api.Personnel.Signalr.Clients { - public interface ICommentThreadClient { +namespace UKSF.Api.Personnel.Signalr.Clients +{ + public interface ICommentThreadClient + { Task ReceiveComment(object comment); Task DeleteComment(string id); } diff --git a/UKSF.Api.Personnel/Signalr/Clients/INotificationsClient.cs b/UKSF.Api.Personnel/Signalr/Clients/INotificationsClient.cs index adc221a6..197de9e3 100644 --- a/UKSF.Api.Personnel/Signalr/Clients/INotificationsClient.cs +++ b/UKSF.Api.Personnel/Signalr/Clients/INotificationsClient.cs @@ -1,8 +1,10 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace UKSF.Api.Personnel.Signalr.Clients { - public interface INotificationsClient { +namespace UKSF.Api.Personnel.Signalr.Clients +{ + public interface INotificationsClient + { Task ReceiveNotification(object notification); Task ReceiveRead(IEnumerable ids); Task ReceiveClear(IEnumerable ids); diff --git a/UKSF.Api.Personnel/Signalr/Hubs/AccountHub.cs b/UKSF.Api.Personnel/Signalr/Hubs/AccountHub.cs index 8eb1825d..fbcd9e68 100644 --- a/UKSF.Api.Personnel/Signalr/Hubs/AccountHub.cs +++ b/UKSF.Api.Personnel/Signalr/Hubs/AccountHub.cs @@ -5,18 +5,22 @@ using Microsoft.Extensions.Primitives; using UKSF.Api.Personnel.Signalr.Clients; -namespace UKSF.Api.Personnel.Signalr.Hubs { +namespace UKSF.Api.Personnel.Signalr.Hubs +{ [Authorize] - public class AccountHub : Hub { + public class AccountHub : Hub + { public const string END_POINT = "account"; - public override async Task OnConnectedAsync() { + public override async Task OnConnectedAsync() + { StringValues userId = Context.GetHttpContext().Request.Query["userId"]; await Groups.AddToGroupAsync(Context.ConnectionId, userId); await base.OnConnectedAsync(); } - public override async Task OnDisconnectedAsync(Exception exception) { + public override async Task OnDisconnectedAsync(Exception exception) + { StringValues userId = Context.GetHttpContext().Request.Query["userId"]; await Groups.RemoveFromGroupAsync(Context.ConnectionId, userId); await base.OnDisconnectedAsync(exception); diff --git a/UKSF.Api.Personnel/Signalr/Hubs/CommentThreadHub.cs b/UKSF.Api.Personnel/Signalr/Hubs/CommentThreadHub.cs index e7b554d4..b4bb9599 100644 --- a/UKSF.Api.Personnel/Signalr/Hubs/CommentThreadHub.cs +++ b/UKSF.Api.Personnel/Signalr/Hubs/CommentThreadHub.cs @@ -5,18 +5,22 @@ using Microsoft.Extensions.Primitives; using UKSF.Api.Personnel.Signalr.Clients; -namespace UKSF.Api.Personnel.Signalr.Hubs { +namespace UKSF.Api.Personnel.Signalr.Hubs +{ [Authorize] - public class CommentThreadHub : Hub { + public class CommentThreadHub : Hub + { public const string END_POINT = "commentThread"; - public override async Task OnConnectedAsync() { + public override async Task OnConnectedAsync() + { StringValues threadId = Context.GetHttpContext().Request.Query["threadId"]; await Groups.AddToGroupAsync(Context.ConnectionId, threadId); await base.OnConnectedAsync(); } - public override async Task OnDisconnectedAsync(Exception exception) { + public override async Task OnDisconnectedAsync(Exception exception) + { StringValues threadId = Context.GetHttpContext().Request.Query["threadId"]; await Groups.RemoveFromGroupAsync(Context.ConnectionId, threadId); await base.OnDisconnectedAsync(exception); diff --git a/UKSF.Api.Personnel/Signalr/Hubs/NotificationsHub.cs b/UKSF.Api.Personnel/Signalr/Hubs/NotificationsHub.cs index ee82bc19..18298398 100644 --- a/UKSF.Api.Personnel/Signalr/Hubs/NotificationsHub.cs +++ b/UKSF.Api.Personnel/Signalr/Hubs/NotificationsHub.cs @@ -5,18 +5,22 @@ using Microsoft.Extensions.Primitives; using UKSF.Api.Personnel.Signalr.Clients; -namespace UKSF.Api.Personnel.Signalr.Hubs { +namespace UKSF.Api.Personnel.Signalr.Hubs +{ [Authorize] - public class NotificationHub : Hub { + public class NotificationHub : Hub + { public const string END_POINT = "notifications"; - public override async Task OnConnectedAsync() { + public override async Task OnConnectedAsync() + { StringValues userId = Context.GetHttpContext().Request.Query["userId"]; await Groups.AddToGroupAsync(Context.ConnectionId, userId); await base.OnConnectedAsync(); } - public override async Task OnDisconnectedAsync(Exception exception) { + public override async Task OnDisconnectedAsync(Exception exception) + { StringValues userId = Context.GetHttpContext().Request.Query["userId"]; await Groups.RemoveFromGroupAsync(Context.ConnectionId, userId); await base.OnDisconnectedAsync(exception); diff --git a/UKSF.Api.Shared/Context/SchedulerContext.cs b/UKSF.Api.Shared/Context/SchedulerContext.cs index c4162722..c1e6020d 100644 --- a/UKSF.Api.Shared/Context/SchedulerContext.cs +++ b/UKSF.Api.Shared/Context/SchedulerContext.cs @@ -2,10 +2,12 @@ using UKSF.Api.Base.Events; using UKSF.Api.Shared.Models; -namespace UKSF.Api.Shared.Context { +namespace UKSF.Api.Shared.Context +{ public interface ISchedulerContext : IMongoContext { } - public class SchedulerContext : MongoContext, ISchedulerContext { + public class SchedulerContext : MongoContext, ISchedulerContext + { public SchedulerContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "scheduledJobs") { } } } diff --git a/UKSF.Api.Shared/Extensions/ObservableExtensions.cs b/UKSF.Api.Shared/Extensions/ObservableExtensions.cs index 2867b13b..d7acb1cd 100644 --- a/UKSF.Api.Shared/Extensions/ObservableExtensions.cs +++ b/UKSF.Api.Shared/Extensions/ObservableExtensions.cs @@ -4,13 +4,17 @@ using System.Threading.Tasks; using UKSF.Api.Base.Models; -namespace UKSF.Api.Shared.Extensions { - public static class ObservableExtensions { - public static void SubscribeWithAsyncNext(this IObservable source, Func onNext, Action onError) { +namespace UKSF.Api.Shared.Extensions +{ + public static class ObservableExtensions + { + public static void SubscribeWithAsyncNext(this IObservable source, Func onNext, Action onError) + { source.Select(x => Observable.Defer(() => onNext(x).ToObservable())).Concat().Subscribe(_ => { }, onError); } - public static void SubscribeWithAsyncNext(this IObservable source, Func onNext, Action onError) { + public static void SubscribeWithAsyncNext(this IObservable source, Func onNext, Action onError) + { source.Select(x => Observable.Defer(() => x.Data is T data ? onNext(x, data).ToObservable() : Task.CompletedTask.ToObservable())).Concat().Subscribe(_ => { }, onError); } } diff --git a/UKSF.Api.Shared/Extensions/ServiceExtensions.cs b/UKSF.Api.Shared/Extensions/ServiceExtensions.cs index 8cf8de45..101a44a4 100644 --- a/UKSF.Api.Shared/Extensions/ServiceExtensions.cs +++ b/UKSF.Api.Shared/Extensions/ServiceExtensions.cs @@ -7,29 +7,39 @@ // ReSharper disable once ForeachCanBeConvertedToQueryUsingAnotherGetEnumerator -namespace UKSF.Api.Shared.Extensions { - public static class ServiceExtensions { - public static IEnumerable GetInterfaceServices(this IServiceProvider provider) { +namespace UKSF.Api.Shared.Extensions +{ + public static class ServiceExtensions + { + public static IEnumerable GetInterfaceServices(this IServiceProvider provider) + { List services = new(); object engine; FieldInfo fieldInfo = provider.GetType().GetFieldInfo("_engine"); - if (fieldInfo == null) { + if (fieldInfo == null) + { PropertyInfo propertyInfo = provider.GetType().GetPropertyInfo("Engine"); - if (propertyInfo == null) { - throw new Exception($"Could not find Field '_engine' or Property 'Engine' on {provider.GetType()}"); + if (propertyInfo == null) + { + throw new($"Could not find Field '_engine' or Property 'Engine' on {provider.GetType()}"); } engine = propertyInfo.GetValue(provider); - } else { + } + else + { engine = fieldInfo.GetValue(provider); } object callSiteFactory = engine.GetPropertyValue("CallSiteFactory"); object descriptorLookup = callSiteFactory.GetFieldValue("_descriptorLookup"); - if (descriptorLookup is IDictionary dictionary) { - foreach (DictionaryEntry entry in dictionary) { - if (typeof(T).IsAssignableFrom((Type) entry.Key)) { + if (descriptorLookup is IDictionary dictionary) + { + foreach (DictionaryEntry entry in dictionary) + { + if (typeof(T).IsAssignableFrom((Type) entry.Key)) + { services.Add((ServiceDescriptor) entry.Value.GetPropertyValue("Last")); } } diff --git a/UKSF.Api.Shared/Extensions/TaskUtilities.cs b/UKSF.Api.Shared/Extensions/TaskUtilities.cs index 73e0983b..655993cb 100644 --- a/UKSF.Api.Shared/Extensions/TaskUtilities.cs +++ b/UKSF.Api.Shared/Extensions/TaskUtilities.cs @@ -2,21 +2,31 @@ using System.Threading; using System.Threading.Tasks; -namespace UKSF.Api.Shared.Extensions { - public static class TaskUtilities { - public static async Task Delay(TimeSpan timeSpan, CancellationToken token) { - try { +namespace UKSF.Api.Shared.Extensions +{ + public static class TaskUtilities + { + public static async Task Delay(TimeSpan timeSpan, CancellationToken token) + { + try + { await Task.Delay(timeSpan, token); - } catch (Exception) { + } + catch (Exception) + { // Ignored } } - public static async Task DelayWithCallback(TimeSpan timeSpan, CancellationToken token, Func callback) { - try { + public static async Task DelayWithCallback(TimeSpan timeSpan, CancellationToken token, Func callback) + { + try + { await Task.Delay(timeSpan, token); await callback(); - } catch (Exception) { + } + catch (Exception) + { // Ignored } } diff --git a/UKSF.Api.Shared/Models/AuditLog.cs b/UKSF.Api.Shared/Models/AuditLog.cs index 7855c33f..aae278cb 100644 --- a/UKSF.Api.Shared/Models/AuditLog.cs +++ b/UKSF.Api.Shared/Models/AuditLog.cs @@ -1,8 +1,11 @@ -namespace UKSF.Api.Shared.Models { - public class AuditLog : BasicLog { +namespace UKSF.Api.Shared.Models +{ + public class AuditLog : BasicLog + { public string Who; - public AuditLog(string who, string message) : base(message) { + public AuditLog(string who, string message) : base(message) + { Who = who; Level = LogLevel.INFO; } diff --git a/UKSF.Api.Shared/Models/ContextEventData.cs b/UKSF.Api.Shared/Models/ContextEventData.cs index 048a58e2..5114de1c 100644 --- a/UKSF.Api.Shared/Models/ContextEventData.cs +++ b/UKSF.Api.Shared/Models/ContextEventData.cs @@ -1,9 +1,12 @@ -namespace UKSF.Api.Shared.Models { - public class ContextEventData { +namespace UKSF.Api.Shared.Models +{ + public class ContextEventData + { public T Data; public string Id; - public ContextEventData(string id, T data) { + public ContextEventData(string id, T data) + { Id = id; Data = data; } diff --git a/UKSF.Api.Shared/Models/DiscordEventData.cs b/UKSF.Api.Shared/Models/DiscordEventData.cs index e751cbf3..8f29d479 100644 --- a/UKSF.Api.Shared/Models/DiscordEventData.cs +++ b/UKSF.Api.Shared/Models/DiscordEventData.cs @@ -1,9 +1,12 @@ -namespace UKSF.Api.Shared.Models { - public class DiscordEventData { +namespace UKSF.Api.Shared.Models +{ + public class DiscordEventData + { public string EventData; public DiscordUserEventType EventType; - public DiscordEventData(DiscordUserEventType eventType, string eventData) { + public DiscordEventData(DiscordUserEventType eventType, string eventData) + { EventType = eventType; EventData = eventData; } diff --git a/UKSF.Api.Shared/Models/DiscordLog.cs b/UKSF.Api.Shared/Models/DiscordLog.cs index 3872f040..5d983050 100644 --- a/UKSF.Api.Shared/Models/DiscordLog.cs +++ b/UKSF.Api.Shared/Models/DiscordLog.cs @@ -1,8 +1,10 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -namespace UKSF.Api.Shared.Models { - public enum DiscordUserEventType { +namespace UKSF.Api.Shared.Models +{ + public enum DiscordUserEventType + { JOINED, LEFT, BANNED, @@ -10,15 +12,18 @@ public enum DiscordUserEventType { MESSAGE_DELETED } - public class DiscordLog : BasicLog { - [BsonRepresentation(BsonType.String)] - public DiscordUserEventType DiscordUserEventType; - public string InstigatorName; + public class DiscordLog : BasicLog + { public string ChannelName; - public string Name; + + [BsonRepresentation(BsonType.String)] public DiscordUserEventType DiscordUserEventType; + public string InstigatorId; + public string InstigatorName; + public string Name; - public DiscordLog(DiscordUserEventType discordUserEventType, string instigatorId, string instigatorName, string channelName, string name, string message) : base(message) { + public DiscordLog(DiscordUserEventType discordUserEventType, string instigatorId, string instigatorName, string channelName, string name, string message) : base(message) + { DiscordUserEventType = discordUserEventType; InstigatorId = instigatorId; InstigatorName = instigatorName; diff --git a/UKSF.Api.Shared/Models/OnlineState.cs b/UKSF.Api.Shared/Models/OnlineState.cs index ac6881ca..ce3d442a 100644 --- a/UKSF.Api.Shared/Models/OnlineState.cs +++ b/UKSF.Api.Shared/Models/OnlineState.cs @@ -1,6 +1,8 @@ -namespace UKSF.Api.Shared.Models { - public class OnlineState { - public bool Online; +namespace UKSF.Api.Shared.Models +{ + public class OnlineState + { public string Nickname; + public bool Online; } } diff --git a/UKSF.Api.Shared/Models/ScheduledJob.cs b/UKSF.Api.Shared/Models/ScheduledJob.cs index dcfb0a25..6fd00310 100644 --- a/UKSF.Api.Shared/Models/ScheduledJob.cs +++ b/UKSF.Api.Shared/Models/ScheduledJob.cs @@ -1,8 +1,10 @@ using System; using UKSF.Api.Base.Models; -namespace UKSF.Api.Shared.Models { - public class ScheduledJob : MongoObject { +namespace UKSF.Api.Shared.Models +{ + public class ScheduledJob : MongoObject + { public string Action; public string ActionParameters; public TimeSpan Interval; diff --git a/UKSF.Api.Shared/Models/SignalrEventData.cs b/UKSF.Api.Shared/Models/SignalrEventData.cs index d11b99e1..a5d69092 100644 --- a/UKSF.Api.Shared/Models/SignalrEventData.cs +++ b/UKSF.Api.Shared/Models/SignalrEventData.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.Shared.Models { - public class SignalrEventData { +namespace UKSF.Api.Shared.Models +{ + public class SignalrEventData + { public object Args; public TeamspeakEventType Procedure; } diff --git a/UKSF.Api.Shared/Models/TeamspeakEventType.cs b/UKSF.Api.Shared/Models/TeamspeakEventType.cs index 71f86b98..f25641ef 100644 --- a/UKSF.Api.Shared/Models/TeamspeakEventType.cs +++ b/UKSF.Api.Shared/Models/TeamspeakEventType.cs @@ -1,5 +1,7 @@ -namespace UKSF.Api.Shared.Models { - public enum TeamspeakEventType { +namespace UKSF.Api.Shared.Models +{ + public enum TeamspeakEventType + { EMPTY, CLIENTS, CLIENT_SERVER_GROUPS diff --git a/UKSF.Api.Shared/Services/ScheduledActionFactory.cs b/UKSF.Api.Shared/Services/ScheduledActionFactory.cs index 91879970..63be5767 100644 --- a/UKSF.Api.Shared/Services/ScheduledActionFactory.cs +++ b/UKSF.Api.Shared/Services/ScheduledActionFactory.cs @@ -2,23 +2,30 @@ using System.Collections.Generic; using UKSF.Api.Base.ScheduledActions; -namespace UKSF.Api.Shared.Services { - public interface IScheduledActionFactory { +namespace UKSF.Api.Shared.Services +{ + public interface IScheduledActionFactory + { void RegisterScheduledActions(IEnumerable newScheduledActions); IScheduledAction GetScheduledAction(string actionName); } - public class ScheduledActionFactory : IScheduledActionFactory { + public class ScheduledActionFactory : IScheduledActionFactory + { private readonly Dictionary _scheduledActions = new(); - public void RegisterScheduledActions(IEnumerable newScheduledActions) { - foreach (IScheduledAction scheduledAction in newScheduledActions) { + public void RegisterScheduledActions(IEnumerable newScheduledActions) + { + foreach (IScheduledAction scheduledAction in newScheduledActions) + { _scheduledActions[scheduledAction.Name] = scheduledAction; } } - public IScheduledAction GetScheduledAction(string actionName) { - if (_scheduledActions.TryGetValue(actionName, out IScheduledAction action)) { + public IScheduledAction GetScheduledAction(string actionName) + { + if (_scheduledActions.TryGetValue(actionName, out IScheduledAction action)) + { return action; } diff --git a/UKSF.Api/AppStart/StartServices.cs b/UKSF.Api/AppStart/StartServices.cs index 1405d0da..cfee61bc 100644 --- a/UKSF.Api/AppStart/StartServices.cs +++ b/UKSF.Api/AppStart/StartServices.cs @@ -13,10 +13,14 @@ using UKSF.Api.Shared.Services; using UKSF.Api.Teamspeak.Services; -namespace UKSF.Api.AppStart { - public static class StartServices { - public static void StartUksfServices(this IServiceProvider serviceProvider) { - if (serviceProvider.GetService().IsDevelopment()) { +namespace UKSF.Api.AppStart +{ + public static class StartServices + { + public static void StartUksfServices(this IServiceProvider serviceProvider) + { + if (serviceProvider.GetService().IsDevelopment()) + { // Do any test data setup // TestDataSetup.Run(serviceProvider); } @@ -51,7 +55,8 @@ public static void StartUksfServices(this IServiceProvider serviceProvider) { serviceProvider.GetService()?.RunQueuedBuilds(); } - public static void StopUksfServices(this IServiceProvider serviceProvider) { + public static void StopUksfServices(this IServiceProvider serviceProvider) + { // Cancel any running builds serviceProvider.GetService()?.CancelAll(); diff --git a/UKSF.Tests/Integration/Data/DataCollectionTests.cs b/UKSF.Tests/Integration/Data/DataCollectionTests.cs index fe4bdfee..41f2ca23 100644 --- a/UKSF.Tests/Integration/Data/DataCollectionTests.cs +++ b/UKSF.Tests/Integration/Data/DataCollectionTests.cs @@ -24,237 +24,239 @@ // // variables // namespace UKSF.Tests.Integration.Data { - // public class DataCollectionTests : IDisposable { - // private const string TEST_COLLECTION_NAME = "roles"; - // private MongoDbRunner _mongoDbRunner; +// public class DataCollectionTests : IDisposable { +// private const string TEST_COLLECTION_NAME = "roles"; +// private MongoDbRunner _mongoDbRunner; - // public void Dispose() { - // _mongoDbRunner?.Dispose(); - // } +// public void Dispose() { +// _mongoDbRunner?.Dispose(); +// } + +// private async Task MongoTest(Func testFunction) { +// _mongoDbRunner = MongoDbRunner.Start(additionalMongodArguments: "--quiet"); + +// IMongoDatabase database = MongoClientFactory.GetDatabase($"{_mongoDbRunner.ConnectionString}{Guid.NewGuid()}"); + +// await testFunction(database); + +// _mongoDbRunner.Dispose(); +// } + +// private static async Task<(MongoCollection dataCollection, string testId)> SetupTestCollection(IMongoDatabase database) { +// MongoCollection mongoCollection = new(database, TEST_COLLECTION_NAME); +// await mongoCollection.AssertCollectionExistsAsync(); + +// string testId = ObjectId.GenerateNewId().ToString(); +// List roles = new() { +// new Role { Name = "Rifleman" }, +// new Role { Name = "Trainee" }, +// new Role { Name = "Marksman", Id = testId }, +// new Role { Name = "1iC", RoleType = RoleType.UNIT, Order = 0 }, +// new Role { Name = "2iC", RoleType = RoleType.UNIT, Order = 1 }, +// new Role { Name = "NCOiC", RoleType = RoleType.UNIT, Order = 3 }, +// new Role { Name = "NCOiC Air Troop", RoleType = RoleType.INDIVIDUAL, Order = 0 } +// }; +// roles.ForEach(x => mongoCollection.AddAsync(x).Wait()); + +// return (mongoCollection, testId); +// } + +// [Fact] +// public async Task Should_add_item() { +// await MongoTest( +// async database => { +// (MongoCollection dataCollection, _) = await SetupTestCollection(database); + +// Role role = new() { Name = "Section Leader" }; +// await dataCollection.AddAsync(role); + +// List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); + +// subject.Should().Contain(x => x.Name == role.Name); +// } +// ); +// } + +// [Fact] +// public async Task Should_create_collection() { +// await MongoTest( +// async database => { +// MongoCollection mongoCollection = new(database, "test"); + +// await mongoCollection.AssertCollectionExistsAsync(); + +// MongoDB.Driver.IMongoCollection subject = database.GetCollection("test"); + +// subject.Should().NotBeNull(); +// } +// ); +// } - // private async Task MongoTest(Func testFunction) { - // _mongoDbRunner = MongoDbRunner.Start(additionalMongodArguments: "--quiet"); +// [Fact] +// public async Task Should_delete_item_by_id() { +// await MongoTest( +// async database => { +// (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); - // IMongoDatabase database = MongoClientFactory.GetDatabase($"{_mongoDbRunner.ConnectionString}{Guid.NewGuid()}"); +// await dataCollection.DeleteAsync(testId); + +// List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); + +// subject.Should().NotContain(x => x.Id == testId); +// } +// ); +// } + +// [Fact] +// public async Task Should_delete_many_by_predicate() { +// await MongoTest( +// async database => { +// (MongoCollection dataCollection, _) = await SetupTestCollection(database); + +// await dataCollection.DeleteManyAsync(x => x.Order == 0); + +// List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); + +// subject.Should().NotContain(x => x.Order == 0); +// } +// ); +// } + +// [Fact] +// public async Task Should_get_many_by_predicate() { +// await MongoTest( +// async database => { +// (MongoCollection dataCollection, _) = await SetupTestCollection(database); + +// List subject = dataCollection.Get(x => x.Order == 0).ToList(); + +// subject.Should().NotBeNull(); +// subject.Count.Should().Be(5); +// subject.Should().Contain(x => x.Name == "Trainee"); +// } +// ); +// } + +// [Fact] +// public async Task Should_get_collection() { +// await MongoTest( +// async database => { +// (MongoCollection dataCollection, _) = await SetupTestCollection(database); + +// List subject = dataCollection.Get().ToList(); + +// subject.Should().NotBeNull(); +// subject.Count.Should().Be(7); +// subject.Should().Contain(x => x.Name == "NCOiC"); +// } +// ); +// } - // await testFunction(database); +// [Fact] +// public async Task Should_get_item_by_id() { +// await MongoTest( +// async database => { +// (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); - // _mongoDbRunner.Dispose(); - // } - - // private static async Task<(MongoCollection dataCollection, string testId)> SetupTestCollection(IMongoDatabase database) { - // MongoCollection mongoCollection = new(database, TEST_COLLECTION_NAME); - // await mongoCollection.AssertCollectionExistsAsync(); +// Role subject = dataCollection.GetSingle(testId); - // string testId = ObjectId.GenerateNewId().ToString(); - // List roles = new() { - // new Role { Name = "Rifleman" }, - // new Role { Name = "Trainee" }, - // new Role { Name = "Marksman", Id = testId }, - // new Role { Name = "1iC", RoleType = RoleType.UNIT, Order = 0 }, - // new Role { Name = "2iC", RoleType = RoleType.UNIT, Order = 1 }, - // new Role { Name = "NCOiC", RoleType = RoleType.UNIT, Order = 3 }, - // new Role { Name = "NCOiC Air Troop", RoleType = RoleType.INDIVIDUAL, Order = 0 } - // }; - // roles.ForEach(x => mongoCollection.AddAsync(x).Wait()); - - // return (mongoCollection, testId); - // } - - // [Fact] - // public async Task Should_add_item() { - // await MongoTest( - // async database => { - // (MongoCollection dataCollection, _) = await SetupTestCollection(database); - - // Role role = new() { Name = "Section Leader" }; - // await dataCollection.AddAsync(role); - - // List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); - - // subject.Should().Contain(x => x.Name == role.Name); - // } - // ); - // } - - // [Fact] - // public async Task Should_create_collection() { - // await MongoTest( - // async database => { - // MongoCollection mongoCollection = new(database, "test"); - - // await mongoCollection.AssertCollectionExistsAsync(); - - // MongoDB.Driver.IMongoCollection subject = database.GetCollection("test"); - - // subject.Should().NotBeNull(); - // } - // ); - // } - - // [Fact] - // public async Task Should_delete_item_by_id() { - // await MongoTest( - // async database => { - // (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); - - // await dataCollection.DeleteAsync(testId); - - // List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); - - // subject.Should().NotContain(x => x.Id == testId); - // } - // ); - // } - - // [Fact] - // public async Task Should_delete_many_by_predicate() { - // await MongoTest( - // async database => { - // (MongoCollection dataCollection, _) = await SetupTestCollection(database); - - // await dataCollection.DeleteManyAsync(x => x.Order == 0); - - // List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().ToList(); - - // subject.Should().NotContain(x => x.Order == 0); - // } - // ); - // } - - // [Fact] - // public async Task Should_get_many_by_predicate() { - // await MongoTest( - // async database => { - // (MongoCollection dataCollection, _) = await SetupTestCollection(database); - - // List subject = dataCollection.Get(x => x.Order == 0).ToList(); - - // subject.Should().NotBeNull(); - // subject.Count.Should().Be(5); - // subject.Should().Contain(x => x.Name == "Trainee"); - // } - // ); - // } - - // [Fact] - // public async Task Should_get_collection() { - // await MongoTest( - // async database => { - // (MongoCollection dataCollection, _) = await SetupTestCollection(database); - - // List subject = dataCollection.Get().ToList(); - - // subject.Should().NotBeNull(); - // subject.Count.Should().Be(7); - // subject.Should().Contain(x => x.Name == "NCOiC"); - // } - // ); - // } - - // [Fact] - // public async Task Should_get_item_by_id() { - // await MongoTest( - // async database => { - // (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); - - // Role subject = dataCollection.GetSingle(testId); - - // subject.Should().NotBeNull(); - // subject.Name.Should().Be("Marksman"); - // } - // ); - // } - - // [Fact] - // public async Task Should_get_item_by_predicate() { - // await MongoTest( - // async database => { - // (MongoCollection dataCollection, _) = await SetupTestCollection(database); - - // Role subject = dataCollection.GetSingle(x => x.RoleType == RoleType.UNIT && x.Order == 1); - - // subject.Should().NotBeNull(); - // subject.Name.Should().Be("2iC"); - // } - // ); - // } - - // [Fact] - // public async Task Should_not_throw_when_collection_exists() { - // await MongoTest( - // async database => { - // await database.CreateCollectionAsync("test"); - // MongoCollection mongoCollection = new MongoCollection(database, "test"); - - // Func act = async () => await mongoCollection.AssertCollectionExistsAsync(); - - // await act.Should().NotThrowAsync(); - // } - // ); - // } - - // [Fact] - // public async Task Should_replace_item() { - // await MongoTest( - // async database => { - // (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); - - // Role role = new Role { Id = testId, Name = "Sharpshooter" }; - // await dataCollection.ReplaceAsync(role.Id, role); - - // Role subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.Id == testId); - - // subject.Name.Should().Be(role.Name); - // subject.Order.Should().Be(0); - // subject.RoleType.Should().Be(RoleType.INDIVIDUAL); - // } - // ); - // } - - // [Fact] - // public async Task Should_update_item_by_id() { - // await MongoTest( - // async database => { - // (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); - - // await dataCollection.UpdateAsync(testId, Builders.Update.Set(x => x.Order, 10)); - - // Rank subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.Id == testId); - - // subject.Order.Should().Be(10); - // } - // ); - // } - - // [Fact] - // public async Task Should_update_item_by_filter() { - // await MongoTest( - // async database => { - // (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); - - // await dataCollection.UpdateAsync(Builders.Filter.Where(x => x.Id == testId), Builders.Update.Set(x => x.Order, 10)); - - // Rank subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.Id == testId); - - // subject.Order.Should().Be(10); - // } - // ); - // } - - // [Fact] - // public async Task Should_update_many_by_predicate() { - // await MongoTest( - // async database => { - // (MongoCollection dataCollection, _) = await SetupTestCollection(database); - - // await dataCollection.UpdateManyAsync(x => x.Order == 0, Builders.Update.Set(x => x.Order, 10)); - - // List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().Where(x => x.Order == 10).ToList(); - - // subject.Count.Should().Be(5); - // } - // ); - // } - // } +// subject.Should().NotBeNull(); +// subject.Name.Should().Be("Marksman"); // } +// ); +// } + +// [Fact] +// public async Task Should_get_item_by_predicate() { +// await MongoTest( +// async database => { +// (MongoCollection dataCollection, _) = await SetupTestCollection(database); + +// Role subject = dataCollection.GetSingle(x => x.RoleType == RoleType.UNIT && x.Order == 1); + +// subject.Should().NotBeNull(); +// subject.Name.Should().Be("2iC"); +// } +// ); +// } + +// [Fact] +// public async Task Should_not_throw_when_collection_exists() { +// await MongoTest( +// async database => { +// await database.CreateCollectionAsync("test"); +// MongoCollection mongoCollection = new MongoCollection(database, "test"); + +// Func act = async () => await mongoCollection.AssertCollectionExistsAsync(); + +// await act.Should().NotThrowAsync(); +// } +// ); +// } + +// [Fact] +// public async Task Should_replace_item() { +// await MongoTest( +// async database => { +// (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); + +// Role role = new Role { Id = testId, Name = "Sharpshooter" }; +// await dataCollection.ReplaceAsync(role.Id, role); + +// Role subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.Id == testId); + +// subject.Name.Should().Be(role.Name); +// subject.Order.Should().Be(0); +// subject.RoleType.Should().Be(RoleType.INDIVIDUAL); +// } +// ); +// } + +// [Fact] +// public async Task Should_update_item_by_id() { +// await MongoTest( +// async database => { +// (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); + +// await dataCollection.UpdateAsync(testId, Builders.Update.Set(x => x.Order, 10)); + +// Rank subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.Id == testId); + +// subject.Order.Should().Be(10); +// } +// ); +// } + +// [Fact] +// public async Task Should_update_item_by_filter() { +// await MongoTest( +// async database => { +// (MongoCollection dataCollection, string testId) = await SetupTestCollection(database); + +// await dataCollection.UpdateAsync(Builders.Filter.Where(x => x.Id == testId), Builders.Update.Set(x => x.Order, 10)); + +// Rank subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().First(x => x.Id == testId); + +// subject.Order.Should().Be(10); +// } +// ); +// } + +// [Fact] +// public async Task Should_update_many_by_predicate() { +// await MongoTest( +// async database => { +// (MongoCollection dataCollection, _) = await SetupTestCollection(database); + +// await dataCollection.UpdateManyAsync(x => x.Order == 0, Builders.Update.Set(x => x.Order, 10)); + +// List subject = database.GetCollection(TEST_COLLECTION_NAME).AsQueryable().Where(x => x.Order == 10).ToList(); + +// subject.Count.Should().Be(5); +// } +// ); +// } +// } +// } + + diff --git a/UKSF.Tests/Integration/Data/DataPerformanceTests.cs b/UKSF.Tests/Integration/Data/DataPerformanceTests.cs index 6d7bc605..17bfa4c4 100644 --- a/UKSF.Tests/Integration/Data/DataPerformanceTests.cs +++ b/UKSF.Tests/Integration/Data/DataPerformanceTests.cs @@ -49,3 +49,5 @@ // } // } // } + + diff --git a/UKSF.Tests/Unit/Common/ClockTests.cs b/UKSF.Tests/Unit/Common/ClockTests.cs index a2b3f363..405b092b 100644 --- a/UKSF.Tests/Unit/Common/ClockTests.cs +++ b/UKSF.Tests/Unit/Common/ClockTests.cs @@ -3,24 +3,29 @@ using UKSF.Api.Shared.Services; using Xunit; -namespace UKSF.Tests.Unit.Common { - public class ClockTests { +namespace UKSF.Tests.Unit.Common +{ + public class ClockTests + { [Fact] - public void Should_return_current_date() { + public void Should_return_current_date() + { DateTime subject = new Clock().Today(); subject.Should().BeCloseTo(DateTime.Today, TimeSpan.FromMilliseconds(0)); } [Fact] - public void Should_return_current_date_and_time() { + public void Should_return_current_date_and_time() + { DateTime subject = new Clock().Now(); subject.Should().BeCloseTo(DateTime.Now, TimeSpan.FromMilliseconds(10)); } [Fact] - public void Should_return_current_utc_date_and_time() { + public void Should_return_current_utc_date_and_time() + { DateTime subject = new Clock().UtcNow(); subject.Should().BeCloseTo(DateTime.UtcNow, TimeSpan.FromMilliseconds(10)); diff --git a/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs b/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs index 81b4589f..7159888b 100644 --- a/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/CollectionUtilitiesTests.cs @@ -3,10 +3,13 @@ using UKSF.Api.Shared.Extensions; using Xunit; -namespace UKSF.Tests.Unit.Common { - public class CollectionUtilitiesTests { +namespace UKSF.Tests.Unit.Common +{ + public class CollectionUtilitiesTests + { [Fact] - public void Should_remove_empty_strings_from_hashset() { + public void Should_remove_empty_strings_from_hashset() + { HashSet subject = new() { "1", "", null, "3" }; subject.CleanHashset(); diff --git a/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs b/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs index 9d339ed2..e6592bda 100644 --- a/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/DataUtilitiesTests.cs @@ -3,10 +3,13 @@ using UKSF.Api.Shared.Extensions; using Xunit; -namespace UKSF.Tests.Unit.Common { - public class DataUtilitiesTests { +namespace UKSF.Tests.Unit.Common +{ + public class DataUtilitiesTests + { [Fact] - public void Should_return_correct_value_from_body() { + public void Should_return_correct_value_from_body() + { JObject jObject = JObject.Parse("{\"key1\":\"item1\", \"key2\":\"item2\"}"); string subject = jObject.GetValueFromBody("key2"); @@ -15,7 +18,8 @@ public void Should_return_correct_value_from_body() { } [Fact] - public void Should_return_nothing_from_body_for_invalid_key() { + public void Should_return_nothing_from_body_for_invalid_key() + { JObject jObject = JObject.Parse("{\"key\":\"value\"}"); string subject = jObject.GetValueFromBody("notthekey"); @@ -24,7 +28,8 @@ public void Should_return_nothing_from_body_for_invalid_key() { } [Fact] - public void Should_return_value_as_string_from_body_when_data_is_not_string() { + public void Should_return_value_as_string_from_body_when_data_is_not_string() + { JObject jObject = JObject.Parse("{\"key\":2}"); string subject = jObject.GetValueFromBody("key"); diff --git a/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs b/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs index 69230ab4..312a9f65 100644 --- a/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs +++ b/UKSF.Tests/Unit/Common/GuardUtilitesTests.cs @@ -2,10 +2,13 @@ using UKSF.Api.Shared.Extensions; using Xunit; -namespace UKSF.Tests.Unit.Common { - public class GuardUtilitesTests { +namespace UKSF.Tests.Unit.Common +{ + public class GuardUtilitesTests + { [Theory, InlineData("", false), InlineData(null, false), InlineData("1", false), InlineData("5ed43018bea2f1945440f37d", true)] - public void ShouldValidateIdCorrectly(string id, bool valid) { + public void ShouldValidateIdCorrectly(string id, bool valid) + { bool subject = true; GuardUtilites.ValidateId(id, _ => subject = false); @@ -14,7 +17,8 @@ public void ShouldValidateIdCorrectly(string id, bool valid) { } [Theory, InlineData(new[] { 2, 4, 6, 8, 10, 12 }, false), InlineData(new[] { 2, 4, 5, 6, 8 }, false), InlineData(new[] { 2, 4, 6, 8, 10 }, true)] - public void ShouldValidateArrayCorrectly(int[] array, bool valid) { + public void ShouldValidateArrayCorrectly(int[] array, bool valid) + { bool subject = true; GuardUtilites.ValidateArray(array, x => x.Length == 5, x => x % 2 == 0, () => subject = false); @@ -23,7 +27,8 @@ public void ShouldValidateArrayCorrectly(int[] array, bool valid) { } [Theory, InlineData("", false), InlineData(null, false), InlineData("1", true)] - public void ShouldValidateStringCorrectly(string text, bool valid) { + public void ShouldValidateStringCorrectly(string text, bool valid) + { bool subject = true; GuardUtilites.ValidateString(text, _ => subject = false); @@ -33,7 +38,8 @@ public void ShouldValidateStringCorrectly(string text, bool valid) { [Theory, InlineData(new[] { "" }, false, false), InlineData(new[] { "", "2" }, true, false), InlineData(new[] { "5ed43018bea2f1945440f37d", "2" }, true, false), InlineData(new[] { "5ed43018bea2f1945440f37d", "5ed43018bea2f1945440f37e" }, true, true)] - public void ShouldValidateIdArrayCorrectly(string[] array, bool valid, bool idValid) { + public void ShouldValidateIdArrayCorrectly(string[] array, bool valid, bool idValid) + { bool subject = true; bool subjectId = true; diff --git a/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs b/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs index 1b2000ad..fa05987e 100644 --- a/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/JsonUtilitiesTests.cs @@ -4,16 +4,18 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Common { - public class JsonUtilitiesTests { +namespace UKSF.Tests.Unit.Common +{ + public class JsonUtilitiesTests + { [Fact] - public void ShouldCopyComplexObject() { + public void ShouldCopyComplexObject() + { TestDataModel testDataModel1 = new() { Name = "1" }; TestDataModel testDataModel2 = new() { Name = "2" }; TestDataModel testDataModel3 = new() { Name = "3" }; - TestComplexDataModel testComplexDataModel = new() { - Name = "Test", Data = testDataModel1, List = new List { "a", "b", "c" }, DataList = new List { testDataModel1, testDataModel2, testDataModel3 } - }; + TestComplexDataModel testComplexDataModel = + new() { Name = "Test", Data = testDataModel1, List = new() { "a", "b", "c" }, DataList = new() { testDataModel1, testDataModel2, testDataModel3 } }; TestComplexDataModel subject = testComplexDataModel.Copy(); @@ -25,7 +27,8 @@ public void ShouldCopyComplexObject() { } [Fact] - public void ShouldCopyObject() { + public void ShouldCopyObject() + { TestDataModel testDataModel = new() { Name = "Test" }; TestDataModel subject = testDataModel.Copy(); @@ -35,7 +38,8 @@ public void ShouldCopyObject() { } [Fact] - public void ShouldEscapeJsonString() { + public void ShouldEscapeJsonString() + { const string UNESCAPED_JSON = "JSON:{\"message\": \"\\nMaking zeus \\ at 'C:\\test\\path'\", \"colour\": \"#20d18b\"}"; string subject = UNESCAPED_JSON.Escape(); diff --git a/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs b/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs index 252be963..389bd483 100644 --- a/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/StringUtilitiesTests.cs @@ -5,18 +5,22 @@ using UKSF.Api.Shared.Extensions; using Xunit; -namespace UKSF.Tests.Unit.Common { - public class StringUtilitiesTests { +namespace UKSF.Tests.Unit.Common +{ + public class StringUtilitiesTests + { [Theory, InlineData("", "", false), InlineData("", "hello", false), InlineData("hello world hello world", "hello", true), InlineData("hello", "HELLO", true), InlineData("hello world", "HELLOWORLD", false)] - public void ShouldIgnoreCase(string text, string searchElement, bool expected) { + public void ShouldIgnoreCase(string text, string searchElement, bool expected) + { bool subject = text.ContainsIgnoreCase(searchElement); subject.Should().Be(expected); } [Theory, InlineData(""), InlineData("2"), InlineData("1E+309"), InlineData("-1E+309")] // E+309 is one more than double max/min - public void ShouldNotThrowExceptionForDouble(string text) { + public void ShouldNotThrowExceptionForDouble(string text) + { Action act = () => text.ToDouble(); act.Should().NotThrow(); @@ -24,42 +28,48 @@ public void ShouldNotThrowExceptionForDouble(string text) { [Theory, InlineData("", 0), InlineData("2", 2), InlineData("1.79769313486232E+307", 1.79769313486232E+307d), InlineData("-1.79769313486232E+307", -1.79769313486232E+307d)] // E+307 is one less than double max/min - public void ShouldParseDoubleCorrectly(string text, double expected) { + public void ShouldParseDoubleCorrectly(string text, double expected) + { double subject = text.ToDouble(); subject.Should().Be(expected); } [Theory, InlineData("", ""), InlineData("hello", "Hello"), InlineData("hi there my name is bob", "Hi There My Name Is Bob"), InlineData("HELLO BOB", "HELLO BOB")] - public void ShouldConvertToTitleCase(string text, string expected) { + public void ShouldConvertToTitleCase(string text, string expected) + { string subject = text.ToTitleCase(); subject.Should().Be(expected); } [Theory, InlineData("", ""), InlineData("hello world", "HELLO_WORLD"), InlineData("HELLO_WORLD", "HELLO_WORLD"), InlineData(" i am key ", "I_AM_KEY")] - public void ShouldKeyify(string text, string expected) { + public void ShouldKeyify(string text, string expected) + { string subject = text.Keyify(); subject.Should().Be(expected); } [Theory, InlineData("", ""), InlineData("hello world hello world", "helloworldhelloworld"), InlineData("hello", "hello"), InlineData(" hello world ", "helloworld")] - public void ShouldRemoveSpaces(string text, string expected) { + public void ShouldRemoveSpaces(string text, string expected) + { string subject = text.RemoveSpaces(); subject.Should().Be(expected); } [Theory, InlineData("", ""), InlineData("hello\\nworld\\n\\nhello world", "helloworldhello world"), InlineData("hello\\n", "hello"), InlineData("\\n hello world \\n", " hello world ")] - public void ShouldRemoveNewLines(string text, string expected) { + public void ShouldRemoveNewLines(string text, string expected) + { string subject = text.RemoveNewLines(); subject.Should().Be(expected); } [Theory, InlineData("", ""), InlineData("\"helloworld\" \"hello world\"", "helloworld hello world"), InlineData("hello\"\"", "hello"), InlineData("\" hello world \"", " hello world ")] - public void ShouldRemoveQuotes(string text, string expected) { + public void ShouldRemoveQuotes(string text, string expected) + { string subject = text.RemoveQuotes(); subject.Should().Be(expected); @@ -67,14 +77,16 @@ public void ShouldRemoveQuotes(string text, string expected) { [Theory, InlineData("", ""), InlineData("\"hello \"\"test\"\" world\"", "\"hello 'test' world\""), InlineData("\"hello \" \"test\"\" world\"", "\"hello test' world\""), InlineData("\"\"\"\"", "''")] - public void ShouldRemoveEmbeddedQuotes(string text, string expected) { + public void ShouldRemoveEmbeddedQuotes(string text, string expected) + { string subject = text.RemoveEmbeddedQuotes(); subject.Should().Be(expected); } [Theory, InlineData("Hello I am 5e39336e1b92ee2d14b7fe08", "5e39336e1b92ee2d14b7fe08"), InlineData("Hello I am 5e39336e1b92ee2d14b7fe08, I will be your SR1", "5e39336e1b92ee2d14b7fe08")] - public void ShouldExtractObjectIds(string input, string expected) { + public void ShouldExtractObjectIds(string input, string expected) + { List subject = input.ExtractObjectIds().ToList(); subject.Should().Contain(expected); diff --git a/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs index 84bbcafd..08daa62e 100644 --- a/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/TaskUtilitiesTests.cs @@ -5,17 +5,22 @@ using UKSF.Api.Shared.Extensions; using Xunit; -namespace UKSF.Tests.Unit.Common { - public class TaskUtilitiesTests { +namespace UKSF.Tests.Unit.Common +{ + public class TaskUtilitiesTests + { [Fact] - public async Task ShouldCallbackAfterDelay() { + public async Task ShouldCallbackAfterDelay() + { bool subject = false; - Func act = async () => { + Func act = async () => + { CancellationTokenSource token = new(); await TaskUtilities.DelayWithCallback( TimeSpan.FromMilliseconds(10), token.Token, - () => { + () => + { subject = true; return Task.CompletedTask; } @@ -28,7 +33,8 @@ await TaskUtilities.DelayWithCallback( } [Fact] - public void ShouldDelay() { + public void ShouldDelay() + { CancellationTokenSource token = new(); Action act = async () => await TaskUtilities.Delay(TimeSpan.FromMilliseconds(10), token.Token); @@ -36,7 +42,8 @@ public void ShouldDelay() { } [Fact] - public void ShouldNotCallbackForCancellation() { + public void ShouldNotCallbackForCancellation() + { CancellationTokenSource token = new(); Func act = async () => { await TaskUtilities.DelayWithCallback(TimeSpan.FromMilliseconds(10), token.Token, null); }; @@ -46,8 +53,10 @@ public void ShouldNotCallbackForCancellation() { } [Fact] - public void ShouldNotThrowExceptionForDelay() { - Action act = () => { + public void ShouldNotThrowExceptionForDelay() + { + Action act = () => + { CancellationTokenSource token = new(); Task unused = TaskUtilities.Delay(TimeSpan.FromMilliseconds(50), token.Token); token.Cancel(); diff --git a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs index 10455ac2..a5aae8f4 100644 --- a/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Admin/VariablesDataServiceTests.cs @@ -11,59 +11,33 @@ using UKSF.Api.Base.Events; using Xunit; -namespace UKSF.Tests.Unit.Data.Admin { - public class VariablesDataServiceTests { +namespace UKSF.Tests.Unit.Data.Admin +{ + public class VariablesDataServiceTests + { private readonly Mock> _mockDataCollection; private readonly VariablesContext _variablesContext; private List _mockCollection; - public VariablesDataServiceTests() { + public VariablesDataServiceTests() + { Mock mockDataCollectionFactory = new(); Mock mockEventBus = new(); - _mockDataCollection = new Mock>(); + _mockDataCollection = new(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); _mockDataCollection.Setup(x => x.Get()).Returns(() => _mockCollection); - _variablesContext = new VariablesContext(mockDataCollectionFactory.Object, mockEventBus.Object); - } - - [Theory, InlineData(""), InlineData("game path")] - public void ShouldGetNothingWhenNoKeyOrNotFound(string key) { - VariableItem item1 = new() { Key = "MISSIONS_PATH" }; - VariableItem item2 = new() { Key = "SERVER_PATH" }; - VariableItem item3 = new() { Key = "DISCORD_IDS" }; - _mockCollection = new List { item1, item2, item3 }; - - VariableItem subject = _variablesContext.GetSingle(key); - - subject.Should().Be(null); - } - - [Theory, InlineData(""), InlineData(null)] - public async Task ShouldThrowForUpdateWhenNoKeyOrNull(string key) { - _mockCollection = new List(); - - Func act = async () => await _variablesContext.Update(key, "75"); - - await act.Should().ThrowAsync(); - } - - [Theory, InlineData(""), InlineData(null)] - public async Task ShouldThrowForDeleteWhenNoKeyOrNull(string key) { - _mockCollection = new List(); - - Func act = async () => await _variablesContext.Delete(key); - - await act.Should().ThrowAsync(); + _variablesContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); } [Fact] - public void Should_get_collection_in_order() { + public void Should_get_collection_in_order() + { VariableItem item1 = new() { Key = "MISSIONS_PATH" }; VariableItem item2 = new() { Key = "SERVER_PATH" }; VariableItem item3 = new() { Key = "DISCORD_IDS" }; - _mockCollection = new List { item1, item2, item3 }; + _mockCollection = new() { item1, item2, item3 }; IEnumerable subject = _variablesContext.Get(); @@ -71,9 +45,10 @@ public void Should_get_collection_in_order() { } [Fact] - public async Task ShouldDeleteItem() { + public async Task ShouldDeleteItem() + { VariableItem item1 = new() { Key = "DISCORD_ID", Item = "50" }; - _mockCollection = new List { item1 }; + _mockCollection = new() { item1 }; _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask).Callback((string id) => _mockCollection.RemoveAll(x => x.Id == id)); @@ -83,11 +58,12 @@ public async Task ShouldDeleteItem() { } [Fact] - public void ShouldGetItemByKey() { + public void ShouldGetItemByKey() + { VariableItem item1 = new() { Key = "MISSIONS_PATH" }; VariableItem item2 = new() { Key = "SERVER_PATH" }; VariableItem item3 = new() { Key = "DISCORD_IDS" }; - _mockCollection = new List { item1, item2, item3 }; + _mockCollection = new() { item1, item2, item3 }; VariableItem subject = _variablesContext.GetSingle("server path"); @@ -95,9 +71,10 @@ public void ShouldGetItemByKey() { } [Fact] - public async Task ShouldUpdateItemValue() { + public async Task ShouldUpdateItemValue() + { VariableItem subject = new() { Key = "DISCORD_ID", Item = "50" }; - _mockCollection = new List { subject }; + _mockCollection = new() { subject }; _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) @@ -107,5 +84,38 @@ public async Task ShouldUpdateItemValue() { subject.Item.Should().Be("75"); } + + [Theory, InlineData(""), InlineData("game path")] + public void ShouldGetNothingWhenNoKeyOrNotFound(string key) + { + VariableItem item1 = new() { Key = "MISSIONS_PATH" }; + VariableItem item2 = new() { Key = "SERVER_PATH" }; + VariableItem item3 = new() { Key = "DISCORD_IDS" }; + _mockCollection = new() { item1, item2, item3 }; + + VariableItem subject = _variablesContext.GetSingle(key); + + subject.Should().Be(null); + } + + [Theory, InlineData(""), InlineData(null)] + public async Task ShouldThrowForUpdateWhenNoKeyOrNull(string key) + { + _mockCollection = new(); + + Func act = async () => await _variablesContext.Update(key, "75"); + + await act.Should().ThrowAsync(); + } + + [Theory, InlineData(""), InlineData(null)] + public async Task ShouldThrowForDeleteWhenNoKeyOrNull(string key) + { + _mockCollection = new(); + + Func act = async () => await _variablesContext.Delete(key); + + await act.Should().ThrowAsync(); + } } } diff --git a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs index 0935336d..1972a48b 100644 --- a/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/CachedDataServiceTests.cs @@ -11,28 +11,32 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Data { - public class CachedDataServiceTests { +namespace UKSF.Tests.Unit.Data +{ + public class CachedDataServiceTests + { private readonly Mock> _mockDataCollection; private readonly Mock _mockDataCollectionFactory; private readonly Mock _mockEventBus; private List _mockCollection; private TestCachedContext _testCachedContext; - public CachedDataServiceTests() { - _mockDataCollectionFactory = new Mock(); - _mockEventBus = new Mock(); - _mockDataCollection = new Mock>(); + public CachedDataServiceTests() + { + _mockDataCollectionFactory = new(); + _mockEventBus = new(); + _mockDataCollection = new(); _mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); _mockDataCollection.Setup(x => x.Get()).Returns(() => new List(_mockCollection)); } [Fact] - public void Should_cache_collection_when_null_for_get() { - _mockCollection = new List(); + public void Should_cache_collection_when_null_for_get() + { + _mockCollection = new(); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); _testCachedContext.Cache.Should().BeNull(); @@ -43,12 +47,13 @@ public void Should_cache_collection_when_null_for_get() { } [Fact] - public void Should_cache_collection_when_null_for_get_single_by_id() { + public void Should_cache_collection_when_null_for_get_single_by_id() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Name = "2" }; - _mockCollection = new List { item1, item2 }; + _mockCollection = new() { item1, item2 }; - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); TestDataModel subject = _testCachedContext.GetSingle(item2.Id); @@ -58,12 +63,13 @@ public void Should_cache_collection_when_null_for_get_single_by_id() { } [Fact] - public void Should_cache_collection_when_null_for_get_single_by_predicate() { + public void Should_cache_collection_when_null_for_get_single_by_predicate() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Name = "2" }; - _mockCollection = new List { item1, item2 }; + _mockCollection = new() { item1, item2 }; - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); TestDataModel subject = _testCachedContext.GetSingle(x => x.Name == "2"); @@ -73,12 +79,13 @@ public void Should_cache_collection_when_null_for_get_single_by_predicate() { } [Fact] - public void Should_cache_collection_when_null_for_get_with_predicate() { + public void Should_cache_collection_when_null_for_get_with_predicate() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Name = "2" }; - _mockCollection = new List { item1, item2 }; + _mockCollection = new() { item1, item2 }; - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); IEnumerable subject = _testCachedContext.Get(x => x.Name == "1"); @@ -87,10 +94,11 @@ public void Should_cache_collection_when_null_for_get_with_predicate() { } [Fact] - public void Should_cache_collection_when_null_for_refresh() { - _mockCollection = new List(); + public void Should_cache_collection_when_null_for_refresh() + { + _mockCollection = new(); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); _testCachedContext.Cache.Should().BeNull(); @@ -101,10 +109,11 @@ public void Should_cache_collection_when_null_for_refresh() { } [Fact] - public void Should_return_cached_collection_for_get() { - _mockCollection = new List(); + public void Should_return_cached_collection_for_get() + { + _mockCollection = new(); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); _testCachedContext.Cache.Should().BeNull(); @@ -120,13 +129,14 @@ public void Should_return_cached_collection_for_get() { } [Fact] - public async Task Should_update_cache_for_add() { + public async Task Should_update_cache_for_add() + { TestDataModel item1 = new() { Name = "1" }; - _mockCollection = new List(); + _mockCollection = new(); _mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Callback(x => _mockCollection.Add(x)); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); _testCachedContext.Cache.Should().BeNull(); @@ -137,14 +147,15 @@ public async Task Should_update_cache_for_add() { } [Fact] - public async Task Should_update_cache_for_delete() { + public async Task Should_update_cache_for_delete() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Name = "2" }; - _mockCollection = new List { item1, item2 }; + _mockCollection = new() { item1, item2 }; _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => _mockCollection.RemoveAll(x => x.Id == id)); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); await _testCachedContext.Delete(item1); @@ -153,14 +164,15 @@ public async Task Should_update_cache_for_delete() { } [Fact] - public async Task Should_update_cache_for_delete_by_id() { + public async Task Should_update_cache_for_delete_by_id() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Name = "2" }; - _mockCollection = new List { item1, item2 }; + _mockCollection = new() { item1, item2 }; _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => _mockCollection.RemoveAll(x => x.Id == id)); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); await _testCachedContext.Delete(item1.Id); @@ -169,17 +181,18 @@ public async Task Should_update_cache_for_delete_by_id() { } [Fact] - public async Task Should_update_cache_for_delete_many() { + public async Task Should_update_cache_for_delete_many() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Name = "1" }; TestDataModel item3 = new() { Name = "3" }; - _mockCollection = new List { item1, item2, item3 }; + _mockCollection = new() { item1, item2, item3 }; _mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) .Returns(Task.CompletedTask) .Callback((Expression> expression) => _mockCollection.RemoveAll(x => _mockCollection.Where(expression.Compile()).Contains(x))); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); await _testCachedContext.DeleteMany(x => x.Name == "1"); @@ -189,16 +202,17 @@ public async Task Should_update_cache_for_delete_many() { } [Fact] - public async Task ShouldRefreshCollectionForReplace() { + public async Task ShouldRefreshCollectionForReplace() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Id = item1.Id, Name = "2" }; - _mockCollection = new List { item1 }; + _mockCollection = new() { item1 }; _mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())) .Returns(Task.CompletedTask) .Callback((string id, TestDataModel value) => _mockCollection[_mockCollection.FindIndex(x => x.Id == id)] = value); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); await _testCachedContext.Replace(item2); @@ -207,15 +221,16 @@ public async Task ShouldRefreshCollectionForReplace() { } [Fact] - public async Task ShouldRefreshCollectionForUpdate() { + public async Task ShouldRefreshCollectionForUpdate() + { TestDataModel item1 = new() { Name = "1" }; - _mockCollection = new List { item1 }; + _mockCollection = new() { item1 }; _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback((string id, UpdateDefinition _) => _mockCollection.First(x => x.Id == id).Name = "2"); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); await _testCachedContext.Update(item1.Id, x => x.Name, "2"); @@ -224,15 +239,16 @@ public async Task ShouldRefreshCollectionForUpdate() { } [Fact] - public async Task ShouldRefreshCollectionForUpdateByUpdateDefinition() { + public async Task ShouldRefreshCollectionForUpdateByUpdateDefinition() + { TestDataModel item1 = new() { Name = "1" }; - _mockCollection = new List { item1 }; + _mockCollection = new() { item1 }; _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback((string id, UpdateDefinition _) => _mockCollection.First(x => x.Id == id).Name = "2"); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); await _testCachedContext.Update(item1.Id, Builders.Update.Set(x => x.Name, "2")); @@ -241,11 +257,12 @@ public async Task ShouldRefreshCollectionForUpdateByUpdateDefinition() { } [Fact] - public async Task ShouldRefreshCollectionForUpdateMany() { + public async Task ShouldRefreshCollectionForUpdateMany() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Name = "1" }; TestDataModel item3 = new() { Name = "3" }; - _mockCollection = new List { item1, item2, item3 }; + _mockCollection = new() { item1, item2, item3 }; _mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())) .Returns(Task.CompletedTask) @@ -254,7 +271,7 @@ public async Task ShouldRefreshCollectionForUpdateMany() { _mockCollection.Where(expression.Compile()).ToList().ForEach(x => x.Name = "3") ); - _testCachedContext = new TestCachedContext(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testCachedContext = new(_mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); await _testCachedContext.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "3")); diff --git a/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs b/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs index c167ec4b..64e995f5 100644 --- a/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs +++ b/UKSF.Tests/Unit/Data/DataCollectionFactoryTests.cs @@ -5,10 +5,13 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Data { - public class DataCollectionFactoryTests { +namespace UKSF.Tests.Unit.Data +{ + public class DataCollectionFactoryTests + { [Fact] - public void ShouldCreateDataCollection() { + public void ShouldCreateDataCollection() + { Mock mockMongoDatabase = new(); MongoCollectionFactory mongoCollectionFactory = new(mockMongoDatabase.Object); diff --git a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs index 19c3a790..051378eb 100644 --- a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs @@ -14,8 +14,10 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Data { - public class DataServiceEventTests { +namespace UKSF.Tests.Unit.Data +{ + public class DataServiceEventTests + { private readonly string _id1; private readonly string _id2; private readonly string _id3; @@ -24,14 +26,15 @@ public class DataServiceEventTests { private readonly Mock _mockEventBus; private readonly TestContext _testContext; - public DataServiceEventTests() { + public DataServiceEventTests() + { Mock mockDataCollectionFactory = new(); - _mockEventBus = new Mock(); - _mockDataCollection = new Mock>(); + _mockEventBus = new(); + _mockDataCollection = new(); _id1 = ObjectId.GenerateNewId().ToString(); _id2 = ObjectId.GenerateNewId().ToString(); _id3 = ObjectId.GenerateNewId().ToString(); - _item1 = new TestDataModel { Id = _id1, Name = "1" }; + _item1 = new() { Id = _id1, Name = "1" }; TestDataModel item2 = new() { Id = _id2, Name = "1" }; TestDataModel item3 = new() { Id = _id3, Name = "3" }; List mockCollection = new() { _item1, item2, item3 }; @@ -40,11 +43,12 @@ public DataServiceEventTests() { _mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => mockCollection.Where(predicate)); _mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => mockCollection.FirstOrDefault(predicate)); - _testContext = new TestContext(mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); + _testContext = new(mockDataCollectionFactory.Object, _mockEventBus.Object, "test"); } [Fact] - public async Task Should_create_correct_add_event_for_add() { + public async Task Should_create_correct_add_event_for_add() + { EventModel subject = null; _mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Returns(Task.CompletedTask); @@ -57,7 +61,8 @@ public async Task Should_create_correct_add_event_for_add() { } [Fact] - public async Task Should_create_correct_delete_event_for_delete() { + public async Task Should_create_correct_delete_event_for_delete() + { EventModel subject = null; _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); @@ -70,7 +75,8 @@ public async Task Should_create_correct_delete_event_for_delete() { } [Fact] - public async Task Should_create_correct_delete_event_for_delete_by_id() { + public async Task Should_create_correct_delete_event_for_delete_by_id() + { EventModel subject = null; _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Returns(Task.CompletedTask); @@ -83,7 +89,8 @@ public async Task Should_create_correct_delete_event_for_delete_by_id() { } [Fact] - public async Task Should_create_correct_delete_events_for_delete_many() { + public async Task Should_create_correct_delete_events_for_delete_many() + { List subjects = new(); _mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())).Returns(Task.CompletedTask); @@ -100,7 +107,8 @@ public async Task Should_create_correct_delete_events_for_delete_many() { } [Fact] - public async Task Should_create_correct_update_event_for_replace() { + public async Task Should_create_correct_update_event_for_replace() + { EventModel subject = null; _mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())).Returns(Task.CompletedTask); @@ -113,7 +121,8 @@ public async Task Should_create_correct_update_event_for_replace() { } [Fact] - public async Task Should_create_correct_update_events_for_update_many() { + public async Task Should_create_correct_update_events_for_update_many() + { List subjects = new(); _mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())).Returns(Task.CompletedTask); @@ -130,7 +139,8 @@ public async Task Should_create_correct_update_events_for_update_many() { } [Fact] - public async Task Should_create_correct_update_events_for_updates() { + public async Task Should_create_correct_update_events_for_updates() + { List subjects = new(); _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask); diff --git a/UKSF.Tests/Unit/Data/DataServiceTests.cs b/UKSF.Tests/Unit/Data/DataServiceTests.cs index e766d2ec..1f63a683 100644 --- a/UKSF.Tests/Unit/Data/DataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceTests.cs @@ -12,54 +12,30 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Data { - public class DataServiceTests { +namespace UKSF.Tests.Unit.Data +{ + public class DataServiceTests + { private readonly Mock> _mockDataCollection; private readonly TestContext _testContext; private List _mockCollection; - public DataServiceTests() { + public DataServiceTests() + { Mock mockDataCollectionFactory = new(); Mock mockEventBus = new(); - _mockDataCollection = new Mock>(); + _mockDataCollection = new(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _testContext = new TestContext(mockDataCollectionFactory.Object, mockEventBus.Object, "test"); - } - - [Theory, InlineData(""), InlineData("1"), InlineData(null)] - public async Task Should_throw_for_delete_single_item_when_key_is_invalid(string id) { - Func act = async () => await _testContext.Delete(id); - - await act.Should().ThrowAsync(); - } - - [Theory, InlineData(""), InlineData("1"), InlineData(null)] - public void Should_throw_for_get_single_item_when_key_is_invalid(string id) { - Action act = () => _testContext.GetSingle(id); - - act.Should().Throw(); - } - - [Theory, InlineData(""), InlineData("1"), InlineData(null)] - public async Task Should_throw_for_update_by_id_when_key_is_invalid(string id) { - Func act = async () => await _testContext.Update(id, x => x.Name, null); - - await act.Should().ThrowAsync(); - } - - [Theory, InlineData(""), InlineData("1"), InlineData(null)] - public async Task Should_throw_for_update_by_update_definition_when_key_is_invalid(string id) { - Func act = async () => await _testContext.Update(id, Builders.Update.Set(x => x.Name, "2")); - - await act.Should().ThrowAsync(); + _testContext = new(mockDataCollectionFactory.Object, mockEventBus.Object, "test"); } [Fact] - public async Task Should_add_single_item() { + public async Task Should_add_single_item() + { TestDataModel item1 = new() { Name = "1" }; - _mockCollection = new List(); + _mockCollection = new(); _mockDataCollection.Setup(x => x.AddAsync(It.IsAny())).Callback(x => _mockCollection.Add(x)); @@ -69,10 +45,11 @@ public async Task Should_add_single_item() { } [Fact] - public async Task Should_delete_many_items() { + public async Task Should_delete_many_items() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Name = "1" }; - _mockCollection = new List { item1, item2 }; + _mockCollection = new() { item1, item2 }; _mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(() => _mockCollection); _mockDataCollection.Setup(x => x.DeleteManyAsync(It.IsAny>>())) @@ -85,10 +62,11 @@ public async Task Should_delete_many_items() { } [Fact] - public async Task Should_delete_single_item() { + public async Task Should_delete_single_item() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Name = "2" }; - _mockCollection = new List { item1, item2 }; + _mockCollection = new() { item1, item2 }; _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => _mockCollection.RemoveAll(x => x.Id == id)); @@ -98,10 +76,11 @@ public async Task Should_delete_single_item() { } [Fact] - public async Task Should_delete_single_item_by_id() { + public async Task Should_delete_single_item_by_id() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Name = "2" }; - _mockCollection = new List { item1, item2 }; + _mockCollection = new() { item1, item2 }; _mockDataCollection.Setup(x => x.DeleteAsync(It.IsAny())).Callback((string id) => _mockCollection.RemoveAll(x => x.Id == id)); @@ -111,7 +90,8 @@ public async Task Should_delete_single_item_by_id() { } [Fact] - public void Should_get_all_items() { + public void Should_get_all_items() + { _mockDataCollection.Setup(x => x.Get()).Returns(() => _mockCollection); IEnumerable subject = _testContext.Get(); @@ -120,10 +100,11 @@ public void Should_get_all_items() { } [Fact] - public void Should_get_items_matching_predicate() { + public void Should_get_items_matching_predicate() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Name = "2" }; - _mockCollection = new List { item1, item2 }; + _mockCollection = new() { item1, item2 }; _mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns>(x => _mockCollection.Where(x).ToList()); @@ -133,7 +114,8 @@ public void Should_get_items_matching_predicate() { } [Fact] - public void Should_get_single_item_by_id() { + public void Should_get_single_item_by_id() + { TestDataModel item1 = new() { Name = "1" }; _mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); @@ -144,10 +126,11 @@ public void Should_get_single_item_by_id() { } [Fact] - public void Should_get_single_item_matching_predicate() { + public void Should_get_single_item_matching_predicate() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Name = "2" }; - _mockCollection = new List { item1, item2 }; + _mockCollection = new() { item1, item2 }; _mockDataCollection.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => _mockCollection.First(x)); @@ -157,10 +140,11 @@ public void Should_get_single_item_matching_predicate() { } [Fact] - public async Task Should_replace_item() { + public async Task Should_replace_item() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Id = item1.Id, Name = "2" }; - _mockCollection = new List { item1 }; + _mockCollection = new() { item1 }; _mockDataCollection.Setup(x => x.GetSingle(It.IsAny())).Returns(item1); _mockDataCollection.Setup(x => x.ReplaceAsync(It.IsAny(), It.IsAny())) @@ -174,18 +158,20 @@ public async Task Should_replace_item() { } [Fact] - public async Task Should_throw_for_add_when_item_is_null() { + public async Task Should_throw_for_add_when_item_is_null() + { Func act = async () => await _testContext.Add(null); await act.Should().ThrowAsync(); } [Fact] - public async Task Should_update_item_by_filter_and_update_definition() { + public async Task Should_update_item_by_filter_and_update_definition() + { TestDataModel item1 = new() { Id = "1", Name = "1" }; - _mockCollection = new List { item1 }; - BsonValue expectedFilter = TestUtilities.RenderFilter(Builders.Filter.Where(x => x.Name == "1")); - BsonValue expectedUpdate = TestUtilities.RenderUpdate(Builders.Update.Set(x => x.Name, "2")); + _mockCollection = new() { item1 }; + BsonValue expectedFilter = Builders.Filter.Where(x => x.Name == "1").RenderFilter(); + BsonValue expectedUpdate = Builders.Update.Set(x => x.Name, "2").RenderUpdate(); FilterDefinition subjectFilter = null; UpdateDefinition subjectUpdate = null; @@ -193,7 +179,8 @@ public async Task Should_update_item_by_filter_and_update_definition() { _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())) .Returns(Task.CompletedTask) .Callback( - (FilterDefinition filter, UpdateDefinition update) => { + (FilterDefinition filter, UpdateDefinition update) => + { subjectFilter = filter; subjectUpdate = update; } @@ -201,14 +188,15 @@ public async Task Should_update_item_by_filter_and_update_definition() { await _testContext.Update(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); - TestUtilities.RenderFilter(subjectFilter).Should().BeEquivalentTo(expectedFilter); - TestUtilities.RenderUpdate(subjectUpdate).Should().BeEquivalentTo(expectedUpdate); + subjectFilter.RenderFilter().Should().BeEquivalentTo(expectedFilter); + subjectUpdate.RenderUpdate().Should().BeEquivalentTo(expectedUpdate); } [Fact] - public async Task Should_update_item_by_id() { + public async Task Should_update_item_by_id() + { TestDataModel item1 = new() { Name = "1" }; - _mockCollection = new List { item1 }; + _mockCollection = new() { item1 }; _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) @@ -220,9 +208,10 @@ public async Task Should_update_item_by_id() { } [Fact] - public async Task Should_update_item_by_update_definition() { + public async Task Should_update_item_by_update_definition() + { TestDataModel item1 = new() { Name = "1" }; - _mockCollection = new List { item1 }; + _mockCollection = new() { item1 }; _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) .Returns(Task.CompletedTask) @@ -234,10 +223,11 @@ public async Task Should_update_item_by_update_definition() { } [Fact] - public async Task Should_update_item_with_set() { + public async Task Should_update_item_with_set() + { TestDataModel item1 = new() { Name = "1" }; - _mockCollection = new List { item1 }; - BsonValue expected = TestUtilities.RenderUpdate(Builders.Update.Set(x => x.Name, "2")); + _mockCollection = new() { item1 }; + BsonValue expected = Builders.Update.Set(x => x.Name, "2").RenderUpdate(); UpdateDefinition subject = null; _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) @@ -246,14 +236,15 @@ public async Task Should_update_item_with_set() { await _testContext.Update(item1.Id, x => x.Name, "2"); - TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); + subject.RenderUpdate().Should().BeEquivalentTo(expected); } [Fact] - public async Task Should_update_item_with_unset() { + public async Task Should_update_item_with_unset() + { TestDataModel item1 = new() { Name = "1" }; - _mockCollection = new List { item1 }; - BsonValue expected = TestUtilities.RenderUpdate(Builders.Update.Unset(x => x.Name)); + _mockCollection = new() { item1 }; + BsonValue expected = Builders.Update.Unset(x => x.Name).RenderUpdate(); UpdateDefinition subject = null; _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) @@ -262,14 +253,15 @@ public async Task Should_update_item_with_unset() { await _testContext.Update(item1.Id, x => x.Name, null); - TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); + subject.RenderUpdate().Should().BeEquivalentTo(expected); } [Fact] - public async Task Should_update_many_items() { + public async Task Should_update_many_items() + { TestDataModel item1 = new() { Name = "1" }; TestDataModel item2 = new() { Name = "1" }; - _mockCollection = new List { item1, item2 }; + _mockCollection = new() { item1, item2 }; _mockDataCollection.Setup(x => x.Get(It.IsAny>())).Returns(() => _mockCollection); _mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())) diff --git a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs index d753af08..30a06cb8 100644 --- a/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Game/GameServersDataServiceTests.cs @@ -7,23 +7,27 @@ using UKSF.Api.Base.Events; using Xunit; -namespace UKSF.Tests.Unit.Data.Game { - public class GameServersDataServiceTests { +namespace UKSF.Tests.Unit.Data.Game +{ + public class GameServersDataServiceTests + { private readonly GameServersContext _gameServersContext; private readonly Mock> _mockDataCollection; - public GameServersDataServiceTests() { + public GameServersDataServiceTests() + { Mock mockDataCollectionFactory = new(); Mock mockEventBus = new(); - _mockDataCollection = new Mock>(); + _mockDataCollection = new(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _gameServersContext = new GameServersContext(mockDataCollectionFactory.Object, mockEventBus.Object); + _gameServersContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); } [Fact] - public void Should_get_collection_in_order() { + public void Should_get_collection_in_order() + { GameServer rank1 = new() { Order = 2 }; GameServer rank2 = new() { Order = 0 }; GameServer rank3 = new() { Order = 1 }; diff --git a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs index d8870fa7..be4e2749 100644 --- a/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Message/CommentThreadDataServiceTests.cs @@ -11,30 +11,34 @@ using UKSF.Api.Tests.Common; using Xunit; -namespace UKSF.Tests.Unit.Data.Message { - public class CommentThreadDataServiceTests { +namespace UKSF.Tests.Unit.Data.Message +{ + public class CommentThreadDataServiceTests + { private readonly CommentThreadContext _commentThreadContext; private readonly Mock> _mockDataCollection; private List _mockCollection; - public CommentThreadDataServiceTests() { + public CommentThreadDataServiceTests() + { Mock mockDataCollectionFactory = new(); Mock mockEventBus = new(); - _mockDataCollection = new Mock>(); + _mockDataCollection = new(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); _mockDataCollection.Setup(x => x.Get()).Returns(() => _mockCollection); - _commentThreadContext = new CommentThreadContext(mockDataCollectionFactory.Object, mockEventBus.Object); + _commentThreadContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); } [Fact] - public async Task ShouldCreateCorrectUdpateDefinitionForAdd() { + public async Task ShouldCreateCorrectUdpateDefinitionForAdd() + { CommentThread commentThread = new(); - _mockCollection = new List { commentThread }; + _mockCollection = new() { commentThread }; Comment comment = new() { Author = ObjectId.GenerateNewId().ToString(), Content = "Hello there" }; - BsonValue expected = TestUtilities.RenderUpdate(Builders.Update.Push(x => x.Comments, comment)); + BsonValue expected = Builders.Update.Push(x => x.Comments, comment).RenderUpdate(); UpdateDefinition subject = null; _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) @@ -43,16 +47,17 @@ public async Task ShouldCreateCorrectUdpateDefinitionForAdd() { await _commentThreadContext.AddCommentToThread(commentThread.Id, comment); - TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); + subject.RenderUpdate().Should().BeEquivalentTo(expected); } [Fact] - public async Task ShouldCreateCorrectUdpateDefinitionForDelete() { + public async Task ShouldCreateCorrectUdpateDefinitionForDelete() + { CommentThread commentThread = new(); - _mockCollection = new List { commentThread }; + _mockCollection = new() { commentThread }; Comment comment = new() { Author = ObjectId.GenerateNewId().ToString(), Content = "Hello there" }; - BsonValue expected = TestUtilities.RenderUpdate(Builders.Update.Pull(x => x.Comments, comment)); + BsonValue expected = Builders.Update.Pull(x => x.Comments, comment).RenderUpdate(); UpdateDefinition subject = null; _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())) @@ -61,7 +66,7 @@ public async Task ShouldCreateCorrectUdpateDefinitionForDelete() { await _commentThreadContext.RemoveCommentFromThread(commentThread.Id, comment); - TestUtilities.RenderUpdate(subject).Should().BeEquivalentTo(expected); + subject.RenderUpdate().Should().BeEquivalentTo(expected); } } } diff --git a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs index af714e90..964992c1 100644 --- a/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Modpack/BuildsDataServiceTests.cs @@ -11,24 +11,28 @@ using UKSF.Api.Modpack.Models; using Xunit; -namespace UKSF.Tests.Unit.Data.Modpack { - public class BuildsDataServiceTests { +namespace UKSF.Tests.Unit.Data.Modpack +{ + public class BuildsDataServiceTests + { private readonly BuildsContext _buildsContext; private readonly Mock> _mockDataCollection; private readonly Mock _mockEventBus; - public BuildsDataServiceTests() { + public BuildsDataServiceTests() + { Mock mockDataCollectionFactory = new(); - _mockEventBus = new Mock(); - _mockDataCollection = new Mock>(); + _mockEventBus = new(); + _mockDataCollection = new(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _buildsContext = new BuildsContext(mockDataCollectionFactory.Object, _mockEventBus.Object); + _buildsContext = new(mockDataCollectionFactory.Object, _mockEventBus.Object); } [Fact] - public void Should_get_collection_in_order() { + public void Should_get_collection_in_order() + { ModpackBuild item1 = new() { BuildNumber = 4 }; ModpackBuild item2 = new() { BuildNumber = 10 }; ModpackBuild item3 = new() { BuildNumber = 9 }; @@ -41,10 +45,11 @@ public void Should_get_collection_in_order() { } [Fact] - public void Should_update_build_step_with_event() { + public void Should_update_build_step_with_event() + { string id = ObjectId.GenerateNewId().ToString(); ModpackBuildStep modpackBuildStep = new("step") { Index = 0, Running = false }; - ModpackBuild modpackBuild = new() { Id = id, BuildNumber = 1, Steps = new List { modpackBuildStep } }; + ModpackBuild modpackBuild = new() { Id = id, BuildNumber = 1, Steps = new() { modpackBuildStep } }; EventModel subject = null; _mockDataCollection.Setup(x => x.Get()).Returns(new List()); @@ -59,7 +64,8 @@ public void Should_update_build_step_with_event() { } [Fact] - public void Should_update_build_with_event_data() { + public void Should_update_build_with_event_data() + { string id = ObjectId.GenerateNewId().ToString(); EventModel subject = null; diff --git a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs index ac03f935..710e9397 100644 --- a/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Modpack/ReleasesDataServiceTests.cs @@ -7,23 +7,27 @@ using UKSF.Api.Modpack.Models; using Xunit; -namespace UKSF.Tests.Unit.Data.Modpack { - public class ReleasesDataServiceTests { +namespace UKSF.Tests.Unit.Data.Modpack +{ + public class ReleasesDataServiceTests + { private readonly Mock> _mockDataCollection; private readonly ReleasesContext _releasesContext; - public ReleasesDataServiceTests() { + public ReleasesDataServiceTests() + { Mock mockDataCollectionFactory = new(); Mock mockEventBus = new(); - _mockDataCollection = new Mock>(); + _mockDataCollection = new(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _releasesContext = new ReleasesContext(mockDataCollectionFactory.Object, mockEventBus.Object); + _releasesContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); } [Fact] - public void Should_get_collection_in_order() { + public void Should_get_collection_in_order() + { ModpackRelease item1 = new() { Version = "4.19.11" }; ModpackRelease item2 = new() { Version = "5.19.6" }; ModpackRelease item3 = new() { Version = "5.18.8" }; diff --git a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs index 0519c3b3..98f7d91b 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationOrderDataServiceTests.cs @@ -8,23 +8,27 @@ using UKSF.Api.Command.Models; using Xunit; -namespace UKSF.Tests.Unit.Data.Operations { - public class OperationOrderDataServiceTests { +namespace UKSF.Tests.Unit.Data.Operations +{ + public class OperationOrderDataServiceTests + { private readonly Mock> _mockDataCollection; private readonly OperationOrderContext _operationOrderContext; - public OperationOrderDataServiceTests() { + public OperationOrderDataServiceTests() + { Mock mockDataCollectionFactory = new(); Mock mockEventBus = new(); - _mockDataCollection = new Mock>(); + _mockDataCollection = new(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _operationOrderContext = new OperationOrderContext(mockDataCollectionFactory.Object, mockEventBus.Object); + _operationOrderContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); } [Fact] - public void Should_get_collection_in_order() { + public void Should_get_collection_in_order() + { Opord item1 = new() { Start = DateTime.Now.AddDays(-1) }; Opord item2 = new() { Start = DateTime.Now.AddDays(-2) }; Opord item3 = new() { Start = DateTime.Now.AddDays(-3) }; @@ -37,7 +41,8 @@ public void Should_get_collection_in_order() { } [Fact] - public void ShouldGetOrderedCollectionByPredicate() { + public void ShouldGetOrderedCollectionByPredicate() + { Opord item1 = new() { Description = "1", Start = DateTime.Now.AddDays(-1) }; Opord item2 = new() { Description = "2", Start = DateTime.Now.AddDays(-2) }; Opord item3 = new() { Description = "1", Start = DateTime.Now.AddDays(-3) }; diff --git a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs index 37d548f8..0aed84d8 100644 --- a/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Operations/OperationReportDataServiceTests.cs @@ -8,23 +8,27 @@ using UKSF.Api.Command.Models; using Xunit; -namespace UKSF.Tests.Unit.Data.Operations { - public class OperationReportDataServiceTests { +namespace UKSF.Tests.Unit.Data.Operations +{ + public class OperationReportDataServiceTests + { private readonly Mock> _mockDataCollection; private readonly OperationReportContext _operationReportContext; - public OperationReportDataServiceTests() { + public OperationReportDataServiceTests() + { Mock mockDataCollectionFactory = new(); Mock mockEventBus = new(); - _mockDataCollection = new Mock>(); + _mockDataCollection = new(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _operationReportContext = new OperationReportContext(mockDataCollectionFactory.Object, mockEventBus.Object); + _operationReportContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); } [Fact] - public void Should_get_collection_in_order() { + public void Should_get_collection_in_order() + { Oprep item1 = new() { Start = DateTime.Now.AddDays(-1) }; Oprep item2 = new() { Start = DateTime.Now.AddDays(-2) }; Oprep item3 = new() { Start = DateTime.Now.AddDays(-3) }; @@ -37,7 +41,8 @@ public void Should_get_collection_in_order() { } [Fact] - public void ShouldGetOrderedCollectionByPredicate() { + public void ShouldGetOrderedCollectionByPredicate() + { Oprep item1 = new() { Description = "1", Start = DateTime.Now.AddDays(-1) }; Oprep item2 = new() { Description = "2", Start = DateTime.Now.AddDays(-2) }; Oprep item3 = new() { Description = "1", Start = DateTime.Now.AddDays(-3) }; diff --git a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs index 57b12553..40dfd8f6 100644 --- a/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/DischargeDataServiceTests.cs @@ -8,17 +8,20 @@ using UKSF.Api.Command.Models; using Xunit; -namespace UKSF.Tests.Unit.Data.Personnel { - public class DischargeDataServiceTests { +namespace UKSF.Tests.Unit.Data.Personnel +{ + public class DischargeDataServiceTests + { [Fact] - public void Should_get_collection_in_order() { + public void Should_get_collection_in_order() + { Mock mockDataCollectionFactory = new(); Mock mockEventBus = new(); Mock> mockDataCollection = new(); - DischargeCollection item1 = new() { Discharges = new List { new() { Timestamp = DateTime.Now.AddDays(-3) } } }; - DischargeCollection item2 = new() { Discharges = new List { new() { Timestamp = DateTime.Now.AddDays(-10) }, new() { Timestamp = DateTime.Now.AddDays(-1) } } }; - DischargeCollection item3 = new() { Discharges = new List { new() { Timestamp = DateTime.Now.AddDays(-5) }, new() { Timestamp = DateTime.Now.AddDays(-2) } } }; + DischargeCollection item1 = new() { Discharges = new() { new() { Timestamp = DateTime.Now.AddDays(-3) } } }; + DischargeCollection item2 = new() { Discharges = new() { new() { Timestamp = DateTime.Now.AddDays(-10) }, new() { Timestamp = DateTime.Now.AddDays(-1) } } }; + DischargeCollection item3 = new() { Discharges = new() { new() { Timestamp = DateTime.Now.AddDays(-5) }, new() { Timestamp = DateTime.Now.AddDays(-2) } } }; mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(mockDataCollection.Object); mockDataCollection.Setup(x => x.Get()).Returns(new List { item1, item2, item3 }); diff --git a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs index 6ac81ab5..4e5e8bdc 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs @@ -7,32 +7,27 @@ using UKSF.Api.Personnel.Models; using Xunit; -namespace UKSF.Tests.Unit.Data.Personnel { - public class RanksDataServiceTests { +namespace UKSF.Tests.Unit.Data.Personnel +{ + public class RanksDataServiceTests + { private readonly Mock> _mockDataCollection; private readonly RanksContext _ranksContext; - public RanksDataServiceTests() { + public RanksDataServiceTests() + { Mock mockDataCollectionFactory = new(); Mock mockEventBus = new(); - _mockDataCollection = new Mock>(); + _mockDataCollection = new(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _ranksContext = new RanksContext(mockDataCollectionFactory.Object, mockEventBus.Object); - } - - [Theory, InlineData(""), InlineData(null)] - public void Should_return_nothing_for_empty_or_null_name(string name) { - _mockDataCollection.Setup(x => x.Get()).Returns(new List()); - - Rank subject = _ranksContext.GetSingle(name); - - subject.Should().Be(null); + _ranksContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); } [Fact] - public void Should_return_collection_in_order() { + public void Should_return_collection_in_order() + { Rank rank1 = new() { Order = 2 }; Rank rank2 = new() { Order = 0 }; Rank rank3 = new() { Order = 1 }; @@ -45,7 +40,8 @@ public void Should_return_collection_in_order() { } [Fact] - public void Should_return_item_by_name() { + public void Should_return_item_by_name() + { Rank rank1 = new() { Name = "Private", Order = 2 }; Rank rank2 = new() { Name = "Recruit", Order = 1 }; Rank rank3 = new() { Name = "Candidate", Order = 0 }; @@ -56,5 +52,15 @@ public void Should_return_item_by_name() { subject.Should().Be(rank2); } + + [Theory, InlineData(""), InlineData(null)] + public void Should_return_nothing_for_empty_or_null_name(string name) + { + _mockDataCollection.Setup(x => x.Get()).Returns(new List()); + + Rank subject = _ranksContext.GetSingle(name); + + subject.Should().Be(null); + } } } diff --git a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs index 038abd2e..304c75ae 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs @@ -7,32 +7,27 @@ using UKSF.Api.Personnel.Models; using Xunit; -namespace UKSF.Tests.Unit.Data.Personnel { - public class RolesDataServiceTests { +namespace UKSF.Tests.Unit.Data.Personnel +{ + public class RolesDataServiceTests + { private readonly Mock> _mockDataCollection; private readonly RolesContext _rolesContext; - public RolesDataServiceTests() { + public RolesDataServiceTests() + { Mock mockDataCollectionFactory = new(); Mock mockEventBus = new(); - _mockDataCollection = new Mock>(); + _mockDataCollection = new(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); - _rolesContext = new RolesContext(mockDataCollectionFactory.Object, mockEventBus.Object); - } - - [Theory, InlineData(""), InlineData(null)] - public void ShouldGetNothingWhenNoName(string name) { - _mockDataCollection.Setup(x => x.Get()).Returns(new List()); - - Role subject = _rolesContext.GetSingle(name); - - subject.Should().Be(null); + _rolesContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); } [Fact] - public void Should_get_collection_in_order() { + public void Should_get_collection_in_order() + { Role role1 = new() { Name = "Rifleman" }; Role role2 = new() { Name = "Trainee" }; Role role3 = new() { Name = "Marksman" }; @@ -45,7 +40,8 @@ public void Should_get_collection_in_order() { } [Fact] - public void ShouldGetSingleByName() { + public void ShouldGetSingleByName() + { Role role1 = new() { Name = "Rifleman" }; Role role2 = new() { Name = "Trainee" }; Role role3 = new() { Name = "Marksman" }; @@ -56,5 +52,15 @@ public void ShouldGetSingleByName() { subject.Should().Be(role2); } + + [Theory, InlineData(""), InlineData(null)] + public void ShouldGetNothingWhenNoName(string name) + { + _mockDataCollection.Setup(x => x.Get()).Returns(new List()); + + Role subject = _rolesContext.GetSingle(name); + + subject.Should().Be(null); + } } } diff --git a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index 9a5cb045..d020db68 100644 --- a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -8,10 +8,13 @@ using Xunit; using UksfUnit = UKSF.Api.Personnel.Models.Unit; -namespace UKSF.Tests.Unit.Data.Units { - public class UnitsDataServiceTests { +namespace UKSF.Tests.Unit.Data.Units +{ + public class UnitsDataServiceTests + { [Fact] - public void Should_get_collection_in_order() { + public void Should_get_collection_in_order() + { Mock mockDataCollectionFactory = new(); Mock mockEventBus = new(); Mock> mockDataCollection = new(); @@ -31,7 +34,8 @@ public void Should_get_collection_in_order() { } [Fact] - public void ShouldGetOrderedCollectionFromPredicate() { + public void ShouldGetOrderedCollectionFromPredicate() + { Mock mockDataCollectionFactory = new(); Mock mockEventBus = new(); Mock> mockDataCollection = new(); diff --git a/UKSF.Tests/Unit/Events/EventBusTests.cs b/UKSF.Tests/Unit/Events/EventBusTests.cs index ce7ae698..3a00a457 100644 --- a/UKSF.Tests/Unit/Events/EventBusTests.cs +++ b/UKSF.Tests/Unit/Events/EventBusTests.cs @@ -4,10 +4,13 @@ using UKSF.Api.Base.Models; using Xunit; -namespace UKSF.Tests.Unit.Events { - public class EventBusTests { +namespace UKSF.Tests.Unit.Events +{ + public class EventBusTests + { [Fact] - public void When_getting_event_bus_observable() { + public void When_getting_event_bus_observable() + { EventBus eventBus = new(); IObservable subject = eventBus.AsObservable(); diff --git a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs index 313c1455..60f54c02 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommandRequestEventHandlerTests.cs @@ -11,25 +11,29 @@ using UKSF.Api.Shared.Models; using Xunit; -namespace UKSF.Tests.Unit.Events.Handlers { - public class CommandRequestEventHandlerTests { +namespace UKSF.Tests.Unit.Events.Handlers +{ + public class CommandRequestEventHandlerTests + { private readonly CommandRequestEventHandler _commandRequestEventHandler; private readonly IEventBus _eventBus; private readonly Mock> _mockHub; - public CommandRequestEventHandlerTests() { + public CommandRequestEventHandlerTests() + { Mock mockDataCollectionFactory = new(); Mock mockLoggingService = new(); - _mockHub = new Mock>(); + _mockHub = new(); _eventBus = new EventBus(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); - _commandRequestEventHandler = new CommandRequestEventHandler(_eventBus, _mockHub.Object, mockLoggingService.Object); + _commandRequestEventHandler = new(_eventBus, _mockHub.Object, mockLoggingService.Object); } [Fact] - public void ShouldNotRunEventOnDelete() { + public void ShouldNotRunEventOnDelete() + { Mock> mockHubClients = new(); Mock mockClient = new(); @@ -39,13 +43,14 @@ public void ShouldNotRunEventOnDelete() { _commandRequestEventHandler.Init(); - _eventBus.Send(new EventModel(EventType.DELETE, new ContextEventData(null, null))); + _eventBus.Send(new(EventType.DELETE, new ContextEventData(null, null))); mockClient.Verify(x => x.ReceiveRequestUpdate(), Times.Never); } [Fact] - public void ShouldRunEventOnUpdateAndAdd() { + public void ShouldRunEventOnUpdateAndAdd() + { Mock> mockHubClients = new(); Mock mockClient = new(); @@ -55,8 +60,8 @@ public void ShouldRunEventOnUpdateAndAdd() { _commandRequestEventHandler.Init(); - _eventBus.Send(new EventModel(EventType.ADD, new ContextEventData(null, null))); - _eventBus.Send(new EventModel(EventType.UPDATE, new ContextEventData(null, null))); + _eventBus.Send(new(EventType.ADD, new ContextEventData(null, null))); + _eventBus.Send(new(EventType.UPDATE, new ContextEventData(null, null))); mockClient.Verify(x => x.ReceiveRequestUpdate(), Times.Exactly(2)); } diff --git a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs index 5dbd684e..ea60f810 100644 --- a/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/CommentThreadEventHandlerTests.cs @@ -11,27 +11,31 @@ using UKSF.Api.Shared.Events; using Xunit; -namespace UKSF.Tests.Unit.Events.Handlers { - public class CommentThreadEventHandlerTests { +namespace UKSF.Tests.Unit.Events.Handlers +{ + public class CommentThreadEventHandlerTests + { private readonly CommentThreadEventHandler _commentThreadEventHandler; private readonly IEventBus _eventBus; private readonly Mock> _mockHub; - public CommentThreadEventHandlerTests() { + public CommentThreadEventHandlerTests() + { Mock mockDataCollectionFactory = new(); Mock mockCommentThreadService = new(); Mock mockLoggingService = new(); - _mockHub = new Mock>(); + _mockHub = new(); _eventBus = new EventBus(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); mockCommentThreadService.Setup(x => x.FormatComment(It.IsAny())).Returns(null); - _commentThreadEventHandler = new CommentThreadEventHandler(_eventBus, _mockHub.Object, mockCommentThreadService.Object, mockLoggingService.Object); + _commentThreadEventHandler = new(_eventBus, _mockHub.Object, mockCommentThreadService.Object, mockLoggingService.Object); } [Fact] - public void ShouldNotRunEventOnUpdate() { + public void ShouldNotRunEventOnUpdate() + { Mock> mockHubClients = new(); Mock mockClient = new(); @@ -42,14 +46,15 @@ public void ShouldNotRunEventOnUpdate() { _commentThreadEventHandler.Init(); - _eventBus.Send(new EventModel(EventType.UPDATE, new CommentThreadEventData(string.Empty, new Comment()))); + _eventBus.Send(new(EventType.UPDATE, new CommentThreadEventData(string.Empty, new()))); mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Never); mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Never); } [Fact] - public void ShouldRunAddedOnAdd() { + public void ShouldRunAddedOnAdd() + { Mock> mockHubClients = new(); Mock mockClient = new(); @@ -60,14 +65,15 @@ public void ShouldRunAddedOnAdd() { _commentThreadEventHandler.Init(); - _eventBus.Send(new EventModel(EventType.ADD, new CommentThreadEventData(string.Empty, new Comment()))); + _eventBus.Send(new(EventType.ADD, new CommentThreadEventData(string.Empty, new()))); mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Once); mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Never); } [Fact] - public void ShouldRunDeletedOnDelete() { + public void ShouldRunDeletedOnDelete() + { Mock> mockHubClients = new(); Mock mockClient = new(); @@ -78,7 +84,7 @@ public void ShouldRunDeletedOnDelete() { _commentThreadEventHandler.Init(); - _eventBus.Send(new EventModel(EventType.DELETE, new CommentThreadEventData(string.Empty, new Comment()))); + _eventBus.Send(new(EventType.DELETE, new CommentThreadEventData(string.Empty, new()))); mockClient.Verify(x => x.ReceiveComment(It.IsAny()), Times.Never); mockClient.Verify(x => x.DeleteComment(It.IsAny()), Times.Once); diff --git a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs index e500f119..4de3ce3e 100644 --- a/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/NotificationsEventHandlerTests.cs @@ -13,44 +13,49 @@ using UKSF.Api.Shared.Models; using Xunit; -namespace UKSF.Tests.Unit.Events.Handlers { - public class NotificationsEventHandlerTests { +namespace UKSF.Tests.Unit.Events.Handlers +{ + public class NotificationsEventHandlerTests + { private readonly IEventBus _eventBus; private readonly Mock> _mockHub; private readonly Mock _mockLoggingService; private readonly NotificationsEventHandler _notificationsEventHandler; - public NotificationsEventHandlerTests() { + public NotificationsEventHandlerTests() + { Mock mockDataCollectionFactory = new(); - _mockLoggingService = new Mock(); - _mockHub = new Mock>(); + _mockLoggingService = new(); + _mockHub = new(); _eventBus = new EventBus(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); - _notificationsEventHandler = new NotificationsEventHandler(_eventBus, _mockHub.Object, _mockLoggingService.Object); + _notificationsEventHandler = new(_eventBus, _mockHub.Object, _mockLoggingService.Object); } [Fact] - public void ShouldLogOnException() { + public void ShouldLogOnException() + { Mock> mockHubClients = new(); Mock mockClient = new(); _mockHub.Setup(x => x.Clients).Returns(mockHubClients.Object); mockHubClients.Setup(x => x.Group(It.IsAny())).Returns(mockClient.Object); - mockClient.Setup(x => x.ReceiveNotification(It.IsAny())).Throws(new Exception()); + mockClient.Setup(x => x.ReceiveNotification(It.IsAny())).Throws(new()); _mockLoggingService.Setup(x => x.LogError(It.IsAny())); _notificationsEventHandler.Init(); - _eventBus.Send(new EventModel(EventType.ADD, new ContextEventData(string.Empty, null))); + _eventBus.Send(new(EventType.ADD, new ContextEventData(string.Empty, null))); _mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Once); } [Fact] - public void ShouldNotRunEventOnUpdateOrDelete() { + public void ShouldNotRunEventOnUpdateOrDelete() + { Mock> mockHubClients = new(); Mock mockClient = new(); @@ -60,14 +65,15 @@ public void ShouldNotRunEventOnUpdateOrDelete() { _notificationsEventHandler.Init(); - _eventBus.Send(new EventModel(EventType.UPDATE, new ContextEventData(string.Empty, null))); - _eventBus.Send(new EventModel(EventType.DELETE, new ContextEventData(string.Empty, null))); + _eventBus.Send(new(EventType.UPDATE, new ContextEventData(string.Empty, null))); + _eventBus.Send(new(EventType.DELETE, new ContextEventData(string.Empty, null))); mockClient.Verify(x => x.ReceiveNotification(It.IsAny()), Times.Never); } [Fact] - public void ShouldRunAddedOnAdd() { + public void ShouldRunAddedOnAdd() + { Mock> mockHubClients = new(); Mock mockClient = new(); @@ -77,13 +83,14 @@ public void ShouldRunAddedOnAdd() { _notificationsEventHandler.Init(); - _eventBus.Send(new EventModel(EventType.ADD, new ContextEventData(string.Empty, new Notification()))); + _eventBus.Send(new(EventType.ADD, new ContextEventData(string.Empty, new()))); mockClient.Verify(x => x.ReceiveNotification(It.IsAny()), Times.Once); } [Fact] - public void ShouldUseOwnerAsIdInAdded() { + public void ShouldUseOwnerAsIdInAdded() + { Mock> mockHubClients = new(); Mock mockClient = new(); @@ -94,7 +101,7 @@ public void ShouldUseOwnerAsIdInAdded() { _notificationsEventHandler.Init(); - _eventBus.Send(new EventModel(EventType.ADD, new ContextEventData(string.Empty, new Notification() { Owner = "1" }))); + _eventBus.Send(new(EventType.ADD, new ContextEventData(string.Empty, new() { Owner = "1" }))); subject.Should().Be("1"); } diff --git a/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs b/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs index 3d6d83d0..f883afc4 100644 --- a/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs +++ b/UKSF.Tests/Unit/Models/Game/MissionFileTests.cs @@ -3,10 +3,13 @@ using UKSF.Api.ArmaServer.Models; using Xunit; -namespace UKSF.Tests.Unit.Models.Game { - public class MissionFileTests { +namespace UKSF.Tests.Unit.Models.Game +{ + public class MissionFileTests + { [Fact] - public void ShouldSetFields() { + public void ShouldSetFields() + { MissionFile subject = new(new FileInfo("../../../testdata/testmission.Altis.pbo")); subject.Path.Should().Be("testmission.Altis.pbo"); diff --git a/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs index f31a050f..42d2c107 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/BasicLogMessageTests.cs @@ -3,17 +3,21 @@ using UKSF.Api.Shared.Models; using Xunit; -namespace UKSF.Tests.Unit.Models.Message.Logging { - public class BasicLogMessageTests { +namespace UKSF.Tests.Unit.Models.Message.Logging +{ + public class BasicLogMessageTests + { [Fact] - public void ShouldSetText() { + public void ShouldSetText() + { BasicLog subject = new("test"); subject.Message.Should().Be("test"); } [Fact] - public void ShouldSetTextAndLogLevel() { + public void ShouldSetTextAndLogLevel() + { BasicLog subject = new("test", LogLevel.DEBUG); subject.Message.Should().Be("test"); @@ -21,7 +25,8 @@ public void ShouldSetTextAndLogLevel() { } [Fact] - public void ShouldSetTextAndLogLevelFromException() { + public void ShouldSetTextAndLogLevelFromException() + { BasicLog subject = new(new Exception("test")); subject.Message.Should().Be("System.Exception: test"); diff --git a/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs b/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs index 2eb78e06..71910dc3 100644 --- a/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs +++ b/UKSF.Tests/Unit/Models/Message/Logging/LauncherLogMessageTests.cs @@ -2,10 +2,13 @@ using UKSF.Api.Shared.Models; using Xunit; -namespace UKSF.Tests.Unit.Models.Message.Logging { - public class LauncherLogMessageTests { +namespace UKSF.Tests.Unit.Models.Message.Logging +{ + public class LauncherLogMessageTests + { [Fact] - public void ShouldSetVersionAndMessage() { + public void ShouldSetVersionAndMessage() + { LauncherLog subject = new("1.0.0", "test"); subject.Message.Should().Be("test"); diff --git a/UKSF.Tests/Unit/Models/Mission/MissionTests.cs b/UKSF.Tests/Unit/Models/Mission/MissionTests.cs index 29fda0c2..c52399d3 100644 --- a/UKSF.Tests/Unit/Models/Mission/MissionTests.cs +++ b/UKSF.Tests/Unit/Models/Mission/MissionTests.cs @@ -1,10 +1,13 @@ using FluentAssertions; using Xunit; -namespace UKSF.Tests.Unit.Models.Mission { - public class MissionTests { +namespace UKSF.Tests.Unit.Models.Mission +{ + public class MissionTests + { [Fact] - public void ShouldSetFields() { + public void ShouldSetFields() + { Api.ArmaMissions.Models.Mission subject = new("testdata/testmission.Altis"); subject.Path.Should().Be("testdata/testmission.Altis"); diff --git a/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs index 5c8d27da..13690373 100644 --- a/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Admin/VariablesServiceTests.cs @@ -7,10 +7,13 @@ using UKSF.Api.Shared.Extensions; using Xunit; -namespace UKSF.Tests.Unit.Services.Admin { - public class VariablesServiceTests { +namespace UKSF.Tests.Unit.Services.Admin +{ + public class VariablesServiceTests + { [Fact] - public void ShouldGetVariableAsArray() { + public void ShouldGetVariableAsArray() + { VariableItem variableItem = new() { Key = "Test", Item = "item1,item2, item3" }; string[] subject = variableItem.AsArray(); @@ -20,7 +23,8 @@ public void ShouldGetVariableAsArray() { } [Fact] - public void ShouldGetVariableAsArrayWithPredicate() { + public void ShouldGetVariableAsArrayWithPredicate() + { VariableItem variableItem = new() { Key = "Test", Item = "\"item1\",item2" }; string[] subject = variableItem.AsArray(x => x.RemoveQuotes()); @@ -30,7 +34,8 @@ public void ShouldGetVariableAsArrayWithPredicate() { } [Fact] - public void ShouldGetVariableAsBool() { + public void ShouldGetVariableAsBool() + { const bool EXPECTED = true; VariableItem variableItem = new() { Key = "Test", Item = EXPECTED }; @@ -40,7 +45,8 @@ public void ShouldGetVariableAsBool() { } [Fact] - public void ShouldGetVariableAsDouble() { + public void ShouldGetVariableAsDouble() + { const double EXPECTED = 1.5; VariableItem variableItem = new() { Key = "Test", Item = EXPECTED }; @@ -50,7 +56,8 @@ public void ShouldGetVariableAsDouble() { } [Fact] - public void ShouldGetVariableAsDoublesArray() { + public void ShouldGetVariableAsDoublesArray() + { VariableItem variableItem = new() { Key = "Test", Item = "1.5,1.67845567657, -0.000000456" }; List subject = variableItem.AsDoublesArray().ToList(); @@ -61,7 +68,8 @@ public void ShouldGetVariableAsDoublesArray() { // ReSharper disable PossibleMultipleEnumeration [Fact] - public void ShouldGetVariableAsEnumerable() { + public void ShouldGetVariableAsEnumerable() + { VariableItem variableItem = new() { Key = "Test", Item = "item1,item2, item3" }; IEnumerable subject = variableItem.AsEnumerable(); @@ -73,7 +81,8 @@ public void ShouldGetVariableAsEnumerable() { // ReSharper restore PossibleMultipleEnumeration [Fact] - public void ShouldGetVariableAsString() { + public void ShouldGetVariableAsString() + { const string EXPECTED = "Value"; VariableItem variableItem = new() { Key = "Test", Item = EXPECTED }; @@ -83,7 +92,8 @@ public void ShouldGetVariableAsString() { } [Fact] - public void ShouldGetVariableAsUlong() { + public void ShouldGetVariableAsUlong() + { const ulong EXPECTED = ulong.MaxValue; VariableItem variableItem = new() { Key = "Test", Item = EXPECTED }; @@ -93,7 +103,8 @@ public void ShouldGetVariableAsUlong() { } [Fact] - public void ShouldHaveItem() { + public void ShouldHaveItem() + { VariableItem variableItem = new() { Key = "Test", Item = "test" }; Action act = () => variableItem.AssertHasItem(); @@ -102,7 +113,8 @@ public void ShouldHaveItem() { } [Fact] - public void ShouldThrowWithInvalidBool() { + public void ShouldThrowWithInvalidBool() + { VariableItem variableItem = new() { Key = "Test", Item = "wontwork" }; Action act = () => variableItem.AsBool(); @@ -111,7 +123,8 @@ public void ShouldThrowWithInvalidBool() { } [Fact] - public void ShouldThrowWithInvalidDouble() { + public void ShouldThrowWithInvalidDouble() + { VariableItem variableItem = new() { Key = "Test", Item = "wontwork" }; Action act = () => variableItem.AsDouble(); @@ -120,7 +133,8 @@ public void ShouldThrowWithInvalidDouble() { } [Fact] - public void ShouldThrowWithInvalidUlong() { + public void ShouldThrowWithInvalidUlong() + { VariableItem variableItem = new() { Key = "Test", Item = "wontwork" }; Action act = () => variableItem.AsUlong(); @@ -129,7 +143,8 @@ public void ShouldThrowWithInvalidUlong() { } [Fact] - public void ShouldThrowWithNoItem() { + public void ShouldThrowWithNoItem() + { VariableItem variableItem = new() { Key = "Test" }; Action act = () => variableItem.AssertHasItem(); diff --git a/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs b/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs index 91151495..7079daea 100644 --- a/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs @@ -7,34 +7,25 @@ using UKSF.Api.Personnel.Services; using Xunit; -namespace UKSF.Tests.Unit.Services.Common { - public class ObjectIdConversionServiceTests { +namespace UKSF.Tests.Unit.Services.Common +{ + public class ObjectIdConversionServiceTests + { private readonly Mock _mockDisplayNameService; private readonly Mock _mockUnitsContext; private readonly ObjectIdConversionService _objectIdConversionService; - public ObjectIdConversionServiceTests() { - _mockDisplayNameService = new Mock(); - _mockUnitsContext = new Mock(); + public ObjectIdConversionServiceTests() + { + _mockDisplayNameService = new(); + _mockUnitsContext = new(); - _objectIdConversionService = new ObjectIdConversionService(_mockUnitsContext.Object, _mockDisplayNameService.Object); - } - - [Theory, InlineData("5e39336e1b92ee2d14b7fe08", "Maj.Bridgford.A"), InlineData("5e39336e1b92ee2d14b7fe08, 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A, Cpl.Carr.C"), - InlineData("5e39336e1b92ee2d14b7fe085e3935db1b92ee2d14b7fe09", "Maj.Bridgford.ACpl.Carr.C"), - InlineData("5e39336e1b92ee2d14b7fe08 has requested all the things for 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A has requested all the things for Cpl.Carr.C")] - public void ShouldConvertNameObjectIds(string input, string expected) { - _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); - _mockDisplayNameService.Setup(x => x.GetDisplayName("5e39336e1b92ee2d14b7fe08")).Returns("Maj.Bridgford.A"); - _mockDisplayNameService.Setup(x => x.GetDisplayName("5e3935db1b92ee2d14b7fe09")).Returns("Cpl.Carr.C"); - - string subject = _objectIdConversionService.ConvertObjectIds(input); - - subject.Should().Be(expected); + _objectIdConversionService = new(_mockUnitsContext.Object, _mockDisplayNameService.Object); } [Fact] - public void ShouldConvertCorrectUnitWithPredicate() { + public void ShouldConvertCorrectUnitWithPredicate() + { Api.Personnel.Models.Unit unit1 = new() { Name = "7 Squadron" }; Api.Personnel.Models.Unit unit2 = new() { Name = "656 Squadron" }; List collection = new() { unit1, unit2 }; @@ -48,7 +39,8 @@ public void ShouldConvertCorrectUnitWithPredicate() { } [Fact] - public void ShouldConvertUnitObjectIds() { + public void ShouldConvertUnitObjectIds() + { const string INPUT = "5e39336e1b92ee2d14b7fe08"; const string EXPECTED = "7 Squadron"; Api.Personnel.Models.Unit unit = new() { Name = EXPECTED, Id = INPUT }; @@ -62,7 +54,8 @@ public void ShouldConvertUnitObjectIds() { } [Fact] - public void ShouldDoNothingToTextWhenNameOrUnitNotFound() { + public void ShouldDoNothingToTextWhenNameOrUnitNotFound() + { const string INPUT = "5e39336e1b92ee2d14b7fe08"; const string EXPECTED = "5e39336e1b92ee2d14b7fe08"; @@ -75,10 +68,25 @@ public void ShouldDoNothingToTextWhenNameOrUnitNotFound() { } [Fact] - public void ShouldReturnEmpty() { + public void ShouldReturnEmpty() + { string subject = _objectIdConversionService.ConvertObjectIds(""); subject.Should().Be(string.Empty); } + + [Theory, InlineData("5e39336e1b92ee2d14b7fe08", "Maj.Bridgford.A"), InlineData("5e39336e1b92ee2d14b7fe08, 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A, Cpl.Carr.C"), + InlineData("5e39336e1b92ee2d14b7fe085e3935db1b92ee2d14b7fe09", "Maj.Bridgford.ACpl.Carr.C"), + InlineData("5e39336e1b92ee2d14b7fe08 has requested all the things for 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A has requested all the things for Cpl.Carr.C")] + public void ShouldConvertNameObjectIds(string input, string expected) + { + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); + _mockDisplayNameService.Setup(x => x.GetDisplayName("5e39336e1b92ee2d14b7fe08")).Returns("Maj.Bridgford.A"); + _mockDisplayNameService.Setup(x => x.GetDisplayName("5e3935db1b92ee2d14b7fe09")).Returns("Cpl.Carr.C"); + + string subject = _objectIdConversionService.ConvertObjectIds(input); + + subject.Should().Be(expected); + } } } diff --git a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs index 89dcf6da..7e9ee3ef 100644 --- a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs @@ -8,19 +8,23 @@ using UKSF.Api.Personnel.Models; using Xunit; -namespace UKSF.Tests.Unit.Services.Personnel { - public class LoaServiceTests { +namespace UKSF.Tests.Unit.Services.Personnel +{ + public class LoaServiceTests + { private readonly ILoaService _loaService; private readonly Mock _mockLoaDataService; - public LoaServiceTests() { - _mockLoaDataService = new Mock(); + public LoaServiceTests() + { + _mockLoaDataService = new(); _loaService = new LoaService(_mockLoaDataService.Object); } [Fact] - public void ShouldGetCorrectLoas() { + public void ShouldGetCorrectLoas() + { Loa loa1 = new() { Recipient = "5ed524b04f5b532a5437bba1", End = DateTime.Now.AddDays(-5) }; Loa loa2 = new() { Recipient = "5ed524b04f5b532a5437bba1", End = DateTime.Now.AddDays(-35) }; Loa loa3 = new() { Recipient = "5ed524b04f5b532a5437bba2", End = DateTime.Now.AddDays(-45) }; @@ -30,7 +34,7 @@ public void ShouldGetCorrectLoas() { _mockLoaDataService.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockCollection.Where(x).ToList()); - IEnumerable subject = _loaService.Get(new List { "5ed524b04f5b532a5437bba1", "5ed524b04f5b532a5437bba2" }); + IEnumerable subject = _loaService.Get(new() { "5ed524b04f5b532a5437bba1", "5ed524b04f5b532a5437bba2" }); subject.Should().Contain(new List { loa1, loa4 }); } diff --git a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs index ccea3dae..2b183f86 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RoleAttributeTests.cs @@ -2,10 +2,13 @@ using UKSF.Api.Shared; using Xunit; -namespace UKSF.Tests.Unit.Services.Personnel { - public class RoleAttributeTests { +namespace UKSF.Tests.Unit.Services.Personnel +{ + public class RoleAttributeTests + { [Theory, InlineData("ADMIN,PERSONNEL", Permissions.ADMIN, Permissions.PERSONNEL), InlineData("ADMIN", Permissions.ADMIN), InlineData("ADMIN", Permissions.ADMIN, Permissions.ADMIN)] - public void ShouldCombineRoles(string expected, params string[] roles) { + public void ShouldCombineRoles(string expected, params string[] roles) + { PermissionsAttribute permissionsAttribute = new(roles); string subject = permissionsAttribute.Roles; diff --git a/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs index 2fcd0f0b..873da829 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs @@ -8,18 +8,42 @@ using UKSF.Api.Personnel.Services; using Xunit; -namespace UKSF.Tests.Unit.Services.Personnel { - public class RolesServiceTests { +namespace UKSF.Tests.Unit.Services.Personnel +{ + public class RolesServiceTests + { private readonly Mock _mockRolesDataService; private readonly RolesService _rolesService; - public RolesServiceTests() { - _mockRolesDataService = new Mock(); - _rolesService = new RolesService(_mockRolesDataService.Object); + public RolesServiceTests() + { + _mockRolesDataService = new(); + _rolesService = new(_mockRolesDataService.Object); + } + + [Fact] + public void ShouldReturnNullWhenNoUnitRoleFound() + { + _mockRolesDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); + + Role subject = _rolesService.GetUnitRoleByOrder(2); + + subject.Should().BeNull(); + } + + [Fact] + public void ShouldReturnZeroForSortWhenRanksAreNull() + { + _mockRolesDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); + + int subject = _rolesService.Sort("Trainee", "Rifleman"); + + subject.Should().Be(0); } [Theory, InlineData("Trainee", "Rifleman", 1), InlineData("Rifleman", "Trainee", -1), InlineData("Rifleman", "Rifleman", 0)] - public void ShouldGetCorrectSortValueByName(string nameA, string nameB, int expected) { + public void ShouldGetCorrectSortValueByName(string nameA, string nameB, int expected) + { Role role1 = new() { Name = "Rifleman", Order = 0 }; Role role2 = new() { Name = "Trainee", Order = 1 }; List mockCollection = new() { role1, role2 }; @@ -33,7 +57,8 @@ public void ShouldGetCorrectSortValueByName(string nameA, string nameB, int expe } [Theory, InlineData(3, "Trainee"), InlineData(0, "Marksman")] - public void ShouldGetUnitRoleByOrder(int order, string expected) { + public void ShouldGetUnitRoleByOrder(int order, string expected) + { Role role1 = new() { Name = "Rifleman", Order = 0, RoleType = RoleType.INDIVIDUAL }; Role role2 = new() { Name = "Gunner", Order = 3, RoleType = RoleType.INDIVIDUAL }; Role role3 = new() { Name = "Marksman", Order = 0, RoleType = RoleType.UNIT }; @@ -48,23 +73,5 @@ public void ShouldGetUnitRoleByOrder(int order, string expected) { subject.Name.Should().Be(expected); } - - [Fact] - public void ShouldReturnNullWhenNoUnitRoleFound() { - _mockRolesDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); - - Role subject = _rolesService.GetUnitRoleByOrder(2); - - subject.Should().BeNull(); - } - - [Fact] - public void ShouldReturnZeroForSortWhenRanksAreNull() { - _mockRolesDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(null); - - int subject = _rolesService.Sort("Trainee", "Rifleman"); - - subject.Should().Be(0); - } } } diff --git a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs index 64e1cc4c..61e62b2b 100644 --- a/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/DataCacheServiceTests.cs @@ -4,18 +4,21 @@ using UKSF.Api.Personnel.Context; using Xunit; -namespace UKSF.Tests.Unit.Services.Utility { - public class DataCacheServiceTests { +namespace UKSF.Tests.Unit.Services.Utility +{ + public class DataCacheServiceTests + { [Fact] - public void When_refreshing_data_caches() { + public void When_refreshing_data_caches() + { Mock mockAccountDataService = new(); Mock mockRanksDataService = new(); Mock mockRolesDataService = new(); ServiceProvider serviceProvider = new ServiceCollection().AddSingleton(_ => mockAccountDataService.Object) - .AddSingleton(_ => mockRanksDataService.Object) - .AddSingleton(_ => mockRolesDataService.Object) - .BuildServiceProvider(); + .AddSingleton(_ => mockRanksDataService.Object) + .AddSingleton(_ => mockRolesDataService.Object) + .BuildServiceProvider(); DataCacheService dataCacheService = new(serviceProvider); dataCacheService.RefreshCachedData(); diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs index cecde4a6..e9b3b765 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActionServiceTests.cs @@ -7,10 +7,13 @@ using UKSF.Api.Shared.Services; using Xunit; -namespace UKSF.Tests.Unit.Services.Utility { - public class ScheduledActionServiceTests { +namespace UKSF.Tests.Unit.Services.Utility +{ + public class ScheduledActionServiceTests + { [Fact] - public void ShouldOverwriteRegisteredActions() { + public void ShouldOverwriteRegisteredActions() + { Mock mockDeleteExpiredConfirmationCodeAction1 = new(); Mock mockDeleteExpiredConfirmationCodeAction2 = new(); mockDeleteExpiredConfirmationCodeAction1.Setup(x => x.Name).Returns("TestAction"); @@ -26,7 +29,8 @@ public void ShouldOverwriteRegisteredActions() { } [Fact] - public void ShouldRegisterActions() { + public void ShouldRegisterActions() + { Mock mockDeleteExpiredConfirmationCodeAction = new(); mockDeleteExpiredConfirmationCodeAction.Setup(x => x.Name).Returns("TestAction"); @@ -39,7 +43,8 @@ public void ShouldRegisterActions() { } [Fact] - public void ShouldThrowWhenActionNotFound() { + public void ShouldThrowWhenActionNotFound() + { IScheduledActionFactory scheduledActionFactory = new ScheduledActionFactory(); Action act = () => scheduledActionFactory.GetScheduledAction("TestAction"); diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs index b55f0af7..79315c67 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/DeleteExpiredConfirmationCodeActionTests.cs @@ -7,13 +7,16 @@ using UKSF.Api.Personnel.ScheduledActions; using Xunit; -namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { - public class DeleteExpiredConfirmationCodeActionTests { +namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions +{ + public class DeleteExpiredConfirmationCodeActionTests + { private readonly Mock _mockConfirmationCodeContext = new(); private IActionDeleteExpiredConfirmationCode _actionDeleteExpiredConfirmationCode; [Fact] - public async Task When_deleting_confirmation_code() { + public async Task When_deleting_confirmation_code() + { string id = ObjectId.GenerateNewId().ToString(); _actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(_mockConfirmationCodeContext.Object); @@ -24,7 +27,8 @@ public async Task When_deleting_confirmation_code() { } [Fact] - public async Task When_deleting_confirmation_code_with_no_id() { + public async Task When_deleting_confirmation_code_with_no_id() + { _actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(_mockConfirmationCodeContext.Object); Func act = async () => await _actionDeleteExpiredConfirmationCode.Run(); @@ -33,7 +37,8 @@ public async Task When_deleting_confirmation_code_with_no_id() { } [Fact] - public void When_getting_action_name() { + public void When_getting_action_name() + { _actionDeleteExpiredConfirmationCode = new ActionDeleteExpiredConfirmationCode(_mockConfirmationCodeContext.Object); string subject = _actionDeleteExpiredConfirmationCode.Name; diff --git a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs index b471ba69..0acad552 100644 --- a/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs +++ b/UKSF.Tests/Unit/Services/Utility/ScheduledActions/TeamspeakSnapshotActionTests.cs @@ -8,13 +8,16 @@ using UKSF.Api.Teamspeak.Services; using Xunit; -namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions { - public class TeamspeakSnapshotActionTests { +namespace UKSF.Tests.Unit.Services.Utility.ScheduledActions +{ + public class TeamspeakSnapshotActionTests + { private readonly IActionTeamspeakSnapshot _actionTeamspeakSnapshot; private readonly Mock _mockTeamspeakService; - public TeamspeakSnapshotActionTests() { - _mockTeamspeakService = new Mock(); + public TeamspeakSnapshotActionTests() + { + _mockTeamspeakService = new(); Mock mockClock = new(); Mock mockSchedulerService = new(); Mock mockHostEnvironment = new(); @@ -30,14 +33,16 @@ public TeamspeakSnapshotActionTests() { } [Fact] - public void When_getting_action_name() { + public void When_getting_action_name() + { string subject = _actionTeamspeakSnapshot.Name; subject.Should().Be("ActionTeamspeakSnapshot"); } [Fact] - public async Task When_running_snapshot() { + public async Task When_running_snapshot() + { await _actionTeamspeakSnapshot.Run(); _mockTeamspeakService.Verify(x => x.StoreTeamspeakServerSnapshot(), Times.Once); From e84277828b148a66f375f3547dff4130c106e976 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 24 May 2021 19:58:37 +0100 Subject: [PATCH 324/369] Remove path reference --- Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj b/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj index 86d3c920..05f2e19a 100644 --- a/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj +++ b/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj @@ -20,12 +20,6 @@ - - - C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\5.0.0\ref\net5.0\Microsoft.Extensions.DependencyInjection.dll - - - From d8fb1779fc8b1ed5d679bbd26a9f06d9abe567b2 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 24 May 2021 20:38:17 +0100 Subject: [PATCH 325/369] Try endpoint routing --- UKSF.Api/Startup.cs | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 3939867c..96dada8b 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -1,5 +1,9 @@ using System; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Configuration; @@ -35,19 +39,20 @@ public void ConfigureServices(IServiceCollection services) { services.AddUksf(_configuration, _currentEnvironment); - services.AddControllers(); services.AddCors( - options => options.AddPolicy( - "CorsPolicy", - builder => - { - builder.AllowAnyMethod() - .AllowAnyHeader() - .WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://uk-sf.co.uk") - .AllowCredentials(); - } - ) - ) + options => options.AddPolicy( + "CorsPolicy", + builder => + { + builder.AllowAnyMethod() + .AllowAnyHeader() + .WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://uk-sf.co.uk") + .AllowCredentials(); + } + ) + ); + services.AddControllers(options => { options.EnableEndpointRouting = true; }); + services.AddRouting() .AddSwaggerGen(options => { options.SwaggerDoc("v1", new() { Title = "UKSF API", Version = "v1" }); }) .AddMvc() .AddNewtonsoftJson(options => { options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); }); @@ -59,6 +64,14 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl app.UseStaticFiles() .UseCookiePolicy(new() { MinimumSameSitePolicy = SameSiteMode.Lax }) + .UseSwagger() + .UseSwaggerUI( + options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF API v1"); + options.DocExpansion(DocExpansion.None); + } + ) .UseRouting() .UseCors("CorsPolicy") .UseMiddleware() @@ -78,14 +91,6 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl endpoints.AddUksfModpackSignalr(); endpoints.AddUksfPersonnelSignalr(); } - ) - .UseSwagger() - .UseSwaggerUI( - options => - { - options.SwaggerEndpoint("/swagger/v1/swagger.json", "UKSF API v1"); - options.DocExpansion(DocExpansion.None); - } ); serviceProvider.StartUksfServices(); From 535818b4c1c2992634c9e7f55b3eb37f18e80f8a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 24 May 2021 20:57:59 +0100 Subject: [PATCH 326/369] Use controllerbase --- UKSF.Api.Admin/Controllers/DataController.cs | 2 +- UKSF.Api.Admin/Controllers/VariablesController.cs | 2 +- UKSF.Api.Admin/Controllers/VersionController.cs | 2 +- UKSF.Api.ArmaServer/Controllers/GameServersController.cs | 2 +- UKSF.Api.Auth/Controllers/AuthController.cs | 2 +- UKSF.Api.Command/Controllers/CommandRequestsController.cs | 2 +- .../Controllers/CommandRequestsCreationController.cs | 2 +- UKSF.Api.Command/Controllers/DischargesController.cs | 2 +- UKSF.Api.Command/Controllers/OperationOrderController.cs | 2 +- UKSF.Api.Command/Controllers/OperationReportController.cs | 2 +- UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs | 2 +- .../Controllers/InstagramController.cs | 2 +- .../Controllers/OperationsController.cs | 2 +- .../Controllers/TeamspeakController.cs | 2 +- UKSF.Api.Launcher/Controllers/LauncherController.cs | 2 +- UKSF.Api.Modpack/Controllers/GithubController.cs | 2 +- UKSF.Api.Modpack/Controllers/IssueController.cs | 2 +- UKSF.Api.Modpack/Controllers/ModpackController.cs | 2 +- UKSF.Api.Personnel/Controllers/AccountsController.cs | 2 +- UKSF.Api.Personnel/Controllers/ApplicationsController.cs | 2 +- UKSF.Api.Personnel/Controllers/CommentThreadController.cs | 2 +- UKSF.Api.Personnel/Controllers/DiscordCodeController.cs | 2 +- UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs | 2 +- UKSF.Api.Personnel/Controllers/DisplayNameController.cs | 2 +- UKSF.Api.Personnel/Controllers/NotificationsController.cs | 2 +- UKSF.Api.Personnel/Controllers/RanksController.cs | 2 +- UKSF.Api.Personnel/Controllers/RecruitmentController.cs | 2 +- UKSF.Api.Personnel/Controllers/RolesController.cs | 2 +- UKSF.Api.Personnel/Controllers/SteamCodeController.cs | 2 +- UKSF.Api.Personnel/Controllers/SteamConnectionController.cs | 2 +- .../Controllers/TeamspeakConnectionController.cs | 2 +- UKSF.Api.Personnel/Controllers/UnitsController.cs | 2 +- UKSF.Api/Controllers/LoaController.cs | 2 +- UKSF.Api/Controllers/LoggingController.cs | 2 +- UKSF.Api/Controllers/ModsController.cs | 2 +- UKSF.Api/Program.cs | 3 +-- 36 files changed, 36 insertions(+), 37 deletions(-) diff --git a/UKSF.Api.Admin/Controllers/DataController.cs b/UKSF.Api.Admin/Controllers/DataController.cs index 8e818480..ea8cde22 100644 --- a/UKSF.Api.Admin/Controllers/DataController.cs +++ b/UKSF.Api.Admin/Controllers/DataController.cs @@ -6,7 +6,7 @@ namespace UKSF.Api.Admin.Controllers { [Route("[controller]"), Permissions(Permissions.ADMIN)] - public class DataController : Controller + public class DataController : ControllerBase { private readonly IDataCacheService _dataCacheService; diff --git a/UKSF.Api.Admin/Controllers/VariablesController.cs b/UKSF.Api.Admin/Controllers/VariablesController.cs index 17a6946b..186919e9 100644 --- a/UKSF.Api.Admin/Controllers/VariablesController.cs +++ b/UKSF.Api.Admin/Controllers/VariablesController.cs @@ -12,7 +12,7 @@ namespace UKSF.Api.Admin.Controllers { [Route("[controller]"), Permissions(Permissions.ADMIN)] - public class VariablesController : Controller + public class VariablesController : ControllerBase { private readonly ILogger _logger; private readonly IVariablesContext _variablesContext; diff --git a/UKSF.Api.Admin/Controllers/VersionController.cs b/UKSF.Api.Admin/Controllers/VersionController.cs index 4dd82bba..b937073e 100644 --- a/UKSF.Api.Admin/Controllers/VersionController.cs +++ b/UKSF.Api.Admin/Controllers/VersionController.cs @@ -11,7 +11,7 @@ namespace UKSF.Api.Admin.Controllers { [Route("[controller]")] - public class VersionController : Controller + public class VersionController : ControllerBase { private readonly IHubContext _utilityHub; private readonly IVariablesContext _variablesContext; diff --git a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs index a5d1edae..23650c02 100644 --- a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs +++ b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs @@ -27,7 +27,7 @@ namespace UKSF.Api.ArmaServer.Controllers { [Route("[controller]"), Permissions(Permissions.NCO, Permissions.SERVERS, Permissions.COMMAND)] - public class GameServersController : Controller + public class GameServersController : ControllerBase { private readonly IGameServerHelpers _gameServerHelpers; private readonly IGameServersContext _gameServersContext; diff --git a/UKSF.Api.Auth/Controllers/AuthController.cs b/UKSF.Api.Auth/Controllers/AuthController.cs index d4bb1dba..c50ced15 100644 --- a/UKSF.Api.Auth/Controllers/AuthController.cs +++ b/UKSF.Api.Auth/Controllers/AuthController.cs @@ -11,7 +11,7 @@ namespace UKSF.Api.Auth.Controllers { [Route("auth")] - public class AuthController : Controller + public class AuthController : ControllerBase { private readonly IHttpContextService _httpContextService; private readonly ILoginService _loginService; diff --git a/UKSF.Api.Command/Controllers/CommandRequestsController.cs b/UKSF.Api.Command/Controllers/CommandRequestsController.cs index 5297112b..121480f4 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsController.cs @@ -23,7 +23,7 @@ namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.COMMAND)] - public class CommandRequestsController : Controller + public class CommandRequestsController : ControllerBase { private const string SUPER_ADMIN = "59e38f10594c603b78aa9dbd"; private readonly IAccountService _accountService; diff --git a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs index 25bb6078..a8eda3a3 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs @@ -16,7 +16,7 @@ namespace UKSF.Api.Command.Controllers { [Route("CommandRequests/Create")] - public class CommandRequestsCreationController : Controller + public class CommandRequestsCreationController : ControllerBase { private readonly IAccountContext _accountContext; private readonly ICommandRequestService _commandRequestService; diff --git a/UKSF.Api.Command/Controllers/DischargesController.cs b/UKSF.Api.Command/Controllers/DischargesController.cs index 4c0b58b6..61f5dfb6 100644 --- a/UKSF.Api.Command/Controllers/DischargesController.cs +++ b/UKSF.Api.Command/Controllers/DischargesController.cs @@ -18,7 +18,7 @@ namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.PERSONNEL, Permissions.NCO, Permissions.RECRUITER)] - public class DischargesController : Controller + public class DischargesController : ControllerBase { private readonly IAccountContext _accountContext; private readonly IAssignmentService _assignmentService; diff --git a/UKSF.Api.Command/Controllers/OperationOrderController.cs b/UKSF.Api.Command/Controllers/OperationOrderController.cs index c8497ddb..44036cc4 100644 --- a/UKSF.Api.Command/Controllers/OperationOrderController.cs +++ b/UKSF.Api.Command/Controllers/OperationOrderController.cs @@ -10,7 +10,7 @@ namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] - public class OperationOrderController : Controller + public class OperationOrderController : ControllerBase { private readonly IOperationOrderContext _operationOrderContext; private readonly IOperationOrderService _operationOrderService; diff --git a/UKSF.Api.Command/Controllers/OperationReportController.cs b/UKSF.Api.Command/Controllers/OperationReportController.cs index e15d78b4..fc753e52 100644 --- a/UKSF.Api.Command/Controllers/OperationReportController.cs +++ b/UKSF.Api.Command/Controllers/OperationReportController.cs @@ -11,7 +11,7 @@ namespace UKSF.Api.Command.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] - public class OperationReportController : Controller + public class OperationReportController : ControllerBase { private readonly IOperationReportContext _operationReportContext; private readonly IOperationReportService _operationReportService; diff --git a/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs b/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs index cd1ebd08..f41dddce 100644 --- a/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs +++ b/UKSF.Api.Integrations.Discord/Controllers/DiscordController.cs @@ -11,7 +11,7 @@ namespace UKSF.Api.Discord.Controllers { [Route("[controller]")] - public class DiscordController : Controller + public class DiscordController : ControllerBase { private readonly IDiscordService _discordService; diff --git a/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs b/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs index 08824d9e..0239cdfb 100644 --- a/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs +++ b/UKSF.Api.Integrations.Instagram/Controllers/InstagramController.cs @@ -9,7 +9,7 @@ namespace UKSF.Api.Integrations.Instagram.Controllers { [Route("[controller]")] - public class InstagramController : Controller + public class InstagramController : ControllerBase { private readonly IActionInstagramToken _actionInstagramToken; private readonly IInstagramService _instagramService; diff --git a/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs b/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs index 4914dc6f..6d2a7a75 100644 --- a/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs +++ b/UKSF.Api.Integrations.Teamspeak/Controllers/OperationsController.cs @@ -10,7 +10,7 @@ namespace UKSF.Api.Teamspeak.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] - public class OperationsController : Controller + public class OperationsController : ControllerBase { private readonly IMongoDatabase _database; diff --git a/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs b/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs index 84e77b39..f8f88fb8 100644 --- a/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs +++ b/UKSF.Api.Integrations.Teamspeak/Controllers/TeamspeakController.cs @@ -16,7 +16,7 @@ namespace UKSF.Api.Teamspeak.Controllers { [Route("teamspeak")] - public class TeamspeakController : Controller + public class TeamspeakController : ControllerBase { private readonly IAccountContext _accountContext; private readonly IConfirmationCodeService _confirmationCodeService; diff --git a/UKSF.Api.Launcher/Controllers/LauncherController.cs b/UKSF.Api.Launcher/Controllers/LauncherController.cs index eefe0619..aeb2cbdb 100644 --- a/UKSF.Api.Launcher/Controllers/LauncherController.cs +++ b/UKSF.Api.Launcher/Controllers/LauncherController.cs @@ -24,7 +24,7 @@ namespace UKSF.Api.Launcher.Controllers { [Route("[controller]"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER)] - public class LauncherController : Controller + public class LauncherController : ControllerBase { private readonly IDisplayNameService _displayNameService; private readonly IHttpContextService _httpContextService; diff --git a/UKSF.Api.Modpack/Controllers/GithubController.cs b/UKSF.Api.Modpack/Controllers/GithubController.cs index b9bf8f8e..9c3cea76 100644 --- a/UKSF.Api.Modpack/Controllers/GithubController.cs +++ b/UKSF.Api.Modpack/Controllers/GithubController.cs @@ -14,7 +14,7 @@ namespace UKSF.Api.Modpack.Controllers { [Route("[controller]")] - public class GithubController : Controller + public class GithubController : ControllerBase { private const string PUSH_EVENT = "push"; private const string REPO_NAME = "modpack"; diff --git a/UKSF.Api.Modpack/Controllers/IssueController.cs b/UKSF.Api.Modpack/Controllers/IssueController.cs index 27b48e0a..3f861396 100644 --- a/UKSF.Api.Modpack/Controllers/IssueController.cs +++ b/UKSF.Api.Modpack/Controllers/IssueController.cs @@ -16,7 +16,7 @@ namespace UKSF.Api.Modpack.Controllers { [Route("issue"), Permissions(Permissions.MEMBER)] - public class IssueController : Controller + public class IssueController : ControllerBase { private readonly IDisplayNameService _displayNameService; private readonly string _githubToken; diff --git a/UKSF.Api.Modpack/Controllers/ModpackController.cs b/UKSF.Api.Modpack/Controllers/ModpackController.cs index 5ffa205f..1a4c054c 100644 --- a/UKSF.Api.Modpack/Controllers/ModpackController.cs +++ b/UKSF.Api.Modpack/Controllers/ModpackController.cs @@ -10,7 +10,7 @@ namespace UKSF.Api.Modpack.Controllers { [Route("[controller]")] - public class ModpackController : Controller + public class ModpackController : ControllerBase { private readonly IGithubService _githubService; private readonly IModpackService _modpackService; diff --git a/UKSF.Api.Personnel/Controllers/AccountsController.cs b/UKSF.Api.Personnel/Controllers/AccountsController.cs index 3c61f990..8a27a0d4 100644 --- a/UKSF.Api.Personnel/Controllers/AccountsController.cs +++ b/UKSF.Api.Personnel/Controllers/AccountsController.cs @@ -26,7 +26,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] - public class AccountsController : Controller + public class AccountsController : ControllerBase { private readonly IAccountContext _accountContext; private readonly IAccountMapper _accountMapper; diff --git a/UKSF.Api.Personnel/Controllers/ApplicationsController.cs b/UKSF.Api.Personnel/Controllers/ApplicationsController.cs index c42bf98f..0a1a017d 100644 --- a/UKSF.Api.Personnel/Controllers/ApplicationsController.cs +++ b/UKSF.Api.Personnel/Controllers/ApplicationsController.cs @@ -16,7 +16,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] - public class ApplicationsController : Controller + public class ApplicationsController : ControllerBase { private readonly IAccountContext _accountContext; private readonly IAccountService _accountService; diff --git a/UKSF.Api.Personnel/Controllers/CommentThreadController.cs b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs index f39a9662..c65f220a 100644 --- a/UKSF.Api.Personnel/Controllers/CommentThreadController.cs +++ b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs @@ -14,7 +14,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("commentthread"), Permissions(Permissions.CONFIRMED, Permissions.MEMBER, Permissions.DISCHARGED)] - public class CommentThreadController : Controller + public class CommentThreadController : ControllerBase { private readonly IAccountContext _accountContext; private readonly IAccountService _accountService; diff --git a/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs b/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs index da68fad2..33d7edcd 100644 --- a/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs +++ b/UKSF.Api.Personnel/Controllers/DiscordCodeController.cs @@ -14,7 +14,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] - public class DiscordCodeController : Controller + public class DiscordCodeController : ControllerBase { private readonly IAccountContext _accountContext; private readonly IConfirmationCodeService _confirmationCodeService; diff --git a/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs b/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs index b4960a8b..2ee26e92 100644 --- a/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs +++ b/UKSF.Api.Personnel/Controllers/DiscordConnectionController.cs @@ -15,7 +15,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] - public class DiscordConnectionController : Controller + public class DiscordConnectionController : ControllerBase { private readonly string _botToken; private readonly string _clientId; diff --git a/UKSF.Api.Personnel/Controllers/DisplayNameController.cs b/UKSF.Api.Personnel/Controllers/DisplayNameController.cs index b78d9ce5..b66546c1 100644 --- a/UKSF.Api.Personnel/Controllers/DisplayNameController.cs +++ b/UKSF.Api.Personnel/Controllers/DisplayNameController.cs @@ -4,7 +4,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] - public class DisplayNameController : Controller + public class DisplayNameController : ControllerBase { private readonly IDisplayNameService _displayNameService; diff --git a/UKSF.Api.Personnel/Controllers/NotificationsController.cs b/UKSF.Api.Personnel/Controllers/NotificationsController.cs index 0cdd1a4f..53ab7bbc 100644 --- a/UKSF.Api.Personnel/Controllers/NotificationsController.cs +++ b/UKSF.Api.Personnel/Controllers/NotificationsController.cs @@ -10,7 +10,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] - public class NotificationsController : Controller + public class NotificationsController : ControllerBase { private readonly INotificationsService _notificationsService; diff --git a/UKSF.Api.Personnel/Controllers/RanksController.cs b/UKSF.Api.Personnel/Controllers/RanksController.cs index 971c0a1a..77ba0344 100644 --- a/UKSF.Api.Personnel/Controllers/RanksController.cs +++ b/UKSF.Api.Personnel/Controllers/RanksController.cs @@ -11,7 +11,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] - public class RanksController : Controller + public class RanksController : ControllerBase { private readonly IAccountContext _accountContext; private readonly IAssignmentService _assignmentService; diff --git a/UKSF.Api.Personnel/Controllers/RecruitmentController.cs b/UKSF.Api.Personnel/Controllers/RecruitmentController.cs index 8616445a..24435802 100644 --- a/UKSF.Api.Personnel/Controllers/RecruitmentController.cs +++ b/UKSF.Api.Personnel/Controllers/RecruitmentController.cs @@ -17,7 +17,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] - public class RecruitmentController : Controller + public class RecruitmentController : ControllerBase { private readonly IAccountContext _accountContext; private readonly IAccountService _accountService; diff --git a/UKSF.Api.Personnel/Controllers/RolesController.cs b/UKSF.Api.Personnel/Controllers/RolesController.cs index c5000774..4f4f81ec 100644 --- a/UKSF.Api.Personnel/Controllers/RolesController.cs +++ b/UKSF.Api.Personnel/Controllers/RolesController.cs @@ -11,7 +11,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] - public class RolesController : Controller + public class RolesController : ControllerBase { private readonly IAccountContext _accountContext; private readonly IAssignmentService _assignmentService; diff --git a/UKSF.Api.Personnel/Controllers/SteamCodeController.cs b/UKSF.Api.Personnel/Controllers/SteamCodeController.cs index ca8f6c5e..815f3f82 100644 --- a/UKSF.Api.Personnel/Controllers/SteamCodeController.cs +++ b/UKSF.Api.Personnel/Controllers/SteamCodeController.cs @@ -12,7 +12,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] - public class SteamCodeController : Controller + public class SteamCodeController : ControllerBase { private readonly IAccountContext _accountContext; private readonly IConfirmationCodeService _confirmationCodeService; diff --git a/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs b/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs index c8fc0745..d0fde0c9 100644 --- a/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs +++ b/UKSF.Api.Personnel/Controllers/SteamConnectionController.cs @@ -7,7 +7,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] - public class SteamConnectionController : Controller + public class SteamConnectionController : ControllerBase { private readonly IConfirmationCodeService _confirmationCodeService; private readonly string _url; diff --git a/UKSF.Api.Personnel/Controllers/TeamspeakConnectionController.cs b/UKSF.Api.Personnel/Controllers/TeamspeakConnectionController.cs index 6cade470..d6d9bab5 100644 --- a/UKSF.Api.Personnel/Controllers/TeamspeakConnectionController.cs +++ b/UKSF.Api.Personnel/Controllers/TeamspeakConnectionController.cs @@ -9,7 +9,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("accounts/{accountId}")] - public class TeamspeakConnectionController : Controller + public class TeamspeakConnectionController : ControllerBase { private readonly IAccountMapper _accountMapper; private readonly IConnectTeamspeakIdToAccountCommand _connectTeamspeakIdToAccountCommand; diff --git a/UKSF.Api.Personnel/Controllers/UnitsController.cs b/UKSF.Api.Personnel/Controllers/UnitsController.cs index 771df85e..fee940d0 100644 --- a/UKSF.Api.Personnel/Controllers/UnitsController.cs +++ b/UKSF.Api.Personnel/Controllers/UnitsController.cs @@ -18,7 +18,7 @@ namespace UKSF.Api.Personnel.Controllers { [Route("[controller]")] - public class UnitsController : Controller + public class UnitsController : ControllerBase { private readonly IAccountContext _accountContext; private readonly IAssignmentService _assignmentService; diff --git a/UKSF.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs index 70b69cfa..b1f9ba9e 100644 --- a/UKSF.Api/Controllers/LoaController.cs +++ b/UKSF.Api/Controllers/LoaController.cs @@ -19,7 +19,7 @@ namespace UKSF.Api.Controllers { [Route("[controller]"), Permissions(Permissions.MEMBER)] - public class LoaController : Controller + public class LoaController : ControllerBase { private readonly IAccountContext _accountContext; private readonly IAccountService _accountService; diff --git a/UKSF.Api/Controllers/LoggingController.cs b/UKSF.Api/Controllers/LoggingController.cs index 75052606..faa45deb 100644 --- a/UKSF.Api/Controllers/LoggingController.cs +++ b/UKSF.Api/Controllers/LoggingController.cs @@ -11,7 +11,7 @@ namespace UKSF.Api.Controllers { [Route("[controller]"), Permissions(Permissions.ADMIN)] - public class LoggingController : Controller + public class LoggingController : ControllerBase { private readonly IAuditLogContext _auditLogContext; private readonly IDiscordLogContext _discordLogContext; diff --git a/UKSF.Api/Controllers/ModsController.cs b/UKSF.Api/Controllers/ModsController.cs index 5c70fcc3..5f3334ee 100644 --- a/UKSF.Api/Controllers/ModsController.cs +++ b/UKSF.Api/Controllers/ModsController.cs @@ -5,7 +5,7 @@ namespace UKSF.Api.Controllers { [Route("[controller]"), Authorize, Permissions(Permissions.CONFIRMED, Permissions.MEMBER)] - public class ModsController : Controller + public class ModsController : ControllerBase { // TODO: Return size of modpack folder [HttpGet("size")] diff --git a/UKSF.Api/Program.cs b/UKSF.Api/Program.cs index 964734d7..22e10b90 100644 --- a/UKSF.Api/Program.cs +++ b/UKSF.Api/Program.cs @@ -44,7 +44,7 @@ public static void Main(string[] args) private static IWebHost BuildDebugWebHost(string[] args) { - return WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel().UseContentRoot(Directory.GetCurrentDirectory()).UseUrls("http://*:5000").UseIISIntegration().Build(); + return WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel().UseContentRoot(Directory.GetCurrentDirectory()).UseUrls("http://*:5000").Build(); } private static IWebHost BuildProductionWebHost(string[] args) @@ -63,7 +63,6 @@ private static IWebHost BuildProductionWebHost(string[] args) } ) .UseContentRoot(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule?.FileName)) - .UseIISIntegration() .Build(); } From 619f17c19f6db0d380cb6ac214ad1d0e8d738e6b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 24 May 2021 21:16:19 +0100 Subject: [PATCH 327/369] Make tests appsettings distinct --- .../TestConfigurationProvider.cs | 2 +- .../UKSF.Api.Tests.Common.csproj | 14 +++++++------- .../{appsettings.json => appsettings.Tests.json} | 0 3 files changed, 8 insertions(+), 8 deletions(-) rename Tests/UKSF.Api.Tests.Common/{appsettings.json => appsettings.Tests.json} (100%) diff --git a/Tests/UKSF.Api.Tests.Common/TestConfigurationProvider.cs b/Tests/UKSF.Api.Tests.Common/TestConfigurationProvider.cs index c1539179..b4e947d4 100644 --- a/Tests/UKSF.Api.Tests.Common/TestConfigurationProvider.cs +++ b/Tests/UKSF.Api.Tests.Common/TestConfigurationProvider.cs @@ -6,7 +6,7 @@ public static class TestConfigurationProvider { public static IConfigurationRoot GetTestConfiguration() { - return new ConfigurationBuilder().AddJsonFile("appsettings.json").Build(); + return new ConfigurationBuilder().AddJsonFile("appsettings.Tests.json").Build(); } } } diff --git a/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj b/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj index d61a50c9..8f9c53e7 100644 --- a/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj +++ b/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj @@ -7,12 +7,12 @@ - - - - - - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -28,7 +28,7 @@ - + true PreserveNewest PreserveNewest diff --git a/Tests/UKSF.Api.Tests.Common/appsettings.json b/Tests/UKSF.Api.Tests.Common/appsettings.Tests.json similarity index 100% rename from Tests/UKSF.Api.Tests.Common/appsettings.json rename to Tests/UKSF.Api.Tests.Common/appsettings.Tests.json From c0ce710de05e358816dcbc4ddde65f8f34b5fa44 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 24 May 2021 21:49:20 +0100 Subject: [PATCH 328/369] Return correct status code for login failure --- .../Commands/ResetPasswordCommand.cs | 5 +- .../Exceptions/LoginFailedException.cs | 11 -- UKSF.Api.Auth/Services/LoginService.cs | 7 +- UKSF.Api.Auth/UKSF.Api.Auth.csproj | 10 +- build.yaml | 114 ++++++++++++++++++ 5 files changed, 126 insertions(+), 21 deletions(-) delete mode 100644 UKSF.Api.Auth/Exceptions/LoginFailedException.cs create mode 100644 build.yaml diff --git a/UKSF.Api.Auth/Commands/ResetPasswordCommand.cs b/UKSF.Api.Auth/Commands/ResetPasswordCommand.cs index 46afe545..83fae755 100644 --- a/UKSF.Api.Auth/Commands/ResetPasswordCommand.cs +++ b/UKSF.Api.Auth/Commands/ResetPasswordCommand.cs @@ -5,6 +5,7 @@ using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Exceptions; namespace UKSF.Api.Auth.Commands { @@ -45,13 +46,13 @@ public async Task ExecuteAsync(ResetPasswordCommandArgs args) DomainAccount domainAccount = _accountContext.GetSingle(x => string.Equals(x.Email, args.Email, StringComparison.InvariantCultureIgnoreCase)); if (domainAccount == null) { - throw new LoginFailedException("Password reset failed. No user found with that email"); + throw new BadRequestException("No user found with that email"); } string codeValue = await _confirmationCodeService.GetConfirmationCodeValue(args.Code); if (codeValue != domainAccount.Id) { - throw new LoginFailedException("Password reset failed. Invalid code"); + throw new BadRequestException("Password reset failed (Invalid code)"); } await _accountContext.Update(domainAccount.Id, x => x.Password, BCrypt.Net.BCrypt.HashPassword(args.Password)); diff --git a/UKSF.Api.Auth/Exceptions/LoginFailedException.cs b/UKSF.Api.Auth/Exceptions/LoginFailedException.cs deleted file mode 100644 index cbc91d8c..00000000 --- a/UKSF.Api.Auth/Exceptions/LoginFailedException.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using UKSF.Api.Shared.Exceptions; - -namespace UKSF.Api.Auth.Exceptions -{ - [Serializable] - public class LoginFailedException : UksfException - { - public LoginFailedException(string message) : base(message, 401) { } - } -} diff --git a/UKSF.Api.Auth/Services/LoginService.cs b/UKSF.Api.Auth/Services/LoginService.cs index 543dcf82..f25914e6 100644 --- a/UKSF.Api.Auth/Services/LoginService.cs +++ b/UKSF.Api.Auth/Services/LoginService.cs @@ -8,6 +8,7 @@ using UKSF.Api.Auth.Exceptions; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Exceptions; namespace UKSF.Api.Auth.Services { @@ -46,7 +47,7 @@ public string RegenerateBearerToken(string accountId) DomainAccount domainAccount = _accountContext.GetSingle(accountId); if (domainAccount == null) { - throw new LoginFailedException("Login failed. No user found with that email"); + throw new BadRequestException("No user found with that email"); } return GenerateBearerToken(domainAccount); @@ -57,7 +58,7 @@ private DomainAccount AuthenticateAccount(string email, string password, bool pa DomainAccount domainAccount = _accountContext.GetSingle(x => string.Equals(x.Email, email, StringComparison.InvariantCultureIgnoreCase)); if (domainAccount == null) { - throw new LoginFailedException("Login failed. No user found with that email"); + throw new BadRequestException("No user found with that email"); } if (passwordReset) @@ -67,7 +68,7 @@ private DomainAccount AuthenticateAccount(string email, string password, bool pa if (!BCrypt.Net.BCrypt.Verify(password, domainAccount.Password)) { - throw new LoginFailedException("Login failed. Incorrect password"); + throw new BadRequestException("Incorrect password"); } return domainAccount; diff --git a/UKSF.Api.Auth/UKSF.Api.Auth.csproj b/UKSF.Api.Auth/UKSF.Api.Auth.csproj index 4cf9a193..09afa00f 100644 --- a/UKSF.Api.Auth/UKSF.Api.Auth.csproj +++ b/UKSF.Api.Auth/UKSF.Api.Auth.csproj @@ -6,11 +6,11 @@ - - - - - + + + + + diff --git a/build.yaml b/build.yaml new file mode 100644 index 00000000..d4321175 --- /dev/null +++ b/build.yaml @@ -0,0 +1,114 @@ +trigger: + branches: + include: + - master + +#pool: +# vmImage: 'ubuntu-latest' + +variables: + solution: '**/*.sln' + buildPlatform: 'Any CPU' + buildConfiguration: 'Release' + +jobs: + - job: BuildTest + displayName: Build & Test + steps: + + - task: SonarCloudPrepare@1 + inputs: + SonarCloud: 'Codat - SonarCloud - Clients API' + organization: 'codat' + scannerMode: 'MSBuild' + projectKey: 'Codat_Clients-API' + projectName: 'Clients API' + extraProperties: 'sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/**/coverage.opencover.xml' + + - task: DotNetCoreCLI@2 + displayName: 'Restore' + inputs: + command: 'restore' + projects: '$(solution)' + feedsToUse: 'config' + nugetConfigPath: 'NuGet.config' + externalFeedCredentials: 'Codat NuGet' + + - task: DotNetCoreCLI@2 + displayName: 'Build' + inputs: + command: 'build' + projects: '$(solution)' + arguments: '/p:DeployOnBuild=false /p:WebPublishMethod=Package /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.stagingDirectory)" /p:configuration="Release" --no-restore' + + - task: DotNetCoreCLI@2 + displayName: 'Test' + inputs: + command: 'test' + projects: '**/*.Tests*.csproj' + arguments: '--configuration $(BuildConfiguration) /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --no-build' + + - task: SonarCloudAnalyze@1 + + - task: SonarCloudPublish@1 + inputs: + pollingTimeoutSec: '30' + + - job: PublishArtifacts + displayName: Publish Artifacts + dependsOn: BuildTest + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) + steps: + + - task: DotNetCoreCLI@2 + displayName: 'Restore' + inputs: + command: 'restore' + projects: '$(solution)' + feedsToUse: 'config' + nugetConfigPath: 'NuGet.config' + externalFeedCredentials: 'Codat NuGet' + + - task: DotNetCoreCLI@2 + displayName: 'Publish WebApi (without zipping)' + inputs: + command: publish + publishWebProjects: false + projects: '**/Codat.Clients.Api.csproj' + arguments: '-c Release --output $(Build.BinariesDirectory)/Codat.Clients.Api' + zipAfterPublish: false + modifyOutputPath: false + + - task: DotNetCoreCLI@2 + displayName: 'Pack Codat.Clients.Api.Client' + inputs: + command: 'pack' + vstsFeed: '346be1b7-5a18-453a-84be-b51f2e6f09a4' + packagesToPack: '**/Codat.Clients.Api.Client.csproj' + versioningScheme: 'off' + includeSymbols: true + + - task: ArchiveFiles@2 + displayName: 'Zip Artifact API + Jobs' + inputs: + rootFolderOrFile: '$(Build.BinariesDirectory)/Codat.Clients.Api' + includeRootFolder: false + archiveType: 'zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/Codat.Clients.Api.zip' + replaceExistingArchive: true + + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact' + inputs: + PathtoPublish: '$(build.artifactstagingdirectory)/Codat.Clients.Api.zip' + ArtifactName: 'Api' + publishLocation: 'Container' + + - task: NuGetCommand@2 + displayName: 'Publish All Packages And Symbols' + inputs: + command: 'push' + packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' + nuGetFeedType: 'internal' + publishVstsFeed: '346be1b7-5a18-453a-84be-b51f2e6f09a4' + allowPackageConflicts: true From 69c0036c03e466b387411a3bae905328373bae29 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 24 May 2021 22:37:35 +0100 Subject: [PATCH 329/369] Premail email templates --- .../AccountConfirmationTemplate.html | 102 +------------ .../NotificationTemplate.html | 89 +----------- .../AccountConfirmationTemplatePremailed.html | 129 +++++++++++++++++ .../NotificationTemplatePremailed.html | 124 ++++++++++++++++ .../ResetPasswordTemplatePremailed.html | 135 ++++++++++++++++++ .../ResetPasswordTemplate.html | 114 +-------------- .../Queries/GetEmailTemplateQuery.cs | 2 +- UKSF.Api.Shared/UKSF.Api.Shared.csproj | 2 +- 8 files changed, 393 insertions(+), 304 deletions(-) create mode 100644 UKSF.Api.Shared/EmailHtmlTemplates/Premailed/AccountConfirmationTemplatePremailed.html create mode 100644 UKSF.Api.Shared/EmailHtmlTemplates/Premailed/NotificationTemplatePremailed.html create mode 100644 UKSF.Api.Shared/EmailHtmlTemplates/Premailed/ResetPasswordTemplatePremailed.html diff --git a/UKSF.Api.Shared/EmailHtmlTemplates/AccountConfirmationTemplate.html b/UKSF.Api.Shared/EmailHtmlTemplates/AccountConfirmationTemplate.html index 8e32445b..f9e839dd 100644 --- a/UKSF.Api.Shared/EmailHtmlTemplates/AccountConfirmationTemplate.html +++ b/UKSF.Api.Shared/EmailHtmlTemplates/AccountConfirmationTemplate.html @@ -2,8 +2,6 @@ - - UKSF Password Reset diff --git a/UKSF.Api.Shared/EmailHtmlTemplates/NotificationTemplate.html b/UKSF.Api.Shared/EmailHtmlTemplates/NotificationTemplate.html index 07adffea..b14b5f62 100644 --- a/UKSF.Api.Shared/EmailHtmlTemplates/NotificationTemplate.html +++ b/UKSF.Api.Shared/EmailHtmlTemplates/NotificationTemplate.html @@ -2,8 +2,6 @@ - - UKSF Notification diff --git a/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/AccountConfirmationTemplatePremailed.html b/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/AccountConfirmationTemplatePremailed.html new file mode 100644 index 00000000..8c3c5b7d --- /dev/null +++ b/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/AccountConfirmationTemplatePremailed.html @@ -0,0 +1,129 @@ + + + + + + UKSF Password Reset + + + + + + + + + + + + + +
+ + UKSF Logo + +
+ + + + + + + + + + + + + +
+

+ UKSF Account Confirmation +

+
+

This email was given during the creation of a UKSF account. To confirm your UKSF account, + enter the code below into the prompt on the UKSF website:

+
+ + + + +
+

$code$

+
+
+

+ If this request was not made by you, it is safe to ignore +

+
+
+ + + + + + + + + + +
+ + + Teamspeak + + + + Discord + + + + Facebook + + + + Instagram + + + + Youtube + +
+

+ Need help? Contact an admin on our Discord +

+
+

© + Copyright UKSF 2021

+ $randomness$ +
+
+ + diff --git a/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/NotificationTemplatePremailed.html b/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/NotificationTemplatePremailed.html new file mode 100644 index 00000000..52bf509c --- /dev/null +++ b/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/NotificationTemplatePremailed.html @@ -0,0 +1,124 @@ + + + + + + UKSF Notification + + + + + + + + + + + + + +
+ + UKSF Logo + +
+ + + + + + + + + + +
+

+ UKSF Notification +

+
+ + + + +
+

$message$

+
+
+

+ You can opt-out of these emails by unchecking 'Email notifications' in your Profile +

+
+
+ + + + + + + + + + +
+ + + Teamspeak + + + + Discord + + + + Facebook + + + + Instagram + + + + Youtube + +
+

+ Need help? Contact an admin on our Discord +

+
+

© + Copyright UKSF 2021

+ $randomness$ +
+
+ + diff --git a/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/ResetPasswordTemplatePremailed.html b/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/ResetPasswordTemplatePremailed.html new file mode 100644 index 00000000..c548e658 --- /dev/null +++ b/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/ResetPasswordTemplatePremailed.html @@ -0,0 +1,135 @@ + + + + + + UKSF Password Reset + + + + + + + + + + + + + +
+ + UKSF Logo + +
+ + + + + + + + + + + + + +
+

+ UKSF Password Reset +

+
+

+ A request was made to reset the password for the account associated with this email. Click + the button below to continue resetting your password. +

+
+ + + + +
+ Reset + Password +
+
+

+ If this request was not made by you, it is safe to ignore +

+
+
+ + + + + + + + + + +
+ + + Teamspeak + + + + Discord + + + + Facebook + + + + Instagram + + + + Youtube + +
+

+ Need help? Contact an admin on our Discord +

+
+

© + Copyright UKSF 2021

+ $randomness$ +
+
+ + diff --git a/UKSF.Api.Shared/EmailHtmlTemplates/ResetPasswordTemplate.html b/UKSF.Api.Shared/EmailHtmlTemplates/ResetPasswordTemplate.html index cf349ae2..a7ded12d 100644 --- a/UKSF.Api.Shared/EmailHtmlTemplates/ResetPasswordTemplate.html +++ b/UKSF.Api.Shared/EmailHtmlTemplates/ResetPasswordTemplate.html @@ -2,8 +2,6 @@ - - UKSF Password Reset diff --git a/UKSF.Api.Shared/Queries/GetEmailTemplateQuery.cs b/UKSF.Api.Shared/Queries/GetEmailTemplateQuery.cs index da7f5e91..6b6bf999 100644 --- a/UKSF.Api.Shared/Queries/GetEmailTemplateQuery.cs +++ b/UKSF.Api.Shared/Queries/GetEmailTemplateQuery.cs @@ -50,7 +50,7 @@ public async Task ExecuteAsync(GetEmailTemplateQueryArgs args) private async Task GetTemplateContent(string templateName) { - string templatePath = _fileContext.AppDirectory + $"/EmailHtmlTemplates/{templateName}Template.html"; + string templatePath = _fileContext.AppDirectory + $"/EmailHtmlTemplates/Premailed/{templateName}TemplatePremailed.html"; if (!_fileContext.Exists(templatePath)) { diff --git a/UKSF.Api.Shared/UKSF.Api.Shared.csproj b/UKSF.Api.Shared/UKSF.Api.Shared.csproj index fc4a5b23..3b6b7d56 100644 --- a/UKSF.Api.Shared/UKSF.Api.Shared.csproj +++ b/UKSF.Api.Shared/UKSF.Api.Shared.csproj @@ -9,7 +9,7 @@ - + Always From 2492e44a3a87629a5764048565bdd2e380e89d37 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 24 May 2021 22:41:31 +0100 Subject: [PATCH 330/369] 2nd pass premailer --- .../AccountConfirmationTemplatePremailed.html | 71 +++++++--------- .../NotificationTemplatePremailed.html | 71 +++++++--------- .../ResetPasswordTemplatePremailed.html | 80 ++++++++----------- 3 files changed, 88 insertions(+), 134 deletions(-) diff --git a/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/AccountConfirmationTemplatePremailed.html b/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/AccountConfirmationTemplatePremailed.html index 8c3c5b7d..60faa6c2 100644 --- a/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/AccountConfirmationTemplatePremailed.html +++ b/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/AccountConfirmationTemplatePremailed.html @@ -4,12 +4,11 @@ UKSF Password Reset - - - + +
- -
+ UKSF Logo @@ -17,7 +16,7 @@
+
@@ -35,9 +34,9 @@
- +
- @@ -46,7 +45,7 @@

$code$

@@ -55,53 +54,38 @@

$code$

-
+

$code$
-

+

If this request was not made by you, it is safe to ignore

+ - @@ -109,16 +93,17 @@

$code$

- + - - Teamspeak - - - Discord - - - Facebook - - - Instagram - - - Youtube

- Need help? Contact an admin on our Discord

-

© +

© Copyright UKSF 2021

- $randomness$ + $randomness$
diff --git a/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/NotificationTemplatePremailed.html b/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/NotificationTemplatePremailed.html index 52bf509c..297c5344 100644 --- a/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/NotificationTemplatePremailed.html +++ b/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/NotificationTemplatePremailed.html @@ -4,12 +4,11 @@ UKSF Notification - - - + +
- -
+ UKSF Logo @@ -17,7 +16,7 @@
+
@@ -29,9 +28,9 @@
- +
- @@ -40,7 +39,7 @@ -
+

$message$
-

+

You can opt-out of these emails by unchecking 'Email notifications' in your Profile

@@ -50,53 +49,38 @@
+ - @@ -104,16 +88,17 @@
- + - - Teamspeak - - - Discord - - - Facebook - - - Instagram - - - Youtube

- Need help? Contact an admin on our Discord

-

© +

© Copyright UKSF 2021

- $randomness$ + $randomness$
diff --git a/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/ResetPasswordTemplatePremailed.html b/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/ResetPasswordTemplatePremailed.html index c548e658..625cd485 100644 --- a/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/ResetPasswordTemplatePremailed.html +++ b/UKSF.Api.Shared/EmailHtmlTemplates/Premailed/ResetPasswordTemplatePremailed.html @@ -4,12 +4,11 @@ UKSF Password Reset - - - + +
- -
+ UKSF Logo @@ -17,7 +16,7 @@
+ @@ -61,53 +59,38 @@ -
@@ -37,14 +36,13 @@
- +
-
- Reset - Password + + Reset Password
@@ -52,7 +50,7 @@
-

+

If this request was not made by you, it is safe to ignore

+ - @@ -115,16 +98,17 @@
- + - - Teamspeak - - - Discord - - - Facebook - - - Instagram - - - Youtube

- Need help? Contact an admin on our Discord

-

© +

© Copyright UKSF 2021

- $randomness$ + $randomness$
From ba5127443498afb1aa21adbd5809dcd13a7f3a1a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 24 May 2021 22:58:19 +0100 Subject: [PATCH 331/369] Fix mission condition when checking if notifs are disabled --- UKSF.Api.Personnel/Services/NotificationsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Personnel/Services/NotificationsService.cs b/UKSF.Api.Personnel/Services/NotificationsService.cs index 6a2ce106..9b6fd5f0 100644 --- a/UKSF.Api.Personnel/Services/NotificationsService.cs +++ b/UKSF.Api.Personnel/Services/NotificationsService.cs @@ -140,7 +140,7 @@ private void SendTeamspeakNotification(DomainAccount domainAccount, string rawMe private bool NotificationsGloballyDisabled() { - return _variablesService.GetFeatureState("NOTIFICATIONS"); + return !_variablesService.GetFeatureState("NOTIFICATIONS"); } } } From b25029954778c84d00ad1ff004abf157836f4e05 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 25 May 2021 00:40:51 +0100 Subject: [PATCH 332/369] Set up CI with Azure Pipelines [skip ci] --- build.yml | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 build.yml diff --git a/build.yml b/build.yml new file mode 100644 index 00000000..8653de29 --- /dev/null +++ b/build.yml @@ -0,0 +1,76 @@ +trigger: + branches: + include: + - master + +pool: Server + +variables: + solution: '**/*.sln' + buildPlatform: 'Any CPU' + buildConfiguration: 'Release' + +jobs: + - job: BuildTest + displayName: Build & Test + steps: + + - task: DotNetCoreCLI@2 + displayName: 'Restore' + inputs: + command: 'restore' + projects: '$(solution)' + feedsToUse: 'select' + + - task: DotNetCoreCLI@2 + displayName: 'Build' + inputs: + command: 'build' + projects: '$(solution)' + arguments: '/p:DeployOnBuild=false /p:WebPublishMethod=Package /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.stagingDirectory)" /p:configuration="Release" --no-restore' + + - task: DotNetCoreCLI@2 + displayName: 'Test' + inputs: + command: 'test' + projects: '**/*.Tests*.csproj' + arguments: '--configuration $(BuildConfiguration) /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --no-build' + + - job: PublishArtifacts + displayName: Publish Artifacts + dependsOn: BuildTest + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + steps: + + - task: DotNetCoreCLI@2 + displayName: 'Restore' + inputs: + command: 'restore' + projects: '$(solution)' + feedsToUse: 'select' + + - task: DotNetCoreCLI@2 + displayName: 'Publish API (without zipping)' + inputs: + command: publish + publishWebProjects: false + projects: '**/UKSF.Api.csproj' + arguments: '-c Release --output $(Build.BinariesDirectory)/UKSF.Api' + zipAfterPublish: false + modifyOutputPath: false + + - task: ArchiveFiles@2 + displayName: 'Zip API Artifact' + inputs: + rootFolderOrFile: '$(Build.BinariesDirectory)/UKSF.Api' + includeRootFolder: false + archiveType: 'zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/UKSF.Api.zip' + replaceExistingArchive: true + + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact' + inputs: + PathtoPublish: '$(build.artifactstagingdirectory)/UKSF.Api.zip' + ArtifactName: 'UKSF.Api' + publishLocation: 'Container' From 3591ed51bcb10d3aadff2eb31d7dfe9d97572c06 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 25 May 2021 00:49:21 +0100 Subject: [PATCH 333/369] Update build.yml for Azure Pipelines --- build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.yml b/build.yml index 8653de29..7cdd678c 100644 --- a/build.yml +++ b/build.yml @@ -3,7 +3,8 @@ trigger: include: - master -pool: Server +pool: + vmImage: 'ubuntu-latest' variables: solution: '**/*.sln' From 13853bbe10556bb15f63280c09742b4ba0ffd2cc Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 25 May 2021 00:49:44 +0100 Subject: [PATCH 334/369] Update build.yml for Azure Pipelines --- build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.yml b/build.yml index 7cdd678c..ac6b01c2 100644 --- a/build.yml +++ b/build.yml @@ -1,7 +1,7 @@ trigger: branches: include: - - master + - main pool: vmImage: 'ubuntu-latest' @@ -40,7 +40,7 @@ jobs: - job: PublishArtifacts displayName: Publish Artifacts dependsOn: BuildTest - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) steps: - task: DotNetCoreCLI@2 From a653bf9897df254e247f76a83b3e61bdcf75a6b3 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 26 May 2021 19:16:39 +0100 Subject: [PATCH 335/369] Make dates locale-agnostic --- .../Unit/Common/ChangeUtilitiesTests.cs | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs index 483bb25a..306b4721 100644 --- a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs @@ -15,14 +15,17 @@ public class ChangeUtilitiesTests public void Should_detect_changes_for_complex_object() { string id = ObjectId.GenerateNewId().ToString(); + DateTime dobBefore = new(2020, 10, 3, 5, 34, 0); + DateTime dobAfter = new(2020, 11, 3); + DateTime dateAccepted = new(2020, 7, 2, 10, 34, 39); DomainAccount original = new() { Id = id, Firstname = "Tim", Background = "I like trains", - Dob = DateTime.Parse("2018-08-09T05:00:00.307"), + Dob = dobBefore, Rank = "Private", - Application = new() { State = ApplicationState.WAITING, Recruiter = "Bob", ApplicationCommentThread = "thread1", DateCreated = DateTime.Parse("2020-05-02T10:34:39.786") }, + Application = new() { State = ApplicationState.WAITING, Recruiter = "Bob", ApplicationCommentThread = "thread1", DateCreated = new(2020, 5, 2, 10, 34, 39) }, RolePreferences = new() { "Aviatin", "NCO" } }; DomainAccount updated = new() @@ -31,11 +34,8 @@ public void Should_detect_changes_for_complex_object() Firstname = "Timmy", Lastname = "Bob", Background = "I like planes", - Dob = DateTime.Parse("2020-10-03T05:00:34.307"), - Application = new() - { - State = ApplicationState.ACCEPTED, Recruiter = "Bob", DateCreated = DateTime.Parse("2020-05-02T10:34:39.786"), DateAccepted = DateTime.Parse("2020-07-02T10:34:39.786") - }, + Dob = dobAfter, + Application = new() { State = ApplicationState.ACCEPTED, Recruiter = "Bob", DateCreated = new(2020, 5, 2, 10, 34, 39), DateAccepted = dateAccepted }, RolePreferences = new() { "Aviation", "Officer" } }; @@ -45,7 +45,7 @@ public void Should_detect_changes_for_complex_object() .Be( "\n\t'Lastname' added as 'Bob'" + "\n\t'Background' changed from 'I like trains' to 'I like planes'" + - "\n\t'Dob' changed from '09/08/2018 05:00:00' to '03/10/2020 05:00:34'" + + $"\n\t'Dob' changed from '{dobBefore}' to '{dobAfter}'" + "\n\t'Firstname' changed from 'Tim' to 'Timmy'" + "\n\t'RolePreferences' changed:" + "\n\t\tadded: 'Aviation'" + @@ -54,7 +54,7 @@ public void Should_detect_changes_for_complex_object() "\n\t\tremoved: 'NCO'" + "\n\t'Rank' as 'Private' removed" + "\n\t'Application' changed:" + - "\n\t\t'DateAccepted' changed from '01/01/0001 00:00:00' to '02/07/2020 10:34:39'" + + $"\n\t\t'DateAccepted' changed from '{new DateTime()}' to '{dateAccepted}'" + "\n\t\t'State' changed from 'WAITING' to 'ACCEPTED'" + "\n\t\t'ApplicationCommentThread' as 'thread1' removed" ); @@ -64,12 +64,14 @@ public void Should_detect_changes_for_complex_object() public void Should_detect_changes_for_date() { string id = ObjectId.GenerateNewId().ToString(); - DomainAccount original = new() { Id = id, Dob = DateTime.Parse("2020-10-03T05:00:34.307") }; - DomainAccount updated = new() { Id = id, Dob = DateTime.Parse("2020-11-03T00:00:00.000") }; + DateTime dobBefore = new(2020, 10, 3, 5, 34, 0); + DateTime dobAfter = new(2020, 11, 3); + DomainAccount original = new() { Id = id, Dob = dobBefore }; + DomainAccount updated = new() { Id = id, Dob = dobAfter }; string subject = original.Changes(updated); - subject.Should().Be("\n\t'Dob' changed from '03/10/2020 05:00:34' to '03/11/2020 00:00:00'"); + subject.Should().Be($"\n\t'Dob' changed from '{dobBefore}' to '{dobAfter}'"); } [Fact] From 475efdf1e3ff96b1db9a7e0ef6878db258cc13a3 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Wed, 26 May 2021 23:54:11 +0100 Subject: [PATCH 336/369] Adapt for environment-agnostic release --- UKSF.Api/Program.cs | 27 +++++---- UKSF.Api/Startup.cs | 28 ++++------ UKSF.Api/appsettings.json | 7 +++ build.yaml | 114 -------------------------------------- 4 files changed, 35 insertions(+), 141 deletions(-) delete mode 100644 build.yaml diff --git a/UKSF.Api/Program.cs b/UKSF.Api/Program.cs index 22e10b90..038c3f67 100644 --- a/UKSF.Api/Program.cs +++ b/UKSF.Api/Program.cs @@ -6,12 +6,16 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.WindowsServices; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; namespace UKSF.Api { public static class Program { + private static IConfigurationRoot _config; + private static string _environment = Environments.Development; + public static void Main(string[] args) { if (!OperatingSystem.IsWindows()) @@ -28,10 +32,10 @@ public static void Main(string[] args) .ToList() .ForEach(x => AppDomain.CurrentDomain.GetAssemblies().ToList().Add(AppDomain.CurrentDomain.Load(x))); - string environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); - bool isDevelopment = environment == Environments.Development; + _config = new ConfigurationBuilder().SetBasePath(Environment.CurrentDirectory).AddJsonFile("appsettings.json").Build(); + _environment = _config.GetSection("appSettings")["environment"]; - if (isDevelopment) + if (_environment == Environments.Development) { BuildDebugWebHost(args).Run(); } @@ -44,22 +48,22 @@ public static void Main(string[] args) private static IWebHost BuildDebugWebHost(string[] args) { - return WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel().UseContentRoot(Directory.GetCurrentDirectory()).UseUrls("http://*:5000").Build(); + string port = _config.GetSection("appSettings")["port"]; + return WebHost.CreateDefaultBuilder(args).UseStartup().UseKestrel().UseContentRoot(Directory.GetCurrentDirectory()).UseUrls($"http://*:{port}").Build(); } private static IWebHost BuildProductionWebHost(string[] args) { + int port = int.Parse(_config.GetSection("appSettings")["port"]); + int portSsl = int.Parse(_config.GetSection("appSettings")["portSsl"]); + string certificatePath = _config.GetSection("appSettings")["certificatePath"]; return WebHost.CreateDefaultBuilder(args) .UseStartup() .UseKestrel( options => { - options.Listen(IPAddress.Loopback, 5000); - options.Listen( - IPAddress.Loopback, - 5001, - listenOptions => { listenOptions.UseHttps("C:\\ProgramData\\win-acme\\acme-v02.api.letsencrypt.org\\Certificates\\uk-sf.co.uk.pfx"); } - ); + options.Listen(IPAddress.Loopback, port); + options.Listen(IPAddress.Loopback, portSsl, listenOptions => { listenOptions.UseHttps(certificatePath); }); } ) .UseContentRoot(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule?.FileName)) @@ -68,7 +72,8 @@ private static IWebHost BuildProductionWebHost(string[] args) private static void InitLogging() { - string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "UKSF.Api"); + string certificatePath = _config.GetSection("appSettings")["certificatePath"]; + string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), certificatePath); Directory.CreateDirectory(appData); string[] logFiles = new DirectoryInfo(appData).EnumerateFiles("*.log").OrderByDescending(file => file.LastWriteTime).Select(file => file.Name).ToArray(); if (logFiles.Length > 9) diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 96dada8b..289ab16a 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -1,9 +1,5 @@ using System; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Configuration; @@ -39,18 +35,7 @@ public void ConfigureServices(IServiceCollection services) { services.AddUksf(_configuration, _currentEnvironment); - services.AddCors( - options => options.AddPolicy( - "CorsPolicy", - builder => - { - builder.AllowAnyMethod() - .AllowAnyHeader() - .WithOrigins("http://localhost:4200", "http://localhost:4300", "https://uk-sf.co.uk", "https://api.uk-sf.co.uk", "https://uk-sf.co.uk") - .AllowCredentials(); - } - ) - ); + services.AddCors(options => options.AddPolicy("CorsPolicy", builder => { builder.AllowAnyMethod().AllowAnyHeader().WithOrigins(GetCorsPaths()).AllowCredentials(); })); services.AddControllers(options => { options.EnableEndpointRouting = true; }); services.AddRouting() .AddSwaggerGen(options => { options.SwaggerDoc("v1", new() { Title = "UKSF API", Version = "v1" }); }) @@ -100,5 +85,16 @@ private static void OnShutdown(IServiceProvider serviceProvider) { serviceProvider.StopUksfServices(); } + + private string[] GetCorsPaths() + { + string environment = _configuration.GetSection("appSettings")["environment"]; + return environment switch + { + "Development" => new[] { "http://localhost:4200", "http://localhost:4300", "https://dev.uk-sf.co.uk", "https://api-dev.uk-sf.co.uk" }, + "Production" => new[] { "https://uk-sf.co.uk", "https://api.uk-sf.co.uk" }, + _ => throw new ArgumentException($"Invalid environment {environment}", nameof(environment)) + }; + } } } diff --git a/UKSF.Api/appsettings.json b/UKSF.Api/appsettings.json index aac55d0d..6d64234e 100644 --- a/UKSF.Api/appsettings.json +++ b/UKSF.Api/appsettings.json @@ -1,4 +1,11 @@ { + "appSettings": { + "environment": "Development", + "port": "5500", + "portSsl": "5501", + "certificatePath": "", + "logsPath": "" + }, "ConnectionStrings": { "database": "", "discord": "" diff --git a/build.yaml b/build.yaml deleted file mode 100644 index d4321175..00000000 --- a/build.yaml +++ /dev/null @@ -1,114 +0,0 @@ -trigger: - branches: - include: - - master - -#pool: -# vmImage: 'ubuntu-latest' - -variables: - solution: '**/*.sln' - buildPlatform: 'Any CPU' - buildConfiguration: 'Release' - -jobs: - - job: BuildTest - displayName: Build & Test - steps: - - - task: SonarCloudPrepare@1 - inputs: - SonarCloud: 'Codat - SonarCloud - Clients API' - organization: 'codat' - scannerMode: 'MSBuild' - projectKey: 'Codat_Clients-API' - projectName: 'Clients API' - extraProperties: 'sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/**/coverage.opencover.xml' - - - task: DotNetCoreCLI@2 - displayName: 'Restore' - inputs: - command: 'restore' - projects: '$(solution)' - feedsToUse: 'config' - nugetConfigPath: 'NuGet.config' - externalFeedCredentials: 'Codat NuGet' - - - task: DotNetCoreCLI@2 - displayName: 'Build' - inputs: - command: 'build' - projects: '$(solution)' - arguments: '/p:DeployOnBuild=false /p:WebPublishMethod=Package /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.stagingDirectory)" /p:configuration="Release" --no-restore' - - - task: DotNetCoreCLI@2 - displayName: 'Test' - inputs: - command: 'test' - projects: '**/*.Tests*.csproj' - arguments: '--configuration $(BuildConfiguration) /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --no-build' - - - task: SonarCloudAnalyze@1 - - - task: SonarCloudPublish@1 - inputs: - pollingTimeoutSec: '30' - - - job: PublishArtifacts - displayName: Publish Artifacts - dependsOn: BuildTest - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) - steps: - - - task: DotNetCoreCLI@2 - displayName: 'Restore' - inputs: - command: 'restore' - projects: '$(solution)' - feedsToUse: 'config' - nugetConfigPath: 'NuGet.config' - externalFeedCredentials: 'Codat NuGet' - - - task: DotNetCoreCLI@2 - displayName: 'Publish WebApi (without zipping)' - inputs: - command: publish - publishWebProjects: false - projects: '**/Codat.Clients.Api.csproj' - arguments: '-c Release --output $(Build.BinariesDirectory)/Codat.Clients.Api' - zipAfterPublish: false - modifyOutputPath: false - - - task: DotNetCoreCLI@2 - displayName: 'Pack Codat.Clients.Api.Client' - inputs: - command: 'pack' - vstsFeed: '346be1b7-5a18-453a-84be-b51f2e6f09a4' - packagesToPack: '**/Codat.Clients.Api.Client.csproj' - versioningScheme: 'off' - includeSymbols: true - - - task: ArchiveFiles@2 - displayName: 'Zip Artifact API + Jobs' - inputs: - rootFolderOrFile: '$(Build.BinariesDirectory)/Codat.Clients.Api' - includeRootFolder: false - archiveType: 'zip' - archiveFile: '$(Build.ArtifactStagingDirectory)/Codat.Clients.Api.zip' - replaceExistingArchive: true - - - task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact' - inputs: - PathtoPublish: '$(build.artifactstagingdirectory)/Codat.Clients.Api.zip' - ArtifactName: 'Api' - publishLocation: 'Container' - - - task: NuGetCommand@2 - displayName: 'Publish All Packages And Symbols' - inputs: - command: 'push' - packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' - nuGetFeedType: 'internal' - publishVstsFeed: '346be1b7-5a18-453a-84be-b51f2e6f09a4' - allowPackageConflicts: true From f82e28effa9e6915f4074c539c54d319f5920951 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 May 2021 00:14:49 +0100 Subject: [PATCH 337/369] Determine run as service from app setting --- UKSF.Api/Program.cs | 9 +++++---- UKSF.Api/appsettings.json | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/UKSF.Api/Program.cs b/UKSF.Api/Program.cs index 038c3f67..51c02900 100644 --- a/UKSF.Api/Program.cs +++ b/UKSF.Api/Program.cs @@ -34,15 +34,16 @@ public static void Main(string[] args) _config = new ConfigurationBuilder().SetBasePath(Environment.CurrentDirectory).AddJsonFile("appsettings.json").Build(); _environment = _config.GetSection("appSettings")["environment"]; + bool runAsService = bool.Parse(_config.GetSection("appSettings")["runAsService"]); - if (_environment == Environments.Development) + if (runAsService) { - BuildDebugWebHost(args).Run(); + InitLogging(); + BuildProductionWebHost(args).RunAsService(); } else { - InitLogging(); - BuildProductionWebHost(args).RunAsService(); + BuildDebugWebHost(args).Run(); } } diff --git a/UKSF.Api/appsettings.json b/UKSF.Api/appsettings.json index 6d64234e..bcb2b208 100644 --- a/UKSF.Api/appsettings.json +++ b/UKSF.Api/appsettings.json @@ -1,5 +1,6 @@ { "appSettings": { + "runAsService": false, "environment": "Development", "port": "5500", "portSsl": "5501", From 50d7522a14b32d2d8cf2b751637140de6c5e7d16 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 May 2021 18:40:33 +0100 Subject: [PATCH 338/369] Update build.yml for Azure Pipelines --- build.yml | 45 ++++++++------------------------------------- 1 file changed, 8 insertions(+), 37 deletions(-) diff --git a/build.yml b/build.yml index ac6b01c2..dc093688 100644 --- a/build.yml +++ b/build.yml @@ -3,55 +3,26 @@ trigger: include: - main -pool: - vmImage: 'ubuntu-latest' - -variables: - solution: '**/*.sln' - buildPlatform: 'Any CPU' - buildConfiguration: 'Release' +pool: Avengers jobs: - - job: BuildTest - displayName: Build & Test + - job: Test + displayName: Test steps: - - - task: DotNetCoreCLI@2 - displayName: 'Restore' - inputs: - command: 'restore' - projects: '$(solution)' - feedsToUse: 'select' - - - task: DotNetCoreCLI@2 - displayName: 'Build' - inputs: - command: 'build' - projects: '$(solution)' - arguments: '/p:DeployOnBuild=false /p:WebPublishMethod=Package /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.stagingDirectory)" /p:configuration="Release" --no-restore' - - task: DotNetCoreCLI@2 displayName: 'Test' inputs: command: 'test' projects: '**/*.Tests*.csproj' - arguments: '--configuration $(BuildConfiguration) /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --no-build' + arguments: '-c Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover' - - job: PublishArtifacts - displayName: Publish Artifacts - dependsOn: BuildTest + - job: Publish + displayName: Publish + dependsOn: Test condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) steps: - - - task: DotNetCoreCLI@2 - displayName: 'Restore' - inputs: - command: 'restore' - projects: '$(solution)' - feedsToUse: 'select' - - task: DotNetCoreCLI@2 - displayName: 'Publish API (without zipping)' + displayName: 'Publish API' inputs: command: publish publishWebProjects: false From 882808881b10c9670cebbedcba2a232d9b11c18b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 May 2021 18:46:28 +0100 Subject: [PATCH 339/369] Update build.yml for Azure Pipelines --- build.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/build.yml b/build.yml index dc093688..6ebd9055 100644 --- a/build.yml +++ b/build.yml @@ -9,12 +9,26 @@ jobs: - job: Test displayName: Test steps: + - task: DotNetCoreCLI@2 + displayName: 'Restore' + inputs: + command: 'restore' + projects: '**/*.sln' + feedsToUse: 'select' + + - task: DotNetCoreCLI@2 + displayName: 'Build' + inputs: + command: 'build' + projects: '**/*.sln' + arguments: '-c Release --no-restore' + - task: DotNetCoreCLI@2 displayName: 'Test' inputs: command: 'test' projects: '**/*.Tests*.csproj' - arguments: '-c Release /p:CollectCoverage=true /p:CoverletOutputFormat=opencover' + arguments: '-c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover' - job: Publish displayName: Publish From 67f3f39bac12644a4c6df7279209ce865fc3a122 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 May 2021 18:52:36 +0100 Subject: [PATCH 340/369] Update build.yml for Azure Pipelines --- build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.yml b/build.yml index 6ebd9055..807f10f6 100644 --- a/build.yml +++ b/build.yml @@ -35,6 +35,13 @@ jobs: dependsOn: Test condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) steps: + - task: DotNetCoreCLI@2 + displayName: 'Restore' + inputs: + command: 'restore' + projects: '**/UKSF.Api.csproj' + feedsToUse: 'select' + - task: DotNetCoreCLI@2 displayName: 'Publish API' inputs: From a6cd3005f69dbc3941fa6ff9b65ae332c71b8647 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 May 2021 18:57:11 +0100 Subject: [PATCH 341/369] Update build.yml for Azure Pipelines --- build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.yml b/build.yml index 807f10f6..01a0e24f 100644 --- a/build.yml +++ b/build.yml @@ -14,7 +14,8 @@ jobs: inputs: command: 'restore' projects: '**/*.sln' - feedsToUse: 'select' + feedsToUse: 'config' + nugetConfigPath: 'NuGet.config' - task: DotNetCoreCLI@2 displayName: 'Build' @@ -40,7 +41,8 @@ jobs: inputs: command: 'restore' projects: '**/UKSF.Api.csproj' - feedsToUse: 'select' + feedsToUse: 'config' + nugetConfigPath: 'NuGet.config' - task: DotNetCoreCLI@2 displayName: 'Publish API' From 0957ffd645410a672fbfbcf1c6963bc57cb01344 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 May 2021 19:03:40 +0100 Subject: [PATCH 342/369] Update build.yml for Azure Pipelines --- build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.yml b/build.yml index 01a0e24f..1d70d761 100644 --- a/build.yml +++ b/build.yml @@ -50,7 +50,7 @@ jobs: command: publish publishWebProjects: false projects: '**/UKSF.Api.csproj' - arguments: '-c Release --output $(Build.BinariesDirectory)/UKSF.Api' + arguments: '-c Release --output "$(Build.BinariesDirectory)/UKSF.Api"' zipAfterPublish: false modifyOutputPath: false From a1a171bd395db1dd725abaf2c1a6b0a807efbd99 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 May 2021 19:12:56 +0100 Subject: [PATCH 343/369] Use correct path for logs --- UKSF.Api/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api/Program.cs b/UKSF.Api/Program.cs index 51c02900..1b0883cd 100644 --- a/UKSF.Api/Program.cs +++ b/UKSF.Api/Program.cs @@ -73,7 +73,7 @@ private static IWebHost BuildProductionWebHost(string[] args) private static void InitLogging() { - string certificatePath = _config.GetSection("appSettings")["certificatePath"]; + string certificatePath = _config.GetSection("appSettings")["logsPath"]; string appData = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), certificatePath); Directory.CreateDirectory(appData); string[] logFiles = new DirectoryInfo(appData).EnumerateFiles("*.log").OrderByDescending(file => file.LastWriteTime).Select(file => file.Name).ToArray(); From 24be884e629b0bc1610a46ea26de279705cda21a Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 May 2021 19:27:17 +0100 Subject: [PATCH 344/369] Add json config to startup --- UKSF.Api/Program.cs | 3 --- UKSF.Api/Startup.cs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/UKSF.Api/Program.cs b/UKSF.Api/Program.cs index 1b0883cd..6732f89d 100644 --- a/UKSF.Api/Program.cs +++ b/UKSF.Api/Program.cs @@ -7,14 +7,12 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.WindowsServices; using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; namespace UKSF.Api { public static class Program { private static IConfigurationRoot _config; - private static string _environment = Environments.Development; public static void Main(string[] args) { @@ -33,7 +31,6 @@ public static void Main(string[] args) .ForEach(x => AppDomain.CurrentDomain.GetAssemblies().ToList().Add(AppDomain.CurrentDomain.Load(x))); _config = new ConfigurationBuilder().SetBasePath(Environment.CurrentDirectory).AddJsonFile("appsettings.json").Build(); - _environment = _config.GetSection("appSettings")["environment"]; bool runAsService = bool.Parse(_config.GetSection("appSettings")["runAsService"]); if (runAsService) diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 289ab16a..061454f0 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -27,7 +27,7 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration { _configuration = configuration; _currentEnvironment = currentEnvironment; - IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); + IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddJsonFile("appsettings.json").AddEnvironmentVariables(); builder.Build(); } From 4a4c80b1c25bc60068e1f1eb17537d807e29a898 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 May 2021 19:40:25 +0100 Subject: [PATCH 345/369] Some logging --- UKSF.Api.Base/ApiBaseExtensions.cs | 9 +++++++-- UKSF.Api/Startup.cs | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/UKSF.Api.Base/ApiBaseExtensions.cs b/UKSF.Api.Base/ApiBaseExtensions.cs index 52291c73..df61f1a8 100644 --- a/UKSF.Api.Base/ApiBaseExtensions.cs +++ b/UKSF.Api.Base/ApiBaseExtensions.cs @@ -1,7 +1,9 @@ -using Microsoft.AspNetCore.Http; +using System; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using MoreLinq.Extensions; using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; @@ -11,13 +13,16 @@ public static class ApiBaseExtensions { public static IServiceCollection AddUksfBase(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { + Console.Out.WriteLine(configuration.GetSection("ConnectionStrings").GetChildren().ToDelimitedString(",")); + string connectionString = configuration.GetConnectionString("database"); + Console.Out.WriteLine(connectionString); services.AddContexts() .AddEventHandlers() .AddServices() .AddSingleton(configuration) .AddSingleton(currentEnvironment) .AddSingleton() - .AddSingleton(MongoClientFactory.GetDatabase(configuration.GetConnectionString("database"))) + .AddSingleton(MongoClientFactory.GetDatabase(connectionString)) .AddSingleton() .AddTransient(); services.AddSignalR().AddNewtonsoftJsonProtocol(); diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 061454f0..d5512d79 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -27,6 +27,7 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration { _configuration = configuration; _currentEnvironment = currentEnvironment; + Console.Out.WriteLine(currentEnvironment.ContentRootPath); IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddJsonFile("appsettings.json").AddEnvironmentVariables(); builder.Build(); } From b22347cce2cfbddf7062cb81495f48d1eea5ba67 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 May 2021 19:47:09 +0100 Subject: [PATCH 346/369] Remove specific appsettings load --- UKSF.Api/Startup.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index d5512d79..637784b3 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -28,7 +28,7 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration _configuration = configuration; _currentEnvironment = currentEnvironment; Console.Out.WriteLine(currentEnvironment.ContentRootPath); - IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddJsonFile("appsettings.json").AddEnvironmentVariables(); + IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); builder.Build(); } From de62ac88f6bb5899730967360401be3a73dfa9aa Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 May 2021 20:03:31 +0100 Subject: [PATCH 347/369] Try changing path for program appsettings read --- UKSF.Api/Program.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UKSF.Api/Program.cs b/UKSF.Api/Program.cs index 6732f89d..33d5ffc5 100644 --- a/UKSF.Api/Program.cs +++ b/UKSF.Api/Program.cs @@ -30,9 +30,9 @@ public static void Main(string[] args) .ToList() .ForEach(x => AppDomain.CurrentDomain.GetAssemblies().ToList().Add(AppDomain.CurrentDomain.Load(x))); - _config = new ConfigurationBuilder().SetBasePath(Environment.CurrentDirectory).AddJsonFile("appsettings.json").Build(); - bool runAsService = bool.Parse(_config.GetSection("appSettings")["runAsService"]); + _config = new ConfigurationBuilder().AddJsonFile("appsettings.json").Build(); + bool runAsService = bool.Parse(_config.GetSection("appSettings")["runAsService"]); if (runAsService) { InitLogging(); From e97cbf5bad2a6aefc223d5990cee41d08ede12b3 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 May 2021 20:07:02 +0100 Subject: [PATCH 348/369] Remove pdb output for debug --- UKSF.Api/UKSF.Api.csproj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index 1d0f52ac..eea0763c 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -10,12 +10,6 @@ disable - - 1701;1702;1705;1591 - full - true - - From 1071a8e2b87eaefe035c41042194a03a437edf28 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 27 May 2021 20:24:42 +0100 Subject: [PATCH 349/369] Change version update to not need a body --- UKSF.Api.Admin/Controllers/VersionController.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/UKSF.Api.Admin/Controllers/VersionController.cs b/UKSF.Api.Admin/Controllers/VersionController.cs index b937073e..fd162e76 100644 --- a/UKSF.Api.Admin/Controllers/VersionController.cs +++ b/UKSF.Api.Admin/Controllers/VersionController.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; -using Newtonsoft.Json.Linq; using UKSF.Api.Admin.Context; using UKSF.Api.Admin.Extensions; using UKSF.Api.Admin.Signalr.Clients; @@ -10,7 +9,7 @@ namespace UKSF.Api.Admin.Controllers { - [Route("[controller]")] + [Route("version")] public class VersionController : ControllerBase { private readonly IHubContext _utilityHub; @@ -28,12 +27,14 @@ public string GetFrontendVersion() return _variablesContext.GetSingle("FRONTEND_VERSION").AsString(); } - [HttpPost("update"), Authorize] - public async Task UpdateFrontendVersion([FromBody] JObject body) + [HttpGet("update"), Authorize] + public async Task UpdateFrontendVersion() { - string version = body["version"].ToString(); - await _variablesContext.Update("FRONTEND_VERSION", version); - await _utilityHub.Clients.All.ReceiveFrontendUpdate(version); + int version = _variablesContext.GetSingle("FRONTEND_VERSION").AsInt(); + int newVersion = version + 1; + + await _variablesContext.Update("FRONTEND_VERSION", newVersion); + await _utilityHub.Clients.All.ReceiveFrontendUpdate(newVersion.ToString()); } } } From f541aa479112dd6845ef869a5cd6d1d1d448368e Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 3 Jun 2021 22:55:03 +0100 Subject: [PATCH 350/369] Base64 encode github app token --- UKSF.Api.Admin/Controllers/DebugController.cs | 15 ++++++++ UKSF.Api.Base/ApiBaseExtensions.cs | 6 +--- UKSF.Api.Modpack/Services/GithubService.cs | 4 ++- UKSF.Api.Personnel/ApiPersonnelExtensions.cs | 7 ++++ .../Controllers/AccountNationsController.cs | 24 +++++++++++++ .../Queries/AllNationsByAccountQuery.cs | 35 +++++++++++++++++++ UKSF.Api/Startup.cs | 1 - 7 files changed, 85 insertions(+), 7 deletions(-) create mode 100644 UKSF.Api.Admin/Controllers/DebugController.cs create mode 100644 UKSF.Api.Personnel/Controllers/AccountNationsController.cs create mode 100644 UKSF.Api.Personnel/Queries/AllNationsByAccountQuery.cs diff --git a/UKSF.Api.Admin/Controllers/DebugController.cs b/UKSF.Api.Admin/Controllers/DebugController.cs new file mode 100644 index 00000000..af021212 --- /dev/null +++ b/UKSF.Api.Admin/Controllers/DebugController.cs @@ -0,0 +1,15 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; + +namespace UKSF.Api.Admin.Controllers +{ + [Route("debug")] + public class DebugController : ControllerBase + { + [HttpGet("500"), Authorize] + public void Throw500() + { + throw new("This is a random error"); + } + } +} diff --git a/UKSF.Api.Base/ApiBaseExtensions.cs b/UKSF.Api.Base/ApiBaseExtensions.cs index df61f1a8..92d93bbd 100644 --- a/UKSF.Api.Base/ApiBaseExtensions.cs +++ b/UKSF.Api.Base/ApiBaseExtensions.cs @@ -1,9 +1,7 @@ -using System; -using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using MoreLinq.Extensions; using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; @@ -13,9 +11,7 @@ public static class ApiBaseExtensions { public static IServiceCollection AddUksfBase(this IServiceCollection services, IConfiguration configuration, IHostEnvironment currentEnvironment) { - Console.Out.WriteLine(configuration.GetSection("ConnectionStrings").GetChildren().ToDelimitedString(",")); string connectionString = configuration.GetConnectionString("database"); - Console.Out.WriteLine(connectionString); services.AddContexts() .AddEventHandlers() .AddServices() diff --git a/UKSF.Api.Modpack/Services/GithubService.cs b/UKSF.Api.Modpack/Services/GithubService.cs index ec4c30b9..b6dae15f 100644 --- a/UKSF.Api.Modpack/Services/GithubService.cs +++ b/UKSF.Api.Modpack/Services/GithubService.cs @@ -292,7 +292,9 @@ private async Task GetAuthenticatedClient() private string GetJwtToken() { - string privateKey = _configuration.GetSection("Github")["appPrivateKey"].Replace("\n", Environment.NewLine, StringComparison.Ordinal); + string base64Key = _configuration.GetSection("Github")["appPrivateKey"]; + byte[] base64Bytes = Convert.FromBase64String(base64Key); + string privateKey = Encoding.UTF8.GetString(base64Bytes).Replace("\n", Environment.NewLine, StringComparison.Ordinal); GitHubJwtFactory generator = new(new StringPrivateKeySource(privateKey), new() { AppIntegrationId = APP_ID, ExpirationSeconds = 540 }); return generator.CreateEncodedJwtToken(); } diff --git a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs index e2d1a5cc..da098f5a 100644 --- a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs +++ b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs @@ -5,6 +5,7 @@ using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.EventHandlers; using UKSF.Api.Personnel.Mappers; +using UKSF.Api.Personnel.Queries; using UKSF.Api.Personnel.ScheduledActions; using UKSF.Api.Personnel.Services; using UKSF.Api.Personnel.Signalr.Hubs; @@ -19,6 +20,7 @@ public static IServiceCollection AddUksfPersonnel(this IServiceCollection servic .AddEventHandlers() .AddServices() .AddCommands() + .AddQueries() .AddMappers() .AddActions() .AddTransient() @@ -65,6 +67,11 @@ private static IServiceCollection AddCommands(this IServiceCollection services) return services.AddSingleton(); } + private static IServiceCollection AddQueries(this IServiceCollection services) + { + return services.AddSingleton(); + } + private static IServiceCollection AddMappers(this IServiceCollection services) { return services.AddSingleton(); diff --git a/UKSF.Api.Personnel/Controllers/AccountNationsController.cs b/UKSF.Api.Personnel/Controllers/AccountNationsController.cs new file mode 100644 index 00000000..6220f752 --- /dev/null +++ b/UKSF.Api.Personnel/Controllers/AccountNationsController.cs @@ -0,0 +1,24 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Personnel.Queries; + +namespace UKSF.Api.Personnel.Controllers +{ + [Route("accounts/nations")] + public class AccountNationsController : ControllerBase + { + private readonly IAllNationsByAccountQuery _allNationsByAccountQuery; + + public AccountNationsController(IAllNationsByAccountQuery allNationsByAccountQuery) + { + _allNationsByAccountQuery = allNationsByAccountQuery; + } + + [HttpGet] + public async Task> GetNations() + { + return await _allNationsByAccountQuery.ExecuteAsync(); + } + } +} diff --git a/UKSF.Api.Personnel/Queries/AllNationsByAccountQuery.cs b/UKSF.Api.Personnel/Queries/AllNationsByAccountQuery.cs new file mode 100644 index 00000000..0759baf9 --- /dev/null +++ b/UKSF.Api.Personnel/Queries/AllNationsByAccountQuery.cs @@ -0,0 +1,35 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using UKSF.Api.Personnel.Context; + +namespace UKSF.Api.Personnel.Queries +{ + public interface IAllNationsByAccountQuery + { + Task> ExecuteAsync(); + } + + public class AllNationsByAccountQuery : IAllNationsByAccountQuery + { + private readonly IAccountContext _accountContext; + + public AllNationsByAccountQuery(IAccountContext accountContext) + { + _accountContext = accountContext; + } + + public Task> ExecuteAsync() + { + List nations = _accountContext.Get() + .Select(x => x.Nation) + .Where(x => !string.IsNullOrWhiteSpace(x)) + .GroupBy(x => x) + .OrderByDescending(x => x.Count()) + .ThenBy(x => x.Key) + .Select(x => x.Key) + .ToList(); + return Task.FromResult(nations); + } + } +} diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 637784b3..289ab16a 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -27,7 +27,6 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration { _configuration = configuration; _currentEnvironment = currentEnvironment; - Console.Out.WriteLine(currentEnvironment.ContentRootPath); IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); builder.Build(); } From 032c72c5c678b3a2ec447867e673e042a3e03b1c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Thu, 10 Jun 2021 23:31:51 +0100 Subject: [PATCH 351/369] Emit servers updates, form accounts return, fix comment thread link --- .../Controllers/GameServersController.cs | 46 ++++++++++++++++++- .../Services/GameServersService.cs | 1 + .../Signalr/Clients/IServersClient.cs | 5 ++ .../Controllers/AccountsController.cs | 8 +--- .../Controllers/CommentThreadController.cs | 18 ++++++-- UKSF.Api.Personnel/Models/DomainAccount.cs | 6 +++ 6 files changed, 72 insertions(+), 12 deletions(-) diff --git a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs index 23650c02..9370cba8 100644 --- a/UKSF.Api.ArmaServer/Controllers/GameServersController.cs +++ b/UKSF.Api.ArmaServer/Controllers/GameServersController.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; +using Microsoft.Extensions.Primitives; using MongoDB.Driver; using Newtonsoft.Json.Linq; using UKSF.Api.Admin.Context; @@ -85,8 +86,11 @@ public GameServer CheckGameServers(string check, [FromBody] GameServer gameServe [HttpPut, Authorize] public async Task AddServer([FromBody] GameServer gameServer) { + gameServer.Order = _gameServersContext.Get().Count(); await _gameServersContext.Add(gameServer); + _logger.LogAudit($"Server added '{gameServer}'"); + SendAnyUpdateIfNotCaller(true); } [HttpPatch, Authorize] @@ -117,6 +121,8 @@ await _gameServersContext.Update( .Set(x => x.Mods, gameServer.Mods) .Set(x => x.ServerMods, gameServer.ServerMods) ); + + SendServerUpdateIfNotCaller(gameServer.Id); return environmentChanged; } @@ -127,6 +133,7 @@ public async Task> DeleteGameServer(string id) _logger.LogAudit($"Game server deleted '{gameServer.Name}'"); await _gameServersContext.Delete(id); + SendAnyUpdateIfNotCaller(true); return _gameServersContext.Get(); } @@ -142,6 +149,7 @@ public async Task> UpdateOrder([FromBody] List UploadMissionFile() throw new BadRequestException(exception.Message); // TODO: Needs better error handling } - return new() { Missions = _gameServersService.GetMissionFiles(), MissionReports = missionReports }; + List missions = _gameServersService.GetMissionFiles(); + SendMissionsUpdateIfNotCaller(missions); + return new() { Missions = missions, MissionReports = missionReports }; } [HttpPost("launch/{id}"), Authorize] @@ -216,6 +226,7 @@ public async Task> LaunchServer(string id, [FromBody] JOb await _gameServersService.LaunchGameServer(gameServer); _logger.LogAudit($"Game server launched '{missionSelection}' on '{gameServer.Name}'"); + SendServerUpdateIfNotCaller(gameServer.Id); return patchingResult.Reports; } @@ -230,6 +241,7 @@ public async Task StopServer(string id) throw new BadRequestException("Server is not running. This shouldn't happen so please contact an admin"); } + SendServerUpdateIfNotCaller(gameServer.Id); await _gameServersService.StopGameServer(gameServer); await _gameServersService.GetGameServerStatus(gameServer); return new() { GameServer = gameServer, InstanceCount = _gameServersService.GetGameInstanceCount() }; @@ -256,6 +268,7 @@ public async Task KillServer(string id) } await _gameServersService.GetGameServerStatus(gameServer); + SendServerUpdateIfNotCaller(gameServer.Id); return new() { GameServer = gameServer, InstanceCount = _gameServersService.GetGameInstanceCount() }; } @@ -264,6 +277,7 @@ public void KillAllArmaProcesses() { int killed = _gameServersService.KillAllArmaProcesses(); _logger.LogAudit($"Killed {killed} Arma instances"); + SendAnyUpdateIfNotCaller(); } [HttpGet("{id}/mods"), Authorize] @@ -302,5 +316,35 @@ public async Task SetDisabledState([FromBody] JObject body) await _variablesContext.Update("SERVER_CONTROL_DISABLED", state); await _serversHub.Clients.All.ReceiveDisabledState(state); } + + private void SendAnyUpdateIfNotCaller(bool skipRefresh = false) + { + if (!HttpContext.Request.Headers.TryGetValue("Hub-Connection-Id", out StringValues connectionId)) + { + return; + } + + _ = _serversHub.Clients.All.ReceiveAnyUpdateIfNotCaller(connectionId, skipRefresh); + } + + private void SendServerUpdateIfNotCaller(string serverId) + { + if (!HttpContext.Request.Headers.TryGetValue("Hub-Connection-Id", out StringValues connectionId)) + { + return; + } + + _ = _serversHub.Clients.All.ReceiveServerUpdateIfNotCaller(connectionId, serverId); + } + + private void SendMissionsUpdateIfNotCaller(List missions) + { + if (!HttpContext.Request.Headers.TryGetValue("Hub-Connection-Id", out StringValues connectionId)) + { + return; + } + + _ = _serversHub.Clients.All.ReceiveMissionsUpdateIfNotCaller(connectionId, missions); + } } } diff --git a/UKSF.Api.ArmaServer/Services/GameServersService.cs b/UKSF.Api.ArmaServer/Services/GameServersService.cs index 75b835fb..56dc5778 100644 --- a/UKSF.Api.ArmaServer/Services/GameServersService.cs +++ b/UKSF.Api.ArmaServer/Services/GameServersService.cs @@ -79,6 +79,7 @@ public async Task GetGameServerStatus(GameServer gameServer) using HttpClient client = new(); client.DefaultRequestHeaders.Accept.Add(new("application/json")); + client.Timeout = TimeSpan.FromSeconds(1); try { HttpResponseMessage response = await client.GetAsync($"http://localhost:{gameServer.ApiPort}/server"); diff --git a/UKSF.Api.ArmaServer/Signalr/Clients/IServersClient.cs b/UKSF.Api.ArmaServer/Signalr/Clients/IServersClient.cs index ec66cf7b..31a85307 100644 --- a/UKSF.Api.ArmaServer/Signalr/Clients/IServersClient.cs +++ b/UKSF.Api.ArmaServer/Signalr/Clients/IServersClient.cs @@ -1,9 +1,14 @@ +using System.Collections.Generic; using System.Threading.Tasks; +using UKSF.Api.ArmaServer.Models; namespace UKSF.Api.ArmaServer.Signalr.Clients { public interface IServersClient { Task ReceiveDisabledState(bool state); + Task ReceiveAnyUpdateIfNotCaller(string connectionId, bool skipRefresh); + Task ReceiveServerUpdateIfNotCaller(string connectionId, string serverId); + Task ReceiveMissionsUpdateIfNotCaller(string connectionId, List missions); } } diff --git a/UKSF.Api.Personnel/Controllers/AccountsController.cs b/UKSF.Api.Personnel/Controllers/AccountsController.cs index 8a27a0d4..c35d5435 100644 --- a/UKSF.Api.Personnel/Controllers/AccountsController.cs +++ b/UKSF.Api.Personnel/Controllers/AccountsController.cs @@ -156,10 +156,8 @@ public async Task ResendConfirmationCode() } [HttpGet("under"), Authorize(Roles = Permissions.COMMAND)] - public List GetAccountsUnder([FromQuery] bool reverse = false) + public List GetAccountsUnder([FromQuery] bool reverse = false) { - List accounts = new(); - List memberAccounts = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER).ToList(); memberAccounts = memberAccounts.OrderBy(x => x.Rank, new RankComparer(_ranksService)).ThenBy(x => x.Lastname).ThenBy(x => x.Firstname).ToList(); if (reverse) @@ -167,9 +165,7 @@ public List GetAccountsUnder([FromQuery] bool reverse = false) memberAccounts.Reverse(); } - accounts.AddRange(memberAccounts.Select(x => new { value = x.Id, displayValue = _displayNameService.GetDisplayName(x) })); - - return accounts; + return memberAccounts.Select(x => new BasicAccount { Id = x.Id, DisplayName = _displayNameService.GetDisplayName(x) }).ToList(); } [HttpGet("roster"), Authorize] diff --git a/UKSF.Api.Personnel/Controllers/CommentThreadController.cs b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs index c65f220a..7d595990 100644 --- a/UKSF.Api.Personnel/Controllers/CommentThreadController.cs +++ b/UKSF.Api.Personnel/Controllers/CommentThreadController.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Hosting; using MongoDB.Bson; using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; @@ -21,6 +22,7 @@ public class CommentThreadController : ControllerBase private readonly ICommentThreadContext _commentThreadContext; private readonly ICommentThreadService _commentThreadService; private readonly IDisplayNameService _displayNameService; + private readonly IHostEnvironment _environment; private readonly IHttpContextService _httpContextService; private readonly INotificationsService _notificationsService; private readonly IRanksService _ranksService; @@ -35,7 +37,8 @@ public CommentThreadController( IDisplayNameService displayNameService, IRecruitmentService recruitmentService, INotificationsService notificationsService, - IHttpContextService httpContextService + IHttpContextService httpContextService, + IHostEnvironment environment ) { _accountContext = accountContext; @@ -47,6 +50,7 @@ IHttpContextService httpContextService _recruitmentService = recruitmentService; _notificationsService = notificationsService; _httpContextService = httpContextService; + _environment = environment; } [HttpGet("{id}"), Authorize] @@ -93,18 +97,22 @@ public async Task AddComment(string commentThreadId, [FromBody] Comment comment) comment.Timestamp = DateTime.Now; comment.Author = _httpContextService.GetUserId(); await _commentThreadService.InsertComment(commentThreadId, comment); + CommentThread thread = _commentThreadContext.GetSingle(commentThreadId); IEnumerable participants = _commentThreadService.GetCommentThreadParticipants(thread.Id); - foreach (string objectId in participants.Where(x => x != comment.Author)) + DomainAccount applicationAccount = _accountContext.GetSingle(x => x.Application?.ApplicationCommentThread == commentThreadId || x.Application?.RecruiterCommentThread == commentThreadId); + + foreach (string participant in participants.Where(x => x != comment.Author)) { - // TODO: Set correct link when comment thread is between /application and /recruitment/id + string url = _environment.IsDevelopment() ? "http://localhost:4200" : "https://uk-sf.co.uk"; + string link = applicationAccount.Id != participant ? $"{url}/recruitment/{applicationAccount.Id}" : $"{url}/application"; _notificationsService.Add( new() { - Owner = objectId, + Owner = participant, Icon = NotificationIcons.COMMENT, Message = $"{_displayNameService.GetDisplayName(comment.Author)} replied to a comment:\n\"{comment.Content}\"", - Link = HttpContext.Request.Headers["Referer"].ToString().Replace("http://localhost:4200", "").Replace("https://www.uk-sf.co.uk", "").Replace("https://uk-sf.co.uk", "") + Link = link } ); } diff --git a/UKSF.Api.Personnel/Models/DomainAccount.cs b/UKSF.Api.Personnel/Models/DomainAccount.cs index aa2c168d..5998f68a 100644 --- a/UKSF.Api.Personnel/Models/DomainAccount.cs +++ b/UKSF.Api.Personnel/Models/DomainAccount.cs @@ -67,4 +67,10 @@ public class Account public string UnitAssignment; public string UnitsExperience; } + + public class BasicAccount + { + public string DisplayName; + public string Id; + } } From 130b2271c11def6b0a07a3bc54245eec9c4a4132 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 26 Jun 2021 14:54:18 +0100 Subject: [PATCH 352/369] Remove timeout from get server --- UKSF.Api.ArmaServer/Services/GameServersService.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/UKSF.Api.ArmaServer/Services/GameServersService.cs b/UKSF.Api.ArmaServer/Services/GameServersService.cs index 56dc5778..75b835fb 100644 --- a/UKSF.Api.ArmaServer/Services/GameServersService.cs +++ b/UKSF.Api.ArmaServer/Services/GameServersService.cs @@ -79,7 +79,6 @@ public async Task GetGameServerStatus(GameServer gameServer) using HttpClient client = new(); client.DefaultRequestHeaders.Accept.Add(new("application/json")); - client.Timeout = TimeSpan.FromSeconds(1); try { HttpResponseMessage response = await client.GetAsync($"http://localhost:{gameServer.ApiPort}/server"); From b90a79e62c54263c10519d53b733e38cfc2f893d Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 13 Jul 2021 21:15:20 +0100 Subject: [PATCH 353/369] Move optionals for acre --- .../BuildSteps/Mods/BuildStepBuildAcre.cs | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index bb7bfc0c..b7d878a1 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -10,6 +10,7 @@ public class BuildStepBuildAcre : ModBuildStep { public const string NAME = "Build ACRE"; private const string MOD_NAME = "acre"; + private readonly List _allowedOptionals = new() { "acre_sys_gm", "acre_sys_sog" }; private readonly List _errorExclusions = new() { "Found DirectX", "Linking statically", "Visual Studio 16", "INFO: Building", "Build Type" }; @@ -26,13 +27,30 @@ protected override async Task ProcessExecute() StepLogger.LogSurround("\nRunning make.py..."); BuildProcessHelper processHelper = new(StepLogger, CancellationTokenSource, errorExclusions: _errorExclusions, ignoreErrorGateClose: "File written to", ignoreErrorGateOpen: "MakePbo Version"); - processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect compile"), (int) TimeSpan.FromMinutes(10).TotalMilliseconds); + processHelper.Run(toolsPath, PythonPath, MakeCommand("redirect compile"), (int)TimeSpan.FromMinutes(10).TotalMilliseconds); StepLogger.LogSurround("Make.py complete"); } StepLogger.LogSurround("\nMoving ACRE release to build..."); await CopyDirectory(releasePath, buildPath); StepLogger.LogSurround("Moved ACRE release to build"); + + StepLogger.LogSurround("\nMoving optionals..."); + await MoveOptionals(buildPath); + StepLogger.LogSurround("Moved optionals"); + } + + private async Task MoveOptionals(string buildPath) + { + string optionalsPath = Path.Join(buildPath, "optionals"); + string addonsPath = Path.Join(buildPath, "addons"); + DirectoryInfo addons = new(addonsPath); + foreach (string optionalName in _allowedOptionals) + { + DirectoryInfo optional = new(Path.Join(optionalsPath, $"@{optionalName}", "addons")); + List files = GetDirectoryContents(optional); + await CopyFiles(optional, addons, files); + } } } } From cdc2dea5236d2d71cb9bb16c5be187919b52cb31 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 13 Jul 2021 21:35:28 +0100 Subject: [PATCH 354/369] Always force build mods if first RC build --- .../Services/BuildProcess/Steps/BuildStep.cs | 12 ++---------- UKSF.Api.Modpack/Services/BuildsService.cs | 6 +++--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs index d524a00d..390bb804 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildStep.cs @@ -193,15 +193,7 @@ internal string GetBuildSourcesPath() internal void SetEnvironmentVariable(string key, object value) { - if (Build.EnvironmentVariables.ContainsKey(key)) - { - Build.EnvironmentVariables[key] = value; - } - else - { - Build.EnvironmentVariables.Add(key, value); - } - + Build.EnvironmentVariables[key] = value; _updateBuildCallback(Builders.Update.Set(x => x.EnvironmentVariables, Build.EnvironmentVariables)); } @@ -210,7 +202,7 @@ internal T GetEnvironmentVariable(string key) if (Build.EnvironmentVariables.ContainsKey(key)) { object value = Build.EnvironmentVariables[key]; - return (T) value; + return (T)value; } return default; diff --git a/UKSF.Api.Modpack/Services/BuildsService.cs b/UKSF.Api.Modpack/Services/BuildsService.cs index 81347bbc..795880b0 100644 --- a/UKSF.Api.Modpack/Services/BuildsService.cs +++ b/UKSF.Api.Modpack/Services/BuildsService.cs @@ -243,7 +243,7 @@ private static void SetEnvironmentVariables(ModpackBuild build, ModpackBuild pre private static void CheckEnvironmentVariable(ModpackBuild build, ModpackBuild previousBuild, string key, string stepName, bool force) { - if (force) + if (force || build.Environment == GameEnvironment.RC && build.BuildNumber == 1) { build.EnvironmentVariables[key] = true; return; @@ -251,11 +251,11 @@ private static void CheckEnvironmentVariable(ModpackBuild build, ModpackBuild pr if (previousBuild.EnvironmentVariables.ContainsKey(key)) { - bool updated = (bool) previousBuild.EnvironmentVariables[key]; + bool updated = (bool)previousBuild.EnvironmentVariables[key]; if (updated) { ModpackBuildStep step = previousBuild.Steps.FirstOrDefault(x => x.Name == stepName); - if (step != null && (!step.Finished || step.BuildResult == ModpackBuildResult.FAILED || step.BuildResult == ModpackBuildResult.CANCELLED)) + if (step != null && (!step.Finished || step.BuildResult is ModpackBuildResult.FAILED or ModpackBuildResult.CANCELLED)) { build.EnvironmentVariables[key] = true; } From 1b783f2c850aa729beaa98874117d8d2ace2b123 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 13 Jul 2021 22:13:02 +0100 Subject: [PATCH 355/369] Add test, move logic for rc force --- .../BuildsServiceTests.cs | 53 +++++++++++++++++++ UKSF.Api.Modpack/Services/BuildsService.cs | 20 ++++--- UKSF.Api.Modpack/Services/ModpackService.cs | 2 +- 3 files changed, 63 insertions(+), 12 deletions(-) create mode 100644 Tests/UKSF.Api.Modpack.Tests/BuildsServiceTests.cs diff --git a/Tests/UKSF.Api.Modpack.Tests/BuildsServiceTests.cs b/Tests/UKSF.Api.Modpack.Tests/BuildsServiceTests.cs new file mode 100644 index 00000000..e408debf --- /dev/null +++ b/Tests/UKSF.Api.Modpack.Tests/BuildsServiceTests.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using FluentAssertions; +using Moq; +using UKSF.Api.ArmaServer.Models; +using UKSF.Api.Modpack.Context; +using UKSF.Api.Modpack.Models; +using UKSF.Api.Modpack.Services; +using UKSF.Api.Modpack.Services.BuildProcess; +using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Events; +using UKSF.Api.Shared.Services; +using Xunit; + +namespace UKSF.Api.Modpack.Tests +{ + public class BuildsServiceTests + { + private readonly Mock _mockAccountContext; + private readonly Mock _mockBuildsContext; + private readonly Mock _mockBuildStepService; + private readonly BuildsService _subject; + + public BuildsServiceTests() + { + _mockBuildsContext = new(); + _mockBuildStepService = new(); + _mockAccountContext = new(); + Mock mockHttpContextService = new(); + Mock mockLogger = new(); + + _subject = new(_mockBuildsContext.Object, _mockBuildStepService.Object, _mockAccountContext.Object, mockHttpContextService.Object, mockLogger.Object); + } + + [Fact] + public async Task When_creating_rc_build() + { + _mockBuildsContext.Setup(x => x.Get(It.IsAny>())).Returns(new List()); + _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(new DomainAccount { Id = "accountId" }); + _mockBuildStepService.Setup(x => x.GetSteps(GameEnvironment.RC)).Returns(new List()); + + GithubCommit githubCommit = new() { Author = "author" }; + ModpackBuild result = await _subject.CreateRcBuild("1.1.0", githubCommit); + + result.Environment.Should().Be(GameEnvironment.RC); + result.BuildNumber.Should().Be(1); + result.BuilderId.Should().Be("accountId"); + result.EnvironmentVariables.Should().BeEquivalentTo(new Dictionary { { "ace_updated", true }, { "acre_updated", true }, { "air_updated", true } }); + } + } +} diff --git a/UKSF.Api.Modpack/Services/BuildsService.cs b/UKSF.Api.Modpack/Services/BuildsService.cs index 795880b0..74915f32 100644 --- a/UKSF.Api.Modpack/Services/BuildsService.cs +++ b/UKSF.Api.Modpack/Services/BuildsService.cs @@ -116,11 +116,7 @@ public async Task CreateRcBuild(string version, GithubCommit commi Steps = _buildStepService.GetSteps(GameEnvironment.RC) }; - if (previousBuild != null) - { - SetEnvironmentVariables(build, previousBuild); - } - + SetEnvironmentVariables(build, previousBuild); await _buildsContext.Add(build); return build; } @@ -131,7 +127,7 @@ public async Task CreateReleaseBuild(string version) ModpackBuild previousBuild = GetRcBuilds().FirstOrDefault(x => x.Version == version); if (previousBuild == null) { - throw new InvalidOperationException("Release build requires at leaste one RC build"); + throw new InvalidOperationException("Release build requires at least one RC build"); } ModpackBuild build = new() @@ -236,14 +232,16 @@ private async Task FinishBuild(ModpackBuild build, ModpackBuildResult result) private static void SetEnvironmentVariables(ModpackBuild build, ModpackBuild previousBuild, NewBuild newBuild = null) { - CheckEnvironmentVariable(build, previousBuild, "ace_updated", "Build ACE", newBuild?.Ace ?? false); - CheckEnvironmentVariable(build, previousBuild, "acre_updated", "Build ACRE", newBuild?.Acre ?? false); - CheckEnvironmentVariable(build, previousBuild, "air_updated", "Build Air", newBuild?.Air ?? false); + bool forceIfRcBuild = build.Environment == GameEnvironment.RC && previousBuild == null; + + SetEnvironmentVariable(build, previousBuild, "ace_updated", "Build ACE", newBuild?.Ace ?? forceIfRcBuild); + SetEnvironmentVariable(build, previousBuild, "acre_updated", "Build ACRE", newBuild?.Acre ?? forceIfRcBuild); + SetEnvironmentVariable(build, previousBuild, "air_updated", "Build Air", newBuild?.Air ?? forceIfRcBuild); } - private static void CheckEnvironmentVariable(ModpackBuild build, ModpackBuild previousBuild, string key, string stepName, bool force) + private static void SetEnvironmentVariable(ModpackBuild build, ModpackBuild previousBuild, string key, string stepName, bool force) { - if (force || build.Environment == GameEnvironment.RC && build.BuildNumber == 1) + if (force) { build.EnvironmentVariables[key] = true; return; diff --git a/UKSF.Api.Modpack/Services/ModpackService.cs b/UKSF.Api.Modpack/Services/ModpackService.cs index 78901876..f33a2371 100644 --- a/UKSF.Api.Modpack/Services/ModpackService.cs +++ b/UKSF.Api.Modpack/Services/ModpackService.cs @@ -159,7 +159,7 @@ public async Task CreateRcBuildFromPush(PushWebhookPayload payload) { string rcVersion = await _githubService.GetReferenceVersion(payload.Ref); ModpackRelease release = _releaseService.GetRelease(rcVersion); - if (release != null && !release.IsDraft) + if (release is { IsDraft: false }) { _logger.LogWarning($"An attempt to build a release candidate for version {rcVersion} failed because the version has already been released."); return; From be9eb4df0e3c33e02d20eee76f4ac5dbbff2ce43 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 13 Jul 2021 22:19:10 +0100 Subject: [PATCH 356/369] Fix bad name for air variable --- Tests/UKSF.Api.Modpack.Tests/BuildsServiceTests.cs | 2 +- UKSF.Api.Modpack/Services/BuildsService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/UKSF.Api.Modpack.Tests/BuildsServiceTests.cs b/Tests/UKSF.Api.Modpack.Tests/BuildsServiceTests.cs index e408debf..1b29339f 100644 --- a/Tests/UKSF.Api.Modpack.Tests/BuildsServiceTests.cs +++ b/Tests/UKSF.Api.Modpack.Tests/BuildsServiceTests.cs @@ -47,7 +47,7 @@ public async Task When_creating_rc_build() result.Environment.Should().Be(GameEnvironment.RC); result.BuildNumber.Should().Be(1); result.BuilderId.Should().Be("accountId"); - result.EnvironmentVariables.Should().BeEquivalentTo(new Dictionary { { "ace_updated", true }, { "acre_updated", true }, { "air_updated", true } }); + result.EnvironmentVariables.Should().BeEquivalentTo(new Dictionary { { "ace_updated", true }, { "acre_updated", true }, { "uksf_air_updated", true } }); } } } diff --git a/UKSF.Api.Modpack/Services/BuildsService.cs b/UKSF.Api.Modpack/Services/BuildsService.cs index 74915f32..82833b07 100644 --- a/UKSF.Api.Modpack/Services/BuildsService.cs +++ b/UKSF.Api.Modpack/Services/BuildsService.cs @@ -236,7 +236,7 @@ private static void SetEnvironmentVariables(ModpackBuild build, ModpackBuild pre SetEnvironmentVariable(build, previousBuild, "ace_updated", "Build ACE", newBuild?.Ace ?? forceIfRcBuild); SetEnvironmentVariable(build, previousBuild, "acre_updated", "Build ACRE", newBuild?.Acre ?? forceIfRcBuild); - SetEnvironmentVariable(build, previousBuild, "air_updated", "Build Air", newBuild?.Air ?? forceIfRcBuild); + SetEnvironmentVariable(build, previousBuild, "uksf_air_updated", "Build Air", newBuild?.Air ?? forceIfRcBuild); } private static void SetEnvironmentVariable(ModpackBuild build, ModpackBuild previousBuild, string key, string stepName, bool force) From 86cd60f7f466045cd6f622c899cb2d398ba2cf4c Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 13 Jul 2021 22:30:30 +0100 Subject: [PATCH 357/369] Don't move acre optionals, requires the dlc --- .../BuildSteps/Mods/BuildStepBuildAcre.cs | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs index b7d878a1..ee5ac733 100644 --- a/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs +++ b/UKSF.Api.Modpack/Services/BuildProcess/Steps/BuildSteps/Mods/BuildStepBuildAcre.cs @@ -10,7 +10,6 @@ public class BuildStepBuildAcre : ModBuildStep { public const string NAME = "Build ACRE"; private const string MOD_NAME = "acre"; - private readonly List _allowedOptionals = new() { "acre_sys_gm", "acre_sys_sog" }; private readonly List _errorExclusions = new() { "Found DirectX", "Linking statically", "Visual Studio 16", "INFO: Building", "Build Type" }; @@ -34,23 +33,6 @@ protected override async Task ProcessExecute() StepLogger.LogSurround("\nMoving ACRE release to build..."); await CopyDirectory(releasePath, buildPath); StepLogger.LogSurround("Moved ACRE release to build"); - - StepLogger.LogSurround("\nMoving optionals..."); - await MoveOptionals(buildPath); - StepLogger.LogSurround("Moved optionals"); - } - - private async Task MoveOptionals(string buildPath) - { - string optionalsPath = Path.Join(buildPath, "optionals"); - string addonsPath = Path.Join(buildPath, "addons"); - DirectoryInfo addons = new(addonsPath); - foreach (string optionalName in _allowedOptionals) - { - DirectoryInfo optional = new(Path.Join(optionalsPath, $"@{optionalName}", "addons")); - List files = GetDirectoryContents(optional); - await CopyFiles(optional, addons, files); - } } } } From bc5922bcc8237c130f0685c0464e082ce7de817b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 13 Jul 2021 22:50:34 +0100 Subject: [PATCH 358/369] Search all directories for mods --- UKSF.Api.ArmaServer/Services/GameServersService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.ArmaServer/Services/GameServersService.cs b/UKSF.Api.ArmaServer/Services/GameServersService.cs index 75b835fb..50d66f69 100644 --- a/UKSF.Api.ArmaServer/Services/GameServersService.cs +++ b/UKSF.Api.ArmaServer/Services/GameServersService.cs @@ -241,7 +241,7 @@ public List GetAvailableMods(string id) foreach (string modsPath in availableModsFolders) { Regex allowedPaths = new("@.*|(? modFolders = new DirectoryInfo(modsPath).EnumerateDirectories("*.*", SearchOption.TopDirectoryOnly).Where(x => allowedPaths.IsMatch(x.Name)); + IEnumerable modFolders = new DirectoryInfo(modsPath).EnumerateDirectories("*.*", SearchOption.AllDirectories).Where(x => allowedPaths.IsMatch(x.Name)); foreach (DirectoryInfo modFolder in modFolders) { if (mods.Any(x => x.Path == modFolder.FullName)) From af67fb1788df45672325ac300a45f9ca7e904ea3 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 18 Jul 2021 14:17:36 +0100 Subject: [PATCH 359/369] Upgrade packages --- UKSF.Api.Auth/UKSF.Api.Auth.csproj | 10 +++++----- UKSF.Api.Base/UKSF.Api.Base.csproj | 4 ++-- .../UKSF.Api.Integrations.Discord.csproj | 2 +- UKSF.Api.Modpack/UKSF.Api.Modpack.csproj | 2 +- UKSF.Api/UKSF.Api.csproj | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/UKSF.Api.Auth/UKSF.Api.Auth.csproj b/UKSF.Api.Auth/UKSF.Api.Auth.csproj index 09afa00f..82d5913b 100644 --- a/UKSF.Api.Auth/UKSF.Api.Auth.csproj +++ b/UKSF.Api.Auth/UKSF.Api.Auth.csproj @@ -6,11 +6,11 @@ - - - - - + + + + + diff --git a/UKSF.Api.Base/UKSF.Api.Base.csproj b/UKSF.Api.Base/UKSF.Api.Base.csproj index dae9b445..7448313d 100644 --- a/UKSF.Api.Base/UKSF.Api.Base.csproj +++ b/UKSF.Api.Base/UKSF.Api.Base.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj b/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj index a2c612d8..8ba864a7 100644 --- a/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj +++ b/UKSF.Api.Integrations.Discord/UKSF.Api.Integrations.Discord.csproj @@ -12,7 +12,7 @@ - + diff --git a/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj b/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj index d5333392..e1926dd9 100644 --- a/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj +++ b/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj @@ -14,7 +14,7 @@ - + diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index eea0763c..dbc309e1 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -16,14 +16,14 @@ - + - - + + From eed57161dda00c6bdd793c90b692c143812d2de3 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 18 Jul 2021 14:19:46 +0100 Subject: [PATCH 360/369] Remove dotnetcore dev nuget source --- NuGet.Config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.Config b/NuGet.Config index 4f82a27b..0a1e438f 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -6,7 +6,6 @@ - From 02d70346ce5c1edeaf83fa32244033b3e80788bb Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 19 Jul 2021 20:49:00 +0100 Subject: [PATCH 361/369] Undo forcing rebuild on first RC build --- UKSF.Api.Modpack/Services/BuildsService.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/UKSF.Api.Modpack/Services/BuildsService.cs b/UKSF.Api.Modpack/Services/BuildsService.cs index 82833b07..15483060 100644 --- a/UKSF.Api.Modpack/Services/BuildsService.cs +++ b/UKSF.Api.Modpack/Services/BuildsService.cs @@ -232,11 +232,9 @@ private async Task FinishBuild(ModpackBuild build, ModpackBuildResult result) private static void SetEnvironmentVariables(ModpackBuild build, ModpackBuild previousBuild, NewBuild newBuild = null) { - bool forceIfRcBuild = build.Environment == GameEnvironment.RC && previousBuild == null; - - SetEnvironmentVariable(build, previousBuild, "ace_updated", "Build ACE", newBuild?.Ace ?? forceIfRcBuild); - SetEnvironmentVariable(build, previousBuild, "acre_updated", "Build ACRE", newBuild?.Acre ?? forceIfRcBuild); - SetEnvironmentVariable(build, previousBuild, "uksf_air_updated", "Build Air", newBuild?.Air ?? forceIfRcBuild); + SetEnvironmentVariable(build, previousBuild, "ace_updated", "Build ACE", newBuild?.Ace ?? false); + SetEnvironmentVariable(build, previousBuild, "acre_updated", "Build ACRE", newBuild?.Acre ?? false); + SetEnvironmentVariable(build, previousBuild, "uksf_air_updated", "Build Air", newBuild?.Air ?? false); } private static void SetEnvironmentVariable(ModpackBuild build, ModpackBuild previousBuild, string key, string stepName, bool force) From a9d910840f229288532d959a1425784f57b2be2b Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Mon, 19 Jul 2021 20:55:41 +0100 Subject: [PATCH 362/369] Remove now invalid test --- .../BuildsServiceTests.cs | 40 ++++++++----------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/Tests/UKSF.Api.Modpack.Tests/BuildsServiceTests.cs b/Tests/UKSF.Api.Modpack.Tests/BuildsServiceTests.cs index 1b29339f..a412dee2 100644 --- a/Tests/UKSF.Api.Modpack.Tests/BuildsServiceTests.cs +++ b/Tests/UKSF.Api.Modpack.Tests/BuildsServiceTests.cs @@ -1,18 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FluentAssertions; -using Moq; -using UKSF.Api.ArmaServer.Models; +using Moq; using UKSF.Api.Modpack.Context; -using UKSF.Api.Modpack.Models; using UKSF.Api.Modpack.Services; using UKSF.Api.Modpack.Services.BuildProcess; using UKSF.Api.Personnel.Context; -using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Services; -using Xunit; namespace UKSF.Api.Modpack.Tests { @@ -34,20 +26,20 @@ public BuildsServiceTests() _subject = new(_mockBuildsContext.Object, _mockBuildStepService.Object, _mockAccountContext.Object, mockHttpContextService.Object, mockLogger.Object); } - [Fact] - public async Task When_creating_rc_build() - { - _mockBuildsContext.Setup(x => x.Get(It.IsAny>())).Returns(new List()); - _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(new DomainAccount { Id = "accountId" }); - _mockBuildStepService.Setup(x => x.GetSteps(GameEnvironment.RC)).Returns(new List()); - - GithubCommit githubCommit = new() { Author = "author" }; - ModpackBuild result = await _subject.CreateRcBuild("1.1.0", githubCommit); - - result.Environment.Should().Be(GameEnvironment.RC); - result.BuildNumber.Should().Be(1); - result.BuilderId.Should().Be("accountId"); - result.EnvironmentVariables.Should().BeEquivalentTo(new Dictionary { { "ace_updated", true }, { "acre_updated", true }, { "uksf_air_updated", true } }); - } + // [Fact] + // public async Task When_creating_rc_build() + // { + // _mockBuildsContext.Setup(x => x.Get(It.IsAny>())).Returns(new List()); + // _mockAccountContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(new DomainAccount { Id = "accountId" }); + // _mockBuildStepService.Setup(x => x.GetSteps(GameEnvironment.RC)).Returns(new List()); + // + // GithubCommit githubCommit = new() { Author = "author" }; + // ModpackBuild result = await _subject.CreateRcBuild("1.1.0", githubCommit); + // + // result.Environment.Should().Be(GameEnvironment.RC); + // result.BuildNumber.Should().Be(1); + // result.BuilderId.Should().Be("accountId"); + // result.EnvironmentVariables.Should().BeEquivalentTo(new Dictionary { { "ace_updated", true }, { "acre_updated", true }, { "uksf_air_updated", true } }); + // } } } From d5b88e9239bc8322f398934f1d4a67288d10f2cf Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 7 Aug 2021 14:06:52 +0100 Subject: [PATCH 363/369] Added paged queries for members list support --- .../DependencyInjectionTests.cs | 1 + ...EventHandler.cs => LogDataEventHandler.cs} | 0 .../Models/MissionPatchData.cs | 2 +- UKSF.Api.ArmaMissions/Models/MissionPlayer.cs | 2 +- UKSF.Api.ArmaMissions/Models/MissionUnit.cs | 2 +- .../Services/MissionPatchDataService.cs | 25 +- UKSF.Api.Base/Context/MongoCollection.cs | 45 +++- UKSF.Api.Base/Context/MongoContextBase.cs | 43 +++- UKSF.Api.Base/Models/PagedResult.cs | 2 +- UKSF.Api.Base/UKSF.Api.Base.csproj | 1 + UKSF.Api.Command/ApiCommandExtensions.cs | 19 +- UKSF.Api.Command/Context/LoaContext.cs | 6 +- .../Controllers/CommandMembersController.cs | 39 +++ .../CommandRequestsCreationController.cs | 6 +- UKSF.Api.Command/Controllers/LoaController.cs | 97 ++++++++ .../Exceptions/InvalidLoaScopeException.cs | 2 +- .../Mappers/CommandMemberMapper.cs | 68 ++++++ UKSF.Api.Command/Mappers/LoaMapper.cs | 43 ++++ .../Models/DomainCommandMember.cs | 17 ++ UKSF.Api.Command/Models/DomainLoa.cs | 47 ++++ .../Queries/GetCommandMembersPagedQuery.cs | 161 ++++++++++++ UKSF.Api.Command/Queries/GetPagedLoasQuery.cs | 159 ++++++++++++ .../Services/ChainOfCommandService.cs | 41 ++-- .../CommandRequestCompletionService.cs | 66 +++-- UKSF.Api.Command/Services/LoaService.cs | 15 +- .../Services/DiscordService.cs | 98 ++++++-- .../Services/TeamspeakGroupService.cs | 21 +- UKSF.Api.Personnel/ApiPersonnelExtensions.cs | 7 +- UKSF.Api.Personnel/Context/RanksContext.cs | 12 +- UKSF.Api.Personnel/Context/RolesContext.cs | 12 +- UKSF.Api.Personnel/Context/UnitsContext.cs | 6 +- .../Controllers/RanksController.cs | 52 ++-- .../Controllers/RolesController.cs | 58 +++-- .../Controllers/UnitsController.cs | 135 +++++----- .../EventHandlers/AccountDataEventHandler.cs | 24 +- .../Mappers/AutoMapperUnitProfile.cs | 2 +- UKSF.Api.Personnel/Mappers/UnitTreeMapper.cs | 32 +++ UKSF.Api.Personnel/Models/DomainAccount.cs | 5 + .../Models/{Rank.cs => DomainRank.cs} | 9 +- .../Models/{Role.cs => DomainRole.cs} | 8 +- .../Models/{Unit.cs => DomainUnit.cs} | 33 ++- UKSF.Api.Personnel/Models/Loa.cs | 26 -- UKSF.Api.Personnel/Models/RolesDataset.cs | 4 +- .../Queries/GetUnitTreeQuery.cs | 57 +++++ .../Services/AssignmentService.cs | 40 ++- .../Services/DisplayNameService.cs | 6 +- .../Services/ObjectIdConversionService.cs | 3 +- UKSF.Api.Personnel/Services/RanksService.cs | 13 +- .../Services/RecruitmentService.cs | 20 +- UKSF.Api.Personnel/Services/RolesService.cs | 8 +- UKSF.Api.Personnel/Services/UnitsService.cs | 110 ++++----- UKSF.Api.Shared/ApiSharedExtensions.cs | 11 +- UKSF.Api.Shared/Context/CachedMongoContext.cs | 13 +- UKSF.Api.Shared/Context/MongoContext.cs | 25 +- .../Extensions/CollectionExtensions.cs | 5 + .../Signalr/Clients/IAccountGroupedClient.cs | 9 + UKSF.Api.Shared/Signalr/Clients/IAllClient.cs | 9 + .../Signalr/Hubs/AccountGroupedHub.cs | 28 +++ UKSF.Api.Shared/Signalr/Hubs/AllHub.cs | 12 + UKSF.Api.sln.DotSettings | 14 +- UKSF.Api/Controllers/LoaController.cs | 140 ----------- UKSF.Api/Models/LoaReportDataset.cs | 28 --- UKSF.Api/Startup.cs | 13 +- UKSF.Api/UKSF.Api.csproj | 23 +- .../Unit/Common/ChangeUtilitiesTests.cs | 35 ++- .../Data/Personnel/RanksDataServiceTests.cs | 28 +-- .../Data/Personnel/RolesDataServiceTests.cs | 28 +-- .../Unit/Data/SimpleDataServiceTests.cs | 2 +- .../Unit/Data/Units/UnitsDataServiceTests.cs | 31 ++- .../Handlers/AccountEventHandlerTests.cs | 10 +- .../Common/ObjectIdConversionServiceTests.cs | 25 +- .../Teamspeak/TeamspeakGroupServiceTests.cs | 231 ++++++++++++------ .../Personnel/DisplayNameServiceTests.cs | 2 +- .../Services/Personnel/LoaServiceTests.cs | 20 +- .../Services/Personnel/RanksServiceTests.cs | 54 ++-- .../Services/Personnel/RolesServiceTests.cs | 27 +- 76 files changed, 1796 insertions(+), 737 deletions(-) rename UKSF.Api.Admin/EventHandlers/{LogEventHandler.cs => LogDataEventHandler.cs} (100%) create mode 100644 UKSF.Api.Command/Controllers/CommandMembersController.cs create mode 100644 UKSF.Api.Command/Controllers/LoaController.cs rename {UKSF.Api => UKSF.Api.Command}/Exceptions/InvalidLoaScopeException.cs (86%) create mode 100644 UKSF.Api.Command/Mappers/CommandMemberMapper.cs create mode 100644 UKSF.Api.Command/Mappers/LoaMapper.cs create mode 100644 UKSF.Api.Command/Models/DomainCommandMember.cs create mode 100644 UKSF.Api.Command/Models/DomainLoa.cs create mode 100644 UKSF.Api.Command/Queries/GetCommandMembersPagedQuery.cs create mode 100644 UKSF.Api.Command/Queries/GetPagedLoasQuery.cs create mode 100644 UKSF.Api.Personnel/Mappers/UnitTreeMapper.cs rename UKSF.Api.Personnel/Models/{Rank.cs => DomainRank.cs} (59%) rename UKSF.Api.Personnel/Models/{Role.cs => DomainRole.cs} (67%) rename UKSF.Api.Personnel/Models/{Unit.cs => DomainUnit.cs} (76%) delete mode 100644 UKSF.Api.Personnel/Models/Loa.cs create mode 100644 UKSF.Api.Personnel/Queries/GetUnitTreeQuery.cs create mode 100644 UKSF.Api.Shared/Signalr/Clients/IAccountGroupedClient.cs create mode 100644 UKSF.Api.Shared/Signalr/Clients/IAllClient.cs create mode 100644 UKSF.Api.Shared/Signalr/Hubs/AccountGroupedHub.cs create mode 100644 UKSF.Api.Shared/Signalr/Hubs/AllHub.cs delete mode 100644 UKSF.Api/Controllers/LoaController.cs delete mode 100644 UKSF.Api/Models/LoaReportDataset.cs diff --git a/Tests/UKSF.Api.Tests/DependencyInjectionTests.cs b/Tests/UKSF.Api.Tests/DependencyInjectionTests.cs index 4eb00761..36664078 100644 --- a/Tests/UKSF.Api.Tests/DependencyInjectionTests.cs +++ b/Tests/UKSF.Api.Tests/DependencyInjectionTests.cs @@ -1,5 +1,6 @@ using FluentAssertions; using Microsoft.Extensions.DependencyInjection; +using UKSF.Api.Command.Controllers; using UKSF.Api.Controllers; using UKSF.Api.EventHandlers; using UKSF.Api.Middleware; diff --git a/UKSF.Api.Admin/EventHandlers/LogEventHandler.cs b/UKSF.Api.Admin/EventHandlers/LogDataEventHandler.cs similarity index 100% rename from UKSF.Api.Admin/EventHandlers/LogEventHandler.cs rename to UKSF.Api.Admin/EventHandlers/LogDataEventHandler.cs diff --git a/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs b/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs index ce86bb31..fd8c708a 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPatchData.cs @@ -10,7 +10,7 @@ public class MissionPatchData public IEnumerable MedicIds; public List OrderedUnits; public List Players; - public List Ranks; + public List Ranks; public List Units; } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs b/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs index d3c2f5a0..a9846b0d 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionPlayer.cs @@ -7,7 +7,7 @@ public class MissionPlayer public DomainAccount DomainAccount; public string Name; public string ObjectClass; - public Rank Rank; + public DomainRank Rank; public MissionUnit Unit; } } diff --git a/UKSF.Api.ArmaMissions/Models/MissionUnit.cs b/UKSF.Api.ArmaMissions/Models/MissionUnit.cs index efe1f1ff..463ad1cd 100644 --- a/UKSF.Api.ArmaMissions/Models/MissionUnit.cs +++ b/UKSF.Api.ArmaMissions/Models/MissionUnit.cs @@ -8,6 +8,6 @@ public class MissionUnit public string Callsign; public List Members = new(); public Dictionary Roles = new(); - public Unit SourceUnit; + public DomainUnit SourceUnit; } } diff --git a/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs b/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs index f2ef4c65..95774fb1 100644 --- a/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs +++ b/UKSF.Api.ArmaMissions/Services/MissionPatchDataService.cs @@ -48,23 +48,30 @@ public void UpdatePatchData() EngineerIds = _variablesService.GetVariable("MISSIONS_ENGINEER_IDS").AsEnumerable() }; - foreach (Unit unit in _unitContext.Get(x => x.Branch == UnitBranch.COMBAT).ToList()) + foreach (var unit in _unitContext.Get(x => x.Branch == UnitBranch.COMBAT).ToList()) { MissionPatchData.Instance.Units.Add(new() { SourceUnit = unit }); } - foreach (DomainAccount account in _accountContext.Get().Where(x => !string.IsNullOrEmpty(x.Rank) && _ranksService.IsSuperiorOrEqual(x.Rank, "Recruit"))) + foreach (DomainAccount account in _accountContext.Get() + .Where(x => !string.IsNullOrEmpty(x.Rank) && _ranksService.IsSuperiorOrEqual(x.Rank, "Recruit"))) { - MissionPatchData.Instance.Players.Add(new() { DomainAccount = account, Rank = _ranksContext.GetSingle(account.Rank), Name = _displayNameService.GetDisplayName(account) }); + MissionPatchData.Instance.Players.Add( + new() { DomainAccount = account, Rank = _ranksContext.GetSingle(account.Rank), Name = _displayNameService.GetDisplayName(account) } + ); } foreach (MissionUnit missionUnit in MissionPatchData.Instance.Units) { missionUnit.Callsign = MissionDataResolver.ResolveCallsign(missionUnit, missionUnit.SourceUnit.Callsign); - missionUnit.Members = missionUnit.SourceUnit.Members.Select(x => MissionPatchData.Instance.Players.FirstOrDefault(y => y.DomainAccount.Id == x)).ToList(); + missionUnit.Members = missionUnit.SourceUnit.Members.Select(x => MissionPatchData.Instance.Players.FirstOrDefault(y => y.DomainAccount.Id == x)) + .ToList(); if (missionUnit.SourceUnit.Roles.Count > 0) { - missionUnit.Roles = missionUnit.SourceUnit.Roles.ToDictionary(pair => pair.Key, pair => MissionPatchData.Instance.Players.FirstOrDefault(y => y.DomainAccount.Id == pair.Value)); + missionUnit.Roles = missionUnit.SourceUnit.Roles.ToDictionary( + pair => pair.Key, + pair => MissionPatchData.Instance.Players.FirstOrDefault(y => y.DomainAccount.Id == pair.Value) + ); } } @@ -77,13 +84,17 @@ public void UpdatePatchData() MissionUnit parent = MissionPatchData.Instance.Units.First(x => x.SourceUnit.Parent == ObjectId.Empty.ToString()); MissionPatchData.Instance.OrderedUnits.Add(parent); InsertUnitChildren(MissionPatchData.Instance.OrderedUnits, parent); - MissionPatchData.Instance.OrderedUnits.RemoveAll(x => !MissionDataResolver.IsUnitPermanent(x) && x.Members.Count == 0 || string.IsNullOrEmpty(x.Callsign)); + MissionPatchData.Instance.OrderedUnits.RemoveAll( + x => !MissionDataResolver.IsUnitPermanent(x) && x.Members.Count == 0 || string.IsNullOrEmpty(x.Callsign) + ); MissionDataResolver.ResolveSpecialUnits(MissionPatchData.Instance.OrderedUnits); } private static void InsertUnitChildren(List newUnits, MissionUnit parent) { - List children = MissionPatchData.Instance.Units.Where(x => x.SourceUnit.Parent == parent.SourceUnit.Id).OrderBy(x => x.SourceUnit.Order).ToList(); + List children = MissionPatchData.Instance.Units.Where(x => x.SourceUnit.Parent == parent.SourceUnit.Id) + .OrderBy(x => x.SourceUnit.Order) + .ToList(); if (children.Count == 0) { return; diff --git a/UKSF.Api.Base/Context/MongoCollection.cs b/UKSF.Api.Base/Context/MongoCollection.cs index 302ed617..21f3ab1f 100644 --- a/UKSF.Api.Base/Context/MongoCollection.cs +++ b/UKSF.Api.Base/Context/MongoCollection.cs @@ -13,7 +13,15 @@ public interface IMongoCollection where T : MongoObject { IEnumerable Get(); IEnumerable Get(Func predicate); - PagedResult GetPaged(int page, int pageSize, SortDefinition sortDefinition, FilterDefinition filterDefinition); + + PagedResult GetPaged( + int page, + int pageSize, + Func, IAggregateFluent> aggregator, + SortDefinition sortDefinition, + FilterDefinition filterDefinition + ); + T GetSingle(string id); T GetSingle(Func predicate); Task AddAsync(T data); @@ -46,25 +54,36 @@ public IEnumerable Get(Func predicate) return GetCollection().AsQueryable().Where(predicate); } - public PagedResult GetPaged(int page, int pageSize, SortDefinition sortDefinition, FilterDefinition filterDefinition) + public PagedResult GetPaged( + int page, + int pageSize, + Func, IAggregateFluent> aggregator, + SortDefinition sortDefinition, + FilterDefinition filterDefinition + ) { - AggregateFacet countFacet = AggregateFacet.Create( + var countFacet = AggregateFacet.Create( "count", - PipelineDefinition.Create(new[] { PipelineStageDefinitionBuilder.Count() }) + PipelineDefinition.Create(new[] { PipelineStageDefinitionBuilder.Count() }) ); - AggregateFacet dataFacet = AggregateFacet.Create( + var dataFacet = AggregateFacet.Create( "data", - PipelineDefinition.Create( - new[] { PipelineStageDefinitionBuilder.Sort(sortDefinition), PipelineStageDefinitionBuilder.Skip((page - 1) * pageSize), PipelineStageDefinitionBuilder.Limit(pageSize) } + PipelineDefinition.Create( + new[] + { + PipelineStageDefinitionBuilder.Sort(sortDefinition), + PipelineStageDefinitionBuilder.Skip((page - 1) * pageSize), + PipelineStageDefinitionBuilder.Limit(pageSize) + } ) ); - IAggregateFluent aggregation = GetCollection().Aggregate().Match(filterDefinition).Facet(countFacet, dataFacet); - IReadOnlyList aggregateCountResults = aggregation.First().Facets.First(x => x.Name == "count").Output(); - int count = aggregateCountResults.Count == 0 ? 0 : (int) aggregateCountResults[0].Count; + var aggregation = aggregator(GetCollection()).Match(filterDefinition).Facet(countFacet, dataFacet); + var aggregateCountResults = aggregation.First().Facets.First(x => x.Name == "count").Output(); + var count = (int)(aggregateCountResults.FirstOrDefault()?.Count ?? 0); - IReadOnlyList data = aggregation.First().Facets.First(x => x.Name == "data").Output(); + var data = aggregation.First().Facets.First(x => x.Name == "data").Output(); return new(count, data); } @@ -99,7 +118,7 @@ public async Task UpdateManyAsync(Expression> predicate, UpdateDef { // Getting ids by the filter predicate is necessary to cover filtering items by a default model value // (e.g Role order default 0, may not be stored in document, and is thus not filterable) - IEnumerable ids = Get(predicate.Compile()).Select(x => x.Id); + var ids = Get(predicate.Compile()).Select(x => x.Id); await GetCollection().UpdateManyAsync(Builders.Filter.In(x => x.Id, ids), update); } @@ -116,7 +135,7 @@ public async Task DeleteAsync(string id) public async Task DeleteManyAsync(Expression> predicate) { // This is necessary for filtering items by a default model value (e.g Role order default 0, may not be stored in document) - IEnumerable ids = Get(predicate.Compile()).Select(x => x.Id); + var ids = Get(predicate.Compile()).Select(x => x.Id); await GetCollection().DeleteManyAsync(Builders.Filter.In(x => x.Id, ids)); } diff --git a/UKSF.Api.Base/Context/MongoContextBase.cs b/UKSF.Api.Base/Context/MongoContextBase.cs index 7a35cd75..a65cafca 100644 --- a/UKSF.Api.Base/Context/MongoContextBase.cs +++ b/UKSF.Api.Base/Context/MongoContextBase.cs @@ -29,13 +29,31 @@ public virtual IEnumerable Get(Func predicate) return _mongoCollection.Get(predicate); } - public virtual PagedResult GetPaged(int page, int pageSize, SortDirection sortDirection, string sortField, IEnumerable>> filterPropertSelectors, string filter) + public virtual PagedResult GetPaged( + int page, + int pageSize, + SortDirection sortDirection, + string sortField, + IEnumerable>> filterPropertSelectors, + string filter + ) { - SortDefinition sortDefinition = sortDirection == SortDirection.ASCENDING ? Builders.Sort.Ascending(sortField) : Builders.Sort.Descending(sortField); - FilterDefinition filterDefinition = string.IsNullOrEmpty(filter) + var sortDefinition = sortDirection == SortDirection.ASCENDING ? Builders.Sort.Ascending(sortField) : Builders.Sort.Descending(sortField); + var filterDefinition = string.IsNullOrEmpty(filter) ? Builders.Filter.Empty : Builders.Filter.Or(filterPropertSelectors.Select(x => Builders.Filter.Regex(x, new(new Regex(filter, RegexOptions.IgnoreCase))))); - return _mongoCollection.GetPaged(page, pageSize, sortDefinition, filterDefinition); + return GetPaged(page, pageSize, collection => collection.Aggregate(), sortDefinition, filterDefinition); + } + + public virtual PagedResult GetPaged( + int page, + int pageSize, + Func, IAggregateFluent> aggregator, + SortDefinition sortDefinition, + FilterDefinition filterDefinition + ) + { + return _mongoCollection.GetPaged(page, pageSize, aggregator, sortDefinition, filterDefinition); } public virtual T GetSingle(string id) @@ -60,7 +78,7 @@ public virtual async Task Add(T item) public virtual async Task Update(string id, Expression> fieldSelector, object value) { - UpdateDefinition update = value == null ? Builders.Update.Unset(fieldSelector) : Builders.Update.Set(fieldSelector, value); + var update = value == null ? Builders.Update.Unset(fieldSelector) : Builders.Update.Set(fieldSelector, value); await _mongoCollection.UpdateAsync(id, update); } @@ -98,5 +116,20 @@ public virtual async Task DeleteMany(Expression> filterExpression) { await _mongoCollection.DeleteManyAsync(filterExpression); } + + public FilterDefinition BuildPagedComplexQuery(string query, Func> filter) + { + if (string.IsNullOrWhiteSpace(query) || !query.Split(new[] { "&&", "||" }, StringSplitOptions.RemoveEmptyEntries).Any()) + { + return Builders.Filter.Empty; + } + + var andQueryParts = query.Split("&&", StringSplitOptions.RemoveEmptyEntries); + var andFilters = andQueryParts.Select(andQueryPart => andQueryPart.Split("||", StringSplitOptions.RemoveEmptyEntries)) + .Select(orQueryParts => orQueryParts.Select(filter).ToList()) + .Select(orFilters => Builders.Filter.Or(orFilters)) + .ToList(); + return Builders.Filter.And(andFilters); + } } } diff --git a/UKSF.Api.Base/Models/PagedResult.cs b/UKSF.Api.Base/Models/PagedResult.cs index cfc772eb..c73323d4 100644 --- a/UKSF.Api.Base/Models/PagedResult.cs +++ b/UKSF.Api.Base/Models/PagedResult.cs @@ -2,7 +2,7 @@ namespace UKSF.Api.Base.Models { - public class PagedResult where T : MongoObject + public class PagedResult { public IEnumerable Data; public int TotalCount; diff --git a/UKSF.Api.Base/UKSF.Api.Base.csproj b/UKSF.Api.Base/UKSF.Api.Base.csproj index 7448313d..e211c91f 100644 --- a/UKSF.Api.Base/UKSF.Api.Base.csproj +++ b/UKSF.Api.Base/UKSF.Api.Base.csproj @@ -4,6 +4,7 @@ net5.0 Library default + CA1826 diff --git a/UKSF.Api.Command/ApiCommandExtensions.cs b/UKSF.Api.Command/ApiCommandExtensions.cs index 01cb0823..b3c02279 100644 --- a/UKSF.Api.Command/ApiCommandExtensions.cs +++ b/UKSF.Api.Command/ApiCommandExtensions.cs @@ -3,6 +3,8 @@ using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Command.Context; using UKSF.Api.Command.EventHandlers; +using UKSF.Api.Command.Mappers; +using UKSF.Api.Command.Queries; using UKSF.Api.Command.Services; using UKSF.Api.Command.Signalr.Hubs; @@ -12,7 +14,7 @@ public static class ApiCommandExtensions { public static IServiceCollection AddUksfCommand(this IServiceCollection services) { - return services.AddContexts().AddEventHandlers().AddServices(); + return services.AddContexts().AddEventHandlers().AddServices().AddCommands().AddQueries().AddMappers(); } private static IServiceCollection AddContexts(this IServiceCollection services) @@ -40,6 +42,21 @@ private static IServiceCollection AddServices(this IServiceCollection services) .AddTransient(); } + private static IServiceCollection AddCommands(this IServiceCollection services) + { + return services; + } + + private static IServiceCollection AddQueries(this IServiceCollection services) + { + return services.AddSingleton().AddSingleton(); + } + + private static IServiceCollection AddMappers(this IServiceCollection services) + { + return services.AddSingleton().AddSingleton(); + } + public static void AddUksfCommandSignalr(this IEndpointRouteBuilder builder) { builder.MapHub($"/hub/{CommandRequestsHub.END_POINT}"); diff --git a/UKSF.Api.Command/Context/LoaContext.cs b/UKSF.Api.Command/Context/LoaContext.cs index 86c17da3..65439bee 100644 --- a/UKSF.Api.Command/Context/LoaContext.cs +++ b/UKSF.Api.Command/Context/LoaContext.cs @@ -1,13 +1,13 @@ using UKSF.Api.Base.Context; using UKSF.Api.Base.Events; -using UKSF.Api.Personnel.Models; +using UKSF.Api.Command.Models; using UKSF.Api.Shared.Context; namespace UKSF.Api.Command.Context { - public interface ILoaContext : IMongoContext, ICachedMongoContext { } + public interface ILoaContext : IMongoContext, ICachedMongoContext { } - public class LoaContext : CachedMongoContext, ILoaContext + public class LoaContext : CachedMongoContext, ILoaContext { public LoaContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "loas") { } } diff --git a/UKSF.Api.Command/Controllers/CommandMembersController.cs b/UKSF.Api.Command/Controllers/CommandMembersController.cs new file mode 100644 index 00000000..4c4a5ad7 --- /dev/null +++ b/UKSF.Api.Command/Controllers/CommandMembersController.cs @@ -0,0 +1,39 @@ +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Base.Models; +using UKSF.Api.Command.Mappers; +using UKSF.Api.Command.Queries; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared; + +namespace UKSF.Api.Command.Controllers +{ + [Route("command/members"), Permissions(Permissions.COMMAND)] + public class CommandMembersController : ControllerBase + { + private readonly ICommandMemberMapper _commandMemberMapper; + private readonly IGetCommandMembersPagedQuery _getCommandMembersPagedQuery; + + public CommandMembersController(IGetCommandMembersPagedQuery getCommandMembersPagedQuery, ICommandMemberMapper commandMemberMapper) + { + _getCommandMembersPagedQuery = getCommandMembersPagedQuery; + _commandMemberMapper = commandMemberMapper; + } + + [HttpGet] + public async Task> GetPaged( + [FromQuery] int page, + [FromQuery] int pageSize = 15, + [FromQuery] string query = null, + [FromQuery] CommandMemberSortMode sortMode = default, + [FromQuery] int sortDirection = -1, + [FromQuery] CommandMemberViewMode viewMode = default + ) + { + var pagedResult = await _getCommandMembersPagedQuery.ExecuteAsync(new(page, pageSize, query, sortMode, sortDirection, viewMode)); + + return new(pagedResult.TotalCount, pagedResult.Data.Select(_commandMemberMapper.MapCommandMemberToAccount).ToList()); + } + } +} diff --git a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs index a8eda3a3..4e0ff8f8 100644 --- a/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs +++ b/UKSF.Api.Command/Controllers/CommandRequestsCreationController.cs @@ -136,7 +136,7 @@ public async Task CreateRequestIndividualRole([FromBody] CommandRequest request) [HttpPut("unitrole"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestUnitRole([FromBody] CommandRequest request) { - Unit unit = _unitsContext.GetSingle(request.Value); + var unit = _unitsContext.GetSingle(request.Value); bool recipientHasUnitRole = _unitsService.RolesHasMember(unit, request.Recipient); if (!recipientHasUnitRole && request.SecondaryValue == "None") { @@ -169,7 +169,7 @@ public async Task CreateRequestUnitRole([FromBody] CommandRequest request) [HttpPut("unitremoval"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestUnitRemoval([FromBody] CommandRequest request) { - Unit removeUnit = _unitsContext.GetSingle(request.Value); + var removeUnit = _unitsContext.GetSingle(request.Value); if (removeUnit.Branch == UnitBranch.COMBAT) { throw new BadRequestException("To remove from a combat unit, use a Transfer request"); @@ -190,7 +190,7 @@ public async Task CreateRequestUnitRemoval([FromBody] CommandRequest request) [HttpPut("transfer"), Authorize, Permissions(Permissions.COMMAND)] public async Task CreateRequestTransfer([FromBody] CommandRequest request) { - Unit toUnit = _unitsContext.GetSingle(request.Value); + var toUnit = _unitsContext.GetSingle(request.Value); request.Requester = _httpContextService.GetUserId(); request.DisplayValue = toUnit.Name; if (toUnit.Branch == UnitBranch.AUXILIARY) diff --git a/UKSF.Api.Command/Controllers/LoaController.cs b/UKSF.Api.Command/Controllers/LoaController.cs new file mode 100644 index 00000000..c0fc5a2f --- /dev/null +++ b/UKSF.Api.Command/Controllers/LoaController.cs @@ -0,0 +1,97 @@ +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using UKSF.Api.Base.Models; +using UKSF.Api.Command.Context; +using UKSF.Api.Command.Mappers; +using UKSF.Api.Command.Models; +using UKSF.Api.Command.Queries; +using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared; +using UKSF.Api.Shared.Events; + +namespace UKSF.Api.Command.Controllers +{ + [Route("[controller]"), Permissions(Permissions.MEMBER)] + public class LoaController : ControllerBase + { + private readonly IAccountContext _accountContext; + private readonly ICommandRequestContext _commandRequestContext; + private readonly IDisplayNameService _displayNameService; + private readonly IGetPagedLoasQuery _getPagedLoasQuery; + private readonly ILoaContext _loaContext; + private readonly ILoaMapper _loaMapper; + private readonly ILogger _logger; + private readonly INotificationsService _notificationsService; + + public LoaController( + ILoaContext loaContext, + IAccountContext accountContext, + ICommandRequestContext commandRequestContext, + IDisplayNameService displayNameService, + INotificationsService notificationsService, + ILogger logger, + IGetPagedLoasQuery getPagedLoasQuery, + ILoaMapper loaMapper + ) + { + _loaContext = loaContext; + _accountContext = accountContext; + _commandRequestContext = commandRequestContext; + _displayNameService = displayNameService; + _notificationsService = notificationsService; + _logger = logger; + _getPagedLoasQuery = getPagedLoasQuery; + _loaMapper = loaMapper; + } + + [HttpGet] + public async Task> GetPaged( + [FromQuery] int page, + [FromQuery] int pageSize = 15, + [FromQuery] string query = null, + [FromQuery] LoaSelectionMode selectionMode = default, + [FromQuery] LoaViewMode viewMode = default + ) + { + var pagedResult = await _getPagedLoasQuery.ExecuteAsync(new(page, pageSize, query, selectionMode, viewMode)); + + return new(pagedResult.TotalCount, pagedResult.Data.Select(_loaMapper.MapToLoa).ToList()); + } + + [HttpDelete("{id}"), Authorize] + public async Task DeleteLoa(string id) + { + var domainLoa = _loaContext.GetSingle(id); + var request = _commandRequestContext.GetSingle(x => x.Value == id); + if (request != null) + { + await _commandRequestContext.Delete(request); + foreach (var reviewerId in request.Reviews.Keys.Where(x => x != request.Requester)) + { + _notificationsService.Add( + new() + { + Owner = reviewerId, + Icon = NotificationIcons.REQUEST, + Message = $"Your review for {request.DisplayRequester}'s LOA is no longer required as they deleted their LOA", + Link = "/command/requests" + } + ); + } + + _logger.LogAudit( + $"Loa request deleted for '{_displayNameService.GetDisplayName(_accountContext.GetSingle(domainLoa.Recipient))}' from '{domainLoa.Start}' to '{domainLoa.End}'" + ); + } + + _logger.LogAudit( + $"Loa deleted for '{_displayNameService.GetDisplayName(_accountContext.GetSingle(domainLoa.Recipient))}' from '{domainLoa.Start}' to '{domainLoa.End}'" + ); + await _loaContext.Delete(domainLoa); + } + } +} diff --git a/UKSF.Api/Exceptions/InvalidLoaScopeException.cs b/UKSF.Api.Command/Exceptions/InvalidLoaScopeException.cs similarity index 86% rename from UKSF.Api/Exceptions/InvalidLoaScopeException.cs rename to UKSF.Api.Command/Exceptions/InvalidLoaScopeException.cs index b1bc390d..572aaded 100644 --- a/UKSF.Api/Exceptions/InvalidLoaScopeException.cs +++ b/UKSF.Api.Command/Exceptions/InvalidLoaScopeException.cs @@ -1,7 +1,7 @@ using System; using UKSF.Api.Shared.Exceptions; -namespace UKSF.Api.Exceptions +namespace UKSF.Api.Command.Exceptions { [Serializable] public class InvalidLoaScopeException : UksfException diff --git a/UKSF.Api.Command/Mappers/CommandMemberMapper.cs b/UKSF.Api.Command/Mappers/CommandMemberMapper.cs new file mode 100644 index 00000000..df3e1220 --- /dev/null +++ b/UKSF.Api.Command/Mappers/CommandMemberMapper.cs @@ -0,0 +1,68 @@ +using System.Collections.Generic; +using System.Linq; +using MongoDB.Bson; +using UKSF.Api.Command.Models; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Extensions; + +namespace UKSF.Api.Command.Mappers +{ + public interface ICommandMemberMapper + { + Account MapCommandMemberToAccount(DomainCommandMember domainCommandMember); + } + + public class CommandMemberMapper : ICommandMemberMapper + { + public Account MapCommandMemberToAccount(DomainCommandMember domainCommandMember) + { + return new() + { + Id = domainCommandMember.Id, + Firstname = domainCommandMember.Firstname, + Lastname = domainCommandMember.Lastname, + RankObject = MapToRank(domainCommandMember.Rank), + RoleObject = MapToRole(domainCommandMember.Role), + UnitObject = MapToUnitWithParentTree(domainCommandMember.Unit, domainCommandMember.ParentUnits), + UnitObjects = domainCommandMember.Units.OrderBy(x => x.Branch).Select(x => MapToUnit(x, domainCommandMember.Id)).ToList() + }; + } + + private static Rank MapToRank(DomainRank domainRank) + { + return new() { Id = domainRank.Id, Name = domainRank.Name, Abbreviation = domainRank.Abbreviation }; + } + + private static Role MapToRole(DomainRole domainRole) + { + return new() { Id = domainRole.Id, Name = domainRole.Name }; + } + + private static Unit MapToUnit(DomainUnit domainUnit, string memberId) + { + return new() + { + Id = domainUnit.Id, + Name = domainUnit.Name, + Shortname = domainUnit.Shortname, + PreferShortname = domainUnit.PreferShortname, + MemberRole = domainUnit.Roles.GetKeyFromValue(memberId) + }; + } + + private static Unit MapToUnitWithParentTree(DomainUnit domainUnit, List parents) + { + var domainParent = domainUnit.Parent == ObjectId.Empty.ToString() ? null : parents.FirstOrDefault(x => x.Id == domainUnit.Parent); + var parent = domainParent == null ? null : MapToUnitWithParentTree(domainParent, parents); + return new() + { + Id = domainUnit.Id, + Order = domainUnit.Order, + Name = domainUnit.Name, + Shortname = domainUnit.Shortname, + PreferShortname = domainUnit.PreferShortname, + ParentUnit = parent + }; + } + } +} diff --git a/UKSF.Api.Command/Mappers/LoaMapper.cs b/UKSF.Api.Command/Mappers/LoaMapper.cs new file mode 100644 index 00000000..a6a61bed --- /dev/null +++ b/UKSF.Api.Command/Mappers/LoaMapper.cs @@ -0,0 +1,43 @@ +using UKSF.Api.Command.Models; +using UKSF.Api.Command.Services; +using UKSF.Api.Personnel.Services; + +namespace UKSF.Api.Command.Mappers +{ + public interface ILoaMapper + { + Loa MapToLoa(DomainLoaWithAccount domainLoa); + } + + public class LoaMapper : ILoaMapper + { + private readonly IChainOfCommandService _chainOfCommandService; + private readonly IDisplayNameService _displayNameService; + + public LoaMapper(IDisplayNameService displayNameService, IChainOfCommandService chainOfCommandService) + { + _displayNameService = displayNameService; + _chainOfCommandService = chainOfCommandService; + } + + public Loa MapToLoa(DomainLoaWithAccount domainLoa) + { + var displayName = _displayNameService.GetDisplayName(domainLoa.Account); + var inContextChainOfCommand = _chainOfCommandService.InContextChainOfCommand(domainLoa.Recipient); + return new() + { + Id = domainLoa.Id, + Submitted = domainLoa.Submitted, + Start = domainLoa.Start, + End = domainLoa.End, + State = domainLoa.State, + Emergency = domainLoa.Emergency, + Late = domainLoa.Late, + Reason = domainLoa.Reason, + LongTerm = (domainLoa.End - domainLoa.Start).Days > 21, + Name = displayName, + InChainOfCommand = inContextChainOfCommand + }; + } + } +} diff --git a/UKSF.Api.Command/Models/DomainCommandMember.cs b/UKSF.Api.Command/Models/DomainCommandMember.cs new file mode 100644 index 00000000..eb43613a --- /dev/null +++ b/UKSF.Api.Command/Models/DomainCommandMember.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; +using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Command.Models +{ + public class DomainCommandMember : MongoObject + { + public string Firstname; + public string Lastname; + public List ParentUnits; + public DomainRank Rank; + public DomainRole Role; + public DomainUnit Unit; + public List Units; + } +} diff --git a/UKSF.Api.Command/Models/DomainLoa.cs b/UKSF.Api.Command/Models/DomainLoa.cs new file mode 100644 index 00000000..1f97c424 --- /dev/null +++ b/UKSF.Api.Command/Models/DomainLoa.cs @@ -0,0 +1,47 @@ +using System; +using MongoDB.Bson; +using MongoDB.Bson.Serialization.Attributes; +using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Command.Models +{ + public enum LoaReviewState + { + PENDING, + APPROVED, + REJECTED + } + + public class DomainLoa : MongoObject + { + public bool Emergency; + public DateTime End; + public bool Late; + public string Reason; + [BsonRepresentation(BsonType.ObjectId)] public string Recipient; + public DateTime Start; + public LoaReviewState State; + public DateTime Submitted; + } + + public class DomainLoaWithAccount : DomainLoa + { + public DomainAccount Account; + } + + public class Loa + { + public bool Emergency; + public DateTime End; + public string Id; + public bool InChainOfCommand; + public bool Late; + public bool LongTerm; + public string Name; + public string Reason; + public DateTime Start; + public LoaReviewState State; + public DateTime Submitted; + } +} diff --git a/UKSF.Api.Command/Queries/GetCommandMembersPagedQuery.cs b/UKSF.Api.Command/Queries/GetCommandMembersPagedQuery.cs new file mode 100644 index 00000000..f051d526 --- /dev/null +++ b/UKSF.Api.Command/Queries/GetCommandMembersPagedQuery.cs @@ -0,0 +1,161 @@ +using System.Collections.Generic; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using MongoDB.Bson; +using MongoDB.Driver; +using UKSF.Api.Base.Models; +using UKSF.Api.Command.Models; +using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Shared.Services; + +namespace UKSF.Api.Command.Queries +{ + public interface IGetCommandMembersPagedQuery + { + Task> ExecuteAsync(GetCommandMembersPagedQueryArgs args); + } + + public class GetCommandMembersPagedQueryArgs + { + public GetCommandMembersPagedQueryArgs( + int page, + int pageSize, + string query, + CommandMemberSortMode sortMode, + int sortDirection, + CommandMemberViewMode viewMode + ) + { + Page = page; + PageSize = pageSize; + Query = query; + SortMode = sortMode; + SortDirection = sortDirection; + ViewMode = viewMode; + } + + public int Page { get; } + public int PageSize { get; } + public string Query { get; } + public CommandMemberSortMode SortMode { get; } + public int SortDirection { get; } + public CommandMemberViewMode ViewMode { get; } + } + + public class GetCommandMembersPagedQuery : IGetCommandMembersPagedQuery + { + private readonly IAccountContext _accountContext; + private readonly IHttpContextService _httpContextService; + + public GetCommandMembersPagedQuery(IAccountContext accountContext, IHttpContextService httpContextService) + { + _accountContext = accountContext; + _httpContextService = httpContextService; + } + + public async Task> ExecuteAsync(GetCommandMembersPagedQueryArgs args) + { + var sortDefinition = BuildSortDefinition(args.SortMode, args.SortDirection); + var viewModeFilterDefinition = BuildViewModeFilterDefinition(args.ViewMode); + var queryFilterDefinition = _accountContext.BuildPagedComplexQuery(args.Query, BuildFiltersFromQueryPart); + var filterDefinition = Builders.Filter.And(viewModeFilterDefinition, queryFilterDefinition); + + var pagedResult = _accountContext.GetPaged(args.Page, args.PageSize, BuildAggregator, sortDefinition, filterDefinition); + return await Task.FromResult(pagedResult); + } + + private static SortDefinition BuildSortDefinition(CommandMemberSortMode sortMode, int sortDirection) + { + var sortDocument = sortMode switch + { + CommandMemberSortMode.RANK => new() { { "rank.order", sortDirection }, { "lastname", sortDirection }, { "firstname", sortDirection } }, + CommandMemberSortMode.ROLE => new() { { "role.name", sortDirection }, { "lastname", sortDirection }, { "firstname", sortDirection } }, + _ => new BsonDocument { { "lastname", sortDirection }, { "firstname", sortDirection } } + }; + return new BsonDocumentSortDefinition(sortDocument); + } + + private FilterDefinition BuildViewModeFilterDefinition(CommandMemberViewMode viewMode) + { + if (viewMode == CommandMemberViewMode.All) + { + return Builders.Filter.Empty; + } + + var currentAccount = _accountContext.GetSingle(_httpContextService.GetUserId()); + var unitFilter = Builders.Filter.Eq(x => x.Unit.Name, currentAccount.UnitAssignment); + + if (viewMode == CommandMemberViewMode.COC) + { + var unitsFilter = Builders.Filter.ElemMatch(x => x.ParentUnits, x => x.Name == currentAccount.UnitAssignment); + return Builders.Filter.Or(unitFilter, unitsFilter); + } + + return unitFilter; + } + + private static FilterDefinition BuildFiltersFromQueryPart(string queryPart) + { + var regex = new BsonRegularExpression(new Regex(queryPart, RegexOptions.IgnoreCase)); + var filters = new List> + { + Builders.Filter.Regex(x => x.Id, regex), + Builders.Filter.Regex(x => x.Lastname, regex), + Builders.Filter.Regex(x => x.Firstname, regex), + Builders.Filter.Regex(x => x.Rank.Name, regex), + Builders.Filter.Regex(x => x.Rank.Abbreviation, regex), + Builders.Filter.Regex(x => x.Role.Name, regex), + Builders.Filter.ElemMatch(x => x.Units, x => Regex.IsMatch(x.Name, queryPart, RegexOptions.IgnoreCase)), + Builders.Filter.ElemMatch(x => x.Units, x => Regex.IsMatch(x.Shortname, queryPart, RegexOptions.IgnoreCase)), + Builders.Filter.ElemMatch(x => x.ParentUnits, x => Regex.IsMatch(x.Name, queryPart, RegexOptions.IgnoreCase)), + Builders.Filter.ElemMatch(x => x.ParentUnits, x => Regex.IsMatch(x.Shortname, queryPart, RegexOptions.IgnoreCase)) + }; + return Builders.Filter.Or(filters); + } + + private static IAggregateFluent BuildAggregator(IMongoCollection collection) + { + return collection.Aggregate() + .Match(x => x.MembershipState == MembershipState.MEMBER) + .Lookup("ranks", "rank", "name", "rank") + .Unwind("rank") + .Lookup("roles", "roleAssignment", "name", "role") + .Unwind("role") + .Lookup("units", "unitAssignment", "name", "unit") + .Unwind("unit") + .Lookup("units", "_id", "members", "units") + .AppendStage( + new BsonDocument( + "$graphLookup", + new BsonDocument + { + { "from", "units" }, + { "startWith", "$units.parent" }, + { "connectFromField", "parent" }, + { "connectToField", "_id" }, + { "as", "parentUnits" }, + { "maxDepth", 50 }, + { "depthField", "depthField" } + } + ) + ) + .As(); + } + } + + public enum CommandMemberSortMode + { + NAME, + RANK, + ROLE, + UNIT + } + + public enum CommandMemberViewMode + { + All, + COC, + UNIT + } +} diff --git a/UKSF.Api.Command/Queries/GetPagedLoasQuery.cs b/UKSF.Api.Command/Queries/GetPagedLoasQuery.cs new file mode 100644 index 00000000..9d8c96ed --- /dev/null +++ b/UKSF.Api.Command/Queries/GetPagedLoasQuery.cs @@ -0,0 +1,159 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using MongoDB.Bson; +using MongoDB.Driver; +using UKSF.Api.Base.Models; +using UKSF.Api.Command.Context; +using UKSF.Api.Command.Models; +using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Services; +using UKSF.Api.Shared.Services; + +namespace UKSF.Api.Command.Queries +{ + public interface IGetPagedLoasQuery + { + Task> ExecuteAsync(GetPagedLoasQueryArgs args); + } + + public class GetPagedLoasQueryArgs + { + public GetPagedLoasQueryArgs(int page, int pageSize, string query, LoaSelectionMode selectionMode, LoaViewMode viewMode) + { + Page = page; + PageSize = pageSize; + Query = query; + SelectionMode = selectionMode; + ViewMode = viewMode; + } + + public int Page { get; } + public int PageSize { get; } + public string Query { get; } + public LoaSelectionMode SelectionMode { get; } + public LoaViewMode ViewMode { get; } + } + + public class GetPagedLoasQuery : IGetPagedLoasQuery + { + private readonly IAccountContext _accountContext; + private readonly IHttpContextService _httpContextService; + private readonly ILoaContext _loaContext; + private readonly IUnitsContext _unitsContext; + private readonly IUnitsService _unitsService; + + public GetPagedLoasQuery( + ILoaContext loaContext, + IAccountContext accountContext, + IUnitsContext unitsContext, + IHttpContextService httpContextService, + IUnitsService unitsService + ) + { + _loaContext = loaContext; + _accountContext = accountContext; + _unitsContext = unitsContext; + _httpContextService = httpContextService; + _unitsService = unitsService; + } + + public async Task> ExecuteAsync(GetPagedLoasQueryArgs args) + { + var sortDefinition = BuildSortDefinition(args.SelectionMode); + var viewModeFilterDefinition = BuildViewModeFilterDefinition(args.ViewMode); + var selectionModeFilterDefinition = BuildSelectionModeFilterDefinition(args.SelectionMode); + var queryFilterDefinition = _loaContext.BuildPagedComplexQuery(args.Query, BuildFiltersFromQueryPart); + var filterDefinition = Builders.Filter.And(viewModeFilterDefinition, selectionModeFilterDefinition, queryFilterDefinition); + + var pagedResult = _loaContext.GetPaged(args.Page, args.PageSize, BuildAggregator, sortDefinition, filterDefinition); + return await Task.FromResult(pagedResult); + } + + private SortDefinition BuildSortDefinition(LoaSelectionMode selectionMode) + { + BsonDocument sortDocument = selectionMode switch + { + LoaSelectionMode.CURRENT => new() { { "end", 1 }, { "start", 1 } }, + LoaSelectionMode.FUTURE => new() { { "start", 1 }, { "end", 1 } }, + LoaSelectionMode.PAST => new() { { "end", -1 }, { "start", -1 } }, + _ => throw new ArgumentOutOfRangeException(nameof(selectionMode)) + }; + return new BsonDocumentSortDefinition(sortDocument); + } + + private FilterDefinition BuildViewModeFilterDefinition(LoaViewMode viewMode) + { + switch (viewMode) + { + case LoaViewMode.ALL: + { + var memberIds = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER).Select(x => x.Id).ToList(); + return Builders.Filter.In(x => x.Recipient, memberIds); + } + case LoaViewMode.COC: + { + var currentAccount = _accountContext.GetSingle(_httpContextService.GetUserId()); + var parentUnit = _unitsContext.GetSingle(x => x.Name == currentAccount.UnitAssignment); + var cocUnits = _unitsService.GetAllChildren(parentUnit, true).ToList(); + var memberIds = cocUnits.SelectMany(x => x.Members).ToList(); + return Builders.Filter.In(x => x.Recipient, memberIds); + } + case LoaViewMode.ME: return Builders.Filter.Eq(x => x.Recipient, _httpContextService.GetUserId()); + default: throw new ArgumentOutOfRangeException(nameof(viewMode)); + } + } + + private FilterDefinition BuildSelectionModeFilterDefinition(LoaSelectionMode selectionMode) + { + var now = DateTime.UtcNow; + + return selectionMode switch + { + LoaSelectionMode.CURRENT => Builders.Filter.And( + Builders.Filter.Lte(x => x.Start, now), + Builders.Filter.Gt(x => x.End, now) + ), + LoaSelectionMode.FUTURE => Builders.Filter.Gte(x => x.Start, now), + LoaSelectionMode.PAST => Builders.Filter.Lt(x => x.End, now), + _ => throw new ArgumentOutOfRangeException(nameof(selectionMode)) + }; + } + + private static FilterDefinition BuildFiltersFromQueryPart(string queryPart) + { + var regex = new BsonRegularExpression(new Regex(queryPart, RegexOptions.IgnoreCase)); + var filters = new List> + { + Builders.Filter.Regex(x => x.Id, regex), + Builders.Filter.Regex(x => x.Account.Lastname, regex), + Builders.Filter.Regex(x => x.Account.Firstname, regex), + Builders.Filter.Regex(x => x.Account.Rank, regex), + Builders.Filter.Regex(x => x.Account.UnitAssignment, regex) + }; + return Builders.Filter.Or(filters); + } + + private static IAggregateFluent BuildAggregator(IMongoCollection collection) + { + return collection.Aggregate().Lookup("accounts", "recipient", "_id", "account").Unwind("account").As(); + } + } + + public enum LoaSelectionMode + { + CURRENT, + FUTURE, + PAST + } + + public enum LoaViewMode + { + ALL, + COC, + ME + } +} diff --git a/UKSF.Api.Command/Services/ChainOfCommandService.cs b/UKSF.Api.Command/Services/ChainOfCommandService.cs index 9ad67451..c2854271 100644 --- a/UKSF.Api.Command/Services/ChainOfCommandService.cs +++ b/UKSF.Api.Command/Services/ChainOfCommandService.cs @@ -12,7 +12,7 @@ namespace UKSF.Api.Command.Services { public interface IChainOfCommandService { - HashSet ResolveChain(ChainOfCommandMode mode, string recipient, Unit start, Unit target); + HashSet ResolveChain(ChainOfCommandMode mode, string recipient, DomainUnit start, DomainUnit target); bool InContextChainOfCommand(string id); } @@ -24,7 +24,13 @@ public class ChainOfCommandService : IChainOfCommandService private readonly IUnitsContext _unitsContext; private readonly IUnitsService _unitsService; - public ChainOfCommandService(IUnitsContext unitsContext, IUnitsService unitsService, IRolesService rolesService, IHttpContextService httpContextService, IAccountService accountService) + public ChainOfCommandService( + IUnitsContext unitsContext, + IUnitsService unitsService, + IRolesService rolesService, + IHttpContextService httpContextService, + IAccountService accountService + ) { _unitsContext = unitsContext; _unitsService = unitsService; @@ -33,7 +39,7 @@ public ChainOfCommandService(IUnitsContext unitsContext, IUnitsService unitsServ _accountService = accountService; } - public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, Unit start, Unit target) + public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, DomainUnit start, DomainUnit target) { HashSet chain = ResolveMode(mode, start, target).Where(x => x != recipient).ToHashSet(); chain.CleanHashset(); @@ -55,7 +61,8 @@ public HashSet ResolveChain(ChainOfCommandMode mode, string recipient, U // If no chain, get root unit child commanders if (chain.Count == 0) { - foreach (Unit unit in _unitsContext.Get(x => x.Parent == _unitsService.GetRoot().Id).Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) + foreach (var unit in _unitsContext.Get(x => x.Parent == _unitsService.GetRoot().Id) + .Where(unit => UnitHasCommander(unit) && GetCommander(unit) != recipient)) { chain.Add(GetCommander(unit)); } @@ -81,12 +88,12 @@ public bool InContextChainOfCommand(string id) return true; } - Unit unit = _unitsContext.GetSingle(x => x.Name == contextDomainAccount.UnitAssignment); + var unit = _unitsContext.GetSingle(x => x.Name == contextDomainAccount.UnitAssignment); return _unitsService.RolesHasMember(unit, contextDomainAccount.Id) && (unit.Members.Contains(id) || _unitsService.GetAllChildren(unit, true).Any(unitChild => unitChild.Members.Contains(id))); } - private IEnumerable ResolveMode(ChainOfCommandMode mode, Unit start, Unit target) + private IEnumerable ResolveMode(ChainOfCommandMode mode, DomainUnit start, DomainUnit target) { return mode switch { @@ -102,7 +109,7 @@ private IEnumerable ResolveMode(ChainOfCommandMode mode, Unit start, Uni }; } - private IEnumerable Full(Unit unit) + private IEnumerable Full(DomainUnit unit) { HashSet chain = new(); while (unit != null) @@ -118,17 +125,17 @@ private IEnumerable Full(Unit unit) return chain; } - private IEnumerable GetNextCommander(Unit unit) + private IEnumerable GetNextCommander(DomainUnit unit) { return new HashSet { GetNextUnitCommander(unit) }; } - private IEnumerable GetNextCommanderExcludeSelf(Unit unit) + private IEnumerable GetNextCommanderExcludeSelf(DomainUnit unit) { return new HashSet { GetNextUnitCommanderExcludeSelf(unit) }; } - private IEnumerable CommanderAndOneAbove(Unit unit) + private IEnumerable CommanderAndOneAbove(DomainUnit unit) { HashSet chain = new(); if (unit != null) @@ -138,7 +145,7 @@ private IEnumerable CommanderAndOneAbove(Unit unit) chain.Add(GetCommander(unit)); } - Unit parentUnit = _unitsService.GetParent(unit); + var parentUnit = _unitsService.GetParent(unit); if (parentUnit != null && UnitHasCommander(parentUnit)) { chain.Add(GetCommander(parentUnit)); @@ -148,7 +155,7 @@ private IEnumerable CommanderAndOneAbove(Unit unit) return chain; } - private IEnumerable GetCommanderAndPersonnel(Unit unit) + private IEnumerable GetCommanderAndPersonnel(DomainUnit unit) { HashSet chain = new(); if (UnitHasCommander(unit)) @@ -165,12 +172,12 @@ private IEnumerable GetPersonnel() return _unitsContext.GetSingle(x => x.Shortname == "SR7").Members.ToHashSet(); } - private IEnumerable GetCommanderAndTargetCommander(Unit unit, Unit targetUnit) + private IEnumerable GetCommanderAndTargetCommander(DomainUnit unit, DomainUnit targetUnit) { return new HashSet { GetNextUnitCommander(unit), GetNextUnitCommander(targetUnit) }; } - private string GetNextUnitCommander(Unit unit) + private string GetNextUnitCommander(DomainUnit unit) { while (unit != null) { @@ -185,7 +192,7 @@ private string GetNextUnitCommander(Unit unit) return string.Empty; } - private string GetNextUnitCommanderExcludeSelf(Unit unit) + private string GetNextUnitCommanderExcludeSelf(DomainUnit unit) { while (unit != null) { @@ -204,12 +211,12 @@ private string GetNextUnitCommanderExcludeSelf(Unit unit) return string.Empty; } - private bool UnitHasCommander(Unit unit) + private bool UnitHasCommander(DomainUnit unit) { return _unitsService.HasRole(unit, _rolesService.GetCommanderRoleName()); } - private string GetCommander(Unit unit) + private string GetCommander(DomainUnit unit) { return unit.Roles.GetValueOrDefault(_rolesService.GetCommanderRoleName(), string.Empty); } diff --git a/UKSF.Api.Command/Services/CommandRequestCompletionService.cs b/UKSF.Api.Command/Services/CommandRequestCompletionService.cs index 3c92d448..d737f92d 100644 --- a/UKSF.Api.Command/Services/CommandRequestCompletionService.cs +++ b/UKSF.Api.Command/Services/CommandRequestCompletionService.cs @@ -110,10 +110,17 @@ private async Task Rank(CommandRequest request) if (_commandRequestService.IsRequestApproved(request.Id)) { string role = HandleRecruitToPrivate(request.Recipient, request.Value); - Notification notification = await _assignmentService.UpdateUnitRankAndRole(request.Recipient, rankString: request.Value, role: role, reason: request.Reason); + Notification notification = await _assignmentService.UpdateUnitRankAndRole( + request.Recipient, + rankString: request.Value, + role: role, + reason: request.Reason + ); _notificationsService.Add(notification); await _commandRequestService.ArchiveRequest(request.Id); - _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); + _logger.LogAudit( + $"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'" + ); } else if (_commandRequestService.IsRequestRejected(request.Id)) { @@ -128,7 +135,9 @@ private async Task Loa(CommandRequest request) { await _loaService.SetLoaState(request.Value, LoaReviewState.APPROVED); await _commandRequestService.ArchiveRequest(request.Id); - _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); + _logger.LogAudit( + $"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'" + ); } else if (_commandRequestService.IsRequestRejected(request.Id)) { @@ -145,7 +154,11 @@ private async Task Discharge(CommandRequest request) DomainAccount domainAccount = _accountContext.GetSingle(request.Recipient); Discharge discharge = new() { - Rank = domainAccount.Rank, Unit = domainAccount.UnitAssignment, Role = domainAccount.RoleAssignment, DischargedBy = request.DisplayRequester, Reason = request.Reason + Rank = domainAccount.Rank, + Unit = domainAccount.UnitAssignment, + Role = domainAccount.RoleAssignment, + DischargedBy = request.DisplayRequester, + Reason = request.Reason }; DischargeCollection dischargeCollection = _dischargeContext.GetSingle(x => x.AccountId == domainAccount.Id); if (dischargeCollection == null) @@ -179,7 +192,9 @@ await _dischargeContext.Update( _notificationsService.Add(notification); await _assignmentService.UnassignAllUnits(domainAccount.Id); await _commandRequestService.ArchiveRequest(request.Id); - _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); + _logger.LogAudit( + $"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'" + ); } else if (_commandRequestService.IsRequestRejected(request.Id)) { @@ -199,7 +214,9 @@ private async Task IndividualRole(CommandRequest request) ); _notificationsService.Add(notification); await _commandRequestService.ArchiveRequest(request.Id); - _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); + _logger.LogAudit( + $"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'" + ); } else if (_commandRequestService.IsRequestRejected(request.Id)) { @@ -217,7 +234,14 @@ private async Task UnitRole(CommandRequest request) if (string.IsNullOrEmpty(request.Value)) { await _assignmentService.UnassignAllUnitRoles(request.Recipient); - _notificationsService.Add(new() { Owner = request.Recipient, Message = "You have been unassigned from all roles in all units", Icon = NotificationIcons.DEMOTION }); + _notificationsService.Add( + new() + { + Owner = request.Recipient, + Message = "You have been unassigned from all roles in all units", + Icon = NotificationIcons.DEMOTION + } + ); } else { @@ -226,7 +250,8 @@ private async Task UnitRole(CommandRequest request) new() { Owner = request.Recipient, - Message = $"You have been unassigned as {AvsAn.Query(role).Article} {role} in {_unitsService.GetChainString(_unitsContext.GetSingle(request.Value))}", + Message = + $"You have been unassigned as {AvsAn.Query(role).Article} {role} in {_unitsService.GetChainString(_unitsContext.GetSingle(request.Value))}", Icon = NotificationIcons.DEMOTION } ); @@ -247,7 +272,9 @@ private async Task UnitRole(CommandRequest request) } await _commandRequestService.ArchiveRequest(request.Id); - _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} as {request.DisplayValue} in {request.Value} because '{request.Reason}'"); + _logger.LogAudit( + $"{request.Type} request approved for {request.DisplayRecipient} as {request.DisplayValue} in {request.Value} because '{request.Reason}'" + ); } else if (_commandRequestService.IsRequestRejected(request.Id)) { @@ -260,9 +287,16 @@ private async Task UnitRemoval(CommandRequest request) { if (_commandRequestService.IsRequestApproved(request.Id)) { - Unit unit = _unitsContext.GetSingle(request.Value); + var unit = _unitsContext.GetSingle(request.Value); await _assignmentService.UnassignUnit(request.Recipient, unit.Id); - _notificationsService.Add(new() { Owner = request.Recipient, Message = $"You have been removed from {_unitsService.GetChainString(unit)}", Icon = NotificationIcons.DEMOTION }); + _notificationsService.Add( + new() + { + Owner = request.Recipient, + Message = $"You have been removed from {_unitsService.GetChainString(unit)}", + Icon = NotificationIcons.DEMOTION + } + ); await _commandRequestService.ArchiveRequest(request.Id); _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} because '{request.Reason}'"); } @@ -277,11 +311,13 @@ private async Task Transfer(CommandRequest request) { if (_commandRequestService.IsRequestApproved(request.Id)) { - Unit unit = _unitsContext.GetSingle(request.Value); + var unit = _unitsContext.GetSingle(request.Value); Notification notification = await _assignmentService.UpdateUnitRankAndRole(request.Recipient, unit.Name, reason: request.Reason); _notificationsService.Add(notification); await _commandRequestService.ArchiveRequest(request.Id); - _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); + _logger.LogAudit( + $"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'" + ); } else if (_commandRequestService.IsRequestRejected(request.Id)) { @@ -310,7 +346,9 @@ private async Task Reinstate(CommandRequest request) _logger.LogAudit($"{_httpContextService.GetUserId()} reinstated {dischargeCollection.Name}'s membership"); await _commandRequestService.ArchiveRequest(request.Id); - _logger.LogAudit($"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'"); + _logger.LogAudit( + $"{request.Type} request approved for {request.DisplayRecipient} from {request.DisplayFrom} to {request.DisplayValue} because '{request.Reason}'" + ); } else if (_commandRequestService.IsRequestRejected(request.Id)) { diff --git a/UKSF.Api.Command/Services/LoaService.cs b/UKSF.Api.Command/Services/LoaService.cs index 223f17c5..7597104f 100644 --- a/UKSF.Api.Command/Services/LoaService.cs +++ b/UKSF.Api.Command/Services/LoaService.cs @@ -5,13 +5,12 @@ using MongoDB.Driver; using UKSF.Api.Command.Context; using UKSF.Api.Command.Models; -using UKSF.Api.Personnel.Models; namespace UKSF.Api.Command.Services { public interface ILoaService { - IEnumerable Get(List ids); + IEnumerable Get(List ids); Task Add(CommandRequestLoa requestBase); Task SetLoaState(string id, LoaReviewState state); bool IsLoaCovered(string id, DateTime eventStart); @@ -26,14 +25,14 @@ public LoaService(ILoaContext loaContext) _loaContext = loaContext; } - public IEnumerable Get(List ids) + public IEnumerable Get(List ids) { - return _loaContext.Get(x => ids.Contains(x.Recipient) && x.End > DateTime.Now.AddDays(-30)); + return _loaContext.Get(x => ids.Contains(x.Recipient)); } public async Task Add(CommandRequestLoa requestBase) { - Loa loa = new() + DomainLoa domainLoa = new() { Submitted = DateTime.Now, Recipient = requestBase.Recipient, @@ -43,13 +42,13 @@ public async Task Add(CommandRequestLoa requestBase) Emergency = !string.IsNullOrEmpty(requestBase.Emergency) && bool.Parse(requestBase.Emergency), Late = !string.IsNullOrEmpty(requestBase.Late) && bool.Parse(requestBase.Late) }; - await _loaContext.Add(loa); - return loa.Id; + await _loaContext.Add(domainLoa); + return domainLoa.Id; } public async Task SetLoaState(string id, LoaReviewState state) { - await _loaContext.Update(id, Builders.Update.Set(x => x.State, state)); + await _loaContext.Update(id, Builders.Update.Set(x => x.State, state)); } public bool IsLoaCovered(string id, DateTime eventStart) diff --git a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs index 265eecdf..4e7bcd5f 100644 --- a/UKSF.Api.Integrations.Discord/Services/DiscordService.cs +++ b/UKSF.Api.Integrations.Discord/Services/DiscordService.cs @@ -31,8 +31,16 @@ public interface IDiscordService public class DiscordService : IDiscordService, IDisposable { - private static readonly string[] OWNER_REPLIES = { "Why thank you {0} owo", "Thank you {0}, you're too kind", "Thank you so much {0} uwu", "Aw shucks {0} you're embarrassing me" }; - private static readonly string[] REPLIES = { "Why thank you {0}", "Thank you {0}, you're too kind", "Thank you so much {0}", "Aw shucks {0} you're embarrassing me" }; + private static readonly string[] OWNER_REPLIES = + { + "Why thank you {0} owo", "Thank you {0}, you're too kind", "Thank you so much {0} uwu", "Aw shucks {0} you're embarrassing me" + }; + + private static readonly string[] REPLIES = + { + "Why thank you {0}", "Thank you {0}, you're too kind", "Thank you so much {0}", "Aw shucks {0} you're embarrassing me" + }; + private static readonly string[] TRIGGERS = { "thank you", "thank", "best", "mvp", "love you", "appreciate you", "good" }; private readonly IAccountContext _accountContext; private readonly IConfiguration _configuration; @@ -256,7 +264,9 @@ private async Task UpdateAccountNickname(IGuildUser user, DomainAccount domainAc } catch (Exception) { - _logger.LogError($"Failed to update nickname for {(string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname)}. Must manually be changed to: {name}"); + _logger.LogError( + $"Failed to update nickname for {(string.IsNullOrEmpty(user.Nickname) ? user.Username : user.Nickname)}. Must manually be changed to: {name}" + ); } } } @@ -264,7 +274,7 @@ private async Task UpdateAccountNickname(IGuildUser user, DomainAccount domainAc private void UpdateAccountRanks(DomainAccount domainAccount, ISet allowedRoles) { string rank = domainAccount.Rank; - foreach (Rank x in _ranksContext.Get().Where(x => rank == x.Name)) + foreach (var x in _ranksContext.Get().Where(x => rank == x.Name)) { allowedRoles.Add(x.DiscordRoleId); } @@ -272,9 +282,9 @@ private void UpdateAccountRanks(DomainAccount domainAccount, ISet allowe private void UpdateAccountUnits(DomainAccount domainAccount, ISet allowedRoles) { - Unit accountUnit = _unitsContext.GetSingle(x => x.Name == domainAccount.UnitAssignment); - List accountUnits = _unitsContext.Get(x => x.Members.Contains(domainAccount.Id)).Where(x => !string.IsNullOrEmpty(x.DiscordRoleId)).ToList(); - List accountUnitParents = _unitsService.GetParents(accountUnit).Where(x => !string.IsNullOrEmpty(x.DiscordRoleId)).ToList(); + var accountUnit = _unitsContext.GetSingle(x => x.Name == domainAccount.UnitAssignment); + var accountUnits = _unitsContext.Get(x => x.Members.Contains(domainAccount.Id)).Where(x => !string.IsNullOrEmpty(x.DiscordRoleId)).ToList(); + var accountUnitParents = _unitsService.GetParents(accountUnit).Where(x => !string.IsNullOrEmpty(x.DiscordRoleId)).ToList(); accountUnits.ForEach(x => allowedRoles.Add(x.DiscordRoleId)); accountUnitParents.ForEach(x => allowedRoles.Add(x.DiscordRoleId)); } @@ -344,7 +354,14 @@ private void AddEventhandlers() string associatedAccountMessage = GetAssociatedAccountMessageFromUserId(user.Id); ulong instigatorId = await GetBannedAuditLogInstigator(user.Id); string instigatorName = GetUserNickname(_guild.GetUser(instigatorId)); - _logger.LogDiscordEvent(DiscordUserEventType.BANNED, instigatorId.ToString(), instigatorName, string.Empty, user.Username, $"Banned, {associatedAccountMessage}"); + _logger.LogDiscordEvent( + DiscordUserEventType.BANNED, + instigatorId.ToString(), + instigatorName, + string.Empty, + user.Username, + $"Banned, {associatedAccountMessage}" + ); }; _client.UserUnbanned += async (user, _) => @@ -352,7 +369,14 @@ private void AddEventhandlers() string associatedAccountMessage = GetAssociatedAccountMessageFromUserId(user.Id); ulong instigatorId = await GetUnbannedAuditLogInstigator(user.Id); string instigatorName = GetUserNickname(_guild.GetUser(instigatorId)); - _logger.LogDiscordEvent(DiscordUserEventType.UNBANNED, instigatorId.ToString(), instigatorName, string.Empty, user.Username, $"Unbanned, {associatedAccountMessage}"); + _logger.LogDiscordEvent( + DiscordUserEventType.UNBANNED, + instigatorId.ToString(), + instigatorName, + string.Empty, + user.Username, + $"Unbanned, {associatedAccountMessage}" + ); }; _client.MessagesBulkDeleted += async (cacheables, channel) => @@ -377,7 +401,14 @@ private void AddEventhandlers() if (irretrievableMessageCount > 0) { - _logger.LogDiscordEvent(DiscordUserEventType.MESSAGE_DELETED, "0", "NO INSTIGATOR", channel.Name, string.Empty, $"{irretrievableMessageCount} irretrievable messages deleted"); + _logger.LogDiscordEvent( + DiscordUserEventType.MESSAGE_DELETED, + "0", + "NO INSTIGATOR", + channel.Name, + string.Empty, + $"{irretrievableMessageCount} irretrievable messages deleted" + ); } IEnumerable> groupedMessages = messages.GroupBy(x => x.Name); @@ -385,7 +416,14 @@ private void AddEventhandlers() { foreach (DiscordDeletedMessageResult result in groupedMessage) { - _logger.LogDiscordEvent(DiscordUserEventType.MESSAGE_DELETED, result.InstigatorId.ToString(), result.InstigatorName, channel.Name, result.Name, result.Message); + _logger.LogDiscordEvent( + DiscordUserEventType.MESSAGE_DELETED, + result.InstigatorId.ToString(), + result.InstigatorName, + channel.Name, + result.Name, + result.Message + ); } } }; @@ -397,10 +435,24 @@ private void AddEventhandlers() { case ulong.MaxValue: return; case 0: - _logger.LogDiscordEvent(DiscordUserEventType.MESSAGE_DELETED, "0", "NO INSTIGATOR", channel.Name, string.Empty, $"Irretrievable message {cacheable.Id} deleted"); + _logger.LogDiscordEvent( + DiscordUserEventType.MESSAGE_DELETED, + "0", + "NO INSTIGATOR", + channel.Name, + string.Empty, + $"Irretrievable message {cacheable.Id} deleted" + ); return; default: - _logger.LogDiscordEvent(DiscordUserEventType.MESSAGE_DELETED, result.InstigatorId.ToString(), result.InstigatorName, channel.Name, result.Name, result.Message); + _logger.LogDiscordEvent( + DiscordUserEventType.MESSAGE_DELETED, + result.InstigatorId.ToString(), + result.InstigatorName, + channel.Name, + result.Name, + result.Message + ); break; } }; @@ -529,7 +581,11 @@ private async Task ClientOnReactionRemoved(Cacheable cachea private bool MessageIsWeeklyEventsMessage(IMessage message) { - return message != null && message.Content.Contains(_variablesService.GetVariable("DISCORD_FILTER_WEEKLY_EVENTS").AsString(), StringComparison.InvariantCultureIgnoreCase); + return message != null && + message.Content.Contains( + _variablesService.GetVariable("DISCORD_FILTER_WEEKLY_EVENTS").AsString(), + StringComparison.InvariantCultureIgnoreCase + ); } private string GetAssociatedAccountMessageFromUserId(ulong userId) @@ -595,13 +651,16 @@ private async Task GetMessageDeletedAuditLogInstigator(ulong channelId, u private async Task GetBannedAuditLogInstigator(ulong userId) { - IAsyncEnumerator> auditLogsEnumerator = _guild.GetAuditLogsAsync(10, RequestOptions.Default, null, null, ActionType.Ban).GetAsyncEnumerator(); + IAsyncEnumerator> auditLogsEnumerator = + _guild.GetAuditLogsAsync(10, RequestOptions.Default, null, null, ActionType.Ban).GetAsyncEnumerator(); try { while (await auditLogsEnumerator.MoveNextAsync()) { IReadOnlyCollection auditLogs = auditLogsEnumerator.Current; - var auditUser = auditLogs.Where(x => x.Data is BanAuditLogData).Select(x => new { Data = x.Data as BanAuditLogData, x.User }).FirstOrDefault(x => x.Data.Target.Id == userId); + var auditUser = auditLogs.Where(x => x.Data is BanAuditLogData) + .Select(x => new { Data = x.Data as BanAuditLogData, x.User }) + .FirstOrDefault(x => x.Data.Target.Id == userId); if (auditUser != null) { return auditUser.User.Id; @@ -618,13 +677,16 @@ private async Task GetBannedAuditLogInstigator(ulong userId) private async Task GetUnbannedAuditLogInstigator(ulong userId) { - IAsyncEnumerator> auditLogsEnumerator = _guild.GetAuditLogsAsync(10, RequestOptions.Default, null, null, ActionType.Unban).GetAsyncEnumerator(); + IAsyncEnumerator> auditLogsEnumerator = + _guild.GetAuditLogsAsync(10, RequestOptions.Default, null, null, ActionType.Unban).GetAsyncEnumerator(); try { while (await auditLogsEnumerator.MoveNextAsync()) { IReadOnlyCollection auditLogs = auditLogsEnumerator.Current; - var auditUser = auditLogs.Where(x => x.Data is UnbanAuditLogData).Select(x => new { Data = x.Data as UnbanAuditLogData, x.User }).FirstOrDefault(x => x.Data.Target.Id == userId); + var auditUser = auditLogs.Where(x => x.Data is UnbanAuditLogData) + .Select(x => new { Data = x.Data as UnbanAuditLogData, x.User }) + .FirstOrDefault(x => x.Data.Target.Id == userId); if (auditUser != null) { return auditUser.User.Id; diff --git a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs index 717bfb53..58097a21 100644 --- a/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs +++ b/UKSF.Api.Integrations.Teamspeak/Services/TeamspeakGroupService.cs @@ -94,15 +94,17 @@ private void ResolveRankGroup(DomainAccount domainAccount, ISet memberGroup private void ResolveUnitGroup(DomainAccount domainAccount, ISet memberGroups) { - Unit accountUnit = _unitsContext.GetSingle(x => x.Name == domainAccount.UnitAssignment); - Unit elcom = _unitsService.GetAuxilliaryRoot(); + var accountUnit = _unitsContext.GetSingle(x => x.Name == domainAccount.UnitAssignment); + var elcom = _unitsService.GetAuxilliaryRoot(); if (accountUnit.Parent == ObjectId.Empty.ToString()) { memberGroups.Add(accountUnit.TeamspeakGroup.ToInt()); } - int group = elcom.Members.Contains(domainAccount.Id) ? _variablesService.GetVariable("TEAMSPEAK_GID_ELCOM").AsInt() : accountUnit.TeamspeakGroup.ToInt(); + int group = elcom.Members.Contains(domainAccount.Id) + ? _variablesService.GetVariable("TEAMSPEAK_GID_ELCOM").AsInt() + : accountUnit.TeamspeakGroup.ToInt(); if (group == 0) { ResolveParentUnitGroup(domainAccount, memberGroups); @@ -115,8 +117,10 @@ private void ResolveUnitGroup(DomainAccount domainAccount, ISet memberGroup private void ResolveParentUnitGroup(DomainAccount domainAccount, ISet memberGroups) { - Unit accountUnit = _unitsContext.GetSingle(x => x.Name == domainAccount.UnitAssignment); - Unit parentUnit = _unitsService.GetParents(accountUnit).Skip(1).FirstOrDefault(x => !string.IsNullOrEmpty(x.TeamspeakGroup) && !memberGroups.Contains(x.TeamspeakGroup.ToInt())); + var accountUnit = _unitsContext.GetSingle(x => x.Name == domainAccount.UnitAssignment); + var parentUnit = _unitsService.GetParents(accountUnit) + .Skip(1) + .FirstOrDefault(x => !string.IsNullOrEmpty(x.TeamspeakGroup) && !memberGroups.Contains(x.TeamspeakGroup.ToInt())); if (parentUnit != null && parentUnit.Parent != ObjectId.Empty.ToString()) { memberGroups.Add(parentUnit.TeamspeakGroup.ToInt()); @@ -129,9 +133,10 @@ private void ResolveParentUnitGroup(DomainAccount domainAccount, ISet membe private void ResolveAuxiliaryUnitGroups(MongoObject account, ISet memberGroups) { - IEnumerable accountUnits = _unitsContext.Get(x => x.Parent != ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY && x.Members.Contains(account.Id)) - .Where(x => !string.IsNullOrEmpty(x.TeamspeakGroup)); - foreach (Unit unit in accountUnits) + var accountUnits = _unitsContext + .Get(x => x.Parent != ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY && x.Members.Contains(account.Id)) + .Where(x => !string.IsNullOrEmpty(x.TeamspeakGroup)); + foreach (var unit in accountUnits) { memberGroups.Add(unit.TeamspeakGroup.ToInt()); } diff --git a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs index da098f5a..76b88909 100644 --- a/UKSF.Api.Personnel/ApiPersonnelExtensions.cs +++ b/UKSF.Api.Personnel/ApiPersonnelExtensions.cs @@ -69,17 +69,18 @@ private static IServiceCollection AddCommands(this IServiceCollection services) private static IServiceCollection AddQueries(this IServiceCollection services) { - return services.AddSingleton(); + return services.AddSingleton().AddSingleton(); } private static IServiceCollection AddMappers(this IServiceCollection services) { - return services.AddSingleton(); + return services.AddSingleton().AddSingleton(); } private static IServiceCollection AddActions(this IServiceCollection services) { - return services.AddSingleton().AddSingleton(); + return services.AddSingleton() + .AddSingleton(); } public static void AddUksfPersonnelSignalr(this IEndpointRouteBuilder builder) diff --git a/UKSF.Api.Personnel/Context/RanksContext.cs b/UKSF.Api.Personnel/Context/RanksContext.cs index 66250540..7bd0263b 100644 --- a/UKSF.Api.Personnel/Context/RanksContext.cs +++ b/UKSF.Api.Personnel/Context/RanksContext.cs @@ -7,22 +7,22 @@ namespace UKSF.Api.Personnel.Context { - public interface IRanksContext : IMongoContext, ICachedMongoContext + public interface IRanksContext : IMongoContext, ICachedMongoContext { - new IEnumerable Get(); - new Rank GetSingle(string name); + new IEnumerable Get(); + new DomainRank GetSingle(string name); } - public class RanksContext : CachedMongoContext, IRanksContext + public class RanksContext : CachedMongoContext, IRanksContext { public RanksContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "ranks") { } - public override Rank GetSingle(string name) + public override DomainRank GetSingle(string name) { return GetSingle(x => x.Name == name); } - protected override void SetCache(IEnumerable newCollection) + protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { diff --git a/UKSF.Api.Personnel/Context/RolesContext.cs b/UKSF.Api.Personnel/Context/RolesContext.cs index c127e5de..818895e8 100644 --- a/UKSF.Api.Personnel/Context/RolesContext.cs +++ b/UKSF.Api.Personnel/Context/RolesContext.cs @@ -7,22 +7,22 @@ namespace UKSF.Api.Personnel.Context { - public interface IRolesContext : IMongoContext, ICachedMongoContext + public interface IRolesContext : IMongoContext, ICachedMongoContext { - new IEnumerable Get(); - new Role GetSingle(string name); + new IEnumerable Get(); + new DomainRole GetSingle(string name); } - public class RolesContext : CachedMongoContext, IRolesContext + public class RolesContext : CachedMongoContext, IRolesContext { public RolesContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "roles") { } - public override Role GetSingle(string name) + public override DomainRole GetSingle(string name) { return GetSingle(x => x.Name == name); } - protected override void SetCache(IEnumerable newCollection) + protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { diff --git a/UKSF.Api.Personnel/Context/UnitsContext.cs b/UKSF.Api.Personnel/Context/UnitsContext.cs index 2e558da1..b2e68be0 100644 --- a/UKSF.Api.Personnel/Context/UnitsContext.cs +++ b/UKSF.Api.Personnel/Context/UnitsContext.cs @@ -7,13 +7,13 @@ namespace UKSF.Api.Personnel.Context { - public interface IUnitsContext : IMongoContext, ICachedMongoContext { } + public interface IUnitsContext : IMongoContext, ICachedMongoContext { } - public class UnitsContext : CachedMongoContext, IUnitsContext + public class UnitsContext : CachedMongoContext, IUnitsContext { public UnitsContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus) : base(mongoCollectionFactory, eventBus, "units") { } - protected override void SetCache(IEnumerable newCollection) + protected override void SetCache(IEnumerable newCollection) { lock (LockObject) { diff --git a/UKSF.Api.Personnel/Controllers/RanksController.cs b/UKSF.Api.Personnel/Controllers/RanksController.cs index 77ba0344..e356f040 100644 --- a/UKSF.Api.Personnel/Controllers/RanksController.cs +++ b/UKSF.Api.Personnel/Controllers/RanksController.cs @@ -19,7 +19,13 @@ public class RanksController : ControllerBase private readonly INotificationsService _notificationsService; private readonly IRanksContext _ranksContext; - public RanksController(IAccountContext accountContext, IRanksContext ranksContext, IAssignmentService assignmentService, INotificationsService notificationsService, ILogger logger) + public RanksController( + IAccountContext accountContext, + IRanksContext ranksContext, + IAssignmentService assignmentService, + INotificationsService notificationsService, + ILogger logger + ) { _accountContext = accountContext; _ranksContext = ranksContext; @@ -29,20 +35,20 @@ public RanksController(IAccountContext accountContext, IRanksContext ranksContex } [HttpGet, Authorize] - public IEnumerable GetRanks() + public IEnumerable GetRanks() { return _ranksContext.Get(); } [HttpGet("{id}"), Authorize] - public IEnumerable GetRanks(string id) + public IEnumerable GetRanks(string id) { DomainAccount domainAccount = _accountContext.GetSingle(id); return _ranksContext.Get(x => x.Name != domainAccount.Rank); } [HttpPost("{check}"), Authorize] - public Rank CheckRank(string check, [FromBody] Rank rank = null) + public DomainRank CheckRank(string check, [FromBody] DomainRank rank = null) { if (string.IsNullOrEmpty(check)) { @@ -51,7 +57,7 @@ public Rank CheckRank(string check, [FromBody] Rank rank = null) if (rank != null) { - Rank safeRank = rank; + var safeRank = rank; return _ranksContext.GetSingle(x => x.Id != safeRank.Id && (x.Name == check || x.TeamspeakGroup == check)); } @@ -59,35 +65,39 @@ public Rank CheckRank(string check, [FromBody] Rank rank = null) } [HttpPost, Authorize] - public Rank CheckRank([FromBody] Rank rank) + public DomainRank CheckRank([FromBody] DomainRank rank) { return rank == null ? null : _ranksContext.GetSingle(x => x.Id != rank.Id && (x.Name == rank.Name || x.TeamspeakGroup == rank.TeamspeakGroup)); } [HttpPut, Authorize] - public async Task AddRank([FromBody] Rank rank) + public async Task AddRank([FromBody] DomainRank rank) { await _ranksContext.Add(rank); _logger.LogAudit($"Rank added '{rank.Name}, {rank.Abbreviation}, {rank.TeamspeakGroup}'"); } [HttpPatch, Authorize] - public async Task> EditRank([FromBody] Rank rank) + public async Task> EditRank([FromBody] DomainRank rank) { - Rank oldRank = _ranksContext.GetSingle(x => x.Id == rank.Id); + var oldRank = _ranksContext.GetSingle(x => x.Id == rank.Id); _logger.LogAudit( $"Rank updated from '{oldRank.Name}, {oldRank.Abbreviation}, {oldRank.TeamspeakGroup}, {oldRank.DiscordRoleId}' to '{rank.Name}, {rank.Abbreviation}, {rank.TeamspeakGroup}, {rank.DiscordRoleId}'" ); await _ranksContext.Update( rank.Id, - Builders.Update.Set(x => x.Name, rank.Name) - .Set(x => x.Abbreviation, rank.Abbreviation) - .Set(x => x.TeamspeakGroup, rank.TeamspeakGroup) - .Set(x => x.DiscordRoleId, rank.DiscordRoleId) + Builders.Update.Set(x => x.Name, rank.Name) + .Set(x => x.Abbreviation, rank.Abbreviation) + .Set(x => x.TeamspeakGroup, rank.TeamspeakGroup) + .Set(x => x.DiscordRoleId, rank.DiscordRoleId) ); foreach (DomainAccount account in _accountContext.Get(x => x.Rank == oldRank.Name)) { - Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, rankString: rank.Name, reason: $"the '{rank.Name}' rank was updated"); + Notification notification = await _assignmentService.UpdateUnitRankAndRole( + account.Id, + rankString: rank.Name, + reason: $"the '{rank.Name}' rank was updated" + ); _notificationsService.Add(notification); } @@ -95,14 +105,18 @@ await _ranksContext.Update( } [HttpDelete("{id}"), Authorize] - public async Task> DeleteRank(string id) + public async Task> DeleteRank(string id) { - Rank rank = _ranksContext.GetSingle(x => x.Id == id); + var rank = _ranksContext.GetSingle(x => x.Id == id); _logger.LogAudit($"Rank deleted '{rank.Name}'"); await _ranksContext.Delete(id); foreach (DomainAccount account in _accountContext.Get(x => x.Rank == rank.Name)) { - Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, rankString: AssignmentService.REMOVE_FLAG, reason: $"the '{rank.Name}' rank was deleted"); + Notification notification = await _assignmentService.UpdateUnitRankAndRole( + account.Id, + rankString: AssignmentService.REMOVE_FLAG, + reason: $"the '{rank.Name}' rank was deleted" + ); _notificationsService.Add(notification); } @@ -110,11 +124,11 @@ public async Task> DeleteRank(string id) } [HttpPost("order"), Authorize] - public async Task> UpdateOrder([FromBody] List newRankOrder) + public async Task> UpdateOrder([FromBody] List newRankOrder) { for (int index = 0; index < newRankOrder.Count; index++) { - Rank rank = newRankOrder[index]; + var rank = newRankOrder[index]; if (_ranksContext.GetSingle(rank.Name).Order != index) { await _ranksContext.Update(rank.Id, x => x.Order, index); diff --git a/UKSF.Api.Personnel/Controllers/RolesController.cs b/UKSF.Api.Personnel/Controllers/RolesController.cs index 4f4f81ec..87ea15d6 100644 --- a/UKSF.Api.Personnel/Controllers/RolesController.cs +++ b/UKSF.Api.Personnel/Controllers/RolesController.cs @@ -45,24 +45,32 @@ public RolesDataset GetRoles([FromQuery] string id = "", [FromQuery] string unit { if (!string.IsNullOrEmpty(id) && !string.IsNullOrEmpty(unitId)) { - Unit unit = _unitsContext.GetSingle(unitId); - IOrderedEnumerable unitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order); + var unit = _unitsContext.GetSingle(unitId); + var unitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order); IEnumerable> existingPairs = unit.Roles.Where(x => x.Value == id); - IEnumerable filteredRoles = unitRoles.Where(x => existingPairs.All(y => y.Key != x.Name)); + var filteredRoles = unitRoles.Where(x => existingPairs.All(y => y.Key != x.Name)); return new() { UnitRoles = filteredRoles }; } if (!string.IsNullOrEmpty(id)) { DomainAccount domainAccount = _accountContext.GetSingle(id); - return new() { IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL && x.Name != domainAccount.RoleAssignment).OrderBy(x => x.Order) }; + return new() + { + IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL && x.Name != domainAccount.RoleAssignment) + .OrderBy(x => x.Order) + }; } - return new() { IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), UnitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }; + return new() + { + IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), + UnitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) + }; } [HttpPost("{roleType}/{check}"), Authorize] - public Role CheckRole(RoleType roleType, string check, [FromBody] Role role = null) + public DomainRole CheckRole(RoleType roleType, string check, [FromBody] DomainRole role = null) { if (string.IsNullOrEmpty(check)) { @@ -71,7 +79,7 @@ public Role CheckRole(RoleType roleType, string check, [FromBody] Role role = nu if (role != null) { - Role safeRole = role; + var safeRole = role; return _rolesContext.GetSingle(x => x.Id != safeRole.Id && x.RoleType == roleType && x.Name == check); } @@ -79,17 +87,21 @@ public Role CheckRole(RoleType roleType, string check, [FromBody] Role role = nu } [HttpPut, Authorize] - public async Task AddRole([FromBody] Role role) + public async Task AddRole([FromBody] DomainRole role) { await _rolesContext.Add(role); _logger.LogAudit($"Role added '{role.Name}'"); - return new() { IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), UnitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }; + return new() + { + IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), + UnitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) + }; } [HttpPatch, Authorize] - public async Task EditRole([FromBody] Role role) + public async Task EditRole([FromBody] DomainRole role) { - Role oldRole = _rolesContext.GetSingle(x => x.Id == role.Id); + var oldRole = _rolesContext.GetSingle(x => x.Id == role.Id); _logger.LogAudit($"Role updated from '{oldRole.Name}' to '{role.Name}'"); await _rolesContext.Update(role.Id, x => x.Name, role.Name); foreach (DomainAccount account in _accountContext.Get(x => x.RoleAssignment == oldRole.Name)) @@ -98,31 +110,43 @@ public async Task EditRole([FromBody] Role role) } await _unitsService.RenameRole(oldRole.Name, role.Name); - return new() { IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), UnitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }; + return new() + { + IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), + UnitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) + }; } [HttpDelete("{id}"), Authorize] public async Task DeleteRole(string id) { - Role role = _rolesContext.GetSingle(x => x.Id == id); + var role = _rolesContext.GetSingle(x => x.Id == id); _logger.LogAudit($"Role deleted '{role.Name}'"); await _rolesContext.Delete(id); foreach (DomainAccount account in _accountContext.Get(x => x.RoleAssignment == role.Name)) { - Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, role: AssignmentService.REMOVE_FLAG, reason: $"the '{role.Name}' role was deleted"); + Notification notification = await _assignmentService.UpdateUnitRankAndRole( + account.Id, + role: AssignmentService.REMOVE_FLAG, + reason: $"the '{role.Name}' role was deleted" + ); _notificationsService.Add(notification); } await _unitsService.DeleteRole(role.Name); - return new() { IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), UnitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) }; + return new() + { + IndividualRoles = _rolesContext.Get(x => x.RoleType == RoleType.INDIVIDUAL), + UnitRoles = _rolesContext.Get(x => x.RoleType == RoleType.UNIT).OrderBy(x => x.Order) + }; } [HttpPost("order"), Authorize] - public async Task> UpdateOrder([FromBody] List newRoleOrder) + public async Task> UpdateOrder([FromBody] List newRoleOrder) { for (int index = 0; index < newRoleOrder.Count; index++) { - Role role = newRoleOrder[index]; + var role = newRoleOrder[index]; if (_rolesContext.GetSingle(role.Name).Order != index) { await _rolesContext.Update(role.Id, x => x.Order, index); diff --git a/UKSF.Api.Personnel/Controllers/UnitsController.cs b/UKSF.Api.Personnel/Controllers/UnitsController.cs index fee940d0..5697f528 100644 --- a/UKSF.Api.Personnel/Controllers/UnitsController.cs +++ b/UKSF.Api.Personnel/Controllers/UnitsController.cs @@ -7,9 +7,10 @@ using Microsoft.AspNetCore.Mvc; using MongoDB.Bson; using UKSF.Api.Base.Events; -using UKSF.Api.Base.Models; using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Mappers; using UKSF.Api.Personnel.Models; +using UKSF.Api.Personnel.Queries; using UKSF.Api.Personnel.Services; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Exceptions; @@ -24,6 +25,7 @@ public class UnitsController : ControllerBase private readonly IAssignmentService _assignmentService; private readonly IDisplayNameService _displayNameService; private readonly IEventBus _eventBus; + private readonly IGetUnitTreeQuery _getUnitTreeQuery; private readonly ILogger _logger; private readonly IMapper _mapper; private readonly INotificationsService _notificationsService; @@ -31,6 +33,7 @@ public class UnitsController : ControllerBase private readonly IRolesService _rolesService; private readonly IUnitsContext _unitsContext; private readonly IUnitsService _unitsService; + private readonly IUnitTreeMapper _unitTreeMapper; public UnitsController( IAccountContext accountContext, @@ -43,7 +46,9 @@ public UnitsController( INotificationsService notificationsService, IEventBus eventBus, IMapper mapper, - ILogger logger + ILogger logger, + IGetUnitTreeQuery getUnitTreeQuery, + IUnitTreeMapper unitTreeMapper ) { _accountContext = accountContext; @@ -57,14 +62,16 @@ ILogger logger _eventBus = eventBus; _mapper = mapper; _logger = logger; + _getUnitTreeQuery = getUnitTreeQuery; + _unitTreeMapper = unitTreeMapper; } [HttpGet, Authorize] - public IEnumerable Get([FromQuery] string filter = "", [FromQuery] string accountId = "") + public IEnumerable Get([FromQuery] string filter = "", [FromQuery] string accountId = "") { - if (!string.IsNullOrEmpty(accountId)) + if (!string.IsNullOrWhiteSpace(accountId)) { - IEnumerable response = filter switch + var response = filter switch { "auxiliary" => _unitsService.GetSortedUnits(x => x.Branch == UnitBranch.AUXILIARY && x.Members.Contains(accountId)), "available" => _unitsService.GetSortedUnits(x => !x.Members.Contains(accountId)), @@ -73,16 +80,27 @@ public IEnumerable Get([FromQuery] string filter = "", [FromQuery] string return response; } + if (!string.IsNullOrWhiteSpace(filter)) + { + var response = filter switch + { + "auxiliary" => _unitsService.GetSortedUnits(x => x.Branch == UnitBranch.AUXILIARY), + "combat" => _unitsService.GetSortedUnits(x => x.Branch == UnitBranch.COMBAT), + _ => _unitsService.GetSortedUnits() + }; + return response; + } + return _unitsService.GetSortedUnits(); } [HttpGet("{id}"), Authorize] public ResponseUnit GetSingle([FromRoute] string id) { - Unit unit = _unitsContext.GetSingle(id); - Unit parent = _unitsService.GetParent(unit); + var unit = _unitsContext.GetSingle(id); + var parent = _unitsService.GetParent(unit); // TODO: Use a factory or mapper - ResponseUnit response = _mapper.Map(unit); + var response = _mapper.Map(unit); response.Code = _unitsService.GetChainString(unit); response.ParentName = parent?.Name; response.UnitMembers = MapUnitMembers(unit); @@ -97,48 +115,41 @@ public bool GetUnitExists([FromRoute] string check, [FromQuery] string id = "") return false; } - bool exists = _unitsContext.GetSingle( - x => (string.IsNullOrEmpty(id) || x.Id != id) && - (string.Equals(x.Name, check, StringComparison.InvariantCultureIgnoreCase) || - string.Equals(x.Shortname, check, StringComparison.InvariantCultureIgnoreCase) || - string.Equals(x.TeamspeakGroup, check, StringComparison.InvariantCultureIgnoreCase) || - string.Equals(x.DiscordRoleId, check, StringComparison.InvariantCultureIgnoreCase) || - string.Equals(x.Callsign, check, StringComparison.InvariantCultureIgnoreCase)) - ) != - null; + var exists = _unitsContext.GetSingle( + x => (string.IsNullOrEmpty(id) || x.Id != id) && + (string.Equals(x.Name, check, StringComparison.InvariantCultureIgnoreCase) || + string.Equals(x.Shortname, check, StringComparison.InvariantCultureIgnoreCase) || + string.Equals(x.TeamspeakGroup, check, StringComparison.InvariantCultureIgnoreCase) || + string.Equals(x.DiscordRoleId, check, StringComparison.InvariantCultureIgnoreCase) || + string.Equals(x.Callsign, check, StringComparison.InvariantCultureIgnoreCase)) + ) != + null; return exists; } [HttpGet("tree"), Authorize] - public ResponseUnitTreeDataSet GetTree() + public async Task GetTree() { - Unit combatRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); - Unit auxiliaryRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); - ResponseUnitTreeDataSet dataSet = new() + var combatTree = await _getUnitTreeQuery.ExecuteAsync(new(UnitBranch.COMBAT)); + var auxiliaryTree = await _getUnitTreeQuery.ExecuteAsync(new(UnitBranch.AUXILIARY)); + return new() { - CombatNodes = new List { new() { Id = combatRoot.Id, Name = combatRoot.Name, Children = GetUnitTreeChildren(combatRoot) } }, - AuxiliaryNodes = new List { new() { Id = auxiliaryRoot.Id, Name = auxiliaryRoot.Name, Children = GetUnitTreeChildren(auxiliaryRoot) } } + CombatNodes = new List { _unitTreeMapper.MapUnitTree(combatTree) }, + AuxiliaryNodes = new List { _unitTreeMapper.MapUnitTree(auxiliaryTree) } }; - return dataSet; - } - - // TODO: Use a mapper - private IEnumerable GetUnitTreeChildren(MongoObject parentUnit) - { - return _unitsContext.Get(x => x.Parent == parentUnit.Id).Select(unit => new ResponseUnitTree { Id = unit.Id, Name = unit.Name, Children = GetUnitTreeChildren(unit) }); } [HttpPost, Authorize] - public async Task AddUnit([FromBody] Unit unit) + public async Task AddUnit([FromBody] DomainUnit unit) { await _unitsContext.Add(unit); _logger.LogAudit($"New unit added: '{unit}'"); } [HttpPut("{id}"), Authorize] - public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit) + public async Task EditUnit([FromRoute] string id, [FromBody] DomainUnit unit) { - Unit oldUnit = _unitsContext.GetSingle(x => x.Id == id); + var oldUnit = _unitsContext.GetSingle(x => x.Id == id); await _unitsContext.Replace(unit); _logger.LogAudit($"Unit '{unit.Shortname}' updated: {oldUnit.Changes(unit)}"); @@ -146,7 +157,7 @@ public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit) unit = _unitsContext.GetSingle(unit.Id); if (unit.Name != oldUnit.Name) { - foreach (DomainAccount account in _accountContext.Get(x => x.UnitAssignment == oldUnit.Name)) + foreach (var account in _accountContext.Get(x => x.UnitAssignment == oldUnit.Name)) { await _accountContext.Update(account.Id, x => x.UnitAssignment, unit.Name); _eventBus.Send(account); @@ -155,7 +166,7 @@ public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit) if (unit.TeamspeakGroup != oldUnit.TeamspeakGroup) { - foreach (DomainAccount account in unit.Members.Select(x => _accountContext.GetSingle(x))) + foreach (var account in unit.Members.Select(x => _accountContext.GetSingle(x))) { _eventBus.Send(account); } @@ -163,7 +174,7 @@ public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit) if (unit.DiscordRoleId != oldUnit.DiscordRoleId) { - foreach (DomainAccount account in unit.Members.Select(x => _accountContext.GetSingle(x))) + foreach (var account in unit.Members.Select(x => _accountContext.GetSingle(x))) { _eventBus.Send(account); } @@ -173,11 +184,11 @@ public async Task EditUnit([FromRoute] string id, [FromBody] Unit unit) [HttpDelete("{id}"), Authorize] public async Task DeleteUnit([FromRoute] string id) { - Unit unit = _unitsContext.GetSingle(id); + var unit = _unitsContext.GetSingle(id); _logger.LogAudit($"Unit deleted '{unit.Name}'"); - foreach (DomainAccount account in _accountContext.Get(x => x.UnitAssignment == unit.Name)) + foreach (var account in _accountContext.Get(x => x.UnitAssignment == unit.Name)) { - Notification notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, "Reserves", reason: $"{unit.Name} was deleted"); + var notification = await _assignmentService.UpdateUnitRankAndRole(account.Id, "Reserves", reason: $"{unit.Name} was deleted"); _notificationsService.Add(notification); } @@ -187,8 +198,8 @@ public async Task DeleteUnit([FromRoute] string id) [HttpPatch("{id}/parent"), Authorize] public async Task UpdateParent([FromRoute] string id, [FromBody] RequestUnitUpdateParent unitUpdate) { - Unit unit = _unitsContext.GetSingle(id); - Unit parentUnit = _unitsContext.GetSingle(unitUpdate.ParentId); + var unit = _unitsContext.GetSingle(id); + var parentUnit = _unitsContext.GetSingle(unitUpdate.ParentId); if (unit.Parent == parentUnit.Id) { return; @@ -200,18 +211,18 @@ public async Task UpdateParent([FromRoute] string id, [FromBody] RequestUnitUpda await _unitsContext.Update(id, x => x.Branch, parentUnit.Branch); } - List parentChildren = _unitsContext.Get(x => x.Parent == parentUnit.Id).ToList(); + var parentChildren = _unitsContext.Get(x => x.Parent == parentUnit.Id).ToList(); parentChildren.Remove(parentChildren.FirstOrDefault(x => x.Id == unit.Id)); parentChildren.Insert(unitUpdate.Index, unit); - foreach (Unit child in parentChildren) + foreach (var child in parentChildren) { await _unitsContext.Update(child.Id, x => x.Order, parentChildren.IndexOf(child)); } unit = _unitsContext.GetSingle(unit.Id); - foreach (Unit child in _unitsService.GetAllChildren(unit, true)) + foreach (var child in _unitsService.GetAllChildren(unit, true)) { - foreach (string accountId in child.Members) + foreach (var accountId in child.Members) { await _assignmentService.UpdateGroupsAndRoles(accountId); } @@ -221,12 +232,12 @@ public async Task UpdateParent([FromRoute] string id, [FromBody] RequestUnitUpda [HttpPatch("{id}/order"), Authorize] public void UpdateSortOrder([FromRoute] string id, [FromBody] RequestUnitUpdateOrder unitUpdate) { - Unit unit = _unitsContext.GetSingle(id); - Unit parentUnit = _unitsContext.GetSingle(x => x.Id == unit.Parent); - List parentChildren = _unitsContext.Get(x => x.Parent == parentUnit.Id).ToList(); + var unit = _unitsContext.GetSingle(id); + var parentUnit = _unitsContext.GetSingle(x => x.Id == unit.Parent); + var parentChildren = _unitsContext.Get(x => x.Parent == parentUnit.Id).ToList(); parentChildren.Remove(parentChildren.FirstOrDefault(x => x.Id == unit.Id)); parentChildren.Insert(unitUpdate.Index, unit); - foreach (Unit child in parentChildren) + foreach (var child in parentChildren) { _unitsContext.Update(child.Id, x => x.Order, parentChildren.IndexOf(child)); } @@ -239,7 +250,7 @@ public ResponseUnitChartNode GetUnitsChart([FromRoute] string type) switch (type) { case "combat": - Unit combatRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); + var combatRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); return new() { Id = combatRoot.Id, @@ -248,7 +259,7 @@ public ResponseUnitChartNode GetUnitsChart([FromRoute] string type) Children = GetUnitChartChildren(combatRoot.Id) }; case "auxiliary": - Unit auxiliaryRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); + var auxiliaryRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); return new() { Id = auxiliaryRoot.Id, @@ -266,29 +277,37 @@ private IEnumerable GetUnitChartChildren(string parent) .Select( unit => new ResponseUnitChartNode { - Id = unit.Id, Name = unit.PreferShortname ? unit.Shortname : unit.Name, Members = MapUnitMembers(unit), Children = GetUnitChartChildren(unit.Id) + Id = unit.Id, + Name = unit.PreferShortname ? unit.Shortname : unit.Name, + Members = MapUnitMembers(unit), + Children = GetUnitChartChildren(unit.Id) } ); } - private IEnumerable MapUnitMembers(Unit unit) + private IEnumerable MapUnitMembers(DomainUnit unit) { return SortMembers(unit.Members, unit).Select(x => MapUnitMember(x, unit)); } - private ResponseUnitMember MapUnitMember(DomainAccount member, Unit unit) + private ResponseUnitMember MapUnitMember(DomainAccount member, DomainUnit unit) { return new() { Name = _displayNameService.GetDisplayName(member), Role = member.RoleAssignment, UnitRole = GetRole(unit, member.Id) }; } // TODO: Move somewhere else - private IEnumerable SortMembers(IEnumerable members, Unit unit) + private IEnumerable SortMembers(IEnumerable members, DomainUnit unit) { return members.Select( x => { - DomainAccount domainAccount = _accountContext.GetSingle(x); - return new { account = domainAccount, rankIndex = _ranksService.GetRankOrder(domainAccount.Rank), roleIndex = _unitsService.GetMemberRoleOrder(domainAccount, unit) }; + var domainAccount = _accountContext.GetSingle(x); + return new + { + account = domainAccount, + rankIndex = _ranksService.GetRankOrder(domainAccount.Rank), + roleIndex = _unitsService.GetMemberRoleOrder(domainAccount, unit) + }; } ) .OrderByDescending(x => x.roleIndex) @@ -298,7 +317,7 @@ private IEnumerable SortMembers(IEnumerable members, Unit .Select(x => x.account); } - private string GetRole(Unit unit, string accountId) + private string GetRole(DomainUnit unit, string accountId) { return _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(0).Name) ? "1" : _unitsService.MemberHasRole(accountId, unit, _rolesService.GetUnitRoleByOrder(1).Name) ? "2" : diff --git a/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs b/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs index 31be5ac7..00cfb8ac 100644 --- a/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs +++ b/UKSF.Api.Personnel/EventHandlers/AccountDataEventHandler.cs @@ -8,6 +8,8 @@ using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Extensions; using UKSF.Api.Shared.Models; +using UKSF.Api.Shared.Signalr.Clients; +using UKSF.Api.Shared.Signalr.Hubs; namespace UKSF.Api.Personnel.EventHandlers { @@ -15,21 +17,31 @@ public interface IAccountDataEventHandler : IEventHandler { } public class AccountDataEventHandler : IAccountDataEventHandler { + private readonly IHubContext _allHub; private readonly IEventBus _eventBus; + private readonly IHubContext _groupedHub; private readonly IHubContext _hub; private readonly ILogger _logger; - public AccountDataEventHandler(IEventBus eventBus, IHubContext hub, ILogger logger) + public AccountDataEventHandler( + IEventBus eventBus, + IHubContext hub, + IHubContext groupedHub, + IHubContext allHub, + ILogger logger + ) { _eventBus = eventBus; _hub = hub; + _groupedHub = groupedHub; + _allHub = allHub; _logger = logger; } public void Init() { _eventBus.AsObservable().SubscribeWithAsyncNext>(HandleAccountEvent, _logger.LogError); - _eventBus.AsObservable().SubscribeWithAsyncNext>(HandleUnitEvent, _logger.LogError); + _eventBus.AsObservable().SubscribeWithAsyncNext>(HandleUnitEvent, _logger.LogError); } private async Task HandleAccountEvent(EventModel eventModel, ContextEventData contextEventData) @@ -40,7 +52,7 @@ private async Task HandleAccountEvent(EventModel eventModel, ContextEventData contextEventData) + private async Task HandleUnitEvent(EventModel eventModel, ContextEventData contextEventData) { if (eventModel.EventType == EventType.UPDATE) { @@ -50,7 +62,11 @@ private async Task HandleUnitEvent(EventModel eventModel, ContextEventData private async Task UpdatedEvent(string id) { - await _hub.Clients.Group(id).ReceiveAccountUpdate(); + var oldTask = _hub.Clients.Group(id).ReceiveAccountUpdate(); + var groupedTask = _groupedHub.Clients.Group(id).ReceiveAccountUpdate(); + var allTask = _allHub.Clients.All.ReceiveAccountUpdate(); + + await Task.WhenAll(oldTask, groupedTask, allTask); } } } diff --git a/UKSF.Api.Personnel/Mappers/AutoMapperUnitProfile.cs b/UKSF.Api.Personnel/Mappers/AutoMapperUnitProfile.cs index b0cfb6bb..5518fa9c 100644 --- a/UKSF.Api.Personnel/Mappers/AutoMapperUnitProfile.cs +++ b/UKSF.Api.Personnel/Mappers/AutoMapperUnitProfile.cs @@ -7,7 +7,7 @@ public class AutoMapperUnitProfile : Profile { public AutoMapperUnitProfile() { - CreateMap(); + CreateMap(); } } } diff --git a/UKSF.Api.Personnel/Mappers/UnitTreeMapper.cs b/UKSF.Api.Personnel/Mappers/UnitTreeMapper.cs new file mode 100644 index 00000000..1dad5085 --- /dev/null +++ b/UKSF.Api.Personnel/Mappers/UnitTreeMapper.cs @@ -0,0 +1,32 @@ +using System.Linq; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Mappers +{ + public interface IUnitTreeMapper + { + Unit MapUnitTree(DomainUnit rootUnit); + } + + public class UnitTreeMapper : IUnitTreeMapper + { + public Unit MapUnitTree(DomainUnit rootUnit) + { + return MapUnit(rootUnit); + } + + private static Unit MapUnit(DomainUnit domainUnit) + { + return new() + { + Id = domainUnit.Id, + Order = domainUnit.Order, + Name = domainUnit.Name, + Shortname = domainUnit.Shortname, + PreferShortname = domainUnit.PreferShortname, + MemberIds = domainUnit.Members, + Children = domainUnit.Children.Select(MapUnit).ToList() + }; + } + } +} diff --git a/UKSF.Api.Personnel/Models/DomainAccount.cs b/UKSF.Api.Personnel/Models/DomainAccount.cs index 5998f68a..ca2b43fe 100644 --- a/UKSF.Api.Personnel/Models/DomainAccount.cs +++ b/UKSF.Api.Personnel/Models/DomainAccount.cs @@ -57,14 +57,19 @@ public class Account public bool MilitaryExperience; public string Nation; public string Rank; + + public Rank RankObject; public string Reference; public string RoleAssignment; + public Role RoleObject; public List RolePreferences; public List ServiceRecord; public AccountSettings Settings; public string Steamname; public HashSet TeamspeakIdentities; public string UnitAssignment; + public Unit UnitObject; + public List UnitObjects; public string UnitsExperience; } diff --git a/UKSF.Api.Personnel/Models/Rank.cs b/UKSF.Api.Personnel/Models/DomainRank.cs similarity index 59% rename from UKSF.Api.Personnel/Models/Rank.cs rename to UKSF.Api.Personnel/Models/DomainRank.cs index 4dd97f34..825727b1 100644 --- a/UKSF.Api.Personnel/Models/Rank.cs +++ b/UKSF.Api.Personnel/Models/DomainRank.cs @@ -2,7 +2,7 @@ namespace UKSF.Api.Personnel.Models { - public class Rank : MongoObject + public class DomainRank : MongoObject { public string Abbreviation; public string DiscordRoleId; @@ -10,4 +10,11 @@ public class Rank : MongoObject public int Order; public string TeamspeakGroup; } + + public class Rank + { + public string Abbreviation; + public string Id; + public string Name; + } } diff --git a/UKSF.Api.Personnel/Models/Role.cs b/UKSF.Api.Personnel/Models/DomainRole.cs similarity index 67% rename from UKSF.Api.Personnel/Models/Role.cs rename to UKSF.Api.Personnel/Models/DomainRole.cs index 9cd1ee4e..d7011314 100644 --- a/UKSF.Api.Personnel/Models/Role.cs +++ b/UKSF.Api.Personnel/Models/DomainRole.cs @@ -8,10 +8,16 @@ public enum RoleType UNIT } - public class Role : MongoObject + public class DomainRole : MongoObject { public string Name; public int Order = 0; public RoleType RoleType = RoleType.INDIVIDUAL; } + + public class Role + { + public string Id; + public string Name; + } } diff --git a/UKSF.Api.Personnel/Models/Unit.cs b/UKSF.Api.Personnel/Models/DomainUnit.cs similarity index 76% rename from UKSF.Api.Personnel/Models/Unit.cs rename to UKSF.Api.Personnel/Models/DomainUnit.cs index e98e7bc8..4a7b08cc 100644 --- a/UKSF.Api.Personnel/Models/Unit.cs +++ b/UKSF.Api.Personnel/Models/DomainUnit.cs @@ -5,10 +5,13 @@ namespace UKSF.Api.Personnel.Models { - public class Unit : MongoObject + // TODO: Migrate object names to names with Id + public class DomainUnit : MongoObject { public UnitBranch Branch = UnitBranch.COMBAT; public string Callsign; + + [BsonIgnore] public List Children; public string DiscordRoleId; public string Icon; [BsonRepresentation(BsonType.ObjectId)] public List Members = new(); @@ -26,6 +29,19 @@ public override string ToString() } } + public class Unit + { + public List Children; + public string Id; + public List MemberIds; + public string MemberRole; + public string Name; + public int Order; + public Unit ParentUnit; + public bool PreferShortname; + public string Shortname; + } + public enum UnitBranch { COMBAT, @@ -33,7 +49,7 @@ public enum UnitBranch } // TODO: Cleaner way of doing this? Inside controllers? - public class ResponseUnit : Unit + public class ResponseUnit : DomainUnit { public string Code; public string ParentName; @@ -47,17 +63,10 @@ public class ResponseUnitMember public string UnitRole; } - public class ResponseUnitTree - { - public IEnumerable Children; - public string Id; - public string Name; - } - - public class ResponseUnitTreeDataSet + public class UnitTreeDataSet { - public IEnumerable AuxiliaryNodes; - public IEnumerable CombatNodes; + public IEnumerable AuxiliaryNodes; + public IEnumerable CombatNodes; } public class ResponseUnitChartNode diff --git a/UKSF.Api.Personnel/Models/Loa.cs b/UKSF.Api.Personnel/Models/Loa.cs deleted file mode 100644 index 550a0928..00000000 --- a/UKSF.Api.Personnel/Models/Loa.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Attributes; -using UKSF.Api.Base.Models; - -namespace UKSF.Api.Personnel.Models -{ - public enum LoaReviewState - { - PENDING, - APPROVED, - REJECTED - } - - public class Loa : MongoObject - { - public bool Emergency; - public DateTime End; - public bool Late; - public string Reason; - [BsonRepresentation(BsonType.ObjectId)] public string Recipient; - public DateTime Start; - public LoaReviewState State; - public DateTime Submitted; - } -} diff --git a/UKSF.Api.Personnel/Models/RolesDataset.cs b/UKSF.Api.Personnel/Models/RolesDataset.cs index ce6c8215..f9acb6dd 100644 --- a/UKSF.Api.Personnel/Models/RolesDataset.cs +++ b/UKSF.Api.Personnel/Models/RolesDataset.cs @@ -4,7 +4,7 @@ namespace UKSF.Api.Personnel.Models { public class RolesDataset { - public IEnumerable IndividualRoles; - public IEnumerable UnitRoles; + public IEnumerable IndividualRoles; + public IEnumerable UnitRoles; } } diff --git a/UKSF.Api.Personnel/Queries/GetUnitTreeQuery.cs b/UKSF.Api.Personnel/Queries/GetUnitTreeQuery.cs new file mode 100644 index 00000000..1fc7ab19 --- /dev/null +++ b/UKSF.Api.Personnel/Queries/GetUnitTreeQuery.cs @@ -0,0 +1,57 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using MongoDB.Bson; +using UKSF.Api.Base.Models; +using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Models; + +namespace UKSF.Api.Personnel.Queries +{ + public interface IGetUnitTreeQuery + { + Task ExecuteAsync(GetUnitTreeQueryArgs args); + } + + public class GetUnitTreeQueryArgs + { + public GetUnitTreeQueryArgs(UnitBranch unitBranch) + { + UnitBranch = unitBranch; + } + + public UnitBranch UnitBranch { get; } + } + + public class GetUnitTreeQuery : IGetUnitTreeQuery + { + private readonly IUnitsContext _unitsContext; + + public GetUnitTreeQuery(IUnitsContext unitsContext) + { + _unitsContext = unitsContext; + } + + public async Task ExecuteAsync(GetUnitTreeQueryArgs args) + { + var root = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == args.UnitBranch); + + root.Children = GetUnitChildren(root); + + return await Task.FromResult(root); + } + + private List GetUnitChildren(MongoObject parentUnit) + { + return _unitsContext.Get(x => x.Parent == parentUnit.Id) + .Select( + x => + { + x.Children = GetUnitChildren(x); + return x; + } + ) + .ToList(); + } + } +} diff --git a/UKSF.Api.Personnel/Services/AssignmentService.cs b/UKSF.Api.Personnel/Services/AssignmentService.cs index 8f5b5d77..bed03955 100644 --- a/UKSF.Api.Personnel/Services/AssignmentService.cs +++ b/UKSF.Api.Personnel/Services/AssignmentService.cs @@ -17,7 +17,17 @@ public interface IAssignmentService Task AssignUnitRole(string id, string unitId, string role); Task UnassignAllUnits(string id); Task UnassignAllUnitRoles(string id); - Task UpdateUnitRankAndRole(string id, string unitString = "", string role = "", string rankString = "", string notes = "", string message = "", string reason = ""); + + Task UpdateUnitRankAndRole( + string id, + string unitString = "", + string role = "", + string rankString = "", + string notes = "", + string message = "", + string reason = "" + ); + Task UnassignUnitRole(string id, string unitId); Task UnassignUnit(string id, string unitId); Task UpdateGroupsAndRoles(string id); @@ -56,7 +66,15 @@ IEventBus eventBus _eventBus = eventBus; } - public async Task UpdateUnitRankAndRole(string id, string unitString = "", string role = "", string rankString = "", string notes = "", string message = "", string reason = "") + public async Task UpdateUnitRankAndRole( + string id, + string unitString = "", + string role = "", + string rankString = "", + string notes = "", + string message = "", + string reason = "" + ) { StringBuilder notificationBuilder = new(); @@ -94,7 +112,9 @@ public async Task UpdateUnitRankAndRole(string id, string unitStri _serviceRecordService.AddServiceRecord(id, message, notes); await UpdateGroupsAndRoles(id); - return message != REMOVE_FLAG ? new Notification { Owner = id, Message = message, Icon = positive ? NotificationIcons.PROMOTION : NotificationIcons.DEMOTION } : null; + return message != REMOVE_FLAG + ? new Notification { Owner = id, Message = message, Icon = positive ? NotificationIcons.PROMOTION : NotificationIcons.DEMOTION } + : null; } public async Task AssignUnitRole(string id, string unitId, string role) @@ -105,7 +125,7 @@ public async Task AssignUnitRole(string id, string unitId, string role) public async Task UnassignAllUnits(string id) { - foreach (Unit unit in _unitsContext.Get()) + foreach (var unit in _unitsContext.Get()) { await _unitsService.RemoveMember(id, unit); } @@ -115,7 +135,7 @@ public async Task UnassignAllUnits(string id) public async Task UnassignAllUnitRoles(string id) { - foreach (Unit unit in _unitsContext.Get()) + foreach (var unit in _unitsContext.Get()) { await _unitsService.SetMemberRole(id, unit); } @@ -125,7 +145,7 @@ public async Task UnassignAllUnitRoles(string id) public async Task UnassignUnitRole(string id, string unitId) { - Unit unit = _unitsContext.GetSingle(unitId); + var unit = _unitsContext.GetSingle(unitId); string role = unit.Roles.FirstOrDefault(x => x.Value == id).Key; if (_unitsService.RolesHasMember(unit, id)) { @@ -138,7 +158,7 @@ public async Task UnassignUnitRole(string id, string unitId) public async Task UnassignUnit(string id, string unitId) { - Unit unit = _unitsContext.GetSingle(unitId); + var unit = _unitsContext.GetSingle(unitId); await _unitsService.RemoveMember(id, unit); await UpdateGroupsAndRoles(unitId); } @@ -155,7 +175,7 @@ private async Task> UpdateUnit(string id, string unitString, S { bool unitUpdate = false; bool positive = true; - Unit unit = _unitsContext.GetSingle(x => x.Name == unitString); + var unit = _unitsContext.GetSingle(x => x.Name == unitString); if (unit != null) { if (unit.Branch == UnitBranch.COMBAT) @@ -194,7 +214,9 @@ private async Task> UpdateRole(string id, string role, bool un if (!string.IsNullOrEmpty(role) && role != REMOVE_FLAG) { await _accountContext.Update(id, x => x.RoleAssignment, role); - notificationMessage.Append($"{(unitUpdate ? $" as {AvsAn.Query(role).Article} {role}" : $"You have been assigned as {AvsAn.Query(role).Article} {role}")}"); + notificationMessage.Append( + $"{(unitUpdate ? $" as {AvsAn.Query(role).Article} {role}" : $"You have been assigned as {AvsAn.Query(role).Article} {role}")}" + ); roleUpdate = true; } else if (role == REMOVE_FLAG) diff --git a/UKSF.Api.Personnel/Services/DisplayNameService.cs b/UKSF.Api.Personnel/Services/DisplayNameService.cs index 865571a6..390ddcdb 100644 --- a/UKSF.Api.Personnel/Services/DisplayNameService.cs +++ b/UKSF.Api.Personnel/Services/DisplayNameService.cs @@ -23,8 +23,10 @@ public DisplayNameService(IAccountContext accountContext, IRanksContext ranksCon public string GetDisplayName(DomainAccount domainAccount) { - Rank rank = domainAccount.Rank != null ? _ranksContext.GetSingle(domainAccount.Rank) : null; - return rank == null ? $"{domainAccount.Lastname}.{domainAccount.Firstname[0]}" : $"{rank.Abbreviation}.{domainAccount.Lastname}.{domainAccount.Firstname[0]}"; + var rank = domainAccount.Rank != null ? _ranksContext.GetSingle(domainAccount.Rank) : null; + return rank == null + ? $"{domainAccount.Lastname}.{domainAccount.Firstname[0]}" + : $"{rank.Abbreviation}.{domainAccount.Lastname}.{domainAccount.Firstname[0]}"; } public string GetDisplayName(string id) diff --git a/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs b/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs index 134336bd..ca8ad970 100644 --- a/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs +++ b/UKSF.Api.Personnel/Services/ObjectIdConversionService.cs @@ -1,5 +1,4 @@ using UKSF.Api.Personnel.Context; -using UKSF.Api.Personnel.Models; using UKSF.Api.Shared.Extensions; namespace UKSF.Api.Personnel.Services @@ -33,7 +32,7 @@ public string ConvertObjectIds(string text) string displayString = _displayNameService.GetDisplayName(objectId); if (displayString == objectId) { - Unit unit = _unitsContext.GetSingle(x => x.Id == objectId); + var unit = _unitsContext.GetSingle(x => x.Id == objectId); if (unit != null) { displayString = unit.Name; diff --git a/UKSF.Api.Personnel/Services/RanksService.cs b/UKSF.Api.Personnel/Services/RanksService.cs index ea18370d..fb8afc37 100644 --- a/UKSF.Api.Personnel/Services/RanksService.cs +++ b/UKSF.Api.Personnel/Services/RanksService.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using UKSF.Api.Personnel.Context; -using UKSF.Api.Personnel.Models; namespace UKSF.Api.Personnel.Services { @@ -29,8 +28,8 @@ public int GetRankOrder(string rankName) public int Sort(string nameA, string nameB) { - Rank rankA = _ranksContext.GetSingle(nameA); - Rank rankB = _ranksContext.GetSingle(nameB); + var rankA = _ranksContext.GetSingle(nameA); + var rankB = _ranksContext.GetSingle(nameB); int rankOrderA = rankA?.Order ?? int.MaxValue; int rankOrderB = rankB?.Order ?? int.MaxValue; return rankOrderA < rankOrderB ? -1 : @@ -39,8 +38,8 @@ public int Sort(string nameA, string nameB) public bool IsSuperior(string nameA, string nameB) { - Rank rankA = _ranksContext.GetSingle(nameA); - Rank rankB = _ranksContext.GetSingle(nameB); + var rankA = _ranksContext.GetSingle(nameA); + var rankB = _ranksContext.GetSingle(nameB); int rankOrderA = rankA?.Order ?? int.MaxValue; int rankOrderB = rankB?.Order ?? int.MaxValue; return rankOrderA < rankOrderB; @@ -48,8 +47,8 @@ public bool IsSuperior(string nameA, string nameB) public bool IsEqual(string nameA, string nameB) { - Rank rankA = _ranksContext.GetSingle(nameA); - Rank rankB = _ranksContext.GetSingle(nameB); + var rankA = _ranksContext.GetSingle(nameA); + var rankB = _ranksContext.GetSingle(nameB); int rankOrderA = rankA?.Order ?? int.MinValue; int rankOrderB = rankB?.Order ?? int.MinValue; return rankOrderA == rankOrderB; diff --git a/UKSF.Api.Personnel/Services/RecruitmentService.cs b/UKSF.Api.Personnel/Services/RecruitmentService.cs index 416dbb37..bd1ffd3a 100644 --- a/UKSF.Api.Personnel/Services/RecruitmentService.cs +++ b/UKSF.Api.Personnel/Services/RecruitmentService.cs @@ -135,7 +135,9 @@ public IEnumerable GetActiveRecruiters() public bool IsRecruiterLead(DomainAccount domainAccount = null) { - return domainAccount != null ? GetRecruiterUnit().Roles.ContainsValue(domainAccount.Id) : GetRecruiterUnit().Roles.ContainsValue(_httpContextService.GetUserId()); + return domainAccount != null + ? GetRecruiterUnit().Roles.ContainsValue(domainAccount.Id) + : GetRecruiterUnit().Roles.ContainsValue(_httpContextService.GetUserId()); } public async Task SetRecruiter(string id, string newRecruiter) @@ -164,7 +166,7 @@ public IEnumerable GetStats(string account, bool monthly) List processedApplications = accountsList.Where(x => x.Application.State != ApplicationState.WAITING).ToList(); double totalProcessingTime = processedApplications.Sum(x => (x.Application.DateAccepted - x.Application.DateCreated).TotalDays); double averageProcessingTime = totalProcessingTime > 0 ? Math.Round(totalProcessingTime / processedApplications.Count, 1) : 0; - double enlistmentRate = acceptedApps != 0 || rejectedApps != 0 ? Math.Round((double) acceptedApps / (acceptedApps + rejectedApps) * 100, 1) : 0; + double enlistmentRate = acceptedApps != 0 || rejectedApps != 0 ? Math.Round((double)acceptedApps / (acceptedApps + rejectedApps) * 100, 1) : 0; return new RecruitmentStat[] { @@ -181,12 +183,19 @@ public string GetRecruiter() IEnumerable recruiters = GetRecruiters().Where(x => x.Settings.Sr1Enabled); List waiting = _accountContext.Get(x => x.Application != null && x.Application.State == ApplicationState.WAITING).ToList(); List complete = _accountContext.Get(x => x.Application != null && x.Application.State != ApplicationState.WAITING).ToList(); - var unsorted = recruiters.Select(x => new { id = x.Id, complete = complete.Count(y => y.Application.Recruiter == x.Id), waiting = waiting.Count(y => y.Application.Recruiter == x.Id) }); + var unsorted = recruiters.Select( + x => new + { + id = x.Id, + complete = complete.Count(y => y.Application.Recruiter == x.Id), + waiting = waiting.Count(y => y.Application.Recruiter == x.Id) + } + ); var sorted = unsorted.OrderBy(x => x.waiting).ThenBy(x => x.complete); return sorted.First().id; } - private Unit GetRecruiterUnit() + private DomainUnit GetRecruiterUnit() { string id = _variablesService.GetVariable("UNIT_ID_RECRUITMENT").AsString(); return _unitsContext.GetSingle(id); @@ -237,7 +246,8 @@ private static string GetNextCandidateOp() private double GetAverageProcessingTime() { - List waitingApplications = _accountContext.Get(x => x.Application != null && x.Application.State != ApplicationState.WAITING).ToList(); + List waitingApplications = + _accountContext.Get(x => x.Application != null && x.Application.State != ApplicationState.WAITING).ToList(); double days = waitingApplications.Sum(x => (x.Application.DateAccepted - x.Application.DateCreated).TotalDays); double time = Math.Round(days / waitingApplications.Count, 1); return time; diff --git a/UKSF.Api.Personnel/Services/RolesService.cs b/UKSF.Api.Personnel/Services/RolesService.cs index b334c5ac..2580c6df 100644 --- a/UKSF.Api.Personnel/Services/RolesService.cs +++ b/UKSF.Api.Personnel/Services/RolesService.cs @@ -6,7 +6,7 @@ namespace UKSF.Api.Personnel.Services public interface IRolesService { int Sort(string nameA, string nameB); - Role GetUnitRoleByOrder(int order); + DomainRole GetUnitRoleByOrder(int order); string GetCommanderRoleName(); } @@ -21,15 +21,15 @@ public RolesService(IRolesContext rolesContext) public int Sort(string nameA, string nameB) { - Role roleA = _rolesContext.GetSingle(nameA); - Role roleB = _rolesContext.GetSingle(nameB); + var roleA = _rolesContext.GetSingle(nameA); + var roleB = _rolesContext.GetSingle(nameB); int roleOrderA = roleA?.Order ?? 0; int roleOrderB = roleB?.Order ?? 0; return roleOrderA < roleOrderB ? -1 : roleOrderA > roleOrderB ? 1 : 0; } - public Role GetUnitRoleByOrder(int order) + public DomainRole GetUnitRoleByOrder(int order) { return _rolesContext.GetSingle(x => x.RoleType == RoleType.UNIT && x.Order == order); } diff --git a/UKSF.Api.Personnel/Services/UnitsService.cs b/UKSF.Api.Personnel/Services/UnitsService.cs index 7b010c48..32ca04b4 100644 --- a/UKSF.Api.Personnel/Services/UnitsService.cs +++ b/UKSF.Api.Personnel/Services/UnitsService.cs @@ -11,33 +11,33 @@ namespace UKSF.Api.Personnel.Services { public interface IUnitsService { - IEnumerable GetSortedUnits(Func predicate = null); + IEnumerable GetSortedUnits(Func predicate = null); Task AddMember(string id, string unitId); Task RemoveMember(string id, string unitName); - Task RemoveMember(string id, Unit unit); + Task RemoveMember(string id, DomainUnit unit); Task SetMemberRole(string id, string unitId, string role = ""); - Task SetMemberRole(string id, Unit unit, string role = ""); + Task SetMemberRole(string id, DomainUnit unit, string role = ""); Task RenameRole(string oldName, string newName); Task DeleteRole(string role); bool HasRole(string unitId, string role); - bool HasRole(Unit unit, string role); + bool HasRole(DomainUnit unit, string role); bool RolesHasMember(string unitId, string id); - bool RolesHasMember(Unit unit, string id); + bool RolesHasMember(DomainUnit unit, string id); bool MemberHasRole(string id, string unitId, string role); - bool MemberHasRole(string id, Unit unit, string role); + bool MemberHasRole(string id, DomainUnit unit, string role); bool MemberHasAnyRole(string id); - int GetMemberRoleOrder(DomainAccount domainAccount, Unit unit); + int GetMemberRoleOrder(DomainAccount domainAccount, DomainUnit unit); - Unit GetRoot(); - Unit GetAuxilliaryRoot(); - Unit GetParent(Unit unit); - IEnumerable GetParents(Unit unit); - IEnumerable GetChildren(Unit parent); - IEnumerable GetAllChildren(Unit parent, bool includeParent = false); + DomainUnit GetRoot(); + DomainUnit GetAuxilliaryRoot(); + DomainUnit GetParent(DomainUnit unit); + IEnumerable GetParents(DomainUnit unit); + IEnumerable GetChildren(DomainUnit parent); + IEnumerable GetAllChildren(DomainUnit parent, bool includeParent = false); - int GetUnitDepth(Unit unit); - string GetChainString(Unit unit); + int GetUnitDepth(DomainUnit unit); + string GetChainString(DomainUnit unit); } public class UnitsService : IUnitsService @@ -51,11 +51,11 @@ public UnitsService(IUnitsContext unitsContext, IRolesContext rolesContext) _rolesContext = rolesContext; } - public IEnumerable GetSortedUnits(Func predicate = null) + public IEnumerable GetSortedUnits(Func predicate = null) { - List sortedUnits = new(); - Unit combatRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); - Unit auxiliaryRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); + List sortedUnits = new(); + var combatRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); + var auxiliaryRoot = _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); sortedUnits.Add(combatRoot); sortedUnits.AddRange(GetAllChildren(combatRoot)); sortedUnits.Add(auxiliaryRoot); @@ -71,12 +71,12 @@ public async Task AddMember(string id, string unitId) return; } - await _unitsContext.Update(unitId, Builders.Update.Push(x => x.Members, id)); + await _unitsContext.Update(unitId, Builders.Update.Push(x => x.Members, id)); } public async Task RemoveMember(string id, string unitName) { - Unit unit = _unitsContext.GetSingle(x => x.Name == unitName); + var unit = _unitsContext.GetSingle(x => x.Name == unitName); if (unit == null) { return; @@ -85,11 +85,11 @@ public async Task RemoveMember(string id, string unitName) await RemoveMember(id, unit); } - public async Task RemoveMember(string id, Unit unit) + public async Task RemoveMember(string id, DomainUnit unit) { if (unit.Members.Contains(id)) { - await _unitsContext.Update(unit.Id, Builders.Update.Pull(x => x.Members, id)); + await _unitsContext.Update(unit.Id, Builders.Update.Pull(x => x.Members, id)); } await RemoveMemberRoles(id, unit); @@ -97,7 +97,7 @@ public async Task RemoveMember(string id, Unit unit) public async Task SetMemberRole(string id, string unitId, string role = "") { - Unit unit = _unitsContext.GetSingle(x => x.Id == unitId); + var unit = _unitsContext.GetSingle(x => x.Id == unitId); if (unit == null) { return; @@ -106,62 +106,62 @@ public async Task SetMemberRole(string id, string unitId, string role = "") await SetMemberRole(id, unit, role); } - public async Task SetMemberRole(string id, Unit unit, string role = "") + public async Task SetMemberRole(string id, DomainUnit unit, string role = "") { await RemoveMemberRoles(id, unit); if (!string.IsNullOrEmpty(role)) { - await _unitsContext.Update(unit.Id, Builders.Update.Set($"roles.{role}", id)); + await _unitsContext.Update(unit.Id, Builders.Update.Set($"roles.{role}", id)); } } public async Task RenameRole(string oldName, string newName) { - foreach (Unit unit in _unitsContext.Get(x => x.Roles.ContainsKey(oldName))) + foreach (var unit in _unitsContext.Get(x => x.Roles.ContainsKey(oldName))) { string id = unit.Roles[oldName]; - await _unitsContext.Update(unit.Id, Builders.Update.Unset($"roles.{oldName}")); - await _unitsContext.Update(unit.Id, Builders.Update.Set($"roles.{newName}", id)); + await _unitsContext.Update(unit.Id, Builders.Update.Unset($"roles.{oldName}")); + await _unitsContext.Update(unit.Id, Builders.Update.Set($"roles.{newName}", id)); } } public async Task DeleteRole(string role) { - foreach (Unit unit in from unit in _unitsContext.Get(x => x.Roles.ContainsKey(role)) let id = unit.Roles[role] select unit) + foreach (var unit in from unit in _unitsContext.Get(x => x.Roles.ContainsKey(role)) let id = unit.Roles[role] select unit) { - await _unitsContext.Update(unit.Id, Builders.Update.Unset($"roles.{role}")); + await _unitsContext.Update(unit.Id, Builders.Update.Unset($"roles.{role}")); } } public bool HasRole(string unitId, string role) { - Unit unit = _unitsContext.GetSingle(x => x.Id == unitId); + var unit = _unitsContext.GetSingle(x => x.Id == unitId); return HasRole(unit, role); } - public bool HasRole(Unit unit, string role) + public bool HasRole(DomainUnit unit, string role) { return unit.Roles.ContainsKey(role); } public bool RolesHasMember(string unitId, string id) { - Unit unit = _unitsContext.GetSingle(x => x.Id == unitId); + var unit = _unitsContext.GetSingle(x => x.Id == unitId); return RolesHasMember(unit, id); } - public bool RolesHasMember(Unit unit, string id) + public bool RolesHasMember(DomainUnit unit, string id) { return unit.Roles.ContainsValue(id); } public bool MemberHasRole(string id, string unitId, string role) { - Unit unit = _unitsContext.GetSingle(x => x.Id == unitId); + var unit = _unitsContext.GetSingle(x => x.Id == unitId); return MemberHasRole(id, unit, role); } - public bool MemberHasRole(string id, Unit unit, string role) + public bool MemberHasRole(string id, DomainUnit unit, string role) { return unit.Roles.GetValueOrDefault(role, string.Empty) == id; } @@ -171,7 +171,7 @@ public bool MemberHasAnyRole(string id) return _unitsContext.Get().Any(x => RolesHasMember(x, id)); } - public int GetMemberRoleOrder(DomainAccount domainAccount, Unit unit) + public int GetMemberRoleOrder(DomainAccount domainAccount, DomainUnit unit) { if (RolesHasMember(unit, domainAccount.Id)) { @@ -181,34 +181,34 @@ public int GetMemberRoleOrder(DomainAccount domainAccount, Unit unit) return -1; } - public Unit GetRoot() + public DomainUnit GetRoot() { return _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.COMBAT); } - public Unit GetAuxilliaryRoot() + public DomainUnit GetAuxilliaryRoot() { return _unitsContext.GetSingle(x => x.Parent == ObjectId.Empty.ToString() && x.Branch == UnitBranch.AUXILIARY); } - public Unit GetParent(Unit unit) + public DomainUnit GetParent(DomainUnit unit) { return unit.Parent != string.Empty ? _unitsContext.GetSingle(x => x.Id == unit.Parent) : null; } // TODO: Change this to not add the child unit to the return - public IEnumerable GetParents(Unit unit) + public IEnumerable GetParents(DomainUnit unit) { if (unit == null) { - return new List(); + return new List(); } - List parentUnits = new(); + List parentUnits = new(); do { parentUnits.Add(unit); - Unit child = unit; + var child = unit; unit = !string.IsNullOrEmpty(unit.Parent) ? _unitsContext.GetSingle(x => x.Id == child.Parent) : null; if (unit == child) { @@ -220,15 +220,15 @@ public IEnumerable GetParents(Unit unit) return parentUnits; } - public IEnumerable GetChildren(Unit parent) + public IEnumerable GetChildren(DomainUnit parent) { return _unitsContext.Get(x => x.Parent == parent.Id).ToList(); } - public IEnumerable GetAllChildren(Unit parent, bool includeParent = false) + public IEnumerable GetAllChildren(DomainUnit parent, bool includeParent = false) { - List children = includeParent ? new() { parent } : new List(); - foreach (Unit unit in _unitsContext.Get(x => x.Parent == parent.Id)) + var children = includeParent ? new() { parent } : new List(); + foreach (var unit in _unitsContext.Get(x => x.Parent == parent.Id)) { children.Add(unit); children.AddRange(GetAllChildren(unit)); @@ -237,7 +237,7 @@ public IEnumerable GetAllChildren(Unit parent, bool includeParent = false) return children; } - public int GetUnitDepth(Unit unit) + public int GetUnitDepth(DomainUnit unit) { if (unit.Parent == ObjectId.Empty.ToString()) { @@ -245,7 +245,7 @@ public int GetUnitDepth(Unit unit) } int depth = 0; - Unit parent = _unitsContext.GetSingle(unit.Parent); + var parent = _unitsContext.GetSingle(unit.Parent); while (parent != null) { depth++; @@ -255,15 +255,15 @@ public int GetUnitDepth(Unit unit) return depth; } - public string GetChainString(Unit unit) + public string GetChainString(DomainUnit unit) { - List parentUnits = GetParents(unit).Skip(1).ToList(); + var parentUnits = GetParents(unit).Skip(1).ToList(); string unitNames = unit.Name; parentUnits.ForEach(x => unitNames += $", {x.Name}"); return unitNames; } - private async Task RemoveMemberRoles(string id, Unit unit) + private async Task RemoveMemberRoles(string id, DomainUnit unit) { Dictionary roles = unit.Roles; int originalCount = unit.Roles.Count; @@ -274,7 +274,7 @@ private async Task RemoveMemberRoles(string id, Unit unit) if (roles.Count != originalCount) { - await _unitsContext.Update(unit.Id, Builders.Update.Set(x => x.Roles, roles)); + await _unitsContext.Update(unit.Id, Builders.Update.Set(x => x.Roles, roles)); } } } diff --git a/UKSF.Api.Shared/ApiSharedExtensions.cs b/UKSF.Api.Shared/ApiSharedExtensions.cs index 003bae0a..5a6fb1bf 100644 --- a/UKSF.Api.Shared/ApiSharedExtensions.cs +++ b/UKSF.Api.Shared/ApiSharedExtensions.cs @@ -1,9 +1,12 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Routing; +using Microsoft.Extensions.DependencyInjection; using UKSF.Api.Shared.Commands; using UKSF.Api.Shared.Context; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Queries; using UKSF.Api.Shared.Services; +using UKSF.Api.Shared.Signalr.Hubs; namespace UKSF.Api.Shared { @@ -52,5 +55,11 @@ private static IServiceCollection AddQueries(this IServiceCollection services) { return services.AddSingleton(); } + + public static void AddUksfSignalr(this IEndpointRouteBuilder builder) + { + builder.MapHub($"/hub/{AllHub.END_POINT}"); + builder.MapHub($"/hub/{AccountGroupedHub.END_POINT}"); + } } } diff --git a/UKSF.Api.Shared/Context/CachedMongoContext.cs b/UKSF.Api.Shared/Context/CachedMongoContext.cs index 97fba4d7..dfc41fdb 100644 --- a/UKSF.Api.Shared/Context/CachedMongoContext.cs +++ b/UKSF.Api.Shared/Context/CachedMongoContext.cs @@ -22,7 +22,10 @@ public class CachedMongoContext : MongoContextBase, IMongoContext, ICac private readonly IEventBus _eventBus; protected readonly object LockObject = new(); - protected CachedMongoContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base(mongoCollectionFactory, collectionName) + protected CachedMongoContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base( + mongoCollectionFactory, + collectionName + ) { _eventBus = eventBus; } @@ -119,8 +122,8 @@ public override async Task UpdateMany(Expression> filterExpression public override async Task Replace(T item) { - string id = item.Id; - T cacheItem = GetSingle(id); + var id = item.Id; + var cacheItem = GetSingle(id); await base.Replace(item); SetCache(Cache.Except(new[] { cacheItem }).Concat(new[] { item })); DataUpdateEvent(item.Id); @@ -128,7 +131,7 @@ public override async Task Replace(T item) public override async Task Delete(string id) { - T cacheItem = GetSingle(id); + var cacheItem = GetSingle(id); await base.Delete(id); SetCache(Cache.Except(new[] { cacheItem })); DataDeleteEvent(id); @@ -148,7 +151,7 @@ public override async Task Delete(T item) public override async Task DeleteMany(Expression> filterExpression) { - List ids = Get(filterExpression.Compile()).ToList(); + var ids = Get(filterExpression.Compile()).ToList(); await base.DeleteMany(filterExpression); SetCache(Cache.Except(ids)); ids.ForEach(x => DataDeleteEvent(x.Id)); diff --git a/UKSF.Api.Shared/Context/MongoContext.cs b/UKSF.Api.Shared/Context/MongoContext.cs index 21d2905a..77b15cf6 100644 --- a/UKSF.Api.Shared/Context/MongoContext.cs +++ b/UKSF.Api.Shared/Context/MongoContext.cs @@ -16,7 +16,24 @@ public interface IMongoContext where T : MongoObject { IEnumerable Get(); IEnumerable Get(Func predicate); - PagedResult GetPaged(int page, int pageSize, SortDirection sortDirection, string sortField, IEnumerable>> filterPropertSelectors, string filter); + + PagedResult GetPaged( + int page, + int pageSize, + SortDirection sortDirection, + string sortField, + IEnumerable>> filterPropertSelectors, + string filter + ); + + PagedResult GetPaged( + int page, + int pageSize, + Func, IAggregateFluent> aggregator, + SortDefinition sortDefinition, + FilterDefinition filterDefinition + ); + T GetSingle(string id); T GetSingle(Func predicate); Task Add(T item); @@ -28,13 +45,17 @@ public interface IMongoContext where T : MongoObject Task Delete(string id); Task Delete(T item); Task DeleteMany(Expression> filterExpression); + FilterDefinition BuildPagedComplexQuery(string query, Func> filter); } public class MongoContext : MongoContextBase, IMongoContext where T : MongoObject { private readonly IEventBus _eventBus; - protected MongoContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base(mongoCollectionFactory, collectionName) + protected MongoContext(IMongoCollectionFactory mongoCollectionFactory, IEventBus eventBus, string collectionName) : base( + mongoCollectionFactory, + collectionName + ) { _eventBus = eventBus; } diff --git a/UKSF.Api.Shared/Extensions/CollectionExtensions.cs b/UKSF.Api.Shared/Extensions/CollectionExtensions.cs index 185f8657..dcd7a99d 100644 --- a/UKSF.Api.Shared/Extensions/CollectionExtensions.cs +++ b/UKSF.Api.Shared/Extensions/CollectionExtensions.cs @@ -19,5 +19,10 @@ public static bool IsEmpty(this IEnumerable collection) { return !collection.Any(); } + + public static TKey GetKeyFromValue(this Dictionary dictionary, TValue value) + { + return dictionary.FirstOrDefault(x => x.Value.Equals(value)).Key; + } } } diff --git a/UKSF.Api.Shared/Signalr/Clients/IAccountGroupedClient.cs b/UKSF.Api.Shared/Signalr/Clients/IAccountGroupedClient.cs new file mode 100644 index 00000000..b83d1ee1 --- /dev/null +++ b/UKSF.Api.Shared/Signalr/Clients/IAccountGroupedClient.cs @@ -0,0 +1,9 @@ +using System.Threading.Tasks; + +namespace UKSF.Api.Shared.Signalr.Clients +{ + public interface IAccountGroupedClient + { + Task ReceiveAccountUpdate(); + } +} diff --git a/UKSF.Api.Shared/Signalr/Clients/IAllClient.cs b/UKSF.Api.Shared/Signalr/Clients/IAllClient.cs new file mode 100644 index 00000000..126659d4 --- /dev/null +++ b/UKSF.Api.Shared/Signalr/Clients/IAllClient.cs @@ -0,0 +1,9 @@ +using System.Threading.Tasks; + +namespace UKSF.Api.Shared.Signalr.Clients +{ + public interface IAllClient + { + Task ReceiveAccountUpdate(); + } +} diff --git a/UKSF.Api.Shared/Signalr/Hubs/AccountGroupedHub.cs b/UKSF.Api.Shared/Signalr/Hubs/AccountGroupedHub.cs new file mode 100644 index 00000000..6aed9433 --- /dev/null +++ b/UKSF.Api.Shared/Signalr/Hubs/AccountGroupedHub.cs @@ -0,0 +1,28 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.SignalR; +using UKSF.Api.Shared.Signalr.Clients; + +namespace UKSF.Api.Shared.Signalr.Hubs +{ + [Authorize] + public class AccountGroupedHub : Hub + { + public const string END_POINT = "accountGrouped"; + + public override async Task OnConnectedAsync() + { + var userId = Context.GetHttpContext().Request.Query["userId"]; + await Groups.AddToGroupAsync(Context.ConnectionId, userId); + await base.OnConnectedAsync(); + } + + public override async Task OnDisconnectedAsync(Exception exception) + { + var userId = Context.GetHttpContext().Request.Query["userId"]; + await Groups.RemoveFromGroupAsync(Context.ConnectionId, userId); + await base.OnDisconnectedAsync(exception); + } + } +} diff --git a/UKSF.Api.Shared/Signalr/Hubs/AllHub.cs b/UKSF.Api.Shared/Signalr/Hubs/AllHub.cs new file mode 100644 index 00000000..20698398 --- /dev/null +++ b/UKSF.Api.Shared/Signalr/Hubs/AllHub.cs @@ -0,0 +1,12 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.SignalR; +using UKSF.Api.Shared.Signalr.Clients; + +namespace UKSF.Api.Shared.Signalr.Hubs +{ + [Authorize] + public class AllHub : Hub + { + public const string END_POINT = "all"; + } +} diff --git a/UKSF.Api.sln.DotSettings b/UKSF.Api.sln.DotSettings index d0ae415c..3e855c85 100644 --- a/UKSF.Api.sln.DotSettings +++ b/UKSF.Api.sln.DotSettings @@ -33,9 +33,9 @@ SUGGESTION HINT WARNING - ERROR - ERROR - ERROR + WARNING + WARNING + WARNING WARNING ShowAndRun Built-in: Full Cleanup @@ -143,7 +143,7 @@ CHOP_IF_LONG CHOP_IF_LONG CHOP_IF_LONG - 200 + 160 True CHOP_IF_LONG CHOP_IF_LONG @@ -355,9 +355,9 @@ </Entry> </TypePattern> </Patterns> - UseExplicitType - UseExplicitType - UseExplicitType + + + True False True diff --git a/UKSF.Api/Controllers/LoaController.cs b/UKSF.Api/Controllers/LoaController.cs deleted file mode 100644 index b1f9ba9e..00000000 --- a/UKSF.Api/Controllers/LoaController.cs +++ /dev/null @@ -1,140 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using UKSF.Api.Command.Context; -using UKSF.Api.Command.Models; -using UKSF.Api.Command.Services; -using UKSF.Api.Exceptions; -using UKSF.Api.Models; -using UKSF.Api.Personnel.Context; -using UKSF.Api.Personnel.Models; -using UKSF.Api.Personnel.Services; -using UKSF.Api.Shared; -using UKSF.Api.Shared.Events; -using UKSF.Api.Shared.Services; - -namespace UKSF.Api.Controllers -{ - [Route("[controller]"), Permissions(Permissions.MEMBER)] - public class LoaController : ControllerBase - { - private readonly IAccountContext _accountContext; - private readonly IAccountService _accountService; - private readonly IChainOfCommandService _chainOfCommandService; - private readonly ICommandRequestContext _commandRequestContext; - private readonly IDisplayNameService _displayNameService; - private readonly IHttpContextService _httpContextService; - private readonly ILoaContext _loaContext; - private readonly ILoaService _loaService; - private readonly ILogger _logger; - private readonly INotificationsService _notificationsService; - private readonly IUnitsContext _unitsContext; - private readonly IUnitsService _unitsService; - - public LoaController( - ILoaContext loaContext, - IAccountContext accountContext, - ICommandRequestContext commandRequestContext, - IUnitsContext unitsContext, - ILoaService loaService, - IHttpContextService httpContextService, - IDisplayNameService displayNameService, - IAccountService accountService, - IUnitsService unitsService, - IChainOfCommandService chainOfCommandService, - INotificationsService notificationsService, - ILogger logger - ) - { - _loaContext = loaContext; - _accountContext = accountContext; - _commandRequestContext = commandRequestContext; - _unitsContext = unitsContext; - _loaService = loaService; - _httpContextService = httpContextService; - _displayNameService = displayNameService; - _accountService = accountService; - _unitsService = unitsService; - _chainOfCommandService = chainOfCommandService; - _notificationsService = notificationsService; - _logger = logger; - } - - [HttpGet, Authorize] - public LoaReportDataset Get([FromQuery] string scope = "you") - { - List objectIds; - switch (scope) - { - case "all": - objectIds = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER).Select(x => x.Id).ToList(); - break; - case "unit": - DomainAccount domainAccount = _accountService.GetUserAccount(); - IEnumerable groups = _unitsService.GetAllChildren(_unitsContext.GetSingle(x => x.Name == domainAccount.UnitAssignment), true); - List members = groups.SelectMany(x => x.Members.ToList()).ToList(); - objectIds = _accountContext.Get(x => x.MembershipState == MembershipState.MEMBER && members.Contains(x.Id)).Select(x => x.Id).ToList(); - break; - case "you": - objectIds = new() { _httpContextService.GetUserId() }; - break; - default: throw new InvalidLoaScopeException(scope); - } - - IEnumerable loaReports = _loaService.Get(objectIds) - .Select( - x => new LoaReport - { - Id = x.Id, - Start = x.Start, - End = x.End, - State = x.State, - Emergency = x.Emergency, - Late = x.Late, - Reason = x.Reason, - Name = _displayNameService.GetDisplayName(_accountContext.GetSingle(x.Recipient)), - InChainOfCommand = _chainOfCommandService.InContextChainOfCommand(x.Recipient), - LongTerm = (x.End - x.Start).Days > 21 - } - ) - .ToList(); - return new() - { - ActiveLoas = loaReports.Where(x => x.Start <= DateTime.Now && x.End > DateTime.Now).OrderBy(x => x.End).ThenBy(x => x.Start).ToList(), - UpcomingLoas = loaReports.Where(x => x.Start >= DateTime.Now).OrderBy(x => x.Start).ThenBy(x => x.End).ToList(), - PastLoas = loaReports.Where(x => x.End < DateTime.Now).OrderByDescending(x => x.End).ThenByDescending(x => x.Start).ToList() - }; - } - - [HttpDelete("{id}"), Authorize] - public async Task DeleteLoa(string id) - { - Loa loa = _loaContext.GetSingle(id); - CommandRequest request = _commandRequestContext.GetSingle(x => x.Value == id); - if (request != null) - { - await _commandRequestContext.Delete(request); - foreach (string reviewerId in request.Reviews.Keys.Where(x => x != request.Requester)) - { - _notificationsService.Add( - new() - { - Owner = reviewerId, - Icon = NotificationIcons.REQUEST, - Message = $"Your review for {request.DisplayRequester}'s LOA is no longer required as they deleted their LOA", - Link = "/command/requests" - } - ); - } - - _logger.LogAudit($"Loa request deleted for '{_displayNameService.GetDisplayName(_accountContext.GetSingle(loa.Recipient))}' from '{loa.Start}' to '{loa.End}'"); - } - - _logger.LogAudit($"Loa deleted for '{_displayNameService.GetDisplayName(_accountContext.GetSingle(loa.Recipient))}' from '{loa.Start}' to '{loa.End}'"); - await _loaContext.Delete(loa); - } - } -} diff --git a/UKSF.Api/Models/LoaReportDataset.cs b/UKSF.Api/Models/LoaReportDataset.cs deleted file mode 100644 index 0b5cedec..00000000 --- a/UKSF.Api/Models/LoaReportDataset.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using UKSF.Api.Personnel.Models; - -namespace UKSF.Api.Models -{ - [Serializable] - public class LoaReportDataset - { - public List ActiveLoas; - public List PastLoas; - public List UpcomingLoas; - } - - public class LoaReport - { - public bool Emergency; - public DateTime End; - public string Id; - public bool InChainOfCommand; - public bool Late; - public bool LongTerm; - public string Name; - public string Reason; - public DateTime Start; - public LoaReviewState State; - } -} diff --git a/UKSF.Api/Startup.cs b/UKSF.Api/Startup.cs index 289ab16a..43b41c89 100644 --- a/UKSF.Api/Startup.cs +++ b/UKSF.Api/Startup.cs @@ -14,6 +14,7 @@ using UKSF.Api.Middleware; using UKSF.Api.Modpack; using UKSF.Api.Personnel; +using UKSF.Api.Shared; using UKSF.Api.Teamspeak; namespace UKSF.Api @@ -27,7 +28,7 @@ public Startup(IHostEnvironment currentEnvironment, IConfiguration configuration { _configuration = configuration; _currentEnvironment = currentEnvironment; - IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); + var builder = new ConfigurationBuilder().SetBasePath(currentEnvironment.ContentRootPath).AddEnvironmentVariables(); builder.Build(); } @@ -35,7 +36,12 @@ public void ConfigureServices(IServiceCollection services) { services.AddUksf(_configuration, _currentEnvironment); - services.AddCors(options => options.AddPolicy("CorsPolicy", builder => { builder.AllowAnyMethod().AllowAnyHeader().WithOrigins(GetCorsPaths()).AllowCredentials(); })); + services.AddCors( + options => options.AddPolicy( + "CorsPolicy", + builder => { builder.AllowAnyMethod().AllowAnyHeader().WithOrigins(GetCorsPaths()).AllowCredentials(); } + ) + ); services.AddControllers(options => { options.EnableEndpointRouting = true; }); services.AddRouting() .AddSwaggerGen(options => { options.SwaggerDoc("v1", new() { Title = "UKSF API", Version = "v1" }); }) @@ -69,6 +75,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime hostAppl endpoints => { endpoints.MapControllers().RequireCors("CorsPolicy"); + endpoints.AddUksfSignalr(); endpoints.AddUksfAdminSignalr(); endpoints.AddUksfArmaServerSignalr(); endpoints.AddUksfCommandSignalr(); @@ -88,7 +95,7 @@ private static void OnShutdown(IServiceProvider serviceProvider) private string[] GetCorsPaths() { - string environment = _configuration.GetSection("appSettings")["environment"]; + var environment = _configuration.GetSection("appSettings")["environment"]; return environment switch { "Development" => new[] { "http://localhost:4200", "http://localhost:4300", "https://dev.uk-sf.co.uk", "https://api-dev.uk-sf.co.uk" }, diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index dbc309e1..9c54c03b 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -36,15 +36,20 @@ - - - - - - - - - + + + + + + + + + + + + + + diff --git a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs index 306b4721..3b9edbd9 100644 --- a/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs +++ b/UKSF.Tests/Unit/Common/ChangeUtilitiesTests.cs @@ -25,7 +25,10 @@ public void Should_detect_changes_for_complex_object() Background = "I like trains", Dob = dobBefore, Rank = "Private", - Application = new() { State = ApplicationState.WAITING, Recruiter = "Bob", ApplicationCommentThread = "thread1", DateCreated = new(2020, 5, 2, 10, 34, 39) }, + Application = new() + { + State = ApplicationState.WAITING, Recruiter = "Bob", ApplicationCommentThread = "thread1", DateCreated = new(2020, 5, 2, 10, 34, 39) + }, RolePreferences = new() { "Aviatin", "NCO" } }; DomainAccount updated = new() @@ -35,7 +38,10 @@ public void Should_detect_changes_for_complex_object() Lastname = "Bob", Background = "I like planes", Dob = dobAfter, - Application = new() { State = ApplicationState.ACCEPTED, Recruiter = "Bob", DateCreated = new(2020, 5, 2, 10, 34, 39), DateAccepted = dateAccepted }, + Application = new() + { + State = ApplicationState.ACCEPTED, Recruiter = "Bob", DateCreated = new(2020, 5, 2, 10, 34, 39), DateAccepted = dateAccepted + }, RolePreferences = new() { "Aviation", "Officer" } }; @@ -83,7 +89,8 @@ public void Should_detect_changes_for_dictionary() string subject = original.Changes(updated); - subject.Should().Be("\n\t'Dictionary' changed:" + "\n\t\tadded: '[1, variable1]'" + "\n\t\tadded: '[2, variable2]'" + "\n\t\tremoved: '[1, variable0]'"); + subject.Should() + .Be("\n\t'Dictionary' changed:" + "\n\t\tadded: '[1, variable1]'" + "\n\t\tadded: '[2, variable2]'" + "\n\t\tremoved: '[1, variable0]'"); } [Fact] @@ -137,12 +144,18 @@ public void Should_detect_changes_for_simple_list() public void Should_detect_changes_for_simple_object() { string id = ObjectId.GenerateNewId().ToString(); - Rank original = new() { Id = id, Abbreviation = "Pte", Name = "Privte", Order = 1 }; - Rank updated = new() { Id = id, Name = "Private", Order = 5, TeamspeakGroup = "4" }; + DomainRank original = new() { Id = id, Abbreviation = "Pte", Name = "Privte", Order = 1 }; + DomainRank updated = new() { Id = id, Name = "Private", Order = 5, TeamspeakGroup = "4" }; string subject = original.Changes(updated); - subject.Should().Be("\n\t'TeamspeakGroup' added as '4'" + "\n\t'Name' changed from 'Privte' to 'Private'" + "\n\t'Order' changed from '1' to '5'" + "\n\t'Abbreviation' as 'Pte' removed"); + subject.Should() + .Be( + "\n\t'TeamspeakGroup' added as '4'" + + "\n\t'Name' changed from 'Privte' to 'Private'" + + "\n\t'Order' changed from '1' to '5'" + + "\n\t'Abbreviation' as 'Pte' removed" + ); } [Fact] @@ -161,8 +174,8 @@ public void Should_detect_changes_for_simple_object_with_list() public void Should_do_nothing_when_field_is_null() { string id = ObjectId.GenerateNewId().ToString(); - Rank original = new() { Id = id, Abbreviation = null }; - Rank updated = new() { Id = id, Abbreviation = null }; + DomainRank original = new() { Id = id, Abbreviation = null }; + DomainRank updated = new() { Id = id, Abbreviation = null }; string subject = original.Changes(updated); @@ -172,7 +185,7 @@ public void Should_do_nothing_when_field_is_null() [Fact] public void Should_do_nothing_when_null() { - string subject = ((Rank) null).Changes(null); + var subject = ((DomainRank)null).Changes(null); subject.Should().Be("\tNo changes"); } @@ -181,8 +194,8 @@ public void Should_do_nothing_when_null() public void Should_do_nothing_when_objects_are_equal() { string id = ObjectId.GenerateNewId().ToString(); - Rank original = new() { Id = id, Abbreviation = "Pte" }; - Rank updated = new() { Id = id, Abbreviation = "Pte" }; + DomainRank original = new() { Id = id, Abbreviation = "Pte" }; + DomainRank updated = new() { Id = id, Abbreviation = "Pte" }; string subject = original.Changes(updated); diff --git a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs index 4e5e8bdc..67654265 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RanksDataServiceTests.cs @@ -11,7 +11,7 @@ namespace UKSF.Tests.Unit.Data.Personnel { public class RanksDataServiceTests { - private readonly Mock> _mockDataCollection; + private readonly Mock> _mockDataCollection; private readonly RanksContext _ranksContext; public RanksDataServiceTests() @@ -20,7 +20,7 @@ public RanksDataServiceTests() Mock mockEventBus = new(); _mockDataCollection = new(); - mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); _ranksContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); } @@ -28,13 +28,13 @@ public RanksDataServiceTests() [Fact] public void Should_return_collection_in_order() { - Rank rank1 = new() { Order = 2 }; - Rank rank2 = new() { Order = 0 }; - Rank rank3 = new() { Order = 1 }; + DomainRank rank1 = new() { Order = 2 }; + DomainRank rank2 = new() { Order = 0 }; + DomainRank rank3 = new() { Order = 1 }; - _mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); - IEnumerable subject = _ranksContext.Get(); + var subject = _ranksContext.Get(); subject.Should().ContainInOrder(rank2, rank3, rank1); } @@ -42,13 +42,13 @@ public void Should_return_collection_in_order() [Fact] public void Should_return_item_by_name() { - Rank rank1 = new() { Name = "Private", Order = 2 }; - Rank rank2 = new() { Name = "Recruit", Order = 1 }; - Rank rank3 = new() { Name = "Candidate", Order = 0 }; + DomainRank rank1 = new() { Name = "Private", Order = 2 }; + DomainRank rank2 = new() { Name = "Recruit", Order = 1 }; + DomainRank rank3 = new() { Name = "Candidate", Order = 0 }; - _mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); - Rank subject = _ranksContext.GetSingle("Recruit"); + var subject = _ranksContext.GetSingle("Recruit"); subject.Should().Be(rank2); } @@ -56,9 +56,9 @@ public void Should_return_item_by_name() [Theory, InlineData(""), InlineData(null)] public void Should_return_nothing_for_empty_or_null_name(string name) { - _mockDataCollection.Setup(x => x.Get()).Returns(new List()); + _mockDataCollection.Setup(x => x.Get()).Returns(new List()); - Rank subject = _ranksContext.GetSingle(name); + var subject = _ranksContext.GetSingle(name); subject.Should().Be(null); } diff --git a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs index 304c75ae..800ccc22 100644 --- a/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Personnel/RolesDataServiceTests.cs @@ -11,7 +11,7 @@ namespace UKSF.Tests.Unit.Data.Personnel { public class RolesDataServiceTests { - private readonly Mock> _mockDataCollection; + private readonly Mock> _mockDataCollection; private readonly RolesContext _rolesContext; public RolesDataServiceTests() @@ -20,7 +20,7 @@ public RolesDataServiceTests() Mock mockEventBus = new(); _mockDataCollection = new(); - mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(_mockDataCollection.Object); _rolesContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); } @@ -28,13 +28,13 @@ public RolesDataServiceTests() [Fact] public void Should_get_collection_in_order() { - Role role1 = new() { Name = "Rifleman" }; - Role role2 = new() { Name = "Trainee" }; - Role role3 = new() { Name = "Marksman" }; + DomainRole role1 = new() { Name = "Rifleman" }; + DomainRole role2 = new() { Name = "Trainee" }; + DomainRole role3 = new() { Name = "Marksman" }; - _mockDataCollection.Setup(x => x.Get()).Returns(new List { role1, role2, role3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { role1, role2, role3 }); - IEnumerable subject = _rolesContext.Get(); + var subject = _rolesContext.Get(); subject.Should().ContainInOrder(role3, role1, role2); } @@ -42,13 +42,13 @@ public void Should_get_collection_in_order() [Fact] public void ShouldGetSingleByName() { - Role role1 = new() { Name = "Rifleman" }; - Role role2 = new() { Name = "Trainee" }; - Role role3 = new() { Name = "Marksman" }; + DomainRole role1 = new() { Name = "Rifleman" }; + DomainRole role2 = new() { Name = "Trainee" }; + DomainRole role3 = new() { Name = "Marksman" }; - _mockDataCollection.Setup(x => x.Get()).Returns(new List { role1, role2, role3 }); + _mockDataCollection.Setup(x => x.Get()).Returns(new List { role1, role2, role3 }); - Role subject = _rolesContext.GetSingle("Trainee"); + var subject = _rolesContext.GetSingle("Trainee"); subject.Should().Be(role2); } @@ -56,9 +56,9 @@ public void ShouldGetSingleByName() [Theory, InlineData(""), InlineData(null)] public void ShouldGetNothingWhenNoName(string name) { - _mockDataCollection.Setup(x => x.Get()).Returns(new List()); + _mockDataCollection.Setup(x => x.Get()).Returns(new List()); - Role subject = _rolesContext.GetSingle(name); + var subject = _rolesContext.GetSingle(name); subject.Should().Be(null); } diff --git a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs index 9342c23a..7165353a 100644 --- a/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/SimpleDataServiceTests.cs @@ -33,7 +33,7 @@ public void Should_create_collections() mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Exactly(2)); mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); - mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); + mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); mockDataCollectionFactory.Verify(x => x.CreateMongoCollection(It.IsAny()), Times.Once); } diff --git a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs index d020db68..5821e7e5 100644 --- a/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs +++ b/UKSF.Tests/Unit/Data/Units/UnitsDataServiceTests.cs @@ -6,7 +6,6 @@ using UKSF.Api.Personnel.Context; using UKSF.Api.Personnel.Models; using Xunit; -using UksfUnit = UKSF.Api.Personnel.Models.Unit; namespace UKSF.Tests.Unit.Data.Units { @@ -17,18 +16,18 @@ public void Should_get_collection_in_order() { Mock mockDataCollectionFactory = new(); Mock mockEventBus = new(); - Mock> mockDataCollection = new(); + Mock> mockDataCollection = new(); - UksfUnit rank1 = new() { Name = "Air Troop", Order = 2 }; - UksfUnit rank2 = new() { Name = "UKSF", Order = 0 }; - UksfUnit rank3 = new() { Name = "SAS", Order = 1 }; + DomainUnit rank1 = new() { Name = "Air Troop", Order = 2 }; + DomainUnit rank2 = new() { Name = "UKSF", Order = 0 }; + DomainUnit rank3 = new() { Name = "SAS", Order = 1 }; - mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3 }); UnitsContext unitsContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); - IEnumerable subject = unitsContext.Get(); + var subject = unitsContext.Get(); subject.Should().ContainInOrder(rank2, rank3, rank1); } @@ -38,19 +37,19 @@ public void ShouldGetOrderedCollectionFromPredicate() { Mock mockDataCollectionFactory = new(); Mock mockEventBus = new(); - Mock> mockDataCollection = new(); + Mock> mockDataCollection = new(); - UksfUnit rank1 = new() { Name = "Air Troop", Order = 3, Branch = UnitBranch.COMBAT }; - UksfUnit rank2 = new() { Name = "Boat Troop", Order = 2, Branch = UnitBranch.COMBAT }; - UksfUnit rank3 = new() { Name = "UKSF", Order = 0, Branch = UnitBranch.AUXILIARY }; - UksfUnit rank4 = new() { Name = "SAS", Order = 1, Branch = UnitBranch.AUXILIARY }; + DomainUnit rank1 = new() { Name = "Air Troop", Order = 3, Branch = UnitBranch.COMBAT }; + DomainUnit rank2 = new() { Name = "Boat Troop", Order = 2, Branch = UnitBranch.COMBAT }; + DomainUnit rank3 = new() { Name = "UKSF", Order = 0, Branch = UnitBranch.AUXILIARY }; + DomainUnit rank4 = new() { Name = "SAS", Order = 1, Branch = UnitBranch.AUXILIARY }; - mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(mockDataCollection.Object); - mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3, rank4 }); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())).Returns(mockDataCollection.Object); + mockDataCollection.Setup(x => x.Get()).Returns(new List { rank1, rank2, rank3, rank4 }); UnitsContext unitsContext = new(mockDataCollectionFactory.Object, mockEventBus.Object); - IEnumerable subject = unitsContext.Get(x => x.Branch == UnitBranch.COMBAT); + var subject = unitsContext.Get(x => x.Branch == UnitBranch.COMBAT); subject.Should().ContainInOrder(rank2, rank1); } diff --git a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs index af7532b7..20a6cf4a 100644 --- a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs @@ -29,7 +29,7 @@ public AccountEventHandlerTests() _eventBus = new EventBus(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); - mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); + mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); _accountDataEventHandler = new(_eventBus, _mockAccountHub.Object, _mockLoggingService.Object); } @@ -48,7 +48,7 @@ public void ShouldLogOnException() _accountDataEventHandler.Init(); _eventBus.Send(new(EventType.UPDATE, new ContextEventData(null, null))); - _eventBus.Send(new(EventType.UPDATE, new ContextEventData(null, null))); + _eventBus.Send(new(EventType.UPDATE, new ContextEventData(null, null))); _mockLoggingService.Verify(x => x.LogError(It.IsAny()), Times.Exactly(2)); } @@ -67,8 +67,8 @@ public void ShouldNotRunEvent() _eventBus.Send(new(EventType.ADD, new ContextEventData(null, null))); _eventBus.Send(new(EventType.DELETE, new ContextEventData(null, null))); - _eventBus.Send(new(EventType.ADD, new ContextEventData(null, null))); - _eventBus.Send(new(EventType.DELETE, new ContextEventData(null, null))); + _eventBus.Send(new(EventType.ADD, new ContextEventData(null, null))); + _eventBus.Send(new(EventType.DELETE, new ContextEventData(null, null))); mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Never); } @@ -86,7 +86,7 @@ public void ShouldRunEventOnUpdate() _accountDataEventHandler.Init(); _eventBus.Send(new(EventType.UPDATE, new ContextEventData("1", null))); - _eventBus.Send(new(EventType.UPDATE, new ContextEventData("2", null))); + _eventBus.Send(new(EventType.UPDATE, new ContextEventData("2", null))); mockAccountClient.Verify(x => x.ReceiveAccountUpdate(), Times.Exactly(2)); } diff --git a/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs b/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs index 7079daea..06637fcb 100644 --- a/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Common/ObjectIdConversionServiceTests.cs @@ -4,6 +4,7 @@ using FluentAssertions; using Moq; using UKSF.Api.Personnel.Context; +using UKSF.Api.Personnel.Models; using UKSF.Api.Personnel.Services; using Xunit; @@ -26,11 +27,11 @@ public ObjectIdConversionServiceTests() [Fact] public void ShouldConvertCorrectUnitWithPredicate() { - Api.Personnel.Models.Unit unit1 = new() { Name = "7 Squadron" }; - Api.Personnel.Models.Unit unit2 = new() { Name = "656 Squadron" }; - List collection = new() { unit1, unit2 }; + DomainUnit unit1 = new() { Name = "7 Squadron" }; + DomainUnit unit2 = new() { Name = "656 Squadron" }; + List collection = new() { unit1, unit2 }; - _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => collection.FirstOrDefault(x)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => collection.FirstOrDefault(x)); _mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); string subject = _objectIdConversionService.ConvertObjectIds(unit1.Id); @@ -43,9 +44,9 @@ public void ShouldConvertUnitObjectIds() { const string INPUT = "5e39336e1b92ee2d14b7fe08"; const string EXPECTED = "7 Squadron"; - Api.Personnel.Models.Unit unit = new() { Name = EXPECTED, Id = INPUT }; + DomainUnit unit = new() { Name = EXPECTED, Id = INPUT }; - _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(unit); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(unit); _mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); string subject = _objectIdConversionService.ConvertObjectIds(INPUT); @@ -59,7 +60,7 @@ public void ShouldDoNothingToTextWhenNameOrUnitNotFound() const string INPUT = "5e39336e1b92ee2d14b7fe08"; const string EXPECTED = "5e39336e1b92ee2d14b7fe08"; - _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); _mockDisplayNameService.Setup(x => x.GetDisplayName(It.IsAny())).Returns(x => x); string subject = _objectIdConversionService.ConvertObjectIds(INPUT); @@ -75,12 +76,16 @@ public void ShouldReturnEmpty() subject.Should().Be(string.Empty); } - [Theory, InlineData("5e39336e1b92ee2d14b7fe08", "Maj.Bridgford.A"), InlineData("5e39336e1b92ee2d14b7fe08, 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A, Cpl.Carr.C"), + [Theory, InlineData("5e39336e1b92ee2d14b7fe08", "Maj.Bridgford.A"), + InlineData("5e39336e1b92ee2d14b7fe08, 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A, Cpl.Carr.C"), InlineData("5e39336e1b92ee2d14b7fe085e3935db1b92ee2d14b7fe09", "Maj.Bridgford.ACpl.Carr.C"), - InlineData("5e39336e1b92ee2d14b7fe08 has requested all the things for 5e3935db1b92ee2d14b7fe09", "Maj.Bridgford.A has requested all the things for Cpl.Carr.C")] + InlineData( + "5e39336e1b92ee2d14b7fe08 has requested all the things for 5e3935db1b92ee2d14b7fe09", + "Maj.Bridgford.A has requested all the things for Cpl.Carr.C" + )] public void ShouldConvertNameObjectIds(string input, string expected) { - _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns(null); _mockDisplayNameService.Setup(x => x.GetDisplayName("5e39336e1b92ee2d14b7fe08")).Returns("Maj.Bridgford.A"); _mockDisplayNameService.Setup(x => x.GetDisplayName("5e3935db1b92ee2d14b7fe09")).Returns("Cpl.Carr.C"); diff --git a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs index b88d5bb1..caf227ce 100644 --- a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs @@ -13,7 +13,6 @@ using UKSF.Api.Teamspeak.Models; using UKSF.Api.Teamspeak.Services; using Xunit; -using UksfUnit = UKSF.Api.Personnel.Models.Unit; namespace UKSF.Tests.Unit.Services.Integrations.Teamspeak { @@ -26,7 +25,12 @@ public class TeamspeakGroupServiceTests private static readonly VariableItem TEAMSPEAK_GID_BLACKLIST = new() { Key = "TEAMSPEAK_GID_BLACKLIST", Item = "99,100" }; private readonly List _addedGroups = new(); - private readonly UksfUnit _elcomUnit = new() { Id = ObjectId.GenerateNewId().ToString(), Name = "ELCOM", Branch = UnitBranch.AUXILIARY, Parent = ObjectId.Empty.ToString() }; + + private readonly DomainUnit _elcomUnit = new() + { + Id = ObjectId.GenerateNewId().ToString(), Name = "ELCOM", Branch = UnitBranch.AUXILIARY, Parent = ObjectId.Empty.ToString() + }; + private readonly Mock _mockRanksContext = new(); private readonly Mock _mockRolesContext = new(); private readonly Mock _mockTeampeakManagerService = new(); @@ -45,13 +49,23 @@ public TeamspeakGroupServiceTests() _mockTeampeakManagerService.Setup(x => x.SendGroupProcedure(TeamspeakProcedureType.ASSIGN, It.IsAny())) .Returns(Task.CompletedTask) - .Callback((TeamspeakProcedureType _, TeamspeakGroupProcedure groupProcedure) => _addedGroups.Add(groupProcedure.ServerGroup)); + .Callback( + (TeamspeakProcedureType _, TeamspeakGroupProcedure groupProcedure) => _addedGroups.Add(groupProcedure.ServerGroup) + ); _mockTeampeakManagerService.Setup(x => x.SendGroupProcedure(TeamspeakProcedureType.UNASSIGN, It.IsAny())) .Returns(Task.CompletedTask) - .Callback((TeamspeakProcedureType _, TeamspeakGroupProcedure groupProcedure) => _removedGroups.Add(groupProcedure.ServerGroup)); + .Callback( + (TeamspeakProcedureType _, TeamspeakGroupProcedure groupProcedure) => _removedGroups.Add(groupProcedure.ServerGroup) + ); IUnitsService unitsService = new UnitsService(_mockUnitsContext.Object, _mockRolesContext.Object); - _teamspeakGroupService = new(_mockRanksContext.Object, _mockUnitsContext.Object, unitsService, _mockTeampeakManagerService.Object, _mockVariablesService.Object); + _teamspeakGroupService = new( + _mockRanksContext.Object, + _mockUnitsContext.Object, + unitsService, + _mockTeampeakManagerService.Object, + _mockVariablesService.Object + ); } [Fact] @@ -59,9 +73,13 @@ public async Task Should_add_correct_groups_for_candidate() { string id = ObjectId.GenerateNewId().ToString(); - _mockRanksContext.Setup(x => x.GetSingle("Candidate")).Returns(new Rank { Name = "Candidate", TeamspeakGroup = "5" }); + _mockRanksContext.Setup(x => x.GetSingle("Candidate")).Returns(new DomainRank { Name = "Candidate", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.CONFIRMED, Rank = "Candidate" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups( + new() { Id = id, MembershipState = MembershipState.CONFIRMED, Rank = "Candidate" }, + new List(), + 2 + ); _addedGroups.Should().BeEquivalentTo(5); _removedGroups.Should().BeEmpty(); @@ -82,19 +100,27 @@ public async Task Should_add_correct_groups_for_elcom() string id = ObjectId.GenerateNewId().ToString(); string parentId = ObjectId.GenerateNewId().ToString(); string parentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; - UksfUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; - UksfUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; - UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } }; - List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; + DomainUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; + DomainUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; + DomainUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; + DomainUnit auxiliaryUnit = new() + { + Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } + }; + List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; _elcomUnit.Members.Add(id); _mockUnitsContext.Setup(x => x.Get()).Returns(units); - _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())) + .Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new DomainRank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups( + new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, + new List(), + 2 + ); _addedGroups.Should().BeEquivalentTo(3, 4, 5, 7, 9); _removedGroups.Should().BeEmpty(); @@ -105,17 +131,25 @@ public async Task Should_add_correct_groups_for_first_root_child() { string id = ObjectId.GenerateNewId().ToString(); string rootId = ObjectId.GenerateNewId().ToString(); - UksfUnit rootUnit = new() { Id = rootId, Name = "UKSF", TeamspeakGroup = "10", Parent = ObjectId.Empty.ToString() }; - UksfUnit unit = new() { Name = "JSFAW", TeamspeakGroup = "6", Members = new() { id }, Parent = rootId }; - UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } }; - List units = new() { rootUnit, unit, _elcomUnit, auxiliaryUnit }; + DomainUnit rootUnit = new() { Id = rootId, Name = "UKSF", TeamspeakGroup = "10", Parent = ObjectId.Empty.ToString() }; + DomainUnit unit = new() { Name = "JSFAW", TeamspeakGroup = "6", Members = new() { id }, Parent = rootId }; + DomainUnit auxiliaryUnit = new() + { + Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } + }; + List units = new() { rootUnit, unit, _elcomUnit, auxiliaryUnit }; _mockUnitsContext.Setup(x => x.Get()).Returns(units); - _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())) + .Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new DomainRank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "JSFAW" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups( + new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "JSFAW" }, + new List(), + 2 + ); _addedGroups.Should().BeEquivalentTo(3, 5, 6, 9); _removedGroups.Should().BeEmpty(); @@ -126,18 +160,26 @@ public async Task Should_add_correct_groups_for_first_root_child_in_elcom() { string id = ObjectId.GenerateNewId().ToString(); string rootId = ObjectId.GenerateNewId().ToString(); - UksfUnit rootUnit = new() { Id = rootId, Name = "UKSF", TeamspeakGroup = "10", Parent = ObjectId.Empty.ToString() }; - UksfUnit unit = new() { Name = "JSFAW", TeamspeakGroup = "6", Members = new() { id }, Parent = rootId }; - UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } }; - List units = new() { rootUnit, unit, _elcomUnit, auxiliaryUnit }; + DomainUnit rootUnit = new() { Id = rootId, Name = "UKSF", TeamspeakGroup = "10", Parent = ObjectId.Empty.ToString() }; + DomainUnit unit = new() { Name = "JSFAW", TeamspeakGroup = "6", Members = new() { id }, Parent = rootId }; + DomainUnit auxiliaryUnit = new() + { + Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } + }; + List units = new() { rootUnit, unit, _elcomUnit, auxiliaryUnit }; _elcomUnit.Members.Add(id); _mockUnitsContext.Setup(x => x.Get()).Returns(units); - _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())) + .Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new DomainRank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "JSFAW" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups( + new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "JSFAW" }, + new List(), + 2 + ); _addedGroups.Should().BeEquivalentTo(3, 5, 4, 6, 9); _removedGroups.Should().BeEmpty(); @@ -149,18 +191,26 @@ public async Task Should_add_correct_groups_for_member() string id = ObjectId.GenerateNewId().ToString(); string parentId = ObjectId.GenerateNewId().ToString(); string parentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; - UksfUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; - UksfUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; - UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } }; - List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; + DomainUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; + DomainUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; + DomainUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; + DomainUnit auxiliaryUnit = new() + { + Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } + }; + List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; _mockUnitsContext.Setup(x => x.Get()).Returns(units); - _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())) + .Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new DomainRank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups( + new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, + new List(), + 2 + ); _addedGroups.Should().BeEquivalentTo(3, 5, 6, 7, 9); _removedGroups.Should().BeEmpty(); @@ -173,18 +223,23 @@ public async Task Should_add_correct_groups_for_member_with_gaps_in_parents() string parentId = ObjectId.GenerateNewId().ToString(); string parentParentId = ObjectId.GenerateNewId().ToString(); string parentParentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new() { Name = "1 Section", Members = new() { id }, Parent = parentId }; - UksfUnit unitParent = new() { Id = parentId, Name = "1 Platoon", TeamspeakGroup = "7", Parent = parentParentId }; - UksfUnit unitParentParent = new() { Id = parentParentId, Name = "A Company", Parent = parentParentParentId }; - UksfUnit unitParentParentParent = new() { Id = parentParentParentId, Name = "SFSG", TeamspeakGroup = "8" }; - List units = new() { unit, unitParent, unitParentParent, unitParentParentParent, _elcomUnit }; + DomainUnit unit = new() { Name = "1 Section", Members = new() { id }, Parent = parentId }; + DomainUnit unitParent = new() { Id = parentId, Name = "1 Platoon", TeamspeakGroup = "7", Parent = parentParentId }; + DomainUnit unitParentParent = new() { Id = parentParentId, Name = "A Company", Parent = parentParentParentId }; + DomainUnit unitParentParentParent = new() { Id = parentParentParentId, Name = "SFSG", TeamspeakGroup = "8" }; + List units = new() { unit, unitParent, unitParentParent, unitParentParentParent, _elcomUnit }; _mockUnitsContext.Setup(x => x.Get()).Returns(units); - _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())) + .Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new DomainRank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups( + new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, + new List(), + 2 + ); _addedGroups.Should().BeEquivalentTo(3, 5, 7, 8); _removedGroups.Should().BeEmpty(); @@ -212,17 +267,25 @@ public async Task Should_add_correct_groups_for_non_member_with_no_account() public async Task Should_add_correct_groups_for_stratcom() { string id = ObjectId.GenerateNewId().ToString(); - UksfUnit rootUnit = new() { Name = "UKSF", TeamspeakGroup = "10", Members = new() { id }, Parent = ObjectId.Empty.ToString() }; - UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } }; - List units = new() { rootUnit, _elcomUnit, auxiliaryUnit }; + DomainUnit rootUnit = new() { Name = "UKSF", TeamspeakGroup = "10", Members = new() { id }, Parent = ObjectId.Empty.ToString() }; + DomainUnit auxiliaryUnit = new() + { + Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } + }; + List units = new() { rootUnit, _elcomUnit, auxiliaryUnit }; _elcomUnit.Members.Add(id); _mockUnitsContext.Setup(x => x.Get()).Returns(units); - _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())) + .Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new DomainRank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "UKSF" }, new List(), 2); + await _teamspeakGroupService.UpdateAccountGroups( + new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "UKSF" }, + new List(), + 2 + ); _addedGroups.Should().BeEquivalentTo(3, 4, 5, 10, 9); _removedGroups.Should().BeEmpty(); @@ -234,18 +297,26 @@ public async Task Should_only_add_groups_if_not_set() string id = ObjectId.GenerateNewId().ToString(); string parentId = ObjectId.GenerateNewId().ToString(); string parentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; - UksfUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; - UksfUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; - UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } }; - List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; + DomainUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; + DomainUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; + DomainUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; + DomainUnit auxiliaryUnit = new() + { + Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } + }; + List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; _mockUnitsContext.Setup(x => x.Get()).Returns(units); - _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())) + .Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new DomainRank { Name = "Private", TeamspeakGroup = "5" }); - await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List { 3, 5 }, 2); + await _teamspeakGroupService.UpdateAccountGroups( + new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, + new List { 3, 5 }, + 2 + ); _addedGroups.Should().BeEquivalentTo(6, 7, 9); _removedGroups.Should().BeEmpty(); @@ -257,18 +328,26 @@ public async Task Should_remove_correct_groups() string id = ObjectId.GenerateNewId().ToString(); string parentId = ObjectId.GenerateNewId().ToString(); string parentParentId = ObjectId.GenerateNewId().ToString(); - UksfUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; - UksfUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; - UksfUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; - UksfUnit auxiliaryUnit = new() { Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } }; - List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; + DomainUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; + DomainUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; + DomainUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; + DomainUnit auxiliaryUnit = new() + { + Branch = UnitBranch.AUXILIARY, Name = "SR1", TeamspeakGroup = "9", Parent = _elcomUnit.Id, Members = new() { id } + }; + List units = new() { unit, unitParent, unitParentParent, _elcomUnit, auxiliaryUnit }; _mockUnitsContext.Setup(x => x.Get()).Returns(units); - _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); - _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())).Returns>(predicate => units.FirstOrDefault(predicate)); - _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new Rank { Name = "Private", TeamspeakGroup = "5" }); - - await _teamspeakGroupService.UpdateAccountGroups(new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, new List { 1, 10 }, 2); + _mockUnitsContext.Setup(x => x.Get(It.IsAny>())).Returns>(predicate => units.Where(predicate)); + _mockUnitsContext.Setup(x => x.GetSingle(It.IsAny>())) + .Returns>(predicate => units.FirstOrDefault(predicate)); + _mockRanksContext.Setup(x => x.GetSingle("Private")).Returns(new DomainRank { Name = "Private", TeamspeakGroup = "5" }); + + await _teamspeakGroupService.UpdateAccountGroups( + new() { Id = id, MembershipState = MembershipState.MEMBER, Rank = "Private", UnitAssignment = "1 Section" }, + new List { 1, 10 }, + 2 + ); _addedGroups.Should().BeEquivalentTo(3, 5, 6, 7, 9); _removedGroups.Should().BeEquivalentTo(1, 10); diff --git a/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs index eafa60ab..d8c141f6 100644 --- a/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/DisplayNameServiceTests.cs @@ -57,7 +57,7 @@ public void ShouldGetDisplayNameWithoutRank() public void ShouldGetDisplayNameWithRank() { DomainAccount domainAccount = new() { Lastname = "Beswick", Firstname = "Tim", Rank = "Squadron Leader" }; - Rank rank = new() { Abbreviation = "SqnLdr" }; + DomainRank rank = new() { Abbreviation = "SqnLdr" }; _mockRanksContext.Setup(x => x.GetSingle(It.IsAny())).Returns(rank); diff --git a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs index 7e9ee3ef..8cef4c18 100644 --- a/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/LoaServiceTests.cs @@ -4,8 +4,8 @@ using FluentAssertions; using Moq; using UKSF.Api.Command.Context; +using UKSF.Api.Command.Models; using UKSF.Api.Command.Services; -using UKSF.Api.Personnel.Models; using Xunit; namespace UKSF.Tests.Unit.Services.Personnel @@ -25,18 +25,18 @@ public LoaServiceTests() [Fact] public void ShouldGetCorrectLoas() { - Loa loa1 = new() { Recipient = "5ed524b04f5b532a5437bba1", End = DateTime.Now.AddDays(-5) }; - Loa loa2 = new() { Recipient = "5ed524b04f5b532a5437bba1", End = DateTime.Now.AddDays(-35) }; - Loa loa3 = new() { Recipient = "5ed524b04f5b532a5437bba2", End = DateTime.Now.AddDays(-45) }; - Loa loa4 = new() { Recipient = "5ed524b04f5b532a5437bba2", End = DateTime.Now.AddDays(-30).AddSeconds(1) }; - Loa loa5 = new() { Recipient = "5ed524b04f5b532a5437bba3", End = DateTime.Now.AddDays(-5) }; - List mockCollection = new() { loa1, loa2, loa3, loa4, loa5 }; + DomainLoa loa1 = new() { Recipient = "5ed524b04f5b532a5437bba1", End = DateTime.Now.AddDays(-5) }; + DomainLoa loa2 = new() { Recipient = "5ed524b04f5b532a5437bba1", End = DateTime.Now.AddDays(-35) }; + DomainLoa loa3 = new() { Recipient = "5ed524b04f5b532a5437bba2", End = DateTime.Now.AddDays(-45) }; + DomainLoa loa4 = new() { Recipient = "5ed524b04f5b532a5437bba2", End = DateTime.Now.AddDays(-30).AddSeconds(1) }; + DomainLoa loa5 = new() { Recipient = "5ed524b04f5b532a5437bba3", End = DateTime.Now.AddDays(-5) }; + List mockCollection = new() { loa1, loa2, loa3, loa4, loa5 }; - _mockLoaDataService.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockCollection.Where(x).ToList()); + _mockLoaDataService.Setup(x => x.Get(It.IsAny>())).Returns>(x => mockCollection.Where(x).ToList()); - IEnumerable subject = _loaService.Get(new() { "5ed524b04f5b532a5437bba1", "5ed524b04f5b532a5437bba2" }); + var subject = _loaService.Get(new() { "5ed524b04f5b532a5437bba1", "5ed524b04f5b532a5437bba2" }); - subject.Should().Contain(new List { loa1, loa4 }); + subject.Should().Contain(new List { loa1, loa4 }); } } } diff --git a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs index e252aa1e..2e9d36bf 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RanksServiceTests.cs @@ -23,9 +23,9 @@ public RanksServiceTests() [Fact] public void ShouldGetCorrectIndex() { - Rank rank1 = new() { Name = "Private" }; - Rank rank2 = new() { Name = "Recruit" }; - List mockCollection = new() { rank1, rank2 }; + DomainRank rank1 = new() { Name = "Private" }; + DomainRank rank2 = new() { Name = "Recruit" }; + List mockCollection = new() { rank1, rank2 }; _mockRanksDataService.Setup(x => x.Get()).Returns(mockCollection); _mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(rank1); @@ -38,9 +38,9 @@ public void ShouldGetCorrectIndex() [Fact] public void ShouldGetCorrectSortValueByName() { - Rank rank1 = new() { Name = "Private", Order = 0 }; - Rank rank2 = new() { Name = "Recruit", Order = 1 }; - List mockCollection = new() { rank1, rank2 }; + DomainRank rank1 = new() { Name = "Private", Order = 0 }; + DomainRank rank2 = new() { Name = "Recruit", Order = 1 }; + List mockCollection = new() { rank1, rank2 }; _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); @@ -62,10 +62,10 @@ public void ShouldReturnEqualWhenBothNull() [Fact] public void ShouldReturnInvalidIndexGetIndexWhenRankNotFound() { - _mockRanksDataService.Setup(x => x.Get()).Returns(new List()); + _mockRanksDataService.Setup(x => x.Get()).Returns(new List()); int subject = _ranksService.GetRankOrder("Private"); - _mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(null); + _mockRanksDataService.Setup(x => x.GetSingle("Private")).Returns(null); subject.Should().Be(-1); } @@ -89,10 +89,10 @@ public void ShouldSortCollection() DomainAccount account4 = new() { Rank = "Private" }; List subject = new() { account1, account2, account3, account4 }; - Rank rank1 = new() { Name = "Private", Order = 0 }; - Rank rank2 = new() { Name = "Recruit", Order = 1 }; - Rank rank3 = new() { Name = "Candidate", Order = 2 }; - List mockCollection = new() { rank1, rank2, rank3 }; + DomainRank rank1 = new() { Name = "Private", Order = 0 }; + DomainRank rank2 = new() { Name = "Recruit", Order = 1 }; + DomainRank rank3 = new() { Name = "Candidate", Order = 2 }; + List mockCollection = new() { rank1, rank2, rank3 }; _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); @@ -101,13 +101,14 @@ public void ShouldSortCollection() subject.Should().ContainInOrder(account1, account4, account3, account2); } - [Theory, InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false), InlineData("Sergeant", "Corporal", false)] + [Theory, InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false), + InlineData("Sergeant", "Corporal", false)] public void ShouldResolveSuperior(string rankName1, string rankName2, bool expected) { - Rank rank1 = new() { Name = "Private", Order = 0 }; - Rank rank2 = new() { Name = "Recruit", Order = 1 }; - Rank rank3 = new() { Name = "Candidate", Order = 2 }; - List mockCollection = new() { rank1, rank2, rank3 }; + DomainRank rank1 = new() { Name = "Private", Order = 0 }; + DomainRank rank2 = new() { Name = "Recruit", Order = 1 }; + DomainRank rank3 = new() { Name = "Candidate", Order = 2 }; + List mockCollection = new() { rank1, rank2, rank3 }; _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); @@ -119,10 +120,10 @@ public void ShouldResolveSuperior(string rankName1, string rankName2, bool expec [Theory, InlineData("Private", "Private", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] public void ShouldResolveEqual(string rankName1, string rankName2, bool expected) { - Rank rank1 = new() { Name = "Private", Order = 0 }; - Rank rank2 = new() { Name = "Recruit", Order = 1 }; - Rank rank3 = new() { Name = "Candidate", Order = 2 }; - List mockCollection = new() { rank1, rank2, rank3 }; + DomainRank rank1 = new() { Name = "Private", Order = 0 }; + DomainRank rank2 = new() { Name = "Recruit", Order = 1 }; + DomainRank rank3 = new() { Name = "Candidate", Order = 2 }; + List mockCollection = new() { rank1, rank2, rank3 }; _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); @@ -131,13 +132,14 @@ public void ShouldResolveEqual(string rankName1, string rankName2, bool expected subject.Should().Be(expected); } - [Theory, InlineData("Private", "Private", true), InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), InlineData("Corporal", "Private", false)] + [Theory, InlineData("Private", "Private", true), InlineData("Private", "Recruit", true), InlineData("Recruit", "Private", false), + InlineData("Corporal", "Private", false)] public void ShouldResolveSuperiorOrEqual(string rankName1, string rankName2, bool expected) { - Rank rank1 = new() { Name = "Private", Order = 0 }; - Rank rank2 = new() { Name = "Recruit", Order = 1 }; - Rank rank3 = new() { Name = "Candidate", Order = 2 }; - List mockCollection = new() { rank1, rank2, rank3 }; + DomainRank rank1 = new() { Name = "Private", Order = 0 }; + DomainRank rank2 = new() { Name = "Recruit", Order = 1 }; + DomainRank rank3 = new() { Name = "Candidate", Order = 2 }; + List mockCollection = new() { rank1, rank2, rank3 }; _mockRanksDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); diff --git a/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs index 873da829..a8539c52 100644 --- a/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Personnel/RolesServiceTests.cs @@ -24,9 +24,9 @@ public RolesServiceTests() [Fact] public void ShouldReturnNullWhenNoUnitRoleFound() { - _mockRolesDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); + _mockRolesDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(null); - Role subject = _rolesService.GetUnitRoleByOrder(2); + var subject = _rolesService.GetUnitRoleByOrder(2); subject.Should().BeNull(); } @@ -44,9 +44,9 @@ public void ShouldReturnZeroForSortWhenRanksAreNull() [Theory, InlineData("Trainee", "Rifleman", 1), InlineData("Rifleman", "Trainee", -1), InlineData("Rifleman", "Rifleman", 0)] public void ShouldGetCorrectSortValueByName(string nameA, string nameB, int expected) { - Role role1 = new() { Name = "Rifleman", Order = 0 }; - Role role2 = new() { Name = "Trainee", Order = 1 }; - List mockCollection = new() { role1, role2 }; + DomainRole role1 = new() { Name = "Rifleman", Order = 0 }; + DomainRole role2 = new() { Name = "Trainee", Order = 1 }; + List mockCollection = new() { role1, role2 }; _mockRolesDataService.Setup(x => x.Get()).Returns(mockCollection); _mockRolesDataService.Setup(x => x.GetSingle(It.IsAny())).Returns(x => mockCollection.FirstOrDefault(y => y.Name == x)); @@ -59,17 +59,18 @@ public void ShouldGetCorrectSortValueByName(string nameA, string nameB, int expe [Theory, InlineData(3, "Trainee"), InlineData(0, "Marksman")] public void ShouldGetUnitRoleByOrder(int order, string expected) { - Role role1 = new() { Name = "Rifleman", Order = 0, RoleType = RoleType.INDIVIDUAL }; - Role role2 = new() { Name = "Gunner", Order = 3, RoleType = RoleType.INDIVIDUAL }; - Role role3 = new() { Name = "Marksman", Order = 0, RoleType = RoleType.UNIT }; - Role role4 = new() { Name = "Trainee", Order = 3, RoleType = RoleType.UNIT }; - Role role5 = new() { Name = "Gunner", Order = 2, RoleType = RoleType.INDIVIDUAL }; - List mockCollection = new() { role1, role2, role3, role4, role5 }; + DomainRole role1 = new() { Name = "Rifleman", Order = 0, RoleType = RoleType.INDIVIDUAL }; + DomainRole role2 = new() { Name = "Gunner", Order = 3, RoleType = RoleType.INDIVIDUAL }; + DomainRole role3 = new() { Name = "Marksman", Order = 0, RoleType = RoleType.UNIT }; + DomainRole role4 = new() { Name = "Trainee", Order = 3, RoleType = RoleType.UNIT }; + DomainRole role5 = new() { Name = "Gunner", Order = 2, RoleType = RoleType.INDIVIDUAL }; + List mockCollection = new() { role1, role2, role3, role4, role5 }; _mockRolesDataService.Setup(x => x.Get()).Returns(mockCollection); - _mockRolesDataService.Setup(x => x.GetSingle(It.IsAny>())).Returns>(x => mockCollection.FirstOrDefault(x)); + _mockRolesDataService.Setup(x => x.GetSingle(It.IsAny>())) + .Returns>(x => mockCollection.FirstOrDefault(x)); - Role subject = _rolesService.GetUnitRoleByOrder(order); + var subject = _rolesService.GetUnitRoleByOrder(order); subject.Name.Should().Be(expected); } From d9b619cdb823712b5726e1436ad891d323ce27cd Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sat, 7 Aug 2021 14:10:52 +0100 Subject: [PATCH 364/369] Fix test --- .../Unit/Events/Handlers/AccountEventHandlerTests.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs index 20a6cf4a..232dcd33 100644 --- a/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/AccountEventHandlerTests.cs @@ -10,6 +10,8 @@ using UKSF.Api.Personnel.Signalr.Hubs; using UKSF.Api.Shared.Events; using UKSF.Api.Shared.Models; +using UKSF.Api.Shared.Signalr.Clients; +using UKSF.Api.Shared.Signalr.Hubs; using Xunit; namespace UKSF.Tests.Unit.Events.Handlers @@ -19,6 +21,8 @@ public class AccountEventHandlerTests private readonly AccountDataEventHandler _accountDataEventHandler; private readonly IEventBus _eventBus; private readonly Mock> _mockAccountHub; + private readonly Mock> _mockGroupedHub; + private readonly Mock> _mockAllHub; private readonly Mock _mockLoggingService; public AccountEventHandlerTests() @@ -26,12 +30,14 @@ public AccountEventHandlerTests() Mock mockDataCollectionFactory = new(); _mockLoggingService = new(); _mockAccountHub = new(); + _mockGroupedHub = new(); + _mockAllHub = new(); _eventBus = new EventBus(); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); mockDataCollectionFactory.Setup(x => x.CreateMongoCollection(It.IsAny())); - _accountDataEventHandler = new(_eventBus, _mockAccountHub.Object, _mockLoggingService.Object); + _accountDataEventHandler = new(_eventBus, _mockAccountHub.Object, _mockGroupedHub.Object, _mockAllHub.Object, _mockLoggingService.Object); } [Fact] From d65d88c46a23fb824876e2bcbfebc723412acc03 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Tue, 10 Aug 2021 12:28:19 +0100 Subject: [PATCH 365/369] Restroe null check when setting variables --- UKSF.Api.Modpack/Services/BuildsService.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/UKSF.Api.Modpack/Services/BuildsService.cs b/UKSF.Api.Modpack/Services/BuildsService.cs index 15483060..8814fedc 100644 --- a/UKSF.Api.Modpack/Services/BuildsService.cs +++ b/UKSF.Api.Modpack/Services/BuildsService.cs @@ -116,7 +116,11 @@ public async Task CreateRcBuild(string version, GithubCommit commi Steps = _buildStepService.GetSteps(GameEnvironment.RC) }; - SetEnvironmentVariables(build, previousBuild); + if (previousBuild != null) + { + SetEnvironmentVariables(build, previousBuild); + } + await _buildsContext.Add(build); return build; } From 86c931512c1a2740b00ae7dc1ff2124ec3f71e39 Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 22 Aug 2021 00:46:52 +0100 Subject: [PATCH 366/369] Update days for candidate ops --- .../UKSF.Api.Admin.Tests.csproj | 8 +- .../UKSF.Api.ArmaMissions.Tests.csproj | 4 +- .../UKSF.Api.ArmaServer.Tests.csproj | 8 +- .../UKSF.Api.Auth.Tests.csproj | 8 +- .../UKSF.Api.Base.Tests.csproj | 6 +- .../UKSF.Api.Command.Tests.csproj | 8 +- ...UKSF.Api.Integrations.Discord.Tests.csproj | 8 +- ...SF.Api.Integrations.Instagram.Tests.csproj | 8 +- ...SF.Api.Integrations.Teamspeak.Tests.csproj | 8 +- .../UKSF.Api.Launcher.Tests.csproj | 8 +- .../UKSF.Api.Modpack.Tests.csproj | 8 +- .../UKSF.Api.Personnel.Tests.csproj | 8 +- .../UKSF.Api.Shared.Tests.csproj | 8 +- .../UKSF.Api.Tests.Common.csproj | 6 +- Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj | 8 +- UKSF.Api.Auth/UKSF.Api.Auth.csproj | 4 +- UKSF.Api.Base/UKSF.Api.Base.csproj | 4 +- UKSF.Api.Modpack/UKSF.Api.Modpack.csproj | 2 +- .../Services/RecruitmentService.cs | 69 ++++++++--------- UKSF.Api/UKSF.Api.csproj | 6 +- UKSF.Tests/UKSF.Tests.csproj | 8 +- .../Unit/Data/CahcedDataServiceEventTests.cs | 29 ++++--- UKSF.Tests/Unit/Data/DataServiceEventTests.cs | 9 +++ .../Handlers/TeamspeakEventHandlerTests.cs | 14 ++-- .../Teamspeak/TeamspeakGroupServiceTests.cs | 76 ++++++++++--------- 25 files changed, 176 insertions(+), 157 deletions(-) diff --git a/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj b/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj index 83bef804..dbefeb74 100644 --- a/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj +++ b/Tests/UKSF.Api.Admin.Tests/UKSF.Api.Admin.Tests.csproj @@ -7,14 +7,14 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.ArmaMissions.Tests/UKSF.Api.ArmaMissions.Tests.csproj b/Tests/UKSF.Api.ArmaMissions.Tests/UKSF.Api.ArmaMissions.Tests.csproj index c06568d9..f17150b9 100644 --- a/Tests/UKSF.Api.ArmaMissions.Tests/UKSF.Api.ArmaMissions.Tests.csproj +++ b/Tests/UKSF.Api.ArmaMissions.Tests/UKSF.Api.ArmaMissions.Tests.csproj @@ -7,13 +7,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj b/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj index 7fc5e002..78c0a0d1 100644 --- a/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj +++ b/Tests/UKSF.Api.ArmaServer.Tests/UKSF.Api.ArmaServer.Tests.csproj @@ -7,14 +7,14 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj b/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj index 84c10203..279d9efe 100644 --- a/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj +++ b/Tests/UKSF.Api.Auth.Tests/UKSF.Api.Auth.Tests.csproj @@ -7,14 +7,14 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Base.Tests/UKSF.Api.Base.Tests.csproj b/Tests/UKSF.Api.Base.Tests/UKSF.Api.Base.Tests.csproj index f004e7e4..04d2fe59 100644 --- a/Tests/UKSF.Api.Base.Tests/UKSF.Api.Base.Tests.csproj +++ b/Tests/UKSF.Api.Base.Tests/UKSF.Api.Base.Tests.csproj @@ -7,16 +7,16 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj b/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj index 3340cca1..bd7c223e 100644 --- a/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj +++ b/Tests/UKSF.Api.Command.Tests/UKSF.Api.Command.Tests.csproj @@ -7,14 +7,14 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj b/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj index 733090b8..a74d9494 100644 --- a/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj +++ b/Tests/UKSF.Api.Integrations.Discord.Tests/UKSF.Api.Integrations.Discord.Tests.csproj @@ -7,14 +7,14 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj b/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj index 292020a8..0ae0f3a0 100644 --- a/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj +++ b/Tests/UKSF.Api.Integrations.Instagram.Tests/UKSF.Api.Integrations.Instagram.Tests.csproj @@ -7,14 +7,14 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Integrations.Teamspeak.Tests/UKSF.Api.Integrations.Teamspeak.Tests.csproj b/Tests/UKSF.Api.Integrations.Teamspeak.Tests/UKSF.Api.Integrations.Teamspeak.Tests.csproj index dfde85e5..fbb0f7ed 100644 --- a/Tests/UKSF.Api.Integrations.Teamspeak.Tests/UKSF.Api.Integrations.Teamspeak.Tests.csproj +++ b/Tests/UKSF.Api.Integrations.Teamspeak.Tests/UKSF.Api.Integrations.Teamspeak.Tests.csproj @@ -7,14 +7,14 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj b/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj index 76c3d2e4..488458cf 100644 --- a/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj +++ b/Tests/UKSF.Api.Launcher.Tests/UKSF.Api.Launcher.Tests.csproj @@ -7,14 +7,14 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj b/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj index 05f2e19a..8dd260f3 100644 --- a/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj +++ b/Tests/UKSF.Api.Modpack.Tests/UKSF.Api.Modpack.Tests.csproj @@ -7,14 +7,14 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj b/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj index 875007ac..d715dc67 100644 --- a/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj +++ b/Tests/UKSF.Api.Personnel.Tests/UKSF.Api.Personnel.Tests.csproj @@ -7,14 +7,14 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Shared.Tests/UKSF.Api.Shared.Tests.csproj b/Tests/UKSF.Api.Shared.Tests/UKSF.Api.Shared.Tests.csproj index 716edaa2..3ef59110 100644 --- a/Tests/UKSF.Api.Shared.Tests/UKSF.Api.Shared.Tests.csproj +++ b/Tests/UKSF.Api.Shared.Tests/UKSF.Api.Shared.Tests.csproj @@ -7,14 +7,14 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj b/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj index 8f9c53e7..8aa285b5 100644 --- a/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj +++ b/Tests/UKSF.Api.Tests.Common/UKSF.Api.Tests.Common.csproj @@ -7,9 +7,9 @@ - + - + @@ -17,7 +17,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj b/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj index 1ffd5b2d..a44ae289 100644 --- a/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj +++ b/Tests/UKSF.Api.Tests/UKSF.Api.Tests.csproj @@ -7,14 +7,14 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/UKSF.Api.Auth/UKSF.Api.Auth.csproj b/UKSF.Api.Auth/UKSF.Api.Auth.csproj index 82d5913b..9f784631 100644 --- a/UKSF.Api.Auth/UKSF.Api.Auth.csproj +++ b/UKSF.Api.Auth/UKSF.Api.Auth.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/UKSF.Api.Base/UKSF.Api.Base.csproj b/UKSF.Api.Base/UKSF.Api.Base.csproj index e211c91f..979bb14a 100644 --- a/UKSF.Api.Base/UKSF.Api.Base.csproj +++ b/UKSF.Api.Base/UKSF.Api.Base.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj b/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj index e1926dd9..484d726a 100644 --- a/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj +++ b/UKSF.Api.Modpack/UKSF.Api.Modpack.csproj @@ -13,7 +13,7 @@ - + diff --git a/UKSF.Api.Personnel/Services/RecruitmentService.cs b/UKSF.Api.Personnel/Services/RecruitmentService.cs index bd1ffd3a..f3c0de80 100644 --- a/UKSF.Api.Personnel/Services/RecruitmentService.cs +++ b/UKSF.Api.Personnel/Services/RecruitmentService.cs @@ -69,7 +69,7 @@ public Dictionary GetRecruiterLeads() public IEnumerable GetRecruiters(bool skipSort = false) { IEnumerable members = GetRecruiterUnit().Members; - List accounts = members.Select(x => _accountContext.GetSingle(x)).ToList(); + var accounts = members.Select(x => _accountContext.GetSingle(x)).ToList(); if (skipSort) { return accounts; @@ -83,11 +83,11 @@ public ApplicationsOverview GetAllApplications() List waiting = new(); List allWaiting = new(); List complete = new(); - List recruiters = GetRecruiters(true).Select(account => _displayNameService.GetDisplayName(account)).ToList(); + var recruiters = GetRecruiters(true).Select(account => _displayNameService.GetDisplayName(account)).ToList(); - string me = _httpContextService.GetUserId(); - IEnumerable accounts = _accountContext.Get(x => x.Application != null); - foreach (DomainAccount account in accounts) + var me = _httpContextService.GetUserId(); + var accounts = _accountContext.Get(x => x.Application != null); + foreach (var account in accounts) { if (account.Application.State == ApplicationState.WAITING) { @@ -111,8 +111,8 @@ public ApplicationsOverview GetAllApplications() public DetailedApplication GetApplication(DomainAccount domainAccount) { - DomainAccount recruiterAccount = _accountContext.GetSingle(domainAccount.Application.Recruiter); - ApplicationAge age = domainAccount.Dob.ToAge(); + var recruiterAccount = _accountContext.GetSingle(domainAccount.Application.Recruiter); + var age = domainAccount.Dob.ToAge(); return new() { Account = _accountMapper.MapToAccount(domainAccount), @@ -122,7 +122,7 @@ public DetailedApplication GetApplication(DomainAccount domainAccount) DaysProcessed = Math.Ceiling((domainAccount.Application.DateAccepted - domainAccount.Application.DateCreated).TotalDays), NextCandidateOp = GetNextCandidateOp(), AverageProcessingTime = GetAverageProcessingTime(), - SteamProfile = "http://steamcommunity.com/profiles/" + domainAccount.Steamname, + SteamProfile = "https://steamcommunity.com/profiles/" + domainAccount.Steamname, Recruiter = _displayNameService.GetDisplayName(recruiterAccount), RecruiterId = recruiterAccount.Id }; @@ -147,7 +147,7 @@ public async Task SetRecruiter(string id, string newRecruiter) public IEnumerable GetStats(string account, bool monthly) { - IEnumerable accounts = _accountContext.Get(x => x.Application != null); + var accounts = _accountContext.Get(x => x.Application != null); if (account != string.Empty) { accounts = accounts.Where(x => x.Application.Recruiter == account); @@ -158,15 +158,15 @@ public IEnumerable GetStats(string account, bool monthly) accounts = accounts.Where(x => x.Application.DateAccepted < DateTime.Now && x.Application.DateAccepted > DateTime.Now.AddMonths(-1)); } - List accountsList = accounts.ToList(); - int acceptedApps = accountsList.Count(x => x.Application.State == ApplicationState.ACCEPTED); - int rejectedApps = accountsList.Count(x => x.Application.State == ApplicationState.REJECTED); - int waitingApps = accountsList.Count(x => x.Application.State == ApplicationState.WAITING); + var accountsList = accounts.ToList(); + var acceptedApps = accountsList.Count(x => x.Application.State == ApplicationState.ACCEPTED); + var rejectedApps = accountsList.Count(x => x.Application.State == ApplicationState.REJECTED); + var waitingApps = accountsList.Count(x => x.Application.State == ApplicationState.WAITING); - List processedApplications = accountsList.Where(x => x.Application.State != ApplicationState.WAITING).ToList(); - double totalProcessingTime = processedApplications.Sum(x => (x.Application.DateAccepted - x.Application.DateCreated).TotalDays); - double averageProcessingTime = totalProcessingTime > 0 ? Math.Round(totalProcessingTime / processedApplications.Count, 1) : 0; - double enlistmentRate = acceptedApps != 0 || rejectedApps != 0 ? Math.Round((double)acceptedApps / (acceptedApps + rejectedApps) * 100, 1) : 0; + var processedApplications = accountsList.Where(x => x.Application.State != ApplicationState.WAITING).ToList(); + var totalProcessingTime = processedApplications.Sum(x => (x.Application.DateAccepted - x.Application.DateCreated).TotalDays); + var averageProcessingTime = totalProcessingTime > 0 ? Math.Round(totalProcessingTime / processedApplications.Count, 1) : 0; + var enlistmentRate = acceptedApps != 0 || rejectedApps != 0 ? Math.Round((double)acceptedApps / (acceptedApps + rejectedApps) * 100, 1) : 0; return new RecruitmentStat[] { @@ -180,9 +180,9 @@ public IEnumerable GetStats(string account, bool monthly) public string GetRecruiter() { - IEnumerable recruiters = GetRecruiters().Where(x => x.Settings.Sr1Enabled); - List waiting = _accountContext.Get(x => x.Application != null && x.Application.State == ApplicationState.WAITING).ToList(); - List complete = _accountContext.Get(x => x.Application != null && x.Application.State != ApplicationState.WAITING).ToList(); + var recruiters = GetRecruiters().Where(x => x.Settings.Sr1Enabled); + var waiting = _accountContext.Get(x => x.Application is { State: ApplicationState.WAITING }).ToList(); + var complete = _accountContext.Get(x => x.Application is { State: not ApplicationState.WAITING }).ToList(); var unsorted = recruiters.Select( x => new { @@ -197,7 +197,7 @@ public string GetRecruiter() private DomainUnit GetRecruiterUnit() { - string id = _variablesService.GetVariable("UNIT_ID_RECRUITMENT").AsString(); + var id = _variablesService.GetVariable("UNIT_ID_RECRUITMENT").AsString(); return _unitsContext.GetSingle(id); } @@ -214,13 +214,13 @@ private CompletedApplication GetCompletedApplication(DomainAccount domainAccount private WaitingApplication GetWaitingApplication(DomainAccount domainAccount) { - double averageProcessingTime = GetAverageProcessingTime(); - double daysProcessing = Math.Ceiling((DateTime.Now - domainAccount.Application.DateCreated).TotalDays); - double processingDifference = daysProcessing - averageProcessingTime; + var averageProcessingTime = GetAverageProcessingTime(); + var daysProcessing = Math.Ceiling((DateTime.Now - domainAccount.Application.DateCreated).TotalDays); + var processingDifference = daysProcessing - averageProcessingTime; return new() { Account = _accountMapper.MapToAccount(domainAccount), - SteamProfile = "http://steamcommunity.com/profiles/" + domainAccount.Steamname, + SteamProfile = "https://steamcommunity.com/profiles/" + domainAccount.Steamname, DaysProcessing = daysProcessing, ProcessingDifference = processingDifference, Recruiter = _displayNameService.GetDisplayName(domainAccount.Application.Recruiter) @@ -229,13 +229,11 @@ private WaitingApplication GetWaitingApplication(DomainAccount domainAccount) private static string GetNextCandidateOp() { - DateTime nextDate = DateTime.Now; - while (nextDate.DayOfWeek == DayOfWeek.Monday || nextDate.DayOfWeek == DayOfWeek.Wednesday || nextDate.DayOfWeek == DayOfWeek.Saturday) - { - nextDate = nextDate.AddDays(1); - } - - if (nextDate.Hour > 18) + var nextDate = DateTime.Now; + while (nextDate.DayOfWeek != DayOfWeek.Tuesday && + nextDate.DayOfWeek != DayOfWeek.Thursday && + nextDate.DayOfWeek != DayOfWeek.Friday && + nextDate.Hour > 18) { nextDate = nextDate.AddDays(1); } @@ -246,10 +244,9 @@ private static string GetNextCandidateOp() private double GetAverageProcessingTime() { - List waitingApplications = - _accountContext.Get(x => x.Application != null && x.Application.State != ApplicationState.WAITING).ToList(); - double days = waitingApplications.Sum(x => (x.Application.DateAccepted - x.Application.DateCreated).TotalDays); - double time = Math.Round(days / waitingApplications.Count, 1); + var waitingApplications = _accountContext.Get(x => x.Application != null && x.Application.State != ApplicationState.WAITING).ToList(); + var days = waitingApplications.Sum(x => (x.Application.DateAccepted - x.Application.DateCreated).TotalDays); + var time = Math.Round(days / waitingApplications.Count, 1); return time; } } diff --git a/UKSF.Api/UKSF.Api.csproj b/UKSF.Api/UKSF.Api.csproj index 9c54c03b..b00b2396 100644 --- a/UKSF.Api/UKSF.Api.csproj +++ b/UKSF.Api/UKSF.Api.csproj @@ -22,10 +22,10 @@ - - + + - + diff --git a/UKSF.Tests/UKSF.Tests.csproj b/UKSF.Tests/UKSF.Tests.csproj index d6eba02f..c68aa66e 100644 --- a/UKSF.Tests/UKSF.Tests.csproj +++ b/UKSF.Tests/UKSF.Tests.csproj @@ -6,12 +6,12 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + @@ -19,7 +19,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs index f71ec9ca..fbf53fd6 100644 --- a/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/CahcedDataServiceEventTests.cs @@ -85,8 +85,11 @@ public async Task Should_create_correct_delete_events_for_delete_many() _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Exactly(2)); subjects.Should() .BeEquivalentTo( - new EventModel(EventType.DELETE, new ContextEventData(_id1, null)), - new EventModel(EventType.DELETE, new ContextEventData(_id2, null)) + new List + { + new(EventType.DELETE, new ContextEventData(_id1, null)), + new(EventType.DELETE, new ContextEventData(_id2, null)) + } ); } @@ -109,7 +112,8 @@ public async Task Should_create_correct_update_events_for_update_many() { List subjects = new(); - _mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())).Returns(Task.CompletedTask); + _mockDataCollection.Setup(x => x.UpdateManyAsync(It.IsAny>>(), It.IsAny>())) + .Returns(Task.CompletedTask); _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subjects.Add(dataEventModel)); await _testCachedContext.UpdateMany(x => x.Name == "1", Builders.Update.Set(x => x.Name, "2")); @@ -117,8 +121,11 @@ public async Task Should_create_correct_update_events_for_update_many() _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Exactly(2)); subjects.Should() .BeEquivalentTo( - new EventModel(EventType.UPDATE, new ContextEventData(_id1, null)), - new EventModel(EventType.UPDATE, new ContextEventData(_id2, null)) + new List + { + new(EventType.UPDATE, new ContextEventData(_id1, null)), + new(EventType.UPDATE, new ContextEventData(_id2, null)) + } ); } @@ -128,7 +135,8 @@ public async Task Should_create_correct_update_events_for_updates() List subjects = new(); _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny(), It.IsAny>())).Returns(Task.CompletedTask); - _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())).Returns(Task.CompletedTask); + _mockDataCollection.Setup(x => x.UpdateAsync(It.IsAny>(), It.IsAny>())) + .Returns(Task.CompletedTask); _mockEventBus.Setup(x => x.Send(It.IsAny())).Callback(dataEventModel => subjects.Add(dataEventModel)); await _testCachedContext.Update(_id1, x => x.Name, "1"); @@ -138,9 +146,12 @@ public async Task Should_create_correct_update_events_for_updates() _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Exactly(3)); subjects.Should() .BeEquivalentTo( - new EventModel(EventType.UPDATE, new ContextEventData(_id1, null)), - new EventModel(EventType.UPDATE, new ContextEventData(_id2, null)), - new EventModel(EventType.UPDATE, new ContextEventData(_id3, null)) + new List + { + new(EventType.UPDATE, new ContextEventData(_id1, null)), + new(EventType.UPDATE, new ContextEventData(_id2, null)), + new(EventType.UPDATE, new ContextEventData(_id3, null)) + } ); } } diff --git a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs index 051378eb..270189a3 100644 --- a/UKSF.Tests/Unit/Data/DataServiceEventTests.cs +++ b/UKSF.Tests/Unit/Data/DataServiceEventTests.cs @@ -101,8 +101,11 @@ public async Task Should_create_correct_delete_events_for_delete_many() _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Exactly(2)); subjects.Should() .BeEquivalentTo( + new List + { new EventModel(EventType.DELETE, new ContextEventData(_id1, null)), new EventModel(EventType.DELETE, new ContextEventData(_id2, null)) + } ); } @@ -133,8 +136,11 @@ public async Task Should_create_correct_update_events_for_update_many() _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Exactly(2)); subjects.Should() .BeEquivalentTo( + new List + { new EventModel(EventType.UPDATE, new ContextEventData(_id1, null)), new EventModel(EventType.UPDATE, new ContextEventData(_id2, null)) + } ); } @@ -154,9 +160,12 @@ public async Task Should_create_correct_update_events_for_updates() _mockEventBus.Verify(x => x.Send(It.IsAny()), Times.Exactly(3)); subjects.Should() .BeEquivalentTo( + new List + { new EventModel(EventType.UPDATE, new ContextEventData(_id1, null)), new EventModel(EventType.UPDATE, new ContextEventData(_id2, null)), new EventModel(EventType.UPDATE, new ContextEventData(_id3, null)) + } ); } } diff --git a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs index b8939527..ce633463 100644 --- a/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs +++ b/UKSF.Tests/Unit/Events/Handlers/TeamspeakEventHandlerTests.cs @@ -87,7 +87,7 @@ public async Task ShouldGetCorrectAccount() _teamspeakServerEventHandler.Init(); _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); - await Task.Delay(TimeSpan.FromSeconds(1)); + await Task.Delay(TimeSpan.FromMilliseconds(600)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); } @@ -129,7 +129,7 @@ public async Task ShouldRunClientGroupsUpdate() _teamspeakServerEventHandler.Init(); _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); - await Task.Delay(TimeSpan.FromSeconds(1)); + await Task.Delay(TimeSpan.FromMilliseconds(600)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(domainAccount, new List { 5 }, 1), Times.Once); } @@ -145,9 +145,9 @@ public async Task ShouldRunClientGroupsUpdateTwiceForTwoEventsWithDelay() _teamspeakServerEventHandler.Init(); _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); - await Task.Delay(TimeSpan.FromSeconds(1)); + await Task.Delay(TimeSpan.FromMilliseconds(600)); _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); - await Task.Delay(TimeSpan.FromSeconds(1)); + await Task.Delay(TimeSpan.FromMilliseconds(600)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(domainAccount, new List { 5 }, 1), Times.Once); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(domainAccount, new List { 10 }, 1), Times.Once); @@ -167,7 +167,7 @@ public async Task ShouldRunSingleClientGroupsUpdateForEachClient() _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 2, \"serverGroupId\": 10}" }); - await Task.Delay(TimeSpan.FromSeconds(2)); + await Task.Delay(TimeSpan.FromMilliseconds(600 * 2)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account1, new List { 5 }, 1), Times.Once); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(account2, new List { 10 }, 2), Times.Once); @@ -185,7 +185,7 @@ public async Task ShouldRunSingleClientGroupsUpdateForMultipleEventsWithOneClien _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 10}" }); - await Task.Delay(TimeSpan.FromSeconds(2)); + await Task.Delay(TimeSpan.FromMilliseconds(600 * 2)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(domainAccount, new List { 5, 10 }, 1), Times.Once); } @@ -216,7 +216,7 @@ public async Task ShouldGetNoAccountForNoMatchingIdsOrNull(int id) _teamspeakServerEventHandler.Init(); _eventBus.Send(new SignalrEventData { Procedure = TeamspeakEventType.CLIENT_SERVER_GROUPS, Args = "{\"clientDbid\": 1, \"serverGroupId\": 5}" }); - await Task.Delay(TimeSpan.FromSeconds(1)); + await Task.Delay(TimeSpan.FromMilliseconds(600)); _mockTeamspeakGroupService.Verify(x => x.UpdateAccountGroups(null, new List { 5 }, 1), Times.Once); } diff --git a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs index caf227ce..cd8c2987 100644 --- a/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs +++ b/UKSF.Tests/Unit/Services/Integrations/Teamspeak/TeamspeakGroupServiceTests.cs @@ -71,7 +71,7 @@ public TeamspeakGroupServiceTests() [Fact] public async Task Should_add_correct_groups_for_candidate() { - string id = ObjectId.GenerateNewId().ToString(); + var id = ObjectId.GenerateNewId().ToString(); _mockRanksContext.Setup(x => x.GetSingle("Candidate")).Returns(new DomainRank { Name = "Candidate", TeamspeakGroup = "5" }); @@ -81,7 +81,7 @@ await _teamspeakGroupService.UpdateAccountGroups( 2 ); - _addedGroups.Should().BeEquivalentTo(5); + _addedGroups.Should().BeEquivalentTo(new List { 5 }); _removedGroups.Should().BeEmpty(); } @@ -90,16 +90,16 @@ public async Task Should_add_correct_groups_for_discharged() { await _teamspeakGroupService.UpdateAccountGroups(new() { MembershipState = MembershipState.DISCHARGED }, new List(), 2); - _addedGroups.Should().BeEquivalentTo(2); + _addedGroups.Should().BeEquivalentTo(new List { 2 }); _removedGroups.Should().BeEmpty(); } [Fact] public async Task Should_add_correct_groups_for_elcom() { - string id = ObjectId.GenerateNewId().ToString(); - string parentId = ObjectId.GenerateNewId().ToString(); - string parentParentId = ObjectId.GenerateNewId().ToString(); + var id = ObjectId.GenerateNewId().ToString(); + var parentId = ObjectId.GenerateNewId().ToString(); + var parentParentId = ObjectId.GenerateNewId().ToString(); DomainUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; DomainUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; DomainUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; @@ -122,15 +122,15 @@ await _teamspeakGroupService.UpdateAccountGroups( 2 ); - _addedGroups.Should().BeEquivalentTo(3, 4, 5, 7, 9); + _addedGroups.Should().BeEquivalentTo(new List { 3, 4, 5, 7, 9 }); _removedGroups.Should().BeEmpty(); } [Fact] public async Task Should_add_correct_groups_for_first_root_child() { - string id = ObjectId.GenerateNewId().ToString(); - string rootId = ObjectId.GenerateNewId().ToString(); + var id = ObjectId.GenerateNewId().ToString(); + var rootId = ObjectId.GenerateNewId().ToString(); DomainUnit rootUnit = new() { Id = rootId, Name = "UKSF", TeamspeakGroup = "10", Parent = ObjectId.Empty.ToString() }; DomainUnit unit = new() { Name = "JSFAW", TeamspeakGroup = "6", Members = new() { id }, Parent = rootId }; DomainUnit auxiliaryUnit = new() @@ -151,15 +151,15 @@ await _teamspeakGroupService.UpdateAccountGroups( 2 ); - _addedGroups.Should().BeEquivalentTo(3, 5, 6, 9); + _addedGroups.Should().BeEquivalentTo(new List { 3, 5, 6, 9 }); _removedGroups.Should().BeEmpty(); } [Fact] public async Task Should_add_correct_groups_for_first_root_child_in_elcom() { - string id = ObjectId.GenerateNewId().ToString(); - string rootId = ObjectId.GenerateNewId().ToString(); + var id = ObjectId.GenerateNewId().ToString(); + var rootId = ObjectId.GenerateNewId().ToString(); DomainUnit rootUnit = new() { Id = rootId, Name = "UKSF", TeamspeakGroup = "10", Parent = ObjectId.Empty.ToString() }; DomainUnit unit = new() { Name = "JSFAW", TeamspeakGroup = "6", Members = new() { id }, Parent = rootId }; DomainUnit auxiliaryUnit = new() @@ -181,16 +181,16 @@ await _teamspeakGroupService.UpdateAccountGroups( 2 ); - _addedGroups.Should().BeEquivalentTo(3, 5, 4, 6, 9); + _addedGroups.Should().BeEquivalentTo(new List { 3, 5, 4, 6, 9 }); _removedGroups.Should().BeEmpty(); } [Fact] public async Task Should_add_correct_groups_for_member() { - string id = ObjectId.GenerateNewId().ToString(); - string parentId = ObjectId.GenerateNewId().ToString(); - string parentParentId = ObjectId.GenerateNewId().ToString(); + var id = ObjectId.GenerateNewId().ToString(); + var parentId = ObjectId.GenerateNewId().ToString(); + var parentParentId = ObjectId.GenerateNewId().ToString(); DomainUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; DomainUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; DomainUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; @@ -212,17 +212,18 @@ await _teamspeakGroupService.UpdateAccountGroups( 2 ); - _addedGroups.Should().BeEquivalentTo(3, 5, 6, 7, 9); + _addedGroups.Should().BeEquivalentTo(new List { 3, 5, 6, 7, 9 }); + _removedGroups.Should().BeEmpty(); } [Fact] public async Task Should_add_correct_groups_for_member_with_gaps_in_parents() { - string id = ObjectId.GenerateNewId().ToString(); - string parentId = ObjectId.GenerateNewId().ToString(); - string parentParentId = ObjectId.GenerateNewId().ToString(); - string parentParentParentId = ObjectId.GenerateNewId().ToString(); + var id = ObjectId.GenerateNewId().ToString(); + var parentId = ObjectId.GenerateNewId().ToString(); + var parentParentId = ObjectId.GenerateNewId().ToString(); + var parentParentParentId = ObjectId.GenerateNewId().ToString(); DomainUnit unit = new() { Name = "1 Section", Members = new() { id }, Parent = parentId }; DomainUnit unitParent = new() { Id = parentId, Name = "1 Platoon", TeamspeakGroup = "7", Parent = parentParentId }; DomainUnit unitParentParent = new() { Id = parentParentId, Name = "A Company", Parent = parentParentParentId }; @@ -241,7 +242,8 @@ await _teamspeakGroupService.UpdateAccountGroups( 2 ); - _addedGroups.Should().BeEquivalentTo(3, 5, 7, 8); + _addedGroups.Should().BeEquivalentTo(new List { 3, 5, 7, 8 }); + _removedGroups.Should().BeEmpty(); } @@ -250,7 +252,7 @@ public async Task Should_add_correct_groups_for_non_member() { await _teamspeakGroupService.UpdateAccountGroups(new() { MembershipState = MembershipState.UNCONFIRMED }, new List(), 2); - _addedGroups.Should().BeEquivalentTo(1); + _addedGroups.Should().BeEquivalentTo(new List { 1 }); _removedGroups.Should().BeEmpty(); } @@ -259,14 +261,14 @@ public async Task Should_add_correct_groups_for_non_member_with_no_account() { await _teamspeakGroupService.UpdateAccountGroups(null, new List(), 2); - _addedGroups.Should().BeEquivalentTo(1); + _addedGroups.Should().BeEquivalentTo(new List { 1 }); _removedGroups.Should().BeEmpty(); } [Fact] public async Task Should_add_correct_groups_for_stratcom() { - string id = ObjectId.GenerateNewId().ToString(); + var id = ObjectId.GenerateNewId().ToString(); DomainUnit rootUnit = new() { Name = "UKSF", TeamspeakGroup = "10", Members = new() { id }, Parent = ObjectId.Empty.ToString() }; DomainUnit auxiliaryUnit = new() { @@ -287,16 +289,16 @@ await _teamspeakGroupService.UpdateAccountGroups( 2 ); - _addedGroups.Should().BeEquivalentTo(3, 4, 5, 10, 9); + _addedGroups.Should().BeEquivalentTo(new List { 3, 4, 5, 10, 9 }); _removedGroups.Should().BeEmpty(); } [Fact] public async Task Should_only_add_groups_if_not_set() { - string id = ObjectId.GenerateNewId().ToString(); - string parentId = ObjectId.GenerateNewId().ToString(); - string parentParentId = ObjectId.GenerateNewId().ToString(); + var id = ObjectId.GenerateNewId().ToString(); + var parentId = ObjectId.GenerateNewId().ToString(); + var parentParentId = ObjectId.GenerateNewId().ToString(); DomainUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; DomainUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; DomainUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; @@ -318,16 +320,16 @@ await _teamspeakGroupService.UpdateAccountGroups( 2 ); - _addedGroups.Should().BeEquivalentTo(6, 7, 9); + _addedGroups.Should().BeEquivalentTo(new List { 6, 7, 9 }); _removedGroups.Should().BeEmpty(); } [Fact] public async Task Should_remove_correct_groups() { - string id = ObjectId.GenerateNewId().ToString(); - string parentId = ObjectId.GenerateNewId().ToString(); - string parentParentId = ObjectId.GenerateNewId().ToString(); + var id = ObjectId.GenerateNewId().ToString(); + var parentId = ObjectId.GenerateNewId().ToString(); + var parentParentId = ObjectId.GenerateNewId().ToString(); DomainUnit unit = new() { Name = "1 Section", TeamspeakGroup = "6", Members = new() { id }, Parent = parentId }; DomainUnit unitParent = new() { Id = parentId, Name = "SFSG", TeamspeakGroup = "7", Parent = parentParentId }; DomainUnit unitParentParent = new() { Id = parentParentId, Name = "UKSF", TeamspeakGroup = "8" }; @@ -349,8 +351,8 @@ await _teamspeakGroupService.UpdateAccountGroups( 2 ); - _addedGroups.Should().BeEquivalentTo(3, 5, 6, 7, 9); - _removedGroups.Should().BeEquivalentTo(1, 10); + _addedGroups.Should().BeEquivalentTo(new List { 3, 5, 6, 7, 9 }); + _removedGroups.Should().BeEquivalentTo(new List { 1, 10 }); } [Fact] @@ -359,7 +361,7 @@ public async Task Should_remove_groups() await _teamspeakGroupService.UpdateAccountGroups(null, new List { 1, 3, 4 }, 2); _addedGroups.Should().BeEmpty(); - _removedGroups.Should().BeEquivalentTo(3, 4); + _removedGroups.Should().BeEquivalentTo(new List { 3, 4 }); } [Fact] @@ -368,7 +370,7 @@ public async Task Should_remove_groups_except_blacklisted() await _teamspeakGroupService.UpdateAccountGroups(null, new List { 1, 3, 4, 99, 100 }, 2); _addedGroups.Should().BeEmpty(); - _removedGroups.Should().BeEquivalentTo(3, 4); + _removedGroups.Should().BeEquivalentTo(new List { 3, 4 }); } } } From 056ad7126268d863ed92ba9c40d331a38233c4bf Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 22 Aug 2021 21:44:16 +0100 Subject: [PATCH 367/369] Remove coverlet nightly nuget feed --- NuGet.Config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.Config b/NuGet.Config index 0a1e438f..c78a76a7 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -6,7 +6,6 @@ - From c5de22cd11de14e1ff615a70523ecb6d4f33c3bb Mon Sep 17 00:00:00 2001 From: Tim Beswick Date: Sun, 22 Aug 2021 21:47:42 +0100 Subject: [PATCH 368/369] Add index to nuget feed --- NuGet.Config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NuGet.Config b/NuGet.Config index c78a76a7..3ae0b41c 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -5,7 +5,7 @@ - + From a98124568d89b45c1ce46521f852c288999d21df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Aug 2021 15:21:24 +0000 Subject: [PATCH 369/369] Bump Microsoft.AspNetCore.Authentication.JwtBearer in /UKSF.Api.Auth Bumps [Microsoft.AspNetCore.Authentication.JwtBearer](https://github.com/dotnet/aspnetcore) from 5.0.6 to 5.0.9. - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.6...v5.0.9) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- UKSF.Api.Auth/UKSF.Api.Auth.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UKSF.Api.Auth/UKSF.Api.Auth.csproj b/UKSF.Api.Auth/UKSF.Api.Auth.csproj index 9f784631..2e589358 100644 --- a/UKSF.Api.Auth/UKSF.Api.Auth.csproj +++ b/UKSF.Api.Auth/UKSF.Api.Auth.csproj @@ -8,7 +8,7 @@ - +